X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnetutl.c;h=f57266c3cc6c5017a7da438e897cfe5c9942ef1f;hp=a61c917308c967b8041d0de26136a72034893822;hb=18c85caac36f7236454deef11b9eba74328dbd96;hpb=f826301889e1fa1a22770919f0385c3ca04c740a

diff --git a/src/netutl.c b/src/netutl.c
index a61c9173..f57266c3 100644
--- a/src/netutl.c
+++ b/src/netutl.c
@@ -16,7 +16,7 @@
     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.11 2000/05/30 11:18:12 zarq Exp $
+    $Id: netutl.c,v 1.12.4.6 2000/06/29 17:09:06 guus Exp $
 */
 
 #include "config.h"
@@ -51,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)
@@ -85,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);
@@ -164,6 +166,7 @@ cp
   look up the name associated with the ip
   address `addr'
 */
+
 char *hostlookup(unsigned long addr)
 {
   char *name;
@@ -189,8 +192,8 @@ cp
     }
   else
     {
-      name = xmalloc(strlen(host->h_name)+20);
-      sprintf(name, "%s (%s)", host->h_name, inet_ntoa(in));
+      name = xmalloc(strlen(host->h_name)+1);
+      sprintf(name, "%s", host->h_name);
     }
 cp
   return name;
@@ -244,9 +247,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
 }