X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnetutl.c;h=f3ef1341246b9a8f6f0ce963f902161bfe6cd225;hp=f49178bdfafbc1028314ffe145d02e61d44e51f6;hb=3831f51a53088bfcc1d148fd54b3083afe7fde32;hpb=9fd02ffcb0cacf3de26e876de5f30510bff137a3

diff --git a/src/netutl.c b/src/netutl.c
index f49178bd..f3ef1341 100644
--- a/src/netutl.c
+++ b/src/netutl.c
@@ -1,6 +1,6 @@
 /*
     netutl.c -- some supporting network utility code
-    Copyright (C) 1998,1999,2000 Ivo Timmermans <zarq@iname.com>
+    Copyright (C) 1998,1999,2000 Ivo Timmermans <itimmermans@bigfoot.com>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -15,6 +15,8 @@
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+    $Id: netutl.c,v 1.12.4.7 2000/08/17 16:51:07 guus Exp $
 */
 
 #include "config.h"
@@ -31,6 +33,7 @@
 #include <utils.h>
 #include <xalloc.h>
 
+#include "conf.h"
 #include "encr.h"
 #include "net.h"
 #include "netutl.h"
@@ -48,7 +51,7 @@ conn_list_t *lookup_conn(ip_t ip)
 cp
   /* Exact match suggested by James B. MacLean */
   for(p = conn_list; p != NULL; p = p->next)
-    if((ip  == p->vpn_ip) && p->status.active)
+    if((ip == p->vpn_ip) && p->status.active)
       return p;
   for(p = conn_list; p != NULL; p = p->next)
     if(((ip & p->vpn_mask) == (p->vpn_ip & p->vpn_mask)) && p->status.active)
@@ -82,12 +85,14 @@ cp
 void free_conn_element(conn_list_t *p)
 {
 cp
-  if(p->hostname)
-    free(p->hostname);
   if(p->sq)
     destroy_queue(p->sq);
   if(p->rq)
     destroy_queue(p->rq);
+  if(p->vpn_hostname)
+    free(p->vpn_hostname);
+  if(p->real_hostname)
+    free(p->real_hostname);
   free_key(p->public_key);
   free_key(p->key);
   free(p);
@@ -161,25 +166,32 @@ cp
   look up the name associated with the ip
   address `addr'
 */
+
 char *hostlookup(unsigned long addr)
 {
   char *name;
   struct hostent *host = NULL;
   struct in_addr in;
+  config_t const *cfg;
+  int lookup_hostname;
 cp
   in.s_addr = addr;
 
-  host = gethostbyaddr((char *)&in, sizeof(in), AF_INET);
+  lookup_hostname = 0;
+  if((cfg = get_config_val(resolve_dns)) != NULL)
+    if(cfg->data.val == stupid_true)
+      lookup_hostname = 1;
+
+  if(lookup_hostname)
+    host = gethostbyaddr((char *)&in, sizeof(in), AF_INET);
 
-  if(host)
+  if(!lookup_hostname || !host)
     {
-      name = xmalloc(strlen(host->h_name)+20);
-      sprintf(name, "%s (%s)", host->h_name, inet_ntoa(in));
+      asprintf(&name, "%s", inet_ntoa(in));
     }
   else
     {
-      name = xmalloc(20);
-      sprintf(name, "%s", inet_ntoa(in));
+      asprintf(&name, "%s", host->h_name);
     }
 cp
   return name;
@@ -233,9 +245,9 @@ cp
 
   for(p = conn_list; p != NULL; p = p->next)
     {
-      syslog(LOG_DEBUG, " " IP_ADDR_S "/" IP_ADDR_S ": %04x (%d|%d)",
-	     IP_ADDR_V(p->vpn_ip), IP_ADDR_V(p->vpn_mask), p->status,
-	     p->socket, p->meta_socket);
+      syslog(LOG_DEBUG, _("%s netmask %d.%d.%d.%d at %s port %hd flags %d sockets %d, %d status %04x"),
+	     p->vpn_hostname, IP_ADDR_V(p->vpn_mask), p->real_hostname, p->port, p->flags,
+	     p->socket, p->meta_socket, p->status);
     }
 cp
 }