mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-09-02 07:15:31 +00:00
Code Issues Releases Wiki Activity

sockets: Merge dgram and stream listeners

Browse Source 
They fully coincide now, just need to distinguish them by socket type.
Thus, add the type member on the unix_sk_listen and merge two hashes.

Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
This commit is contained in:
Pavel Emelyanov
2012-02-07 15:57:32 +04:00
committed by Cyrill Gorcunov
parent 2d9873e051
commit e1ed063f79
1 changed files with 29 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
sockets.c
View File

@@ -65,6 +65,7 @@ struct unix_sk_listen {
unsigned int ino; unsigned int ino;
struct sockaddr_un addr; struct sockaddr_un addr;
unsigned int addrlen; unsigned int addrlen;
int type;
struct unix_sk_listen *next; struct unix_sk_listen *next;
}; };
@@ -109,14 +110,16 @@ __gen_static_lookup_func(struct unix_sk_listen_icon, \
peer_ino, unsigned int, ino); peer_ino, unsigned int, ino);
static struct unix_sk_listen *unix_listen[SK_HASH_SIZE]; static struct unix_sk_listen *unix_listen[SK_HASH_SIZE];
__gen_static_lookup_func(struct unix_sk_listen, \ static struct unix_sk_listen *lookup_unix_listen(unsigned int ino, int type)
lookup_unix_listen, \ {
unix_listen, \ struct unix_sk_listen *l;
ino, unsigned int, ino);
static struct unix_sk_listen *dgram_bound[SK_HASH_SIZE]; for (l = unix_listen[ino % SK_HASH_SIZE]; l != NULL; l = l->next)
__gen_static_lookup_func(struct unix_sk_listen, lookup_dgram_bound, dgram_bound, ino, int, ino); if ((l->ino == ino) && (l->type == type))
return l;
return NULL;
}
static int sk_collect_one(int ino, int family, struct socket_desc *d) static int sk_collect_one(int ino, int family, struct socket_desc *d)
{ {
@@ -720,30 +723,24 @@ static int run_connect_jobs(void)
/* /*
* Might need to resolve in-flight connection name. * Might need to resolve in-flight connection name.
*/ */
if (cj->type == CJ_STREAM_INFLIGHT) { if (cj->type == CJ_STREAM)
struct unix_sk_listen *e;
e = lookup_unix_listen(cj->peer);
if (!e) {
pr_err("Bad in-flight socket peer %d\n", cj->peer);
return -1;
}
memcpy(&addr, &e->addr, sizeof(addr));
addrlen = e->addrlen;
} else if (cj->type == CJ_DGRAM) {
struct unix_sk_listen *e;
e = lookup_dgram_bound(cj->peer);
if (!e) {
pr_err("Bad in-flight socket peer %d\n", cj->peer);
return -1;
}
memcpy(&addr, &e->addr, sizeof(addr));
addrlen = e->addrlen;
} else
prep_conn_addr(cj->peer, &addr, &addrlen); prep_conn_addr(cj->peer, &addr, &addrlen);
else {
struct unix_sk_listen *e;
if (cj->type == CJ_STREAM_INFLIGHT)
e = lookup_unix_listen(cj->peer, SOCK_STREAM);
else /* if (cj->type == CJ_DGRAM) */
e = lookup_unix_listen(cj->peer, SOCK_DGRAM);
if (!e) {
pr_err("Bad in-flight socket peer %d\n", cj->peer);
return -1;
}
memcpy(&addr, &e->addr, sizeof(addr));
addrlen = e->addrlen;
}
unix_show_job("Run conn", cj->fd, -1); unix_show_job("Run conn", cj->fd, -1);
try_again: try_again:
@@ -777,16 +774,6 @@ try_again:
} }
} }
for (i = 0; i < SK_HASH_SIZE; i++) {
struct unix_sk_listen *h = dgram_bound[i];
struct unix_sk_listen *e;
while (h) {
e = h->next;
xfree(h);
h = e;
}
}
return 0; return 0;
} }
@@ -864,8 +851,9 @@ static int open_unix_sk_dgram(int sk, struct unix_sk_entry *ue, int img_fd)
memcpy(&d->addr, &addr, sizeof(d->addr)); memcpy(&d->addr, &addr, sizeof(d->addr));
d->addrlen = sizeof(addr.sun_family) + ue->namelen; d->addrlen = sizeof(addr.sun_family) + ue->namelen;
d->ino = ue->id; d->ino = ue->id;
d->type = SOCK_DGRAM;
SK_HASH_LINK(dgram_bound, d->ino, d); SK_HASH_LINK(unix_listen, d->ino, d);
} }
if (ue->peer) if (ue->peer)
@@ -931,6 +919,7 @@ static int open_unix_sk_stream(int sk, struct unix_sk_entry *ue, int img_fd)
memcpy(&e->addr, &addr, sizeof(e->addr)); memcpy(&e->addr, &addr, sizeof(e->addr));
e->addrlen = sizeof(e->addr.sun_family) + ue->namelen; e->addrlen = sizeof(e->addr.sun_family) + ue->namelen;
e->ino = ue->id; e->ino = ue->id;
e->type = SOCK_STREAM;
dprintk("\tCollected listening socket %d\n", ue->id); dprintk("\tCollected listening socket %d\n", ue->id);