X-Git-Url: https://git.distorted.org.uk/~mdw/tripe/blobdiff_plain/5c8525cb2bbe784c14014e72ad7a63d6afecea1c..24898e7eadbac98ac25abbecdb813ceacabefa76:/pkstream/pkstream.c diff --git a/pkstream/pkstream.c b/pkstream/pkstream.c index 3a5f3fde..8b2a058c 100644 --- a/pkstream/pkstream.c +++ b/pkstream/pkstream.c @@ -61,6 +61,7 @@ typedef union addr { struct sockaddr sa; struct sockaddr_in sin; + struct sockaddr_in6 sin6; } addr; DA_DECL(addr_v, addr); @@ -107,10 +108,34 @@ static socklen_t addrsz(const addr *a) { switch (a->sa.sa_family) { case AF_INET: return sizeof(a->sin); + case AF_INET6: return sizeof(a->sin6); default: abort(); } } +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); +} + static const char *addrstr(const addr *a) { static char buf[128]; @@ -127,16 +152,61 @@ static int addreq(const addr *a, const addr *b) switch (a->sa.sa_family) { case AF_INET: return (a->sin.sin_addr.s_addr == b->sin.sin_addr.s_addr); + case AF_INET6: + return (!memcmp(a->sin6.sin6_addr.s6_addr, + b->sin6.sin6_addr.s6_addr, + 16) && + a->sin6.sin6_scope_id == b->sin6.sin6_scope_id); + default: + abort(); + } +} + +static void initaddr(addr *a, int af) +{ + 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 initaddr(addr *a) +#define caf_addr 1u +#define caf_port 2u +static void copyaddr(addr *a, const struct sockaddr *sa, unsigned f) { - a->sin.sin_family = AF_INET; - a->sin.sin_addr.s_addr = INADDR_ANY; - a->sin.sin_port = 0; + const struct sockaddr_in *sin; + const struct sockaddr_in6 *sin6; + + a->sa.sa_family = sa->sa_family; + switch (sa->sa_family) { + case AF_INET: + sin = (const struct sockaddr_in *)sa; + if (f&caf_addr) a->sin.sin_addr = sin->sin_addr; + if (f&caf_port) a->sin.sin_port = sin->sin_port; + break; + case AF_INET6: + sin6 = (const struct sockaddr_in6 *)sa; + if (f&caf_addr) { + a->sin6.sin6_addr = sin6->sin6_addr; + a->sin6.sin6_scope_id = sin6->sin6_scope_id; + } + if (f&caf_port) a->sin6.sin6_port = sin6->sin6_port; + /* ??? flowinfo? */ + break; + default: + abort(); + } } static void dolisten(void); @@ -294,6 +364,7 @@ static void dolisten1(const addr *a, sel_file *sf) if ((fd = socket(a->sa.sa_family, SOCK_STREAM, IPPROTO_TCP)) < 0 || setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) || + initsock(fd, a->sa.sa_family) || bind(fd, &a->sa, addrsz(a)) || listen(fd, 1) || nonblockify(fd) || cloexec(fd)) die(1, "couldn't set up listening socket: %s", strerror(errno)); @@ -310,41 +381,52 @@ static void dolisten(void) dolisten1(&DA(&cw.me)[i], &cw.sfv[i]); } -static void pushaddr(addr_v *av, const addr *a) +static void pushaddrs(addr_v *av, const struct addrinfo *ailist) { - DA_ENSURE(av, 1); - DA(av)[DA_LEN(av)] = *a; - DA_EXTEND(av, 1); + const struct addrinfo *ai; + size_t i, n; + + for (ai = ailist, n = 0; ai; ai = ai->ai_next) + if (knownafp(ai->ai_family)) n++; + DA_ENSURE(av, n); + for (i = DA_LEN(av), ai = ailist; ai; ai = ai->ai_next) { + if (!knownafp(ai->ai_family)) continue; + initaddr(&DA(av)[i], ai->ai_family); + copyaddr(&DA(av)[i++], ai->ai_addr, caf_addr | caf_port); + } + DA_EXTEND(av, n); } #define paf_parse 1u -static void parseaddr(const char *host, const char *svc, unsigned f, addr *a) +static void parseaddr(const struct addrinfo *aihint, + const char *host, const char *svc, unsigned f, + struct addrinfo **ai_out) { char *alloc = 0, *sep; - struct hostent *h; - struct servent *s; - char *qq; - unsigned long n; + int err; if (f&paf_parse) { alloc = xstrdup(host); - if ((sep = strchr(alloc, ':')) == 0) - die(1, "missing port number in address `%s'", host); - host = alloc; *sep = 0; svc = sep + 1; - } - - if (host) { - if ((h = gethostbyname(host)) == 0) die(1, "unknown host `%s'", host); - memcpy(&a->sin.sin_addr, h->h_addr, sizeof(a->sin.sin_addr)); + 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; + } } - if (svc) { - if ((n = strtoul(svc, &qq, 0)) > 0 && !*qq && n <= 0xffff) - a->sin.sin_port = htons(n); - else if ((s = getservbyname(svc, "tcp")) != 0) - a->sin.sin_port = s->s_port; + err = getaddrinfo(host, svc, aihint, ai_out); + if (err) { + if (host && svc) { + die(1, "failed to resolve hostname `%s', service `%s': %s", + host, svc, gai_strerror(err)); + } else if (host) + die(1, "failed to resolve hostname `%s': %s", host, gai_strerror(err)); else - die(1, "bad service name/number `%s'", svc); + die(1, "failed to resolve service `%s': %s", svc, gai_strerror(err)); } xfree(alloc); @@ -353,7 +435,7 @@ static void parseaddr(const char *host, const char *svc, unsigned f, addr *a) static void usage(FILE *fp) { pquis(fp, - "Usage: $ [-l PORT] [-b ADDR] [-p ADDR] [-c ADDR:PORT]\n\ + "Usage: $ [-46] [-l PORT] [-b ADDR] [-p ADDR] [-c ADDR:PORT]\n\ ADDR:PORT ADDR:PORT\n"); } @@ -372,6 +454,8 @@ Options:\n\ -v, --version Display version number.\n\ -u, --usage Display pointless usage message.\n\ \n\ +-4, --ipv4 Restrict to IPv4 only.\n\ +-6, --ipv6 Restrict to IPv6 only.\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\ @@ -389,7 +473,8 @@ int main(int argc, char *argv[]) const char *bindsvc = 0; addr bindaddr; const char *connhost = 0; - addr tmpaddr; + struct addrinfo aihint = { 0 }, *ai, *ailist; + int af = AF_UNSPEC; int fd = -1; int len = 65536; size_t i, n; @@ -405,6 +490,8 @@ int main(int argc, char *argv[]) { "help", 0, 0, 'h' }, { "version", 0, 0, 'v' }, { "usage", 0, 0, 'u' }, + { "ipv4", 0, 0, '4' }, + { "ipv6", 0, 0, '6' }, { "listen", OPTF_ARGREQ, 0, 'l' }, { "peer", OPTF_ARGREQ, 0, 'p' }, { "bind", OPTF_ARGREQ, 0, 'b' }, @@ -413,13 +500,15 @@ int main(int argc, char *argv[]) }; int i; - 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); + case '4': af = AF_INET; break; + case '6': af = AF_INET6; break; case 'l': bindsvc = optarg; break; case 'p': DA_PUSH(&peerhosts, optarg); break; case 'b': DA_PUSH(&bindhosts, optarg); break; @@ -436,22 +525,32 @@ int main(int argc, char *argv[]) if (bindsvc && connhost) die(1, "can't listen and connect"); + aihint.ai_family = af; DA_CREATE(&cw.me); DA_CREATE(&cw.peer); n = DA_LEN(&bindhosts); if (n || bindsvc) { + aihint.ai_socktype = SOCK_STREAM; + aihint.ai_protocol = IPPROTO_TCP; + aihint.ai_flags = AI_ADDRCONFIG | AI_PASSIVE; if (!n) { - initaddr(&tmpaddr); - parseaddr(0, bindsvc, 0, &tmpaddr); - pushaddr(&cw.me, &tmpaddr); + parseaddr(&aihint, 0, bindsvc, 0, &ailist); + pushaddrs(&cw.me, ailist); + freeaddrinfo(ailist); } else if (!bindsvc) { if (n != 1) die(1, "can only bind to one address as client"); - initaddr(&bindaddr); - parseaddr(DA(&bindhosts)[0], 0, 0, &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); + copyaddr(&bindaddr, ai->ai_addr, caf_addr); + aihint.ai_family = ai->ai_family; + freeaddrinfo(ailist); } else for (i = 0; i < n; i++) { - initaddr(&tmpaddr); - parseaddr(DA(&bindhosts)[i], bindsvc, 0, &tmpaddr); - pushaddr(&cw.me, &tmpaddr); + parseaddr(&aihint, DA(&bindhosts)[i], bindsvc, 0, &ailist); + pushaddrs(&cw.me, ailist); + freeaddrinfo(ailist); } if (bindsvc) { cw.f |= cwf_port; @@ -462,37 +561,60 @@ int main(int argc, char *argv[]) n = DA_LEN(&peerhosts); if (n) { + aihint.ai_socktype = SOCK_STREAM; + aihint.ai_protocol = IPPROTO_TCP; + aihint.ai_flags = AI_ADDRCONFIG; for (i = 0; i < n; i++) { - initaddr(&tmpaddr); - parseaddr(DA(&peerhosts)[0], 0, 0, &tmpaddr); - pushaddr(&cw.peer, &tmpaddr); + parseaddr(&aihint, DA(&peerhosts)[i], 0, 0, &ailist); + pushaddrs(&cw.peer, ailist); + freeaddrinfo(ailist); } + if (!DA_LEN(&cw.peer)) die(1, "no usable peer addresses"); } if (connhost) { - initaddr(&tmpaddr); - parseaddr(connhost, 0, paf_parse, &tmpaddr); - if ((fd = socket(tmpaddr.sa.sa_family, SOCK_STREAM, IPPROTO_TCP)) < 0 || - (DA_LEN(&bindhosts) && - bind(fd, &bindaddr.sa, addrsz(&bindaddr))) || - connect(fd, &tmpaddr.sa, addrsz(&tmpaddr))) - die(1, "couldn't connect to TCP server: %s", strerror(errno)); + aihint.ai_socktype = SOCK_STREAM; + aihint.ai_protocol = IPPROTO_TCP; + aihint.ai_flags = AI_ADDRCONFIG; + parseaddr(&aihint, connhost, 0, paf_parse, &ailist); + + for (ai = ailist; ai; ai = ai->ai_next) { + if ((fd = socket(ai->ai_family, SOCK_STREAM, IPPROTO_TCP)) >= 0 && + !initsock(fd, ai->ai_family) && + (!DA_LEN(&bindhosts) || + !bind(fd, &bindaddr.sa, addrsz(&bindaddr))) && + !connect(fd, ai->ai_addr, ai->ai_addrlen)) + goto conn_tcp; + if (fd >= 0) close(fd); + } + die(1, "couldn't connect to TCP server: %s", strerror(errno)); + conn_tcp: if (nonblockify(fd) || cloexec(fd)) die(1, "couldn't connect to TCP server: %s", strerror(errno)); } - initaddr(&tmpaddr); - parseaddr(argv[optind], 0, paf_parse, &tmpaddr); - if ((fd_udp = socket(tmpaddr.sa.sa_family, SOCK_DGRAM, IPPROTO_UDP)) < 0 || + aihint.ai_family = af; + 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); + for (ai = ailist; ai && !knownafp(ai->ai_family); ai = ai->ai_next); + if (!ai) die(1, "no usable addresses returned for `%s'", argv[optind]); + if ((fd_udp = socket(ai->ai_family, SOCK_DGRAM, IPPROTO_UDP)) < 0 || + initsock(fd_udp, ai->ai_family) || 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, &tmpaddr.sa, addrsz(&tmpaddr))) - die(1, "couldn't set up UDP socket: %s", strerror(errno)); - initaddr(&tmpaddr); - parseaddr(argv[optind + 1], 0, paf_parse, &tmpaddr); - if (connect(fd_udp, &tmpaddr.sa, addrsz(&tmpaddr))) + bind(fd_udp, ai->ai_addr, ai->ai_addrlen)) die(1, "couldn't set up UDP socket: %s", strerror(errno)); + freeaddrinfo(ailist); + aihint.ai_family = ai->ai_family; + aihint.ai_flags = AI_ADDRCONFIG; + parseaddr(&aihint, argv[optind + 1], 0, paf_parse, &ailist); + for (ai = ailist; ai; ai = ai->ai_next) + if (!connect(fd_udp, ai->ai_addr, ai->ai_addrlen)) goto conn_udp; + die(1, "couldn't set up UDP socket: %s", strerror(errno)); +conn_udp: if (bindsvc) dolisten(); else if (connhost) dofwd(fd, fd);