X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Fdiscovery.c;h=6b98a2768f178de342533e2574c060bb55b880a4;hp=95e5ed65d86da5e75297fd0fa94a9dd8eb9e762f;hb=f31267783fccb4e17d914c64243b0cba4e5632c4;hpb=230b5907e242aa48bb8c8d09450fbd3767e9c24a

diff --git a/src/discovery.c b/src/discovery.c
index 95e5ed65..6b98a276 100644
--- a/src/discovery.c
+++ b/src/discovery.c
@@ -21,9 +21,11 @@
 #define MESHLINK_MDNS_NAME_KEY "name"
 #define MESHLINK_MDNS_FINGERPRINT_KEY "fingerprint"
 
-static void generate_rand_string(char *buffer, size_t size) {
+static void generate_rand_string(meshlink_handle_t *mesh, char *buffer, size_t size) {
+	assert(size);
+
 	for(size_t i = 0; i < (size - 1); ++i) {
-		buffer[i] = 'a' + (rand() % ('z' - 'a' + 1));
+		buffer[i] = 'a' + prng(mesh, 'z' - 'a' + 1);
 	}
 
 	buffer[size - 1] = '\0';
@@ -34,12 +36,9 @@ static void discovery_entry_group_callback(CattaServer *server, CattaSEntryGroup
 	(void)group;
 	meshlink_handle_t *mesh = userdata;
 
-	// asserts
-	assert(mesh != NULL);
-	assert(mesh->catta_server != NULL);
-	assert(mesh->catta_poll != NULL);
-
-	pthread_mutex_lock(&(mesh->mesh_mutex));
+	assert(mesh);
+	assert(mesh->catta_server);
+	assert(mesh->catta_poll);
 
 	/* Called whenever the entry group state changes */
 	switch(state) {
@@ -63,8 +62,6 @@ static void discovery_entry_group_callback(CattaServer *server, CattaSEntryGroup
 	case CATTA_ENTRY_GROUP_REGISTERING:
 		break;
 	}
-
-	pthread_mutex_unlock(&(mesh->mesh_mutex));
 }
 
 
@@ -73,25 +70,20 @@ static void discovery_create_services(meshlink_handle_t *mesh) {
 	char *txt_name = NULL;
 	char *txt_fingerprint = NULL;
 
-	// asserts
-	assert(mesh != NULL);
-	assert(mesh->name != NULL);
-	assert(mesh->myport != NULL);
-	assert(mesh->catta_server != NULL);
-	assert(mesh->catta_poll != NULL);
-	assert(mesh->catta_servicetype != NULL);
-	assert(mesh->self != NULL);
-
-	pthread_mutex_lock(&(mesh->mesh_mutex));
+	assert(mesh);
+	assert(mesh->name);
+	assert(mesh->myport);
+	assert(mesh->catta_server);
+	assert(mesh->catta_poll);
+	assert(mesh->catta_servicetype);
+	assert(mesh->self);
 
 	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 */
@@ -122,45 +114,50 @@ done:
 	free(fingerprint);
 	free(txt_name);
 	free(txt_fingerprint);
-
-	pthread_mutex_unlock(&(mesh->mesh_mutex));
 }
 
 static void discovery_server_callback(CattaServer *server, CattaServerState state, void *userdata) {
 	(void)server;
 	meshlink_handle_t *mesh = userdata;
 
-	// asserts
-	assert(mesh != NULL);
+	assert(mesh);
 
 	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: {
-		// 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));
+		generate_rand_string(mesh, hostname, sizeof(hostname));
+
+		pthread_mutex_lock(&(mesh->mesh_mutex));
+
+		assert(mesh->catta_server);
+		assert(mesh->catta_poll);
+
 		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
@@ -170,15 +167,20 @@ static void discovery_server_callback(CattaServer *server, CattaServerState stat
 			mesh->catta_group = NULL;
 		}
 
+		pthread_mutex_unlock(&(mesh->mesh_mutex));
+
 		break;
 
 	case CATTA_SERVER_FAILURE:
-		// asserts
-		assert(mesh->catta_server != NULL);
-		assert(mesh->catta_poll != NULL);
+		pthread_mutex_lock(&(mesh->mesh_mutex));
+
+		assert(mesh->catta_server);
+		assert(mesh->catta_poll);
 
 		/* Terminate on failure */
 		catta_simple_poll_quit(mesh->catta_poll);
+
+		pthread_mutex_unlock(&(mesh->mesh_mutex));
 		break;
 
 	case CATTA_SERVER_INVALID:
@@ -190,105 +192,88 @@ static void discovery_resolve_callback(CattaSServiceResolver *resolver, CattaIfI
 	(void)interface_;
 	(void)protocol;
 	(void)flags;
+	(void)name;
+	(void)type;
+	(void)domain;
+	(void)host_name;
+
 	meshlink_handle_t *mesh = userdata;
 
-	// asserts
-	assert(resolver != NULL);
-	assert(mesh != NULL);
-	assert(mesh->catta_server != NULL);
+	assert(mesh);
 
-	/* 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 && node_fp_li) {
+		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_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) {
+				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);
-						pthread_mutex_lock(&(mesh->mesh_mutex));
-
-						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
+							});
 						}
 
-						pthread_mutex_unlock(&(mesh->mesh_mutex));
-					} 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);
 }
@@ -298,20 +283,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;
@@ -328,18 +310,6 @@ static void discovery_browse_callback(CattaSServiceBrowser *browser, CattaIfInde
 	}
 }
 
-static void *discovery_loop(void *userdata) {
-	meshlink_handle_t *mesh = userdata;
-
-	// asserts
-	assert(mesh != NULL);
-	assert(mesh->catta_poll != NULL);
-
-	catta_simple_poll_loop(mesh->catta_poll);
-
-	return NULL;
-}
-
 static void discovery_log_cb(CattaLogLevel level, const char *txt) {
 	meshlink_log_level_t mlevel = MESHLINK_CRITICAL;
 
@@ -366,22 +336,30 @@ static void discovery_log_cb(CattaLogLevel level, const char *txt) {
 	logger(NULL, mlevel, "%s\n", txt);
 }
 
-bool discovery_start(meshlink_handle_t *mesh) {
-	logger(mesh, MESHLINK_DEBUG, "discovery_start called\n");
-
-	// asserts
-	assert(mesh != NULL);
-	assert(mesh->catta_poll == NULL);
-	assert(mesh->catta_server == NULL);
-	assert(mesh->catta_browser == NULL);
-	assert(mesh->discovery_threadstarted == false);
-	assert(mesh->catta_servicetype == NULL);
+static void *discovery_loop(void *userdata) {
+	bool status = false;
+	meshlink_handle_t *mesh = userdata;
+	assert(mesh);
 
 	// handle catta logs
 	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) {
@@ -389,7 +367,7 @@ bool discovery_start(meshlink_handle_t *mesh) {
 		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())) {
@@ -399,7 +377,7 @@ bool discovery_start(meshlink_handle_t *mesh) {
 
 	// generate some unique host name (we actually do not care about it)
 	char hostname[17];
-	generate_rand_string(hostname, sizeof(hostname));
+	generate_rand_string(mesh, hostname, sizeof(hostname));
 
 	// Let's set the host name for this server.
 	CattaServerConfig config;
@@ -430,47 +408,77 @@ bool discovery_start(meshlink_handle_t *mesh) {
 		goto fail;
 	}
 
-	// Start the discovery thread
-	if(pthread_create(&mesh->discovery_thread, NULL, discovery_loop, mesh) != 0) {
-		logger(mesh, MESHLINK_ERROR, "Could not start discovery thread: %s\n", strerror(errno));
-		memset(&mesh->discovery_thread, 0, sizeof(mesh)->discovery_thread);
-		goto fail;
-	}
+	status = true;
 
-	mesh->discovery_threadstarted = true;
+fail:
 
-	return true;
+	pthread_mutex_lock(&mesh->discovery_mutex);
+	pthread_cond_broadcast(&mesh->discovery_cond);
+	pthread_mutex_unlock(&mesh->discovery_mutex);
 
-fail:
+	if(status) {
+		catta_simple_poll_loop(mesh->catta_poll);
+	}
 
-	if(mesh->catta_browser != NULL) {
+	if(mesh->catta_browser) {
 		catta_s_service_browser_free(mesh->catta_browser);
 		mesh->catta_browser = NULL;
 	}
 
-	if(mesh->catta_server != NULL) {
+	if(mesh->catta_group) {
+		catta_s_entry_group_reset(mesh->catta_group);
+		catta_s_entry_group_free(mesh->catta_group);
+		mesh->catta_group = NULL;
+	}
+
+	if(mesh->catta_server) {
 		catta_server_free(mesh->catta_server);
 		mesh->catta_server = NULL;
 	}
 
-	if(mesh->catta_poll != NULL) {
+	if(mesh->catta_poll) {
 		catta_simple_poll_free(mesh->catta_poll);
 		mesh->catta_poll = NULL;
 	}
 
-	if(mesh->catta_servicetype != NULL) {
+	if(mesh->catta_servicetype) {
 		free(mesh->catta_servicetype);
 		mesh->catta_servicetype = NULL;
 	}
 
-	return false;
+	return NULL;
+}
+
+bool discovery_start(meshlink_handle_t *mesh) {
+	logger(mesh, MESHLINK_DEBUG, "discovery_start called\n");
+
+	assert(mesh);
+	assert(!mesh->catta_poll);
+	assert(!mesh->catta_server);
+	assert(!mesh->catta_browser);
+	assert(!mesh->discovery_threadstarted);
+	assert(!mesh->catta_servicetype);
+
+	// Start the discovery thread
+	if(pthread_create(&mesh->discovery_thread, NULL, discovery_loop, mesh) != 0) {
+		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);
+
+	mesh->discovery_threadstarted = true;
+
+	return true;
 }
 
 void discovery_stop(meshlink_handle_t *mesh) {
 	logger(mesh, MESHLINK_DEBUG, "discovery_stop called\n");
 
-	// asserts
-	assert(mesh != NULL);
+	assert(mesh);
 
 	// Shut down
 	if(mesh->catta_poll) {
@@ -483,32 +491,5 @@ void discovery_stop(meshlink_handle_t *mesh) {
 		mesh->discovery_threadstarted = false;
 	}
 
-	// Clean up resources
-	if(mesh->catta_browser != NULL) {
-		catta_s_service_browser_free(mesh->catta_browser);
-		mesh->catta_browser = NULL;
-	}
-
-	if(mesh->catta_group) {
-		catta_s_entry_group_reset(mesh->catta_group);
-		catta_s_entry_group_free(mesh->catta_group);
-		mesh->catta_group = NULL;
-	}
-
-	if(mesh->catta_server != NULL) {
-		catta_server_free(mesh->catta_server);
-		mesh->catta_server = NULL;
-	}
-
-	if(mesh->catta_poll != NULL) {
-		catta_simple_poll_free(mesh->catta_poll);
-		mesh->catta_poll = NULL;
-	}
-
-	if(mesh->catta_servicetype != NULL) {
-		free(mesh->catta_servicetype);
-		mesh->catta_servicetype = NULL;
-	}
-
 	mesh->catta_interfaces = 0;
 }