X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol.c;h=d079dfb4026e30b50f893f34a92cd6b8f529a20f;hp=2e9769d24cedc843286224322dd26a1906f1f5af;hb=e0ddb638d1fb7abf19969ac887f3b7a2bd8225c1;hpb=070ad08118a33755835b31174e2b04e84f75556e

diff --git a/src/protocol.c b/src/protocol.c
index 2e9769d2..d079dfb4 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.12 2000/06/27 20:55:12 guus Exp $
+    $Id: protocol.c,v 1.28.4.14 2000/06/28 13:41:02 guus Exp $
 */
 
 #include "config.h"
@@ -61,10 +61,6 @@ cp
       syslog(LOG_ERR, _("Send failed: %d:%d: %m"), __FILE__, __LINE__);
       return -1;
     }
-
-  if(debug_lvl > 0)
-    syslog(LOG_NOTICE, _("Connection with " IP_ADDR_S " (%s) activated"),
-                       IP_ADDR_V(cl->vpn_ip), cl->hostname);
 cp
   return 0;
 }
@@ -110,8 +106,8 @@ int send_del_host(conn_list_t *cl, conn_list_t *new_host)
 {
 cp
   if(debug_lvl > 1)
-    syslog(LOG_DEBUG, _("Sending DEL_HOST for " IP_ADDR_S " to " IP_ADDR_S " (%s)"),
-	   IP_ADDR_V(new_host->vpn_ip), IP_ADDR_V(cl->vpn_ip), cl->hostname);
+    syslog(LOG_DEBUG, _("Sending DEL_HOST for " IP_ADDR_S " (%s) to " IP_ADDR_S " (%s)"),
+	   IP_ADDR_V(new_host->vpn_ip), new_host->hostname, IP_ADDR_V(cl->vpn_ip), cl->hostname);
 
   buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx\n", DEL_HOST, new_host->vpn_ip);
 
@@ -350,7 +346,7 @@ cp
 
   if((write(fw->nexthop->meta_socket, buffer, buflen)) < 0)
     {
-      syslog(LOG_ERR, _("send failed: %s:%d: %m"), __FILE__, __LINE__);
+      syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
       return -1;
     }
 cp
@@ -492,6 +488,11 @@ cp
         terminate_connection(old);
 
       cl->status.active = 1;
+
+      if(debug_lvl > 0)
+        syslog(LOG_NOTICE, _("Connection with " IP_ADDR_S " (%s) activated"),
+                           IP_ADDR_V(cl->vpn_ip), cl->hostname);
+
       notify_others(cl, NULL, send_add_host);
       notify_one(cl);
     }
@@ -507,8 +508,13 @@ cp
               IP_ADDR_V(cl->vpn_ip), cl->hostname);
   
   cl->status.active = 1;
+
   syslog(LOG_NOTICE, _("Connection with " IP_ADDR_S " (%s) activated"),
               IP_ADDR_V(cl->vpn_ip), cl->hostname);
+
+  notify_others(cl, NULL, send_add_host);
+  notify_one(cl);
+
   upstreamindex = 0;
 cp
   return 0;
@@ -579,10 +585,6 @@ cp
        return -1;
     }  
 
-  if(debug_lvl > 1)
-    syslog(LOG_DEBUG, _("Got DEL_HOST for " IP_ADDR_S " from " IP_ADDR_S " (%s)"),
-           IP_ADDR_V(vpn_ip), IP_ADDR_V(cl->vpn_ip), cl->hostname);
-
   if(!(fw = lookup_conn(vpn_ip)))
     {
       syslog(LOG_ERR, _("Got DEL_HOST for " IP_ADDR_S " from " IP_ADDR_S " (%s) which does not exist?"),
@@ -590,6 +592,10 @@ cp
       return 0;
     }
 
+  if(debug_lvl > 1)
+    syslog(LOG_DEBUG, _("Got DEL_HOST for " IP_ADDR_S " (%s) from " IP_ADDR_S " (%s)"),
+           IP_ADDR_V(fw->vpn_ip), fw->hostname, IP_ADDR_V(cl->vpn_ip), cl->hostname);
+
   notify_others(fw, cl, send_del_host);
 
   fw->status.termreq = 1;