Remove some unused variables.

diff --git a/src/connection.h b/src/connection.h
index 0bdea9efd49db9e54400ce6969f6f83638525386..d414e83d063f55ec7eb5b40eb7dd30a8ad9bdb97 100644 (file)
--- a/src/connection.h
+++ b/src/connection.h
@@ -62,7 +62,6 @@ typedef struct connection_t {
        struct buffer_t inbuf;
        struct buffer_t outbuf;
        io_t io;                        /* input/output event on this metadata connection */
-       int tcplen;                     /* length of incoming TCPpacket */
        int allow_request;              /* defined if there's only one request possible */
        time_t last_ping_time;          /* last time we saw some activity from the other end or pinged them */
        time_t last_key_renewal;        /* last time we renewed the SPTPS key */

diff --git a/src/devtools.c b/src/devtools.c
index 54fe84a8630aa991f30e9c8c529a148ee2efd4f6..2c135eab2fcfee10e7f19f226ffd0817f1bf4c00 100644 (file)
--- a/src/devtools.c
+++ b/src/devtools.c
@@ -66,7 +66,6 @@ void devtool_get_node_status(meshlink_handle_t *mesh, meshlink_node_t *node, dev
        }
 
        memcpy(&status->status, &internal->status, sizeof status->status);
-       memcpy(&status->address, &internal->address, sizeof status->address);
        status->mtu = internal->mtu;
        status->minmtu = internal->minmtu;
        status->maxmtu = internal->maxmtu;

diff --git a/src/devtools.h b/src/devtools.h
index 60b51d13be43c56e019fdba1a66d377905cb9b83..16b89590580ee97db6bd142917026c883e9c819f 100644 (file)
--- a/src/devtools.h
+++ b/src/devtools.h
@@ -32,7 +32,6 @@ typedef struct devtool_node_status devtool_node_status_t;
 /// The status of a node.
 struct devtool_node_status {
        uint32_t status;
-       struct sockaddr_storage address;
        uint16_t mtu;
        uint16_t minmtu;
        uint16_t maxmtu;

diff --git a/src/meshlink_internal.h b/src/meshlink_internal.h
index 3113bea286fae7289124ab88924d4c2590b45087..30748636b3c26baf9da724b145e93982ea200362 100644 (file)
--- a/src/meshlink_internal.h
+++ b/src/meshlink_internal.h
@@ -97,12 +97,9 @@ struct meshlink_handle {
        struct connection_t *connection;
        struct outgoing_t *outgoing;
 
-       int connection_burst;
        int contradicting_add_edge;
        int contradicting_del_edge;
        int sleeptime;
-       time_t connection_burst_time;
-       time_t last_hard_try;
        time_t last_unreachable;
        timeout_t pingtimer;
        timeout_t periodictimer;
@@ -111,9 +108,6 @@ struct meshlink_handle {
        uint64_t prng_state[4];
        uint32_t session_id;
 
-       int next_pit;
-       int pits[10];
-
        // Infrequently used callbacks
        meshlink_node_status_cb_t node_status_cb;
        meshlink_node_status_cb_t meta_status_cb;

diff --git a/src/meta.c b/src/meta.c
index 32e3de24ba9656b804e39f6c063813214011ad92..09edf79d503b920a0e6739d1ea4d9b2c3355b1a0 100644 (file)
--- a/src/meta.c
+++ b/src/meta.c
@@ -95,12 +95,6 @@ bool receive_meta_sptps(void *handle, uint8_t type, const void *data, uint16_t l
                return true;
        }
 
-       /* Are we receiving a TCPpacket? */
-
-       if(c->tcplen) {
-               abort(); // TODO: get rid of tcplen altogether
-       }
-
        /* Change newline to null byte, just like non-SPTPS requests */
 
        if(request[length - 1] == '\n') {

diff --git a/src/node.c b/src/node.c
index 1c1c864b14e2f89a2c198e819e54f296a108deea..ce5a5a244d878fdb4a0b59a013dc25b23e9b75df 100644 (file)
--- a/src/node.c
+++ b/src/node.c
@@ -55,8 +55,6 @@ void free_node(node_t *n) {
 
        utcp_exit(n->utcp);
 
-       sockaddrfree(&n->address);
-
        ecdsa_free(n->ecdsa);
        sptps_stop(&n->sptps);
 

diff --git a/src/node.h b/src/node.h
index dd19884537334dac78f910ff55e274b6811e759f..29d37252b5d0273354c3d2f4e3bcb47fbf164662 100644 (file)
--- a/src/node.h
+++ b/src/node.h
@@ -53,10 +53,8 @@ typedef struct node_t {
        dev_class_t devclass;
 
        // Used for packet I/O
-       int sock;                               /* Socket to use for outgoing UDP packets */
        uint32_t session_id;                    /* Unique ID for this node's currently running process */
        sptps_t sptps;
-       sockaddr_t address;                     /* his real (internet) ip to send UDP packets to */
 
        struct utcp *utcp;
 
@@ -85,7 +83,6 @@ typedef struct node_t {
 
        char *canonical_address;                /* The canonical address of this node, if known */
        sockaddr_t recent[MAX_RECENT];          /* Recently seen addresses */
-       sockaddr_t catta_address;               /* Latest address seen by Catta */
 
        struct node_t *nexthop;                 /* nearest node from us to him */
 } node_t;