using the sl_net_for_lwip.c from the wifi sdk itself

Author: chirag-silabs

src/platform/silabs/wifi/BUILD.gn

@@ -139,9 +139,7 @@ source_set("wifi-platform") {
       "${silabs_platform_dir}/wifi/SiWx/WifiInterface.cpp",
       "${silabs_platform_dir}/wifi/wiseconnect-abstraction/WiseconnectInterfaceAbstraction.cpp",
       "${silabs_platform_dir}/wifi/wiseconnect-abstraction/WiseconnectInterfaceAbstraction.h",
-
-      # Wi-Fi Config - Using the file sdk support until the wiseconnect file is fixed
-      "${matter_support_root}/sdk-copies/components/service/network_manager/src/sl_net_for_lwip.c",
+      "${wifi_sdk_root}/components/service/network_manager/src/sl_net_for_lwip.c",
     ]
 
     public_deps += [ "${lwip_root}:lwip" ]

src/platform/silabs/wifi/SiWx/WifiInterface.cpp

@@ -100,16 +100,11 @@ bool ps_requirement_added = false;
 #endif // CHIP_CONFIG_ENABLE_ICD_SERVER
 
 bool hasNotifiedWifiConnectivity = false;
-bool hasNotifiedIPV6             = false;
-#if (CHIP_DEVICE_CONFIG_ENABLE_IPV4)
-bool hasNotifiedIPV4 = false;
-#endif /* CHIP_DEVICE_CONFIG_ENABLE_IPV4 */
 
 wfx_wifi_scan_ext_t temp_reset;
 
 osSemaphoreId_t sScanCompleteSemaphore;
 osSemaphoreId_t sScanInProgressSemaphore;
-osTimerId_t sDHCPTimer;
 osMessageQueueId_t sWifiEventQueue = nullptr;
 
 sl_net_wifi_lwip_context_t wifi_client_context;
@@ -207,27 +202,6 @@ constexpr uint8_t kWfxQueueSize = 10;
 // TODO: Figure out why we actually need this, we are already handling failure and retries somewhere else.
 constexpr uint16_t kWifiScanTimeoutTicks = 10000;
 
-void DHCPTimerEventHandler(void * arg)
-{
-    WifiEvent event = WifiEvent::kStationDhcpPoll;
-    sl_matter_wifi_post_event(event);
-}
-
-void CancelDHCPTimer(void)
-{
-    VerifyOrReturn(osTimerIsRunning(sDHCPTimer), ChipLogDetail(DeviceLayer, "CancelDHCPTimer: timer not running"));
-    VerifyOrReturn(osTimerStop(sDHCPTimer) == osOK, ChipLogError(DeviceLayer, "CancelDHCPTimer: failed to stop timer"));
-}
-
-void StartDHCPTimer(uint32_t timeout)
-{
-    // Cancel timer if already started
-    CancelDHCPTimer();
-
-    VerifyOrReturn(osTimerStart(sDHCPTimer, pdMS_TO_TICKS(timeout)) == osOK,
-                   ChipLogError(DeviceLayer, "StartDHCPTimer: failed to start timer"));
-}
-
 sl_status_t sl_wifi_siwx917_init(void)
 {
     sl_status_t status = SL_STATUS_OK;
@@ -513,11 +487,6 @@ sl_status_t sl_matter_wifi_platform_init(void)
     sWifiEventQueue = osMessageQueueNew(kWfxQueueSize, sizeof(WifiEvent), nullptr);
     VerifyOrReturnError(sWifiEventQueue != nullptr, SL_STATUS_ALLOCATION_FAILED);
 
-    // Create timer for DHCP polling
-    // TODO: Use LWIP timer instead of creating a new one here
-    sDHCPTimer = osTimerNew(DHCPTimerEventHandler, osTimerPeriodic, nullptr, nullptr);
-    VerifyOrReturnError(sDHCPTimer != nullptr, SL_STATUS_ALLOCATION_FAILED);
-
     return status;
 }
 
