X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol.c;h=e3e7e3908058ff47a3d2788f58cab1bf6935bfea;hp=6da4025ada10402cfe5808679696f251c475df72;hb=d1b597758eab68bb80d97855f25cb6dda55eeb0b;hpb=34f9e6cf2d6d2b81eb63f9f28963b447a2157740

diff --git a/src/protocol.c b/src/protocol.c
index 6da4025a..e3e7e390 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.85 2001/03/04 13:59:28 guus Exp $
+    $Id: protocol.c,v 1.28.4.88 2001/05/24 21:29:09 guus Exp $
 */
 
 #include "config.h"
@@ -325,6 +325,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 +645,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 +811,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 +905,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 +915,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 +1060,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 +1078,12 @@ cp
 
 int send_pong(connection_t *cl)
 {
+  char salt[SALTLEN*2+1];
+cp
+  RAND_bytes(salt, SALTLEN);
+  bin2hex(salt, salt, SALTLEN);
 cp
-  return send_request(cl, "%d", PONG);
+  return send_request(cl, "%d %s", PONG, salt);
 }
 
 int pong_h(connection_t *cl)
@@ -1126,7 +1134,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;
 }