summaryrefslogtreecommitdiffstats
path: root/contrib/ipfilter/test/regress
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/ipfilter/test/regress')
-rw-r--r--contrib/ipfilter/test/regress/14
-rw-r--r--contrib/ipfilter/test/regress/1018
-rw-r--r--contrib/ipfilter/test/regress/116
-rw-r--r--contrib/ipfilter/test/regress/126
-rw-r--r--contrib/ipfilter/test/regress/136
-rw-r--r--contrib/ipfilter/test/regress/148
-rw-r--r--contrib/ipfilter/test/regress/26
-rw-r--r--contrib/ipfilter/test/regress/38
-rw-r--r--contrib/ipfilter/test/regress/48
-rw-r--r--contrib/ipfilter/test/regress/548
-rw-r--r--contrib/ipfilter/test/regress/648
-rw-r--r--contrib/ipfilter/test/regress/76
-rw-r--r--contrib/ipfilter/test/regress/86
-rw-r--r--contrib/ipfilter/test/regress/918
-rw-r--r--contrib/ipfilter/test/regress/bpf-f14
-rw-r--r--contrib/ipfilter/test/regress/bpf14
-rw-r--r--contrib/ipfilter/test/regress/f14
-rw-r--r--contrib/ipfilter/test/regress/f1018
-rw-r--r--contrib/ipfilter/test/regress/f117
-rw-r--r--contrib/ipfilter/test/regress/f126
-rw-r--r--contrib/ipfilter/test/regress/f138
-rw-r--r--contrib/ipfilter/test/regress/f148
-rw-r--r--contrib/ipfilter/test/regress/f158
-rw-r--r--contrib/ipfilter/test/regress/f1610
-rw-r--r--contrib/ipfilter/test/regress/f174
-rw-r--r--contrib/ipfilter/test/regress/f184
-rw-r--r--contrib/ipfilter/test/regress/f192
-rw-r--r--contrib/ipfilter/test/regress/f26
-rw-r--r--contrib/ipfilter/test/regress/f204
-rw-r--r--contrib/ipfilter/test/regress/f241
-rw-r--r--contrib/ipfilter/test/regress/f38
-rw-r--r--contrib/ipfilter/test/regress/f48
-rw-r--r--contrib/ipfilter/test/regress/f548
-rw-r--r--contrib/ipfilter/test/regress/f648
-rw-r--r--contrib/ipfilter/test/regress/f79
-rw-r--r--contrib/ipfilter/test/regress/f86
-rw-r--r--contrib/ipfilter/test/regress/f918
-rw-r--r--contrib/ipfilter/test/regress/i118
-rw-r--r--contrib/ipfilter/test/regress/i105
-rw-r--r--contrib/ipfilter/test/regress/i1111
-rw-r--r--contrib/ipfilter/test/regress/i1210
-rw-r--r--contrib/ipfilter/test/regress/i138
-rw-r--r--contrib/ipfilter/test/regress/i1410
-rw-r--r--contrib/ipfilter/test/regress/i154
-rw-r--r--contrib/ipfilter/test/regress/i163
-rw-r--r--contrib/ipfilter/test/regress/i1713
-rw-r--r--contrib/ipfilter/test/regress/i183
-rw-r--r--contrib/ipfilter/test/regress/i1922
-rw-r--r--contrib/ipfilter/test/regress/i28
-rw-r--r--contrib/ipfilter/test/regress/i204
-rw-r--r--contrib/ipfilter/test/regress/i217
-rw-r--r--contrib/ipfilter/test/regress/i314
-rw-r--r--contrib/ipfilter/test/regress/i49
-rw-r--r--contrib/ipfilter/test/regress/i59
-rw-r--r--contrib/ipfilter/test/regress/i612
-rw-r--r--contrib/ipfilter/test/regress/i79
-rw-r--r--contrib/ipfilter/test/regress/i833
-rw-r--r--contrib/ipfilter/test/regress/i917
-rw-r--r--contrib/ipfilter/test/regress/in131
-rw-r--r--contrib/ipfilter/test/regress/in271
-rw-r--r--contrib/ipfilter/test/regress/in35
-rw-r--r--contrib/ipfilter/test/regress/in45
-rw-r--r--contrib/ipfilter/test/regress/in524
-rw-r--r--contrib/ipfilter/test/regress/in68
-rw-r--r--contrib/ipfilter/test/regress/ip178
-rw-r--r--contrib/ipfilter/test/regress/ip22
-rw-r--r--contrib/ipfilter/test/regress/ipf6-13
-rw-r--r--contrib/ipfilter/test/regress/ipv6.11
-rw-r--r--contrib/ipfilter/test/regress/ipv6.23
-rw-r--r--contrib/ipfilter/test/regress/ipv6.31
-rw-r--r--contrib/ipfilter/test/regress/ipv6.52
-rw-r--r--contrib/ipfilter/test/regress/ipv6.61
-rw-r--r--contrib/ipfilter/test/regress/l16
-rw-r--r--contrib/ipfilter/test/regress/n13
-rw-r--r--contrib/ipfilter/test/regress/n103
-rw-r--r--contrib/ipfilter/test/regress/n113
-rw-r--r--contrib/ipfilter/test/regress/n121
-rw-r--r--contrib/ipfilter/test/regress/n131
-rw-r--r--contrib/ipfilter/test/regress/n141
-rw-r--r--contrib/ipfilter/test/regress/n161
-rw-r--r--contrib/ipfilter/test/regress/n24
-rw-r--r--contrib/ipfilter/test/regress/n32
-rw-r--r--contrib/ipfilter/test/regress/n46
-rw-r--r--contrib/ipfilter/test/regress/n56
-rw-r--r--contrib/ipfilter/test/regress/n65
-rw-r--r--contrib/ipfilter/test/regress/n73
-rw-r--r--contrib/ipfilter/test/regress/n81
-rw-r--r--contrib/ipfilter/test/regress/n91
-rw-r--r--contrib/ipfilter/test/regress/ni1.ipf4
-rw-r--r--contrib/ipfilter/test/regress/ni1.nat3
-rw-r--r--contrib/ipfilter/test/regress/ni10.ipf4
-rw-r--r--contrib/ipfilter/test/regress/ni10.nat1
-rw-r--r--contrib/ipfilter/test/regress/ni11.ipf4
-rw-r--r--contrib/ipfilter/test/regress/ni11.nat1
-rw-r--r--contrib/ipfilter/test/regress/ni12.ipf4
-rw-r--r--contrib/ipfilter/test/regress/ni12.nat1
-rw-r--r--contrib/ipfilter/test/regress/ni13.ipf3
-rw-r--r--contrib/ipfilter/test/regress/ni13.nat1
-rw-r--r--contrib/ipfilter/test/regress/ni14.ipf3
-rw-r--r--contrib/ipfilter/test/regress/ni14.nat1
-rw-r--r--contrib/ipfilter/test/regress/ni15.ipf3
-rw-r--r--contrib/ipfilter/test/regress/ni15.nat1
-rw-r--r--contrib/ipfilter/test/regress/ni16.ipf3
-rw-r--r--contrib/ipfilter/test/regress/ni16.nat1
-rw-r--r--contrib/ipfilter/test/regress/ni17.nat4
-rw-r--r--contrib/ipfilter/test/regress/ni19.ipf3
-rw-r--r--contrib/ipfilter/test/regress/ni19.nat1
-rw-r--r--contrib/ipfilter/test/regress/ni2.ipf1
-rw-r--r--contrib/ipfilter/test/regress/ni2.nat1
-rw-r--r--contrib/ipfilter/test/regress/ni20.ipf3
-rw-r--r--contrib/ipfilter/test/regress/ni20.nat1
-rw-r--r--contrib/ipfilter/test/regress/ni21.ipf1
-rw-r--r--contrib/ipfilter/test/regress/ni21.nat1
-rw-r--r--contrib/ipfilter/test/regress/ni23.ipf3
-rw-r--r--contrib/ipfilter/test/regress/ni23.nat2
-rw-r--r--contrib/ipfilter/test/regress/ni3.ipf4
-rw-r--r--contrib/ipfilter/test/regress/ni3.nat1
-rw-r--r--contrib/ipfilter/test/regress/ni4.ipf4
-rw-r--r--contrib/ipfilter/test/regress/ni4.nat1
-rw-r--r--contrib/ipfilter/test/regress/ni5.ipf3
-rw-r--r--contrib/ipfilter/test/regress/ni5.nat1
-rw-r--r--contrib/ipfilter/test/regress/ni6.ipf9
-rw-r--r--contrib/ipfilter/test/regress/ni6.nat3
-rw-r--r--contrib/ipfilter/test/regress/ni7.ipf4
-rw-r--r--contrib/ipfilter/test/regress/ni7.nat1
-rw-r--r--contrib/ipfilter/test/regress/ni8.ipf1
-rw-r--r--contrib/ipfilter/test/regress/ni8.nat1
-rw-r--r--contrib/ipfilter/test/regress/ni9.ipf1
-rw-r--r--contrib/ipfilter/test/regress/ni9.nat1
-rw-r--r--contrib/ipfilter/test/regress/p1.ipf1
-rw-r--r--contrib/ipfilter/test/regress/p1.pool2
-rw-r--r--contrib/ipfilter/test/regress/p2.ipf2
-rw-r--r--contrib/ipfilter/test/regress/p3.ipf6
-rw-r--r--contrib/ipfilter/test/regress/p3.pool4
-rw-r--r--contrib/ipfilter/test/regress/p5.ipf1
-rw-r--r--contrib/ipfilter/test/regress/p5.pool2
-rw-r--r--contrib/ipfilter/test/regress/regress.sed0
137 files changed, 0 insertions, 1062 deletions
diff --git a/contrib/ipfilter/test/regress/1 b/contrib/ipfilter/test/regress/1
deleted file mode 100644
index 6a2ede9..0000000
--- a/contrib/ipfilter/test/regress/1
+++ /dev/null
@@ -1,4 +0,0 @@
-block in all
-pass in all
-block out all
-pass out all
diff --git a/contrib/ipfilter/test/regress/10 b/contrib/ipfilter/test/regress/10
deleted file mode 100644
index 3552983..0000000
--- a/contrib/ipfilter/test/regress/10
+++ /dev/null
@@ -1,18 +0,0 @@
-block in from any to any with not ipopts
-pass in from any to any with not opt sec-class topsecret
-block in from any to any with not opt ssrr,sec-class topsecret
-pass in from any to any with not opt ssrr,sec-class topsecret
-block in from any to any with not opt ts,sec-class topsecret
-pass in from any to any with not opt ts,sec-class topsecret
-block in from any to any with not opt sec-class secret
-pass in from any to any with not opt sec-class secret
-block in from any to any with not opt lsrr,ssrr
-pass in from any to any with not opt lsrr,ssrr
-pass in from any to any with not ipopts
-block in from any to any with not opt lsrr
-pass in from any to any with not opt lsrr
-block in from any to any with not opt ssrr,ts
-pass in from any to any with not opt ssrr,ts
-block in from any to any with not opt rr
-pass in from any to any with not opt rr
-block in from any to any with not opt sec-class topsecret
diff --git a/contrib/ipfilter/test/regress/11 b/contrib/ipfilter/test/regress/11
deleted file mode 100644
index 0bf0a2a..0000000
--- a/contrib/ipfilter/test/regress/11
+++ /dev/null
@@ -1,6 +0,0 @@
-pass in proto tcp from any to any port = 23 flags S/SA keep state
-block in proto tcp from any to any port = 23 flags S/SA keep state
-pass in proto udp from any to any port = 53 keep frags
-block in proto udp from any to any port = 53 keep frags
-pass in proto udp from any to any port = 53 keep state
-block in proto udp from any to any port = 53 keep state
diff --git a/contrib/ipfilter/test/regress/12 b/contrib/ipfilter/test/regress/12
deleted file mode 100644
index c29f839..0000000
--- a/contrib/ipfilter/test/regress/12
+++ /dev/null
@@ -1,6 +0,0 @@
-pass in proto tcp from any port > 1024 to any port = 25 with not short
-pass in proto tcp from any port > 1024 to any port = 25
-block in proto tcp from any to any with short
-block in proto tcp from any to any with frag
-pass in proto udp from any port = 53 to any port = 53
-block in proto udp from any port = 53 to any port = 53 with not short
diff --git a/contrib/ipfilter/test/regress/13 b/contrib/ipfilter/test/regress/13
deleted file mode 100644
index f123e47..0000000
--- a/contrib/ipfilter/test/regress/13
+++ /dev/null
@@ -1,6 +0,0 @@
-pass in proto tcp from any to any port = 25 flags S/SA keep frags
-block in proto tcp from any to any port = 25 flags S/SA keep frags
-pass in proto udp from any to any port = 53 keep frags
-block in proto udp from any to any port = 53 keep frags
-pass in proto tcp from any to any port = 25 flags S/SA keep state keep frags
-block in proto tcp from any to any port = 25 flags S/SA keep state keep frags
diff --git a/contrib/ipfilter/test/regress/14 b/contrib/ipfilter/test/regress/14
deleted file mode 100644
index aa54af8..0000000
--- a/contrib/ipfilter/test/regress/14
+++ /dev/null
@@ -1,8 +0,0 @@
-block in from !1.1.1.1 to any
-pass in from 1.1.1.1 to !any
-block in from 1.1.1.1/24 to !any
-pass in from !1.1.1.1/24 to any
-block in from !1.1.1.1/16 to any
-pass in from 1.1.1.1/16 to !any
-block in from 1.1.1.1/0 to !any
-pass in from !1.1.1.1/0 to any
diff --git a/contrib/ipfilter/test/regress/2 b/contrib/ipfilter/test/regress/2
deleted file mode 100644
index e2f02a4..0000000
--- a/contrib/ipfilter/test/regress/2
+++ /dev/null
@@ -1,6 +0,0 @@
-block in proto tcp from any to any
-pass in proto tcp from any to any
-block in proto udp from any to any
-pass in proto udp from any to any
-block in proto icmp from any to any
-pass in proto icmp from any to any
diff --git a/contrib/ipfilter/test/regress/3 b/contrib/ipfilter/test/regress/3
deleted file mode 100644
index ee80729..0000000
--- a/contrib/ipfilter/test/regress/3
+++ /dev/null
@@ -1,8 +0,0 @@
-block in from 1.1.1.1 to any
-pass in from 1.1.1.1 to any
-block in from 1.1.1.1/24 to any
-pass in from 1.1.1.1/24 to any
-block in from 1.1.1.1/16 to any
-pass in from 1.1.1.1/16 to any
-block in from 1.1.1.1/0 to any
-pass in from 1.1.1.1/0 to any
diff --git a/contrib/ipfilter/test/regress/4 b/contrib/ipfilter/test/regress/4
deleted file mode 100644
index bc8af2f..0000000
--- a/contrib/ipfilter/test/regress/4
+++ /dev/null
@@ -1,8 +0,0 @@
-block in from any to 1.1.1.1
-pass in from any to 1.1.1.1
-block in from any to 1.1.1.1/24
-pass in from any to 1.1.1.1/24
-block in from any to 1.1.1.1/16
-pass in from any to 1.1.1.1/16
-block in from any to 1.1.1.1/0
-pass in from any to 1.1.1.1/0
diff --git a/contrib/ipfilter/test/regress/5 b/contrib/ipfilter/test/regress/5
deleted file mode 100644
index 998eabd..0000000
--- a/contrib/ipfilter/test/regress/5
+++ /dev/null
@@ -1,48 +0,0 @@
-block in proto tcp from any port = 23 to any
-block in proto udp from any port = 23 to any
-block in proto tcp/udp from any port = 23 to any
-pass in proto tcp from any port <= 1023 to any
-pass in proto udp from any port <= 1023 to any
-pass in proto tcp/udp from any port <= 1023 to any
-block in proto tcp from any port >= 1024 to any
-block in proto udp from any port >= 1024 to any
-block in proto tcp/udp from any port >= 1024 to any
-pass in proto tcp from any port >= 1024 to any
-pass in proto udp from any port >= 1024 to any
-pass in proto tcp/udp from any port >= 1024 to any
-block in proto tcp from any port 0 >< 512 to any
-block in proto udp from any port 0 >< 512 to any
-block in proto tcp/udp from any port 0 >< 512 to any
-pass in proto tcp from any port 0 >< 512 to any
-pass in proto udp from any port 0 >< 512 to any
-pass in proto tcp/udp from any port 0 >< 512 to any
-block in proto tcp from any port 6000 <> 6009 to any
-block in proto udp from any port 6000 <> 6009 to any
-block in proto tcp/udp from any port 6000 <> 6009 to any
-pass in proto tcp from any port 6000 <> 6009 to any
-pass in proto udp from any port 6000 <> 6009 to any
-pass in proto tcp/udp from any port 6000 <> 6009 to any
-pass in proto tcp from any port = 23 to any
-pass in proto udp from any port = 23 to any
-pass in proto tcp/udp from any port = 23 to any
-block in proto tcp from any port != 21 to any
-block in proto udp from any port != 21 to any
-block in proto tcp/udp from any port != 21 to any
-pass in proto tcp from any port != 21 to any
-pass in proto udp from any port != 21 to any
-pass in proto tcp/udp from any port != 21 to any
-block in proto tcp from any port < 1024 to any
-block in proto udp from any port < 1024 to any
-block in proto tcp/udp from any port < 1024 to any
-pass in proto tcp from any port < 1024 to any
-pass in proto udp from any port < 1024 to any
-pass in proto tcp/udp from any port < 1024 to any
-block in proto tcp from any port > 1023 to any
-block in proto udp from any port > 1023 to any
-block in proto tcp/udp from any port > 1023 to any
-pass in proto tcp from any port > 1023 to any
-pass in proto udp from any port > 1023 to any
-pass in proto tcp/udp from any port > 1023 to any
-block in proto tcp from any port <= 1023 to any
-block in proto udp from any port <= 1023 to any
-block in proto tcp/udp from any port <= 1023 to any
diff --git a/contrib/ipfilter/test/regress/6 b/contrib/ipfilter/test/regress/6
deleted file mode 100644
index 291f09ad..0000000
--- a/contrib/ipfilter/test/regress/6
+++ /dev/null
@@ -1,48 +0,0 @@
-block in proto tcp from any to any port = 23
-block in proto udp from any to any port = 23
-block in proto tcp/udp from any to any port = 23
-pass in proto tcp from any to any port <= 1023
-pass in proto udp from any to any port <= 1023
-pass in proto tcp/udp from any to any port <= 1023
-block in proto tcp from any to any port >= 1024
-block in proto udp from any to any port >= 1024
-block in proto tcp/udp from any to any port >= 1024
-pass in proto tcp from any to any port >= 1024
-pass in proto udp from any to any port >= 1024
-pass in proto tcp/udp from any to any port >= 1024
-block in proto tcp from any to any port 0 >< 512
-block in proto udp from any to any port 0 >< 512
-block in proto tcp/udp from any to any port 0 >< 512
-pass in proto tcp from any to any port 0 >< 512
-pass in proto udp from any to any port 0 >< 512
-pass in proto tcp/udp from any to any port 0 >< 512
-block in proto tcp from any to any port 6000 <> 6009
-block in proto udp from any to any port 6000 <> 6009
-block in proto tcp/udp from any to any port 6000 <> 6009
-pass in proto tcp from any to any port 6000 <> 6009
-pass in proto udp from any to any port 6000 <> 6009
-pass in proto tcp/udp from any to any port 6000 <> 6009
-pass in proto tcp from any to any port = 23
-pass in proto udp from any to any port = 23
-pass in proto tcp/udp from any to any port = 23
-block in proto tcp from any to any port != 21
-block in proto udp from any to any port != 21
-block in proto tcp/udp from any to any port != 21
-pass in proto tcp from any to any port != 21
-pass in proto udp from any to any port != 21
-pass in proto tcp/udp from any to any port != 21
-block in proto tcp from any to any port < 1024
-block in proto udp from any to any port < 1024
-block in proto tcp/udp from any to any port < 1024
-pass in proto tcp from any to any port < 1024
-pass in proto udp from any to any port < 1024
-pass in proto tcp/udp from any to any port < 1024
-block in proto tcp from any to any port > 1023
-block in proto udp from any to any port > 1023
-block in proto tcp/udp from any to any port > 1023
-pass in proto tcp from any to any port > 1023
-pass in proto udp from any to any port > 1023
-pass in proto tcp/udp from any to any port > 1023
-block in proto tcp from any to any port <= 1023
-block in proto udp from any to any port <= 1023
-block in proto tcp/udp from any to any port <= 1023
diff --git a/contrib/ipfilter/test/regress/7 b/contrib/ipfilter/test/regress/7
deleted file mode 100644
index 6848a68..0000000
--- a/contrib/ipfilter/test/regress/7
+++ /dev/null
@@ -1,6 +0,0 @@
-block in proto icmp from any to any icmp-type echo
-pass in proto icmp from any to any icmp-type echo
-block in proto icmp from any to any icmp-type unreach code 3
-pass in proto icmp from any to any icmp-type unreach code 3
-block in proto icmp from any to any icmp-type echorep
-pass in proto icmp from any to any icmp-type echorep
diff --git a/contrib/ipfilter/test/regress/8 b/contrib/ipfilter/test/regress/8
deleted file mode 100644
index 0f28fd2..0000000
--- a/contrib/ipfilter/test/regress/8
+++ /dev/null
@@ -1,6 +0,0 @@
-block in proto tcp from any to any flags S
-pass in proto tcp from any to any flags S
-block in proto tcp from any to any flags S/SA
-pass in proto tcp from any to any flags S/SA
-block in proto tcp from any to any flags S/APU
-pass in proto tcp from any to any flags S/APU
diff --git a/contrib/ipfilter/test/regress/9 b/contrib/ipfilter/test/regress/9
deleted file mode 100644
index 17bc967..0000000
--- a/contrib/ipfilter/test/regress/9
+++ /dev/null
@@ -1,18 +0,0 @@
-block in from any to any with ipopts
-pass in from any to any with opt sec-class topsecret
-block in from any to any with opt ssrr,sec-class topsecret
-pass in from any to any with opt ssrr,sec-class topsecret
-block in from any to any with opt ts,sec-class topsecret
-pass in from any to any with opt ts,sec-class topsecret
-block in from any to any with opt sec-class secret
-pass in from any to any with opt sec-class secret
-block in from any to any with opt lsrr,ssrr
-pass in from any to any with opt lsrr,ssrr
-pass in from any to any with ipopts
-block in from any to any with opt lsrr
-pass in from any to any with opt lsrr
-block in from any to any with opt ssrr,ts
-pass in from any to any with opt ssrr,ts
-block in from any to any with opt rr
-pass in from any to any with opt rr
-block in from any to any with opt sec-class topsecret
diff --git a/contrib/ipfilter/test/regress/bpf-f1 b/contrib/ipfilter/test/regress/bpf-f1
deleted file mode 100644
index 2c80283..0000000
--- a/contrib/ipfilter/test/regress/bpf-f1
+++ /dev/null
@@ -1,4 +0,0 @@
-pass in bpf-v4 { "0x20 0 0 0xc 0x15 0 0x1 0x1010101 0x6 0 0 0x60 0x6 0 0 0" }
-pass out bpf-v4 { "0x20 0 0 0xc 0x15 0 0x1 0x1010101 0x6 0 0 0x60 0x6 0 0 0" }
-pass in bpf-v4 { "0x20 0 0 0x10 0x15 0 0x1 0x1010101 0x6 0 0 0x60 0x6 0 0 0" }
-pass out bpf-v4 { "0x20 0 0 0x10 0x15 0 0x1 0x1010101 0x6 0 0 0x60 0x6 0 0 0" }
diff --git a/contrib/ipfilter/test/regress/bpf1 b/contrib/ipfilter/test/regress/bpf1
deleted file mode 100644
index 5d83b77..0000000
--- a/contrib/ipfilter/test/regress/bpf1
+++ /dev/null
@@ -1,4 +0,0 @@
-pass in bpf-v4 { "0x20 0 0 0xc 0x15 0 0x1 0x1010101 0x6 0 0 0x60 0x6 0 0 0" }
-pass out bpf-v4 { "src host 1.1.1.1" }
-pass in bpf-v4 { "0x20 0 0 0x10 0x15 0 0x1 0x1010101 0x6 0 0 0x60 0x6 0 0 0" }
-pass out bpf-v4 { "dst host 1.1.1.1" }
diff --git a/contrib/ipfilter/test/regress/f1 b/contrib/ipfilter/test/regress/f1
deleted file mode 100644
index 6a2ede9..0000000
--- a/contrib/ipfilter/test/regress/f1
+++ /dev/null
@@ -1,4 +0,0 @@
-block in all
-pass in all
-block out all
-pass out all
diff --git a/contrib/ipfilter/test/regress/f10 b/contrib/ipfilter/test/regress/f10
deleted file mode 100644
index 3552983..0000000
--- a/contrib/ipfilter/test/regress/f10
+++ /dev/null
@@ -1,18 +0,0 @@
-block in from any to any with not ipopts
-pass in from any to any with not opt sec-class topsecret
-block in from any to any with not opt ssrr,sec-class topsecret
-pass in from any to any with not opt ssrr,sec-class topsecret
-block in from any to any with not opt ts,sec-class topsecret
-pass in from any to any with not opt ts,sec-class topsecret
-block in from any to any with not opt sec-class secret
-pass in from any to any with not opt sec-class secret
-block in from any to any with not opt lsrr,ssrr
-pass in from any to any with not opt lsrr,ssrr
-pass in from any to any with not ipopts
-block in from any to any with not opt lsrr
-pass in from any to any with not opt lsrr
-block in from any to any with not opt ssrr,ts
-pass in from any to any with not opt ssrr,ts
-block in from any to any with not opt rr
-pass in from any to any with not opt rr
-block in from any to any with not opt sec-class topsecret
diff --git a/contrib/ipfilter/test/regress/f11 b/contrib/ipfilter/test/regress/f11
deleted file mode 100644
index a71e528..0000000
--- a/contrib/ipfilter/test/regress/f11
+++ /dev/null
@@ -1,7 +0,0 @@
-pass in proto tcp from any to any port = 23 flags S/SA keep state
-block in proto tcp from any to any port = 23 flags S/SA keep state
-pass in proto udp from any to any port = 53 keep frags
-block in proto udp from any to any port = 53 keep frags
-pass in proto udp from any to any port = 53 keep state
-block in proto udp from any to any port = 53 keep state
-pass in on e0 proto tcp from any to any port = 25 keep state
diff --git a/contrib/ipfilter/test/regress/f12 b/contrib/ipfilter/test/regress/f12
deleted file mode 100644
index c29f839..0000000
--- a/contrib/ipfilter/test/regress/f12
+++ /dev/null
@@ -1,6 +0,0 @@
-pass in proto tcp from any port > 1024 to any port = 25 with not short
-pass in proto tcp from any port > 1024 to any port = 25
-block in proto tcp from any to any with short
-block in proto tcp from any to any with frag
-pass in proto udp from any port = 53 to any port = 53
-block in proto udp from any port = 53 to any port = 53 with not short
diff --git a/contrib/ipfilter/test/regress/f13 b/contrib/ipfilter/test/regress/f13
deleted file mode 100644
index 8106419..0000000
--- a/contrib/ipfilter/test/regress/f13
+++ /dev/null
@@ -1,8 +0,0 @@
-pass in proto tcp from any to any port = 25 flags S/SA keep frags
-block in proto tcp from any to any port = 25 flags S/SA keep frags
-pass in proto udp from any to any port = 53 keep frags
-block in proto udp from any to any port = 53 keep frags
-pass in proto tcp from any to any port = 25 flags S/SA keep state keep frags
-block in proto tcp from any to any port = 25 flags S/SA keep state keep frags
-pass in proto udp from any to any port = 53 keep frags(strict)
-pass in proto tcp from any to any port = 25 keep state(strict)
diff --git a/contrib/ipfilter/test/regress/f14 b/contrib/ipfilter/test/regress/f14
deleted file mode 100644
index 06ab519..0000000
--- a/contrib/ipfilter/test/regress/f14
+++ /dev/null
@@ -1,8 +0,0 @@
-block in from !1.1.1.1 to any
-pass in from 1.1.1.1 to !any
-block in from 1.1.1.0/24 to !any
-pass in from !1.1.1.0/24 to any
-block in from !1.1.0.0/16 to any
-pass in from 1.1.0.0/16 to !1.2.0.0/16
-block in from any to !127.0.0.0/8
-pass in from !any to any
diff --git a/contrib/ipfilter/test/regress/f15 b/contrib/ipfilter/test/regress/f15
deleted file mode 100644
index 16185e1..0000000
--- a/contrib/ipfilter/test/regress/f15
+++ /dev/null
@@ -1,8 +0,0 @@
-block in log quick on hme0 from any to 195.134.65.0/25 head 10
-block return-rst in log quick proto tcp all flags S head 100 group 10
-pass in quick proto tcp from any to any port = 22 keep state group 100
-pass in quick proto tcp from any to any port = 23 keep state group 100
-pass in quick proto tcp from any to any port = 21 keep state group 100
-block return-icmp in quick proto udp all keep state head 110 group 10
-pass in quick proto udp from any to any port = 53 keep state group 110
-block in log quick on hme0 from any to any
diff --git a/contrib/ipfilter/test/regress/f16 b/contrib/ipfilter/test/regress/f16
deleted file mode 100644
index 920ad8c..0000000
--- a/contrib/ipfilter/test/regress/f16
+++ /dev/null
@@ -1,10 +0,0 @@
-pass in all
-skip 2 in proto tcp all
-block in quick proto tcp all
-skip 4 in proto udp all
-block in quick proto udp all
-pass in quick proto tcp from any to 1.1.1.1
-pass in quick proto tcp from any to 1.1.1.2 port = 22
-block in quick proto udp from any to any port = 53
-pass in quick proto udp from any to any port = 53
-block in all
diff --git a/contrib/ipfilter/test/regress/f17 b/contrib/ipfilter/test/regress/f17
deleted file mode 100644
index 9a75ae3..0000000
--- a/contrib/ipfilter/test/regress/f17
+++ /dev/null
@@ -1,4 +0,0 @@
-block in all
-block out all
-pass out quick on ppp0 proto tcp all flags S keep state
-block return-rst in quick proto tcp all
diff --git a/contrib/ipfilter/test/regress/f18 b/contrib/ipfilter/test/regress/f18
deleted file mode 100644
index acba2b3..0000000
--- a/contrib/ipfilter/test/regress/f18
+++ /dev/null
@@ -1,4 +0,0 @@
-pass in from 1.1.1.1 to any
-pass out from 2.2.2.2 to any
-count in from 1.1.1.1 to 3.3.3.3
-count out from 2.2.2.2 to 4.4.4.4
diff --git a/contrib/ipfilter/test/regress/f19 b/contrib/ipfilter/test/regress/f19
deleted file mode 100644
index d7770b8..0000000
--- a/contrib/ipfilter/test/regress/f19
+++ /dev/null
@@ -1,2 +0,0 @@
-pass in quick proto tcp all flags S keep state
-pass in quick proto tcp all flags S keep state(limit 1)
diff --git a/contrib/ipfilter/test/regress/f2 b/contrib/ipfilter/test/regress/f2
deleted file mode 100644
index e2f02a4..0000000
--- a/contrib/ipfilter/test/regress/f2
+++ /dev/null
@@ -1,6 +0,0 @@
-block in proto tcp from any to any
-pass in proto tcp from any to any
-block in proto udp from any to any
-pass in proto udp from any to any
-block in proto icmp from any to any
-pass in proto icmp from any to any
diff --git a/contrib/ipfilter/test/regress/f20 b/contrib/ipfilter/test/regress/f20
deleted file mode 100644
index 279523e..0000000
--- a/contrib/ipfilter/test/regress/f20
+++ /dev/null
@@ -1,4 +0,0 @@
-block out quick on de0 head 100
-skip 1 out group 100
-block out quick group 100
-pass out quick group 100
diff --git a/contrib/ipfilter/test/regress/f24 b/contrib/ipfilter/test/regress/f24
deleted file mode 100644
index 5cb3bab..0000000
--- a/contrib/ipfilter/test/regress/f24
+++ /dev/null
@@ -1 +0,0 @@
-pass out quick proto udp all keep state keep frags
diff --git a/contrib/ipfilter/test/regress/f3 b/contrib/ipfilter/test/regress/f3
deleted file mode 100644
index ee80729..0000000
--- a/contrib/ipfilter/test/regress/f3
+++ /dev/null
@@ -1,8 +0,0 @@
-block in from 1.1.1.1 to any
-pass in from 1.1.1.1 to any
-block in from 1.1.1.1/24 to any
-pass in from 1.1.1.1/24 to any
-block in from 1.1.1.1/16 to any
-pass in from 1.1.1.1/16 to any
-block in from 1.1.1.1/0 to any
-pass in from 1.1.1.1/0 to any
diff --git a/contrib/ipfilter/test/regress/f4 b/contrib/ipfilter/test/regress/f4
deleted file mode 100644
index bc8af2f..0000000
--- a/contrib/ipfilter/test/regress/f4
+++ /dev/null
@@ -1,8 +0,0 @@
-block in from any to 1.1.1.1
-pass in from any to 1.1.1.1
-block in from any to 1.1.1.1/24
-pass in from any to 1.1.1.1/24
-block in from any to 1.1.1.1/16
-pass in from any to 1.1.1.1/16
-block in from any to 1.1.1.1/0
-pass in from any to 1.1.1.1/0
diff --git a/contrib/ipfilter/test/regress/f5 b/contrib/ipfilter/test/regress/f5
deleted file mode 100644
index 998eabd..0000000
--- a/contrib/ipfilter/test/regress/f5
+++ /dev/null
@@ -1,48 +0,0 @@
-block in proto tcp from any port = 23 to any
-block in proto udp from any port = 23 to any
-block in proto tcp/udp from any port = 23 to any
-pass in proto tcp from any port <= 1023 to any
-pass in proto udp from any port <= 1023 to any
-pass in proto tcp/udp from any port <= 1023 to any
-block in proto tcp from any port >= 1024 to any
-block in proto udp from any port >= 1024 to any
-block in proto tcp/udp from any port >= 1024 to any
-pass in proto tcp from any port >= 1024 to any
-pass in proto udp from any port >= 1024 to any
-pass in proto tcp/udp from any port >= 1024 to any
-block in proto tcp from any port 0 >< 512 to any
-block in proto udp from any port 0 >< 512 to any
-block in proto tcp/udp from any port 0 >< 512 to any
-pass in proto tcp from any port 0 >< 512 to any
-pass in proto udp from any port 0 >< 512 to any
-pass in proto tcp/udp from any port 0 >< 512 to any
-block in proto tcp from any port 6000 <> 6009 to any
-block in proto udp from any port 6000 <> 6009 to any
-block in proto tcp/udp from any port 6000 <> 6009 to any
-pass in proto tcp from any port 6000 <> 6009 to any
-pass in proto udp from any port 6000 <> 6009 to any
-pass in proto tcp/udp from any port 6000 <> 6009 to any
-pass in proto tcp from any port = 23 to any
-pass in proto udp from any port = 23 to any
-pass in proto tcp/udp from any port = 23 to any
-block in proto tcp from any port != 21 to any
-block in proto udp from any port != 21 to any
-block in proto tcp/udp from any port != 21 to any
-pass in proto tcp from any port != 21 to any
-pass in proto udp from any port != 21 to any
-pass in proto tcp/udp from any port != 21 to any
-block in proto tcp from any port < 1024 to any
-block in proto udp from any port < 1024 to any
-block in proto tcp/udp from any port < 1024 to any
-pass in proto tcp from any port < 1024 to any
-pass in proto udp from any port < 1024 to any
-pass in proto tcp/udp from any port < 1024 to any
-block in proto tcp from any port > 1023 to any
-block in proto udp from any port > 1023 to any
-block in proto tcp/udp from any port > 1023 to any
-pass in proto tcp from any port > 1023 to any
-pass in proto udp from any port > 1023 to any
-pass in proto tcp/udp from any port > 1023 to any
-block in proto tcp from any port <= 1023 to any
-block in proto udp from any port <= 1023 to any
-block in proto tcp/udp from any port <= 1023 to any
diff --git a/contrib/ipfilter/test/regress/f6 b/contrib/ipfilter/test/regress/f6
deleted file mode 100644
index 291f09ad..0000000
--- a/contrib/ipfilter/test/regress/f6
+++ /dev/null
@@ -1,48 +0,0 @@
-block in proto tcp from any to any port = 23
-block in proto udp from any to any port = 23
-block in proto tcp/udp from any to any port = 23
-pass in proto tcp from any to any port <= 1023
-pass in proto udp from any to any port <= 1023
-pass in proto tcp/udp from any to any port <= 1023
-block in proto tcp from any to any port >= 1024
-block in proto udp from any to any port >= 1024
-block in proto tcp/udp from any to any port >= 1024
-pass in proto tcp from any to any port >= 1024
-pass in proto udp from any to any port >= 1024
-pass in proto tcp/udp from any to any port >= 1024
-block in proto tcp from any to any port 0 >< 512
-block in proto udp from any to any port 0 >< 512
-block in proto tcp/udp from any to any port 0 >< 512
-pass in proto tcp from any to any port 0 >< 512
-pass in proto udp from any to any port 0 >< 512
-pass in proto tcp/udp from any to any port 0 >< 512
-block in proto tcp from any to any port 6000 <> 6009
-block in proto udp from any to any port 6000 <> 6009
-block in proto tcp/udp from any to any port 6000 <> 6009
-pass in proto tcp from any to any port 6000 <> 6009
-pass in proto udp from any to any port 6000 <> 6009
-pass in proto tcp/udp from any to any port 6000 <> 6009
-pass in proto tcp from any to any port = 23
-pass in proto udp from any to any port = 23
-pass in proto tcp/udp from any to any port = 23
-block in proto tcp from any to any port != 21
-block in proto udp from any to any port != 21
-block in proto tcp/udp from any to any port != 21
-pass in proto tcp from any to any port != 21
-pass in proto udp from any to any port != 21
-pass in proto tcp/udp from any to any port != 21
-block in proto tcp from any to any port < 1024
-block in proto udp from any to any port < 1024
-block in proto tcp/udp from any to any port < 1024
-pass in proto tcp from any to any port < 1024
-pass in proto udp from any to any port < 1024
-pass in proto tcp/udp from any to any port < 1024
-block in proto tcp from any to any port > 1023
-block in proto udp from any to any port > 1023
-block in proto tcp/udp from any to any port > 1023
-pass in proto tcp from any to any port > 1023
-pass in proto udp from any to any port > 1023
-pass in proto tcp/udp from any to any port > 1023
-block in proto tcp from any to any port <= 1023
-block in proto udp from any to any port <= 1023
-block in proto tcp/udp from any to any port <= 1023
diff --git a/contrib/ipfilter/test/regress/f7 b/contrib/ipfilter/test/regress/f7
deleted file mode 100644
index be1b969..0000000
--- a/contrib/ipfilter/test/regress/f7
+++ /dev/null
@@ -1,9 +0,0 @@
-block in proto icmp from any to any icmp-type echo
-pass in proto icmp from any to any icmp-type echo
-block in proto icmp from any to any icmp-type unreach code 3
-pass in proto icmp from any to any icmp-type unreach code 3
-block in proto icmp from any to any icmp-type echorep
-pass in proto icmp from any to any icmp-type echorep
-pass in proto icmp all icmp-type maskreq keep state
-pass in proto icmp all icmp-type timest keep state
-pass in proto icmp all icmp-type inforeq keep state
diff --git a/contrib/ipfilter/test/regress/f8 b/contrib/ipfilter/test/regress/f8
deleted file mode 100644
index 0f28fd2..0000000
--- a/contrib/ipfilter/test/regress/f8
+++ /dev/null
@@ -1,6 +0,0 @@
-block in proto tcp from any to any flags S
-pass in proto tcp from any to any flags S
-block in proto tcp from any to any flags S/SA
-pass in proto tcp from any to any flags S/SA
-block in proto tcp from any to any flags S/APU
-pass in proto tcp from any to any flags S/APU
diff --git a/contrib/ipfilter/test/regress/f9 b/contrib/ipfilter/test/regress/f9
deleted file mode 100644
index 17bc967..0000000
--- a/contrib/ipfilter/test/regress/f9
+++ /dev/null
@@ -1,18 +0,0 @@
-block in from any to any with ipopts
-pass in from any to any with opt sec-class topsecret
-block in from any to any with opt ssrr,sec-class topsecret
-pass in from any to any with opt ssrr,sec-class topsecret
-block in from any to any with opt ts,sec-class topsecret
-pass in from any to any with opt ts,sec-class topsecret
-block in from any to any with opt sec-class secret
-pass in from any to any with opt sec-class secret
-block in from any to any with opt lsrr,ssrr
-pass in from any to any with opt lsrr,ssrr
-pass in from any to any with ipopts
-block in from any to any with opt lsrr
-pass in from any to any with opt lsrr
-block in from any to any with opt ssrr,ts
-pass in from any to any with opt ssrr,ts
-block in from any to any with opt rr
-pass in from any to any with opt rr
-block in from any to any with opt sec-class topsecret
diff --git a/contrib/ipfilter/test/regress/i1 b/contrib/ipfilter/test/regress/i1
deleted file mode 100644
index 0fd2c6e..0000000
--- a/contrib/ipfilter/test/regress/i1
+++ /dev/null
@@ -1,18 +0,0 @@
-pass in all
-block out \
-all
-log in all
-log body in all
-count in from any to any
-pass in from !any to any pps 10
-block in from any to !any
-pass in on ed0 from localhost to localhost
-pass in on ed0,vx0 from localhost to localhost
-block in log first on lo0 from any to any
-pass in log body or-block quick from any to any
-block return-rst in quick on le0 proto tcp from any to any
-block return-icmp in on qe0 from any to any
-block return-icmp(1) in on qe0 from any to any
-block return-icmp-as-dest in on le0 from any to any
-block return-icmp-as-dest(port-unr) in on qe0 from any to any
-pass out on longNICname0 from test.host.dots to test\.host.dots
diff --git a/contrib/ipfilter/test/regress/i10 b/contrib/ipfilter/test/regress/i10
deleted file mode 100644
index 640ac84..0000000
--- a/contrib/ipfilter/test/regress/i10
+++ /dev/null
@@ -1,5 +0,0 @@
-pass in from localhost to localhost with opt sec
-pass in from localhost to localhost with opt lsrr not opt sec
-block in from any to any with not opt sec-class topsecret
-block in from any to any with not opt sec-class topsecret,secret
-pass in from any to any with opt sec-class topsecret,confid not opt sec-class unclass
diff --git a/contrib/ipfilter/test/regress/i11 b/contrib/ipfilter/test/regress/i11
deleted file mode 100644
index cb7d683..0000000
--- a/contrib/ipfilter/test/regress/i11
+++ /dev/null
@@ -1,11 +0,0 @@
-pass in on ed0 proto tcp from localhost to localhost port = telnet keep state
-block in log first on lo0 proto tcp/udp from any to any port = echo keep state
-pass in proto udp from localhost to localhost port = 20499 keep frag
-pass in proto udp from localhost to localhost port = 2049 keep frag(strict)
-pass in proto udp from localhost to localhost port = 53 keep state keep frags
-pass in on ed0 out-via vx0 proto udp from any to any keep state
-pass out on ppp0 in-via le0 proto tcp from any to any keep state
-pass in on ed0,vx0 out-via vx0,ed0 proto udp from any to any keep state
-pass in proto tcp from any port gt 1024 to localhost port eq 1024 keep state
-pass in proto tcp all flags S keep state(strict,newisn,no-icmp-err,limit 101,age 600)
-pass in proto udp all keep state(age 10/20,sync)
diff --git a/contrib/ipfilter/test/regress/i12 b/contrib/ipfilter/test/regress/i12
deleted file mode 100644
index 5342702..0000000
--- a/contrib/ipfilter/test/regress/i12
+++ /dev/null
@@ -1,10 +0,0 @@
-pass in from 1.1.1.1/32 to 2.2.2.2/32
-pass in from (2.2.2.2/24,3.3.3.3/32) to 4.4.4.4/32
-pass in from (2.2.2.2/24,3.3.3.3/32) to (5.5.5.5/32,6.6.6.6/32)
-pass in from (2.2.2.2/24,3.3.3.3/32) to (5.5.5.5/32,6.6.6.6/32) port = (22,25)
-pass in proto tcp from (2.2.2.2/24,3.3.3.3/32) port = (53,9) to (5.5.5.5/32,6.6.6.6/32)
-pass in proto udp from (2.2.2.2/24,3.3.3.3/32) to (5.5.5.5/32,6.6.6.6/32) port = (53,9)
-pass in from 10.10.10.10 to 11.11.11.11
-pass in from pool/101 to hash/202
-pass in from hash/303 to pool/404
-pass in from pool=(!1.1.1.1,2.2.2.2,!2.2.0.0/16) to pool = ( 1.1.0.0/16 )
diff --git a/contrib/ipfilter/test/regress/i13 b/contrib/ipfilter/test/regress/i13
deleted file mode 100644
index 3ba343d..0000000
--- a/contrib/ipfilter/test/regress/i13
+++ /dev/null
@@ -1,8 +0,0 @@
-a=any;
-b="from $a";
-c='to $a';
-d=block;
-e="pass in";
-$d in $b $c
-f=" $b $c";
-$e${f}
diff --git a/contrib/ipfilter/test/regress/i14 b/contrib/ipfilter/test/regress/i14
deleted file mode 100644
index 2cd2613..0000000
--- a/contrib/ipfilter/test/regress/i14
+++ /dev/null
@@ -1,10 +0,0 @@
-block in on eri0 all head 1
-pass in on eri0 proto icmp all group 1
-pass out on ed0 all head 1000000
-block out on ed0 proto udp all group 1000000
-block in on vm0 proto tcp/udp all head 101
-pass in from 1.1.1.1 to 2.2.2.2 group 101
-pass in proto tcp from 1.0.0.1 to 2.0.0.2 group 101
-pass in proto udp from 2.0.0.2 to 3.0.0.3 group 101
-block in on vm0 proto tcp/udp all head vm0-group
-pass in from 1.1.1.1 to 2.2.2.2 group vm0-group
diff --git a/contrib/ipfilter/test/regress/i15 b/contrib/ipfilter/test/regress/i15
deleted file mode 100644
index 0e6b0d1..0000000
--- a/contrib/ipfilter/test/regress/i15
+++ /dev/null
@@ -1,4 +0,0 @@
-pass out on fxp0 all set-tag(log=100)
-pass out on fxp0 all set-tag(nat=foo)
-pass out on fxp0 all set-tag(log=100, nat=200)
-pass out on fxp0 all set-tag(log=2147483648, nat=overtherainbowisapotof)
diff --git a/contrib/ipfilter/test/regress/i16 b/contrib/ipfilter/test/regress/i16
deleted file mode 100644
index 5c9144a..0000000
--- a/contrib/ipfilter/test/regress/i16
+++ /dev/null
@@ -1,3 +0,0 @@
-0 block out all
-100 pass in all
-10101 pass out proto tcp all
diff --git a/contrib/ipfilter/test/regress/i17 b/contrib/ipfilter/test/regress/i17
deleted file mode 100644
index e399248..0000000
--- a/contrib/ipfilter/test/regress/i17
+++ /dev/null
@@ -1,13 +0,0 @@
-100 pass in all
-200 pass in proto tcp all
-110 pass in proto udp all
-110 pass in from localhost to any
-pass in all
-pass in from localhost to any
-@0 100 pass in from localhost to any
-@1 pass in from any to localhost
-@0 pass in from 1.1.1.1 to any
-@1 110 pass in from 2.2.2.2 to any
-@2 pass in from 3.3.3.3 to any
-call fr_srcgrpmap/100 out from 10.1.0.0/16 to any
-call now fr_dstgrpmap/200 in from 10.2.0.0/16 to any
diff --git a/contrib/ipfilter/test/regress/i18 b/contrib/ipfilter/test/regress/i18
deleted file mode 100644
index 03ce713..0000000
--- a/contrib/ipfilter/test/regress/i18
+++ /dev/null
@@ -1,3 +0,0 @@
-pass in tos (80,0x80) all
-pass in tos (0x80,80) all
-block in ttl (0,1,2,3,4,5,6) all
diff --git a/contrib/ipfilter/test/regress/i19 b/contrib/ipfilter/test/regress/i19
deleted file mode 100644
index a09fd56..0000000
--- a/contrib/ipfilter/test/regress/i19
+++ /dev/null
@@ -1,22 +0,0 @@
-block in quick log level user.debug proto icmp all
-block in quick log level mail.info proto icmp all
-block in quick log level daemon.notice proto icmp all
-block in quick log level auth.warn proto icmp all
-block in quick log level syslog.err proto icmp all
-block in quick log level lpr.crit proto icmp all
-block in quick log level news.alert proto icmp all
-block in quick log level uucp.emerg proto icmp all
-block in quick log level cron.debug proto icmp all
-block in quick log level ftp.info proto icmp all
-block in quick log level authpriv.notice proto icmp all
-block in quick log level logalert.warn proto icmp all
-block in quick log level local0.err proto icmp all
-block in quick log level local1.crit proto icmp all
-block in quick log level local2.alert proto icmp all
-block in quick log level local3.emerg proto icmp all
-block in quick log level local4.debug proto icmp all
-block in quick log level local5.info proto icmp all
-block in quick log level local6.notice proto icmp all
-block in quick log level local7.warn proto icmp all
-block in quick log level kern.err proto icmp all
-block in quick log level security.emerg proto icmp all
diff --git a/contrib/ipfilter/test/regress/i2 b/contrib/ipfilter/test/regress/i2
deleted file mode 100644
index 50f6107..0000000
--- a/contrib/ipfilter/test/regress/i2
+++ /dev/null
@@ -1,8 +0,0 @@
-log in proto tcp all
-pass in proto 6 from any to any
-pass in proto udp from localhost to localhost
-block in proto ipv6 from any to any
-block in proto 17 from any to any
-block in proto 250 from any to any
-pass in proto tcp/udp from any to any
-block in proto tcp-udp from any to any
diff --git a/contrib/ipfilter/test/regress/i20 b/contrib/ipfilter/test/regress/i20
deleted file mode 100644
index 99039ee..0000000
--- a/contrib/ipfilter/test/regress/i20
+++ /dev/null
@@ -1,4 +0,0 @@
-pass in on ppp0 from ppp0/peer to ppp0/32
-block in on hme0 from any to hme0/broadcast
-pass in on bge0 from bge0/network to bge0/32
-block in on eri0 from any to eri0/netmasked
diff --git a/contrib/ipfilter/test/regress/i21 b/contrib/ipfilter/test/regress/i21
deleted file mode 100644
index 9d583ab..0000000
--- a/contrib/ipfilter/test/regress/i21
+++ /dev/null
@@ -1,7 +0,0 @@
-pass in from port = 10101
-pass out from any to port != 22
-block in from port 20:21
-block out from any to port 10 <> 100
-pass out from any to port = (3,5,7,9)
-block in from port = (20,25)
-pass in from any port = (11:12, 21:22) to any port = (1:2, 4:5, 8:9)
diff --git a/contrib/ipfilter/test/regress/i3 b/contrib/ipfilter/test/regress/i3
deleted file mode 100644
index 390fc3c..0000000
--- a/contrib/ipfilter/test/regress/i3
+++ /dev/null
@@ -1,14 +0,0 @@
-log in all
-pass in from 128.16/16 to 129.10.10/24
-pass in from 128.0.0.1/24 to 1\
-28\
-.\
-0.0.1/16
-pass in from 128.0.0.1/0xffffff00 to 128.0.0.1/0xffff0000
-pass in from 128.0.0.1/255.255.255.0 to 128.0.0.1/255.255.0.0
-pass in from 128.0.0.1 mask 0xffffff00 to 128.0.0.1 mask 0xffff0000
-pass in from 128.0.0.1 mask 255.255.255.0 to 128.0.0.1 mask 255.255.0.0
-pass in from localhost to localhost
-block in log from 0/0 to 0/0
-block in log level auth.info on hme0 all
-log level local5.warn out all
diff --git a/contrib/ipfilter/test/regress/i4 b/contrib/ipfilter/test/regress/i4
deleted file mode 100644
index 8551f76..0000000
--- a/contrib/ipfilter/test/regress/i4
+++ /dev/null
@@ -1,9 +0,0 @@
-log in proto tcp from any port > 0 to any
-log in proto tcp from any to any port > 0
-pass in proto 6 from any port != 0 to any port 0 >< 65535
-pass in proto 17 from localhost port > 32000 to localhost port < 29000
-block in proto udp from any port != \ntp to any port < echo
-block in proto tcp from any port = smtp to any port > 25
-pass in proto tcp/udp from any port 1 >< 3 to any port 1 <> 3
-pass in proto tcp/udp from any port 2:2 to any port 10:20
-pass in log first quick proto tcp from any port > 1023 to any port = 1723 flags S keep state
diff --git a/contrib/ipfilter/test/regress/i5 b/contrib/ipfilter/test/regress/i5
deleted file mode 100644
index 788f971..0000000
--- a/contrib/ipfilter/test/regress/i5
+++ /dev/null
@@ -1,9 +0,0 @@
-log in all
-count in tos 0x80 from any to any
-pass in on ed0 tos 64 from localhost to localhost
-block in log on lo0 ttl 0 from any to any
-pass in quick ttl 1 from any to any
-skip 3 out from 127.0.0.1 to any
-auth out on foo0 proto tcp from any to any port = 80
-preauth out on foo0 proto tcp from any to any port = 22
-nomatch out on foo0 proto tcp from any port < 1024 to any
diff --git a/contrib/ipfilter/test/regress/i6 b/contrib/ipfilter/test/regress/i6
deleted file mode 100644
index 0b371bd..0000000
--- a/contrib/ipfilter/test/regress/i6
+++ /dev/null
@@ -1,12 +0,0 @@
-pass in on lo0 fastroute from any to any
-pass in on lo0 to qe0 from localhost to localhost
-pass in on le0 to qe0:127.0.0.1 from localhost to localhost
-pass in on lo0 dup-to qe0 from localhost to localhost
-pass in on le0 dup-to qe0:127.0.0.1 from localhost to localhost
-pass in on le0 to hme0:10.1.1.1 dup-to qe0:127.0.0.1 from localhost to localhost
-block in quick on qe0 to qe1 from any to any
-block in quick to qe1 from any to any
-pass out quick dup-to hme0 from any to any
-pass out quick on hme0 reply-to hme1 from any to any
-pass in on le0 dup-to qe0:127.0.0.1 reply-to hme1:10.10.10.10 all
-pass in quick fastroute all
diff --git a/contrib/ipfilter/test/regress/i7 b/contrib/ipfilter/test/regress/i7
deleted file mode 100644
index 1a82940..0000000
--- a/contrib/ipfilter/test/regress/i7
+++ /dev/null
@@ -1,9 +0,0 @@
-pass in on ed0 proto tcp from localhost to localhost port = 23 flags S/SA
-block in on lo0 proto tcp from any to any flags A
-pass in on lo0 proto tcp from any to any flags /SAP
-block in on lo0 proto tcp from any to any flags 0x80/A
-pass in on lo0 proto tcp from any to any flags S/18
-block in on lo0 proto tcp from any to any flags 2/18
-pass in on lo0 proto tcp from any to any flags 2
-block in on lo0 proto tcp from any to any flags /16
-pass in on lo0 proto tcp from any to any flags 2/SA
diff --git a/contrib/ipfilter/test/regress/i8 b/contrib/ipfilter/test/regress/i8
deleted file mode 100644
index c30f8bd..0000000
--- a/contrib/ipfilter/test/regress/i8
+++ /dev/null
@@ -1,33 +0,0 @@
-pass in proto icmp from localhost to localhost icmp-type timest
-block in proto icmp from any to any icmp-type unreach code 1
-pass in proto icmp all icmp-type unreach code cutoff-preced
-pass in proto icmp all icmp-type unreach code filter-prohib
-pass in proto icmp all icmp-type unreach code isolate
-pass in proto icmp all icmp-type unreach code needfrag
-pass in proto icmp all icmp-type unreach code net-prohib
-pass in proto icmp all icmp-type unreach code net-tos
-pass in proto icmp all icmp-type unreach code host-preced
-pass in proto icmp all icmp-type unreach code host-prohib
-pass in proto icmp all icmp-type unreach code host-tos
-pass in proto icmp all icmp-type unreach code host-unk
-pass in proto icmp all icmp-type unreach code host-unr
-pass in proto icmp all icmp-type unreach code (net-unk,net-unr)
-pass in proto icmp all icmp-type unreach code port-unr
-pass in proto icmp all icmp-type unreach code proto-unr
-pass in proto icmp all icmp-type unreach code srcfail
-pass in proto icmp all icmp-type (echo,echorep)
-pass in proto icmp all icmp-type inforeq
-pass in proto icmp all icmp-type inforep
-pass in proto icmp all icmp-type maskrep
-pass in proto icmp all icmp-type maskreq
-pass in proto icmp all icmp-type paramprob
-pass in proto icmp all icmp-type redir
-pass in proto icmp all icmp-type unreach
-pass in proto icmp all icmp-type routerad
-pass in proto icmp all icmp-type routersol
-pass in proto icmp all icmp-type squench
-pass in proto icmp all icmp-type timest
-pass in proto icmp all icmp-type timestrep
-pass in proto icmp all icmp-type timex
-pass in proto icmp all icmp-type 254
-pass in proto icmp all icmp-type 253 code 254
diff --git a/contrib/ipfilter/test/regress/i9 b/contrib/ipfilter/test/regress/i9
deleted file mode 100644
index 441cfa9..0000000
--- a/contrib/ipfilter/test/regress/i9
+++ /dev/null
@@ -1,17 +0,0 @@
-pass in from localhost to localhost with short,frags
-block in from any to any with ipopts
-pass in from any to any with opt nop,rr,zsu
-pass in from any to any with opt nop,rr,zsu not opt ssrr,lsrr
-pass in from localhost to localhost and not frag
-pass in from localhost to localhost with frags,frag-body
-pass in proto tcp all flags S with not oow keep state
-block in proto tcp all with oow
-pass in proto tcp all flags S with not bad,bad-src,bad-nat
-block in proto tcp all flags S with bad,not bad-src,not bad-nat
-pass in quick all with not short
-block in quick all with not nat
-pass in quick all with not frag-body
-block in quick all with not lowttl
-pass in all with mbcast,not bcast,multicast,not state,not ipopts
-block in all with not mbcast,bcast,not multicast,state
-pass in from any to any with opt mtur,mtup,encode,ts,tr,sec,cipso,satid,ssrr,visa,imitd,eip,finn,dps,sdb,nsapa,rtralrt,ump,addext,e-sec
diff --git a/contrib/ipfilter/test/regress/in1 b/contrib/ipfilter/test/regress/in1
deleted file mode 100644
index d5d0cf4..0000000
--- a/contrib/ipfilter/test/regress/in1
+++ /dev/null
@@ -1,31 +0,0 @@
-map le0 0/0 -> 0/32
-map le0 1/32 -> 1/32
-map le0 128.0.0.0/1 -> 0/0
-map le0 10.0.0.0/8 -> 1.2.3.0/24
-map le0 10.0.0.5/8 -> 1.2.3.4/24
-map le0 10.0.0.5/0xff000000 -> 1.2.3.4/24
-map le0 10.0.0.5/0xff -> 1.2.3.4/24
-map le0 192.168.0.0/16 -> range 203.1.1.23-203.1.3.45
-map ppp0 192.168.0.0/16 -> 0/32 portmap tcp 10000:19999
-map ppp0 192.168.0.0/16 -> 0/32 portmap udp 20000:29999
-map ppp0 192.168.0.0/16 -> 0/32 portmap tcp/udp 30000:39999
-map ppp0 192.168.0.0/16 -> 0/32 portmap tcp auto
-map ppp0 192.168.0.0/16 -> 0/32 portmap udp auto
-map ppp0 192.168.0.0/16 -> 0/32 portmap tcpudp auto
-map ppp0 192.168.0.0/16 -> 0/32 proxy port ftp ftp/6
-map ppp0 192.168.0.0/16 -> 0/32 proxy port 1010 ftp/tcp
-map le0 0/0 -> 0/32 frag
-map le0 192.168.0.0/16 -> range 203.1.1.23-203.1.3.45 frag
-map ppp0 192.168.0.0/16 -> 0/32 portmap tcp 10000:19999 frag
-map ppp0 192.168.0.0/16 -> 0/32 proxy port ftp ftp/tcp frag
-map le0 0/0 -> 0/32 age 10
-map le0 192.168.0.0/16 -> range 203.1.1.23-203.1.3.45 age 10/20
-map ppp0 192.168.0.0/16 -> 0/32 portmap tcp 10000:19999 age 30
-map le0 0/0 -> 0/32 frag age 10
-map le0 192.168.0.0/16 -> range 203.1.1.23-203.1.3.45 frag age 10/20
-map ppp0 192.168.0.0/16 -> 0/32 portmap tcp 10000:19999 frag age 30
-map fxp0 from 192.168.0.0/18 to 0/0 port = 21 -> 1.2.3.4/32 proxy port 21 ftp/tcp
-map thisisalonginte 0/0 -> 0/32 mssclamp 1452 tag freddyliveshere
-map bar0 0/0 -> 0/32 icmpidmap icmp 1000:2000
-map ppp0,adsl0 0/0 -> 0/32
-map ppp0 from 192.168.0.0/16 to any port = 123 -> 0/32 age 30/1 udp
diff --git a/contrib/ipfilter/test/regress/in2 b/contrib/ipfilter/test/regress/in2
deleted file mode 100644
index 83a2ca5..0000000
--- a/contrib/ipfilter/test/regress/in2
+++ /dev/null
@@ -1,71 +0,0 @@
-rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 tcp
-rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 255
-rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 tcp
-rdr le0 9.8.7.6/32 -> 1.1.1.1 ip
-rdr le0 9.8.7.6/0xff000000 -> 1.1.1.1 ip
-rdr le0 9.8.7.6/0xffff0000 -> 1.1.1.1 ip
-rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 tcp
-rdr le0 9.8.7.6/32 port 80 -> 0/0 port 80 tcp
-rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 udp
-rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 tcp/udp
-rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 icmp
-rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp
-rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 tcp round-robin
-rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin
-rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip frag
-rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 icmp frag
-rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcpudp frag
-rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 tcp round-robin frag
-rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin frag
-rdr le0 9.8.7.6/32 -> 1.1.1.1 ip frag age 10
-rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip frag age 10/20
-rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 icmp frag age 10
-rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp frag age 20
-rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 tcp round-robin frag age 30
-rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin frag age 40
-rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip sticky
-rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip frag sticky
-rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 icmp frag sticky
-rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp frag sticky
-rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 tcp round-robin frag sticky
-rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin frag sticky
-rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip frag age 10 sticky
-rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip frag age 10/20 sticky
-rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 icmp frag age 10 sticky
-rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp frag age 20 sticky
-rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 tcp round-robin frag age 30 sticky
-rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin frag age 40 sticky
-rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip mssclamp 1000
-rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip sticky mssclamp 1000
-rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip frag sticky mssclamp 1000
-rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 icmp frag sticky mssclamp 1000
-rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp frag sticky mssclamp 1000
-rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 tcp round-robin frag sticky mssclamp 1000
-rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin frag sticky mssclamp 1000
-rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip frag age 10 sticky mssclamp 1000
-rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip frag age 10/20 sticky mssclamp 1000
-rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 icmp frag age 10 sticky mssclamp 1000
-rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp frag age 20 sticky mssclamp 1000
-rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 tcp round-robin frag age 30 sticky mssclamp 1000
-rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin frag age 40 sticky mssclamp 1000
-rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip tag nattagcacheline
-rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip mssclamp 1000 tag nattagcacheline
-rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip sticky mssclamp 1000 tag nattagcacheline
-rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip frag sticky mssclamp 1000 tag nattagcacheline
-rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 icmp frag sticky mssclamp 1000 tag nattagcacheline
-rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp frag sticky mssclamp 1000 tag nattagcacheline
-rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 tcp round-robin frag sticky mssclamp 1000 tag nattagcacheline
-rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin frag sticky mssclamp 1000 tag nattagcacheline
-rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip frag age 10 sticky mssclamp 1000 tag nattagcacheline
-rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip frag age 10/20 sticky mssclamp 1000 tag nattagcacheline
-rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 icmp frag age 10 sticky mssclamp 1000 tag nattagcacheline
-rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp frag age 20 sticky mssclamp 1000 tag nattagcacheline
-rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 tcp round-robin frag age 30 sticky mssclamp 1000 tag nattagcacheline
-rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin frag age 40 sticky mssclamp 1000 tag nattagcacheline
-rdr ge0 9.8.7.6/32 -> 1.1.1.1 proxy port 21 ftp/tcp
-rdr ge0 9.8.7.6/32 port 21 -> 1.1.1.1 port 21 tcp proxy ftp
-rdr le0 9.8.7.6/32 port 1000-2000 -> 1.1.1.1 port 5555 tcp
-rdr le0 9.8.7.6/32 port 1000-2000 -> 1.1.1.1 port = 5555 tcp
-rdr le0 0/0 -> test.host.dots
-rdr le0 0/0 -> test.host.dots,test.host.dots
-rdr adsl0,ppp0 0/0 port 25 -> 127.0.0.1 port 25
diff --git a/contrib/ipfilter/test/regress/in3 b/contrib/ipfilter/test/regress/in3
deleted file mode 100644
index d8016b6..0000000
--- a/contrib/ipfilter/test/regress/in3
+++ /dev/null
@@ -1,5 +0,0 @@
-bimap le0 0/0 -> 0/32
-bimap le0 1/32 -> 1/32
-bimap le0 128.0.0.0/1 -> 0/0
-bimap le0 10.0.0.0/8 -> 1.2.3.0/24
-bimap le0 10.0.5.6/24 -> 1.2.3.4/24
diff --git a/contrib/ipfilter/test/regress/in4 b/contrib/ipfilter/test/regress/in4
deleted file mode 100644
index 46bbd81..0000000
--- a/contrib/ipfilter/test/regress/in4
+++ /dev/null
@@ -1,5 +0,0 @@
-map-block le0 10.0.0.0/24 -> 203.1.1.0/24
-map-block le0 10.0.0.0/24 -> 203.1.1.0/24 ports 0
-map-block le0 10.0.0.0/24 -> 203.1.1.0/24 ports 256
-map-block le0 10.0.0.0/24 -> 203.1.1.0/24 ports auto
-map-block le0 10.0.0.0/16 -> 203.1.1.0/24 ports auto
diff --git a/contrib/ipfilter/test/regress/in5 b/contrib/ipfilter/test/regress/in5
deleted file mode 100644
index 766c3e3..0000000
--- a/contrib/ipfilter/test/regress/in5
+++ /dev/null
@@ -1,24 +0,0 @@
-map le0 from 9.8.7.6/32 port > 1024 to any -> 1.1.1.1 portmap 10000:20000 tcp
-map le0 from 9.8.7.6/32 port > 1024 to ! 1.2.3.4 -> 1.1.1.1 portmap 10000:20000 tcp
-rdr le0 from any to 9.8.7.6/32 port = 0 -> 1.1.1.1 port 0 tcp
-rdr le0 from any to 9.8.7.6/0xffffffff port = 0 -> 1.1.1.1 port 0 ip
-rdr le0 ! from 1.2.3.4 to 9.8.7.6 port = 8888 -> 1.1.1.1 port 888 tcp
-rdr le0 from any to 9.8.7.6/255.255.255.255 port = 8888 -> 1.1.1.1 port 888 ip
-rdr le0 from any to 9.8.7.6 mask 0xffffffff port = 8888 -> 1.1.1.1 port 888 tcp
-rdr le0 from any to 9.8.7.6 mask 255.255.255.255 port = 8888 -> 1.1.1.1 port 888 udp
-rdr le0 from any to 9.8.7.6/32 port = 8888 -> 1.1.1.1 port 888 tcp/udp
-rdr le0 from any to 9.8.7.6/32 -> 1.1.1.1 port 888 icmp
-rdr le0 from any to 9.8.7.6/32 port = 8888 -> 1.1.1.1,1.1.1.2 port 888 tcp
-rdr le0 from any to 9.8.7.6/32 port = 8888 -> 1.1.1.1 port 888 tcp round-robin
-rdr le0 from any to 9.8.7.6/32 port = 8888 -> 1.1.1.1,1.1.1.2 port 888 tcp round-robin
-rdr le0 from any to 9.8.7.6/32 -> 1.1.1.1 port 0 ip frag
-rdr le0 from any to 9.8.7.6/32 port = 8888 -> 1.1.1.1 port 888 icmp frag
-rdr le0 from any to 9.8.7.6/32 port = 8888 -> 1.1.1.1,1.1.1.2 port 888 tcp frag
-rdr le0 from any to 9.8.7.6/32 port = 8888 -> 1.1.1.1 port 888 tcp round-robin frag
-rdr le0 from any to 9.8.7.6/32 port = 8888 -> 1.1.1.1,1.1.1.2 port 888 tcp round-robin frag
-rdr le0 from any to 9.8.7.6/32 -> 1.1.1.1 port 0 ip frag age 10
-rdr le0 from any to 9.8.7.6/32 port = 0 -> 1.1.1.1 port 0 ip frag age 10/20
-rdr le0 from any to 9.8.7.6/32 port = 8888 -> 1.1.1.1 port 888 icmp frag age 10
-rdr le0 from any to 9.8.7.6/32 port = 8888 -> 1.1.1.1,1.1.1.2 port 888 tcp frag age 20
-rdr le0 from any to 9.8.7.6/32 port = 8888 -> 1.1.1.1 port 888 tcp round-robin frag age 30
-rdr le0 from any to 9.8.7.6/32 port = 8888 -> 1.1.1.1,1.1.1.2 port 888 tcp round-robin frag age 40
diff --git a/contrib/ipfilter/test/regress/in6 b/contrib/ipfilter/test/regress/in6
deleted file mode 100644
index 70e71dd..0000000
--- a/contrib/ipfilter/test/regress/in6
+++ /dev/null
@@ -1,8 +0,0 @@
-map foo0 from any port = 1 to any port != 0 -> 0/32 udp
-map foo0 from any port eq 1 to any port ne 0 -> 0/32 udp
-map foo0 from any port < 1 to any port > 0 -> 0/32 tcp
-map foo0 from any port lt 1 to any port gt 0 -> 0/32 tcp
-map foo0 from any port <= 1 to any port >= 0 -> 0/32 tcp/udp
-map foo0 from any port le 1 to any port ge 0 -> 0/32 tcp/udp
-map foo0 from any port 1 >< 20 to any port 20 <> 40 -> 0/32 tcp/udp
-map foo0 from any port 10:20 to any port 30:40 -> 0/32 tcp/udp
diff --git a/contrib/ipfilter/test/regress/ip1 b/contrib/ipfilter/test/regress/ip1
deleted file mode 100644
index c31ba25..0000000
--- a/contrib/ipfilter/test/regress/ip1
+++ /dev/null
@@ -1,78 +0,0 @@
-#:%s/ \(number = [0-9]*\) \(type = [a-z]*\)/ \2 \1/g
-
-table role = ipf type = tree number = 1
- {; };
-table role = ipf type = tree number = 100
- { 1.2.3.4/32; !2.2.0.0/16; 2.2.2.0/24; };
-table role = nat type = tree number = 110
- { 1.2.3.4/32; !2.2.0.0/16; 2.2.2.0/24; };
-table role = auth type = tree number = 120
- { 1.2.3.4/32; !2.2.0.0/16; 2.2.2.0/24; };
-table role = count type = tree number = 130
- { 1.2.3.4; !2.2.0.0/16; 2.2.2.0/24; };
-
-table role = ipf type = hash number = 2
- {; };
-table role = ipf type = hash number = 200
- { 0/0; 1/32; 1.2.3.4/32; };
-table role = nat type = hash number = 210
- { 0/0; 2/32; 1.2.3.4/32; };
-table role = auth type = hash number = 220
- { 0/0; 3/32; 1.2.3.4/32; };
-table role = count type = hash number = 230
- { 0/0; 4/32; 1.2.3.4/32; };
-
-table role = ipf type = hash number = 240 seed = 101
- { 0/0; 1/32; 1.2.3.4/32; };
-table role = nat type = hash number = 250 seed = 101
- { 0/0; 2/32; 1.2.3.4/32; };
-table role = auth type = hash number = 260 seed = 101
- { 0/0; 3/32; 1.2.3.4/32; };
-table role = count type = hash number = 270 seed = 101
- { 0/0; 4/32; 1.2.3.4/32; };
-
-table role = ipf type = hash number = 2000 size = 1001
- { 0/0; 1/32; 1.2.3.4/32; };
-table role = nat type = hash number = 2000 size = 1001
- { 0/0; 2/32; 1.2.3.4/32; };
-table role = auth type = hash number = 2000 size = 1001
- { 0/0; 3/32; 1.2.3.4/32; };
-table role = count type = hash number = 2000 size = 1001
- { 0/0; 4/32; 1.2.3.4/32; };
-
-table role = ipf type = hash number = 100 size = 1001 seed = 101
- { 0/0; 1/32; 1.2.3.4/32; };
-table role = nat type = hash number = 100 size = 1001 seed = 101
- { 0/0; 2/32; 1.2.3.4/32; };
-table role = auth type = hash number = 100 size = 1001 seed = 101
- { 0/0; 3/32; 1.2.3.4/32; };
-table role = count type = hash number = 100 size = 1001 seed = 101
- { 0/0; 4/32; 1.2.3.4/32; };
-
-group-map in role = ipf number = 300 group = 303
- { 0/0; 5/32; 1.2.3.4/32; };
-group-map in role = nat number = 300 group = 303
- { 0/0; 6/32; 1.2.3.4/32; };
-group-map in role = auth number = 300 group = 303
- { 0/0; 7/32; 1.2.3.4/32; };
-group-map in role = count number = 300 group = 303
- { 0/0; 8/32; 1.2.3.4/32; };
-
-group-map out role = ipf number = 400 group = 303
- { 0/0; 5/32; 1.2.3.4/32, group = 606; };
-group-map out role = nat number = 400 group = 303
- { 0/0; 6/32; 1.2.3.4/32, group = 606; };
-group-map out role = auth number = 400 group = 303
- { 0/0; 7/32; 1.2.3.4/32, group = 606; };
-group-map out role = count number = 400 group = 303
- { 0/0; 8/32; 1.2.3.4/32, group = 606; };
-
-group-map in role = ipf number = 500
- { 0/0, group = 10; 5/32, group = 800; 1.2.3.4/32, group = 606; };
-group-map in role = nat number = 500
- { 0/0, group = 10; 6/32, group = 800; 1.2.3.4/32, group = 606; };
-group-map in role = auth number = 500
- { 0/0, group = 10; 7/32, group = 800; 1.2.3.4/32, group = 606; };
-group-map in role = count number = 500
- { 0/0, group = 10; 8/32, group = 800; 1.2.3.4/32, group = 606; };
-
diff --git a/contrib/ipfilter/test/regress/ip2 b/contrib/ipfilter/test/regress/ip2
deleted file mode 100644
index 76f31b6..0000000
--- a/contrib/ipfilter/test/regress/ip2
+++ /dev/null
@@ -1,2 +0,0 @@
-table role = ipf type = tree name = letters
- { "file://input/ip2.data"; };
diff --git a/contrib/ipfilter/test/regress/ipf6-1 b/contrib/ipfilter/test/regress/ipf6-1
deleted file mode 100644
index 814dfd6..0000000
--- a/contrib/ipfilter/test/regress/ipf6-1
+++ /dev/null
@@ -1,3 +0,0 @@
-block in all
-block out all
-pass out proto 58 all keep state
diff --git a/contrib/ipfilter/test/regress/ipv6.1 b/contrib/ipfilter/test/regress/ipv6.1
deleted file mode 100644
index fc532b6..0000000
--- a/contrib/ipfilter/test/regress/ipv6.1
+++ /dev/null
@@ -1 +0,0 @@
-pass out log quick on gif0 proto udp from ef00:1001:2002::/48 to any port 33433 >< 34000 keep state
diff --git a/contrib/ipfilter/test/regress/ipv6.2 b/contrib/ipfilter/test/regress/ipv6.2
deleted file mode 100644
index 814dfd6..0000000
--- a/contrib/ipfilter/test/regress/ipv6.2
+++ /dev/null
@@ -1,3 +0,0 @@
-block in all
-block out all
-pass out proto 58 all keep state
diff --git a/contrib/ipfilter/test/regress/ipv6.3 b/contrib/ipfilter/test/regress/ipv6.3
deleted file mode 100644
index 6dc9e93..0000000
--- a/contrib/ipfilter/test/regress/ipv6.3
+++ /dev/null
@@ -1 +0,0 @@
-pass out log quick on gif0 proto ipv6-icmp from any to any icmp-type 128 keep state
diff --git a/contrib/ipfilter/test/regress/ipv6.5 b/contrib/ipfilter/test/regress/ipv6.5
deleted file mode 100644
index ba8cabb..0000000
--- a/contrib/ipfilter/test/regress/ipv6.5
+++ /dev/null
@@ -1,2 +0,0 @@
-pass out all with v6hdrs routing
-block out proto tcp all with v6hdrs routing
diff --git a/contrib/ipfilter/test/regress/ipv6.6 b/contrib/ipfilter/test/regress/ipv6.6
deleted file mode 100644
index f1f904b..0000000
--- a/contrib/ipfilter/test/regress/ipv6.6
+++ /dev/null
@@ -1 +0,0 @@
-pass out on gif0 proto udp all keep frag
diff --git a/contrib/ipfilter/test/regress/l1 b/contrib/ipfilter/test/regress/l1
deleted file mode 100644
index 88cca58..0000000
--- a/contrib/ipfilter/test/regress/l1
+++ /dev/null
@@ -1,6 +0,0 @@
-log in all
-pass in on anon0 all head 100
-pass in log quick from 3.3.3.3 to any group 100
-pass in log body quick from 2.2.2.2 to any
-pass in log quick proto tcp from 1.1.1.1 to any flags S keep state
-pass in log first quick proto tcp from 1.1.1.1 to any flags S keep state
diff --git a/contrib/ipfilter/test/regress/n1 b/contrib/ipfilter/test/regress/n1
deleted file mode 100644
index 9bcf29b..0000000
--- a/contrib/ipfilter/test/regress/n1
+++ /dev/null
@@ -1,3 +0,0 @@
-map zx0 10.1.1.1/32 -> 10.2.2.2/32
-map zx0 10.1.1.0/24 -> 10.3.4.5/32
-map zx0 10.1.1.0/24 -> 10.3.4.0/24
diff --git a/contrib/ipfilter/test/regress/n10 b/contrib/ipfilter/test/regress/n10
deleted file mode 100644
index 0f48192..0000000
--- a/contrib/ipfilter/test/regress/n10
+++ /dev/null
@@ -1,3 +0,0 @@
-map ppp0 0/0 -> 203.203.203.203/32 mssclamp 100
-map ppp0 0/0 -> 203.203.203.203/32 mssclamp 1000
-map ppp0 0/0 -> 203.203.203.203/32 mssclamp 10000
diff --git a/contrib/ipfilter/test/regress/n11 b/contrib/ipfilter/test/regress/n11
deleted file mode 100644
index 8cdf7fc..0000000
--- a/contrib/ipfilter/test/regress/n11
+++ /dev/null
@@ -1,3 +0,0 @@
-bimap zx0 10.1.1.1/32 -> 1.6.7.8/32
-bimap zx0 10.1.1.0/24 -> 10.2.2.2/32
-bimap zx0 10.1.1.0/24 -> 10.3.4.5/24
diff --git a/contrib/ipfilter/test/regress/n12 b/contrib/ipfilter/test/regress/n12
deleted file mode 100644
index 225675b..0000000
--- a/contrib/ipfilter/test/regress/n12
+++ /dev/null
@@ -1 +0,0 @@
-map le0 192.168.126.0/24 -> 0/32 portmap tcp/udp 10000:20000
diff --git a/contrib/ipfilter/test/regress/n13 b/contrib/ipfilter/test/regress/n13
deleted file mode 100644
index 8047930..0000000
--- a/contrib/ipfilter/test/regress/n13
+++ /dev/null
@@ -1 +0,0 @@
-map le0 192.168.0.0/16 -> range 203.1.1.23-203.1.3.45
diff --git a/contrib/ipfilter/test/regress/n14 b/contrib/ipfilter/test/regress/n14
deleted file mode 100644
index 6f5d571..0000000
--- a/contrib/ipfilter/test/regress/n14
+++ /dev/null
@@ -1 +0,0 @@
-rdr gre0 0/0 port 80 -> 10.1.1.254,10.1.1.253 port 80 tcp sticky
diff --git a/contrib/ipfilter/test/regress/n16 b/contrib/ipfilter/test/regress/n16
deleted file mode 100644
index ff8958c..0000000
--- a/contrib/ipfilter/test/regress/n16
+++ /dev/null
@@ -1 +0,0 @@
-rdr vlan0 from any to 69.248.79.193 port = 38136 -> 172.31.83.24 port 2013 udp
diff --git a/contrib/ipfilter/test/regress/n2 b/contrib/ipfilter/test/regress/n2
deleted file mode 100644
index dbce5aa..0000000
--- a/contrib/ipfilter/test/regress/n2
+++ /dev/null
@@ -1,4 +0,0 @@
-map zx0 10.1.1.1/32 -> 10.2.2.2/32 portmap tcp 10000:20000
-map zx0 10.1.1.0/24 -> 10.3.4.5/32 portmap udp 10000:20000
-map zx0 10.1.0.0/16 -> 10.3.4.0/24 portmap tcp/udp 10000:20000
-map zx0 10.1.1.0/24 -> 10.3.4.5/32 portmap tcp/udp 40000:40001
diff --git a/contrib/ipfilter/test/regress/n3 b/contrib/ipfilter/test/regress/n3
deleted file mode 100644
index 82c83dd..0000000
--- a/contrib/ipfilter/test/regress/n3
+++ /dev/null
@@ -1,2 +0,0 @@
-map zz0 10.1.0.0/16 -> 192.168.2.0/24 portmap tcp/udp auto
-map-block zz0 10.1.0.0/16 -> 192.168.1.0/24 ports 252
diff --git a/contrib/ipfilter/test/regress/n4 b/contrib/ipfilter/test/regress/n4
deleted file mode 100644
index e7c0314..0000000
--- a/contrib/ipfilter/test/regress/n4
+++ /dev/null
@@ -1,6 +0,0 @@
-rdr zx0 10.1.1.1/32 port 23 -> 10.2.2.1 port 10023 tcp
-rdr zx0 10.1.1.0/24 port 23 -> 10.2.2.1 port 10023 tcp
-rdr zx0 0/0 port 23 -> 10.2.2.1 port 10023 tcp
-rdr zx0 10.1.1.0/24 port 53 -> 10.2.2.1 port 10053 udp
-rdr zx0 10.1.1.0/24 port 0 -> 10.2.2.1 port 0 tcp
-rdr zx0 10.1.1.0/24 port 0 -> 10.2.2.1 port 0 ip
diff --git a/contrib/ipfilter/test/regress/n5 b/contrib/ipfilter/test/regress/n5
deleted file mode 100644
index e55cea0..0000000
--- a/contrib/ipfilter/test/regress/n5
+++ /dev/null
@@ -1,6 +0,0 @@
-map zx0 10.1.1.1/32 -> 10.2.2.2/32
-map zx0 from 10.1.1.0/24 to 10.1.0.0/16 -> 10.3.4.5/32
-map zx0 from 10.1.1.0/24 ! to 10.1.0.0/16 -> 10.3.4.0/24
-map zx0 10.1.1.0/24 -> 10.3.4.5/32 portmap udp 10000:20000
-map zx0 10.1.0.0/16 -> 10.3.4.0/24 portmap tcp/udp 10000:20000
-map zx0 10.1.1.0/24 -> 10.3.4.5/32 portmap tcp/udp 40000:40001
diff --git a/contrib/ipfilter/test/regress/n6 b/contrib/ipfilter/test/regress/n6
deleted file mode 100644
index 79f11a4..0000000
--- a/contrib/ipfilter/test/regress/n6
+++ /dev/null
@@ -1,5 +0,0 @@
-rdr zx0 10.1.1.1/32 port 23 -> 10.2.2.1 port 10023 tcp
-rdr zx0 from any to 10.1.1.0/24 port = 23 -> 10.2.2.1 port 10023 tcp
-rdr zx0 from 10.2.0.0/16 to 10.1.1.0/24 port = 23 -> 10.2.2.1 port 10023 tcp
-rdr zx0 from 10.3.0.0/16 to 10.1.0.0/16 port = 23 -> 10.2.2.1 port 10023 tcp
-rdr zx0 ! from 10.2.0.0/16 to 10.1.1.0/24 port = 53 -> 10.2.2.1 port 10053 udp
diff --git a/contrib/ipfilter/test/regress/n7 b/contrib/ipfilter/test/regress/n7
deleted file mode 100644
index be995c2..0000000
--- a/contrib/ipfilter/test/regress/n7
+++ /dev/null
@@ -1,3 +0,0 @@
-rdr zx0 10.1.1.1/32 port 23-79 -> 10.2.2.1 port 10023 tcp
-rdr zx0 10.1.1.1/32 port 23-79 -> 10.2.2.1 port = 10023 tcp
-rdr zx0 10.1.1.0/24 port 80 -> 10.2.2.1,1.2.2.129 port 3128 tcp
diff --git a/contrib/ipfilter/test/regress/n8 b/contrib/ipfilter/test/regress/n8
deleted file mode 100644
index bf0e94f..0000000
--- a/contrib/ipfilter/test/regress/n8
+++ /dev/null
@@ -1 +0,0 @@
-map icmp0 2.2.2.0/24 -> 10.10.10.0/24
diff --git a/contrib/ipfilter/test/regress/n9 b/contrib/ipfilter/test/regress/n9
deleted file mode 100644
index 81a7ccd..0000000
--- a/contrib/ipfilter/test/regress/n9
+++ /dev/null
@@ -1 +0,0 @@
-rdr icmp0 4.4.4.0/24 port 0 -> 10.10.10.1 port 0 ip
diff --git a/contrib/ipfilter/test/regress/ni1.ipf b/contrib/ipfilter/test/regress/ni1.ipf
deleted file mode 100644
index c7e5797..0000000
--- a/contrib/ipfilter/test/regress/ni1.ipf
+++ /dev/null
@@ -1,4 +0,0 @@
-block in all
-block out all
-pass out proto udp from any to any keep state
-pass out proto tcp from any to any flags S keep state
diff --git a/contrib/ipfilter/test/regress/ni1.nat b/contrib/ipfilter/test/regress/ni1.nat
deleted file mode 100644
index f38e435..0000000
--- a/contrib/ipfilter/test/regress/ni1.nat
+++ /dev/null
@@ -1,3 +0,0 @@
-map df0 from 2.2.2.2/32 port 20000 >< 25000 to any -> 6.6.6.8/32 portmap udp 2000:2500
-map df0 from 2.2.2.2/32 port 2000 >< 2500 to any -> 6.6.6.7/32 portmap udp 20000:25000
-map df0 from 2.2.2.2/32 to any -> 6.6.6.6/32
diff --git a/contrib/ipfilter/test/regress/ni10.ipf b/contrib/ipfilter/test/regress/ni10.ipf
deleted file mode 100644
index 4151b6e..0000000
--- a/contrib/ipfilter/test/regress/ni10.ipf
+++ /dev/null
@@ -1,4 +0,0 @@
-block in all
-block out all
-pass in proto udp from any to any keep state
-pass in proto tcp from any to any flags S keep state
diff --git a/contrib/ipfilter/test/regress/ni10.nat b/contrib/ipfilter/test/regress/ni10.nat
deleted file mode 100644
index 2a04ef7..0000000
--- a/contrib/ipfilter/test/regress/ni10.nat
+++ /dev/null
@@ -1 +0,0 @@
-rdr df0 2.2.2.2/32 -> 6.6.6.6
diff --git a/contrib/ipfilter/test/regress/ni11.ipf b/contrib/ipfilter/test/regress/ni11.ipf
deleted file mode 100644
index 4151b6e..0000000
--- a/contrib/ipfilter/test/regress/ni11.ipf
+++ /dev/null
@@ -1,4 +0,0 @@
-block in all
-block out all
-pass in proto udp from any to any keep state
-pass in proto tcp from any to any flags S keep state
diff --git a/contrib/ipfilter/test/regress/ni11.nat b/contrib/ipfilter/test/regress/ni11.nat
deleted file mode 100644
index 1d0018c..0000000
--- a/contrib/ipfilter/test/regress/ni11.nat
+++ /dev/null
@@ -1 +0,0 @@
-rdr df0 10.0.0.0/8 port 1000:2000 -> 1.1.1.1 port 40000 tcp/udp
diff --git a/contrib/ipfilter/test/regress/ni12.ipf b/contrib/ipfilter/test/regress/ni12.ipf
deleted file mode 100644
index 4151b6e..0000000
--- a/contrib/ipfilter/test/regress/ni12.ipf
+++ /dev/null
@@ -1,4 +0,0 @@
-block in all
-block out all
-pass in proto udp from any to any keep state
-pass in proto tcp from any to any flags S keep state
diff --git a/contrib/ipfilter/test/regress/ni12.nat b/contrib/ipfilter/test/regress/ni12.nat
deleted file mode 100644
index 8c36bc8..0000000
--- a/contrib/ipfilter/test/regress/ni12.nat
+++ /dev/null
@@ -1 +0,0 @@
-rdr df0 10.0.0.0/8 port 1000:2000 -> 1.1.1.1 port = 40000 tcp/udp
diff --git a/contrib/ipfilter/test/regress/ni13.ipf b/contrib/ipfilter/test/regress/ni13.ipf
deleted file mode 100644
index 04b6d13..0000000
--- a/contrib/ipfilter/test/regress/ni13.ipf
+++ /dev/null
@@ -1,3 +0,0 @@
-pass in quick on pcn1 proto tcp from any to any port = 1723 keep state
-block in all
-block out all
diff --git a/contrib/ipfilter/test/regress/ni13.nat b/contrib/ipfilter/test/regress/ni13.nat
deleted file mode 100644
index 7a879d8..0000000
--- a/contrib/ipfilter/test/regress/ni13.nat
+++ /dev/null
@@ -1 +0,0 @@
-rdr pcn1 192.168.113.3/32 port 1723 -> 0.0.0.0 port 1723 proxy pptp
diff --git a/contrib/ipfilter/test/regress/ni14.ipf b/contrib/ipfilter/test/regress/ni14.ipf
deleted file mode 100644
index 04b6d13..0000000
--- a/contrib/ipfilter/test/regress/ni14.ipf
+++ /dev/null
@@ -1,3 +0,0 @@
-pass in quick on pcn1 proto tcp from any to any port = 1723 keep state
-block in all
-block out all
diff --git a/contrib/ipfilter/test/regress/ni14.nat b/contrib/ipfilter/test/regress/ni14.nat
deleted file mode 100644
index c546e99..0000000
--- a/contrib/ipfilter/test/regress/ni14.nat
+++ /dev/null
@@ -1 +0,0 @@
-rdr pcn1 192.168.113.3/32 port 1723 -> 127.0.0.1 port 1723 proxy pptp
diff --git a/contrib/ipfilter/test/regress/ni15.ipf b/contrib/ipfilter/test/regress/ni15.ipf
deleted file mode 100644
index 1b9a013..0000000
--- a/contrib/ipfilter/test/regress/ni15.ipf
+++ /dev/null
@@ -1,3 +0,0 @@
-pass out quick on pcn1 proto tcp from any to any port = 1723 keep state
-block in all
-block out all
diff --git a/contrib/ipfilter/test/regress/ni15.nat b/contrib/ipfilter/test/regress/ni15.nat
deleted file mode 100644
index 420c7b7..0000000
--- a/contrib/ipfilter/test/regress/ni15.nat
+++ /dev/null
@@ -1 +0,0 @@
-map pcn1 0/0 -> 0/0 proxy port 1723 pptp/tcp
diff --git a/contrib/ipfilter/test/regress/ni16.ipf b/contrib/ipfilter/test/regress/ni16.ipf
deleted file mode 100644
index 1b9a013..0000000
--- a/contrib/ipfilter/test/regress/ni16.ipf
+++ /dev/null
@@ -1,3 +0,0 @@
-pass out quick on pcn1 proto tcp from any to any port = 1723 keep state
-block in all
-block out all
diff --git a/contrib/ipfilter/test/regress/ni16.nat b/contrib/ipfilter/test/regress/ni16.nat
deleted file mode 100644
index 5fad3cd..0000000
--- a/contrib/ipfilter/test/regress/ni16.nat
+++ /dev/null
@@ -1 +0,0 @@
-map pcn1 10.2.2.2/32 -> 0/32 proxy port 1723 pptp/tcp
diff --git a/contrib/ipfilter/test/regress/ni17.nat b/contrib/ipfilter/test/regress/ni17.nat
deleted file mode 100644
index 3da6338..0000000
--- a/contrib/ipfilter/test/regress/ni17.nat
+++ /dev/null
@@ -1,4 +0,0 @@
-rdr le0 0/0 port 80 -> 10.1.1.252 port 3128 tcp round-robin
-rdr le0 0/0 port 80 -> 10.1.2.252 port 3128 tcp round-robin
-rdr le0 0/0 port 80 -> 10.1.3.252 port 3128 tcp round-robin sticky
-rdr le0 0/0 port 80 -> 10.1.1.253,10.1.2.253 port 3128 tcp round-robin sticky
diff --git a/contrib/ipfilter/test/regress/ni19.ipf b/contrib/ipfilter/test/regress/ni19.ipf
deleted file mode 100644
index c6fcec1..0000000
--- a/contrib/ipfilter/test/regress/ni19.ipf
+++ /dev/null
@@ -1,3 +0,0 @@
-block in all
-pass out quick on bge0 proto tcp from any to any port = shell flags S keep state
-block out all
diff --git a/contrib/ipfilter/test/regress/ni19.nat b/contrib/ipfilter/test/regress/ni19.nat
deleted file mode 100644
index 56b81a9..0000000
--- a/contrib/ipfilter/test/regress/ni19.nat
+++ /dev/null
@@ -1 +0,0 @@
-map bge0 192.168.113.0/24 -> 10.1.1.1/32 proxy port shell rcmd/tcp
diff --git a/contrib/ipfilter/test/regress/ni2.ipf b/contrib/ipfilter/test/regress/ni2.ipf
deleted file mode 100644
index 5956cf9..0000000
--- a/contrib/ipfilter/test/regress/ni2.ipf
+++ /dev/null
@@ -1 +0,0 @@
-pass out quick proto tcp from any to any flags S/SAFR keep state
diff --git a/contrib/ipfilter/test/regress/ni2.nat b/contrib/ipfilter/test/regress/ni2.nat
deleted file mode 100644
index 4ad73c2..0000000
--- a/contrib/ipfilter/test/regress/ni2.nat
+++ /dev/null
@@ -1 +0,0 @@
-map xl0 10.0.0.0/8 -> 1.1.1.1/32 portmap tcp/udp 40000:60000
diff --git a/contrib/ipfilter/test/regress/ni20.ipf b/contrib/ipfilter/test/regress/ni20.ipf
deleted file mode 100644
index c6f6d84..0000000
--- a/contrib/ipfilter/test/regress/ni20.ipf
+++ /dev/null
@@ -1,3 +0,0 @@
-block in all
-pass in quick on bge0 proto tcp from any to any port = shell flags S keep state
-block out all
diff --git a/contrib/ipfilter/test/regress/ni20.nat b/contrib/ipfilter/test/regress/ni20.nat
deleted file mode 100644
index f2dd0a7..0000000
--- a/contrib/ipfilter/test/regress/ni20.nat
+++ /dev/null
@@ -1 +0,0 @@
-rdr bge0 10.1.1.4/32 port shell -> 192.168.113.4 port shell tcp proxy rcmd
diff --git a/contrib/ipfilter/test/regress/ni21.ipf b/contrib/ipfilter/test/regress/ni21.ipf
deleted file mode 100644
index 6d6ed08..0000000
--- a/contrib/ipfilter/test/regress/ni21.ipf
+++ /dev/null
@@ -1 +0,0 @@
-pass out on lan0 to eri0:1.1.1.1 from 2.2.2.2 to any
diff --git a/contrib/ipfilter/test/regress/ni21.nat b/contrib/ipfilter/test/regress/ni21.nat
deleted file mode 100644
index 6b2d46a..0000000
--- a/contrib/ipfilter/test/regress/ni21.nat
+++ /dev/null
@@ -1 +0,0 @@
-map lan0,eri0 2.2.2.2 -> 4.4.4.4
diff --git a/contrib/ipfilter/test/regress/ni23.ipf b/contrib/ipfilter/test/regress/ni23.ipf
deleted file mode 100644
index 49ebcf7..0000000
--- a/contrib/ipfilter/test/regress/ni23.ipf
+++ /dev/null
@@ -1,3 +0,0 @@
-block out all
-block in all
-pass in on le0,hme0 out-via ppp0,bge0 to ppp0:3.3.3.254 proto udp all keep state
diff --git a/contrib/ipfilter/test/regress/ni23.nat b/contrib/ipfilter/test/regress/ni23.nat
deleted file mode 100644
index 094d377..0000000
--- a/contrib/ipfilter/test/regress/ni23.nat
+++ /dev/null
@@ -1,2 +0,0 @@
-rdr le0,bge0 1.1.0.0/16 -> 2.2.2.2
-map hme0,ppp0 3.3.3.0/24 -> 4.4.4.4/32
diff --git a/contrib/ipfilter/test/regress/ni3.ipf b/contrib/ipfilter/test/regress/ni3.ipf
deleted file mode 100644
index c7e5797..0000000
--- a/contrib/ipfilter/test/regress/ni3.ipf
+++ /dev/null
@@ -1,4 +0,0 @@
-block in all
-block out all
-pass out proto udp from any to any keep state
-pass out proto tcp from any to any flags S keep state
diff --git a/contrib/ipfilter/test/regress/ni3.nat b/contrib/ipfilter/test/regress/ni3.nat
deleted file mode 100644
index 4306f4b..0000000
--- a/contrib/ipfilter/test/regress/ni3.nat
+++ /dev/null
@@ -1 +0,0 @@
-map df0 2.2.2.2/32 -> 6.6.6.6/32
diff --git a/contrib/ipfilter/test/regress/ni4.ipf b/contrib/ipfilter/test/regress/ni4.ipf
deleted file mode 100644
index c7e5797..0000000
--- a/contrib/ipfilter/test/regress/ni4.ipf
+++ /dev/null
@@ -1,4 +0,0 @@
-block in all
-block out all
-pass out proto udp from any to any keep state
-pass out proto tcp from any to any flags S keep state
diff --git a/contrib/ipfilter/test/regress/ni4.nat b/contrib/ipfilter/test/regress/ni4.nat
deleted file mode 100644
index 6eefdc2..0000000
--- a/contrib/ipfilter/test/regress/ni4.nat
+++ /dev/null
@@ -1 +0,0 @@
-map df0 2.2.2.2/32 -> 6.6.6.6/32 portmap tcp/udp 40000:60000
diff --git a/contrib/ipfilter/test/regress/ni5.ipf b/contrib/ipfilter/test/regress/ni5.ipf
deleted file mode 100644
index 8f11424..0000000
--- a/contrib/ipfilter/test/regress/ni5.ipf
+++ /dev/null
@@ -1,3 +0,0 @@
-block in all
-pass out quick on ppp0 proto tcp from any to any port = ftp flags S keep state
-block out all
diff --git a/contrib/ipfilter/test/regress/ni5.nat b/contrib/ipfilter/test/regress/ni5.nat
deleted file mode 100644
index 8e80d22..0000000
--- a/contrib/ipfilter/test/regress/ni5.nat
+++ /dev/null
@@ -1 +0,0 @@
-map ppp0 192.168.1.0/24 -> 1.1.1.1/32 proxy port ftp ftp/tcp
diff --git a/contrib/ipfilter/test/regress/ni6.ipf b/contrib/ipfilter/test/regress/ni6.ipf
deleted file mode 100644
index f5b83b2..0000000
--- a/contrib/ipfilter/test/regress/ni6.ipf
+++ /dev/null
@@ -1,9 +0,0 @@
-block out log quick on qfe0 from 192.168.7.0/24 to any
-block out log quick on nf0 from 192.168.6.0/24 to any
-pass in quick on nf0 proto tcp from any to any port = 111 flags S keep state
-pass in quick on nf0 proto udp from any to any port = 111 keep state
-block return-rst in log quick on nf0 proto tcp from any to any
-block in log quick on nf0 from 192.168.7.0/24 to any
-block return-rst in log quick on qfe0 proto tcp from any to any
-block in log quick on qfe0 from 192.168.6.0/24 to any
-
diff --git a/contrib/ipfilter/test/regress/ni6.nat b/contrib/ipfilter/test/regress/ni6.nat
deleted file mode 100644
index 00d57d0..0000000
--- a/contrib/ipfilter/test/regress/ni6.nat
+++ /dev/null
@@ -1,3 +0,0 @@
-rdr nf0 192.168.6.2 port 111 -> 192.168.7.1 port 111 udp proxy rpcbu
-rdr nf0 192.168.6.2 port 111 -> 192.168.7.1 port 111 tcp proxy rpcbt
-map qfe0 192.168.6.0/24 -> 192.168.7.2/32
diff --git a/contrib/ipfilter/test/regress/ni7.ipf b/contrib/ipfilter/test/regress/ni7.ipf
deleted file mode 100644
index 4151b6e..0000000
--- a/contrib/ipfilter/test/regress/ni7.ipf
+++ /dev/null
@@ -1,4 +0,0 @@
-block in all
-block out all
-pass in proto udp from any to any keep state
-pass in proto tcp from any to any flags S keep state
diff --git a/contrib/ipfilter/test/regress/ni7.nat b/contrib/ipfilter/test/regress/ni7.nat
deleted file mode 100644
index 2a04ef7..0000000
--- a/contrib/ipfilter/test/regress/ni7.nat
+++ /dev/null
@@ -1 +0,0 @@
-rdr df0 2.2.2.2/32 -> 6.6.6.6
diff --git a/contrib/ipfilter/test/regress/ni8.ipf b/contrib/ipfilter/test/regress/ni8.ipf
deleted file mode 100644
index 6666241..0000000
--- a/contrib/ipfilter/test/regress/ni8.ipf
+++ /dev/null
@@ -1 +0,0 @@
-pass in quick proto tcp from any to any flags S/SAFR keep state
diff --git a/contrib/ipfilter/test/regress/ni8.nat b/contrib/ipfilter/test/regress/ni8.nat
deleted file mode 100644
index 1d0018c..0000000
--- a/contrib/ipfilter/test/regress/ni8.nat
+++ /dev/null
@@ -1 +0,0 @@
-rdr df0 10.0.0.0/8 port 1000:2000 -> 1.1.1.1 port 40000 tcp/udp
diff --git a/contrib/ipfilter/test/regress/ni9.ipf b/contrib/ipfilter/test/regress/ni9.ipf
deleted file mode 100644
index 6666241..0000000
--- a/contrib/ipfilter/test/regress/ni9.ipf
+++ /dev/null
@@ -1 +0,0 @@
-pass in quick proto tcp from any to any flags S/SAFR keep state
diff --git a/contrib/ipfilter/test/regress/ni9.nat b/contrib/ipfilter/test/regress/ni9.nat
deleted file mode 100644
index 8c36bc8..0000000
--- a/contrib/ipfilter/test/regress/ni9.nat
+++ /dev/null
@@ -1 +0,0 @@
-rdr df0 10.0.0.0/8 port 1000:2000 -> 1.1.1.1 port = 40000 tcp/udp
diff --git a/contrib/ipfilter/test/regress/p1.ipf b/contrib/ipfilter/test/regress/p1.ipf
deleted file mode 100644
index acaf639..0000000
--- a/contrib/ipfilter/test/regress/p1.ipf
+++ /dev/null
@@ -1 +0,0 @@
-pass in from pool/100 to any
diff --git a/contrib/ipfilter/test/regress/p1.pool b/contrib/ipfilter/test/regress/p1.pool
deleted file mode 100644
index 14ae3a3..0000000
--- a/contrib/ipfilter/test/regress/p1.pool
+++ /dev/null
@@ -1,2 +0,0 @@
-table role = ipf type = tree number = 100
- { 1.1.1.1/32; !2.2.0.0/16; 2.2.2.0/24; };
diff --git a/contrib/ipfilter/test/regress/p2.ipf b/contrib/ipfilter/test/regress/p2.ipf
deleted file mode 100644
index 4cfb388..0000000
--- a/contrib/ipfilter/test/regress/p2.ipf
+++ /dev/null
@@ -1,2 +0,0 @@
-pass out from hash=(127.0.0.1,4.4.0.0/16) to any
-block in from hash=(127.0.0.1,4.4.0.0/16) to any
diff --git a/contrib/ipfilter/test/regress/p3.ipf b/contrib/ipfilter/test/regress/p3.ipf
deleted file mode 100644
index aad7cb3..0000000
--- a/contrib/ipfilter/test/regress/p3.ipf
+++ /dev/null
@@ -1,6 +0,0 @@
-call now fr_srcgrpmap/1010 in all
-call now fr_dstgrpmap/2010 out all
-pass in all group 1020
-block in all group 1030
-pass out all group 2020
-block out all group 2040
diff --git a/contrib/ipfilter/test/regress/p3.pool b/contrib/ipfilter/test/regress/p3.pool
deleted file mode 100644
index 3fadd59..0000000
--- a/contrib/ipfilter/test/regress/p3.pool
+++ /dev/null
@@ -1,4 +0,0 @@
-group-map in role = ipf number = 1010
- { 1.1.1.1/32, group = 1020; 3.3.0.0/16, group = 1030; };
-group-map out role = ipf number = 2010 group = 2020
- { 2.2.2.2/32; 4.4.0.0/16; 5.0.0.0/8, group = 2040; };
diff --git a/contrib/ipfilter/test/regress/p5.ipf b/contrib/ipfilter/test/regress/p5.ipf
deleted file mode 100644
index ada9f56..0000000
--- a/contrib/ipfilter/test/regress/p5.ipf
+++ /dev/null
@@ -1 +0,0 @@
-pass in from pool/letters to any
diff --git a/contrib/ipfilter/test/regress/p5.pool b/contrib/ipfilter/test/regress/p5.pool
deleted file mode 100644
index 9a8eaa3..0000000
--- a/contrib/ipfilter/test/regress/p5.pool
+++ /dev/null
@@ -1,2 +0,0 @@
-table role = ipf type = tree name = letters
- { 1.1.1.1/32; !2.2.0.0/16; 2.2.2.0/24; };
diff --git a/contrib/ipfilter/test/regress/regress.sed b/contrib/ipfilter/test/regress/regress.sed
deleted file mode 100644
index e69de29..0000000
--- a/contrib/ipfilter/test/regress/regress.sed
+++ /dev/null
OpenPOWER on IntegriCloud