From: mpi Date: Tue, 19 Jul 2016 10:47:39 +0000 (+0000) Subject: Update counters & unbreak now that rtrequest(RTM_ADD, ...) caches the X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=93cc73020bddac27a310bfe09633151d2fa035d2;p=openbsd Update counters & unbreak now that rtrequest(RTM_ADD, ...) caches the gateway. --- diff --git a/regress/sbin/route/rttest1.ok b/regress/sbin/route/rttest1.ok index 9b2d1f9c4c1..7a594cf591e 100644 --- a/regress/sbin/route/rttest1.ok +++ b/regress/sbin/route/rttest1.ok @@ -10,7 +10,7 @@ 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 -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.0.2.1 192.0.2.1 UHl 2 2 32768 1 lo10001 +192.0.2.2 192.0.2.2 UHl 1 1 32768 1 lo10002 +192.0.2.3 192.0.2.3 UHl 2 2 32768 1 lo10003 +192.0.2.4 192.0.2.4 UHl 3 3 32768 1 lo10004 diff --git a/regress/sbin/route/rttest10.ok b/regress/sbin/route/rttest10.ok index 7f19cdac56c..411420a1b4e 100644 --- a/regress/sbin/route/rttest10.ok +++ b/regress/sbin/route/rttest10.ok @@ -5,7 +5,7 @@ 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 -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.1 192.0.2.1 UHl 1 1 32768 1 lo10001 +192.0.2.2 192.0.2.2 UHl 1 1 32768 1 lo10002 +192.0.2.3 192.0.2.3 UHl 1 1 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 7f19cdac56c..411420a1b4e 100644 --- a/regress/sbin/route/rttest11.ok +++ b/regress/sbin/route/rttest11.ok @@ -5,7 +5,7 @@ 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 -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.1 192.0.2.1 UHl 1 1 32768 1 lo10001 +192.0.2.2 192.0.2.2 UHl 1 1 32768 1 lo10002 +192.0.2.3 192.0.2.3 UHl 1 1 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 7eb109aed93..5c15c7c584d 100644 --- a/regress/sbin/route/rttest12.ok +++ b/regress/sbin/route/rttest12.ok @@ -5,5 +5,5 @@ Destination Gateway Flags Refs Use Mtu Prio Iface 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 0 32768 1 lo10003 -192.0.2.4 192.0.2.4 UHl 0 0 32768 1 lo10004 +192.0.2.3 192.0.2.3 UHl 0 1 32768 1 lo10003 +192.0.2.4 192.0.2.4 UHl 0 1 32768 1 lo10004 diff --git a/regress/sbin/route/rttest14.ok b/regress/sbin/route/rttest14.ok index bcb9c800bb9..61962ea941b 100644 --- a/regress/sbin/route/rttest14.ok +++ b/regress/sbin/route/rttest14.ok @@ -5,13 +5,13 @@ Destination Gateway Flags Refs ::1 ::1 UHl 0 2 32768 1 lo10001 fd88::1 fd88::1 UHl 0 0 32768 1 lo10002 fd88::666 fd99::1 UGHS 0 0 1500 8 lo10003 -fd99::1 fd99::1 UHl 0 0 32768 1 lo10003 +fd99::1 fd99::1 UHl 1 1 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 ::1 UC 0 1 32768 4 lo10001 -ff01::%lo10002/32 ::1 UC 0 2 32768 4 lo10001 -ff01::%lo10003/32 ::1 UC 0 2 32768 4 lo10001 -ff02::%lo10001/32 ::1 UC 0 1 32768 4 lo10001 -ff02::%lo10002/32 ::1 UC 0 2 32768 4 lo10001 -ff02::%lo10003/32 ::1 UC 0 2 32768 4 lo10001 +ff01::%lo10001/32 ::1 Um 0 1 32768 4 lo10001 +ff01::%lo10002/32 ::1 Um 0 2 32768 4 lo10001 +ff01::%lo10003/32 ::1 Um 0 2 32768 4 lo10001 +ff02::%lo10001/32 ::1 Um 0 1 32768 4 lo10001 +ff02::%lo10002/32 ::1 Um 0 2 32768 4 lo10001 +ff02::%lo10003/32 ::1 Um 0 2 32768 4 lo10001 diff --git a/regress/sbin/route/rttest15.ok b/regress/sbin/route/rttest15.ok index 2c4432efdd7..171a5bffbc4 100644 --- a/regress/sbin/route/rttest15.ok +++ b/regress/sbin/route/rttest15.ok @@ -6,4 +6,4 @@ Destination Gateway Flags Refs Use Mtu Prio Iface 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.0.2.4 192.0.2.4 UHl 1 1 32768 1 lo10004 diff --git a/regress/sbin/route/rttest16.ok b/regress/sbin/route/rttest16.ok index 715f9153834..f806d3f5b86 100644 --- a/regress/sbin/route/rttest16.ok +++ b/regress/sbin/route/rttest16.ok @@ -5,13 +5,13 @@ Destination Gateway Flags Refs ::1 ::1 UHl 0 2 32768 1 lo10001 fd88::1 fd88::1 UHl 0 0 32768 1 lo10002 fd88::666 fd99::1 UGHS 0 0 32768 8 lo10002 -fd99::1 fd99::1 UHl 0 0 32768 1 lo10003 +fd99::1 fd99::1 UHl 1 1 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 ::1 UC 0 1 32768 4 lo10001 -ff01::%lo10002/32 ::1 UC 0 2 32768 4 lo10001 -ff01::%lo10003/32 ::1 UC 0 2 32768 4 lo10001 -ff02::%lo10001/32 ::1 UC 0 1 32768 4 lo10001 -ff02::%lo10002/32 ::1 UC 0 2 32768 4 lo10001 -ff02::%lo10003/32 ::1 UC 0 2 32768 4 lo10001 +ff01::%lo10001/32 ::1 Um 0 1 32768 4 lo10001 +ff01::%lo10002/32 ::1 Um 0 2 32768 4 lo10001 +ff01::%lo10003/32 ::1 Um 0 2 32768 4 lo10001 +ff02::%lo10001/32 ::1 Um 0 1 32768 4 lo10001 +ff02::%lo10002/32 ::1 Um 0 2 32768 4 lo10001 +ff02::%lo10003/32 ::1 Um 0 2 32768 4 lo10001 diff --git a/regress/sbin/route/rttest17.ok b/regress/sbin/route/rttest17.ok index 7eb109aed93..a97c89eea5d 100644 --- a/regress/sbin/route/rttest17.ok +++ b/regress/sbin/route/rttest17.ok @@ -5,5 +5,5 @@ Destination Gateway Flags Refs Use Mtu Prio Iface 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 0 32768 1 lo10003 -192.0.2.4 192.0.2.4 UHl 0 0 32768 1 lo10004 +192.0.2.3 192.0.2.3 UHl 0 1 32768 1 lo10003 +192.0.2.4 192.0.2.4 UHl 1 1 32768 1 lo10004 diff --git a/regress/sbin/route/rttest18.ok b/regress/sbin/route/rttest18.ok index 723cfcdb474..6a37b021e65 100644 --- a/regress/sbin/route/rttest18.ok +++ b/regress/sbin/route/rttest18.ok @@ -5,5 +5,5 @@ Destination Gateway Flags Refs Use Mtu Prio Iface 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 UHl 0 0 32768 1 lo10003 -192.0.2.4 192.0.2.4 UHl 0 0 32768 1 lo10004 +192.0.2.3 192.0.2.3 UHl 1 1 32768 1 lo10003 +192.0.2.4 192.0.2.4 UHl 0 1 32768 1 lo10004 diff --git a/regress/sbin/route/rttest19.ok b/regress/sbin/route/rttest19.ok index 0a03c078c5f..2b9c1b85dbe 100644 --- a/regress/sbin/route/rttest19.ok +++ b/regress/sbin/route/rttest19.ok @@ -5,7 +5,7 @@ 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 -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.0.2.1 192.0.2.1 UHl 1 1 32768 1 lo10001 +192.0.2.2 192.0.2.2 UHl 1 1 32768 1 lo10002 +192.0.2.3 192.0.2.3 UHl 0 1 32768 1 lo10003 +192.0.2.4 192.0.2.4 UHl 1 1 32768 1 lo10004 diff --git a/regress/sbin/route/rttest2.ok b/regress/sbin/route/rttest2.ok index 02f374dce54..7c5657c8c59 100644 --- a/regress/sbin/route/rttest2.ok +++ b/regress/sbin/route/rttest2.ok @@ -6,5 +6,5 @@ Destination Gateway Flags Refs Use Mtu Prio Iface 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 UHl 0 0 32768 1 lo10003 -192.0.2.4 192.0.2.4 UHl 0 0 32768 1 lo10004 +192.0.2.3 192.0.2.3 UHl 1 1 32768 1 lo10003 +192.0.2.4 192.0.2.4 UHl 1 1 32768 1 lo10004 diff --git a/regress/sbin/route/rttest21.ok b/regress/sbin/route/rttest21.ok index 170d2b0251b..d44fc0e383e 100644 --- a/regress/sbin/route/rttest21.ok +++ b/regress/sbin/route/rttest21.ok @@ -7,5 +7,5 @@ Destination Gateway Flags Refs Use Mtu Prio Iface 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 UHl 0 0 32768 1 lo10003 +192.0.2.3 192.0.2.3 UHl 3 3 32768 1 lo10003 192.0.2.4 192.0.2.4 UHl 0 0 32768 1 lo10004 diff --git a/regress/sbin/route/rttest3.ok b/regress/sbin/route/rttest3.ok index b58d346960e..1a4cd417769 100644 --- a/regress/sbin/route/rttest3.ok +++ b/regress/sbin/route/rttest3.ok @@ -5,5 +5,5 @@ Destination Gateway Flags Refs Use Mtu Prio Iface 10.8.1/24 192.0.2.3 UGS 0 1 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 UHl 1 1 32768 1 lo10003 +192.0.2.3 192.0.2.3 UHl 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/rttest4.ok b/regress/sbin/route/rttest4.ok index 94d286dcd41..05a7903709f 100644 --- a/regress/sbin/route/rttest4.ok +++ b/regress/sbin/route/rttest4.ok @@ -5,7 +5,7 @@ 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 -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.1 192.0.2.1 UHl 1 1 32768 1 lo10001 +192.0.2.2 192.0.2.2 UHl 1 1 32768 1 lo10002 +192.0.2.3 192.0.2.3 UHl 1 1 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 aa95b21111e..b3c92415fa9 100644 --- a/regress/sbin/route/rttest5.ok +++ b/regress/sbin/route/rttest5.ok @@ -6,6 +6,6 @@ Destination Gateway Flags Refs Use Mtu Prio Iface 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 UHl 1 1 32768 1 lo10002 +192.0.2.2 192.0.2.2 UHl 3 4 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 721f49edbfb..c23326d4528 100644 --- a/regress/sbin/route/rttest6.ok +++ b/regress/sbin/route/rttest6.ok @@ -6,6 +6,6 @@ Destination Gateway Flags Refs Use Mtu Prio Iface 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 UHl 1 1 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.2 192.0.2.2 UHl 1 2 32768 1 lo10002 +192.0.2.3 192.0.2.3 UHl 1 1 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 2b83578be2a..744cfef2ff9 100644 --- a/regress/sbin/route/rttest7.ok +++ b/regress/sbin/route/rttest7.ok @@ -4,7 +4,7 @@ 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 -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.1 192.0.2.1 UHl 1 1 32768 1 lo10001 +192.0.2.2 192.0.2.2 UHl 0 1 32768 1 lo10002 +192.0.2.3 192.0.2.3 UHl 1 1 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 d868a3046a3..6fc609bacc6 100644 --- a/regress/sbin/route/rttest8.ok +++ b/regress/sbin/route/rttest8.ok @@ -6,6 +6,6 @@ Destination Gateway Flags Refs Use Mtu Prio Iface 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 UHl 1 1 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.2 192.0.2.2 UHl 1 2 32768 1 lo10002 +192.0.2.3 192.0.2.3 UHl 1 1 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 2b83578be2a..744cfef2ff9 100644 --- a/regress/sbin/route/rttest9.ok +++ b/regress/sbin/route/rttest9.ok @@ -4,7 +4,7 @@ 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 -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.1 192.0.2.1 UHl 1 1 32768 1 lo10001 +192.0.2.2 192.0.2.2 UHl 0 1 32768 1 lo10002 +192.0.2.3 192.0.2.3 UHl 1 1 32768 1 lo10003 192.0.2.4 192.0.2.4 UHl 0 0 32768 1 lo10004