X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/812b526d127c6657e571db8b33a58137af6709cd..6735af5fd1a4ae3978c0c31ac6026f15742c0a90:/lib/addr.c diff --git a/lib/addr.c b/lib/addr.c index fecc28c..802204a 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 @@ -20,16 +20,32 @@ #include "common.h" +#include + #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" #include "addr.h" #include "mem.h" +#include "syscalls.h" +#include "configuration.h" +#include "vector.h" /** @brief Convert a pair of strings to an address * @param a Pointer to string list @@ -55,28 +71,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; @@ -92,29 +112,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); } } @@ -146,12 +175,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; } @@ -162,20 +191,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 @@ -187,13 +218,193 @@ 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; } } +/** @brief Parse the text form of a network address + * @param na Where to store result + * @param nvec Number of strings + * @param vec List of strings + * @return 0 on success, -1 on syntax error + */ +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] == '-') { + if(!strcmp(vec[0], "-4")) + na->af = AF_INET; + else if(!strcmp(vec[0], "-6")) + na->af = AF_INET6; + else if(!strcmp(vec[0], "-unix")) + na->af = AF_UNIX; + else if(!strcmp(vec[0], "-")) + na->af = AF_UNSPEC; + else + return -1; + --nvec; + ++vec; + } + if(nvec == 0) + return -1; + /* Possibilities are: + * + * /path/to/unix/socket an AF_UNIX socket + * * PORT any address, specific port + * PORT any address, specific port + * ADDRESS PORT specific address, specific port + */ + if(vec[0][0] == '/' && na->af == AF_UNSPEC) + na->af = AF_UNIX; + if(na->af == AF_UNIX) { + if(nvec != 1) + return -1; + na->address = xstrdup(vec[0]); + na->port = -1; /* makes no sense */ + } else { + switch(nvec) { + case 1: + na->address = NULL; + port = vec[0]; + break; + case 2: + if(!strcmp(vec[0], "*")) + na->address = NULL; + else + na->address = xstrdup(vec[0]); + port = vec[1]; + break; + default: + return -1; + } + if(port[strspn(port, "0123456789")]) + return -1; + e = xstrtol(&p, port, NULL, 10); + + if(e) + return -1; + if(p > 65535) + return -1; + na->port = (int)p; + } + return 0; +} + +/** @brief Format a @ref netaddress structure + * @param na Network address to format + * @param nvecp Where to put string count, or NULL + * @param vecp Where to put strings + * + * The formatted form is suitable for passing to netaddress_parse(). + */ +void netaddress_format(const struct netaddress *na, + int *nvecp, + char ***vecp) { + struct vector v[1]; + + vector_init(v); + switch(na->af) { + case AF_UNSPEC: vector_append(v, xstrdup("-")); break; + case AF_INET: vector_append(v, xstrdup("-4")); break; + case AF_INET6: vector_append(v, xstrdup("-6")); break; + case AF_UNIX: vector_append(v, xstrdup("-unix")); break; + } + if(na->address) + vector_append(v, xstrdup(na->address)); + else + vector_append(v, xstrdup("*")); + if(na->port != -1) { + char buffer[64]; + + byte_snprintf(buffer, sizeof buffer, "%d", na->port); + vector_append(v, xstrdup(buffer)); + } + vector_terminate(v); + if(nvecp) + *nvecp = v->nvec; + if(vecp) + *vecp = v->vec; +} + +/** @brief Resolve a network address + * @param na Address structure + * @param passive True if passive (bindable) address is desired + * @param protocol Protocol number desired (e.g. @c IPPROTO_TCP) + * @return List of suitable addresses or NULL + * + * Free the address using netaddress_freeaddrinfo() because it might not + * have come from getaddrinfo() directly. + */ +struct addrinfo *netaddress_resolve(const struct netaddress *na, + int passive, + int protocol) { + struct addrinfo *res, hints[1]; + struct sockaddr_un *sun; + char service[64]; + int rc; + char errbuf[1024]; + +#if HAVE_SYS_UN_H + if (na->af == AF_UNIX) { + /* `getaddrinfo' won't work, so we make our own one */ + res = xmalloc(sizeof(*res)); + res->ai_flags = 0; + res->ai_family = AF_UNIX; + res->ai_socktype = (protocol == IPPROTO_UDP ? SOCK_DGRAM : SOCK_STREAM); + res->ai_protocol = 0; + res->ai_addrlen = offsetof(struct sockaddr_un, sun_path) + + strlen(na->address) + 1; + sun = xmalloc(res->ai_addrlen); + sun->sun_family = AF_UNIX; + strcpy(sun->sun_path, na->address); + res->ai_addr = (struct sockaddr *)sun; + res->ai_canonname = sun->sun_path; + res->ai_next = 0; + } else +#endif + { + /* get the system to do the heavy lifting */ + memset(hints, 0, sizeof hints); + hints->ai_family = na->af; + hints->ai_protocol = protocol; + hints->ai_flags = passive ? AI_PASSIVE : 0; + byte_snprintf(service, sizeof service, "%d", na->port); + rc = getaddrinfo(na->address, service, hints, &res); + if(rc) { + disorder_error(0, "getaddrinfo %s %d: %s", + na->address ? na->address : "*", + na->port, + format_error(ec_getaddrinfo, rc, errbuf, sizeof errbuf)); + return NULL; + } + assert(res->ai_family != AF_UNIX); + } + return res; +} + +/** @brief Free an address-info list from netaddress_resovle() + * @param res Address-info list + */ +void netaddress_freeaddrinfo(struct addrinfo *res) { +#if HAVE_SYS_UN_H + if(res->ai_family == AF_UNIX) { + xfree(res->ai_addr); + xfree(res); + } else +#endif + freeaddrinfo(res); +} + /* Local Variables: c-basic-offset:2