projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Drop graph and edge stuff. Use new node stuff instead.
[tinc]
/
src
/
protocol_key.c
diff --git
a/src/protocol_key.c
b/src/protocol_key.c
index
b85de5e
..
90df50f
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-2002 Ivo Timmermans <i
timmermans@bigfoot.com
>,
- 2000-2002 Guus Sliepen <guus@sliepen.
warande.net
>
+ Copyright (C) 1999-2002 Ivo Timmermans <i
vo@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
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.
4 2002/02/27 22:37:5
5 guus Exp $
+ $Id: protocol_key.c,v 1.1.4.
8 2002/09/03 20:43:2
5 guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-40,7
+40,6
@@
#include "meta.h"
#include "connection.h"
#include "node.h"
#include "meta.h"
#include "connection.h"
#include "node.h"
-#include "edge.h"
#include "system.h"
#include "system.h"
@@
-61,8
+60,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
+70,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)
@@
-91,9
+95,15
@@
cp
n->status.validkey = 0;
n->status.waitingforkey = 0;
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;
}
cp
return 0;
}
@@
-141,7
+151,7
@@
cp
if(to == myself) /* Yes, send our own key back */
{
mykeyused = 1;
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
send_ans_key(c, myself, from);
}
else
@@
-223,7
+233,8
@@
cp
from->status.validkey = 1;
from->status.waitingforkey = 0;
from->status.validkey = 1;
from->status.waitingforkey = 0;
-
+ from->received_seqno = 0;
+
/* Check and lookup cipher and digest algorithms */
if(cipher)
/* Check and lookup cipher and digest algorithms */
if(cipher)