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

diff --git a/src/netutl.c b/src/netutl.c
index 1d07daa7..2d264a84 100644
--- a/src/netutl.c
+++ b/src/netutl.c
@@ -1,6 +1,7 @@
 /*
     netutl.c -- some supporting network utility code
-    Copyright (C) 1998,99 Ivo Timmermans <zarq@iname.com>
+    Copyright (C) 1998-2001 Ivo Timmermans <itimmermans@bigfoot.com>
+                  2000,2001 Guus Sliepen <guus@sliepen.warande.net>
 
     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 +16,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.21 2001/10/31 20:37:54 guus Exp $
 */
 
 #include "config.h"
@@ -31,149 +34,36 @@
 #include <utils.h>
 #include <xalloc.h>
 
-#include "encr.h"
+#include "errno.h"
+#include "conf.h"
 #include "net.h"
 #include "netutl.h"
 
-/*
-  look for a connection associated with the given vpn ip,
-  return its connection structure
-*/
-conn_list_t *lookup_conn(ip_t ip)
-{
-  conn_list_t *p = conn_list;
-
-  /* Exact match suggested by James B. MacLean */
-  for(p = conn_list; p != NULL; p = p->next)
-    if(ip  == p->vpn_ip)
-      return p;
-  for(p = conn_list; p != NULL; p = p->next)
-    if((ip & p->vpn_mask) == (p->vpn_ip & p->vpn_mask))
-      return p;
-
-  return NULL;
-}
-
-/*
-  free a queue and all of its elements
-*/
-void destroy_queue(packet_queue_t *pq)
-{
-  queue_element_t *p, *q;
-
-  for(p = pq->head; p != NULL; p = q)
-    {
-      q = p->next;
-      if(p->packet)
-	free(p->packet);
-      free(p);
-    }
-
-  free(pq);
-}
-
-/*
-  free a conn_list_t element and all its pointers
-*/
-void free_conn_element(conn_list_t *p)
-{
-  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);
-  free_key(p->public_key);
-  free_key(p->key);
-  free(p);
-}
-
-/*
-  remove all marked connections
-*/
-void prune_conn_list(void)
-{
-  conn_list_t *p, *prev = NULL, *next = NULL;
-
-  for(p = conn_list; p != NULL; )
-    {
-      next = p->next;
-
-      if(p->status.remove)
-	{
-	  if(prev)
-	    prev->next = next;
-	  else
-	    conn_list = next;
-
-	  free_conn_element(p);
-	}
-      else
-	prev = p;
-
-      p = next;
-    }
-}
-
-/*
-  creates new conn_list element, and initializes it
-*/
-conn_list_t *new_conn_list(void)
-{
-  conn_list_t *p = xmalloc(sizeof(conn_list_t));
-
-  /* initialise all those stupid pointers at once */
-  memset(p, '\0', sizeof(conn_list_t));
-  p->nexthop = p;
-  return p;
-}
+#include "system.h"
 
-/*
-  free all elements of conn_list
-*/
-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;
-}
-
-/*
-  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;
-
+  int lookup_hostname = 0;
+cp
   in.s_addr = addr;
 
-  host = gethostbyaddr((char *)&in, sizeof(in), AF_INET);
+  get_config_bool(lookup_config(config_tree, "Hostnames"), &lookup_hostname);
+
+  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;
 }
 
@@ -187,7 +77,7 @@ ip_mask_t *strtoip(char *str)
   int masker;
   char *q, *p;
   struct hostent *h;
-
+cp
   p = str;
   if((q = strchr(p, '/')))
     {
@@ -197,7 +87,9 @@ ip_mask_t *strtoip(char *str)
 
   if(!(h = gethostbyname(p)))
     {
-      fprintf(stderr, "Error looking up `%s': %s\n", p, sys_errlist[h_errno]);
+      if(debug_lvl >= DEBUG_ERROR)
+        syslog(LOG_WARNING, _("Error looking up `%s': %s\n"), p, strerror(errno));
+        
       return NULL;
     }
 
@@ -209,24 +101,11 @@ ip_mask_t *strtoip(char *str)
 	return NULL;
     }
 
-  ip = xmalloc(sizeof(ip_mask_t));
-  ip->ip = ntohl(*((ip_t*)(h->h_addr_list[0])));
+  ip = xmalloc(sizeof(*ip));
+  ip->address = ntohl(*((ipv4_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:");
-
-  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);
-    }
-}