Merge branch 'master' into fix4545

jiceatscion · Jul 22, 2024 · 6653ab3 · 6653ab3
2 parents 1acbb21 + 169a698
commit 6653ab3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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.
 

diff --git 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)