Merge branch 'discovery' into everbase

[meshlink] / src / meshlink.c

diff --git a/src/meshlink.c b/src/meshlink.c
index d5ea5418e974c398ba181aa131dacf1cdd321df8..79db920b6a9d39eef024f6ee56c692679024925b 100644 (file)
--- a/src/meshlink.c
+++ b/src/meshlink.c
@@ -47,6 +47,8 @@ typedef struct {
 #define MSG_NOSIGNAL 0
 #endif
 
+static pthread_mutex_t global_mutex;
+
 __thread meshlink_errno_t meshlink_errno;
 
 //TODO: this can go away completely
@@ -843,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;
@@ -868,14 +873,14 @@ bool meshlink_start(meshlink_handle_t *mesh) {
 
        mesh->threadstarted=true;
 
-       // Start discovery
-       if(!discovery_start(mesh))
-               return false;
+       discovery_start(mesh);
 
        return true;
 }
 
 void meshlink_stop(meshlink_handle_t *mesh) {
+
+       fprintf(stderr, "meshlink_stop called\n");
        
        if(!mesh) {
                meshlink_errno = MESHLINK_EINVAL;
@@ -1702,7 +1707,6 @@ extern void meshlink_hint_address(meshlink_handle_t *mesh, meshlink_node_t *node
        append_config_file(mesh, node->name, "Address", full_addr_str);
 
 fail:
-done:
        free(addr_str);
        free(port_str);
        free(full_addr_str);