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

diff --git a/src/netutl.c b/src/netutl.c
index 1d07daa7..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,26 +33,30 @@
 #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)
 {
   conn_list_t *p = conn_list;
-
+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;
 }
 
@@ -60,7 +66,7 @@ conn_list_t *lookup_conn(ip_t ip)
 void destroy_queue(packet_queue_t *pq)
 {
   queue_element_t *p, *q;
-
+cp
   for(p = pq->head; p != NULL; p = q)
     {
       q = p->next;
@@ -70,6 +76,7 @@ void destroy_queue(packet_queue_t *pq)
     }
 
   free(pq);
+cp
 }
 
 /*
@@ -77,10 +84,9 @@ void destroy_queue(packet_queue_t *pq)
 */
 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)
@@ -88,6 +94,7 @@ void free_conn_element(conn_list_t *p)
   free_key(p->public_key);
   free_key(p->key);
   free(p);
+cp
 }
 
 /*
@@ -96,7 +103,7 @@ void free_conn_element(conn_list_t *p)
 void prune_conn_list(void)
 {
   conn_list_t *p, *prev = NULL, *next = NULL;
-
+cp
   for(p = conn_list; p != NULL; )
     {
       next = p->next;
@@ -115,6 +122,7 @@ void prune_conn_list(void)
 
       p = next;
     }
+cp
 }
 
 /*
@@ -122,11 +130,15 @@ void prune_conn_list(void)
 */
 conn_list_t *new_conn_list(void)
 {
-  conn_list_t *p = xmalloc(sizeof(conn_list_t));
-
+  conn_list_t *p = xmalloc(sizeof(*p));
+cp
   /* initialise all those stupid pointers at once */
-  memset(p, '\0', sizeof(conn_list_t));
+  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;
 }
 
@@ -137,16 +149,15 @@ void destroy_conn_list(void)
 {
   conn_list_t *p, *next;
 cp
-
   for(p = conn_list; p != NULL; )
     {
       next = p->next;
       free_conn_element(p);
       p = next;
     }
-cp
 
   conn_list = NULL;
+cp
 }
 
 /*
@@ -158,22 +169,30 @@ 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;
 }
 
@@ -187,7 +206,7 @@ ip_mask_t *strtoip(char *str)
   int masker;
   char *q, *p;
   struct hostent *h;
-
+cp
   p = str;
   if((q = strchr(p, '/')))
     {
@@ -197,7 +216,7 @@ ip_mask_t *strtoip(char *str)
 
   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;
     }
 
@@ -209,19 +228,19 @@ ip_mask_t *strtoip(char *str)
 	return NULL;
     }
 
-  ip = xmalloc(sizeof(ip_mask_t));
+  ip = xmalloc(sizeof(*ip));
   ip->ip = ntohl(*((ip_t*)(h->h_addr_list[0])));
 
   ip->mask = masker ? ~((1 << (32 - masker)) - 1) : 0;
-
+cp
   return ip;
 }
 
 void dump_conn_list(void)
 {
   conn_list_t *p;
-
-  syslog(LOG_DEBUG, "Connection list:");
+cp
+  syslog(LOG_DEBUG, _("Connection list:"));
 
   for(p = conn_list; p != NULL; p = p->next)
     {
@@ -229,4 +248,5 @@ void dump_conn_list(void)
 	     IP_ADDR_V(p->vpn_ip), IP_ADDR_V(p->vpn_mask), p->status,
 	     p->socket, p->meta_socket);
     }
+cp
 }