From e832209ca1cb7a7c196115267ac5fe9026817b6c Mon Sep 17 00:00:00 2001 From: Cedric Berger Date: Sat, 3 Jan 2004 22:03:04 +0000 Subject: Do not use (self) in pfload regress tests, it makes result config-dependant. Found by David Krause, analyzed by Ryan McBride. --- regress/sbin/pfctl/pf17.in | 24 ++++++++++++------------ regress/sbin/pfctl/pf17.loaded | 24 ++++++++++++------------ regress/sbin/pfctl/pf17.ok | 24 ++++++++++++------------ 3 files changed, 36 insertions(+), 36 deletions(-) (limited to 'regress/sbin') diff --git a/regress/sbin/pfctl/pf17.in b/regress/sbin/pfctl/pf17.in index 72333a10085..e741d66ea2e 100644 --- a/regress/sbin/pfctl/pf17.in +++ b/regress/sbin/pfctl/pf17.in @@ -36,18 +36,18 @@ binat on lo0 from ::1 to (lo1000000:0) -> ::2 binat on lo0 from ::1 to !(lo1000000:0) -> ::2 binat on lo0 from (lo0:0) to -> ::2 -binat on lo0 from ::1 to (self) -> ::1 -binat on lo0 from ::1 to (self:0) -> ::1 -binat on lo0 from ::1 to (self:peer) -> ::1 -binat on lo0 from ::1 to (self:peer:0) -> ::1 -binat on lo0 from ::1 to (self:broadcast) -> ::1 -binat on lo0 from ::1 to (self:broadcast:0) -> ::1 -binat on lo0 from ::1 to (self:network) -> ::1 -binat on lo0 from ::1 to (self:network:0) -> ::1 -binat on lo0 from ::1 to (self)/100 -> ::2 -binat on lo0 from ::1 to (self:0)/100 -> ::2 -binat on lo0 from ::1 to (self:peer)/100 -> ::2 -binat on lo0 from ::1 to (self:peer:0)/100 -> ::2 +binat on lo0 from ::1 to (lo) -> ::1 +binat on lo0 from ::1 to (lo:0) -> ::1 +binat on lo0 from ::1 to (lo:peer) -> ::1 +binat on lo0 from ::1 to (lo:peer:0) -> ::1 +binat on lo0 from ::1 to (lo:broadcast) -> ::1 +binat on lo0 from ::1 to (lo:broadcast:0) -> ::1 +binat on lo0 from ::1 to (lo:network) -> ::1 +binat on lo0 from ::1 to (lo:network:0) -> ::1 +binat on lo0 from ::1 to (lo)/100 -> ::2 +binat on lo0 from ::1 to (lo:0)/100 -> ::2 +binat on lo0 from ::1 to (lo:peer)/100 -> ::2 +binat on lo0 from ::1 to (lo:peer:0)/100 -> ::2 binat on lo from (lo0:0) to ::1 -> ::2 binat on tun from (lo0:0) to ::1 -> ::2 diff --git a/regress/sbin/pfctl/pf17.loaded b/regress/sbin/pfctl/pf17.loaded index 96c24cf03b3..1279985eae8 100644 --- a/regress/sbin/pfctl/pf17.loaded +++ b/regress/sbin/pfctl/pf17.loaded @@ -118,51 +118,51 @@ [ Skip steps: i=42 d=end f=end p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@30 binat on lo0 inet6 from ::1 to (self:3) -> ::1 +@30 binat on lo0 inet6 from ::1 to (lo:2) -> ::1 [ Skip steps: i=42 d=end f=end p=end sa=42 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@31 binat on lo0 inet6 from ::1 to (self:0:2) -> ::1 +@31 binat on lo0 inet6 from ::1 to (lo:0:1) -> ::1 [ Skip steps: i=42 d=end f=end p=end sa=42 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@32 binat on lo0 inet6 from ::1 to (self:peer:*) -> ::1 +@32 binat on lo0 inet6 from ::1 to (lo:peer:*) -> ::1 [ Skip steps: i=42 d=end f=end p=end sa=42 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@33 binat on lo0 inet6 from ::1 to (self:peer:0:*) -> ::1 +@33 binat on lo0 inet6 from ::1 to (lo:peer:0:*) -> ::1 [ Skip steps: i=42 d=end f=end p=end sa=42 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@34 binat on lo0 inet6 from ::1 to (self:broadcast:*) -> ::1 +@34 binat on lo0 inet6 from ::1 to (lo:broadcast:*) -> ::1 [ Skip steps: i=42 d=end f=end p=end sa=42 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@35 binat on lo0 inet6 from ::1 to (self:broadcast:0:*) -> ::1 +@35 binat on lo0 inet6 from ::1 to (lo:broadcast:0:*) -> ::1 [ Skip steps: i=42 d=end f=end p=end sa=42 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@36 binat on lo0 inet6 from ::1 to (self:network:1) -> ::1 +@36 binat on lo0 inet6 from ::1 to (lo:network:1) -> ::1 [ Skip steps: i=42 d=end f=end p=end sa=42 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@37 binat on lo0 inet6 from ::1 to (self:network:0:1) -> ::1 +@37 binat on lo0 inet6 from ::1 to (lo:network:0:1) -> ::1 [ Skip steps: i=42 d=end f=end p=end sa=42 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@38 binat on lo0 inet6 from ::1 to (self:3)/100 -> ::2 +@38 binat on lo0 inet6 from ::1 to (lo:2)/100 -> ::2 [ Skip steps: i=42 d=end f=end p=end sa=42 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@39 binat on lo0 inet6 from ::1 to (self:0:2)/100 -> ::2 +@39 binat on lo0 inet6 from ::1 to (lo:0:1)/100 -> ::2 [ Skip steps: i=42 d=end f=end p=end sa=42 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@40 binat on lo0 inet6 from ::1 to (self:peer:*)/100 -> ::2 +@40 binat on lo0 inet6 from ::1 to (lo:peer:*)/100 -> ::2 [ Skip steps: i=42 d=end f=end p=end sa=42 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@41 binat on lo0 inet6 from ::1 to (self:peer:0:*)/100 -> ::2 +@41 binat on lo0 inet6 from ::1 to (lo:peer:0:*)/100 -> ::2 [ Skip steps: d=end f=end p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf17.ok b/regress/sbin/pfctl/pf17.ok index 0304b56f013..c44951645ea 100644 --- a/regress/sbin/pfctl/pf17.ok +++ b/regress/sbin/pfctl/pf17.ok @@ -28,17 +28,17 @@ binat on lo0 inet6 from ::1 to ! -> ::2 binat on lo0 inet6 from ::1 to (lo1000000:0) -> ::2 binat on lo0 inet6 from ::1 to ! (lo1000000:0) -> ::2 binat on lo0 inet6 from (lo0:0) to -> ::2 -binat on lo0 inet6 from ::1 to (self) -> ::1 -binat on lo0 inet6 from ::1 to (self:0) -> ::1 -binat on lo0 inet6 from ::1 to (self:peer) -> ::1 -binat on lo0 inet6 from ::1 to (self:peer:0) -> ::1 -binat on lo0 inet6 from ::1 to (self:broadcast) -> ::1 -binat on lo0 inet6 from ::1 to (self:broadcast:0) -> ::1 -binat on lo0 inet6 from ::1 to (self:network) -> ::1 -binat on lo0 inet6 from ::1 to (self:network:0) -> ::1 -binat on lo0 inet6 from ::1 to (self)/100 -> ::2 -binat on lo0 inet6 from ::1 to (self:0)/100 -> ::2 -binat on lo0 inet6 from ::1 to (self:peer)/100 -> ::2 -binat on lo0 inet6 from ::1 to (self:peer:0)/100 -> ::2 +binat on lo0 inet6 from ::1 to (lo) -> ::1 +binat on lo0 inet6 from ::1 to (lo:0) -> ::1 +binat on lo0 inet6 from ::1 to (lo:peer) -> ::1 +binat on lo0 inet6 from ::1 to (lo:peer:0) -> ::1 +binat on lo0 inet6 from ::1 to (lo:broadcast) -> ::1 +binat on lo0 inet6 from ::1 to (lo:broadcast:0) -> ::1 +binat on lo0 inet6 from ::1 to (lo:network) -> ::1 +binat on lo0 inet6 from ::1 to (lo:network:0) -> ::1 +binat on lo0 inet6 from ::1 to (lo)/100 -> ::2 +binat on lo0 inet6 from ::1 to (lo:0)/100 -> ::2 +binat on lo0 inet6 from ::1 to (lo:peer)/100 -> ::2 +binat on lo0 inet6 from ::1 to (lo:peer:0)/100 -> ::2 binat on lo inet6 from (lo0:0) to ::1 -> ::2 binat on tun inet6 from (lo0:0) to ::1 -> ::2 -- cgit v1.2.3