X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=1b3d230eb4dff87b40d3e945016f9f783a3cfb71;hp=1f0655bb84ea760a708ddba4a6b7592abab2015c;hb=fe84fafcb684391739a1b3366705c58683210392;hpb=89c9f3ed8fddb316d0f9ef7de30bdc76fba39e41

diff --git a/src/net.c b/src/net.c
index 1f0655bb..1b3d230e 100644
--- a/src/net.c
+++ b/src/net.c
@@ -1,7 +1,7 @@
 /*
     net.c -- most of the network code
-    Copyright (C) 1998-2003 Ivo Timmermans <ivo@o2w.nl>,
-                  2000-2003 Guus Sliepen <guus@sliepen.eu.org>
+    Copyright (C) 1998-2004 Ivo Timmermans <ivo@tinc-vpn.org>,
+                  2000-2004 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: net.c,v 1.35.4.198 2003/08/22 15:04:26 guus Exp $
+    $Id$
 */
 
 #include "system.h"
@@ -63,7 +63,7 @@ static void purge(void)
 
 	for(nnode = node_tree->head; nnode; nnode = nnext) {
 		nnext = nnode->next;
-		n = (node_t *) nnode->data;
+		n = nnode->data;
 
 		if(!n->status.reachable) {
 			ifdebug(SCARY_THINGS) logger(LOG_DEBUG, _("Purging node %s (%s)"), n->name,
@@ -71,15 +71,17 @@ static void purge(void)
 
 			for(snode = n->subnet_tree->head; snode; snode = snext) {
 				snext = snode->next;
-				s = (subnet_t *) snode->data;
-				send_del_subnet(broadcast, s);
+				s = snode->data;
+				if(!tunnelserver)
+					send_del_subnet(broadcast, s);
 				subnet_del(n, s);
 			}
 
 			for(enode = n->edge_tree->head; enode; enode = enext) {
 				enext = enode->next;
-				e = (edge_t *) enode->data;
-				send_del_edge(broadcast, e);
+				e = enode->data;
+				if(!tunnelserver)
+					send_del_edge(broadcast, e);
 				edge_del(e);
 			}
 		}
@@ -89,12 +91,12 @@ static void purge(void)
 
 	for(nnode = node_tree->head; nnode; nnode = nnext) {
 		nnext = nnode->next;
-		n = (node_t *) nnode->data;
+		n = nnode->data;
 
 		if(!n->status.reachable) {
 			for(enode = edge_weight_tree->head; enode; enode = enext) {
 				enext = enode->next;
-				e = (edge_t *) enode->data;
+				e = enode->data;
 
 				if(e->to == n)
 					break;
@@ -122,7 +124,7 @@ static int build_fdset(fd_set * fs)
 
 	for(node = connection_tree->head; node; node = next) {
 		next = node->next;
-		c = (connection_t *) node->data;
+		c = node->data;
 
 		if(c->status.remove) {
 			connection_del(c);
@@ -178,7 +180,7 @@ void terminate_connection(connection_t *c, bool report)
 		closesocket(c->socket);
 
 	if(c->edge) {
-		if(report)
+		if(report && !tunnelserver)
 			send_del_edge(broadcast, c->edge);
 
 		edge_del(c->edge);
@@ -186,6 +188,18 @@ void terminate_connection(connection_t *c, bool report)
 		/* Run MST and SSSP algorithms */
 
 		graph();
+
+		/* If the node is not reachable anymore but we remember it had an edge to us, clean it up */
+
+		if(report && !c->node->status.reachable) {
+			edge_t *e;
+			e = lookup_edge(c->node, myself);
+			if(e) {
+				if(!tunnelserver)
+					send_del_edge(broadcast, e);
+				edge_del(e);
+			}
+		}
 	}
 
 	/* Check if this was our outgoing connection */
@@ -213,7 +227,7 @@ static void check_dead_connections(void)
 
 	for(node = connection_tree->head; node; node = next) {
 		next = node->next;
-		c = (connection_t *) node->data;
+		c = node->data;
 
 		if(c->last_ping_time + pingtimeout < now) {
 			if(c->status.active) {
@@ -234,7 +248,13 @@ static void check_dead_connections(void)
 				}
 				ifdebug(CONNECTIONS) logger(LOG_WARNING, _("Timeout from %s (%s) during authentication"),
 						   c->name, c->hostname);
-				terminate_connection(c, false);
+				if(c->status.connecting) {
+					c->status.connecting = false;
+					closesocket(c->socket);
+					do_outgoing_connection(c);
+				} else {
+					terminate_connection(c, false);
+				}
 			}
 		}
 	}
@@ -256,11 +276,11 @@ static void check_network_activity(fd_set * f)
 
 	if(FD_ISSET(device_fd, f)) {
 		if(read_packet(&packet))
-			route_outgoing(&packet);
+			route(myself, &packet);
 	}
 
 	for(node = connection_tree->head; node; node = node->next) {
-		c = (connection_t *) node->data;
+		c = node->data;
 
 		if(c->status.remove)
 			continue;
@@ -320,7 +340,8 @@ int main_loop(void)
 	while(running) {
 		now = time(NULL);
 
-		tv.tv_sec = 1 + (rand() & 7);	/* Approx. 5 seconds, randomized to prevent global synchronisation effects */
+	//	tv.tv_sec = 1 + (rand() & 7);	/* Approx. 5 seconds, randomized to prevent global synchronisation effects */
+		tv.tv_sec = 1;
 		tv.tv_usec = 0;
 
 		maxfd = build_fdset(&fset);
@@ -353,7 +374,7 @@ int main_loop(void)
 			last_ping_check = now;
 
 			if(routing_mode == RMODE_SWITCH)
-				age_mac();
+				age_subnets();
 
 			age_past_requests();
 
@@ -380,7 +401,7 @@ int main_loop(void)
 			logger(LOG_INFO, _("Flushing event queue"));
 
 			while(event_tree->head) {
-				event = (event_t *) event_tree->head->data;
+				event = event_tree->head->data;
 				event->handler(event->data);
 				event_del(event);
 			}
@@ -408,7 +429,7 @@ int main_loop(void)
 			/* Close connections to hosts that have a changed or deleted host config file */
 			
 			for(node = connection_tree->head; node; node = node->next) {
-				c = (connection_t *) node->data;
+				c = node->data;
 				
 				if(c->outgoing) {
 					free(c->outgoing->name);