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

diff --git a/src/netutl.c b/src/netutl.c
index 200f7768..2d264a84 100644
--- a/src/netutl.c
+++ b/src/netutl.c
@@ -1,7 +1,7 @@
 /*
     netutl.c -- some supporting network utility code
-    Copyright (C) 1998,1999,2000 Ivo Timmermans <itimmermans@bigfoot.com>
-                            2000 Guus Sliepen <guus@sliepen.warande.net>
+    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
@@ -17,7 +17,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.12.4.17 2001/01/07 15:25:44 guus Exp $
+    $Id: netutl.c,v 1.12.4.21 2001/10/31 20:37:54 guus Exp $
 */
 
 #include "config.h"
@@ -46,15 +46,11 @@ char *hostlookup(unsigned long addr)
   char *name;
   struct hostent *host = NULL;
   struct in_addr in;
-  config_t const *cfg;
-  int lookup_hostname;
+  int lookup_hostname = 0;
 cp
   in.s_addr = addr;
 
-  lookup_hostname = 0;
-  if((cfg = get_config_val(config, config_hostnames)) != NULL)
-    if(cfg->data.val == stupid_true)
-      lookup_hostname = 1;
+  get_config_bool(lookup_config(config_tree, "Hostnames"), &lookup_hostname);
 
   if(lookup_hostname)
     host = gethostbyaddr((char *)&in, sizeof(in), AF_INET);
@@ -106,7 +102,7 @@ cp
     }
 
   ip = xmalloc(sizeof(*ip));
-  ip->address = ntohl(*((ip_t*)(h->h_addr_list[0])));
+  ip->address = ntohl(*((ipv4_t*)(h->h_addr_list[0])));
 
   ip->mask = masker ? ~((1 << (32 - masker)) - 1) : 0;
 cp