Finish implementation of log callbacks.

[meshlink] / src / net_setup.c

diff --git a/src/net_setup.c b/src/net_setup.c
index 298a1819f9400759f4dd8849e9374c9e7149ffc2..190eafa3b53303402b764ef75143c9a0b80c53c4 100644 (file)
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -80,7 +80,7 @@ bool read_ecdsa_public_key(meshlink_handle_t *mesh, connection_t *c) {
        return false;
 }
 
-static bool read_ecdsa_private_key(meshlink_handle_t *mesh) {
+bool read_ecdsa_private_key(meshlink_handle_t *mesh) {
        FILE *fp;
        char filename[PATH_MAX];
 
@@ -88,7 +88,7 @@ static bool read_ecdsa_private_key(meshlink_handle_t *mesh) {
        fp = fopen(filename, "r");
 
        if(!fp) {
-               logger(DEBUG_ALWAYS, LOG_ERR, "Error reading ECDSA private key file: %s", strerror(errno));
+               logger(mesh, MESHLINK_ERROR, "Error reading ECDSA private key file: %s", strerror(errno));
                return false;
        }
 
@@ -96,7 +96,7 @@ static bool read_ecdsa_private_key(meshlink_handle_t *mesh) {
        fclose(fp);
 
        if(!mesh->self->connection->ecdsa)
-               logger(DEBUG_ALWAYS, LOG_ERR, "Reading ECDSA private key file failed: %s", strerror(errno));
+               logger(mesh, MESHLINK_ERROR, "Reading ECDSA private key file failed: %s", strerror(errno));
 
        return mesh->self->connection->ecdsa;
 }
@@ -118,13 +118,13 @@ static bool read_invitation_key(meshlink_handle_t *mesh) {
                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", filename, strerror(errno));
+                       logger(mesh, MESHLINK_ERROR, "Reading ECDSA private key file `%s' failed: %s", filename, strerror(errno));
        }
 
        return mesh->invitation_key;
 }
 
-static void load_all_nodes(meshlink_handle_t *mesh) {
+void load_all_nodes(meshlink_handle_t *mesh) {
        DIR *dir;
        struct dirent *ent;
        char dname[PATH_MAX];
@@ -132,7 +132,7 @@ static void load_all_nodes(meshlink_handle_t *mesh) {
        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));
+               logger(mesh, MESHLINK_ERROR, "Could not open %s: %s", dname, strerror(errno));
                return;
        }
 
@@ -162,7 +162,7 @@ char *get_name(meshlink_handle_t *mesh) {
                return NULL;
 
        if(!check_id(name)) {
-               logger(DEBUG_ALWAYS, LOG_ERR, "Invalid name for mesh->self!");
+               logger(mesh, MESHLINK_ERROR, "Invalid name for mesh->self!");
                free(name);
                return NULL;
        }
@@ -209,7 +209,7 @@ static bool add_listen_address(meshlink_handle_t *mesh, char *address, bool bind
        free(address);
 
        if(err || !ai) {
-               logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", "getaddrinfo", err == EAI_SYSTEM ? strerror(err) : gai_strerror(err));
+               logger(mesh, MESHLINK_ERROR, "System call `%s' failed: %s", "getaddrinfo", err == EAI_SYSTEM ? strerror(err) : gai_strerror(err));
                return false;
        }
 
@@ -227,7 +227,7 @@ static bool add_listen_address(meshlink_handle_t *mesh, char *address, bool bind
                        continue;
 
                if(mesh->listen_sockets >= MAXSOCKETS) {
-                       logger(DEBUG_ALWAYS, LOG_ERR, "Too many listening sockets");
+                       logger(mesh, MESHLINK_ERROR, "Too many listening sockets");
                        return false;
                }
 
@@ -246,9 +246,9 @@ static bool add_listen_address(meshlink_handle_t *mesh, char *address, bool bind
                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) {
+               if(mesh->log_level >= MESHLINK_INFO) {
                        char *hostname = sockaddr2hostname((sockaddr_t *) aip->ai_addr);
-                       logger(DEBUG_CONNECTIONS, LOG_NOTICE, "Listening on %s", hostname);
+                       logger(mesh, MESHLINK_INFO, "Listening on %s", hostname);
                        free(hostname);
                }
 
@@ -265,12 +265,11 @@ static bool add_listen_address(meshlink_handle_t *mesh, char *address, bool bind
   Configure node_t mesh->self and set up the local sockets (listen only)
 */
 bool setup_myself(meshlink_handle_t *mesh) {
-       char *name, *hostname, *cipher, *digest, *type;
+       char *name;
        char *address = NULL;
-       bool port_specified = false;
 
        if(!(name = get_name(mesh))) {
-               logger(DEBUG_ALWAYS, LOG_ERR, "Name for tinc daemon required!");
+               logger(mesh, MESHLINK_ERROR, "Name for MeshLink instance required!");
                return false;
        }
 
@@ -280,10 +279,10 @@ bool setup_myself(meshlink_handle_t *mesh) {
        mesh->self->connection->name = xstrdup(name);
        read_host_config(mesh, mesh->config, name);
 
-       if(!get_config_string(lookup_config(mesh->config, "Port"), &mesh->myport))
-               mesh->myport = xstrdup("655");
-       else
-               port_specified = true;
+       if(!get_config_string(lookup_config(mesh->config, "Port"), &mesh->myport)) {
+               logger(mesh, MESHLINK_ERROR, "Port for MeshLink instance required!");
+               return false;
+       }
 
        mesh->self->connection->options = 0;
        mesh->self->connection->protocol_major = PROT_MAJOR;
@@ -333,21 +332,15 @@ bool setup_myself(meshlink_handle_t *mesh) {
        /* Open sockets */
 
        mesh->listen_sockets = 0;
-       int cfgs = 0;
 
        if(!add_listen_address(mesh, address, NULL))
                return false;
 
        if(!mesh->listen_sockets) {
-               logger(DEBUG_ALWAYS, LOG_ERR, "Unable to create any listening socket!");
+               logger(mesh, MESHLINK_ERROR, "Unable to create any listening socket!");
                return false;
        }
 
-       // TODO: require Port to be set? Or use "0" and use getsockname()?
-
-       if(!mesh->myport)
-               mesh->myport = xstrdup("655");
-
        xasprintf(&mesh->self->hostname, "MYSELF port %s", mesh->myport);
        mesh->self->connection->hostname = xstrdup(mesh->self->hostname);
 
@@ -381,11 +374,13 @@ bool setup_network(meshlink_handle_t *mesh) {
   close all open network connections
 */
 void close_network_connections(meshlink_handle_t *mesh) {
-       for(list_node_t *node = mesh->connections->head, *next; node; node = next) {
-               next = node->next;
-               connection_t *c = node->data;
-               c->outgoing = NULL;
-               terminate_connection(mesh, c, false);
+       if(mesh->connections) {
+               for(list_node_t *node = mesh->connections->head, *next; node; node = next) {
+                       next = node->next;
+                       connection_t *c = node->data;
+                       c->outgoing = NULL;
+                       terminate_connection(mesh, c, false);
+               }
        }
 
        if(mesh->outgoings)