s/sliepen.warande.net/sliepen.eu.org/g

[tinc] / src / protocol_key.c

diff --git a/src/protocol_key.c b/src/protocol_key.c
index 621bb1b..3d711f9 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.2 2002/02/11 15:59:18 guus Exp $
+    $Id: protocol_key.c,v 1.1.4.7 2002/06/21 10:11:19 guus Exp $
 */
 
 #include "config.h"
@@ -41,7 +41,7 @@
 #include "connection.h"
 #include "node.h"
 #include "edge.h"
-\
+
 #include "system.h"
 
 int mykeyused = 0;
@@ -61,8 +61,8 @@ cp
   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;
@@ -71,15 +71,20 @@ cp
 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 "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;
     }
 
+  if(seen_request(c->buffer))
+    return 0;
+
   n = lookup_node(name);
 
   if(!n)
@@ -93,7 +98,14 @@ cp
   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;
 }
@@ -208,7 +220,7 @@ cp
 
   if(to != myself)
     {
-      return send_request(to->nexthop->connection, c->buffer);
+      return send_request(to->nexthop->connection, "%s", c->buffer);
     }
 
   /* Update our copy of the origin's packet key */
@@ -245,6 +257,8 @@ cp
       from->cipher = NULL;
     }
 
+  from->maclength = maclength;
+
   if(digest)
     {
       from->digest = EVP_get_digestbynid(digest);
@@ -253,7 +267,6 @@ cp
          syslog(LOG_ERR, _("Node %s (%s) uses unknown digest!"), from->name, from->hostname);
          return -1;
        }
-      from->maclength = maclength;
       if(from->maclength > from->digest->md_size || from->maclength < 0)
        {
          syslog(LOG_ERR, _("Node %s (%s) uses bogus MAC length!"), from->name, from->hostname);
@@ -263,7 +276,6 @@ cp
   else
     {
       from->digest = NULL;
-      from->maclength = maclength;
     }
 
   from->compression = compression;