X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeshlink.c;h=4fa3a58000135bb71713659de90599dac492458e;hb=693fbd414983fdc87a34786093e0dbfab4542f6a;hp=9fc80153d48210b0cbb60f7c7793b673c4e090cd;hpb=cbcb7c1e64318a80dd72e5b09b45ab16e56e47de;p=meshlink

diff --git a/src/meshlink.c b/src/meshlink.c
index 9fc80153..4fa3a580 100644
--- a/src/meshlink.c
+++ b/src/meshlink.c
@@ -347,12 +347,7 @@ static bool try_bind(int port) {
 }
 
 static int check_port(meshlink_handle_t *mesh) {
-	if(try_bind(655))
-		return 655;
-
-	fprintf(stderr, "Warning: could not bind to port 655.\n");
-
-	for(int i = 0; i < 100; i++) {
+	for(int i = 0; i < 1000; i++) {
 		int port = 0x1000 + (rand() & 0x7fff);
 		if(try_bind(port)) {
 			char filename[PATH_MAX];
@@ -365,7 +360,6 @@ static int check_port(meshlink_handle_t *mesh) {
 
 			fprintf(f, "Port = %d\n", port);
 			fclose(f);
-			fprintf(stderr, "MeshLink will instead listen on port %d.\n", port);
 			return port;
 		}
 	}
@@ -740,7 +734,13 @@ static bool meshlink_setup(meshlink_handle_t *mesh) {
 	return true;
 }
 
+
 meshlink_handle_t *meshlink_open(const char *confbase, const char *name) {
+	return meshlink_open_with_size(confbase, name, sizeof(meshlink_handle_t) );
+}
+
+
+meshlink_handle_t *meshlink_open_with_size(const char *confbase, const char *name, size_t size) {
 	// Validate arguments provided by the application
 	bool usingname = false;
 
@@ -763,10 +763,9 @@ meshlink_handle_t *meshlink_open(const char *confbase, const char *name) {
 		} else { usingname = true;}
 	}
 
-	meshlink_handle_t *mesh = xzalloc(sizeof *mesh);
+	meshlink_handle_t *mesh = xzalloc(size);
 	mesh->confbase = xstrdup(confbase);
 	if (usingname) mesh->name = xstrdup(name);
-	pthread_mutex_init ( &(mesh->outpacketqueue_mutex), NULL);
 	pthread_mutex_init ( &(mesh->nodes_mutex), NULL);
 	mesh->threadstarted = false;
 	event_loop_init(&mesh->loop);
@@ -827,7 +826,9 @@ static void *meshlink_main_loop(void *arg) {
 
 	try_outgoing_connections(mesh);
 
+	fprintf(stderr, "Starting main_loop...\n");
 	main_loop(mesh);
+	fprintf(stderr, "main_loop returned.\n");
 
 	return NULL;
 }
@@ -867,16 +868,26 @@ void meshlink_stop(meshlink_handle_t *mesh) {
 		return;
 	}
 
-	// Shut down the listening sockets to signal the main thread to shut down
+	listen_socket_t *s = &mesh->listen_socket[0];
 
-	for(int i = 0; i < mesh->listen_sockets; i++) {
-		shutdown(mesh->listen_socket[i].tcp.fd, SHUT_RDWR);
-		shutdown(mesh->listen_socket[i].udp.fd, SHUT_RDWR);
-	}
+	// Shut down a listening socket to signal the main thread to shut down
+
+	shutdown(s->tcp.fd, SHUT_RDWR);
 
 	// Wait for the main thread to finish
 
 	pthread_join(mesh->thread, NULL);
+	mesh->threadstarted = false;
+
+	// Fix the socket
+	
+	closesocket(s->tcp.fd);
+	io_del(&mesh->loop, &s->tcp);
+	s->tcp.fd = setup_listen_socket(&s->sa);
+	if(s->tcp.fd < 0)
+		logger(DEBUG_ALWAYS, LOG_ERR, "Could not repair listenen socket!");
+	else
+		io_add(&mesh->loop, &s->tcp, handle_new_meta_connection, s, s->tcp.fd, IO_READ);
 }
 
 void meshlink_close(meshlink_handle_t *mesh) {
@@ -951,19 +962,15 @@ bool meshlink_send(meshlink_handle_t *mesh, meshlink_node_t *destination, const
 		return false;
 	}
 
-	/* If there is no outgoing list yet, create one. */
-
-	if(!mesh->outpacketqueue)
-		mesh->outpacketqueue = list_alloc(NULL);
-
 	//add packet to the queue
 	outpacketqueue_t *packet_in_queue = xzalloc(sizeof *packet_in_queue);
 	packet_in_queue->destination=destination;
 	packet_in_queue->data=data;
 	packet_in_queue->len=len;
-	pthread_mutex_lock(&(mesh->outpacketqueue_mutex));
-	list_insert_head(mesh->outpacketqueue,packet_in_queue);
-	pthread_mutex_unlock(&(mesh->outpacketqueue_mutex));
+	if(!meshlink_queue_push(&mesh->outpacketqueue, packet_in_queue)) {
+		free(packet_in_queue);
+		return false;
+	}
 
 	//notify event loop
 	signal_trigger(&(mesh->loop),&(mesh->datafromapp));
@@ -974,10 +981,9 @@ void meshlink_send_from_queue(event_loop_t* el,meshlink_handle_t *mesh) {
 	vpn_packet_t packet;
 	meshlink_packethdr_t *hdr = (meshlink_packethdr_t *)packet.data;
 
-	outpacketqueue_t* p = list_get_tail(mesh->outpacketqueue);
-	if (p)
-	list_delete_tail(mesh->outpacketqueue);
-	else return ;
+	outpacketqueue_t* p = meshlink_queue_pop(&mesh->outpacketqueue);
+	if(!p)
+		return;
 
 	if (sizeof(meshlink_packethdr_t) + p->len > MAXSIZE) {
 		//log something
@@ -1386,7 +1392,7 @@ bool meshlink_join(meshlink_handle_t *mesh, const char *invitation) {
 	}
 
 	if(!port)
-		port = "655";
+		goto invalid;
 
 	if(!b64decode(slash, mesh->hash, 18) || !b64decode(slash + 24, mesh->cookie, 18))
 		goto invalid;