X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/76e72f65da97e7482da0a1eb0b110ca323f21643..16b0fea8ae1a581d568dbee2efa2932aa4e6fcce:/lib/addr.c diff --git a/lib/addr.c b/lib/addr.c index 8082cad..1b62251 100644 --- a/lib/addr.c +++ b/lib/addr.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004, 2007, 2008 Richard Kettlewell + * Copyright (C) 2004, 2007, 2008, 2013 Richard Kettlewell * * 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 @@ -21,10 +21,21 @@ #include "common.h" #include -#include -#include -#include -#include +#if HAVE_SYS_SOCKET_H +# include +#endif +#if HAVE_NETINET_IN_H +# include +#endif +#if HAVE_ARPA_INET_H +# include +#endif +#if HAVE_SYS_UN_H +# include +#endif +#if HAVE_WS2TCPIP_H +# include +#endif #include "log.h" #include "printf.h" @@ -58,28 +69,32 @@ struct addrinfo *get_address(const struct stringlist *a, struct addrinfo *res; char *name; int rc; + char errbuf[1024]; switch(a->n) { case 1: byte_xasprintf(&name, "host * service %s", a->s[0]); if((rc = getaddrinfo(0, a->s[0], pref, &res))) { - error(0, "getaddrinfo %s: %s", a->s[0], gai_strerror(rc)); + disorder_error(0, "getaddrinfo %s: %s", a->s[0], + format_error(ec_getaddrinfo, rc, errbuf, sizeof errbuf)); return 0; } break; case 2: byte_xasprintf(&name, "host %s service %s", a->s[0], a->s[1]); if((rc = getaddrinfo(a->s[0], a->s[1], pref, &res))) { - error(0, "getaddrinfo %s %s: %s", a->s[0], a->s[1], gai_strerror(rc)); + disorder_error(0, "getaddrinfo %s %s: %s", + a->s[0], a->s[1], + format_error(ec_getaddrinfo, rc, errbuf, sizeof errbuf)); return 0; } break; default: - error(0, "invalid network address specification (n=%d)", a->n); + disorder_error(0, "invalid network address specification (n=%d)", a->n); return 0; } if(!res || (pref && res->ai_socktype != pref->ai_socktype)) { - error(0, "getaddrinfo didn't give us a suitable socket address"); + disorder_error(0, "getaddrinfo didn't give us a suitable socket address"); if(res) freeaddrinfo(res); return 0; @@ -95,29 +110,38 @@ struct addrinfo *get_address(const struct stringlist *a, */ int addrinfocmp(const struct addrinfo *a, const struct addrinfo *b) { - const struct sockaddr_in *ina, *inb; - const struct sockaddr_in6 *in6a, *in6b; - if(a->ai_family != b->ai_family) return a->ai_family - b->ai_family; if(a->ai_socktype != b->ai_socktype) return a->ai_socktype - b->ai_socktype; if(a->ai_protocol != b->ai_protocol) return a->ai_protocol - b->ai_protocol; - switch(a->ai_family) { + return sockaddrcmp(a->ai_addr, b->ai_addr); +} + +/** @brief Comparison function for socket addresses + * + * Suitable for qsort(). + */ +int sockaddrcmp(const struct sockaddr *a, + const struct sockaddr *b) { + const struct sockaddr_in *ina, *inb; + const struct sockaddr_in6 *in6a, *in6b; + + if(a->sa_family != b->sa_family) return a->sa_family - b->sa_family; + switch(a->sa_family) { case PF_INET: - ina = (const struct sockaddr_in *)a->ai_addr; - inb = (const struct sockaddr_in *)b->ai_addr; + ina = (const struct sockaddr_in *)a; + inb = (const struct sockaddr_in *)b; if(ina->sin_port != inb->sin_port) return ina->sin_port - inb->sin_port; return ina->sin_addr.s_addr - inb->sin_addr.s_addr; break; case PF_INET6: - in6a = (const struct sockaddr_in6 *)a->ai_addr; - in6b = (const struct sockaddr_in6 *)b->ai_addr; + in6a = (const struct sockaddr_in6 *)a; + in6b = (const struct sockaddr_in6 *)b; if(in6a->sin6_port != in6b->sin6_port) return in6a->sin6_port - in6b->sin6_port; return memcmp(&in6a->sin6_addr, &in6b->sin6_addr, sizeof (struct in6_addr)); default: - error(0, "unsupported protocol family %d", a->ai_protocol); - return memcmp(a->ai_addr, b->ai_addr, a->ai_addrlen); /* kludge */ + disorder_fatal(0, "unsupported protocol family %d", a->sa_family); } } @@ -149,12 +173,12 @@ static inline char *format_sockaddr4(const struct sockaddr_in *sin4) { if(sin4->sin_port) byte_xasprintf(&r, "%s port %u", - inet_ntop(sin4->sin_family, &sin4->sin_addr, + inet_ntop(sin4->sin_family, (void *)&sin4->sin_addr, buffer, sizeof buffer), ntohs(sin4->sin_port)); else byte_xasprintf(&r, "%s", - inet_ntop(sin4->sin_family, &sin4->sin_addr, + inet_ntop(sin4->sin_family, (void *)&sin4->sin_addr, buffer, sizeof buffer)); return r; } @@ -165,20 +189,22 @@ static inline char *format_sockaddr6(const struct sockaddr_in6 *sin6) { if(sin6->sin6_port) byte_xasprintf(&r, "%s port %u", - inet_ntop(sin6->sin6_family, &sin6->sin6_addr, + inet_ntop(sin6->sin6_family, (void *)&sin6->sin6_addr, buffer, sizeof buffer), ntohs(sin6->sin6_port)); else byte_xasprintf(&r, "%s", - inet_ntop(sin6->sin6_family, &sin6->sin6_addr, + inet_ntop(sin6->sin6_family, (void *)&sin6->sin6_addr, buffer, sizeof buffer)); return r; } +#if HAVE_SYS_UN_H /** @brief Format a UNIX socket address */ static inline char *format_sockaddrun(const struct sockaddr_un *sun) { return xstrdup(sun->sun_path); } +#endif /** @brief Construct a text description a sockaddr * @param sa Socket address @@ -190,8 +216,10 @@ char *format_sockaddr(const struct sockaddr *sa) { return format_sockaddr4((const struct sockaddr_in *)sa); case AF_INET6: return format_sockaddr6((const struct sockaddr_in6 *)sa); +#if HAVE_SYS_UN_H case AF_UNIX: return format_sockaddrun((const struct sockaddr_un *)sa); +#endif default: return 0; } @@ -207,6 +235,8 @@ int netaddress_parse(struct netaddress *na, int nvec, char **vec) { const char *port; + long p; + int e; na->af = AF_UNSPEC; if(nvec > 0 && vec[0][0] == '-') { @@ -257,8 +287,7 @@ int netaddress_parse(struct netaddress *na, } if(port[strspn(port, "0123456789")]) return -1; - long p; - int e = xstrtol(&p, port, NULL, 10); + e = xstrtol(&p, port, NULL, 10); if(e) return -1; @@ -295,7 +324,7 @@ void netaddress_format(const struct netaddress *na, if(na->port != -1) { char buffer[64]; - snprintf(buffer, sizeof buffer, "%d", na->port); + byte_snprintf(buffer, sizeof buffer, "%d", na->port); vector_append(v, xstrdup(buffer)); } vector_terminate(v); @@ -317,17 +346,19 @@ struct addrinfo *netaddress_resolve(const struct netaddress *na, struct addrinfo *res, hints[1]; char service[64]; int rc; + char errbuf[1024]; memset(hints, 0, sizeof hints); hints->ai_family = na->af; hints->ai_protocol = protocol; hints->ai_flags = passive ? AI_PASSIVE : 0; - snprintf(service, sizeof service, "%d", na->port); + byte_snprintf(service, sizeof service, "%d", na->port); rc = getaddrinfo(na->address, service, hints, &res); if(rc) { - error(0, "getaddrinfo %s %d: %s", - na->address ? na->address : "*", - na->port, gai_strerror(rc)); + disorder_error(0, "getaddrinfo %s %d: %s", + na->address ? na->address : "*", + na->port, + format_error(ec_getaddrinfo, rc, errbuf, sizeof errbuf)); return NULL; } return res;