AFG/dump1090
3
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

IPv6 support (in theory).

Browse source 
Fixes #87.
This commit is contained in:
Oliver Jowett 2016-02-16 13:00:55 +00:00
parent 108b402918
commit a2eb71d49a
3 changed files with 184 additions and 177 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

231
anet.c
View file

@ -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 <oliver@mutability.co.uk>
//
// 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 <http://www.gnu.org/licenses/>.
// This file incorporates work covered by the following copyright and
// permission notice:
//
/* anet.c -- Basic TCP socket stuff made a bit less boring /* anet.c -- Basic TCP socket stuff made a bit less boring
* *
* Copyright (c) 2006-2012, Salvatore Sanfilippo <antirez at gmail dot com> * Copyright (c) 2006-2012, Salvatore Sanfilippo <antirez at gmail dot com>
@ -28,7 +51,6 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef _WIN32
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/stat.h> #include <sys/stat.h>
@ -43,10 +65,6 @@
#include <errno.h> #include <errno.h>
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
#else
#include "winstubs.h" //Put everything Windows specific in here
#include "dump1090.h"
#endif
#include "anet.h" #include "anet.h"
@ -63,7 +81,7 @@ static void anetSetError(char *err, const char *fmt, ...)
int anetNonBlock(char *err, int fd) int anetNonBlock(char *err, int fd)
{ {
int flags; int flags;
#ifndef _WIN32
/* Set the socket nonblocking. /* Set the socket nonblocking.
* Note that fcntl(2) for F_GETFL and F_SETFL can't be * Note that fcntl(2) for F_GETFL and F_SETFL can't be
* interrupted by a signal. */ * interrupted by a signal. */
@ -75,14 +93,7 @@ int anetNonBlock(char *err, int fd)
anetSetError(err, "fcntl(F_SETFL,O_NONBLOCK): %s", strerror(errno)); anetSetError(err, "fcntl(F_SETFL,O_NONBLOCK): %s", strerror(errno));
return ANET_ERR; 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; return ANET_OK;
} }
@ -117,31 +128,10 @@ int anetTcpKeepAlive(char *err, int fd)
return ANET_OK; 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; int s, on = 1;
if ((s = socket(domain, SOCK_STREAM, 0)) == -1) { if ((s = socket(domain, SOCK_STREAM, 0)) == -1) {
#ifdef _WIN32
errno = WSAGetLastError();
#endif
anetSetError(err, "creating socket: %s", strerror(errno)); anetSetError(err, "creating socket: %s", strerror(errno));
return ANET_ERR; return ANET_ERR;
} }
@ -157,52 +147,63 @@ static int anetCreateSocket(char *err, int domain) {
#define ANET_CONNECT_NONE 0 #define ANET_CONNECT_NONE 0
#define ANET_CONNECT_NONBLOCK 1 #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; int s;
struct sockaddr_in sa; struct addrinfo gai_hints;
struct addrinfo *gai_result, *p;
int gai_error;
if ((s = anetCreateSocket(err,AF_INET)) == ANET_ERR) gai_hints.ai_family = AF_UNSPEC;
return ANET_ERR; 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;
memset(&sa,0,sizeof(sa)); gai_error = getaddrinfo(addr, service, &gai_hints, &gai_result);
sa.sin_family = AF_INET; if (gai_error != 0) {
sa.sin_port = htons((uint16_t)port); anetSetError(err, "can't resolve %s: %s", addr, gai_strerror(gai_error));
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; return ANET_ERR;
} }
memcpy(&sa.sin_addr, he->h_addr, sizeof(struct in_addr));
} for (p = gai_result; p != NULL; p = p->ai_next) {
if ((s = anetCreateSocket(err, p->ai_family)) == ANET_ERR)
continue;
if (flags & ANET_CONNECT_NONBLOCK) { if (flags & ANET_CONNECT_NONBLOCK) {
if (anetNonBlock(err,s) != ANET_OK) if (anetNonBlock(err,s) != ANET_OK)
return ANET_ERR; return ANET_ERR;
} }
if (connect(s, (struct sockaddr*)&sa, sizeof(sa)) == -1) {
if (errno == EINPROGRESS && if (connect(s, p->ai_addr, p->ai_addrlen) >= 0) {
flags & ANET_CONNECT_NONBLOCK) freeaddrinfo(gai_result);
return s; return s;
}
if (errno == EINPROGRESS && (flags & ANET_CONNECT_NONBLOCK)) {
freeaddrinfo(gai_result);
return s;
}
anetSetError(err, "connect: %s", strerror(errno)); anetSetError(err, "connect: %s", strerror(errno));
close(s); close(s);
}
freeaddrinfo(gai_result);
return ANET_ERR; return ANET_ERR;
} }
return s;
int anetTcpConnect(char *err, char *addr, char *service)
{
return anetTcpGenericConnect(err,addr,service,ANET_CONNECT_NONE);
} }
int anetTcpConnect(char *err, char *addr, int port) int anetTcpNonBlockConnect(char *err, char *addr, char *service)
{ {
return anetTcpGenericConnect(err,addr,port,ANET_CONNECT_NONE); return anetTcpGenericConnect(err,addr,service,ANET_CONNECT_NONBLOCK);
}
int anetTcpNonBlockConnect(char *err, char *addr, int port)
{
return anetTcpGenericConnect(err,addr,port,ANET_CONNECT_NONBLOCK);
} }
/* Like read(2) but make sure 'count' is read before to return /* 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) { 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) { if (bind(s,sa,len) == -1) {
#ifdef _WIN32
errno = WSAGetLastError();
#endif
anetSetError(err, "bind: %s", strerror(errno)); anetSetError(err, "bind: %s", strerror(errno));
close(s); close(s);
return ANET_ERR; 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); * the kernel does: backlogsize = roundup_pow_of_two(backlogsize + 1);
* which will thus give us a backlog of 512 entries */ * which will thus give us a backlog of 512 entries */
if (listen(s, 511) == -1) { if (listen(s, 511) == -1) {
#ifdef _WIN32
errno = WSAGetLastError();
#endif
anetSetError(err, "listen: %s", strerror(errno)); anetSetError(err, "listen: %s", strerror(errno));
close(s); close(s);
return ANET_ERR; return ANET_ERR;
@ -259,40 +259,52 @@ static int anetListen(char *err, int s, struct sockaddr *sa, socklen_t len) {
return ANET_OK; 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; int s;
struct sockaddr_in sa; int i = 0;
struct addrinfo gai_hints;
struct addrinfo *gai_result, *p;
int gai_error;
if ((s = anetCreateSocket(err,AF_INET)) == ANET_ERR) gai_hints.ai_family = AF_UNSPEC;
return ANET_ERR; 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;
memset(&sa,0,sizeof(sa)); gai_error = getaddrinfo(bindaddr, service, &gai_hints, &gai_result);
sa.sin_family = AF_INET; if (gai_error != 0) {
sa.sin_port = htons((uint16_t)port); anetSetError(err, "can't resolve %s: %s", bindaddr, gai_strerror(gai_error));
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; return ANET_ERR;
} }
if (anetListen(err,s,(struct sockaddr*)&sa,sizeof(sa)) == ANET_ERR)
return ANET_ERR; for (p = gai_result; p != NULL && i < nfds; p = p->ai_next) {
return s; if ((s = anetCreateSocket(err, p->ai_family)) == ANET_ERR)
continue;
if (anetListen(err, s, p->ai_addr, p->ai_addrlen) == ANET_ERR) {
continue;
} }
static int anetGenericAccept(char *err, int s, struct sockaddr *sa, socklen_t *len) { fds[i++] = s;
}
freeaddrinfo(gai_result);
return (i > 0 ? i : ANET_ERR);
}
static int anetGenericAccept(char *err, int s, struct sockaddr *sa, socklen_t *len)
{
int fd; int fd;
while(1) { while(1) {
fd = accept(s,sa,len); fd = accept(s,sa,len);
if (fd == -1) { if (fd == -1) {
#ifndef _WIN32
if (errno == EINTR) { if (errno == EINTR) {
continue; continue;
#else
errno = WSAGetLastError();
if (errno == WSAEWOULDBLOCK) {
#endif
} else { } else {
anetSetError(err, "accept: %s", strerror(errno)); 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; return fd;
} }
int anetTcpAccept(char *err, int s, char *ip, int *port) { int anetTcpAccept(char *err, int s) {
int fd; int fd;
struct sockaddr_in sa; struct sockaddr_storage ss;
socklen_t salen = sizeof(sa); socklen_t sslen = sizeof(ss);
if ((fd = anetGenericAccept(err,s,(struct sockaddr*)&sa,&salen)) == ANET_ERR)
if ((fd = anetGenericAccept(err, s, (struct sockaddr*)&ss, &sslen)) == ANET_ERR)
return ANET_ERR; return ANET_ERR;
if (ip) strcpy(ip,inet_ntoa(sa.sin_addr));
if (port) *port = ntohs(sa.sin_port);
return fd; 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;
}

37
anet.h
View file

@ -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 <oliver@mutability.co.uk>
//
// 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 <http://www.gnu.org/licenses/>.
// This file incorporates work covered by the following copyright and
// permission notice:
//
/* anet.c -- Basic TCP socket stuff made a bit less boring /* anet.c -- Basic TCP socket stuff made a bit less boring
* *
* Copyright (c) 2006-2012, Salvatore Sanfilippo <antirez at gmail dot com> * Copyright (c) 2006-2012, Salvatore Sanfilippo <antirez at gmail dot com>
@ -39,21 +62,15 @@
#define AF_LOCAL AF_UNIX #define AF_LOCAL AF_UNIX
#endif #endif
int anetTcpConnect(char *err, char *addr, int port); int anetTcpConnect(char *err, char *addr, char *service);
int anetTcpNonBlockConnect(char *err, char *addr, int port); int anetTcpNonBlockConnect(char *err, char *addr, char *service);
int anetUnixConnect(char *err, char *path);
int anetUnixNonBlockConnect(char *err, char *path);
int anetRead(int fd, char *buf, int count); int anetRead(int fd, char *buf, int count);
int anetResolve(char *err, char *host, char *ipbuf); int anetTcpServer(char *err, char *service, char *bindaddr, int *fds, int nfds);
int anetTcpServer(char *err, int port, char *bindaddr); int anetTcpAccept(char *err, int serversock);
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 anetWrite(int fd, char *buf, int count); int anetWrite(int fd, char *buf, int count);
int anetNonBlock(char *err, int fd); int anetNonBlock(char *err, int fd);
int anetTcpNoDelay(char *err, int fd); int anetTcpNoDelay(char *err, int fd);
int anetTcpKeepAlive(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); int anetSetSendBuffer(char *err, int fd, int buffsize);
#endif #endif

63
net_io.c
View file

@ -154,7 +154,12 @@ struct client *createGenericClient(struct net_service *service, int fd)
// Return the new client or NULL if the connection failed // Return the new client or NULL if the connection failed
struct client *serviceConnect(struct net_service *service, char *addr, int port) 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) if (s == ANET_ERR)
return NULL; return NULL;
@ -168,6 +173,7 @@ void serviceListen(struct net_service *service, char *bind_addr, char *bind_port
int *fds = NULL; int *fds = NULL;
int n = 0; int n = 0;
char *p, *end; char *p, *end;
char buf[128];
if (service->listener_count > 0) { if (service->listener_count > 0) {
fprintf(stderr, "Tried to set up the service %s twice!\n", service->descr); 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; return;
p = bind_ports; p = bind_ports;
while (*p) { while (p && *p) {
int s; int newfds[16];
unsigned long port = strtoul(p, &end, 10); int nfds, i;
if (p == end) {
fprintf(stderr, end = strpbrk(p, ", ");
"Couldn't parse port list: %s\n" if (!end) {
" %*s^\n", strncpy(buf, p, sizeof(buf));
bind_ports, (int)(p - bind_ports), ""); p = NULL;
} else {
size_t len = end - p;
if (len > sizeof(buf))
len = sizeof(buf);
memcpy(buf, p, len);
p = end + 1;
}
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); exit(1);
} }
s = anetTcpServer(Modes.aneterr, port, bind_addr); fds = realloc(fds, (n+nfds) * sizeof(int));
if (s == ANET_ERR) {
fprintf(stderr, "Error opening the listening port %lu (%s): %s\n",
port, service->descr, Modes.aneterr);
exit(1);
}
anetNonBlock(Modes.aneterr, s);
fds = realloc(fds, (n+1) * sizeof(int));
if (!fds) { if (!fds) {
fprintf(stderr, "out of memory\n"); fprintf(stderr, "out of memory\n");
exit(1); exit(1);
} }
fds[n] = s; for (i = 0; i < nfds; ++i) {
++n; anetNonBlock(Modes.aneterr, newfds[i]);
fds[n++] = newfds[i];
p = end; }
if (*p == ',')
++p;
} }
service->listener_count = n; service->listener_count = n;
@ -259,13 +268,13 @@ void modesInitNet(void) {
// awakened by new data arriving. This usually happens a few times every second // awakened by new data arriving. This usually happens a few times every second
// //
static struct client * modesAcceptClients(void) { static struct client * modesAcceptClients(void) {
int fd, port; int fd;
struct net_service *s; struct net_service *s;
for (s = Modes.services; s; s = s->next) { for (s = Modes.services; s; s = s->next) {
int i; int i;
for (i = 0; i < s->listener_count; ++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); createSocketClient(s, fd);
} }
} }