Remove remaining OSI protocol support.
authorSascha Wildner <saw@online.de>
Sat, 8 Aug 2015 12:58:25 +0000 (14:58 +0200)
committerSascha Wildner <saw@online.de>
Sat, 8 Aug 2015 12:58:25 +0000 (14:58 +0200)
These were just leftovers.

15 files changed:
sbin/route/keywords
sbin/route/route.8
sbin/route/show.c
share/man/man4/netintro.4
sys/net/if_loop.c
sys/vfs/nfs/nfs.h
sys/vfs/nfs/nfs_socket.c
sys/vfs/nfs/nfs_srvcache.c
sys/vfs/nfs/nfs_syscalls.c
usr.bin/netstat/Makefile
usr.bin/netstat/if.c
usr.bin/netstat/iso.c [deleted file]
usr.bin/netstat/main.c
usr.bin/netstat/netstat.1
usr.bin/netstat/route.c

index e1683c1..18a06a7 100644 (file)
@@ -20,7 +20,6 @@ ifa
 ifp
 inet
 inet6
-iso
 link
 llinfo
 lock
@@ -32,7 +31,6 @@ mtu
 net
 netmask
 nostatic
-osi
 pop
 prefixlen
 proto1
index 7b23bf2..a12773b 100644 (file)
@@ -28,7 +28,7 @@
 .\"     @(#)route.8    8.3 (Berkeley) 3/19/94
 .\" $FreeBSD: src/sbin/route/route.8,v 1.17.2.9 2003/02/24 00:56:43 trhodes Exp $
 .\"
-.Dd June 8, 2001
+.Dd August 8, 2015
 .Dt ROUTE 8
 .Os
 .Sh NAME
@@ -131,8 +131,7 @@ command is specified,
 .Nm
 will ``flush'' the routing tables of all gateway entries.
 When the address family may is specified by any of the
-.Fl osi ,
-.Fl inet6 ,
+.Fl inet6
 or
 .Fl inet
 modifiers, only routes having destinations with addresses in the
@@ -219,29 +218,20 @@ itself may be given, in which case the route remains valid even
 if the local or remote addresses change.
 .Pp
 The optional modifiers
-.Fl mpls ,
-.Fl osi ,
+.Fl mpls
 and
 .Fl link
 specify that all subsequent addresses are in the
-.Tn MPLS ,
-or
-.Tn OSI
-address families,
+.Tn MPLS
+address family
 or are specified as link-level addresses,
 and the names must be numeric specifications rather than
 symbolic names.
 .Pp
 The optional
 .Fl netmask
-modifier is intended
-to achieve the effect of an
-.Tn OSI
-.Tn ESIS
-redirect with the netmask option,
-or to manually add subnet routes with
-netmasks different from that of the implied network interface
-(as would otherwise be communicated using the OSPF or ISIS routing protocols).
+modifier is intended to manually add subnet routes with
+netmasks different from that of the implied network interface.
 One specifies an additional ensuing address parameter
 (to be interpreted as a network mask).
 The implicit network mask generated in the AF_INET case
index 47fb057..a5ce662 100644 (file)
@@ -115,10 +115,6 @@ show(int argc, char *argv[])
                         case K_LINK:
                                 af = AF_LINK;
                                 break;
-                        case K_ISO:
-                        case K_OSI:
-                                af = AF_ISO;
-                                break;
                         case K_X25:
                                 af = AF_CCITT;
                                 break;
@@ -253,9 +249,6 @@ pr_family(int af)
                afname = "Internet6";
                break;
 #endif /* INET6 */
-       case AF_ISO:
-               afname = "ISO";
-               break;
        case AF_CCITT:
                afname = "X.25";
                break;
index aacb75f..0c1243c 100644 (file)
@@ -28,7 +28,7 @@
 .\"     @(#)netintro.4 8.2 (Berkeley) 11/30/93
 .\" $FreeBSD: src/share/man/man4/netintro.4,v 1.10.2.6 2002/08/30 14:23:38 sobomax Exp $
 .\"
-.Dd November 30, 1993
+.Dd August 8, 2015
 .Dt NETINTRO 4
 .Os
 .Sh NAME
@@ -146,7 +146,6 @@ are known to the system
 #define    AF_INET      2    /* internetwork: UDP, TCP, etc. */
 #define    AF_CCITT     10   /* CCITT protocols, X.25 etc */
 #define    AF_HYLINK    15   /* NSC Hyperchannel */
-#define    AF_ISO       18   /* ISO protocols */
 .Ed
 .Sh ROUTING
 .Ux
index 623efe9..f18ed66 100644 (file)
@@ -288,11 +288,6 @@ lo_altqstart(struct ifnet *ifp, struct ifaltq_subque *ifsq)
                        m->m_flags |= M_LOOP;
                        isr = NETISR_IPV6;
                        break;
-#endif
-#ifdef ISO
-               case AF_ISO:
-                       isr = NETISR_ISO;
-                       break;
 #endif
                default:
                        kprintf("lo_altqstart: can't handle af%d\n", af);
