syn with reality, ryan ok

7 files changed, 18 insertions, 18 deletions

diff --git a/regress/sbin/pfctl/pfr13.in b/regress/sbin/pfctl/pfr13.in
index 71093cf8a30..6edd6e2453e 100644
--- a/regress/sbin/pfctl/pfr13.in
+++ b/regress/sbin/pfctl/pfr13.in
@@ -7,5 +7,5 @@ pass load table <regress> persist { !127.0.0.1 } file "DIR/pfr.addrs1"
 pass show
 pass load table <regress> persist file "DIR/pfr.addrs1" { 3.3.3.3 }
 pass show
-pass load table <regress> persist { 11 } file "DIR/pfr.addrs1" { !12 }
+pass load table <regress> persist { 11/8 } file "DIR/pfr.addrs1" { !12/8 }
 pass show
diff --git a/regress/sbin/pfctl/pfr13.ok b/regress/sbin/pfctl/pfr13.ok
index 84cc5ee0a42..69536892bcb 100644
--- a/regress/sbin/pfctl/pfr13.ok
+++ b/regress/sbin/pfctl/pfr13.ok
@@ -367,7 +367,7 @@
    fe80::/16
    fe80::/24
    fe80::1
-# pass load table <regress> persist { 11 } file "DIR/pfr.addrs1" { !12 }
+# pass load table <regress> persist { 11/8 } file "DIR/pfr.addrs1" { !12/8 }
 # pass show 
    1.1.1.1
    10.0.0.0/8
diff --git a/regress/sbin/pfctl/pfr3.in b/regress/sbin/pfctl/pfr3.in
index 9cf12864c98..364b355fead 100644
--- a/regress/sbin/pfctl/pfr3.in
+++ b/regress/sbin/pfctl/pfr3.in
@@ -1,5 +1,5 @@
 # basic manipulation of IPv4 networks
-pass add 10 10.11 10.11.12 10.11.12.13
+pass add 10/8 10.11/16 10.11.12/24 10.11.12.13
 pass delete 10.11.0.0/16 10.11.12.0/24
 pass replace 10.0/8 172.16.0/12 192.168.0/16
 pass test 10.1.1.1 172.17.1.1 192.168.1.1
diff --git a/regress/sbin/pfctl/pfr3.ok b/regress/sbin/pfctl/pfr3.ok
index 6e75df72d67..d6ddb336a95 100644
--- a/regress/sbin/pfctl/pfr3.ok
+++ b/regress/sbin/pfctl/pfr3.ok
@@ -1,19 +1,19 @@
 # create
-# pass add -n 10 10.11 10.11.12 10.11.12.13
+# pass add -n 10/8 10.11/16 10.11.12/24 10.11.12.13
 4/4 addresses added (dummy).
 # pass add -nf-
 4/4 addresses added (dummy).
-# pass add -nqv 10 10.11 10.11.12 10.11.12.13
+# pass add -nqv 10/8 10.11/16 10.11.12/24 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
-# pass add -nqvv 10 10.11 10.11.12 10.11.12.13
+# pass add -nqvv 10/8 10.11/16 10.11.12/24 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
-# pass add 10 10.11 10.11.12 10.11.12.13
+# pass add 10/8 10.11/16 10.11.12/24 10.11.12.13
 4/4 addresses added.
 # pass delete -n 10.11.0.0/16 10.11.12.0/24
 2/2 addresses deleted (dummy).
diff --git a/regress/sbin/pfctl/pfr6.in b/regress/sbin/pfctl/pfr6.in
index 3d7d97a442d..c5e9dd316e2 100644
--- a/regress/sbin/pfctl/pfr6.in
+++ b/regress/sbin/pfctl/pfr6.in
@@ -1,11 +1,11 @@
 # negated addresses and networks
-pass add 1.1.1.1 !1.1.1.2 10.10 !10.11 ::1 !::2
+pass add 1.1.1.1 !1.1.1.2 10.10/16 !10.11/16 ::1 !::2
 pass show
 pass replace 1.1.1.1 !1.1.1.2 !!1.1.1.3 !!!1.1.1.4
 pass show
 pass replace fe80::/16 !fe81::/16 !!fe82::/16 !!!fe83::/16
 pass show
