X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol.c;h=52300632ad2286b923b60a7fa0d417d4e9d84c3a;hp=e3e7e3908058ff47a3d2788f58cab1bf6935bfea;hb=4dee76522e177dcb4af5d6d844a5f3b74070e4b7;hpb=d1b597758eab68bb80d97855f25cb6dda55eeb0b

diff --git a/src/protocol.c b/src/protocol.c
index e3e7e390..52300632 100644
--- a/src/protocol.c
+++ b/src/protocol.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.c,v 1.28.4.88 2001/05/24 21:29:09 guus Exp $
+    $Id: protocol.c,v 1.28.4.90 2001/05/25 08:36:11 guus Exp $
 */
 
 #include "config.h"
@@ -68,6 +68,8 @@
 
 #include "system.h"
 
+int mykeyused = 0;
+
 int check_id(char *id)
 {
   int i;
@@ -1066,6 +1068,7 @@ cp
   cl->last_ping_time = time(NULL);
   RAND_bytes(salt, SALTLEN);
   bin2hex(salt, salt, SALTLEN);
+  salt[SALTLEN*2] = '\0';
 cp
   return send_request(cl, "%d %s", PING, salt);
 }
@@ -1082,6 +1085,7 @@ int send_pong(connection_t *cl)
 cp
   RAND_bytes(salt, SALTLEN);
   bin2hex(salt, salt, SALTLEN);
+  salt[SALTLEN*2] = '\0';
 cp
   return send_request(cl, "%d %s", PONG, salt);
 }
@@ -1101,13 +1105,21 @@ int send_key_changed(connection_t *from, connection_t *cl)
   connection_t *p;
   avl_node_t *node;
 cp
-  for(node = connection_tree->head; node; node = node->next)
+  /* Only send this message if some other daemon requested our key previously.
+     This reduces unnecessary key_changed broadcasts.
+  */
+
+  if(mykeyused)
     {
-      p = (connection_t *)node->data;
-      if(p != cl && p->status.meta && p->status.active)
-        if(!(p->options & OPTION_INDIRECT) || from == myself)
-          send_request(p, "%d %s", KEY_CHANGED, from->name);
-    }
+      for(node = connection_tree->head; node; node = node->next)
+        {
+          p = (connection_t *)node->data;
+          if(p != cl && p->status.meta && p->status.active)
+            if(!(p->options & OPTION_INDIRECT) || from == myself)
+              send_request(p, "%d %s", KEY_CHANGED, from->name);
+        }
+    mykeyused = 0;
+  }
 cp
   return 0;
 }
@@ -1170,11 +1182,12 @@ cp
 
   /* Check if this key request is for us */
 
-  if(!strcmp(to_id, myself->name))
+  if(!strcmp(to_id, myself->name))	/* Yes, send our own key back */
     {
       bin2hex(myself->cipher_pktkey, pktkey, myself->cipher_pktkeylength);
       pktkey[myself->cipher_pktkeylength*2] = '\0';
       send_ans_key(myself, from, pktkey);
+      mykeyused = 1;
     }
   else
     {