Remove global variable "now".

[meshlink] / src / net_setup.c

diff --git a/src/net_setup.c b/src/net_setup.c
index 7fa7b98e975e56dbf7d91f7af290098dee4b569e..ba17b099abcf80a06d09893edf02fc2d05b70469 100644 (file)
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -243,8 +243,8 @@ static bool add_listen_address(char *address, bool bindto) {
                        continue;
                }
 
-               io_add(&mesh->listen_socket[mesh->listen_sockets].tcp, handle_new_meta_connection, &mesh->listen_socket[mesh->listen_sockets], tcp_fd, IO_READ);
-               io_add(&mesh->listen_socket[mesh->listen_sockets].udp, handle_incoming_vpn_data, &mesh->listen_socket[mesh->listen_sockets], udp_fd, IO_READ);
+               io_add(&mesh->loop, &mesh->listen_socket[mesh->listen_sockets].tcp, handle_new_meta_connection, &mesh->listen_socket[mesh->listen_sockets], tcp_fd, IO_READ);
+               io_add(&mesh->loop, &mesh->listen_socket[mesh->listen_sockets].udp, handle_incoming_vpn_data, &mesh->listen_socket[mesh->listen_sockets], udp_fd, IO_READ);
 
                if(mesh->debug_level >= DEBUG_CONNECTIONS) {
                        char *hostname = sockaddr2hostname((sockaddr_t *) aip->ai_addr);
@@ -322,7 +322,7 @@ bool setup_myself(void) {
        mesh->self->nexthop = mesh->self;
        mesh->self->via = mesh->self;
        mesh->self->status.reachable = true;
-       mesh->self->last_state_change = now.tv_sec;
+       mesh->self->last_state_change = mesh->loop.now.tv_sec;
        node_add(mesh->self);
 
        graph();
@@ -353,7 +353,7 @@ bool setup_myself(void) {
 
        /* Done. */
 
-       mesh->last_config_check = now.tv_sec;
+       mesh->last_config_check = mesh->loop.now.tv_sec;
 
        return true;
 }
@@ -397,8 +397,8 @@ void close_network_connections(void) {
        }
 
        for(int i = 0; i < mesh->listen_sockets; i++) {
-               io_del(&mesh->listen_socket[i].tcp);
-               io_del(&mesh->listen_socket[i].udp);
+               io_del(&mesh->loop, &mesh->listen_socket[i].tcp);
+               io_del(&mesh->loop, &mesh->listen_socket[i].udp);
                close(mesh->listen_socket[i].tcp.fd);
                close(mesh->listen_socket[i].udp.fd);
        }