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.1 2002/02/11 10:05:58 guus Exp $
+ $Id: protocol_key.c,v 1.1.4.6 2002/03/22 13:31:18 guus Exp $
*/
#include "config.h"
#include "connection.h"
#include "node.h"
#include "edge.h"
-\
+
#include "system.h"
int mykeyused = 0;
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.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;
}
bin2hex(from->key, key, from->keylength);
key[from->keylength * 2] = '\0';
cp
- return send_request(c, "%d %s %s %s %d %d %d", ANS_KEY,
- from->name, to->name, key, from->cipher?from->cipher->nid:0, from->digest?from->digest->type:0, from->maclength);
+ return send_request(c, "%d %s %s %s %d %d %d %d", ANS_KEY,
+ from->name, to->name, key, from->cipher?from->cipher->nid:0, from->digest?from->digest->type:0, from->maclength, from->compression);
}
int ans_key_h(connection_t *c)
char from_name[MAX_STRING_SIZE];
char to_name[MAX_STRING_SIZE];
char key[MAX_STRING_SIZE];
- int cipher, digest, maclength;
+ int cipher, digest, maclength, compression;
node_t *from, *to;
cp
- if(sscanf(c->buffer, "%*d "MAX_STRING" "MAX_STRING" "MAX_STRING" %d %d %d", from_name, to_name, key, &cipher, &digest, &maclength) != 6)
+ if(sscanf(c->buffer, "%*d "MAX_STRING" "MAX_STRING" "MAX_STRING" %d %d %d %d", from_name, to_name, key, &cipher, &digest, &maclength, &compression) != 7)
{
syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "ANS_KEY",
c->name, c->hostname);
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->cipher = NULL;
}
+ from->maclength = maclength;
+
if(digest)
{
from->digest = EVP_get_digestbynid(digest);
syslog(LOG_ERR, _("Node %s (%s) uses unknown digest!"), from->name, from->hostname);
return -1;
}
- from->maclength = maclength;
if(from->maclength > from->digest->md_size || from->maclength < 0)
{
syslog(LOG_ERR, _("Node %s (%s) uses bogus MAC length!"), from->name, from->hostname);
else
{
from->digest = NULL;
- from->maclength = maclength;
}
+
+ from->compression = compression;
flush_queue(from);
cp