Mirrors/criu
1
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu.git synced 2026-01-23 02:14:37 +00:00
Code Issues Projects Releases Wiki Activity

tcp: bind tcp sockets after enabling the repair mode

Browse source 
Only sockets in the repair mode can be bound to the same
port a few time, what is required to restore tcp connects.

v2: move bind() into libsoccr
v3: fix an error message
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
This commit is contained in:
Andrei Vagin 2016-12-15 03:34:00 +03:00 • committed by Pavel Emelyanov
parent 8664130b17
commit 67d548e9fe
3 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
criu/sk-inet.c
View file

@ -628,11 +628,6 @@ static int open_inet_sk(struct file_desc *d)
if (restore_opt(sk, SOL_SOCKET, SO_REUSEADDR, &yes))
goto err;
if (ie->src_port) {
if (inet_bind(sk, ii))
goto err;
}
if (tcp_connection(ie)) {
if (!opts.tcp_established_ok) {
pr_err("Connected TCP socket in image\n");
@ -649,6 +644,11 @@ static int open_inet_sk(struct file_desc *d)
goto done;
}
if (ie->src_port) {
if (inet_bind(sk, ii))
goto err;
}
/*
* Listen sockets are easiest ones -- simply
* bind() and listen(), and that's all.

10
soccr/soccr.c
View file

@ -449,6 +449,16 @@ static int libsoccr_set_sk_data_noq(struct libsoccr_sk *sk,
if (data->state == TCP_LISTEN)
return -1;
if (sk->src_addr->sa.sa_family == AF_INET)
addr_size = sizeof(sk->src_addr->v4);
else
addr_size = sizeof(sk->src_addr->v6);
if (bind(sk->fd, &sk->src_addr->sa, addr_size)) {
loge("Can't bind inet socket back\n");
return -1;
}
if (mstate & (RCVQ_FIRST_FIN | RCVQ_SECOND_FIN))
data->inq_seq--;

2
soccr/soccr.h
View file

@ -224,7 +224,7 @@ int libsoccr_set_queue_bytes(struct libsoccr_sk *sk, int queue_id, char *bytes,
int libsoccr_set_addr(struct libsoccr_sk *sk, int self, union libsoccr_addr *, unsigned flags);
/*
* Performs restore actions on bind()-ed socket
* Performs restore actions on a socket
*/
int libsoccr_restore(struct libsoccr_sk *sk, struct libsoccr_sk_data *data, unsigned data_size);