X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnetutl.c;h=7eadaebff9d3ae43a3071b0f6ea556182a3cf2c2;hp=1ab4c2cb8e9ce727c2daf325dbcf9ff6b65548bc;hb=a227843b739d279b63adcf3736ebb03d856080c4;hpb=72bdc05cb7e246e56ed21a25256d441c45fccca8 diff --git a/src/netutl.c b/src/netutl.c index 1ab4c2cb..7eadaebf 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-2009 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 @@ -13,11 +13,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - 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.53 2003/08/22 11:18:42 guus Exp $ + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include "system.h" @@ -34,13 +32,10 @@ bool hostnames = false; Turn a string into a struct addrinfo. Return NULL on failure. */ -struct addrinfo *str2addrinfo(const char *address, const char *service, int socktype) -{ +struct addrinfo *str2addrinfo(const char *address, const char *service, int socktype) { struct addrinfo *ai, hint = {0}; int err; - cp(); - hint.ai_family = addressfamily; hint.ai_socktype = socktype; @@ -55,14 +50,11 @@ struct addrinfo *str2addrinfo(const char *address, const char *service, int sock return ai; } -sockaddr_t str2sockaddr(const char *address, const char *port) -{ +sockaddr_t str2sockaddr(const char *address, const char *port) { struct addrinfo *ai, hint = {0}; sockaddr_t result; int err; - cp(); - hint.ai_family = AF_UNSPEC; hint.ai_flags = AI_NUMERICHOST; hint.ai_socktype = SOCK_STREAM; @@ -78,21 +70,18 @@ sockaddr_t str2sockaddr(const char *address, const char *port) return result; } - result = *(sockaddr_t *) ai->ai_addr; + memcpy(&result, ai->ai_addr, ai->ai_addrlen); freeaddrinfo(ai); return result; } -void sockaddr2str(const 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]; char *scopeid; int err; - cp(); - if(sa->sa.sa_family == AF_UNKNOWN) { *addrstr = xstrdup(sa->unknown.address); *portstr = xstrdup(sa->unknown.port); @@ -104,7 +93,6 @@ void sockaddr2str(const sockaddr_t *sa, char **addrstr, char **portstr) if(err) { logger(LOG_ERR, _("Error while translating addresses: %s"), gai_strerror(err)); - cp_trace(); raise(SIGFPE); exit(0); } @@ -118,17 +106,14 @@ void sockaddr2str(const sockaddr_t *sa, char **addrstr, char **portstr) *portstr = xstrdup(port); } -char *sockaddr2hostname(const sockaddr_t *sa) -{ +char *sockaddr2hostname(const sockaddr_t *sa) { char *str; char address[NI_MAXHOST] = "unknown"; char port[NI_MAXSERV] = "unknown"; int err; - cp(); - if(sa->sa.sa_family == AF_UNKNOWN) { - asprintf(&str, _("%s port %s"), sa->unknown.address, sa->unknown.port); + xasprintf(&str, _("%s port %s"), sa->unknown.address, sa->unknown.port); return str; } @@ -139,16 +124,42 @@ char *sockaddr2hostname(const sockaddr_t *sa) gai_strerror(err)); } - asprintf(&str, _("%s port %s"), address, port); + xasprintf(&str, _("%s port %s"), address, port); return str; } -int sockaddrcmp(const sockaddr_t *a, const 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); + raise(SIGFPE); + exit(0); + } +} + +int sockaddrcmp(const sockaddr_t *a, const sockaddr_t *b) { + int result; result = a->sa.sa_family - b->sa.sa_family; @@ -186,7 +197,6 @@ int sockaddrcmp(const sockaddr_t *a, const sockaddr_t *b) default: logger(LOG_ERR, _("sockaddrcmp() was called with unknown address family %d, exitting!"), a->sa.sa_family); - cp_trace(); raise(SIGFPE); exit(0); } @@ -209,8 +219,7 @@ void sockaddrfree(sockaddr_t *a) { } } -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]; sa->in.sin_family = AF_INET; @@ -219,14 +228,11 @@ void sockaddrunmap(sockaddr_t *sa) /* 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; const char *b = vb; - cp(); - for(m = masklen, i = 0; m >= 8; m -= 8, i++) { result = a[i] - b[i]; if(result) @@ -240,36 +246,30 @@ int maskcmp(const void *va, const void *vb, int masklen, int len) return 0; } -void mask(void *va, int masklen, int len) -{ +void mask(void *va, int masklen, int len) { int i; char *a = va; - cp(); - i = masklen / 8; 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, const void *vb, int masklen, int len) -{ +void maskcpy(void *va, const void *vb, int masklen, int len) { int i, m; char *a = va; const char *b = vb; - cp(); - for(m = masklen, i = 0; m >= 8; m -= 8, i++) a[i] = b[i]; if(m) { - a[i] = b[i] & (0x100 - (1 << m)); + a[i] = b[i] & (0x100 - (1 << (8 - m))); i++; } @@ -277,13 +277,10 @@ void maskcpy(void *va, const void *vb, int masklen, int len) a[i] = 0; } -bool maskcheck(const void *va, int masklen, int len) -{ +bool maskcheck(const void *va, int masklen, int len) { int i; const char *a = va; - cp(); - i = masklen / 8; masklen %= 8;