X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeshlink.c;h=d9bd0146e94cedaf4b6dc5967e28f6a4f00483c9;hb=eba5b30f09f91d95c56efb8f1d8613152c176856;hp=aa29ce8984bac86c3cbc92955793d4c6837953c6;hpb=a27bebb24d4072ef66d8640a3c988f1b883e309e;p=meshlink diff --git a/src/meshlink.c b/src/meshlink.c index aa29ce89..d9bd0146 100644 --- a/src/meshlink.c +++ b/src/meshlink.c @@ -1693,14 +1693,10 @@ static void *meshlink_main_loop(void *arg) { #endif // HAVE_SETNS } -#if HAVE_CATTA - if(mesh->discovery) { discovery_start(mesh); } -#endif - if(pthread_mutex_lock(&mesh->mutex) != 0) { abort(); } @@ -1712,15 +1708,11 @@ static void *meshlink_main_loop(void *arg) { pthread_mutex_unlock(&mesh->mutex); -#if HAVE_CATTA - // Stop discovery if(mesh->discovery) { discovery_stop(mesh); } -#endif - return NULL; } @@ -4554,8 +4546,6 @@ void handle_duplicate_node(meshlink_handle_t *mesh, node_t *n) { } void meshlink_enable_discovery(meshlink_handle_t *mesh, bool enable) { -#if HAVE_CATTA - if(!mesh) { meshlink_errno = MESHLINK_EINVAL; return; @@ -4581,11 +4571,6 @@ void meshlink_enable_discovery(meshlink_handle_t *mesh, bool enable) { end: pthread_mutex_unlock(&mesh->mutex); -#else - (void)mesh; - (void)enable; - meshlink_errno = MESHLINK_ENOTSUP; -#endif } void meshlink_set_dev_class_timeouts(meshlink_handle_t *mesh, dev_class_t devclass, int pinginterval, int pingtimeout) {