projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix infinite loop in timeout handling on Windows.
[tinc]
/
src
/
protocol_subnet.c
diff --git
a/src/protocol_subnet.c
b/src/protocol_subnet.c
index
3e5dadd
..
06dafbc
100644
(file)
--- 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-2005 Ivo Timmermans,
/*
protocol_subnet.c -- handle the meta-protocol, subnets
Copyright (C) 1999-2005 Ivo Timmermans,
- 2000-2009 Guus Sliepen <guus@tinc-vpn.org>
+ 2000-2012 Guus Sliepen <guus@tinc-vpn.org>
+ 2009 Michael Tokarev <mjt@tls.msk.ru>
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
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.
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$
+ 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"
*/
#include "system.h"
@@
-33,29
+32,23
@@
#include "utils.h"
#include "xalloc.h"
#include "utils.h"
#include "xalloc.h"
-bool send_add_subnet(connection_t *c, const subnet_t *subnet)
-{
+bool send_add_subnet(connection_t *c, const subnet_t *subnet) {
char netstr[MAXNETSTR];
char netstr[MAXNETSTR];
- cp();
-
if(!net2str(netstr, sizeof netstr, subnet))
return false;
if(!net2str(netstr, sizeof netstr, subnet))
return false;
- return send_request(c, "%d %
lx %s %s", ADD_SUBNET, random
(), subnet->owner->name, netstr);
+ return send_request(c, "%d %
x %s %s", ADD_SUBNET, rand
(), subnet->owner->name, netstr);
}
}
-bool add_subnet_h(connection_t *c)
-{
+bool add_subnet_h(connection_t *c, const char *request) {
char subnetstr[MAX_STRING_SIZE];
char name[MAX_STRING_SIZE];
node_t *owner;
char subnetstr[MAX_STRING_SIZE];
char name[MAX_STRING_SIZE];
node_t *owner;
- subnet_t s = {
0}, *new
;
+ subnet_t s = {
NULL}, *new, *old
;
- 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,
+ if(sscanf(request, "%*d %*x " MAX_STRING " " MAX_STRING, name, subnetstr) != 2) {
+ logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s)", "ADD_SUBNET", c->name,
c->hostname);
return false;
}
c->hostname);
return false;
}
@@
-63,20
+56,20
@@
bool add_subnet_h(connection_t *c)
/* Check if owner name is valid */
if(!check_id(name)) {
/* 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")
);
+ logger(
DEBUG_ALWAYS, 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)) {
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")
);
+ logger(
DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s): %s"
, "ADD_SUBNET", c->name,
+ c->hostname,
"invalid subnet string"
);
return false;
}
return false;
}
- if(seen_request(
c->buffer
))
+ if(seen_request(
request
))
return true;
/* Check if the owner of the new subnet is in the connection list */
return true;
/* Check if the owner of the new subnet is in the connection list */
@@
-85,7
+78,7
@@
bool add_subnet_h(connection_t *c)
if(tunnelserver && owner != myself && owner != c->node) {
/* in case of tunnelserver, ignore indirect subnet registrations */
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")
,
+
logger(DEBUG_PROTOCOL, LOG_WARNING, "Ignoring indirect %s from %s (%s) for %s"
,
"ADD_SUBNET", c->name, c->hostname, subnetstr);
return true;
}
"ADD_SUBNET", c->name, c->hostname, subnetstr);
return true;
}
@@
-104,33
+97,28
@@
bool add_subnet_h(connection_t *c)
/* If we don't know this subnet, but we are the owner, retaliate with a DEL_SUBNET */
if(owner == myself) {
/* 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")
,
+
logger(DEBUG_PROTOCOL, 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;
}
"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
*/
+ /* In tunnel server mode,
we should already know all allowed subnets
*/
if(tunnelserver) {
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);
- }
+ logger(DEBUG_ALWAYS, LOG_WARNING, "Ignoring unauthorized %s from %s (%s): %s",
+ "ADD_SUBNET", c->name, c->hostname, subnetstr);
+ return true;
+ }
- if(!cfg)
- return false;
+ /* Ignore if strictsubnets is true, but forward it to others */
- free_subnet(allowed);
+ if(strictsubnets) {
+ logger(DEBUG_ALWAYS, LOG_WARNING, "Ignoring unauthorized %s from %s (%s): %s",
+ "ADD_SUBNET", c->name, c->hostname, subnetstr);
+ forward_request(c, request);
+ return true;
}
/* If everything is correct, add the subnet to the list of the owner */
}
/* If everything is correct, add the subnet to the list of the owner */
@@
-144,34
+132,33
@@
bool add_subnet_h(connection_t *c)
/* Tell the rest */
if(!tunnelserver)
/* Tell the rest */
if(!tunnelserver)
- forward_request(c);
+ forward_request(c, request);
+
+ /* Fast handoff of roaming MAC addresses */
+
+ if(s.type == SUBNET_MAC && owner != myself && (old = lookup_subnet(myself, &s)) && old->expires)
+ old->expires = 1;
return true;
}
return true;
}
-bool send_del_subnet(connection_t *c, const subnet_t *s)
-{
+bool send_del_subnet(connection_t *c, const subnet_t *s) {
char netstr[MAXNETSTR];
char netstr[MAXNETSTR];
- cp();
-
if(!net2str(netstr, sizeof netstr, s))
return false;
if(!net2str(netstr, sizeof netstr, s))
return false;
- return send_request(c, "%d %
lx %s %s", DEL_SUBNET, random
(), s->owner->name, netstr);
+ return send_request(c, "%d %
x %s %s", DEL_SUBNET, rand
(), s->owner->name, netstr);
}
}
-bool del_subnet_h(connection_t *c)
-{
+bool del_subnet_h(connection_t *c, const char *request) {
char subnetstr[MAX_STRING_SIZE];
char name[MAX_STRING_SIZE];
node_t *owner;
char subnetstr[MAX_STRING_SIZE];
char name[MAX_STRING_SIZE];
node_t *owner;
- subnet_t s = {
0
}, *find;
+ subnet_t s = {
NULL
}, *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,
+ if(sscanf(request, "%*d %*x " MAX_STRING " " MAX_STRING, name, subnetstr) != 2) {
+ logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s)", "DEL_SUBNET", c->name,
c->hostname);
return false;
}
c->hostname);
return false;
}
@@
-179,20
+166,20
@@
bool del_subnet_h(connection_t *c)
/* Check if owner name is valid */
if(!check_id(name)) {
/* 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")
);
+ logger(
DEBUG_ALWAYS, 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)) {
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")
);
+ logger(
DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s): %s"
, "DEL_SUBNET", c->name,
+ c->hostname,
"invalid subnet string"
);
return false;
}
return false;
}
- if(seen_request(
c->buffer
))
+ if(seen_request(
request
))
return true;
/* Check if the owner of the subnet being deleted is in the connection list */
return true;
/* Check if the owner of the subnet being deleted is in the connection list */
@@
-201,13
+188,13
@@
bool del_subnet_h(connection_t *c)
if(tunnelserver && owner != myself && owner != c->node) {
/* in case of tunnelserver, ignore indirect subnet deletion */
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);
+
logger(DEBUG_PROTOCOL, LOG_WARNING, "Ignoring indirect %s from %s (%s) for %s"
,
+ "DEL_SUBNET", c->name, c->hostname, subnetstr);
return true;
}
if(!owner) {
return true;
}
if(!owner) {
-
ifdebug(PROTOCOL) logger(LOG_WARNING, _("Got %s from %s (%s) for %s which is not in our node tree")
,
+
logger(DEBUG_PROTOCOL, 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;
}
"DEL_SUBNET", c->name, c->hostname, name);
return true;
}
@@
-219,24
+206,31
@@
bool del_subnet_h(connection_t *c)
find = lookup_subnet(owner, &s);
if(!find) {
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")
,
+
logger(DEBUG_PROTOCOL, LOG_WARNING, "Got %s from %s (%s) for %s which does not appear in his subnet tree"
,
"DEL_SUBNET", c->name, c->hostname, name);
"DEL_SUBNET", c->name, c->hostname, name);
+ if(strictsubnets)
+ forward_request(c, request);
return true;
}
/* If we are the owner of this subnet, retaliate with an ADD_SUBNET */
if(owner == myself) {
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")
,
+
logger(DEBUG_PROTOCOL, LOG_WARNING, "Got %s from %s (%s) for ourself"
,
"DEL_SUBNET", c->name, c->hostname);
send_add_subnet(c, find);
return true;
}
"DEL_SUBNET", c->name, c->hostname);
send_add_subnet(c, find);
return true;
}
+ if(tunnelserver)
+ return true;
+
/* Tell the rest */
if(!tunnelserver)
/* Tell the rest */
if(!tunnelserver)
- forward_request(c);
+ forward_request(c, request);
+ if(strictsubnets)
+ return true;
/* Finally, delete it. */
/* Finally, delete it. */