X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fdiscovery.c;h=7b6cfd0a96f3f4893c2a072897ac4f752bcd07b1;hb=a036178f1a7b4484e7159c4a857632bb10e06739;hp=2af4702365e6b652c543bb9279371f12f19b83ad;hpb=9cde0d32cf209388cc59b06b7dcb0c3432f97da5;p=meshlink

diff --git a/src/discovery.c b/src/discovery.c
index 2af47023..7b6cfd0a 100644
--- a/src/discovery.c
+++ b/src/discovery.c
@@ -21,11 +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';
@@ -114,8 +114,6 @@ 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) {
@@ -128,22 +126,22 @@ 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));
+		assert(pthread_mutex_lock(&mesh->mutex) == 0);
 
 		if(!mesh->catta_group) {
 			discovery_create_services(mesh);
 		}
 
-		pthread_mutex_unlock(&(mesh->mesh_mutex));
+		assert(pthread_mutex_unlock(&mesh->mutex) == 0);
 
 		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->mesh_mutex));
+		assert(pthread_mutex_lock(&mesh->mutex) == 0);
 
 		assert(mesh->catta_server);
 		assert(mesh->catta_poll);
@@ -154,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));
+		assert(pthread_mutex_unlock(&mesh->mutex) == 0);
 	}
 	break;
 
 	case CATTA_SERVER_REGISTERING:
-		pthread_mutex_lock(&(mesh->mesh_mutex));
+		assert(pthread_mutex_lock(&mesh->mutex) == 0);
 
 		/* Let's drop our registered services. When the server is back
 		 * in CATTA_SERVER_RUNNING state we will register them
@@ -169,12 +167,12 @@ static void discovery_server_callback(CattaServer *server, CattaServerState stat
 			mesh->catta_group = NULL;
 		}
 
-		pthread_mutex_unlock(&(mesh->mesh_mutex));
+		assert(pthread_mutex_unlock(&mesh->mutex) == 0);
 
 		break;
 
 	case CATTA_SERVER_FAILURE:
-		pthread_mutex_lock(&(mesh->mesh_mutex));
+		assert(pthread_mutex_lock(&mesh->mutex) == 0);
 
 		assert(mesh->catta_server);
 		assert(mesh->catta_poll);
@@ -182,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));
+		assert(pthread_mutex_unlock(&mesh->mutex) == 0);
 		break;
 
 	case CATTA_SERVER_INVALID:
@@ -217,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));
+			assert(pthread_mutex_lock(&mesh->mutex) == 0);
 
 			node_name += 1;
 
@@ -250,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 {
@@ -273,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));
+			assert(pthread_mutex_unlock(&mesh->mutex) == 0);
 		}
 	}
 
@@ -288,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);
+		assert(pthread_mutex_lock(&mesh->mutex) == 0);
 		catta_simple_poll_quit(mesh->catta_poll);
-		pthread_mutex_unlock(&mesh->mesh_mutex);
+		assert(pthread_mutex_unlock(&mesh->mutex) == 0);
 		break;
 
 	case CATTA_BROWSER_NEW:
-		pthread_mutex_lock(&mesh->mesh_mutex);
+		assert(pthread_mutex_lock(&mesh->mutex) == 0);
 		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);
+		assert(pthread_mutex_unlock(&mesh->mutex) == 0);
 		break;
 
 	case CATTA_BROWSER_REMOVE:
-		pthread_mutex_lock(&mesh->mesh_mutex);
+		assert(pthread_mutex_lock(&mesh->mutex) == 0);
 		handle_network_change(mesh, --mesh->catta_interfaces);
-		pthread_mutex_unlock(&mesh->mesh_mutex);
+		assert(pthread_mutex_unlock(&mesh->mutex) == 0);
 		break;
 
 	case CATTA_BROWSER_ALL_FOR_NOW:
@@ -343,6 +343,8 @@ static void *discovery_loop(void *userdata) {
 	meshlink_handle_t *mesh = userdata;
 	assert(mesh);
 
+	assert(pthread_mutex_lock(&mesh->discovery_mutex) == 0);
+
 	// handle catta logs
 	catta_set_log_function(discovery_log_cb);
 
@@ -379,7 +381,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;
@@ -390,6 +392,7 @@ static void *discovery_loop(void *userdata) {
 	config.publish_hinfo = 0;
 	config.publish_addresses = 1;
 	config.publish_no_reverse = 1;
+	config.allow_point_to_point = 1;
 
 	/* Allocate a new server */
 	int error;
@@ -398,7 +401,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;
@@ -414,9 +417,8 @@ 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);
+	assert(pthread_cond_broadcast(&mesh->discovery_cond) == 0);
+	assert(pthread_mutex_unlock(&mesh->discovery_mutex) == 0);
 
 	if(status) {
 		catta_simple_poll_loop(mesh->catta_poll);
@@ -461,16 +463,18 @@ bool discovery_start(meshlink_handle_t *mesh) {
 	assert(!mesh->discovery_threadstarted);
 	assert(!mesh->catta_servicetype);
 
+	assert(pthread_mutex_lock(&mesh->discovery_mutex) == 0);
+
 	// Start the discovery thread
 	if(pthread_create(&mesh->discovery_thread, NULL, discovery_loop, mesh) != 0) {
+		assert(pthread_mutex_unlock(&mesh->discovery_mutex) == 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);
+	assert(pthread_cond_wait(&mesh->discovery_cond, &mesh->discovery_mutex) == 0);
+	assert(pthread_mutex_unlock(&mesh->discovery_mutex) == 0);
 
 	mesh->discovery_threadstarted = true;
 
@@ -489,7 +493,7 @@ void discovery_stop(meshlink_handle_t *mesh) {
 
 	// Wait for the discovery thread to finish
 	if(mesh->discovery_threadstarted == true) {
-		pthread_join(mesh->discovery_thread, NULL);
+		assert(pthread_join(mesh->discovery_thread, NULL) == 0);
 		mesh->discovery_threadstarted = false;
 	}