Don't keep an address cache in an outgoing_t.

[tinc] / src / protocol_misc.c

diff --git a/src/protocol_misc.c b/src/protocol_misc.c
index a8b30ff..050e30a 100644 (file)
--- a/src/protocol_misc.c
+++ b/src/protocol_misc.c
@@ -20,6 +20,7 @@
 
 #include "system.h"
 
+#include "address_cache.h"
 #include "conf.h"
 #include "connection.h"
 #include "logger.h"
@@ -38,61 +39,13 @@ int maxoutbufsize = 0;
 int mtu_info_interval = 5;
 int udp_info_interval = 5;
 
-/* Status and error notification routines */
-
-bool send_status(connection_t *c, int statusno, const char *statusstring) {
-       if(!statusstring) {
-               statusstring = "Status";
-       }
-
-       return send_request(c, "%d %d %s", STATUS, statusno, statusstring);
-}
-
-bool status_h(connection_t *c, const char *request) {
-       int statusno;
-       char statusstring[MAX_STRING_SIZE];
-
-       if(sscanf(request, "%*d %d " MAX_STRING, &statusno, statusstring) != 2) {
-               logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s)", "STATUS",
-                      c->name, c->hostname);
-               return false;
-       }
-
-       logger(DEBUG_STATUS, LOG_NOTICE, "Status message from %s (%s): %d: %s",
-              c->name, c->hostname, statusno, statusstring);
-
-       return true;
-}
-
-bool send_error(connection_t *c, int err, const char *errstring) {
-       if(!errstring) {
-               errstring = "Error";
-       }
-
-       return send_request(c, "%d %d %s", ERROR, err, errstring);
-}
-
-bool error_h(connection_t *c, const char *request) {
-       int err;
-       char errorstring[MAX_STRING_SIZE];
-
-       if(sscanf(request, "%*d %d " MAX_STRING, &err, errorstring) != 2) {
-               logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s)", "ERROR",
-                      c->name, c->hostname);
-               return false;
-       }
-
-       logger(DEBUG_ERROR, LOG_NOTICE, "Error message from %s (%s): %d: %s",
-              c->name, c->hostname, err, errorstring);
-
-       return false;
-}
-
 bool send_termreq(connection_t *c) {
        return send_request(c, "%d", TERMREQ);
 }
 
 bool termreq_h(connection_t *c, const char *request) {
+       (void)c;
+       (void)request;
        return false;
 }
 
@@ -104,6 +57,7 @@ bool send_ping(connection_t *c) {
 }
 
 bool ping_h(connection_t *c, const char *request) {
+       (void)request;
        return send_pong(c);
 }
 
@@ -112,20 +66,14 @@ bool send_pong(connection_t *c) {
 }
 
 bool pong_h(connection_t *c, const char *request) {
+       (void)request;
        c->status.pinged = false;
 
-       /* Succesful connection, reset timeout if this is an outgoing connection. */
+       /* 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;