projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
In execute_script:
[tinc]
/
src
/
netutl.c
diff --git
a/src/netutl.c
b/src/netutl.c
index
0a0a3fe
..
b80473b
100644
(file)
--- a/
src/netutl.c
+++ b/
src/netutl.c
@@
-16,7
+16,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.1
1 2000/10/11 10:35:17
guus Exp $
+ $Id: netutl.c,v 1.12.4.1
4 2000/10/29 09:19:25
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-35,7
+35,6
@@
#include "errno.h"
#include "conf.h"
#include "errno.h"
#include "conf.h"
-#include "encr.h"
#include "net.h"
#include "netutl.h"
#include "net.h"
#include "netutl.h"
@@
-73,7
+72,7
@@
cp
in.s_addr = addr;
lookup_hostname = 0;
in.s_addr = addr;
lookup_hostname = 0;
- if((cfg = get_config_val(resolve_dns)) != NULL)
+ if((cfg = get_config_val(
config,
resolve_dns)) != NULL)
if(cfg->data.val == stupid_true)
lookup_hostname = 1;
if(cfg->data.val == stupid_true)
lookup_hostname = 1;
@@
-125,7
+124,7
@@
cp
}
ip = xmalloc(sizeof(*ip));
}
ip = xmalloc(sizeof(*ip));
- ip->
ip
= ntohl(*((ip_t*)(h->h_addr_list[0])));
+ ip->
address
= ntohl(*((ip_t*)(h->h_addr_list[0])));
ip->mask = masker ? ~((1 << (32 - masker)) - 1) : 0;
cp
ip->mask = masker ? ~((1 << (32 - masker)) - 1) : 0;
cp