Make expected output match reality again.

diff --git a/regress/sbin/route/rttest1.ok b/regress/sbin/route/rttest1.ok
index 80d844b..7241c41 100644 (file)
--- 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 4c9e6cd..01667bc 100644 (file)
--- 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 4c9e6cd..01667bc 100644 (file)
--- 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 e69b90e..c2482f7 100644 (file)
--- 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 11d523d..e6407d7 100644 (file)
--- 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 83b20ea..c7c1735 100644 (file)
--- 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 e8504e2..2730c03 100644 (file)
--- 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 e69b90e..c2482f7 100644 (file)
--- 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 0cdf397..483d6b9 100644 (file)
--- 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 7be45a5..bd1af37 100644 (file)
--- 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 64b9350..4f80b19 100644 (file)
--- 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 5bdd996..d68404e 100644 (file)
--- 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 c5b334f..8b9a012 100644 (file)
--- 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 599b49a..c023f61 100644 (file)
--- 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 f9a9fb8..8b4a5c1 100644 (file)
--- 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 9684c8b..ce93259 100644 (file)
--- 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 6bd1139..3c4bb99 100644 (file)
--- 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 1daa8fe..7600f58 100644 (file)
--- 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 515652c..193ebb5 100644 (file)
--- 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 cea1509..64ed660 100644 (file)
--- 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 59933b0..bf5242f 100644 (file)
--- 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 7d3aee1..2a7bcdf 100644 (file)
--- 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 2d8fdf5..3e5e93c 100644 (file)
--- 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 aeab9e7..3d66ce3 100644 (file)
--- 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 c87b2a0..7620548 100644 (file)
--- 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 6bb4e63..40b09d2 100644 (file)
--- 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 8b0c4a8..b3f440e 100644 (file)
--- 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 69fbc40..54c6974 100644 (file)
--- 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 7ec47ba..75cab41 100644 (file)
--- 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 3e5ecab..557be06 100644 (file)
--- 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 b05b1d2..00d9bf7 100644 (file)
--- 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 3e5ecab..557be06 100644 (file)
--- 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 cc9eb33..1ae52b2 100644 (file)
--- 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