index b66856f..063561d 100644 (file)
@@ -35,7 +35,6 @@
  *
  *     @(#)nfs.h       8.4 (Berkeley) 5/1/95
  * $FreeBSD: src/sys/nfs/nfs.h,v 1.53.2.5 2002/02/20 01:35:34 iedowse Exp $
- * $DragonFly: src/sys/vfs/nfs/nfs.h,v 1.21 2008/09/17 21:44:24 dillon Exp $
  */
 
 #ifndef _NFS_NFS_H_
@@ -456,7 +455,6 @@ struct nfsuid {
 /* Bits for nu_flag */
 #define        NU_INETADDR     0x1
 #define NU_NAM         0x2
-#define NU_NETFAM(u)   (((u)->nu_flag & NU_INETADDR) ? AF_INET : AF_ISO)
 
 struct nfsrv_rec {
        STAILQ_ENTRY(nfsrv_rec) nr_link;
index 4ae4dee..1e2be7e 100644 (file)
@@ -1640,7 +1640,7 @@ nfs_rephead(int siz, struct nfsrv_descript *nd, struct nfssvc_sock *slp,
                    for (nuidp = NUIDHASH(slp, nd->nd_cr.cr_uid)->lh_first;
                        nuidp != NULL; nuidp = nuidp->nu_hash.le_next) {
                        if (nuidp->nu_cr.cr_uid == nd->nd_cr.cr_uid &&
-                           (!nd->nd_nam2 || netaddr_match(NU_NETFAM(nuidp),
+                           (!nd->nd_nam2 || netaddr_match(AF_INET,
                             &nuidp->nu_haddr, nd->nd_nam2)))
                            break;
                    }
@@ -2456,7 +2456,7 @@ nfs_getreq(struct nfsrv_descript *nd, struct nfsd *nfsd, int has_header)
                            nuidp != NULL; nuidp = nuidp->nu_hash.le_next) {
                                if (nuidp->nu_cr.cr_uid == nickuid &&
                                    (!nd->nd_nam2 ||
-                                    netaddr_match(NU_NETFAM(nuidp),
+                                    netaddr_match(AF_INET,
                                      &nuidp->nu_haddr, nd->nd_nam2)))
                                        break;
                        }
index 3cdb711..fd8a685 100644 (file)
@@ -65,9 +65,6 @@ static u_long nfsrvhash;
 #define TRUE   1
 #define        FALSE   0
 
-#define        NETFAMILY(rp) \
-               (((rp)->rc_flag & RC_INETADDR) ? AF_INET : AF_ISO)
-
 struct lwkt_token srvcache_token = LWKT_TOKEN_INITIALIZER(srvcache_token);
 
 /*
@@ -184,7 +181,7 @@ loop:
        for (rp = NFSRCHASH(nd->nd_retxid)->lh_first; rp != NULL;
            rp = rp->rc_hash.le_next) {
            if (nd->nd_retxid == rp->rc_xid && nd->nd_procnum == rp->rc_proc &&
-               netaddr_match(NETFAMILY(rp), &rp->rc_haddr, nd->nd_nam)) {
+               netaddr_match(AF_INET, &rp->rc_haddr, nd->nd_nam)) {
                        NFS_DPF(RC, ("H%03x", rp->rc_xid & 0xfff));
                        if ((rp->rc_flag & RC_LOCKED) != 0) {
                                rp->rc_flag |= RC_WANTED;
@@ -264,7 +261,6 @@ loop:
                rp->rc_flag |= RC_INETADDR;
                rp->rc_inetaddr = saddr->sin_addr.s_addr;
                break;
-       case AF_ISO:
        default:
                rp->rc_flag |= RC_NAM;
                rp->rc_nam = dup_sockaddr(nd->nd_nam);
@@ -298,7 +294,7 @@ loop:
        for (rp = NFSRCHASH(nd->nd_retxid)->lh_first; rp != NULL;
            rp = rp->rc_hash.le_next) {
            if (nd->nd_retxid == rp->rc_xid && nd->nd_procnum == rp->rc_proc &&
-               netaddr_match(NETFAMILY(rp), &rp->rc_haddr, nd->nd_nam)) {
+               netaddr_match(AF_INET, &rp->rc_haddr, nd->nd_nam)) {
                        NFS_DPF(RC, ("U%03x", rp->rc_xid & 0xfff));
                        if ((rp->rc_flag & RC_LOCKED) != 0) {
                                rp->rc_flag |= RC_WANTED;
index faf6a11..c11142c 100644 (file)
@@ -225,7 +225,7 @@ sys_nfssvc(struct nfssvc_args *uap)
                            nuidp != 0; nuidp = nuidp->nu_hash.le_next) {
                                if (nuidp->nu_cr.cr_uid == nsd->nsd_cr.cr_uid &&
                                    (!nfsd->nfsd_nd->nd_nam2 ||
-                                    netaddr_match(NU_NETFAM(nuidp),
+                                    netaddr_match(AF_INET,
                                     &nuidp->nu_haddr, nfsd->nfsd_nd->nd_nam2)))
                                        break;
                        }
@@ -278,7 +278,6 @@ sys_nfssvc(struct nfssvc_args *uap)
                                        nuidp->nu_inetaddr =
                                             saddr->sin_addr.s_addr;
                                        break;
-                                   case AF_ISO:
                                    default:
                                        nuidp->nu_flag |= NU_NAM;
                                        nuidp->nu_nam = 
index 1f4daa9..ef4f083 100644 (file)
@@ -3,12 +3,10 @@
 
 PROG=  netstat
 SRCS=  if.c inet.c inet6.c main.c mbuf.c mroute.c route.c \
-       unix.c netgraph.c mroute6.c ipsec.c # iso.c tp_astring.c
+       unix.c netgraph.c mroute6.c ipsec.c
 CFLAGS+=-DIPSEC
 CFLAGS+=-DINET6
 
-#CFLAGS+=-g
-#.PATH:        ${.CURDIR}/../../sys/netiso
 BINGRP=        kmem
 BINMODE=2555
 DPADD= ${LIBKVM} ${LIBKINFO} ${LIBNETGRAPH} ${LIBUTIL}
index 1dd197c..e21c0fb 100644 (file)
 #include <net/ethernet.h>
 #include <netinet/in.h>
 #include <netinet/in_var.h>
-#ifdef ISO
-#include <netiso/iso.h>
-#include <netiso/iso_var.h>
-#endif
 #include <arpa/inet.h>
 
 #include <libutil.h>
@@ -115,9 +111,6 @@ intpr(int interval1, u_long ifnetaddr, void (*pfunc)(char *), u_long ncpusaddr)
                struct in_ifaddr in;
 #ifdef INET6
                struct in6_ifaddr in6;
-#endif
-#ifdef ISO
-               struct iso_ifaddr iso;
 #endif
        } ifaddr;
        u_long ifaddraddr;
diff --git a/usr.bin/netstat/iso.c b/usr.bin/netstat/iso.c
deleted file mode 100644 (file)
index f05ba73..0000000
+++ /dev/null
@@ -1,810 +0,0 @@
-/*
- * Copyright (c) 1983, 1988, 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.
- *
- * @(#)iso.c   8.1 (Berkeley) 6/6/93
- */
-
-/*
- * $FreeBSD: src/usr.bin/netstat/iso.c,v 1.4.2.2 2001/09/17 14:53:17 ru Exp $
- */
-/*******************************************************************************
-                 Copyright IBM Corporation 1987
-
-                      All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of IBM not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-IBM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
-IBM BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-*******************************************************************************/
-
-/*
- * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
- */
-
-#include <sys/param.h>
-#include <sys/mbuf.h>
-#include <sys/time.h>
-#include <sys/domain.h>
-#include <sys/protosw.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/queue.h>
-#include <errno.h>
-#include <net/if.h>
-#include <net/route.h>
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/in_pcb.h>
-#include <netinet/ip_var.h>
-#include <netiso/iso.h>
-#include <netiso/iso_errno.h>
-#include <netiso/clnp.h>
-#include <netiso/esis.h>
-#include <netiso/clnp_stat.h>
-#include <netiso/argo_debug.h>
-#undef satosiso
-#include <netiso/tp_param.h>
-#include <netiso/tp_states.h>
-#include <netiso/tp_pcb.h>
-#include <netiso/tp_stat.h>
-#include <netiso/iso_pcb.h>
-#include <netiso/cltp_var.h>
-#include <netiso/cons.h>
-#ifdef IncStat
-#undef IncStat
-#endif
-#include <netiso/cons_pcb.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include "netstat.h"
-
-static void tprintstat (struct tp_stat *, int);
-static void isonetprint (struct sockaddr_iso *, int);
-static void hexprint (int, char *, char *);
-extern void inetprint (struct in_addr *, int, char *);
-
-/*
- *     Dump esis stats
- */
-void
-esis_stats(u_long off, char *name, int af __unused)
-{
-       struct esis_stat esis_stat;
-
-       if (off == 0 ||
-           kread(off, (char *)&esis_stat, sizeof (struct esis_stat)))
-               return;
-       printf("%s:\n", name);
-       printf("\t%d esh sent, %d esh received\n", esis_stat.es_eshsent,
-               esis_stat.es_eshrcvd);
-       printf("\t%d ish sent, %d ish received\n", esis_stat.es_ishsent,
-               esis_stat.es_ishrcvd);
-       printf("\t%d rd sent, %d rd received\n", esis_stat.es_rdsent,
-               esis_stat.es_rdrcvd);
-       printf("\t%d pdus not sent due to insufficient memory\n",
-               esis_stat.es_nomem);
-       printf("\t%d pdus received with bad checksum\n", esis_stat.es_badcsum);
-       printf("\t%d pdus received with bad version number\n",
-               esis_stat.es_badvers);
-       printf("\t%d pdus received with bad type field\n", esis_stat.es_badtype);
-       printf("\t%d short pdus received\n", esis_stat.es_toosmall);
-}
-
-/*
- * Dump clnp statistics structure.
- */
-void
-clnp_stats(u_long off, char *name, int af __unused)
-{
-       struct clnp_stat clnp_stat;
-
-       if (off == 0 ||
-           kread(off, (char *)&clnp_stat, sizeof (clnp_stat)))
-               return;
-
-       printf("%s:\n\t%d total packets sent\n", name, clnp_stat.cns_sent);
-       printf("\t%d total fragments sent\n", clnp_stat.cns_fragments);
-       printf("\t%d total packets received\n", clnp_stat.cns_total);
-       printf("\t%d with fixed part of header too small\n",
-               clnp_stat.cns_toosmall);
-       printf("\t%d with header length not reasonable\n", clnp_stat.cns_badhlen);
-       printf("\t%d incorrect checksum%s\n",
-               clnp_stat.cns_badcsum, plural(clnp_stat.cns_badcsum));
-       printf("\t%d with unreasonable address lengths\n", clnp_stat.cns_badaddr);
-       printf("\t%d with forgotten segmentation information\n",
-               clnp_stat.cns_noseg);
-       printf("\t%d with an incorrect protocol identifier\n", clnp_stat.cns_noproto);
-       printf("\t%d with an incorrect version\n", clnp_stat.cns_badvers);
-       printf("\t%d dropped because the ttl has expired\n",
-               clnp_stat.cns_ttlexpired);
-       printf("\t%d clnp cache misses\n", clnp_stat.cns_cachemiss);
-       printf("\t%d clnp congestion experience bits set\n",
-               clnp_stat.cns_congest_set);
-       printf("\t%d clnp congestion experience bits received\n",
-               clnp_stat.cns_congest_rcvd);
-}
-/*
- * Dump CLTP statistics structure.
- */
-void
-cltp_stats(u_long off, char *name, int af __unused)
-{
-       struct cltpstat cltpstat;
-
-       if (off == 0 ||
-           kread(off, (char *)&cltpstat, sizeof (cltpstat)))
-               return;
-       printf("%s:\n\t%u incomplete header%s\n", name,
-               cltpstat.cltps_hdrops, plural(cltpstat.cltps_hdrops));
-       printf("\t%u bad data length field%s\n",
-               cltpstat.cltps_badlen, plural(cltpstat.cltps_badlen));
-       printf("\t%u bad checksum%s\n",
-               cltpstat.cltps_badsum, plural(cltpstat.cltps_badsum));
-}
-
-struct tp_pcb tpcb;
-struct isopcb isopcb;
-struct socket sockb;
-union  {
-       struct sockaddr_iso     siso;
-       char    data[128];
-} laddr, faddr;
-#define kget(o, p) \
-       (kread((u_long)(o), (char *)&p, sizeof (p)))
-
-static int first = 1;
-
-/*
- * Print a summary of connections related to an Internet
- * protocol.  For TP, also give state of connection.
- * Listening processes (aflag) are suppressed unless the
- * -a (all) flag is specified.
- */
-void
-iso_protopr(u_long off, const char *name, int af __unused)
-{
-       struct isopcb cb;
-       struct isopcb *prev, *next;
-
-       if (off == 0) {
-               printf("%s control block: symbol not in namelist\n", name);
-               return;
-       }
-       if (strcmp(name, "tp") == 0) {
-               tp_protopr(off, name);
-               return;
-       }
-       if (kread(off, (char *)&cb, sizeof(cb)))
-               return;
-       isopcb = cb;
-       prev = (struct isopcb *)off;
-       if (isopcb.isop_next == (struct isopcb *)off)
-               return;
-       while (isopcb.isop_next != (struct isopcb *)off) {
-               next = isopcb.isop_next;
-               kget(next, isopcb);
-               if (isopcb.isop_prev != prev) {
-                       printf("prev 0x%x next 0x%x isop_prev 0x%x isop_next 0x%x???\n",
-                               prev, next, isopcb.isop_prev, isopcb.isop_next);
-                       break;
-               }
-               kget(isopcb.isop_socket, sockb);
-               iso_protopr1((u_long)next, 0);
-               putchar('\n');
-               prev = next;
-       }
-}
-
-void
-iso_protopr1(u_long kern_addr, int istp)
-{
-       if (first) {
-               printf("Active ISO net connections");
-               if (aflag)
-                       printf(" (including servers)");
-               putchar('\n');
-               if (Aflag)
-                       printf("%-8.8s ", "PCB");
-               printf(Aflag ?
-                       "%-5.5s %-6.6s %-6.6s  %-18.18s %-18.18s %s\n" :
-                       "%-5.5s %-6.6s %-6.6s  %-22.22s %-22.22s %s\n",
-                       "Proto", "Recv-Q", "Send-Q",
-                       "Local Address", "Foreign Address", "(state)");
-               first = 0;
-       }
-       if (Aflag)
-                       printf("%8x ",
-                                       (sockb.so_pcb ? (void *)sockb.so_pcb : (void *)kern_addr));
-       printf("%-5.5s %6d %6d ", "tp", sockb.so_rcv.ssb_cc, sockb.so_snd.ssb_cc);
-       if (istp && tpcb.tp_lsuffixlen) {
-                       hexprint(tpcb.tp_lsuffixlen, tpcb.tp_lsuffix, "()");
-                       printf("\t");
-       } else if (isopcb.isop_laddr == 0)
-                       printf("*.*\t");
-       else {
-                       if ((char *)isopcb.isop_laddr == ((char *)kern_addr) +
-                                       _offsetof(struct isopcb, isop_sladdr))
-                                       laddr.siso = isopcb.isop_sladdr;
-                       else
-                                       kget(isopcb.isop_laddr, laddr);
-                       isonetprint((struct sockaddr_iso *)&laddr, 1);
-       }
-       if (istp && tpcb.tp_fsuffixlen) {
-                       hexprint(tpcb.tp_fsuffixlen, tpcb.tp_fsuffix, "()");
-                       printf("\t");
-       } else if (isopcb.isop_faddr == 0)
-               printf("*.*\t");
-       else {
-               if ((char *)isopcb.isop_faddr == ((char *)kern_addr) +
-                       _offsetof(struct isopcb, isop_sfaddr))
-                       faddr.siso = isopcb.isop_sfaddr;
-               else
-                       kget(isopcb.isop_faddr, faddr);
-               isonetprint((struct sockaddr_iso *)&faddr, 0);
-       }
-}
-
-void
-tp_protopr(u_long off, const char *name, int af __unused)
-{
-       extern char *tp_sstring[];
-       struct tp_ref *tpr, *tpr_base;
-       struct tp_refinfo tpkerninfo;
-       int size;
-
-       kget(off, tpkerninfo);
-       size = tpkerninfo.tpr_size * sizeof (*tpr);
-       tpr_base = (struct tp_ref *)malloc(size);
-       if (tpr_base == NULL)
-               return;
-       kread((u_long)(tpkerninfo.tpr_base), (char *)tpr_base, size);
-       for (tpr = tpr_base; tpr < tpr_base + tpkerninfo.tpr_size; tpr++) {
-               if (tpr->tpr_pcb == 0)
-                       continue;
-               kget(tpr->tpr_pcb, tpcb);
-               if (tpcb.tp_state == ST_ERROR)
-                       printf("undefined tpcb state: 0x%x\n", tpr->tpr_pcb);
-               if (!aflag &&
-                       (tpcb.tp_state == TP_LISTENING ||
-                        tpcb.tp_state == TP_CLOSED ||
-                        tpcb.tp_state == TP_REFWAIT)) {
-                       continue;
-               }
-               kget(tpcb.tp_sock, sockb);
-               if (tpcb.tp_npcb) switch(tpcb.tp_netservice) {
-                       case IN_CLNS:
-                               tp_inproto((u_long)tpkerninfo.tpr_base);
-                               break;
-                       default:
-                               kget(tpcb.tp_npcb, isopcb);
-                               iso_protopr1((u_long)tpcb.tp_npcb, 1);
-                               break;
-               }
-               if (tpcb.tp_state >= tp_NSTATES)
-                       printf(" %d", tpcb.tp_state);
-               else
-                       printf(" %-12.12s", tp_sstring[tpcb.tp_state]);
-               putchar('\n');
-       }
-}
-
-void
-tp_inproto(u_long pcb)
-{
-       struct inpcb inpcb;
-       kget(tpcb.tp_npcb, inpcb);
-       if (!aflag && inet_lnaof(inpcb.inp_laddr) == INADDR_ANY)
-               return;
-       if (Aflag)
-               printf("%8x ", pcb);
-       printf("%-5.5s %6d %6d ", "tpip",
-           sockb.so_rcv.ssb_cc, sockb.so_snd.ssb_cc);
-       inetprint(&inpcb.inp_laddr, inpcb.inp_lport, "tp");
-       inetprint(&inpcb.inp_faddr, inpcb.inp_fport, "tp");
-}
-
-/*
- * Pretty print an iso address (net address + port).
- * If the numeric_addr or numeric_port were specified,
- * use numbers instead of names.
- */
-
-#ifdef notdef
-char *
-isonetname(struct iso_addr *iso)
-{
-       struct sockaddr_iso sa;
-       struct iso_hostent *ihe = NULL;
-       struct iso_hostent *iso_gethostentrybyaddr();
-       struct iso_hostent *iso_getserventrybytsel();
-       struct iso_hostent Ihe;
-       static char line[80];
-
-       bzero(line, sizeof(line));
-       if( iso->isoa_afi ) {
-               sa.siso_family = AF_ISO;
-               sa.siso_addr = *iso;
-               sa.siso_tsuffix = 0;
-
-               if ( !numeric_addr )
-                       ihe = iso_gethostentrybyaddr( &sa, 0, 0 );
-               if( ihe ) {
-                       Ihe = *ihe;
-                       ihe = &Ihe;
-                       sprintf(line, "%s", ihe->isoh_hname);
-               } else {
-                       sprintf(line, "%s", iso_ntoa(iso));
-               }
-       } else {
-               sprintf(line, "*");
-       }
-       return line;
-}
-
-static void
-isonetprint(struct iso_addr *iso, char *sufx, u_short sufxlen, int islocal)
-{
-       struct iso_hostent *iso_getserventrybytsel(), *ihe;
-       struct iso_hostent Ihe;
-       char *line, *cp;
-       int Alen = Aflag?18:22;
-
-       line =  isonetname(iso);
-       cp = strchr(line, '\0');
-       ihe = NULL;
-
-       if( islocal )
-               islocal = 20;
-       else
-               islocal = 22 + Alen;
-
-       if(Aflag)
-               islocal += 10 ;
-
-       if(!numeric_addr) {
-               if( (cp -line)>10 ) {
-                       cp = line+10;
-                       bzero(cp, sizeof(line)-10);
-               }
-       }
-
-       *cp++ = '.';
-       if(sufxlen) {
-               if( !Aflag && !numeric_port && (ihe=iso_getserventrybytsel(sufx, sufxlen))) {
-                       Ihe = *ihe;
-                       ihe = &Ihe;
-               }
-               if( ihe && (strlen(ihe->isoh_aname)>0) ) {
-                       sprintf(cp, "%s", ihe->isoh_aname);
-               } else  {
-                       iso_sprinttsel(cp, sufx, sufxlen);
-               }
-       } else
-               sprintf(cp, "*");
-       /*
-       fprintf(stdout, Aflag?" %-18.18s":" %-22.22s", line);
-       */
-
-       if( strlen(line) > Alen ) {
-               fprintf(stdout, " %s", line);
-               fprintf(stdout, "\n %*.s", islocal+Alen," ");
-       } else {
-               fprintf(stdout, " %-*.*s", Alen, Alen,line);
-       }
-}
-#endif
-
-#ifdef notdef
-static void
-x25_protopr(u_long off, const char *name, int af __unused)
-{
-       static char *xpcb_states[] = {
-               "CLOSED",
-               "LISTENING",
-               "CLOSING",
-               "CONNECTING",
-               "ACKWAIT",
-               "OPEN",
-       };
-       struct isopcb *prev, *next;
-       struct x25_pcb xpcb;
-
-       if (off == 0) {
-               printf("%s control block: symbol not in namelist\n", name);
-               return;
-       }
-       kread(off, &xpcb, sizeof (struct x25_pcb));
-       prev = (struct isopcb *)off;
-       if (xpcb.x_next == (struct isopcb *)off)
-               return;
-       while (xpcb.x_next != (struct isopcb *)off) {
-               next = isopcb.isop_next;
-               kread((u_long)next, &xpcb, sizeof (struct x25_pcb));
-               if (xpcb.x_prev != prev) {
-                       printf("???\n");
-                       break;
-               }
-               kread((u_long)xpcb.x_socket, &sockb, sizeof (sockb));
-
-               if (!aflag &&
-                       xpcb.x_state == LISTENING ||
-                       xpcb.x_state == TP_CLOSED ) {
-                       prev = next;
-                       continue;
-               }
-               if (first) {
-                       printf("Active X25 net connections");
-                       if (aflag)
-                               printf(" (including servers)");
-                       putchar('\n');
-                       if (Aflag)
-                               printf("%-8.8s ", "PCB");
-                       printf(Aflag ?
-                               "%-5.5s %-6.6s %-6.6s  %-18.18s %-18.18s %s\n" :
-                               "%-5.5s %-6.6s %-6.6s  %-22.22s %-22.22s %s\n",
-                               "Proto", "Recv-Q", "Send-Q",
-                               "Local Address", "Foreign Address", "(state)");
-                       first = 0;
-               }
-               printf("%-5.5s %6d %6d ", name, sockb.so_rcv.ssb_cc,
-                       sockb.so_snd.ssb_cc);
-               isonetprint(&xpcb.x_laddr.siso_addr, &xpcb.x_lport,
-                       sizeof(xpcb.x_lport), 1);
-               isonetprint(&xpcb.x_faddr.siso_addr, &xpcb.x_fport,
-                       sizeof(xpcb.x_lport), 0);
-               if (xpcb.x_state < 0 || xpcb.x_state >= x25_NSTATES)
-                       printf(" 0x0x0x0x0x0x0x0x0x%x", xpcb.x_state);
-               else
-                       printf(" %-12.12s", xpcb_states[xpcb.x_state]);
-               putchar('\n');
-               prev = next;
-       }
-}
-#endif
-
-struct tp_stat tp_stat;
-
-void
-tp_stats(caddr_t off, caddr_t name)
-{
-       if (off == 0) {
-               printf("TP not configured\n\n");
-               return;
-       }
-       printf("%s:\n", name);
-       kget(off, tp_stat);
-       tprintstat(&tp_stat, 8);
-}
-
-#define OUT stdout
-
-static void
-tprintstat(struct tp_stat *s, int indent)
-{
-       fprintf(OUT,
-               "%*sReceiving:\n",indent," ");
-       fprintf(OUT,
-               "\t%*s%d variable parameter%s ignored\n", indent," ",
-               s->ts_param_ignored ,plural(s->ts_param_ignored));
-       fprintf(OUT,
-               "\t%*s%d invalid parameter code%s\n", indent, " ",
-               s->ts_inv_pcode ,plural(s->ts_inv_pcode));
-       fprintf(OUT,
-               "\t%*s%d invalid parameter value%s\n", indent, " ",
-               s->ts_inv_pval ,plural(s->ts_inv_pval));
-       fprintf(OUT,
-               "\t%*s%d invalid dutype%s\n", indent, " ",
-               s->ts_inv_dutype ,plural(s->ts_inv_dutype));
-       fprintf(OUT,
-               "\t%*s%d negotiation failure%s\n", indent, " ",
-               s->ts_negotfailed ,plural(s->ts_negotfailed));
-       fprintf(OUT,
-               "\t%*s%d invalid destination reference%s\n", indent, " ",
-               s->ts_inv_dref ,plural(s->ts_inv_dref));
-       fprintf(OUT,
-               "\t%*s%d invalid suffix parameter%s\n", indent, " ",
-               s->ts_inv_sufx ,plural(s->ts_inv_sufx));
-       fprintf(OUT,
-               "\t%*s%d invalid length\n",indent, " ", s->ts_inv_length);
-       fprintf(OUT,
-               "\t%*s%d invalid checksum%s\n", indent, " ",
-               s->ts_bad_csum ,plural(s->ts_bad_csum));
-       fprintf(OUT,
-               "\t%*s%d DT%s out of order\n", indent, " ",
-               s->ts_dt_ooo ,plural(s->ts_dt_ooo));
-       fprintf(OUT,
-               "\t%*s%d DT%s not in window\n", indent, " ",
-               s->ts_dt_niw ,plural(s->ts_dt_niw));
-       fprintf(OUT,
-               "\t%*s%d duplicate DT%s\n", indent, " ",
-               s->ts_dt_dup ,plural(s->ts_dt_dup));
-       fprintf(OUT,
-                       "\t%*s%d XPD%s not in window\n", indent, " ",
-                       s->ts_xpd_niw ,plural(s->ts_xpd_niw));
-               fprintf(OUT,
-                       "\t%*s%d XPD%s w/o credit to stash\n", indent, " ",
-               s->ts_xpd_dup ,plural(s->ts_xpd_dup));
-       fprintf(OUT,
-               "\t%*s%d time%s local credit reneged\n", indent, " ",
-               s->ts_lcdt_reduced ,plural(s->ts_lcdt_reduced));
-       fprintf(OUT,
-               "\t%*s%d concatenated TPDU%s\n", indent, " ",
-               s->ts_concat_rcvd ,plural(s->ts_concat_rcvd));
-       fprintf(OUT,
-               "%*sSending:\n", indent, " ");
-       fprintf(OUT,
-               "\t%*s%d XPD mark%s discarded\n", indent, " ",
-               s->ts_xpdmark_del ,plural(s->ts_xpdmark_del));
-       fprintf(OUT,
-               "\t%*sXPD stopped data flow %d time%s\n", indent, " ",
-               s->ts_xpd_intheway ,plural(s->ts_xpd_intheway));
-       fprintf(OUT,
-               "\t%*s%d time%s foreign window closed\n", indent, " ",
-               s->ts_zfcdt ,plural(s->ts_zfcdt));
-       fprintf(OUT,
-               "%*sMiscellaneous:\n", indent, " ");
-       fprintf(OUT,
-               "\t%*s%d small mbuf%s\n", indent, " ",
-               s->ts_mb_small ,plural(s->ts_mb_small));
-       fprintf(OUT,
-               "\t%*s%d cluster%s\n", indent, " ",
-               s->ts_mb_cluster, plural(s->ts_mb_cluster));
-       fprintf(OUT,
-               "\t%*s%d source quench \n",indent, " ",
-               s->ts_quench);
-       fprintf(OUT,
-               "\t%*s%d dec bit%s\n", indent, " ",
-               s->ts_rcvdecbit, plural(s->ts_rcvdecbit));
-       fprintf(OUT,
-               "\t%*sM:L ( M mbuf chains of length L)\n", indent, " ");
-       {
-               int j;
-
-               fprintf(OUT, "\t%*s%d: over 16\n", indent, " ",
-               s->ts_mb_len_distr[0]);
-               for( j=1; j<=8; j++) {
-                       fprintf(OUT,
-                               "\t%*s%d: %d\t\t%d: %d\n", indent, " ",
-                               s->ts_mb_len_distr[j],j,
-                               s->ts_mb_len_distr[j<<1],j<<1
-                               );
-               }
-       }
-       fprintf(OUT,
-               "\t%*s%d EOT rcvd\n",  indent, " ", s->ts_eot_input);
-       fprintf(OUT,
-               "\t%*s%d EOT sent\n",  indent, " ", s->ts_EOT_sent);
-       fprintf(OUT,
-               "\t%*s%d EOT indication%s\n",  indent, " ",
-               s->ts_eot_user ,plural(s->ts_eot_user));
-
-       fprintf(OUT,
-               "%*sConnections:\n", indent, " ");
-       fprintf(OUT,
-               "\t%*s%d connection%s used extended format\n",  indent, " ",
-               s->ts_xtd_fmt ,plural(s->ts_xtd_fmt));
-       fprintf(OUT,
-               "\t%*s%d connection%s allowed transport expedited data\n",  indent, " ",
-               s->ts_use_txpd ,plural(s->ts_use_txpd));
-       fprintf(OUT,
-               "\t%*s%d connection%s turned off checksumming\n",  indent, " ",
-               s->ts_csum_off ,plural(s->ts_csum_off));
-       fprintf(OUT,
-               "\t%*s%d connection%s dropped due to retrans limit\n",  indent, " ",
-               s->ts_conn_gaveup ,plural(s->ts_conn_gaveup));
-       fprintf(OUT,
-               "\t%*s%d tp 4 connection%s\n",  indent, " ",
-               s->ts_tp4_conn ,plural(s->ts_tp4_conn));
-       fprintf(OUT,
-               "\t%*s%d tp 0 connection%s\n",  indent, " ",
-               s->ts_tp0_conn ,plural(s->ts_tp0_conn));
-    {
-               int j;
-               static char *name[]= {
-                       "~LOCAL, PDN",
-                       "~LOCAL,~PDN",
-                       " LOCAL,~PDN",
-                       " LOCAL, PDN"
-               };
-
-               fprintf(OUT,
-                       "\n%*sRound trip times, listed in ticks:\n", indent, " ");
-               fprintf(OUT,
-                       "\t%*s%11.11s  %12.12s | %12.12s | %s\n", indent, " ",
-                               "Category",
-                               "Smoothed avg", "Deviation", "Deviation/Avg");
-               for (j = 0; j <= 3; j++) {
-                       fprintf(OUT,
-                               "\t%*s%11.11s: %-11d | %-11d | %-11d | %-11d\n", indent, " ",
-                               name[j],
-                               s->ts_rtt[j],
-                               s->ts_rtt[j],
-                               s->ts_rtv[j],
-                               s->ts_rtv[j]);
-               }
-       }
-       fprintf(OUT,
-"\n%*sTpdus RECVD [%d valid, %3.6f %% of total (%d); %d dropped]\n",indent," ",
-               s->ts_tpdu_rcvd ,
-               ((s->ts_pkt_rcvd > 0) ?
-                       ((100 * (float)s->ts_tpdu_rcvd)/(float)s->ts_pkt_rcvd)
-                       : 0),
-               s->ts_pkt_rcvd,
-               s->ts_recv_drop );
-
-       fprintf(OUT,
-               "\t%*sDT  %6d   AK  %6d   DR  %4d   CR  %4d \n", indent, " ",
-               s->ts_DT_rcvd, s->ts_AK_rcvd, s->ts_DR_rcvd, s->ts_CR_rcvd);
-       fprintf(OUT,
-               "\t%*sXPD %6d   XAK %6d   DC  %4d   CC  %4d   ER  %4d\n",  indent, " ",
-               s->ts_XPD_rcvd, s->ts_XAK_rcvd, s->ts_DC_rcvd, s->ts_CC_rcvd,
-               s->ts_ER_rcvd);
-       fprintf(OUT,
-               "\n%*sTpdus SENT [%d total, %d dropped]\n",  indent, " ",
-               s->ts_tpdu_sent, s->ts_send_drop);
-
-       fprintf(OUT,
-               "\t%*sDT  %6d   AK  %6d   DR  %4d   CR  %4d \n", indent, " ",
-               s->ts_DT_sent, s->ts_AK_sent, s->ts_DR_sent, s->ts_CR_sent);
-       fprintf(OUT,
-               "\t%*sXPD %6d   XAK %6d   DC  %4d   CC  %4d   ER  %4d\n",  indent, " ",
-               s->ts_XPD_sent, s->ts_XAK_sent, s->ts_DC_sent, s->ts_CC_sent,
-               s->ts_ER_sent);
-
-       fprintf(OUT,
-               "\n%*sRetransmissions:\n", indent, " ");
-#define PERCENT(X,Y) (((Y)>0)?((100 *(float)(X)) / (float) (Y)):0)
-
-       fprintf(OUT,
-       "\t%*sCR  %6d   CC  %6d   DR  %6d \n", indent, " ",
-               s->ts_retrans_cr, s->ts_retrans_cc, s->ts_retrans_dr);
-       fprintf(OUT,
-       "\t%*sDT  %6d (%5.2f%%)\n", indent, " ",
-               s->ts_retrans_dt,
-               PERCENT(s->ts_retrans_dt, s->ts_DT_sent));
-       fprintf(OUT,
-       "\t%*sXPD %6d (%5.2f%%)\n",  indent, " ",
-               s->ts_retrans_xpd,
-               PERCENT(s->ts_retrans_xpd, s->ts_XPD_sent));
-
-
-       fprintf(OUT,
-               "\n%*sE Timers: [%6d ticks]\n", indent, " ", s->ts_Eticks);
-       fprintf(OUT,
-               "%*s%6d timer%s set \t%6d timer%s expired \t%6d timer%s cancelled\n",indent, " ",
-               s->ts_Eset ,plural(s->ts_Eset),
-               s->ts_Eexpired ,plural(s->ts_Eexpired),
-               s->ts_Ecan_act ,plural(s->ts_Ecan_act));
-
-       fprintf(OUT,
-               "\n%*sC Timers: [%6d ticks]\n",  indent, " ",s->ts_Cticks);
-       fprintf(OUT,
-       "%*s%6d timer%s set \t%6d timer%s expired \t%6d timer%s cancelled\n",
-               indent, " ",
-               s->ts_Cset ,plural(s->ts_Cset),
-               s->ts_Cexpired ,plural(s->ts_Cexpired),
-               s->ts_Ccan_act ,plural(s->ts_Ccan_act));
-       fprintf(OUT,
-               "%*s%6d inactive timer%s cancelled\n", indent, " ",
-               s->ts_Ccan_inact ,plural(s->ts_Ccan_inact));
-
-       fprintf(OUT,
-               "\n%*sPathological debugging activity:\n", indent, " ");
-       fprintf(OUT,
-               "\t%*s%6d CC%s sent to zero dref\n", indent, " ",
-               s->ts_zdebug ,plural(s->ts_zdebug));
-       /* SAME LINE AS ABOVE */
-       fprintf(OUT,
-               "\t%*s%6d random DT%s dropped\n", indent, " ",
-               s->ts_ydebug ,plural(s->ts_ydebug));
-       fprintf(OUT,
-               "\t%*s%6d illegally large XPD TPDU%s\n", indent, " ",
-               s->ts_vdebug ,plural(s->ts_vdebug));
-       fprintf(OUT,
-               "\t%*s%6d faked reneging of cdt\n", indent, " ",
-               s->ts_ldebug );
-
-       fprintf(OUT,
-               "\n%*sACK reasons:\n", indent, " ");
-       fprintf(OUT, "\t%*s%6d not acked immediately\n", indent, " ",
-               s->ts_ackreason[_ACK_DONT_] );
-       fprintf(OUT, "\t%*s%6d strategy==each\n", indent, " ",
-               s->ts_ackreason[_ACK_STRAT_EACH_] );
-       fprintf(OUT, "\t%*s%6d strategy==fullwindow\n", indent, " ",
-               s->ts_ackreason[_ACK_STRAT_FULLWIN_] );
-       fprintf(OUT, "\t%*s%6d duplicate DT\n", indent, " ",
-               s->ts_ackreason[_ACK_DUP_] );
-       fprintf(OUT, "\t%*s%6d EOTSDU\n", indent, " ",
-               s->ts_ackreason[_ACK_EOT_] );
-       fprintf(OUT, "\t%*s%6d reordered DT\n", indent, " ",
-               s->ts_ackreason[_ACK_REORDER_] );
-       fprintf(OUT, "\t%*s%6d user rcvd\n", indent, " ",
-               s->ts_ackreason[_ACK_USRRCV_] );
-       fprintf(OUT, "\t%*s%6d fcc reqd\n", indent, " ",
-               s->ts_ackreason[_ACK_FCC_] );
-}
-#ifndef SSEL
-#define SSEL(s) ((s)->siso_tlen + TSEL(s))
-#define PSEL(s) ((s)->siso_slen + SSEL(s))
-#endif
-
-static void
-isonetprint(struct sockaddr_iso *siso, int islocal)
-{
-       hexprint(siso->siso_nlen, siso->siso_addr.isoa_genaddr, "{}");
-       if (siso->siso_tlen || siso->siso_slen || siso->siso_plen)
-               hexprint(siso->siso_tlen, TSEL(siso), "()");
-       if (siso->siso_slen || siso->siso_plen)
-               hexprint(siso->siso_slen, SSEL(siso), "[]");
-       if (siso->siso_plen)
-               hexprint(siso->siso_plen, PSEL(siso), "<>");
-       putchar(' ');
-}
-
-static char hexlist[] = "0123456789abcdef", obuf[128];
-
-static void
-hexprint(int n, char *buf, char *delim)
-{
-       u_char *in = (u_char *)buf, *top = in + n;
-       char *out = obuf;
-       int i;
-
-       if (n == 0)
-               return;
-       while (in < top) {
-               i = *in++;
-               *out++ = '.';
-               if (i > 0xf) {
-                       out[1] = hexlist[i & 0xf];
-                       i >>= 4;
-                       out[0] = hexlist[i];
-                       out += 2;
-               } else
-                       *out++ = hexlist[i];
-       }
-       *obuf = *delim; *out++ = delim[1]; *out = 0;
-       printf("%s", obuf);
-}
index d69d4ec..5fd9358 100644 (file)
@@ -219,21 +219,6 @@ struct protox netgraphprotox[] = {
          0,            NULL,           NULL,   0 }
 };
 
-#ifdef ISO
-struct protox isoprotox[] = {
-       { ISO_TP,       N_TPSTAT,       1,      iso_protopr,
-         tp_stats,     NULL,           "tp" },
-       { N_CLTP,       N_CLTPSTAT,     1,      iso_protopr,
-         cltp_stats,   NULL,           "cltp" },
-       { -1,           N_CLNPSTAT,     1,       0,
-         clnp_stats,   NULL,           "clnp"},
-       { -1,           N_ESISSTAT,     1,       0,
-         esis_stats,   NULL,           "esis"},
-       { -1,           -1,             0,      0,
-         0,            NULL,           0 }
-};
-#endif
-
 struct protox *protoprotox[] = {
                                         protox,
 #ifdef INET6
@@ -241,9 +226,6 @@ struct protox *protoprotox[] = {
 #endif
 #ifdef IPSEC
                                         pfkeyprotox,
-#endif
-#ifdef ISO
-                                        isoprotox, 
 #endif
                                         NULL };
 
@@ -329,10 +311,6 @@ main(int argc, char **argv)
                        else if (strcmp(optarg, "ng") == 0
                            || strcmp(optarg, "netgraph") == 0)
                                af = AF_NETGRAPH;
-#ifdef ISO
-                       else if (strcmp(optarg, "iso") == 0)
-                               af = AF_ISO;
-#endif
                        else if (strcmp(optarg, "link") == 0)
                                af = AF_LINK;
                        else if (strcmp(optarg, "mpls") == 0)
@@ -530,11 +508,6 @@ main(int argc, char **argv)
        if (af == AF_NETGRAPH || af == AF_UNSPEC)
                for (tp = netgraphprotox; tp->pr_name; tp++)
                        printproto(tp, tp->pr_name, nl[N_NCPUS].n_value);
-#ifdef ISO
-       if (af == AF_ISO || af == AF_UNSPEC)
-               for (tp = isoprotox; tp->pr_name; tp++)
-                       printproto(tp, tp->pr_name, nl[N_NCPUS].n_value);
-#endif
        if ((af == AF_UNIX || af == AF_UNSPEC) && !Lflag && !sflag)
                unixpr();
        exit(0);
index e8f8b3d..d18783a 100644 (file)
@@ -28,7 +28,7 @@
 .\"    @(#)netstat.1   8.8 (Berkeley) 4/18/94
 .\" $FreeBSD: src/usr.bin/netstat/netstat.1,v 1.22.2.13 2003/05/03 22:10:02 keramida Exp $
 .\"
-.Dd November 23, 2014
+.Dd August 8, 2015
 .Dt NETSTAT 1
 .Os
 .Sh NAME
@@ -295,8 +295,6 @@ The following address families, protocol families and protocols are recognized:
 .Cm pfkey
 .It Cm netgraph , ng Pq Dv AF_NETGRAPH PF_NETGRAPH
 .Cm ctrl , data
-.\".It Cm iso Pq Dv AF_ISO PF_ISO
-.\".Cm clnp , cltp , esis , tp
 .It Cm unix Pq Dv AF_UNIX PF_UNIX
 .It Cm link Pq Dv AF_LINK PF_LINK
 .It Cm mpls Pq Dv AF_MPLS PF_MPLS
index 61e5dcf..128a8f1 100644 (file)
@@ -190,9 +190,6 @@ pr_family(int af1)
                afname = "Internet6";
                break;
 #endif /*INET6*/
-       case AF_ISO:
-               afname = "ISO";
-               break;
        case AF_CCITT:
                afname = "X.25";
                break;