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

Ugly hack to keep connection on server restart

Browse Source
This commit is contained in:
Adrien Gallouët
2016-08-26 11:17:42 +00:00
parent 9f1bf41a01
commit a22476f18a
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mud.c
View File

@@ -143,6 +143,7 @@ struct crypto {
struct crypto_key private, last, next, current; struct crypto_key private, last, next, current;
int use_next; int use_next;
int aes; int aes;
int bad_key;
}; };
struct mud { struct mud {
@@ -1049,7 +1050,8 @@ int mud_pull (struct mud *mud)
if (!path) if (!path)
return -1; return -1;
path->state.up = 1; if (mud_packet)
path->state.up = 1;
int64_t dt = (now-path->recv_time)-(send_time-path->recv_send_time); int64_t dt = (now-path->recv_time)-(send_time-path->recv_send_time);
@@ -1101,6 +1103,7 @@ int mud_recv (struct mud *mud, void *data, size_t size)
mud->rx.start = MUD_PACKET_NEXT(mud->rx.start); mud->rx.start = MUD_PACKET_NEXT(mud->rx.start);
if (ret == -1) { if (ret == -1) {
mud->crypto.bad_key = 1;
errno = EINVAL; errno = EINVAL;
return -1; return -1;
} }
@@ -1132,10 +1135,15 @@ int mud_push (struct mud *mud)
} }
} }
if (!path->state.active) if (!path->state.active) {
if (mud->crypto.bad_key) {
mud_ctrl_path(mud, mud_keyx, path, now);
mud->crypto.bad_key = 0;
}
continue; continue;
}
if (path->state.up && (now-mud->crypto.time >= MUD_KEYX_TIMEOUT)) { if ((now-mud->crypto.time >= MUD_KEYX_TIMEOUT)) {
mud_ctrl_path(mud, mud_keyx, path, now); mud_ctrl_path(mud, mud_keyx, path, now);
mud->crypto.time = now; mud->crypto.time = now;
continue; continue;