summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Pieuchot <mpi@cvs.openbsd.org>2016-08-22 16:55:15 +0000
committerMartin Pieuchot <mpi@cvs.openbsd.org>2016-08-22 16:55:15 +0000
commit4211eddbb784a4efe54aeda29a5964c7c676f92f (patch)
treef177bce3c9d684f9f85a1d5cd99f496baa03035f
parenta066a216d6f999b4a8acaf5cd54d2f0e78b8eeb4 (diff)
Sync counters now that ifa_ifwithroute() no longer uses ifa_ifwithnet().
Diffstat
-rw-r--r--regress/sbin/route/rttest1.ok8
-rw-r--r--regress/sbin/route/rttest10.ok6
-rw-r--r--regress/sbin/route/rttest11.ok6
-rw-r--r--regress/sbin/route/rttest14.ok2
-rw-r--r--regress/sbin/route/rttest15.ok2
-rw-r--r--regress/sbin/route/rttest16.ok2
-rw-r--r--regress/sbin/route/rttest17.ok4
-rw-r--r--regress/sbin/route/rttest18.ok4
-rw-r--r--regress/sbin/route/rttest19.ok8
-rw-r--r--regress/sbin/route/rttest2.ok4
-rw-r--r--regress/sbin/route/rttest21.ok2
-rw-r--r--regress/sbin/route/rttest3.ok2
-rw-r--r--regress/sbin/route/rttest4.ok6
-rw-r--r--regress/sbin/route/rttest5.ok2
-rw-r--r--regress/sbin/route/rttest6.ok6
-rw-r--r--regress/sbin/route/rttest7.ok6
-rw-r--r--regress/sbin/route/rttest8.ok6
-rw-r--r--regress/sbin/route/rttest9.ok6
18 files changed, 41 insertions, 41 deletions
diff --git a/regress/sbin/route/rttest1.ok b/regress/sbin/route/rttest1.ok
index 7a594cf591e..e6760a456d1 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 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
+192.0.2.1 192.0.2.1 UHl 2 4 32768 1 lo10001
+192.0.2.2 192.0.2.2 UHl 1 2 32768 1 lo10002
+192.0.2.3 192.0.2.3 UHl 2 4 32768 1 lo10003
+192.0.2.4 192.0.2.4 UHl 3 6 32768 1 lo10004
diff --git a/regress/sbin/route/rttest10.ok b/regress/sbin/route/rttest10.ok
index 411420a1b4e..9d8c5f88624 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 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.1 192.0.2.1 UHl 1 2 32768 1 lo10001
+192.0.2.2 192.0.2.2 UHl 1 2 32768 1 lo10002
+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/rttest11.ok b/regress/sbin/route/rttest11.ok
index 411420a1b4e..9d8c5f88624 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 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.1 192.0.2.1 UHl 1 2 32768 1 lo10001
+192.0.2.2 192.0.2.2 UHl 1 2 32768 1 lo10002
+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/rttest14.ok b/regress/sbin/route/rttest14.ok
index 61962ea941b..26a58409ab1 100644
--- a/regress/sbin/route/rttest14.ok
+++ b/regress/sbin/route/rttest14.ok
@@ -5,7 +5,7 @@ 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 1 1 32768 1 lo10003
+fd99::1 fd99::1 UHl 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
diff --git a/regress/sbin/route/rttest15.ok b/regress/sbin/route/rttest15.ok
index 171a5bffbc4..0a79aee4e8f 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 1 1 32768 1 lo10004
+192.0.2.4 192.0.2.4 UHl 1 2 32768 1 lo10004
diff --git a/regress/sbin/route/rttest16.ok b/regress/sbin/route/rttest16.ok
index f806d3f5b86..94df7fb9003 100644
--- a/regress/sbin/route/rttest16.ok
+++ b/regress/sbin/route/rttest16.ok
@@ -5,7 +5,7 @@ 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 1 1 32768 1 lo10003
+fd99::1 fd99::1 UHl 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
diff --git a/regress/sbin/route/rttest17.ok b/regress/sbin/route/rttest17.ok
index a97c89eea5d..10845427bb1 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 1 32768 1 lo10003
-192.0.2.4 192.0.2.4 UHl 1 1 32768 1 lo10004
+192.0.2.3 192.0.2.3 UHl 0 2 32768 1 lo10003
+192.0.2.4 192.0.2.4 UHl 1 2 32768 1 lo10004
diff --git a/regress/sbin/route/rttest18.ok b/regress/sbin/route/rttest18.ok
index 6a37b021e65..6c6882568fe 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 1 1 32768 1 lo10003
-192.0.2.4 192.0.2.4 UHl 0 1 32768 1 lo10004
+192.0.2.3 192.0.2.3 UHl 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 2b9c1b85dbe..f29e67a661d 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 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
+192.0.2.1 192.0.2.1 UHl 1 2 32768 1 lo10001
+192.0.2.2 192.0.2.2 UHl 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 UHl 1 2 32768 1 lo10004
diff --git a/regress/sbin/route/rttest2.ok b/regress/sbin/route/rttest2.ok
index 7c5657c8c59..b39dade260e 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 1 1 32768 1 lo10003
-192.0.2.4 192.0.2.4 UHl 1 1 32768 1 lo10004
+192.0.2.3 192.0.2.3 UHl 1 2 32768 1 lo10003
+192.0.2.4 192.0.2.4 UHl 1 2 32768 1 lo10004
diff --git a/regress/sbin/route/rttest21.ok b/regress/sbin/route/rttest21.ok
index d44fc0e383e..8a1ab5e0097 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 3 3 32768 1 lo10003
+192.0.2.3 192.0.2.3 UHl 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/rttest3.ok b/regress/sbin/route/rttest3.ok
index 1a4cd417769..d968cdaa20e 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 2 32768 1 lo10003
+192.0.2.3 192.0.2.3 UHl 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/rttest4.ok b/regress/sbin/route/rttest4.ok
index 05a7903709f..6101e4e15bd 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 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.1 192.0.2.1 UHl 1 2 32768 1 lo10001
+192.0.2.2 192.0.2.2 UHl 1 2 32768 1 lo10002
+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/rttest5.ok b/regress/sbin/route/rttest5.ok
index b3c92415fa9..2213b23b4ad 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 3 4 32768 1 lo10002
+192.0.2.2 192.0.2.2 UHl 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 c23326d4528..4e8cfb18f63 100644
--- a/regress/sbin/route/rttest6.ok
+++ b/regress/sbin/route/rttest6.ok
@@ -5,7 +5,7 @@ Destination Gateway Flags Refs Use Mtu Prio Iface
10.8.1/24 192.0.2.1 UGS 0 1 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 1 1 32768 1 lo10001
-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.1 192.0.2.1 UHl 1 2 32768 1 lo10001
+192.0.2.2 192.0.2.2 UHl 1 4 32768 1 lo10002
+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/rttest7.ok b/regress/sbin/route/rttest7.ok
index 744cfef2ff9..33b92fdfee1 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 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.1 192.0.2.1 UHl 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 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/rttest8.ok b/regress/sbin/route/rttest8.ok
index 6fc609bacc6..f1974e98b2d 100644
--- a/regress/sbin/route/rttest8.ok
+++ b/regress/sbin/route/rttest8.ok
@@ -5,7 +5,7 @@ Destination Gateway Flags Refs Use Mtu Prio Iface
10.8.1/24 192.0.2.1 UGS 0 1 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 1 1 32768 1 lo10001
-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.1 192.0.2.1 UHl 1 2 32768 1 lo10001
+192.0.2.2 192.0.2.2 UHl 1 4 32768 1 lo10002
+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/rttest9.ok b/regress/sbin/route/rttest9.ok
index 744cfef2ff9..33b92fdfee1 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 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.1 192.0.2.1 UHl 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 UHl 1 2 32768 1 lo10003
192.0.2.4 192.0.2.4 UHl 0 0 32768 1 lo10004
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 03:59:12 +0000