X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Fprotocol_subnet.c;h=00cdde67a994014fa95fca8ce63ba26e705e384d;hp=b1d71ab767abf4fd0920d04d8c4325cb24da9a0c;hb=08aabbf9317806bc50a9a6693ca866c8936ce26b;hpb=551cd19406a560d0d206bff5b4e9da064ec222b6

diff --git a/src/protocol_subnet.c b/src/protocol_subnet.c
index b1d71ab7..00cdde67 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-2005 Ivo Timmermans,
-                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
+                  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
@@ -83,15 +83,19 @@ bool add_subnet_h(connection_t *c, char *request)
 
 	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))