summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormpi <mpi@openbsd.org>2015-11-09 10:49:36 +0000
committermpi <mpi@openbsd.org>2015-11-09 10:49:36 +0000
commit1797eada42d0b00267fbf392f208452ecfba59d6 (patch)
tree8a93517c3bb8ee70ff4b8bdd2a56a3b966f19a5b
parentRewrite rtalloc(9) to consider RTF_GATEWAY entries without valid next- (diff)
downloadwireguard-openbsd-1797eada42d0b00267fbf392f208452ecfba59d6.tar.xz
wireguard-openbsd-1797eada42d0b00267fbf392f208452ecfba59d6.zip
Match recent rtalloc(9) rewrite.
Gateway routes are now cached the first time they are used and no longer when they are added. This allows to track down which multipath route is being selected as next-hop.
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/rttest12.ok4
-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/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.ok4
-rw-r--r--regress/sbin/route/rttest7.ok6
-rw-r--r--regress/sbin/route/rttest8.ok4
-rw-r--r--regress/sbin/route/rttest9.ok6
18 files changed, 40 insertions, 40 deletions
diff --git a/regress/sbin/route/rttest1.ok b/regress/sbin/route/rttest1.ok
index 49e5e6301c8..5a5c711b1dc 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 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/rttest10.ok b/regress/sbin/route/rttest10.ok
index 411420a1b4e..7f19cdac56c 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 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/rttest11.ok b/regress/sbin/route/rttest11.ok
index 411420a1b4e..7f19cdac56c 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 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/rttest12.ok b/regress/sbin/route/rttest12.ok
index a97c89eea5d..7eb109aed93 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 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 0 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 edabc9c9254..bcb9c800bb9 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 0 0 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..2c4432efdd7 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 0 0 32768 1 lo10004
diff --git a/regress/sbin/route/rttest16.ok b/regress/sbin/route/rttest16.ok
index 56ffeedab80..715f9153834 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 0 0 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..7eb109aed93 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 0 32768 1 lo10003
+192.0.2.4 192.0.2.4 UHl 0 0 32768 1 lo10004
diff --git a/regress/sbin/route/rttest18.ok b/regress/sbin/route/rttest18.ok
index 6a37b021e65..723cfcdb474 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 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/rttest19.ok b/regress/sbin/route/rttest19.ok
index 9fa8c82ddb1..99045c00107 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.0/26 192.0.2.2 UGS 0 0 32768 8 lo10002
10.8.1.0/25 192.0.2.4 UGS 0 0 32768 8 lo10004
10.8.1/24 192.0.2.1 UGS 0 0 32768 8 lo10001
-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 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/rttest2.ok b/regress/sbin/route/rttest2.ok
index 7c5657c8c59..02f374dce54 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 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/rttest3.ok b/regress/sbin/route/rttest3.ok
index 1a4cd417769..b58d346960e 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 1 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..94d286dcd41 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 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/rttest5.ok b/regress/sbin/route/rttest5.ok
index b3c92415fa9..aa95b21111e 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 1 1 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..721f49edbfb 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 1 2 32768 1 lo10002
-192.0.2.3 192.0.2.3 UHl 1 1 32768 1 lo10003
+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/rttest7.ok b/regress/sbin/route/rttest7.ok
index 744cfef2ff9..2b83578be2a 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 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/rttest8.ok b/regress/sbin/route/rttest8.ok
index 6fc609bacc6..d868a3046a3 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 1 2 32768 1 lo10002
-192.0.2.3 192.0.2.3 UHl 1 1 32768 1 lo10003
+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/rttest9.ok b/regress/sbin/route/rttest9.ok
index 744cfef2ff9..2b83578be2a 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 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
Copyright © 1996 – 2023 Jason A. Donenfeld. All Rights Reverse Engineered.