Update PF table regress tests to work with -current.

15 files changed, 69 insertions, 46 deletions

diff --git a/regress/sbin/pfctl/Makefile b/regress/sbin/pfctl/Makefile
index 75527f4219a..0fb1483ea07 100644
--- a/regress/sbin/pfctl/Makefile
+++ b/regress/sbin/pfctl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.216 2011/07/08 21:57:48 mcbride Exp $
+# $OpenBSD: Makefile,v 1.217 2011/07/24 01:22:11 mcbride Exp $
 
 # TARGETS
 # pf: feed pfNN.in through pfctl and check whether the output matches pfNN.ok
@@ -29,7 +29,7 @@ PFALTQ=1 2 3 4 5 6 7 8 9 10 11 12 13 14
 # PFLOAD+=33 35 37 42 43 45 51 58 59 62 63 64
 # only testing parser, load test would be useless
 # PFLOAD+=6 22 41 50 52 53 55 57 83 85 86
-PFTABLE=1 2 3 4 5 6 7 8 9 10 11 12 13 14
+PFTABLE=1 2 3 4 5 6 7 8 9 10 11 12 13
 PFOPT=1 2 3 6
 PFIF2IP=1 2 3
 PFCHKSUM=1 2 3
diff --git a/regress/sbin/pfctl/pfr.exec b/regress/sbin/pfctl/pfr.exec
index 30b4a8c605c..4157147f90f 100644
--- a/regress/sbin/pfctl/pfr.exec
+++ b/regress/sbin/pfctl/pfr.exec
@@ -3,13 +3,16 @@ D=`dirname $1`
 A='regress'
 pfctl -a $A -FT 2>/dev/null
 pfctl -a $A -Fr 2>/dev/null
-pfctl -a $A -Fn 2>/dev/null
 KT_R=`vmstat -mv | awk '/pfrktable/{print $3}'`
 KT_I=`vmstat -mv | awk '/pfrktable/{print $5}'`
-KE_R=`vmstat -mv | awk '/pfrkentry /{print $3}'`
-KE_I=`vmstat -mv | awk '/pfrkentry /{print $5}'`
+KEP_R=`vmstat -mv | awk '/pfrke_plain /{print $3}'`
+KEP_I=`vmstat -mv | awk '/pfrke_plain /{print $5}'`
+KER_R=`vmstat -mv | awk '/pfrke_route /{print $3}'`
+KER_I=`vmstat -mv | awk '/pfrke_route /{print $5}'`
+KEC_R=`vmstat -mv | awk '/pfrke_cost /{print $3}'`
+KEC_I=`vmstat -mv | awk '/pfrke_cost /{print $5}'`
 echo "# create"
-echo "table <regress> persist" | pfctl -a $A -Tl -f - 2>&1 || exit 1
+echo "table <regress> persist" | pfctl -a $A -f - 2>&1 || exit 1
 for LINE in `sed -e "s/ /_/g" $1`; do 
 	RESULT=`echo $LINE | awk '{split($1,a,"_");print a[1]}'`
 	case $RESULT in
@@ -48,7 +51,7 @@ for LINE in `sed -e "s/ /_/g" $1`; do
 			pfctl -a $A -gvsT 2>&1
 			;;
 		load)
-			echo $ARGS | sed "s,DIR,$D,g" | pfctl -a $A -Tl -f- \
+			echo $ARGS | sed "s,DIR,$D,g" | pfctl -a $A -f- \
 			    || exit 1
 			;;
 		rule)
@@ -77,13 +80,20 @@ done
 echo "# kill"
 pfctl -a $A -FT 2>&1
 pfctl -a $A -Fr 2>&1
-pfctl -a $A -Fn 2>&1
 let KT_R=`vmstat -mv | awk '/pfrktable/{print $3}'`-$KT_R
 let KT_I=`vmstat -mv | awk '/pfrktable/{print $5}'`-$KT_I
 let KT_RL=$KT_R-$KT_I
