+static int knownafp(int af)
+{
+ switch (af) {
+ case AF_INET: case AF_INET6: return (1);
+ default: return (0);
+ }
+}
+
+static int initsock(int fd, int af)
+{
+ int yes = 1;
+
+ switch (af) {
+ case AF_INET: break;
+ case AF_INET6:
+ if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &yes, sizeof(yes)))
+ return (-1);
+ break;
+ default: abort();
+ }
+ return (0);
+}
+
- a->sin.sin_family = AF_INET;
- a->sin.sin_addr.s_addr = INADDR_ANY;
- a->sin.sin_port = 0;
+ a->sa.sa_family = af;
+ switch (af) {
+ case AF_INET:
+ a->sin.sin_addr.s_addr = INADDR_ANY;
+ a->sin.sin_port = 0;
+ break;
+ case AF_INET6:
+ memset(a->sin6.sin6_addr.s6_addr, 0, 16);
+ a->sin6.sin6_port = 0;
+ a->sin6.sin6_flowinfo = 0;
+ a->sin6.sin6_scope_id = 0;
+ break;
+ default:
+ abort();
+ }
static void copyaddr(addr *a, const struct sockaddr *sa, unsigned f)
{
const struct sockaddr_in *sin;
static void copyaddr(addr *a, const struct sockaddr *sa, unsigned f)
{
const struct sockaddr_in *sin;
if ((fd = socket(a->sa.sa_family, SOCK_STREAM, IPPROTO_TCP)) < 0 ||
setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) ||
if ((fd = socket(a->sa.sa_family, SOCK_STREAM, IPPROTO_TCP)) < 0 ||
setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) ||
bind(fd, &a->sa, addrsz(a)) ||
listen(fd, 1) || nonblockify(fd) || cloexec(fd))
die(1, "couldn't set up listening socket: %s", strerror(errno));
bind(fd, &a->sa, addrsz(a)) ||
listen(fd, 1) || nonblockify(fd) || cloexec(fd))
die(1, "couldn't set up listening socket: %s", strerror(errno));
- if ((sep = strchr(alloc, ':')) == 0)
- die(1, "missing port number in address `%s'", host);
- host = alloc; *sep = 0; svc = sep + 1;
+ if (alloc[0] != '[') {
+ if ((sep = strchr(alloc, ':')) == 0)
+ die(1, "missing port number in address `%s'", host);
+ host = alloc; *sep = 0; svc = sep + 1;
+ } else {
+ if ((sep = strchr(alloc, ']')) == 0 || sep[1] != ':')
+ die(1, "bad syntax in address `%s:'", host);
+ host = alloc + 1; *sep = 0; svc = sep + 2;
+ }
}
err = getaddrinfo(host, svc, aihint, ai_out);
}
err = getaddrinfo(host, svc, aihint, ai_out);
-v, --version Display version number.\n\
-u, --usage Display pointless usage message.\n\
\n\
-v, --version Display version number.\n\
-u, --usage Display pointless usage message.\n\
\n\
-l, --listen=PORT Listen for connections to TCP PORT.\n\
-p, --peer=ADDR Only accept connections from IP ADDR.\n\
-b, --bind=ADDR Bind to ADDR before connecting.\n\
-l, --listen=PORT Listen for connections to TCP PORT.\n\
-p, --peer=ADDR Only accept connections from IP ADDR.\n\
-b, --bind=ADDR Bind to ADDR before connecting.\n\
addr bindaddr;
const char *connhost = 0;
struct addrinfo aihint = { 0 }, *ai, *ailist;
addr bindaddr;
const char *connhost = 0;
struct addrinfo aihint = { 0 }, *ai, *ailist;
{ "help", 0, 0, 'h' },
{ "version", 0, 0, 'v' },
{ "usage", 0, 0, 'u' },
{ "help", 0, 0, 'h' },
{ "version", 0, 0, 'v' },
{ "usage", 0, 0, 'u' },
{ "listen", OPTF_ARGREQ, 0, 'l' },
{ "peer", OPTF_ARGREQ, 0, 'p' },
{ "bind", OPTF_ARGREQ, 0, 'b' },
{ "listen", OPTF_ARGREQ, 0, 'l' },
{ "peer", OPTF_ARGREQ, 0, 'p' },
{ "bind", OPTF_ARGREQ, 0, 'b' },
- i = mdwopt(argc, argv, "hvul:p:b:c:", opt, 0, 0, 0);
+ i = mdwopt(argc, argv, "hvu46l:p:b:c:", opt, 0, 0, 0);
if (i < 0)
break;
switch (i) {
case 'h': help(stdout); exit(0);
case 'v': version(stdout); exit(0);
case 'u': usage(stdout); exit(0);
if (i < 0)
break;
switch (i) {
case 'h': help(stdout); exit(0);
case 'v': version(stdout); exit(0);
case 'u': usage(stdout); exit(0);
case 'l': bindsvc = optarg; break;
case 'p': DA_PUSH(&peerhosts, optarg); break;
case 'b': DA_PUSH(&bindhosts, optarg); break;
case 'l': bindsvc = optarg; break;
case 'p': DA_PUSH(&peerhosts, optarg); break;
case 'b': DA_PUSH(&bindhosts, optarg); break;
- parseaddr(&aihint, DA(&bindhosts)[0], 0, 0, &ailist); ai = ailist;
- initaddr(&bindaddr);
+ parseaddr(&aihint, DA(&bindhosts)[0], 0, 0, &ailist);
+ for (ai = ailist; ai && !knownafp(ai->ai_family); ai = ai->ai_next);
+ if (!ai)
+ die(1, "no usable addresses returned for `%s'", DA(&bindhosts)[0]);
+ initaddr(&bindaddr, ai->ai_family);
freeaddrinfo(ailist);
} else for (i = 0; i < n; i++) {
parseaddr(&aihint, DA(&bindhosts)[i], bindsvc, 0, &ailist);
freeaddrinfo(ailist);
} else for (i = 0; i < n; i++) {
parseaddr(&aihint, DA(&bindhosts)[i], bindsvc, 0, &ailist);
for (ai = ailist; ai; ai = ai->ai_next) {
if ((fd = socket(ai->ai_family, SOCK_STREAM, IPPROTO_TCP)) >= 0 &&
for (ai = ailist; ai; ai = ai->ai_next) {
if ((fd = socket(ai->ai_family, SOCK_STREAM, IPPROTO_TCP)) >= 0 &&
(!DA_LEN(&bindhosts) ||
!bind(fd, &bindaddr.sa, addrsz(&bindaddr))) &&
!connect(fd, ai->ai_addr, ai->ai_addrlen))
(!DA_LEN(&bindhosts) ||
!bind(fd, &bindaddr.sa, addrsz(&bindaddr))) &&
!connect(fd, ai->ai_addr, ai->ai_addrlen))
aihint.ai_socktype = SOCK_DGRAM;
aihint.ai_protocol = IPPROTO_UDP;
aihint.ai_flags = AI_ADDRCONFIG | AI_PASSIVE;
aihint.ai_socktype = SOCK_DGRAM;
aihint.ai_protocol = IPPROTO_UDP;
aihint.ai_flags = AI_ADDRCONFIG | AI_PASSIVE;
- parseaddr(&aihint, argv[optind], 0, paf_parse, &ailist); ai = ailist;
+ parseaddr(&aihint, argv[optind], 0, paf_parse, &ailist);
+ for (ai = ailist; ai && !knownafp(ai->ai_family); ai = ai->ai_next);
+ if (!ai) die(1, "no usable addresses returned for `%s'", argv[optind]);
nonblockify(fd_udp) || cloexec(fd_udp) ||
setsockopt(fd_udp, SOL_SOCKET, SO_RCVBUF, &len, sizeof(len)) ||
setsockopt(fd_udp, SOL_SOCKET, SO_SNDBUF, &len, sizeof(len)) ||
bind(fd_udp, ai->ai_addr, ai->ai_addrlen))
die(1, "couldn't set up UDP socket: %s", strerror(errno));
freeaddrinfo(ailist);
nonblockify(fd_udp) || cloexec(fd_udp) ||
setsockopt(fd_udp, SOL_SOCKET, SO_RCVBUF, &len, sizeof(len)) ||
setsockopt(fd_udp, SOL_SOCKET, SO_SNDBUF, &len, sizeof(len)) ||
bind(fd_udp, ai->ai_addr, ai->ai_addrlen))
die(1, "couldn't set up UDP socket: %s", strerror(errno));
freeaddrinfo(ailist);
aihint.ai_flags = AI_ADDRCONFIG;
parseaddr(&aihint, argv[optind + 1], 0, paf_parse, &ailist);
for (ai = ailist; ai; ai = ai->ai_next)
aihint.ai_flags = AI_ADDRCONFIG;
parseaddr(&aihint, argv[optind + 1], 0, paf_parse, &ailist);
for (ai = ailist; ai; ai = ai->ai_next)