From ae93f82e536ad4d931f03903299d0e047ce8735b Mon Sep 17 00:00:00 2001 From: Mathieu Kardous Date: Fri, 4 Mar 2022 08:08:26 -0500 Subject: [PATCH 1/2] fix mg24 light-switch --- src/transport/SessionManager.cpp | 12 ++++++------ third_party/efr32_sdk/repo | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/transport/SessionManager.cpp b/src/transport/SessionManager.cpp index 58c5ee2ace5ad7..d9c6cf97a8accf 100644 --- a/src/transport/SessionManager.cpp +++ b/src/transport/SessionManager.cpp @@ -259,12 +259,12 @@ CHIP_ERROR SessionManager::SendPreparedMessage(const SessionHandle & sessionHand multicastAddress.ToString(addressStr, Transport::PeerAddress::kMaxToStringSize); ChipLogProgress(Inet, - "Sending %s msg %p with MessageCounter:" ChipLogFormatMessageCounter " to %d" - " at monotonic time: %" PRId64 - " msec to Multicast IPV6 address : %s with GroupID of %d and fabric Id of %d", - "encrypted", &preparedMessage, preparedMessage.GetMessageCounter(), groupSession->GetGroupId(), - System::SystemClock().GetMonotonicMilliseconds64().count(), addressStr, groupSession->GetGroupId(), - groupSession->GetFabricIndex()); + "Sending %s msg %p with MessageCounter:" ChipLogFormatMessageCounter + " to Multicast IPV6 address : %s with GroupID of %d and fabric Id of %d" + " at monotonic time: %" PRId64, + sessionHandle->GetSessionTypeString(), &preparedMessage, preparedMessage.GetMessageCounter(), addressStr, + groupSession->GetGroupId(), groupSession->GetFabricIndex(), + System::SystemClock().GetMonotonicMilliseconds64().count()); } break; case Transport::Session::SessionType::kSecure: { diff --git a/third_party/efr32_sdk/repo b/third_party/efr32_sdk/repo index 4cf4906e3327ac..1f6ff3d05c9400 160000 --- a/third_party/efr32_sdk/repo +++ b/third_party/efr32_sdk/repo @@ -1 +1 @@ -Subproject commit 4cf4906e3327ac5c5fccdf9c500a85987c489ae3 +Subproject commit 1f6ff3d05c94003899f3599b2e3ca524c5aa5495 From 0d12459e4e1bef7115d3506226522e2980cfd09f Mon Sep 17 00:00:00 2001 From: Mathieu Kardous Date: Wed, 9 Mar 2022 09:10:24 -0500 Subject: [PATCH 2/2] PR comments --- src/transport/SessionManager.cpp | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/transport/SessionManager.cpp b/src/transport/SessionManager.cpp index d9c6cf97a8accf..bf38782218f0be 100644 --- a/src/transport/SessionManager.cpp +++ b/src/transport/SessionManager.cpp @@ -259,12 +259,12 @@ CHIP_ERROR SessionManager::SendPreparedMessage(const SessionHandle & sessionHand multicastAddress.ToString(addressStr, Transport::PeerAddress::kMaxToStringSize); ChipLogProgress(Inet, - "Sending %s msg %p with MessageCounter:" ChipLogFormatMessageCounter - " to Multicast IPV6 address : %s with GroupID of %d and fabric Id of %d" - " at monotonic time: %" PRId64, - sessionHandle->GetSessionTypeString(), &preparedMessage, preparedMessage.GetMessageCounter(), addressStr, - groupSession->GetGroupId(), groupSession->GetFabricIndex(), - System::SystemClock().GetMonotonicMilliseconds64().count()); + "Sending %s msg %p with MessageCounter:" ChipLogFormatMessageCounter " to %d" + " at monotonic time: " ChipLogFormatX64 + " msec to Multicast IPV6 address : %s with GroupID of %d and fabric Id of %d", + "encrypted group", &preparedMessage, preparedMessage.GetMessageCounter(), groupSession->GetGroupId(), + ChipLogValueX64(System::SystemClock().GetMonotonicMilliseconds64().count()), addressStr, + groupSession->GetGroupId(), groupSession->GetFabricIndex()); } break; case Transport::Session::SessionType::kSecure: { @@ -278,10 +278,10 @@ CHIP_ERROR SessionManager::SendPreparedMessage(const SessionHandle & sessionHand ChipLogProgress(Inet, "Sending %s msg %p with MessageCounter:" ChipLogFormatMessageCounter " to 0x" ChipLogFormatX64 - " (%u) at monotonic time: %" PRId64 " msec", + " (%u) at monotonic time: " ChipLogFormatX64 " msec", "encrypted", &preparedMessage, preparedMessage.GetMessageCounter(), ChipLogValueX64(secure->GetPeerNodeId()), secure->GetFabricIndex(), - System::SystemClock().GetMonotonicMilliseconds64().count()); + ChipLogValueX64(System::SystemClock().GetMonotonicMilliseconds64().count())); } break; case Transport::Session::SessionType::kUnauthenticated: { @@ -291,9 +291,10 @@ CHIP_ERROR SessionManager::SendPreparedMessage(const SessionHandle & sessionHand ChipLogProgress(Inet, "Sending %s msg %p with MessageCounter:" ChipLogFormatMessageCounter " to 0x" ChipLogFormatX64 - " at monotonic time: %" PRId64 " msec", + " at monotonic time: " ChipLogFormatX64 " msec", sessionHandle->GetSessionTypeString(), &preparedMessage, preparedMessage.GetMessageCounter(), - ChipLogValueX64(kUndefinedNodeId), System::SystemClock().GetMonotonicMilliseconds64().count()); + ChipLogValueX64(kUndefinedNodeId), + ChipLogValueX64(System::SystemClock().GetMonotonicMilliseconds64().count())); } break; default: