projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't free struct addrinfo too early. Spotted by Christian Cier-Zniewski.
[tinc]
/
src
/
protocol_key.c
diff --git
a/src/protocol_key.c
b/src/protocol_key.c
index
f0c9bcc
..
a3ef4d6
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
/*
protocol_key.c -- handle the meta-protocol, key exchange
- Copyright (C) 1999-200
3 Ivo Timmermans <ivo@o2w.nl>
,
- 2000-200
3 Guus Sliepen <guus@sliepen.eu
.org>
+ Copyright (C) 1999-200
5 Ivo Timmermans
,
+ 2000-200
6 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
@@
-17,7
+17,7
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id
: protocol_key.c,v 1.1.4.23 2003/10/11 12:16:13 guus Exp
$
+ $Id$
*/
#include "system.h"
*/
#include "system.h"
@@
-80,7
+80,8
@@
bool key_changed_h(connection_t *c)
/* Tell the others */
/* Tell the others */
- forward_request(c);
+ if(!tunnelserver)
+ forward_request(c);
return true;
}
return true;
}
@@
-130,6
+131,9
@@
bool req_key_h(connection_t *c)
memset(from->late, 0, sizeof(from->late));
send_ans_key(c, myself, from);
} else {
memset(from->late, 0, sizeof(from->late));
send_ans_key(c, myself, from);
} else {
+ if(tunnelserver)
+ return false;
+
send_req_key(to->nexthop->connection, from, to);
}
send_req_key(to->nexthop->connection, from, to);
}
@@
-138,10
+142,11
@@
bool req_key_h(connection_t *c)
bool send_ans_key(connection_t *c, const node_t *from, const node_t *to)
{
bool send_ans_key(connection_t *c, const node_t *from, const node_t *to)
{
- char
key[MAX_STRING_SIZE]
;
+ char
*key
;
cp();
cp();
+ key = alloca(2 * from->keylength + 1);
bin2hex(from->key, key, from->keylength);
key[from->keylength * 2] = '\0';
bin2hex(from->key, key, from->keylength);
key[from->keylength * 2] = '\0';
@@
-189,6
+194,9
@@
bool ans_key_h(connection_t *c)
/* Forward it if necessary */
if(to != myself) {
/* Forward it if necessary */
if(to != myself) {
+ if(tunnelserver)
+ return false;
+
return send_request(to->nexthop->connection, "%s", c->buffer);
}
return send_request(to->nexthop->connection, "%s", c->buffer);
}
@@
-254,12
+262,14
@@
bool ans_key_h(connection_t *c)
from->compression = compression;
if(from->cipher)
from->compression = compression;
if(from->cipher)
- if(!EVP_EncryptInit_ex(&from->packet_ctx, from->cipher, NULL,
from->key,
from->key + from->cipher->key_len)) {
+ if(!EVP_EncryptInit_ex(&from->packet_ctx, from->cipher, NULL,
(unsigned char *)from->key, (unsigned char *)
from->key + from->cipher->key_len)) {
logger(LOG_ERR, _("Error during initialisation of key from %s (%s): %s"),
from->name, from->hostname, ERR_error_string(ERR_get_error(), NULL));
return false;
}
logger(LOG_ERR, _("Error during initialisation of key from %s (%s): %s"),
from->name, from->hostname, ERR_error_string(ERR_get_error(), NULL));
return false;
}
+ if(from->options & OPTION_PMTU_DISCOVERY && !from->mtuprobes)
+ send_mtu_probe(from);
flush_queue(from);
flush_queue(from);