Merge branch 'master' into feature/fix-cluster-revisions

Author: lazarkov

src/lib/dnssd/BUILD.gn

@@ -27,7 +27,7 @@ static_library("dnssd") {
     "${chip_root}/src/crypto",
     "${chip_root}/src/lib/core",
     "${chip_root}/src/lib/support",
-    "${chip_root}/src/messaging:messaging_mrp_config",
+    "${chip_root}/src/messaging:configurations",
   ]
 
   sources = [

src/messaging/BUILD.gn

@@ -33,10 +33,16 @@ if (chip_config_resolve_peer_on_first_transmit_failure != "") {
   defines += [ "CHIP_CONFIG_RESOLVE_PEER_ON_FIRST_TRANSMIT_FAILURE=${chip_config_resolve_peer_on_first_transmit_failure}" ]
 }
 
-source_set("messaging_mrp_config") {
-  sources = [ "ReliableMessageProtocolConfig.h" ]
+source_set("configurations") {
+  sources = [
+    "ReliableMessageProtocolConfig.h",
+    "SessionParameters.h",
+  ]
 
-  public_deps = [ "${chip_root}/src/system" ]
+  public_deps = [
+    "${chip_root}/src/lib/core",
+    "${chip_root}/src/system",
+  ]
 }
 
 static_library("messaging") {
@@ -67,7 +73,7 @@ static_library("messaging") {
   cflags = [ "-Wconversion" ]
 
   public_deps = [
-    ":messaging_mrp_config",
+    ":configurations",
     "${chip_root}/src/app/icd/server:icd-server-config",
     "${chip_root}/src/crypto",
     "${chip_root}/src/inet",

src/protocols/secure_channel/SessionParameters.h src/messaging/SessionParameters.h

@@ -37,11 +37,11 @@
 #include <lib/support/SafeInt.h>
 #include <lib/support/ScopedBuffer.h>
 #include <lib/support/TypeTraits.h>
+#include <messaging/SessionParameters.h>
 #include <platform/PlatformManager.h>
 #include <protocols/Protocols.h>
 #include <protocols/secure_channel/CASEDestinationId.h>
 #include <protocols/secure_channel/PairingSession.h>
-#include <protocols/secure_channel/SessionParameters.h>
 #include <protocols/secure_channel/SessionResumptionStorage.h>
 #include <protocols/secure_channel/StatusReport.h>
 #include <system/SystemClock.h>

src/protocols/secure_channel/CASESession.cpp

@@ -39,9 +39,9 @@
 #include <lib/support/CodeUtils.h>
 #include <lib/support/SafeInt.h>
 #include <lib/support/TypeTraits.h>
+#include <messaging/SessionParameters.h>
 #include <protocols/Protocols.h>
 #include <protocols/secure_channel/Constants.h>
-#include <protocols/secure_channel/SessionParameters.h>
 #include <protocols/secure_channel/StatusReport.h>
 #include <setup_payload/SetupPayload.h>
 #include <system/TLVPacketBufferBackingStore.h>

src/protocols/secure_channel/PASESession.cpp

@@ -28,9 +28,9 @@
 #include <lib/core/CHIPError.h>
 #include <lib/core/TLV.h>
 #include <messaging/ExchangeContext.h>
+#include <messaging/SessionParameters.h>
 #include <protocols/secure_channel/Constants.h>
 #include <protocols/secure_channel/SessionEstablishmentDelegate.h>
-#include <protocols/secure_channel/SessionParameters.h>
 #include <protocols/secure_channel/StatusReport.h>
 #include <transport/CryptoContext.h>
 #include <transport/SecureSession.h>

src/protocols/secure_channel/PairingSession.h

@@ -25,8 +25,8 @@
 #include <lib/support/IntrusiveList.h>
 #include <lib/support/ReferenceCountedHandle.h>
 #include <messaging/ReliableMessageProtocolConfig.h>
+#include <messaging/SessionParameters.h>
 #include <platform/LockTracker.h>
-#include <protocols/secure_channel/SessionParameters.h>
 #include <transport/SessionDelegate.h>
 
 namespace chip {