/*
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
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.13 2000/10/24 15:46:17 guus Exp $
+ $Id: netutl.c,v 1.12.4.20 2001/10/27 12:13:17 guus Exp $
*/
#include "config.h"
#include "errno.h"
#include "conf.h"
-#include "encr.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;
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, resolve_dns)) != 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(!(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;
}
}
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