X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol_subnet.c;h=d40b3a33afe255f02439953769ec8a71fbe51342;hp=fbb021d1bacf3b27d8663cec95f8cbe80dde7fb7;hb=a8a65cee083a27afe42cab360596e1453e7141b9;hpb=5bf4b88666ecafe190e8ed71d6c14c9de8d16e1f diff --git a/src/protocol_subnet.c b/src/protocol_subnet.c index fbb021d1..d40b3a33 100644 --- 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-2002 Ivo Timmermans , - 2000-2002 Guus Sliepen + Copyright (C) 1999-2005 Ivo Timmermans, + 2000-2009 Guus Sliepen 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,215 +17,236 @@ 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.1 2002/02/11 10:05:58 guus Exp $ + $Id$ */ -#include "config.h" - -#include -#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 "edge.h" -#include "graph.h" - -#include "system.h" +#include "protocol.h" +#include "subnet.h" +#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; - char *netstr; -cp - x = send_request(c, "%d %s %s", ADD_SUBNET, - subnet->owner->name, netstr = net2str(subnet)); - free(netstr); -cp - return x; + char netstr[MAXNETSTR]; + + cp(); + + if(!net2str(netstr, sizeof netstr, subnet)) + return false; + + return send_request(c, "%d %lx %s %s", ADD_SUBNET, random(), 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; - connection_t *other; - subnet_t *s; - avl_node_t *node; -cp - if(sscanf(c->buffer, "%*d "MAX_STRING" "MAX_STRING, name, subnetstr) != 2) - { - syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "ADD_SUBNET", c->name, c->hostname); - return -1; - } - - /* 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, c->hostname, _("invalid name")); - return -1; - } - - /* Check if subnet string is valid */ - - if(!(s = str2net(subnetstr))) - { - syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_SUBNET", c->name, c->hostname, _("invalid subnet string")); - return -1; - } - - /* Check if the owner of the new subnet is in the connection list */ - - owner = lookup_node(name); - - if(!owner) - { - owner = new_node(); - owner->name = xstrdup(name); - node_add(owner); - } - - /* Check if we already know this subnet */ - - if(lookup_subnet(owner, s)) - { - free_subnet(s); - return 0; - } - - /* If we don't know this subnet, but we are the owner, retaliate with a DEL_SUBNET */ - - if(owner == myself) - { - if(debug_lvl >= DEBUG_PROTOCOL) - syslog(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; - } - - /* If everything is correct, add the subnet to the list of the owner */ - - subnet_add(owner, s); - - /* Tell the rest */ - - for(node = connection_tree->head; node; node = node->next) - { - other = (connection_t *)node->data; - if(other->status.active && other != c) - send_add_subnet(other, s); - } -cp - return 0; + char subnetstr[MAX_STRING_SIZE]; + char name[MAX_STRING_SIZE]; + node_t *owner; + subnet_t s = {0}, *new; + + cp(); + + 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, + c->hostname); + return false; + } + + /* Check if owner name is valid */ + + 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 */ + + 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 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); + node_add(owner); + } + + /* Check if we already know this subnet */ + + 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); + 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) { + logger(LOG_WARNING, _("Unauthorized %s from %s (%s) for %s"), + "ADD_SUBNET", c->name, c->hostname, subnetstr); + return false; + } + + free_subnet(allowed); + } + + /* If everything is correct, add the subnet to the list of the owner */ + + *(new = new_subnet()) = s; + subnet_add(owner, new); + + if(owner->status.reachable) + subnet_update(owner, new, true); + + /* Tell the rest */ + + if(!tunnelserver) + forward_request(c); + + 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; - char *netstr; -cp - netstr = net2str(s); - x = send_request(c, "%d %s %s", DEL_SUBNET, s->owner->name, netstr); - free(netstr); -cp - return x; + char netstr[MAXNETSTR]; + + cp(); + + if(!net2str(netstr, sizeof netstr, s)) + return false; + + return send_request(c, "%d %lx %s %s", DEL_SUBNET, random(), 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; - connection_t *other; - subnet_t *s, *find; - avl_node_t *node; -cp - if(sscanf(c->buffer, "%*d "MAX_STRING" "MAX_STRING, name, subnetstr) != 2) - { - syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "DEL_SUBNET", c->name, c->hostname); - return -1; - } - - /* 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, c->hostname, _("invalid name")); - return -1; - } - - /* Check if the owner of the new subnet is in the connection list */ - - if(!(owner = lookup_node(name))) - { - if(debug_lvl >= DEBUG_PROTOCOL) - syslog(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; - } - - /* Check if subnet string is valid */ - - if(!(s = str2net(subnetstr))) - { - syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_SUBNET", c->name, c->hostname, _("invalid subnet string")); - return -1; - } - - /* If everything is correct, delete the subnet from the list of the owner */ - - s->owner = owner; - - find = lookup_subnet(owner, s); - - free_subnet(s); - - if(!find) - { - if(debug_lvl >= DEBUG_PROTOCOL) - syslog(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; - } - - /* If we are the owner of this subnet, retaliate with an ADD_SUBNET */ - - if(owner == myself) - { - if(debug_lvl >= DEBUG_PROTOCOL) - syslog(LOG_WARNING, _("Got %s from %s (%s) for ourself"), "DEL_SUBNET", c->name, c->hostname); - send_add_subnet(c, find); - return 0; - } - - /* Tell the rest */ - - for(node = connection_tree->head; node; node = node->next) - { - other = (connection_t *)node->data; - if(other->status.active && other != c) - send_del_subnet(other, find); - } - - /* Finally, delete it. */ - - subnet_del(owner, find); - -cp - return 0; + char subnetstr[MAX_STRING_SIZE]; + char name[MAX_STRING_SIZE]; + node_t *owner; + subnet_t s = {0}, *find; + + cp(); + + 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, + c->hostname); + return false; + } + + /* Check if owner name is valid */ + + 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 subnet string is valid */ + + 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; + } + + if(seen_request(c->buffer)) + return true; + + /* Check if the owner of the subnet being deleted is in the connection list */ + + owner = lookup_node(name); + + 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(!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); + + 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 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"), + "DEL_SUBNET", c->name, c->hostname); + send_add_subnet(c, find); + return true; + } + + /* Tell the rest */ + + if(!tunnelserver) + forward_request(c); + + /* Finally, delete it. */ + + if(owner->status.reachable) + subnet_update(owner, find, false); + + subnet_del(owner, find); + + return true; }