X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol_subnet.c;h=62656c38302e8587ab10dfb4cb1f36e24ad2239e;hp=7098e2a04a2271a4f36c35d1321a89a6118f22b6;hb=c6b1643c2bcc727db4aed69bc58eb1f31903fdcf;hpb=9fed0ec34b9208611a7e96a595f23fa04e60a5c0

diff --git a/src/protocol_subnet.c b/src/protocol_subnet.c
index 7098e2a0..62656c38 100644
--- a/src/protocol_subnet.c
+++ b/src/protocol_subnet.c
@@ -45,7 +45,7 @@ bool add_subnet_h(connection_t *c) {
 	char subnetstr[MAX_STRING_SIZE];
 	char name[MAX_STRING_SIZE];
 	node_t *owner;
-	subnet_t s = {0}, *new, *old;
+	subnet_t s = {NULL}, *new, *old;
 
 	if(sscanf(c->buffer, "%*d %*x " MAX_STRING " " MAX_STRING, name, subnetstr) != 2) {
 		logger(LOG_ERR, "Got bad %s from %s (%s)", "ADD_SUBNET", c->name,
@@ -112,6 +112,15 @@ bool add_subnet_h(connection_t *c) {
 		return true;
 	}
 
+	/* Ignore if strictsubnets is true, but forward it to others */
+
+	if(strictsubnets) {
+		logger(LOG_WARNING, "Ignoring unauthorized %s from %s (%s): %s",
+				"ADD_SUBNET", c->name, c->hostname, subnetstr);
+		forward_request(c);
+		return true;
+	}
+
 	/* If everything is correct, add the subnet to the list of the owner */
 
 	*(new = new_subnet()) = s;
@@ -145,7 +154,7 @@ bool del_subnet_h(connection_t *c) {
 	char subnetstr[MAX_STRING_SIZE];
 	char name[MAX_STRING_SIZE];
 	node_t *owner;
-	subnet_t s = {0}, *find;
+	subnet_t s = {NULL}, *find;
 
 	if(sscanf(c->buffer, "%*d %*x " MAX_STRING " " MAX_STRING, name, subnetstr) != 2) {
 		logger(LOG_ERR, "Got bad %s from %s (%s)", "DEL_SUBNET", c->name,
@@ -198,6 +207,8 @@ bool del_subnet_h(connection_t *c) {
 	if(!find) {
 		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);
 		return true;
 	}
 
@@ -216,6 +227,8 @@ bool del_subnet_h(connection_t *c) {
 	/* Tell the rest */
 
 	forward_request(c);
+	if(strictsubnets)
+		return true;
 
 	/* Finally, delete it. */