-let KE_R=`vmstat -mv | awk '/pfrkentry /{print $3}'`-$KE_R
-let KE_I=`vmstat -mv | awk '/pfrkentry /{print $5}'`-$KE_I
-let KE_RL=$KE_R-$KE_I
+let KEP_R=`vmstat -mv | awk '/pfrke_plain /{print $3}'`-$KEP_R
+let KEP_I=`vmstat -mv | awk '/pfrke_plain /{print $5}'`-$KEP_I
+let KEP_RL=$KEP_R-$KEP_I
+let KER_R=`vmstat -mv | awk '/pfrke_route /{print $3}'`-$KER_R
+let KER_I=`vmstat -mv | awk '/pfrke_route /{print $5}'`-$KER_I
+let KER_RL=$KER_R-$KER_I
+let KEC_R=`vmstat -mv | awk '/pfrke_cost /{print $3}'`-$KEC_R
+let KEC_I=`vmstat -mv | awk '/pfrke_cost /{print $5}'`-$KEC_I
+let KEC_RL=$KEC_R-$KEC_I
 echo "ktable: $KT_R allocated, $KT_RL released, $KT_I leaked."
-echo "kentry: $KE_R allocated, $KE_RL released, $KE_I leaked."
-[ "$KT_I" = "0" -a "$KE_I" = "0" ] || exit 1
+echo "pfrke_plain: $KEP_R allocated, $KEP_RL released, $KEP_I leaked."
+echo "pfrke_route: $KER_R allocated, $KER_RL released, $KER_I leaked."
+echo "pfrke_cost: $KEC_R allocated, $KEC_RL released, $KEC_I leaked."
+[ "$KT_I" = "0" -a "$KEP_I" = "0"  -a "$KER_I" = "0" -a "$KEC_I" = "0" ] || exit 1
diff --git a/regress/sbin/pfctl/pfr1.ok b/regress/sbin/pfctl/pfr1.ok
index 22045bc17bd..502fce7eba5 100644
--- a/regress/sbin/pfctl/pfr1.ok
+++ b/regress/sbin/pfctl/pfr1.ok
@@ -59,6 +59,7 @@ regress
 # kill
 1 tables deleted.
 rules cleared
-nat cleared
 ktable: 13 allocated, 13 released, 0 leaked.
-kentry: 25 allocated, 25 released, 0 leaked.
+pfrke_plain: 25 allocated, 25 released, 0 leaked.
+pfrke_route: 0 allocated, 0 released, 0 leaked.
+pfrke_cost: 0 allocated, 0 released, 0 leaked.
diff --git a/regress/sbin/pfctl/pfr10.ok b/regress/sbin/pfctl/pfr10.ok
index a5b0793b8fb..c7a29924859 100644
--- a/regress/sbin/pfctl/pfr10.ok
+++ b/regress/sbin/pfctl/pfr10.ok
@@ -40,6 +40,7 @@ regress
 # kill
 1 tables deleted.
 rules cleared
-nat cleared
 ktable: 14 allocated, 14 released, 0 leaked.
-kentry: 2 allocated, 2 released, 0 leaked.
+pfrke_plain: 2 allocated, 2 released, 0 leaked.
+pfrke_route: 0 allocated, 0 released, 0 leaked.
+pfrke_cost: 0 allocated, 0 released, 0 leaked.
diff --git a/regress/sbin/pfctl/pfr11.ok b/regress/sbin/pfctl/pfr11.ok
index cc04f3cd09d..021e30388e5 100644
--- a/regress/sbin/pfctl/pfr11.ok
+++ b/regress/sbin/pfctl/pfr11.ok
@@ -30,6 +30,7 @@ regress
 # kill
 1 tables deleted.
 rules cleared
-nat cleared
 ktable: 7 allocated, 7 released, 0 leaked.
-kentry: 0 allocated, 0 released, 0 leaked.
+pfrke_plain: 0 allocated, 0 released, 0 leaked.
+pfrke_route: 0 allocated, 0 released, 0 leaked.
+pfrke_cost: 0 allocated, 0 released, 0 leaked.
diff --git a/regress/sbin/pfctl/pfr12.ok b/regress/sbin/pfctl/pfr12.ok
index d33ebf3c16b..347e50cd201 100644
--- a/regress/sbin/pfctl/pfr12.ok
+++ b/regress/sbin/pfctl/pfr12.ok
@@ -2,7 +2,7 @@
 # pass list 
 regress
 # pass list -v
--pa---	regress	regress
+-pa----	regress	regress
 # pass kill 
 1 table deleted.
 # pass show 
@@ -10,10 +10,10 @@ pfctl: Table does not exist.
 # pass rule pass in from <regress> to any
 # pass list 
 # pass list -v
