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

Be nice with old good path

Browse Source 
Signed-off-by: Adrien Gallouët <adrien@gallouet.fr>
This commit is contained in:
Adrien Gallouët
2018-05-05 19:34:52 +00:00
parent 1988ee1d78
commit 964672adb5
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
mud.c
View File

@@ -1230,11 +1230,11 @@ mud_packet_recv(struct mud *mud, struct mud_path *path,
const int rem = memcmp(packet->pub, const int rem = memcmp(packet->pub,
mud->crypto.pub.remote, mud->crypto.pub.remote,
sizeof(mud->crypto.pub.remote)); MUD_PUB_SIZE);
const int loc = memcmp(path->pub.local, const int loc = memcmp(path->pub.local,
mud->crypto.pub.local, mud->crypto.pub.local,
sizeof(mud->crypto.pub.local)); MUD_PUB_SIZE);
if (rem || loc) { if (rem || loc) {
if (mud_keyx(mud, packet->pub, packet->aes)) { if (mud_keyx(mud, packet->pub, packet->aes)) {
@@ -1243,24 +1243,26 @@ mud_packet_recv(struct mud *mud, struct mud_path *path,
return; return;
} }
path->pub = mud->crypto.pub; if (!mud->peer.set) {
if (peer_sent) {
mud->crypto.use_next = 1;
} else {
for (unsigned i = 0; i < mud->count; i++) { for (unsigned i = 0; i < mud->count; i++) {
if (mud->paths[i].state == MUD_EMPTY) if (mud->paths[i].state == MUD_EMPTY)
continue; continue;
if (memcmp(mud->paths[i].pub.remote, if (memcmp(mud->paths[i].pub.remote,
mud->crypto.pub.remote, path->pub.remote,
MUD_PUB_SIZE)) { MUD_PUB_SIZE) &&
memcmp(mud->paths[i].pub.remote,
packet->pub,
MUD_PUB_SIZE))
mud->paths[i].state = MUD_EMPTY; mud->paths[i].state = MUD_EMPTY;
} }
}
mud_packet_send(mud, path, now, sent, 0); mud_packet_send(mud, path, now, sent, 0);
} }
path->pub = mud->crypto.pub;
} else {
mud->crypto.use_next = 1;
} }
path->r_rms = mud_read48(packet->rms); path->r_rms = mud_read48(packet->rms);