Cleanups:

[oweals/tinc.git] / src / protocol_key.c

diff --git a/src/protocol_key.c b/src/protocol_key.c
index b85de5ede486dbf5a76f4d785266a6af49f3122e..03131eb88fa92b29d48c0031253c101c5623ef15 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.4 2002/02/27 22:37:55 guus Exp $
+    $Id: protocol_key.c,v 1.1.4.12 2002/09/09 19:40:05 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,38 +47,32 @@ int mykeyused = 0;
 
 int send_key_changed(connection_t *c, node_t *n)
 {
-  connection_t *other;
-  avl_node_t *node;
-cp
+  cp();
   /* Only send this message if some other daemon requested our key previously.
      This reduces unnecessary key_changed broadcasts.
   */
 
   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->status.mst && other != c)
-        send_request(other, "%d %s", KEY_CHANGED, n->name);
-    }
-cp
-  return 0;
+  cp();
+  return send_request(c, "%d %lx %s", KEY_CHANGED, random(), n->name);
 }
 
 int key_changed_h(connection_t *c)
 {
   char name[MAX_STRING_SIZE];
   node_t *n;
-cp
-  if(sscanf(c->buffer, "%*d "MAX_STRING, name) != 1)
+  cp();
+  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)
@@ -91,16 +84,17 @@ cp
 
   n->status.validkey = 0;
   n->status.waitingforkey = 0;
-  n->sent_seqno = 0;
 
-  send_key_changed(c, n);
-cp
+  /* Tell the others */
+
+  forward_request(c);
+  cp();
   return 0;
 }
 
 int send_req_key(connection_t *c, node_t *from, node_t *to)
 {
-cp
+  cp();
   return send_request(c, "%d %s %s", REQ_KEY,
                       from->name, to->name);
 }
@@ -110,7 +104,7 @@ int req_key_h(connection_t *c)
   char from_name[MAX_STRING_SIZE];
   char to_name[MAX_STRING_SIZE];
   node_t *from, *to;
-cp
+  cp();
   if(sscanf(c->buffer, "%*d "MAX_STRING" "MAX_STRING, from_name, to_name) != 2)
     {
        syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "REQ_KEY",
@@ -156,17 +150,17 @@ cp
         send_req_key(to->nexthop->connection, from, to);
     }
 
-cp
+  cp();
   return 0;
 }
 
 int send_ans_key(connection_t *c, node_t *from, node_t *to)
 {
   char key[MAX_STRING_SIZE];
-cp
+  cp();
   bin2hex(from->key, key, from->keylength);
   key[from->keylength * 2] = '\0';
-cp
+  cp();
   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);
 }
@@ -178,7 +172,7 @@ int ans_key_h(connection_t *c)
   char key[MAX_STRING_SIZE];
   int cipher, digest, maclength, compression;
   node_t *from, *to;
-cp
+  cp();
   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",
@@ -223,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)
@@ -269,6 +264,6 @@ cp
   from->compression = compression;
   
   flush_queue(from);
-cp
+  cp();
   return 0;
 }