Don't use assert() to check the results of pthread_*() calls.

[meshlink] / src / net_socket.c

diff --git a/src/net_socket.c b/src/net_socket.c
index 30ff016917bee18e4383fbe5b420fdaa01b66f6f..a692313958850a0f1b87db3bb313930684cb59b9 100644 (file)
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -19,6 +19,7 @@
 
 #include "system.h"
 
+#include "adns.h"
 #include "conf.h"
 #include "connection.h"
 #include "list.h"
@@ -70,6 +71,11 @@ static void configure_tcp(connection_t *c) {
        int lowdelay = IPTOS_LOWDELAY;
        setsockopt(c->socket, IPPROTO_IP, IP_TOS, (void *)&lowdelay, sizeof(lowdelay));
 #endif
+
+#if defined(SO_NOSIGPIPE)
+       int nosigpipe = 1;
+       setsockopt(c->socket, SOL_SOCKET, SO_NOSIGPIPE, (void *)&nosigpipe, sizeof(nosigpipe));
+#endif
 }
 
 static void retry_outgoing_handler(event_loop_t *loop, void *data) {
@@ -87,8 +93,10 @@ void retry_outgoing(meshlink_handle_t *mesh, outgoing_t *outgoing) {
                outgoing->timeout += 5;
        }
 
-       if(outgoing->timeout > mesh->maxtimeout) {
-               outgoing->timeout = mesh->maxtimeout;
+       int maxtimeout = mesh->dev_class_traits[outgoing->node->devclass].maxtimeout;
+
+       if(outgoing->timeout > maxtimeout) {
+               outgoing->timeout = maxtimeout;
        }
 
        timeout_add(&mesh->loop, &outgoing->ev, retry_outgoing_handler, outgoing, &(struct timespec) {
@@ -240,25 +248,26 @@ static void free_known_addresses(struct addrinfo *ai) {
        }
 }
 
-static struct addrinfo *get_canonical_address(node_t *n) {
-       if(!n->canonical_address) {
-               return false;
-       }
-
-       char *address = xstrdup(n->canonical_address);
-       char *port = strchr(address, ' ');
+static void canonical_resolve_cb(meshlink_handle_t *mesh, char *host, char *serv, void *data, struct addrinfo *ai, int err) {
+       (void)serv;
+       (void)err;
+       node_t *n = data;
+
+       free(host);
+       free(serv);
+
+       for list_each(outgoing_t, outgoing, mesh->outgoings) {
+               if(outgoing->node == n) {
+                       if(outgoing->state == OUTGOING_CANONICAL_RESOLVE) {
+                               outgoing->ai = ai;
+                               outgoing->aip = NULL;
+                               outgoing->state = OUTGOING_CANONICAL;
+                               do_outgoing_connection(mesh, outgoing);
+                       }
 
-       if(!port) {
-               free(address);
-               return false;
+                       return;
+               }
        }
-
-       *port++ = 0;
-
-       struct addrinfo *ai = str2addrinfo(address, port, SOCK_STREAM);
-       free(address);
-
-       return ai;
 }
 
 static bool get_next_outgoing_address(meshlink_handle_t *mesh, outgoing_t *outgoing) {
@@ -268,12 +277,34 @@ static bool get_next_outgoing_address(meshlink_handle_t *mesh, outgoing_t *outgo
 
        if(outgoing->state == OUTGOING_START) {
                start = true;
-               outgoing->state = OUTGOING_CANONICAL;
+               outgoing->state = OUTGOING_CANONICAL_RESOLVE;
+       }
+
+       if(outgoing->state == OUTGOING_CANONICAL_RESOLVE) {
+               node_t *n = outgoing->node;
+
+               if(n->canonical_address) {
+                       char *address = xstrdup(n->canonical_address);
+                       char *port = strchr(address, ' ');
+
+                       if(port) {
+                               *port++ = 0;
+                               port = xstrdup(port);
+                               adns_queue(mesh, address, port, canonical_resolve_cb, outgoing->node, 2);
+                               return false;
+                       } else {
+                               logger(mesh, MESHLINK_ERROR, "Canonical address for %s is missing port number", n->name);
+                               free(address);
+                               outgoing->state = OUTGOING_RECENT;
+                       }
+
+               } else {
+                       outgoing->state = OUTGOING_RECENT;
+               }
        }
 
        if(outgoing->state == OUTGOING_CANONICAL) {
                if(!outgoing->aip) {
-                       outgoing->ai = get_canonical_address(outgoing->node);
                        outgoing->aip = outgoing->ai;
                } else {
                        outgoing->aip = outgoing->aip->ai_next;
@@ -283,7 +314,10 @@ static bool get_next_outgoing_address(meshlink_handle_t *mesh, outgoing_t *outgo
                        return true;
                }
 
-               freeaddrinfo(outgoing->ai);
+               if(outgoing->ai) {
+                       freeaddrinfo(outgoing->ai);
+               }
+
                outgoing->ai = NULL;
                outgoing->aip = NULL;
                outgoing->state = OUTGOING_RECENT;
@@ -336,7 +370,9 @@ void do_outgoing_connection(meshlink_handle_t *mesh, outgoing_t *outgoing) {
 begin:
 
        if(!get_next_outgoing_address(mesh, outgoing)) {
-               if(outgoing->state == OUTGOING_NO_KNOWN_ADDRESSES) {
+               if(outgoing->state == OUTGOING_CANONICAL_RESOLVE) {
+                       /* We are waiting for a callback from the ADNS thread */
+               } else if(outgoing->state == OUTGOING_NO_KNOWN_ADDRESSES) {
                        logger(mesh, MESHLINK_ERROR, "No known addresses for %s", outgoing->node->name);
                } else {
                        logger(mesh, MESHLINK_ERROR, "Could not set up a meta connection to %s", outgoing->node->name);