From a2eb71d49a3135900662a7e89ae97725463445d1 Mon Sep 17 00:00:00 2001 From: Oliver Jowett Date: Tue, 16 Feb 2016 13:00:55 +0000 Subject: [PATCH] IPv6 support (in theory). Fixes #87. --- anet.c | 267 ++++++++++++++++++++++++++----------------------------- anet.h | 37 +++++--- net_io.c | 59 ++++++------ 3 files changed, 185 insertions(+), 178 deletions(-) diff --git a/anet.c b/anet.c index 859c98c82..9d89badd2 100644 --- a/anet.c +++ b/anet.c @@ -1,3 +1,26 @@ +// Part of dump1090, a Mode S message decoder for RTLSDR devices. +// +// anet.c: Basic TCP socket stuff made a bit less boring +// +// Copyright (c) 2016 Oliver Jowett +// +// This file is free software: you may copy, redistribute and/or modify it +// under the terms of the GNU General Public License as published by the +// Free Software Foundation, either version 2 of the License, or (at your +// option) any later version. +// +// This file is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// 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, see . + +// This file incorporates work covered by the following copyright and +// permission notice: +// + /* anet.c -- Basic TCP socket stuff made a bit less boring * * Copyright (c) 2006-2012, Salvatore Sanfilippo @@ -28,25 +51,20 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _WIN32 - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include -#else - #include "winstubs.h" //Put everything Windows specific in here - #include "dump1090.h" -#endif +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "anet.h" @@ -63,7 +81,7 @@ static void anetSetError(char *err, const char *fmt, ...) int anetNonBlock(char *err, int fd) { int flags; -#ifndef _WIN32 + /* Set the socket nonblocking. * Note that fcntl(2) for F_GETFL and F_SETFL can't be * interrupted by a signal. */ @@ -75,14 +93,7 @@ int anetNonBlock(char *err, int fd) anetSetError(err, "fcntl(F_SETFL,O_NONBLOCK): %s", strerror(errno)); return ANET_ERR; } -#else - flags = 1; - if (ioctlsocket(fd, FIONBIO, &flags)) { - errno = WSAGetLastError(); - anetSetError(err, "ioctlsocket(FIONBIO): %s", strerror(errno)); - return ANET_ERR; - } -#endif + return ANET_OK; } @@ -117,31 +128,10 @@ int anetTcpKeepAlive(char *err, int fd) return ANET_OK; } -int anetResolve(char *err, char *host, char *ipbuf) +static int anetCreateSocket(char *err, int domain) { - struct sockaddr_in sa; - - sa.sin_family = AF_INET; - if (inet_aton(host, (void*)&sa.sin_addr) == 0) { - struct hostent *he; - - he = gethostbyname(host); - if (he == NULL) { - anetSetError(err, "can't resolve: %s", host); - return ANET_ERR; - } - memcpy(&sa.sin_addr, he->h_addr, sizeof(struct in_addr)); - } - strcpy(ipbuf,inet_ntoa(sa.sin_addr)); - return ANET_OK; -} - -static int anetCreateSocket(char *err, int domain) { int s, on = 1; if ((s = socket(domain, SOCK_STREAM, 0)) == -1) { -#ifdef _WIN32 - errno = WSAGetLastError(); -#endif anetSetError(err, "creating socket: %s", strerror(errno)); return ANET_ERR; } @@ -157,52 +147,63 @@ static int anetCreateSocket(char *err, int domain) { #define ANET_CONNECT_NONE 0 #define ANET_CONNECT_NONBLOCK 1 -static int anetTcpGenericConnect(char *err, char *addr, int port, int flags) +static int anetTcpGenericConnect(char *err, char *addr, char *service, int flags) { int s; - struct sockaddr_in sa; - - if ((s = anetCreateSocket(err,AF_INET)) == ANET_ERR) + struct addrinfo gai_hints; + struct addrinfo *gai_result, *p; + int gai_error; + + gai_hints.ai_family = AF_UNSPEC; + gai_hints.ai_socktype = SOCK_STREAM; + gai_hints.ai_protocol = 0; + gai_hints.ai_flags = 0; + gai_hints.ai_addrlen = 0; + gai_hints.ai_addr = NULL; + gai_hints.ai_canonname = NULL; + gai_hints.ai_next = NULL; + + gai_error = getaddrinfo(addr, service, &gai_hints, &gai_result); + if (gai_error != 0) { + anetSetError(err, "can't resolve %s: %s", addr, gai_strerror(gai_error)); return ANET_ERR; + } + + for (p = gai_result; p != NULL; p = p->ai_next) { + if ((s = anetCreateSocket(err, p->ai_family)) == ANET_ERR) + continue; - memset(&sa,0,sizeof(sa)); - sa.sin_family = AF_INET; - sa.sin_port = htons((uint16_t)port); - if (inet_aton(addr, (void*)&sa.sin_addr) == 0) { - struct hostent *he; - - he = gethostbyname(addr); - if (he == NULL) { - anetSetError(err, "can't resolve: %s", addr); - close(s); - return ANET_ERR; + if (flags & ANET_CONNECT_NONBLOCK) { + if (anetNonBlock(err,s) != ANET_OK) + return ANET_ERR; } - memcpy(&sa.sin_addr, he->h_addr, sizeof(struct in_addr)); - } - if (flags & ANET_CONNECT_NONBLOCK) { - if (anetNonBlock(err,s) != ANET_OK) - return ANET_ERR; - } - if (connect(s, (struct sockaddr*)&sa, sizeof(sa)) == -1) { - if (errno == EINPROGRESS && - flags & ANET_CONNECT_NONBLOCK) + + if (connect(s, p->ai_addr, p->ai_addrlen) >= 0) { + freeaddrinfo(gai_result); return s; + } + + if (errno == EINPROGRESS && (flags & ANET_CONNECT_NONBLOCK)) { + freeaddrinfo(gai_result); + return s; + } anetSetError(err, "connect: %s", strerror(errno)); close(s); - return ANET_ERR; } - return s; + + freeaddrinfo(gai_result); + return ANET_ERR; } -int anetTcpConnect(char *err, char *addr, int port) +int anetTcpConnect(char *err, char *addr, char *service) { - return anetTcpGenericConnect(err,addr,port,ANET_CONNECT_NONE); + return anetTcpGenericConnect(err,addr,service,ANET_CONNECT_NONE); } -int anetTcpNonBlockConnect(char *err, char *addr, int port) +int anetTcpNonBlockConnect(char *err, char *addr, char *service) { - return anetTcpGenericConnect(err,addr,port,ANET_CONNECT_NONBLOCK); + return anetTcpGenericConnect(err,addr,service,ANET_CONNECT_NONBLOCK); } /* Like read(2) but make sure 'count' is read before to return @@ -236,10 +237,12 @@ int anetWrite(int fd, char *buf, int count) } static int anetListen(char *err, int s, struct sockaddr *sa, socklen_t len) { + if (sa->sa_family == AF_INET6) { + int on = 1; + setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, &on, sizeof(on)); + } + if (bind(s,sa,len) == -1) { -#ifdef _WIN32 - errno = WSAGetLastError(); -#endif anetSetError(err, "bind: %s", strerror(errno)); close(s); return ANET_ERR; @@ -249,9 +252,6 @@ static int anetListen(char *err, int s, struct sockaddr *sa, socklen_t len) { * the kernel does: backlogsize = roundup_pow_of_two(backlogsize + 1); * which will thus give us a backlog of 512 entries */ if (listen(s, 511) == -1) { -#ifdef _WIN32 - errno = WSAGetLastError(); -#endif anetSetError(err, "listen: %s", strerror(errno)); close(s); return ANET_ERR; @@ -259,40 +259,52 @@ static int anetListen(char *err, int s, struct sockaddr *sa, socklen_t len) { return ANET_OK; } -int anetTcpServer(char *err, int port, char *bindaddr) +int anetTcpServer(char *err, char *service, char *bindaddr, int *fds, int nfds) { int s; - struct sockaddr_in sa; - - if ((s = anetCreateSocket(err,AF_INET)) == ANET_ERR) + int i = 0; + struct addrinfo gai_hints; + struct addrinfo *gai_result, *p; + int gai_error; + + gai_hints.ai_family = AF_UNSPEC; + gai_hints.ai_socktype = SOCK_STREAM; + gai_hints.ai_protocol = 0; + gai_hints.ai_flags = AI_PASSIVE; + gai_hints.ai_addrlen = 0; + gai_hints.ai_addr = NULL; + gai_hints.ai_canonname = NULL; + gai_hints.ai_next = NULL; + + gai_error = getaddrinfo(bindaddr, service, &gai_hints, &gai_result); + if (gai_error != 0) { + anetSetError(err, "can't resolve %s: %s", bindaddr, gai_strerror(gai_error)); return ANET_ERR; + } - memset(&sa,0,sizeof(sa)); - sa.sin_family = AF_INET; - sa.sin_port = htons((uint16_t)port); - sa.sin_addr.s_addr = htonl(INADDR_ANY); - if (bindaddr && inet_aton(bindaddr, (void*)&sa.sin_addr) == 0) { - anetSetError(err, "invalid bind address"); - close(s); - return ANET_ERR; + for (p = gai_result; p != NULL && i < nfds; p = p->ai_next) { + if ((s = anetCreateSocket(err, p->ai_family)) == ANET_ERR) + continue; + + if (anetListen(err, s, p->ai_addr, p->ai_addrlen) == ANET_ERR) { + continue; + } + + fds[i++] = s; } - if (anetListen(err,s,(struct sockaddr*)&sa,sizeof(sa)) == ANET_ERR) - return ANET_ERR; - return s; + + freeaddrinfo(gai_result); + return (i > 0 ? i : ANET_ERR); } -static int anetGenericAccept(char *err, int s, struct sockaddr *sa, socklen_t *len) { +static int anetGenericAccept(char *err, int s, struct sockaddr *sa, socklen_t *len) +{ int fd; while(1) { fd = accept(s,sa,len); if (fd == -1) { -#ifndef _WIN32 if (errno == EINTR) { continue; -#else - errno = WSAGetLastError(); - if (errno == WSAEWOULDBLOCK) { -#endif } else { anetSetError(err, "accept: %s", strerror(errno)); } @@ -302,44 +314,13 @@ static int anetGenericAccept(char *err, int s, struct sockaddr *sa, socklen_t *l return fd; } -int anetTcpAccept(char *err, int s, char *ip, int *port) { +int anetTcpAccept(char *err, int s) { int fd; - struct sockaddr_in sa; - socklen_t salen = sizeof(sa); - if ((fd = anetGenericAccept(err,s,(struct sockaddr*)&sa,&salen)) == ANET_ERR) + struct sockaddr_storage ss; + socklen_t sslen = sizeof(ss); + + if ((fd = anetGenericAccept(err, s, (struct sockaddr*)&ss, &sslen)) == ANET_ERR) return ANET_ERR; - if (ip) strcpy(ip,inet_ntoa(sa.sin_addr)); - if (port) *port = ntohs(sa.sin_port); return fd; } - -int anetPeerToString(int fd, char *ip, int *port) { - struct sockaddr_in sa; - socklen_t salen = sizeof(sa); - - if (getpeername(fd,(struct sockaddr*)&sa,&salen) == -1) { - *port = 0; - ip[0] = '?'; - ip[1] = '\0'; - return -1; - } - if (ip) strcpy(ip,inet_ntoa(sa.sin_addr)); - if (port) *port = ntohs(sa.sin_port); - return 0; -} - -int anetSockName(int fd, char *ip, int *port) { - struct sockaddr_in sa; - socklen_t salen = sizeof(sa); - - if (getsockname(fd,(struct sockaddr*)&sa,&salen) == -1) { - *port = 0; - ip[0] = '?'; - ip[1] = '\0'; - return -1; - } - if (ip) strcpy(ip,inet_ntoa(sa.sin_addr)); - if (port) *port = ntohs(sa.sin_port); - return 0; -} diff --git a/anet.h b/anet.h index 6d74af577..bf36871f8 100644 --- a/anet.h +++ b/anet.h @@ -1,3 +1,26 @@ +// Part of dump1090, a Mode S message decoder for RTLSDR devices. +// +// anet.h: Basic TCP socket stuff made a bit less boring +// +// Copyright (c) 2016 Oliver Jowett +// +// This file is free software: you may copy, redistribute and/or modify it +// under the terms of the GNU General Public License as published by the +// Free Software Foundation, either version 2 of the License, or (at your +// option) any later version. +// +// This file is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// 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, see . + +// This file incorporates work covered by the following copyright and +// permission notice: +// + /* anet.c -- Basic TCP socket stuff made a bit less boring * * Copyright (c) 2006-2012, Salvatore Sanfilippo @@ -39,21 +62,15 @@ #define AF_LOCAL AF_UNIX #endif -int anetTcpConnect(char *err, char *addr, int port); -int anetTcpNonBlockConnect(char *err, char *addr, int port); -int anetUnixConnect(char *err, char *path); -int anetUnixNonBlockConnect(char *err, char *path); +int anetTcpConnect(char *err, char *addr, char *service); +int anetTcpNonBlockConnect(char *err, char *addr, char *service); int anetRead(int fd, char *buf, int count); -int anetResolve(char *err, char *host, char *ipbuf); -int anetTcpServer(char *err, int port, char *bindaddr); -int anetUnixServer(char *err, char *path, mode_t perm); -int anetTcpAccept(char *err, int serversock, char *ip, int *port); -int anetUnixAccept(char *err, int serversock); +int anetTcpServer(char *err, char *service, char *bindaddr, int *fds, int nfds); +int anetTcpAccept(char *err, int serversock); int anetWrite(int fd, char *buf, int count); int anetNonBlock(char *err, int fd); int anetTcpNoDelay(char *err, int fd); int anetTcpKeepAlive(char *err, int fd); -int anetPeerToString(int fd, char *ip, int *port); int anetSetSendBuffer(char *err, int fd, int buffsize); #endif diff --git a/net_io.c b/net_io.c index ab9d656fb..0f378f404 100644 --- a/net_io.c +++ b/net_io.c @@ -154,7 +154,12 @@ struct client *createGenericClient(struct net_service *service, int fd) // Return the new client or NULL if the connection failed struct client *serviceConnect(struct net_service *service, char *addr, int port) { - int s = anetTcpConnect(Modes.aneterr, addr, port); + int s; + char buf[20]; + + // Bleh. + snprintf(buf, 20, "%d", port); + s = anetTcpConnect(Modes.aneterr, addr, buf); if (s == ANET_ERR) return NULL; @@ -168,6 +173,7 @@ void serviceListen(struct net_service *service, char *bind_addr, char *bind_port int *fds = NULL; int n = 0; char *p, *end; + char buf[128]; if (service->listener_count > 0) { fprintf(stderr, "Tried to set up the service %s twice!\n", service->descr); @@ -178,38 +184,41 @@ void serviceListen(struct net_service *service, char *bind_addr, char *bind_port return; p = bind_ports; - while (*p) { - int s; - unsigned long port = strtoul(p, &end, 10); - if (p == end) { - fprintf(stderr, - "Couldn't parse port list: %s\n" - " %*s^\n", - bind_ports, (int)(p - bind_ports), ""); - exit(1); + while (p && *p) { + int newfds[16]; + int nfds, i; + + end = strpbrk(p, ", "); + if (!end) { + strncpy(buf, p, sizeof(buf)); + p = NULL; + } else { + size_t len = end - p; + if (len > sizeof(buf)) + len = sizeof(buf); + memcpy(buf, p, len); + p = end + 1; } - s = anetTcpServer(Modes.aneterr, port, bind_addr); - if (s == ANET_ERR) { - fprintf(stderr, "Error opening the listening port %lu (%s): %s\n", - port, service->descr, Modes.aneterr); + buf[sizeof(buf)-1] = 0; + + nfds = anetTcpServer(Modes.aneterr, buf, bind_addr, newfds, sizeof(newfds)); + if (nfds == ANET_ERR) { + fprintf(stderr, "Error opening the listening port %s (%s): %s\n", + buf, service->descr, Modes.aneterr); exit(1); } - anetNonBlock(Modes.aneterr, s); - - fds = realloc(fds, (n+1) * sizeof(int)); + fds = realloc(fds, (n+nfds) * sizeof(int)); if (!fds) { fprintf(stderr, "out of memory\n"); exit(1); } - fds[n] = s; - ++n; - - p = end; - if (*p == ',') - ++p; + for (i = 0; i < nfds; ++i) { + anetNonBlock(Modes.aneterr, newfds[i]); + fds[n++] = newfds[i]; + } } service->listener_count = n; @@ -259,13 +268,13 @@ void modesInitNet(void) { // awakened by new data arriving. This usually happens a few times every second // static struct client * modesAcceptClients(void) { - int fd, port; + int fd; struct net_service *s; for (s = Modes.services; s; s = s->next) { int i; for (i = 0; i < s->listener_count; ++i) { - while ((fd = anetTcpAccept(Modes.aneterr, s->listener_fds[i], NULL, &port)) >= 0) { + while ((fd = anetTcpAccept(Modes.aneterr, s->listener_fds[i])) >= 0) { createSocketClient(s, fd); } }