Reset the *correct* seqnos.

[tinc] / src / protocol_key.c

diff --git a/src/protocol_key.c b/src/protocol_key.c
index dc44b53..2411556 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
-    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
@@ -17,7 +17,7 @@
     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.5 2002/03/21 23:11:53 guus Exp $
+    $Id: protocol_key.c,v 1.1.4.11 2002/09/06 14:31:12 guus Exp $
 */
 
 #include "config.h"
@@ -40,7 +40,6 @@
 #include "meta.h"
 #include "connection.h"
 #include "node.h"
-#include "edge.h"
 
 #include "system.h"
 
@@ -48,8 +47,6 @@ int mykeyused = 0;
 
 int send_key_changed(connection_t *c, node_t *n)
 {
-  connection_t *other;
-  avl_node_t *node;
 cp
   /* Only send this message if some other daemon requested our key previously.
      This reduces unnecessary key_changed broadcasts.
@@ -57,25 +54,16 @@ cp
 
   if(n == myself && !mykeyused)
     return 0;
-
-  for(node = connection_tree->head; node; node = node->next)
-    {
-      other = (connection_t *)node->data;
-      if(other->status.active && other != c)
-        send_request(other, "%d %lx %s", KEY_CHANGED, random(), n->name);
-    }
 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];
-  avl_node_t *node;
-  connection_t *other;
   node_t *n;
 cp
-  if(sscanf(c->buffer, "%*d %*lx "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);
@@ -96,16 +84,10 @@ cp
 
   n->status.validkey = 0;
   n->status.waitingforkey = 0;
-  n->sent_seqno = 0;
 
   /* 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;
 }
@@ -235,7 +217,8 @@ cp
 
   from->status.validkey = 1;
   from->status.waitingforkey = 0;
-  
+  from->sent_seqno = 0;
+    
   /* Check and lookup cipher and digest algorithms */
 
   if(cipher)