-----r-	regress	regress
+----r--	regress	regress
 # pass list 
 # pass list -v
-----r-	regress	regress
+----r--	regress	regress
 # pass rule 
 # pass list 
 # pass list -v
@@ -24,20 +24,21 @@ pfctl: Table does not exist.
 # pass rule pass in from <regress> to any
 # pass list 
 # pass list -v
-----r-	regress	regress
+----r--	regress	regress
 # pass load table <regress> persist
 # pass list 
 regress
 # pass list -v
--pa-r-	regress	regress
+-pa----	regress	regress
 # pass rule 
 # pass list 
 regress
 # pass list -v
--pa---	regress	regress
+-pa----	regress	regress
 # kill
 1 tables deleted.
 rules cleared
-nat cleared
 ktable: 8 allocated, 8 released, 0 leaked.
-kentry: 0 allocated, 0 released, 0 leaked.
+pfrke_plain: 0 allocated, 0 released, 0 leaked.
+pfrke_route: 0 allocated, 0 released, 0 leaked.
+pfrke_cost: 0 allocated, 0 released, 0 leaked.
diff --git a/regress/sbin/pfctl/pfr13.ok b/regress/sbin/pfctl/pfr13.ok
index 69536892bcb..6c119251381 100644
--- a/regress/sbin/pfctl/pfr13.ok
+++ b/regress/sbin/pfctl/pfr13.ok
@@ -338,6 +338,7 @@
    10.0.0.0/8
    127.0.0.0/24
    127.0.0.0/8
+   127.0.0.1
    172.16.0.0/12
    192.168.0.0/16
    2.2.2.2
@@ -348,7 +349,6 @@
    fe80::/16
    fe80::/24
    fe80::1
-  !127.0.0.1
 # pass load table <regress> persist file "DIR/pfr.addrs1" { 3.3.3.3 }
 # pass show 
    1.1.1.1
@@ -389,6 +389,7 @@
 # kill
 1 tables deleted.
 rules cleared
-nat cleared
 ktable: 8 allocated, 8 released, 0 leaked.
-kentry: 377 allocated, 377 released, 0 leaked.
+pfrke_plain: 377 allocated, 377 released, 0 leaked.
+pfrke_route: 0 allocated, 0 released, 0 leaked.
+pfrke_cost: 0 allocated, 0 released, 0 leaked.
diff --git a/regress/sbin/pfctl/pfr2.ok b/regress/sbin/pfctl/pfr2.ok
index 854e18c04c4..fbf30fb11ba 100644
--- a/regress/sbin/pfctl/pfr2.ok
+++ b/regress/sbin/pfctl/pfr2.ok
@@ -59,6 +59,7 @@ regress
 # kill
 1 tables deleted.
 rules cleared
-nat cleared
 ktable: 13 allocated, 13 released, 0 leaked.
-kentry: 25 allocated, 25 released, 0 leaked.
+pfrke_plain: 25 allocated, 25 released, 0 leaked.
+pfrke_route: 0 allocated, 0 released, 0 leaked.
+pfrke_cost: 0 allocated, 0 released, 0 leaked.
diff --git a/regress/sbin/pfctl/pfr3.ok b/regress/sbin/pfctl/pfr3.ok
index d6ddb336a95..0d748e8883e 100644
--- a/regress/sbin/pfctl/pfr3.ok
+++ b/regress/sbin/pfctl/pfr3.ok
@@ -54,6 +54,7 @@ D  10.11.12.13
 # kill
 1 tables deleted.
 rules cleared
-nat cleared
 ktable: 13 allocated, 13 released, 0 leaked.
-kentry: 30 allocated, 30 released, 0 leaked.
+pfrke_plain: 30 allocated, 30 released, 0 leaked.
+pfrke_route: 0 allocated, 0 released, 0 leaked.
+pfrke_cost: 0 allocated, 0 released, 0 leaked.
diff --git a/regress/sbin/pfctl/pfr4.ok b/regress/sbin/pfctl/pfr4.ok
index 40d7d7722f7..4d5d2c6a933 100644
--- a/regress/sbin/pfctl/pfr4.ok
+++ b/regress/sbin/pfctl/pfr4.ok
@@ -191,6 +191,7 @@ D  0.0.0.0/23
 # kill
 1 tables deleted.
 rules cleared
