Merge remote-tracking branch 'origin/everbase' into discovery

[meshlink] / src / meshlink.c

diff --git a/src/meshlink.c b/src/meshlink.c
index 9fc80153d48210b0cbb60f7c7793b673c4e090cd..f9e7e9054d291c308b6987a6d4460794e6c030f7 100644 (file)
--- a/src/meshlink.c
+++ b/src/meshlink.c
@@ -39,6 +39,7 @@ typedef struct {
 #include "utils.h"
 #include "xalloc.h"
 #include "ed25519/sha512.h"
+#include "discovery.h"
 
 #ifndef MSG_NOSIGNAL
 #define MSG_NOSIGNAL 0
@@ -858,6 +859,10 @@ bool meshlink_start(meshlink_handle_t *mesh) {
 
        mesh->threadstarted=true;
 
+       // Start discovery
+       if(!discovery_start(mesh))
+               return false;
+
        return true;
 }
 
@@ -867,6 +872,9 @@ void meshlink_stop(meshlink_handle_t *mesh) {
                return;
        }
 
+       // Stop discovery
+       discovery_stop(mesh);
+
        // Shut down the listening sockets to signal the main thread to shut down
 
        for(int i = 0; i < mesh->listen_sockets; i++) {