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

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src NI_WITHSCOPEID was not picked up by IETF standardization pro...
From: itojun <itojun%NetBSD.org@localhost>
Date: Fri, 24 Jan 2020 15:55:54 +0000
details:   https://anonhg.NetBSD.org/src/rev/b397ffec1398
branches:  trunk
changeset: 571293:b397ffec1398
user:      itojun <itojun%NetBSD.org@localhost>
date:      Tue Nov 16 05:59:32 2004 +0000

description:
NI_WITHSCOPEID was not picked up by IETF standardization process.

diffstat:

 sbin/ifconfig/ifconfig.c     |  12 ++----------
 sbin/route/route.c           |  12 ++----------
 usr.bin/fstat/fstat.c        |   8 ++------
 usr.bin/netstat/if.c         |   8 ++------
 usr.bin/netstat/inet6.c      |   8 ++------
 usr.bin/netstat/route.c      |   8 ++------
 usr.bin/telnet/commands.c    |   8 ++------
 usr.sbin/ifmcstat/ifmcstat.c |   6 +-----
 usr.sbin/mountd/mountd.c     |   8 ++------
 9 files changed, 17 insertions(+), 61 deletions(-)

diffs (286 lines):

diff -r 9fdffaae1aa5 -r b397ffec1398 sbin/ifconfig/ifconfig.c
--- a/sbin/ifconfig/ifconfig.c  Tue Nov 16 05:14:12 2004 +0000
+++ b/sbin/ifconfig/ifconfig.c  Tue Nov 16 05:59:32 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ifconfig.c,v 1.147 2004/11/11 20:37:18 dsl Exp $       */
+/*     $NetBSD: ifconfig.c,v 1.148 2004/11/16 05:59:32 itojun Exp $    */
 
 /*-
  * Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@
 #if 0
 static char sccsid[] = "@(#)ifconfig.c 8.2 (Berkeley) 2/16/94";
 #else
-__RCSID("$NetBSD: ifconfig.c,v 1.147 2004/11/11 20:37:18 dsl Exp $");
+__RCSID("$NetBSD: ifconfig.c,v 1.148 2004/11/16 05:59:32 itojun Exp $");
 #endif
 #endif /* not lint */
 
@@ -2035,11 +2035,7 @@
        char psrcaddr[NI_MAXHOST];
        char pdstaddr[NI_MAXHOST];
        const char *ver = "";
-#ifdef NI_WITHSCOPEID
-       const int niflag = NI_NUMERICHOST | NI_WITHSCOPEID;
-#else
        const int niflag = NI_NUMERICHOST;
-#endif
        struct if_laddrreq req;
 
        psrcaddr[0] = pdstaddr[0] = '\0';
@@ -2201,11 +2197,7 @@
        struct sockaddr_in6 *sin6;
        char hbuf[NI_MAXHOST];
        u_int32_t scopeid;
-#ifdef NI_WITHSCOPEID
-       const int niflag = NI_NUMERICHOST | NI_WITHSCOPEID;
-#else
        const int niflag = NI_NUMERICHOST;
-#endif
 
        /* Get the non-alias address for this interface. */
        getsock(AF_INET6);
diff -r 9fdffaae1aa5 -r b397ffec1398 sbin/route/route.c
--- a/sbin/route/route.c        Tue Nov 16 05:14:12 2004 +0000
+++ b/sbin/route/route.c        Tue Nov 16 05:59:32 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: route.c,v 1.73 2004/05/15 14:13:36 itojun Exp $        */
+/*     $NetBSD: route.c,v 1.74 2004/11/16 05:59:32 itojun Exp $        */
 
 /*
  * Copyright (c) 1983, 1989, 1991, 1993
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)route.c    8.6 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: route.c,v 1.73 2004/05/15 14:13:36 itojun Exp $");
+__RCSID("$NetBSD: route.c,v 1.74 2004/11/16 05:59:32 itojun Exp $");
 #endif
 #endif /* not lint */
 
@@ -541,11 +541,7 @@
                struct sockaddr_in6 sin6;
                int niflags;
 
-#ifdef NI_WITHSCOPEID
-               niflags = NI_WITHSCOPEID;
-#else
                niflags = 0;
-#endif
                if (nflag)
                        niflags |= NI_NUMERICHOST;
                memset(&sin6, 0, sizeof(sin6));
@@ -699,11 +695,7 @@
                struct sockaddr_in6 sin6;
                int niflags;
 
-#ifdef NI_WITHSCOPEID
-               niflags = NI_WITHSCOPEID;
-#else
                niflags = 0;
-#endif
                if (nflag)
                        niflags |= NI_NUMERICHOST;
                memset(&sin6, 0, sizeof(sin6));
