projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Big bad commit:
[tinc]
/
src
/
netutl.c
diff --git
a/src/netutl.c
b/src/netutl.c
index
200f776
..
e869e34
100644
(file)
--- a/
src/netutl.c
+++ b/
src/netutl.c
@@
-1,7
+1,7
@@
/*
netutl.c -- some supporting network utility code
/*
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
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.
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.
20 2001/10/27 12:13:17
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-46,15
+46,11
@@
char *hostlookup(unsigned long addr)
char *name;
struct hostent *host = NULL;
struct in_addr in;
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;
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_int(lookup_config(config_tree, "Hostnames"), &lookup_hostname);
if(lookup_hostname)
host = gethostbyaddr((char *)&in, sizeof(in), AF_INET);
if(lookup_hostname)
host = gethostbyaddr((char *)&in, sizeof(in), AF_INET);
@@
-106,7
+102,7
@@
cp
}
ip = xmalloc(sizeof(*ip));
}
ip = xmalloc(sizeof(*ip));
- ip->address = ntohl(*((ip_t*)(h->h_addr_list[0])));
+ ip->address = ntohl(*((ip
v4
_t*)(h->h_addr_list[0])));
ip->mask = masker ? ~((1 << (32 - masker)) - 1) : 0;
cp
ip->mask = masker ? ~((1 << (32 - masker)) - 1) : 0;
cp