From owner-p4-projects@FreeBSD.ORG  Wed Jun 10 13:16:18 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1E30B1065670; Wed, 10 Jun 2009 13:16:18 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D25F1106564A
	for <perforce@FreeBSD.org>; Wed, 10 Jun 2009 13:16:17 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C10428FC15
	for <perforce@FreeBSD.org>; Wed, 10 Jun 2009 13:16:17 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n5ADGH1I064176
	for <perforce@FreeBSD.org>; Wed, 10 Jun 2009 13:16:17 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n5ADGHFw064174
	for perforce@freebsd.org; Wed, 10 Jun 2009 13:16:17 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Wed, 10 Jun 2009 13:16:17 GMT
Message-Id: <200906101316.n5ADGHFw064174@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	pgj@FreeBSD.org using -f
From: Gabor Pali <pgj@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 163987 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Jun 2009 13:16:18 -0000

http://perforce.freebsd.org/chv.cgi?CH=163987

Change 163987 by pgj@petymeg-current on 2009/06/10 13:16:11

	Add support for extracting only valid (properly flagged) tcp
	connections

Affected files ...

.. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat.c#15 edit
.. //depot/projects/soc2009/pgj_libstat/src/usr.bin/netstat/inet.c#7 edit

Differences ...

==== //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat.c#15 (text+ko) ====

@@ -149,11 +149,21 @@
 		if (so->xso_protocol != protocol)
 			continue;
 
-		if (inp->inp_gencnt <= oxig->xig_gen) {
-			stp = _netstat_st_allocate(list, PF_INET, protocol,
-			    ipproto[protocol]);
-			extract_inet_data(tp, inp, so, stp);
-		}
+		/* Keep active PCBs only. */
+		if (inp->inp_gencnt > oxig->xig_gen)
+			continue;
+
+		/* Not a valid IPv4/IPv6 connection. */
+		if (((inp->inp_vflag & INP_IPV4) == 0)
+#ifdef INET6
+		    && ((inp->inp_vflag & INP_IPV6) == 0)
+#endif
+		    )
+			continue;
+
+		stp = _netstat_st_allocate(list, PF_INET, protocol,
+		    ipproto[protocol]);
+		extract_inet_data(tp, inp, so, stp);
 	}
 	
 	free(buf);

==== //depot/projects/soc2009/pgj_libstat/src/usr.bin/netstat/inet.c#7 (text+ko) ====

@@ -623,17 +623,6 @@
 		tp = XXX_netstat_st_get_tcpcb(stp);
 		istcp = 1;
 	}
-	if ((netstat_st_get_family(stp) == AF_INET && (inp.inp_vflag & INP_IPV4) == 0)
-#ifdef INET6
-	    || (netstat_st_get_family(stp) == AF_INET6 && (inp.inp_vflag & INP_IPV6) == 0)
-#endif /* INET6 */
-	    || (netstat_st_get_family(stp) == AF_UNSPEC && ((inp.inp_vflag & INP_IPV4) == 0
-#ifdef INET6
-				&& (inp.inp_vflag & INP_IPV6) == 0
-#endif /* INET6 */
-		))
-	    )
-		return;
 	if (!aflag &&
 	    (
 	     (istcp && netstat_st_get_listening(stp))