Stop using global variable mesh in net_socket.[ch].

diff --git a/src/meshlink.c b/src/meshlink.c
index b566498551940ba8299d68b31599d736b0b8c717..124b6e8f649731495a3fb65e9c7b0407e789f315 100644 (file)
--- a/src/meshlink.c
+++ b/src/meshlink.c
@@ -213,6 +213,7 @@ meshlink_handle_t *meshlink_open(const char *confbase, const char *name) {
        mesh->confbase = xstrdup(confbase);
        mesh->name = xstrdup(name);
        event_loop_init(&mesh->loop);
+       mesh->loop.data = mesh;
        set_mesh(mesh);
 
        // TODO: should be set by a function.
@@ -252,7 +253,7 @@ meshlink_handle_t *meshlink_open(const char *confbase, const char *name) {
 void *meshlink_main_loop(void *arg) {
        meshlink_handle_t *mesh = arg;
 
-       try_outgoing_connections();
+       try_outgoing_connections(mesh);
 
        main_loop();
 

diff --git a/src/net.c b/src/net.c
index d271a3466c08bbd721873bcddbfe0bfb711391c8..f543c207259c049d0886e75120304deecc405a69 100644 (file)
--- a/src/net.c
+++ b/src/net.c
@@ -105,7 +105,7 @@ void terminate_connection(connection_t *c, bool report) {
        /* Check if this was our outgoing connection */
 
        if(outgoing)
-               do_outgoing_connection(outgoing);
+               do_outgoing_connection(mesh, outgoing);
 
 #ifndef HAVE_MINGW
        /* Clean up dead proxy processes */
@@ -208,7 +208,7 @@ static void periodic_handler(event_loop_t *loop, void *data) {
                                        outgoing_t *outgoing = xzalloc(sizeof *outgoing);
                                        outgoing->name = xstrdup(n->name);
                                        list_insert_tail(mesh->outgoings, outgoing);
-                                       setup_outgoing_connection(outgoing);
+                                       setup_outgoing_connection(mesh, outgoing);
                                }
                                break;
                        }
@@ -290,7 +290,7 @@ int reload_configuration(void) {
 
        /* Try to make outgoing connections */
 
-       try_outgoing_connections();
+       try_outgoing_connections(mesh);
 
        /* Close connections to hosts that have a changed or deleted host config file */
 

diff --git a/src/net.h b/src/net.h
index 524a52e646946f586121bacfb13d2ecdd527c495..2346149d7827cc3ad4ba77a01a9281156ac68748 100644 (file)
--- a/src/net.h
+++ b/src/net.h
@@ -81,13 +81,13 @@ extern int autoconnect;
 #include "connection.h"
 #include "node.h"
 
-extern void retry_outgoing(outgoing_t *);
+extern void retry_outgoing(struct meshlink_handle *mesh, outgoing_t *);
 extern void handle_incoming_vpn_data(struct event_loop_t *loop, void *, int);
-extern void finish_connecting(struct connection_t *);
-extern bool do_outgoing_connection(struct outgoing_t *);
+extern void finish_connecting(struct meshlink_handle *mesh, struct connection_t *);
+extern bool do_outgoing_connection(struct meshlink_handle *mesh, struct outgoing_t *);
 extern void handle_new_meta_connection(struct event_loop_t *loop, void *, int);
 extern int setup_listen_socket(const sockaddr_t *);
-extern int setup_vpn_in_socket(const sockaddr_t *);
+extern int setup_vpn_in_socket(struct meshlink_handle *mesh, const sockaddr_t *);
 extern bool send_sptps_data(void *handle, uint8_t type, const char *data, size_t len);
 extern bool receive_sptps_record(void *handle, uint8_t type, const char *data, uint16_t len);
 extern void send_packet(struct node_t *, struct vpn_packet_t *);
@@ -96,8 +96,8 @@ extern void broadcast_packet(const struct node_t *, struct vpn_packet_t *);
 extern char *get_name(struct meshlink_handle *mesh);
 extern bool setup_myself_reloadable(struct meshlink_handle *mesh);
 extern bool setup_network(struct meshlink_handle *mesh);
-extern void setup_outgoing_connection(struct outgoing_t *);
-extern void try_outgoing_connections(void);
+extern void setup_outgoing_connection(struct meshlink_handle *mesh, struct outgoing_t *);
+extern void try_outgoing_connections(struct meshlink_handle * mesh);
 extern void close_network_connections(void);
 extern int main_loop(void);
 extern void terminate_connection(struct connection_t *, bool);

diff --git a/src/net_setup.c b/src/net_setup.c
index 1ebacffa5863e84a98e553fdfdb9c94630a416c2..02e90aefe078191777c7b29f19d2c91749af19aa 100644 (file)
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -236,7 +236,7 @@ static bool add_listen_address(meshlink_handle_t *mesh, char *address, bool bind
                if(tcp_fd < 0)
                        continue;
 
-               int udp_fd = setup_vpn_in_socket((sockaddr_t *) aip->ai_addr);
+               int udp_fd = setup_vpn_in_socket(mesh, (sockaddr_t *) aip->ai_addr);
 
                if(tcp_fd < 0) {
                        close(tcp_fd);

diff --git a/src/net_socket.c b/src/net_socket.c
index 842704998e2cbba7e177dd9da6c390ddd9a83b77..4ef7eb0c9aa0ebaf6ccaa16411d67c41bfe38c79 100644 (file)
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -70,7 +70,7 @@ static void configure_tcp(connection_t *c) {
 #endif
 }
 
-static bool bind_to_address(connection_t *c) {
+static bool bind_to_address(meshlink_handle_t *mesh, connection_t *c) {
        int s = -1;
 
        for(int i = 0; i < mesh->listen_sockets && mesh->listen_socket[i].bindto; i++) {
@@ -142,7 +142,7 @@ int setup_listen_socket(const sockaddr_t *sa) {
        return nfd;
 }
 
-int setup_vpn_in_socket(const sockaddr_t *sa) {
+int setup_vpn_in_socket(meshlink_handle_t *mesh, const sockaddr_t *sa) {
        int nfd;
        char *addrstr;
        int option;
@@ -233,10 +233,12 @@ int setup_vpn_in_socket(const sockaddr_t *sa) {
 } /* int setup_vpn_in_socket */
 
 static void retry_outgoing_handler(event_loop_t *loop, void *data) {
-       setup_outgoing_connection(data);
+       meshlink_handle_t *mesh = loop->data;
+       outgoing_t *outgoing = data;
+       setup_outgoing_connection(mesh, outgoing);
 }
 
-void retry_outgoing(outgoing_t *outgoing) {
+void retry_outgoing(meshlink_handle_t *mesh, outgoing_t *outgoing) {
        outgoing->timeout += 5;
 
        if(outgoing->timeout > mesh->maxtimeout)
@@ -247,7 +249,7 @@ void retry_outgoing(outgoing_t *outgoing) {
        logger(DEBUG_CONNECTIONS, LOG_NOTICE, "Trying to re-establish outgoing connection in %d seconds", outgoing->timeout);
 }
 
-void finish_connecting(connection_t *c) {
+void finish_connecting(meshlink_handle_t *mesh, connection_t *c) {
        logger(DEBUG_CONNECTIONS, LOG_INFO, "Connected to %s (%s)", c->name, c->hostname);
 
        c->last_ping_time = mesh->loop.now.tv_sec;
@@ -256,7 +258,7 @@ void finish_connecting(connection_t *c) {
        send_id(c);
 }
 
-static void do_outgoing_pipe(connection_t *c, char *command) {
+static void do_outgoing_pipe(meshlink_handle_t *mesh, connection_t *c, char *command) {
 #ifndef HAVE_MINGW
        int fd[2];
 
@@ -302,7 +304,7 @@ static void do_outgoing_pipe(connection_t *c, char *command) {
 #endif
 }
 
-static void handle_meta_write(connection_t *c) {
+static void handle_meta_write(meshlink_handle_t *mesh, connection_t *c) {
        if(c->outbuf.len <= c->outbuf.offset)
                return;
 
@@ -327,6 +329,7 @@ static void handle_meta_write(connection_t *c) {
 }
 
 static void handle_meta_io(event_loop_t *loop, void *data, int flags) {
+       meshlink_handle_t *mesh = loop->data;
        connection_t *c = data;
 
        if(c->status.connecting) {
@@ -337,7 +340,7 @@ static void handle_meta_io(event_loop_t *loop, void *data, int flags) {
                getsockopt(c->socket, SOL_SOCKET, SO_ERROR, (void *)&result, &len);
 
                if(!result)
-                       finish_connecting(c);
+                       finish_connecting(mesh, c);
                else {
                        logger(DEBUG_CONNECTIONS, LOG_DEBUG, "Error while connecting to %s (%s): %s", c->name, c->hostname, sockstrerror(result));
                        terminate_connection(c, false);
@@ -346,12 +349,12 @@ static void handle_meta_io(event_loop_t *loop, void *data, int flags) {
        }
 
        if(flags & IO_WRITE)
-               handle_meta_write(c);
+               handle_meta_write(mesh, c);
        else
                handle_meta_connection_data(c);
 }
 
-bool do_outgoing_connection(outgoing_t *outgoing) {
+bool do_outgoing_connection(meshlink_handle_t *mesh, outgoing_t *outgoing) {
        char *address, *port, *space;
        struct addrinfo *proxyai = NULL;
        int result;
@@ -360,7 +363,7 @@ begin:
        if(!outgoing->ai) {
                if(!outgoing->cfg) {
                        logger(DEBUG_CONNECTIONS, LOG_ERR, "Could not set up a meta connection to %s", outgoing->name);
-                       retry_outgoing(outgoing);
+                       retry_outgoing(mesh, outgoing);
                        return false;
                }
 
@@ -405,7 +408,7 @@ begin:
                c->socket = socket(c->address.sa.sa_family, SOCK_STREAM, IPPROTO_TCP);
                configure_tcp(c);
        } else if(mesh->proxytype == PROXY_EXEC) {
-               do_outgoing_pipe(c, mesh->proxyhost);
+               do_outgoing_pipe(mesh, c, mesh->proxyhost);
        } else {
                proxyai = str2addrinfo(mesh->proxyhost, mesh->proxyport, SOCK_STREAM);
                if(!proxyai) {
@@ -434,7 +437,7 @@ begin:
                        setsockopt(c->socket, SOL_IPV6, IPV6_V6ONLY, (void *)&option, sizeof option);
 #endif
 
-               bind_to_address(c);
+               bind_to_address(mesh, c);
        }
 
        /* Connect */
@@ -502,7 +505,7 @@ static struct addrinfo *get_known_addresses(node_t *n) {
        return ai;
 }
 
-void setup_outgoing_connection(outgoing_t *outgoing) {
+void setup_outgoing_connection(meshlink_handle_t *mesh, outgoing_t *outgoing) {
        timeout_del(&mesh->loop, &outgoing->ev);
 
        node_t *n = lookup_node(outgoing->name);
@@ -527,7 +530,7 @@ void setup_outgoing_connection(outgoing_t *outgoing) {
                }
        }
 
-       do_outgoing_connection(outgoing);
+       do_outgoing_connection(mesh, outgoing);
 }
 
 /*
@@ -535,6 +538,7 @@ void setup_outgoing_connection(outgoing_t *outgoing) {
   new connection
 */
 void handle_new_meta_connection(event_loop_t *loop, void *data, int flags) {
+       meshlink_handle_t *mesh = loop->data;
        listen_socket_t *l = data;
        connection_t *c;
        sockaddr_t sa;
@@ -622,7 +626,7 @@ void handle_new_meta_connection(event_loop_t *loop, void *data, int flags) {
        send_id(c);
 }
 
-static void free_outgoing(outgoing_t *outgoing) {
+static void free_outgoing(meshlink_handle_t *mesh, outgoing_t *outgoing) {
        timeout_del(&mesh->loop, &outgoing->ev);
 
        if(outgoing->ai)
@@ -637,7 +641,7 @@ static void free_outgoing(outgoing_t *outgoing) {
        free(outgoing);
 }
 
-void try_outgoing_connections(void) {
+void try_outgoing_connections(meshlink_handle_t *mesh) {
        /* If there is no outgoing list yet, create one. Otherwise, mark all outgoings as deleted. */
 
        if(!mesh->outgoings) {
@@ -676,7 +680,7 @@ void try_outgoing_connections(void) {
                        outgoing_t *outgoing = xzalloc(sizeof *outgoing);
                        outgoing->name = name;
                        list_insert_tail(mesh->outgoings, outgoing);
-                       setup_outgoing_connection(outgoing);
+                       setup_outgoing_connection(mesh, outgoing);
                }
        }