[src/trunk]: src/usr.bin/ftp allow IPv6 extended numeric address in host part.

[itojun <itojun%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3776aa0a4ac2
branches:  trunk
changeset: 485287:3776aa0a4ac2
user:      itojun <itojun%NetBSD.org@localhost>
date:      Mon Apr 24 05:59:39 2000 +0000

description:
allow IPv6 extended numeric address in host part.
(draft-ietf-ipngwg-scopedaddr-format-01.txt)
fixes PR 9616.

diffstat:

 usr.bin/ftp/util.c |  20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 deletions(-)

diffs (49 lines):

diff -r efb0c38695eb -r 3776aa0a4ac2 usr.bin/ftp/util.c
--- a/usr.bin/ftp/util.c        Mon Apr 24 05:38:51 2000 +0000
+++ b/usr.bin/ftp/util.c        Mon Apr 24 05:59:39 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: util.c,v 1.92 2000/04/13 08:13:31 lukem Exp $  */
+/*     $NetBSD: util.c,v 1.93 2000/04/24 05:59:39 itojun Exp $ */
 
 /*-
  * Copyright (c) 1997-1999 The NetBSD Foundation, Inc.
@@ -75,7 +75,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: util.c,v 1.92 2000/04/13 08:13:31 lukem Exp $");
+__RCSID("$NetBSD: util.c,v 1.93 2000/04/24 05:59:39 itojun Exp $");
 #endif /* not lint */
 
 /*
@@ -103,6 +103,9 @@
 #include <time.h>
 #include <tzfile.h>
 #include <unistd.h>
+#ifdef INET6
+#include <netdb.h>
+#endif
 
 #include "ftp_var.h"
 
@@ -1413,9 +1416,18 @@
 {
        int rv = 0;
 #ifdef INET6
-       struct sockaddr_in6 su_sin6;
+       struct addrinfo hints, *res;
 
-       rv = inet_pton(AF_INET6, addr, &su_sin6.sin6_addr);
+       memset(&hints, 0, sizeof(hints));
+       hints.ai_family = PF_INET6;
+       hints.ai_socktype = SOCK_DGRAM; /*dummy*/
+       hints.ai_flags = AI_NUMERICHOST;
+       if (getaddrinfo(addr, "0", &hints, &res) != 0)
+               rv = 0;
+       else {
+               rv = 1;
+               freeaddrinfo(res);
+       }
        if (debug)
                fprintf(ttyout, "isipv6addr: got %d for %s\n", rv, addr);
 #endif