-nat cleared
 ktable: 23 allocated, 23 released, 0 leaked.
-kentry: 160 allocated, 160 released, 0 leaked.
+pfrke_plain: 160 allocated, 160 released, 0 leaked.
+pfrke_route: 0 allocated, 0 released, 0 leaked.
+pfrke_cost: 0 allocated, 0 released, 0 leaked.
diff --git a/regress/sbin/pfctl/pfr5.ok b/regress/sbin/pfctl/pfr5.ok
index f2ab0297d95..e2fd5da3a6b 100644
--- a/regress/sbin/pfctl/pfr5.ok
+++ b/regress/sbin/pfctl/pfr5.ok
@@ -815,6 +815,7 @@ D  ::/119
 # kill
 1 tables deleted.
 rules cleared
-nat cleared
 ktable: 83 allocated, 83 released, 0 leaked.
-kentry: 640 allocated, 640 released, 0 leaked.
+pfrke_plain: 640 allocated, 640 released, 0 leaked.
+pfrke_route: 0 allocated, 0 released, 0 leaked.
+pfrke_cost: 0 allocated, 0 released, 0 leaked.
diff --git a/regress/sbin/pfctl/pfr6.ok b/regress/sbin/pfctl/pfr6.ok
index 14da64a8d6b..d047b9d2c4b 100644
--- a/regress/sbin/pfctl/pfr6.ok
+++ b/regress/sbin/pfctl/pfr6.ok
@@ -146,6 +146,7 @@ A !fe80:fe80::/32
 # kill
 1 tables deleted.
 rules cleared
-nat cleared
 ktable: 28 allocated, 28 released, 0 leaked.
-kentry: 95 allocated, 95 released, 0 leaked.
+pfrke_plain: 95 allocated, 95 released, 0 leaked.
+pfrke_route: 0 allocated, 0 released, 0 leaked.
+pfrke_cost: 0 allocated, 0 released, 0 leaked.
diff --git a/regress/sbin/pfctl/pfr7.ok b/regress/sbin/pfctl/pfr7.ok
index 07b66b32096..ac193ba9d3e 100644
--- a/regress/sbin/pfctl/pfr7.ok
+++ b/regress/sbin/pfctl/pfr7.ok
@@ -6,6 +6,7 @@ no IP address found for :80
 # kill
 1 tables deleted.
 rules cleared
-nat cleared
 ktable: 3 allocated, 3 released, 0 leaked.
-kentry: 0 allocated, 0 released, 0 leaked.
+pfrke_plain: 0 allocated, 0 released, 0 leaked.
+pfrke_route: 0 allocated, 0 released, 0 leaked.
+pfrke_cost: 0 allocated, 0 released, 0 leaked.
diff --git a/regress/sbin/pfctl/pfr8.ok b/regress/sbin/pfctl/pfr8.ok
index 5e574729f35..db1a676fd77 100644
--- a/regress/sbin/pfctl/pfr8.ok
+++ b/regress/sbin/pfctl/pfr8.ok
@@ -16,6 +16,7 @@ no IP address found for invalid$host
 # kill
 1 tables deleted.
 rules cleared
-nat cleared
 ktable: 8 allocated, 8 released, 0 leaked.
-kentry: 10 allocated, 10 released, 0 leaked.
+pfrke_plain: 10 allocated, 10 released, 0 leaked.
+pfrke_route: 0 allocated, 0 released, 0 leaked.
+pfrke_cost: 0 allocated, 0 released, 0 leaked.
diff --git a/regress/sbin/pfctl/pfr9.ok b/regress/sbin/pfctl/pfr9.ok
index f9e01b46993..6b2e0bdff8c 100644
--- a/regress/sbin/pfctl/pfr9.ok
+++ b/regress/sbin/pfctl/pfr9.ok
@@ -91,6 +91,7 @@ no changes.
 # kill
 1 tables deleted.
 rules cleared
-nat cleared
 ktable: 23 allocated, 23 released, 0 leaked.
-kentry: 20 allocated, 20 released, 0 leaked.
+pfrke_plain: 20 allocated, 20 released, 0 leaked.
+pfrke_route: 0 allocated, 0 released, 0 leaked.
+pfrke_cost: 0 allocated, 0 released, 0 leaked.