projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1
[tinc]
/
src
/
protocol_subnet.c
diff --git
a/src/protocol_subnet.c
b/src/protocol_subnet.c
index
ea112b9
..
26cb560
100644
(file)
--- a/
src/protocol_subnet.c
+++ b/
src/protocol_subnet.c
@@
-45,10
+45,10
@@
bool add_subnet_h(connection_t *c, 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, *old;
+ subnet_t s = {
NULL
}, *new, *old;
if(sscanf(request, "%*d %*x " MAX_STRING " " MAX_STRING, name, subnetstr) != 2) {
if(sscanf(request, "%*d %*x " MAX_STRING " " MAX_STRING, name, subnetstr) != 2) {
- logger(LOG_ERR, "Got bad %s from %s (%s)", "ADD_SUBNET", c->name,
+ logger(
DEBUG_ALWAYS,
LOG_ERR, "Got bad %s from %s (%s)", "ADD_SUBNET", c->name,
c->hostname);
return false;
}
c->hostname);
return false;
}
@@
-56,7
+56,7
@@
bool add_subnet_h(connection_t *c, char *request) {
/* 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,
+ logger(
DEBUG_ALWAYS,
LOG_ERR, "Got bad %s from %s (%s): %s", "ADD_SUBNET", c->name,
c->hostname, "invalid name");
return false;
}
c->hostname, "invalid name");
return false;
}
@@
-64,7
+64,7
@@
bool add_subnet_h(connection_t *c, char *request) {
/* Check if subnet string is valid */
if(!str2net(&s, subnetstr)) {
/* Check if subnet string is valid */
if(!str2net(&s, subnetstr)) {
- logger(LOG_ERR, "Got bad %s from %s (%s): %s", "ADD_SUBNET", c->name,
+ logger(
DEBUG_ALWAYS,
LOG_ERR, "Got bad %s from %s (%s): %s", "ADD_SUBNET", c->name,
c->hostname, "invalid subnet string");
return false;
}
c->hostname, "invalid subnet string");
return false;
}
@@
-78,7
+78,7
@@
bool add_subnet_h(connection_t *c, char *request) {
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;
}
@@
-97,36
+97,28
@@
bool add_subnet_h(connection_t *c, char *request) {
/* 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))
- continue;
-
- 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) {
- 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 */
- 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 */
@@
-163,10
+155,10
@@
bool del_subnet_h(connection_t *c, 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;
if(sscanf(request, "%*d %*x " MAX_STRING " " MAX_STRING, name, subnetstr) != 2) {
if(sscanf(request, "%*d %*x " MAX_STRING " " MAX_STRING, name, subnetstr) != 2) {
- logger(LOG_ERR, "Got bad %s from %s (%s)", "DEL_SUBNET", c->name,
+ logger(
DEBUG_ALWAYS,
LOG_ERR, "Got bad %s from %s (%s)", "DEL_SUBNET", c->name,
c->hostname);
return false;
}
c->hostname);
return false;
}
@@
-174,7
+166,7
@@
bool del_subnet_h(connection_t *c, char *request) {
/* 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,
+ logger(
DEBUG_ALWAYS,
LOG_ERR, "Got bad %s from %s (%s): %s", "DEL_SUBNET", c->name,
c->hostname, "invalid name");
return false;
}
c->hostname, "invalid name");
return false;
}
@@
-182,7
+174,7
@@
bool del_subnet_h(connection_t *c, char *request) {
/* Check if subnet string is valid */
if(!str2net(&s, subnetstr)) {
/* Check if subnet string is valid */
if(!str2net(&s, subnetstr)) {
- logger(LOG_ERR, "Got bad %s from %s (%s): %s", "DEL_SUBNET", c->name,
+ logger(
DEBUG_ALWAYS,
LOG_ERR, "Got bad %s from %s (%s): %s", "DEL_SUBNET", c->name,
c->hostname, "invalid subnet string");
return false;
}
c->hostname, "invalid subnet string");
return false;
}
@@
-196,13
+188,13
@@
bool del_subnet_h(connection_t *c, char *request) {
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",
+
logger(DEBUG_PROTOCOL,
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",
+
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;
}
@@
-214,24
+206,31
@@
bool del_subnet_h(connection_t *c, char *request) {
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)
forward_request(c, request);
/* Tell the rest */
if(!tunnelserver)
forward_request(c, request);
+ if(strictsubnets)
+ return true;
/* Finally, delete it. */
/* Finally, delete it. */