Merge branch 'master' of github.com:selissia/connectedhomeip into sil…

…abs-force-key

.github/labeler.yml

@@ -51,9 +51,6 @@ gn:
     - "*.gn"
     - "*.gni"
 
-tests:
-    - src/app/tests/*
-
 github:
     - .github
 
@@ -66,6 +63,11 @@ tools:
 ############################################################
 #  Tests
 ############################################################
+tests:
+    - src/app/tests/*
+    - src/app/tests/suites/*
+    - src/app/tests/suites/certification/*
+
 test driver:
     - src/test_driver/*
 

.github/workflows/cherry-picks.yaml

@@ -36,6 +36,8 @@ jobs:
               with:
                   token: ${{ secrets.MATTER_PAT }}
                   branch: sve
+                  labels: |
+                      sve cherry pick
                   reviewers: |
                       woody-apple
                       andy31415

src/app/server/Server.cpp

@@ -252,7 +252,14 @@ CHIP_ERROR Server::Init(const ServerInitParams & initParams)
     SuccessOrExit(err);
 #endif
 
-    app::DnssdServer::Instance().SetSecuredPort(mOperationalServicePort);
+    //
+    // We need to advertise the port that we're listening to for unsolicited messages over UDP. However, we have both a IPv4
+    // and IPv6 endpoint to pick from. Given that the listen port passed in may be set to 0 (which then has the kernel select
+    // a valid port at bind time), that will result in two possible ports being provided back from the resultant endpoint
+    // initializations. Since IPv6 is POR for Matter, let's go ahead and pick that port.
+    //
+    app::DnssdServer::Instance().SetSecuredPort(mTransports.GetTransport().GetImplAtIndex<0>().GetBoundPort());
+
     app::DnssdServer::Instance().SetUnsecuredPort(mUserDirectedCommissioningPort);
     app::DnssdServer::Instance().SetInterfaceId(mInterfaceId);
 

src/app/server/Server.h

@@ -66,6 +66,10 @@ namespace chip {
 
 constexpr size_t kMaxBlePendingPackets = 1;
 
+//
+// NOTE: Please do not alter the order of template specialization here as the logic
+//       in the Server impl depends on this.
+//
 using ServerTransportMgr = chip::TransportMgr<chip::Transport::UDP
 #if INET_CONFIG_ENABLE_IPV4
                                               ,

src/transport/SessionManager.cpp

@@ -111,6 +111,12 @@ void SessionManager::Shutdown()
         mFabricTable->RemoveFabricDelegate(this);
         mFabricTable = nullptr;
     }
+
+    mSecureSessions.ForEachSession([&](auto session) {
+        session->MarkForEviction();
+        return Loop::Continue;
+    });
+
     mMessageCounterManager = nullptr;
 
     mState        = State::kNotReady;