From e41b73a826df1c71b42366130831646bfa5b5544 Mon Sep 17 00:00:00 2001 From: mpi Date: Mon, 12 Feb 2018 15:22:52 +0000 Subject: [PATCH] Revert previous, the changed has been backed out and I wasn't running the last snaphot. --- regress/sbin/route/rttest1.ok | 2 -- regress/sbin/route/rttest10.ok | 2 -- regress/sbin/route/rttest11.ok | 2 -- regress/sbin/route/rttest12.ok | 2 -- regress/sbin/route/rttest15.ok | 2 -- regress/sbin/route/rttest17.ok | 2 -- regress/sbin/route/rttest18.ok | 2 -- regress/sbin/route/rttest19.ok | 2 -- regress/sbin/route/rttest2.ok | 2 -- regress/sbin/route/rttest21.ok | 2 -- regress/sbin/route/rttest22.ok | 2 -- regress/sbin/route/rttest24.ok | 2 -- regress/sbin/route/rttest26.ok | 2 -- regress/sbin/route/rttest27.ok | 2 -- regress/sbin/route/rttest3.ok | 2 -- regress/sbin/route/rttest30.ok | 2 -- regress/sbin/route/rttest31.ok | 2 -- regress/sbin/route/rttest32.ok | 6 ++++++ regress/sbin/route/rttest4.ok | 2 -- regress/sbin/route/rttest5.ok | 2 -- regress/sbin/route/rttest6.ok | 2 -- regress/sbin/route/rttest7.ok | 2 -- regress/sbin/route/rttest8.ok | 2 -- regress/sbin/route/rttest9.ok | 2 -- 24 files changed, 6 insertions(+), 46 deletions(-) diff --git a/regress/sbin/route/rttest1.ok b/regress/sbin/route/rttest1.ok index 1efa09804a1..7241c4101cc 100644 --- a/regress/sbin/route/rttest1.ok +++ b/regress/sbin/route/rttest1.ok @@ -10,8 +10,6 @@ Destination Gateway Flags Refs Use Mtu Prio Iface 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 -127/8 127.0.0.1 UGRS 0 0 32768 8 lo5 -127.0.0.1 127.0.0.1 UHhl 1 1 32768 1 lo5 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 diff --git a/regress/sbin/route/rttest10.ok b/regress/sbin/route/rttest10.ok index 0eff9e50289..01667bccf48 100644 --- a/regress/sbin/route/rttest10.ok +++ b/regress/sbin/route/rttest10.ok @@ -5,8 +5,6 @@ Destination Gateway Flags Refs Use Mtu Prio Iface 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 -127/8 127.0.0.1 UGRS 0 0 32768 8 lo5 -127.0.0.1 127.0.0.1 UHhl 1 1 32768 1 lo5 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 diff --git a/regress/sbin/route/rttest11.ok b/regress/sbin/route/rttest11.ok index 0eff9e50289..01667bccf48 100644 --- a/regress/sbin/route/rttest11.ok +++ b/regress/sbin/route/rttest11.ok @@ -5,8 +5,6 @@ Destination Gateway Flags Refs Use Mtu Prio Iface 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 -127/8 127.0.0.1 UGRS 0 0 32768 8 lo5 -127.0.0.1 127.0.0.1 UHhl 1 1 32768 1 lo5 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 diff --git a/regress/sbin/route/rttest12.ok b/regress/sbin/route/rttest12.ok index a1d14a60f39..c2482f76780 100644 --- a/regress/sbin/route/rttest12.ok +++ b/regress/sbin/route/rttest12.ok @@ -3,8 +3,6 @@ Routing tables Internet: Destination Gateway Flags Refs Use Mtu Prio Iface 10.8.1/24 192.0.2.4 UGS 0 0 32768 8 lo10004 -127/8 127.0.0.1 UGRS 0 0 32768 8 lo5 -127.0.0.1 127.0.0.1 UHhl 1 1 32768 1 lo5 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 diff --git a/regress/sbin/route/rttest15.ok b/regress/sbin/route/rttest15.ok index e19d546b2f9..c7c1735efaa 100644 --- a/regress/sbin/route/rttest15.ok +++ b/regress/sbin/route/rttest15.ok @@ -3,8 +3,6 @@ Routing tables Internet: Destination Gateway Flags Refs Use Mtu Prio Iface 10.0/16 192.0.2.4 UGS 0 0 32768 8 lo10002 -127/8 127.0.0.1 UGRS 0 0 32768 8 lo5 -127.0.0.1 127.0.0.1 UHhl 1 1 32768 1 lo5 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 diff --git a/regress/sbin/route/rttest17.ok b/regress/sbin/route/rttest17.ok index a1d14a60f39..c2482f76780 100644 --- a/regress/sbin/route/rttest17.ok +++ b/regress/sbin/route/rttest17.ok @@ -3,8 +3,6 @@ Routing tables Internet: Destination Gateway Flags Refs Use Mtu Prio Iface 10.8.1/24 192.0.2.4 UGS 0 0 32768 8 lo10004 -127/8 127.0.0.1 UGRS 0 0 32768 8 lo5 -127.0.0.1 127.0.0.1 UHhl 1 1 32768 1 lo5 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 diff --git a/regress/sbin/route/rttest18.ok b/regress/sbin/route/rttest18.ok index c7ae52beffa..483d6b9891b 100644 --- a/regress/sbin/route/rttest18.ok +++ b/regress/sbin/route/rttest18.ok @@ -3,8 +3,6 @@ Routing tables Internet: Destination Gateway Flags Refs Use Mtu Prio Iface 10.8.1/24 192.0.2.3 UGS 0 0 32768 8 lo10003 -127/8 127.0.0.1 UGRS 0 0 32768 8 lo5 -127.0.0.1 127.0.0.1 UHhl 1 1 32768 1 lo5 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 diff --git a/regress/sbin/route/rttest19.ok b/regress/sbin/route/rttest19.ok index 7f7bc8beaff..bd1af3783b0 100644 --- a/regress/sbin/route/rttest19.ok +++ b/regress/sbin/route/rttest19.ok @@ -5,8 +5,6 @@ Destination Gateway Flags Refs Use Mtu Prio Iface 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 -127/8 127.0.0.1 UGRS 0 0 32768 8 lo5 -127.0.0.1 127.0.0.1 UHhl 1 1 32768 1 lo5 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 diff --git a/regress/sbin/route/rttest2.ok b/regress/sbin/route/rttest2.ok index c83a23ac076..4f80b19a27e 100644 --- a/regress/sbin/route/rttest2.ok +++ b/regress/sbin/route/rttest2.ok @@ -4,8 +4,6 @@ Internet: Destination Gateway Flags Refs Use Mtu Prio Iface 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 -127/8 127.0.0.1 UGRS 0 0 32768 8 lo5 -127.0.0.1 127.0.0.1 UHhl 1 1 32768 1 lo5 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 diff --git a/regress/sbin/route/rttest21.ok b/regress/sbin/route/rttest21.ok index c72b910cb76..d68404e07b3 100644 --- a/regress/sbin/route/rttest21.ok +++ b/regress/sbin/route/rttest21.ok @@ -5,8 +5,6 @@ Destination Gateway Flags Refs Use Mtu Prio Iface 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 -127/8 127.0.0.1 UGRS 0 0 32768 8 lo5 -127.0.0.1 127.0.0.1 UHhl 1 1 32768 1 lo5 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 diff --git a/regress/sbin/route/rttest22.ok b/regress/sbin/route/rttest22.ok index 6c97e16a722..8b9a012b536 100644 --- a/regress/sbin/route/rttest22.ok +++ b/regress/sbin/route/rttest22.ok @@ -4,8 +4,6 @@ Internet: Destination Gateway Flags Refs Use Mtu Prio Iface 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 -127/8 127.0.0.1 UGRS 0 0 32768 8 lo5 -127.0.0.1 127.0.0.1 UHhl 1 1 32768 1 lo5 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 diff --git a/regress/sbin/route/rttest24.ok b/regress/sbin/route/rttest24.ok index 7f40817e2a4..c023f616fc7 100644 --- a/regress/sbin/route/rttest24.ok +++ b/regress/sbin/route/rttest24.ok @@ -4,8 +4,6 @@ Internet: Destination Gateway Flags Refs Use Mtu Prio Iface 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 -127/8 127.0.0.1 UGRS 0 0 32768 8 lo5 -127.0.0.1 127.0.0.1 UHhl 1 1 32768 1 lo5 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 diff --git a/regress/sbin/route/rttest26.ok b/regress/sbin/route/rttest26.ok index 4dbe72dd31b..8b4a5c1874d 100644 --- a/regress/sbin/route/rttest26.ok +++ b/regress/sbin/route/rttest26.ok @@ -3,8 +3,6 @@ Routing tables Internet: Destination Gateway Flags Refs Use Mtu Prio Iface 10.8.1/24 192.0.2.3 UGS 0 0 1000 8 lo10003 -127/8 127.0.0.1 UGRS 0 0 32768 8 lo5 -127.0.0.1 127.0.0.1 UHhl 1 1 32768 1 lo5 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 diff --git a/regress/sbin/route/rttest27.ok b/regress/sbin/route/rttest27.ok index 236981f257c..ce932595c15 100644 --- a/regress/sbin/route/rttest27.ok +++ b/regress/sbin/route/rttest27.ok @@ -3,8 +3,6 @@ Routing tables Internet: Destination Gateway Flags Refs Use Mtu Prio Iface 10.8.1/24 192.0.2.4 UGS 0 0 1000 8 lo10004 -127/8 127.0.0.1 UGRS 0 0 32768 8 lo5 -127.0.0.1 127.0.0.1 UHhl 1 1 32768 1 lo5 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 diff --git a/regress/sbin/route/rttest3.ok b/regress/sbin/route/rttest3.ok index 9235796f952..3c4bb99edc8 100644 --- a/regress/sbin/route/rttest3.ok +++ b/regress/sbin/route/rttest3.ok @@ -3,8 +3,6 @@ Routing tables Internet: Destination Gateway Flags Refs Use Mtu Prio Iface 10.8.1/24 192.0.2.3 UGS 0 0 32768 8 lo10003 -127/8 127.0.0.1 UGRS 0 0 32768 8 lo5 -127.0.0.1 127.0.0.1 UHhl 1 1 32768 1 lo5 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 diff --git a/regress/sbin/route/rttest30.ok b/regress/sbin/route/rttest30.ok index 39dfec8b6de..14391dc3175 100644 --- a/regress/sbin/route/rttest30.ok +++ b/regress/sbin/route/rttest30.ok @@ -14,8 +14,6 @@ Destination Gateway Flags Refs Use Mtu Prio Iface 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 -127/8 127.0.0.1 UGRS 0 0 32768 8 lo5 -127.0.0.1 127.0.0.1 UHhl 1 1 32768 1 lo5 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 diff --git a/regress/sbin/route/rttest31.ok b/regress/sbin/route/rttest31.ok index 9378f82b4e0..193ebb588d9 100644 --- a/regress/sbin/route/rttest31.ok +++ b/regress/sbin/route/rttest31.ok @@ -2,8 +2,6 @@ Routing tables Internet: Destination Gateway Flags Refs Use Mtu Prio Iface -127/8 127.0.0.1 UGRS 0 0 32768 8 lo5 -127.0.0.1 127.0.0.1 UHhl 1 1 32768 1 lo5 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 diff --git a/regress/sbin/route/rttest32.ok b/regress/sbin/route/rttest32.ok index 64ed66052f2..2b4ac13da71 100644 --- a/regress/sbin/route/rttest32.ok +++ b/regress/sbin/route/rttest32.ok @@ -2,6 +2,12 @@ Routing tables Internet: Destination Gateway Flags Refs Use Mtu Prio Iface +10.0/14 10.1.255.2 UCPn 0 0 - 4 vlan99 +10.0/14 10.1.255.3 UCPn 0 0 - 4 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.255.2 UHPb 0 0 - 1 vlan99 +10.3.255.255 10.1.255.3 UHPb 0 0 - 1 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 diff --git a/regress/sbin/route/rttest4.ok b/regress/sbin/route/rttest4.ok index cbe93409ad3..b3f440eb8a3 100644 --- a/regress/sbin/route/rttest4.ok +++ b/regress/sbin/route/rttest4.ok @@ -5,8 +5,6 @@ Destination Gateway Flags Refs Use Mtu Prio Iface 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 -127/8 127.0.0.1 UGRS 0 0 32768 8 lo5 -127.0.0.1 127.0.0.1 UHhl 1 1 32768 1 lo5 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 diff --git a/regress/sbin/route/rttest5.ok b/regress/sbin/route/rttest5.ok index 5c53858db4d..54c6974980d 100644 --- a/regress/sbin/route/rttest5.ok +++ b/regress/sbin/route/rttest5.ok @@ -5,8 +5,6 @@ Destination Gateway Flags Refs Use Mtu Prio Iface 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 -127/8 127.0.0.1 UGRS 0 0 32768 8 lo5 -127.0.0.1 127.0.0.1 UHhl 1 1 32768 1 lo5 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 diff --git a/regress/sbin/route/rttest6.ok b/regress/sbin/route/rttest6.ok index 4f54c33b815..75cab411edf 100644 --- a/regress/sbin/route/rttest6.ok +++ b/regress/sbin/route/rttest6.ok @@ -5,8 +5,6 @@ Destination Gateway Flags Refs Use Mtu Prio Iface 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 -127/8 127.0.0.1 UGRS 0 0 32768 8 lo5 -127.0.0.1 127.0.0.1 UHhl 1 1 32768 1 lo5 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 diff --git a/regress/sbin/route/rttest7.ok b/regress/sbin/route/rttest7.ok index 478041a548e..557be06d02b 100644 --- a/regress/sbin/route/rttest7.ok +++ b/regress/sbin/route/rttest7.ok @@ -4,8 +4,6 @@ Internet: Destination Gateway Flags Refs Use Mtu Prio Iface 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 -127/8 127.0.0.1 UGRS 0 0 32768 8 lo5 -127.0.0.1 127.0.0.1 UHhl 1 1 32768 1 lo5 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 diff --git a/regress/sbin/route/rttest8.ok b/regress/sbin/route/rttest8.ok index d6f42a0147a..00d9bf778c2 100644 --- a/regress/sbin/route/rttest8.ok +++ b/regress/sbin/route/rttest8.ok @@ -5,8 +5,6 @@ Destination Gateway Flags Refs Use Mtu Prio Iface 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 -127/8 127.0.0.1 UGRS 0 0 32768 8 lo5 -127.0.0.1 127.0.0.1 UHhl 1 1 32768 1 lo5 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 diff --git a/regress/sbin/route/rttest9.ok b/regress/sbin/route/rttest9.ok index 478041a548e..557be06d02b 100644 --- a/regress/sbin/route/rttest9.ok +++ b/regress/sbin/route/rttest9.ok @@ -4,8 +4,6 @@ Internet: Destination Gateway Flags Refs Use Mtu Prio Iface 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 -127/8 127.0.0.1 UGRS 0 0 32768 8 lo5 -127.0.0.1 127.0.0.1 UHhl 1 1 32768 1 lo5 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 -- 2.20.1