test altq tbrsize calculation

10 files changed, 35 insertions, 3 deletions

diff --git a/regress/sbin/pfctl/Makefile b/regress/sbin/pfctl/Makefile
index 27ab25b6634..b2df59c16d3 100644
--- a/regress/sbin/pfctl/Makefile
+++ b/regress/sbin/pfctl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.90 2003/02/21 17:18:24 henning Exp $
+# $OpenBSD: Makefile,v 1.91 2003/02/21 20:11:20 henning Exp $
 
 # TARGETS
 # pf: feed pfNN.in through pfctl and check wether the output matches pfNN.ok
@@ -15,7 +15,7 @@ PFTESTS+=28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50
 PFTESTS+=51 52 53 54 55
 PFFAIL=1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23
 PFSIMPLE=1
-PFSETUP=1
+PFSETUP=1 2 3
 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 34 36 38 39 40 44 46 47 49 54
 # disabled; no altq in anchors
diff --git a/regress/sbin/pfctl/pfsetup1.clean b/regress/sbin/pfctl/pfsetup1.clean
index 4f3daea01e2..561f7c6ee89 100644
--- a/regress/sbin/pfctl/pfsetup1.clean
+++ b/regress/sbin/pfctl/pfsetup1.clean
@@ -1 +1 @@
-ifconfig lo1 inet 192.168.0.1 netmask 0xffffff00 delete
+ifconfig lo1 inet 192.168.0.1 netmask 0xffffff00 delete -link1
diff --git a/regress/sbin/pfctl/pfsetup2.clean b/regress/sbin/pfctl/pfsetup2.clean
new file mode 100644
index 00000000000..3fb62e908f7
--- /dev/null
+++ b/regress/sbin/pfctl/pfsetup2.clean
@@ -0,0 +1,9 @@
+ifconfig lo1 inet 10.163.1.1 netmask 0xffffffff delete mtu 33224
+ARCH=`uname -m`
+if [ $ARCH -eq "alpha" ]; then
+  ifconfig lo1 33192
+fi;
+if [ $ARCH -eq "sparc64" ]; then
+  ifconfig lo1 33192
+fi;
+
diff --git a/regress/sbin/pfctl/pfsetup2.in b/regress/sbin/pfctl/pfsetup2.in
new file mode 100644
index 00000000000..37c08116929
--- /dev/null
+++ b/regress/sbin/pfctl/pfsetup2.in
@@ -0,0 +1,4 @@
+#test tbrsize calculation
+
+altq on lo1 bandwidth 10Mb cbq queue { openbsd rocks }
+queue openbsd cbq(default)
diff --git a/regress/sbin/pfctl/pfsetup2.ok b/regress/sbin/pfctl/pfsetup2.ok
new file mode 100644
index 00000000000..516f04a6a05
--- /dev/null
+++ b/regress/sbin/pfctl/pfsetup2.ok
@@ -0,0 +1,2 @@
+altq on lo1 cbq bandwidth 10.00Mb tbrsize 6000 queue { openbsd rocks }
+queue openbsd bandwidth 10.00Mb cbq( default ) 
diff --git a/regress/sbin/pfctl/pfsetup2.setup b/regress/sbin/pfctl/pfsetup2.setup
new file mode 100644
index 00000000000..fa6eec0cb4f
--- /dev/null
+++ b/regress/sbin/pfctl/pfsetup2.setup
@@ -0,0 +1 @@
+ifconfig lo1 inet 10.163.1.1 netmask 0xffffffff mtu 1500
diff --git a/regress/sbin/pfctl/pfsetup3.clean b/regress/sbin/pfctl/pfsetup3.clean
new file mode 100644
index 00000000000..4816c15ecd8
--- /dev/null
+++ b/regress/sbin/pfctl/pfsetup3.clean
@@ -0,0 +1,9 @@
+ifconfig lo1 mtu 33224
+ARCH=`uname -m`
+if [ $ARCH -eq "alpha" ]; then
+  ifconfig lo1 33192
+fi;
+if [ $ARCH -eq "sparc64" ]; then
+  ifconfig lo1 33192
+fi;
+
diff --git a/regress/sbin/pfctl/pfsetup3.in b/regress/sbin/pfctl/pfsetup3.in
new file mode 100644
index 00000000000..37c08116929
--- /dev/null
+++ b/regress/sbin/pfctl/pfsetup3.in
@@ -0,0 +1,4 @@
+#test tbrsize calculation
+
+altq on lo1 bandwidth 10Mb cbq queue { openbsd rocks }
+queue openbsd cbq(default)
diff --git a/regress/sbin/pfctl/pfsetup3.ok b/regress/sbin/pfctl/pfsetup3.ok
new file mode 100644
index 00000000000..1fcb8fc7ba4
--- /dev/null
+++ b/regress/sbin/pfctl/pfsetup3.ok
@@ -0,0 +1,2 @@
+altq on lo1 cbq bandwidth 10.00Mb tbrsize 32000 queue { openbsd rocks }
+queue openbsd bandwidth 10.00Mb cbq( default ) 
diff --git a/regress/sbin/pfctl/pfsetup3.setup b/regress/sbin/pfctl/pfsetup3.setup
new file mode 100644
index 00000000000..a6660366e82
--- /dev/null
+++ b/regress/sbin/pfctl/pfsetup3.setup
@@ -0,0 +1 @@
+ifconfig lo1 mtu 8000