PERFORCE change 129371 for review

[Zhouyi ZHOU]

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

Change 129371 by zhouzhouyi at 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: