From: Mark Wooding <mdw@distorted.org.uk>
Date: Wed, 27 Sep 2017 22:56:07 +0000 (+0100)
Subject: pkstream/pkstream.c: Fetch protocol family codes from addresses.
X-Git-Tag: 1.5.0~41^2~50
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/commitdiff_plain/b31421b948a5510d4529ff6e6d2579135c517634

pkstream/pkstream.c: Fetch protocol family codes from addresses.

Now the only mentions of `AF_INET' are in the address-handling
functions.
---

diff --git a/pkstream/pkstream.c b/pkstream/pkstream.c
index fa924402..c0deff73 100644
--- a/pkstream/pkstream.c
+++ b/pkstream/pkstream.c
@@ -285,7 +285,7 @@ static void dolisten(void)
   int fd;
   int opt = 1;
 
-  if ((fd = socket(PF_INET, SOCK_STREAM, 0)) < 0 ||
+  if ((fd = socket(cw.me.sa.sa_family, SOCK_STREAM, 0)) < 0 ||
       setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) ||
       bind(fd, &cw.me.sa, addrsz(&cw.me)) ||
       listen(fd, 1) || nonblockify(fd) || cloexec(fd))
@@ -427,7 +427,7 @@ int main(int argc, char *argv[])
   if (connhost) {
     initaddr(&tmpaddr);
     parseaddr(connhost, 0, paf_parse, &tmpaddr);
-    if ((fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0 ||
+    if ((fd = socket(tmpaddr.sa.sa_family, SOCK_STREAM, IPPROTO_TCP)) < 0 ||
 	(bindhost &&
 	 bind(fd, &bindaddr.sa, addrsz(&bindaddr))) ||
 	connect(fd, &tmpaddr.sa, addrsz(&tmpaddr)))
@@ -438,7 +438,7 @@ int main(int argc, char *argv[])
 
   initaddr(&tmpaddr);
   parseaddr(argv[optind], 0, paf_parse, &tmpaddr);
-  if ((fd_udp = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0 ||
+  if ((fd_udp = socket(tmpaddr.sa.sa_family, SOCK_DGRAM, IPPROTO_UDP)) < 0 ||
       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)) ||