X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol_key.c;h=0f14cd69c53251d0d6e02e3e2fce9b94240eb78e;hp=3c72c294cd034e7b86dcfff3715333712f3baa3d;hb=4a7c2026aec6966f934b60d75bc472d28f8587d8;hpb=5bf4b88666ecafe190e8ed71d6c14c9de8d16e1f

diff --git a/src/protocol_key.c b/src/protocol_key.c
index 3c72c294..0f14cd69 100644
--- 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.1 2002/02/11 10:05:58 guus Exp $
+    $Id: protocol_key.c,v 1.1.4.9 2002/09/04 08:02:33 guus Exp $
 */
 
 #include "config.h"
@@ -40,16 +40,13 @@
 #include "meta.h"
 #include "connection.h"
 #include "node.h"
-#include "edge.h"
-\
+
 #include "system.h"
 
 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.
@@ -58,12 +55,7 @@ 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->status.mst && other != c)
-        send_request(other, "%d %s", KEY_CHANGED, n->name);
-    }
+  send_request(NULL, "%d %lx %s", KEY_CHANGED, random(), n->name);
 cp
   return 0;
 }
@@ -71,15 +63,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)
@@ -91,9 +88,15 @@ cp
 
   n->status.validkey = 0;
   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;
 }
@@ -141,7 +144,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
@@ -167,8 +170,8 @@ cp
   bin2hex(from->key, key, from->keylength);
   key[from->keylength * 2] = '\0';
 cp
-  return send_request(c, "%d %s %s %s %d %d %d", ANS_KEY,
-                      from->name, to->name, key, from->cipher?from->cipher->nid:0, from->digest?from->digest->type:0, from->maclength);
+  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);
 }
 
 int ans_key_h(connection_t *c)
@@ -176,10 +179,10 @@ int ans_key_h(connection_t *c)
   char from_name[MAX_STRING_SIZE];
   char to_name[MAX_STRING_SIZE];
   char key[MAX_STRING_SIZE];
-  int cipher, digest, maclength;
+  int cipher, digest, maclength, compression;
   node_t *from, *to;
 cp
-  if(sscanf(c->buffer, "%*d "MAX_STRING" "MAX_STRING" "MAX_STRING" %d %d %d", from_name, to_name, key, &cipher, &digest, &maclength) != 6)
+  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",
               c->name, c->hostname);
@@ -208,7 +211,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 */
@@ -223,7 +226,8 @@ cp
 
   from->status.validkey = 1;
   from->status.waitingforkey = 0;
-  
+  from->received_seqno = 0;
+    
   /* Check and lookup cipher and digest algorithms */
 
   if(cipher)
@@ -245,6 +249,8 @@ cp
       from->cipher = NULL;
     }
 
+  from->maclength = maclength;
+
   if(digest)
     {
       from->digest = EVP_get_digestbynid(digest);
@@ -253,7 +259,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,8 +268,9 @@ cp
   else
     {
       from->digest = NULL;
-      from->maclength = maclength;
     }
+
+  from->compression = compression;
   
   flush_queue(from);
 cp