/*
protocol_key.c -- handle the meta-protocol, key exchange
- Copyright (C) 1999-2002 Ivo Timmermans <itimmermans@bigfoot.com>,
- 2000-2002 Guus Sliepen <guus@sliepen.warande.net>
+ Copyright (C) 1999-2002 Ivo Timmermans <ivo@o2w.nl>,
+ 2000-2002 Guus Sliepen <guus@sliepen.eu.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
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.8 2002/09/03 20:43:25 guus Exp $
*/
#include "config.h"
#include "meta.h"
#include "connection.h"
#include "node.h"
-#include "edge.h"
#include "system.h"
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;
int key_changed_h(connection_t *c)
{
char name[MAX_STRING_SIZE];
+ avl_node_t *node;
+ connection_t *other;
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;
}
+ if(seen_request(c->buffer))
+ return 0;
+
n = lookup_node(name);
if(!n)
n->status.validkey = 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;
}
if(to == myself) /* Yes, send our own key back */
{
mykeyused = 1;
- from->received_seqno = 0;
+ from->sent_seqno = 0;
send_ans_key(c, myself, from);
}
else
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 */
from->status.validkey = 1;
from->status.waitingforkey = 0;
-
+ from->received_seqno = 0;
+
/* Check and lookup cipher and digest algorithms */
if(cipher)