This commit was generated by cvs2svn to compensate for changes in r95421,

which included commits to RCS files with non-trunk default branches.

8 files changed, 68 insertions, 0 deletions

diff --git a/contrib/ipfilter/test/regress/f17 b/contrib/ipfilter/test/regress/f17
new file mode 100644
index 0000000..9a75ae3
--- /dev/null
+++ b/contrib/ipfilter/test/regress/f17
@@ -0,0 +1,4 @@
+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/in1 b/contrib/ipfilter/test/regress/in1
new file mode 100644
index 0000000..6f3b063
--- /dev/null
+++ b/contrib/ipfilter/test/regress/in1
@@ -0,0 +1,24 @@
+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 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 tcp/udp auto
+map ppp0 192.168.0.0/16 -> 0/32 proxy port ftp ftp/tcp
+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
diff --git a/contrib/ipfilter/test/regress/in2 b/contrib/ipfilter/test/regress/in2
new file mode 100644
index 0000000..33151f0
--- /dev/null
+++ b/contrib/ipfilter/test/regress/in2
@@ -0,0 +1,22 @@
+rdr le0 0/0 port 0 -> 1.1.1.1 port 0
+rdr le0 0/0 port 0 -> 1.1.1.1 port 0 ip
+rdr le0 0/0 port 80 -> 1.1.1.1 port 80
+rdr le0 0/0 port 80 -> 1.1.1.1 port 80 ip
+rdr le0 0/0 port 80 -> 1.1.1.1 port 80 tcp
+rdr le0 0/0 port 80 -> 1.1.1.1 port 80 udp
+rdr le0 0/0 port 80 -> 1.1.1.1 port 80 tcp/udp
+rdr le0 0/0 port 80 -> 1.1.1.1 port 80 icmp
+rdr le0 0/0 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp
+rdr le0 0/0 port 80 -> 1.1.1.1 port 80 tcp round-robin
+rdr le0 0/0 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin
+rdr le0 0/0 port 0 -> 1.1.1.1 port 0 ip frag
+rdr le0 0/0 port 80 -> 1.1.1.1 port 80 icmp frag
+rdr le0 0/0 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp frag
+rdr le0 0/0 port 80 -> 1.1.1.1 port 80 tcp round-robin frag
+rdr le0 0/0 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin frag
+rdr le0 0/0 port 0 -> 1.1.1.1 port 0 ip frag age 10
+rdr le0 0/0 port 0 -> 1.1.1.1 port 0 ip frag age 10/20
+rdr le0 0/0 port 80 -> 1.1.1.1 port 80 icmp frag age 10
+rdr le0 0/0 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp frag age 20
+rdr le0 0/0 port 80 -> 1.1.1.1 port 80 tcp round-robin frag age 30
+rdr le0 0/0 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin frag age 40
diff --git a/contrib/ipfilter/test/regress/in3 b/contrib/ipfilter/test/regress/in3
new file mode 100644
index 0000000..d8016b6
--- /dev/null
+++ b/contrib/ipfilter/test/regress/in3
@@ -0,0 +1,5 @@
+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
new file mode 100644
index 0000000..46bbd81
--- /dev/null
+++ b/contrib/ipfilter/test/regress/in4
@@ -0,0 +1,5 @@
+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/ipv6.2 b/contrib/ipfilter/test/regress/ipv6.2
new file mode 100644
index 0000000..814dfd6
--- /dev/null
+++ b/contrib/ipfilter/test/regress/ipv6.2
@@ -0,0 +1,3 @@
+block in all
+block out all
+pass out proto 58 all keep state
diff --git a/contrib/ipfilter/test/regress/ni4.ipf b/contrib/ipfilter/test/regress/ni4.ipf
new file mode 100644
index 0000000..c7e5797
--- /dev/null
+++ b/contrib/ipfilter/test/regress/ni4.ipf
@@ -0,0 +1,4 @@
+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
new file mode 100644
index 0000000..6eefdc2
--- /dev/null
+++ b/contrib/ipfilter/test/regress/ni4.nat
@@ -0,0 +1 @@
+map df0 2.2.2.2/32 -> 6.6.6.6/32 portmap tcp/udp 40000:60000