projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 1.1
[tinc]
/
src
/
protocol_key.c
diff --git
a/src/protocol_key.c
b/src/protocol_key.c
index
2a0f230
..
3baa580
100644
(file)
--- a/
src/protocol_key.c
+++ b/
src/protocol_key.c
@@
-1,7
+1,7
@@
/*
protocol_key.c -- handle the meta-protocol, key exchange
Copyright (C) 1999-2005 Ivo Timmermans,
/*
protocol_key.c -- handle the meta-protocol, key exchange
Copyright (C) 1999-2005 Ivo Timmermans,
- 2000-20
09
Guus Sliepen <guus@tinc-vpn.org>
+ 2000-20
10
Guus Sliepen <guus@tinc-vpn.org>
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
+13,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"
@@
-36,27
+34,27
@@
static bool mykeyused = false;
static bool mykeyused = false;
-bool send_key_changed() {
- cp();
+void send_key_changed() {
+ splay_node_t *node;
+ connection_t *c;
- /* Only send this message if some other daemon requested our key previously.
- This reduces unnecessary key_changed broadcasts.
- */
+ send_request(broadcast, "%d %x %s", KEY_CHANGED, rand(), myself->name);
- if(!mykeyused)
- return true;
+ /* Immediately send new keys to directly connected nodes to keep UDP mappings alive */
- return send_request(broadcast, "%d %lx %s", KEY_CHANGED, random(), myself->name);
+ for(node = connection_tree->head; node; node = node->next) {
+ c = node->data;
+ if(c->status.active && c->node && c->node->status.reachable)
+ send_ans_key(c->node);
+ }
}
bool key_changed_h(connection_t *c, char *request) {
char name[MAX_STRING_SIZE];
node_t *n;
}
bool key_changed_h(connection_t *c, char *request) {
char name[MAX_STRING_SIZE];
node_t *n;
- cp();
-
if(sscanf(request, "%*d %*x " MAX_STRING, name) != 1) {
if(sscanf(request, "%*d %*x " MAX_STRING, name) != 1) {
- logger(LOG_ERR,
_("Got bad %s from %s (%s)")
, "KEY_CHANGED",
+ logger(LOG_ERR,
"Got bad %s from %s (%s)"
, "KEY_CHANGED",
c->name, c->hostname);
return false;
}
c->name, c->hostname);
return false;
}
@@
-67,13
+65,13
@@
bool key_changed_h(connection_t *c, char *request) {
n = lookup_node(name);
if(!n) {
n = lookup_node(name);
if(!n) {
- logger(LOG_ERR,
_("Got %s from %s (%s) origin %s which does not exist")
,
+ logger(LOG_ERR,
"Got %s from %s (%s) origin %s which does not exist"
,
"KEY_CHANGED", c->name, c->hostname, name);
"KEY_CHANGED", c->name, c->hostname, name);
- return
fals
e;
+ return
tru
e;
}
n->status.validkey = false;
}
n->status.validkey = false;
- n->
status.waitingforkey = false
;
+ n->
last_req_key = 0
;
/* Tell the others */
/* Tell the others */
@@
-84,8
+82,6
@@
bool key_changed_h(connection_t *c, char *request) {
}
bool send_req_key(node_t *to) {
}
bool send_req_key(node_t *to) {
- cp();
-
return send_request(to->nexthop->connection, "%d %s %s", REQ_KEY, myself->name, to->name);
}
return send_request(to->nexthop->connection, "%d %s %s", REQ_KEY, myself->name, to->name);
}
@@
-94,28
+90,31
@@
bool req_key_h(connection_t *c, char *request) {
char to_name[MAX_STRING_SIZE];
node_t *from, *to;
char to_name[MAX_STRING_SIZE];
node_t *from, *to;
- cp();
-
if(sscanf(request, "%*d " MAX_STRING " " MAX_STRING, from_name, to_name) != 2) {
if(sscanf(request, "%*d " MAX_STRING " " MAX_STRING, from_name, to_name) != 2) {
- logger(LOG_ERR,
_("Got bad %s from %s (%s)")
, "REQ_KEY", c->name,
+ logger(LOG_ERR,
"Got bad %s from %s (%s)"
, "REQ_KEY", c->name,
c->hostname);
return false;
}
c->hostname);
return false;
}
+ if(!check_id(from_name) || !check_id(to_name)) {
+ logger(LOG_ERR, "Got bad %s from %s (%s): %s", "REQ_KEY", c->name, c->hostname, "invalid name");
+ return false;
+ }
+
from = lookup_node(from_name);
if(!from) {
from = lookup_node(from_name);
if(!from) {
- logger(LOG_ERR,
_("Got %s from %s (%s) origin %s which does not exist in our connection list")
,
+ logger(LOG_ERR,
"Got %s from %s (%s) origin %s which does not exist in our connection list"
,
"REQ_KEY", c->name, c->hostname, from_name);
"REQ_KEY", c->name, c->hostname, from_name);
- return
fals
e;
+ return
tru
e;
}
to = lookup_node(to_name);
if(!to) {
}
to = lookup_node(to_name);
if(!to) {
- logger(LOG_ERR,
_("Got %s from %s (%s) destination %s which does not exist in our connection list")
,
+ logger(LOG_ERR,
"Got %s from %s (%s) destination %s which does not exist in our connection list"
,
"REQ_KEY", c->name, c->hostname, to_name);
"REQ_KEY", c->name, c->hostname, to_name);
- return
fals
e;
+ return
tru
e;
}
/* Check if this key request is for us */
}
/* Check if this key request is for us */
@@
-125,10
+124,10
@@
bool req_key_h(connection_t *c, char *request) {
send_ans_key(from);
} else {
if(tunnelserver)
send_ans_key(from);
} else {
if(tunnelserver)
- return
fals
e;
+ return
tru
e;
if(!to->status.reachable) {
if(!to->status.reachable) {
- logger(LOG_WARNING,
_("Got %s from %s (%s) destination %s which is not reachable")
,
+ logger(LOG_WARNING,
"Got %s from %s (%s) destination %s which is not reachable"
,
"REQ_KEY", c->name, c->hostname, to_name);
return true;
}
"REQ_KEY", c->name, c->hostname, to_name);
return true;
}
@@
-143,14
+142,13
@@
bool send_ans_key(node_t *to) {
size_t keylen = cipher_keylength(&myself->incipher);
char key[keylen * 2 + 1];
size_t keylen = cipher_keylength(&myself->incipher);
char key[keylen * 2 + 1];
- cp();
-
cipher_open_by_nid(&to->incipher, cipher_get_nid(&myself->incipher));
digest_open_by_nid(&to->indigest, digest_get_nid(&myself->indigest), digest_length(&myself->indigest));
to->incompression = myself->incompression;
randomize(key, keylen);
cipher_set_key(&to->incipher, key, true);
cipher_open_by_nid(&to->incipher, cipher_get_nid(&myself->incipher));
digest_open_by_nid(&to->indigest, digest_get_nid(&myself->indigest), digest_length(&myself->indigest));
to->incompression = myself->incompression;
randomize(key, keylen);
cipher_set_key(&to->incipher, key, true);
+ digest_set_key(&to->indigest, key, keylen);
bin2hex(key, key, keylen);
key[keylen * 2] = '\0';
bin2hex(key, key, keylen);
key[keylen * 2] = '\0';
@@
-160,7
+158,7
@@
bool send_ans_key(node_t *to) {
to->received_seqno = 0;
memset(to->late, 0, sizeof(to->late));
to->received_seqno = 0;
memset(to->late, 0, sizeof(to->late));
- return send_request(to->nexthop->connection, "%d %s %s %s %d %d %
d
%d", ANS_KEY,
+ return send_request(to->nexthop->connection, "%d %s %s %s %d %d %
zu
%d", ANS_KEY,
myself->name, to->name, key,
cipher_get_nid(&to->incipher),
digest_get_nid(&to->indigest),
myself->name, to->name, key,
cipher_get_nid(&to->incipher),
digest_get_nid(&to->indigest),
@@
-172,43
+170,48
@@
bool ans_key_h(connection_t *c, char *request) {
char from_name[MAX_STRING_SIZE];
char to_name[MAX_STRING_SIZE];
char key[MAX_STRING_SIZE];
char from_name[MAX_STRING_SIZE];
char to_name[MAX_STRING_SIZE];
char key[MAX_STRING_SIZE];
- int cipher, digest, maclength, compression;
+ char address[MAX_STRING_SIZE] = "";
+ char port[MAX_STRING_SIZE] = "";
+ int cipher, digest, maclength, compression, keylen;
node_t *from, *to;
node_t *from, *to;
- cp();
-
if(sscanf(request, "%*d "MAX_STRING" "MAX_STRING" "MAX_STRING" %d %d %d %d",
from_name, to_name, key, &cipher, &digest, &maclength,
if(sscanf(request, "%*d "MAX_STRING" "MAX_STRING" "MAX_STRING" %d %d %d %d",
from_name, to_name, key, &cipher, &digest, &maclength,
- &compression
) !=
7) {
- logger(LOG_ERR,
_("Got bad %s from %s (%s)")
, "ANS_KEY", c->name,
+ &compression
, address, port) <
7) {
+ logger(LOG_ERR,
"Got bad %s from %s (%s)"
, "ANS_KEY", c->name,
c->hostname);
return false;
}
c->hostname);
return false;
}
+ if(!check_id(from_name) || !check_id(to_name)) {
+ logger(LOG_ERR, "Got bad %s from %s (%s): %s", "ANS_KEY", c->name, c->hostname, "invalid name");
+ return false;
+ }
+
from = lookup_node(from_name);
if(!from) {
from = lookup_node(from_name);
if(!from) {
- logger(LOG_ERR,
_("Got %s from %s (%s) origin %s which does not exist in our connection list")
,
+ logger(LOG_ERR,
"Got %s from %s (%s) origin %s which does not exist in our connection list"
,
"ANS_KEY", c->name, c->hostname, from_name);
"ANS_KEY", c->name, c->hostname, from_name);
- return
fals
e;
+ return
tru
e;
}
to = lookup_node(to_name);
if(!to) {
}
to = lookup_node(to_name);
if(!to) {
- logger(LOG_ERR,
_("Got %s from %s (%s) destination %s which does not exist in our connection list")
,
+ logger(LOG_ERR,
"Got %s from %s (%s) destination %s which does not exist in our connection list"
,
"ANS_KEY", c->name, c->hostname, to_name);
"ANS_KEY", c->name, c->hostname, to_name);
- return
fals
e;
+ return
tru
e;
}
/* Forward it if necessary */
if(to != myself) {
if(tunnelserver)
}
/* Forward it if necessary */
if(to != myself) {
if(tunnelserver)
- return
fals
e;
+ return
tru
e;
if(!to->status.reachable) {
if(!to->status.reachable) {
- logger(LOG_WARNING,
_("Got %s from %s (%s) destination %s which is not reachable")
,
+ logger(LOG_WARNING,
"Got %s from %s (%s) destination %s which is not reachable"
,
"ANS_KEY", c->name, c->hostname, to_name);
return true;
}
"ANS_KEY", c->name, c->hostname, to_name);
return true;
}
@@
-219,41
+222,49
@@
bool ans_key_h(connection_t *c, char *request) {
/* Check and lookup cipher and digest algorithms */
if(!cipher_open_by_nid(&from->outcipher, cipher)) {
/* Check and lookup cipher and digest algorithms */
if(!cipher_open_by_nid(&from->outcipher, cipher)) {
- logger(LOG_ERR,
_("Node %s (%s) uses unknown cipher!")
, from->name, from->hostname);
+ logger(LOG_ERR,
"Node %s (%s) uses unknown cipher!"
, from->name, from->hostname);
return false;
}
return false;
}
- if(strlen(key) / 2 != cipher_keylength(&from->outcipher)) {
- logger(LOG_ERR, _("Node %s (%s) uses wrong keylength!"), from->name, from->hostname);
+ keylen = strlen(key) / 2;
+
+ if(keylen != cipher_keylength(&from->outcipher)) {
+ logger(LOG_ERR, "Node %s (%s) uses wrong keylength!", from->name, from->hostname);
return false;
}
if(!digest_open_by_nid(&from->outdigest, digest, maclength)) {
return false;
}
if(!digest_open_by_nid(&from->outdigest, digest, maclength)) {
- logger(LOG_ERR,
_("Node %s (%s) uses unknown digest!")
, from->name, from->hostname);
+ logger(LOG_ERR,
"Node %s (%s) uses unknown digest!"
, from->name, from->hostname);
return false;
}
if(maclength != digest_length(&from->outdigest)) {
return false;
}
if(maclength != digest_length(&from->outdigest)) {
- logger(LOG_ERR,
_("Node %s (%s) uses bogus MAC length!")
, from->name, from->hostname);
+ logger(LOG_ERR,
"Node %s (%s) uses bogus MAC length!"
, from->name, from->hostname);
return false;
}
if(compression < 0 || compression > 11) {
return false;
}
if(compression < 0 || compression > 11) {
- logger(LOG_ERR,
_("Node %s (%s) uses bogus compression level!")
, from->name, from->hostname);
- return
fals
e;
+ logger(LOG_ERR,
"Node %s (%s) uses bogus compression level!"
, from->name, from->hostname);
+ return
tru
e;
}
from->outcompression = compression;
/* Update our copy of the origin's packet key */
}
from->outcompression = compression;
/* Update our copy of the origin's packet key */
- hex2bin(key, key,
cipher_keylength(&from->outcipher)
);
+ hex2bin(key, key,
keylen
);
cipher_set_key(&from->outcipher, key, false);
cipher_set_key(&from->outcipher, key, false);
+ digest_set_key(&from->outdigest, key, keylen);
from->status.validkey = true;
from->status.validkey = true;
- from->status.waitingforkey = false;
from->sent_seqno = 0;
from->sent_seqno = 0;
+ if(*address && *port) {
+ ifdebug(PROTOCOL) logger(LOG_DEBUG, "Using reflexive UDP address from %s: %s port %s", from->name, address, port);
+ sockaddr_t sa = str2sockaddr(address, port);
+ update_node_udp(from, &sa);
+ }
+
if(from->options & OPTION_PMTU_DISCOVERY && !from->mtuprobes)
send_mtu_probe(from);
if(from->options & OPTION_PMTU_DISCOVERY && !from->mtuprobes)
send_mtu_probe(from);