/*
netutl.c -- some supporting network utility code
- Copyright (C) 1998-2002 Ivo Timmermans <ivo@o2w.nl>
- 2000-2002 Guus Sliepen <guus@sliepen.eu.org>
+ Copyright (C) 1998-2003 Ivo Timmermans <ivo@o2w.nl>
+ 2000-2003 Guus Sliepen <guus@sliepen.eu.org>
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.43 2002/09/09 21:24:41 guus Exp $
+ $Id: netutl.c,v 1.12.4.46 2003/07/12 17:41:46 guus Exp $
*/
#include "config.h"
#include <string.h>
#include <signal.h>
#include <sys/socket.h>
-#include <syslog.h>
#include <arpa/inet.h>
#include <utils.h>
#include "conf.h"
#include "net.h"
#include "netutl.h"
+#include "logger.h"
#include "system.h"
err = getaddrinfo(address, service, &hint, &ai);
if(err) {
- if(debug_lvl >= DEBUG_ERROR)
- syslog(LOG_WARNING, _("Error looking up %s port %s: %s\n"), address,
+ logger(LOG_WARNING, _("Error looking up %s port %s: %s\n"), address,
service, gai_strerror(err));
- cp_trace();
return NULL;
}
err = getaddrinfo(address, port, &hint, &ai);
if(err || !ai) {
- syslog(LOG_ERR, _("Error looking up %s port %s: %s\n"), address, port,
+ logger(LOG_ERR, _("Error looking up %s port %s: %s\n"), address, port,
gai_strerror(err));
cp_trace();
raise(SIGFPE);
return result;
}
-void sockaddr2str(sockaddr_t * sa, char **addrstr, char **portstr)
+void sockaddr2str(sockaddr_t *sa, char **addrstr, char **portstr)
{
char address[NI_MAXHOST];
char port[NI_MAXSERV];
err = getnameinfo(&sa->sa, SALEN(sa->sa), address, sizeof(address), port, sizeof(port), NI_NUMERICHOST | NI_NUMERICSERV);
if(err) {
- syslog(LOG_ERR, _("Error while translating addresses: %s"),
+ logger(LOG_ERR, _("Error while translating addresses: %s"),
gai_strerror(err));
cp_trace();
raise(SIGFPE);
*portstr = xstrdup(port);
}
-char *sockaddr2hostname(sockaddr_t * sa)
+char *sockaddr2hostname(sockaddr_t *sa)
{
char *str;
char address[NI_MAXHOST] = "unknown";
err = getnameinfo(&sa->sa, SALEN(sa->sa), address, sizeof(address), port, sizeof(port),
hostnames ? 0 : (NI_NUMERICHOST | NI_NUMERICSERV));
if(err) {
- syslog(LOG_ERR, _("Error while looking up hostname: %s"),
+ logger(LOG_ERR, _("Error while looking up hostname: %s"),
gai_strerror(err));
}
return str;
}
-int sockaddrcmp(sockaddr_t * a, sockaddr_t * b)
+int sockaddrcmp(sockaddr_t *a, sockaddr_t *b)
{
int result;
return memcmp(&a->in6.sin6_port, &b->in6.sin6_port, sizeof(a->in6.sin6_port));
default:
- syslog(LOG_ERR, _("sockaddrcmp() was called with unknown address family %d, exitting!"),
+ logger(LOG_ERR, _("sockaddrcmp() was called with unknown address family %d, exitting!"),
a->sa.sa_family);
cp_trace();
raise(SIGFPE);
}
}
-void sockaddrunmap(sockaddr_t * sa)
+void sockaddrunmap(sockaddr_t *sa)
{
if(sa->sa.sa_family == AF_INET6 && IN6_IS_ADDR_V4MAPPED(&sa->in6.sin6_addr)) {
sa->in.sin_addr.s_addr = ((uint32_t *) & sa->in6.sin6_addr)[3];