mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-09-01 06:45:35 +00:00
Code Issues Releases Wiki Activity

tcp: Print error reported from sys_setsockopt

Browse Source 
We use pr_perror, but after direct syscall calling the
errno is not initialized (and in PIE it doesn't even exists).

Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Pavel Emelyanov
2013-04-11 19:50:08 +04:00
parent 84a0cabbd5
commit 64d039dc29
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/sk-inet.h
View File

@@ -51,10 +51,11 @@ struct rst_tcp_sock {
static inline void tcp_repair_off(int fd) static inline void tcp_repair_off(int fd)
{ {
int aux = 0; int aux = 0, ret;
if (sys_setsockopt(fd, SOL_TCP, TCP_REPAIR, &aux, sizeof(aux)) < 0) ret = sys_setsockopt(fd, SOL_TCP, TCP_REPAIR, &aux, sizeof(aux));
pr_perror("Failed to turn off repair mode on socket"); if (ret < 0)
pr_perror("Failed to turn off repair mode on socket (%d)", ret);
} }
void tcp_locked_conn_add(struct inet_sk_info *); void tcp_locked_conn_add(struct inet_sk_info *);

12
pie/restorer.c
View File

@@ -333,13 +333,15 @@ static u64 restore_mapping(const VmaEntry *vma_entry)
static void rst_tcp_repair_off(struct rst_tcp_sock *rts) static void rst_tcp_repair_off(struct rst_tcp_sock *rts)
{ {
int aux; int aux, ret;
tcp_repair_off(rts->sk);
aux = rts->reuseaddr; aux = rts->reuseaddr;
if (sys_setsockopt(rts->sk, SOL_SOCKET, SO_REUSEADDR, &aux, sizeof(aux)) < 0) pr_debug("pie: Turning repair off for %d (reuse %d)\n", rts->sk, aux);
pr_perror("Failed to restore of SO_REUSEADDR on socket"); tcp_repair_off(rts->sk);
ret = sys_setsockopt(rts->sk, SOL_SOCKET, SO_REUSEADDR, &aux, sizeof(aux));
if (ret < 0)
pr_perror("Failed to restore of SO_REUSEADDR on socket (%d)", ret);
} }
static void rst_tcp_socks_all(struct rst_tcp_sock *arr, int size) static void rst_tcp_socks_all(struct rst_tcp_sock *arr, int size)