@@ -661,53 +630,29 @@ sl_status_t bg_scan_callback_handler(sl_wifi_event_t event, sl_wifi_scan_result_
 
 /// NotifyConnectivity
 /// @brief Notify the application about the connectivity status if it has not been notified yet.
-///        Helper function for HandleDHCPPolling.
 void NotifyConnectivity(void)
 {
     VerifyOrReturn(!hasNotifiedWifiConnectivity);
     wfx_connected_notify(CONNECTION_STATUS_SUCCESS, &wfx_rsi.ap_mac);
     hasNotifiedWifiConnectivity = true;
 }
 
-void HandleDHCPPolling(void)
+/// NotifySuccessfulConnection
+/// @brief Processing function responsible for notifying the upper layers of a succesful connection attempt.
+void NotifySuccessfulConnection(void)
 {
-    WifiEvent event;
-
-    // TODO: Notify the application that the interface is not set up or Chipdie here because we are in an unkonwn state
     struct netif * sta_netif = &wifi_client_context.netif;
     VerifyOrReturn(sta_netif != nullptr, ChipLogError(DeviceLayer, "HandleDHCPPolling: failed to get STA netif"));
-
 #if (CHIP_DEVICE_CONFIG_ENABLE_IPV4)
-    uint8_t dhcp_state = dhcpclient_poll(sta_netif);
-    if (dhcp_state == DHCP_ADDRESS_ASSIGNED && !hasNotifiedIPV4)
-    {
-        wfx_dhcp_got_ipv4((uint32_t) sta_netif->ip_addr.u_addr.ip4.addr);
-        hasNotifiedIPV4 = true;
-        event           = WifiEvent::kStationDhcpDone;
-        sl_matter_wifi_post_event(event);
-        NotifyConnectivity();
-    }
-    else if (dhcp_state == DHCP_OFF)
-    {
-        wfx_ip_changed_notify(IP_STATUS_FAIL);
-        hasNotifiedIPV4 = false;
-    }
+    wfx_dhcp_got_ipv4((uint32_t) sta_netif->ip_addr.u_addr.ip4.addr)
 #endif /* CHIP_DEVICE_CONFIG_ENABLE_IPV4 */
-    /* Checks if the assigned IPv6 address is preferred by evaluating
-     * the first block of IPv6 address ( block 0)
-     */
-    if ((ip6_addr_ispreferred(netif_ip6_addr_state(sta_netif, 0))) && !hasNotifiedIPV6)
-    {
-        char addrStr[chip::Inet::IPAddress::kMaxStringLength] = { 0 };
-        VerifyOrReturn(ip6addr_ntoa_r(netif_ip6_addr(sta_netif, 0), addrStr, sizeof(addrStr)) != nullptr);
-        ChipLogProgress(DeviceLayer, "SLAAC OK: linklocal addr: %s", addrStr);
-        wfx_ipv6_notify(GET_IPV6_SUCCESS);
-        hasNotifiedIPV6 = true;
-        event           = WifiEvent::kStationDhcpDone;
-        sl_matter_wifi_post_event(event);
-        NotifyConnectivity();
-    }
+    char addrStr[chip::Inet::IPAddress::kMaxStringLength] = { 0 };
+    VerifyOrReturn(ip6addr_ntoa_r(netif_ip6_addr(sta_netif, 0), addrStr, sizeof(addrStr)) != nullptr);
+    ChipLogProgress(DeviceLayer, "SLAAC OK: linklocal addr: %s", addrStr);
+    wfx_ipv6_notify(GET_IPV6_SUCCESS);
+    NotifyConnectivity();
 }
+
 void sl_matter_wifi_post_event(WifiEvent event)
 {
     sl_status_t status = osMessageQueuePut(sWifiEventQueue, &event, 0, 0);
@@ -719,19 +664,14 @@ void sl_matter_wifi_post_event(WifiEvent event)
         // Chipdie, etc.
     }
 }
-/// ResetDHCPNotificationFlags
+/// ResetConnectivityNotificationFlags
 /// @brief Reset the flags that are used to notify the application about DHCP connectivity
-///        and emits a WifiEvent::kStationDoDhcp event to trigger DHCP polling checks. Helper function for ProcessEvent.
-void ResetDHCPNotificationFlags(void)
+///        and emits a WifiEvent::kConnectionComplete event to trigger DHCP polling checks. Helper function for ProcessEvent.
+void ResetConnectivityNotificationFlags(void)
 {
-
-#if (CHIP_DEVICE_CONFIG_ENABLE_IPV4)
-    hasNotifiedIPV4 = false;
-#endif // CHIP_DEVICE_CONFIG_ENABLE_IPV4
-    hasNotifiedIPV6             = false;
     hasNotifiedWifiConnectivity = false;
 
-    WifiEvent event = WifiEvent::kStationDoDhcp;
+    WifiEvent event = WifiEvent::kConnectionComplete;
     sl_matter_wifi_post_event(event);
 }
 
@@ -743,7 +683,7 @@ void ProcessEvent(WifiEvent event)
     case WifiEvent::kStationConnect:
         ChipLogDetail(DeviceLayer, "WifiEvent::kStationConnect");
         wfx_rsi.dev_state.Set(WifiState::kStationConnected);
