X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprotocol_key.c;h=63fcd976875cc0520d2f6c8e8cad3e9e2851e476;hb=f4010694b3b16453e5e6298c208910264e326978;hp=069cfd5f8ff8dd26abb1b3fd1bbcc93faa9fdfff;hpb=103543aa2c15d9f1e2aa313a2e593a7524cce484;p=tinc

diff --git a/src/protocol_key.c b/src/protocol_key.c
index 069cfd5f..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 <guus@tinc-vpn.org>
+                  2000-2011 Guus Sliepen <guus@tinc-vpn.org>
 
     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,8 +34,8 @@
 
 static bool mykeyused = false;
 
-void send_key_changed() {
-	avl_node_t *node;
+void send_key_changed(void) {
+	splay_node_t *node;
 	connection_t *c;
 
 	send_request(broadcast, "%d %x %s", KEY_CHANGED, rand(), myself->name);
@@ -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,
@@ -175,7 +175,7 @@ bool ans_key_h(connection_t *c, char *request) {
 	int cipher, digest, maclength, compression, keylen;
 	node_t *from, *to;
 
-	if(sscanf(request, "%*d "MAX_STRING" "MAX_STRING" "MAX_STRING" %d %d %d %d",
+	if(sscanf(request, "%*d "MAX_STRING" "MAX_STRING" "MAX_STRING" %d %d %d %d "MAX_STRING" "MAX_STRING,
 		from_name, to_name, key, &cipher, &digest, &maclength,
 		&compression, address, port) < 7) {
 		logger(LOG_ERR, "Got bad %s from %s (%s)", "ANS_KEY", c->name,
@@ -216,6 +216,16 @@ bool ans_key_h(connection_t *c, char *request) {
 			return true;
 		}
 
+		if(!*address && from->address.sa.sa_family != AF_UNSPEC) {
+			char *address, *port;
+			ifdebug(PROTOCOL) logger(LOG_DEBUG, "Appending reflexive UDP address to ANS_KEY from %s to %s", from->name, to->name);
+			sockaddr2str(&from->address, &address, &port);
+			send_request(to->nexthop->connection, "%s %s %s", request, address, port);
+			free(address);
+			free(port);
+			return true;
+		}
+
 		return send_request(to->nexthop->connection, "%s", request);
 	}
 
@@ -257,7 +267,6 @@ bool ans_key_h(connection_t *c, char *request) {
 	digest_set_key(&from->outdigest, key, keylen);
 
 	from->status.validkey = true;
-	from->status.waitingforkey = false;
 	from->sent_seqno = 0;
 
 	if(*address && *port) {
@@ -266,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;