X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fdiscovery.c;h=d4790c43f8292020d352606fa23e2cfef78566a5;hb=8e4f6238558c28cd05bd580cc947d7178d2bac90;hp=6b98a2768f178de342533e2574c060bb55b880a4;hpb=1e2076334fd067db863956c7bda77fcbcc9a52fc;p=meshlink diff --git a/src/discovery.c b/src/discovery.c index 6b98a276..d4790c43 100644 --- a/src/discovery.c +++ b/src/discovery.c @@ -126,13 +126,13 @@ static void discovery_server_callback(CattaServer *server, CattaServerState stat case CATTA_SERVER_RUNNING: /* The serve has startup successfully and registered its host * name on the network, so it's time to create our services */ - pthread_mutex_lock(&(mesh->mesh_mutex)); + pthread_mutex_lock(&mesh->mutex); if(!mesh->catta_group) { discovery_create_services(mesh); } - pthread_mutex_unlock(&(mesh->mesh_mutex)); + pthread_mutex_unlock(&mesh->mutex); break; @@ -141,7 +141,7 @@ static void discovery_server_callback(CattaServer *server, CattaServerState stat char hostname[17]; generate_rand_string(mesh, hostname, sizeof(hostname)); - pthread_mutex_lock(&(mesh->mesh_mutex)); + pthread_mutex_lock(&mesh->mutex); assert(mesh->catta_server); assert(mesh->catta_poll); @@ -152,12 +152,12 @@ static void discovery_server_callback(CattaServer *server, CattaServerState stat catta_simple_poll_quit(mesh->catta_poll); } - pthread_mutex_unlock(&(mesh->mesh_mutex)); + pthread_mutex_unlock(&mesh->mutex); } break; case CATTA_SERVER_REGISTERING: - pthread_mutex_lock(&(mesh->mesh_mutex)); + pthread_mutex_lock(&mesh->mutex); /* Let's drop our registered services. When the server is back * in CATTA_SERVER_RUNNING state we will register them @@ -167,12 +167,12 @@ static void discovery_server_callback(CattaServer *server, CattaServerState stat mesh->catta_group = NULL; } - pthread_mutex_unlock(&(mesh->mesh_mutex)); + pthread_mutex_unlock(&mesh->mutex); break; case CATTA_SERVER_FAILURE: - pthread_mutex_lock(&(mesh->mesh_mutex)); + pthread_mutex_lock(&mesh->mutex); assert(mesh->catta_server); assert(mesh->catta_poll); @@ -180,7 +180,7 @@ static void discovery_server_callback(CattaServer *server, CattaServerState stat /* Terminate on failure */ catta_simple_poll_quit(mesh->catta_poll); - pthread_mutex_unlock(&(mesh->mesh_mutex)); + pthread_mutex_unlock(&mesh->mutex); break; case CATTA_SERVER_INVALID: @@ -215,7 +215,7 @@ static void discovery_resolve_callback(CattaSServiceResolver *resolver, CattaIfI char *node_fp = (char *)catta_string_list_get_text(node_fp_li) + strlen(MESHLINK_MDNS_FINGERPRINT_KEY); if(node_name[0] == '=' && node_fp[0] == '=') { - pthread_mutex_lock(&(mesh->mesh_mutex)); + pthread_mutex_lock(&mesh->mutex); node_name += 1; @@ -248,20 +248,22 @@ static void discovery_resolve_callback(CattaSServiceResolver *resolver, CattaIfI } if(naddress.unknown.family != AF_UNKNOWN) { - meshlink_hint_address(mesh, (meshlink_node_t *)node, (struct sockaddr *)&naddress); - node_t *n = (node_t *)node; + connection_t *c = n->connection; + + n->catta_address = naddress; + node_add_recent_address(mesh, n, &naddress); - if(n->connection && n->connection->outgoing) { - n->connection->outgoing->timeout = 0; + if(c && c->outgoing && !c->status.active) { + c->outgoing->timeout = 0; - if(n->connection->outgoing->ev.cb) { - timeout_set(&mesh->loop, &n->connection->outgoing->ev, &(struct timeval) { + if(c->outgoing->ev.cb) { + timeout_set(&mesh->loop, &c->outgoing->ev, &(struct timespec) { 0, 0 }); } - n->connection->last_ping_time = 0; + c->last_ping_time = -3600; } } else { @@ -271,7 +273,7 @@ static void discovery_resolve_callback(CattaSServiceResolver *resolver, CattaIfI logger(mesh, MESHLINK_WARNING, "Node %s is not part of the mesh network.\n", node_name); } - pthread_mutex_unlock(&(mesh->mesh_mutex)); + pthread_mutex_unlock(&mesh->mutex); } } @@ -286,22 +288,22 @@ static void discovery_browse_callback(CattaSServiceBrowser *browser, CattaIfInde /* Called whenever a new services becomes available on the LAN or is removed from the LAN */ switch(event) { case CATTA_BROWSER_FAILURE: - pthread_mutex_lock(&mesh->mesh_mutex); + pthread_mutex_lock(&mesh->mutex); catta_simple_poll_quit(mesh->catta_poll); - pthread_mutex_unlock(&mesh->mesh_mutex); + pthread_mutex_unlock(&mesh->mutex); break; case CATTA_BROWSER_NEW: - pthread_mutex_lock(&mesh->mesh_mutex); + pthread_mutex_lock(&mesh->mutex); catta_s_service_resolver_new(mesh->catta_server, interface_, protocol, name, type, domain, CATTA_PROTO_UNSPEC, 0, discovery_resolve_callback, mesh); handle_network_change(mesh, ++mesh->catta_interfaces); - pthread_mutex_unlock(&mesh->mesh_mutex); + pthread_mutex_unlock(&mesh->mutex); break; case CATTA_BROWSER_REMOVE: - pthread_mutex_lock(&mesh->mesh_mutex); + pthread_mutex_lock(&mesh->mutex); handle_network_change(mesh, --mesh->catta_interfaces); - pthread_mutex_unlock(&mesh->mesh_mutex); + pthread_mutex_unlock(&mesh->mutex); break; case CATTA_BROWSER_ALL_FOR_NOW: @@ -341,6 +343,8 @@ static void *discovery_loop(void *userdata) { meshlink_handle_t *mesh = userdata; assert(mesh); + pthread_mutex_lock(&mesh->discovery_mutex); + // handle catta logs catta_set_log_function(discovery_log_cb); @@ -396,7 +400,7 @@ static void *discovery_loop(void *userdata) { /* Free the configuration data */ catta_server_config_free(&config); - /* Check wether creating the server object succeeded */ + /* Check whether creating the server object succeeded */ if(!mesh->catta_server) { logger(mesh, MESHLINK_ERROR, "Failed to create discovery server: %s\n", catta_strerror(error)); goto fail; @@ -412,7 +416,6 @@ static void *discovery_loop(void *userdata) { fail: - pthread_mutex_lock(&mesh->discovery_mutex); pthread_cond_broadcast(&mesh->discovery_cond); pthread_mutex_unlock(&mesh->discovery_mutex); @@ -459,14 +462,16 @@ bool discovery_start(meshlink_handle_t *mesh) { assert(!mesh->discovery_threadstarted); assert(!mesh->catta_servicetype); + pthread_mutex_lock(&mesh->discovery_mutex); + // Start the discovery thread if(pthread_create(&mesh->discovery_thread, NULL, discovery_loop, mesh) != 0) { + pthread_mutex_unlock(&mesh->discovery_mutex); logger(mesh, MESHLINK_ERROR, "Could not start discovery thread: %s\n", strerror(errno)); memset(&mesh->discovery_thread, 0, sizeof(mesh)->discovery_thread); return false; } - pthread_mutex_lock(&mesh->discovery_mutex); pthread_cond_wait(&mesh->discovery_cond, &mesh->discovery_mutex); pthread_mutex_unlock(&mesh->discovery_mutex);