===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/netstat/Attic/iso.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -c -r1.10 -r1.11
*** src/usr.bin/netstat/Attic/iso.c	2002/05/27 01:50:36	1.10
--- src/usr.bin/netstat/Attic/iso.c	2003/02/01 01:51:31	1.11
***************
*** 1,4 ****
! /*	$OpenBSD: iso.c,v 1.10 2002/05/27 01:50:36 deraadt Exp $	*/
  /*	$NetBSD: iso.c,v 1.12 1995/10/03 21:42:38 thorpej Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: iso.c,v 1.11 2003/02/01 01:51:31 deraadt Exp $	*/
  /*	$NetBSD: iso.c,v 1.12 1995/10/03 21:42:38 thorpej Exp $	*/
  
  /*
***************
*** 38,44 ****
  #if 0
  static char sccsid[] = "from: @(#)iso.c	8.1 (Berkeley) 6/6/93";
  #else
! static char *rcsid = "$OpenBSD: iso.c,v 1.10 2002/05/27 01:50:36 deraadt Exp $";
  #endif
  #endif /* not lint */
  
--- 38,44 ----
  #if 0
  static char sccsid[] = "from: @(#)iso.c	8.1 (Berkeley) 6/6/93";
  #else
! static char *rcsid = "$OpenBSD: iso.c,v 1.11 2003/02/01 01:51:31 deraadt Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 120,128 ****
   *	Dump esis stats
   */
  void
! esis_stats(off, name)
! 	u_long	off;
! 	char	*name;
  {
  	struct esis_stat esis_stat;
  
--- 120,126 ----
   *	Dump esis stats
   */
  void
! esis_stats(u_long off, char *name)
  {
  	struct esis_stat esis_stat;
  
***************
*** 149,157 ****
   * Dump clnp statistics structure.
   */
  void
! clnp_stats(off, name)
! 	u_long off;
! 	char *name;
  {
  	struct clnp_stat clnp_stat;
  
--- 147,153 ----
   * Dump clnp statistics structure.
   */
  void
! clnp_stats(u_long off, char *name)
  {
  	struct clnp_stat clnp_stat;
  
***************
*** 184,192 ****
   * Dump CLTP statistics structure.
   */
  void
! cltp_stats(off, name)
! 	u_long off;
! 	char *name;
  {
  	struct cltpstat cltpstat;
  
--- 180,186 ----
   * Dump CLTP statistics structure.
   */
  void
! cltp_stats(u_long off, char *name)
  {
  	struct cltpstat cltpstat;
  
***************
*** 220,228 ****
   * -a (all) flag is specified.
   */
  void
! iso_protopr(off, name)
! 	u_long off;
! 	char *name;
  {
  	struct isopcb cb;
  	struct isopcb *prev, *next;
--- 214,220 ----
   * -a (all) flag is specified.
   */
  void
! iso_protopr(u_long off, char *name)
  {
  	struct isopcb cb;
  	struct isopcb *prev, *next;
***************
*** 257,265 ****
  }
  
  void
! iso_protopr1(kern_addr, istp)
! 	u_long kern_addr;
! 	int istp;
  {
  	if (first) {
  		printf("Active ISO net connections");
--- 249,255 ----
  }
  
  void
! iso_protopr1(u_long kern_addr, int istp)
  {
  	if (first) {
  		printf("Active ISO net connections");
***************
*** 284,293 ****
  	printf("%-5.5s %6ld %6ld ", "tp", sockb.so_rcv.sb_cc,
  	    sockb.so_snd.sb_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))
--- 274,283 ----
  	printf("%-5.5s %6ld %6ld ", "tp", sockb.so_rcv.sb_cc,
  	    sockb.so_snd.sb_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))
***************
*** 312,320 ****
  }
  
  void
! tp_protopr(off, name)
! 	u_long off;
! 	char *name;
  {
  	extern char *tp_sstring[];
  	struct tp_ref *tpr, *tpr_base;
--- 302,308 ----
  }
  
  void
! tp_protopr(u_long off, char *name)
  {
  	extern char *tp_sstring[];
  	struct tp_ref *tpr, *tpr_base;
***************
*** 358,365 ****
  }
  
  void
! tp_inproto(pcb)
! 	u_long pcb;
  {
  	struct inpcb inpcb;
  
--- 346,352 ----
  }
  
  void
! tp_inproto(u_long pcb)
  {
  	struct inpcb inpcb;
  
***************
*** 381,388 ****
  
  #ifdef notdef
  char *
! isonetname(iso)
! 	struct iso_addr *iso;
  {
  	struct sockaddr_iso sa;
  	struct iso_hostent *ihe = 0;
--- 368,374 ----
  
  #ifdef notdef
  char *
! isonetname(struct iso_addr *iso)
  {
  	struct sockaddr_iso sa;
  	struct iso_hostent *ihe = 0;
***************
*** 413,423 ****
  }
  
  static void
! isonetprint(iso, sufx, sufxlen, islocal)
! 	struct iso_addr *iso;
! 	char *sufx;
! 	u_short	sufxlen;
! 	int islocal;
  {
  	struct iso_hostent *iso_getserventrybytsel(), *ihe;
  	struct iso_hostent Ihe;
--- 399,405 ----
  }
  
  static void
! isonetprint(struct iso_addr *iso, char *sufx, u_short sufxlen, int islocal)
  {
  	struct iso_hostent *iso_getserventrybytsel(), *ihe;
  	struct iso_hostent Ihe;
***************
*** 457,465 ****
  		}
  	} else
  		snprintf(cp, line + sizeof line - cp, "*");
- 	/*
- 	fprintf(stdout, Aflag?" %-18.18s":" %-22.22s", line);
- 	*/
  
  	if (strlen(line) > Alen ) {
  		fprintf(stdout, " %s", line);
--- 439,444 ----
***************
*** 472,480 ****
  
  #ifdef notdef
  static void
! x25_protopr(off, name)
! 	u_long off;
! 	char *name;
  {
  	static char *xpcb_states[] = {
  		"CLOSED",
--- 451,457 ----
  
  #ifdef notdef
  static void
! x25_protopr(u_long off, char *name)
  {
  	static char *xpcb_states[] = {
  		"CLOSED",
***************
*** 546,553 ****
  struct	tp_stat tp_stat;
  
  void
! tp_stats(off, name)
! 	caddr_t off, name;
  {
  	if (off == 0) {
  		printf("TP not configured\n\n");
--- 523,529 ----
  struct	tp_stat tp_stat;
  
  void
! tp_stats(caddr_t off, char *name)
  {
  	if (off == 0) {
  		printf("TP not configured\n\n");
***************
*** 561,569 ****
  #define OUT stdout
  
  static void
! tprintstat(s, indent)
! 	struct tp_stat *s;
! 	int indent;
  {
  	fprintf(OUT,
  	    "%*sReceiving:\n",indent," ");
--- 537,543 ----
  #define OUT stdout
  
  static void
! tprintstat(struct tp_stat *s, int indent)
  {
  	fprintf(OUT,
  	    "%*sReceiving:\n",indent," ");
***************
*** 806,814 ****
  #endif
  
  static void
! isonetprint(siso, islocal)
! 	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)
--- 780,786 ----
  #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)
***************
*** 823,831 ****
  static char hexlist[] = "0123456789abcdef", obuf[128];
  
  static void
! hexprint(n, buf, delim)
! 	int n;
! 	char *buf, *delim;
  {
  	u_char *in = (u_char *)buf, *top = in + n;
  	char *out = obuf;
--- 795,801 ----
  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;