Move outgoing_list to mesh->outgoings.

[meshlink] / src / net.c

diff --git a/src/net.c b/src/net.c
index 8b118dde6d860b0012a474fc988ce664ad76364a..98cc8beded0272775c7f4fccdc1c27a730a8244f 100644 (file)
--- a/src/net.c
+++ b/src/net.c
@@ -133,7 +133,7 @@ void terminate_connection(connection_t *c, bool report) {
   and close the connection.
 */
 static void timeout_handler(void *data) {
-       for list_each(connection_t, c, connection_list) {
+       for list_each(connection_t, c, mesh->connections) {
                if(c->last_ping_time + pingtimeout <= now.tv_sec) {
                        if(c->status.active) {
                                if(c->status.pinged) {
@@ -183,7 +183,7 @@ static void periodic_handler(void *data) {
        if(autoconnect && mesh->nodes->count > 1) {
                /* Count number of active connections */
                int nc = 0;
-               for list_each(connection_t, c, connection_list) {
+               for list_each(connection_t, c, mesh->connections) {
                        if(c->status.active)
                                nc++;
                }
@@ -206,7 +206,7 @@ static void periodic_handler(void *data) {
 
                                bool found = false;
 
-                               for list_each(outgoing_t, outgoing, outgoing_list) {
+                               for list_each(outgoing_t, outgoing, mesh->outgoings) {
                                        if(!strcmp(outgoing->name, n->name)) {
                                                found = true;
                                                break;
@@ -217,7 +217,7 @@ static void periodic_handler(void *data) {
                                        logger(DEBUG_CONNECTIONS, LOG_INFO, "Autoconnecting to %s", n->name);
                                        outgoing_t *outgoing = xzalloc(sizeof *outgoing);
                                        outgoing->name = xstrdup(n->name);
-                                       list_insert_tail(outgoing_list, outgoing);
+                                       list_insert_tail(mesh->outgoings, outgoing);
                                        setup_outgoing_connection(outgoing);
                                }
                                break;
@@ -230,7 +230,7 @@ static void periodic_handler(void *data) {
                        int r = rand() % nc;
                        int i = 0;
 
-                       for list_each(connection_t, c, connection_list) {
+                       for list_each(connection_t, c, mesh->connections) {
                                if(!c->status.active)
                                        continue;
 
@@ -241,7 +241,7 @@ static void periodic_handler(void *data) {
                                        break;
 
                                logger(DEBUG_CONNECTIONS, LOG_INFO, "Autodisconnecting from %s", c->name);
-                               list_delete(outgoing_list, c->outgoing);
+                               list_delete(mesh->outgoings, c->outgoing);
                                c->outgoing = NULL;
                                terminate_connection(c, c->status.active);
                                break;
@@ -252,9 +252,9 @@ static void periodic_handler(void *data) {
                        /* If we have enough active connections,
                           remove any pending outgoing connections.
                        */
-                       for list_each(outgoing_t, o, outgoing_list) {
+                       for list_each(outgoing_t, o, mesh->outgoings) {
                                bool found = false;
-                               for list_each(connection_t, c, connection_list) {
+                               for list_each(connection_t, c, mesh->connections) {
                                        if(c->outgoing == o) {
                                                found = true;
                                                break;
@@ -262,7 +262,7 @@ static void periodic_handler(void *data) {
                                }
                                if(!found) {
                                        logger(DEBUG_CONNECTIONS, LOG_INFO, "Cancelled outgoing connection to %s", o->name);
-                                       list_delete_node(outgoing_list, node);
+                                       list_delete_node(mesh->outgoings, node);
                                }
                        }
                }
@@ -305,7 +305,7 @@ int reload_configuration(void) {
 
        /* Close connections to hosts that have a changed or deleted host config file */
 
-       for list_each(connection_t, c, connection_list) {
+       for list_each(connection_t, c, mesh->connections) {
                xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", confbase, c->name);
                struct stat s;
                if(stat(fname, &s) || s.st_mtime > last_config_check) {
@@ -322,14 +322,14 @@ int reload_configuration(void) {
 
 void retry(void) {
        /* Reset the reconnection timers for all outgoing connections */
-       for list_each(outgoing_t, outgoing, outgoing_list) {
+       for list_each(outgoing_t, outgoing, mesh->outgoings) {
                outgoing->timeout = 0;
                if(outgoing->ev.cb)
                        timeout_set(&outgoing->ev, &(struct timeval){0, 0});
        }
 
        /* Check for outgoing connections that are in progress, and reset their ping timers */
-       for list_each(connection_t, c, connection_list) {
+       for list_each(connection_t, c, mesh->connections) {
                if(c->outgoing && !c->node)
                        c->last_ping_time = 0;
        }