X-Git-Url: https://git.librecmc.org/?p=oweals%2Ftinc.git;a=blobdiff_plain;f=src%2Fprotocol_subnet.c;h=01aed64ef3e99cf24a84ce5a7532b00483f52183;hp=79fbb4172b19f425610f2e0c50fceaf28b1899ad;hb=2116c6eb7d328c7aa3ce3da54f95367e5199d373;hpb=e169244e4b10dbcc1910c0f7fd811304d5b1a5a5 diff --git a/src/protocol_subnet.c b/src/protocol_subnet.c index 79fbb41..01aed64 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,11 +14,9 @@ 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.13 2003/07/21 14:47:43 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 "system.h" @@ -33,61 +32,59 @@ #include "utils.h" #include "xalloc.h" -int send_add_subnet(connection_t *c, subnet_t *subnet) -{ - int x; - char *netstr; - - cp(); - - 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 = {}, *new, *old; 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 -1; + logger(LOG_ERR, "Got bad %s from %s (%s)", "ADD_SUBNET", c->name, + c->hostname); + return false; } - /* Check if owner name is a valid */ + /* 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 -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) { - logger(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; + 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); @@ -96,124 +93,163 @@ 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"), - "ADD_SUBNET", c->name, c->hostname); - s->owner = myself; - send_del_subnet(c, s); - return 0; + 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, we should already know all allowed subnets */ + + if(tunnelserver) { + logger(LOG_WARNING, "Ignoring unauthorized %s from %s (%s): %s", + "ADD_SUBNET", c->name, c->hostname, subnetstr); + 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 */ - subnet_add(owner, s); + *(new = new_subnet()) = s; + subnet_add(owner, new); + + if(owner->status.reachable) { + subnet_update(owner, new, true); + } /* Tell the rest */ forward_request(c); - return 0; -} - -int send_del_subnet(connection_t *c, subnet_t *s) -{ - int x; - char *netstr; + /* Fast handoff of roaming MAC addresses */ - cp(); + if(s.type == SUBNET_MAC && owner != myself && (old = lookup_subnet(myself, &s)) && old->expires) { + old->expires = now; + } - 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 = {}, *find; 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 -1; + logger(LOG_ERR, "Got bad %s from %s (%s)", "DEL_SUBNET", c->name, + c->hostname); + return false; } - /* Check if owner name is a valid */ + /* 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 -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 */ + /* Check if subnet string is valid */ - owner = lookup_node(name); + 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(!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(seen_request(c->buffer)) { + return true; } - /* Check if subnet string is valid */ + /* Check if the owner of the subnet being deleted is in the connection list */ - s = str2net(subnetstr); + owner = lookup_node(name); - if(!s) { - logger(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"), - "DEL_SUBNET", c->name, c->hostname, name); - return 0; + 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; } /* 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); + 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; + } + + if(tunnelserver) { + return true; } /* Tell the rest */ forward_request(c); + if(strictsubnets) { + return true; + } + /* Finally, delete it. */ + if(owner->status.reachable) { + subnet_update(owner, find, false); + } + subnet_del(owner, find); - return 0; + return true; }