diff -r 9fdffaae1aa5 -r b397ffec1398 usr.bin/fstat/fstat.c
--- a/usr.bin/fstat/fstat.c     Tue Nov 16 05:14:12 2004 +0000
+++ b/usr.bin/fstat/fstat.c     Tue Nov 16 05:59:32 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fstat.c,v 1.68 2004/10/30 17:29:47 dsl Exp $   */
+/*     $NetBSD: fstat.c,v 1.69 2004/11/16 05:59:32 itojun Exp $        */
 
 /*-
  * Copyright (c) 1988, 1993
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)fstat.c    8.3 (Berkeley) 5/2/95";
 #else
-__RCSID("$NetBSD: fstat.c,v 1.68 2004/10/30 17:29:47 dsl Exp $");
+__RCSID("$NetBSD: fstat.c,v 1.69 2004/11/16 05:59:32 itojun Exp $");
 #endif
 #endif /* not lint */
 
@@ -727,11 +727,7 @@
 {
        struct sockaddr_in6 sin6;
        static char hbuf[NI_MAXHOST];
-#ifdef NI_WITHSCOPEID
-       const int niflags = NI_NUMERICHOST | NI_WITHSCOPEID;
-#else
        const int niflags = NI_NUMERICHOST;
-#endif
 
        memset(&sin6, 0, sizeof(sin6));
        sin6.sin6_family = AF_INET6;
diff -r 9fdffaae1aa5 -r b397ffec1398 usr.bin/netstat/if.c
--- a/usr.bin/netstat/if.c      Tue Nov 16 05:14:12 2004 +0000
+++ b/usr.bin/netstat/if.c      Tue Nov 16 05:59:32 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if.c,v 1.57 2003/11/15 11:54:34 ragge Exp $    */
+/*     $NetBSD: if.c,v 1.58 2004/11/16 05:59:32 itojun Exp $   */
 
 /*
  * Copyright (c) 1983, 1988, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "from: @(#)if.c 8.2 (Berkeley) 2/21/94";
 #else
-__RCSID("$NetBSD: if.c,v 1.57 2003/11/15 11:54:34 ragge Exp $");
+__RCSID("$NetBSD: if.c,v 1.58 2004/11/16 05:59:32 itojun Exp $");
 #endif
 #endif /* not lint */
 
@@ -96,12 +96,8 @@
        char name[IFNAMSIZ + 1];        /* + 1 for `*' */
        char hbuf[NI_MAXHOST];          /* for getnameinfo() */
 #ifdef INET6
-#ifdef NI_WITHSCOPEID
-       const int niflag = NI_NUMERICHOST | NI_WITHSCOPEID;
-#else
        const int niflag = NI_NUMERICHOST;
 #endif
-#endif
 
        if (ifnetaddr == 0) {
                printf("ifnet: symbol not defined\n");
diff -r 9fdffaae1aa5 -r b397ffec1398 usr.bin/netstat/inet6.c
--- a/usr.bin/netstat/inet6.c   Tue Nov 16 05:14:12 2004 +0000
+++ b/usr.bin/netstat/inet6.c   Tue Nov 16 05:59:32 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: inet6.c,v 1.31 2003/11/06 06:11:48 itojun Exp $        */
+/*     $NetBSD: inet6.c,v 1.32 2004/11/16 05:59:32 itojun Exp $        */
 /*     BSDI inet.c,v 2.3 1995/10/24 02:19:29 prb Exp   */
 
 /*
@@ -64,7 +64,7 @@
 #if 0
 static char sccsid[] = "@(#)inet.c     8.4 (Berkeley) 4/20/94";
 #else
-__RCSID("$NetBSD: inet6.c,v 1.31 2003/11/06 06:11:48 itojun Exp $");
+__RCSID("$NetBSD: inet6.c,v 1.32 2004/11/16 05:59:32 itojun Exp $");
 #endif
 #endif /* not lint */
 
@@ -1195,11 +1195,7 @@
        static int first = 1;
        char hbuf[NI_MAXHOST];
        struct sockaddr_in6 sin6;
-#ifdef NI_WITHSCOPEID
-       const int niflag = NI_NUMERICHOST | NI_WITHSCOPEID;
-#else
        const int niflag = NI_NUMERICHOST;
-#endif
 
        if (first && !numeric_addr) {
                first = 0;
diff -r 9fdffaae1aa5 -r b397ffec1398 usr.bin/netstat/route.c
--- a/usr.bin/netstat/route.c   Tue Nov 16 05:14:12 2004 +0000
+++ b/usr.bin/netstat/route.c   Tue Nov 16 05:59:32 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: route.c,v 1.63 2003/08/07 11:15:21 agc Exp $   */
+/*     $NetBSD: route.c,v 1.64 2004/11/16 05:59:32 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.63 2003/08/07 11:15:21 agc Exp $");
+__RCSID("$NetBSD: route.c,v 1.64 2004/11/16 05:59:32 itojun Exp $");
 #endif
 #endif /* not lint */
 
@@ -798,11 +798,7 @@
        u_char *p, *q;
        u_char *lim;
        int masklen, final = 0, illegal = 0;
-#ifdef NI_WITHSCOPEID
-       int flag = NI_WITHSCOPEID;
-#else
        int flag = 0;
-#endif
        int error;
        struct sockaddr_in6 sin6;
 
diff -r 9fdffaae1aa5 -r b397ffec1398 usr.bin/telnet/commands.c
--- a/usr.bin/telnet/commands.c Tue Nov 16 05:14:12 2004 +0000
+++ b/usr.bin/telnet/commands.c Tue Nov 16 05:59:32 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: commands.c,v 1.59 2004/03/20 23:26:05 heas Exp $       */
+/*     $NetBSD: commands.c,v 1.60 2004/11/16 05:59:32 itojun Exp $     */
 
 /*
  * Copyright (C) 1997 and 1998 WIDE Project.
@@ -63,7 +63,7 @@
 #if 0
 static char sccsid[] = "@(#)commands.c 8.4 (Berkeley) 5/30/95";
 #else
-__RCSID("$NetBSD: commands.c,v 1.59 2004/03/20 23:26:05 heas Exp $");
+__RCSID("$NetBSD: commands.c,v 1.60 2004/11/16 05:59:32 itojun Exp $");
 #endif
 #endif /* not lint */
 
@@ -2150,11 +2150,7 @@
 sockaddr_ntop(struct sockaddr *sa)
 {
     static char addrbuf[NI_MAXHOST];
-#ifdef NI_WITHSCOPEID
-    const int niflags = NI_NUMERICHOST | NI_WITHSCOPEID;
-#else
     const int niflags = NI_NUMERICHOST;
-#endif
 
     if (getnameinfo(sa, sa->sa_len, addrbuf, sizeof(addrbuf),
            NULL, 0, niflags) == 0)
diff -r 9fdffaae1aa5 -r b397ffec1398 usr.sbin/ifmcstat/ifmcstat.c
--- a/usr.sbin/ifmcstat/ifmcstat.c      Tue Nov 16 05:14:12 2004 +0000
+++ b/usr.sbin/ifmcstat/ifmcstat.c      Tue Nov 16 05:59:32 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ifmcstat.c,v 1.8 2000/02/26 08:13:25 itojun Exp $      */
+/*     $NetBSD: ifmcstat.c,v 1.9 2004/11/16 05:59:32 itojun Exp $      */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -111,11 +111,7 @@
        static char buf[NI_MAXHOST];
        struct sockaddr_in6 sin6;
        u_int32_t scopeid;
-#ifdef NI_WITHSCOPEID
-       const int niflags = NI_NUMERICHOST | NI_WITHSCOPEID;
-#else
        const int niflags = NI_NUMERICHOST;
-#endif
 
        memset(&sin6, 0, sizeof(sin6));
        sin6.sin6_family = AF_INET6;
diff -r 9fdffaae1aa5 -r b397ffec1398 usr.sbin/mountd/mountd.c
--- a/usr.sbin/mountd/mountd.c  Tue Nov 16 05:14:12 2004 +0000
+++ b/usr.sbin/mountd/mountd.c  Tue Nov 16 05:59:32 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mountd.c,v 1.88 2004/10/30 08:49:45 dsl Exp $   */
+/*     $NetBSD: mountd.c,v 1.89 2004/11/16 05:59:32 itojun Exp $        */
 
 /*
  * Copyright (c) 1989, 1993
@@ -47,7 +47,7 @@
 #if 0
 static char     sccsid[] = "@(#)mountd.c  8.15 (Berkeley) 5/1/95";
 #else
-__RCSID("$NetBSD: mountd.c,v 1.88 2004/10/30 08:49:45 dsl Exp $");
+__RCSID("$NetBSD: mountd.c,v 1.89 2004/11/16 05:59:32 itojun Exp $");
 #endif
 #endif                         /* not lint */
 
@@ -250,11 +250,7 @@
 
 static int      opt_flags;
 static int     have_v6 = 1;
-#ifdef NI_WITHSCOPEID
-static const int ninumeric = NI_NUMERICHOST | NI_WITHSCOPEID;
-#else
 static const int ninumeric = NI_NUMERICHOST;
-#endif
 
 /* Bits for above */
 #define        OP_MAPROOT      0x001
Prev by Date: [src/trunk]: src/sys/dev/pci Add Intel PRO/Wireless LAN 2200BG Mini-PCI Adapter
Next by Date: [src/trunk]: src NI_WITHSCOPEID was not picked up by IETF standardization pro...
Previous by Thread: [src/trunk]: src/sys/dev/pci Add Intel PRO/Wireless LAN 2200BG Mini-PCI Adapter
Next by Thread: [src/trunk]: src NI_WITHSCOPEID was not picked up by IETF standardization pro...
Indexes:
Home | Main Index | Thread Index | Old Index