Update copyright notices.

[tinc] / src / protocol_subnet.c

diff --git a/src/protocol_subnet.c b/src/protocol_subnet.c
index cb33ba0..f15a175 100644 (file)
--- 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-2003 Ivo Timmermans <ivo@o2w.nl>,
-                  2000-2003 Guus Sliepen <guus@sliepen.eu.org>
+    Copyright (C) 1999-2005 Ivo Timmermans <ivo@tinc-vpn.org>,
+                  2000-2005 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
@@ -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.16 2003/11/10 22:31:53 guus Exp $
+    $Id$
 */
 
 #include "system.h"
@@ -35,17 +35,14 @@
 
 bool send_add_subnet(connection_t *c, const subnet_t *subnet)
 {
-       bool x;
-       char *netstr;
+       char netstr[MAXNETSTR];
 
        cp();
 
-       x = send_request(c, "%d %lx %s %s", ADD_SUBNET, random(),
-                                        subnet->owner->name, netstr = net2str(subnet));
-
-       free(netstr);
+       if(!net2str(netstr, sizeof netstr, subnet))
+               return false;
 
-       return x;
+       return send_request(c, "%d %lx %s %s", ADD_SUBNET, random(), subnet->owner->name, netstr);
 }
 
 bool add_subnet_h(connection_t *c)
@@ -53,7 +50,7 @@ bool add_subnet_h(connection_t *c)
        char subnetstr[MAX_STRING_SIZE];
        char name[MAX_STRING_SIZE];
        node_t *owner;
-       subnet_t *s;
+       subnet_t s = {0}, *new;
 
        cp();
 
@@ -73,9 +70,7 @@ bool add_subnet_h(connection_t *c)
 
        /* Check if subnet string is valid */
 
-       s = str2net(subnetstr);
-
-       if(!s) {
+       if(!str2net(&s, subnetstr)) {
                logger(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_SUBNET", c->name,
                           c->hostname, _("invalid subnet string"));
                return false;
@@ -94,33 +89,57 @@ bool add_subnet_h(connection_t *c)
                node_add(owner);
        }
 
-       if(c->status.opaque && owner != myself && owner != c->node)
+       if(tunnelserver && owner != myself && owner != c->node)
                return false;
 
        /* Check if we already know this subnet */
 
-       if(lookup_subnet(owner, s)) {
-               free_subnet(s);
+       if(lookup_subnet(owner, &s))
                return true;
-       }
 
        /* If we don't know this subnet, but we are the owner, retaliate with a DEL_SUBNET */
 
        if(owner == myself) {
                ifdebug(PROTOCOL) logger(LOG_WARNING, _("Got %s from %s (%s) for ourself"),
                                   "ADD_SUBNET", c->name, c->hostname);
-               s->owner = myself;
-               send_del_subnet(c, s);
+               s.owner = myself;
+               send_del_subnet(c, &s);
                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 */
 
-       subnet_add(owner, s);
+       *(new = new_subnet()) = s;
+       subnet_add(owner, new);
+
+       if(owner->status.reachable)
+               subnet_update(owner, new, true);
 
        /* Tell the rest */
 
-       if(!c->status.opaque)
+       if(!tunnelserver)
                forward_request(c);
 
        return true;
@@ -128,18 +147,14 @@ bool add_subnet_h(connection_t *c)
 
 bool send_del_subnet(connection_t *c, const subnet_t *s)
 {
-       bool x;
-       char *netstr;
+       char netstr[MAXNETSTR];
 
        cp();
 
-       netstr = net2str(s);
-
-       x = send_request(c, "%d %lx %s %s", DEL_SUBNET, random(), s->owner->name, netstr);
-
-       free(netstr);
+       if(!net2str(netstr, sizeof netstr, s))
+               return false;
 
-       return x;
+       return send_request(c, "%d %lx %s %s", DEL_SUBNET, random(), s->owner->name, netstr);
 }
 
 bool del_subnet_h(connection_t *c)
@@ -147,7 +162,7 @@ bool del_subnet_h(connection_t *c)
        char subnetstr[MAX_STRING_SIZE];
        char name[MAX_STRING_SIZE];
        node_t *owner;
-       subnet_t *s, *find;
+       subnet_t s = {0}, *find;
 
        cp();
 
@@ -175,14 +190,12 @@ bool del_subnet_h(connection_t *c)
                return true;
        }
 
-       if(c->status.opaque && owner != myself && owner != c->node)
+       if(tunnelserver && owner != myself && owner != c->node)
                return false;
 
        /* Check if subnet string is valid */
 
-       s = str2net(subnetstr);
-
-       if(!s) {
+       if(!str2net(&s, subnetstr)) {
                logger(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_SUBNET", c->name,
                           c->hostname, _("invalid subnet string"));
                return false;
@@ -193,11 +206,9 @@ bool del_subnet_h(connection_t *c)
 
        /* If everything is correct, delete the subnet from the list of the owner */
 
-       s->owner = owner;
+       s.owner = owner;
 
-       find = lookup_subnet(owner, s);
-
-       free_subnet(s);
+       find = lookup_subnet(owner, &s);
 
        if(!find) {
                ifdebug(PROTOCOL) logger(LOG_WARNING, _("Got %s from %s (%s) for %s which does not appear in his subnet tree"),
@@ -216,11 +227,14 @@ bool del_subnet_h(connection_t *c)
 
        /* Tell the rest */
 
-       if(!c->status.opaque)
+       if(!tunnelserver)
                forward_request(c);
 
        /* Finally, delete it. */
 
+       if(owner->status.reachable)
+               subnet_update(owner, find, false);
+
        subnet_del(owner, find);
 
        return true;