X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol_key.c;h=029b41a4da848593b0687be23cdba68c7e8b048e;hp=3d711f901931beaea9e1279c5ea643664b7ea7d6;hb=8b2b67e26c5b971761f5015764d5e188f6343bc4;hpb=627f7c22b447bd464b536cd016278545674df93d

diff --git a/src/protocol_key.c b/src/protocol_key.c
index 3d711f90..029b41a4 100644
--- 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.
 
-    $Id: protocol_key.c,v 1.1.4.7 2002/06/21 10:11:19 guus Exp $
+    $Id: protocol_key.c,v 1.1.4.10 2002/09/04 16:26:45 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,22 +54,13 @@ 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 %*x "MAX_STRING, name) != 1)
@@ -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;
 }
@@ -153,7 +135,7 @@ cp
   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
@@ -235,7 +217,8 @@ cp
 
   from->status.validkey = 1;
   from->status.waitingforkey = 0;
-  
+  from->received_seqno = 0;
+    
   /* Check and lookup cipher and digest algorithms */
 
   if(cipher)