[Group] Add multicast listening on linux

.github/workflows/tests.yaml

@@ -31,9 +31,11 @@ jobs:
         strategy:
           matrix:
              build_variant: [no-ble-tsan]
+             group_variant: [no-ble-tsan-test-group]
              chip_tool: ["", -same-event-loop]
         env:
             BUILD_VARIANT: ${{matrix.build_variant}}
+            GROUP_VARIANT: ${{matrix.group_variant}}
             CHIP_TOOL_VARIANT: ${{matrix.chip_tool}}
 
         if: github.actor != 'restyled-io[bot]'
@@ -72,7 +74,7 @@ jobs:
                   ./scripts/run_in_build_env.sh \
                      "./scripts/build/build_examples.py \
                         --target linux-x64-chip-tool-${BUILD_VARIANT}${CHIP_TOOL_VARIANT} \
-                        --target linux-x64-all-clusters-${BUILD_VARIANT} \
+                        --target linux-x64-all-clusters-${GROUP_VARIANT} \
                         --target linux-x64-tv-app-${BUILD_VARIANT} \
                         build \
                         --copy-artifacts-to objdir-clone \
@@ -85,7 +87,7 @@ jobs:
                      --chip-tool ./out/linux-x64-chip-tool-${BUILD_VARIANT}${CHIP_TOOL_VARIANT}/chip-tool \
                      run \
                      --iterations 1 \
-                     --all-clusters-app ./out/linux-x64-all-clusters-${BUILD_VARIANT}/chip-all-clusters-app \
+                     --all-clusters-app ./out/linux-x64-all-clusters-${GROUP_VARIANT}/chip-all-clusters-app \
                      --tv-app ./out/linux-x64-tv-app-${BUILD_VARIANT}/chip-tv-app \
                   "
             - name: Uploading core files
@@ -167,7 +169,7 @@ jobs:
                   ./scripts/run_in_build_env.sh \
                   "./scripts/tests/run_test_suite.py \
                      --chip-tool ./out/darwin-x64-chip-tool-${BUILD_VARIANT}${CHIP_TOOL_VARIANT}/chip-tool \
-                     --target-skip-glob 'TV*' \
+                     --target-skip-glob '{TestGroupMessaging,TV_*}' \
                      run \
                      --iterations 1 \
                      --all-clusters-app ./out/darwin-x64-all-clusters-${BUILD_VARIANT}/chip-all-clusters-app \

scripts/build/build/targets.py

@@ -157,6 +157,7 @@ def HostTargets():
         HostBuildVariant(name="no-ble", enable_ble=False),
         HostBuildVariant(name="tsan", conflicts=['asan'], use_tsan=True),
         HostBuildVariant(name="asan", conflicts=['tsan'], use_asan=True),
+        HostBuildVariant(name="test-group", test_group=True),
         HostBuildVariant(name="same-event-loop",
                          validator=AcceptNameWithSubstring('-chip-tool'), separate_event_loop=False),
     ]

scripts/build/builders/host.py

@@ -106,8 +106,8 @@ def PlatformName(self):
 class HostBuilder(GnBuilder):
 
     def __init__(self, root, runner, app: HostApp, board=HostBoard.NATIVE, enable_ipv4=True,
-                 enable_ble=True, use_tsan=False,  use_asan=False, separate_event_loop=True
-                 ):
+                 enable_ble=True, use_tsan=False,  use_asan=False, separate_event_loop=True,
+                 test_group=False):
         super(HostBuilder, self).__init__(
             root=os.path.join(root, 'examples', app.ExamplePath()),
             runner=runner)
