X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprotocol_misc.c;h=27125da80b6399a8fe04149faee0197201f79182;hb=b18d5b572992debb04a7851e43143711319243a0;hp=d4a45e8ce820580b553da752ac4fd522970405fa;hpb=ca989c0c8b19901cbd7664a9d2b42aa85c9c176e;p=tinc

diff --git a/src/protocol_misc.c b/src/protocol_misc.c
index d4a45e8c..27125da8 100644
--- a/src/protocol_misc.c
+++ b/src/protocol_misc.c
@@ -20,7 +20,7 @@
 
 #include "system.h"
 
-#include "conf.h"
+#include "address_cache.h"
 #include "connection.h"
 #include "logger.h"
 #include "meta.h"
@@ -28,7 +28,6 @@
 #include "netutl.h"
 #include "protocol.h"
 #include "utils.h"
-#include "xalloc.h"
 
 #ifndef MIN
 #define MIN(x, y) (((x)<(y))?(x):(y))
@@ -43,6 +42,8 @@ bool send_termreq(connection_t *c) {
 }
 
 bool termreq_h(connection_t *c, const char *request) {
+	(void)c;
+	(void)request;
 	return false;
 }
 
@@ -54,6 +55,7 @@ bool send_ping(connection_t *c) {
 }
 
 bool ping_h(connection_t *c, const char *request) {
+	(void)request;
 	return send_pong(c);
 }
 
@@ -62,20 +64,14 @@ bool send_pong(connection_t *c) {
 }
 
 bool pong_h(connection_t *c, const char *request) {
+	(void)request;
 	c->status.pinged = false;
 
 	/* Successful connection, reset timeout if this is an outgoing connection. */
 
-	if(c->outgoing) {
+	if(c->outgoing && c->outgoing->timeout) {
 		c->outgoing->timeout = 0;
-		c->outgoing->cfg = NULL;
-
-		if(c->outgoing->ai) {
-			freeaddrinfo(c->outgoing->ai);
-		}
-
-		c->outgoing->ai = NULL;
-		c->outgoing->aip = NULL;
+		reset_address_cache(c->outgoing->node->address_cache, &c->address);
 	}
 
 	return true;