X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol_subnet.c;h=e0297b99bf5188b98c3f98066bf501042fb4794c;hp=bb2f2deff80407255141b0838bec654451e253db;hb=e3220cacb5bc79fc56167e61b7a342f88a33a479;hpb=83263b74460656ba557fd9bb84dc27258549e9cd

diff --git a/src/protocol_subnet.c b/src/protocol_subnet.c
index bb2f2def..e0297b99 100644
--- a/src/protocol_subnet.c
+++ b/src/protocol_subnet.c
@@ -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.15 2003/07/24 12:08:16 guus Exp $
+    $Id: protocol_subnet.c,v 1.1.4.17 2003/11/17 15:30:18 guus Exp $
 */
 
 #include "system.h"
@@ -94,6 +94,9 @@ bool add_subnet_h(connection_t *c)
 		node_add(owner);
 	}
 
+	if(tunnelserver && owner != myself && owner != c->node)
+		return false;
+
 	/* Check if we already know this subnet */
 
 	if(lookup_subnet(owner, s)) {
@@ -111,13 +114,36 @@ bool add_subnet_h(connection_t *c)
 		return true;
 	}
 
+	/* In tunnel server mode, check if the subnet matches one in the config file of this node */
+
+	if(tunnelserver) {
+		config_t *cfg;
+		subnet_t *allowed;
+
+		for(cfg = lookup_config(c->config_tree, "Subnet"); cfg; cfg = lookup_config_next(c->config_tree, cfg)) {
+			if(!get_config_subnet(cfg, &allowed))
+				return false;
+
+			if(!subnet_compare(s, allowed))
+				break;
+
+			free_subnet(allowed);
+		}
+
+		if(!cfg)
+			return false;
+
+		free_subnet(allowed);
+	}
+
 	/* If everything is correct, add the subnet to the list of the owner */
 
 	subnet_add(owner, s);
 
 	/* Tell the rest */
 
-	forward_request(c);
+	if(!tunnelserver)
+		forward_request(c);
 
 	return true;
 }
@@ -171,6 +197,9 @@ bool del_subnet_h(connection_t *c)
 		return true;
 	}
 
+	if(tunnelserver && owner != myself && owner != c->node)
+		return false;
+
 	/* Check if subnet string is valid */
 
 	s = str2net(subnetstr);
@@ -209,7 +238,8 @@ bool del_subnet_h(connection_t *c)
 
 	/* Tell the rest */
 
-	forward_request(c);
+	if(!tunnelserver)
+		forward_request(c);
 
 	/* Finally, delete it. */