Merge branch 'master' into testing/invitations

[meshlink] / src / meshlink.c

diff --git a/src/meshlink.c b/src/meshlink.c
index e5982721d533aadd2cafb8e775f6dcb7b1555916..c703ddbe6da3bb205ecff27b67bde3fcbe3a62db 100644 (file)
--- a/src/meshlink.c
+++ b/src/meshlink.c
@@ -773,11 +773,6 @@ meshlink_handle_t *meshlink_open(const char *confbase, const char *name) {
        WSAStartup(MAKEWORD(2, 2), &wsa_state);
 #endif
 
-       // Setup up everything
-       // TODO: we should not open listening sockets yet
-
-       if(!setup_network(mesh))
-               return meshlink_close(mesh), NULL;
 
        return mesh;
 }
@@ -800,6 +795,10 @@ bool meshlink_start(meshlink_handle_t *mesh) {
                fprintf(stderr, "No name given!\n");
                return false;
        }
+       // Setup up everything
+
+       if(!setup_network(mesh))
+               return meshlink_close(mesh), NULL;
 
        // Start the main thread