miegl/mud
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Do not remove path with the same kiss

Browse Source
This commit is contained in:
Adrien Gallouët
2017-01-12 13:21:17 +00:00
parent 58c734a681
commit 19e3115420
1 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
mud.c
View File

@@ -91,6 +91,7 @@ struct mud_path {
int remote; int remote;
int local; int local;
} mtu; } mtu;
unsigned char kiss[MUD_SID_SIZE];
} conf; } conf;
unsigned char *tc; unsigned char *tc;
uint64_t rdt; uint64_t rdt;
@@ -982,17 +983,20 @@ mud_recv_keyx(struct mud *mud, struct mud_path *path, uint64_t now,
static void static void
mud_kiss_path(struct mud *mud, struct mud_path *path) mud_kiss_path(struct mud *mud, struct mud_path *path)
{ {
while (mud->path) { struct mud_path **p = &mud->path;
struct mud_path *p = mud->path;
mud->path = p->next; while (*p) {
if (p != path) struct mud_path *t = *p;
free(p);
if ((t == path) ||
!memcmp(t->conf.kiss, path->conf.kiss, sizeof(path->conf.kiss))) {
p = &t->next;
continue;
}
*p = t->next;
free(t);
} }
mud->path = path;
if (path)
path->next = NULL;
} }
static int static int
@@ -1045,12 +1049,13 @@ mud_packet_recv(struct mud *mud, struct mud_path *path,
switch (packet->hdr.code) { switch (packet->hdr.code) {
case mud_conf: case mud_conf:
path->conf.mtu.remote = mud_read48(packet->data.conf.mtu); path->conf.mtu.remote = mud_read48(packet->data.conf.mtu);
path->conf.remote = !memcmp(mud->kiss, packet->data.conf.kiss, path->conf.remote = !memcmp(path->conf.kiss, packet->data.conf.kiss,
sizeof(mud->kiss)); sizeof(path->conf.kiss));
if (path->state.active) if (path->state.active)
break; break;
if (!path->conf.remote) { if (!path->conf.remote) {
memcpy(mud->kiss, packet->data.conf.kiss, sizeof(mud->kiss)); memcpy(path->conf.kiss, packet->data.conf.kiss,
sizeof(path->conf.kiss));
mud_kiss_path(mud, path); mud_kiss_path(mud, path);
path->conf.remote = 1; path->conf.remote = 1;
} }