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

Force kx on all paths

Browse Source
This commit is contained in:
Adrien Gallouët
2017-01-16 16:10:28 +00:00
parent 19e3115420
commit 762b4487bf
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mud.c
View File

@@ -93,6 +93,9 @@ struct mud_path {
} mtu; } mtu;
unsigned char kiss[MUD_SID_SIZE]; unsigned char kiss[MUD_SID_SIZE];
} conf; } conf;
struct {
uint64_t send_time;
} public;
unsigned char *tc; unsigned char *tc;
uint64_t rdt; uint64_t rdt;
uint64_t rtt; uint64_t rtt;
@@ -166,7 +169,6 @@ struct mud {
struct mud_path *path; struct mud_path *path;
struct { struct {
uint64_t recv_time; uint64_t recv_time;
uint64_t send_time;
unsigned char secret[crypto_scalarmult_SCALARBYTES]; unsigned char secret[crypto_scalarmult_SCALARBYTES];
struct mud_crypto_pub public; struct mud_crypto_pub public;
struct mud_crypto_key private, last, next, current; struct mud_crypto_key private, last, next, current;
@@ -1163,11 +1165,7 @@ mud_recv(struct mud *mud, void *data, size_t size)
int ret = mud_decrypt(mud, data, size, packet, packet_size); int ret = mud_decrypt(mud, data, size, packet, packet_size);
if (ret == -1) { if (ret == -1) {
if ((!path->state.active) && // XXX
(mud_timeout(now, mud->crypto.send_time, mud->send_timeout))) {
mud_packet_send(mud, mud_keyx, path, now);
mud->crypto.send_time = now;
}
return 0; return 0;
} }
@@ -1195,10 +1193,10 @@ mud_update(struct mud *mud)
continue; continue;
} }
if ((mud_timeout(now, mud->crypto.send_time, mud->send_timeout)) && if ((mud_timeout(now, path->public.send_time, mud->send_timeout)) &&
(mud_timeout(now, mud->crypto.recv_time, MUD_KEYX_TIMEOUT))) { (mud_timeout(now, mud->crypto.recv_time, MUD_KEYX_TIMEOUT))) {
mud_packet_send(mud, mud_keyx, path, now); mud_packet_send(mud, mud_keyx, path, now);
mud->crypto.send_time = now; path->public.send_time = now;
continue; continue;
} }
} }