Remove global variable "now".

[meshlink] / src / net_setup.c

diff --git a/src/net_setup.c b/src/net_setup.c
index e168f6acd4d8a7416378ea0d962821ed730d2060..ba17b099abcf80a06d09893edf02fc2d05b70469 100644 (file)
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -82,11 +82,10 @@ bool read_ecdsa_public_key(connection_t *c) {
 
 static bool read_ecdsa_private_key(void) {
        FILE *fp;
-       char *fname;
+       char filename[PATH_MAX];
 
-       xasprintf(&fname, "%s" SLASH "ecdsa_key.priv", mesh->confbase);
-       fp = fopen(fname, "r");
-       free(fname);
+       snprintf(filename,PATH_MAX, "%s" SLASH "ecdsa_key.priv", mesh->confbase);
+       fp = fopen(filename, "r");
 
        if(!fp) {
                logger(DEBUG_ALWAYS, LOG_ERR, "Error reading ECDSA private key file: %s", strerror(errno));
@@ -104,38 +103,36 @@ static bool read_ecdsa_private_key(void) {
 
 static bool read_invitation_key(void) {
        FILE *fp;
-       char *fname;
+       char filename[PATH_MAX];
 
        if(mesh->invitation_key) {
                ecdsa_free(mesh->invitation_key);
                mesh->invitation_key = NULL;
        }
 
-       xasprintf(&fname, "%s" SLASH "invitations" SLASH "ecdsa_key.priv", mesh->confbase);
+       snprintf(filename,PATH_MAX, "%s" SLASH "invitations" SLASH "ecdsa_key.priv", mesh->confbase);
 
-       fp = fopen(fname, "r");
+       fp = fopen(filename, "r");
 
        if(fp) {
                mesh->invitation_key = ecdsa_read_pem_private_key(fp);
                fclose(fp);
                if(!mesh->invitation_key)
-                       logger(DEBUG_ALWAYS, LOG_ERR, "Reading ECDSA private key file `%s' failed: %s", fname, strerror(errno));
+                       logger(DEBUG_ALWAYS, LOG_ERR, "Reading ECDSA private key file `%s' failed: %s", filename, strerror(errno));
        }
 
-       free(fname);
        return mesh->invitation_key;
 }
 
 void load_all_nodes(void) {
        DIR *dir;
        struct dirent *ent;
-       char *dname;
+       char dname[PATH_MAX];
 
-       xasprintf(&dname, "%s" SLASH "hosts", mesh->confbase);
+       snprintf(dname,PATH_MAX, "%s" SLASH "hosts", mesh->confbase);
        dir = opendir(dname);
        if(!dir) {
                logger(DEBUG_ALWAYS, LOG_ERR, "Could not open %s: %s", dname, strerror(errno));
-               free(dname);
                return;
        }
 
@@ -246,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);
@@ -325,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();
@@ -356,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;
 }
@@ -400,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);
        }