diff options
author | Cedric Berger <cedric@cvs.openbsd.org> | 2003-01-15 17:08:17 +0000 |
---|---|---|
committer | Cedric Berger <cedric@cvs.openbsd.org> | 2003-01-15 17:08:17 +0000 |
commit | 78ae833db046f5889e4b0e8054f703c70591f4d1 (patch) | |
tree | 5fa0e263f40d710d99327e8e7a56b0693483aaa2 | |
parent | d3a8b6e5ebf772eca59716d7480aaf1f5a56759f (diff) |
Bunch of new regression tests. The only missing thing now is tests
for the <table> syntax in rules.
-rw-r--r-- | regress/sbin/pfctl/Makefile | 4 | ||||
-rw-r--r-- | regress/sbin/pfctl/pfr.exec | 66 | ||||
-rw-r--r-- | regress/sbin/pfctl/pfr1.in | 1 | ||||
-rw-r--r-- | regress/sbin/pfctl/pfr1.ok | 46 | ||||
-rw-r--r-- | regress/sbin/pfctl/pfr10.in | 16 | ||||
-rw-r--r-- | regress/sbin/pfctl/pfr10.ok | 44 | ||||
-rw-r--r-- | regress/sbin/pfctl/pfr11.in | 10 | ||||
-rw-r--r-- | regress/sbin/pfctl/pfr11.ok | 34 | ||||
-rw-r--r-- | regress/sbin/pfctl/pfr12.in | 18 | ||||
-rw-r--r-- | regress/sbin/pfctl/pfr12.ok | 47 | ||||
-rw-r--r-- | regress/sbin/pfctl/pfr2.in | 1 | ||||
-rw-r--r-- | regress/sbin/pfctl/pfr2.ok | 46 | ||||
-rw-r--r-- | regress/sbin/pfctl/pfr3.ok | 40 | ||||
-rw-r--r-- | regress/sbin/pfctl/pfr4.ok | 52 | ||||
-rw-r--r-- | regress/sbin/pfctl/pfr5.ok | 196 | ||||
-rw-r--r-- | regress/sbin/pfctl/pfr6.ok | 68 | ||||
-rw-r--r-- | regress/sbin/pfctl/pfr7.ok | 8 | ||||
-rw-r--r-- | regress/sbin/pfctl/pfr8.ok | 16 | ||||
-rw-r--r-- | regress/sbin/pfctl/pfr9.ok | 66 |
19 files changed, 477 insertions, 302 deletions
diff --git a/regress/sbin/pfctl/Makefile b/regress/sbin/pfctl/Makefile index 9a3cb433e0c..26c7c26b7c2 100644 --- a/regress/sbin/pfctl/Makefile +++ b/regress/sbin/pfctl/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.62 2003/01/14 15:37:29 henning Exp $ +# $OpenBSD: Makefile,v 1.63 2003/01/15 17:08:16 cedric Exp $ PFTESTS=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 PFTESTS+=28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 @@ -7,7 +7,7 @@ PFSIMPLE=1 2 PFSETUP=1 PFLOAD=1 2 3 4 5 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 23 24 25 26 27 28 29 PFLOAD+=30 31 32 33 34 35 36 38 39 40 43 44 -PFTABLE=1 2 3 4 5 6 7 8 9 +PFTABLE=1 2 3 4 5 6 7 8 9 10 11 12 .for n in ${PFFAIL} REGRESS_TARGETS+=pfail${n} diff --git a/regress/sbin/pfctl/pfr.exec b/regress/sbin/pfctl/pfr.exec index 31deb8014c3..98868b51b1c 100644 --- a/regress/sbin/pfctl/pfr.exec +++ b/regress/sbin/pfctl/pfr.exec @@ -1,9 +1,13 @@ #!/bin/ksh +for TABLE in `pfctl -sT | grep regress`; do + pfctl -t $TABLE -qTk 2>&1 || exit 1 +done +pfctl -Fr -a regress:regress 2>/dev/null +pfctl -Fn -a regress:regress 2>/dev/null KT_A=0`vmstat -m | awk '/pfrktable/{print $3}'` KT_R=0`vmstat -m | awk '/pfrktable/{print $5}'` KE_A=0`vmstat -m | awk '/pfrkentry/{print $3}'` KE_R=0`vmstat -m | awk '/pfrkentry/{print $5}'` -pfctl -t regress -qTk 2>&1 || exit 1 echo "# create" pfctl -t regress -Tc 2>&1 || exit 1 for LINE in `sed -e "s/ /_/g" $1`; do @@ -15,34 +19,63 @@ for LINE in `sed -e "s/ /_/g" $1`; do CMD=`echo $LINE | awk '{split($1,a,"_");print a[2]}'` ARGSX=`echo $LINE | awk '{split($1,a,"_");for(i=3;a[i];i++)print a[i]}'` ARGS="" - for ARG in $ARGSX; do ARGS="$ARGS $ARG"; done + for ARG in $ARGSX; do + if [ "X$ARGS" = "X" ]; then + ARGS="$ARG" + else + ARGS="$ARGS $ARG" + fi + done if [ "$RESULT" = "pass" ]; then case $CMD in - a*|d*|r*) - echo "# $CMD -n $ARGS" + add|delete|replace) + echo "# pass $CMD -n $ARGS" pfctl -t regress -nT $CMD $ARGS 2>&1 || exit 1 - echo "# $CMD -nf-" + echo "# pass $CMD -nf-" echo "# test\n" $ARGSX | pfctl -t regress -nT $CMD -f- \ 2>&1 || exit 1 - echo "# $CMD -nqv" + echo "# pass $CMD -nqv $ARGS" pfctl -t regress -nqvT $CMD $ARGS 2>&1 || exit 1 - echo "# $CMD -nqvv" + echo "# pass $CMD -nqvv $ARGS" pfctl -t regress -nqvvT $CMD $ARGS 2>&1 || exit 1 ;; esac fi + echo "# $RESULT $CMD $ARGS" if [ "$RESULT" = "pass" ]; then - echo "# $CMD" - pfctl -t regress -T $CMD $ARGS 2>&1 || exit 1 + case $CMD in + list) + (pfctl -sT | grep regress) 2>&1 + echo "# pass $CMD -v" + (pfctl -vsT | grep regress) 2>&1 + ;; + load) + echo $ARGS | pfctl -Tl -f- || exit 1 + ;; + rule) + echo $ARGS | pfctl -a regress:regress -f- 2>&1 || exit 1 + ;; + *) + pfctl -t regress -T $CMD $ARGS 2>&1 || exit 1 + ;; + esac else - echo "# $CMD" - pfctl -t regress -T $CMD $ARGS 2>&1 && exit 1 + case $CMD in + load) + echo $ARGS | pfctl -Tl -f- && exit 1 + ;; + rule) + echo $ARGS | pfctl -a regress:regress -f- 2>&1 && exit 1 ;; + *) + pfctl -t regress -T $CMD $ARGS 2>&1 && exit 1 + ;; + esac fi done -echo "# table" -pfctl -sT | grep regress 2>&1 || exit 1 -echo "# table -v" -pfctl -vsT | grep regress 2>&1 || exit 1 echo "# kill" -pfctl -t regress -Tk 2>&1 || exit 1 +for TABLE in `pfctl -sT | grep regress`; do + pfctl -t $TABLE -Tk 2>&1 || exit 1 +done +pfctl -Fr -a regress:regress 2>/dev/null +pfctl -Fn -a regress:regress 2>/dev/null let KT_A=`vmstat -m | awk '/pfrktable/{print $3}'`-$KT_A let KT_R=`vmstat -m | awk '/pfrktable/{print $5}'`-$KT_R let KT_L=$KT_A-$KT_R @@ -52,4 +85,3 @@ let KE_L=$KE_A-$KE_R echo "ktable: $KT_A allocated, $KT_R released, $KT_L leaked." echo "kentry: $KE_A allocated, $KE_R released, $KE_L leaked." [ "$KT_L" = "0" -a "$KE_L" = "0" ] || exit 1 - diff --git a/regress/sbin/pfctl/pfr1.in b/regress/sbin/pfctl/pfr1.in index d0baf186daf..30fc8d4164d 100644 --- a/regress/sbin/pfctl/pfr1.in +++ b/regress/sbin/pfctl/pfr1.in @@ -8,3 +8,4 @@ pass zero pass show pass flush pass show +pass list diff --git a/regress/sbin/pfctl/pfr1.ok b/regress/sbin/pfctl/pfr1.ok index 105a634b0d7..b9a66ce18f0 100644 --- a/regress/sbin/pfctl/pfr1.ok +++ b/regress/sbin/pfctl/pfr1.ok @@ -1,61 +1,61 @@ # create 1 table added. -# add -n 1.1.1.1 1.1.1.2 1.1.1.3 +# pass add -n 1.1.1.1 1.1.1.2 1.1.1.3 3/3 addresses added (dummy). -# add -nf- +# pass add -nf- 3/3 addresses added (dummy). -# add -nqv +# pass add -nqv 1.1.1.1 1.1.1.2 1.1.1.3 A 1.1.1.1 A 1.1.1.2 A 1.1.1.3 -# add -nqvv +# pass add -nqvv 1.1.1.1 1.1.1.2 1.1.1.3 A 1.1.1.1 A 1.1.1.2 A 1.1.1.3 -# add +# pass add 1.1.1.1 1.1.1.2 1.1.1.3 3/3 addresses added. -# delete -n 1.1.1.1 1.1.1.2 1.1.1.4 +# pass delete -n 1.1.1.1 1.1.1.2 1.1.1.4 2/3 addresses deleted (dummy). -# delete -nf- +# pass delete -nf- 2/3 addresses deleted (dummy). -# delete -nqv +# pass delete -nqv 1.1.1.1 1.1.1.2 1.1.1.4 D 1.1.1.1 D 1.1.1.2 -# delete -nqvv +# pass delete -nqvv 1.1.1.1 1.1.1.2 1.1.1.4 D 1.1.1.1 D 1.1.1.2 1.1.1.4 -# delete +# pass delete 1.1.1.1 1.1.1.2 1.1.1.4 2/3 addresses deleted. -# replace -n 1.1.1.1 1.1.1.2 1.1.1.3 +# pass replace -n 1.1.1.1 1.1.1.2 1.1.1.3 2 addresses added (dummy). -# replace -nf- +# pass replace -nf- 2 addresses added (dummy). -# replace -nqv +# pass replace -nqv 1.1.1.1 1.1.1.2 1.1.1.3 A 1.1.1.1 A 1.1.1.2 -# replace -nqvv +# pass replace -nqvv 1.1.1.1 1.1.1.2 1.1.1.3 A 1.1.1.1 A 1.1.1.2 1.1.1.3 -# replace +# pass replace 1.1.1.1 1.1.1.2 1.1.1.3 2 addresses added. -# test +# pass test 1.1.1.1 1.1.1.2 1.1.1.3 3/3 addresses match. -# test +# fail test 1.1.1.1 1.1.1.2 1.1.1.4 2/3 addresses match. -# zero +# pass zero 1 table/stats cleared. -# show +# pass show 1.1.1.1 1.1.1.2 1.1.1.3 -# flush +# pass flush 3 addresses deleted. -# show -# table +# pass show +# pass list regress -# table -v +# pass list -v -pa-- regress # kill 1 table deleted. diff --git a/regress/sbin/pfctl/pfr10.in b/regress/sbin/pfctl/pfr10.in new file mode 100644 index 00000000000..2eb22393cf2 --- /dev/null +++ b/regress/sbin/pfctl/pfr10.in @@ -0,0 +1,16 @@ +# table loading from pf.conf +pass list +pass load table <regress.1> const +pass list +pass load table <regress.1> persist const +pass list +pass load table <regress.1> persist +pass list +pass load table <regress.1> +pass list +pass load table <regress> persist { 1.2.3.4 1.2.3.4 4.3.2.1 } +pass show +pass load table <regress> persist +pass show +pass load table <regress> persist {} +pass show diff --git a/regress/sbin/pfctl/pfr10.ok b/regress/sbin/pfctl/pfr10.ok new file mode 100644 index 00000000000..9164e6e95b1 --- /dev/null +++ b/regress/sbin/pfctl/pfr10.ok @@ -0,0 +1,44 @@ +# create +1 table added. +# pass list +regress +# pass list -v +-pa-- regress +# pass load table <regress.1> const +# pass list +regress +# pass list -v +-pa-- regress +# pass load table <regress.1> persist const +# pass list +regress +regress.1 +# pass list -v +-pa-- regress +cpa-- regress.1 +# pass load table <regress.1> persist +# pass list +regress +regress.1 +# pass list -v +-pa-- regress +-pa-- regress.1 +# pass load table <regress.1> +# pass list +regress +# pass list -v +-pa-- regress +# pass load table <regress> persist { 1.2.3.4 1.2.3.4 4.3.2.1 } +# pass show + 1.2.3.4 + 4.3.2.1 +# pass load table <regress> persist +# pass show + 1.2.3.4 + 4.3.2.1 +# pass load table <regress> persist {} +# pass show +# kill +1 table deleted. +ktable: 10 allocated, 10 released, 0 leaked. +kentry: 2 allocated, 2 released, 0 leaked. diff --git a/regress/sbin/pfctl/pfr11.in b/regress/sbin/pfctl/pfr11.in new file mode 100644 index 00000000000..007ecbf4ea6 --- /dev/null +++ b/regress/sbin/pfctl/pfr11.in @@ -0,0 +1,10 @@ +# hidden tables created by rules +pass list +pass rule pass in from <regress.1> to any +pass list +pass rule pass in from <regress.1> to <regress.2> +pass list +pass rule pass in from <regress.1> to any +pass list +pass rule +pass list diff --git a/regress/sbin/pfctl/pfr11.ok b/regress/sbin/pfctl/pfr11.ok new file mode 100644 index 00000000000..4e07804cd8c --- /dev/null +++ b/regress/sbin/pfctl/pfr11.ok @@ -0,0 +1,34 @@ +# create +1 table added. +# pass list +regress +# pass list -v +-pa-- regress +# pass rule pass in from <regress.1> to any +# pass list +regress +# pass list -v +-pa-- regress +----r regress.1 +# pass rule pass in from <regress.1> to <regress.2> +# pass list +regress +# pass list -v +-pa-- regress +----r regress.1 +----r regress.2 +# pass rule pass in from <regress.1> to any +# pass list +regress +# pass list -v +-pa-- regress +----r regress.1 +# pass rule +# pass list +regress +# pass list -v +-pa-- regress +# kill +1 table deleted. +ktable: 3 allocated, 3 released, 0 leaked. +kentry: 0 allocated, 0 released, 0 leaked. diff --git a/regress/sbin/pfctl/pfr12.in b/regress/sbin/pfctl/pfr12.in new file mode 100644 index 00000000000..0b1a6614990 --- /dev/null +++ b/regress/sbin/pfctl/pfr12.in @@ -0,0 +1,18 @@ +# hidden tables created by rules +pass list +pass kill +pass list +pass rule pass in from <regress> to any +pass list +pass create +pass list +pass rule +pass list +pass kill +pass list +pass rule pass in from <regress> to any +pass list +pass load table <regress> persist +pass list +pass rule +pass list diff --git a/regress/sbin/pfctl/pfr12.ok b/regress/sbin/pfctl/pfr12.ok new file mode 100644 index 00000000000..263c76e2d87 --- /dev/null +++ b/regress/sbin/pfctl/pfr12.ok @@ -0,0 +1,47 @@ +# create +1 table added. +# pass list +regress +# pass list -v +-pa-- regress +# pass kill +1 table deleted. +# pass list +# pass list -v +# pass rule pass in from <regress> to any +# pass list +# pass list -v +----r regress +# pass create +1 table added. +# pass list +regress +# pass list -v +-pa-r regress +# pass rule +# pass list +regress +# pass list -v +-pa-- regress +# pass kill +1 table deleted. +# pass list +# pass list -v +# pass rule pass in from <regress> to any +# pass list +# pass list -v +----r regress +# pass load table <regress> persist +# pass list +regress +# pass list -v +-pa-r regress +# pass rule +# pass list +regress +# pass list -v +-pa-- regress +# kill +1 table deleted. +ktable: 4 allocated, 4 released, 0 leaked. +kentry: 0 allocated, 0 released, 0 leaked. diff --git a/regress/sbin/pfctl/pfr2.in b/regress/sbin/pfctl/pfr2.in index 76ca32d0717..c4e43c2e81f 100644 --- a/regress/sbin/pfctl/pfr2.in +++ b/regress/sbin/pfctl/pfr2.in @@ -8,3 +8,4 @@ pass zero pass show pass flush pass show +pass list diff --git a/regress/sbin/pfctl/pfr2.ok b/regress/sbin/pfctl/pfr2.ok index 223b2c3c94e..8fe19a188b9 100644 --- a/regress/sbin/pfctl/pfr2.ok +++ b/regress/sbin/pfctl/pfr2.ok @@ -1,61 +1,61 @@ # create 1 table added. -# add -n ::1 ::2 FE80::1 +# pass add -n ::1 ::2 FE80::1 3/3 addresses added (dummy). -# add -nf- +# pass add -nf- 3/3 addresses added (dummy). -# add -nqv +# pass add -nqv ::1 ::2 FE80::1 A ::1 A ::2 A fe80::1 -# add -nqvv +# pass add -nqvv ::1 ::2 FE80::1 A ::1 A ::2 A fe80::1 -# add +# pass add ::1 ::2 FE80::1 3/3 addresses added. -# delete -n ::1 ::2 FE80::2 +# pass delete -n ::1 ::2 FE80::2 2/3 addresses deleted (dummy). -# delete -nf- +# pass delete -nf- 2/3 addresses deleted (dummy). -# delete -nqv +# pass delete -nqv ::1 ::2 FE80::2 D ::1 D ::2 -# delete -nqvv +# pass delete -nqvv ::1 ::2 FE80::2 D ::1 D ::2 fe80::2 -# delete +# pass delete ::1 ::2 FE80::2 2/3 addresses deleted. -# replace -n ::1 ::2 FE80::1 +# pass replace -n ::1 ::2 FE80::1 2 addresses added (dummy). -# replace -nf- +# pass replace -nf- 2 addresses added (dummy). -# replace -nqv +# pass replace -nqv ::1 ::2 FE80::1 A ::1 A ::2 -# replace -nqvv +# pass replace -nqvv ::1 ::2 FE80::1 A ::1 A ::2 fe80::1 -# replace +# pass replace ::1 ::2 FE80::1 2 addresses added. -# test +# pass test ::1 ::2 FE80::1 3/3 addresses match. -# test +# fail test ::1 ::2 FE80::2 2/3 addresses match. -# zero +# pass zero 1 table/stats cleared. -# show +# pass show ::1 ::2 fe80::1 -# flush +# pass flush 3 addresses deleted. -# show -# table +# pass show +# pass list regress -# table -v +# pass list -v -pa-- regress # kill 1 table deleted. diff --git a/regress/sbin/pfctl/pfr3.ok b/regress/sbin/pfctl/pfr3.ok index a83ebaac152..2343b99974f 100644 --- a/regress/sbin/pfctl/pfr3.ok +++ b/regress/sbin/pfctl/pfr3.ok @@ -1,61 +1,57 @@ # create 1 table added. -# add -n 10 10.11 10.11.12 10.11.12.13 +# pass add -n 10 10.11 10.11.12 10.11.12.13 4/4 addresses added (dummy). -# add -nf- +# pass add -nf- 4/4 addresses added (dummy). -# add -nqv +# pass add -nqv 10 10.11 10.11.12 10.11.12.13 A 10.0.0.0/8 A 10.11.0.0/16 A 10.11.12.0/24 A 10.11.12.13 -# add -nqvv +# pass add -nqvv 10 10.11 10.11.12 10.11.12.13 A 10.0.0.0/8 A 10.11.0.0/16 A 10.11.12.0/24 A 10.11.12.13 -# add +# pass add 10 10.11 10.11.12 10.11.12.13 4/4 addresses added. -# delete -n 10.11.0.0/16 10.11.12.0/24 +# pass delete -n 10.11.0.0/16 10.11.12.0/24 2/2 addresses deleted (dummy). -# delete -nf- +# pass delete -nf- 2/2 addresses deleted (dummy). -# delete -nqv +# pass delete -nqv 10.11.0.0/16 10.11.12.0/24 D 10.11.0.0/16 D 10.11.12.0/24 -# delete -nqvv +# pass delete -nqvv 10.11.0.0/16 10.11.12.0/24 D 10.11.0.0/16 D 10.11.12.0/24 -# delete +# pass delete 10.11.0.0/16 10.11.12.0/24 2/2 addresses deleted. -# replace -n 10.0/8 172.16.0/12 192.168.0/16 +# pass replace -n 10.0/8 172.16.0/12 192.168.0/16 2 addresses added (dummy). 1 addresses deleted (dummy). -# replace -nf- +# pass replace -nf- 2 addresses added (dummy). 1 addresses deleted (dummy). -# replace -nqv +# pass replace -nqv 10.0/8 172.16.0/12 192.168.0/16 A 172.16.0.0/12 A 192.168.0.0/16 D 10.11.12.13 -# replace -nqvv +# pass replace -nqvv 10.0/8 172.16.0/12 192.168.0/16 10.0.0.0/8 A 172.16.0.0/12 A 192.168.0.0/16 D 10.11.12.13 -# replace +# pass replace 10.0/8 172.16.0/12 192.168.0/16 2 addresses added. 1 addresses deleted. -# test +# pass test 10.1.1.1 172.17.1.1 192.168.1.1 3/3 addresses match. -# test +# fail test 11.1.1.1 0/1 addresses match. -# test +# fail test 10.1.1.1 11.1.1.1 1/2 addresses match. -# table -regress -# table -v --pa-- regress # kill 1 table deleted. ktable: 11 allocated, 11 released, 0 leaked. diff --git a/regress/sbin/pfctl/pfr4.ok b/regress/sbin/pfctl/pfr4.ok index f5ac929a97a..cb1a384147b 100644 --- a/regress/sbin/pfctl/pfr4.ok +++ b/regress/sbin/pfctl/pfr4.ok @@ -1,10 +1,10 @@ # create 1 table added. -# replace -n 0/0 0/1 0/2 0/3 0/4 0/5 0/6 0/7 +# pass replace -n 0/0 0/1 0/2 0/3 0/4 0/5 0/6 0/7 8 addresses added (dummy). -# replace -nf- +# pass replace -nf- 8 addresses added (dummy). -# replace -nqv +# pass replace -nqv 0/0 0/1 0/2 0/3 0/4 0/5 0/6 0/7 A 0.0.0.0/0 A 0.0.0.0/1 A 0.0.0.0/2 @@ -13,7 +13,7 @@ A 0.0.0.0/4 A 0.0.0.0/5 A 0.0.0.0/6 A 0.0.0.0/7 -# replace -nqvv +# pass replace -nqvv 0/0 0/1 0/2 0/3 0/4 0/5 0/6 0/7 A 0.0.0.0/0 A 0.0.0.0/1 A 0.0.0.0/2 @@ -22,9 +22,9 @@ A 0.0.0.0/4 A 0.0.0.0/5 A 0.0.0.0/6 A 0.0.0.0/7 -# replace +# pass replace 0/0 0/1 0/2 0/3 0/4 0/5 0/6 0/7 8 addresses added. -# show +# pass show 0.0.0.0/0 0.0.0.0/7 0.0.0.0/6 @@ -33,13 +33,13 @@ A 0.0.0.0/7 0.0.0.0/3 0.0.0.0/2 0.0.0.0/1 -# replace -n 0/8 0/9 0/10 0/11 0/12 0/13 0/14 0/15 +# pass replace -n 0/8 0/9 0/10 0/11 0/12 0/13 0/14 0/15 8 addresses added (dummy). 8 addresses deleted (dummy). -# replace -nf- +# pass replace -nf- 8 addresses added (dummy). 8 addresses deleted (dummy). -# replace -nqv +# pass replace -nqv 0/8 0/9 0/10 0/11 0/12 0/13 0/14 0/15 A 0.0.0.0/8 A 0.0.0.0/9 A 0.0.0.0/10 @@ -56,7 +56,7 @@ D 0.0.0.0/5 D 0.0.0.0/6 D 0.0.0.0/7 D 0.0.0.0/0 -# replace -nqvv +# pass replace -nqvv 0/8 0/9 0/10 0/11 0/12 0/13 0/14 0/15 A 0.0.0.0/8 A 0.0.0.0/9 A 0.0.0.0/10 @@ -73,10 +73,10 @@ D 0.0.0.0/5 D 0.0.0.0/6 D 0.0.0.0/7 D 0.0.0.0/0 -# replace +# pass replace 0/8 0/9 0/10 0/11 0/12 0/13 0/14 0/15 8 addresses added. 8 addresses deleted. -# show +# pass show 0.0.0.0/15 0.0.0.0/14 0.0.0.0/13 @@ -85,13 +85,13 @@ D 0.0.0.0/0 0.0.0.0/10 0.0.0.0/9 0.0.0.0/8 -# replace -n 0/16 0/17 0/18 0/19 0/20 0/21 0/22 0/23 +# pass replace -n 0/16 0/17 0/18 0/19 0/20 0/21 0/22 0/23 8 addresses added (dummy). 8 addresses deleted (dummy). -# replace -nf- +# pass replace -nf- 8 addresses added (dummy). 8 addresses deleted (dummy). -# replace -nqv +# pass replace -nqv 0/16 0/17 0/18 0/19 0/20 0/21 0/22 0/23 A 0.0.0.0/16 A 0.0.0.0/17 A 0.0.0.0/18 @@ -108,7 +108,7 @@ D 0.0.0.0/12 D 0.0.0.0/13 D 0.0.0.0/14 D 0.0.0.0/15 -# replace -nqvv +# pass replace -nqvv 0/16 0/17 0/18 0/19 0/20 0/21 0/22 0/23 A 0.0.0.0/16 A 0.0.0.0/17 A 0.0.0.0/18 @@ -125,10 +125,10 @@ D 0.0.0.0/12 D 0.0.0.0/13 D 0.0.0.0/14 D 0.0.0.0/15 -# replace +# pass replace 0/16 0/17 0/18 0/19 0/20 0/21 0/22 0/23 8 addresses added. 8 addresses deleted. -# show +# pass show 0.0.0.0/23 0.0.0.0/22 0.0.0.0/21 @@ -137,13 +137,13 @@ D 0.0.0.0/15 0.0.0.0/18 0.0.0.0/17 0.0.0.0/16 -# replace -n 0/24 0/25 0/26 0/27 0/28 0/29 0/30 0/31 +# pass replace -n 0/24 0/25 0/26 0/27 0/28 0/29 0/30 0/31 8 addresses added (dummy). 8 addresses deleted (dummy). -# replace -nf- +# pass replace -nf- 8 addresses added (dummy). 8 addresses deleted (dummy). -# replace -nqv +# pass replace -nqv 0/24 0/25 0/26 0/27 0/28 0/29 0/30 0/31 A 0.0.0.0/24 A 0.0.0.0/25 A 0.0.0.0/26 @@ -160,7 +160,7 @@ D 0.0.0.0/20 D 0.0.0.0/21 D 0.0.0.0/22 D 0.0.0.0/23 -# replace -nqvv +# pass replace -nqvv 0/24 0/25 0/26 0/27 0/28 0/29 0/30 0/31 A 0.0.0.0/24 A 0.0.0.0/25 A 0.0.0.0/26 @@ -177,10 +177,10 @@ D 0.0.0.0/20 D 0.0.0.0/21 D 0.0.0.0/22 D 0.0.0.0/23 -# replace +# pass replace 0/24 0/25 0/26 0/27 0/28 0/29 0/30 0/31 8 addresses added. 8 addresses deleted. -# show +# pass show 0.0.0.0/31 0.0.0.0/30 0.0.0.0/29 @@ -189,10 +189,6 @@ D 0.0.0.0/23 0.0.0.0/26 0.0.0.0/25 0.0.0.0/24 -# table -regress -# table -v --pa-- regress # kill 1 table deleted. ktable: 21 allocated, 21 released, 0 leaked. diff --git a/regress/sbin/pfctl/pfr5.ok b/regress/sbin/pfctl/pfr5.ok index 70da37b46f9..6779bdd3091 100644 --- a/regress/sbin/pfctl/pfr5.ok +++ b/regress/sbin/pfctl/pfr5.ok @@ -1,10 +1,10 @@ # create 1 table added. -# replace -n ::/0 ::/1 ::/2 ::/3 ::/4 ::/5 ::/6 ::/7 +# pass replace -n ::/0 ::/1 ::/2 ::/3 ::/4 ::/5 ::/6 ::/7 8 addresses added (dummy). -# replace -nf- +# pass replace -nf- 8 addresses added (dummy). -# replace -nqv +# pass replace -nqv ::/0 ::/1 ::/2 ::/3 ::/4 ::/5 ::/6 ::/7 A ::/0 A ::/1 A ::/2 @@ -13,7 +13,7 @@ A ::/4 A ::/5 A ::/6 A ::/7 -# replace -nqvv +# pass replace -nqvv ::/0 ::/1 ::/2 ::/3 ::/4 ::/5 ::/6 ::/7 A ::/0 A ::/1 A ::/2 @@ -22,9 +22,9 @@ A ::/4 A ::/5 A ::/6 A ::/7 -# replace +# pass replace ::/0 ::/1 ::/2 ::/3 ::/4 ::/5 ::/6 ::/7 8 addresses added. -# show +# pass show ::/0 ::/7 ::/6 @@ -33,13 +33,13 @@ A ::/7 ::/3 ::/2 ::/1 -# replace -n ::/8 ::/9 ::/10 ::/11 ::/12 ::/13 ::/14 ::/15 +# pass replace -n ::/8 ::/9 ::/10 ::/11 ::/12 ::/13 ::/14 ::/15 8 addresses added (dummy). 8 addresses deleted (dummy). -# replace -nf- +# pass replace -nf- 8 addresses added (dummy). 8 addresses deleted (dummy). -# replace -nqv +# pass replace -nqv ::/8 ::/9 ::/10 ::/11 ::/12 ::/13 ::/14 ::/15 A ::/8 A ::/9 A ::/10 @@ -56,7 +56,7 @@ D ::/5 D ::/6 D ::/7 D ::/0 -# replace -nqvv +# pass replace -nqvv ::/8 ::/9 ::/10 ::/11 ::/12 ::/13 ::/14 ::/15 A ::/8 A ::/9 A ::/10 @@ -73,10 +73,10 @@ D ::/5 D ::/6 D ::/7 D ::/0 -# replace +# pass replace ::/8 ::/9 ::/10 ::/11 ::/12 ::/13 ::/14 ::/15 8 addresses added. 8 addresses deleted. -# show +# pass show ::/15 ::/14 ::/13 @@ -85,13 +85,13 @@ D ::/0 ::/10 ::/9 ::/8 -# replace -n ::/16 ::/17 ::/18 ::/19 ::/20 ::/21 ::/22 ::/23 +# pass replace -n ::/16 ::/17 ::/18 ::/19 ::/20 ::/21 ::/22 ::/23 8 addresses added (dummy). 8 addresses deleted (dummy). -# replace -nf- +# pass replace -nf- 8 addresses added (dummy). 8 addresses deleted (dummy). -# replace -nqv +# pass replace -nqv ::/16 ::/17 ::/18 ::/19 ::/20 ::/21 ::/22 ::/23 A ::/16 A ::/17 A ::/18 @@ -108,7 +108,7 @@ D ::/12 D ::/13 D ::/14 D ::/15 -# replace -nqvv +# pass replace -nqvv ::/16 ::/17 ::/18 ::/19 ::/20 ::/21 ::/22 ::/23 A ::/16 A ::/17 A ::/18 @@ -125,10 +125,10 @@ D ::/12 D ::/13 D ::/14 D ::/15 -# replace +# pass replace ::/16 ::/17 ::/18 ::/19 ::/20 ::/21 ::/22 ::/23 8 addresses added. 8 addresses deleted. -# show +# pass show ::/23 ::/22 ::/21 @@ -137,13 +137,13 @@ D ::/15 ::/18 ::/17 ::/16 -# replace -n ::/24 ::/25 ::/26 ::/27 ::/28 ::/29 ::/30 ::/31 +# pass replace -n ::/24 ::/25 ::/26 ::/27 ::/28 ::/29 ::/30 ::/31 8 addresses added (dummy). 8 addresses deleted (dummy). -# replace -nf- +# pass replace -nf- 8 addresses added (dummy). 8 addresses deleted (dummy). -# replace -nqv +# pass replace -nqv ::/24 ::/25 ::/26 ::/27 ::/28 ::/29 ::/30 ::/31 A ::/24 A ::/25 A ::/26 @@ -160,7 +160,7 @@ D ::/20 D ::/21 D ::/22 D ::/23 -# replace -nqvv +# pass replace -nqvv ::/24 ::/25 ::/26 ::/27 ::/28 ::/29 ::/30 ::/31 A ::/24 A ::/25 A ::/26 @@ -177,10 +177,10 @@ D ::/20 D ::/21 D ::/22 D ::/23 -# replace +# pass replace ::/24 ::/25 ::/26 ::/27 ::/28 ::/29 ::/30 ::/31 8 addresses added. 8 addresses deleted. -# show +# pass show ::/31 ::/30 ::/29 @@ -189,13 +189,13 @@ D ::/23 ::/26 ::/25 ::/24 -# replace -n ::/32 ::/33 ::/34 ::/35 ::/36 ::/37 ::/38 ::/39 +# pass replace -n ::/32 ::/33 ::/34 ::/35 ::/36 ::/37 ::/38 ::/39 8 addresses added (dummy). 8 addresses deleted (dummy). -# replace -nf- +# pass replace -nf- 8 addresses added (dummy). 8 addresses deleted (dummy). -# replace -nqv +# pass replace -nqv ::/32 ::/33 ::/34 ::/35 ::/36 ::/37 ::/38 ::/39 A ::/32 A ::/33 A ::/34 @@ -212,7 +212,7 @@ D ::/28 D ::/29 D ::/30 D ::/31 -# replace -nqvv +# pass replace -nqvv ::/32 ::/33 ::/34 ::/35 ::/36 ::/37 ::/38 ::/39 A ::/32 A ::/33 A ::/34 @@ -229,10 +229,10 @@ D ::/28 D ::/29 D ::/30 D ::/31 -# replace +# pass replace ::/32 ::/33 ::/34 ::/35 ::/36 ::/37 ::/38 ::/39 8 addresses added. 8 addresses deleted. -# show +# pass show ::/39 ::/38 ::/37 @@ -241,13 +241,13 @@ D ::/31 ::/34 ::/33 ::/32 -# replace -n ::/40 ::/41 ::/42 ::/43 ::/44 ::/45 ::/46 ::/47 +# pass replace -n ::/40 ::/41 ::/42 ::/43 ::/44 ::/45 ::/46 ::/47 8 addresses added (dummy). 8 addresses deleted (dummy). -# replace -nf- +# pass replace -nf- 8 addresses added (dummy). 8 addresses deleted (dummy). -# replace -nqv +# pass replace -nqv ::/40 ::/41 ::/42 ::/43 ::/44 ::/45 ::/46 ::/47 A ::/40 A ::/41 A ::/42 @@ -264,7 +264,7 @@ D ::/36 D ::/37 D ::/38 D ::/39 -# replace -nqvv +# pass replace -nqvv ::/40 ::/41 ::/42 ::/43 ::/44 ::/45 ::/46 ::/47 A ::/40 A ::/41 A ::/42 @@ -281,10 +281,10 @@ D ::/36 D ::/37 D ::/38 D ::/39 -# replace +# pass replace ::/40 ::/41 ::/42 ::/43 ::/44 ::/45 ::/46 ::/47 8 addresses added. 8 addresses deleted. -# show +# pass show ::/47 ::/46 ::/45 @@ -293,13 +293,13 @@ D ::/39 ::/42 ::/41 ::/40 -# replace -n ::/48 ::/49 ::/50 ::/51 ::/52 ::/53 ::/54 ::/55 +# pass replace -n ::/48 ::/49 ::/50 ::/51 ::/52 ::/53 ::/54 ::/55 8 addresses added (dummy). 8 addresses deleted (dummy). -# replace -nf- +# pass replace -nf- 8 addresses added (dummy). 8 addresses deleted (dummy). -# replace -nqv +# pass replace -nqv ::/48 ::/49 ::/50 ::/51 ::/52 ::/53 ::/54 ::/55 A ::/48 A ::/49 A ::/50 @@ -316,7 +316,7 @@ D ::/44 D ::/45 D ::/46 D ::/47 -# replace -nqvv +# pass replace -nqvv ::/48 ::/49 ::/50 ::/51 ::/52 ::/53 ::/54 ::/55 A ::/48 A ::/49 A ::/50 @@ -333,10 +333,10 @@ D ::/44 D ::/45 D ::/46 D ::/47 -# replace +# pass replace ::/48 ::/49 ::/50 ::/51 ::/52 ::/53 ::/54 ::/55 8 addresses added. 8 addresses deleted. -# show +# pass show ::/55 ::/54 ::/53 @@ -345,13 +345,13 @@ D ::/47 ::/50 ::/49 ::/48 -# replace -n ::/56 ::/57 ::/58 ::/59 ::/60 ::/61 ::/62 ::/63 +# pass replace -n ::/56 ::/57 ::/58 ::/59 ::/60 ::/61 ::/62 ::/63 8 addresses added (dummy). 8 addresses deleted (dummy). -# replace -nf- +# pass replace -nf- 8 addresses added (dummy). 8 addresses deleted (dummy). -# replace -nqv +# pass replace -nqv ::/56 ::/57 ::/58 ::/59 ::/60 ::/61 ::/62 ::/63 A ::/56 A ::/57 A ::/58 @@ -368,7 +368,7 @@ D ::/52 D ::/53 D ::/54 D ::/55 -# replace -nqvv +# pass replace -nqvv ::/56 ::/57 ::/58 ::/59 ::/60 ::/61 ::/62 ::/63 A ::/56 A ::/57 A ::/58 @@ -385,10 +385,10 @@ D ::/52 D ::/53 D ::/54 D ::/55 -# replace +# pass replace ::/56 ::/57 ::/58 ::/59 ::/60 ::/61 ::/62 ::/63 8 addresses added. 8 addresses deleted. -# show +# pass show ::/63 ::/62 ::/61 @@ -397,13 +397,13 @@ D ::/55 ::/58 ::/57 ::/56 -# replace -n ::/64 ::/65 ::/66 ::/67 ::/68 ::/69 ::/70 ::/71 +# pass replace -n ::/64 ::/65 ::/66 ::/67 ::/68 ::/69 ::/70 ::/71 8 addresses added (dummy). 8 addresses deleted (dummy). -# replace -nf- +# pass replace -nf- 8 addresses added (dummy). 8 addresses deleted (dummy). -# replace -nqv +# pass replace -nqv ::/64 ::/65 ::/66 ::/67 ::/68 ::/69 ::/70 ::/71 A ::/64 A ::/65 A ::/66 @@ -420,7 +420,7 @@ D ::/60 D ::/61 D ::/62 D ::/63 -# replace -nqvv +# pass replace -nqvv ::/64 ::/65 ::/66 ::/67 ::/68 ::/69 ::/70 ::/71 A ::/64 A ::/65 A ::/66 @@ -437,10 +437,10 @@ D ::/60 D ::/61 D ::/62 D ::/63 -# replace +# pass replace ::/64 ::/65 ::/66 ::/67 ::/68 ::/69 ::/70 ::/71 8 addresses added. 8 addresses deleted. -# show +# pass show ::/71 ::/70 ::/69 @@ -449,13 +449,13 @@ D ::/63 ::/66 ::/65 ::/64 -# replace -n ::/72 ::/73 ::/74 ::/75 ::/76 ::/77 ::/78 ::/79 +# pass replace -n ::/72 ::/73 ::/74 ::/75 ::/76 ::/77 ::/78 ::/79 8 addresses added (dummy). 8 addresses deleted (dummy). -# replace -nf- +# pass replace -nf- 8 addresses added (dummy). 8 addresses deleted (dummy). -# replace -nqv +# pass replace -nqv ::/72 ::/73 ::/74 ::/75 ::/76 ::/77 ::/78 ::/79 A ::/72 A ::/73 A ::/74 @@ -472,7 +472,7 @@ D ::/68 D ::/69 D ::/70 D ::/71 -# replace -nqvv +# pass replace -nqvv ::/72 ::/73 ::/74 ::/75 ::/76 ::/77 ::/78 ::/79 A ::/72 A ::/73 A ::/74 @@ -489,10 +489,10 @@ D ::/68 D ::/69 D ::/70 D ::/71 -# replace +# pass replace ::/72 ::/73 ::/74 ::/75 ::/76 ::/77 ::/78 ::/79 8 addresses added. 8 addresses deleted. -# show +# pass show ::/79 ::/78 ::/77 @@ -501,13 +501,13 @@ D ::/71 ::/74 ::/73 ::/72 -# replace -n ::/80 ::/81 ::/82 ::/83 ::/84 ::/85 ::/86 ::/87 +# pass replace -n ::/80 ::/81 ::/82 ::/83 ::/84 ::/85 ::/86 ::/87 8 addresses added (dummy). 8 addresses deleted (dummy). -# replace -nf- +# pass replace -nf- 8 addresses added (dummy). 8 addresses deleted (dummy). -# replace -nqv +# pass replace -nqv ::/80 ::/81 ::/82 ::/83 ::/84 ::/85 ::/86 ::/87 A ::/80 A ::/81 A ::/82 @@ -524,7 +524,7 @@ D ::/76 D ::/77 D ::/78 D ::/79 -# replace -nqvv +# pass replace -nqvv ::/80 ::/81 ::/82 ::/83 ::/84 ::/85 ::/86 ::/87 A ::/80 A ::/81 A ::/82 @@ -541,10 +541,10 @@ D ::/76 D ::/77 D ::/78 D ::/79 -# replace +# pass replace ::/80 ::/81 ::/82 ::/83 ::/84 ::/85 ::/86 ::/87 8 addresses added. 8 addresses deleted. -# show +# pass show ::/87 ::/86 ::/85 @@ -553,13 +553,13 @@ D ::/79 ::/82 ::/81 ::/80 -# replace -n ::/88 ::/89 ::/90 ::/91 ::/92 ::/93 ::/94 ::/95 +# pass replace -n ::/88 ::/89 ::/90 ::/91 ::/92 ::/93 ::/94 ::/95 8 addresses added (dummy). 8 addresses deleted (dummy). -# replace -nf- +# pass replace -nf- 8 addresses added (dummy). 8 addresses deleted (dummy). -# replace -nqv +# pass replace -nqv ::/88 ::/89 ::/90 ::/91 ::/92 ::/93 ::/94 ::/95 A ::/88 A ::/89 A ::/90 @@ -576,7 +576,7 @@ D ::/84 D ::/85 D ::/86 D ::/87 -# replace -nqvv +# pass replace -nqvv ::/88 ::/89 ::/90 ::/91 ::/92 ::/93 ::/94 ::/95 A ::/88 A ::/89 A ::/90 @@ -593,10 +593,10 @@ D ::/84 D ::/85 D ::/86 D ::/87 -# replace +# pass replace ::/88 ::/89 ::/90 ::/91 ::/92 ::/93 ::/94 ::/95 8 addresses added. 8 addresses deleted. -# show +# pass show ::/95 ::/94 ::/93 @@ -605,13 +605,13 @@ D ::/87 ::/90 ::/89 ::/88 -# replace -n ::/96 ::/97 ::/98 ::/99 ::/100 ::/101 ::/102 ::/103 +# pass replace -n ::/96 ::/97 ::/98 ::/99 ::/100 ::/101 ::/102 ::/103 8 addresses added (dummy). 8 addresses deleted (dummy). -# replace -nf- +# pass replace -nf- 8 addresses added (dummy). 8 addresses deleted (dummy). -# replace -nqv +# pass replace -nqv ::/96 ::/97 ::/98 ::/99 ::/100 ::/101 ::/102 ::/103 A ::/96 A ::/97 A ::/98 @@ -628,7 +628,7 @@ D ::/92 D ::/93 D ::/94 D ::/95 -# replace -nqvv +# pass replace -nqvv ::/96 ::/97 ::/98 ::/99 ::/100 ::/101 ::/102 ::/103 A ::/96 A ::/97 A ::/98 @@ -645,10 +645,10 @@ D ::/92 D ::/93 D ::/94 D ::/95 -# replace +# pass replace ::/96 ::/97 ::/98 ::/99 ::/100 ::/101 ::/102 ::/103 8 addresses added. 8 addresses deleted. -# show +# pass show ::/103 ::/102 ::/101 @@ -657,13 +657,13 @@ D ::/95 ::/98 ::/97 ::/96 -# replace -n ::/104 ::/105 ::/106 ::/107 ::/108 ::/109 ::/110 ::/111 +# pass replace -n ::/104 ::/105 ::/106 ::/107 ::/108 ::/109 ::/110 ::/111 8 addresses added (dummy). 8 addresses deleted (dummy). -# replace -nf- +# pass replace -nf- 8 addresses added (dummy). 8 addresses deleted (dummy). -# replace -nqv +# pass replace -nqv ::/104 ::/105 ::/106 ::/107 ::/108 ::/109 ::/110 ::/111 A ::/104 A ::/105 A ::/106 @@ -680,7 +680,7 @@ D ::/100 D ::/101 D ::/102 D ::/103 -# replace -nqvv +# pass replace -nqvv ::/104 ::/105 ::/106 ::/107 ::/108 ::/109 ::/110 ::/111 A ::/104 A ::/105 A ::/106 @@ -697,10 +697,10 @@ D ::/100 D ::/101 D ::/102 D ::/103 -# replace +# pass replace ::/104 ::/105 ::/106 ::/107 ::/108 ::/109 ::/110 ::/111 8 addresses added. 8 addresses deleted. -# show +# pass show ::/111 ::/110 ::/109 @@ -709,13 +709,13 @@ D ::/103 ::/106 ::/105 ::/104 -# replace -n ::/112 ::/113 ::/114 ::/115 ::/116 ::/117 ::/118 ::/119 +# pass replace -n ::/112 ::/113 ::/114 ::/115 ::/116 ::/117 ::/118 ::/119 8 addresses added (dummy). 8 addresses deleted (dummy). -# replace -nf- +# pass replace -nf- 8 addresses added (dummy). 8 addresses deleted (dummy). -# replace -nqv +# pass replace -nqv ::/112 ::/113 ::/114 ::/115 ::/116 ::/117 ::/118 ::/119 A ::/112 A ::/113 A ::/114 @@ -732,7 +732,7 @@ D ::/108 D ::/109 D ::/110 D ::/111 -# replace -nqvv +# pass replace -nqvv ::/112 ::/113 ::/114 ::/115 ::/116 ::/117 ::/118 ::/119 A ::/112 A ::/113 A ::/114 @@ -749,10 +749,10 @@ D ::/108 D ::/109 D ::/110 D ::/111 -# replace +# pass replace ::/112 ::/113 ::/114 ::/115 ::/116 ::/117 ::/118 ::/119 8 addresses added. 8 addresses deleted. -# show +# pass show ::/119 ::/118 ::/117 @@ -761,13 +761,13 @@ D ::/111 ::/114 ::/113 ::/112 -# replace -n ::/120 ::/121 ::/122 ::/123 ::/124 ::/125 ::/126 ::/127 +# pass replace -n ::/120 ::/121 ::/122 ::/123 ::/124 ::/125 ::/126 ::/127 8 addresses added (dummy). 8 addresses deleted (dummy). -# replace -nf- +# pass replace -nf- 8 addresses added (dummy). 8 addresses deleted (dummy). -# replace -nqv +# pass replace -nqv ::/120 ::/121 ::/122 ::/123 ::/124 ::/125 ::/126 ::/127 A ::/120 A ::/121 A ::/122 @@ -784,7 +784,7 @@ D ::/116 D ::/117 D ::/118 D ::/119 -# replace -nqvv +# pass replace -nqvv ::/120 ::/121 ::/122 ::/123 ::/124 ::/125 ::/126 ::/127 A ::/120 A ::/121 A ::/122 @@ -801,10 +801,10 @@ D ::/116 D ::/117 D ::/118 D ::/119 -# replace +# pass replace ::/120 ::/121 ::/122 ::/123 ::/124 ::/125 ::/126 ::/127 8 addresses added. 8 addresses deleted. -# show +# pass show ::/127 ::/126 ::/125 @@ -813,10 +813,6 @@ D ::/119 ::/122 ::/121 ::/120 -# table -regress -# table -v --pa-- regress # kill 1 table deleted. ktable: 81 allocated, 81 released, 0 leaked. diff --git a/regress/sbin/pfctl/pfr6.ok b/regress/sbin/pfctl/pfr6.ok index 8e43a943501..c754baf79f7 100644 --- a/regress/sbin/pfctl/pfr6.ok +++ b/regress/sbin/pfctl/pfr6.ok @@ -1,46 +1,46 @@ # create 1 table added. -# add -n 1.1.1.1 !1.1.1.2 10.10 !10.11 ::1 !::2 +# pass add -n 1.1.1.1 !1.1.1.2 10.10 !10.11 ::1 !::2 6/6 addresses added (dummy). -# add -nf- +# pass add -nf- 6/6 addresses added (dummy). -# add -nqv +# pass add -nqv 1.1.1.1 !1.1.1.2 10.10 !10.11 ::1 !::2 A 1.1.1.1 A !1.1.1.2 A 10.10.0.0/16 A !10.11.0.0/16 A ::1 A !::2 -# add -nqvv +# pass add -nqvv 1.1.1.1 !1.1.1.2 10.10 !10.11 ::1 !::2 A 1.1.1.1 A !1.1.1.2 A 10.10.0.0/16 A !10.11.0.0/16 A ::1 A !::2 -# add +# pass add 1.1.1.1 !1.1.1.2 10.10 !10.11 ::1 !::2 6/6 addresses added. -# show +# pass show 1.1.1.1 !1.1.1.2 10.10.0.0/16 !10.11.0.0/16 ::1 !::2 -# replace -n 1.1.1.1 !1.1.1.2 !!1.1.1.3 !!!1.1.1.4 +# pass replace -n 1.1.1.1 !1.1.1.2 !!1.1.1.3 !!!1.1.1.4 2 addresses added (dummy). 4 addresses deleted (dummy). -# replace -nf- +# pass replace -nf- 2 addresses added (dummy). 4 addresses deleted (dummy). -# replace -nqv +# pass replace -nqv 1.1.1.1 !1.1.1.2 !!1.1.1.3 !!!1.1.1.4 A 1.1.1.3 A !1.1.1.4 D !::2 D ::1 D !10.11.0.0/16 D 10.10.0.0/16 -# replace -nqvv +# pass replace -nqvv 1.1.1.1 !1.1.1.2 !!1.1.1.3 !!!1.1.1.4 1.1.1.1 !1.1.1.2 A 1.1.1.3 @@ -49,21 +49,21 @@ D !::2 D ::1 D !10.11.0.0/16 D 10.10.0.0/16 -# replace +# pass replace 1.1.1.1 !1.1.1.2 !!1.1.1.3 !!!1.1.1.4 2 addresses added. 4 addresses deleted. -# show +# pass show 1.1.1.1 !1.1.1.2 1.1.1.3 !1.1.1.4 -# replace -n fe80::/16 !fe81::/16 !!fe82::/16 !!!fe83::/16 +# pass replace -n fe80::/16 !fe81::/16 !!fe82::/16 !!!fe83::/16 4 addresses added (dummy). 4 addresses deleted (dummy). -# replace -nf- +# pass replace -nf- 4 addresses added (dummy). 4 addresses deleted (dummy). -# replace -nqv +# pass replace -nqv fe80::/16 !fe81::/16 !!fe82::/16 !!!fe83::/16 A fe80::/16 A !fe81::/16 A fe82::/16 @@ -72,7 +72,7 @@ D !1.1.1.4 D 1.1.1.3 D !1.1.1.2 D 1.1.1.1 -# replace -nqvv +# pass replace -nqvv fe80::/16 !fe81::/16 !!fe82::/16 !!!fe83::/16 A fe80::/16 A !fe81::/16 A fe82::/16 @@ -81,21 +81,21 @@ D !1.1.1.4 D 1.1.1.3 D !1.1.1.2 D 1.1.1.1 -# replace +# pass replace fe80::/16 !fe81::/16 !!fe82::/16 !!!fe83::/16 4 addresses added. 4 addresses deleted. -# show +# pass show fe80::/16 !fe81::/16 fe82::/16 !fe83::/16 -# replace -n 10 !10.10 10.10.10 !10.10.10.10 +# pass replace -n 10 !10.10 10.10.10 !10.10.10.10 4 addresses added (dummy). 4 addresses deleted (dummy). -# replace -nf- +# pass replace -nf- 4 addresses added (dummy). 4 addresses deleted (dummy). -# replace -nqv +# pass replace -nqv 10 !10.10 10.10.10 !10.10.10.10 A 10.0.0.0/8 A !10.10.0.0/16 A 10.10.10.0/24 @@ -104,7 +104,7 @@ D !fe83::/16 D fe82::/16 D !fe81::/16 D fe80::/16 -# replace -nqvv +# pass replace -nqvv 10 !10.10 10.10.10 !10.10.10.10 A 10.0.0.0/8 A !10.10.0.0/16 A 10.10.10.0/24 @@ -113,24 +113,24 @@ D !fe83::/16 D fe82::/16 D !fe81::/16 D fe80::/16 -# replace +# pass replace 10 !10.10 10.10.10 !10.10.10.10 4 addresses added. 4 addresses deleted. -# add -n fe80::/16 !fe80:fe80::/32 fe80:fe80:fe80::/48 +# pass add -n fe80::/16 !fe80:fe80::/32 fe80:fe80:fe80::/48 3/3 addresses added (dummy). -# add -nf- +# pass add -nf- 3/3 addresses added (dummy). -# add -nqv +# pass add -nqv fe80::/16 !fe80:fe80::/32 fe80:fe80:fe80::/48 A fe80::/16 A !fe80:fe80::/32 A fe80:fe80:fe80::/48 -# add -nqvv +# pass add -nqvv fe80::/16 !fe80:fe80::/32 fe80:fe80:fe80::/48 A fe80::/16 A !fe80:fe80::/32 A fe80:fe80:fe80::/48 -# add +# pass add fe80::/16 !fe80:fe80::/32 fe80:fe80:fe80::/48 3/3 addresses added. -# show +# pass show 10.0.0.0/8 !10.10.0.0/16 10.10.10.0/24 @@ -138,16 +138,12 @@ A fe80:fe80:fe80::/48 fe80::/16 !fe80:fe80::/32 fe80:fe80:fe80::/48 -# test +# pass test 10.1.1.1 10.10.10.1 2/2 addresses match. -# test +# fail test 11.1.1.1 10.10.1.1 10.10.10.10 0/3 addresses match. -# test +# fail test 10.1.1.1 11.1.1.1 1/2 addresses match. -# table -regress -# table -v --pa-- regress # kill 1 table deleted. ktable: 26 allocated, 26 released, 0 leaked. diff --git a/regress/sbin/pfctl/pfr7.ok b/regress/sbin/pfctl/pfr7.ok index d366b51b82a..c60ca0fe087 100644 --- a/regress/sbin/pfctl/pfr7.ok +++ b/regress/sbin/pfctl/pfr7.ok @@ -1,13 +1,9 @@ # create 1 table added. -# add +# fail add 1.2.3.4.5 cannot resolve 1.2.3.4.5: no address associated with name -# add +# fail add :80 cannot resolve :80: no address associated with name -# table -regress -# table -v --pa-- regress # kill 1 table deleted. ktable: 1 allocated, 1 released, 0 leaked. diff --git a/regress/sbin/pfctl/pfr8.ok b/regress/sbin/pfctl/pfr8.ok index 79b51d43b40..6c4dff7d8c1 100644 --- a/regress/sbin/pfctl/pfr8.ok +++ b/regress/sbin/pfctl/pfr8.ok @@ -1,23 +1,19 @@ # create 1 table added. -# add -n localhost +# pass add -n localhost 2/2 addresses added (dummy). -# add -nf- +# pass add -nf- 2/2 addresses added (dummy). -# add -nqv +# pass add -nqv localhost A ::1 A 127.0.0.1 -# add -nqvv +# pass add -nqvv localhost A ::1 A 127.0.0.1 -# add +# pass add localhost 2/2 addresses added. -# add +# fail add invalid$host cannot resolve invalid$host: no address associated with name -# table -regress -# table -v --pa-- regress # kill 1 table deleted. ktable: 6 allocated, 6 released, 0 leaked. diff --git a/regress/sbin/pfctl/pfr9.ok b/regress/sbin/pfctl/pfr9.ok index b21d3d1e921..d5f6c5edde9 100644 --- a/regress/sbin/pfctl/pfr9.ok +++ b/regress/sbin/pfctl/pfr9.ok @@ -1,98 +1,94 @@ # create 1 table added. -# add -n 1.2.3.4 ::1 1.2.3.4 ::1 +# pass add -n 1.2.3.4 ::1 1.2.3.4 ::1 2/4 addresses added (dummy). -# add -nf- +# pass add -nf- 2/4 addresses added (dummy). -# add -nqv +# pass add -nqv 1.2.3.4 ::1 1.2.3.4 ::1 A 1.2.3.4 A ::1 X 1.2.3.4 X ::1 -# add -nqvv +# pass add -nqvv 1.2.3.4 ::1 1.2.3.4 ::1 A 1.2.3.4 A ::1 X 1.2.3.4 X ::1 -# add +# pass add 1.2.3.4 ::1 1.2.3.4 ::1 2/4 addresses added. -# add -n 1.2.3.4 ::1 1.2.3.4 ::1 +# pass add -n 1.2.3.4 ::1 1.2.3.4 ::1 0/4 addresses added (dummy). -# add -nf- +# pass add -nf- 0/4 addresses added (dummy). -# add -nqv -# add -nqvv +# pass add -nqv 1.2.3.4 ::1 1.2.3.4 ::1 +# pass add -nqvv 1.2.3.4 ::1 1.2.3.4 ::1 1.2.3.4 ::1 1.2.3.4 ::1 -# add +# pass add 1.2.3.4 ::1 1.2.3.4 ::1 0/4 addresses added. -# delete -n 1.2.3.4 ::1 1.2.3.4 ::1 +# pass delete -n 1.2.3.4 ::1 1.2.3.4 ::1 2/4 addresses deleted (dummy). -# delete -nf- +# pass delete -nf- 2/4 addresses deleted (dummy). -# delete -nqv +# pass delete -nqv 1.2.3.4 ::1 1.2.3.4 ::1 D 1.2.3.4 D ::1 X 1.2.3.4 X ::1 -# delete -nqvv +# pass delete -nqvv 1.2.3.4 ::1 1.2.3.4 ::1 D 1.2.3.4 D ::1 X 1.2.3.4 X ::1 -# delete +# pass delete 1.2.3.4 ::1 1.2.3.4 ::1 2/4 addresses deleted. -# delete -n 1.2.3.4 ::1 1.2.3.4 ::1 +# pass delete -n 1.2.3.4 ::1 1.2.3.4 ::1 0/4 addresses deleted (dummy). -# delete -nf- +# pass delete -nf- 0/4 addresses deleted (dummy). -# delete -nqv -# delete -nqvv +# pass delete -nqv 1.2.3.4 ::1 1.2.3.4 ::1 +# pass delete -nqvv 1.2.3.4 ::1 1.2.3.4 ::1 1.2.3.4 ::1 1.2.3.4 ::1 -# delete +# pass delete 1.2.3.4 ::1 1.2.3.4 ::1 0/4 addresses deleted. -# replace -n 1.2.3.4 ::1 1.2.3.4 ::1 +# pass replace -n 1.2.3.4 ::1 1.2.3.4 ::1 2 addresses added (dummy). -# replace -nf- +# pass replace -nf- 2 addresses added (dummy). -# replace -nqv +# pass replace -nqv 1.2.3.4 ::1 1.2.3.4 ::1 A 1.2.3.4 A ::1 X 1.2.3.4 X ::1 -# replace -nqvv +# pass replace -nqvv 1.2.3.4 ::1 1.2.3.4 ::1 A 1.2.3.4 A ::1 X 1.2.3.4 X ::1 -# replace +# pass replace 1.2.3.4 ::1 1.2.3.4 ::1 2 addresses added. -# replace -n 1.2.3.4 ::1 1.2.3.4 ::1 +# pass replace -n 1.2.3.4 ::1 1.2.3.4 ::1 no changes (dummy). -# replace -nf- +# pass replace -nf- no changes (dummy). -# replace -nqv +# pass replace -nqv 1.2.3.4 ::1 1.2.3.4 ::1 X 1.2.3.4 X ::1 -# replace -nqvv +# pass replace -nqvv 1.2.3.4 ::1 1.2.3.4 ::1 1.2.3.4 ::1 X 1.2.3.4 X ::1 -# replace +# pass replace 1.2.3.4 ::1 1.2.3.4 ::1 no changes. -# show +# pass show 1.2.3.4 ::1 -# table -regress -# table -v --pa-- regress # kill 1 table deleted. ktable: 21 allocated, 21 released, 0 leaked. |