[src/trunk]: src NI_WITHSCOPEID was not picked up by IETF standardization pro...

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

details:   https://anonhg.NetBSD.org/src/rev/87bd9df6b0bc
branches:  trunk
changeset: 571296:87bd9df6b0bc
user:      itojun <itojun%NetBSD.org@localhost>
date:      Tue Nov 16 06:04:12 2004 +0000

description:
NI_WITHSCOPEID was not picked up by IETF standardization process

diffstat:

 lib/libc/net/rcmd.c              |  22 ++--------------------
 lib/libform/type_ipv6.c          |   8 ++------
 lib/libipsec/ipsec_dump_policy.c |   8 ++------
 libexec/rlogind/rlogind.c        |   8 ++------
 libexec/rshd/rshd.c              |   8 ++------
 usr.bin/netstat/route.c          |   8 ++------
 6 files changed, 12 insertions(+), 50 deletions(-)

diffs (224 lines):

diff -r e361b929890e -r 87bd9df6b0bc lib/libc/net/rcmd.c
--- a/lib/libc/net/rcmd.c       Tue Nov 16 06:00:51 2004 +0000
+++ b/lib/libc/net/rcmd.c       Tue Nov 16 06:04:12 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rcmd.c,v 1.56 2004/03/21 05:46:42 mrg Exp $    */
+/*     $NetBSD: rcmd.c,v 1.57 2004/11/16 06:04:12 itojun Exp $ */
 
 /*
  * Copyright (c) 1983, 1993, 1994
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)rcmd.c     8.3 (Berkeley) 3/26/94";
 #else
-__RCSID("$NetBSD: rcmd.c,v 1.56 2004/03/21 05:46:42 mrg Exp $");
+__RCSID("$NetBSD: rcmd.c,v 1.57 2004/11/16 06:04:12 itojun Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -260,11 +260,7 @@
                if (r->ai_next) {
                        int oerrno = errno;
                        char hbuf[NI_MAXHOST];
-#ifdef NI_WITHSCOPEID
-                       const int niflags = NI_NUMERICHOST | NI_WITHSCOPEID;
-#else
                        const int niflags = NI_NUMERICHOST;
-#endif
 
                        hbuf[0] = '\0';
                        if (getnameinfo(r->ai_addr, r->ai_addrlen,
@@ -916,9 +912,6 @@
 
 /*
  * Returns "true" if match, 0 if no match.
- *
- * NI_WITHSCOPEID is useful for comparing sin6_scope_id portion
- * if af == AF_INET6.
  */
 static int
 __icheckhost(raddr, salen, lhost)
@@ -929,11 +922,7 @@
        struct addrinfo hints, *res, *r;
        char h1[NI_MAXHOST], h2[NI_MAXHOST];
        int error;
-#ifdef NI_WITHSCOPEID
-       const int niflags = NI_NUMERICHOST | NI_WITHSCOPEID;
-#else
        const int niflags = NI_NUMERICHOST;
-#endif
 
        _DIAGASSERT(raddr != NULL);
        _DIAGASSERT(lhost != NULL);
@@ -975,9 +964,6 @@
  * Return the hostname associated with the supplied address.
  * Do a reverse lookup as well for security. If a loop cannot
  * be found, pack the numeric IP address into the string.
- *
- * NI_WITHSCOPEID is useful for comparing sin6_scope_id portion
- * if af == AF_INET6.
  */
 static char *
 __gethostloop(raddr, salen)
@@ -988,11 +974,7 @@
        char h1[NI_MAXHOST], h2[NI_MAXHOST];
        struct addrinfo hints, *res, *r;
        int error;
-#ifdef NI_WITHSCOPEID
-       const int niflags = NI_NUMERICHOST | NI_WITHSCOPEID;
-#else
        const int niflags = NI_NUMERICHOST;
-#endif
 
        _DIAGASSERT(raddr != NULL);
 
diff -r e361b929890e -r 87bd9df6b0bc lib/libform/type_ipv6.c
--- a/lib/libform/type_ipv6.c   Tue Nov 16 06:00:51 2004 +0000
+++ b/lib/libform/type_ipv6.c   Tue Nov 16 06:04:12 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: type_ipv6.c,v 1.8 2003/07/26 19:24:57 salo Exp $       */
+/*     $NetBSD: type_ipv6.c,v 1.9 2004/11/16 06:04:13 itojun Exp $     */
 
 /*-
  * Copyright (c) 1998-1999 Brett Lymn
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: type_ipv6.c,v 1.8 2003/07/26 19:24:57 salo Exp $");
+__RCSID("$NetBSD: type_ipv6.c,v 1.9 2004/11/16 06:04:13 itojun Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -55,11 +55,7 @@
 {
        char cleaned[NI_MAXHOST];
        struct addrinfo hints, *res;
-#ifdef NI_WITHSCOPEID  /* KAME extension */
-       const int niflags = NI_NUMERICHOST | NI_WITHSCOPEID;
-#else
        const int niflags = NI_NUMERICHOST;
-#endif
 
        if (args == NULL)
                return FALSE;
