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

diff --git a/src/netutl.c b/src/netutl.c
index ce47c3e9..a61c9173 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.11 2000/05/30 11:18:12 zarq 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;
@@ -81,8 +87,6 @@ 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)
@@ -165,20 +169,28 @@ 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));
+      name = xmalloc(20);
+      sprintf(name, "%s", inet_ntoa(in));
     }
   else
     {
-      name = xmalloc(20);
-      sprintf(name, "%s", inet_ntoa(in));
+      name = xmalloc(strlen(host->h_name)+20);
+      sprintf(name, "%s (%s)", host->h_name, inet_ntoa(in));
     }
 cp
   return name;
@@ -204,7 +216,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;
     }
 
@@ -228,7 +240,7 @@ 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)
     {