X-Git-Url: https://git.librecmc.org/?p=oweals%2Ftinc.git;a=blobdiff_plain;f=src%2Fprotocol_subnet.c;h=b50cf6a348cd4d0367902f615d3df57e5b576552;hp=e3600bdf5a5cd5a030daf678dd68cb401e5f1460;hb=35e87b903e08fc51975a8cc97f06251d5153a424;hpb=de78d79db84c486afcc353884ec1770866beb653

diff --git a/src/protocol_subnet.c b/src/protocol_subnet.c
index e3600bd..b50cf6a 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
@@ -42,7 +42,7 @@ bool send_add_subnet(connection_t *c, const subnet_t *subnet)
 	if(!net2str(netstr, sizeof netstr, subnet))
 		return false;
 
-	return send_request(c, "%d %lx %s %s", ADD_SUBNET, random(), subnet->owner->name, netstr);
+	return send_request(c, "%d %x %s %s", ADD_SUBNET, rand(), subnet->owner->name, netstr);
 }
 
 bool add_subnet_h(connection_t *c)
@@ -60,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,
@@ -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))
@@ -123,8 +127,11 @@ bool add_subnet_h(connection_t *c)
 			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);
 	}
@@ -154,7 +161,7 @@ bool send_del_subnet(connection_t *c, const subnet_t *s)
 	if(!net2str(netstr, sizeof netstr, s))
 		return false;
 
-	return send_request(c, "%d %lx %s %s", DEL_SUBNET, random(), s->owner->name, netstr);
+	return send_request(c, "%d %x %s %s", DEL_SUBNET, rand(), s->owner->name, netstr);
 }
 
 bool del_subnet_h(connection_t *c)
@@ -172,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,
@@ -180,19 +187,6 @@ 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(tunnelserver && owner != myself && owner != c->node)
-		return false;
-
 	/* Check if subnet string is valid */
 
 	if(!str2net(&s, subnetstr)) {
@@ -204,6 +198,23 @@ bool del_subnet_h(connection_t *c)
 	if(seen_request(c->buffer))
 		return true;
 
+	/* 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;
+	}
+
 	/* If everything is correct, delete the subnet from the list of the owner */
 
 	s.owner = owner;