X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnetutl.c;h=206486056de095597f0006f1eddd5d8df339e4c0;hp=1f5e4afcaa33ca9713f707b7f8236dddc1ec1559;hb=3308d13e7e3bf20cfeaf6f2ab17228a9820cea66;hpb=5db596c6844169f1eb5f804b72abe99d067aaa5a diff --git a/src/netutl.c b/src/netutl.c index 1f5e4afc..20648605 100644 --- a/src/netutl.c +++ b/src/netutl.c @@ -1,7 +1,7 @@ /* netutl.c -- some supporting network utility code - Copyright (C) 1998-2003 Ivo Timmermans - 2000-2003 Guus Sliepen + Copyright (C) 1998-2005 Ivo Timmermans + 2000-2006 Guus Sliepen 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 @@ -17,57 +17,37 @@ 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.46 2003/07/12 17:41:46 guus Exp $ + $Id$ */ -#include "config.h" - -#include -#include -#include -#include -#include -#ifdef HAVE_INTTYPES_H -#include -#endif -#include -#include -#include -#include - -#include -#include - -#include "errno.h" -#include "conf.h" +#include "system.h" + #include "net.h" #include "netutl.h" #include "logger.h" +#include "utils.h" +#include "xalloc.h" -#include "system.h" - -int hostnames = 0; +bool hostnames = false; /* Turn a string into a struct addrinfo. Return NULL on failure. */ -struct addrinfo *str2addrinfo(char *address, char *service, int socktype) +struct addrinfo *str2addrinfo(const char *address, const char *service, int socktype) { - struct addrinfo hint, *ai; + struct addrinfo *ai, hint = {0}; int err; cp(); - memset(&hint, 0, sizeof(hint)); - hint.ai_family = addressfamily; hint.ai_socktype = socktype; err = getaddrinfo(address, service, &hint, &ai); if(err) { - logger(LOG_WARNING, _("Error looking up %s port %s: %s\n"), address, + logger(LOG_WARNING, _("Error looking up %s port %s: %s"), address, service, gai_strerror(err)); return NULL; } @@ -75,16 +55,14 @@ struct addrinfo *str2addrinfo(char *address, char *service, int socktype) return ai; } -sockaddr_t str2sockaddr(char *address, char *port) +sockaddr_t str2sockaddr(const char *address, const char *port) { - struct addrinfo hint, *ai; + struct addrinfo *ai, hint = {0}; sockaddr_t result; int err; cp(); - memset(&hint, 0, sizeof(hint)); - hint.ai_family = AF_UNSPEC; hint.ai_flags = AI_NUMERICHOST; hint.ai_socktype = SOCK_STREAM; @@ -92,20 +70,21 @@ sockaddr_t str2sockaddr(char *address, char *port) err = getaddrinfo(address, port, &hint, &ai); if(err || !ai) { - logger(LOG_ERR, _("Error looking up %s port %s: %s\n"), 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; } -void sockaddr2str(sockaddr_t *sa, char **addrstr, char **portstr) +void sockaddr2str(const sockaddr_t *sa, char **addrstr, char **portstr) { char address[NI_MAXHOST]; char port[NI_MAXSERV]; @@ -114,6 +93,12 @@ void sockaddr2str(sockaddr_t *sa, char **addrstr, char **portstr) 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) { @@ -133,7 +118,7 @@ void sockaddr2str(sockaddr_t *sa, char **addrstr, char **portstr) *portstr = xstrdup(port); } -char *sockaddr2hostname(sockaddr_t *sa) +char *sockaddr2hostname(const sockaddr_t *sa) { char *str; char address[NI_MAXHOST] = "unknown"; @@ -142,6 +127,11 @@ char *sockaddr2hostname(sockaddr_t *sa) 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) { @@ -154,7 +144,40 @@ char *sockaddr2hostname(sockaddr_t *sa) return str; } -int sockaddrcmp(sockaddr_t *a, sockaddr_t *b) +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; @@ -169,6 +192,14 @@ int sockaddrcmp(sockaddr_t *a, sockaddr_t *b) 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)); @@ -194,8 +225,31 @@ int sockaddrcmp(sockaddr_t *a, sockaddr_t *b) } } +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; @@ -204,11 +258,11 @@ void sockaddrunmap(sockaddr_t *sa) /* Subnet mask handling */ -int maskcmp(void *va, void *vb, int masklen, int len) +int maskcmp(const void *va, const void *vb, int masklen) { int i, m, result; - char *a = va; - char *b = vb; + const char *a = va; + const char *b = vb; cp(); @@ -236,17 +290,17 @@ void mask(void *va, int masklen, int len) masklen %= 8; if(masklen) - a[i++] &= (0x100 - (1 << masklen)); + a[i++] &= (0x100 - (1 << (8 - masklen))); for(; i < len; i++) a[i] = 0; } -void maskcpy(void *va, void *vb, int masklen, int len) +void maskcpy(void *va, const void *vb, int masklen, int len) { int i, m; char *a = va; - char *b = vb; + const char *b = vb; cp(); @@ -254,7 +308,7 @@ void maskcpy(void *va, void *vb, int masklen, int len) a[i] = b[i]; if(m) { - a[i] = b[i] & (0x100 - (1 << m)); + a[i] = b[i] & (0x100 - (1 << (8 - m))); i++; } @@ -262,10 +316,10 @@ void maskcpy(void *va, void *vb, int masklen, int len) a[i] = 0; } -int maskcheck(void *va, int masklen, int len) +bool maskcheck(const void *va, int masklen, int len) { int i; - char *a = va; + const char *a = va; cp(); @@ -273,11 +327,11 @@ int maskcheck(void *va, int masklen, int len) masklen %= 8; if(masklen && a[i++] & (0xff >> masklen)) - return -1; + return false; for(; i < len; i++) if(a[i] != 0) - return -2; + return false; - return 0; + return true; }