===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/netstat/main.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -c -r1.47 -r1.48
*** src/usr.bin/netstat/main.c	2004/06/06 22:08:59	1.47
--- src/usr.bin/netstat/main.c	2004/06/25 20:05:40	1.48
***************
*** 1,4 ****
! /*	$OpenBSD: main.c,v 1.47 2004/06/06 22:08:59 jmc Exp $	*/
  /*	$NetBSD: main.c,v 1.9 1996/05/07 02:55:02 thorpej Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: main.c,v 1.48 2004/06/25 20:05:40 henning Exp $	*/
  /*	$NetBSD: main.c,v 1.9 1996/05/07 02:55:02 thorpej Exp $	*/
  
  /*
***************
*** 40,46 ****
  #if 0
  static char sccsid[] = "from: @(#)main.c	8.4 (Berkeley) 3/1/94";
  #else
! static char *rcsid = "$OpenBSD: main.c,v 1.47 2004/06/06 22:08:59 jmc Exp $";
  #endif
  #endif /* not lint */
  
--- 40,46 ----
  #if 0
  static char sccsid[] = "from: @(#)main.c	8.4 (Berkeley) 3/1/94";
  #else
! static char *rcsid = "$OpenBSD: main.c,v 1.48 2004/06/25 20:05:40 henning Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 99,106 ****
  	{ "_clnp_stat"},
  #define	IN_NOTUSED	16
  	{ "_tp_inpcb" },
- #define	ISO_TP		17
- 	{ "_tp_refinfo" },
  #define	N_TPSTAT	18
  	{ "_tp_stat" },
  #define	N_ESISSTAT	19
--- 99,104 ----
***************
*** 261,279 ****
  	  0,		0 }
  };
  
- struct protox isoprotox[] = {
- 	{ ISO_TP,	N_TPSTAT,	1,	iso_protopr,
- 	  tp_stats,	"tp" },
- 	{ N_CLTP,	N_CLTPSTAT,	1,	iso_protopr,
- 	  cltp_stats,	"cltp" },
- 	{ -1,		N_CLNPSTAT,	1,	 0,
- 	  clnp_stats,	"clnp"},
- 	{ -1,		N_ESISSTAT,	1,	 0,
- 	  esis_stats,	"esis"},
- 	{ -1,		-1,		0,	0,
- 	  0,		0 }
- };
- 
  struct protox atalkprotox[] = {
  	{ N_DDPCB,	N_DDPSTAT,	1,	atalkprotopr,
  	  ddp_stats,	"ddp" },
--- 259,264 ----
***************
*** 283,293 ****
  
  #ifndef INET6
  struct protox *protoprotox[] = {
! 	protox, ipxprotox, nsprotox, isoprotox, atalkprotox, NULL
  };
  #else
  struct protox *protoprotox[] = {
! 	protox, ip6protox, ipxprotox, nsprotox, isoprotox, atalkprotox, NULL
  };
  #endif
  
--- 268,278 ----
  
  #ifndef INET6
  struct protox *protoprotox[] = {
! 	protox, ipxprotox, nsprotox, atalkprotox, NULL
  };
  #else
  struct protox *protoprotox[] = {
! 	protox, ip6protox, ipxprotox, nsprotox, atalkprotox, NULL
  };
  #endif
  
***************
*** 338,345 ****
  				af = AF_IPX;
  			else if (strcmp(optarg, "ns") == 0)
  				af = AF_NS;
- 			else if (strcmp(optarg, "iso") == 0)
- 				af = AF_ISO;
  			else if (strcmp(optarg, "encap") == 0)
  				af = PF_KEY;
  			else if (strcmp(optarg, "atalk") == 0)
--- 323,328 ----
***************
*** 536,544 ****
  			printproto(tp, tp->pr_name);
  	if (af == AF_NS || af == AF_UNSPEC)
  		for (tp = nsprotox; tp->pr_name; tp++)
- 			printproto(tp, tp->pr_name);
- 	if (af == AF_ISO || af == AF_UNSPEC)
- 		for (tp = isoprotox; tp->pr_name; tp++)
  			printproto(tp, tp->pr_name);
  	if ((af == AF_UNIX || af == AF_UNSPEC) && !sflag)
  		unixpr(nl[N_UNIXSW].n_value);
--- 519,524 ----