adopt regression tests to recent change

18 files changed, 33 insertions, 98 deletions

diff --git a/regress/sbin/ipsecctl/ipsec1.ok b/regress/sbin/ipsecctl/ipsec1.ok
index 42ba91174b5..c6b6c697983 100644
--- a/regress/sbin/ipsecctl/ipsec1.ok
+++ b/regress/sbin/ipsecctl/ipsec1.ok
@@ -1,4 +1,2 @@
-flow esp out from 1.1.1.1 to 2.2.2.2 peer 2.2.2.2
-	type require
-flow esp in from 2.2.2.2 to 1.1.1.1 peer 2.2.2.2
-	type use
+flow esp out from 1.1.1.1 to 2.2.2.2 peer 2.2.2.2 type require
+flow esp in from 2.2.2.2 to 1.1.1.1 peer 2.2.2.2 type use
diff --git a/regress/sbin/ipsecctl/ipsec10.ok b/regress/sbin/ipsecctl/ipsec10.ok
index 6a3545a72da..41f24461738 100644
--- a/regress/sbin/ipsecctl/ipsec10.ok
+++ b/regress/sbin/ipsecctl/ipsec10.ok
@@ -1,8 +1,2 @@
-flow ah out from 1.1.1.1 to 3.3.3.0/24 peer 2.2.2.2
-	srcid host1.one.net
-	dstid host2.two.net
-	type require
-flow ah in from 3.3.3.0/24 to 1.1.1.1 peer 2.2.2.2
-	srcid host1.one.net
-	dstid host2.two.net
-	type use
+flow ah out from 1.1.1.1 to 3.3.3.0/24 peer 2.2.2.2 srcid host1.one.net dstid host2.two.net type require
+flow ah in from 3.3.3.0/24 to 1.1.1.1 peer 2.2.2.2 srcid host1.one.net dstid host2.two.net type use
diff --git a/regress/sbin/ipsecctl/ipsec11.ok b/regress/sbin/ipsecctl/ipsec11.ok
index 189b5a87cf4..6e66d6da947 100644
--- a/regress/sbin/ipsecctl/ipsec11.ok
+++ b/regress/sbin/ipsecctl/ipsec11.ok
@@ -1,8 +1,2 @@
-flow ah out from 4.4.0.0/16 to 3.3.3.0/24 peer 2.2.2.2
-	srcid host1.one.net
-	dstid host2.two.net
-	type require
-flow ah in from 3.3.3.0/24 to 4.4.0.0/16 peer 2.2.2.2
-	srcid host1.one.net
-	dstid host2.two.net
-	type use
+flow ah out from 4.4.0.0/16 to 3.3.3.0/24 peer 2.2.2.2 srcid host1.one.net dstid host2.two.net type require
+flow ah in from 3.3.3.0/24 to 4.4.0.0/16 peer 2.2.2.2 srcid host1.one.net dstid host2.two.net type use
diff --git a/regress/sbin/ipsecctl/ipsec12.ok b/regress/sbin/ipsecctl/ipsec12.ok
index 189b5a87cf4..6e66d6da947 100644
--- a/regress/sbin/ipsecctl/ipsec12.ok
+++ b/regress/sbin/ipsecctl/ipsec12.ok
@@ -1,8 +1,2 @@
-flow ah out from 4.4.0.0/16 to 3.3.3.0/24 peer 2.2.2.2
-	srcid host1.one.net
-	dstid host2.two.net
-	type require
-flow ah in from 3.3.3.0/24 to 4.4.0.0/16 peer 2.2.2.2
-	srcid host1.one.net
-	dstid host2.two.net
-	type use
+flow ah out from 4.4.0.0/16 to 3.3.3.0/24 peer 2.2.2.2 srcid host1.one.net dstid host2.two.net type require
+flow ah in from 3.3.3.0/24 to 4.4.0.0/16 peer 2.2.2.2 srcid host1.one.net dstid host2.two.net type use
diff --git a/regress/sbin/ipsecctl/ipsec13.ok b/regress/sbin/ipsecctl/ipsec13.ok
index a575a6214d3..6e6136f6f3a 100644
--- a/regress/sbin/ipsecctl/ipsec13.ok
+++ b/regress/sbin/ipsecctl/ipsec13.ok
@@ -1,4 +1,2 @@
-flow esp out from 1.1.1.1 to 0.0.0.0/0 peer 2.2.2.2
-	type require
-flow esp in from 0.0.0.0/0 to 1.1.1.1 peer 2.2.2.2
-	type use
+flow esp out from 1.1.1.1 to 0.0.0.0/0 peer 2.2.2.2 type require
+flow esp in from 0.0.0.0/0 to 1.1.1.1 peer 2.2.2.2 type use
diff --git a/regress/sbin/ipsecctl/ipsec14.ok b/regress/sbin/ipsecctl/ipsec14.ok
index 7805e531e86..4f54ba0b88b 100644
--- a/regress/sbin/ipsecctl/ipsec14.ok
+++ b/regress/sbin/ipsecctl/ipsec14.ok
@@ -1,2 +1 @@
-flow ipip out from 0.0.0.0/0 to 192.168.11.0/24 peer 10.0.0.2
-	type require
+flow ipip out from 0.0.0.0/0 to 192.168.11.0/24 peer 10.0.0.2 type require
diff --git a/regress/sbin/ipsecctl/ipsec15.ok b/regress/sbin/ipsecctl/ipsec15.ok
index ff21ae89486..d85e31fbb1d 100644
--- a/regress/sbin/ipsecctl/ipsec15.ok
+++ b/regress/sbin/ipsecctl/ipsec15.ok
@@ -1,4 +1,2 @@
-flow esp out from 1.1.1.0/24 to 2.2.2.0/24 local 192.168.0.1 peer 192.168.100.1
-	type require
-flow esp in from 2.2.2.0/24 to 1.1.1.0/24 local 192.168.0.1 peer 192.168.100.1
-	type use
+flow esp out from 1.1.1.0/24 to 2.2.2.0/24 local 192.168.0.1 peer 192.168.100.1 type require
+flow esp in from 2.2.2.0/24 to 1.1.1.0/24 local 192.168.0.1 peer 192.168.100.1 type use
diff --git a/regress/sbin/ipsecctl/ipsec16.ok b/regress/sbin/ipsecctl/ipsec16.ok
index 2a9020468c2..3aef68ce19d 100644
--- a/regress/sbin/ipsecctl/ipsec16.ok
+++ b/regress/sbin/ipsecctl/ipsec16.ok
@@ -2,7 +2,5 @@ a = "1.1.1.0/24"
 b = "2.2.2.0/24"
 l = "192.168.0.1"
 p = "192.168.100.1"
