• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

UltraMonkey-L7 V3(multi-thread implementation)


Commit MetaInfo

Revision3938dd0b7a5602223d5c55420de027696d246f10 (tree)
Time2010-10-22 12:42:52
Author6638678 <6638678@1ed6...>
Commiter6638678

Log Message

bug fix

git-svn-id: http://10.144.169.20/repos/um/branches/l7vsd-3.x-ramiel-epoll-cond@10404 1ed66053-1c2d-0410-8867-f7571e6e31d3

Change Summary

Incremental Difference

--- a/test/script/PT/B/B-47-IPv4v4.sh
+++ b/test/script/PT/B/B-47-IPv4v4.sh
@@ -165,9 +165,6 @@ ULTRAMONKEY-L7-MIB::l7vsRsInActiveConn.3 = INTEGER: 0
165165 ULTRAMONKEY-L7-MIB::l7vsRsInActiveConn.4 = INTEGER: 0
166166 ULTRAMONKEY-L7-MIB::l7vsReplicationMode.0 = INTEGER: single(1)"
167167
168-echo "$RET" >1.log
169-echo "$EXPECT" >2.log
170-
171168 if [ "${RET}" != "${EXPECT}" ]
172169 then
173170 echo "Test failed: snmpwalk -v 2c -c public localhost ULTRAMONKEY-L7-MIB::ultramonkey"
--- a/test/script/PT/B/B-47-IPv6v6.sh
+++ b/test/script/PT/B/B-47-IPv6v6.sh
@@ -164,9 +164,6 @@ ULTRAMONKEY-L7-MIB::l7vsRsInActiveConn.2 = INTEGER: 0
164164 ULTRAMONKEY-L7-MIB::l7vsRsInActiveConn.3 = INTEGER: 0
165165 ULTRAMONKEY-L7-MIB::l7vsRsInActiveConn.4 = INTEGER: 0
166166 ULTRAMONKEY-L7-MIB::l7vsReplicationMode.0 = INTEGER: single(1)"
167-echo "$RET" >1.log
168-echo "$EXPECT" >2.log
169-
170167
171168 if [ "${RET}" != "${EXPECT}" ]
172169 then
--- a/test/script/PT/B/B-51-IPv4v4.sh
+++ b/test/script/PT/B/B-51-IPv4v4.sh
@@ -53,7 +53,7 @@ fi
5353 dd if=/dev/zero of=${TMP_DIR}/10M.dat bs=1024 count=10240
5454
5555 #Get The File
56-$WGET http://$VS1:40001 --post-file ${TMP_DIR}/10M.dat -t 1
56+$WGET -qO- http://$VS1:40001 --post-file ${TMP_DIR}/10M.dat -t 1
5757 if [ $? -ne 0 ]
5858 then
5959 echo "Test failed: $WGET http://127.0.0.1:40001 --post-file 10M.dat"
--- a/test/script/PT/B/B-51-IPv6v4.sh
+++ b/test/script/PT/B/B-51-IPv6v4.sh
@@ -53,7 +53,7 @@ fi
5353 dd if=/dev/zero of=${TMP_DIR}/10M.dat bs=1024 count=10240
5454
5555 #Get The File
56-$WGET http://$VS1:40001 --post-file ${TMP_DIR}/10M.dat -t 1
56+$WGET -qO- http://$VS1:40001 --post-file ${TMP_DIR}/10M.dat -t 1
5757 if [ $? -ne 0 ]
5858 then
5959 echo "Test failed: $WGET http://$VS1:40001 --post-file 10M.dat"
--- a/test/script/PT/B/B-51-IPv6v6.sh
+++ b/test/script/PT/B/B-51-IPv6v6.sh
@@ -53,7 +53,7 @@ fi
5353 dd if=/dev/zero of=${TMP_DIR}/10M.dat bs=1024 count=10240
5454
5555 #Get The File
56-$WGET http://$VS1:40001 --post-file ${TMP_DIR}/10M.dat -t 1
56+$WGET -qO- http://$VS1:40001 --post-file ${TMP_DIR}/10M.dat -t 1
5757 if [ $? -ne 0 ]
5858 then
5959 echo "Test failed: $WGET http://$VS1:40001 --post-file 10M.dat"
--- a/test/script/PT/B/B-55.sh
+++ b/test/script/PT/B/B-55.sh
@@ -96,9 +96,6 @@ ULTRAMONKEY-L7-MIB::l7vsVsHttpPostCount.1 = Counter64: 0
9696 ULTRAMONKEY-L7-MIB::l7vsVsRsNumber.1 = INTEGER: 0
9797 ULTRAMONKEY-L7-MIB::l7vsReplicationMode.0 = INTEGER: single(1)"
9898
99-echo "$RET" >1.log
100-echo "$EXPECT" >2.log
101-
10299 if [ "${RET}" != "${EXPECT}" ]
103100 then
104101 echo "Test failed: snmpwalk -v 2c -c public localhost ULTRAMONKEY-L7-MIB::ultramonkey-l7"
--- a/test/script/PT/B/B-56.sh
+++ b/test/script/PT/B/B-56.sh
@@ -105,7 +105,6 @@ sleep 2
105105 #warnning log trap
106106 $L7VSADM -A -t 127.0.0.1:40001 -m sessionless
107107 sleep 1
108-
109108 RET=`cat ${L7VS_LOG_DIR}/B-56-snmptrapd.log | grep -e "SNMPv2-SMI::enterprises.32132.1.0.3.3 = STRING: \"[0-9]\{4\}/[0-9]\{2\}/[0-9]\{2\} [0-9]\{2\}:[0-9]\{2\}:[0-9]\{2\},VSD3.*" | wc -l`
110109 echo "TEST:: $RET"
111110 if [ "${RET}" != "2" ]
@@ -115,7 +114,6 @@ then
115114 fi
116115
117116 sleep 20
118-
119117 #Check MIB
120118 RET=`snmpwalk -v 2c -c public localhost ULTRAMONKEY-L7-MIB::ultramonkey-l7`
121119 EXPECT="ULTRAMONKEY-L7-MIB::l7vsVsNumber.0 = INTEGER: 1
@@ -147,16 +145,10 @@ ULTRAMONKEY-L7-MIB::l7vsVsHttpPostCount.1 = Counter64: 0
147145 ULTRAMONKEY-L7-MIB::l7vsVsRsNumber.1 = INTEGER: 0
148146 ULTRAMONKEY-L7-MIB::l7vsReplicationMode.0 = INTEGER: single(1)"
149147
150-echo "$EXPECT" > /tmp/1.txt
151-echo "$RET" > /tmp/2.txt
152-diff /tmp/1.txt /tmp/2.txt
153-
154148 if [ "${RET}" != "${EXPECT}" ]
155149 then
156150 echo "Test failed: snmpwalk -v 2c -c public localhost ULTRAMONKEY-L7-MIB::ultramonkey-l7"
157151 exit 1
158152 fi
159153
160-
161-
162154 exit 0
--- a/test/script/common/stop_um_ps.sh
+++ b/test/script/common/stop_um_ps.sh
@@ -10,13 +10,19 @@ then
1010 LOG_FATAL "Can not stop l7vsd."
1111 exit 1
1212 fi
13+ usleep 500000
14+ if [ -n "`pgrep l7vsd`" ]
15+ then
16+ LOG_FATAL "Can not stop l7vsd."
17+ exit 1
18+ fi
1319 fi
1420
1521 if [ -n "`pgrep l7directord`" ]
1622 then
1723 ${INIT_L7DIRECTORD} stop > /dev/null 2>&1
1824 pkill -KILL l7directord > /dev/null 2>&1
19- usleep 100000
25+ usleep 500000
2026 if [ -n "`pgrep l7directord`" ]
2127 then
2228 LOG_FATAL "Can not stop l7directord."