projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix some compiler warnings from MinGW.
[tinc]
/
src
/
protocol_subnet.c
diff --git
a/src/protocol_subnet.c
b/src/protocol_subnet.c
index
c284622
..
06dafbc
100644
(file)
--- 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-2005 Ivo Timmermans,
/*
protocol_subnet.c -- handle the meta-protocol, subnets
Copyright (C) 1999-2005 Ivo Timmermans,
- 2000-20
09
Guus Sliepen <guus@tinc-vpn.org>
+ 2000-20
12
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
2009 Michael Tokarev <mjt@tls.msk.ru>
This program is free software; you can redistribute it and/or modify
@@
-41,14
+41,14
@@
bool send_add_subnet(connection_t *c, const subnet_t *subnet) {
return send_request(c, "%d %x %s %s", ADD_SUBNET, rand(), 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, *old;
+ subnet_t s = {
NULL
}, *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,
+ 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;
}
@@
-56,7
+56,7
@@
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,
+ 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,12
+64,12
@@
bool add_subnet_h(connection_t *c) {
/* 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;
}
- 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 */
@@
-78,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;
}
@@
-97,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",
+
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);
"ADD_SUBNET", c->name, c->hostname);
s.owner = myself;
send_del_subnet(c, &s);
@@
-107,7
+107,7
@@
bool add_subnet_h(connection_t *c) {
/* In tunnel server mode, we should already know all allowed subnets */
if(tunnelserver) {
/* In tunnel server mode, we should already know all allowed subnets */
if(tunnelserver) {
- logger(LOG_WARNING, "Ignoring unauthorized %s from %s (%s): %s",
+ logger(
DEBUG_ALWAYS,
LOG_WARNING, "Ignoring unauthorized %s from %s (%s): %s",
"ADD_SUBNET", c->name, c->hostname, subnetstr);
return true;
}
"ADD_SUBNET", c->name, c->hostname, subnetstr);
return true;
}
@@
-115,7
+115,9
@@
bool add_subnet_h(connection_t *c) {
/* Ignore if strictsubnets is true, but forward it to others */
if(strictsubnets) {
/* Ignore if strictsubnets is true, but forward it to others */
if(strictsubnets) {
- forward_request(c);
+ 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;
}
return true;
}
@@
-129,12
+131,13
@@
bool add_subnet_h(connection_t *c) {
/* Tell the rest */
/* Tell the rest */
- forward_request(c);
+ if(!tunnelserver)
+ forward_request(c, request);
/* Fast handoff of roaming MAC addresses */
if(s.type == SUBNET_MAC && owner != myself && (old = lookup_subnet(myself, &s)) && old->expires)
/* Fast handoff of roaming MAC addresses */
if(s.type == SUBNET_MAC && owner != myself && (old = lookup_subnet(myself, &s)) && old->expires)
- old->expires =
now
;
+ old->expires =
1
;
return true;
}
return true;
}
@@
-148,14
+151,14
@@
bool send_del_subnet(connection_t *c, const subnet_t *s) {
return send_request(c, "%d %x %s %s", DEL_SUBNET, rand(), 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;
- 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;
}
@@
-163,7
+166,7
@@
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,
+ 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;
}
@@
-171,12
+174,12
@@
bool del_subnet_h(connection_t *c) {
/* 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;
}
- 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 */
@@
-185,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;
}
@@
-203,17
+206,17
@@
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);
if(strictsubnets)
"DEL_SUBNET", c->name, c->hostname, name);
if(strictsubnets)
- forward_request(c);
+ 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;
@@
-224,7
+227,8
@@
bool del_subnet_h(connection_t *c) {
/* Tell the rest */
/* Tell the rest */
- forward_request(c);
+ if(!tunnelserver)
+ forward_request(c, request);
if(strictsubnets)
return true;
if(strictsubnets)
return true;