-flow esp out from 1.1.1.0/24 to 2.2.2.0/24 local 192.168.0.1 peer 192.168.100.1
-	type require
-flow esp in from 2.2.2.0/24 to 1.1.1.0/24 local 192.168.0.1 peer 192.168.100.1
-	type use
+flow esp out from 1.1.1.0/24 to 2.2.2.0/24 local 192.168.0.1 peer 192.168.100.1 type require
+flow esp in from 2.2.2.0/24 to 1.1.1.0/24 local 192.168.0.1 peer 192.168.100.1 type use
diff --git a/regress/sbin/ipsecctl/ipsec17.ok b/regress/sbin/ipsecctl/ipsec17.ok
index fbcf60da111..91aac52b751 100644
--- a/regress/sbin/ipsecctl/ipsec17.ok
+++ b/regress/sbin/ipsecctl/ipsec17.ok
@@ -1,2 +1 @@
-flow esp in from 3.3.3.0/24 to 3.3.3.0/24
-	type bypass
+flow esp in from 3.3.3.0/24 to 3.3.3.0/24 type bypass
diff --git a/regress/sbin/ipsecctl/ipsec18.ok b/regress/sbin/ipsecctl/ipsec18.ok
index af00b1ad91a..41decbc23e1 100644
--- a/regress/sbin/ipsecctl/ipsec18.ok
+++ b/regress/sbin/ipsecctl/ipsec18.ok
@@ -1,2 +1 @@
-flow esp in from 0.0.0.0/0 to 3.3.3.0/24
-	type deny
+flow esp in from 0.0.0.0/0 to 3.3.3.0/24 type deny
diff --git a/regress/sbin/ipsecctl/ipsec2.ok b/regress/sbin/ipsecctl/ipsec2.ok
index 436fbea9e29..0bbec5dfc7f 100644
--- a/regress/sbin/ipsecctl/ipsec2.ok
+++ b/regress/sbin/ipsecctl/ipsec2.ok
@@ -1,8 +1,2 @@
-flow esp out from 1.1.1.1 to 2.2.2.2 peer 2.2.2.2
-	srcid host1.one.net
-	dstid host2.two.net
-	type require
-flow esp in from 2.2.2.2 to 1.1.1.1 peer 2.2.2.2
-	srcid host1.one.net
-	dstid host2.two.net
-	type use
+flow esp out from 1.1.1.1 to 2.2.2.2 peer 2.2.2.2 srcid host1.one.net dstid host2.two.net type require
+flow esp in from 2.2.2.2 to 1.1.1.1 peer 2.2.2.2 srcid host1.one.net dstid host2.two.net type use
diff --git a/regress/sbin/ipsecctl/ipsec3.ok b/regress/sbin/ipsecctl/ipsec3.ok
index a82868434e5..35fcc89dd50 100644
--- a/regress/sbin/ipsecctl/ipsec3.ok
+++ b/regress/sbin/ipsecctl/ipsec3.ok
@@ -1,4 +1,2 @@
-flow esp out from 1.1.1.1 to 3.3.3.0/24 peer 2.2.2.2
-	type require
-flow esp in from 3.3.3.0/24 to 1.1.1.1 peer 2.2.2.2
-	type use
+flow esp out from 1.1.1.1 to 3.3.3.0/24 peer 2.2.2.2 type require
+flow esp in from 3.3.3.0/24 to 1.1.1.1 peer 2.2.2.2 type use
diff --git a/regress/sbin/ipsecctl/ipsec4.ok b/regress/sbin/ipsecctl/ipsec4.ok
index d6ff3d0366c..bbf4d76ed60 100644
--- a/regress/sbin/ipsecctl/ipsec4.ok
+++ b/regress/sbin/ipsecctl/ipsec4.ok
@@ -1,8 +1,2 @@
-flow esp out from 1.1.1.1 to 3.3.3.0/24 peer 2.2.2.2
-	srcid host1.one.net
-	dstid host2.two.net
-	type require
-flow esp in from 3.3.3.0/24 to 1.1.1.1 peer 2.2.2.2
-	srcid host1.one.net
-	dstid host2.two.net
-	type use
+flow esp out from 1.1.1.1 to 3.3.3.0/24 peer 2.2.2.2 srcid host1.one.net dstid host2.two.net type require
+flow esp in from 3.3.3.0/24 to 1.1.1.1 peer 2.2.2.2 srcid host1.one.net dstid host2.two.net type use
diff --git a/regress/sbin/ipsecctl/ipsec5.ok b/regress/sbin/ipsecctl/ipsec5.ok
index ab61ea1a0f2..7d38398585b 100644
--- a/regress/sbin/ipsecctl/ipsec5.ok
+++ b/regress/sbin/ipsecctl/ipsec5.ok
@@ -1,8 +1,2 @@
-flow esp out from 4.4.0.0/16 to 3.3.3.0/24 peer 2.2.2.2
-	srcid host1.one.net
-	dstid host2.two.net
-	type require
-flow esp in from 3.3.3.0/24 to 4.4.0.0/16 peer 2.2.2.2
-	srcid host1.one.net
-	dstid host2.two.net
-	type use
+flow esp out from 4.4.0.0/16 to 3.3.3.0/24 peer 2.2.2.2 srcid host1.one.net dstid host2.two.net type require
+flow esp in from 3.3.3.0/24 to 4.4.0.0/16 peer 2.2.2.2 srcid host1.one.net dstid host2.two.net type use
diff --git a/regress/sbin/ipsecctl/ipsec6.ok b/regress/sbin/ipsecctl/ipsec6.ok
index ab61ea1a0f2..7d38398585b 100644
--- a/regress/sbin/ipsecctl/ipsec6.ok
+++ b/regress/sbin/ipsecctl/ipsec6.ok
@@ -1,8 +1,2 @@
-flow esp out from 4.4.0.0/16 to 3.3.3.0/24 peer 2.2.2.2
-	srcid host1.one.net
-	dstid host2.two.net
-	type require
-flow esp in from 3.3.3.0/24 to 4.4.0.0/16 peer 2.2.2.2
-	srcid host1.one.net
-	dstid host2.two.net
-	type use
+flow esp out from 4.4.0.0/16 to 3.3.3.0/24 peer 2.2.2.2 srcid host1.one.net dstid host2.two.net type require
+flow esp in from 3.3.3.0/24 to 4.4.0.0/16 peer 2.2.2.2 srcid host1.one.net dstid host2.two.net type use
diff --git a/regress/sbin/ipsecctl/ipsec7.ok b/regress/sbin/ipsecctl/ipsec7.ok
index 2e9aae9e319..136afbbae75 100644
--- a/regress/sbin/ipsecctl/ipsec7.ok
+++ b/regress/sbin/ipsecctl/ipsec7.ok
@@ -1,4 +1,2 @@
-flow ah out from 1.1.1.1 to 2.2.2.2 peer 2.2.2.2
-	type require
-flow ah in from 2.2.2.2 to 1.1.1.1 peer 2.2.2.2
-	type use
+flow ah out from 1.1.1.1 to 2.2.2.2 peer 2.2.2.2 type require
+flow ah in from 2.2.2.2 to 1.1.1.1 peer 2.2.2.2 type use
diff --git a/regress/sbin/ipsecctl/ipsec8.ok b/regress/sbin/ipsecctl/ipsec8.ok
index 1bef6b4c4d1..fa8d3ded8f7 100644
--- a/regress/sbin/ipsecctl/ipsec8.ok
+++ b/regress/sbin/ipsecctl/ipsec8.ok
@@ -1,8 +1,2 @@
-flow ah out from 1.1.1.1 to 2.2.2.2 peer 2.2.2.2
-	srcid host1.one.net
-	dstid host2.two.net
-	type require
-flow ah in from 2.2.2.2 to 1.1.1.1 peer 2.2.2.2
-	srcid host1.one.net
-	dstid host2.two.net
-	type use
+flow ah out from 1.1.1.1 to 2.2.2.2 peer 2.2.2.2 srcid host1.one.net dstid host2.two.net type require
+flow ah in from 2.2.2.2 to 1.1.1.1 peer 2.2.2.2 srcid host1.one.net dstid host2.two.net type use
diff --git a/regress/sbin/ipsecctl/ipsec9.ok b/regress/sbin/ipsecctl/ipsec9.ok
index 7fd2751ec3f..61c7a697cb3 100644
--- a/regress/sbin/ipsecctl/ipsec9.ok
+++ b/regress/sbin/ipsecctl/ipsec9.ok
@@ -1,4 +1,2 @@
-flow ah out from 1.1.1.1 to 3.3.3.0/24 peer 2.2.2.2
-	type require
-flow ah in from 3.3.3.0/24 to 1.1.1.1 peer 2.2.2.2
-	type use
+flow ah out from 1.1.1.1 to 3.3.3.0/24 peer 2.2.2.2 type require
+flow ah in from 3.3.3.0/24 to 1.1.1.1 peer 2.2.2.2 type use