X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnetutl.c;h=a5886fc16ec04f077ed164baa59545574ab7b395;hp=7e02ad0df4051e6f17c6a21b8d2a4b3dc7771517;hb=2ac7be0d51a112108dc6c2b1c6f46da022f72f40;hpb=f8b4a000d008082e5c7e511a49318b8dea8fd08d diff --git a/src/netutl.c b/src/netutl.c index 7e02ad0d..a5886fc1 100644 --- a/src/netutl.c +++ b/src/netutl.c @@ -1,6 +1,7 @@ /* netutl.c -- some supporting network utility code - Copyright (C) 1998,1999,2000 Ivo Timmermans + Copyright (C) 1998-2002 Ivo Timmermans + 2000-2002 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 @@ -16,19 +17,21 @@ 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.16 2000/11/22 18:54:08 guus Exp $ + $Id: netutl.c,v 1.12.4.28 2002/02/26 22:47:51 guus Exp $ */ #include "config.h" -#include +#include #include #include #include #include #include +#include #include #include +#include #include #include @@ -40,96 +43,195 @@ #include "system.h" +int hostnames = 0; /* - free a queue and all of its elements + Turn a string into a struct addrinfo. + Return NULL on failure. */ -void destroy_queue(packet_queue_t *pq) +struct addrinfo *str2addrinfo(char *address, char *service, int socktype) { - queue_element_t *p, *q; + struct addrinfo hint, *ai; + int err; cp - for(p = pq->head; p != NULL; p = q) + memset(&hint, 0, sizeof(hint)); + + hint.ai_family = addressfamily; + hint.ai_socktype = socktype; + + if((err = getaddrinfo(address, service, &hint, &ai))) { - q = p->next; - if(p->packet) - free(p->packet); - free(p); + if(debug_lvl >= DEBUG_ERROR) + syslog(LOG_WARNING, _("Error looking up %s port %s: %s\n"), address, service, gai_strerror(err)); + cp_trace(); + return NULL; } - free(pq); cp + return ai; } - -char *hostlookup(unsigned long addr) +sockaddr_t str2sockaddr(char *address, char *port) { - char *name; - struct hostent *host = NULL; - struct in_addr in; - config_t const *cfg; - int lookup_hostname; + struct addrinfo hint, *ai; + sockaddr_t result; + int err; cp - in.s_addr = addr; - - lookup_hostname = 0; - if((cfg = get_config_val(config, config_hostnames)) != NULL) - if(cfg->data.val == stupid_true) - lookup_hostname = 1; + memset(&hint, 0, sizeof(hint)); - if(lookup_hostname) - host = gethostbyaddr((char *)&in, sizeof(in), AF_INET); + hint.ai_family = AF_UNSPEC; + hint.ai_flags = AI_NUMERICHOST; + hint.ai_socktype = SOCK_STREAM; - if(!lookup_hostname || !host) + if((err = getaddrinfo(address, port, &hint, &ai) || !ai)) { - asprintf(&name, "%s", inet_ntoa(in)); + syslog(LOG_ERR, _("Error looking up %s port %s: %s\n"), address, port, gai_strerror(err)); + cp_trace(); + raise(SIGFPE); + exit(0); } - else + + result = *(sockaddr_t *)ai->ai_addr; + freeaddrinfo(ai); +cp + return result; +} + +void sockaddr2str(sockaddr_t *sa, char **addrstr, char **portstr) +{ + char address[NI_MAXHOST]; + char port[NI_MAXSERV]; + char *scopeid; + int err; +cp + if((err = getnameinfo(&sa->sa, SALEN(sa->sa), address, sizeof(address), port, sizeof(port), NI_NUMERICHOST|NI_NUMERICSERV))) { - asprintf(&name, "%s", host->h_name); + syslog(LOG_ERR, _("Error while translating addresses: %s"), gai_strerror(err)); + cp_trace(); + raise(SIGFPE); + exit(0); } + +#ifdef HAVE_LINUX + if((scopeid = strchr(address, '%'))) + *scopeid = '\0'; /* Descope. */ +#endif + + *addrstr = xstrdup(address); + *portstr = xstrdup(port); cp - return name; } -/* - Turn a string into an IP addy with netmask - return NULL on failure -*/ -ip_mask_t *strtoip(char *str) +char *sockaddr2hostname(sockaddr_t *sa) { - ip_mask_t *ip; - int masker; - char *q, *p; - struct hostent *h; + char *str; + char address[NI_MAXHOST] = "unknown"; + char port[NI_MAXSERV] = "unknown"; + int err; cp - p = str; - if((q = strchr(p, '/'))) + if((err = getnameinfo(&sa->sa, SALEN(sa->sa), address, sizeof(address), port, sizeof(port), hostnames?0:(NI_NUMERICHOST|NI_NUMERICSERV)))) { - *q = '\0'; - q++; /* q now points to netmask part, or NULL if no mask */ + syslog(LOG_ERR, _("Error while looking up hostname: %s"), gai_strerror(err)); } - if(!(h = gethostbyname(p))) + asprintf(&str, _("%s port %s"), address, port); +cp + return str; +} + +int sockaddrcmp(sockaddr_t *a, sockaddr_t *b) +{ + int result; +cp + result = a->sa.sa_family - b->sa.sa_family; + + if(result) + return result; + + switch(a->sa.sa_family) { - if(debug_lvl >= DEBUG_ERROR) - syslog(LOG_WARNING, _("Error looking up `%s': %s\n"), p, strerror(errno)); - - return NULL; + case AF_UNSPEC: + return 0; + case AF_INET: + result = memcmp(&a->in.sin_addr, &b->in.sin_addr, sizeof(a->in.sin_addr)); + if(result) + return result; + return memcmp(&a->in.sin_port, &b->in.sin_port, sizeof(a->in.sin_port)); + case AF_INET6: + result = memcmp(&a->in6.sin6_addr, &b->in6.sin6_addr, sizeof(a->in6.sin6_addr)); + if(result) + return 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!"), a->sa.sa_family); + cp_trace(); + raise(SIGFPE); + exit(0); } +cp +} + +/* Subnet mask handling */ + +int maskcmp(char *a, char *b, int masklen, int len) +{ + int i, m, result; +cp + for(m = masklen, i = 0; m >= 8; m -= 8, i++) + if((result = a[i] - b[i])) + return result; + + if(m) + return (a[i] & (0x100 - (m << 1))) - (b[i] & (0x100 - (m << 1))); + + return 0; +} + +void mask(char *a, int masklen, int len) +{ + int i; +cp + i = masklen / 8; + masklen %= 8; + + if(masklen) + a[i++] &= (0x100 - (masklen << 1)); + + for(; i < len; i++) + a[i] = 0; +} - masker = 0; - if(q) +void maskcpy(char *a, char *b, int masklen, int len) +{ + int i, m; +cp + for(m = masklen, i = 0; m >= 8; m -= 8, i++) + a[i] = b[i]; + + if(m) { - masker = strtol(q, &p, 10); - if(q == p || (*p)) - return NULL; + a[i] = b[i] & (0x100 - (m << 1)); + i++; } - ip = xmalloc(sizeof(*ip)); - ip->address = ntohl(*((ip_t*)(h->h_addr_list[0]))); + for(; i < len; i++) + a[i] = 0; +} - ip->mask = masker ? ~((1 << (32 - masker)) - 1) : 0; +int maskcheck(char *a, int masklen, int len) +{ + int i; cp - return ip; + i = masklen / 8; + masklen %= 8; + + if(masklen) + if(a[i++] & ~(0x100 - (masklen << 1))) + return -1; + + for(; i < len; i++) + if(a[i] != 0) + return -1; + + return 0; } -