Merge branch 'discovery' into everbase

[meshlink] / src / net_setup.c

diff --git a/src/net_setup.c b/src/net_setup.c
index ce9a59ad230b0723e5bafeed12f312fed629b4a5..1c468b78d7f8d19316bfb918194c1181bb3a2ba4 100644 (file)
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -279,8 +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");
+       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;
@@ -339,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);