X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=57c61cc74a2d10cacee471f76b435cbad9a8b7b0;hp=1fee46b80cdc3b3fee6cdfa1165bb17a3b883ad3;hb=a473ece8a0d83be5f7992888a6a3ff938dc4fb72;hpb=7f7e158aae8df5c65211bcfa82516e7c243cdd2e

diff --git a/src/net.c b/src/net.c
index 1fee46b8..57c61cc7 100644
--- a/src/net.c
+++ b/src/net.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: net.c,v 1.35.4.3 2000/06/25 15:16:11 guus Exp $
+    $Id: net.c,v 1.35.4.5 2000/06/25 16:20:27 guus Exp $
 */
 
 #include "config.h"
@@ -754,14 +754,15 @@ cp
     }
 
   p->real_ip = ntohl(ci.sin_addr.s_addr);
+  p->hostname = hostlookup(ci.sin_addr.s_addr);
   p->meta_socket = sfd;
   p->status.meta = 1;
   p->buflen = 0;
   p->last_ping_time = time(NULL);
   p->want_ping = 0;
   
-  syslog(LOG_NOTICE, _("Connection from " IP_ADDR_S ":%d"),
-         IP_ADDR_V(p->real_ip), htons(ci.sin_port));
+  syslog(LOG_NOTICE, _("Connection from %s port %d"),
+         p->hostname, htons(ci.sin_port));
 
   if(send_basic_info(p) < 0)
     {
@@ -873,8 +874,8 @@ cp
     return;
 
   if(debug_lvl > 0)
-    syslog(LOG_NOTICE, _("Closing connection with " IP_ADDR_S " (" IP_ADDR_S ")"),
-           IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
+    syslog(LOG_NOTICE, _("Closing connection with " IP_ADDR_S " (%s)"),
+           IP_ADDR_V(cl->vpn_ip), cl->hostname);
 
   if(cl->status.timeout)
     send_timeout(cl);
@@ -943,8 +944,8 @@ cp
               if(p->status.pinged && !p->status.got_pong)
                 {
                   if(debug_lvl > 1)
-  	            syslog(LOG_INFO, _(IP_ADDR_S " (" IP_ADDR_S ") didn't respond to ping"),
-		           IP_ADDR_V(p->vpn_ip), IP_ADDR_V(p->real_ip));
+  	            syslog(LOG_INFO, _(IP_ADDR_S " (%s) didn't respond to ping"),
+		           IP_ADDR_V(p->vpn_ip), p->hostname);
 	          p->status.timeout = 1;
 	          terminate_connection(p);
                 }
@@ -1047,28 +1048,28 @@ cp
       if(cl->reqlen)
         {
           if(debug_lvl > 2)
-            syslog(LOG_DEBUG, _("Got request from " IP_ADDR_S " (" IP_ADDR_S "): %s"),
-                         IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip), cl->buffer);
+            syslog(LOG_DEBUG, _("Got request from " IP_ADDR_S " (%s): %s"),
+                         IP_ADDR_V(cl->vpn_ip), cl->hostname, cl->buffer);
           if(sscanf(cl->buffer, "%d", &request) == 1)
             {
               if((request < 0) || (request > 255) || (request_handlers[request] == NULL))
                 {
-                  syslog(LOG_ERR, _("Unknown request from " IP_ADDR_S " (" IP_ADDR_S ")"),
-                         IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
+                  syslog(LOG_ERR, _("Unknown request from " IP_ADDR_S " (%s)"),
+                         IP_ADDR_V(cl->vpn_ip), cl->hostname);
                   return -1;
                 }
 
               if(request_handlers[request](cl))  /* Something went wrong. Probably scriptkiddies. Terminate. */
                 {
-                  syslog(LOG_ERR, _("Error while processing request from " IP_ADDR_S " (" IP_ADDR_S ")"),
-                         IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
+                  syslog(LOG_ERR, _("Error while processing request from " IP_ADDR_S " (%s)"),
+                         IP_ADDR_V(cl->vpn_ip), cl->hostname);
                   return -1;
                 }
             }
           else
             {
-              syslog(LOG_ERR, _("Bogus data received from " IP_ADDR_S " (" IP_ADDR_S ")"),
-                         IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
+              syslog(LOG_ERR, _("Bogus data received from " IP_ADDR_S " (%s)"),
+                         IP_ADDR_V(cl->vpn_ip), cl->hostname);
               return -1;
             }