Replace Opaque and Strict options with a TunnelServer option.

[tinc] / src / protocol_subnet.c

diff --git a/src/protocol_subnet.c b/src/protocol_subnet.c
index f29bdbe..e0297b9 100644 (file)
--- a/src/protocol_subnet.c
+++ b/src/protocol_subnet.c
@@ -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.12 2003/07/17 15:06:27 guus Exp $
+    $Id: protocol_subnet.c,v 1.1.4.17 2003/11/17 15:30:18 guus Exp $
 */
 
 #include "system.h"
@@ -33,9 +33,9 @@
 #include "utils.h"
 #include "xalloc.h"
 
-int send_add_subnet(connection_t *c, subnet_t *subnet)
+bool send_add_subnet(connection_t *c, const subnet_t *subnet)
 {
-       int x;
+       bool x;
        char *netstr;
 
        cp();
@@ -48,7 +48,7 @@ int send_add_subnet(connection_t *c, subnet_t *subnet)
        return x;
 }
 
-int add_subnet_h(connection_t *c)
+bool add_subnet_h(connection_t *c)
 {
        char subnetstr[MAX_STRING_SIZE];
        char name[MAX_STRING_SIZE];
@@ -58,17 +58,17 @@ int add_subnet_h(connection_t *c)
        cp();
 
        if(sscanf(c->buffer, "%*d %*x " MAX_STRING " " MAX_STRING, name, subnetstr) != 2) {
-               syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "ADD_SUBNET", c->name,
+               logger(LOG_ERR, _("Got bad %s from %s (%s)"), "ADD_SUBNET", c->name,
                           c->hostname);
-               return -1;
+               return false;
        }
 
        /* Check if owner name is a valid */
 
-       if(check_id(name)) {
-               syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_SUBNET", c->name,
+       if(!check_id(name)) {
+               logger(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_SUBNET", c->name,
                           c->hostname, _("invalid name"));
-               return -1;
+               return false;
        }
 
        /* Check if subnet string is valid */
@@ -76,13 +76,13 @@ int add_subnet_h(connection_t *c)
        s = str2net(subnetstr);
 
        if(!s) {
-               syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_SUBNET", c->name,
+               logger(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_SUBNET", c->name,
                           c->hostname, _("invalid subnet string"));
-               return -1;
+               return false;
        }
 
        if(seen_request(c->buffer))
-               return 0;
+               return true;
 
        /* Check if the owner of the new subnet is in the connection list */
 
@@ -94,11 +94,14 @@ int add_subnet_h(connection_t *c)
                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);
-               return 0;
+               return true;
        }
 
        /* If we don't know this subnet, but we are the owner, retaliate with a DEL_SUBNET */
@@ -108,7 +111,29 @@ int add_subnet_h(connection_t *c)
                                   "ADD_SUBNET", c->name, c->hostname);
                s->owner = myself;
                send_del_subnet(c, s);
-               return 0;
+               return true;
+       }
+
+       /* In tunnel server mode, check if the subnet matches one in the config file of this node */
+
+       if(tunnelserver) {
+               config_t *cfg;
+               subnet_t *allowed;
+
+               for(cfg = lookup_config(c->config_tree, "Subnet"); cfg; cfg = lookup_config_next(c->config_tree, cfg)) {
+                       if(!get_config_subnet(cfg, &allowed))
+                               return false;
+
+                       if(!subnet_compare(s, allowed))
+                               break;
+
+                       free_subnet(allowed);
+               }
+
+               if(!cfg)
+                       return false;
+
+               free_subnet(allowed);
        }
 
        /* If everything is correct, add the subnet to the list of the owner */
@@ -117,14 +142,15 @@ int add_subnet_h(connection_t *c)
 
        /* Tell the rest */
 
-       forward_request(c);
+       if(!tunnelserver)
+               forward_request(c);
 
-       return 0;
+       return true;
 }
 
-int send_del_subnet(connection_t *c, subnet_t *s)
+bool send_del_subnet(connection_t *c, const subnet_t *s)
 {
-       int x;
+       bool x;
        char *netstr;
 
        cp();
@@ -138,7 +164,7 @@ int send_del_subnet(connection_t *c, subnet_t *s)
        return x;
 }
 
-int del_subnet_h(connection_t *c)
+bool del_subnet_h(connection_t *c)
 {
        char subnetstr[MAX_STRING_SIZE];
        char name[MAX_STRING_SIZE];
@@ -148,17 +174,17 @@ int del_subnet_h(connection_t *c)
        cp();
 
        if(sscanf(c->buffer, "%*d %*x " MAX_STRING " " MAX_STRING, name, subnetstr) != 2) {
-               syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "DEL_SUBNET", c->name,
+               logger(LOG_ERR, _("Got bad %s from %s (%s)"), "DEL_SUBNET", c->name,
                           c->hostname);
-               return -1;
+               return false;
        }
 
        /* Check if owner name is a valid */
 
-       if(check_id(name)) {
-               syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_SUBNET", c->name,
+       if(!check_id(name)) {
+               logger(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_SUBNET", c->name,
                           c->hostname, _("invalid name"));
-               return -1;
+               return false;
        }
 
        /* Check if the owner of the new subnet is in the connection list */
@@ -168,21 +194,24 @@ int del_subnet_h(connection_t *c)
        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 0;
+               return true;
        }
 
+       if(tunnelserver && owner != myself && owner != c->node)
+               return false;
+
        /* Check if subnet string is valid */
 
        s = str2net(subnetstr);
 
        if(!s) {
-               syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_SUBNET", c->name,
+               logger(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_SUBNET", c->name,
                           c->hostname, _("invalid subnet string"));
-               return -1;
+               return false;
        }
 
        if(seen_request(c->buffer))
-               return 0;
+               return true;
 
        /* If everything is correct, delete the subnet from the list of the owner */
 
@@ -195,7 +224,7 @@ int 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);
-               return 0;
+               return true;
        }
 
        /* If we are the owner of this subnet, retaliate with an ADD_SUBNET */
@@ -204,16 +233,17 @@ int del_subnet_h(connection_t *c)
                ifdebug(PROTOCOL) logger(LOG_WARNING, _("Got %s from %s (%s) for ourself"),
                                   "DEL_SUBNET", c->name, c->hostname);
                send_add_subnet(c, find);
-               return 0;
+               return true;
        }
 
        /* Tell the rest */
 
-       forward_request(c);
+       if(!tunnelserver)
+               forward_request(c);
 
        /* Finally, delete it. */
 
        subnet_del(owner, find);
 
-       return 0;
+       return true;
 }