changing charspan to span<unsigned char> and addressing review comments

Author: chirag-silabs

src/platform/silabs/ConnectivityManagerImpl_WIFI.cpp

@@ -438,9 +438,13 @@ void ConnectivityManagerImpl::UpdateInternetConnectivityState(void)
             config.allowedQueuedPackets = 20; // Set the desired value
 
             mEndpointQueueFilter.SetConfig(config);
-            if (mEndpointQueueFilter.SetHostName(chip::CharSpan(macaddrString)) == CHIP_NO_ERROR)
+
+            // Convert macaddrString to Span<const unsigned char>
+            Span<const unsigned char> macaddrSpan(reinterpret_cast<const unsigned char *>(macaddrString), sizeof(macaddrString));
+
+            if (mEndpointQueueFilter.SetHostName(macaddrSpan) == CHIP_NO_ERROR)
             {
-                chip::Inet::UDPEndPointImpl::SetQueueFilter(&mEndpointQueueFilter);
+                UDPEndPointImpl::SetQueueFilter(&mEndpointQueueFilter);
             }
             else
             {
@@ -449,8 +453,6 @@ void ConnectivityManagerImpl::UpdateInternetConnectivityState(void)
         }
 #endif // CHIP_CONFIG_ENABLE_ICD_SERVER
 
-        (void) PlatformMgr().PostEvent(&event);
-
         if (haveIPv4Conn != hadIPv4Conn)
         {
             ChipLogProgress(DeviceLayer, "%s Internet connectivity %s", "IPv4", (haveIPv4Conn) ? "ESTABLISHED" : "LOST");

src/platform/silabs/EndpointQueueFilter.cpp

@@ -4,14 +4,18 @@
 #include <string.h>
 #include <support/CodeUtils.h>
 #include <support/logging/CHIPLogging.h>
+#include <lib/core/CHIPSafeCasts.h>
+
+using namespace ::chip;
+
 namespace chip {
 namespace Inet {
 
 using FilterOutcome = EndpointQueueFilter::FilterOutcome;
 
 namespace {
 
-bool IsValidMdnsHostName(const CharSpan & hostName)
+bool IsValidMdnsHostName(const Span<const unsigned char> & hostName)
 {
     for (size_t i = 0; i < hostName.size(); ++i)
     {
@@ -30,7 +34,7 @@ bool IsMdnsBroadcastPacket(const IPPacketInfo & pktInfo, const System::PacketBuf
     VerifyOrReturnValue(pktInfo.DestPort == 5353, false);
 #if INET_CONFIG_ENABLE_IPV4
     ip_addr_t mdnsIPv4BroadcastAddr = IPADDR4_INIT_BYTES(224, 0, 0, 251);
-    if (pktInfo.DestAddress == Inet::IPAddress(mdnsIPv4BroadcastAddr)
+    if (pktInfo.DestAddress == Inet::IPAddress(mdnsIPv4BroadcastAddr))
     {
         return true;
     }
@@ -43,7 +47,7 @@ bool IsMdnsBroadcastPacket(const IPPacketInfo & pktInfo, const System::PacketBuf
     return false;
 }
 
-bool PayloadContainsCaseInsensitive(const System::PacketBufferHandle & payload, const ByteSpan & pattern)
+bool PayloadContainsCaseInsensitive(const System::PacketBufferHandle & payload, const Span<const unsigned char> & pattern)
 {
     if (payload->TotalLength() == 0 || pattern.size() == 0)
     {
@@ -55,15 +59,14 @@ bool PayloadContainsCaseInsensitive(const System::PacketBufferHandle & payload,
         return false;
     }
 
-    CharSpan payloadView(reinterpret_cast<const char *>(payload->Start()), payload->TotalLength());
-    CharSpan patternView(reinterpret_cast<const char *>(pattern.data()), pattern.size());
+    Span<const unsigned char> payloadView(payload->Start(), payload->TotalLength());
 
-    auto toLower = [](char c) { return std::tolower(static_cast<unsigned char>(c)); };
+    auto toLower = [](unsigned char c) { return std::tolower(static_cast<unsigned char>(c)); };
 
-    auto it = std::search(payloadView.data(), payloadView.data() + payloadView.size(), patternView.data(),
-                          patternView.data() + patternView.size(), [&](char a, char b) { return toLower(a) == toLower(b); });
+    auto it = std::search(payloadView.begin(), payloadView.end(), pattern.begin(), pattern.end(),
+                          [&](unsigned char a, unsigned char b) { return toLower(a) == toLower(b); });
 
-    return (it != payloadView.data() + payloadView.size());
+    return (it != payloadView.end());
 }
 
 } // namespace
@@ -72,16 +75,16 @@ FilterOutcome HostNameFilter::Filter(const void * endpoint, const IPPacketInfo &
                                      const System::PacketBufferHandle & pktPayload)
 {
     // Drop the mDNS packets which don't contain 'matter' or '<device-hostname>'.
-    const uint8_t matterBytes[] = { 'm', 'a', 't', 't', 'e', 'r' };
-    if (PayloadContainsCaseInsensitive(pktPayload, ByteSpan(matterBytes)) ||
-        PayloadContainsCaseInsensitive(pktPayload, ByteSpan(mHostName)))
+    const unsigned char matterBytes[] = { 'm', 'a', 't', 't', 'e', 'r' };
+    if (PayloadContainsCaseInsensitive(pktPayload, Span<const unsigned char>(matterBytes, sizeof(matterBytes))) ||
+        PayloadContainsCaseInsensitive(pktPayload, Span<const unsigned char>(mHostName, sizeof(mHostName))))
     {
         return FilterOutcome::kAllowPacket;
     }
     return FilterOutcome::kDropPacket;
 }
 
-CHIP_ERROR HostNameFilter::SetHostName(const CharSpan & hostName)
+CHIP_ERROR HostNameFilter::SetHostName(Span<const unsigned char> & hostName)
 {
     VerifyOrReturnError(IsValidMdnsHostName(hostName), CHIP_ERROR_INVALID_ARGUMENT);
     memcpy(mHostName, hostName.data(), hostName.size());

src/platform/silabs/EndpointQueueFilter.h

@@ -41,7 +41,7 @@ struct HostNameFilter : EndpointFilter
     EndpointQueueFilter::FilterOutcome Filter(const void * endpoint, const IPPacketInfo & pktInfo,
                                               const System::PacketBufferHandle & pktPayload) override;
 
-    CHIP_ERROR SetHostName(const CharSpan & name);
+    CHIP_ERROR SetHostName(Span<const unsigned char> & name);
 
 private:
     uint8_t mHostName[kHostNameLengthMax] = { 0 };
@@ -63,7 +63,7 @@ class EndpointQueueFilter : public Inet::EndpointQueueFilter
     FilterOutcome FilterAfterDequeue(const void * endpoint, const IPPacketInfo & pktInfo,
                                      const System::PacketBufferHandle & pktPayload);
 
-    CHIP_ERROR SetHostName(const CharSpan & addr) { return mHostNameFilter.SetHostName(addr); }
+    CHIP_ERROR SetHostName(Span<const unsigned char> & addr) { return mHostNameFilter.SetHostName(addr); }
 
     // Method to set the configuration
     void SetConfig(const EndpointQueueFilterConfig & config) { mConfig = config; }