X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol.c;h=199bd7c8071ef83c4c01e8ec1e9660524f0ba7b3;hp=1e9649355847409866d51d2a6d27e599fb3139da;hb=7f7e158aae8df5c65211bcfa82516e7c243cdd2e;hpb=3c54a513b0c0a3acac60e03403ab4abfa0688c62

diff --git a/src/protocol.c b/src/protocol.c
index 1e964935..199bd7c8 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.1 2000/06/23 19:27:03 guus Exp $
+    $Id: protocol.c,v 1.28.4.2 2000/06/25 15:16:12 guus Exp $
 */
 
 #include "config.h"
@@ -50,18 +50,20 @@ int buflen;
 int send_ack(conn_list_t *cl)
 {
 cp
-  if(debug_lvl > 2)
-    syslog(LOG_DEBUG, _("Send ACK to %s"), cl->hostname);
+  if(debug_lvl > 1)
+    syslog(LOG_DEBUG, _("Sending ACK to " IP_ADDR_S " (" IP_ADDR_S ")"),
+	   IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
 
   buflen = snprintf(buffer, MAXBUFSIZE, "%d\n", ACK);
 
   if((write(cl->meta_socket, buffer, buflen)) < 0)
     {
-      syslog(LOG_ERR, _("send failed: %d:%d: %m"), __FILE__, __LINE__);
+      syslog(LOG_ERR, _("Send failed: %d:%d: %m"), __FILE__, __LINE__);
       return -1;
     }
 
-  syslog(LOG_NOTICE, _("Connection with %s activated."), cl->hostname);
+  syslog(LOG_NOTICE, _("Connection with " IP_ADDR_S " (" IP_ADDR_S ") activated"),
+                       IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
 cp
   return 0;
 }
@@ -69,16 +71,16 @@ cp
 int send_termreq(conn_list_t *cl)
 {
 cp
-  if(debug_lvl > 2)
-    syslog(LOG_DEBUG, _("Send TERMREQ to " IP_ADDR_S),
-	   IP_ADDR_V(cl->vpn_ip));
+  if(debug_lvl > 1)
+    syslog(LOG_DEBUG, _("Sending TERMREQ to " IP_ADDR_S " (" IP_ADDR_S ")"),
+	   IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
 
   buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx\n", TERMREQ, myself->vpn_ip);
 
   if(write(cl->meta_socket, buffer, buflen) < 0)
     {
       if(debug_lvl > 1)
-	syslog(LOG_ERR, _("send failed: %s:%d: %m"), __FILE__, __LINE__);
+	syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
       return -1;
     }
 cp
@@ -88,15 +90,15 @@ cp
 int send_timeout(conn_list_t *cl)
 {
 cp
-  if(debug_lvl > 2)
-    syslog(LOG_DEBUG, _("Send TIMEOUT to " IP_ADDR_S),
-	   IP_ADDR_V(cl->vpn_ip));
+  if(debug_lvl > 1)
+    syslog(LOG_DEBUG, _("Sending TIMEOUT to " IP_ADDR_S " (" IP_ADDR_S ")"),
+	   IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
 
   buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx\n", PINGTIMEOUT, myself->vpn_ip);
 
   if((write(cl->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
@@ -106,15 +108,15 @@ cp
 int send_del_host(conn_list_t *cl, conn_list_t *new_host)
 {
 cp
-  if(debug_lvl > 2)
-    syslog(LOG_DEBUG, _("Sending delete host " IP_ADDR_S " to " IP_ADDR_S),
-	   IP_ADDR_V(new_host->vpn_ip), IP_ADDR_V(cl->vpn_ip));
+  if(debug_lvl > 1)
+    syslog(LOG_DEBUG, _("Sending DEL_HOST for " IP_ADDR_S " to " IP_ADDR_S " (" IP_ADDR_S ")"),
+	   IP_ADDR_V(new_host->vpn_ip), IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
 
   buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx\n", DEL_HOST, new_host->vpn_ip);
 
   if((write(cl->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
@@ -124,14 +126,15 @@ cp
 int send_ping(conn_list_t *cl)
 {
 cp
-  if(debug_lvl > 3)
-    syslog(LOG_DEBUG, _("pinging " IP_ADDR_S), IP_ADDR_V(cl->vpn_ip));
+  if(debug_lvl > 1)
+    syslog(LOG_DEBUG, _("Sending PING to " IP_ADDR_S " (" IP_ADDR_S ")"),
+	   IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
 
   buflen = snprintf(buffer, MAXBUFSIZE, "%d\n", PING);
 
   if((write(cl->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
@@ -141,11 +144,15 @@ cp
 int send_pong(conn_list_t *cl)
 {
 cp
+  if(debug_lvl > 1)
+    syslog(LOG_DEBUG, _("Sending PONG to " IP_ADDR_S " (" IP_ADDR_S ")"),
+	   IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
+
   buflen = snprintf(buffer, MAXBUFSIZE, "%d\n", PONG);
 
   if((write(cl->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
@@ -157,10 +164,6 @@ int send_add_host(conn_list_t *cl, conn_list_t *new_host)
   ip_t real_ip;
   int flags;
 cp
-  if(debug_lvl > 2)
-    syslog(LOG_DEBUG, _("Sending add host to " IP_ADDR_S),
-	   IP_ADDR_V(cl->vpn_ip));
-
   real_ip = new_host->real_ip;
   flags = new_host->flags;
   
@@ -177,11 +180,15 @@ cp
       real_ip = myself->vpn_ip;
     }
 
+  if(debug_lvl > 1)
+    syslog(LOG_DEBUG, _("Sending ADD_HOST for " IP_ADDR_S " (" IP_ADDR_S ") to " IP_ADDR_S " (" IP_ADDR_S ")"),
+	   IP_ADDR_V(new_host->vpn_ip), IP_ADDR_V(real_ip), IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
+
   buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx %lx/%lx:%x %d\n", ADD_HOST, new_host->real_ip, new_host->vpn_ip, new_host->vpn_mask, new_host->port, flags);
 
   if((write(cl->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
@@ -191,15 +198,15 @@ cp
 int send_key_changed(conn_list_t *cl, conn_list_t *src)
 {
 cp
-  if(debug_lvl > 2)
-    syslog(LOG_DEBUG, _("Sending KEY_CHANGED to " IP_ADDR_S),
-	   IP_ADDR_V(cl->vpn_ip));
+  if(debug_lvl > 1)
+    syslog(LOG_DEBUG, _("Sending KEY_CHANGED origin " IP_ADDR_S " to " IP_ADDR_S " (" IP_ADDR_S ")"),
+	   IP_ADDR_V(src->vpn_ip), IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
 
   buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx\n", KEY_CHANGED, src->vpn_ip);
 
   if((write(cl->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
@@ -219,15 +226,15 @@ cp
 int send_basic_info(conn_list_t *cl)
 {
 cp
-  if(debug_lvl > 2)
-    syslog(LOG_DEBUG, _("Send BASIC_INFO to " IP_ADDR_S),
+  if(debug_lvl > 1)
+    syslog(LOG_DEBUG, _("Sending BASIC_INFO to " IP_ADDR_S),
 	   IP_ADDR_V(cl->real_ip));
 
   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);
 
   if((write(cl->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
@@ -240,15 +247,15 @@ int send_passphrase(conn_list_t *cl)
 cp
   encrypt_passphrase(&tmp);
 
-  if(debug_lvl > 2)
-    syslog(LOG_DEBUG, _("Send PASSPHRASE %s to " IP_ADDR_S),
-	   tmp.phrase, IP_ADDR_V(cl->vpn_ip));
+  if(debug_lvl > 1)
+    syslog(LOG_DEBUG, _("Sending PASSPHRASE to " IP_ADDR_S " (" IP_ADDR_S ")"),
+	   IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
 
   buflen = snprintf(buffer, MAXBUFSIZE, "%d %s\n", PASSPHRASE, tmp.phrase);
 
   if((write(cl->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
@@ -258,21 +265,22 @@ cp
 int send_public_key(conn_list_t *cl)
 {
 cp
-  if(debug_lvl > 2)
-    syslog(LOG_DEBUG, _("Send PUBLIC_KEY %s to " IP_ADDR_S),
-	   my_public_key_base36, IP_ADDR_V(cl->vpn_ip));
+  if(debug_lvl > 1)
+    syslog(LOG_DEBUG, _("Sending PUBLIC_KEY to " IP_ADDR_S " (" IP_ADDR_S ")"),
+	   IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
 
   buflen = snprintf(buffer, MAXBUFSIZE, "%d %s\n", PUBLIC_KEY, my_public_key_base36);
 
   if((write(cl->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
   return 0;
 }
 
+/* WDN doet deze functie? (GS)
 int send_calculate(conn_list_t *cl, char *k)
 {
 cp
@@ -280,12 +288,13 @@ cp
 
   if((write(cl->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
   return 0;
 }
+*/
 
 int send_key_request(ip_t to)
 {
@@ -294,20 +303,20 @@ cp
   fw = lookup_conn(to);
   if(!fw)
     {
-      syslog(LOG_ERR, _("Attempting to send key request to " IP_ADDR_S ", which does not exist?"),
+      syslog(LOG_ERR, _("Attempting to send REQ_KEY to " IP_ADDR_S ", which does not exist?"),
 	     IP_ADDR_V(to));
       return -1;
     }
 
-  if(debug_lvl > 2)
-    syslog(LOG_DEBUG, _("Sending out request for public key to " IP_ADDR_S),
-	   IP_ADDR_V(fw->nexthop->vpn_ip));
+  if(debug_lvl > 1)
+    syslog(LOG_DEBUG, _("Sending REQ_KEY to " IP_ADDR_S " (" IP_ADDR_S ")"),
+	   IP_ADDR_V(fw->nexthop->vpn_ip), IP_ADDR_V(fw->nexthop->real_ip));
 
   buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx %lx\n", REQ_KEY, to, myself->vpn_ip);
 
   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;
     }
   fw->status.waitingforkey = 1;
@@ -324,14 +333,14 @@ cp
   
   if(!fw)
     {
-      syslog(LOG_ERR, _("Attempting to send key answer to " IP_ADDR_S ", which does not exist?"),
+      syslog(LOG_ERR, _("Attempting to send ANS_KEY to " IP_ADDR_S ", which does not exist?"),
 	     IP_ADDR_V(to));
       return -1;
     }
 
- if(debug_lvl > 2)
-    syslog(LOG_DEBUG, _("Sending public key to " IP_ADDR_S),
-	   IP_ADDR_V(fw->nexthop->vpn_ip));
+ if(debug_lvl > 1)
+    syslog(LOG_DEBUG, _("Sending ANS_KEY to " IP_ADDR_S " (" IP_ADDR_S ")"),
+	   IP_ADDR_V(fw->nexthop->vpn_ip), IP_ADDR_V(fw->nexthop->real_ip));
 
   buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx %lx %d %s\n", ANS_KEY, to, myself->vpn_ip, my_key_expiry, my_public_key_base36);
 
@@ -383,26 +392,23 @@ cp
 int basic_info_h(conn_list_t *cl)
 {
 cp
+  if(debug_lvl > 1)
+    syslog(LOG_DEBUG, _("Got BASIC_INFO from " IP_ADDR_S), IP_ADDR_V(cl->real_ip));
+
   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 request: %s"), cl->buffer);
+       syslog(LOG_ERR, _("Got bad BASIC_INFO from " IP_ADDR_S),
+              IP_ADDR_V(cl->real_ip));
        return -1;
     }  
 
   if(cl->protocol_version != PROT_CURRENT)
     {
-      syslog(LOG_ERR, _("Peer uses incompatible protocol version %d."),
+      syslog(LOG_ERR, _("Peer uses incompatible protocol version %d"),
 	     cl->protocol_version);
       return -1;
     }
 
-  if(debug_lvl > 2)
-    syslog(LOG_DEBUG, _("got BASIC_INFO(%hd," IP_ADDR_S "," IP_ADDR_S ")"), cl->port,
-	   IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->vpn_mask));
-  if(debug_lvl > 1)
-    syslog(LOG_DEBUG, _("Peer uses protocol version %d"),
-	   cl->protocol_version);
-
   if(cl->status.outgoing)
     {
       if(setup_vpn_connection(cl) < 0)
@@ -426,13 +432,15 @@ cp
 
   if(sscanf(cl->buffer, "%*d %as", &(cl->pp->phrase)) != 1)
     {
-      syslog(LOG_ERR, _("got bad PASSPHRASE request: %s"), cl->buffer);
+      syslog(LOG_ERR, _("Got bad PASSPHRASE from " IP_ADDR_S " (" IP_ADDR_S ")"),
+              IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
       return -1;
     }
   cl->pp->len = strlen(cl->pp->phrase);
     
-  if(debug_lvl > 2)
-    syslog(LOG_DEBUG, _("got PASSPHRASE"));
+  if(debug_lvl > 1)
+    syslog(LOG_DEBUG, _("Got PASSPHRASE from " IP_ADDR_S " (" IP_ADDR_S ")"),
+              IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
 
   if(cl->status.outgoing)
     send_passphrase(cl);
@@ -449,23 +457,22 @@ 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 request: %s"), cl->buffer);
+       syslog(LOG_ERR, _("Got bad PUBLIC_KEY from " IP_ADDR_S " (" IP_ADDR_S ")"),
+              IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
        return -1;
     }  
 
-  if(debug_lvl > 2)
-    syslog(LOG_DEBUG, _("got PUBLIC_KEY %s"), g_n);
+  if(debug_lvl > 1)
+    syslog(LOG_DEBUG, _("Got PUBLIC_KEY from " IP_ADDR_S " (" IP_ADDR_S ")"),
+              IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
 
   if(verify_passphrase(cl, g_n))
     {
       /* intruder! */
-      syslog(LOG_ERR, _("Intruder: passphrase does not match."));
+      syslog(LOG_ERR, _("Intruder: passphrase does not match!"));
       return -1;
     }
 
-  if(debug_lvl > 2)
-    syslog(LOG_INFO, _("Passphrase OK"));
-
   if(cl->status.outgoing)
     send_public_key(cl);
   else
@@ -491,11 +498,13 @@ cp
 int ack_h(conn_list_t *cl)
 {
 cp
-  if(debug_lvl > 2)
-    syslog(LOG_DEBUG, _("got ACK"));
+  if(debug_lvl > 1)
+    syslog(LOG_DEBUG, _("Got ACK from " IP_ADDR_S " (" IP_ADDR_S ")"),
+              IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
   
   cl->status.active = 1;
-  syslog(LOG_NOTICE, _("Connection with %s activated."), cl->hostname);
+  syslog(LOG_NOTICE, _("Connection with " IP_ADDR_S " (" IP_ADDR_S ") activated"),
+              IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
 cp
   return 0;
 }
@@ -503,7 +512,10 @@ cp
 int termreq_h(conn_list_t *cl)
 {
 cp
-  syslog(LOG_NOTICE, _(IP_ADDR_S " wants to quit"), IP_ADDR_V(cl->vpn_ip));
+  if(debug_lvl > 1)
+   syslog(LOG_DEBUG, _("Got TERMREQ from " IP_ADDR_S " (" IP_ADDR_S ")"),
+             IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
+  
   cl->status.termreq = 1;
   terminate_connection(cl);
 
@@ -515,8 +527,10 @@ cp
 int timeout_h(conn_list_t *cl)
 {
 cp
-  if(!cl->status.active) return -1;
-  syslog(LOG_NOTICE, _(IP_ADDR_S " says it's gotten a timeout from us"), IP_ADDR_V(cl->vpn_ip));
+  if(debug_lvl > 1)
+    syslog(LOG_DEBUG, _("Got TIMEOUT from " IP_ADDR_S " (" IP_ADDR_S ")"),
+              IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
+
   cl->status.termreq = 1;
   terminate_connection(cl);
 cp
@@ -532,18 +546,19 @@ cp
 
   if(sscanf(cl->buffer, "%*d %lx", &vpn_ip) != 1)
     {
-       syslog(LOG_ERR, _("got bad DEL_HOST request: %s"), cl->buffer);
+       syslog(LOG_ERR, _("Got bad DEL_HOST from " IP_ADDR_S " (" IP_ADDR_S ")"),
+              IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
        return -1;
     }  
 
-  if(debug_lvl > 2)
-    syslog(LOG_DEBUG, _("got DEL_HOST for " IP_ADDR_S),
-	   IP_ADDR_V(vpn_ip));
+  if(debug_lvl > 1)
+    syslog(LOG_DEBUG, _("Got DEL_HOST for " IP_ADDR_S " from " IP_ADDR_S " (" IP_ADDR_S ")"),
+           IP_ADDR_V(vpn_ip), IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
 
   if(!(fw = lookup_conn(vpn_ip)))
     {
-      syslog(LOG_ERR, _("Somebody wanted to delete " IP_ADDR_S " which does not exist?"),
-	     IP_ADDR_V(vpn_ip));
+      syslog(LOG_ERR, _("Got DEL_HOST for " IP_ADDR_S " from " IP_ADDR_S " (" IP_ADDR_S ") which does not exist?"),
+	     IP_ADDR_V(vpn_ip), IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
       return 0;
     }
 
@@ -558,9 +573,10 @@ cp
 int ping_h(conn_list_t *cl)
 {
 cp
-  if(!cl->status.active) return -1;
-  if(debug_lvl > 3)
-    syslog(LOG_DEBUG, _("responding to ping from " IP_ADDR_S), IP_ADDR_V(cl->vpn_ip));
+  if(debug_lvl > 1)
+    syslog(LOG_DEBUG, _("Got PING from " IP_ADDR_S " (" IP_ADDR_S ")"),
+              IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
+
   cl->status.pinged = 0;
   cl->status.got_pong = 1;
 
@@ -572,9 +588,10 @@ cp
 int pong_h(conn_list_t *cl)
 {
 cp
-  if(!cl->status.active) return -1;
-  if(debug_lvl > 3)
-    syslog(LOG_DEBUG, _("ok, got pong from " IP_ADDR_S), IP_ADDR_V(cl->vpn_ip));
+  if(debug_lvl > 1)
+    syslog(LOG_DEBUG, _("Got PONG from " IP_ADDR_S " (" IP_ADDR_S ")"),
+              IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
+
   cl->status.got_pong = 1;
 cp
   return 0;
@@ -593,15 +610,14 @@ cp
     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 request: %s"), cl->buffer);
+       syslog(LOG_ERR, _("Got bad ADD_HOST from " IP_ADDR_S " (" IP_ADDR_S ")"),
+              IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
        return -1;
     }  
 
-  if(debug_lvl > 2)
-    syslog(LOG_DEBUG, _("Add host request from " IP_ADDR_S), IP_ADDR_V(cl->vpn_ip));
-  if(debug_lvl > 3)
-    syslog(LOG_DEBUG, _("got ADD_HOST(" IP_ADDR_S "," IP_ADDR_S ",%hd)"),
-	   IP_ADDR_V(vpn_ip), IP_ADDR_V(vpn_mask), port);
+  if(debug_lvl > 1)
+    syslog(LOG_DEBUG, _("Got ADD_HOST from " IP_ADDR_S " (" IP_ADDR_S ")"),
+              IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
 
   /*
     Suggestion of Hans Bayle
@@ -611,9 +627,8 @@ cp
       if(fw->nexthop == cl)
 	notify_others(fw, cl, send_add_host);
       else
-	if(debug_lvl > 1)
-	  syslog(LOG_DEBUG, _("Invalid add_host request from " IP_ADDR_S),
-			      IP_ADDR_V(cl->vpn_ip));
+	syslog(LOG_DEBUG, _("Invalid ADD_HOST from " IP_ADDR_S " (" IP_ADDR_S ")"),
+            IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
       return 0;
     }
 
@@ -623,7 +638,6 @@ cp
   ncn->vpn_mask = vpn_mask;
   ncn->port = port;
   ncn->flags = flags;
-  ncn->hostname = hostlookup(real_ip);
   ncn->nexthop = cl;
   ncn->next = conn_list;
   conn_list = ncn;
@@ -642,13 +656,14 @@ cp
   if(!cl->status.active) return -1;
   if(sscanf(cl->buffer, "%*d %lx %lx", &to, &from) != 2)
     {
-       syslog(LOG_ERR, _("got bad request: %s"), cl->buffer);
+       syslog(LOG_ERR, _("Got bad REQ_KEY from " IP_ADDR_S " (" IP_ADDR_S ")"),
+              IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
        return -1;
     }  
 
-  if(debug_lvl > 2)
-    syslog(LOG_DEBUG, _("got REQ_KEY from " IP_ADDR_S " for " IP_ADDR_S),
-	   IP_ADDR_V(from), IP_ADDR_V(to));
+  if(debug_lvl > 1)
+    syslog(LOG_DEBUG, _("Got REQ_KEY origin " IP_ADDR_S " destination " IP_ADDR_S " from " IP_ADDR_S " (" IP_ADDR_S ")"),
+           IP_ADDR_V(from), IP_ADDR_V(to), IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
 
   if((to & myself->vpn_mask) == (myself->vpn_ip & myself->vpn_mask))
     {  /* hey! they want something from ME! :) */
@@ -660,20 +675,20 @@ cp
   
   if(!fw)
     {
-      syslog(LOG_ERR, _("Attempting to forward key request to " IP_ADDR_S ", which does not exist?"),
+      syslog(LOG_ERR, _("Attempting to forward REQ_KEY to " IP_ADDR_S ", which does not exist?"),
 	     IP_ADDR_V(to));
       return -1;
     }
 
-  if(debug_lvl > 3)
-    syslog(LOG_DEBUG, _("Forwarding request for public key to " IP_ADDR_S),
-	   IP_ADDR_V(fw->nexthop->vpn_ip));
+  if(debug_lvl > 1)
+    syslog(LOG_DEBUG, _("Forwarding REQ_KEY to " IP_ADDR_S " (" IP_ADDR_S ")"),
+	   IP_ADDR_V(fw->nexthop->vpn_ip), IP_ADDR_V(fw->nexthop->real_ip));
   
   cl->buffer[cl->reqlen-1] = '\n';
   
   if(write(fw->nexthop->meta_socket, cl->buffer, cl->reqlen) < 0)
     {
-      syslog(LOG_ERR, _("send failed: %s:%d: %m"), __FILE__, __LINE__);
+      syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
       return -1;
     }
 cp
@@ -726,23 +741,22 @@ cp
   if(!cl->status.active) return -1;
   if(sscanf(cl->buffer, "%*d %lx %lx %d %as", &to, &from, &expiry, &key) != 4)
     {
-       syslog(LOG_ERR, _("got bad ANS_KEY request: %s"), cl->buffer);
+       syslog(LOG_ERR, _("Got bad ANS_KEY from " IP_ADDR_S " (" IP_ADDR_S ")"),
+              IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
        return -1;
     }  
 
-  if(debug_lvl > 3)
-    syslog(LOG_DEBUG, _("got ANS_KEY from " IP_ADDR_S " for " IP_ADDR_S),
-	   IP_ADDR_V(from), IP_ADDR_V(to));
+  if(debug_lvl > 1)
+    syslog(LOG_DEBUG, _("Got ANS_KEY origin " IP_ADDR_S " destination " IP_ADDR_S " from " IP_ADDR_S " (" IP_ADDR_S ")"),
+            IP_ADDR_V(from), IP_ADDR_V(to), IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
 
   if(to == myself->vpn_ip)
     {  /* hey! that key's for ME! :) */
-      if(debug_lvl > 2)
-	syslog(LOG_DEBUG, _("Yeah! key arrived. Now do something with it."));
       gk = lookup_conn(from);
 
       if(!gk)
         {
-          syslog(LOG_ERR, _("Receiving key from " IP_ADDR_S ", which does not exist?"),
+          syslog(LOG_ERR, _("Receiving ANS_KEY from " IP_ADDR_S ", which does not exist?"),
 	         IP_ADDR_V(from));
           return -1;
         }
@@ -758,20 +772,20 @@ cp
   
   if(!fw)
     {
-      syslog(LOG_ERR, _("Attempting to forward key to " IP_ADDR_S ", which does not exist?"),
+      syslog(LOG_ERR, _("Attempting to forward ANS_KEY to " IP_ADDR_S ", which does not exist?"),
 	     IP_ADDR_V(to));
       return -1;
     }
 
-  if(debug_lvl > 2)
-    syslog(LOG_DEBUG, _("Forwarding public key to " IP_ADDR_S),
-	   IP_ADDR_V(fw->nexthop->vpn_ip));
+  if(debug_lvl > 1)
+    syslog(LOG_DEBUG, _("Forwarding ANS_KEY to " IP_ADDR_S " (" IP_ADDR_S ")"),
+	   IP_ADDR_V(fw->nexthop->vpn_ip), IP_ADDR_V(fw->nexthop->real_ip));
 
   cl->buffer[cl->reqlen-1] = '\n';
 
   if((write(fw->nexthop->meta_socket, cl->buffer, cl->reqlen)) < 0)
     {
-      syslog(LOG_ERR, _("send failed: %s:%d: %m"), __FILE__, __LINE__);
+      syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
       return -1;
     }
 cp
@@ -786,19 +800,20 @@ cp
   if(!cl->status.active) return -1;
   if(sscanf(cl->buffer, "%*d %lx", &from) != 1)
     {
-       syslog(LOG_ERR, _("got bad ANS_KEY request: %s"), cl->buffer);
+       syslog(LOG_ERR, _("Got bad KEY_CHANGED from " IP_ADDR_S " (" IP_ADDR_S ")"),
+              IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
        return -1;
     }  
 
-  if(debug_lvl > 2)
-    syslog(LOG_DEBUG, _("got KEY_CHANGED from " IP_ADDR_S),
-	   IP_ADDR_V(from));
+  if(debug_lvl > 1)
+    syslog(LOG_DEBUG, _("Got KEY_CHANGED origin " IP_ADDR_S " from " IP_ADDR_S " (" IP_ADDR_S ")"),
+            IP_ADDR_V(from), IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
 
   ik = lookup_conn(from);
 
   if(!ik)
     {
-      syslog(LOG_ERR, _("Got changed key from " IP_ADDR_S ", which does not exist?"),
+      syslog(LOG_ERR, _("Got KEY_CHANGED from " IP_ADDR_S ", which does not exist?"),
 	     IP_ADDR_V(from));
       return -1;
     }
@@ -806,9 +821,6 @@ cp
   ik->status.validkey = 0;
   ik->status.waitingforkey = 0;
 
-  if(debug_lvl > 3)
-    syslog(LOG_DEBUG, _("Forwarding key invalidation request"));
-
   notify_others(cl, ik, send_key_changed);
 cp
   return 0;