From bfcdfbf037f89a92a831600ec313356f32eec06a Mon Sep 17 00:00:00 2001
From: jiceatscion <139873336+jiceatscion@users.noreply.github.com>
Date: Thu, 18 Jul 2024 15:05:13 +0200
Subject: [PATCH 1/2] doc: fix the reference to router.bfd.disable (#4581)

router.bfd.disabled -> router.bfd.disable

Fixes #4537
---
 doc/manuals/common.rst | 2 +-
 doc/manuals/router.rst | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/manuals/common.rst b/doc/manuals/common.rst
index 0e521f4ba5..ca8e646172 100644
--- a/doc/manuals/common.rst
+++ b/doc/manuals/common.rst
@@ -294,7 +294,7 @@ of the individual fields below.
 
          .. option:: disable = <bool>, default router.bfd.disable
 
-            See :option:`router.bfd.disabled <router-conf-toml disabled>`.
+            See :option:`router.bfd.disable <router-conf-toml disable>`.
 
             Disable BFD, unconditionally consider the connection alive.
 
diff --git a/doc/manuals/router.rst b/doc/manuals/router.rst
index e6aa1ab66e..48df410ada 100644
--- a/doc/manuals/router.rst
+++ b/doc/manuals/router.rst
@@ -183,7 +183,7 @@ considers the following options.
 
    .. object:: bfd
 
-      .. option:: disabled = <bool> (Default: false)
+      .. option:: disable = <bool> (Default: false)
 
          Set whether the :term:`BFD` feature is disabled by default.
 

From 169a6986fe6ea96a73d1410e75beb98fc87bd4df Mon Sep 17 00:00:00 2001
From: jiceatscion <139873336+jiceatscion@users.noreply.github.com>
Date: Mon, 22 Jul 2024 13:00:27 +0200
Subject: [PATCH 2/2] router: clarified cryptic comment (#4580)

This was noticed by a reviewer of #4579
---
 router/dataplane.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/router/dataplane.go b/router/dataplane.go
index 01afd7d69c..306e14cea5 100644
--- a/router/dataplane.go
+++ b/router/dataplane.go
@@ -2132,7 +2132,9 @@ func (d *DataPlane) resolveLocalDst(
 		if dstIP.Is4In6() {
 			return unsupportedV4MappedV6Address
 		}
-		if dstIP.IsUnspecified() { // IsInvalid() not possible, we initialized it from wire bits.
+		// Zero IP addresses (per IsUnspecified()) are not supported. Zero valued netip.Addr objects
+		// (per IsInvalid()) cannot happen here as dstIP is initialized from packet header data.
+		if dstIP.IsUnspecified() {
 			return unsupportedUnspecifiedAddress
 		}
 		return d.addEndhostPort(resolvedDst, lastLayer, dstIP)