status=0
t=0
-DEBUG=
-DNSRPS_TEST_MODE= # "" to test with and then without DNSRPS
-ARGS=
-
-USAGE="$0: [-xS] [-D {1,2}]"
-while getopts "xSD:" c; do
- case $c in
- x) set -x; DEBUG=-x; ARGS="$ARGS -x";;
- D) DNSRPS_TEST_MODE="$OPTARG";; # with or without DNSRPS
- *) echo "$USAGE" 1>&2; exit 1;;
- esac
-done
-shift `expr $OPTIND - 1 || true`
-if test "$#" -ne 0; then
- echo "$USAGE" 1>&2
- exit 1
-fi
-# really quit on control-C
-trap 'exit 1' 1 2 15
-
-
-DNSRPSCMD=../rpz/dnsrps
-RNDCCMD="$RNDC -c $SYSTEMTESTTOP/common/rndc.conf -p ${CONTROLPORT} -s"
-
# $1 = test name (such as 1a, 1b, etc. for which named.$1.conf exists)
run_server() {
TESTNAME=$1
echo_i "starting resolver using named.$TESTNAME.conf"
cp -f ns2/named.$TESTNAME.conf ns2/named.conf
$PERL $SYSTEMTESTTOP/start.pl --noclean --restart --port ${PORT} . ns2
- sleep 3
}
run_query() {
NAME=`sed -n -e "$LINE,"'$p' ns2/$TESTNAME.queries | head -n 1`
t=`expr $t + 1`
echo_i "testing $NAME doesn't recurse (${t})"
- add_test_marker 10.53.0.2
run_query $TESTNAME $LINE || {
- echo_i "test ${t} failed"
- status=1
+ echo_i "test ${t} failed"
+ status=1
}
}
NAME=`sed -n -e "$LINE,"'$p' ns2/$TESTNAME.queries | head -n 1`
t=`expr $t + 1`
echo_i "testing $NAME recurses (${t})"
- add_test_marker 10.53.0.2
run_query $TESTNAME $LINE && {
- echo_i "test ${t} failed"
- status=1
+ echo_i "test ${t} failed"
+ status=1
}
}
-add_test_marker() {
- for ns in $@
- do
- $RNDCCMD $ns null ---- test ${t} ----
- done
-}
-
-case "$DNSRPS_TEST_MODE" in
-''|native|dnsrps);;
-*)
- echo "bad test mode'${DNSRPS_TEST_MODE}' should be 'native' or 'dnsrps'"
- exit 1
- ;;
-esac
-
-for mode in ${DNSRPS_TEST_MODE:-native dnsrps}
-do
- status=0
- case $mode in
- native)
- if [ ${DNSRPS_TEST_MODE:-unset} = unset -a -e dnsrps-only ] ; then
- echo_i "'dnsrps-only' found: skipping native RPZ sub-test"
- continue
- fi
- ;;
- dnsrps)
- if [ ${DNSRPS_TEST_MODE:-unset} = unset -a -e dnsrps-off ] ; then
- echo_i "'dnsrps-off' found: skipping DNSRPS sub-test"
- continue
- fi
- if grep '^#skip' dnsrps.conf > /dev/null ; then
- echo_i "DNSRPS sub-test skipped"
- continue
- fi
- $SHELL ./setup.sh -N -D $DEBUG
- $RNDCCMD 10.53.0.2 reload
- $RNDCCMD 10.53.0.3 reload
- $RNDCCMD 10.53.0.2 flush
- $RNDCCMD 10.53.0.3 flush
- ;;
- esac
-
- # show whether and why DNSRPS is enabled or disabled
- sed -n 's/^## /I:/p' dnsrps.conf
-
- t=`expr $t + 1`
- echo_i "testing that l1.l0 exists without RPZ (${t})"
- add_test_marker 10.53.0.2
- $DIG $DIGOPTS l1.l0 ns @10.53.0.2 -p ${PORT} > dig.out.${t}
- grep "status: NOERROR" dig.out.${t} > /dev/null 2>&1 || {
+t=`expr $t + 1`
+echo_i "testing that l1.l0 exists without RPZ (${t})"
+$DIG $DIGOPTS l1.l0 ns @10.53.0.2 -p ${PORT} > dig.out.${t}
+grep "status: NOERROR" dig.out.${t} > /dev/null 2>&1 || {
echo_i "test ${t} failed"
status=1
}
- t=`expr $t + 1`
- echo_i "testing that l2.l1.l0 returns SERVFAIL without RPZ (${t})"
- add_test_marker 10.53.0.2
- $DIG $DIGOPTS l2.l1.l0 ns @10.53.0.2 -p ${PORT} > dig.out.${t}
- grep "status: SERVFAIL" dig.out.${t} > /dev/null 2>&1 || {
+t=`expr $t + 1`
+echo_i "testing that l2.l1.l0 returns SERVFAIL without RPZ (${t})"
+$DIG $DIGOPTS l2.l1.l0 ns @10.53.0.2 -p ${PORT} > dig.out.${t}
+grep "status: SERVFAIL" dig.out.${t} > /dev/null 2>&1 || {
echo_i "test ${t} failed"
status=1
}
ni=$1
t=`expr $t + 1`
echo_i "testing that ${ni} of 33 queries skip recursion (${t})"
- add_test_marker 10.53.0.2
c=0
for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 \
17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33
done
skipped=`expr 33 - $c`
if [ $skipped != $ni ]; then
- echo_i "test $t failed (actual=$skipped, expected=$ni)"
- status=1
+ echo_i "test $t failed (actual=$skipped, expected=$ni)"
+ status=1
fi
shift
- done
-
- # Group 5
- run_server 5a
- expect_norecurse 5a 1
- expect_norecurse 5a 2
- expect_recurse 5a 3
- expect_recurse 5a 4
- expect_recurse 5a 5
- expect_recurse 5a 6
-
- if [ ! "$CYGWIN" -o -n "$PSSUSPEND" ]
- then
- # Group 6
- echo_i "check recursive behavior consistency during policy update races"
- run_server 6a
- sleep 1
- t=`expr $t + 1`
- echo_i "running dig to cache CNAME record (${t})"
- add_test_marker 10.53.0.1 10.53.0.2
- $DIG $DIGOPTS @10.53.0.2 -p ${PORT} www.test.example.org CNAME > dig.out.${t}
- sleep 1
- echo_i "suspending authority server"
+done
+
+# Group 5
+run_server 5a
+expect_norecurse 5a 1
+expect_norecurse 5a 2
+expect_recurse 5a 3
+expect_recurse 5a 4
+expect_recurse 5a 5
+expect_recurse 5a 6
+
+# Group 6
+echo_i "check recursive behavior consistency during policy update races"
+run_server 6a
+sleep 1
+t=`expr $t + 1`
+echo_i "running dig to cache CNAME record (${t})"
+$DIG $DIGOPTS @10.53.0.2 -p ${PORT} www.test.example.org CNAME > dig.out.${t}
+sleep 1
+echo_i "suspending authority server"
+if [ "$CYGWIN" ]; then
+ WINPID=`cat ns1/named.pid`
+ PID=`ps | sed 's/^..//' | awk '$4 == '$WINPID | awk '{print $1}'`
+else
PID=`cat ns1/named.pid`
- if [ "$CYGWIN" ]
- then
- $PSSUSPEND $PID
- else
- $KILL -STOP $PID
- fi
- echo_i "adding an NSDNAME policy"
- cp ns2/db.6a.00.policy.local ns2/saved.policy.local
- cp ns2/db.6b.00.policy.local ns2/db.6a.00.policy.local
- $RNDC -c ../common/rndc.conf -s 10.53.0.2 -p ${CONTROLPORT} reload 6a.00.policy.local 2>&1 | sed 's/^/I:ns2 /'
- test -f dnsrpzd.pid && $KILL -USR1 `cat dnsrpzd.pid`
- sleep 1
- t=`expr $t + 1`
- echo_i "running dig to follow CNAME (blocks, so runs in the background) (${t})"
- add_test_marker 10.53.0.2
- $DIG $DIGOPTS @10.53.0.2 -p ${PORT} www.test.example.org A > dig.out.${t} &
- sleep 1
- echo_i "removing the NSDNAME policy"
- cp ns2/db.6c.00.policy.local ns2/db.6a.00.policy.local
- $RNDC -c ../common/rndc.conf -s 10.53.0.2 -p ${CONTROLPORT} reload 6a.00.policy.local 2>&1 | sed 's/^/I:ns2 /'
- test -f dnsrpzd.pid && $KILL -USR1 `cat dnsrpzd.pid`
- sleep 1
- echo_i "resuming authority server"
+fi
+kill -TSTP $PID
+echo_i "adding an NSDNAME policy"
+cp ns2/db.6a.00.policy.local ns2/saved.policy.local
+cp ns2/db.6b.00.policy.local ns2/db.6a.00.policy.local
+$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p ${CONTROLPORT} reload 6a.00.policy.local 2>&1 | sed 's/^/I:ns2 /'
+sleep 1
+t=`expr $t + 1`
+echo_i "running dig to follow CNAME (blocks, so runs in the background) (${t})"
+$DIG $DIGOPTS @10.53.0.2 -p ${PORT} www.test.example.org A > dig.out.${t} &
+sleep 1
+echo_i "removing the NSDNAME policy"
+cp ns2/db.6c.00.policy.local ns2/db.6a.00.policy.local
+$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p ${CONTROLPORT} reload 6a.00.policy.local 2>&1 | sed 's/^/I:ns2 /'
+sleep 1
+echo_i "resuming authority server"
+if [ "$CYGWIN" ]; then
+ WINPID=`cat ns1/named.pid`
+ PID=`ps | sed 's/^..//' | awk '$4 == '$WINPID | awk '{print $1}'`
+else
PID=`cat ns1/named.pid`
- if [ "$CYGWIN" ]
- then
- $PSSUSPEND -r $PID
- else
- $KILL -CONT $PID
- fi
- add_test_marker 10.53.0.1
- for n in 1 2 3 4 5 6 7 8 9
- do
- sleep 1
- [ -s dig.out.${t} ] || continue
- grep "status: .*," dig.out.${t} > /dev/null 2>&1 && break
- done
- grep "status: NOERROR" dig.out.${t} > /dev/null 2>&1 || {
- echo_i "test ${t} failed"
- status=1
- }
-
- echo_i "check recursive behavior consistency during policy removal races"
- cp ns2/saved.policy.local ns2/db.6a.00.policy.local
- run_server 6a
- sleep 1
- t=`expr $t + 1`
- echo_i "running dig to cache CNAME record (${t})"
- add_test_marker 10.53.0.1 10.53.0.2
- $DIG $DIGOPTS @10.53.0.2 -p ${PORT} www.test.example.org CNAME > dig.out.${t}
+fi
+kill -CONT $PID
+for n in 1 2 3 4 5 6 7 8 9; do
sleep 1
- echo_i "suspending authority server"
+ [ -s dig.out.${t} ] || continue
+ grep "status: .*," dig.out.${t} > /dev/null 2>&1 && break
+done
+grep "status: NOERROR" dig.out.${t} > /dev/null 2>&1 || {
+ echo_i "test ${t} failed"
+ status=1
+}
+
+echo_i "check recursive behavior consistency during policy removal races"
+cp ns2/saved.policy.local ns2/db.6a.00.policy.local
+run_server 6a
+sleep 1
+t=`expr $t + 1`
+echo_i "running dig to cache CNAME record (${t})"
+$DIG $DIGOPTS @10.53.0.2 -p ${PORT} www.test.example.org CNAME > dig.out.${t}
+sleep 1
+echo_i "suspending authority server"
+if [ "$CYGWIN" ]; then
+ WINPID=`cat ns1/named.pid`
+ PID=`ps | sed 's/^..//' | awk '$4 == '$WINPID | awk '{print $1}'`
+else
PID=`cat ns1/named.pid`
- if [ "$CYGWIN" ]
- then
- $PSSUSPEND $PID
- else
- $KILL -STOP $PID
- fi
- echo_i "adding an NSDNAME policy"
- cp ns2/db.6b.00.policy.local ns2/db.6a.00.policy.local
- $RNDC -c ../common/rndc.conf -s 10.53.0.2 -p ${CONTROLPORT} reload 6a.00.policy.local 2>&1 | sed 's/^/I:ns2 /'
- test -f dnsrpzd.pid && $KILL -USR1 `cat dnsrpzd.pid`
- sleep 1
- t=`expr $t + 1`
- echo_i "running dig to follow CNAME (blocks, so runs in the background) (${t})"
- add_test_marker 10.53.0.2
- $DIG $DIGOPTS @10.53.0.2 -p ${PORT} www.test.example.org A > dig.out.${t} &
- sleep 1
- echo_i "removing the policy zone"
- cp ns2/named.default.conf ns2/named.conf
- $RNDC -c ../common/rndc.conf -s 10.53.0.2 -p ${CONTROLPORT} reconfig 2>&1 | sed 's/^/I:ns2 /'
- test -f dnsrpzd.pid && $KILL -USR1 `cat dnsrpzd.pid`
- sleep 1
- echo_i "resuming authority server"
+fi
+kill -TSTP $PID
+echo_i "adding an NSDNAME policy"
+cp ns2/db.6b.00.policy.local ns2/db.6a.00.policy.local
+$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p ${CONTROLPORT} reload 6a.00.policy.local 2>&1 | sed 's/^/I:ns2 /'
+sleep 1
+t=`expr $t + 1`
+echo_i "running dig to follow CNAME (blocks, so runs in the background) (${t})"
+$DIG $DIGOPTS @10.53.0.2 -p ${PORT} www.test.example.org A > dig.out.${t} &
+sleep 1
+echo_i "removing the policy zone"
+cp ns2/named.default.conf ns2/named.conf
+$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p ${CONTROLPORT} reconfig 2>&1 | sed 's/^/I:ns2 /'
+sleep 1
+echo_i "resuming authority server"
+if [ "$CYGWIN" ]; then
+ WINPID=`cat ns1/named.pid`
+ PID=`ps | sed 's/^..//' | awk '$4 == '$WINPID | awk '{print $1}'`
+else
PID=`cat ns1/named.pid`
- if [ "$CYGWIN" ]
- then
- $PSSUSPEND -r $PID
- else
- $KILL -CONT $PID
- fi
- add_test_marker 10.53.0.1
- for n in 1 2 3 4 5 6 7 8 9; do
- sleep 1
- [ -s dig.out.${t} ] || continue
- grep "status: .*," dig.out.${t} > /dev/null 2>&1 && break
- done
- grep "status: NOERROR" dig.out.${t} > /dev/null 2>&1 || {
- echo_i "test ${t} failed"
- status=1
- }
- fi
-
- # Check CLIENT-IP behavior
- t=`expr $t + 1`
- echo_i "testing CLIENT-IP behavior (${t})"
- add_test_marker 10.53.0.2
- run_server clientip
- $DIG $DIGOPTS l2.l1.l0 a @10.53.0.2 -p ${PORT} -b 10.53.0.4 > dig.out.${t}
- grep "status: NOERROR" dig.out.${t} > /dev/null 2>&1 || {
+fi
+kill -CONT $PID
+for n in 1 2 3 4 5 6 7 8 9; do
+ sleep 1
+ [ -s dig.out.${t} ] || continue
+ grep "status: .*," dig.out.${t} > /dev/null 2>&1 && break
+done
+grep "status: NOERROR" dig.out.${t} > /dev/null 2>&1 || {
+ echo_i "test ${t} failed"
+ status=1
+}
+
+# Check CLIENT-IP behavior
+t=`expr $t + 1`
+echo_i "testing CLIENT-IP behavior (${t})"
+run_server clientip
+$DIG $DIGOPTS l2.l1.l0 a @10.53.0.2 -p ${PORT} -b 10.53.0.4 > dig.out.${t}
+grep "status: NOERROR" dig.out.${t} > /dev/null 2>&1 || {
echo_i "test $t failed: query failed"
status=1
- }
- grep "^l2.l1.l0.[ ]*[0-9]*[ ]*IN[ ]*A[ ]*10.53.0.2" dig.out.${t} > /dev/null 2>&1 || {
+}
+grep "^l2.l1.l0.[ ]*[0-9]*[ ]*IN[ ]*A[ ]*10.53.0.2" dig.out.${t} > /dev/null 2>&1 || {
echo_i "test $t failed: didn't get expected answer"
status=1
- }
-
- # Check CLIENT-IP behavior #2
- t=`expr $t + 1`
- echo_i "testing CLIENT-IP behavior #2 (${t})"
- add_test_marker 10.53.0.2
- run_server clientip2
- $DIG $DIGOPTS l2.l1.l0 a @10.53.0.2 -p ${PORT} -b 10.53.0.1 > dig.out.${t}.1
- grep "status: SERVFAIL" dig.out.${t}.1 > /dev/null 2>&1 || {
+}
+
+# Check CLIENT-IP behavior #2
+t=`expr $t + 1`
+echo_i "testing CLIENT-IP behavior #2 (${t})"
+run_server clientip2
+$DIG $DIGOPTS l2.l1.l0 a @10.53.0.2 -p ${PORT} -b 10.53.0.1 > dig.out.${t}.1
+grep "status: SERVFAIL" dig.out.${t}.1 > /dev/null 2>&1 || {
echo_i "test $t failed: query failed"
status=1
- }
- $DIG $DIGOPTS l2.l1.l0 a @10.53.0.2 -p ${PORT} -b 10.53.0.2 > dig.out.${t}.2
- grep "status: NXDOMAIN" dig.out.${t}.2 > /dev/null 2>&1 || {
+}
+$DIG $DIGOPTS l2.l1.l0 a @10.53.0.2 -p ${PORT} -b 10.53.0.2 > dig.out.${t}.2
+grep "status: NXDOMAIN" dig.out.${t}.2 > /dev/null 2>&1 || {
echo_i "test $t failed: query failed"
status=1
- }
- $DIG $DIGOPTS l2.l1.l0 a @10.53.0.2 -p ${PORT} -b 10.53.0.3 > dig.out.${t}.3
- grep "status: NOERROR" dig.out.${t}.3 > /dev/null 2>&1 || {
+}
+$DIG $DIGOPTS l2.l1.l0 a @10.53.0.2 -p ${PORT} -b 10.53.0.3 > dig.out.${t}.3
+grep "status: NOERROR" dig.out.${t}.3 > /dev/null 2>&1 || {
echo_i "test $t failed: query failed"
status=1
- }
- grep "^l2.l1.l0.[ ]*[0-9]*[ ]*IN[ ]*A[ ]*10.53.0.1" dig.out.${t}.3 > /dev/null 2>&1 || {
+}
+grep "^l2.l1.l0.[ ]*[0-9]*[ ]*IN[ ]*A[ ]*10.53.0.1" dig.out.${t}.3 > /dev/null 2>&1 || {
echo_i "test $t failed: didn't get expected answer"
status=1
- }
- $DIG $DIGOPTS l2.l1.l0 a @10.53.0.2 -p ${PORT} -b 10.53.0.4 > dig.out.${t}.4
- grep "status: SERVFAIL" dig.out.${t}.4 > /dev/null 2>&1 || {
+}
+$DIG $DIGOPTS l2.l1.l0 a @10.53.0.2 -p ${PORT} -b 10.53.0.4 > dig.out.${t}.4
+grep "status: SERVFAIL" dig.out.${t}.4 > /dev/null 2>&1 || {
echo_i "test $t failed: query failed"
status=1
- }
-
- # Check RPZ log clause
- t=`expr $t + 1`
- echo_i "testing RPZ log clause (${t})"
- add_test_marker 10.53.0.2
- run_server log
- cur=`awk 'BEGIN {l=0} /^/ {l++} END { print l }' ns2/named.run`
- $DIG $DIGOPTS l2.l1.l0 a @10.53.0.2 -p ${PORT} -b 10.53.0.4 > dig.out.${t}
- $DIG $DIGOPTS l2.l1.l0 a @10.53.0.2 -p ${PORT} -b 10.53.0.3 >> dig.out.${t}
- $DIG $DIGOPTS l2.l1.l0 a @10.53.0.2 -p ${PORT} -b 10.53.0.2 >> dig.out.${t}
- sed -n "$cur,"'$p' < ns2/named.run | grep "view recursive: rpz CLIENT-IP Local-Data rewrite l2.l1.l0 via 32.4.0.53.10.rpz-client-ip.log1" > /dev/null && {
+}
+
+# Check RPZ log clause
+t=`expr $t + 1`
+echo_i "testing RPZ log clause (${t})"
+run_server log
+cur=`awk 'BEGIN {l=0} /^/ {l++} END { print l }' ns2/named.run`
+$DIG $DIGOPTS l2.l1.l0 a @10.53.0.2 -p ${PORT} -b 10.53.0.4 > dig.out.${t}
+$DIG $DIGOPTS l2.l1.l0 a @10.53.0.2 -p ${PORT} -b 10.53.0.3 >> dig.out.${t}
+$DIG $DIGOPTS l2.l1.l0 a @10.53.0.2 -p ${PORT} -b 10.53.0.2 >> dig.out.${t}
+sed -n "$cur,"'$p' < ns2/named.run | grep "view recursive: rpz CLIENT-IP Local-Data rewrite l2.l1.l0 via 32.4.0.53.10.rpz-client-ip.log1" > /dev/null && {
echo_i " failed: unexpected rewrite message for policy zone log1 was logged"
status=1
- }
- sed -n "$cur,"'$p' < ns2/named.run | grep "view recursive: rpz CLIENT-IP Local-Data rewrite l2.l1.l0 via 32.3.0.53.10.rpz-client-ip.log2" > /dev/null || {
+}
+sed -n "$cur,"'$p' < ns2/named.run | grep "view recursive: rpz CLIENT-IP Local-Data rewrite l2.l1.l0 via 32.3.0.53.10.rpz-client-ip.log2" > /dev/null || {
echo_i " failed: expected rewrite message for policy zone log2 was not logged"
status=1
- }
- sed -n "$cur,"'$p' < ns2/named.run | grep "view recursive: rpz CLIENT-IP Local-Data rewrite l2.l1.l0 via 32.2.0.53.10.rpz-client-ip.log3" > /dev/null || {
+}
+sed -n "$cur,"'$p' < ns2/named.run | grep "view recursive: rpz CLIENT-IP Local-Data rewrite l2.l1.l0 via 32.2.0.53.10.rpz-client-ip.log3" > /dev/null || {
echo_i " failed: expected rewrite message for policy zone log3 was not logged"
status=1
}
# Check wildcard behavior
- t=`expr $t + 1`
- echo_i "testing wildcard behavior with 1 RPZ zone (${t})"
- add_test_marker 10.53.0.2
- run_server wildcard1
- $DIG $DIGOPTS www.test1.example.net a @10.53.0.2 -p ${PORT} > dig.out.${t}.1
- grep "status: NXDOMAIN" dig.out.${t}.1 > /dev/null || {
+t=`expr $t + 1`
+echo_i "testing wildcard behavior with 1 RPZ zone (${t})"
+run_server wildcard1
+$DIG $DIGOPTS www.test1.example.net a @10.53.0.2 -p ${PORT} > dig.out.${t}.1
+grep "status: NXDOMAIN" dig.out.${t}.1 > /dev/null || {
echo_i "test ${t} failed"
status=1
- }
- $DIG $DIGOPTS test1.example.net a @10.53.0.2 -p ${PORT} > dig.out.${t}.2
- grep "status: NXDOMAIN" dig.out.${t}.2 > /dev/null || {
+}
+$DIG $DIGOPTS test1.example.net a @10.53.0.2 -p ${PORT} > dig.out.${t}.2
+grep "status: NXDOMAIN" dig.out.${t}.2 > /dev/null || {
echo_i "test ${t} failed"
status=1
- }
-
- t=`expr $t + 1`
- echo_i "testing wildcard behavior with 2 RPZ zones (${t})"
- add_test_marker 10.53.0.2
- run_server wildcard2
- $DIG $DIGOPTS www.test1.example.net a @10.53.0.2 -p ${PORT} > dig.out.${t}.1
- grep "status: NXDOMAIN" dig.out.${t}.1 > /dev/null || {
+}
+
+t=`expr $t + 1`
+echo_i "testing wildcard behavior with 2 RPZ zones (${t})"
+run_server wildcard2
+$DIG $DIGOPTS www.test1.example.net a @10.53.0.2 -p ${PORT} > dig.out.${t}.1
+grep "status: NXDOMAIN" dig.out.${t}.1 > /dev/null || {
echo_i "test ${t} failed"
status=1
- }
- $DIG $DIGOPTS test1.example.net a @10.53.0.2 -p ${PORT} > dig.out.${t}.2
- grep "status: NXDOMAIN" dig.out.${t}.2 > /dev/null || {
+}
+$DIG $DIGOPTS test1.example.net a @10.53.0.2 -p ${PORT} > dig.out.${t}.2
+grep "status: NXDOMAIN" dig.out.${t}.2 > /dev/null || {
echo_i "test ${t} failed"
status=1
- }
-
- t=`expr $t + 1`
- echo_i "testing wildcard behavior with 1 RPZ zone and no non-wildcard triggers (${t})"
- add_test_marker 10.53.0.2
- run_server wildcard3
- $DIG $DIGOPTS www.test1.example.net a @10.53.0.2 -p ${PORT} > dig.out.${t}.1
- grep "status: NXDOMAIN" dig.out.${t}.1 > /dev/null || {
+}
+
+t=`expr $t + 1`
+echo_i "testing wildcard behavior with 1 RPZ zone and no non-wildcard triggers (${t})"
+run_server wildcard3
+$DIG $DIGOPTS www.test1.example.net a @10.53.0.2 -p ${PORT} > dig.out.${t}.1
+grep "status: NXDOMAIN" dig.out.${t}.1 > /dev/null || {
echo_i "test ${t} failed"
status=1
- }
- $DIG $DIGOPTS test1.example.net a @10.53.0.2 -p ${PORT} > dig.out.${t}.2
- grep "status: NOERROR" dig.out.${t}.2 > /dev/null || {
+}
+$DIG $DIGOPTS test1.example.net a @10.53.0.2 -p ${PORT} > dig.out.${t}.2
+grep "status: NOERROR" dig.out.${t}.2 > /dev/null || {
echo_i "test ${t} failed"
status=1
- }
-
- t=`expr $t + 1`
- echo_i "checking 'nsip-wait-recurse no' is faster than 'nsip-wait-recurse yes' ($t)"
- add_test_marker 10.53.0.2
- echo_i "timing 'nsip-wait-recurse yes' (default)"
- ret=0
- t1=`$PERL -e 'print time()."\n";'`
- $DIG -p ${PORT} @10.53.0.3 foo.child.example.tld a > dig.out.yes.$t
- t2=`$PERL -e 'print time()."\n";'`
- p1=`expr $t2 - $t1`
- echo_i "elasped time $p1 seconds"
-
- $RNDC -c ../common/rndc.conf -s 10.53.0.3 -p ${CONTROLPORT} flush
- cp -f ns3/named2.conf ns3/named.conf
- $RNDC -c ../common/rndc.conf -s 10.53.0.3 -p ${CONTROLPORT} reload > /dev/null
-
- echo_i "timing 'nsip-wait-recurse no'"
- t3=`$PERL -e 'print time()."\n";'`
- $DIG -p ${PORT} @10.53.0.3 foo.child.example.tld a > dig.out.no.$t
- t4=`$PERL -e 'print time()."\n";'`
- p2=`expr $t4 - $t3`
- echo_i "elasped time $p2 seconds"
-
- if test $p1 -le $p2; then ret=1; fi
- if test $ret != 0; then echo_i "failed"; fi
- status=`expr $status + $ret`
-
- [ $status -ne 0 ] && pf=fail || pf=pass
- case $mode in
- native)
- native=$status
- echo_i "status (native RPZ sub-test): $status ($pf)";;
- dnsrps)
- dnsrps=$status
- echo_i "status (DNSRPS sub-test): $status ($pf)";;
- *) echo_i "invalid test mode";;
- esac
-done
-status=`expr ${native:-0} + ${dnsrps:-0}`
+}
t=`expr $t + 1`
-echo "I:checking 'nsip-wait-recurse no' is faster than 'nsip-wait-recurse yes' ($t)"
-echo "I:timing 'nsip-wait-recurse yes' (default)"
+echo_i "checking 'nsip-wait-recurse no' is faster than 'nsip-wait-recurse yes' ($t)"
+echo_i "timing 'nsip-wait-recurse yes' (default)"
ret=0
t1=`$PERL -e 'print time()."\n";'`
-$DIG -p 5300 @10.53.0.3 foo.child.example.tld a > dig.out.yes.$t
+$DIG -p ${PORT} @10.53.0.3 foo.child.example.tld a > dig.out.yes.$t
t2=`$PERL -e 'print time()."\n";'`
p1=`expr $t2 - $t1`
-echo "I:elasped time $p1 seconds"
+echo_i "elasped time $p1 seconds"
-$RNDC -c ../common/rndc.conf -s 10.53.0.3 -p 9953 flush
+$RNDC -c ../common/rndc.conf -s 10.53.0.3 -p ${CONTROLPORT} flush
cp -f ns3/named2.conf ns3/named.conf
-$RNDC -c ../common/rndc.conf -s 10.53.0.3 -p 9953 reload > /dev/null
+$RNDC -c ../common/rndc.conf -s 10.53.0.3 -p ${CONTROLPORT} reload > /dev/null
-echo "I:timing 'nsip-wait-recurse no'"
+echo_i "timing 'nsip-wait-recurse no'"
t3=`$PERL -e 'print time()."\n";'`
-$DIG -p 5300 @10.53.0.3 foo.child.example.tld a > dig.out.no.$t
+$DIG -p ${PORT} @10.53.0.3 foo.child.example.tld a > dig.out.no.$t
t4=`$PERL -e 'print time()."\n";'`
p2=`expr $t4 - $t3`
-echo "I:elasped time $p2 seconds"
+echo_i "elasped time $p2 seconds"
if test $p1 -le $p2; then ret=1; fi
-if test $ret != 0; then echo "I:failed"; fi
+if test $ret != 0; then echo_i "failed"; fi
status=`expr $status + $ret`
-echo "I:exit status: $status"
+echo_i "exit status: $status"
[ $status -eq 0 ] || exit 1
projects / thirdparty / bind9.git / commitdiff
