[nrf5-demo] Change perference when selecting IP for publishing service (

#2232)
project-chip · Aug 19, 2020 · eaa1380 · eaa1380
1 parent 4af7537
commit eaa1380
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/examples/platform/nrf528xx/app/Server.cpp b/examples/platform/nrf528xx/app/Server.cpp
@@ -192,14 +192,15 @@ void PublishService()
  memset(&mSocket, 0, sizeof(mSocket));
  memset(&messageInfo, 0, sizeof(messageInfo));
 
+ // Use mesh local EID by default, if we have GUA, use that IP address.
+ memcpy(&messageInfo.mSockAddr, otThreadGetMeshLocalEid(ThreadStackMgrImpl().OTInstance()), sizeof(messageInfo.mSockAddr));
+
  // Select a address to send
  const otNetifAddress * otAddrs = otIp6GetUnicastAddresses(ThreadStackMgrImpl().OTInstance());
  for (const otNetifAddress * otAddr = otAddrs; otAddr != NULL; otAddr = otAddr->mNext)
  {
  addr = chip::DeviceLayer::Internal::ToIPAddress(otAddr->mAddress);
- if (otAddr->mValid && !otAddr->mRloc &&
- (!addr.IsIPv6ULA() ||
- ::chip::DeviceLayer::Internal::IsOpenThreadMeshLocalAddress(ThreadStackMgrImpl().OTInstance(), addr)))
+ if (otAddr->mValid && addr.IsIPv6GlobalUnicast())
  {
  memcpy(&messageInfo.mSockAddr, &(otAddr->mAddress), sizeof(otAddr->mAddress));
  break;