summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo Buehler <tb@cvs.openbsd.org>2022-06-19 14:02:45 +0000
committerTheo Buehler <tb@cvs.openbsd.org>2022-06-19 14:02:45 +0000
commita14ab151f1d2a0af43b13e87315dd2fe46622191 (patch)
treee372f54add776d578cb1d7b18cb8fe974d7a29f7
parent2aec6559b5225c9f990b383257f7b358e22a934d (diff)
Make expected output match reality again.
-rw-r--r--regress/sbin/route/rttest1.ok24
-rw-r--r--regress/sbin/route/rttest10.ok14
-rw-r--r--regress/sbin/route/rttest11.ok14
-rw-r--r--regress/sbin/route/rttest12.ok10
-rw-r--r--regress/sbin/route/rttest14.ok24
-rw-r--r--regress/sbin/route/rttest15.ok10
-rw-r--r--regress/sbin/route/rttest16.ok24
-rw-r--r--regress/sbin/route/rttest17.ok10
-rw-r--r--regress/sbin/route/rttest18.ok10
-rw-r--r--regress/sbin/route/rttest19.ok14
-rw-r--r--regress/sbin/route/rttest2.ok12
-rw-r--r--regress/sbin/route/rttest21.ok14
-rw-r--r--regress/sbin/route/rttest22.ok12
-rw-r--r--regress/sbin/route/rttest24.ok12
-rw-r--r--regress/sbin/route/rttest26.ok10
-rw-r--r--regress/sbin/route/rttest27.ok10
-rw-r--r--regress/sbin/route/rttest3.ok10
-rw-r--r--regress/sbin/route/rttest30.ok32
-rw-r--r--regress/sbin/route/rttest31.ok16
-rw-r--r--regress/sbin/route/rttest32.ok28
-rw-r--r--regress/sbin/route/rttest33.ok18
-rw-r--r--regress/sbin/route/rttest34.ok18
-rw-r--r--regress/sbin/route/rttest35.ok18
-rw-r--r--regress/sbin/route/rttest36.ok18
-rw-r--r--regress/sbin/route/rttest37.ok26
-rw-r--r--regress/sbin/route/rttest38.ok32
-rw-r--r--regress/sbin/route/rttest4.ok14
-rw-r--r--regress/sbin/route/rttest5.ok14
-rw-r--r--regress/sbin/route/rttest6.ok14
-rw-r--r--regress/sbin/route/rttest7.ok12
-rw-r--r--regress/sbin/route/rttest8.ok14
-rw-r--r--regress/sbin/route/rttest9.ok12
-rw-r--r--regress/usr.bin/netstat/nstest1.ok10
33 files changed, 265 insertions, 265 deletions
diff --git a/regress/sbin/route/rttest1.ok b/regress/sbin/route/rttest1.ok
index 80d844b69bf..7241c4101cc 100644
--- a/regress/sbin/route/rttest1.ok
+++ b/regress/sbin/route/rttest1.ok
@@ -2,15 +2,15 @@ Routing tables
Internet:
Destination Gateway Flags Refs Use Mtu Prio Iface
-10/8 192.0.2.1 UGdS 0 0 32768 8 lo10001
-10.0/10 192.0.2.4 UGdS 0 0 32768 8 lo10004
-10.0/16 192.0.2.4 UGdS 0 0 32768 8 lo10004
-10.8/16 192.0.2.3 UGdS 0 0 32768 8 lo10003
-10.8.0/24 192.0.2.1 UGdS 0 0 32768 8 lo10001
-10.8.1/24 192.0.2.2 UGdS 0 0 32768 8 lo10002
-10.8.3/24 192.0.2.3 UGdS 0 0 32768 8 lo10003
-10.8.4/24 192.0.2.4 UGdS 0 0 32768 8 lo10004
-192.0.2.1 192.0.2.1 UHdhl 2 4 32768 1 lo10001
-192.0.2.2 192.0.2.2 UHdhl 1 2 32768 1 lo10002
-192.0.2.3 192.0.2.3 UHdhl 2 4 32768 1 lo10003
-192.0.2.4 192.0.2.4 UHdhl 3 6 32768 1 lo10004
+10/8 192.0.2.1 UGS 0 0 32768 8 lo10001
+10.0/10 192.0.2.4 UGS 0 0 32768 8 lo10004
+10.0/16 192.0.2.4 UGS 0 0 32768 8 lo10004
+10.8/16 192.0.2.3 UGS 0 0 32768 8 lo10003
+10.8.0/24 192.0.2.1 UGS 0 0 32768 8 lo10001
+10.8.1/24 192.0.2.2 UGS 0 0 32768 8 lo10002
+10.8.3/24 192.0.2.3 UGS 0 0 32768 8 lo10003
+10.8.4/24 192.0.2.4 UGS 0 0 32768 8 lo10004
+192.0.2.1 192.0.2.1 UHhl 2 4 32768 1 lo10001
+192.0.2.2 192.0.2.2 UHhl 1 2 32768 1 lo10002
+192.0.2.3 192.0.2.3 UHhl 2 4 32768 1 lo10003
+192.0.2.4 192.0.2.4 UHhl 3 6 32768 1 lo10004
diff --git a/regress/sbin/route/rttest10.ok b/regress/sbin/route/rttest10.ok
index 4c9e6cdbfdb..01667bccf48 100644
--- a/regress/sbin/route/rttest10.ok
+++ b/regress/sbin/route/rttest10.ok
@@ -2,10 +2,10 @@ Routing tables
Internet:
Destination Gateway Flags Refs Use Mtu Prio Iface
-10.8.1/24 192.0.2.1 UGdS 0 0 32768 16 lo10001
-10.8.1/24 192.0.2.3 UGdS 0 0 32768 18 lo10003
-10.8.1/24 192.0.2.2 GdS 0 0 32768 17 lo10002
-192.0.2.1 192.0.2.1 UHdhl 1 2 32768 1 lo10001
-192.0.2.2 192.0.2.2 UHdhl 1 2 32768 1 lo10002
-192.0.2.3 192.0.2.3 UHdhl 1 2 32768 1 lo10003
-192.0.2.4 192.0.2.4 UHdl 0 0 32768 1 lo10004
+10.8.1/24 192.0.2.1 UGS 0 0 32768 16 lo10001
+10.8.1/24 192.0.2.3 UGS 0 0 32768 18 lo10003
+10.8.1/24 192.0.2.2 GS 0 0 32768 17 lo10002
+192.0.2.1 192.0.2.1 UHhl 1 2 32768 1 lo10001
+192.0.2.2 192.0.2.2 UHhl 1 2 32768 1 lo10002
+192.0.2.3 192.0.2.3 UHhl 1 2 32768 1 lo10003
+192.0.2.4 192.0.2.4 UHl 0 0 32768 1 lo10004
diff --git a/regress/sbin/route/rttest11.ok b/regress/sbin/route/rttest11.ok
index 4c9e6cdbfdb..01667bccf48 100644
--- a/regress/sbin/route/rttest11.ok
+++ b/regress/sbin/route/rttest11.ok
@@ -2,10 +2,10 @@ Routing tables
Internet:
Destination Gateway Flags Refs Use Mtu Prio Iface
-10.8.1/24 192.0.2.1 UGdS 0 0 32768 16 lo10001
-10.8.1/24 192.0.2.3 UGdS 0 0 32768 18 lo10003
-10.8.1/24 192.0.2.2 GdS 0 0 32768 17 lo10002
-192.0.2.1 192.0.2.1 UHdhl 1 2 32768 1 lo10001
-192.0.2.2 192.0.2.2 UHdhl 1 2 32768 1 lo10002
-192.0.2.3 192.0.2.3 UHdhl 1 2 32768 1 lo10003
-192.0.2.4 192.0.2.4 UHdl 0 0 32768 1 lo10004
+10.8.1/24 192.0.2.1 UGS 0 0 32768 16 lo10001
+10.8.1/24 192.0.2.3 UGS 0 0 32768 18 lo10003
+10.8.1/24 192.0.2.2 GS 0 0 32768 17 lo10002
+192.0.2.1 192.0.2.1 UHhl 1 2 32768 1 lo10001
+192.0.2.2 192.0.2.2 UHhl 1 2 32768 1 lo10002
+192.0.2.3 192.0.2.3 UHhl 1 2 32768 1 lo10003
+192.0.2.4 192.0.2.4 UHl 0 0 32768 1 lo10004
diff --git a/regress/sbin/route/rttest12.ok b/regress/sbin/route/rttest12.ok
index e69b90e29fa..c2482f76780 100644
--- a/regress/sbin/route/rttest12.ok
+++ b/regress/sbin/route/rttest12.ok
@@ -2,8 +2,8 @@ Routing tables
Internet:
Destination Gateway Flags Refs Use Mtu Prio Iface
-10.8.1/24 192.0.2.4 UGdS 0 0 32768 8 lo10004
-192.0.2.1 192.0.2.1 UHdl 0 0 32768 1 lo10001
-192.0.2.2 192.0.2.2 UHdl 0 0 32768 1 lo10002
-192.0.2.3 192.0.2.3 UHdl 0 2 32768 1 lo10003
-192.0.2.4 192.0.2.4 UHdhl 1 2 32768 1 lo10004
+10.8.1/24 192.0.2.4 UGS 0 0 32768 8 lo10004
+192.0.2.1 192.0.2.1 UHl 0 0 32768 1 lo10001
+192.0.2.2 192.0.2.2 UHl 0 0 32768 1 lo10002
+192.0.2.3 192.0.2.3 UHl 0 2 32768 1 lo10003
+192.0.2.4 192.0.2.4 UHhl 1 2 32768 1 lo10004
diff --git a/regress/sbin/route/rttest14.ok b/regress/sbin/route/rttest14.ok
index 11d523d8a99..e6407d75622 100644
--- a/regress/sbin/route/rttest14.ok
+++ b/regress/sbin/route/rttest14.ok
@@ -2,15 +2,15 @@ Routing tables
Internet6:
Destination Gateway Flags Refs Use Mtu Prio Iface
-fd88::1 fd88::1 UHdl 0 0 32768 1 lo10002
-fd88::666 fd99::1 UGHdS 0 0 1500 8 lo10003
-fd99::1 fd99::1 UHdhl 1 2 32768 1 lo10003
-fe80::1%lo10001 fe80::1%lo10001 UHdl 0 0 32768 1 lo10001
-fe80::1%lo10002 fe80::1%lo10002 UHdl 0 0 32768 1 lo10002
-fe80::1%lo10003 fe80::1%lo10003 UHdl 0 0 32768 1 lo10003
-ff01::%lo10001/32 fe80::1%lo10001 Udm 0 0 32768 4 lo10001
-ff01::%lo10002/32 fe80::1%lo10002 Udm 0 1 32768 4 lo10002
-ff01::%lo10003/32 fe80::1%lo10003 Udm 0 1 32768 4 lo10003
-ff02::%lo10001/32 fe80::1%lo10001 Udm 0 0 32768 4 lo10001
-ff02::%lo10002/32 fe80::1%lo10002 Udm 0 1 32768 4 lo10002
-ff02::%lo10003/32 fe80::1%lo10003 Udm 0 1 32768 4 lo10003
+fd88::1 fd88::1 UHl 0 0 32768 1 lo10002
+fd88::666 fd99::1 UGHS 0 0 1500 8 lo10003
+fd99::1 fd99::1 UHhl 1 2 32768 1 lo10003
+fe80::1%lo10001 fe80::1%lo10001 UHl 0 0 32768 1 lo10001
+fe80::1%lo10002 fe80::1%lo10002 UHl 0 0 32768 1 lo10002
+fe80::1%lo10003 fe80::1%lo10003 UHl 0 0 32768 1 lo10003
+ff01::%lo10001/32 fe80::1%lo10001 Um 0 0 32768 4 lo10001
+ff01::%lo10002/32 fe80::1%lo10002 Um 0 1 32768 4 lo10002
+ff01::%lo10003/32 fe80::1%lo10003 Um 0 1 32768 4 lo10003
+ff02::%lo10001/32 fe80::1%lo10001 Um 0 0 32768 4 lo10001
+ff02::%lo10002/32 fe80::1%lo10002 Um 0 1 32768 4 lo10002
+ff02::%lo10003/32 fe80::1%lo10003 Um 0 1 32768 4 lo10003
diff --git a/regress/sbin/route/rttest15.ok b/regress/sbin/route/rttest15.ok
index 83b20ead3a8..c7c1735efaa 100644
--- a/regress/sbin/route/rttest15.ok
+++ b/regress/sbin/route/rttest15.ok
@@ -2,8 +2,8 @@ Routing tables
Internet:
Destination Gateway Flags Refs Use Mtu Prio Iface
-10.0/16 192.0.2.4 UGdS 0 0 32768 8 lo10002
-192.0.2.1 192.0.2.1 UHdl 0 0 32768 1 lo10001
-192.0.2.2 192.0.2.2 UHdl 0 0 32768 1 lo10002
-192.0.2.3 192.0.2.3 UHdl 0 0 32768 1 lo10003
-192.0.2.4 192.0.2.4 UHdhl 1 2 32768 1 lo10004
+10.0/16 192.0.2.4 UGS 0 0 32768 8 lo10002
+192.0.2.1 192.0.2.1 UHl 0 0 32768 1 lo10001
+192.0.2.2 192.0.2.2 UHl 0 0 32768 1 lo10002
+192.0.2.3 192.0.2.3 UHl 0 0 32768 1 lo10003
+192.0.2.4 192.0.2.4 UHhl 1 2 32768 1 lo10004
diff --git a/regress/sbin/route/rttest16.ok b/regress/sbin/route/rttest16.ok
index e8504e28311..2730c038f7c 100644
--- a/regress/sbin/route/rttest16.ok
+++ b/regress/sbin/route/rttest16.ok
@@ -2,15 +2,15 @@ Routing tables
Internet6:
Destination Gateway Flags Refs Use Mtu Prio Iface
-fd88::1 fd88::1 UHdl 0 0 32768 1 lo10002
-fd88::666 fd99::1 UGHdS 0 0 32768 8 lo10002
-fd99::1 fd99::1 UHdhl 1 2 32768 1 lo10003
-fe80::1%lo10001 fe80::1%lo10001 UHdl 0 0 32768 1 lo10001
-fe80::1%lo10002 fe80::1%lo10002 UHdl 0 0 32768 1 lo10002
-fe80::1%lo10003 fe80::1%lo10003 UHdl 0 0 32768 1 lo10003
-ff01::%lo10001/32 fe80::1%lo10001 Udm 0 0 32768 4 lo10001
-ff01::%lo10002/32 fe80::1%lo10002 Udm 0 1 32768 4 lo10002
-ff01::%lo10003/32 fe80::1%lo10003 Udm 0 1 32768 4 lo10003
-ff02::%lo10001/32 fe80::1%lo10001 Udm 0 0 32768 4 lo10001
-ff02::%lo10002/32 fe80::1%lo10002 Udm 0 1 32768 4 lo10002
-ff02::%lo10003/32 fe80::1%lo10003 Udm 0 1 32768 4 lo10003
+fd88::1 fd88::1 UHl 0 0 32768 1 lo10002
+fd88::666 fd99::1 UGHS 0 0 32768 8 lo10002
+fd99::1 fd99::1 UHhl 1 2 32768 1 lo10003
+fe80::1%lo10001 fe80::1%lo10001 UHl 0 0 32768 1 lo10001
+fe80::1%lo10002 fe80::1%lo10002 UHl 0 0 32768 1 lo10002
+fe80::1%lo10003 fe80::1%lo10003 UHl 0 0 32768 1 lo10003
+ff01::%lo10001/32 fe80::1%lo10001 Um 0 0 32768 4 lo10001
+ff01::%lo10002/32 fe80::1%lo10002 Um 0 1 32768 4 lo10002
+ff01::%lo10003/32 fe80::1%lo10003 Um 0 1 32768 4 lo10003
+ff02::%lo10001/32 fe80::1%lo10001 Um 0 0 32768 4 lo10001
+ff02::%lo10002/32 fe80::1%lo10002 Um 0 1 32768 4 lo10002
+ff02::%lo10003/32 fe80::1%lo10003 Um 0 1 32768 4 lo10003
diff --git a/regress/sbin/route/rttest17.ok b/regress/sbin/route/rttest17.ok
index e69b90e29fa..c2482f76780 100644
--- a/regress/sbin/route/rttest17.ok
+++ b/regress/sbin/route/rttest17.ok
@@ -2,8 +2,8 @@ Routing tables
Internet:
Destination Gateway Flags Refs Use Mtu Prio Iface
-10.8.1/24 192.0.2.4 UGdS 0 0 32768 8 lo10004
-192.0.2.1 192.0.2.1 UHdl 0 0 32768 1 lo10001
-192.0.2.2 192.0.2.2 UHdl 0 0 32768 1 lo10002
-192.0.2.3 192.0.2.3 UHdl 0 2 32768 1 lo10003
-192.0.2.4 192.0.2.4 UHdhl 1 2 32768 1 lo10004
+10.8.1/24 192.0.2.4 UGS 0 0 32768 8 lo10004
+192.0.2.1 192.0.2.1 UHl 0 0 32768 1 lo10001
+192.0.2.2 192.0.2.2 UHl 0 0 32768 1 lo10002
+192.0.2.3 192.0.2.3 UHl 0 2 32768 1 lo10003
+192.0.2.4 192.0.2.4 UHhl 1 2 32768 1 lo10004
diff --git a/regress/sbin/route/rttest18.ok b/regress/sbin/route/rttest18.ok
index 0cdf397f5dd..483d6b9891b 100644
--- a/regress/sbin/route/rttest18.ok
+++ b/regress/sbin/route/rttest18.ok
@@ -2,8 +2,8 @@ Routing tables
Internet:
Destination Gateway Flags Refs Use Mtu Prio Iface
-10.8.1/24 192.0.2.3 UGdS 0 0 32768 8 lo10003
-192.0.2.1 192.0.2.1 UHdl 0 0 32768 1 lo10001
-192.0.2.2 192.0.2.2 UHdl 0 0 32768 1 lo10002
-192.0.2.3 192.0.2.3 UHdhl 1 2 32768 1 lo10003
-192.0.2.4 192.0.2.4 UHdl 0 2 32768 1 lo10004
+10.8.1/24 192.0.2.3 UGS 0 0 32768 8 lo10003
+192.0.2.1 192.0.2.1 UHl 0 0 32768 1 lo10001
+192.0.2.2 192.0.2.2 UHl 0 0 32768 1 lo10002
+192.0.2.3 192.0.2.3 UHhl 1 2 32768 1 lo10003
+192.0.2.4 192.0.2.4 UHl 0 2 32768 1 lo10004
diff --git a/regress/sbin/route/rttest19.ok b/regress/sbin/route/rttest19.ok
index 7be45a588a1..bd1af3783b0 100644
--- a/regress/sbin/route/rttest19.ok
+++ b/regress/sbin/route/rttest19.ok
@@ -2,10 +2,10 @@ Routing tables
Internet:
Destination Gateway Flags Refs Use Mtu Prio Iface
-10.8.1/24 192.0.2.1 UGdS 0 0 32768 8 lo10001
-10.8.1.0/25 192.0.2.4 UGdS 0 0 32768 8 lo10004
-10.8.1.0/26 192.0.2.2 UGdS 0 0 32768 8 lo10002
-192.0.2.1 192.0.2.1 UHdhl 1 2 32768 1 lo10001
-192.0.2.2 192.0.2.2 UHdhl 1 2 32768 1 lo10002
-192.0.2.3 192.0.2.3 UHdl 0 2 32768 1 lo10003
-192.0.2.4 192.0.2.4 UHdhl 1 2 32768 1 lo10004
+10.8.1/24 192.0.2.1 UGS 0 0 32768 8 lo10001
+10.8.1.0/25 192.0.2.4 UGS 0 0 32768 8 lo10004
+10.8.1.0/26 192.0.2.2 UGS 0 0 32768 8 lo10002
+192.0.2.1 192.0.2.1 UHhl 1 2 32768 1 lo10001
+192.0.2.2 192.0.2.2 UHhl 1 2 32768 1 lo10002
+192.0.2.3 192.0.2.3 UHl 0 2 32768 1 lo10003
+192.0.2.4 192.0.2.4 UHhl 1 2 32768 1 lo10004
diff --git a/regress/sbin/route/rttest2.ok b/regress/sbin/route/rttest2.ok
index 64b9350adae..4f80b19a27e 100644
--- a/regress/sbin/route/rttest2.ok
+++ b/regress/sbin/route/rttest2.ok
@@ -2,9 +2,9 @@ Routing tables
Internet:
Destination Gateway Flags Refs Use Mtu Prio Iface
-10.8.1/24 192.0.2.3 UGdSP 0 0 32768 8 lo10003
-10.8.1/24 192.0.2.4 UGdSP 0 0 32768 8 lo10004
-192.0.2.1 192.0.2.1 UHdl 0 0 32768 1 lo10001
-192.0.2.2 192.0.2.2 UHdl 0 0 32768 1 lo10002
-192.0.2.3 192.0.2.3 UHdhl 1 2 32768 1 lo10003
-192.0.2.4 192.0.2.4 UHdhl 1 2 32768 1 lo10004
+10.8.1/24 192.0.2.3 UGSP 0 0 32768 8 lo10003
+10.8.1/24 192.0.2.4 UGSP 0 0 32768 8 lo10004
+192.0.2.1 192.0.2.1 UHl 0 0 32768 1 lo10001
+192.0.2.2 192.0.2.2 UHl 0 0 32768 1 lo10002
+192.0.2.3 192.0.2.3 UHhl 1 2 32768 1 lo10003
+192.0.2.4 192.0.2.4 UHhl 1 2 32768 1 lo10004
diff --git a/regress/sbin/route/rttest21.ok b/regress/sbin/route/rttest21.ok
index 5bdd996de9d..d68404e07b3 100644
--- a/regress/sbin/route/rttest21.ok
+++ b/regress/sbin/route/rttest21.ok
@@ -2,10 +2,10 @@ Routing tables
Internet:
Destination Gateway Flags Refs Use Mtu Prio Iface
-10.8.1/24 192.0.2.3 UGdS 0 0 32768 3 lo10003
-10.8.1/24 192.0.2.3 UGdS 0 0 32768 4 lo10003
-10.8.1/24 192.0.2.3 UGdS 0 0 32768 5 lo10003
-192.0.2.1 192.0.2.1 UHdl 0 0 32768 1 lo10001
-192.0.2.2 192.0.2.2 UHdl 0 0 32768 1 lo10002
-192.0.2.3 192.0.2.3 UHdhl 3 6 32768 1 lo10003
-192.0.2.4 192.0.2.4 UHdl 0 0 32768 1 lo10004
+10.8.1/24 192.0.2.3 UGS 0 0 32768 3 lo10003
+10.8.1/24 192.0.2.3 UGS 0 0 32768 4 lo10003
+10.8.1/24 192.0.2.3 UGS 0 0 32768 5 lo10003
+192.0.2.1 192.0.2.1 UHl 0 0 32768 1 lo10001
+192.0.2.2 192.0.2.2 UHl 0 0 32768 1 lo10002
+192.0.2.3 192.0.2.3 UHhl 3 6 32768 1 lo10003
+192.0.2.4 192.0.2.4 UHl 0 0 32768 1 lo10004
diff --git a/regress/sbin/route/rttest22.ok b/regress/sbin/route/rttest22.ok
index c5b334f3f4c..8b9a012b536 100644
--- a/regress/sbin/route/rttest22.ok
+++ b/regress/sbin/route/rttest22.ok
@@ -2,9 +2,9 @@ Routing tables
Internet:
Destination Gateway Flags Refs Use Mtu Prio Iface
-10.8.1/24 192.0.2.3 UGdSP 0 0 32768 8 lo10003
-10.8.1/24 192.0.2.4 UGdSP 0 0 1000 8 lo10004
-192.0.2.1 192.0.2.1 UHdl 0 0 32768 1 lo10001
-192.0.2.2 192.0.2.2 UHdl 0 0 32768 1 lo10002
-192.0.2.3 192.0.2.3 UHdhl 1 2 32768 1 lo10003
-192.0.2.4 192.0.2.4 UHdhl 1 3 32768 1 lo10004
+10.8.1/24 192.0.2.3 UGSP 0 0 32768 8 lo10003
+10.8.1/24 192.0.2.4 UGSP 0 0 1000 8 lo10004
+192.0.2.1 192.0.2.1 UHl 0 0 32768 1 lo10001
+192.0.2.2 192.0.2.2 UHl 0 0 32768 1 lo10002
+192.0.2.3 192.0.2.3 UHhl 1 2 32768 1 lo10003
+192.0.2.4 192.0.2.4 UHhl 1 3 32768 1 lo10004
diff --git a/regress/sbin/route/rttest24.ok b/regress/sbin/route/rttest24.ok
index 599b49a5faf..c023f616fc7 100644
--- a/regress/sbin/route/rttest24.ok
+++ b/regress/sbin/route/rttest24.ok
@@ -2,9 +2,9 @@ Routing tables
Internet:
Destination Gateway Flags Refs Use Mtu Prio Iface
-10.8.1/24 192.0.2.3 UGdSP 0 0 32768 8 lo10003
-10.8.1/24 192.0.2.4 UGdSP 0 0 1000 L 8 lo10004
-192.0.2.1 192.0.2.1 UHdl 0 0 32768 1 lo10001
-192.0.2.2 192.0.2.2 UHdl 0 0 32768 1 lo10002
-192.0.2.3 192.0.2.3 UHdhl 1 2 32768 1 lo10003
-192.0.2.4 192.0.2.4 UHdhl 1 3 32768 1 lo10004
+10.8.1/24 192.0.2.3 UGSP 0 0 32768 8 lo10003
+10.8.1/24 192.0.2.4 UGSP 0 0 1000 L 8 lo10004
+192.0.2.1 192.0.2.1 UHl 0 0 32768 1 lo10001
+192.0.2.2 192.0.2.2 UHl 0 0 32768 1 lo10002
+192.0.2.3 192.0.2.3 UHhl 1 2 32768 1 lo10003
+192.0.2.4 192.0.2.4 UHhl 1 3 32768 1 lo10004
diff --git a/regress/sbin/route/rttest26.ok b/regress/sbin/route/rttest26.ok
index f9a9fb8b19e..8b4a5c1874d 100644
--- a/regress/sbin/route/rttest26.ok
+++ b/regress/sbin/route/rttest26.ok
@@ -2,8 +2,8 @@ Routing tables
Internet:
Destination Gateway Flags Refs Use Mtu Prio Iface
-10.8.1/24 192.0.2.3 UGdS 0 0 1000 8 lo10003
-192.0.2.1 192.0.2.1 UHdl 0 0 32768 1 lo10001
-192.0.2.2 192.0.2.2 UHdl 0 0 32768 1 lo10002
-192.0.2.3 192.0.2.3 UHdhl 1 2 32768 1 lo10003
-192.0.2.4 192.0.2.4 UHdl 0 0 32768 1 lo10004
+10.8.1/24 192.0.2.3 UGS 0 0 1000 8 lo10003
+192.0.2.1 192.0.2.1 UHl 0 0 32768 1 lo10001
+192.0.2.2 192.0.2.2 UHl 0 0 32768 1 lo10002
+192.0.2.3 192.0.2.3 UHhl 1 2 32768 1 lo10003
+192.0.2.4 192.0.2.4 UHl 0 0 32768 1 lo10004
diff --git a/regress/sbin/route/rttest27.ok b/regress/sbin/route/rttest27.ok
index 9684c8b1a38..ce932595c15 100644
--- a/regress/sbin/route/rttest27.ok
+++ b/regress/sbin/route/rttest27.ok
@@ -2,8 +2,8 @@ Routing tables
Internet:
Destination Gateway Flags Refs Use Mtu Prio Iface
-10.8.1/24 192.0.2.4 UGdS 0 0 1000 8 lo10004
-192.0.2.1 192.0.2.1 UHdl 0 0 32768 1 lo10001
-192.0.2.2 192.0.2.2 UHdl 0 0 32768 1 lo10002
-192.0.2.3 192.0.2.3 UHdl 0 2 32768 1 lo10003
-192.0.2.4 192.0.2.4 UHdhl 1 2 32768 1 lo10004
+10.8.1/24 192.0.2.4 UGS 0 0 1000 8 lo10004
+192.0.2.1 192.0.2.1 UHl 0 0 32768 1 lo10001
+192.0.2.2 192.0.2.2 UHl 0 0 32768 1 lo10002
+192.0.2.3 192.0.2.3 UHl 0 2 32768 1 lo10003
+192.0.2.4 192.0.2.4 UHhl 1 2 32768 1 lo10004
diff --git a/regress/sbin/route/rttest3.ok b/regress/sbin/route/rttest3.ok
index 6bd1139bae4..3c4bb99edc8 100644
--- a/regress/sbin/route/rttest3.ok
+++ b/regress/sbin/route/rttest3.ok
@@ -2,8 +2,8 @@ Routing tables
Internet:
Destination Gateway Flags Refs Use Mtu Prio Iface
-10.8.1/24 192.0.2.3 UGdS 0 0 32768 8 lo10003
-192.0.2.1 192.0.2.1 UHdl 0 0 32768 1 lo10001
-192.0.2.2 192.0.2.2 UHdl 0 0 32768 1 lo10002
-192.0.2.3 192.0.2.3 UHdhl 1 4 32768 1 lo10003
-192.0.2.4 192.0.2.4 UHdl 0 0 32768 1 lo10004
+10.8.1/24 192.0.2.3 UGS 0 0 32768 8 lo10003
+192.0.2.1 192.0.2.1 UHl 0 0 32768 1 lo10001
+192.0.2.2 192.0.2.2 UHl 0 0 32768 1 lo10002
+192.0.2.3 192.0.2.3 UHhl 1 4 32768 1 lo10003
+192.0.2.4 192.0.2.4 UHl 0 0 32768 1 lo10004
diff --git a/regress/sbin/route/rttest30.ok b/regress/sbin/route/rttest30.ok
index 1daa8fe2ed9..7600f583d27 100644
--- a/regress/sbin/route/rttest30.ok
+++ b/regress/sbin/route/rttest30.ok
@@ -2,19 +2,19 @@ Routing tables
Internet:
Destination Gateway Flags Refs Use Mtu Prio Iface
-10.0/14 10.1.254.56 UdCPn 0 3 - 4 vether99
-10.0/14 10.1.255.1 dCPn 0 0 - 4 vlan99
-10.0/14 10.1.255.2 dCPn 0 0 - 4 vlan99
-10.0/14 10.1.255.3 dCPn 0 0 - 4 vlan99
-10.1.254.56 fe:e1:ba:d4:c8:1d UHdLl 0 0 - 1 vether99
-10.1.255.1 fe:e1:ba:d4:c8:1d UHdLl 0 0 - 1 vlan99
-10.1.255.2 fe:e1:ba:d4:c8:1d UHdLl 0 0 - 1 vlan99
-10.1.255.3 fe:e1:ba:d4:c8:1d UHdLl 0 0 - 1 vlan99
-10.3.255.255 10.1.254.56 UHdPb 0 0 - 1 vether99
-10.3.255.255 10.1.255.1 HdPb 0 0 - 1 vlan99
-10.3.255.255 10.1.255.2 HdPb 0 0 - 1 vlan99
-10.3.255.255 10.1.255.3 HdPb 0 0 - 1 vlan99
-192.0.2.1 192.0.2.1 UHdl 0 0 32768 1 lo10001
-192.0.2.2 192.0.2.2 UHdl 0 0 32768 1 lo10002
-192.0.2.3 192.0.2.3 UHdl 0 0 32768 1 lo10003
-192.0.2.4 192.0.2.4 UHdl 0 0 32768 1 lo10004
+10.0/14 10.1.254.56 UCPn 0 3 - 4 vether99
+10.0/14 10.1.255.1 CPn 0 0 - 4 vlan99
+10.0/14 10.1.255.2 CPn 0 0 - 4 vlan99
+10.0/14 10.1.255.3 CPn 0 0 - 4 vlan99
+10.1.254.56 fe:e1:ba:d4:c8:1d UHLl 0 0 - 1 vether99
+10.1.255.1 fe:e1:ba:d4:c8:1d UHLl 0 0 - 1 vlan99
+10.1.255.2 fe:e1:ba:d4:c8:1d UHLl 0 0 - 1 vlan99
+10.1.255.3 fe:e1:ba:d4:c8:1d UHLl 0 0 - 1 vlan99
+10.3.255.255 10.1.254.56 UHPb 0 0 - 1 vether99
+10.3.255.255 10.1.255.1 HPb 0 0 - 1 vlan99
+10.3.255.255 10.1.255.2 HPb 0 0 - 1 vlan99
+10.3.255.255 10.1.255.3 HPb 0 0 - 1 vlan99
+192.0.2.1 192.0.2.1 UHl 0 0 32768 1 lo10001
+192.0.2.2 192.0.2.2 UHl 0 0 32768 1 lo10002
+192.0.2.3 192.0.2.3 UHl 0 0 32768 1 lo10003
+192.0.2.4 192.0.2.4 UHl 0 0 32768 1 lo10004
diff --git a/regress/sbin/route/rttest31.ok b/regress/sbin/route/rttest31.ok
index 515652c16c9..193ebb588d9 100644
--- a/regress/sbin/route/rttest31.ok
+++ b/regress/sbin/route/rttest31.ok
@@ -2,11 +2,11 @@ Routing tables
Internet:
Destination Gateway Flags Refs Use Mtu Prio Iface
-192.0.2.1 192.0.2.1 UHdhl 1 2 32768 1 lo10001
-192.0.2.2 192.0.2.2 UHdhl 1 2 32768 1 lo10002
-192.0.2.3 192.0.2.3 UHdhl 1 2 32768 1 lo10003
-192.0.2.4 192.0.2.4 UHdhl 1 2 32768 1 lo10004
-192.0.3/24 192.0.2.1 UGdS 0 0 32768 11 lo10001
-192.0.3/24 192.0.2.2 UGdS 0 0 32768 12 lo10002
-192.0.3/24 192.0.2.3 UGdS 0 0 32768 13 lo10003
-192.0.3/24 192.0.2.4 UGdS 0 0 32768 14 lo10004
+192.0.2.1 192.0.2.1 UHhl 1 2 32768 1 lo10001
+192.0.2.2 192.0.2.2 UHhl 1 2 32768 1 lo10002
+192.0.2.3 192.0.2.3 UHhl 1 2 32768 1 lo10003
+192.0.2.4 192.0.2.4 UHhl 1 2 32768 1 lo10004
+192.0.3/24 192.0.2.1 UGS 0 0 32768 11 lo10001
+192.0.3/24 192.0.2.2 UGS 0 0 32768 12 lo10002
+192.0.3/24 192.0.2.3 UGS 0 0 32768 13 lo10003
+192.0.3/24 192.0.2.4 UGS 0 0 32768 14 lo10004
diff --git a/regress/sbin/route/rttest32.ok b/regress/sbin/route/rttest32.ok
index cea1509b6d5..64ed66052f2 100644
--- a/regress/sbin/route/rttest32.ok
+++ b/regress/sbin/route/rttest32.ok
@@ -2,17 +2,17 @@ Routing tables
Internet:
Destination Gateway Flags Refs Use Mtu Prio Iface
-130.102.71.64/27 130.102.71.68 UdCPn 1 1 - 4 vether99
-130.102.71.64/27 130.102.71.70 UdCPn 1 0 - 4 vlan99
-130.102.71.67 link# UHdLch 1 3 - 3 vether99
-130.102.71.67 link# UHdLch 1 0 - 3 vlan99
-130.102.71.68 fe:e1:ba:d4:c8:1d UHdLl 0 0 - 1 vether99
-130.102.71.70 fe:e1:ba:d4:c8:1d UHdLl 0 0 - 1 vlan99
-130.102.71.95 130.102.71.68 UHdPb 0 0 - 1 vether99
-130.102.71.95 130.102.71.70 UHdPb 0 0 - 1 vlan99
-192.0.2.1 192.0.2.1 UHdl 0 0 32768 1 lo10001
-192.0.2.2 192.0.2.2 UHdl 0 0 32768 1 lo10002
-192.0.2.3 192.0.2.3 UHdl 0 0 32768 1 lo10003
-192.0.2.4 192.0.2.4 UHdl 0 0 32768 1 lo10004
-192.168.67.0/25 130.102.71.67 UGdS 0 0 - 9 vether99
-192.168.67.128/25 130.102.71.67 UGdS 0 0 - 3 vlan99
+130.102.71.64/27 130.102.71.68 UCPn 1 1 - 4 vether99
+130.102.71.64/27 130.102.71.70 UCPn 1 0 - 4 vlan99
+130.102.71.67 link# UHLchP 1 3 - 3 vether99
+130.102.71.67 link# UHLchP 1 0 - 3 vlan99
+130.102.71.68 fe:e1:ba:d4:c8:1d UHLl 0 0 - 1 vether99
+130.102.71.70 fe:e1:ba:d4:c8:1d UHLl 0 0 - 1 vlan99
+130.102.71.95 130.102.71.68 UHPb 0 0 - 1 vether99
+130.102.71.95 130.102.71.70 UHPb 0 0 - 1 vlan99
+192.0.2.1 192.0.2.1 UHl 0 0 32768 1 lo10001
+192.0.2.2 192.0.2.2 UHl 0 0 32768 1 lo10002
+192.0.2.3 192.0.2.3 UHl 0 0 32768 1 lo10003
+192.0.2.4 192.0.2.4 UHl 0 0 32768 1 lo10004
+192.168.67.0/25 130.102.71.67 UGS 0 0 - 9 vether99
+192.168.67.128/25 130.102.71.67 UGS 0 0 - 3 vlan99
diff --git a/regress/sbin/route/rttest33.ok b/regress/sbin/route/rttest33.ok
index 59933b008e6..bf5242f06dc 100644
--- a/regress/sbin/route/rttest33.ok
+++ b/regress/sbin/route/rttest33.ok
@@ -2,12 +2,12 @@ Routing tables
Internet:
Destination Gateway Flags Refs Use Mtu Prio Iface
-default 192.168.178.1 UGdS 0 0 - 8 vether99
-192.0.2.1 192.0.2.1 UHdl 0 0 32768 1 lo10001
-192.0.2.2 192.0.2.2 UHdl 0 0 32768 1 lo10002
-192.0.2.3 192.0.2.3 UHdl 0 0 32768 1 lo10003
-192.0.2.4 192.0.2.4 UHdl 0 0 32768 1 lo10004
-192.168.178/24 192.168.178.52 UdCn 1 1 - 4 vether99
-192.168.178.1 link# UHdLch 1 3 - 3 vether99
-192.168.178.52 fe:e1:ba:d4:c8:1d UHdLl 0 0 - 1 vether99
-192.168.178.255 192.168.178.52 UHdb 0 0 - 1 vether99
+default 192.168.178.1 UGS 0 0 - 8 vether99
+192.0.2.1 192.0.2.1 UHl 0 0 32768 1 lo10001
+192.0.2.2 192.0.2.2 UHl 0 0 32768 1 lo10002
+192.0.2.3 192.0.2.3 UHl 0 0 32768 1 lo10003
+192.0.2.4 192.0.2.4 UHl 0 0 32768 1 lo10004
+192.168.178/24 192.168.178.52 UCn 1 1 - 4 vether99
+192.168.178.1 link# UHLch 1 3 - 3 vether99
+192.168.178.52 fe:e1:ba:d4:c8:1d UHLl 0 0 - 1 vether99
+192.168.178.255 192.168.178.52 UHb 0 0 - 1 vether99
diff --git a/regress/sbin/route/rttest34.ok b/regress/sbin/route/rttest34.ok
index 7d3aee17929..2a7bcdf43b0 100644
--- a/regress/sbin/route/rttest34.ok
+++ b/regress/sbin/route/rttest34.ok
@@ -2,12 +2,12 @@ Routing tables
Internet:
Destination Gateway Flags Refs Use Mtu Prio Iface
-default 192.168.71.1 UGdS 0 0 - 8 vether99
-192.0.2.1 192.0.2.1 UHdl 0 0 32768 1 lo10001
-192.0.2.2 192.0.2.2 UHdl 0 0 32768 1 lo10002
-192.0.2.3 192.0.2.3 UHdl 0 0 32768 1 lo10003
-192.0.2.4 192.0.2.4 UHdl 0 0 32768 1 lo10004
-192.168.71/24 192.168.71.10 UdCn 1 0 - 4 vether99
-192.168.71.1 link# UHdLch 1 2 - 3 vether99
-192.168.71.10 fe:e1:ba:d4:c8:1d UHdLl 0 0 - 1 vether99
-192.168.71.255 192.168.71.10 UHdb 0 0 - 1 vether99
+default 192.168.71.1 UGS 0 0 - 8 vether99
+192.0.2.1 192.0.2.1 UHl 0 0 32768 1 lo10001
+192.0.2.2 192.0.2.2 UHl 0 0 32768 1 lo10002
+192.0.2.3 192.0.2.3 UHl 0 0 32768 1 lo10003
+192.0.2.4 192.0.2.4 UHl 0 0 32768 1 lo10004
+192.168.71/24 192.168.71.10 UCn 1 0 - 4 vether99
+192.168.71.1 link# UHLch 1 2 - 3 vether99
+192.168.71.10 fe:e1:ba:d4:c8:1d UHLl 0 0 - 1 vether99
+192.168.71.255 192.168.71.10 UHb 0 0 - 1 vether99
diff --git a/regress/sbin/route/rttest35.ok b/regress/sbin/route/rttest35.ok
index 2d8fdf5cc53..3e5e93c06fb 100644
--- a/regress/sbin/route/rttest35.ok
+++ b/regress/sbin/route/rttest35.ok
@@ -2,12 +2,12 @@ Routing tables
Internet:
Destination Gateway Flags Refs Use Mtu Prio Iface
-default 192.168.3.1 UGdS 0 0 - 8 vether99
-192.0.2.1 192.0.2.1 UHdl 0 0 32768 1 lo10001
-192.0.2.2 192.0.2.2 UHdl 0 0 32768 1 lo10002
-192.0.2.3 192.0.2.3 UHdl 0 0 32768 1 lo10003
-192.0.2.4 192.0.2.4 UHdl 0 0 32768 1 lo10004
-192.168.3/24 192.168.3.23 UdCn 1 0 - 4 vether99
-192.168.3.1 link# UHdLch 1 2 - 3 vether99
-192.168.3.23 fe:e1:ba:d4:c8:1d UHdLl 0 0 - 1 vether99
-192.168.3.255 192.168.3.23 UHdb 0 0 - 1 vether99
+default 192.168.3.1 UGS 0 0 - 8 vether99
+192.0.2.1 192.0.2.1 UHl 0 0 32768 1 lo10001
+192.0.2.2 192.0.2.2 UHl 0 0 32768 1 lo10002
+192.0.2.3 192.0.2.3 UHl 0 0 32768 1 lo10003
+192.0.2.4 192.0.2.4 UHl 0 0 32768 1 lo10004
+192.168.3/24 192.168.3.23 UCn 1 0 - 4 vether99
+192.168.3.1 link# UHLch 1 2 - 3 vether99
+192.168.3.23 fe:e1:ba:d4:c8:1d UHLl 0 0 - 1 vether99
+192.168.3.255 192.168.3.23 UHb 0 0 - 1 vether99
diff --git a/regress/sbin/route/rttest36.ok b/regress/sbin/route/rttest36.ok
index aeab9e7272e..3d66ce3cf9f 100644
--- a/regress/sbin/route/rttest36.ok
+++ b/regress/sbin/route/rttest36.ok
@@ -2,12 +2,12 @@ Routing tables
Internet:
Destination Gateway Flags Refs Use Mtu Prio Iface
-0.0.0.0 192.168.89.1 UGHdS 0 0 - 8 vether99
-192.0.2.1 192.0.2.1 UHdl 0 0 32768 1 lo10001
-192.0.2.2 192.0.2.2 UHdl 0 0 32768 1 lo10002
-192.0.2.3 192.0.2.3 UHdl 0 0 32768 1 lo10003
-192.0.2.4 192.0.2.4 UHdl 0 0 32768 1 lo10004
-192.168.89/24 192.168.89.5 UdCn 1 0 - 4 vether99
-192.168.89.1 link# UHdLch 1 2 - 3 vether99
-192.168.89.5 fe:e1:ba:d4:c8:1d UHdLl 0 0 - 1 vether99
-192.168.89.255 192.168.89.5 UHdb 0 0 - 1 vether99
+0.0.0.0 192.168.89.1 UGHS 0 0 - 8 vether99
+192.0.2.1 192.0.2.1 UHl 0 0 32768 1 lo10001
+192.0.2.2 192.0.2.2 UHl 0 0 32768 1 lo10002
+192.0.2.3 192.0.2.3 UHl 0 0 32768 1 lo10003
+192.0.2.4 192.0.2.4 UHl 0 0 32768 1 lo10004
+192.168.89/24 192.168.89.5 UCn 1 0 - 4 vether99
+192.168.89.1 link# UHLch 1 2 - 3 vether99
+192.168.89.5 fe:e1:ba:d4:c8:1d UHLl 0 0 - 1 vether99
+192.168.89.255 192.168.89.5 UHb 0 0 - 1 vether99
diff --git a/regress/sbin/route/rttest37.ok b/regress/sbin/route/rttest37.ok
index c87b2a0d7c6..7620548d2e5 100644
--- a/regress/sbin/route/rttest37.ok
+++ b/regress/sbin/route/rttest37.ok
@@ -2,16 +2,16 @@ Routing tables
Internet:
Destination Gateway Flags Refs Use Mtu Prio Iface
-10/8 192.0.2.3 UGdS 0 0 32768 8 lo10003
-10.1.0/24 192.0.2.1 UGdS 0 0 32768 8 lo10001
-10.2/16 192.0.2.2 UGdS 0 0 32768 8 lo10002
-172/8 192.0.2.3 UGdS 0 0 32768 8 lo10003
-172.25.8/24 192.0.2.1 UGdS 0 0 32768 8 lo10001
-172.30/16 192.0.2.2 UGdS 0 0 32768 8 lo10002
-192/8 192.0.2.3 UGdS 0 0 32768 8 lo10003
-192.0.2.1 192.0.2.1 UHdhl 3 6 32768 1 lo10001
-192.0.2.2 192.0.2.2 UHdhl 3 6 32768 1 lo10002
-192.0.2.3 192.0.2.3 UHdhl 3 6 32768 1 lo10003
-192.0.2.4 192.0.2.4 UHdl 0 0 32768 1 lo10004
-192.168/16 192.0.2.2 UGdS 0 0 32768 8 lo10002
-192.168.5/24 192.0.2.1 UGdS 0 0 32768 8 lo10001
+10/8 192.0.2.3 UGS 0 0 32768 8 lo10003
+10.1.0/24 192.0.2.1 UGS 0 0 32768 8 lo10001
+10.2/16 192.0.2.2 UGS 0 0 32768 8 lo10002
+172/8 192.0.2.3 UGS 0 0 32768 8 lo10003
+172.25.8/24 192.0.2.1 UGS 0 0 32768 8 lo10001
+172.30/16 192.0.2.2 UGS 0 0 32768 8 lo10002
+192/8 192.0.2.3 UGS 0 0 32768 8 lo10003
+192.0.2.1 192.0.2.1 UHhl 3 6 32768 1 lo10001
+192.0.2.2 192.0.2.2 UHhl 3 6 32768 1 lo10002
+192.0.2.3 192.0.2.3 UHhl 3 6 32768 1 lo10003
+192.0.2.4 192.0.2.4 UHl 0 0 32768 1 lo10004
+192.168/16 192.0.2.2 UGS 0 0 32768 8 lo10002
+192.168.5/24 192.0.2.1 UGS 0 0 32768 8 lo10001
diff --git a/regress/sbin/route/rttest38.ok b/regress/sbin/route/rttest38.ok
index 6bb4e638af9..40b09d2e9a7 100644
--- a/regress/sbin/route/rttest38.ok
+++ b/regress/sbin/route/rttest38.ok
@@ -2,19 +2,19 @@ Routing tables
Internet:
Destination Gateway Flags Refs Use Mtu Prio Iface
-10/8 192.0.2.4 UGdS 0 0 32768 8 lo10004
-10.0.0.5 192.0.2.1 UGHdS 0 0 32768 8 lo10001
-10.4.2/24 192.0.2.2 UGdS 0 0 32768 8 lo10002
-10.5/16 192.0.2.3 UGdS 0 0 32768 8 lo10003
-172.0/16 192.0.2.4 UGdS 0 0 32768 8 lo10004
-172.16.1.8 192.0.2.1 UGHdS 0 0 32768 8 lo10001
-172.17.2/24 192.0.2.2 UGdS 0 0 32768 8 lo10002
-172.28/16 192.0.2.3 UGdS 0 0 32768 8 lo10003
-192.0.0/24 192.0.2.4 UGdS 0 0 32768 8 lo10004
-192.0.2.1 192.0.2.1 UHdhl 3 6 32768 1 lo10001
-192.0.2.2 192.0.2.2 UHdhl 3 6 32768 1 lo10002
-192.0.2.3 192.0.2.3 UHdhl 3 6 32768 1 lo10003
-192.0.2.4 192.0.2.4 UHdhl 3 6 32768 1 lo10004
-192.168.0/24 192.0.2.3 UGdS 0 0 32768 8 lo10003
-192.168.2/24 192.0.2.2 UGdS 0 0 32768 8 lo10002
-192.168.7.9 192.0.2.1 UGHdS 0 0 32768 8 lo10001
+10/8 192.0.2.4 UGS 0 0 32768 8 lo10004
+10.0.0.5 192.0.2.1 UGHS 0 0 32768 8 lo10001
+10.4.2/24 192.0.2.2 UGS 0 0 32768 8 lo10002
+10.5/16 192.0.2.3 UGS 0 0 32768 8 lo10003
+172.0/16 192.0.2.4 UGS 0 0 32768 8 lo10004
+172.16.1.8 192.0.2.1 UGHS 0 0 32768 8 lo10001
+172.17.2/24 192.0.2.2 UGS 0 0 32768 8 lo10002
+172.28/16 192.0.2.3 UGS 0 0 32768 8 lo10003
+192.0.0/24 192.0.2.4 UGS 0 0 32768 8 lo10004
+192.0.2.1 192.0.2.1 UHhl 3 6 32768 1 lo10001
+192.0.2.2 192.0.2.2 UHhl 3 6 32768 1 lo10002
+192.0.2.3 192.0.2.3 UHhl 3 6 32768 1 lo10003
+192.0.2.4 192.0.2.4 UHhl 3 6 32768 1 lo10004
+192.168.0/24 192.0.2.3 UGS 0 0 32768 8 lo10003
+192.168.2/24 192.0.2.2 UGS 0 0 32768 8 lo10002
+192.168.7.9 192.0.2.1 UGHS 0 0 32768 8 lo10001
diff --git a/regress/sbin/route/rttest4.ok b/regress/sbin/route/rttest4.ok
index 8b0c4a821bd..b3f440eb8a3 100644
--- a/regress/sbin/route/rttest4.ok
+++ b/regress/sbin/route/rttest4.ok
@@ -2,10 +2,10 @@ Routing tables
Internet:
Destination Gateway Flags Refs Use Mtu Prio Iface
-10.8.1/24 192.0.2.1 UGdS 0 0 32768 16 lo10001
-10.8.1/24 192.0.2.2 UGdS 0 0 32768 17 lo10002
-10.8.1/24 192.0.2.3 UGdS 0 0 32768 18 lo10003
-192.0.2.1 192.0.2.1 UHdhl 1 2 32768 1 lo10001
-192.0.2.2 192.0.2.2 UHdhl 1 2 32768 1 lo10002
-192.0.2.3 192.0.2.3 UHdhl 1 2 32768 1 lo10003
-192.0.2.4 192.0.2.4 UHdl 0 0 32768 1 lo10004
+10.8.1/24 192.0.2.1 UGS 0 0 32768 16 lo10001
+10.8.1/24 192.0.2.2 UGS 0 0 32768 17 lo10002
+10.8.1/24 192.0.2.3 UGS 0 0 32768 18 lo10003
+192.0.2.1 192.0.2.1 UHhl 1 2 32768 1 lo10001
+192.0.2.2 192.0.2.2 UHhl 1 2 32768 1 lo10002
+192.0.2.3 192.0.2.3 UHhl 1 2 32768 1 lo10003
+192.0.2.4 192.0.2.4 UHl 0 0 32768 1 lo10004
diff --git a/regress/sbin/route/rttest5.ok b/regress/sbin/route/rttest5.ok
index 69fbc40bb81..54c6974980d 100644
--- a/regress/sbin/route/rttest5.ok
+++ b/regress/sbin/route/rttest5.ok
@@ -2,10 +2,10 @@ Routing tables
Internet:
Destination Gateway Flags Refs Use Mtu Prio Iface
-10.8.1/24 192.0.2.2 UGdS 0 0 32768 16 lo10002
-10.8.1/24 192.0.2.2 UGdS 0 0 32768 17 lo10002
-10.8.1/24 192.0.2.2 UGdS 0 0 32768 18 lo10002
-192.0.2.1 192.0.2.1 UHdl 0 0 32768 1 lo10001
-192.0.2.2 192.0.2.2 UHdhl 3 8 32768 1 lo10002
-192.0.2.3 192.0.2.3 UHdl 0 0 32768 1 lo10003
-192.0.2.4 192.0.2.4 UHdl 0 0 32768 1 lo10004
+10.8.1/24 192.0.2.2 UGS 0 0 32768 16 lo10002
+10.8.1/24 192.0.2.2 UGS 0 0 32768 17 lo10002
+10.8.1/24 192.0.2.2 UGS 0 0 32768 18 lo10002
+192.0.2.1 192.0.2.1 UHl 0 0 32768 1 lo10001
+192.0.2.2 192.0.2.2 UHhl 3 8 32768 1 lo10002
+192.0.2.3 192.0.2.3 UHl 0 0 32768 1 lo10003
+192.0.2.4 192.0.2.4 UHl 0 0 32768 1 lo10004
diff --git a/regress/sbin/route/rttest6.ok b/regress/sbin/route/rttest6.ok
index 7ec47ba327f..75cab411edf 100644
--- a/regress/sbin/route/rttest6.ok
+++ b/regress/sbin/route/rttest6.ok
@@ -2,10 +2,10 @@ Routing tables
Internet:
Destination Gateway Flags Refs Use Mtu Prio Iface
-10.8.1/24 192.0.2.1 UGdS 0 0 32768 16 lo10001
-10.8.1/24 192.0.2.2 UGdS 0 0 32768 17 lo10002
-10.8.1/24 192.0.2.3 UGdS 0 0 32768 18 lo10003
-192.0.2.1 192.0.2.1 UHdhl 1 2 32768 1 lo10001
-192.0.2.2 192.0.2.2 UHdhl 1 4 32768 1 lo10002
-192.0.2.3 192.0.2.3 UHdhl 1 2 32768 1 lo10003
-192.0.2.4 192.0.2.4 UHdl 0 0 32768 1 lo10004
+10.8.1/24 192.0.2.1 UGS 0 0 32768 16 lo10001
+10.8.1/24 192.0.2.2 UGS 0 0 32768 17 lo10002
+10.8.1/24 192.0.2.3 UGS 0 0 32768 18 lo10003
+192.0.2.1 192.0.2.1 UHhl 1 2 32768 1 lo10001
+192.0.2.2 192.0.2.2 UHhl 1 4 32768 1 lo10002
+192.0.2.3 192.0.2.3 UHhl 1 2 32768 1 lo10003
+192.0.2.4 192.0.2.4 UHl 0 0 32768 1 lo10004
diff --git a/regress/sbin/route/rttest7.ok b/regress/sbin/route/rttest7.ok
index 3e5ecababf8..557be06d02b 100644
--- a/regress/sbin/route/rttest7.ok
+++ b/regress/sbin/route/rttest7.ok
@@ -2,9 +2,9 @@ Routing tables
Internet:
Destination Gateway Flags Refs Use Mtu Prio Iface
-10.8.1/24 192.0.2.1 UGdS 0 0 32768 16 lo10001
-10.8.1/24 192.0.2.3 UGdS 0 0 32768 18 lo10003
-192.0.2.1 192.0.2.1 UHdhl 1 2 32768 1 lo10001
-192.0.2.2 192.0.2.2 UHdl 0 2 32768 1 lo10002
-192.0.2.3 192.0.2.3 UHdhl 1 2 32768 1 lo10003
-192.0.2.4 192.0.2.4 UHdl 0 0 32768 1 lo10004
+10.8.1/24 192.0.2.1 UGS 0 0 32768 16 lo10001
+10.8.1/24 192.0.2.3 UGS 0 0 32768 18 lo10003
+192.0.2.1 192.0.2.1 UHhl 1 2 32768 1 lo10001
+192.0.2.2 192.0.2.2 UHl 0 2 32768 1 lo10002
+192.0.2.3 192.0.2.3 UHhl 1 2 32768 1 lo10003
+192.0.2.4 192.0.2.4 UHl 0 0 32768 1 lo10004
diff --git a/regress/sbin/route/rttest8.ok b/regress/sbin/route/rttest8.ok
index b05b1d257a6..00d9bf778c2 100644
--- a/regress/sbin/route/rttest8.ok
+++ b/regress/sbin/route/rttest8.ok
@@ -2,10 +2,10 @@ Routing tables
Internet:
Destination Gateway Flags Refs Use Mtu Prio Iface
-10.8.1/24 192.0.2.1 UGdS 0 0 32768 16 lo10001
-10.8.1/24 192.0.2.3 UGdS 0 0 32768 18 lo10003
-10.8.1/24 192.0.2.2 GdS 0 0 32768 17 lo10002
-192.0.2.1 192.0.2.1 UHdhl 1 2 32768 1 lo10001
-192.0.2.2 192.0.2.2 UHdhl 1 4 32768 1 lo10002
-192.0.2.3 192.0.2.3 UHdhl 1 2 32768 1 lo10003
-192.0.2.4 192.0.2.4 UHdl 0 0 32768 1 lo10004
+10.8.1/24 192.0.2.1 UGS 0 0 32768 16 lo10001
+10.8.1/24 192.0.2.3 UGS 0 0 32768 18 lo10003
+10.8.1/24 192.0.2.2 GS 0 0 32768 17 lo10002
+192.0.2.1 192.0.2.1 UHhl 1 2 32768 1 lo10001
+192.0.2.2 192.0.2.2 UHhl 1 4 32768 1 lo10002
+192.0.2.3 192.0.2.3 UHhl 1 2 32768 1 lo10003
+192.0.2.4 192.0.2.4 UHl 0 0 32768 1 lo10004
diff --git a/regress/sbin/route/rttest9.ok b/regress/sbin/route/rttest9.ok
index 3e5ecababf8..557be06d02b 100644
--- a/regress/sbin/route/rttest9.ok
+++ b/regress/sbin/route/rttest9.ok
@@ -2,9 +2,9 @@ Routing tables
Internet:
Destination Gateway Flags Refs Use Mtu Prio Iface
-10.8.1/24 192.0.2.1 UGdS 0 0 32768 16 lo10001
-10.8.1/24 192.0.2.3 UGdS 0 0 32768 18 lo10003
-192.0.2.1 192.0.2.1 UHdhl 1 2 32768 1 lo10001
-192.0.2.2 192.0.2.2 UHdl 0 2 32768 1 lo10002
-192.0.2.3 192.0.2.3 UHdhl 1 2 32768 1 lo10003
-192.0.2.4 192.0.2.4 UHdl 0 0 32768 1 lo10004
+10.8.1/24 192.0.2.1 UGS 0 0 32768 16 lo10001
+10.8.1/24 192.0.2.3 UGS 0 0 32768 18 lo10003
+192.0.2.1 192.0.2.1 UHhl 1 2 32768 1 lo10001
+192.0.2.2 192.0.2.2 UHl 0 2 32768 1 lo10002
+192.0.2.3 192.0.2.3 UHhl 1 2 32768 1 lo10003
+192.0.2.4 192.0.2.4 UHl 0 0 32768 1 lo10004
diff --git a/regress/usr.bin/netstat/nstest1.ok b/regress/usr.bin/netstat/nstest1.ok
index cc9eb33f1b1..1ae52b25e95 100644
--- a/regress/usr.bin/netstat/nstest1.ok
+++ b/regress/usr.bin/netstat/nstest1.ok
@@ -2,8 +2,8 @@ Routing tables
Internet:
Destination Gateway Flags Refs Use Mtu Prio Iface
-0.0.0.0 192.168.89.1 UGHdS 0 0 - 8 vether99
-192.168.89/24 192.168.89.5 UdCn 1 0 - 4 vether99
-192.168.89.1 link# UHdLch 1 2 - 3 vether99
-192.168.89.5 fe:e1:ba:d4:c8:1d UHdLl 0 0 - 1 vether99
-192.168.89.255 192.168.89.5 UHdb 0 0 - 1 vether99
+0.0.0.0 192.168.89.1 UGHS 0 0 - 8 vether99
+192.168.89/24 192.168.89.5 UCn 1 0 - 4 vether99
+192.168.89.1 link# UHLch 1 2 - 3 vether99
+192.168.89.5 fe:e1:ba:d4:c8:1d UHLl 0 0 - 1 vether99
+192.168.89.255 192.168.89.5 UHb 0 0 - 1 vether99