-        ResetDHCPNotificationFlags();
+        ResetConnectivityNotificationFlags();
         break;
 
     case WifiEvent::kStationDisconnect: {
@@ -756,7 +696,7 @@ void ProcessEvent(WifiEvent event)
             .Clear(WifiState::kStationDhcpDone);
 
         /* TODO: Implement disconnect notify */
-        ResetDHCPNotificationFlags();
+        ResetConnectivityNotificationFlags();
 #if (CHIP_DEVICE_CONFIG_ENABLE_IPV4)
         wfx_ip_changed_notify(0); // for IPV4
         wfx_ip_changed_notify(IP_STATUS_FAIL);
@@ -833,20 +773,9 @@ void ProcessEvent(WifiEvent event)
         JoinWifiNetwork();
         break;
 
-    case WifiEvent::kStationDoDhcp:
-        ChipLogDetail(DeviceLayer, "WifiEvent::kStationDoDhcp");
-        StartDHCPTimer(WFX_RSI_DHCP_POLL_INTERVAL);
-        break;
-
-    case WifiEvent::kStationDhcpDone:
-        ChipLogDetail(DeviceLayer, "WifiEvent::kStationDhcpDone");
-        CancelDHCPTimer();
-        break;
-
-    case WifiEvent::kStationDhcpPoll:
-        ChipLogDetail(DeviceLayer, "WifiEvent::kStationDhcpPoll");
-        HandleDHCPPolling();
-        break;
+    case WifiEvent::kConnectionComplete:
+        ChipLogDetail(DeviceLayer, "WifiPlatformEvent::kConnectionComplete");
+        NotifySuccessfulConnection();
 
     default:
         break;
@@ -917,6 +846,7 @@ void wfx_dhcp_got_ipv4(uint32_t ip)
 }
 #endif /* CHIP_DEVICE_CONFIG_ENABLE_IPV4 */
 
+
 #if CHIP_CONFIG_ENABLE_ICD_SERVER
 sl_status_t ConfigurePowerSave(rsi_power_save_profile_mode_t sl_si91x_ble_state, sl_si91x_performance_profile_t sl_si91x_wifi_state,
                                uint32_t listenInterval)

src/platform/silabs/wifi/WifiInterfaceAbstraction.h

@@ -87,15 +87,15 @@ enum class WifiState : uint16_t
 
 enum class WifiEvent : uint8_t
 {
-    kStationConnect    = 0,
-    kStationDisconnect = 1,
-    kAPStart           = 2,
-    kAPStop            = 3,
-    kScan              = 4, /* This is used as scan result and start */
-    kStationStartJoin  = 5,
-    kStationDoDhcp     = 6,
-    kStationDhcpDone   = 7,
-    kStationDhcpPoll   = 8
+    kStationConnect     = 0,
+    kStationDisconnect  = 1,
+    kAPStart            = 2,
+    kAPStop             = 3,
+    kScan               = 4, /* This is used as scan result and start */
+    kStationStartJoin   = 5,
+    kConnectionComplete = 6,
+    kStationDhcpDone    = 7,
+    kStationDhcpPoll    = 8
 };
 
 typedef enum

src/platform/silabs/wifi/rs911x/WifiInterface.cpp

@@ -606,7 +606,7 @@ void HandleDHCPPolling(void)
 
 /** ResetDHCPNotificationFlags
  *  @brief Reset the flags that are used to notify the application about DHCP connectivity
- *         and emits a WifiEvent::kStationDoDhcp event to trigger DHCP polling checks. Helper function for ProcessEvent.
+ *         and emits a WifiEvent::kConnectionComplete event to trigger DHCP polling checks. Helper function for ProcessEvent.
  */
 void ResetDHCPNotificationFlags(void)
 {
@@ -618,7 +618,7 @@ void ResetDHCPNotificationFlags(void)
     hasNotifiedIPV6             = false;
     hasNotifiedWifiConnectivity = false;
 
-    outEvent = WifiEvent::kStationDoDhcp;
+    outEvent = WifiEvent::kConnectionComplete;
     sl_matter_wifi_post_event(outEvent);
 }
 
@@ -752,7 +752,7 @@ void ProcessEvent(WifiEvent event)
         sl_wifi_platform_join_network();
     }
     break;
-    case WifiEvent::kStationDoDhcp: {
+    case WifiEvent::kConnectionComplete: {
         StartDHCPTimer(WFX_RSI_DHCP_POLL_INTERVAL);
     }
     break;

src/platform/silabs/wifi/rs911x/rs9117.gni

@@ -44,9 +44,6 @@ rs9117_src_sapi = [
   "${wifi_sdk_root}/components/device/silabs/si91x/wireless/ncp_interface/spi/sl_si91x_spi.c",
   "${wifi_sdk_root}/components/device/silabs/si91x/wireless/ncp_interface/sl_si91x_ncp_driver.c",
 
-  # Wi-Fi Config - Using the file sdk support until the wiseconnect file is fixed
-  "${matter_support_root}/sdk-copies/components/service/network_manager/src/sl_net_for_lwip.c",
-
   # wifi component
   "${wifi_sdk_root}/components/protocol/wifi/src/sl_wifi_basic_credentials.c",
   "${wifi_sdk_root}/components/protocol/wifi/src/sl_wifi_callback_framework.c",
@@ -55,6 +52,7 @@ rs9117_src_sapi = [
   # basic_network_manager component
   "${wifi_sdk_root}/components/service/network_manager/src/sl_net_credentials.c",
   "${wifi_sdk_root}/components/service/network_manager/src/sl_net_basic_profiles.c",
+  "${wifi_sdk_root}/components/service/network_manager/src/sl_net_for_lwip.c",
 
   # si91x_basic_buffers component
   "${wifi_sdk_root}/components/device/silabs/si91x/wireless/memory/malloc_buffers.c",