X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=regress%2Fhplayback.c;fp=regress%2Fhplayback.c;h=c14426c5588f8c6d36abf1fb53621f5b776d73d5;hb=84ada014b1bf2cf7e5a38320be7371dbbf91bb23;hp=d229f34f6f9680cf5d419fbb49f550ffdb5114d9;hpb=51cb3de39ef4e85d2efa7d167dc531d04500a525;p=adns.git

diff --git a/regress/hplayback.c b/regress/hplayback.c
index d229f34..c14426c 100644
--- a/regress/hplayback.c
+++ b/regress/hplayback.c
@@ -7,6 +7,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/time.h>
+#include <netdb.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include "harness.h"
@@ -153,21 +154,34 @@ static void Ppollfds(struct pollfd *fds, int nfds) {
 }
 #endif
 static void Paddr(struct sockaddr *addr, int *lenr) {
-  struct sockaddr_in *sa= (struct sockaddr_in*)addr;
-  char *p, *ep;
-  long ul;
-  assert(*lenr >= sizeof(*sa));
-  p= strchr(vb2.buf+vb2.used,':');
-  if (!p) Psyntax("no port on address");
-  *p++= 0;
-  memset(sa,0,sizeof(*sa));
-  sa->sin_family= AF_INET;
-  if (!inet_aton(vb2.buf+vb2.used,&sa->sin_addr)) Psyntax("invalid address");
-  ul= strtoul(p,&ep,10);
-  if (*ep && *ep != ' ') Psyntax("invalid port (bad syntax)");
-  if (ul >= 65536) Psyntax("port too large");
-  sa->sin_port= htons(ul);
-  *lenr= sizeof(*sa);
+  struct addrinfo *ai, hint = { 0 };
+  char *p, *q, *ep;
+  int err;
+  p= vb2.buf+vb2.used;
+  if (*p!='[') {
+    q= strchr(p,':');
+    if (!q) Psyntax("missing :");
+    *q++= 0;
+  } else {
+    p++;
+    q= strchr(p,']');
+    if (!q) Psyntax("missing ]");
+    *q++= 0;
+    if (*q!=':') Psyntax("expected : after ]");
+    q++;
+  }
+  for (ep=q; ctype_digit(*ep); ep++);
+  if (ep==q || (*ep && *ep!=' ')) Psyntax("invalid port number");
+  *ep= 0;
+  hint.ai_socktype= SOCK_DGRAM;
+  hint.ai_family= AF_UNSPEC;
+  hint.ai_flags= AI_NUMERICHOST | AI_NUMERICSERV;
+  err= getaddrinfo(p, q, &hint, &ai);
+  if (err) Psyntax("invalid address");
+  assert(*lenr >= ai->ai_addrlen);
+  memcpy(addr, ai->ai_addr, ai->ai_addrlen);
+  *lenr= ai->ai_addrlen;
+  freeaddrinfo(ai);
   vb2.used= ep - (char*)vb2.buf;
 }
 static int Pbytes(byte *buf, int maxlen) {