Merge branch 'discovery' into everbase

[meshlink] / src / meshlink.c

diff --git a/src/meshlink.c b/src/meshlink.c
index c7a6c0b2f3ad8d3e4fbf982c7a5951c50a4be6a5..79db920b6a9d39eef024f6ee56c692679024925b 100644 (file)
--- a/src/meshlink.c
+++ b/src/meshlink.c
@@ -48,7 +48,6 @@ typedef struct {
 #endif
 
 static pthread_mutex_t global_mutex;
-static bool discovery_started;
 
 __thread meshlink_errno_t meshlink_errno;
 
@@ -846,6 +845,9 @@ static void *meshlink_main_loop(void *arg) {
 }
 
 bool meshlink_start(meshlink_handle_t *mesh) {
+
+       fprintf(stderr, "meshlink_start called\n");
+
        if(!mesh) {
                meshlink_errno = MESHLINK_EINVAL;
                return false;
@@ -871,22 +873,14 @@ bool meshlink_start(meshlink_handle_t *mesh) {
 
        mesh->threadstarted=true;
 
-       // Start discovery
-       // Since only one Avahi instance can run in one program at the moment, make sure we only start one, ignore it otherwise.
-
-       bool discovery_on = false;
-       pthread_mutex_lock(&global_mutex);
-       if(!discovery_started)
-               discovery_on = discovery_started = true;
-       pthread_mutex_unlock(&global_mutex);
-
-       if(discovery_on)
-               discovery_start(mesh);
+       discovery_start(mesh);
 
        return true;
 }
 
 void meshlink_stop(meshlink_handle_t *mesh) {
+
+       fprintf(stderr, "meshlink_stop called\n");
        
        if(!mesh) {
                meshlink_errno = MESHLINK_EINVAL;
@@ -894,14 +888,7 @@ void meshlink_stop(meshlink_handle_t *mesh) {
        }
 
        // Stop discovery
-
-       bool discovery_on = mesh->discovery_threadstarted;
        discovery_stop(mesh);
-       if(discovery_on) {
-               pthread_mutex_lock(&global_mutex);
-               discovery_started = false;
-               pthread_mutex_unlock(&global_mutex);
-       }
 
        // Shut down a listening socket to signal the main thread to shut down