Correctly remove all duplicates when having many hostnames in an invitation URL.

[meshlink] / src / net.c

diff --git a/src/net.c b/src/net.c
index b9f441a0d0b9b774d3ab7fb914395dca3b9ba9d5..304c62683b4e5faa2c50a3f675ad47051258ee57 100644 (file)
--- a/src/net.c
+++ b/src/net.c
@@ -118,6 +118,10 @@ static void timeout_handler(event_loop_t *loop, void *data) {
                int pingtimeout = c->node ? mesh->dev_class_traits[c->node->devclass].pingtimeout : default_timeout;
                int pinginterval = c->node ? mesh->dev_class_traits[c->node->devclass].pinginterval : default_interval;
 
+               if(c->outgoing && c->outgoing->timeout < 5) {
+                       pingtimeout = 1;
+               }
+
                // Also make sure that if outstanding key requests for the UDP counterpart of a connection has timed out, we restart it.
                if(c->node) {
                        if(c->node->status.waitingforkey && c->node->last_req_key + pingtimeout <= mesh->loop.now.tv_sec) {
@@ -148,7 +152,7 @@ static void timeout_handler(event_loop_t *loop, void *data) {
        }
 
        timeout_set(&mesh->loop, data, &(struct timeval) {
-               default_timeout, prng(mesh, TIMER_FUDGE)
+               1, prng(mesh, TIMER_FUDGE)
        });
 }
 
@@ -635,11 +639,6 @@ void retry(meshlink_handle_t *mesh) {
                });
        }
 
-#ifdef HAVE_IFADDRS_H
-       struct ifaddrs *ifa = NULL;
-       getifaddrs(&ifa);
-#endif
-
        /* For active connections, check if their addresses are still valid.
         * If yes, reset their ping timers, otherwise terminate them. */
        for list_each(connection_t, c, mesh->connections) {
@@ -651,12 +650,6 @@ void retry(meshlink_handle_t *mesh) {
                        c->last_ping_time = 0;
                }
 
-#ifdef HAVE_IFADDRS_H
-
-               if(!ifa) {
-                       continue;
-               }
-
                sockaddr_t sa;
                socklen_t salen = sizeof(sa);
 
@@ -664,32 +657,33 @@ void retry(meshlink_handle_t *mesh) {
                        continue;
                }
 
-               bool found = false;
+               switch(sa.sa.sa_family) {
+               case AF_INET:
+                       sa.in.sin_port = 0;
+                       break;
 
-               for(struct ifaddrs *ifap = ifa; ifap; ifap = ifap->ifa_next) {
-                       if(ifap->ifa_addr && !sockaddrcmp_noport(&sa, (sockaddr_t *)ifap->ifa_addr)) {
-                               found = true;
-                               break;
-                       }
+               case AF_INET6:
+                       sa.in6.sin6_port = 0;
+                       break;
+
+               default:
+                       continue;
+               }
+
+               int sock = socket(sa.sa.sa_family, SOCK_STREAM, IPPROTO_TCP);
 
+               if(sock != -1) {
+                       continue;
                }
 
-               if(!found) {
+               if(bind(sock, &sa.sa, salen) && errno == EADDRNOTAVAIL) {
                        logger(mesh, MESHLINK_DEBUG, "Local address for connection to %s no longer valid, terminating", c->name);
                        terminate_connection(mesh, c, c->status.active);
                }
 
-#endif
-       }
-
-#ifdef HAVE_IFADDRS_H
-
-       if(ifa) {
-               freeifaddrs(ifa);
+               closesocket(sock);
        }
 
-#endif
-
        /* Kick the ping timeout handler */
        timeout_set(&mesh->loop, &mesh->pingtimer, &(struct timeval) {
                0, 0
@@ -701,7 +695,7 @@ void retry(meshlink_handle_t *mesh) {
 */
 void main_loop(meshlink_handle_t *mesh) {
        timeout_add(&mesh->loop, &mesh->pingtimer, timeout_handler, &mesh->pingtimer, &(struct timeval) {
-               default_timeout, prng(mesh, TIMER_FUDGE)
+               1, prng(mesh, TIMER_FUDGE)
        });
        timeout_add(&mesh->loop, &mesh->periodictimer, periodic_handler, &mesh->periodictimer, &(struct timeval) {
                0, 0