Only send key_changed if it was previously requested.

[tinc] / src / protocol.c

diff --git a/src/protocol.c b/src/protocol.c
index 6da4025..be3b5d1 100644 (file)
--- 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.85 2001/03/04 13:59:28 guus Exp $
+    $Id: protocol.c,v 1.28.4.89 2001/05/24 21:52:26 guus Exp $
 */
 
 #include "config.h"
@@ -68,6 +68,8 @@
 
 #include "system.h"
 
+int mykeyused = 0;
+
 int check_id(char *id)
 {
   int i;
@@ -325,6 +327,7 @@ cp
       subnet = (subnet_t *)node->data;
       send_add_subnet(cl, subnet);
     }
+
   /* And send him all the hosts and their subnets we know... */
   
   for(node = connection_tree->head; node; node = node->next)
@@ -644,7 +647,7 @@ int send_add_subnet(connection_t *cl, subnet_t *subnet)
   char *netstr;
   char *owner;
 cp
-  if(cl->options & OPTION_INDIRECT)
+  if((cl->options | myself->options | subnet->owner->options) & OPTION_INDIRECT)
     owner = myself->name;
   else
     owner = subnet->owner->name;
@@ -810,7 +813,7 @@ cp
 int send_add_host(connection_t *cl, connection_t *other)
 {
 cp
-  if(!(cl->options & OPTION_INDIRECT))
+  if(!((cl->options | myself->options | other->options) & OPTION_INDIRECT))
     return send_request(cl, "%d %s %lx:%d %lx", ADD_HOST,
                       other->name, other->address, other->port, other->options);
   else
@@ -904,7 +907,7 @@ cp
 int send_del_host(connection_t *cl, connection_t *other)
 {
 cp
-  if(!(cl->options & OPTION_INDIRECT))
+  if(!((cl->options | myself->options) & OPTION_INDIRECT))
     return send_request(cl, "%d %s %lx:%d %lx", DEL_HOST,
                       other->name, other->address, other->port, other->options);
   else
@@ -914,7 +917,7 @@ cp
 int del_host_h(connection_t *cl)
 {
   char name[MAX_STRING_SIZE];
-  ip_t address;
+  ipv4_t address;
   port_t port;
   long int options;
   connection_t *old, *p;
@@ -1059,11 +1062,14 @@ cp
 
 int send_ping(connection_t *cl)
 {
+  char salt[SALTLEN*2+1];
 cp
   cl->status.pinged = 1;
   cl->last_ping_time = time(NULL);
+  RAND_bytes(salt, SALTLEN);
+  bin2hex(salt, salt, SALTLEN);
 cp
-  return send_request(cl, "%d", PING);
+  return send_request(cl, "%d %s", PING, salt);
 }
 
 int ping_h(connection_t *cl)
@@ -1074,8 +1080,12 @@ cp
 
 int send_pong(connection_t *cl)
 {
+  char salt[SALTLEN*2+1];
 cp
-  return send_request(cl, "%d", PONG);
+  RAND_bytes(salt, SALTLEN);
+  bin2hex(salt, salt, SALTLEN);
+cp
+  return send_request(cl, "%d %s", PONG, salt);
 }
 
 int pong_h(connection_t *cl)
@@ -1093,13 +1103,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;
 }
@@ -1126,7 +1144,8 @@ cp
   from->status.validkey = 0;
   from->status.waitingforkey = 0;
 
-  send_key_changed(from, cl);
+  if(!(from->options | cl->options | myself->options) & OPTION_INDIRECT)
+    send_key_changed(from, cl);
 cp
   return 0;
 }
@@ -1161,11 +1180,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
     {