X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol_subnet.c;h=f7ce53b961de88a0edd4ad1205c181a7c8417e0e;hp=c0a351f2b9d7f0c5c7a521853085ea352dfec02f;hb=5cddf5e52aeb20e50c887356ad23aec354e04151;hpb=5db596c6844169f1eb5f804b72abe99d067aaa5a diff --git a/src/protocol_subnet.c b/src/protocol_subnet.c index c0a351f2..f7ce53b9 100644 --- a/src/protocol_subnet.c +++ b/src/protocol_subnet.c @@ -1,7 +1,8 @@ /* protocol_subnet.c -- handle the meta-protocol, subnets - Copyright (C) 1999-2003 Ivo Timmermans , - 2000-2003 Guus Sliepen + Copyright (C) 1999-2005 Ivo Timmermans, + 2000-2009 Guus Sliepen + 2009 Michael Tokarev 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 @@ -13,91 +14,75 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - 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.11 2003/07/12 17:41:47 guus Exp $ + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" - -#include -#include -#include -#include -#include - -#include -#include -#include +#include "system.h" #include "conf.h" +#include "connection.h" +#include "logger.h" #include "net.h" #include "netutl.h" -#include "protocol.h" -#include "meta.h" -#include "connection.h" #include "node.h" -#include "logger.h" - -#include "system.h" - -int send_add_subnet(connection_t *c, subnet_t *subnet) -{ - int x; - char *netstr; - - cp(); +#include "protocol.h" +#include "subnet.h" +#include "utils.h" +#include "xalloc.h" - x = send_request(c, "%d %lx %s %s", ADD_SUBNET, random(), - subnet->owner->name, netstr = net2str(subnet)); +bool send_add_subnet(connection_t *c, const subnet_t *subnet) { + char netstr[MAXNETSTR]; - free(netstr); + if(!net2str(netstr, sizeof netstr, subnet)) + return false; - return x; + return send_request(c, "%d %x %s %s", ADD_SUBNET, rand(), subnet->owner->name, netstr); } -int add_subnet_h(connection_t *c) -{ +bool add_subnet_h(connection_t *c) { char subnetstr[MAX_STRING_SIZE]; char name[MAX_STRING_SIZE]; node_t *owner; - subnet_t *s; - - cp(); + subnet_t s = {0}, *new; 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 */ + /* Check if owner name is valid */ - if(check_id(name)) { - syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_SUBNET", c->name, - c->hostname, _("invalid name")); - return -1; + if(!check_id(name)) { + logger(LOG_ERR, "Got bad %s from %s (%s): %s", "ADD_SUBNET", c->name, + c->hostname, "invalid name"); + return false; } /* Check if subnet string is valid */ - s = str2net(subnetstr); - - if(!s) { - syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_SUBNET", c->name, - c->hostname, _("invalid subnet string")); - return -1; + 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; } if(seen_request(c->buffer)) - return 0; + return true; /* Check if the owner of the new subnet is in the connection list */ owner = lookup_node(name); + if(tunnelserver && owner != myself && owner != c->node) { + /* in case of tunnelserver, ignore indirect subnet registrations */ + ifdebug(PROTOCOL) logger(LOG_WARNING, "Ignoring indirect %s from %s (%s) for %s", + "ADD_SUBNET", c->name, c->hostname, subnetstr); + return true; + } + if(!owner) { owner = new_node(); owner->name = xstrdup(name); @@ -106,124 +91,149 @@ int add_subnet_h(connection_t *c) /* Check if we already know this subnet */ - if(lookup_subnet(owner, s)) { - free_subnet(s); - return 0; - } + 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"), + 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); - return 0; + s.owner = myself; + send_del_subnet(c, &s); + return true; } - /* If everything is correct, add the subnet to the list of the owner */ + /* In tunnel server mode, check if the subnet matches one in the config file of this node */ - subnet_add(owner, s); + if(tunnelserver) { + config_t *cfg; + subnet_t *allowed; - /* Tell the rest */ + for(cfg = lookup_config(c->config_tree, "Subnet"); cfg; cfg = lookup_config_next(c->config_tree, cfg)) { + if(!get_config_subnet(cfg, &allowed)) + continue; - forward_request(c); + if(!subnet_compare(&s, allowed)) + break; - return 0; -} + free_subnet(allowed); + } + + if(!cfg) { + logger(LOG_WARNING, "Ignoring unauthorized %s from %s (%s): %s", + "ADD_SUBNET", c->name, c->hostname, subnetstr); + return true; + } + + free_subnet(allowed); + } + + /* If everything is correct, add the subnet to the list of the owner */ -int send_del_subnet(connection_t *c, subnet_t *s) -{ - int x; - char *netstr; + *(new = new_subnet()) = s; + subnet_add(owner, new); + + if(owner->status.reachable) + subnet_update(owner, new, true); + + /* Tell the rest */ - cp(); + if(!tunnelserver) + forward_request(c); - netstr = net2str(s); + return true; +} - x = send_request(c, "%d %lx %s %s", DEL_SUBNET, random(), s->owner->name, netstr); +bool send_del_subnet(connection_t *c, const subnet_t *s) { + char netstr[MAXNETSTR]; - free(netstr); + if(!net2str(netstr, sizeof netstr, s)) + return false; - return x; + return send_request(c, "%d %x %s %s", DEL_SUBNET, rand(), s->owner->name, netstr); } -int del_subnet_h(connection_t *c) -{ +bool del_subnet_h(connection_t *c) { char subnetstr[MAX_STRING_SIZE]; char name[MAX_STRING_SIZE]; node_t *owner; - subnet_t *s, *find; - - cp(); + subnet_t s = {0}, *find; 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 */ + /* Check if owner name is valid */ - if(check_id(name)) { - syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_SUBNET", c->name, - c->hostname, _("invalid name")); - return -1; + if(!check_id(name)) { + logger(LOG_ERR, "Got bad %s from %s (%s): %s", "DEL_SUBNET", c->name, + c->hostname, "invalid name"); + return false; } - /* Check if the owner of the new subnet is in the connection list */ - - owner = lookup_node(name); + /* Check if subnet string is valid */ - 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; + 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; } - /* Check if subnet string is valid */ + if(seen_request(c->buffer)) + return true; + + /* Check if the owner of the subnet being deleted is in the connection list */ - s = str2net(subnetstr); + owner = lookup_node(name); - if(!s) { - syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_SUBNET", c->name, - c->hostname, _("invalid subnet string")); - return -1; + if(tunnelserver && owner != myself && owner != c->node) { + /* in case of tunnelserver, ignore indirect subnet deletion */ + ifdebug(PROTOCOL) logger(LOG_WARNING, "Ignoring indirect %s from %s (%s) for %s", + "DEL_SUBNET", c->name, c->hostname, subnetstr); + return true; } - if(seen_request(c->buffer)) - return 0; + 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 true; + } /* If everything is correct, delete the subnet from the list of the owner */ - s->owner = owner; - - find = lookup_subnet(owner, s); + s.owner = owner; - 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"), + 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 */ if(owner == myself) { - ifdebug(PROTOCOL) logger(LOG_WARNING, _("Got %s from %s (%s) for ourself"), + 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. */ + if(owner->status.reachable) + subnet_update(owner, find, false); + subnet_del(owner, find); - return 0; + return true; }