X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=a04ba005b67fc616e8291a4f80dddb9ff9c50af8;hp=59dd39b30c327b8f15f5deb6360148a043deb466;hb=4708f2c89edea4be2562256544cf35309cf1ea89;hpb=35af4051c3749cd2c2137a7eb57171a1fbb12af7

diff --git a/src/net.c b/src/net.c
index 59dd39b3..a04ba005 100644
--- a/src/net.c
+++ b/src/net.c
@@ -1,7 +1,7 @@
 /*
     net.c -- most of the network code
     Copyright (C) 1998-2005 Ivo Timmermans,
-                  2000-2009 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2010 Guus Sliepen <guus@tinc-vpn.org>
                   2006      Scott Lamb <slamb@slamb.org>
 
     This program is free software; you can redistribute it and/or modify
@@ -68,9 +68,9 @@ static void purge(void) {
 			for(snode = n->subnet_tree->head; snode; snode = snext) {
 				snext = snode->next;
 				s = snode->data;
-				if(!tunnelserver)
-					send_del_subnet(broadcast, s);
-				subnet_del(n, s);
+				send_del_subnet(broadcast, s);
+				if(!strictsubnets)
+					subnet_del(n, s);
 			}
 
 			for(enode = n->edge_tree->head; enode; enode = enext) {
@@ -98,7 +98,8 @@ static void purge(void) {
 					break;
 			}
 
-			if(!enode)
+			if(!enode && (!strictsubnets || !n->subnet_tree->head))
+				/* in strictsubnets mode do not delete nodes with subnets */
 				node_del(n);
 		}
 	}
@@ -303,7 +304,7 @@ static void check_network_activity(fd_set * readset, fd_set * writeset) {
 				else {
 					ifdebug(CONNECTIONS) logger(LOG_DEBUG,
 							   "Error while connecting to %s (%s): %s",
-							   c->name, c->hostname, strerror(result));
+							   c->name, c->hostname, sockstrerror(result));
 					closesocket(c->socket);
 					do_outgoing_connection(c);
 					continue;
@@ -369,17 +370,15 @@ int main_loop(void) {
 #endif
 
 		if(r < 0) {
-			if(errno != EINTR && errno != EAGAIN) {
-				logger(LOG_ERR, "Error while waiting for input: %s",
-					   strerror(errno));
+			if(!sockwouldblock(sockerrno)) {
+				logger(LOG_ERR, "Error while waiting for input: %s", sockstrerror(sockerrno));
 				dump_connections();
 				return 1;
 			}
-
-			continue;
 		}
 
-		check_network_activity(&readset, &writeset);
+		if(r > 0)
+			check_network_activity(&readset, &writeset);
 
 		if(do_purge) {
 			purge();
@@ -419,8 +418,13 @@ int main_loop(void) {
 		}
 
 		if(sigalrm) {
+			avl_node_t *node;
 			logger(LOG_INFO, "Flushing event queue");
 			expire_events();
+			for(node = connection_tree->head; node; node = node->next) {
+				connection_t *c = node->data;
+				send_ping(c);
+			}
 			sigalrm = false;
 		}
 
@@ -485,6 +489,36 @@ int main_loop(void) {
 
 			last_config_check = now;
 
+			/* If StrictSubnet is set, expire deleted Subnets and read new ones in */
+
+			if(strictsubnets) {
+				subnet_t *subnet;
+
+				for(node = subnet_tree->head; node; node = node->next) {
+					subnet = node->data;
+					subnet->expires = 1;
+				}
+
+				load_all_subnets();
+
+				for(node = subnet_tree->head; node; node = next) {
+					next = node->next;
+					subnet = node->data;
+					if(subnet->expires == 1) {
+						send_del_subnet(broadcast, subnet);
+						if(subnet->owner->status.reachable)
+							subnet_update(subnet->owner, subnet, false);
+						subnet_del(subnet->owner, subnet);
+					} else if(subnet->expires == -1) {
+						subnet->expires = 0;
+					} else {
+						send_add_subnet(broadcast, subnet);
+						if(subnet->owner->status.reachable)
+							subnet_update(subnet->owner, subnet, true);
+					}
+				}
+			}
+
 			/* Try to make outgoing connections */
 			
 			try_outgoing_connections();