X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnet.c;h=866bacb10c7eb46d5cdaaf93086f8d72ad1129d0;hb=05c02272e16eb7670b19c596070a1a7cad72e432;hp=61cb1538de42236ee2727ff537b5034df6f4b752;hpb=cf3f161b0cbe847a484ea2c4fb215b963acbb805;p=meshlink

diff --git a/src/net.c b/src/net.c
index 61cb1538..866bacb1 100644
--- a/src/net.c
+++ b/src/net.c
@@ -31,36 +31,6 @@
 #include "protocol.h"
 #include "xalloc.h"
 
-/* Purge edges of unreachable nodes. Use carefully. */
-
-// TODO: remove
-void purge(void) {
-	logger(DEBUG_PROTOCOL, LOG_DEBUG, "Purging unreachable nodes");
-
-	/* Remove all edges owned by unreachable nodes. */
-
-	for splay_each(node_t, n, mesh->nodes) {
-		if(!n->status.reachable) {
-			logger(DEBUG_SCARY_THINGS, LOG_DEBUG, "Purging node %s (%s)", n->name, n->hostname);
-
-			for splay_each(edge_t, e, n->edge_tree) {
-				send_del_edge(mesh->everyone, e);
-				edge_del(e);
-			}
-		}
-	}
-
-	/* Check if anyone else claims to have an edge to an unreachable node. If not, delete node. */
-
-	for splay_each(node_t, n, mesh->nodes) {
-		if(!n->status.reachable) {
-			for splay_each(edge_t, e, mesh->edges)
-				if(e->to == n)
-					return;
-		}
-	}
-}
-
 /*
   Terminate a connection:
   - Mark it as inactive
@@ -68,7 +38,7 @@ void purge(void) {
   - Kill it with fire
   - Check if we need to retry making an outgoing connection
 */
-void terminate_connection(connection_t *c, bool report) {
+void terminate_connection(meshlink_handle_t *mesh, connection_t *c, bool report) {
 	logger(DEBUG_CONNECTIONS, LOG_NOTICE, "Closing connection with %s (%s)", c->name, c->hostname);
 
 	c->status.active = false;
@@ -78,14 +48,14 @@ void terminate_connection(connection_t *c, bool report) {
 
 	if(c->edge) {
 		if(report)
-			send_del_edge(mesh->everyone, c->edge);
+			send_del_edge(mesh, mesh->everyone, c->edge);
 
-		edge_del(c->edge);
+		edge_del(mesh, c->edge);
 		c->edge = NULL;
 
 		/* Run MST and SSSP algorithms */
 
-		graph();
+		graph(mesh);
 
 		/* If the node is not reachable anymore but we remember it had an edge to us, clean it up */
 
@@ -93,14 +63,14 @@ void terminate_connection(connection_t *c, bool report) {
 			edge_t *e;
 			e = lookup_edge(c->node, mesh->self);
 			if(e) {
-				send_del_edge(mesh->everyone, e);
-				edge_del(e);
+				send_del_edge(mesh, mesh->everyone, e);
+				edge_del(mesh, e);
 			}
 		}
 	}
 
 	outgoing_t *outgoing = c->outgoing;
-	connection_del(c);
+	connection_del(mesh, c);
 
 	/* Check if this was our outgoing connection */
 
@@ -123,13 +93,15 @@ void terminate_connection(connection_t *c, bool report) {
   and close the connection.
 */
 static void timeout_handler(event_loop_t *loop, void *data) {
+	meshlink_handle_t *mesh = loop->data;
+
 	for list_each(connection_t, c, mesh->connections) {
 		if(c->last_ping_time + mesh->pingtimeout <= mesh->loop.now.tv_sec) {
 			if(c->status.active) {
 				if(c->status.pinged) {
 					logger(DEBUG_CONNECTIONS, LOG_INFO, "%s (%s) didn't respond to PING in %ld seconds", c->name, c->hostname, (long)mesh->loop.now.tv_sec - c->last_ping_time);
 				} else if(c->last_ping_time + mesh->pinginterval <= mesh->loop.now.tv_sec) {
-					send_ping(c);
+					send_ping(mesh, c);
 					continue;
 				} else {
 					continue;
@@ -140,7 +112,7 @@ static void timeout_handler(event_loop_t *loop, void *data) {
 				else
 					logger(DEBUG_CONNECTIONS, LOG_WARNING, "Timeout from %s (%s) during authentication", c->name, c->hostname);
 			}
-			terminate_connection(c, c->status.active);
+			terminate_connection(mesh, c, c->status.active);
 		}
 	}
 
@@ -148,6 +120,8 @@ static void timeout_handler(event_loop_t *loop, void *data) {
 }
 
 static void periodic_handler(event_loop_t *loop, void *data) {
+	meshlink_handle_t *mesh = loop->data;
+
 	/* Check if there are too many contradicting ADD_EDGE and DEL_EDGE messages.
 	   This usually only happens when another node has the same Name as this node.
 	   If so, sleep for a short while to prevent a storm of contradicting messages.
@@ -233,7 +207,7 @@ static void periodic_handler(event_loop_t *loop, void *data) {
 				logger(DEBUG_CONNECTIONS, LOG_INFO, "Autodisconnecting from %s", c->name);
 				list_delete(mesh->outgoings, c->outgoing);
 				c->outgoing = NULL;
-				terminate_connection(c, c->status.active);
+				terminate_connection(mesh, c, c->status.active);
 				break;
 			}
 		}
@@ -261,14 +235,14 @@ static void periodic_handler(event_loop_t *loop, void *data) {
 	timeout_set(&mesh->loop, data, &(struct timeval){5, rand() % 100000});
 }
 
-void handle_meta_connection_data(connection_t *c) {
-	if (!receive_meta(c)) {
-		terminate_connection(c, c->status.active);
+void handle_meta_connection_data(meshlink_handle_t *mesh, connection_t *c) {
+	if (!receive_meta(mesh, c)) {
+		terminate_connection(mesh, c, c->status.active);
 		return;
 	}
 }
 
-void retry(void) {
+void retry(meshlink_handle_t *mesh) {
 	/* Reset the reconnection timers for all outgoing connections */
 	for list_each(outgoing_t, outgoing, mesh->outgoings) {
 		outgoing->timeout = 0;
@@ -289,7 +263,7 @@ void retry(void) {
 /*
   this is where it all happens...
 */
-int main_loop(void) {
+int main_loop(meshlink_handle_t *mesh) {
 	timeout_add(&mesh->loop, &mesh->pingtimer, timeout_handler, &mesh->pingtimer, &(struct timeval){mesh->pingtimeout, rand() % 100000});
 	timeout_add(&mesh->loop, &mesh->periodictimer, periodic_handler, &mesh->periodictimer, &(struct timeval){mesh->pingtimeout, rand() % 100000});