diff -r e361b929890e -r 87bd9df6b0bc lib/libipsec/ipsec_dump_policy.c
--- a/lib/libipsec/ipsec_dump_policy.c  Tue Nov 16 06:00:51 2004 +0000
+++ b/lib/libipsec/ipsec_dump_policy.c  Tue Nov 16 06:04:12 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ipsec_dump_policy.c,v 1.5 2003/03/09 01:03:54 lukem Exp $      */
+/*     $NetBSD: ipsec_dump_policy.c,v 1.6 2004/11/16 06:04:13 itojun Exp $     */
 /*     $KAME: ipsec_dump_policy.c,v 1.12 2001/11/13 12:38:47 jinmei Exp $      */
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: ipsec_dump_policy.c,v 1.5 2003/03/09 01:03:54 lukem Exp $");
+__RCSID("$NetBSD: ipsec_dump_policy.c,v 1.6 2004/11/16 06:04:13 itojun Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -295,11 +295,7 @@
        size_t len;
        struct sockaddr *sa;
 {
-#ifdef NI_WITHSCOPEID
-       const int niflags = NI_NUMERICHOST | NI_WITHSCOPEID;
-#else
        const int niflags = NI_NUMERICHOST;
-#endif
 
        if (len < 1)
                return NULL;
diff -r e361b929890e -r 87bd9df6b0bc libexec/rlogind/rlogind.c
--- a/libexec/rlogind/rlogind.c Tue Nov 16 06:00:51 2004 +0000
+++ b/libexec/rlogind/rlogind.c Tue Nov 16 06:04:12 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rlogind.c,v 1.35 2004/11/15 21:01:18 christos Exp $    */
+/*     $NetBSD: rlogind.c,v 1.36 2004/11/16 06:04:13 itojun Exp $      */
 
 /*
  * Copyright (C) 1998 WIDE Project.
@@ -69,7 +69,7 @@
 #if 0
 static char sccsid[] = "@(#)rlogind.c  8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: rlogind.c,v 1.35 2004/11/15 21:01:18 christos Exp $");
+__RCSID("$NetBSD: rlogind.c,v 1.36 2004/11/16 06:04:13 itojun Exp $");
 #endif
 #endif /* not lint */
 
@@ -258,11 +258,7 @@
        int gaierror;
        socklen_t fromlen = fromp->ss_len > sizeof(*fromp)
            ? sizeof(*fromp) : fromp->ss_len;
-#ifdef NI_WITHSCOPEID
-       const int niflags = NI_NUMERICHOST | NI_NUMERICSERV | NI_WITHSCOPEID;
-#else
        const int niflags = NI_NUMERICHOST | NI_NUMERICSERV;
-#endif
 
        alarm(60);
        read(f, &c, 1);
diff -r e361b929890e -r 87bd9df6b0bc libexec/rshd/rshd.c
--- a/libexec/rshd/rshd.c       Tue Nov 16 06:00:51 2004 +0000
+++ b/libexec/rshd/rshd.c       Tue Nov 16 06:04:12 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rshd.c,v 1.32 2003/08/07 09:46:49 agc Exp $    */
+/*     $NetBSD: rshd.c,v 1.33 2004/11/16 06:04:13 itojun Exp $ */
 
 /*
  * Copyright (C) 1998 WIDE Project.
@@ -69,7 +69,7 @@
 #if 0
 static char sccsid[] = "@(#)rshd.c     8.2 (Berkeley) 4/6/94";
 #else
-__RCSID("$NetBSD: rshd.c,v 1.32 2003/08/07 09:46:49 agc Exp $");
+__RCSID("$NetBSD: rshd.c,v 1.33 2004/11/16 06:04:13 itojun Exp $");
 #endif
 #endif /* not lint */
 
@@ -245,11 +245,7 @@
        u_int16_t *portp;
        struct addrinfo hints, *res, *res0;
        int gaierror;
-#ifdef NI_WITHSCOPEID
-       const int niflags = NI_NUMERICHOST | NI_NUMERICSERV | NI_WITHSCOPEID;
-#else
        const int niflags = NI_NUMERICHOST | NI_NUMERICSERV;
-#endif
 
        (void) signal(SIGINT, SIG_DFL);
        (void) signal(SIGQUIT, SIG_DFL);
diff -r e361b929890e -r 87bd9df6b0bc usr.bin/netstat/route.c
--- a/usr.bin/netstat/route.c   Tue Nov 16 06:00:51 2004 +0000
+++ b/usr.bin/netstat/route.c   Tue Nov 16 06:04:12 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: route.c,v 1.64 2004/11/16 05:59:32 itojun Exp $        */
+/*     $NetBSD: route.c,v 1.65 2004/11/16 06:04:13 itojun Exp $        */
 
 /*
  * Copyright (c) 1983, 1988, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "from: @(#)route.c      8.3 (Berkeley) 3/9/94";
 #else
-__RCSID("$NetBSD: route.c,v 1.64 2004/11/16 05:59:32 itojun Exp $");
+__RCSID("$NetBSD: route.c,v 1.65 2004/11/16 06:04:13 itojun Exp $");
 #endif
 #endif /* not lint */
 
@@ -886,11 +886,7 @@
        struct sockaddr_in6 *sa6;
 {
        static char line[NI_MAXHOST];
-#ifdef NI_WITHSCOPEID
-       int flag = NI_WITHSCOPEID;
-#else
        int flag = 0;
-#endif
        /* use local variable for safety */
        struct sockaddr_in6 sa6_local;
        int error;