Merge branch 'master' into 1.1

[tinc] / src / protocol_subnet.c

diff --git a/src/protocol_subnet.c b/src/protocol_subnet.c
index 7098e2a..65ab6e1 100644 (file)
--- 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 */
@@ -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;
@@ -122,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;
 }
@@ -141,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;
@@ -169,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 */
@@ -198,6 +208,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;
        }
 
@@ -215,7 +227,10 @@ bool del_subnet_h(connection_t *c) {
 
        /* Tell the rest */
 
-       forward_request(c);
+       if(!tunnelserver)
+               forward_request(c, request);
+       if(strictsubnets)
+               return true;
 
        /* Finally, delete it. */