remove netns stuff, ok millert

libc major bump by espie in a few

5 files changed, 4 insertions, 459 deletions

diff --git a/src/lib/libc/net/Makefile.inc b/src/lib/libc/net/Makefile.inc
index 6b7740195f..da746b97b1 100644
--- a/src/lib/libc/net/Makefile.inc
+++ b/src/lib/libc/net/Makefile.inc
@@ -1,4 +1,4 @@
-#       $OpenBSD: Makefile.inc,v 1.39 2005/01/06 04:24:14 itojun Exp $
+#       $OpenBSD: Makefile.inc,v 1.40 2005/06/17 20:36:16 henning Exp $
 
 # net sources
 .PATH: ${LIBCSRCDIR}/arch/${MACHINE_ARCH}/net ${LIBCSRCDIR}/net
@@ -12,9 +12,7 @@ SRCS+=	base64.c freeaddrinfo.c gai_strerror.c getaddrinfo.c gethostnamadr.c \
         herror.c if_indextoname.c if_nameindex.c if_nametoindex.c inet_addr.c \
         inet_lnaof.c inet_makeaddr.c inet_neta.c inet_netof.c inet_network.c \
         inet_net_ntop.c inet_net_pton.c inet_ntoa.c inet_ntop.c inet_pton.c \
-        ipx_addr.c ipx_ntoa.c linkaddr.c ns_addr.c ns_ntoa.c \
-        nsap_addr.c \
-        net_addrcmp.c \
+        ipx_addr.c ipx_ntoa.c linkaddr.c net_addrcmp.c nsap_addr.c \
         rcmd.c rresvport.c recv.c res_comp.c res_data.c res_debug.c \
         res_init.c res_mkquery.c res_query.c res_random.c res_send.c send.c \
         sethostent.c ethers.c rcmdsh.c
@@ -32,7 +30,7 @@ MAN+=	byteorder.3 ethers.3 gai_strerror.3 getaddrinfo.3 gethostbyname.3 \
         getifaddrs.3 getnameinfo.3 getnetent.3 getprotoent.3 \
         getrrsetbyname.3 getservent.3 if_indextoname.3 inet.3 \
         inet_net.3 inet6_option_space.3 inet6_rthdr_space.3 \
-        ipx.3 link_addr.3 net_addrcmp.3 ns.3 \
+        ipx.3 link_addr.3 net_addrcmp.3 \
         rcmd.3 rcmdsh.3 resolver.3
 
 MLINKS+=byteorder.3 htonl.3 byteorder.3 htons.3 byteorder.3 ntohl.3 \
@@ -71,7 +69,6 @@ MLINKS+=inet.3 addr.3 inet.3 inet_addr.3 inet.3 inet_aton.3 \
 MLINKS+=inet_net.3 inet_net_ntop.3 inet_net.3 inet_net_pton.3
 MLINKS+=link_addr.3 link_ntoa.3
 MLINKS+=ipx.3 ipx_addr.3 ipx.3 ipx_ntoa.3
-MLINKS+=ns.3 ns_addr.3 ns.3 ns_ntoa.3
 MLINKS+=rcmd.3 iruserok.3 rcmd.3 rresvport.3 rcmd.3 ruserok.3 \
         rcmd.3 rresvport_af.3 rcmd.3 rcmd_af.3 rcmd.3 iruserok_sa.3
 MLINKS+=resolver.3 dn_comp.3 resolver.3 dn_expand.3 resolver.3 res_init.3 \
