From: Mark Wooding <mdw@distorted.org.uk>
Date: Thu, 12 Oct 2017 01:39:26 +0000 (+0100)
Subject: contrib/greet.in: Accept IPv6 addresses.
X-Git-Tag: 1.5.0~41^2
X-Git-Url: https://git.distorted.org.uk/~mdw/tripe/commitdiff_plain/80a1137431b5f1e52b1edd192a498669325d6ec2

contrib/greet.in: Accept IPv6 addresses.
---

diff --git a/contrib/greet.in b/contrib/greet.in
index c84efdcb..7bc678aa 100644
--- a/contrib/greet.in
+++ b/contrib/greet.in
@@ -9,9 +9,12 @@ from sys import argv
 def db64(s):
   return (s + '='*((-len(s))%4)).decode('base64')
 
-addr, chal = (lambda _, h, p, c: ((h, int(p)), db64(c)))(*argv)
-sk = S.socket(S.AF_INET, S.SOCK_DGRAM)
-sk.connect(addr)
+ai, chal = (lambda _, h, p, c:
+            (S.getaddrinfo(h, p, S.AF_UNSPEC, S.SOCK_DGRAM, S.IPPROTO_UDP,
+                             S.AI_NUMERICHOST | S.AI_NUMERICSERV)[0],
+             db64(c)))(*argv)
+sk = S.socket(ai[0], S.SOCK_DGRAM)
+sk.connect(ai[4])
 
 pkt = '\x25' + chal
 sk.send(pkt)