projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More files to ignore in CVS
[tinc]
/
src
/
netutl.c
diff --git
a/src/netutl.c
b/src/netutl.c
index
5f62770
..
e9f74d0
100644
(file)
--- a/
src/netutl.c
+++ b/
src/netutl.c
@@
-1,6
+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>
+ 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
@@
-16,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.1
2 2000/10/11 22:01:00
guus Exp $
+ $Id: netutl.c,v 1.12.4.1
8 2001/01/07 17:09:02
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-35,33
+36,11
@@
#include "errno.h"
#include "conf.h"
#include "errno.h"
#include "conf.h"
-#include "encr.h"
#include "net.h"
#include "netutl.h"
#include "system.h"
#include "net.h"
#include "netutl.h"
#include "system.h"
-
-/*
- free a queue and all of its elements
-*/
-void destroy_queue(packet_queue_t *pq)
-{
- queue_element_t *p, *q;
-cp
- for(p = pq->head; p != NULL; p = q)
- {
- q = p->next;
- if(p->packet)
- free(p->packet);
- free(p);
- }
-
- free(pq);
-cp
-}
-
-
char *hostlookup(unsigned long addr)
{
char *name;
char *hostlookup(unsigned long addr)
{
char *name;
@@
-73,7
+52,7
@@
cp
in.s_addr = addr;
lookup_hostname = 0;
in.s_addr = addr;
lookup_hostname = 0;
- if((cfg = get_config_val(config,
resolve_dn
s)) != NULL)
+ if((cfg = get_config_val(config,
config_hostname
s)) != NULL)
if(cfg->data.val == stupid_true)
lookup_hostname = 1;
if(cfg->data.val == stupid_true)
lookup_hostname = 1;
@@
-112,7
+91,9
@@
cp
if(!(h = gethostbyname(p)))
{
if(!(h = gethostbyname(p)))
{
- fprintf(stderr, _("Error looking up `%s': %s\n"), p, strerror(errno));
+ if(debug_lvl >= DEBUG_ERROR)
+ syslog(LOG_WARNING, _("Error looking up `%s': %s\n"), p, strerror(errno));
+
return NULL;
}
return NULL;
}
@@
-125,7
+106,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