X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol.c;h=51d95e9dd2e2c30a43ebed43a3b08563c6f3e80a;hp=3b23c9e28e1c92e612dd2da1668dee863518fd2c;hb=028659bfbf164cb7a72831506896e291010b251f;hpb=e4ff969a9868ecc25a85daab620f97227de8d493

diff --git a/src/protocol.c b/src/protocol.c
index 3b23c9e2..51d95e9d 100644
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -188,7 +188,7 @@ void send_key_changed_all(void)
   conn_list_t *p;
 cp
   for(p = conn_list; p != NULL; p = p->next)
-    if(p->status.meta && p->active)
+    if(p->status.meta && p->status.active)
       send_key_changed(p, myself);
 cp
 }
@@ -332,7 +332,7 @@ int notify_others(conn_list_t *new, conn_list_t *source,
   conn_list_t *p;
 cp
   for(p = conn_list; p != NULL; p = p->next)
-    if(p != new && p != source && p->status.meta && p->active)
+    if(p != new && p != source && p->status.meta && p->status.active)
       function(p, new);
 cp
   return 0;
@@ -347,7 +347,7 @@ int notify_one(conn_list_t *new)
   conn_list_t *p;
 cp
   for(p = conn_list; p != NULL; p = p->next)
-    if(p != new && p->active)
+    if(p != new && p->status.active)
       send_add_host(new, p);
 cp
   return 0;
@@ -453,7 +453,7 @@ cp
      old connection that has timed out but we don't know it yet. Because our
      conn_list entry is not active, lookup_conn will skip ourself. */
 
-  if(old=lookup_conn(cl->vpn_ip)) 
+  while(old=lookup_conn(cl->vpn_ip)) 
     terminate_connection(old);
 
   cl->status.active = 1;