From owner-p4-projects@FreeBSD.ORG  Thu Nov 22 06:50:03 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0969116A419; Thu, 22 Nov 2007 06:50:03 +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 5A0E116A417
	for <perforce@FreeBSD.org>; Thu, 22 Nov 2007 06:50:02 +0000 (UTC)
	(envelope-from zhouzhouyi@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 64DEF13C43E
	for <perforce@FreeBSD.org>; Thu, 22 Nov 2007 06:50:02 +0000 (UTC)
	(envelope-from zhouzhouyi@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAM6o2Ep070341
	for <perforce@FreeBSD.org>; Thu, 22 Nov 2007 06:50:02 GMT
	(envelope-from zhouzhouyi@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAM6o2cu070313
	for perforce@freebsd.org; Thu, 22 Nov 2007 06:50:02 GMT
	(envelope-from zhouzhouyi@FreeBSD.org)
Date: Thu, 22 Nov 2007 06:50:02 GMT
Message-Id: <200711220650.lAM6o2cu070313@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zhouzhouyi@FreeBSD.org using -f
From: Zhouyi ZHOU <zhouzhouyi@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 129371 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: Thu, 22 Nov 2007 06:50:03 -0000

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

Change 129371 by zhouzhouyi@zhouzhouyi_mactest on 2007/11/22 06:49:27

	check for TCP's time wait status

Affected files ...

.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/bpf/00.t#3 edit

Differences ...

==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/bpf/00.t#3 (text+ko) ====

@@ -36,8 +36,9 @@
 		setfmac "mls/equal,biba/equal" ${mactest_conf}
 		
 		notreceived=`${macping} -f ${mactest_conf} -t 2 192.167.0.34`
-		
-		if [ "${#notreceived}" -eq 0 ]; then
+		timewait=`netstat -p tcp|grep 111|grep TIME_WAIT`
+
+		if [ "${#notreceived}" -eq 0 ] && [ "${#timewait}" -eq 0 ]; then
 
 		    echo "1..2"
 
@@ -51,7 +52,7 @@
 		    sysctl security.mac.biba.enabled=1 > /dev/null
 		    
 		    bizarretestexpect ${tcpconnect} "" "bpf.received!" \
-			-f ${mactest_conf} -t 2 -b "mls/5(4-7),biba/5(low-high)" \
+			-f ${mactest_conf} -t 2 -b "mls/5(4-7),biba/5(4-7)" \
 			-s 192.167.0.33 -c 192.167.1.33 -p 1111
 
 #case 2: bpf descriptor's label doesnot matches that of mbuf's
@@ -61,7 +62,7 @@
 		    echo "biba/5,mls/5 biba/5(4-7),mls/6(4-7)" >> ${mactest_conf}
 
 		    bizarretestexpect ${tcpconnect} "" \
-			""  -f ${mactest_conf} -t 2 -b "mls/5(4-7),biba/5(low-high)" \
+			""  -f ${mactest_conf} -t 2 -b "mls/5(4-7),biba/5(4-7)" \
 			-s 192.167.0.33 -c 192.167.1.33 -p 1112
 
 #cleanup: