X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprotocol_subnet.c;h=d509c2ba47b4747049c0563908c66264a5147ad9;hb=refs%2Fheads%2F1.1-threads;hp=9ae491d0533b276ac409b87fc4be0559439d268b;hpb=f2346771cf5b22092dd3f5af3674008aa1e878d1;p=tinc

diff --git a/src/protocol_subnet.c b/src/protocol_subnet.c
index 9ae491d0..d509c2ba 100644
--- a/src/protocol_subnet.c
+++ b/src/protocol_subnet.c
@@ -41,13 +41,13 @@ bool send_add_subnet(connection_t *c, const subnet_t *subnet) {
 	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 = {0}, *new, *old;
 
-	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;
@@ -69,7 +69,7 @@ bool add_subnet_h(connection_t *c) {
 		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 */
@@ -117,7 +117,7 @@ bool add_subnet_h(connection_t *c) {
 	if(strictsubnets) {
 		logger(LOG_WARNING, "Ignoring unauthorized %s from %s (%s): %s",
 				"ADD_SUBNET", c->name, c->hostname, subnetstr);
-		forward_request(c);
+		forward_request(c, request);
 		return true;
 	}
 
@@ -131,12 +131,13 @@ bool add_subnet_h(connection_t *c) {
 
 	/* Tell the rest */
 
-	forward_request(c);
+	if(!tunnelserver)
+		forward_request(c, request);
 
 	/* Fast handoff of roaming MAC addresses */
 
 	if(s.type == SUBNET_MAC && owner != myself && (old = lookup_subnet(myself, &s)) && old->expires)
-		old->expires = now;
+		old->expires = 1;
 
 	return true;
 }
@@ -150,13 +151,13 @@ bool send_del_subnet(connection_t *c, const subnet_t *s) {
 	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 = {0}, *find;
 
-	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;
@@ -178,7 +179,7 @@ bool del_subnet_h(connection_t *c) {
 		return false;
 	}
 
-	if(seen_request(c->buffer))
+	if(seen_request(request))
 		return true;
 
 	/* Check if the owner of the subnet being deleted is in the connection list */
@@ -208,7 +209,7 @@ bool del_subnet_h(connection_t *c) {
 		ifdebug(PROTOCOL) logger(LOG_WARNING, "Got %s from %s (%s) for %s which does not appear in his subnet tree",
 				   "DEL_SUBNET", c->name, c->hostname, name);
 		if(strictsubnets)
-			forward_request(c);
+			forward_request(c, request);
 		return true;
 	}
 
@@ -226,7 +227,8 @@ bool del_subnet_h(connection_t *c) {
 
 	/* Tell the rest */
 
-	forward_request(c);
+	if(!tunnelserver)
+		forward_request(c, request);
 	if(strictsubnets)
 		return true;