Remove references to port 655 from MeshLink.

[meshlink] / src / net_setup.c

diff --git a/src/net_setup.c b/src/net_setup.c
index 69b6e86a10460492e62d4b49e56c0cdfa0cee66f..1c468b78d7f8d19316bfb918194c1181bb3a2ba4 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];
 
@@ -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(DEBUG_ALWAYS, LOG_ERR, "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(DEBUG_ALWAYS, LOG_ERR, "Port for MeshLink instance required!");
+               return false;
+       }
 
        mesh->self->connection->options = 0;
        mesh->self->connection->protocol_major = PROT_MAJOR;
@@ -333,7 +332,6 @@ 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;
@@ -343,11 +341,6 @@ bool setup_myself(meshlink_handle_t *mesh) {
                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)