Import version 3.2alpha7

6 files changed, 59 insertions, 2 deletions

diff --git a/contrib/ipfilter/test/Makefile b/contrib/ipfilter/test/Makefile
index d3bdcc2..f2e3ca9 100644
--- a/contrib/ipfilter/test/Makefile
+++ b/contrib/ipfilter/test/Makefile
@@ -17,7 +17,7 @@ first:
 	-mkdir -p results
 
 # Filtering tests
-ftests: 1 2 3 4 5 6 7 8 9 10 11 12
+ftests: 1 2 3 4 5 6 7 8 9 10 11 12 14
 
 # Rule parsing tests
 ptests: i1 i2 i3 i4 i5 i6 i7 i8 i9 i10 i11
@@ -25,7 +25,7 @@ ptests: i1 i2 i3 i4 i5 i6 i7 i8 i9 i10 i11
 0:
 	@(cd ..; make ipftest; )
 
-1 2 3 4 5 6 7 8 9 10 11:
+1 2 3 4 5 6 7 8 9 10 11 14:
 	@./dotest $@
 
 12:
diff --git a/contrib/ipfilter/test/expected/14 b/contrib/ipfilter/test/expected/14
new file mode 100644
index 0000000..d06d92b
--- /dev/null
+++ b/contrib/ipfilter/test/expected/14
@@ -0,0 +1,40 @@
+nomatch
+block
+nomatch
+nomatch
+nomatch
+nomatch
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+block
+block
+nomatch
+nomatch
+nomatch
+pass
+pass
+nomatch
+nomatch
+nomatch
+block
+block
+block
+nomatch
+nomatch
+pass
+pass
+pass
+nomatch
+block
+block
+block
+block
+block
+pass
+pass
+pass
+pass
+pass
diff --git a/contrib/ipfilter/test/expected/i1 b/contrib/ipfilter/test/expected/i1
index f69e055..3eb14be 100644
--- a/contrib/ipfilter/test/expected/i1
+++ b/contrib/ipfilter/test/expected/i1
@@ -3,6 +3,8 @@ block out from any to any
 log in from any to any
 log body in from any to any
 count in from any to any
+pass in from !any to any
+block in from any to !any
 pass in on ed0(!) from 127.0.0.1/32 to 127.0.0.1/32
 block in log first on lo0(!) from any to any
 pass in log body quick from any to any
diff --git a/contrib/ipfilter/test/input/14 b/contrib/ipfilter/test/input/14
new file mode 100644
index 0000000..16a806f
--- /dev/null
+++ b/contrib/ipfilter/test/input/14
@@ -0,0 +1,5 @@
+in 127.0.0.1 127.0.0.1
+in 1.1.1.1 1.2.1.1
+in 1.1.1.2 1.2.1.1
+in 1.1.2.2 1.2.1.1
+in 1.2.2.2 1.2.1.1
diff --git a/contrib/ipfilter/test/regress/14 b/contrib/ipfilter/test/regress/14
new file mode 100644
index 0000000..aa54af8
--- /dev/null
+++ b/contrib/ipfilter/test/regress/14
@@ -0,0 +1,8 @@
+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/i1 b/contrib/ipfilter/test/regress/i1
index 583cd8b..736801e 100644
--- a/contrib/ipfilter/test/regress/i1
+++ b/contrib/ipfilter/test/regress/i1
@@ -3,6 +3,8 @@ block out all
 log in all
 log body in all
 count in from any to any
+pass in from !any to any
+block in from any to !any
 pass in on ed0 from localhost to localhost
 block in log first on lo0 from any to any
 pass in log body quick from any to any