diff options
| author | Ryan Thomas McBride <mcbride@cvs.openbsd.org> | 2002-12-31 00:49:33 +0000 |
|---|---|---|
| committer | Ryan Thomas McBride <mcbride@cvs.openbsd.org> | 2002-12-31 00:49:33 +0000 |
| commit | e0427523ce1cc41117564d9062248cb189411e14 (patch) | |
| tree | 67cdf3ac60c27a5443fc91c7e3f4381dd4b5ae5e /regress | |
| parent | b4b233f85561f5c69a711265330e0e2a3eb98152 (diff) | |
Fix regression tests for ipv6-icmp-type to icmp6-type changes in pfctl.
Diffstat (limited to 'regress')
| -rw-r--r-- | regress/sbin/pfctl/pf11.in | 18 | ||||
| -rw-r--r-- | regress/sbin/pfctl/pf11.loaded | 18 | ||||
| -rw-r--r-- | regress/sbin/pfctl/pf11.ok | 18 | ||||
| -rw-r--r-- | regress/sbin/pfctl/pfail6.in | 2 |
4 files changed, 28 insertions, 28 deletions
diff --git a/regress/sbin/pfctl/pf11.in b/regress/sbin/pfctl/pf11.in index 618562b3bac..a4dd3d57487 100644 --- a/regress/sbin/pfctl/pf11.in +++ b/regress/sbin/pfctl/pf11.in @@ -2,17 +2,17 @@ pass in inet proto icmp all icmp-type 0 pass in inet proto icmp all icmp-type 0 code 0 pass in inet proto icmp all icmp-type 1 pass in inet proto icmp all icmp-type 1 code 1 -pass in inet6 proto ipv6-icmp all ipv6-icmp-type 0 -pass in inet6 proto ipv6-icmp all ipv6-icmp-type 0 code 0 -pass in inet6 proto ipv6-icmp all ipv6-icmp-type 1 -pass in inet6 proto ipv6-icmp all ipv6-icmp-type 1 code 1 +pass in inet6 proto ipv6-icmp all icmp6-type 0 +pass in inet6 proto ipv6-icmp all icmp6-type 0 code 0 +pass in inet6 proto ipv6-icmp all icmp6-type 1 +pass in inet6 proto ipv6-icmp all icmp6-type 1 code 1 block in inet proto icmp all icmp-type 0 block in inet proto icmp all icmp-type 0 code 0 block in inet proto icmp all icmp-type 1 block in inet proto icmp all icmp-type 1 code 1 -block in inet6 proto ipv6-icmp all ipv6-icmp-type 0 -block in inet6 proto ipv6-icmp all ipv6-icmp-type 0 code 0 -block in inet6 proto ipv6-icmp all ipv6-icmp-type 1 -block in inet6 proto ipv6-icmp all ipv6-icmp-type 1 code 1 +block in inet6 proto ipv6-icmp all icmp6-type 0 +block in inet6 proto ipv6-icmp all icmp6-type 0 code 0 +block in inet6 proto ipv6-icmp all icmp6-type 1 +block in inet6 proto ipv6-icmp all icmp6-type 1 code 1 pass in inet proto icmp all icmp-type unreach code needfrag -pass in inet6 proto ipv6-icmp all ipv6-icmp-type timex code reassemb +pass in inet6 proto ipv6-icmp all icmp6-type timex code reassemb diff --git a/regress/sbin/pfctl/pf11.loaded b/regress/sbin/pfctl/pf11.loaded index 2ffb56bb88e..c758ef4e652 100644 --- a/regress/sbin/pfctl/pf11.loaded +++ b/regress/sbin/pfctl/pf11.loaded @@ -14,19 +14,19 @@ [ Skip steps: a=end i=end d=end sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@4 pass in inet6 proto ipv6-icmp all ipv6-icmp-type 0 +@4 pass in inet6 proto ipv6-icmp all icmp6-type 0 [ Skip steps: a=end i=end d=end f=8 p=8 sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@5 pass in inet6 proto ipv6-icmp all ipv6-icmp-type 0 code 0 +@5 pass in inet6 proto ipv6-icmp all icmp6-type 0 code 0 [ Skip steps: a=end i=end d=end f=8 p=8 sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@6 pass in inet6 proto ipv6-icmp all ipv6-icmp-type unreach +@6 pass in inet6 proto ipv6-icmp all icmp6-type unreach [ Skip steps: a=end i=end d=end f=8 p=8 sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@7 pass in inet6 proto ipv6-icmp all ipv6-icmp-type unreach code admin-unr +@7 pass in inet6 proto ipv6-icmp all icmp6-type unreach code admin-unr [ Skip steps: a=end i=end d=end sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @@ -46,19 +46,19 @@ [ Skip steps: a=end i=end d=end sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@12 block drop in inet6 proto ipv6-icmp all ipv6-icmp-type 0 +@12 block drop in inet6 proto ipv6-icmp all icmp6-type 0 [ Skip steps: a=end i=end d=end f=16 p=16 sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@13 block drop in inet6 proto ipv6-icmp all ipv6-icmp-type 0 code 0 +@13 block drop in inet6 proto ipv6-icmp all icmp6-type 0 code 0 [ Skip steps: a=end i=end d=end f=16 p=16 sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@14 block drop in inet6 proto ipv6-icmp all ipv6-icmp-type unreach +@14 block drop in inet6 proto ipv6-icmp all icmp6-type unreach [ Skip steps: a=end i=end d=end f=16 p=16 sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@15 block drop in inet6 proto ipv6-icmp all ipv6-icmp-type unreach code admin-unr +@15 block drop in inet6 proto ipv6-icmp all icmp6-type unreach code admin-unr [ Skip steps: a=end i=end d=end sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @@ -66,7 +66,7 @@ [ Skip steps: a=end i=end d=end sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@17 pass in inet6 proto ipv6-icmp all ipv6-icmp-type timex code reassemb +@17 pass in inet6 proto ipv6-icmp all icmp6-type timex code reassemb [ Skip steps: a=end i=end d=end f=end p=end sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf11.ok b/regress/sbin/pfctl/pf11.ok index 78a677cc47b..40c68936752 100644 --- a/regress/sbin/pfctl/pf11.ok +++ b/regress/sbin/pfctl/pf11.ok @@ -2,17 +2,17 @@ pass in inet proto icmp all icmp-type echorep pass in inet proto icmp all icmp-type echorep code 0 pass in inet proto icmp all icmp-type 1 pass in inet proto icmp all icmp-type 1 code 1 -pass in inet6 proto ipv6-icmp all ipv6-icmp-type 0 -pass in inet6 proto ipv6-icmp all ipv6-icmp-type 0 code 0 -pass in inet6 proto ipv6-icmp all ipv6-icmp-type unreach -pass in inet6 proto ipv6-icmp all ipv6-icmp-type unreach code admin-unr +pass in inet6 proto ipv6-icmp all icmp6-type 0 +pass in inet6 proto ipv6-icmp all icmp6-type 0 code 0 +pass in inet6 proto ipv6-icmp all icmp6-type unreach +pass in inet6 proto ipv6-icmp all icmp6-type unreach code admin-unr block drop in inet proto icmp all icmp-type echorep block drop in inet proto icmp all icmp-type echorep code 0 block drop in inet proto icmp all icmp-type 1 block drop in inet proto icmp all icmp-type 1 code 1 -block drop in inet6 proto ipv6-icmp all ipv6-icmp-type 0 -block drop in inet6 proto ipv6-icmp all ipv6-icmp-type 0 code 0 -block drop in inet6 proto ipv6-icmp all ipv6-icmp-type unreach -block drop in inet6 proto ipv6-icmp all ipv6-icmp-type unreach code admin-unr +block drop in inet6 proto ipv6-icmp all icmp6-type 0 +block drop in inet6 proto ipv6-icmp all icmp6-type 0 code 0 +block drop in inet6 proto ipv6-icmp all icmp6-type unreach +block drop in inet6 proto ipv6-icmp all icmp6-type unreach code admin-unr pass in inet proto icmp all icmp-type unreach code needfrag -pass in inet6 proto ipv6-icmp all ipv6-icmp-type timex code reassemb +pass in inet6 proto ipv6-icmp all icmp6-type timex code reassemb diff --git a/regress/sbin/pfctl/pfail6.in b/regress/sbin/pfctl/pfail6.in index 8e36dc270aa..06f95d1c983 100644 --- a/regress/sbin/pfctl/pfail6.in +++ b/regress/sbin/pfctl/pfail6.in @@ -1 +1 @@ -pass in inet proto icmp all ipv6-icmp-type 0 +pass in inet proto icmp all icmp6-type 0 |