projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reset the *correct* seqnos.
[tinc]
/
src
/
protocol_key.c
diff --git
a/src/protocol_key.c
b/src/protocol_key.c
index
0f14cd6
..
2411556
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.
9 2002/09/04 08:02:33
guus Exp $
+ $Id: protocol_key.c,v 1.1.4.
11 2002/09/06 14:31:12
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-54,17
+54,13
@@
cp
if(n == myself && !mykeyused)
return 0;
if(n == myself && !mykeyused)
return 0;
-
- send_request(NULL, "%d %lx %s", KEY_CHANGED, random(), n->name);
cp
cp
- return
0
;
+ return
send_request(c, "%d %lx %s", KEY_CHANGED, random(), n->name)
;
}
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
if(sscanf(c->buffer, "%*d %*x "MAX_STRING, name) != 1)
node_t *n;
cp
if(sscanf(c->buffer, "%*d %*x "MAX_STRING, name) != 1)
@@
-91,12
+87,7
@@
cp
/* Tell the others */
/* 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);
- }
+ forward_request(c);
cp
return 0;
}
cp
return 0;
}
@@
-144,7
+135,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->
sent
_seqno = 0;
+ from->
received
_seqno = 0;
send_ans_key(c, myself, from);
}
else
send_ans_key(c, myself, from);
}
else
@@
-226,7
+217,7
@@
cp
from->status.validkey = 1;
from->status.waitingforkey = 0;
from->status.validkey = 1;
from->status.waitingforkey = 0;
- from->
received
_seqno = 0;
+ from->
sent
_seqno = 0;
/* Check and lookup cipher and digest algorithms */
/* Check and lookup cipher and digest algorithms */