projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use MTU probes to regularly ping other nodes over UDP.
[tinc]
/
src
/
protocol_subnet.c
diff --git
a/src/protocol_subnet.c
b/src/protocol_subnet.c
index
c6c0187
..
f7ce53b
100644
(file)
--- a/
src/protocol_subnet.c
+++ b/
src/protocol_subnet.c
@@
-35,8
+35,6
@@
bool send_add_subnet(connection_t *c, const subnet_t *subnet) {
char netstr[MAXNETSTR];
bool send_add_subnet(connection_t *c, const subnet_t *subnet) {
char netstr[MAXNETSTR];
- cp();
-
if(!net2str(netstr, sizeof netstr, subnet))
return false;
if(!net2str(netstr, sizeof netstr, subnet))
return false;
@@
-49,10
+47,8
@@
bool add_subnet_h(connection_t *c) {
node_t *owner;
subnet_t s = {0}, *new;
node_t *owner;
subnet_t s = {0}, *new;
- cp();
-
if(sscanf(c->buffer, "%*d %*x " MAX_STRING " " MAX_STRING, name, subnetstr) != 2) {
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,
+ logger(LOG_ERR,
"Got bad %s from %s (%s)"
, "ADD_SUBNET", c->name,
c->hostname);
return false;
}
c->hostname);
return false;
}
@@
-60,16
+56,16
@@
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(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(LOG_ERR,
"Got bad %s from %s (%s): %s"
, "ADD_SUBNET", c->name,
+ c->hostname,
"invalid subnet string"
);
return false;
}
return false;
}
@@
-82,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")
,
+ ifdebug(PROTOCOL) logger(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;
}
@@
-101,7
+97,7
@@
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")
,
+ 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);
"ADD_SUBNET", c->name, c->hostname);
s.owner = myself;
send_del_subnet(c, &s);
@@
-116,7
+112,7
@@
bool add_subnet_h(connection_t *c) {
for(cfg = lookup_config(c->config_tree, "Subnet"); cfg; cfg = lookup_config_next(c->config_tree, cfg)) {
if(!get_config_subnet(cfg, &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 fals
e;
+
continu
e;
if(!subnet_compare(&s, allowed))
break;
if(!subnet_compare(&s, allowed))
break;
@@
-125,9
+121,9
@@
bool add_subnet_h(connection_t *c) {
}
if(!cfg) {
}
if(!cfg) {
- logger(LOG_WARNING,
_("Unauthorized %s from %s (%s) for %s")
,
- "ADD_SUBNET", c->name, c->hostname, subnetstr);
- return
fals
e;
+ logger(LOG_WARNING,
"Ignoring unauthorized %s from %s (%s): %s"
,
+
"ADD_SUBNET", c->name, c->hostname, subnetstr);
+ return
tru
e;
}
free_subnet(allowed);
}
free_subnet(allowed);
@@
-152,8
+148,6
@@
bool add_subnet_h(connection_t *c) {
bool send_del_subnet(connection_t *c, const subnet_t *s) {
char netstr[MAXNETSTR];
bool send_del_subnet(connection_t *c, const subnet_t *s) {
char netstr[MAXNETSTR];
- cp();
-
if(!net2str(netstr, sizeof netstr, s))
return false;
if(!net2str(netstr, sizeof netstr, s))
return false;
@@
-166,10
+160,8
@@
bool del_subnet_h(connection_t *c) {
node_t *owner;
subnet_t s = {0}, *find;
node_t *owner;
subnet_t s = {0}, *find;
- cp();
-
if(sscanf(c->buffer, "%*d %*x " MAX_STRING " " MAX_STRING, name, subnetstr) != 2) {
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,
+ logger(LOG_ERR,
"Got bad %s from %s (%s)"
, "DEL_SUBNET", c->name,
c->hostname);
return false;
}
c->hostname);
return false;
}
@@
-177,16
+169,16
@@
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(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(LOG_ERR,
"Got bad %s from %s (%s): %s"
, "DEL_SUBNET", c->name,
+ c->hostname,
"invalid subnet string"
);
return false;
}
return false;
}
@@
-199,13
+191,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")
,
+ ifdebug(PROTOCOL) logger(LOG_WARNING,
"Ignoring indirect %s from %s (%s) for %s"
,
"DEL_SUBNET", c->name, c->hostname, subnetstr);
return true;
}
if(!owner) {
"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")
,
+ 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;
}
"DEL_SUBNET", c->name, c->hostname, name);
return true;
}
@@
-217,7
+209,7
@@
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")
,
+ 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;
}
"DEL_SUBNET", c->name, c->hostname, name);
return true;
}
@@
-225,7
+217,7
@@
bool del_subnet_h(connection_t *c) {
/* If we are the owner of this subnet, retaliate with an ADD_SUBNET */
if(owner == myself) {
/* 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 true;
"DEL_SUBNET", c->name, c->hostname);
send_add_subnet(c, find);
return true;