From 4b794f45205c660dfda2f128ca33a8c5ebf30c29 Mon Sep 17 00:00:00 2001 From: veego Date: Wed, 3 May 2000 10:57:43 +0000 Subject: [PATCH] Import IP Filter 3.4.1 --- dist/ipf/test/expected/i3 | 2 ++ dist/ipf/test/expected/i7 | 3 ++- dist/ipf/test/expected/n1 | 14 +++++++------- dist/ipf/test/regress/i3 | 2 ++ dist/ipf/test/regress/i7 | 1 + 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dist/ipf/test/expected/i3 b/dist/ipf/test/expected/i3 index 4d70a94dd3d2..18d91614f0a6 100644 --- a/dist/ipf/test/expected/i3 +++ b/dist/ipf/test/expected/i3 @@ -6,3 +6,5 @@ pass in from 128.0.0.0/24 to 128.0.0.0/16 pass in from 128.0.0.0/24 to 128.0.0.0/16 pass in from 127.0.0.1/32 to 127.0.0.1/32 block in log from any to any +block in log level auth.info on hme0(!) from any to any +log level local5.warn out from any to any diff --git a/dist/ipf/test/expected/i7 b/dist/ipf/test/expected/i7 index 2414f57b8281..750cf26079ea 100644 --- a/dist/ipf/test/expected/i7 +++ b/dist/ipf/test/expected/i7 @@ -1,3 +1,4 @@ pass in on ed0(!) proto tcp from 127.0.0.1/32 to 127.0.0.1/32 port = 23 flags S/SA -block in on lo0(!) proto tcp from any to any flags A/FSRPAU +block in on lo0(!) proto tcp from any to any flags A/0xff pass in on lo0(!) proto tcp from any to any flags /SPA +block in on lo0(!) proto tcp from any to any flags 0x80/A diff --git a/dist/ipf/test/expected/n1 b/dist/ipf/test/expected/n1 index 77365f83ec3b..c195f6f79263 100644 --- a/dist/ipf/test/expected/n1 +++ b/dist/ipf/test/expected/n1 @@ -81,16 +81,16 @@ ip 20(20) 255 10.1.1.0 > 10.3.4.5 ip 20(20) 255 10.1.1.1 > 10.3.4.5 ip 20(20) 255 10.1.1.2 > 10.3.4.5 ip 40(20) 6 10.1.1.1,1025 > 10.3.4.5,1025 -ip 48(20) 1 10.3.4.4 > 10.4.3.2 +ip 48(20) 1 10.3.4.2 > 10.4.3.2 ip 48(20) 1 10.4.3.2 > 10.2.2.2 ip 48(20) 1 10.4.3.2 > 10.3.4.3 ip 48(20) 1 10.4.3.2 > 10.3.4.5 -ip 20(20) 34 10.3.4.5 > 10.4.3.2 +ip 20(20) 34 10.3.4.3 > 10.4.3.2 ip 20(20) 34 10.4.3.2 > 10.3.4.4 -ip 20(20) 34 10.3.4.6 > 10.4.3.4 +ip 20(20) 34 10.3.4.3 > 10.4.3.4 ip 20(20) 34 10.4.3.4 > 10.3.4.5 -ip 20(20) 34 10.3.4.7 > 10.4.3.4 -ip 20(20) 34 10.4.3.4 > 10.1.1.2 -ip 20(20) 35 10.3.4.7 > 10.4.3.4 -ip 20(20) 35 10.4.3.4 > 10.1.1.3 +ip 20(20) 34 10.3.4.4 > 10.4.3.4 +ip 20(20) 34 10.4.3.4 > 10.3.4.6 +ip 20(20) 35 10.3.4.4 > 10.4.3.4 +ip 20(20) 35 10.4.3.4 > 10.3.4.7 ------------------------------- diff --git a/dist/ipf/test/regress/i3 b/dist/ipf/test/regress/i3 index e69663ee7a0d..15e98bfc71ff 100644 --- a/dist/ipf/test/regress/i3 +++ b/dist/ipf/test/regress/i3 @@ -6,3 +6,5 @@ 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/dist/ipf/test/regress/i7 b/dist/ipf/test/regress/i7 index 9cb35723c67e..4f3328d06a50 100644 --- a/dist/ipf/test/regress/i7 +++ b/dist/ipf/test/regress/i7 @@ -1,3 +1,4 @@ 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