Multiple PeerConnections with the same nodeId but different PeerAddre…

…ss (#1422)

src/transport/PeerConnections.h

@@ -134,6 +134,17 @@ class PeerConnections
         state->SetLastActivityTimeMs(mTimeSource.GetCurrentMonotonicTimeMs());
     }
 
+    /// Convenience method to expired a peer connection state and fired the related callback
+    void MarkConnectionExpired(PeerConnectionState * state)
+    {
+        if (OnConnectionExpired)
+        {
+            OnConnectionExpired(*state, mConnectionExpiredArgument);
+        }
+
+        *state = PeerConnectionState(PeerAddress::Uninitialized());
+    }
+
     /**
      * Iterates through all active connections and expires any connection with an idle time
      * larger than the given amount.
@@ -157,13 +168,7 @@ class PeerConnections
                 continue; // not expired
             }
 
-            if (OnConnectionExpired)
-            {
-                OnConnectionExpired(mStates[i], mConnectionExpiredArgument);
-            }
-
-            // Connection is assumed expired, marking it as invalid
-            mStates[i] = PeerConnectionState(PeerAddress::Uninitialized());
+            MarkConnectionExpired(&mStates[i]);
         }
     }
 

src/transport/SecureSessionMgr.cpp

@@ -205,6 +205,16 @@ void SecureSessionMgr::HandleDataReceived(const MessageHeader & header, const Pe
     {
         if (!connection->mPeerConnections.FindPeerConnectionState(peerAddress, &state))
         {
+            if (header.GetSourceNodeId().HasValue())
+            {
+                // If the data is from a new address BUT the node id is the same as a previous
+                // connection, mark the previous connection invalid in order to not have duplicate node ids.
+                if (connection->mPeerConnections.FindPeerConnectionState(header.GetSourceNodeId().Value(), &state))
+                {
+                    connection->mPeerConnections.MarkConnectionExpired(state);
+                }
+            }
+
             ChipLogProgress(Inet, "New peer connection received.");
 
             err = connection->AllocateNewConnection(header, peerAddress, &state);