X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fprotocol_subnet.c;h=9c5b04c8866dca45a73ac6b5efe19380c677f63b;hb=075e6828a7533e7daa790225f17aa6bb39703278;hp=e0297b99bf5188b98c3f98066bf501042fb4794c;hpb=e3220cacb5bc79fc56167e61b7a342f88a33a479;p=meshlink

diff --git a/src/protocol_subnet.c b/src/protocol_subnet.c
index e0297b99..9c5b04c8 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.17 2003/11/17 15:30:18 guus Exp $
+    $Id$
 */
 
 #include "system.h"
@@ -35,35 +35,32 @@
 
 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)
+bool add_subnet_h(connection_t *c, char *request)
 {
 	char subnetstr[MAX_STRING_SIZE];
 	char name[MAX_STRING_SIZE];
 	node_t *owner;
-	subnet_t *s;
+	subnet_t s = {0}, *new;
 
 	cp();
 
-	if(sscanf(c->buffer, "%*d %*x " MAX_STRING " " MAX_STRING, name, subnetstr) != 2) {
+	if(sscanf(request, "%*d %*x " MAX_STRING " " MAX_STRING, name, subnetstr) != 2) {
 		logger(LOG_ERR, _("Got bad %s from %s (%s)"), "ADD_SUBNET", c->name,
 			   c->hostname);
 		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,44 +70,44 @@ 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;
 	}
 
-	if(seen_request(c->buffer))
+	if(seen_request(request))
 		return true;
 
 	/* Check if the owner of the new subnet is in the connection list */
 
 	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)) {
-		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;
 	}
 
@@ -124,62 +121,65 @@ bool add_subnet_h(connection_t *c)
 			if(!get_config_subnet(cfg, &allowed))
 				return false;
 
-			if(!subnet_compare(s, allowed))
+			if(!subnet_compare(&s, allowed))
 				break;
 
 			free_subnet(allowed);
 		}
 
-		if(!cfg)
+		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(!tunnelserver)
-		forward_request(c);
+		forward_request(c, request);
 
 	return true;
 }
 
 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)
+bool del_subnet_h(connection_t *c, char *request)
 {
 	char subnetstr[MAX_STRING_SIZE];
 	char name[MAX_STRING_SIZE];
 	node_t *owner;
-	subnet_t *s, *find;
+	subnet_t s = {0}, *find;
 
 	cp();
 
-	if(sscanf(c->buffer, "%*d %*x " MAX_STRING " " MAX_STRING, name, subnetstr) != 2) {
+	if(sscanf(request, "%*d %*x " MAX_STRING " " MAX_STRING, name, subnetstr) != 2) {
 		logger(LOG_ERR, _("Got bad %s from %s (%s)"), "DEL_SUBNET", c->name,
 			   c->hostname);
 		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,
@@ -187,39 +187,39 @@ 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);
+	/* Check if subnet string is valid */
 
-	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(!str2net(&s, subnetstr)) {
+		logger(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_SUBNET", c->name,
+			   c->hostname, _("invalid subnet string"));
+		return false;
 	}
 
-	if(tunnelserver && owner != myself && owner != c->node)
-		return false;
+	if(seen_request(request))
+		return true;
 
-	/* Check if subnet string is valid */
+	/* Check if the owner of the subnet being deleted is in the connection list */
 
-	s = str2net(subnetstr);
+	owner = lookup_node(name);
 
-	if(!s) {
-		logger(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_SUBNET", c->name,
-			   c->hostname, _("invalid subnet string"));
-		return false;
+	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(seen_request(c->buffer))
+	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 everything is correct, delete the subnet from the list of the owner */
 
-	s->owner = owner;
+	s.owner = owner;
 
-	find = lookup_subnet(owner, s);
-
-	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"),
@@ -239,10 +239,13 @@ bool del_subnet_h(connection_t *c)
 	/* Tell the rest */
 
 	if(!tunnelserver)
-		forward_request(c);
+		forward_request(c, request);
 
 	/* Finally, delete it. */
 
+	if(owner->status.reachable)
+		subnet_update(owner, find, false);
+
 	subnet_del(owner, find);
 
 	return true;