projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sparse fixup: warning: non-ANSI function declaration of function '...'
[tinc]
/
src
/
protocol_key.c
diff --git
a/src/protocol_key.c
b/src/protocol_key.c
index
4187538
..
63fcd97
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-201
0
Guus Sliepen <guus@tinc-vpn.org>
+ 2000-201
1
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
@@
-34,7
+34,7
@@
static bool mykeyused = false;
static bool mykeyused = false;
-void send_key_changed() {
+void send_key_changed(
void
) {
splay_node_t *node;
connection_t *c;
splay_node_t *node;
connection_t *c;
@@
-156,7
+156,7
@@
bool send_ans_key(node_t *to) {
// Reset sequence number and late packet window
mykeyused = true;
to->received_seqno = 0;
// Reset sequence number and late packet window
mykeyused = true;
to->received_seqno = 0;
-
memset(to->late, 0, sizeof(to->late)
);
+
if(replaywin) memset(to->late, 0, replaywin
);
return send_request(to->nexthop->connection, "%d %s %s %s %d %d %zu %d", ANS_KEY,
myself->name, to->name, key,
return send_request(to->nexthop->connection, "%d %s %s %s %d %d %zu %d", ANS_KEY,
myself->name, to->name, key,
@@
-216,7
+216,7
@@
bool ans_key_h(connection_t *c, char *request) {
return true;
}
return true;
}
- if(!*address) {
+ if(!*address
&& from->address.sa.sa_family != AF_UNSPEC
) {
char *address, *port;
ifdebug(PROTOCOL) logger(LOG_DEBUG, "Appending reflexive UDP address to ANS_KEY from %s to %s", from->name, to->name);
sockaddr2str(&from->address, &address, &port);
char *address, *port;
ifdebug(PROTOCOL) logger(LOG_DEBUG, "Appending reflexive UDP address to ANS_KEY from %s to %s", from->name, to->name);
sockaddr2str(&from->address, &address, &port);
@@
-275,7
+275,7
@@
bool ans_key_h(connection_t *c, char *request) {
update_node_udp(from, &sa);
}
update_node_udp(from, &sa);
}
- if(from->options & OPTION_PMTU_DISCOVERY && !
from->mtuprobes
)
+ if(from->options & OPTION_PMTU_DISCOVERY && !
event_initialized(&from->mtuevent)
)
send_mtu_probe(from);
return true;
send_mtu_probe(from);
return true;