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

diff --git a/src/protocol.c b/src/protocol.c
index 2e9769d2..6740cb0d 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.15 2000/06/29 13:04:15 guus Exp $
 */
 
 #include "config.h"
@@ -51,8 +51,8 @@ int send_ack(conn_list_t *cl)
 {
 cp
   if(debug_lvl > 1)
-    syslog(LOG_DEBUG, _("Sending ACK to " IP_ADDR_S " (%s)"),
-	   IP_ADDR_V(cl->vpn_ip), cl->hostname);
+    syslog(LOG_DEBUG, _("Sending ACK to %s (%s)"),
+	   cl->vpn_hostname, cl->real_hostname);
 
   buflen = snprintf(buffer, MAXBUFSIZE, "%d\n", ACK);
 
@@ -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;
 }
@@ -73,8 +69,8 @@ int send_termreq(conn_list_t *cl)
 {
 cp
   if(debug_lvl > 1)
-    syslog(LOG_DEBUG, _("Sending TERMREQ to " IP_ADDR_S " (%s)"),
-	   IP_ADDR_V(cl->vpn_ip), cl->hostname);
+    syslog(LOG_DEBUG, _("Sending TERMREQ to %s (%s)"),
+	   cl->vpn_hostname, cl->real_hostname);
 
   buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx\n", TERMREQ, myself->vpn_ip);
 
@@ -92,8 +88,8 @@ int send_timeout(conn_list_t *cl)
 {
 cp
   if(debug_lvl > 1)
-    syslog(LOG_DEBUG, _("Sending TIMEOUT to " IP_ADDR_S " (%s)"),
-	   IP_ADDR_V(cl->vpn_ip), cl->hostname);
+    syslog(LOG_DEBUG, _("Sending TIMEOUT to %s (%s)"),
+	   cl->vpn_hostname, cl->real_hostname);
 
   buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx\n", PINGTIMEOUT, myself->vpn_ip);
 
@@ -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 %s (%s) to %s (%s)"),
+	   new_host->vpn_hostname, new_host->real_hostname, cl->vpn_hostname, cl->real_hostname);
 
   buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx\n", DEL_HOST, new_host->vpn_ip);
 
@@ -128,8 +124,8 @@ int send_ping(conn_list_t *cl)
 {
 cp
   if(debug_lvl > 1)
-    syslog(LOG_DEBUG, _("Sending PING to " IP_ADDR_S " (%s)"),
-	   IP_ADDR_V(cl->vpn_ip), cl->hostname);
+    syslog(LOG_DEBUG, _("Sending PING to %s (%s)"),
+	   cl->vpn_hostname, cl->real_hostname);
 
   buflen = snprintf(buffer, MAXBUFSIZE, "%d\n", PING);
 
@@ -146,8 +142,8 @@ int send_pong(conn_list_t *cl)
 {
 cp
   if(debug_lvl > 1)
-    syslog(LOG_DEBUG, _("Sending PONG to " IP_ADDR_S " (%s)"),
-	   IP_ADDR_V(cl->vpn_ip), cl->hostname);
+    syslog(LOG_DEBUG, _("Sending PONG to %s (%s)"),
+	   cl->vpn_hostname, cl->real_hostname);
 
   buflen = snprintf(buffer, MAXBUFSIZE, "%d\n", PONG);
 
@@ -167,7 +163,7 @@ int send_add_host(conn_list_t *cl, conn_list_t *new_host)
   char *hostname;
 cp
   real_ip = new_host->real_ip;
-  hostname = new_host->hostname;
+  hostname = new_host->real_hostname;
   flags = new_host->flags;
   
   /* If we need to propagate information about a new host that wants us to export
@@ -181,12 +177,12 @@ cp
       flags &= ~EXPORTINDIRECTDATA;
       flags |= INDIRECTDATA;
       real_ip = myself->vpn_ip;
-      hostname = myself->hostname;
+      hostname = myself->real_hostname;
     }
 
   if(debug_lvl > 1)
-    syslog(LOG_DEBUG, _("Sending ADD_HOST for " IP_ADDR_S " (%s) to " IP_ADDR_S " (%s)"),
-	   IP_ADDR_V(new_host->vpn_ip), hostname, IP_ADDR_V(cl->vpn_ip), cl->hostname);
+    syslog(LOG_DEBUG, _("Sending ADD_HOST for %s (%s) to %s (%s)"),
+	   new_host->vpn_hostname, hostname, cl->vpn_hostname, cl->real_hostname);
 
   buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx %lx/%lx:%x %d\n", ADD_HOST, real_ip, new_host->vpn_ip, new_host->vpn_mask, new_host->port, flags);
 
@@ -203,8 +199,8 @@ int send_key_changed(conn_list_t *cl, conn_list_t *src)
 {
 cp
   if(debug_lvl > 1)
-    syslog(LOG_DEBUG, _("Sending KEY_CHANGED origin " IP_ADDR_S " to " IP_ADDR_S " (%s)"),
-	   IP_ADDR_V(src->vpn_ip), IP_ADDR_V(cl->vpn_ip), cl->hostname);
+    syslog(LOG_DEBUG, _("Sending KEY_CHANGED origin %s to %s (%s)"),
+	   src->vpn_hostname, cl->vpn_hostname, cl->real_hostname);
 
   buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx\n", KEY_CHANGED, src->vpn_ip);
 
@@ -232,7 +228,7 @@ int send_basic_info(conn_list_t *cl)
 cp
   if(debug_lvl > 1)
     syslog(LOG_DEBUG, _("Sending BASIC_INFO to %s"),
-	   cl->hostname);
+	   cl->real_hostname);
 
   buflen = snprintf(buffer, MAXBUFSIZE, "%d %d %lx/%lx:%x %d\n", BASIC_INFO, PROT_CURRENT, myself->vpn_ip, myself->vpn_mask, myself->port, myself->flags);
 
@@ -252,8 +248,8 @@ cp
   encrypt_passphrase(&tmp);
 
   if(debug_lvl > 1)
-    syslog(LOG_DEBUG, _("Sending PASSPHRASE to " IP_ADDR_S " (%s)"),
-	   IP_ADDR_V(cl->vpn_ip), cl->hostname);
+    syslog(LOG_DEBUG, _("Sending PASSPHRASE to %s (%s)"),
+	   cl->vpn_hostname, cl->real_hostname);
 
   buflen = snprintf(buffer, MAXBUFSIZE, "%d %s\n", PASSPHRASE, tmp.phrase);
 
@@ -270,8 +266,8 @@ int send_public_key(conn_list_t *cl)
 {
 cp
   if(debug_lvl > 1)
-    syslog(LOG_DEBUG, _("Sending PUBLIC_KEY to " IP_ADDR_S " (%s)"),
-	   IP_ADDR_V(cl->vpn_ip), cl->hostname);
+    syslog(LOG_DEBUG, _("Sending PUBLIC_KEY to %s (%s)"),
+	   cl->vpn_hostname, cl->real_hostname);
 
   buflen = snprintf(buffer, MAXBUFSIZE, "%d %s\n", PUBLIC_KEY, my_public_key_base36);
 
@@ -307,14 +303,14 @@ cp
   fw = lookup_conn(to);
   if(!fw)
     {
-      syslog(LOG_ERR, _("Attempting to send REQ_KEY to " IP_ADDR_S ", which does not exist?"),
+      syslog(LOG_ERR, _("Attempting to send REQ_KEY to %d.%d.%d.%d, which does not exist?"),
 	     IP_ADDR_V(to));
       return -1;
     }
 
   if(debug_lvl > 1)
-    syslog(LOG_DEBUG, _("Sending REQ_KEY to " IP_ADDR_S " (%s)"),
-	   IP_ADDR_V(fw->nexthop->vpn_ip), fw->nexthop->hostname);
+    syslog(LOG_DEBUG, _("Sending REQ_KEY to %s (%s)"),
+	   fw->nexthop->vpn_hostname, fw->nexthop->real_hostname);
 
   buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx %lx\n", REQ_KEY, to, myself->vpn_ip);
 
@@ -337,20 +333,20 @@ cp
   
   if(!fw)
     {
-      syslog(LOG_ERR, _("Attempting to send ANS_KEY to " IP_ADDR_S ", which does not exist?"),
+      syslog(LOG_ERR, _("Attempting to send ANS_KEY to %d.%d.%d.%d, which does not exist?"),
 	     IP_ADDR_V(to));
       return -1;
     }
 
  if(debug_lvl > 1)
-    syslog(LOG_DEBUG, _("Sending ANS_KEY to " IP_ADDR_S " (%s)"),
-	   IP_ADDR_V(fw->nexthop->vpn_ip), fw->nexthop->hostname);
+    syslog(LOG_DEBUG, _("Sending ANS_KEY to %s (%s)"),
+	   fw->nexthop->vpn_hostname, fw->nexthop->real_hostname);
 
   buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx %lx %d %s\n", ANS_KEY, to, myself->vpn_ip, my_key_expiry, my_public_key_base36);
 
   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
@@ -397,14 +393,16 @@ int basic_info_h(conn_list_t *cl)
 {
 cp
   if(debug_lvl > 1)
-    syslog(LOG_DEBUG, _("Got BASIC_INFO from %s"), cl->hostname);
+    syslog(LOG_DEBUG, _("Got BASIC_INFO from %s"), cl->real_hostname);
 
   if(sscanf(cl->buffer, "%*d %d %lx/%lx:%hx %d", &cl->protocol_version, &cl->vpn_ip, &cl->vpn_mask, &cl->port, &cl->flags) != 5)
     {
        syslog(LOG_ERR, _("Got bad BASIC_INFO from %s"),
-              cl->hostname);
+              cl->real_hostname);
        return -1;
-    }  
+    }
+    
+  cl->vpn_hostname = hostlookup(htonl(cl->vpn_ip));
 
   if(cl->protocol_version != PROT_CURRENT)
     {
@@ -436,15 +434,15 @@ cp
 
   if(sscanf(cl->buffer, "%*d %as", &(cl->pp->phrase)) != 1)
     {
-      syslog(LOG_ERR, _("Got bad PASSPHRASE from " IP_ADDR_S " (%s)"),
-              IP_ADDR_V(cl->vpn_ip), cl->hostname);
+      syslog(LOG_ERR, _("Got bad PASSPHRASE from %s (%s)"),
+              cl->vpn_hostname, cl->real_hostname);
       return -1;
     }
   cl->pp->len = strlen(cl->pp->phrase);
     
   if(debug_lvl > 1)
-    syslog(LOG_DEBUG, _("Got PASSPHRASE from " IP_ADDR_S " (%s)"),
-              IP_ADDR_V(cl->vpn_ip), cl->hostname);
+    syslog(LOG_DEBUG, _("Got PASSPHRASE from %s (%s)"),
+              cl->vpn_hostname, cl->real_hostname);
 
   if(cl->status.outgoing)
     send_passphrase(cl);
@@ -461,14 +459,14 @@ int public_key_h(conn_list_t *cl)
 cp
   if(sscanf(cl->buffer, "%*d %as", &g_n) != 1)
     {
-       syslog(LOG_ERR, _("Got bad PUBLIC_KEY from " IP_ADDR_S " (%s)"),
-              IP_ADDR_V(cl->vpn_ip), cl->hostname);
+       syslog(LOG_ERR, _("Got bad PUBLIC_KEY from %s (%s)"),
+              cl->vpn_hostname, cl->real_hostname);
        return -1;
     }  
 
   if(debug_lvl > 1)
-    syslog(LOG_DEBUG, _("Got PUBLIC_KEY from " IP_ADDR_S " (%s)"),
-              IP_ADDR_V(cl->vpn_ip), cl->hostname);
+    syslog(LOG_DEBUG, _("Got PUBLIC_KEY from %s (%s)"),
+              cl->vpn_hostname, cl->real_hostname);
 
   if(verify_passphrase(cl, g_n))
     {
@@ -492,6 +490,11 @@ cp
         terminate_connection(old);
 
       cl->status.active = 1;
+
+      if(debug_lvl > 0)
+        syslog(LOG_NOTICE, _("Connection with %s (%s) activated"),
+                           cl->vpn_hostname, cl->real_hostname);
+
       notify_others(cl, NULL, send_add_host);
       notify_one(cl);
     }
@@ -503,12 +506,17 @@ int ack_h(conn_list_t *cl)
 {
 cp
   if(debug_lvl > 1)
-    syslog(LOG_DEBUG, _("Got ACK from " IP_ADDR_S " (%s)"),
-              IP_ADDR_V(cl->vpn_ip), cl->hostname);
+    syslog(LOG_DEBUG, _("Got ACK from %s (%s)"),
+              cl->vpn_hostname, cl->real_hostname);
   
   cl->status.active = 1;
-  syslog(LOG_NOTICE, _("Connection with " IP_ADDR_S " (%s) activated"),
-              IP_ADDR_V(cl->vpn_ip), cl->hostname);
+
+  syslog(LOG_NOTICE, _("Connection with %s (%s) activated"),
+              cl->vpn_hostname, cl->real_hostname);
+
+  notify_others(cl, NULL, send_add_host);
+  notify_one(cl);
+
   upstreamindex = 0;
 cp
   return 0;
@@ -519,14 +527,14 @@ int termreq_h(conn_list_t *cl)
 cp
   if(!cl->status.active)
     {
-      syslog(LOG_ERR, _("Got unauthorized TERMREQ from " IP_ADDR_S " (%s)"),
-              IP_ADDR_V(cl->vpn_ip), cl->hostname);
+      syslog(LOG_ERR, _("Got unauthorized TERMREQ from %s (%s)"),
+              cl->vpn_hostname, cl->real_hostname);
       return -1;
     }
     
   if(debug_lvl > 1)
-   syslog(LOG_DEBUG, _("Got TERMREQ from " IP_ADDR_S " (%s)"),
-             IP_ADDR_V(cl->vpn_ip), cl->hostname);
+   syslog(LOG_DEBUG, _("Got TERMREQ from %s (%s)"),
+             cl->vpn_hostname, cl->real_hostname);
   
   cl->status.termreq = 1;
 
@@ -545,14 +553,14 @@ int timeout_h(conn_list_t *cl)
 cp
   if(!cl->status.active)
     {
-      syslog(LOG_ERR, _("Got unauthorized TIMEOUT from " IP_ADDR_S " (%s)"),
-              IP_ADDR_V(cl->vpn_ip), cl->hostname);
+      syslog(LOG_ERR, _("Got unauthorized TIMEOUT from %s (%s)"),
+              cl->vpn_hostname, cl->real_hostname);
       return -1;
     }
 
   if(debug_lvl > 1)
-    syslog(LOG_DEBUG, _("Got TIMEOUT from " IP_ADDR_S " (%s)"),
-              IP_ADDR_V(cl->vpn_ip), cl->hostname);
+    syslog(LOG_DEBUG, _("Got TIMEOUT from %s (%s)"),
+              cl->vpn_hostname, cl->real_hostname);
 
   cl->status.termreq = 1;
   terminate_connection(cl);
@@ -567,29 +575,29 @@ int del_host_h(conn_list_t *cl)
 cp
   if(!cl->status.active)
     {
-      syslog(LOG_ERR, _("Got unauthorized DEL_HOST from " IP_ADDR_S " (%s)"),
-              IP_ADDR_V(cl->vpn_ip), cl->hostname);
+      syslog(LOG_ERR, _("Got unauthorized DEL_HOST from %s (%s)"),
+              cl->vpn_hostname, cl->real_hostname);
       return -1;
     }
 
   if(sscanf(cl->buffer, "%*d %lx", &vpn_ip) != 1)
     {
-       syslog(LOG_ERR, _("Got bad DEL_HOST from " IP_ADDR_S " (%s)"),
-              IP_ADDR_V(cl->vpn_ip), cl->hostname);
+       syslog(LOG_ERR, _("Got bad DEL_HOST from %s (%s)"),
+              cl->vpn_hostname, cl->real_hostname);
        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?"),
-	     IP_ADDR_V(vpn_ip), IP_ADDR_V(cl->vpn_ip), cl->hostname);
+      syslog(LOG_ERR, _("Got DEL_HOST for %d.%d.%d.%d from %s (%s) which does not exist?"),
+	     IP_ADDR_V(vpn_ip), cl->vpn_hostname, cl->real_hostname);
       return 0;
     }
 
+  if(debug_lvl > 1)
+    syslog(LOG_DEBUG, _("Got DEL_HOST for %s (%s) from %s (%s)"),
+           fw->vpn_hostname, fw->real_hostname, cl->vpn_hostname, cl->real_hostname);
+
   notify_others(fw, cl, send_del_host);
 
   fw->status.termreq = 1;
@@ -605,14 +613,14 @@ int ping_h(conn_list_t *cl)
 cp
   if(!cl->status.active)
     {
-      syslog(LOG_ERR, _("Got unauthorized PING from " IP_ADDR_S " (%s)"),
-              IP_ADDR_V(cl->vpn_ip), cl->hostname);
+      syslog(LOG_ERR, _("Got unauthorized PING from %s (%s)"),
+              cl->vpn_hostname, cl->real_hostname);
       return -1;
     }
 
   if(debug_lvl > 1)
-    syslog(LOG_DEBUG, _("Got PING from " IP_ADDR_S " (%s)"),
-              IP_ADDR_V(cl->vpn_ip), cl->hostname);
+    syslog(LOG_DEBUG, _("Got PING from %s (%s)"),
+              cl->vpn_hostname, cl->real_hostname);
 
   cl->status.pinged = 0;
   cl->status.got_pong = 1;
@@ -627,14 +635,14 @@ int pong_h(conn_list_t *cl)
 cp
   if(!cl->status.active)
     {
-      syslog(LOG_ERR, _("Got unauthorized PONG from " IP_ADDR_S " (%s)"),
-              IP_ADDR_V(cl->vpn_ip), cl->hostname);
+      syslog(LOG_ERR, _("Got unauthorized PONG from %s (%s)"),
+              cl->vpn_hostname, cl->real_hostname);
       return -1;
     }
 
   if(debug_lvl > 1)
-    syslog(LOG_DEBUG, _("Got PONG from " IP_ADDR_S " (%s)"),
-              IP_ADDR_V(cl->vpn_ip), cl->hostname);
+    syslog(LOG_DEBUG, _("Got PONG from %s (%s)"),
+              cl->vpn_hostname, cl->real_hostname);
 
   cl->status.got_pong = 1;
 cp
@@ -652,15 +660,15 @@ int add_host_h(conn_list_t *cl)
 cp
   if(!cl->status.active)
     {
-      syslog(LOG_ERR, _("Got unauthorized ADD_HOST from " IP_ADDR_S " (%s)"),
-              IP_ADDR_V(cl->vpn_ip), cl->hostname);
+      syslog(LOG_ERR, _("Got unauthorized ADD_HOST from %s (%s)"),
+              cl->vpn_hostname, cl->real_hostname);
       return -1;
     }
     
   if(sscanf(cl->buffer, "%*d %lx %lx/%lx:%hx %d", &real_ip, &vpn_ip, &vpn_mask, &port, &flags) != 5)
     {
-       syslog(LOG_ERR, _("Got bad ADD_HOST from " IP_ADDR_S " (%s)"),
-              IP_ADDR_V(cl->vpn_ip), cl->hostname);
+       syslog(LOG_ERR, _("Got bad ADD_HOST from %s (%s)"),
+              cl->vpn_hostname, cl->real_hostname);
        return -1;
     }  
 
@@ -669,9 +677,10 @@ cp
     
   ncn = new_conn_list();
   ncn->real_ip = real_ip;
-  ncn->hostname = hostlookup(htonl(real_ip));
+  ncn->real_hostname = hostlookup(htonl(real_ip));
   ncn->vpn_ip = vpn_ip;
   ncn->vpn_mask = vpn_mask;
+  ncn->vpn_hostname = hostlookup(htonl(vpn_ip));
   ncn->port = port;
   ncn->flags = flags;
   ncn->nexthop = cl;
@@ -680,8 +689,8 @@ cp
   ncn->status.active = 1;
 
   if(debug_lvl > 1)
-    syslog(LOG_DEBUG, _("Got ADD_HOST for " IP_ADDR_S " (%s) from " IP_ADDR_S " (%s)"),
-           IP_ADDR_V(ncn->vpn_ip), ncn->hostname, IP_ADDR_V(cl->vpn_ip), cl->hostname);
+    syslog(LOG_DEBUG, _("Got ADD_HOST for %s (%s) from %s (%s)"),
+           ncn->vpn_hostname, ncn->real_hostname, cl->vpn_hostname, cl->real_hostname);
 
   notify_others(ncn, cl, send_add_host);
 cp
@@ -696,21 +705,21 @@ int req_key_h(conn_list_t *cl)
 cp
   if(!cl->status.active)
     {
-      syslog(LOG_ERR, _("Got unauthorized REQ_KEY from " IP_ADDR_S " (%s)"),
-              IP_ADDR_V(cl->vpn_ip), cl->hostname);
+      syslog(LOG_ERR, _("Got unauthorized REQ_KEY from %s (%s)"),
+              cl->vpn_hostname, cl->real_hostname);
       return -1;
     }
 
   if(sscanf(cl->buffer, "%*d %lx %lx", &to, &from) != 2)
     {
-       syslog(LOG_ERR, _("Got bad REQ_KEY from " IP_ADDR_S " (%s)"),
-              IP_ADDR_V(cl->vpn_ip), cl->hostname);
+       syslog(LOG_ERR, _("Got bad REQ_KEY from %s (%s)"),
+              cl->vpn_hostname, cl->real_hostname);
        return -1;
     }  
 
   if(debug_lvl > 1)
-    syslog(LOG_DEBUG, _("Got REQ_KEY origin " IP_ADDR_S " destination " IP_ADDR_S " from " IP_ADDR_S " (%s)"),
-           IP_ADDR_V(from), IP_ADDR_V(to), IP_ADDR_V(cl->vpn_ip), cl->hostname);
+    syslog(LOG_DEBUG, _("Got REQ_KEY origin %d.%d.%d.%d destination %d.%d.%d.%d from %s (%s)"),
+           IP_ADDR_V(from), IP_ADDR_V(to), cl->vpn_hostname, cl->real_hostname);
 
   if((to & myself->vpn_mask) == (myself->vpn_ip & myself->vpn_mask))
     {  /* hey! they want something from ME! :) */
@@ -722,14 +731,14 @@ cp
   
   if(!fw)
     {
-      syslog(LOG_ERR, _("Attempting to forward REQ_KEY to " IP_ADDR_S ", which does not exist?"),
+      syslog(LOG_ERR, _("Attempting to forward REQ_KEY to %d.%d.%d.%d, which does not exist?"),
 	     IP_ADDR_V(to));
       return -1;
     }
 
   if(debug_lvl > 1)
-    syslog(LOG_DEBUG, _("Forwarding REQ_KEY to " IP_ADDR_S " (%s)"),
-	   IP_ADDR_V(fw->nexthop->vpn_ip), fw->nexthop->hostname);
+    syslog(LOG_DEBUG, _("Forwarding REQ_KEY to %s (%s)"),
+	   fw->nexthop->vpn_hostname, fw->nexthop->real_hostname);
   
   cl->buffer[cl->reqlen-1] = '\n';
   
@@ -787,21 +796,21 @@ int ans_key_h(conn_list_t *cl)
 cp
   if(!cl->status.active)
     {
-      syslog(LOG_ERR, _("Got unauthorized ANS_KEY from " IP_ADDR_S " (%s)"),
-              IP_ADDR_V(cl->vpn_ip), cl->hostname);
+      syslog(LOG_ERR, _("Got unauthorized ANS_KEY from %s (%s)"),
+              cl->vpn_hostname, cl->real_hostname);
       return -1;
     }
 
   if(sscanf(cl->buffer, "%*d %lx %lx %d %as", &to, &from, &expiry, &key) != 4)
     {
-       syslog(LOG_ERR, _("Got bad ANS_KEY from " IP_ADDR_S " (%s)"),
-              IP_ADDR_V(cl->vpn_ip), cl->hostname);
+       syslog(LOG_ERR, _("Got bad ANS_KEY from %s (%s)"),
+              cl->vpn_hostname, cl->real_hostname);
        return -1;
     }  
 
   if(debug_lvl > 1)
-    syslog(LOG_DEBUG, _("Got ANS_KEY origin " IP_ADDR_S " destination " IP_ADDR_S " from " IP_ADDR_S " (%s)"),
-            IP_ADDR_V(from), IP_ADDR_V(to), IP_ADDR_V(cl->vpn_ip), cl->hostname);
+    syslog(LOG_DEBUG, _("Got ANS_KEY origin %d.%d.%d.%d destination %d.%d.%d.%d from %s (%s)"),
+            IP_ADDR_V(from), IP_ADDR_V(to), cl->vpn_hostname, cl->real_hostname);
 
   if(to == myself->vpn_ip)
     {  /* hey! that key's for ME! :) */
@@ -809,8 +818,8 @@ cp
 
       if(!gk)
         {
-          syslog(LOG_ERR, _("Receiving ANS_KEY from " IP_ADDR_S ", which does not exist?"),
-	         IP_ADDR_V(from));
+          syslog(LOG_ERR, _("Receiving ANS_KEY origin %d.%d.%d.%d from %s (%s), which does not exist?"),
+	         IP_ADDR_V(from), cl->vpn_hostname, cl->real_hostname);
           return -1;
         }
 
@@ -825,14 +834,14 @@ cp
   
   if(!fw)
     {
-      syslog(LOG_ERR, _("Attempting to forward ANS_KEY to " IP_ADDR_S ", which does not exist?"),
+      syslog(LOG_ERR, _("Attempting to forward ANS_KEY to %d.%d.%d.%d, which does not exist?"),
 	     IP_ADDR_V(to));
       return -1;
     }
 
   if(debug_lvl > 1)
-    syslog(LOG_DEBUG, _("Forwarding ANS_KEY to " IP_ADDR_S " (%s)"),
-	   IP_ADDR_V(fw->nexthop->vpn_ip), fw->nexthop->hostname);
+    syslog(LOG_DEBUG, _("Forwarding ANS_KEY to %s (%s)"),
+	   fw->nexthop->vpn_hostname, fw->nexthop->real_hostname);
 
   cl->buffer[cl->reqlen-1] = '\n';
 
@@ -852,31 +861,31 @@ int key_changed_h(conn_list_t *cl)
 cp
   if(!cl->status.active)
     {
-      syslog(LOG_ERR, _("Got unauthorized KEY_CHANGED from " IP_ADDR_S " (%s)"),
-              IP_ADDR_V(cl->vpn_ip), cl->hostname);
+      syslog(LOG_ERR, _("Got unauthorized KEY_CHANGED from %s (%s)"),
+              cl->vpn_hostname, cl->real_hostname);
       return -1;
     }
 
   if(sscanf(cl->buffer, "%*d %lx", &from) != 1)
     {
-       syslog(LOG_ERR, _("Got bad KEY_CHANGED from " IP_ADDR_S " (%s)"),
-              IP_ADDR_V(cl->vpn_ip), cl->hostname);
+       syslog(LOG_ERR, _("Got bad KEY_CHANGED from %s (%s)"),
+              cl->vpn_hostname, cl->real_hostname);
        return -1;
     }  
 
-  if(debug_lvl > 1)
-    syslog(LOG_DEBUG, _("Got KEY_CHANGED origin " IP_ADDR_S " from " IP_ADDR_S " (%s)"),
-            IP_ADDR_V(from), IP_ADDR_V(cl->vpn_ip), cl->hostname);
-
   ik = lookup_conn(from);
 
   if(!ik)
     {
-      syslog(LOG_ERR, _("Got KEY_CHANGED from " IP_ADDR_S ", which does not exist?"),
-	     IP_ADDR_V(from));
+      syslog(LOG_ERR, _("Got KEY_CHANGED origin %d.%d.%d.%d from %s (%s), which does not exist?"),
+	     IP_ADDR_V(from), cl->vpn_hostname, cl->real_hostname);
       return -1;
     }
 
+  if(debug_lvl > 1)
+    syslog(LOG_DEBUG, _("Got KEY_CHANGED origin %s from %s (%s)"),
+            ik->vpn_hostname, cl->vpn_hostname, cl->real_hostname);
+
   ik->status.validkey = 0;
   ik->status.waitingforkey = 0;