-pass replace 10 !10.10 10.10.10 !10.10.10.10
+pass replace 10/8 !10.10/16 10.10.10/24 !10.10.10.10
 pass add fe80::/16 !fe80:fe80::/32 fe80:fe80:fe80::/48
 pass show
 pass test 10.1.1.1 10.10.10.1
diff --git a/regress/sbin/pfctl/pfr6.ok b/regress/sbin/pfctl/pfr6.ok
index 9705fda2b41..14da64a8d6b 100644
--- a/regress/sbin/pfctl/pfr6.ok
+++ b/regress/sbin/pfctl/pfr6.ok
@@ -1,23 +1,23 @@
 # create
-# pass 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/16 !10.11/16 ::1 !::2
 6/6 addresses added (dummy).
 # pass add -nf-
 6/6 addresses added (dummy).
-# pass add -nqv 1.1.1.1 !1.1.1.2 10.10 !10.11 ::1 !::2
+# pass add -nqv 1.1.1.1 !1.1.1.2 10.10/16 !10.11/16 ::1 !::2
 A  1.1.1.1
 A  10.10.0.0/16
 A  ::1
 A !1.1.1.2
 A !10.11.0.0/16
 A !::2
-# pass add -nqvv 1.1.1.1 !1.1.1.2 10.10 !10.11 ::1 !::2
+# pass add -nqvv 1.1.1.1 !1.1.1.2 10.10/16 !10.11/16 ::1 !::2
 A  1.1.1.1
 A  10.10.0.0/16
 A  ::1
 A !1.1.1.2
 A !10.11.0.0/16
 A !::2
-# pass add 1.1.1.1 !1.1.1.2 10.10 !10.11 ::1 !::2
+# pass add 1.1.1.1 !1.1.1.2 10.10/16 !10.11/16 ::1 !::2
 6/6 addresses added.
 # pass show 
    1.1.1.1
@@ -88,13 +88,13 @@ D !1.1.1.4
    fe82::/16
   !fe81::/16
   !fe83::/16
-# pass replace -n 10 !10.10 10.10.10 !10.10.10.10
+# pass replace -n 10/8 !10.10/16 10.10.10/24 !10.10.10.10
 4 addresses added (dummy).
 4 addresses deleted (dummy).
 # pass replace -nf-
 4 addresses added (dummy).
 4 addresses deleted (dummy).
-# pass replace -nqv 10 !10.10 10.10.10 !10.10.10.10
+# pass replace -nqv 10/8 !10.10/16 10.10.10/24 !10.10.10.10
 A  10.0.0.0/8
 A  10.10.10.0/24
 A !10.10.0.0/16
@@ -103,7 +103,7 @@ D  fe80::/16
 D  fe82::/16
 D !fe81::/16
 D !fe83::/16
-# pass replace -nqvv 10 !10.10 10.10.10 !10.10.10.10
+# pass replace -nqvv 10/8 !10.10/16 10.10.10/24 !10.10.10.10
 A  10.0.0.0/8
 A  10.10.10.0/24
 A !10.10.0.0/16
@@ -112,7 +112,7 @@ D  fe80::/16
 D  fe82::/16
 D !fe81::/16
 D !fe83::/16
-# pass replace 10 !10.10 10.10.10 !10.10.10.10
+# pass replace 10/8 !10.10/16 10.10.10/24 !10.10.10.10
 4 addresses added.
 4 addresses deleted.
 # pass add -n fe80::/16 !fe80:fe80::/32 fe80:fe80:fe80::/48
diff --git a/regress/sbin/pfctl/pfsetup3.ok b/regress/sbin/pfctl/pfsetup3.ok
index ef3cf0cc47c..984ba0d8f6f 100644
--- a/regress/sbin/pfctl/pfsetup3.ok
+++ b/regress/sbin/pfctl/pfsetup3.ok
@@ -1,2 +1,2 @@
-altq on lo1000010 cbq bandwidth 10Mb tbrsize 65535 queue { openbsd rocks }
+altq on lo1000010 cbq bandwidth 10Mb tbrsize 32000 queue { openbsd rocks }
 queue openbsd cbq( default )