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

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

6 files changed, 58 insertions, 20 deletions

diff --git a/contrib/ipfilter/test/Makefile b/contrib/ipfilter/test/Makefile
index 8128413..c24ba46 100644
--- a/contrib/ipfilter/test/Makefile
+++ b/contrib/ipfilter/test/Makefile
@@ -28,7 +28,7 @@ intests: in1 in2 in3 in4
 
 logtests: l1
 
-ipv6: ipv6.1 ipv6.2
+ipv6: ipv6.1 ipv6.2 ipv6.3
 
 0:
 	@(cd ..; make ipftest; )
@@ -60,7 +60,7 @@ in1 in2 in3 in4:
 l1:
 	@/bin/sh ./logtest $@
 
-ipv6.1 ipv6.2:
+ipv6.1 ipv6.2 ipv6.3:
 	@/bin/sh ./dotest6 $@
 
 clean:
@@ -70,5 +70,5 @@ clean:
 	/bin/rm -f ni1 ni2 ni3 ni4 ni5
 	/bin/rm -f in1 in2 in3 in4
 	/bin/rm -f l1
-	/bin/rm -f ipv6.1 ipv6.2
+	/bin/rm -f ipv6.1 ipv6.2 ipv6.3
 	/bin/rm -f results/*
diff --git a/contrib/ipfilter/test/expected/ipv6.3 b/contrib/ipfilter/test/expected/ipv6.3
new file mode 100644
index 0000000..58cddec
--- /dev/null
+++ b/contrib/ipfilter/test/expected/ipv6.3
@@ -0,0 +1,6 @@
+pass
+nomatch
+nomatch
+nomatch
+pass
+--------
diff --git a/contrib/ipfilter/test/expected/ni5 b/contrib/ipfilter/test/expected/ni5
index 050e257..74c615f 100644
--- a/contrib/ipfilter/test/expected/ni5
+++ b/contrib/ipfilter/test/expected/ni5
@@ -3,6 +3,7 @@
 4500 0028 10ca 4000 ff06 328c 0101 0101 96cb e002 8032 0015 bd6b c9c9 3786 76c5 5010 269c 5aa0 0000
 4500 006f ffde 4000 ef06 5330 96cb e002 c0a8 0103 0015 8032 3786 76c5 bd6b c9c9 5018 269c 967e 0000 3232 302d 636f 6f6d 6273 2e61 6e75 2e65 6475 2e61 7520 4e63 4654 5064 2053 6572 7665 7220 2866 7265 6520 6564 7563 6174 696f 6e61 6c20 6c69 6365 6e73 6529 2072 6561 6479 2e0d 0a
 4500 0028 10cb 4000 ff06 328b 0101 0101 96cb e002 8032 0015 bd6b c9c9 3786 770c 5010 269c 5a59 0000
+ippr_ftp_server_valid:junk after cmd[220-Maintained by RSSS and RSPAS IT Staff (previously known as Coombs Comp]
 4500 00c7 ffdf 4000 ef06 52d7 96cb e002 c0a8 0103 0015 8032 3786 770c bd6b c9c9 5018 269c 1087 0000 3232 302d 0d0a 3232 302d 4d61 696e 7461 696e 6564 2062 7920 5253 5353 2061 6e64 2052 5350 4153 2049 5420 5374 6166 6620 2870 7265 7669 6f75 736c 7920 6b6e 6f77 6e20 6173 2043 6f6f 6d62 7320 436f 6d70 7574 696e 6720 556e 6974 290d 0a32 3230 2d41 6e79 2070 726f 626c 656d 7320 636f 6e74 6163 7420 6674 706d 6173 7465 7240 636f 6f6d 6273 2e61 6e75 2e65 6475 2e61 750d 0a32 3230 2d0d 0a32 3230 200d 0a
 4500 0028 10cc 4000 ff06 328a 0101 0101 96cb e002 8032 0015 bd6b c9c9 3786 77ab 5010 269c 59ba 0000
 4500 0038 10cd 4000 ff06 3279 0101 0101 96cb e002 8032 0015 bd6b c9c9 3786 77ab 5018 269c d1c5 0000 5553 4552 2061 6e6f 6e79 6d6f 7573 0d0a
diff --git a/contrib/ipfilter/test/input/ipv6.3 b/contrib/ipfilter/test/input/ipv6.3
new file mode 100644
index 0000000..e8ad9f2
--- /dev/null
+++ b/contrib/ipfilter/test/input/ipv6.3
@@ -0,0 +1,30 @@
+[out,gif0]
+6000 0000 0010 3a40 3ffe 8280 0000 2001
+0000 0000 0000 4395 3ffe 8280 0000 2001
+0000 0000 0000 4394 8000 3f77 085c 0038
+0c06 b73d 1b3d 0d00
+
+[in,gif0]
+6000 0000 0010 3a40 3ffe 8280 0000 2001
+0000 0000 0000 4393 3ffe 8280 0000 2001
+0000 0000 0000 4395 8100 3e77 085c 0038
+0c06 b73d 1b3d 0d00
+
+[in,gif0]
+6000 0000 0010 3a40 3ffe 8280 0000 2001
+0000 0000 0000 4394 3ffe 8280 0000 2001
+0000 0000 0000 4395 8300 3e77 085c 0038
+0c06 b73d 1b3d 0d00
+
+[in,gif0]
+6000 0000 0010 3a40 3ffe 8280 0000 2001
+0000 0000 0000 4394 3ffe 8280 0000 2001
+0000 0000 0000 4395 8000 3e77 085c 0038
+0c06 b73d 1b3d 0d00
+
+[in,gif0]
+6000 0000 0010 3a40 3ffe 8280 0000 2001
+0000 0000 0000 4394 3ffe 8280 0000 2001
+0000 0000 0000 4395 8100 3e77 085c 0038
+0c06 b73d 1b3d 0d00
+
diff --git a/contrib/ipfilter/test/input/ni5 b/contrib/ipfilter/test/input/ni5
index cd3d7ce..b6ff31a 100644
--- a/contrib/ipfilter/test/input/ni5
+++ b/contrib/ipfilter/test/input/ni5
@@ -1,7 +1,7 @@
 [out,ppp0]
 4500 002c 10c9 4000 ff06 3289 c0a8 0103
 96cb e002 8032 0015 bd6b c9c8 0000 0000
-6002 2238 35f9 0000 0204 05b4 3cb9
+6002 2238 35f9 0000 0204 05b4
 
 [in,ppp0]
 4500 002c ffdd 4000 ef06 5374 96cb e002
@@ -11,7 +11,7 @@
 [out,ppp0]
 4500 0028 10ca 4000 ff06 328c c0a8 0103
 96cb e002 8032 0015 bd6b c9c9 3786 76c5
-5010 269c 9af6 0000 c0a8 0103 0015
+5010 269c 9af6 0000
 
 [in,ppp0]
 4500 006f ffde 4000 ef06 5330 96cb e002
@@ -25,7 +25,7 @@
 [out,ppp0]
 4500 0028 10cb 4000 ff06 328b c0a8 0103
 96cb e002 8032 0015 bd6b c9c9 3786 770c
-5010 269c 9aaf 0000 0111 aa28 c0a8
+5010 269c 9aaf 0000
 
 [in,ppp0]
 4500 00c7 ffdf 4000 ef06 52d7 96cb e002
@@ -45,7 +45,7 @@
 [out,ppp0]
 4500 0028 10cc 4000 ff06 328a c0a8 0103
 96cb e002 8032 0015 bd6b c9c9 3786 77ab
-5010 269c 9a10 0000 c0a8 0103 206c
+5010 269c 9a10 0000
 
 [out,ppp0]
 4500 0038 10cd 4000 ff06 3279 c0a8 0103
@@ -70,7 +70,7 @@
 [out,ppp0]
 4500 0028 10ce 4000 ff06 3288 c0a8 0103
 96cb e002 8032 0015 bd6b c9d9 3786 77ef
-5010 269c 99bc 0000 c0a8 0103 0015
+5010 269c 99bc 0000
 
 [out,ppp0]
 4500 0036 10cf 4000 ff06 3279 c0a8 0103
@@ -89,7 +89,7 @@
 [out,ppp0]
 4500 0028 10d0 4000 ff06 3286 c0a8 0103
 96cb e002 8032 0015 bd6b c9e7 3786 7826
-5010 269c 9977 0000 0000 0800 207a
+5010 269c 9977 0000
 
 [in,ppp0]
 4500 0099 ffe3 4000 ef06 5301 96cb e002
@@ -106,7 +106,7 @@
 [out,ppp0]
 4500 0028 10d1 4000 ff06 3285 c0a8 0103
 96cb e002 8032 0015 bd6b c9e7 3786 7897
-5010 269c 9906 0000 c0a8 0103 0015
+5010 269c 9906 0000
 
 [out,ppp0]
 4500 0030 10d2 4000 ff06 327c c0a8 0103
@@ -122,7 +122,7 @@
 [out,ppp0]
 4500 0028 10d3 4000 ff06 3283 c0a8 0103
 96cb e002 8032 0015 bd6b c9ef 3786 78a7
-5010 269c 98ee 0000 c0a8 0103 0015
+5010 269c 98ee 0000
 
 [out,ppp0]
 4500 0041 10d4 4000 ff06 3269 c0a8 0103
@@ -162,7 +162,7 @@
 [out,ppp0]
 4500 002c 10d7 4000 ff06 327b c0a8 0103
 96cb e002 8033 0014 bd78 5c12 d9f8 11d5
-6012 02f8 d734 0000 0204 0584 3cc7
+6012 02f8 d734 0000 0204 0584
 
 [in,ppp0]
 4500 0028 ffe8 4000 ef06 536d 96cb e002
@@ -180,7 +180,7 @@
 [out,ppp0]
 4500 0028 10d8 4000 ff06 327e c0a8 0103
 96cb e002 8033 0014 bd78 5c13 d9f8 11d5
-5010 6348 8e71 0000 c0a8 0103 0015
+5010 6348 8e71 0000
 
 [in,ppp0]
 4500 0063 ffea 4000 ef06 5330 96cb e002
@@ -194,7 +194,7 @@
 [out,ppp0]
 4500 0028 10d9 4000 ff06 327d c0a8 0103
 96cb e002 8033 0014 bd78 5c13 d9f8 1210
-5010 6348 8e36 0000 c0a8 0103 0014
+5010 6348 8e36 0000
 
 [in,ppp0]
 4500 0028 ffeb 4000 ef06 536a 96cb e002
@@ -204,12 +204,12 @@
 [out,ppp0]
 4500 0028 10da 4000 ff06 327c c0a8 0103
 96cb e002 8033 0014 bd78 5c13 d9f8 1211
-5010 6348 8e35 0000 c0a8 0103 0014
+5010 6348 8e35 0000
 
 [out,ppp0]
 4500 0028 10db 4000 ff06 327b c0a8 0103
 96cb e002 8033 0014 bd78 5c13 d9f8 1211
-5011 6348 8e34 0000 c0a8 0103 0014
+5011 6348 8e34 0000
 
 [in,ppp0]
 4500 0028 ffec 4000 ef06 5369 96cb e002
@@ -219,7 +219,7 @@
 [out,ppp0]
 4500 0028 10dc 4000 ff06 327a c0a8 0103
 96cb e002 8032 0015 bd6b ca16 3786 790a
-5010 269c 9864 0000 c0a8 0103 0014
+5010 269c 9864 0000
 
 [in,ppp0]
 4500 0040 ffed 4000 ef06 5350 96cb e002
@@ -241,7 +241,7 @@
 [out,ppp0]
 4500 0028 10de 4000 ff06 3278 c0a8 0103
 96cb e002 8032 0015 bd6b ca1e 3786 7932
-5010 269c 9834 0000 6720 636f 6d70
+5010 269c 9834 0000
 
 [out,ppp0]
 4500 002e 10df 4000 ff06 3271 c0a8 0103
@@ -257,7 +257,7 @@
 [out,ppp0]
 4500 0028 10e0 4000 ff06 3276 c0a8 0103
 96cb e002 8032 0015 bd6b ca24 3786 7940
-5011 269c 981f 0000 c0a8 0103 0015
+5011 269c 981f 0000
 
 [in,ppp0]
 4500 0028 fff0 4000 ef06 5365 96cb e002
@@ -267,7 +267,7 @@
 [out,ppp0]
 4500 0028 10e1 4000 ff06 3275 c0a8 0103
 96cb e002 8032 0015 bd6b ca25 3786 7941
-5010 269c 981e 0000 0663 6f6f 6d62
+5010 269c 981e 0000
 
 [in,ppp0]
 4500 0028 fff1 4000 ef06 5364 96cb e002
diff --git a/contrib/ipfilter/test/regress/ipv6.3 b/contrib/ipfilter/test/regress/ipv6.3
new file mode 100644
index 0000000..6dc9e93
--- /dev/null
+++ b/contrib/ipfilter/test/regress/ipv6.3
@@ -0,0 +1 @@
+pass out log quick on gif0 proto ipv6-icmp from any to any icmp-type 128 keep state