X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fgraph.c;h=d779ecd5f4144b2d6c92be41155924b5dbe56d02;hb=HEAD;hp=e6212116528a64d17bb0b03d5e209ace106158fe;hpb=a97a07d79c847d0b30c61a2589e7bde62f25d603;p=meshlink

diff --git a/src/graph.c b/src/graph.c
index e6212116..9a2bfb19 100644
--- a/src/graph.c
+++ b/src/graph.c
@@ -126,8 +126,8 @@ static void sssp_bfs(meshlink_handle_t *mesh) {
 			list_insert_tail(todo_list, e->to);
 		}
 
-		next = node->next; /* Because the list_insert_tail() above could have added something extra for us! */
-		list_delete_node(todo_list, node);
+		list_next = list_node->next; /* Because the list_insert_tail() above could have added something extra for us! */
+		list_delete_node(todo_list, list_node);
 	}
 
 	list_free(todo_list);
@@ -145,54 +145,49 @@ static void check_reachability(meshlink_handle_t *mesh) {
 
 		/* Check for nodes that have changed session_id */
 		if(n->status.visited && n->prevedge && n->prevedge->reverse->session_id != n->session_id) {
+			logger(mesh, MESHLINK_DEBUG, "Node %s has a new session ID", n->name);
+
 			n->session_id = n->prevedge->reverse->session_id;
 
 			if(n->utcp) {
-				utcp_abort_all_connections(n->utcp);
+				utcp_reset_all_connections(n->utcp);
 			}
 
-			if(n->status.visited == n->status.reachable) {
-				/* This session replaces the previous one without changing reachability status.
-				 * We still need to reset the UDP SPTPS state.
-				 */
-				n->status.validkey = false;
-				sptps_stop(&n->sptps);
-				n->status.waitingforkey = false;
-				n->last_req_key = 0;
-
-				n->status.udp_confirmed = false;
-				n->maxmtu = MTU;
-				n->minmtu = 0;
-				n->mtuprobes = 0;
-
-				timeout_del(&mesh->loop, &n->mtutimeout);
-			}
+			n->status.validkey = false;
+			sptps_stop(&n->sptps);
+			n->status.waitingforkey = false;
+			n->last_req_key = -3600;
+
+			n->status.udp_confirmed = false;
+			n->maxmtu = MTU;
+			n->minmtu = 0;
+			n->mtuprobes = 0;
+
+			timeout_del(&mesh->loop, &n->mtutimeout);
 		}
 
 		if(n->status.visited != n->status.reachable) {
 			n->status.reachable = !n->status.reachable;
 			n->status.dirty = true;
 
-			if(n->status.reachable) {
-				logger(mesh, MESHLINK_DEBUG, "Node %s became reachable", n->name);
-				bool first_time_reachable = !n->last_reachable;
-				n->last_reachable = mesh->loop.now.tv_sec;
-
-				if(first_time_reachable) {
-					node_write_config(mesh, n);
+			if(!n->status.blacklisted) {
+				if(n->status.reachable) {
+					logger(mesh, MESHLINK_DEBUG, "Node %s became reachable", n->name);
+					bool first_time_reachable = !n->last_reachable;
+					n->last_reachable = time(NULL);
+
+					if(first_time_reachable) {
+						if(!node_write_config(mesh, n, false)) {
+							logger(mesh, MESHLINK_WARNING, "Could not write host config file for node %s!\n", n->name);
+
+						}
+					}
+				} else {
+					logger(mesh, MESHLINK_DEBUG, "Node %s became unreachable", n->name);
+					n->last_unreachable = time(NULL);
 				}
-			} else {
-				logger(mesh, MESHLINK_DEBUG, "Node %s became unreachable", n->name);
-				n->last_unreachable = mesh->loop.now.tv_sec;
 			}
 
-			/* TODO: only clear status.validkey if node is unreachable? */
-
-			n->status.validkey = false;
-			sptps_stop(&n->sptps);
-			n->status.waitingforkey = false;
-			n->last_req_key = 0;
-
 			n->status.udp_confirmed = false;
 			n->maxmtu = MTU;
 			n->minmtu = 0;
@@ -207,10 +202,6 @@ static void check_reachability(meshlink_handle_t *mesh) {
 			if(!n->status.reachable) {
 				update_node_udp(mesh, n, NULL);
 				n->status.broadcast = false;
-			} else if(n->connection) {
-				if(n->connection->status.initiator) {
-					send_req_key(mesh, n);
-				}
 			}
 
 			if(n->utcp) {
@@ -223,8 +214,8 @@ static void check_reachability(meshlink_handle_t *mesh) {
 		if(!reachable) {
 			mesh->last_unreachable = mesh->loop.now.tv_sec;
 
-			if(mesh->threadstarted) {
-				timeout_set(&mesh->loop, &mesh->periodictimer, &(struct timeval) {
+			if(mesh->threadstarted && mesh->periodictimer.cb) {
+				timeout_set(&mesh->loop, &mesh->periodictimer, &(struct timespec) {
 					0, prng(mesh, TIMER_FUDGE)
 				});
 			}