X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fdiscovery.c;h=da4a1d7de4e010b0b5872327056f2ba4047cb1c7;hb=2224a56ea44bffdafbe29ba7b74d1a0adb0cbd95;hp=9064523c9c603222cd2e55bd8736a56c1f712ec5;hpb=dceaa0b7940464df45104e02b88e0ea3283bb938;p=meshlink

diff --git a/src/discovery.c b/src/discovery.c
index 9064523c..da4a1d7d 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,10 +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);
+	assert(mesh);
+	assert(mesh->catta_server);
+	assert(mesh->catta_poll);
 
 	/* Called whenever the entry group state changes */
 	switch(state) {
@@ -69,14 +70,13 @@ 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);
+	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");
 
@@ -114,41 +114,37 @@ 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));
+		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;
 
 	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));
+		generate_rand_string(mesh, hostname, sizeof(hostname));
+
+		pthread_mutex_lock(&mesh->mutex);
 
-		pthread_mutex_lock(&(mesh->mesh_mutex));
-		//
-		// asserts
-		assert(mesh->catta_server != NULL);
-		assert(mesh->catta_poll != NULL);
+		assert(mesh->catta_server);
+		assert(mesh->catta_poll);
 
 		int result = catta_server_set_host_name(mesh->catta_server, hostname);
 
@@ -156,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
@@ -171,21 +167,20 @@ 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);
 
-		// asserts
-		assert(mesh->catta_server != NULL);
-		assert(mesh->catta_poll != NULL);
+		assert(mesh->catta_server);
+		assert(mesh->catta_poll);
 
 		/* 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:
@@ -204,6 +199,8 @@ static void discovery_resolve_callback(CattaSServiceResolver *resolver, CattaIfI
 
 	meshlink_handle_t *mesh = userdata;
 
+	assert(mesh);
+
 	if(event != CATTA_RESOLVER_FOUND) {
 		catta_s_service_resolver_free(resolver);
 		return;
@@ -213,19 +210,18 @@ static void discovery_resolve_callback(CattaSServiceResolver *resolver, CattaIfI
 	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) {
+	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[0] == '=' && node_fp[0] == '=') {
-			pthread_mutex_lock(&(mesh->mesh_mutex));
+			pthread_mutex_lock(&mesh->mutex);
 
 			node_name += 1;
-			node_fp += 1;
 
 			meshlink_node_t *node = meshlink_get_node(mesh, node_name);
 
-			if(node != NULL) {
+			if(node) {
 				logger(mesh, MESHLINK_INFO, "Node %s is part of the mesh network.\n", node->name);
 
 				sockaddr_t naddress;
@@ -252,20 +248,21 @@ 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;
 
-					if(n->connection && n->connection->outgoing) {
-						n->connection->outgoing->timeout = 0;
+					node_add_recent_address(mesh, n, &naddress);
 
-						if(n->connection->outgoing->ev.cb) {
-							timeout_set(&mesh->loop, &n->connection->outgoing->ev, &(struct timeval) {
+					if(c && c->outgoing && !c->status.active) {
+						c->outgoing->timeout = 0;
+
+						if(c->outgoing->ev.cb) {
+							timeout_set(&mesh->loop, &c->outgoing->ev, &(struct timeval) {
 								0, 0
 							});
 						}
 
-						n->connection->last_ping_time = 0;
+						c->last_ping_time = 0;
 					}
 
 				} else {
@@ -275,7 +272,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);
 		}
 	}
 
@@ -290,22 +287,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,14 +338,29 @@ 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);
+	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) {
@@ -356,7 +368,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())) {
@@ -366,7 +378,7 @@ static void *discovery_loop(void *userdata) {
 
 	// 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;
@@ -385,7 +397,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;
@@ -397,15 +409,19 @@ static void *discovery_loop(void *userdata) {
 		goto fail;
 	}
 
+	status = true;
+
+fail:
+
 	pthread_mutex_lock(&mesh->discovery_mutex);
 	pthread_cond_broadcast(&mesh->discovery_cond);
 	pthread_mutex_unlock(&mesh->discovery_mutex);
 
-	catta_simple_poll_loop(mesh->catta_poll);
-
-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;
 	}
@@ -416,17 +432,17 @@ fail:
 		mesh->catta_group = NULL;
 	}
 
-	if(mesh->catta_server != 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;
 	}
@@ -437,13 +453,12 @@ fail:
 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);
+	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) {
@@ -464,8 +479,7 @@ bool discovery_start(meshlink_handle_t *mesh) {
 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) {