projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove pidfile in favour of control socket.
[tinc]
/
src
/
protocol_key.c
diff --git
a/src/protocol_key.c
b/src/protocol_key.c
index
049fc1e
..
9ab1743
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.24 2003/11/17 15:30:18 guus Exp
$
+ $Id$
*/
#include "system.h"
*/
#include "system.h"
@@
-25,7
+25,7
@@
#include <openssl/evp.h>
#include <openssl/err.h>
#include <openssl/evp.h>
#include <openssl/err.h>
-#include "
avl
_tree.h"
+#include "
splay
_tree.h"
#include "connection.h"
#include "logger.h"
#include "net.h"
#include "connection.h"
#include "logger.h"
#include "net.h"
@@
-37,8
+37,7
@@
bool mykeyused = false;
bool mykeyused = false;
-bool send_key_changed(connection_t *c, const node_t *n)
-{
+bool send_key_changed(connection_t *c, const node_t *n) {
cp();
/* Only send this message if some other daemon requested our key previously.
cp();
/* Only send this message if some other daemon requested our key previously.
@@
-51,8
+50,7
@@
bool send_key_changed(connection_t *c, const node_t *n)
return send_request(c, "%d %lx %s", KEY_CHANGED, random(), n->name);
}
return send_request(c, "%d %lx %s", KEY_CHANGED, random(), n->name);
}
-bool key_changed_h(connection_t *c)
-{
+bool key_changed_h(connection_t *c) {
char name[MAX_STRING_SIZE];
node_t *n;
char name[MAX_STRING_SIZE];
node_t *n;
@@
-86,15
+84,13
@@
bool key_changed_h(connection_t *c)
return true;
}
return true;
}
-bool send_req_key(connection_t *c, const node_t *from, const node_t *to)
-{
+bool send_req_key(connection_t *c, const node_t *from, const node_t *to) {
cp();
return send_request(c, "%d %s %s", REQ_KEY, from->name, to->name);
}
cp();
return send_request(c, "%d %s %s", REQ_KEY, from->name, to->name);
}
-bool req_key_h(connection_t *c)
-{
+bool req_key_h(connection_t *c) {
char from_name[MAX_STRING_SIZE];
char to_name[MAX_STRING_SIZE];
node_t *from, *to;
char from_name[MAX_STRING_SIZE];
char to_name[MAX_STRING_SIZE];
node_t *from, *to;
@@
-140,12
+136,12
@@
bool req_key_h(connection_t *c)
return true;
}
return true;
}
-bool send_ans_key(connection_t *c, const node_t *from, const node_t *to)
-{
- char key[MAX_STRING_SIZE];
+bool send_ans_key(connection_t *c, const node_t *from, const node_t *to) {
+ 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';
@@
-156,8
+152,7
@@
bool send_ans_key(connection_t *c, const node_t *from, const node_t *to)
from->compression);
}
from->compression);
}
-bool ans_key_h(connection_t *c)
-{
+bool ans_key_h(connection_t *c) {
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];
@@
-261,12
+256,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);