Don't try to renew SPTPS keys for unreachable nodes.

This caused other functions that incorrectly used status.validkey to check
if they could send data to a node to pass a NULL pointer to send_request(),
causing a crash about an hour after a node went offline.

diff --git a/src/net.c b/src/net.c
index 5689a0401883d9b4b3836f35dcbab09eef663eea..8bec6b67f52af5e52c671d94cc26ffad425244aa 100644 (file)
--- a/src/net.c
+++ b/src/net.c
@@ -627,7 +627,7 @@ static void periodic_handler(event_loop_t *loop, void *data) {
                        n->status.dirty = false;
                }
 
                        n->status.dirty = false;
                }
 

-               if(n->status.validkey && n->last_req_key + 3600 < mesh->loop.now.tv_sec) {
+               if(n->status.reachable && n->status.validkey && n->last_req_key + 3600 < mesh->loop.now.tv_sec) {

                        logger(mesh, MESHLINK_DEBUG, "SPTPS key renewal for node %s", n->name);
                        devtool_sptps_renewal_probe((meshlink_node_t *)n);
 
                        logger(mesh, MESHLINK_DEBUG, "SPTPS key renewal for node %s", n->name);
                        devtool_sptps_renewal_probe((meshlink_node_t *)n);
 

diff --git a/src/net_packet.c b/src/net_packet.c
index 3ee0eaec4a4be44f6d5ec57ed69ddeb5242d4656..38200e5a1d9a31f05bfe6b63ef86634eb9079374 100644 (file)
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -245,6 +245,11 @@ static bool try_mac(meshlink_handle_t *mesh, node_t *n, const vpn_packet_t *inpk
 }
 
 static void receive_udppacket(meshlink_handle_t *mesh, node_t *n, vpn_packet_t *inpkt) {
 }
 
 static void receive_udppacket(meshlink_handle_t *mesh, node_t *n, vpn_packet_t *inpkt) {

+       if(!n->status.reachable) {
+               logger(mesh, MESHLINK_ERROR, "Got SPTPS data from unreachable node %s", n->name);
+               return;
+       }
+

        if(!n->sptps.state) {
                if(!n->status.waitingforkey) {
                        logger(mesh, MESHLINK_DEBUG, "Got packet from %s but we haven't exchanged keys yet", n->name);
        if(!n->sptps.state) {
                if(!n->status.waitingforkey) {
                        logger(mesh, MESHLINK_DEBUG, "Got packet from %s but we haven't exchanged keys yet", n->name);


@@ -262,6 +267,11 @@ static void receive_udppacket(meshlink_handle_t *mesh, node_t *n, vpn_packet_t *
 }
 
 static void send_sptps_packet(meshlink_handle_t *mesh, node_t *n, vpn_packet_t *origpkt) {
 }
 
 static void send_sptps_packet(meshlink_handle_t *mesh, node_t *n, vpn_packet_t *origpkt) {

+       if(!n->status.reachable) {
+               logger(mesh, MESHLINK_ERROR, "Trying to send SPTPS data to unreachable node %s", n->name);
+               return;
+       }
+

        if(!n->status.validkey) {
                logger(mesh, MESHLINK_INFO, "No valid key known yet for %s", n->name);
 
        if(!n->status.validkey) {
                logger(mesh, MESHLINK_INFO, "No valid key known yet for %s", n->name);
 


@@ -379,6 +389,11 @@ bool send_sptps_data(void *handle, uint8_t type, const void *data, size_t len) {
        node_t *to = handle;
        meshlink_handle_t *mesh = to->mesh;
 
        node_t *to = handle;
        meshlink_handle_t *mesh = to->mesh;
 

+       if(!to->status.reachable) {
+               logger(mesh, MESHLINK_ERROR, "Trying to send SPTPS data to unreachable node %s", to->name);
+               return false;
+       }
+

        /* Send it via TCP if it is a handshake packet, TCPOnly is in use, or this packet is larger than the MTU. */
 
        if(type >= SPTPS_HANDSHAKE || (type != PKT_PROBE && (len - 21) > to->minmtu)) {
        /* Send it via TCP if it is a handshake packet, TCPOnly is in use, or this packet is larger than the MTU. */
 
        if(type >= SPTPS_HANDSHAKE || (type != PKT_PROBE && (len - 21) > to->minmtu)) {