@@ -210,9 +210,8 @@ CHIP_ERROR WiFiManager::Connect(const ByteSpan & ssid, const ByteSpan & credenti
210
210
{
211
211
ChipLogDetail (DeviceLayer, " Connecting to WiFi network: %*s" , ssid.size (), ssid.data ());
212
212
213
- mHandling .mOnConnectionSuccess = handling.mOnConnectionSuccess ;
214
- mHandling .mOnConnectionFailed = handling.mOnConnectionFailed ;
215
- mHandling .mConnectionTimeout = handling.mConnectionTimeout ;
213
+ mHandling .mOnConnectionDone = handling.mOnConnectionDone ;
214
+ mHandling .mConnectionTimeout = handling.mConnectionTimeout ;
216
215
217
216
mWiFiState = WIFI_STATE_ASSOCIATING;
218
217
@@ -343,11 +342,10 @@ void WiFiManager::ScanDoneHandler(Platform::UniquePtr<uint8_t> data)
343
342
{
344
343
CHIP_ERROR err = SystemLayer ().ScheduleLambda ([capturedData = data.get ()] {
345
344
Platform::UniquePtr<uint8_t > safePtr (capturedData);
346
- uint8_t * rawData = safePtr.get ();
347
- const wifi_status * status = reinterpret_cast <const wifi_status *>(rawData);
348
- WiFiRequestStatus requestStatus = static_cast <WiFiRequestStatus>(status->status );
345
+ uint8_t * rawData = safePtr.get ();
346
+ const wifi_status * status = reinterpret_cast <const wifi_status *>(rawData);
349
347
350
- if (requestStatus == WiFiRequestStatus::FAILURE )
348
+ if (status-> status )
351
349
{
352
350
ChipLogError (DeviceLayer, " Wi-Fi scan finalization failure (%d)" , status->status );
353
351
}
@@ -358,7 +356,7 @@ void WiFiManager::ScanDoneHandler(Platform::UniquePtr<uint8_t> data)
358
356
359
357
if (Instance ().mScanDoneCallback && !Instance ().mInternalScan )
360
358
{
361
- Instance ().mScanDoneCallback (requestStatus );
359
+ Instance ().mScanDoneCallback (*status );
362
360
// restore the connection state from before the scan request was issued
363
361
Instance ().mWiFiState = Instance ().mCachedWiFiState ;
364
362
return ;
@@ -379,13 +377,13 @@ void WiFiManager::ScanDoneHandler(Platform::UniquePtr<uint8_t> data)
379
377
380
378
Instance ().mWiFiState = WIFI_STATE_ASSOCIATING;
381
379
382
- if (net_mgmt (NET_REQUEST_WIFI_CONNECT, Instance ().mNetIf , &(Instance ().mWiFiParams .mParams ),
383
- sizeof (wifi_connect_req_params)))
380
+ if (int connStatus = net_mgmt (NET_REQUEST_WIFI_CONNECT, Instance ().mNetIf , &(Instance ().mWiFiParams .mParams ),
381
+ sizeof (wifi_connect_req_params)))
384
382
{
385
383
ChipLogError (DeviceLayer, " Connection request failed" );
386
- if (Instance ().mHandling .mOnConnectionFailed )
384
+ if (Instance ().mHandling .mOnConnectionDone )
387
385
{
388
- Instance ().mHandling .mOnConnectionFailed ( );
386
+ Instance ().mHandling .mOnConnectionDone (connStatus );
389
387
}
390
388
Instance ().mWiFiState = WIFI_STATE_DISCONNECTED;
391
389
return ;
@@ -424,15 +422,14 @@ void WiFiManager::ConnectHandler(Platform::UniquePtr<uint8_t> data)
424
422
Platform::UniquePtr<uint8_t > safePtr (capturedData);
425
423
uint8_t * rawData = safePtr.get ();
426
424
const wifi_status * status = reinterpret_cast <const wifi_status *>(rawData);
427
- WiFiRequestStatus requestStatus = static_cast <WiFiRequestStatus>(status->status );
428
425
429
- if (requestStatus == WiFiRequestStatus::FAILURE || requestStatus == WiFiRequestStatus::TERMINATED )
426
+ if (status-> status )
430
427
{
431
428
ChipLogProgress (DeviceLayer, " Connection to WiFi network failed or was terminated by another request" );
432
429
Instance ().mWiFiState = WIFI_STATE_DISCONNECTED;
433
- if (Instance ().mHandling .mOnConnectionFailed )
430
+ if (Instance ().mHandling .mOnConnectionDone )
434
431
{
435
- Instance ().mHandling .mOnConnectionFailed ( );
432
+ Instance ().mHandling .mOnConnectionDone (status-> status );
436
433
}
437
434
}
438
435
else // The connection has been established successfully.
@@ -444,9 +441,9 @@ void WiFiManager::ConnectHandler(Platform::UniquePtr<uint8_t> data)
444
441
445
442
ChipLogProgress (DeviceLayer, " Connected to WiFi network" );
446
443
Instance ().mWiFiState = WIFI_STATE_COMPLETED;
447
- if (Instance ().mHandling .mOnConnectionSuccess )
444
+ if (Instance ().mHandling .mOnConnectionDone )
448
445
{
449
- Instance ().mHandling .mOnConnectionSuccess ( );
446
+ Instance ().mHandling .mOnConnectionDone (status-> status );
450
447
}
451
448
Instance ().PostConnectivityStatusChange (kConnectivity_Established );
452
449
0 commit comments