X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol_subnet.c;h=b50cf6a348cd4d0367902f615d3df57e5b576552;hp=cb33ba0ac6bcb34bbb5d0c25fa7277802cfbc2b2;hb=35e87b903e08fc51975a8cc97f06251d5153a424;hpb=0e59fb022c6c015a5be7ed70e0378cb011be98b5

diff --git a/src/protocol_subnet.c b/src/protocol_subnet.c
index cb33ba0a..b50cf6a3 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.16 2003/11/10 22:31:53 guus Exp $
+    $Id$
 */
 
 #include "system.h"
@@ -35,17 +35,14 @@
 
 bool send_add_subnet(connection_t *c, const subnet_t *subnet)
 {
-	bool x;
-	char *netstr;
+	char netstr[MAXNETSTR];
 
 	cp();
 
-	x = send_request(c, "%d %lx %s %s", ADD_SUBNET, random(),
-					 subnet->owner->name, netstr = net2str(subnet));
-
-	free(netstr);
+	if(!net2str(netstr, sizeof netstr, subnet))
+		return false;
 
-	return x;
+	return send_request(c, "%d %x %s %s", ADD_SUBNET, rand(), subnet->owner->name, netstr);
 }
 
 bool add_subnet_h(connection_t *c)
@@ -53,7 +50,7 @@ bool add_subnet_h(connection_t *c)
 	char subnetstr[MAX_STRING_SIZE];
 	char name[MAX_STRING_SIZE];
 	node_t *owner;
-	subnet_t *s;
+	subnet_t s = {0}, *new;
 
 	cp();
 
@@ -63,7 +60,7 @@ bool add_subnet_h(connection_t *c)
 		return false;
 	}
 
-	/* Check if owner name is a valid */
+	/* Check if owner name is valid */
 
 	if(!check_id(name)) {
 		logger(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_SUBNET", c->name,
@@ -73,9 +70,7 @@ bool add_subnet_h(connection_t *c)
 
 	/* Check if subnet string is valid */
 
-	s = str2net(subnetstr);
-
-	if(!s) {
+	if(!str2net(&s, subnetstr)) {
 		logger(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_SUBNET", c->name,
 			   c->hostname, _("invalid subnet string"));
 		return false;
@@ -88,39 +83,70 @@ 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(c->status.opaque && owner != myself && owner != c->node)
-		return false;
-
 	/* Check if we already know this subnet */
 
-	if(lookup_subnet(owner, s)) {
-		free_subnet(s);
+	if(lookup_subnet(owner, &s))
 		return true;
-	}
 
 	/* If we don't know this subnet, but we are the owner, retaliate with a DEL_SUBNET */
 
 	if(owner == myself) {
 		ifdebug(PROTOCOL) logger(LOG_WARNING, _("Got %s from %s (%s) for ourself"),
 				   "ADD_SUBNET", c->name, c->hostname);
-		s->owner = myself;
-		send_del_subnet(c, s);
+		s.owner = myself;
+		send_del_subnet(c, &s);
 		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) {
+			logger(LOG_WARNING, _("Unauthorized %s from %s (%s) for %s"),
+				"ADD_SUBNET", c->name, c->hostname, subnetstr);
+			return false;
+		}
+
+		free_subnet(allowed);
+	}
+
 	/* If everything is correct, add the subnet to the list of the owner */
 
-	subnet_add(owner, s);
+	*(new = new_subnet()) = s;
+	subnet_add(owner, new);
+
+	if(owner->status.reachable)
+		subnet_update(owner, new, true);
 
 	/* Tell the rest */
 
-	if(!c->status.opaque)
+	if(!tunnelserver)
 		forward_request(c);
 
 	return true;
@@ -128,18 +154,14 @@ bool add_subnet_h(connection_t *c)
 
 bool send_del_subnet(connection_t *c, const subnet_t *s)
 {
-	bool x;
-	char *netstr;
+	char netstr[MAXNETSTR];
 
 	cp();
 
-	netstr = net2str(s);
-
-	x = send_request(c, "%d %lx %s %s", DEL_SUBNET, random(), s->owner->name, netstr);
-
-	free(netstr);
+	if(!net2str(netstr, sizeof netstr, s))
+		return false;
 
-	return x;
+	return send_request(c, "%d %x %s %s", DEL_SUBNET, rand(), s->owner->name, netstr);
 }
 
 bool del_subnet_h(connection_t *c)
@@ -147,7 +169,7 @@ bool del_subnet_h(connection_t *c)
 	char subnetstr[MAX_STRING_SIZE];
 	char name[MAX_STRING_SIZE];
 	node_t *owner;
-	subnet_t *s, *find;
+	subnet_t s = {0}, *find;
 
 	cp();
 
@@ -157,7 +179,7 @@ bool del_subnet_h(connection_t *c)
 		return false;
 	}
 
-	/* Check if owner name is a valid */
+	/* Check if owner name is valid */
 
 	if(!check_id(name)) {
 		logger(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_SUBNET", c->name,
@@ -165,24 +187,9 @@ bool del_subnet_h(connection_t *c)
 		return false;
 	}
 
-	/* Check if the owner of the new subnet is in the connection list */
-
-	owner = lookup_node(name);
-
-	if(!owner) {
-		ifdebug(PROTOCOL) logger(LOG_WARNING, _("Got %s from %s (%s) for %s which is not in our node tree"),
-				   "DEL_SUBNET", c->name, c->hostname, name);
-		return true;
-	}
-
-	if(c->status.opaque && owner != myself && owner != c->node)
-		return false;
-
 	/* Check if subnet string is valid */
 
-	s = str2net(subnetstr);
-
-	if(!s) {
+	if(!str2net(&s, subnetstr)) {
 		logger(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_SUBNET", c->name,
 			   c->hostname, _("invalid subnet string"));
 		return false;
@@ -191,13 +198,28 @@ bool del_subnet_h(connection_t *c)
 	if(seen_request(c->buffer))
 		return true;
 
-	/* If everything is correct, delete the subnet from the list of the owner */
+	/* Check if the owner of the subnet being deleted is in the connection list */
+
+	owner = lookup_node(name);
+
+	if(tunnelserver && owner != myself && owner != c->node) {
+		/* in case of tunnelserver, ignore indirect subnet deletion */
+		ifdebug(PROTOCOL) logger(LOG_WARNING, _("Ignoring indirect %s from %s (%s) for %s"),
+                                  "DEL_SUBNET", c->name, c->hostname, subnetstr);
+		return true;
+	}
+
+	if(!owner) {
+		ifdebug(PROTOCOL) logger(LOG_WARNING, _("Got %s from %s (%s) for %s which is not in our node tree"),
+				   "DEL_SUBNET", c->name, c->hostname, name);
+		return true;
+	}
 
-	s->owner = owner;
+	/* If everything is correct, delete the subnet from the list of the owner */
 
-	find = lookup_subnet(owner, s);
+	s.owner = owner;
 
-	free_subnet(s);
+	find = lookup_subnet(owner, &s);
 
 	if(!find) {
 		ifdebug(PROTOCOL) logger(LOG_WARNING, _("Got %s from %s (%s) for %s which does not appear in his subnet tree"),
@@ -216,11 +238,14 @@ bool del_subnet_h(connection_t *c)
 
 	/* Tell the rest */
 
-	if(!c->status.opaque)
+	if(!tunnelserver)
 		forward_request(c);
 
 	/* Finally, delete it. */
 
+	if(owner->status.reachable)
+		subnet_update(owner, find, false);
+
 	subnet_del(owner, find);
 
 	return true;