@@ -131,6 +131,9 @@ def __init__(self, root, runner, app: HostApp, board=HostBoard.NATIVE, enable_ip
         if not separate_event_loop:
             self.extra_gn_options.append('config_use_separate_eventloop=false')
 
+        if test_group:
+            self.extra_gn_options.append('chip_enable_test_group=true')
+
     def GnBuildArgs(self):
         if self.board == HostBoard.NATIVE:
             return self.extra_gn_options

src/app/server/BUILD.gn

@@ -15,12 +15,21 @@
 import("//build_overrides/chip.gni")
 import("${chip_root}/src/app/common_flags.gni")
 
+# Move this inside the GroupDataProvider once implemented Issue #11075
+declare_args() {
+  chip_enable_test_group = false
+}
+
 config("server_config") {
   defines = []
 
   if (chip_app_use_echo) {
     defines += [ "CHIP_APP_USE_ECHO" ]
   }
+
+  if (chip_enable_test_group) {
+    defines += [ "TEST_SUITE_GROUP" ]
+  }
 }
 
 static_library("server") {

src/app/server/Server.cpp

@@ -117,6 +117,16 @@ CHIP_ERROR Server::Init(AppDelegate * delegate, uint16_t secureServicePort, uint
 #endif
     SuccessOrExit(err);
 
+    // Enable Group Listening
+    // TODO : Fix this once GroupDataProvider is implemented #Issue 11075
+    // for (iterate through all GroupDataProvider multicast Address)
+    // {
+#ifdef TEST_SUITE_GROUP
+    err = mTransports.MulticastGroupJoinLeave(Transport::PeerAddress::Multicast(1, 1234), true);
+    SuccessOrExit(err);
+#endif
+    //}
+
     err = mSessions.Init(&DeviceLayer::SystemLayer(), &mTransports, &mMessageCounterManager);
     SuccessOrExit(err);
 

src/app/tests/TestWriteInteraction.cpp

@@ -261,8 +261,7 @@ void TestWriteInteraction::TestWriteClientGroup(nlTestSuite * apSuite, void * ap
 
     err = writeClientHandle.SendWriteRequest(groupSession);
 
-    // Write will fail until issue #11078 is completed
-    NL_TEST_ASSERT(apSuite, err == CHIP_ERROR_NOT_CONNECTED);
+    NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
     // The internal WriteClient should be shutdown once we SendWriteRequest for group.
     NL_TEST_ASSERT(apSuite, nullptr == writeClientHandle.mpWriteClient);
 }

src/darwin/Framework/CHIP/templates/tests.js

@@ -172,7 +172,6 @@ function getTests()
     'TestIdentifyCluster',
     'TestOperationalCredentialsCluster',
     'TestModeSelectCluster',
-    'TestGroupMessaging',
   ];
 
   const SoftwareDiagnostics = [

src/inet/UDPEndPoint.cpp

@@ -136,7 +136,6 @@ namespace {
 
 CHIP_ERROR CheckMulticastGroupArgs(InterfaceId aInterfaceId, const IPAddress & aAddress)
 {
-    VerifyOrReturnError(aInterfaceId.IsPresent(), INET_ERROR_UNKNOWN_INTERFACE);
     VerifyOrReturnError(aAddress.IsMulticast(), INET_ERROR_WRONG_ADDRESS_TYPE);
     return CHIP_NO_ERROR;
 }
@@ -1419,7 +1418,7 @@ CHIP_ERROR UDPEndPointImplSockets::IPv6JoinLeaveMulticastGroupImpl(InterfaceId a
     }
 #endif // CHIP_SYSTEM_CONFIG_USE_PLATFORM_MULTICAST_API
 
-#if defined(INET_IPV6_ADD_MEMBERSHIP) && defined(INET_IPV6_DROP_MEMBERSHIP)
+#ifdef IPV6_MULTICAST_IMPLEMENTED
     const InterfaceId::PlatformType lIfIndex = aInterfaceId.GetPlatformInterface();
 
     struct ipv6_mreq lMulticastRequest;
@@ -1435,9 +1434,9 @@ CHIP_ERROR UDPEndPointImplSockets::IPv6JoinLeaveMulticastGroupImpl(InterfaceId a
         return CHIP_ERROR_POSIX(errno);
     }
     return CHIP_NO_ERROR;
-#else  // defined(INET_IPV6_ADD_MEMBERSHIP) && defined(INET_IPV6_DROP_MEMBERSHIP)
-    return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
-#endif // defined(INET_IPV6_ADD_MEMBERSHIP) && defined(INET_IPV6_DROP_MEMBERSHIP)
+#else
+    return CHIP_ERROR_NOT_IMPLEMENTED;
+#endif
 }
 
 #endif // CHIP_SYSTEM_CONFIG_USE_SOCKETS
@@ -2023,7 +2022,7 @@ void UDPEndPoint::Close()
 
 CHIP_ERROR UDPEndPoint::JoinMulticastGroup(InterfaceId aInterfaceId, const IPAddress & aAddress)
 {
-    CHIP_ERROR lRetval = CHIP_ERROR_NOT_IMPLEMENTED;
+    CHIP_ERROR lRetval = CHIP_NO_ERROR;
 
     const IPAddressType lAddrType = aAddress.Type();
     lRetval                       = CheckMulticastGroupArgs(aInterfaceId, aAddress);

src/messaging/ExchangeMgr.cpp

@@ -237,6 +237,11 @@ void ExchangeManager::OnMessageReceived(const PacketHeader & packetHeader, const
             return;
         }
     }
+    else
+    {
+        ChipLogProgress(ExchangeManager, "Received Groupcast Message with GroupId of %d",
+                        packetHeader.GetDestinationGroupId().Value());
+    }
 
     // If it's not a duplicate message, search for an unsolicited message handler if it is marked as being sent by an initiator.
     // Since we didn't find an existing exchange that matches the message, it must be an unsolicited message. However all

src/platform/Darwin/InetPlatformConfig.h

@@ -36,6 +36,10 @@
 #define INET_CONFIG_NUM_TCP_ENDPOINTS 32
 #endif // INET_CONFIG_NUM_TCP_ENDPOINTS
 
+#ifndef IPV6_MULTICAST_IMPLEMENTED
+#define IPV6_MULTICAST_IMPLEMENTED
+#endif
+
 #ifndef INET_CONFIG_NUM_UDP_ENDPOINTS
 #define INET_CONFIG_NUM_UDP_ENDPOINTS 32
 #endif // INET_CONFIG_NUM_UDP_ENDPOINTS

src/platform/Linux/InetPlatformConfig.h

@@ -36,6 +36,10 @@
 #define INET_CONFIG_NUM_TCP_ENDPOINTS 32
 #endif // INET_CONFIG_NUM_TCP_ENDPOINTS
 
+#ifndef IPV6_MULTICAST_IMPLEMENTED
+#define IPV6_MULTICAST_IMPLEMENTED
+#endif
+
 #ifndef INET_CONFIG_NUM_UDP_ENDPOINTS
 #define INET_CONFIG_NUM_UDP_ENDPOINTS 32
 #endif // INET_CONFIG_NUM_UDP_ENDPOINTS

src/transport/SessionManager.cpp

@@ -195,25 +195,44 @@ CHIP_ERROR SessionManager::SendPreparedMessage(SessionHandle sessionHandle, cons
 
     if (sessionHandle.IsSecure())
     {
-        // Find an active connection to the specified peer node
-        SecureSession * session = GetSecureSession(sessionHandle);
-        if (session == nullptr)
+        if (sessionHandle.IsGroupSession())
         {
-            ChipLogError(Inet, "Secure transport could not find a valid PeerConnection");
-            return CHIP_ERROR_NOT_CONNECTED;
+            chip::Transport::PeerAddress multicastAddress =
+                Transport::PeerAddress::Multicast(sessionHandle.GetFabricIndex(), sessionHandle.GetGroupId().Value());
+            destination = static_cast<Transport::PeerAddress *>(&multicastAddress);
+            char addressStr[Transport::PeerAddress::kMaxToStringSize];
+            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(), sessionHandle.GetGroupId().Value(),
+                            System::SystemClock().GetMonotonicMilliseconds64().count(), addressStr,
+                            sessionHandle.GetGroupId().Value(), sessionHandle.GetFabricIndex());
         }
+        else
+        {
+            // Find an active connection to the specified peer node
+            SecureSession * session = GetSecureSession(sessionHandle);
+            if (session == nullptr)
+            {
+                ChipLogError(Inet, "Secure transport could not find a valid PeerConnection");
+                return CHIP_ERROR_NOT_CONNECTED;
+            }
 
-        // This marks any connection where we send data to as 'active'
-        mSecureSessions.MarkSessionActive(session);
+            // This marks any connection where we send data to as 'active'
+            mSecureSessions.MarkSessionActive(session);
 
-        destination = &session->GetPeerAddress();
+            destination = &session->GetPeerAddress();
 
-        ChipLogProgress(Inet,
-                        "Sending %s msg %p with MessageCounter:" ChipLogFormatMessageCounter " to 0x" ChipLogFormatX64
-                        " (%u) at monotonic time: %" PRId64 " msec",
-                        "encrypted", &preparedMessage, preparedMessage.GetMessageCounter(),
-                        ChipLogValueX64(session->GetPeerNodeId()), session->GetFabricIndex(),
-                        System::SystemClock().GetMonotonicMilliseconds64().count());
+            ChipLogProgress(Inet,
+                            "Sending %s msg %p with MessageCounter:" ChipLogFormatMessageCounter " to 0x" ChipLogFormatX64
+                            " (%u) at monotonic time: %" PRId64 " msec",
+                            "encrypted", &preparedMessage, preparedMessage.GetMessageCounter(),
+                            ChipLogValueX64(session->GetPeerNodeId()), session->GetFabricIndex(),
+                            System::SystemClock().GetMonotonicMilliseconds64().count());
+        }
     }
     else
     {

src/transport/TransportMgrBase.cpp

@@ -50,6 +50,11 @@ void TransportMgrBase::Close()
     mTransport      = nullptr;
 }
 
+CHIP_ERROR TransportMgrBase::MulticastGroupJoinLeave(const Transport::PeerAddress & address, bool join)
+{
+    return mTransport->MulticastGroupJoinLeave(address, join);
+}
+
 void TransportMgrBase::HandleMessageReceived(const Transport::PeerAddress & peerAddress, System::PacketBufferHandle && msg)
 {
     if (msg->HasChainedBuffer())

src/transport/TransportMgrBase.h

@@ -43,6 +43,8 @@ class TransportMgrBase : public Transport::RawTransportDelegate
 
     void SetSessionManager(TransportMgrDelegate * sessionManager) { mSessionManager = sessionManager; }
 
+    CHIP_ERROR MulticastGroupJoinLeave(const Transport::PeerAddress & address, bool join);
+
     void HandleMessageReceived(const Transport::PeerAddress & peerAddress, System::PacketBufferHandle && msg) override;
 
 private: