Code reformatting.

[meshlink] / src / net_setup.c

diff --git a/src/net_setup.c b/src/net_setup.c
index a59632cfec3ff216124c229874c801fa5caf1a2b..10fb37b0005c5df5ae73b35bf33a66a9591796ac 100644 (file)
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -273,15 +273,14 @@ static bool add_listen_address(meshlink_handle_t *mesh, char *address, bool bind
                }
        }
 
-       struct addrinfo *ai, hint = {};
+       struct addrinfo *ai;
 
-       hint.ai_family = addressfamily;
-
-       hint.ai_socktype = SOCK_STREAM;
-
-       hint.ai_protocol = IPPROTO_TCP;
-
-       hint.ai_flags = AI_PASSIVE;
+       struct addrinfo hint = {
+               .ai_family = addressfamily,
+               .ai_socktype = SOCK_STREAM,
+               .ai_protocol = IPPROTO_TCP,
+               .ai_flags = AI_PASSIVE,
+       };
 
        int err = getaddrinfo(address && *address ? address : NULL, port, &hint, &ai);
 
@@ -365,8 +364,13 @@ bool setup_myself(meshlink_handle_t *mesh) {
        read_host_config(mesh, mesh->config, name);
 
        if(!get_config_string(lookup_config(mesh->config, "Port"), &mesh->myport)) {
-               logger(mesh, MESHLINK_ERROR, "Port for MeshLink instance required!");
-               return false;
+               int port = check_port(mesh);
+
+               if(port == 0) {
+                       return false;
+               }
+
+               xasprintf(&mesh->myport, "%d", port);
        }
 
        mesh->self->connection->options = 0;