X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprotocol_key.c;h=63fcd976875cc0520d2f6c8e8cad3e9e2851e476;hb=f4010694b3b16453e5e6298c208910264e326978;hp=f57dc2ea059ff07d01d104c8e3df46b48c60287a;hpb=a22041922f160667573e9a5ae3f4195e1668906a;p=tinc diff --git a/src/protocol_key.c b/src/protocol_key.c index f57dc2ea..63fcd976 100644 --- a/src/protocol_key.c +++ b/src/protocol_key.c @@ -1,7 +1,7 @@ /* protocol_key.c -- handle the meta-protocol, key exchange Copyright (C) 1999-2005 Ivo Timmermans, - 2000-2010 Guus Sliepen + 2000-2011 Guus Sliepen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -34,7 +34,7 @@ static bool mykeyused = false; -void send_key_changed() { +void send_key_changed(void) { splay_node_t *node; connection_t *c; @@ -156,7 +156,7 @@ bool send_ans_key(node_t *to) { // Reset sequence number and late packet window mykeyused = true; to->received_seqno = 0; - memset(to->late, 0, sizeof(to->late)); + if(replaywin) memset(to->late, 0, replaywin); return send_request(to->nexthop->connection, "%d %s %s %s %d %d %zu %d", ANS_KEY, myself->name, to->name, key, @@ -275,7 +275,7 @@ bool ans_key_h(connection_t *c, char *request) { update_node_udp(from, &sa); } - if(from->options & OPTION_PMTU_DISCOVERY && !from->mtuprobes) + if(from->options & OPTION_PMTU_DISCOVERY && !event_initialized(&from->mtuevent)) send_mtu_probe(from); return true;