/*
netutl.c -- some supporting network utility code
- Copyright (C) 1998-2003 Ivo Timmermans <ivo@o2w.nl>
- 2000-2003 Guus Sliepen <guus@sliepen.eu.org>
+ Copyright (C) 1998-2005 Ivo Timmermans
+ 2000-2006 Guus Sliepen <guus@tinc-vpn.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.52 2003/08/03 12:38:43 guus Exp $
+ $Id$
*/
#include "system.h"
err = getaddrinfo(address, port, &hint, &ai);
if(err || !ai) {
- logger(LOG_ERR, _("Error looking up %s port %s: %s"), address, port,
- gai_strerror(err));
- cp_trace();
- raise(SIGFPE);
- exit(0);
+ ifdebug(SCARY_THINGS)
+ logger(LOG_DEBUG, "Unknown type address %s port %s", address, port);
+ result.sa.sa_family = AF_UNKNOWN;
+ result.unknown.address = xstrdup(address);
+ result.unknown.port = xstrdup(port);
+ return result;
}
- result = *(sockaddr_t *) ai->ai_addr;
+ memcpy(&result, ai->ai_addr, ai->ai_addrlen);
freeaddrinfo(ai);
return result;
cp();
+ if(sa->sa.sa_family == AF_UNKNOWN) {
+ *addrstr = xstrdup(sa->unknown.address);
+ *portstr = xstrdup(sa->unknown.port);
+ return;
+ }
+
err = getnameinfo(&sa->sa, SALEN(sa->sa), address, sizeof(address), port, sizeof(port), NI_NUMERICHOST | NI_NUMERICSERV);
if(err) {
cp();
+ if(sa->sa.sa_family == AF_UNKNOWN) {
+ asprintf(&str, _("%s port %s"), sa->unknown.address, sa->unknown.port);
+ return str;
+ }
+
err = getnameinfo(&sa->sa, SALEN(sa->sa), address, sizeof(address), port, sizeof(port),
hostnames ? 0 : (NI_NUMERICHOST | NI_NUMERICSERV));
if(err) {
return str;
}
+int sockaddrcmp_noport(const sockaddr_t *a, const sockaddr_t *b)
+{
+ int result;
+
+ cp();
+
+ result = a->sa.sa_family - b->sa.sa_family;
+
+ if(result)
+ return result;
+
+ switch (a->sa.sa_family) {
+ case AF_UNSPEC:
+ return 0;
+
+ case AF_UNKNOWN:
+ return strcmp(a->unknown.address, b->unknown.address);
+
+ case AF_INET:
+ return memcmp(&a->in.sin_addr, &b->in.sin_addr, sizeof(a->in.sin_addr));
+
+ case AF_INET6:
+ return memcmp(&a->in6.sin6_addr, &b->in6.sin6_addr, sizeof(a->in6.sin6_addr));
+
+ default:
+ logger(LOG_ERR, _("sockaddrcmp() was called with unknown address family %d, exitting!"),
+ a->sa.sa_family);
+ cp_trace();
+ raise(SIGFPE);
+ exit(0);
+ }
+}
+
int sockaddrcmp(const sockaddr_t *a, const sockaddr_t *b)
{
int result;
case AF_UNSPEC:
return 0;
+ case AF_UNKNOWN:
+ result = strcmp(a->unknown.address, b->unknown.address);
+
+ if(result)
+ return result;
+
+ return strcmp(a->unknown.port, b->unknown.port);
+
case AF_INET:
result = memcmp(&a->in.sin_addr, &b->in.sin_addr, sizeof(a->in.sin_addr));
}
}
+void sockaddrcpy(sockaddr_t *a, const sockaddr_t *b) {
+ cp();
+
+ if(b->sa.sa_family != AF_UNKNOWN) {
+ *a = *b;
+ } else {
+ a->unknown.family = AF_UNKNOWN;
+ a->unknown.address = xstrdup(b->unknown.address);
+ a->unknown.port = xstrdup(b->unknown.port);
+ }
+}
+
+void sockaddrfree(sockaddr_t *a) {
+ cp();
+
+ if(a->sa.sa_family == AF_UNKNOWN) {
+ free(a->unknown.address);
+ free(a->unknown.port);
+ }
+}
+
void sockaddrunmap(sockaddr_t *sa)
{
+ cp();
+
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];
sa->in.sin_family = AF_INET;
/* Subnet mask handling */
-int maskcmp(const void *va, const void *vb, int masklen, int len)
+int maskcmp(const void *va, const void *vb, int masklen)
{
int i, m, result;
const char *a = va;
masklen %= 8;
if(masklen)
- a[i++] &= (0x100 - (1 << masklen));
+ a[i++] &= (0x100 - (1 << (8 - masklen)));
for(; i < len; i++)
a[i] = 0;
a[i] = b[i];
if(m) {
- a[i] = b[i] & (0x100 - (1 << m));
+ a[i] = b[i] & (0x100 - (1 << (8 - m)));
i++;
}