Set DestNodeId flag for repaired WeaveConnection if PeerAddress is
not IPv6ULA.
Necessary for the Tunnel TCP connection over IPv4.
diff --git a/src/lib/core/WeaveConnection.cpp b/src/lib/core/WeaveConnection.cpp
index 8a7c962..be05b1c 100644
--- a/src/lib/core/WeaveConnection.cpp
+++ b/src/lib/core/WeaveConnection.cpp
@@ -1299,6 +1299,14 @@
// Set the connection variables
PeerAddr = repairInfo.dstIP;
PeerNodeId = peerNodeId;
+
+ // If the peer address is not a ULA, or if the interface identifier portion of the peer address does not match
+ // the peer node id, then force the destination node identifier field to be encoded in all sent messages.
+ if (!PeerAddr.IsIPv6ULA() || IPv6InterfaceIdToWeaveNodeId(PeerAddr.InterfaceId()) != PeerNodeId)
+ {
+ SendDestNodeId = true;
+ }
+
PeerPort = repairInfo.dstPort;
IsRepaired = true;
