 @@ -1,14 +1,14 @@
-/*	$NetBSD: inet.c,v 1.88 2008/04/24 04:09:27 thorpej Exp $	*/
+/*	$NetBSD: inet.c,v 1.89 2009/02/22 07:43:01 dholland Exp $	*/
 /*
  * 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.
 @@ -24,27 +24,27 @@
  * 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.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "from: @(#)inet.c	8.4 (Berkeley) 4/20/94";
 #else
-__RCSID("$NetBSD: inet.c,v 1.88 2008/04/24 04:09:27 thorpej Exp $");
+__RCSID("$NetBSD: inet.c,v 1.89 2009/02/22 07:43:01 dholland Exp $");
 #endif
 #endif /* not lint */
 #define	_CALLOUT_PRIVATE	/* for defs in sys/callout.h */
 #include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
 #include <sys/sysctl.h>
 @@ -205,26 +205,30 @@ protopr(u_long off, char *name)
 	        mib[6] = sizeof(*pcblist);
         	mib[7] = size / sizeof(*pcblist);
 		if (sysctl(mib, sizeof(mib) / sizeof(*mib), pcblist,
 			   &size, NULL, 0) == -1)
 			err(1, "sysctl (copy)");
 		for (i = 0; i < size / sizeof(*pcblist); i++) {
 			struct sockaddr_in src, dst;
 			memcpy(&src, &pcblist[i].ki_s, sizeof(src));
 			memcpy(&dst, &pcblist[i].ki_d, sizeof(dst));
 			if (!aflag &&
 			    inet_lnaof(dst.sin_addr) == INADDR_ANY)
 				continue;
 			if (first) {
 				protoprhdr();
 				first = 0;
+			}
 	                protopr0((intptr_t) pcblist[i].ki_ppcbaddr,
 				 pcblist[i].ki_rcvq, pcblist[i].ki_sndq,
 				 &src.sin_addr, src.sin_port,
 				 &dst.sin_addr, dst.sin_port,
 				 pcblist[i].ki_tstate, name);
+		}
 		free(pcblist);
 @@ -242,27 +246,27 @@ protopr(u_long off, char *name)
 	while (next != head) {
 		kread((u_long)next, (char *)&inpcb, sizeof inpcb);
 		if ((struct inpcb *)inpcb.inp_queue.cqe_prev != prev) {
 			printf("???\n");
 			break;
+		}
 		prev = next;
 		next = (struct inpcb *)inpcb.inp_queue.cqe_next;
 		if (inpcb.inp_af != AF_INET)
 			continue;
 		if (!aflag &&
-		    inet_lnaof(inpcb.inp_laddr) == INADDR_ANY)
+		    inet_lnaof(inpcb.inp_faddr) == INADDR_ANY)
 			continue;
 		kread((u_long)inpcb.inp_socket, (char *)&sockb, sizeof (sockb));
 		if (istcp) {
 			kread((u_long)inpcb.inp_ppcb,
 			    (char *)&tcpcb, sizeof (tcpcb));
+		}
 		if (first) {
 			protoprhdr();
 			first = 0;
+		}
 		protopr0(istcp ? (intptr_t) inpcb.inp_ppcb : (intptr_t) prev,

 @@ -1,14 +1,14 @@
-/*	$NetBSD: inet6.c,v 1.50 2008/04/24 04:09:27 thorpej Exp $	*/
+/*	$NetBSD: inet6.c,v 1.51 2009/02/22 07:43:01 dholland Exp $	*/
 /*	BSDI inet.c,v 2.3 1995/10/24 02:19:29 prb Exp	*/
 /*
  * Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
  * 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
 @@ -54,27 +54,27 @@
  * 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.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)inet.c	8.4 (Berkeley) 4/20/94";
 #else
-__RCSID("$NetBSD: inet6.c,v 1.50 2008/04/24 04:09:27 thorpej Exp $");
+__RCSID("$NetBSD: inet6.c,v 1.51 2009/02/22 07:43:01 dholland Exp $");
 #endif
 #endif /* not lint */
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/ioctl.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
 #include <sys/sysctl.h>
 #include <net/route.h>
 #include <net/if.h>
 @@ -263,26 +263,29 @@ ip6protopr(u_long off, char *name)
 		mib[6] = sizeof(*pcblist);
 		mib[7] = size / sizeof(*pcblist);
 		if (sysctl(mib, sizeof(mib) / sizeof(*mib), pcblist,
 		    &size, NULL, 0) == -1)
 			err(1, "sysctl (copy)");
 		for (i = 0; i < size / sizeof(*pcblist); i++) {
 			struct sockaddr_in6 src, dst;
 			memcpy(&src, &pcblist[i].ki_s, sizeof(src));
 			memcpy(&dst, &pcblist[i].ki_d, sizeof(dst));
 			if (!aflag && IN6_IS_ADDR_UNSPECIFIED(&dst.sin6_addr))
 				continue;
 			if (first) {
 				ip6protoprhdr();
 				first = 0;
+			}
 			ip6protopr0((intptr_t) pcblist[i].ki_ppcbaddr,
 			    pcblist[i].ki_rcvq, pcblist[i].ki_sndq,
 			    &src.sin6_addr, src.sin6_port,
 			    &dst.sin6_addr, dst.sin6_port,
 			    pcblist[i].ki_tstate, name);
+		}
 		free(pcblist);
 @@ -299,27 +302,27 @@ ip6protopr(u_long off, char *name)
 	while (next != head) {
 		kread((u_long)next, (char *)&in6pcb, sizeof in6pcb);
 		if ((struct in6pcb *)in6pcb.in6p_queue.cqe_prev != prev) {
 			printf("???\n");
 			break;
+		}
 		prev = next;
 		next = (struct in6pcb *)in6pcb.in6p_queue.cqe_next;
 		if (in6pcb.in6p_af != AF_INET6)
 			continue;
-		if (!aflag && IN6_IS_ADDR_UNSPECIFIED(&in6pcb.in6p_laddr))
+		if (!aflag && IN6_IS_ADDR_UNSPECIFIED(&in6pcb.in6p_faddr))
 			continue;
 		kread((u_long)in6pcb.in6p_socket, (char *)&sockb,
 		    sizeof (sockb));
 		if (istcp) {
 #ifdef TCP6
 			kread((u_long)in6pcb.in6p_ppcb,
 			    (char *)&tcp6cb, sizeof (tcp6cb));
 #else
 			kread((u_long)in6pcb.in6p_ppcb,
 			    (char *)&tcpcb, sizeof (tcpcb));
 #endif
+		}
 		if (first) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: iso.c,v 1.30 2008/04/23 08:26:47 plunky Exp $	*/
+/*	$NetBSD: iso.c,v 1.31 2009/02/22 07:43:01 dholland Exp $	*/
 /*
  * 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.
 @@ -24,27 +24,27 @@
  * 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.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "from: @(#)iso.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: iso.c,v 1.30 2008/04/23 08:26:47 plunky Exp $");
+__RCSID("$NetBSD: iso.c,v 1.31 2009/02/22 07:43:01 dholland Exp $");
 #endif
 #endif /* not lint */
 /*******************************************************************************
 	          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
 @@ -362,27 +362,27 @@ tp_protopr(off, name)
 			printf(" %-12.12s", tp_sstring[tpcb.tp_state]);
 		putchar('\n');
+	}
 	free(tpr_base);
+}
 void
 tp_inproto(pcb)
 	u_long pcb;
+{
 	struct inpcb inpcb;
 	kget(tpcb.tp_npcb, inpcb);
-	if (!aflag && inet_lnaof(inpcb.inp_laddr) == INADDR_ANY)
+	if (!aflag && inet_lnaof(inpcb.inp_faddr) == INADDR_ANY)
 		return;
 	if (Aflag)
 		printf("%8lx ", pcb);
 	printf("%-5.5s %6ld %6ld ", "tpip",
 	    sockb.so_rcv.sb_cc, sockb.so_snd.sb_cc);
 	inetprint(&inpcb.inp_laddr, inpcb.inp_lport, "tp", 1);
 	inetprint(&inpcb.inp_faddr, inpcb.inp_fport, "tp", 1);
+}
 /*
  * Pretty print an iso address (net address + port).
  * If the numeric_addr or numeric_port were specified,
  * use numbers instead of names.