X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol_subnet.c;h=6e7d706e153171f484c829047e57c6c854bec129;hp=76cdd49ab03a81893065efe5e7b71add5c9e894b;hb=3308d13e7e3bf20cfeaf6f2ab17228a9820cea66;hpb=5a1406adefd8b51981af0da5ac0ebec830eb43b4

diff --git a/src/protocol_subnet.c b/src/protocol_subnet.c
index 76cdd49a..6e7d706e 100644
--- a/src/protocol_subnet.c
+++ b/src/protocol_subnet.c
@@ -1,7 +1,7 @@
 /*
     protocol_subnet.c -- handle the meta-protocol, subnets
-    Copyright (C) 1999-2003 Ivo Timmermans <ivo@o2w.nl>,
-                  2000-2003 Guus Sliepen <guus@sliepen.eu.org>
+    Copyright (C) 1999-2005 Ivo Timmermans,
+                  2000-2009 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: protocol_subnet.c,v 1.1.4.18 2003/12/12 19:52:25 guus Exp $
+    $Id$
 */
 
 #include "system.h"
@@ -83,15 +83,19 @@ bool add_subnet_h(connection_t *c)
 
 	owner = lookup_node(name);
 
+	if(tunnelserver && owner != myself && owner != c->node) {
+		/* in case of tunnelserver, ignore indirect subnet registrations */
+		ifdebug(PROTOCOL) logger(LOG_WARNING, _("Ignoring indirect %s from %s (%s) for %s"),
+				   "ADD_SUBNET", c->name, c->hostname, subnetstr);
+		return true;
+	}
+
 	if(!owner) {
 		owner = new_node();
 		owner->name = xstrdup(name);
 		node_add(owner);
 	}
 
-	if(tunnelserver && owner != myself && owner != c->node)
-		return false;
-
 	/* Check if we already know this subnet */
 
 	if(lookup_subnet(owner, &s))
@@ -134,6 +138,9 @@ bool add_subnet_h(connection_t *c)
 	*(new = new_subnet()) = s;
 	subnet_add(owner, new);
 
+	if(owner->status.reachable)
+		subnet_update(owner, new, true);
+
 	/* Tell the rest */
 
 	if(!tunnelserver)
@@ -229,6 +236,9 @@ bool del_subnet_h(connection_t *c)
 
 	/* Finally, delete it. */
 
+	if(owner->status.reachable)
+		subnet_update(owner, find, false);
+
 	subnet_del(owner, find);
 
 	return true;