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

diff --git a/src/netutl.c b/src/netutl.c
index 9e60dbbf..f3ef1341 100644
--- a/src/netutl.c
+++ b/src/netutl.c
@@ -1,6 +1,6 @@
 /*
     netutl.c -- some supporting network utility code
-    Copyright (C) 1998,99 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,13 +33,17 @@
 #include <utils.h>
 #include <xalloc.h>
 
+#include "conf.h"
 #include "encr.h"
 #include "net.h"
 #include "netutl.h"
 
+#include "system.h"
+
 /*
   look for a connection associated with the given vpn ip,
-  return its connection structure
+  return its connection structure.
+  Skips connections that are not activated!
 */
 conn_list_t *lookup_conn(ip_t ip)
 {
@@ -45,10 +51,10 @@ 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)
+    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))
+    if(((ip & p->vpn_mask) == (p->vpn_ip & p->vpn_mask)) && p->status.active)
       return p;
 cp
   return NULL;
@@ -79,14 +85,14 @@ cp
 void free_conn_element(conn_list_t *p)
 {
 cp
-  if(p->hostname)
-    free(p->hostname);
-  if(p->pp)
-    free(p->pp);
   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);
@@ -130,6 +136,9 @@ conn_list_t *new_conn_list(void)
 cp
   /* initialise all those stupid pointers at once */
   memset(p, '\0', sizeof(*p));
+  p->vpn_mask = (ip_t)(~0L); /* If this isn't done, it would be a
+                                wastebucket for all packets with
+                                unknown destination. */
   p->nexthop = p;
 cp
   return p;
@@ -157,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;
@@ -201,7 +217,7 @@ cp
 
   if(!(h = gethostbyname(p)))
     {
-      fprintf(stderr, "Error looking up `%s': %s\n", p, sys_errlist[h_errno]);
+      fprintf(stderr, _("Error looking up `%s': %s\n"), p, sys_errlist[h_errno]);
       return NULL;
     }
 
@@ -225,13 +241,13 @@ void dump_conn_list(void)
 {
   conn_list_t *p;
 cp
-  syslog(LOG_DEBUG, "Connection list:");
+  syslog(LOG_DEBUG, _("Connection list:"));
 
   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
 }