diff --git a/src/lib/libc/net/net_addrcmp.c b/src/lib/libc/net/net_addrcmp.c
index 8f8f694f4c..c2630a5265 100644
--- a/src/lib/libc/net/net_addrcmp.c
+++ b/src/lib/libc/net/net_addrcmp.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: net_addrcmp.c,v 1.9 2005/03/25 13:24:12 otto Exp $    */
+/*      $OpenBSD: net_addrcmp.c,v 1.10 2005/06/17 20:36:16 henning Exp $        */
 
 /*
  * Copyright (c) 1999 Theo de Raadt
@@ -29,7 +29,6 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <netinet/in.h>
-#include <netns/ns.h>
 #include <string.h>
 
 int
@@ -55,10 +54,6 @@ net_addrcmp(struct sockaddr *sa1, struct sockaddr *sa2)
                 return memcmp(&((struct sockaddr_in6 *)sa1)->sin6_addr,
                     &((struct sockaddr_in6 *)sa2)->sin6_addr,
                     sizeof(struct in6_addr));
-        case AF_NS:
-                return (memcmp(&((struct sockaddr_ns *)sa1)->sns_addr,
-                    &((struct sockaddr_ns *)sa2)->sns_addr,
-                    sizeof(struct ns_addr)));
         case AF_LOCAL:
                 return (strcmp(((struct sockaddr_un *)sa1)->sun_path,
                     ((struct sockaddr_un *)sa1)->sun_path));
diff --git a/src/lib/libc/net/ns.3 b/src/lib/libc/net/ns.3
deleted file mode 100644
index 9c7aeab312..0000000000
--- a/src/lib/libc/net/ns.3
+++ /dev/null
@@ -1,127 +0,0 @@
-.\"     $OpenBSD: ns.3,v 1.9 2003/06/02 20:18:35 millert Exp $
-.\"
-.\" Copyright (c) 1986, 1991, 1993
-.\"     The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.Dd June 4, 1993
-.Dt NS 3
-.Os
-.Sh NAME
-.Nm ns_addr ,
-.Nm ns_ntoa
-.Nd Xerox
-.Tn NS Ns (tm)
-address conversion routines
-.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <netns/ns.h>
-.Ft struct ns_addr
-.Fn ns_addr "char *cp"
-.Ft char *
-.Fn ns_ntoa "struct ns_addr ns"
-.Sh DESCRIPTION
-The routine
-.Fn ns_addr
-interprets character strings representing
-.Tn XNS
-addresses, returning binary information suitable
-for use in system calls.
-The routine
-.Fn ns_ntoa
-takes
-.Tn XNS
-addresses and returns
-.Tn ASCII
-strings representing the address in a
-notation in common use in the Xerox Development Environment:
-.Bd -filled -offset indent
-<network number>.<host number>.<port number>
-.Ed
-.Pp
-Trailing zero fields are suppressed, and each number is printed in hexadecimal,
-in a format suitable for input to
-.Fn ns_addr .
-Any fields lacking super-decimal digits will have a
-trailing
-.Sq H
-appended.
-.Pp
-Unfortunately, no universal standard exists for representing
-.Tn XNS
-addresses.
-An effort has been made to ensure that
-.Fn ns_addr
-be compatible with most formats in common use.
-It will first separate an address into 1 to 3 fields using a single delimiter
-chosen from
-period
-.Pq Ql \&. ,
-colon
-.Pq Ql \&: ,
-or pound-sign
-.Ql # .
-Each field is then examined for byte separators (colon or period).
-If there are byte separators, each subfield separated is taken to be
-a small hexadecimal number, and the entirety is taken as a network-byte-ordered
-quantity to be zero extended in the high-network-order bytes.
-Next, the field is inspected for hyphens, in which case
-the field is assumed to be a number in decimal notation
-with hyphens separating the millenia.
-Next, the field is assumed to be a number:
-It is interpreted
-as hexadecimal if there is a leading
-.Ql 0x
-(as in C),
-a trailing
-.Sq H
-(as in Mesa), or there are any super-decimal digits present.
-It is interpreted as octal if there is a leading
-.Ql 0
-and there are no super-octal digits.
-Otherwise, it is converted as a decimal number.
-.Sh RETURN VALUES
-None.
-(See
-.Sx BUGS . )
-.Sh SEE ALSO
-.Xr hosts 5 ,
-.Xr networks 5
-.Sh HISTORY
-The
-.Fn ns_addr
-and
-.Fn ns_toa
-functions appeared in
-.Bx 4.3 .
-.Sh BUGS
-The string returned by
-.Fn ns_ntoa
-resides in a static memory area.
-The function
-.Fn ns_addr
-should diagnose improperly formed input, and there should be an unambiguous
-way to recognize this.
diff --git a/src/lib/libc/net/ns_addr.c b/src/lib/libc/net/ns_addr.c
deleted file mode 100644
index 03b14909c5..0000000000
--- a/src/lib/libc/net/ns_addr.c
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- * Copyright (c) 1986, 1993
- *      The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * J.Q. Johnson.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: ns_addr.c,v 1.9 2005/03/25 13:24:12 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <netns/ns.h>
-#include <stdio.h>
-#include <string.h>
-
-static struct ns_addr addr, zero_addr;
-
-static void Field(char *, u_int8_t *, int);
-static void cvtbase(long, int, int[], int, u_int8_t[], int);
-
-struct ns_addr 
-ns_addr(const char *name)
-{
-        char separator;
-        char *hostname, *socketname, *cp;
-        char buf[50];
-
-        strlcpy(buf, name, sizeof(buf));
-
-        /*
-         * First, figure out what he intends as a field separtor.
-         * Despite the way this routine is written, the prefered
-         * form  2-272.AA001234H.01777, i.e. XDE standard.
-         * Great efforts are made to insure backward compatibility.
-         */
-        if ((hostname = strchr(buf, '#')))
-                separator = '#';
-        else {
-                hostname = strchr(buf, '.');
-                if ((cp = strchr(buf, ':')) &&
-                    ((hostname && cp < hostname) || (hostname == 0))) {
-                        hostname = cp;
-                        separator = ':';
-                } else
-                        separator = '.';
-        }
-        if (hostname)
-                *hostname++ = 0;
-
-        addr = zero_addr;
-        Field(buf, addr.x_net.c_net, 4);
-        if (hostname == 0)
-                return (addr);  /* No separator means net only */
-
-        socketname = strchr(hostname, separator);
-        if (socketname) {
-                *socketname++ = 0;
-                Field(socketname, (u_char *)&addr.x_port, 2);
-        }
-
-        Field(hostname, (u_char *)addr.x_host.c_host, 6);
-
-        return (addr);
-}
-
-static void
-Field(char *buf, u_char *out, int len)
-{
-        char *bp = buf;
-        int i, ibase, base16 = 0, base10 = 0, clen = 0;
-        int hb[6], *hp;
-        char *fmt;
-
-        /*
-         * first try 2-273#2-852-151-014#socket
-         */
-        if ((*buf != '-') &&
-            (1 < (i = sscanf(buf, "%d-%d-%d-%d-%d",
-                        &hb[0], &hb[1], &hb[2], &hb[3], &hb[4])))) {
-                cvtbase(1000L, 256, hb, i, out, len);
-                return;
-        }
-        /*
-         * try form 8E1#0.0.AA.0.5E.E6#socket
-         */
-        if (1 < (i = sscanf(buf,"%x.%x.%x.%x.%x.%x",
-                        &hb[0], &hb[1], &hb[2], &hb[3], &hb[4], &hb[5]))) {
-                cvtbase(256L, 256, hb, i, out, len);
-                return;
-        }
-        /*
-         * try form 8E1#0:0:AA:0:5E:E6#socket
-         */
-        if (1 < (i = sscanf(buf,"%x:%x:%x:%x:%x:%x",
-                        &hb[0], &hb[1], &hb[2], &hb[3], &hb[4], &hb[5]))) {
-                cvtbase(256L, 256, hb, i, out, len);
-                return;
-        }
-        /*
-         * This is REALLY stretching it but there was a
-         * comma notation separting shorts -- definitely non standard
-         */
-        if (1 < (i = sscanf(buf,"%x,%x,%x",
-                        &hb[0], &hb[1], &hb[2]))) {
-                hb[0] = htons(hb[0]); hb[1] = htons(hb[1]);
-                hb[2] = htons(hb[2]);
-                cvtbase(65536L, 256, hb, i, out, len);
-                return;
-        }
-
-        /* Need to decide if base 10, 16 or 8 */
-        while (*bp) switch (*bp++) {
-
-        case '0': case '1': case '2': case '3': case '4': case '5':
-        case '6': case '7': case '-':
-                break;
-
-        case '8': case '9':
-                base10 = 1;
-                break;
-
-        case 'a': case 'b': case 'c': case 'd': case 'e': case 'f':
-        case 'A': case 'B': case 'C': case 'D': case 'E': case 'F':
-                base16 = 1;
-                break;
-        
-        case 'x': case 'X':
-                *--bp = '0';
-                base16 = 1;
-                break;
-
-        case 'h': case 'H':
-                base16 = 1;
-                /* fall into */
-
-        default:
-                *--bp = 0; /* Ends Loop */
-        }
-        if (base16) {
-                fmt = "%3x";
-                ibase = 4096;
-        } else if (base10 == 0 && *buf == '0') {
-                fmt = "%3o";
-                ibase = 512;
-        } else {
-                fmt = "%3d";
-                ibase = 1000;
-        }
-
-        for (bp = buf; *bp++; ) clen++;
-        if (clen == 0) clen++;
-        if (clen > 18) clen = 18;
-        i = ((clen - 1) / 3) + 1;
-        bp = clen + buf - 3;
-        hp = hb + i - 1;
-
-        while (hp > hb) {
-                (void)sscanf(bp, fmt, hp);
-                bp[0] = 0;
-                hp--;
-                bp -= 3;
-        }
-        (void)sscanf(buf, fmt, hp);
-        cvtbase((long)ibase, 256, hb, i, out, len);
-}
-
-static void
-cvtbase(long int oldbase, int newbase, int *input, int inlen,
-    unsigned char *result, int reslen)
-{
-        int d, e;
-        long sum;
-
-        e = 1;
-        while (e > 0 && reslen > 0) {
-                d = 0; e = 0; sum = 0;
-                /* long division: input=input/newbase */
-                while (d < inlen) {
-                        sum = sum*oldbase + (long) input[d];
-                        e += (sum > 0);
-                        input[d++] = sum / newbase;
-                        sum %= newbase;
-                }
-                result[--reslen] = sum; /* accumulate remainder */
-        }
-        for (d=0; d < reslen; d++)
-                result[d] = 0;
-}
diff --git a/src/lib/libc/net/ns_ntoa.c b/src/lib/libc/net/ns_ntoa.c
deleted file mode 100644
index fd67e459da..0000000000
--- a/src/lib/libc/net/ns_ntoa.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (c) 1986, 1993
- *      The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: ns_ntoa.c,v 1.13 2003/09/25 21:14:46 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <netns/ns.h>
-#include <stdio.h>
-
-static char *spectHex(char *);
-
-char *
-ns_ntoa(struct ns_addr addr)
-{
-        static char obuf[40];
-        union { union ns_net net_e; u_int32_t long_e; } net;
-        in_port_t port = htons(addr.x_port);
-        char *cp, *cp2;
-        u_char *up = addr.x_host.c_host;
-        u_char *uplim = up + 6;
-        size_t rem;
-
-        net.net_e = addr.x_net;
-        snprintf(obuf, sizeof obuf, "%x", ntohl(net.long_e));
-        cp = spectHex(obuf);
-        rem = sizeof(obuf) - (cp - obuf);
-        cp2 = cp + 1;
-        while (up < uplim && *up==0)
-                up++;
-        if (up == uplim) {
-                if (port) {
-                        snprintf(cp, rem, ".0");
-                        cp += 2;
-                        rem -= 2;
-                }
-        } else {
-                snprintf(cp, rem, ".%x", *up++);
-                while (up < uplim) {
-                        while (*cp) {
-                                cp++;
-                                rem--;
-                        }
-                        snprintf(cp, rem, "%02x", *up++);
-                }
-                cp = spectHex(cp2);
-                rem = sizeof(obuf) - (cp - obuf);
-        }
-        if (port) {
-                snprintf(cp, rem, ".%x", port);
-                spectHex(cp + 1);
-        }
-        return (obuf);
-}
-
-static char *
-spectHex(char *p0)
-{
-        int ok = 0, nonzero = 0;
-        char *p = p0;
-
-        for (; *p; p++) {
-                switch (*p) {
-                case 'a': case 'b': case 'c': case 'd': case 'e': case 'f':
-                        *p += ('A' - 'a');
-                        /* fall into . . . */
-                case 'A': case 'B': case 'C': case 'D': case 'E': case 'F':
-                        ok = 1;
-                case '1': case '2': case '3': case '4': case '5':
-                case '6': case '7': case '8': case '9':
-                        nonzero = 1;
-                }
-        }
-        if (nonzero && !ok) {
-                *p++ = 'H';
-                *p = 0;
-        }
-        return (p);
-}