projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix format strings.
[tinc]
/
src
/
protocol_key.c
diff --git
a/src/protocol_key.c
b/src/protocol_key.c
index
aec7889
..
016fbff
100644
(file)
--- a/
src/protocol_key.c
+++ b/
src/protocol_key.c
@@
-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.
3 2002/02/20 19:25:09
guus Exp $
+ $Id: protocol_key.c,v 1.1.4.
6 2002/03/22 13:31:18
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-61,8
+61,8
@@
cp
for(node = connection_tree->head; node; node = node->next)
{
other = (connection_t *)node->data;
for(node = connection_tree->head; node; node = node->next)
{
other = (connection_t *)node->data;
- if(other->status.active && other
->status.mst && other
!= c)
- send_request(other, "%d %
s", KEY_CHANGED
, n->name);
+ if(other->status.active && other != c)
+ send_request(other, "%d %
lx %s", KEY_CHANGED, random()
, n->name);
}
cp
return 0;
}
cp
return 0;
@@
-71,15
+71,20
@@
cp
int key_changed_h(connection_t *c)
{
char name[MAX_STRING_SIZE];
int key_changed_h(connection_t *c)
{
char name[MAX_STRING_SIZE];
+ avl_node_t *node;
+ connection_t *other;
node_t *n;
cp
node_t *n;
cp
- if(sscanf(c->buffer, "%*d "MAX_STRING, name) != 1)
+ if(sscanf(c->buffer, "%*d
%*x
"MAX_STRING, name) != 1)
{
syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "KEY_CHANGED",
c->name, c->hostname);
return -1;
}
{
syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "KEY_CHANGED",
c->name, c->hostname);
return -1;
}
+ if(seen_request(c->buffer))
+ return 0;
+
n = lookup_node(name);
if(!n)
n = lookup_node(name);
if(!n)
@@
-93,7
+98,14
@@
cp
n->status.waitingforkey = 0;
n->sent_seqno = 0;
n->status.waitingforkey = 0;
n->sent_seqno = 0;
- send_key_changed(c, n);
+ /* Tell the others */
+
+ for(node = connection_tree->head; node; node = node->next)
+ {
+ other = (connection_t *)node->data;
+ if(other->status.active && other != c)
+ send_request(other, "%s", c->buffer);
+ }
cp
return 0;
}
cp
return 0;
}
@@
-208,7
+220,7
@@
cp
if(to != myself)
{
if(to != myself)
{
- return send_request(to->nexthop->connection, c->buffer);
+ return send_request(to->nexthop->connection,
"%s",
c->buffer);
}
/* Update our copy of the origin's packet key */
}
/* Update our copy of the origin's packet key */