X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fdiscovery.c;h=72ff8bc5b5c6b57adae057e4c6db0fdb8d12d7f2;hb=7b8fe1b56e0fa4258931b3cdba66b6edf0dc6b21;hp=076bddcfd08201db5163636d21f24d604b25cdbd;hpb=5aa1e39a0ff8304e24151d3a69a68737084269e2;p=meshlink

diff --git a/src/discovery.c b/src/discovery.c
index 076bddcf..72ff8bc5 100644
--- a/src/discovery.c
+++ b/src/discovery.c
@@ -78,16 +78,12 @@ static void discovery_create_services(meshlink_handle_t *mesh) {
 	assert(mesh->catta_servicetype != NULL);
 	assert(mesh->self != NULL);
 
-	pthread_mutex_lock(&(mesh->mesh_mutex));
-
 	logger(mesh, MESHLINK_DEBUG, "Adding service\n");
 
 	/* Ifthis is the first time we're called, let's create a new entry group */
-	if(!mesh->catta_group) {
-		if(!(mesh->catta_group = catta_s_entry_group_new(mesh->catta_server, discovery_entry_group_callback, mesh))) {
-			logger(mesh, MESHLINK_ERROR, "catta_entry_group_new() failed: %s\n", catta_strerror(catta_server_errno(mesh->catta_server)));
-			goto fail;
-		}
+	if(!(mesh->catta_group = catta_s_entry_group_new(mesh->catta_server, discovery_entry_group_callback, mesh))) {
+		logger(mesh, MESHLINK_ERROR, "catta_entry_group_new() failed: %s\n", catta_strerror(catta_server_errno(mesh->catta_server)));
+		goto fail;
 	}
 
 	/* Create txt records */
@@ -131,32 +127,41 @@ static void discovery_server_callback(CattaServer *server, CattaServerState stat
 
 	switch(state) {
 	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));
+
 		if(!mesh->catta_group) {
 			discovery_create_services(mesh);
 		}
 
+		pthread_mutex_unlock(&(mesh->mesh_mutex));
+
 		break;
 
 	case CATTA_SERVER_COLLISION: {
+		/* A host name collision happened. Let's pick a new name for the server */
+		char hostname[17];
+		generate_rand_string(hostname, sizeof(hostname));
+
+		pthread_mutex_lock(&(mesh->mesh_mutex));
+		//
 		// asserts
 		assert(mesh->catta_server != NULL);
 		assert(mesh->catta_poll != NULL);
 
-		/* A host name collision happened. Let's pick a new name for the server */
-		char hostname[17];
-		generate_rand_string(hostname, sizeof(hostname));
 		int result = catta_server_set_host_name(mesh->catta_server, hostname);
 
 		if(result < 0) {
 			catta_simple_poll_quit(mesh->catta_poll);
 		}
+
+		pthread_mutex_unlock(&(mesh->mesh_mutex));
 	}
 	break;
 
 	case CATTA_SERVER_REGISTERING:
+		pthread_mutex_lock(&(mesh->mesh_mutex));
 
 		/* Let's drop our registered services. When the server is back
 		 * in CATTA_SERVER_RUNNING state we will register them
@@ -166,15 +171,21 @@ static void discovery_server_callback(CattaServer *server, CattaServerState stat
 			mesh->catta_group = NULL;
 		}
 
+		pthread_mutex_unlock(&(mesh->mesh_mutex));
+
 		break;
 
 	case CATTA_SERVER_FAILURE:
+		pthread_mutex_lock(&(mesh->mesh_mutex));
+
 		// asserts
 		assert(mesh->catta_server != NULL);
 		assert(mesh->catta_poll != NULL);
 
 		/* Terminate on failure */
 		catta_simple_poll_quit(mesh->catta_poll);
+
+		pthread_mutex_unlock(&(mesh->mesh_mutex));
 		break;
 
 	case CATTA_SERVER_INVALID:
@@ -186,103 +197,87 @@ static void discovery_resolve_callback(CattaSServiceResolver *resolver, CattaIfI
 	(void)interface_;
 	(void)protocol;
 	(void)flags;
-	meshlink_handle_t *mesh = userdata;
+	(void)name;
+	(void)type;
+	(void)domain;
+	(void)host_name;
 
-	// asserts
-	assert(resolver != NULL);
-	assert(mesh != NULL);
-	assert(mesh->catta_server != NULL);
+	meshlink_handle_t *mesh = userdata;
 
-	/* Called whenever a service has been resolved successfully or timed out */
-	switch(event) {
-	case CATTA_RESOLVER_FAILURE:
-		// asserts
-		assert(name != NULL);
-		assert(type != NULL);
-		assert(domain != NULL);
-		break;
+	if(event != CATTA_RESOLVER_FOUND) {
+		catta_s_service_resolver_free(resolver);
+		return;
+	}
 
-	case CATTA_RESOLVER_FOUND: {
-		// asserts
-		assert(name != NULL);
-		assert(type != NULL);
-		assert(domain != NULL);
-		assert(host_name != NULL);
-		assert(address != NULL);
-		assert(txt != NULL);
+	// retrieve fingerprint
+	CattaStringList *node_name_li = catta_string_list_find(txt, MESHLINK_MDNS_NAME_KEY);
+	CattaStringList *node_fp_li = catta_string_list_find(txt, MESHLINK_MDNS_FINGERPRINT_KEY);
 
-		// retrieve fingerprint
-		CattaStringList *node_name_li = catta_string_list_find(txt, MESHLINK_MDNS_NAME_KEY);
-		CattaStringList *node_fp_li = catta_string_list_find(txt, MESHLINK_MDNS_FINGERPRINT_KEY);
+	if(node_name_li != NULL && node_fp_li != NULL) {
+		char *node_name = (char *)catta_string_list_get_text(node_name_li) + strlen(MESHLINK_MDNS_NAME_KEY);
+		char *node_fp = (char *)catta_string_list_get_text(node_fp_li) + strlen(MESHLINK_MDNS_FINGERPRINT_KEY);
 
-		if(node_name_li != NULL && node_fp_li != NULL) {
-			char *node_name = (char *)catta_string_list_get_text(node_name_li) + strlen(MESHLINK_MDNS_NAME_KEY);
-			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));
 
-			if(node_name[0] == '=' && node_fp[0] == '=') {
-				pthread_mutex_lock(&(mesh->mesh_mutex));
+			node_name += 1;
+			node_fp += 1;
 
-				node_name += 1;
-				node_fp += 1;
+			meshlink_node_t *node = meshlink_get_node(mesh, node_name);
 
-				meshlink_node_t *node = meshlink_get_node(mesh, node_name);
+			if(node != NULL) {
+				logger(mesh, MESHLINK_INFO, "Node %s is part of the mesh network.\n", node->name);
 
-				if(node != NULL) {
-					logger(mesh, MESHLINK_INFO, "Node %s is part of the mesh network.\n", node->name);
+				sockaddr_t naddress;
+				memset(&naddress, 0, sizeof(naddress));
 
-					sockaddr_t naddress;
-					memset(&naddress, 0, sizeof(naddress));
+				switch(address->proto) {
+				case CATTA_PROTO_INET: {
+					naddress.in.sin_family = AF_INET;
+					naddress.in.sin_port = htons(port);
+					naddress.in.sin_addr.s_addr = address->data.ipv4.address;
+				}
+				break;
 
-					switch(address->proto) {
-					case CATTA_PROTO_INET: {
-						naddress.in.sin_family = AF_INET;
-						naddress.in.sin_port = htons(port);
-						naddress.in.sin_addr.s_addr = address->data.ipv4.address;
-					}
-					break;
+				case CATTA_PROTO_INET6: {
+					naddress.in6.sin6_family = AF_INET6;
+					naddress.in6.sin6_port = htons(port);
+					memcpy(naddress.in6.sin6_addr.s6_addr, address->data.ipv6.address, sizeof(naddress.in6.sin6_addr.s6_addr));
+				}
+				break;
 
-					case CATTA_PROTO_INET6: {
-						naddress.in6.sin6_family = AF_INET6;
-						naddress.in6.sin6_port = htons(port);
-						memcpy(naddress.in6.sin6_addr.s6_addr, address->data.ipv6.address, sizeof(naddress.in6.sin6_addr.s6_addr));
-					}
+				default:
+					naddress.unknown.family = AF_UNKNOWN;
 					break;
+				}
 
-					default:
-						naddress.unknown.family = AF_UNKNOWN;
-						break;
-					}
-
-					if(naddress.unknown.family != AF_UNKNOWN) {
-						meshlink_hint_address(mesh, (meshlink_node_t *)node, (struct sockaddr *)&naddress);
-
-						node_t *n = (node_t *)node;
+				if(naddress.unknown.family != AF_UNKNOWN) {
+					meshlink_hint_address(mesh, (meshlink_node_t *)node, (struct sockaddr *)&naddress);
 
-						if(n->connection && n->connection->outgoing) {
-							n->connection->outgoing->timeout = 0;
+					node_t *n = (node_t *)node;
 
-							if(n->connection->outgoing->ev.cb) {
-								timeout_set(&mesh->loop, &n->connection->outgoing->ev, &(struct timeval) {
-									0, 0
-								});
-							}
+					if(n->connection && n->connection->outgoing) {
+						n->connection->outgoing->timeout = 0;
 
-							n->connection->last_ping_time = 0;
+						if(n->connection->outgoing->ev.cb) {
+							timeout_set(&mesh->loop, &n->connection->outgoing->ev, &(struct timeval) {
+								0, 0
+							});
 						}
 
-					} else {
-						logger(mesh, MESHLINK_WARNING, "Could not resolve node %s to a known address family type.\n", node->name);
+						n->connection->last_ping_time = 0;
 					}
+
 				} else {
-					logger(mesh, MESHLINK_WARNING, "Node %s is not part of the mesh network.\n", node_name);
+					logger(mesh, MESHLINK_WARNING, "Could not resolve node %s to a known address family type.\n", node->name);
 				}
-
-				pthread_mutex_unlock(&(mesh->mesh_mutex));
+			} else {
+				logger(mesh, MESHLINK_WARNING, "Node %s is not part of the mesh network.\n", node_name);
 			}
+
+			pthread_mutex_unlock(&(mesh->mesh_mutex));
 		}
 	}
-	break;
-	}
 
 	catta_s_service_resolver_free(resolver);
 }
@@ -292,20 +287,17 @@ static void discovery_browse_callback(CattaSServiceBrowser *browser, CattaIfInde
 	(void)flags;
 	meshlink_handle_t *mesh = userdata;
 
-	// asserts
-	assert(mesh != NULL);
-	assert(mesh->catta_server != NULL);
-	assert(mesh->catta_poll != NULL);
-
 	/* 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);
 		catta_simple_poll_quit(mesh->catta_poll);
+		pthread_mutex_unlock(&mesh->mesh_mutex);
 		break;
 
 	case CATTA_BROWSER_NEW:
-		catta_s_service_resolver_new(mesh->catta_server, interface_, protocol, name, type, domain, CATTA_PROTO_UNSPEC, 0, discovery_resolve_callback, mesh);
 		pthread_mutex_lock(&mesh->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);
 		break;
@@ -349,6 +341,7 @@ static void discovery_log_cb(CattaLogLevel level, const char *txt) {
 }
 
 static void *discovery_loop(void *userdata) {
+	bool status = false;
 	meshlink_handle_t *mesh = userdata;
 	assert(mesh != NULL);
 
@@ -356,7 +349,21 @@ static void *discovery_loop(void *userdata) {
 	catta_set_log_function(discovery_log_cb);
 
 	// create service type string
-	size_t servicetype_strlen = sizeof(MESHLINK_MDNS_SERVICE_TYPE) + strlen(mesh->appname) + 1;
+	char appname[strlen(mesh->appname) + 2];
+	strcpy(appname, mesh->appname);
+
+	for(char *p = appname; *p; p++) {
+		if(!isalnum(*p) && *p != '_' && *p != '-') {
+			*p = '_';
+		}
+	}
+
+	if(!appname[1]) {
+		appname[1] = '_';
+		appname[2] = '\0';
+	}
+
+	size_t servicetype_strlen = sizeof(MESHLINK_MDNS_SERVICE_TYPE) + strlen(appname) + 1;
 	mesh->catta_servicetype = malloc(servicetype_strlen);
 
 	if(mesh->catta_servicetype == NULL) {
@@ -364,7 +371,7 @@ static void *discovery_loop(void *userdata) {
 		goto fail;
 	}
 
-	snprintf(mesh->catta_servicetype, servicetype_strlen, MESHLINK_MDNS_SERVICE_TYPE, mesh->appname);
+	snprintf(mesh->catta_servicetype, servicetype_strlen, MESHLINK_MDNS_SERVICE_TYPE, appname);
 
 	// Allocate discovery loop object
 	if(!(mesh->catta_poll = catta_simple_poll_new())) {
@@ -405,10 +412,18 @@ static void *discovery_loop(void *userdata) {
 		goto fail;
 	}
 
-	catta_simple_poll_loop(mesh->catta_poll);
+	status = true;
 
 fail:
 
+	pthread_mutex_lock(&mesh->discovery_mutex);
+	pthread_cond_broadcast(&mesh->discovery_cond);
+	pthread_mutex_unlock(&mesh->discovery_mutex);
+
+	if(status) {
+		catta_simple_poll_loop(mesh->catta_poll);
+	}
+
 	if(mesh->catta_browser != NULL) {
 		catta_s_service_browser_free(mesh->catta_browser);
 		mesh->catta_browser = NULL;
@@ -456,6 +471,10 @@ bool discovery_start(meshlink_handle_t *mesh) {
 		return false;
 	}
 
+	pthread_mutex_lock(&mesh->discovery_mutex);
+	pthread_cond_wait(&mesh->discovery_cond, &mesh->discovery_mutex);
+	pthread_mutex_unlock(&mesh->discovery_mutex);
+
 	mesh->discovery_threadstarted = true;
 
 	return true;