Changeset 149 for trunk/test

Timestamp:

Jan 7, 2008, 8:52:13 PM (17 years ago)

Author:

katerina

Message:

Make sh_hash.c thread-safe, remove plenty of tiny allocations, improve sh_mem_dump, modify port check to run as thread, and fix unsetting of sh_thread_pause_flag (was too early).

File:

• trunk/test/testrun_1e.sh (modified) (2 diffs)

trunk/test/testrun_1e.sh

@@ -23 +23 @@
 export BUILDOPTS
 
-MAXTEST=3; export MAXTEST
+MAXTEST=4; export MAXTEST
+
+PORTPOLICY_4="
+[ReadOnly]
+file=${BASE}
+[PortCheck]
+PortCheckActive = yes
+PortCheckUDP = no
+"
+
+chk_portdata_4 () {
+    one_sec_sleep
+
+    egrep 'CRIT.*POLICY \[ServiceNew\]' $LOGFILE >/dev/null 2>&1
+    if [ $? -eq 0 ]; then
+        
+        [ -z "$verbose" ] || log_msg_fail "Open ports";
+        return 1
+    fi
+}
+
+refine_portpolicy_4 ()
+{
+    cat "$LOGFILE" | grep ServiceNew | sed 's/.*port //' | awk '{ print $1 }' | \
+    while read line; do
+        echo "PortCheckSkip=$line" >>"${RCFILE}"
+    done
+    echo "PortCheckIgnore=2026/tcp" >>"${RCFILE}"
+    echo "PortCheckIgnore=2027/udp" >>"${RCFILE}"
+    echo "PortCheckIgnore=2028/tcp" >>"${RCFILE}"
+    echo "PortCheckIgnore=2029/udp" >>"${RCFILE}"
+}
 
 PORTPOLICY_3="
@@ -50 +81 @@
         echo "PortCheckIgnore=$line" >>"${RCFILE}"
     done
-    echo "PortCheckIgnore=2026" >>"${RCFILE}"
-    echo "PortCheckIgnore=2027" >>"${RCFILE}"
-    echo "PortCheckIgnore=2028" >>"${RCFILE}"
-    echo "PortCheckIgnore=2029" >>"${RCFILE}"
+    echo "PortCheckIgnore=2026/tcp" >>"${RCFILE}"
+    echo "PortCheckIgnore=2027/udp" >>"${RCFILE}"
+    echo "PortCheckIgnore=2028/tcp" >>"${RCFILE}"
+    echo "PortCheckIgnore=2029/udp" >>"${RCFILE}"
 }