From dda30f2e8857e40b5fa3be94ddf8ea81ce5e19d2 Mon Sep 17 00:00:00 2001 From: bluhm Date: Wed, 11 Jul 2018 14:57:58 +0000 Subject: [PATCH] Some spaces have been removed from pfctl print. Adapt expected output in regress. --- regress/sbin/pfctl/pf101.loaded | 8 ++++---- regress/sbin/pfctl/pf101.ok | 8 ++++---- regress/sbin/pfctl/pf101.optimized | 8 ++++---- regress/sbin/pfctl/pf103.ok | 2 +- regress/sbin/pfctl/pf15.loaded | 10 +++++----- regress/sbin/pfctl/pf15.ok | 10 +++++----- regress/sbin/pfctl/pf15.optimized | 4 ++-- regress/sbin/pfctl/pf39.loaded | 12 ++++++------ regress/sbin/pfctl/pf39.ok | 12 ++++++------ regress/sbin/pfctl/pf39.optimized | 12 ++++++------ 10 files changed, 43 insertions(+), 43 deletions(-) diff --git a/regress/sbin/pfctl/pf101.loaded b/regress/sbin/pfctl/pf101.loaded index 01b9492dcfd..d03264c5761 100644 --- a/regress/sbin/pfctl/pf101.loaded +++ b/regress/sbin/pfctl/pf101.loaded @@ -1,16 +1,16 @@ -@0 pass all flags S/SA set ( prio 3 ) +@0 pass all flags S/SA set (prio 3) [ Skip steps: r=end f=2 sa=end da=2 sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 pass out on lo1000000 proto tcp from any to any port = 22 flags S/SA set ( prio(5, 2) ) +@1 pass out on lo1000000 proto tcp from any to any port = 22 flags S/SA set (prio(5, 2)) [ Skip steps: r=end sa=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@2 pass inet proto udp from any to 127.0.0.1 port = 53 set ( prio 4 ) +@2 pass inet proto udp from any to 127.0.0.1 port = 53 set (prio 4) [ Skip steps: i=end d=end r=end f=end p=end sa=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 pass inet proto udp from any to 127.0.0.2 port = 53 set ( prio 4 ) +@3 pass inet proto udp from any to 127.0.0.2 port = 53 set (prio 4) [ Skip steps: i=end d=end r=end f=end p=end sa=end da=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/pf101.ok b/regress/sbin/pfctl/pf101.ok index 4c5b7f0f2a7..444504a1701 100644 --- a/regress/sbin/pfctl/pf101.ok +++ b/regress/sbin/pfctl/pf101.ok @@ -1,4 +1,4 @@ -pass all flags S/SA set ( prio 3 ) -pass out on lo1000000 proto tcp from any to any port = 22 flags S/SA set ( prio(5, 2) ) -pass inet proto udp from any to 127.0.0.1 port = 53 set ( prio 4 ) -pass inet proto udp from any to 127.0.0.2 port = 53 set ( prio 4 ) +pass all flags S/SA set (prio 3) +pass out on lo1000000 proto tcp from any to any port = 22 flags S/SA set (prio(5, 2)) +pass inet proto udp from any to 127.0.0.1 port = 53 set (prio 4) +pass inet proto udp from any to 127.0.0.2 port = 53 set (prio 4) diff --git a/regress/sbin/pfctl/pf101.optimized b/regress/sbin/pfctl/pf101.optimized index 01b9492dcfd..d03264c5761 100644 --- a/regress/sbin/pfctl/pf101.optimized +++ b/regress/sbin/pfctl/pf101.optimized @@ -1,16 +1,16 @@ -@0 pass all flags S/SA set ( prio 3 ) +@0 pass all flags S/SA set (prio 3) [ Skip steps: r=end f=2 sa=end da=2 sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 pass out on lo1000000 proto tcp from any to any port = 22 flags S/SA set ( prio(5, 2) ) +@1 pass out on lo1000000 proto tcp from any to any port = 22 flags S/SA set (prio(5, 2)) [ Skip steps: r=end sa=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@2 pass inet proto udp from any to 127.0.0.1 port = 53 set ( prio 4 ) +@2 pass inet proto udp from any to 127.0.0.1 port = 53 set (prio 4) [ Skip steps: i=end d=end r=end f=end p=end sa=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 pass inet proto udp from any to 127.0.0.2 port = 53 set ( prio 4 ) +@3 pass inet proto udp from any to 127.0.0.2 port = 53 set (prio 4) [ Skip steps: i=end d=end r=end f=end p=end sa=end da=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/pf103.ok b/regress/sbin/pfctl/pf103.ok index d071ceeef32..582dd7d5a63 100644 --- a/regress/sbin/pfctl/pf103.ok +++ b/regress/sbin/pfctl/pf103.ok @@ -1,3 +1,3 @@ queue root on lo1000000 bandwidth 1M queue def parent root bandwidth 1K default -pass all flags S/SA set ( queue def ) +pass all flags S/SA set (queue def) diff --git a/regress/sbin/pfctl/pf15.loaded b/regress/sbin/pfctl/pf15.loaded index 23913942803..8777b884eb3 100644 --- a/regress/sbin/pfctl/pf15.loaded +++ b/regress/sbin/pfctl/pf15.loaded @@ -14,23 +14,23 @@ [ Skip steps: i=end d=5 r=end f=end p=5 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@4 match all set ( tos 0x10 ) +@4 match all set (tos 0x10) [ Skip steps: i=end r=end f=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@5 match out proto esp all set ( tos 0x08 ) +@5 match out proto esp all set (tos 0x08) [ Skip steps: i=end d=end r=end f=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@6 match out proto ah all set ( tos 0x04 ) +@6 match out proto ah all set (tos 0x04) [ Skip steps: i=end d=end r=end f=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@7 match out proto icmp all set ( tos 0x12 ) +@7 match out proto icmp all set (tos 0x12) [ Skip steps: i=end d=end r=end f=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@8 match out all set ( tos 0x08 ) tagged THROUGHPUT +@8 match out all set (tos 0x08) tagged THROUGHPUT [ Skip steps: i=end d=end r=end f=end p=end sa=end da=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/pf15.ok b/regress/sbin/pfctl/pf15.ok index eae3df356f7..5c6c38ceda1 100644 --- a/regress/sbin/pfctl/pf15.ok +++ b/regress/sbin/pfctl/pf15.ok @@ -4,8 +4,8 @@ match all scrub (no-df) match all scrub (min-ttl 25) match all scrub (max-mss 224) match all scrub (no-df max-mss 224) -match all set ( tos 0x10 ) -match out proto esp all set ( tos 0x08 ) -match out proto ah all set ( tos 0x04 ) -match out proto icmp all set ( tos 0x12 ) -match out all set ( tos 0x08 ) tagged THROUGHPUT +match all set (tos 0x10) +match out proto esp all set (tos 0x08) +match out proto ah all set (tos 0x04) +match out proto icmp all set (tos 0x12) +match out all set (tos 0x08) tagged THROUGHPUT diff --git a/regress/sbin/pfctl/pf15.optimized b/regress/sbin/pfctl/pf15.optimized index 7a6eade15f8..b8b7d0c51ea 100644 --- a/regress/sbin/pfctl/pf15.optimized +++ b/regress/sbin/pfctl/pf15.optimized @@ -10,11 +10,11 @@ [ Skip steps: i=end d=4 r=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 match all set ( tos 0x10 ) +@3 match all set (tos 0x10) [ Skip steps: i=end r=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@4 match out all set ( tos 0x08 ) tagged THROUGHPUT +@4 match out all set (tos 0x08) tagged THROUGHPUT [ Skip steps: i=end d=end r=end f=end p=end sa=end da=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/pf39.loaded b/regress/sbin/pfctl/pf39.loaded index dcabd70d1e8..f5207d3b049 100644 --- a/regress/sbin/pfctl/pf39.loaded +++ b/regress/sbin/pfctl/pf39.loaded @@ -2,23 +2,23 @@ [ Skip steps: i=end d=end r=end f=end p=5 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 pass in log quick on lo0 inet proto tcp all user = 3 group = 32767 flags S/SA tos 0x08 set ( prio 2 ) allow-opts label "blah" +@1 pass in log quick on lo0 inet proto tcp all user = 3 group = 32767 flags S/SA tos 0x08 set (prio 2) allow-opts label "blah" [ Skip steps: i=end d=end r=end f=end p=5 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@2 pass in log quick on lo0 inet proto tcp all user = 3 group = 0 flags S/SA tos 0x08 set ( prio 2 ) allow-opts label "blah" +@2 pass in log quick on lo0 inet proto tcp all user = 3 group = 0 flags S/SA tos 0x08 set (prio 2) allow-opts label "blah" [ Skip steps: i=end d=end r=end f=end p=5 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 pass in log quick on lo0 inet proto tcp all user = 0 group = 32767 flags S/SA tos 0x08 set ( prio 2 ) allow-opts label "blah" +@3 pass in log quick on lo0 inet proto tcp all user = 0 group = 32767 flags S/SA tos 0x08 set (prio 2) allow-opts label "blah" [ Skip steps: i=end d=end r=end f=end p=5 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@4 pass in log quick on lo0 inet proto tcp all user = 0 group = 0 flags S/SA tos 0x08 set ( prio 2 ) allow-opts label "blah" +@4 pass in log quick on lo0 inet proto tcp all user = 0 group = 0 flags S/SA tos 0x08 set (prio 2) allow-opts label "blah" [ Skip steps: i=end d=end r=end f=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@5 pass in log quick on lo0 inet proto icmp all icmp-type echorep code 0 set ( prio 2 ) label "blah" +@5 pass in log quick on lo0 inet proto icmp all icmp-type echorep code 0 set (prio 2) label "blah" [ Skip steps: i=end d=end r=end f=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @@ -26,7 +26,7 @@ [ Skip steps: i=end d=end r=end f=end p=8 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@7 pass in log quick on lo0 inet proto tcp all flags S/SA tos 0x08 set ( prio 2 ) label "blah" +@7 pass in log quick on lo0 inet proto tcp all flags S/SA tos 0x08 set (prio 2) label "blah" [ Skip steps: i=end d=end r=end f=end sa=end da=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/pf39.ok b/regress/sbin/pfctl/pf39.ok index 719c3d0cf43..5eb6c3cc6cd 100644 --- a/regress/sbin/pfctl/pf39.ok +++ b/regress/sbin/pfctl/pf39.ok @@ -13,12 +13,12 @@ o_allowopts = "allow-opts " o_label = "label blah" o_prio = "set prio 2" pass in log quick on lo0 inet proto tcp all tos 0x08 fragment label "blah" -pass in log quick on lo0 inet proto tcp all user = 3 group = 32767 flags S/SA tos 0x08 set ( prio 2 ) allow-opts label "blah" -pass in log quick on lo0 inet proto tcp all user = 3 group = 0 flags S/SA tos 0x08 set ( prio 2 ) allow-opts label "blah" -pass in log quick on lo0 inet proto tcp all user = 0 group = 32767 flags S/SA tos 0x08 set ( prio 2 ) allow-opts label "blah" -pass in log quick on lo0 inet proto tcp all user = 0 group = 0 flags S/SA tos 0x08 set ( prio 2 ) allow-opts label "blah" -pass in log quick on lo0 inet proto icmp all icmp-type echorep code 0 set ( prio 2 ) label "blah" +pass in log quick on lo0 inet proto tcp all user = 3 group = 32767 flags S/SA tos 0x08 set (prio 2) allow-opts label "blah" +pass in log quick on lo0 inet proto tcp all user = 3 group = 0 flags S/SA tos 0x08 set (prio 2) allow-opts label "blah" +pass in log quick on lo0 inet proto tcp all user = 0 group = 32767 flags S/SA tos 0x08 set (prio 2) allow-opts label "blah" +pass in log quick on lo0 inet proto tcp all user = 0 group = 0 flags S/SA tos 0x08 set (prio 2) allow-opts label "blah" +pass in log quick on lo0 inet proto icmp all icmp-type echorep code 0 set (prio 2) label "blah" pass in log quick on lo0 inet proto tcp all flags S/SA -pass in log quick on lo0 inet proto tcp all flags S/SA tos 0x08 set ( prio 2 ) label "blah" +pass in log quick on lo0 inet proto tcp all flags S/SA tos 0x08 set (prio 2) label "blah" pass in log quick on lo0 inet proto icmp all icmp-type echorep code 0 tos 0x08 pass in log quick on lo0 inet proto tcp all flags S/SA allow-opts diff --git a/regress/sbin/pfctl/pf39.optimized b/regress/sbin/pfctl/pf39.optimized index dcabd70d1e8..f5207d3b049 100644 --- a/regress/sbin/pfctl/pf39.optimized +++ b/regress/sbin/pfctl/pf39.optimized @@ -2,23 +2,23 @@ [ Skip steps: i=end d=end r=end f=end p=5 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 pass in log quick on lo0 inet proto tcp all user = 3 group = 32767 flags S/SA tos 0x08 set ( prio 2 ) allow-opts label "blah" +@1 pass in log quick on lo0 inet proto tcp all user = 3 group = 32767 flags S/SA tos 0x08 set (prio 2) allow-opts label "blah" [ Skip steps: i=end d=end r=end f=end p=5 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@2 pass in log quick on lo0 inet proto tcp all user = 3 group = 0 flags S/SA tos 0x08 set ( prio 2 ) allow-opts label "blah" +@2 pass in log quick on lo0 inet proto tcp all user = 3 group = 0 flags S/SA tos 0x08 set (prio 2) allow-opts label "blah" [ Skip steps: i=end d=end r=end f=end p=5 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 pass in log quick on lo0 inet proto tcp all user = 0 group = 32767 flags S/SA tos 0x08 set ( prio 2 ) allow-opts label "blah" +@3 pass in log quick on lo0 inet proto tcp all user = 0 group = 32767 flags S/SA tos 0x08 set (prio 2) allow-opts label "blah" [ Skip steps: i=end d=end r=end f=end p=5 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@4 pass in log quick on lo0 inet proto tcp all user = 0 group = 0 flags S/SA tos 0x08 set ( prio 2 ) allow-opts label "blah" +@4 pass in log quick on lo0 inet proto tcp all user = 0 group = 0 flags S/SA tos 0x08 set (prio 2) allow-opts label "blah" [ Skip steps: i=end d=end r=end f=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@5 pass in log quick on lo0 inet proto icmp all icmp-type echorep code 0 set ( prio 2 ) label "blah" +@5 pass in log quick on lo0 inet proto icmp all icmp-type echorep code 0 set (prio 2) label "blah" [ Skip steps: i=end d=end r=end f=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @@ -26,7 +26,7 @@ [ Skip steps: i=end d=end r=end f=end p=8 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@7 pass in log quick on lo0 inet proto tcp all flags S/SA tos 0x08 set ( prio 2 ) label "blah" +@7 pass in log quick on lo0 inet proto tcp all flags S/SA tos 0x08 set (prio 2) label "blah" [ Skip steps: i=end d=end r=end f=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -- 2.20.1