From 0f3a67a95bd49ac37974e0ae33ad3e6554e32a56 Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Tue, 12 Oct 2021 08:20:21 +0000 Subject: [PATCH 001/491] 1. Modify scan control strategy for App; 2. Resolve can't auto-reconnect and unexpected disconnection problem; 3. Resolve possibly use wrong id to disable network when connection is timeout Signed-off-by: zhangfeng --- .../wifi_standard/interfaces/wifi_msg.h | 9 +- .../common/config/wifi_settings.h | 2 +- .../wifi_manage/wifi_config_center.h | 2 +- .../wifi_manage/wifi_scan/scan_service.cpp | 2 +- .../wifi_sta/sta_saved_device_appraisal.cpp | 6 +- .../wifi_sta/sta_state_machine.cpp | 201 ++++++++---------- .../wifi_manage/wifi_sta/sta_state_machine.h | 6 +- .../sta_saved_device_appraisal_test.cpp | 17 -- 8 files changed, 98 insertions(+), 147 deletions(-) diff --git a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_msg.h b/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_msg.h index e2dbde2..69d7d9b 100755 --- a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_msg.h +++ b/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_msg.h @@ -143,11 +143,8 @@ struct WpsConfig { }; enum class WifiDeviceConfigStatus { - INVALID = -1, /* invalid */ - CURRENT = 0, /* using */ - DISABLED = 1, /* disabled */ - ENABLED = 2, /* enable */ - + ENABLED, /* enable */ + DISABLED, /* disabled */ UNKNOWN }; @@ -342,7 +339,7 @@ struct WifiDeviceConfig { WifiDeviceConfig() { networkId = INVALID_NETWORK_ID; - status = static_cast(WifiDeviceConfigStatus::INVALID); + status = static_cast(WifiDeviceConfigStatus::ENABLED); band = 0; channel = 0; frequency = 0; diff --git a/services/wifi_standard/wifi_framework/common/config/wifi_settings.h b/services/wifi_standard/wifi_framework/common/config/wifi_settings.h index 54a5015..fc82dd5 100644 --- a/services/wifi_standard/wifi_framework/common/config/wifi_settings.h +++ b/services/wifi_standard/wifi_framework/common/config/wifi_settings.h @@ -230,7 +230,7 @@ public: * when the param bSetOther is true and the state is ENABLED, that means we need * to set other wifi device DISABLED * @param networkId - the wifi device's id - * @param state - WifiDeviceConfigStatus INVALID/CURRENT/DISABLED/ENABLED/UNKNOWN + * @param state - WifiDeviceConfigStatus DISABLED/ENABLED/UNKNOWN * @param bSetOther - whether set other device config disabled * @return int - when 0 means success, other means some fails happened, * Input state invalid or not find the wifi device config diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.h index e6c6950..c2e2e68 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.h @@ -147,7 +147,7 @@ public: * when the param bSetOther is true and the state is ENABLED, that means we need * to set other wifi device DISABLED * @param networkId - the wifi device's id - * @param state - WifiDeviceConfigStatus INVALID/CURRENT/DISABLED/ENABLED/UNKNOWN + * @param state - WifiDeviceConfigStatus DISABLED/ENABLED/UNKNOWN * @param bSetOther - whether set other device config disabled * @return int - when 0 means success, other means some fails happened, * Input state invalid or not find the wifi device config diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp index d1eb516..b4ff9f7 100755 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp @@ -34,7 +34,7 @@ ScanService::ScanService() autoNetworkSelection(false), lastSystemScanTime(0), pnoScanFailedNum(0), - operateAppMode(0), + operateAppMode(static_cast(ScanMode::SYS_FOREGROUND_SCAN)), customScene(SCAN_SCENE_ALL), staCurrentTime(0), customCurrentTime(0) diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp index 3b2db99..b62be20 100755 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp @@ -98,10 +98,8 @@ bool StaSavedDeviceAppraisal::WhetherSkipDevice(WifiDeviceConfig &device) return false; } - if ((device.status != static_cast(WifiDeviceConfigStatus::ENABLED)) && - (device.status != static_cast(WifiDeviceConfigStatus::CURRENT))) { - WIFI_LOGI("Skip disable Network %s.NetworkId is %{public}d", device.ssid.c_str(), device.networkId); - return false; + if (device.status == static_cast(WifiDeviceConfigStatus::DISABLED)) { + return true; } return true; } diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp index b984f65..4554a5a 100755 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp @@ -46,7 +46,6 @@ namespace OHOS { namespace Wifi { StaStateMachine::StaStateMachine() : StateMachine("StaStateMachine"), - statusId(0), lastNetworkId(INVALID_NETWORK_ID), operationalMode(STA_CONNECT_MODE), targetNetworkId(INVALID_NETWORK_ID), @@ -358,8 +357,40 @@ ErrCode StaStateMachine::ConvertDeviceCfg(const WifiDeviceConfig &config) const return WIFI_OPT_SUCCESS; } +void StaStateMachine::SyncDeviceConfigToWpa() const +{ + /* Reload wifi Configurations. */ + if (WifiSettings::GetInstance().ReloadDeviceConfig() != 0) { + WIFI_LOGE("ReloadDeviceConfig is failed!"); + } + + if (WifiStaHalInterface::GetInstance().ClearDeviceConfig() != WIFI_IDL_OPT_OK) { + WIFI_LOGE("ClearDeviceConfig() failed!"); + } else { + WIFI_LOGD("ClearDeviceConfig() successed!"); + std::vector results; + WifiSettings::GetInstance().GetDeviceConfig(results); + for(WifiDeviceConfig result : results) { + WIFI_LOGD("SyncDeviceConfigToWpa:result.networkId=[%d]!", result.networkId); + int networkId = INVALID_NETWORK_ID; + if (WifiStaHalInterface::GetInstance().GetNextNetworkId(networkId) != WIFI_IDL_OPT_OK) { + WIFI_LOGE("GetNextNetworkId failed."); + return; + } + if (networkId != result.networkId) { + WIFI_LOGE("DeviceConfig networkId different from wpa config networkId."); + return; + } + ConvertDeviceCfg(result); + } + WIFI_LOGD("SyncDeviceConfigToWpa-SaveDeviceConfig() succeed!"); + } +} + void StaStateMachine::StartWifiProcess() { + WifiSettings::GetInstance().SetWifiState(static_cast(WifiState::ENABLING)); + staCallback.OnStaOpenRes(OperateResState::OPEN_WIFI_OPENING); int res = WifiStaHalInterface::GetInstance().StartWifi(); if (res == static_cast(WIFI_IDL_OPT_OK)) { WIFI_LOGD("Start wifi successfully!"); @@ -367,25 +398,15 @@ void StaStateMachine::StartWifiProcess() WIFI_LOGI("The automatic Wpa connection is disabled failed."); } - /* Reload wifi Configurations. */ - if (WifiSettings::GetInstance().ReloadDeviceConfig() != 0) { - WIFI_LOGE("ReloadDeviceConfig() failed!"); - } - - /* Sets the MAC address of WifiSettings. */ - std::string mac; - if ((WifiStaHalInterface::GetInstance().GetStaDeviceMacAddress(mac)) != WIFI_IDL_OPT_OK) { - WIFI_LOGI("GetStaDeviceMacAddress failed!"); - } else { - WifiSettings::GetInstance().SetMacAddress(mac); - } + /* callback the InterfaceService that wifi is enabled successfully. */ + WifiSettings::GetInstance().SetWifiState(static_cast(WifiState::ENABLED)); + staCallback.OnStaOpenRes(OperateResState::OPEN_WIFI_SUCCEED); /* Initialize Connection Information. */ InitWifiLinkedInfo(); InitLastWifiLinkedInfo(); WifiSettings::GetInstance().SaveLinkedInfo(linkedInfo); + SyncDeviceConfigToWpa(); - /* callback the InterfaceService that wifi is enabled successfully. */ - staCallback.OnStaOpenRes(OperateResState::OPEN_WIFI_SUCCEED); /* The current state of StaStateMachine transfers to SeparatedState after * enable supplicant. */ @@ -393,6 +414,7 @@ void StaStateMachine::StartWifiProcess() } else { /* Notify the InterfaceService that wifi is failed to enable wifi. */ LOGE("StartWifi failed, and errcode is %d", res); + WifiSettings::GetInstance().SetWifiState(static_cast(WifiState::DISABLED)); staCallback.OnStaOpenRes(OperateResState::OPEN_WIFI_FAILED); staCallback.OnStaOpenRes(OperateResState::OPEN_WIFI_DISABLED); } @@ -454,8 +476,6 @@ void StaStateMachine::WpaStartedState::GoInState() { WIFI_LOGD("WpaStartedState GoInState function."); if (pStaStateMachine->operationalMode == STA_CONNECT_MODE) { - /* Update the wifi status. */ - WifiSettings::GetInstance().SetWifiState(static_cast(WifiState::ENABLING)); pStaStateMachine->SwitchState(pStaStateMachine->pSeparatedState); } else if (pStaStateMachine->operationalMode == STA_DISABLED_MODE) { pStaStateMachine->SwitchState(pStaStateMachine->pWpaStoppingState); @@ -508,25 +528,15 @@ bool StaStateMachine::WpaStartedState::ExecuteStateMsg(InternalMessage *msg) void StaStateMachine::StopWifiProcess() { WIFI_LOGD("Enter StaStateMachine::StopWifiProcess.\n"); + WifiSettings::GetInstance().SetWifiState(static_cast(WifiState::DISABLING)); + staCallback.OnStaCloseRes(OperateResState::CLOSE_WIFI_CLOSING); if (currentTpType == IPTYPE_IPV4) { pDhcpService->StopDhcpClient(IF_NAME, false); } else { pDhcpService->StopDhcpClient(IF_NAME, true); } isRoam = false; - if (lastNetworkId != INVALID_NETWORK_ID) { - if (statusId == static_cast(WifiDeviceConfigStatus::DISABLED)) { - WIFI_LOGD("The network status is DISABLED:1.\n"); - WifiSettings::GetInstance().SetDeviceState( - lastNetworkId, static_cast(WifiDeviceConfigStatus::DISABLED)); - } else if (statusId == static_cast(WifiDeviceConfigStatus::ENABLED)) { - WIFI_LOGD("The network status is ENABLED:2.\n"); - WifiSettings::GetInstance().SetDeviceState( - lastNetworkId, static_cast(WifiDeviceConfigStatus::ENABLED)); - } - WifiSettings::GetInstance().SyncDeviceConfig(); - } - WIFI_LOGD("linkedInfo network = %{public}d", linkedInfo.networkId); + WifiSettings::GetInstance().SetMacAddress(""); IpInfo ipInfo; WifiSettings::GetInstance().SaveIpInfo(ipInfo); @@ -538,6 +548,7 @@ void StaStateMachine::StopWifiProcess() WifiErrorNo errorNo = WifiStaHalInterface::GetInstance().StopWifi(); if (errorNo == WIFI_IDL_OPT_OK) { + WifiSettings::GetInstance().SetWifiState(static_cast(WifiState::DISABLED)); /* Notify result to InterfaceService. */ staCallback.OnStaCloseRes(OperateResState::CLOSE_WIFI_SUCCEED); WIFI_LOGD("Stop WifiProcess successfully!"); @@ -545,7 +556,8 @@ void StaStateMachine::StopWifiProcess() /* The current state of StaStateMachine transfers to InitState. */ SwitchState(pInitState); } else { - LOGE("StopWifiProcess failed，and errcode is %d", errorNo); + LOGE("StopWifiProcess failed, and errcode is %d", errorNo); + WifiSettings::GetInstance().SetWifiState(static_cast(WifiState::UNKNOWN)); staCallback.OnStaCloseRes(OperateResState::CLOSE_WIFI_FAILED); } } @@ -660,7 +672,6 @@ bool StaStateMachine::LinkState::ExecuteStateMsg(InternalMessage *msg) /* -- state machine Connect State Message processing function -- */ int StaStateMachine::InitStaSMHandleMap() { - staSmHandleFuncMap[CMD_START_CONNECT_SELECTED_NETWORK] = &StaStateMachine::DealConnectToSelectedNetCmd; staSmHandleFuncMap[WIFI_SVR_CMD_STA_CONNECT_NETWORK] = &StaStateMachine::DealConnectToUserSelectedNetwork; staSmHandleFuncMap[WIFI_SVR_CMD_STA_CONNECT_SAVED_NETWORK] = &StaStateMachine::DealConnectToUserSelectedNetwork; staSmHandleFuncMap[WIFI_SVR_CMD_STA_NETWORK_DISCONNECTION_EVENT] = &StaStateMachine::DealDisconnectEvent; @@ -686,72 +697,30 @@ void StaStateMachine::DealConnectToUserSelectedNetwork(InternalMessage *msg) int networkId = msg->GetParam1(); bool forceReconnect = msg->GetParam2(); + if (linkedInfo.connState == ConnState::CONNECTED && networkId == linkedInfo.networkId) { + WIFI_LOGE("This network is in use and does not need to be reconnected.\n"); + return; + } + /* Sets network status. */ WifiSettings::GetInstance().EnableNetwork(networkId, forceReconnect); + WifiSettings::GetInstance().SetDeviceState(networkId, (int)WifiDeviceConfigStatus::ENABLED, false); StartConnectToNetwork(networkId); } -void StaStateMachine::DealConnectToSelectedNetCmd(InternalMessage *msg) +void StaStateMachine::DealConnectTimeOutCmd(InternalMessage *msg) { if (msg == nullptr) { - return; - } - - WIFI_LOGD("Enter StaStateMachine::DealConnectToSelectedNetCmd.\n"); - WifiDeviceConfig config; - targetNetworkId = msg->GetParam1(); - - SetRandomMac(targetNetworkId); - - /* Sets linkedinfo */ - linkedInfo.networkId = targetNetworkId; - linkedInfo.ssid = config.ssid; - lastLinkedInfo.networkId = targetNetworkId; - lastLinkedInfo.ssid = config.ssid; - - /* test */ - std::string countryCode; - if (WifiSupplicantHalInterface::GetInstance().WpaGetCountryCode(countryCode) != WIFI_IDL_OPT_OK) { - WIFI_LOGE("WpaGetCountryCode() failed!"); + WIFI_LOGE("msg is nul\n"); } - WIFI_LOGD("WpaGetCountryCode() success countryCode=%{public}s!", countryCode.c_str()); - - if (WifiStaHalInterface::GetInstance().EnableNetwork(targetNetworkId) == WIFI_IDL_OPT_OK) { - WIFI_LOGD("EnableNetwork() succeed!"); - int connRes = WifiStaHalInterface::GetInstance().Connect(targetNetworkId); - if (connRes == static_cast(WIFI_IDL_OPT_OK)) { - WIFI_LOGD("Connect() succeed!"); - - if (WifiStaHalInterface::GetInstance().SaveDeviceConfig() != WIFI_IDL_OPT_OK) { - WIFI_LOGW("SaveDeviceConfig() failed!"); - } else { - WIFI_LOGD("SaveDeviceConfig() succeed!"); - } - /* Update wifi status. */ - WifiSettings::GetInstance().SetWifiState(static_cast(WifiState::ENABLING)); - - /* Save connection information. */ - SaveLinkstate(ConnState::CONNECTING, DetailedState::CONNECTING); - /* Callback result to InterfaceService. */ - staCallback.OnStaConnChanged(OperateResState::CONNECT_CONNECTING, linkedInfo); - StartTimer(static_cast(CMD_NETWORK_CONNECT_TIMEOUT), STA_NETWORK_CONNECTTING_DELAY); - } else { - WIFI_LOGE("Connect failed!"); - staCallback.OnStaConnChanged(OperateResState::CONNECT_SELECT_NETWORK_FAILED, linkedInfo); - } - } else { - WIFI_LOGE("EnableNetwork() failed!"); + if (linkedInfo.connState == ConnState::CONNECTED) { + WIFI_LOGE("Currently connected and do not process timeout.\n"); + return; } -} -void StaStateMachine::DealConnectTimeOutCmd(InternalMessage *msg) -{ - if (msg == nullptr) { - WIFI_LOGE("msg is nul\n"); - } WIFI_LOGD("enter DealDisableOneNetCmd\n"); - DisableNetwork(linkedInfo.networkId); + DisableNetwork(targetNetworkId); InitWifiLinkedInfo(); WifiSettings::GetInstance().SaveLinkedInfo(linkedInfo); staCallback.OnStaConnChanged(OperateResState::CONNECT_CONNECTING_TIMEOUT, linkedInfo); @@ -796,18 +765,6 @@ void StaStateMachine::DealDisconnectEvent(InternalMessage *msg) getIpSucNum = 0; getIpFailNum = 0; isRoam = false; - if (statusId == static_cast(WifiDeviceConfigStatus::DISABLED)) { - WIFI_LOGD("The network status is DISABLED:1.\n"); - WifiSettings::GetInstance().SetDeviceState(lastNetworkId, static_cast(WifiDeviceConfigStatus::DISABLED)); - } else if (statusId == static_cast(WifiDeviceConfigStatus::ENABLED)) { - WIFI_LOGD("The network status is ENABLED:2.\n"); - WifiSettings::GetInstance().SetDeviceState(lastNetworkId, static_cast(WifiDeviceConfigStatus::ENABLED)); - } else { - WIFI_LOGI("The network status is other:%{public}d.\n", statusId); - } - - WifiSettings::GetInstance().SyncDeviceConfig(); - statusId = static_cast(WifiDeviceConfigStatus::INVALID); IpInfo ipInfo; WifiSettings::GetInstance().SaveIpInfo(ipInfo); @@ -1057,14 +1014,33 @@ void StaStateMachine::DealStartRoamCmd(InternalMessage *msg) void StaStateMachine::StartConnectToNetwork(int networkId) { - InternalMessage *msg = CreateMessage(); - if (msg == nullptr) { + targetNetworkId = networkId; + SetRandomMac(targetNetworkId); + if (WifiStaHalInterface::GetInstance().EnableNetwork(targetNetworkId) != WIFI_IDL_OPT_OK) { + LOGE("EnableNetwork() failed!"); return; } - msg->SetMessageName(CMD_START_CONNECT_SELECTED_NETWORK); - msg->SetParam1(networkId); - SendMessage(msg); + if (WifiStaHalInterface::GetInstance().Connect(targetNetworkId) != WIFI_IDL_OPT_OK) { + LOGE("Connect failed!"); + staCallback.OnStaConnChanged(OperateResState::CONNECT_SELECT_NETWORK_FAILED, linkedInfo); + return; + } + + if (WifiStaHalInterface::GetInstance().SaveDeviceConfig() != WIFI_IDL_OPT_OK) { + LOGE("SaveDeviceConfig() failed!"); + } + + /* Update wifi status. */ + WifiSettings::GetInstance().SetWifiState(static_cast(WifiState::ENABLING)); + + /* Save connection information. */ + SaveLinkstate(ConnState::CONNECTING, DetailedState::CONNECTING); + + /* Callback result to InterfaceService. */ + staCallback.OnStaConnChanged(OperateResState::CONNECT_CONNECTING, linkedInfo); + StopTimer(static_cast(CMD_NETWORK_CONNECT_TIMEOUT)); + StartTimer(static_cast(CMD_NETWORK_CONNECT_TIMEOUT), STA_NETWORK_CONNECTTING_DELAY); } void StaStateMachine::StartRoamToNetwork(std::string bssid) @@ -1401,7 +1377,6 @@ bool StaStateMachine::StaWpsState::ExecuteStateMsg(InternalMessage *msg) } case WIFI_SVR_CMD_STA_CANCELWPS: { ret = EXECUTED; - pStaStateMachine->SyncAllDeviceConfigs(); pStaStateMachine->DealCancelWpsCmd(msg); break; } @@ -1447,7 +1422,7 @@ void StaStateMachine::SyncAllDeviceConfigs() } } -/* --------------------------- state machine ObtainingIp State ------------------------------ */ +/* --------------------------- state machine GetIp State ------------------------------ */ StaStateMachine::GetIpState::GetIpState(StaStateMachine *staStateMachine) : State("GetIpState"), pStaStateMachine(staStateMachine) {} @@ -1458,7 +1433,6 @@ StaStateMachine::GetIpState::~GetIpState() void StaStateMachine::GetIpState::GoInState() { WIFI_LOGI("GetIpState GoInState function."); - WifiDeviceConfig config; AssignIpMethod assignMethod = AssignIpMethod::DHCP; int ret = WifiSettings::GetInstance().GetDeviceConfig(pStaStateMachine->linkedInfo.networkId, config); @@ -1521,11 +1495,11 @@ bool StaStateMachine::GetIpState::ExecuteStateMsg(InternalMessage *msg) } bool ret = NOT_EXECUTED; - WIFI_LOGI("RootState-msgCode=%{public}d not handled.\n", msg->GetMessageName()); + WIFI_LOGI("GetIpState-msgCode=%{public}d not handled.\n", msg->GetMessageName()); return ret; } -/* --- state machine ObtainingIp State functions ----- */ +/* --- state machine GetIp State functions ----- */ bool StaStateMachine::ConfigStaticIpAddress(StaticIpAddress &staticIpAddress) { WIFI_LOGI("Enter StaStateMachine::SetDhcpResultFromStatic."); @@ -1589,14 +1563,12 @@ void StaStateMachine::HandleNetCheckResult(StaNetState netState) WIFI_LOGI("HandleNetCheckResult network state is working\n"); /* Save connection information to WifiSettings. */ SaveLinkstate(ConnState::CONNECTED, DetailedState::WORKING); - statusId = static_cast(WifiDeviceConfigStatus::ENABLED); staCallback.OnStaConnChanged(OperateResState::CONNECT_NETWORK_ENABLED, linkedInfo); /* The current state of StaStateMachine transfers to LinkedState. */ SwitchState(pLinkedState); } else { WIFI_LOGI("HandleNetCheckResult network state is notworking\n"); SaveLinkstate(ConnState::CONNECTED, DetailedState::NOTWORKING); - statusId = static_cast(WifiDeviceConfigStatus::DISABLED); staCallback.OnStaConnChanged(OperateResState::CONNECT_NETWORK_DISABLED, linkedInfo); } } @@ -1652,7 +1624,7 @@ bool StaStateMachine::LinkedState::ExecuteStateMsg(InternalMessage *msg) } bool ret = NOT_EXECUTED; - WIFI_LOGI("RootState-msgCode=%{public}d not handled.\n", msg->GetMessageName()); + WIFI_LOGI("LinkedState-msgCode=%{public}d not handled.\n", msg->GetMessageName()); return ret; } @@ -1715,8 +1687,6 @@ void StaStateMachine::ConnectToNetworkProcess(InternalMessage *msg) WIFI_LOGI("Device config networkId = %{public}d", deviceConfig.networkId); WIFI_LOGI("Connected to AP[networkid=%{public}d], obtaining ip...", lastNetworkId); - /* Update wifi status. */ - WifiSettings::GetInstance().SetWifiState(static_cast(WifiState::ENABLED)); /* Save connection information. */ WifiIdlGetDeviceConfig config; @@ -1743,14 +1713,15 @@ void StaStateMachine::ConnectToNetworkProcess(InternalMessage *msg) WifiSettings::GetInstance().SyncDeviceConfig(); WIFI_LOGD("Device ssid = %s", deviceConfig.ssid.c_str()); } - WifiSettings::GetInstance().SetDeviceState(lastNetworkId, static_cast(WifiDeviceConfigStatus::CURRENT)); - WIFI_LOGD("The network status is CURRENT:0."); + linkedInfo.networkId = lastNetworkId; linkedInfo.bssid = bssid; linkedInfo.ssid = deviceConfig.ssid; linkedInfo.macAddress = deviceConfig.macAddress; + linkedInfo.ifHiddenSSID = deviceConfig.hiddenSSID; lastLinkedInfo.bssid = bssid; lastLinkedInfo.macAddress = deviceConfig.macAddress; + lastLinkedInfo.ifHiddenSSID = deviceConfig.hiddenSSID; SetWifiLinkedInfo(lastNetworkId); SaveLinkstate(ConnState::OBTAINING_IPADDR, DetailedState::OBTAINING_IPADDR); } diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h index 4eaf829..06d9b21 100755 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h @@ -40,7 +40,6 @@ static const int STA_DISABLED_MODE = 4; static const int CMD_START_WIFI_SUCCESS = 0x01; static const int CMD_STOP_WIFI_SUCCESS = 0x02; static const int CMD_CONNECT_NETWORK = 0x03; -static const int CMD_START_CONNECT_SELECTED_NETWORK = 0x04; static const int CMD_DISCONNECT_NETWORK = 0X05; static const int CMD_SYNC_LINKINFO = 0X06; static const int CMD_GET_NETWORK_SPEED = 0X07; @@ -423,6 +422,10 @@ private: * */ void StartWifiProcess(); + /** + * @Description Synchronize the deviceConfig structure to wpa_supplicant + */ + void SyncDeviceConfigToWpa() const; /** * @Description Update wifi status and save connection information. * @@ -594,7 +597,6 @@ private: StaSmHandleFuncMap staSmHandleFuncMap; StaServiceCallback staCallback; - int statusId; int lastNetworkId; int operationalMode; int targetNetworkId; diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal_test.cpp b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal_test.cpp index 8b99c6e..d9d7453 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal_test.cpp +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal_test.cpp @@ -66,7 +66,6 @@ public: void AppraiseDeviceQualitySuccess1(); void AppraiseDeviceQualitySuccess2(); void WhetherSkipDeviceSuccess1(); - void WhetherSkipDeviceSuccess2(); void WhetherSkipDeviceFail1(); public: @@ -225,17 +224,6 @@ void StaSavedDeviceAppraisalTest::WhetherSkipDeviceSuccess1() EXPECT_TRUE(pStaSavedDeviceAppraisal->WhetherSkipDevice(deviceConfig) == true); } -void StaSavedDeviceAppraisalTest::WhetherSkipDeviceSuccess2() -{ - WifiDeviceConfig deviceConfig; - GetWifiDeviceConfig(deviceConfig); - - deviceConfig.isPasspoint = false; - deviceConfig.isEphemeral = false; - deviceConfig.status = static_cast(WifiDeviceConfigStatus::CURRENT); - EXPECT_TRUE(pStaSavedDeviceAppraisal->WhetherSkipDevice(deviceConfig) == true); -} - void StaSavedDeviceAppraisalTest::WhetherSkipDeviceFail1() { WifiDeviceConfig deviceConfig; @@ -276,11 +264,6 @@ HWTEST_F(StaSavedDeviceAppraisalTest, WhetherSkipDeviceSuccess1, TestSize.Level1 WhetherSkipDeviceSuccess1(); } -HWTEST_F(StaSavedDeviceAppraisalTest, WhetherSkipDeviceSuccess2, TestSize.Level1) -{ - WhetherSkipDeviceSuccess2(); -} - HWTEST_F(StaSavedDeviceAppraisalTest, WhetherSkipDeviceFail1, TestSize.Level1) { WhetherSkipDeviceFail1(); -- Gitee From a061624a6fb526c15aa5ee02780bb226354bfd42 Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Tue, 12 Oct 2021 09:19:00 +0000 Subject: [PATCH 002/491] 1. add WiFi lock feature Signed-off-by: zhangfeng --- .../wifi_standard/include/wifi_device.h | 25 ++ .../wifi_standard/interfaces/define.h | 3 + .../wifi_standard/interfaces/i_wifi_device.h | 26 ++ .../wifi_standard/interfaces/wifi_msg.h | 15 + .../wifi_standard/src/wifi_device_impl.cpp | 17 ++ .../wifi_standard/src/wifi_device_impl.h | 26 ++ .../wifi_standard/src/wifi_device_proxy.cpp | 86 ++++++ .../wifi_standard/src/wifi_device_proxy.h | 26 ++ .../wifi_framework/wifi_manage/BUILD.gn | 4 + .../wifi_manage/wifi_device_service_impl.cpp | 25 ++ .../wifi_manage/wifi_device_service_impl.h | 5 + .../wifi_manage/wifi_device_stub.cpp | 34 +++ .../wifi_manage/wifi_device_stub.h | 3 + .../wifi_manage/wifi_protect.cpp | 80 +++++ .../wifi_framework/wifi_manage/wifi_protect.h | 112 +++++++ .../wifi_manage/wifi_protect_manager.cpp | 274 ++++++++++++++++++ .../wifi_manage/wifi_protect_manager.h | 122 ++++++++ 17 files changed, 883 insertions(+) create mode 100644 services/wifi_standard/wifi_framework/wifi_manage/wifi_protect.cpp create mode 100644 services/wifi_standard/wifi_framework/wifi_manage/wifi_protect.h create mode 100644 services/wifi_standard/wifi_framework/wifi_manage/wifi_protect_manager.cpp create mode 100644 services/wifi_standard/wifi_framework/wifi_manage/wifi_protect_manager.h diff --git a/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_device.h b/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_device.h index aa71abc..f9d66fa 100644 --- a/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_device.h +++ b/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_device.h @@ -42,6 +42,31 @@ public: * @return ErrCode - operation result */ virtual ErrCode DisableWifi() = 0; + /** + * @Description create the Wi-Fi protect. + * + * @param protectType - WifiProtectMode object + * @param protectName - the protect name + * @return ErrCode - operation result + */ + virtual ErrCode InitWifiProtect(const WifiProtectType &protectType, const std::string &protectName) = 0; + + /** + * @Description Acquire the Wi-Fi protect mode. + * + * @param protectMode - WifiProtectMode object + * @param protectName - the protect name + * @return ErrCode - operation result + */ + virtual ErrCode GetWifiProtectRef(const WifiProtectMode &protectMode, const std::string &protectName) = 0; + + /** + * @Description Release the Wi-Fi protect mode. + * + * @param protectName - the protect name + * @return ErrCode - operation result + */ + virtual ErrCode PutWifiProtectRef(const std::string &protectName) = 0; /** * @Description Add a wifi device configuration. diff --git a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/define.h b/interfaces/innerkits/native_cpp/wifi_standard/interfaces/define.h index 98546a2..c7b93f9 100644 --- a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/define.h +++ b/interfaces/innerkits/native_cpp/wifi_standard/interfaces/define.h @@ -49,6 +49,9 @@ #define WIFI_SVR_CMD_REMOVE_ALL_DEVICE_CONFIG 0x1020 /* remove all network configs */ #define WIFI_SVR_CMD_GET_SUPPORTED_FEATURES 0x1021 /* get supported features */ #define WIFI_SVR_CMD_GET_DERVICE_MAC_ADD 0x1022 /* get mac address */ +#define WIFI_SVR_CMD_INIT_WIFI_PROTECT 0x1023 /* init the Wi-Fi protect. */ +#define WIFI_SVR_CMD_GET_WIFI_PROTECT 0x1024 /* get the Wi-Fi protect. */ +#define WIFI_SVR_CMD_PUT_WIFI_PROTECT 0x1025 /* put the Wi-Fi protect. */ /* -------------ap module message define----------------- */ #define WIFI_SVR_CMD_ENABLE_WIFI_AP 0x1100 /* open ap */ diff --git a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_device.h b/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_device.h index 244c0f4..96f912c 100644 --- a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_device.h +++ b/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_device.h @@ -42,6 +42,32 @@ public: * @return ErrCode - operation result */ virtual ErrCode DisableWifi() = 0; + + /** + * @Description create the Wi-Fi protect. + * + * @param protectType - WifiProtectMode object + * @param protectName - the protect name + * @return ErrCode - operation result + */ + virtual ErrCode InitWifiProtect(const WifiProtectType &protectType, const std::string &protectName) = 0; + + /** + * @Description Acquire the Wi-Fi protect mode. + * + * @param protectMode - WifiProtectMode object + * @param protectName - the protect name + * @return ErrCode - operation result + */ + virtual ErrCode GetWifiProtectRef(const WifiProtectMode &protectMode, const std::string &protectName) = 0; + + /** + * @Description Release the Wi-Fi protect mode. + * + * @param protectName - the protect name + * @return ErrCode - operation result + */ + virtual ErrCode PutWifiProtectRef(const std::string &protectName) = 0; /** * @Description Add a wifi device configuration. diff --git a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_msg.h b/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_msg.h index 69d7d9b..c4f7759 100755 --- a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_msg.h +++ b/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_msg.h @@ -398,6 +398,21 @@ enum class StreamDirection { UNKNOWN, }; +/* WifiProtectType */ +enum class WifiProtectType { + WIFI_PROTECT_MULTICAST = 0, + WIFI_PROTECT_COMMON = 1 +}; + +/* WifiProtectMode */ +enum class WifiProtectMode { + WIFI_PROTECT_FULL = 0, + WIFI_PROTECT_SCAN_ONLY = 1, + WIFI_PROTECT_FULL_HIGH_PERF = 2, + WIFI_PROTECT_FULL_LOW_LATENCY = 3, + WIFI_PROTECT_NO_HELD = 4 +}; + /* DHCP info */ struct IpInfo { int ipAddress; /* ip address */ diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_impl.cpp b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_impl.cpp index 856507b..3a47d02 100644 --- a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_impl.cpp +++ b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_impl.cpp @@ -73,6 +73,23 @@ ErrCode WifiDeviceImpl::DisableWifi() return client_->DisableWifi(); } +ErrCode WifiDeviceImpl::InitWifiProtect(const WifiProtectType &protectType, const std::string &protectName) +{ + RETURN_IF_FAIL(client_); + return client_->InitWifiProtect(protectType, protectName); +} + +ErrCode WifiDeviceImpl::GetWifiProtectRef(const WifiProtectMode &protectMode, const std::string &protectName) +{ + RETURN_IF_FAIL(client_); + return client_->GetWifiProtectRef(protectMode, protectName); +} + +ErrCode WifiDeviceImpl::PutWifiProtectRef(const std::string &protectName) +{ + RETURN_IF_FAIL(client_); + return client_->PutWifiProtectRef(protectName); +} ErrCode WifiDeviceImpl::AddDeviceConfig(const WifiDeviceConfig &config, int &result) { RETURN_IF_FAIL(client_); diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_impl.h b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_impl.h index aa25766..84da625 100644 --- a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_impl.h +++ b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_impl.h @@ -41,6 +41,32 @@ public: */ ErrCode DisableWifi() override; + /** + * @Description create the Wi-Fi protect. + * + * @param protectType - WifiProtectMode object + * @param protectName - the protect name + * @return ErrCode - operation result + */ + ErrCode InitWifiProtect(const WifiProtectType &protectType, const std::string &protectName) override; + + /** + * @Description Acquire the Wi-Fi protect mode. + * + * @param protectMode - WifiProtectMode object + * @param protectName - the protect name + * @return ErrCode - operation result + */ + ErrCode GetWifiProtectRef(const WifiProtectMode &protectMode, const std::string &protectName) override; + + /** + * @Description Release the Wi-Fi protect mode. + * + * @param protectName - the protect name + * @return ErrCode - operation result + */ + ErrCode PutWifiProtectRef(const std::string &protectName) override; + /** * @Description Add a wifi device configuration. * diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy.cpp b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy.cpp index 32ecac1..2b676f1 100644 --- a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy.cpp +++ b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy.cpp @@ -82,6 +82,92 @@ ErrCode WifiDeviceProxy::DisableWifi() return ErrCode(reply.ReadInt32()); } +ErrCode WifiDeviceProxy::InitWifiProtect(const WifiProtectType &protectType, const std::string &protectName) +{ + if (mRemoteDied) { + WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + return WIFI_OPT_FAILED; + } + MessageOption option; + MessageParcel data, reply; + data.WriteInt32(0); + data.WriteInt32((int)protectType); + data.WriteCString(protectName.c_str()); + + int error = Remote()->SendRequest(WIFI_SVR_CMD_INIT_WIFI_PROTECT, data, reply, option); + if (error != ERR_NONE) { + WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", WIFI_SVR_CMD_INIT_WIFI_PROTECT, error); + return ErrCode(error); + } + int exception = reply.ReadInt32(); + if (exception) { + return WIFI_OPT_FAILED; + } + int ret = reply.ReadInt32(); + if (ret != WIFI_OPT_SUCCESS) { + return ErrCode(ret); + } + + return WIFI_OPT_SUCCESS; +} + +ErrCode WifiDeviceProxy::GetWifiProtectRef(const WifiProtectMode &protectMode, const std::string &protectName) +{ + if (mRemoteDied) { + WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + return WIFI_OPT_FAILED; + } + MessageOption option; + MessageParcel data, reply; + data.WriteInt32(0); + data.WriteInt32((int)protectMode); + data.WriteCString(protectName.c_str()); + + int error = Remote()->SendRequest(WIFI_SVR_CMD_GET_WIFI_PROTECT, data, reply, option); + if (error != ERR_NONE) { + WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", WIFI_SVR_CMD_GET_WIFI_PROTECT, error); + return ErrCode(error); + } + int exception = reply.ReadInt32(); + if (exception) { + return WIFI_OPT_FAILED; + } + int ret = reply.ReadInt32(); + if (ret != WIFI_OPT_SUCCESS) { + return ErrCode(ret); + } + + return WIFI_OPT_SUCCESS; +} + +ErrCode WifiDeviceProxy::PutWifiProtectRef(const std::string &protectName) +{ + if (mRemoteDied) { + WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + return WIFI_OPT_FAILED; + } + MessageOption option; + MessageParcel data, reply; + data.WriteInt32(0); + data.WriteCString(protectName.c_str()); + + int error = Remote()->SendRequest(WIFI_SVR_CMD_PUT_WIFI_PROTECT, data, reply, option); + if (error != ERR_NONE) { + WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", WIFI_SVR_CMD_PUT_WIFI_PROTECT, error); + return ErrCode(error); + } + int exception = reply.ReadInt32(); + if (exception) { + return WIFI_OPT_FAILED; + } + int ret = reply.ReadInt32(); + if (ret != WIFI_OPT_SUCCESS) { + return ErrCode(ret); + } + + return WIFI_OPT_SUCCESS; +} + void WifiDeviceProxy::WriteIpAddress(MessageParcel &data, const WifiIpAddress &address) { data.WriteInt32(address.family); diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy.h b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy.h index b27c3de..c6318d4 100644 --- a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy.h +++ b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy.h @@ -41,6 +41,32 @@ public: */ ErrCode DisableWifi() override; + /** + * @Description create the Wi-Fi protect. + * + * @param protectType - WifiProtectMode object + * @param protectName - the protect name + * @return ErrCode - operation result + */ + ErrCode InitWifiProtect(const WifiProtectType &protectType, const std::string &protectName) override; + + /** + * @Description Acquire the Wi-Fi protect mode. + * + * @param protectMode - WifiProtectMode object + * @param protectName - the protect name + * @return ErrCode - operation result + */ + ErrCode GetWifiProtectRef(const WifiProtectMode &protectMode, const std::string &protectName) override; + + /** + * @Description Release the Wi-Fi protect mode. + * + * @param protectName - the protect name + * @return ErrCode - operation result + */ + ErrCode PutWifiProtectRef(const std::string &protectName) override; + /** * @Description Add a wifi device configuration. * diff --git a/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn b/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn index bbb4334..2dfa8e1 100755 --- a/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn +++ b/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn @@ -86,6 +86,8 @@ ohos_source_set("wifi_device_service_impl") { "wifi_device_death_recipient.cpp", "wifi_device_service_impl.cpp", "wifi_device_stub.cpp", + "wifi_protect.cpp", + "wifi_protect_manager.cpp", ] configs = [ ":wifi_manager_service_config", @@ -174,6 +176,7 @@ ohos_shared_library("wifi_device_ability") { ":wifi_device_service_impl", ":wifi_manager_service", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", + "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//utils/native/base:utils", ] @@ -188,6 +191,7 @@ ohos_shared_library("wifi_scan_ability") { ":wifi_manager_service", ":wifi_scan_service_impl", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", + "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//utils/native/base:utils", ] diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp index f6c8b52..e071df5 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp @@ -22,6 +22,7 @@ #include "wifi_internal_event_dispatcher.h" #include "wifi_manager.h" #include "wifi_service_manager.h" +#include "wifi_protect_manager.h" #include "wifi_logger.h" #include "define.h" @@ -177,6 +178,30 @@ ErrCode WifiDeviceServiceImpl::DisableWifi() return ret; } +ErrCode WifiDeviceServiceImpl::InitWifiProtect(const WifiProtectType &protectType, const std::string &protectName) +{ + if (WifiProtectManager::GetInstance().InitWifiProtect(protectType, protectName)) { + return WIFI_OPT_SUCCESS; + } + return WIFI_OPT_FAILED; +} + +ErrCode WifiDeviceServiceImpl::GetWifiProtectRef(const WifiProtectMode &protectMode, const std::string &protectName) +{ + if (WifiProtectManager::GetInstance().GetWifiProtect(protectMode, protectName)) { + return WIFI_OPT_SUCCESS; + } + return WIFI_OPT_FAILED; +} + +ErrCode WifiDeviceServiceImpl::PutWifiProtectRef(const std::string &protectName) +{ + if (WifiProtectManager::GetInstance().PutWifiProtect(protectName)) { + return WIFI_OPT_SUCCESS; + } + return WIFI_OPT_FAILED; +} + ErrCode WifiDeviceServiceImpl::AddDeviceConfig(const WifiDeviceConfig &config, int &result) { if (WifiPermissionUtils::VerifySetWifiInfoPermission() == PERMISSION_DENIED) { diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h index 1d519c9..c78b68c 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h @@ -44,6 +44,11 @@ public: ErrCode DisableWifi() override; + ErrCode InitWifiProtect(const WifiProtectType &protectType, const std::string &protectName) override; + + ErrCode GetWifiProtectRef(const WifiProtectMode &protectMode, const std::string &protectName) override; + + ErrCode PutWifiProtectRef(const std::string &protectName) override; ErrCode AddDeviceConfig(const WifiDeviceConfig &config, int &result) override; ErrCode RemoveDevice(int networkId) override; diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp index 2afaed4..fe05033 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp @@ -37,6 +37,9 @@ void WifiDeviceStub::InitHandleMap() { handleFuncMap[WIFI_SVR_CMD_ENABLE_WIFI] = &WifiDeviceStub::OnEnableWifi; handleFuncMap[WIFI_SVR_CMD_DISABLE_WIFI] = &WifiDeviceStub::OnDisableWifi; + handleFuncMap[WIFI_SVR_CMD_INIT_WIFI_PROTECT] = &WifiDeviceStub::OnInitWifiProtect; + handleFuncMap[WIFI_SVR_CMD_GET_WIFI_PROTECT] = &WifiDeviceStub::OnGetWifiProtectRef; + handleFuncMap[WIFI_SVR_CMD_PUT_WIFI_PROTECT] = &WifiDeviceStub::OnPutWifiProtectRef; handleFuncMap[WIFI_SVR_CMD_ADD_DEVICE_CONFIG] = &WifiDeviceStub::OnAddDeviceConfig; handleFuncMap[WIFI_SVR_CMD_REMOVE_DEVICE_CONFIG] = &WifiDeviceStub::OnRemoveDevice; handleFuncMap[WIFI_SVR_CMD_REMOVE_ALL_DEVICE_CONFIG] = &WifiDeviceStub::OnRemoveAllDevice; @@ -101,6 +104,37 @@ void WifiDeviceStub::OnDisableWifi(uint32_t code, MessageParcel &data, MessagePa return; } +void WifiDeviceStub::OnInitWifiProtect(uint32_t code, MessageParcel &data, MessageParcel &reply) +{ + WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); + WifiProtectType protectType = (WifiProtectType)data.ReadInt32(); + std::string protectName = data.ReadCString(); + ErrCode ret = InitWifiProtect(protectType, protectName); + reply.WriteInt32(0); + reply.WriteInt32(ret); + return; +} + +void WifiDeviceStub::OnGetWifiProtectRef(uint32_t code, MessageParcel &data, MessageParcel &reply) +{ + WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); + WifiProtectMode protectMode = (WifiProtectMode)data.ReadInt32(); + std::string protectName = data.ReadCString(); + ErrCode ret = GetWifiProtectRef(protectMode, protectName); + reply.WriteInt32(0); + reply.WriteInt32(ret); + return; +} + +void WifiDeviceStub::OnPutWifiProtectRef(uint32_t code, MessageParcel &data, MessageParcel &reply) +{ + WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); + std::string protectName = data.ReadCString(); + ErrCode ret = PutWifiProtectRef(protectName); + reply.WriteInt32(0); + reply.WriteInt32(ret); + return; +} void WifiDeviceStub::OnAddDeviceConfig(uint32_t code, MessageParcel &data, MessageParcel &reply) { WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.h index 0f2e9e2..c3b00ef 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.h @@ -37,6 +37,9 @@ private: void InitHandleMap(); void OnEnableWifi(uint32_t code, MessageParcel &data, MessageParcel &reply); void OnDisableWifi(uint32_t code, MessageParcel &data, MessageParcel &reply); + void OnInitWifiProtect(uint32_t code, MessageParcel &data, MessageParcel &reply); + void OnGetWifiProtectRef(uint32_t code, MessageParcel &data, MessageParcel &reply); + void OnPutWifiProtectRef(uint32_t code, MessageParcel &data, MessageParcel &reply); void OnAddDeviceConfig(uint32_t code, MessageParcel &data, MessageParcel &reply); void OnRemoveDevice(uint32_t code, MessageParcel &data, MessageParcel &reply); void OnRemoveAllDevice(uint32_t code, MessageParcel &data, MessageParcel &reply); diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_protect.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_protect.cpp new file mode 100644 index 0000000..f129aa9 --- /dev/null +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_protect.cpp @@ -0,0 +1,80 @@ +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "wifi_protect.h" + +namespace OHOS { +namespace Wifi { +WifiProtect::WifiProtect( + const WifiProtectType &protectType, const WifiProtectMode &protectMode, const std::string &name) + : mName(name), + mType(protectType), + mMode(protectMode), + mAcqTimestamp(0) +{} + +WifiProtect::WifiProtect(const std::string &name) + : mName(name), + mType(WifiProtectType::WIFI_PROTECT_COMMON), + mMode(WifiProtectMode::WIFI_PROTECT_FULL), + mAcqTimestamp(0) +{} + +WifiProtect::WifiProtect() + : mName(""), + mType(WifiProtectType::WIFI_PROTECT_COMMON), + mMode(WifiProtectMode::WIFI_PROTECT_FULL), + mAcqTimestamp(0) +{} + +WifiProtect::~WifiProtect() +{} + +void WifiProtect::SetProtectType(const WifiProtectType &protectType) +{ + mType = protectType; +} + +WifiProtectType WifiProtect::GetProtectType() const +{ + return mType; +} + +void WifiProtect::SetProtectMode(const WifiProtectMode &protectMode) +{ + mMode = protectMode; +} + +WifiProtectMode WifiProtect::GetProtectMode() const +{ + return mMode; +} + +void WifiProtect::SetName(const std::string &name) +{ + mName = name; +} + +std::string WifiProtect::GetName() const +{ + return mName; +} + +long WifiProtect::GetAcqTimestamp() const +{ + return mAcqTimestamp; +} +} // namespace Wifi +} // namespace OHOS \ No newline at end of file diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_protect.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_protect.h new file mode 100644 index 0000000..b8bcfbb --- /dev/null +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_protect.h @@ -0,0 +1,112 @@ +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OHOS_WIFIPROTECT_H +#define OHOS_WIFIPROTECT_H + +#include +#include "wifi_msg.h" + +namespace OHOS { +namespace Wifi { +class WifiProtect { +public: + /** + * @Description Construct a new Wifi Protect object + * + * @param protectType - protect type + * @param protectMode - protect mode + * @param name - protect name, which is a unique identifier + */ + WifiProtect(const WifiProtectType &protectType, const WifiProtectMode &protectMode, const std::string &name); + + /** + * @Description Construct a new Wifi Full Protect object + * + * @param tag - protect name, which is a unique identifier + */ + explicit WifiProtect(const std::string &name); + + /** + * @Description Construct a new Default Wifi Protect object + * + */ + WifiProtect(); + + /** + * @Description Destroy the Wifi Protect object + * + */ + ~WifiProtect(); + + /** + * @Description Set the Tag object + * + * @param tag - protect name + */ + void SetName(const std::string &name); + + /** + * @Description Get the Tag object + * + * @return std::string - Wifi protect Tag + */ + std::string GetName() const; + + /** + * @Description Set the Protect Type object + * + * @param protectType - protect type + */ + void SetProtectType(const WifiProtectType &protectType); + + /** + * @Description Get the Protect Type object + * + * @return WifiProtectType - protect type + */ + WifiProtectType GetProtectType() const; + + /** + * @Description Set the Protect Mode object + * + * @param protectMode - protect mode + */ + void SetProtectMode(const WifiProtectMode &protectMode); + + /** + * @Description Get the Protect Mode object + * + * @return WifiProtectMode - protect mode + */ + WifiProtectMode GetProtectMode() const; + + /** + * @Description Get the Acq Timestamp + * + * @return long - timestamp + */ + long GetAcqTimestamp() const; + +private: + std::string mName; + /* not used: int mUid; */ + WifiProtectType mType; + WifiProtectMode mMode; + long mAcqTimestamp; +}; +} // namespace Wifi +} // namespace OHOS +#endif diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_protect_manager.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_protect_manager.cpp new file mode 100644 index 0000000..a3966aa --- /dev/null +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_protect_manager.cpp @@ -0,0 +1,274 @@ +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "wifi_protect_manager.h" +#include "wifi_log.h" +#include "wifi_chip_hal_interface.h" +#include "wifi_supplicant_hal_interface.h" + +#undef LOG_TAG +#define LOG_TAG "OHWIFI_MANAGER_LOCK_MANAGER" + +namespace OHOS { +namespace Wifi { +WifiProtectManager::WifiProtectManager() +{ + mWifiConnected = false; + mScreenOn = false; + mForceHiPerfMode = false; + mForceLowLatencyMode = false; + mCurrentOpMode = WifiProtectMode::WIFI_PROTECT_NO_HELD; + mFullHighPerfProtectsAcquired = 0; + mFullHighPerfProtectsReleased = 0; + mFullLowLatencyProtectsAcquired = 0; + mFullLowLatencyProtectsReleased = 0; + mWifiProtects.clear(); +} + +WifiProtectManager::~WifiProtectManager() +{} + +WifiProtectManager &WifiProtectManager::GetInstance() +{ + static WifiProtectManager instance; + return instance; +} + +bool WifiProtectManager::IsValidProtectMode(WifiProtectMode &protectMode) +{ + if (protectMode != WifiProtectMode::WIFI_PROTECT_FULL && protectMode != WifiProtectMode::WIFI_PROTECT_SCAN_ONLY && + protectMode != WifiProtectMode::WIFI_PROTECT_FULL_HIGH_PERF && + protectMode != WifiProtectMode::WIFI_PROTECT_FULL_LOW_LATENCY) { + return false; + } + + return true; +} + +WifiProtectMode WifiProtectManager::GetNearlyProtectMode() +{ + /* If Wifi Client is not connected, then all protects are not effective */ + if (!mWifiConnected) { + return WifiProtectMode::WIFI_PROTECT_NO_HELD; + } + + /* Check if mode is forced to hi-perf */ + if (mForceHiPerfMode) { + return WifiProtectMode::WIFI_PROTECT_FULL_HIGH_PERF; + } + + /* Check if mode is forced to low-latency */ + if (mForceLowLatencyMode) { + return WifiProtectMode::WIFI_PROTECT_FULL_LOW_LATENCY; + } + + if (mFullHighPerfProtectsAcquired > mFullHighPerfProtectsReleased) { + return WifiProtectMode::WIFI_PROTECT_FULL_HIGH_PERF; + } + + return WifiProtectMode::WIFI_PROTECT_NO_HELD; +} + +bool WifiProtectManager::InitWifiProtect(const WifiProtectType &protectType, const std::string &protectName) +{ + WifiProtect* pProtect = new WifiProtect(protectType, WifiProtectMode::WIFI_PROTECT_FULL, protectName); + mWifiProtects.push_back(pProtect); + return true; +} + +bool WifiProtectManager::GetWifiProtect(const WifiProtectMode &protectMode, const std::string name) +{ + bool isAlreadyExist = false; + WifiProtect *pProtect = nullptr; + + std::vector::iterator itor = mWifiProtects.begin(); + while (itor != mWifiProtects.end()) { + if ((*itor)->GetName() == name) { + LOGD("old name = %{public}s, and new Name = %{public}s", + (*itor)->GetName().c_str(), + (*itor)->GetName().c_str()); + pProtect = (*itor); + + isAlreadyExist = true; + break; + } + itor++; + } + + if (isAlreadyExist) { + LOGD("attempted to add a protect when already holding one"); + delete pProtect; + pProtect = nullptr; + return false; + } + + return AddProtect(pProtect); +} + +bool WifiProtectManager::ChangeToPerfMode(bool isEnabled) +{ + mForceHiPerfMode = isEnabled; + mForceLowLatencyMode = false; + if (!ChangeWifiPowerMode()) { + LOGE("Failed to force hi-perf mode, returning to normal mode"); + mForceHiPerfMode = false; + return false; + } + + return true; +} +void WifiProtectManager::HandleScreenStateChanged(bool screenOn) +{ + mScreenOn = screenOn; +} + +void WifiProtectManager::UpdateWifiClientConnected(bool isConnected) +{ + mWifiConnected = isConnected; +} + +bool WifiProtectManager::AddProtect(WifiProtect *pProtect) +{ + switch (pProtect->GetProtectMode()) { + case WifiProtectMode::WIFI_PROTECT_FULL_HIGH_PERF: + if (mWifiConnected) { + ++mFullHighPerfProtectsAcquired; + } + break; + case WifiProtectMode::WIFI_PROTECT_FULL_LOW_LATENCY: + ++mFullLowLatencyProtectsAcquired; + break; + default: + break; + } + + ChangeWifiPowerMode(); + LOGD("GetWifiProtect finished!"); + return true; +} + +bool WifiProtectManager::PutWifiProtect(const std::string &name) +{ + WifiProtect *pWifiProtect = RemoveProtect(name); + if (pWifiProtect == nullptr) { + /* attempting to release a protect that does not exist. */ + return false; + } + + switch (pWifiProtect->GetProtectMode()) { + case WifiProtectMode::WIFI_PROTECT_FULL_HIGH_PERF: + if (mWifiConnected) { + ++mFullHighPerfProtectsReleased; + } + break; + case WifiProtectMode::WIFI_PROTECT_FULL_LOW_LATENCY: + ++mFullLowLatencyProtectsReleased; + break; + default: + break; + } + + /* Recalculate the operating mode */ + ChangeWifiPowerMode(); + LOGD("PutWifiProtect finished!"); + + delete pWifiProtect; + pWifiProtect = nullptr; + return true; +} + +WifiProtect *WifiProtectManager::RemoveProtect(const std::string &name) +{ + WifiProtect *pProtect = nullptr; + std::vector::iterator itor = mWifiProtects.begin(); + while (itor != mWifiProtects.end()) { + if ((*itor)->GetName() == name) { + pProtect = *itor; + itor = mWifiProtects.erase(itor); + break; + } + itor++; + } + return pProtect; +} + +bool WifiProtectManager::ChangeWifiPowerMode() +{ + WifiProtectMode newProtectMode = GetNearlyProtectMode(); + if (newProtectMode == mCurrentOpMode) { + /* No action is needed */ + return true; + } + + /* Otherwise, we need to change current mode, first reset it to normal */ + switch (mCurrentOpMode) { + case WifiProtectMode::WIFI_PROTECT_FULL_HIGH_PERF: + if (!WifiSupplicantHalInterface::GetInstance().SetPowerSave(true)) { + LOGE("Failed to reset the OpMode from hi-perf to Normal"); + return false; + } + break; + case WifiProtectMode::WIFI_PROTECT_FULL_LOW_LATENCY: + + break; + case WifiProtectMode::WIFI_PROTECT_NO_HELD: + default: + /* No action */ + break; + } + + /* Set the current mode, before we attempt to set the new mode */ + mCurrentOpMode = WifiProtectMode::WIFI_PROTECT_NO_HELD; + + /* Now switch to the new opMode */ + switch (newProtectMode) { + case WifiProtectMode::WIFI_PROTECT_FULL_HIGH_PERF: + if (!WifiSupplicantHalInterface::GetInstance().SetPowerSave(false)) { + LOGE("Failed to set the OpMode to hi-perf"); + return false; + } + break; + case WifiProtectMode::WIFI_PROTECT_FULL_LOW_LATENCY: + if (!SetLowLatencyMode(true)) { + LOGE("Failed to set the OpMode to low-latency"); + return false; + } + break; + case WifiProtectMode::WIFI_PROTECT_NO_HELD: + /* No action */ + break; + default: + /* Invalid mode, don't change currentOpMode , and exit with error */ + LOGE("Invalid new opMode: %{public}d", (int)newProtectMode); + return false; + } + + /* Now set the mode to the new value */ + mCurrentOpMode = newProtectMode; + return true; +} + +bool WifiProtectManager::SetLowLatencyMode(bool enabled) +{ + /* Only set power save mode */ + if (!WifiSupplicantHalInterface::GetInstance().SetPowerSave(!enabled)) { + LOGE("Failed to set power save mode"); + return false; + } + + return true; +} +} // namespace Wifi +} // namespace OHOS \ No newline at end of file diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_protect_manager.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_protect_manager.h new file mode 100644 index 0000000..439cf50 --- /dev/null +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_protect_manager.h @@ -0,0 +1,122 @@ +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OHOS_WIFI_PROTECT_MANAGER_H +#define OHOS_WIFI_PROTECT_MANAGER_H + +#include +#include "wifi_protect.h" +#include "wifi_msg.h" + +namespace OHOS { +namespace Wifi { +class WifiProtectManager { +public: + ~WifiProtectManager(); + static WifiProtectManager &GetInstance(); + + /** + * @Description Validate that the protect mode is valid + * + * @param protectMode - The protect mode to verify + * @return true - valid + * @return false - invalid + */ + static bool IsValidProtectMode(WifiProtectMode &protectMode); + + /** + * @Description Get the nearly protect type currently held by the WifiProtectManager + * + * @return WifiProtectMode - currently held protect + */ + WifiProtectMode GetNearlyProtectMode(); + + /** + * @Description Create a Wifi Protect. + * + * @param protectMode - representation of the Wifi Protect type + * @param protectName - represent the protect name + * @return true - create the protect success + * @return false - create protect failed + */ + bool InitWifiProtect(const WifiProtectType &protectType, const std::string &protectName); + + /** + * @Description Allowing a calling app to acquire a Wifi Protect in the supplied mode + * + * @param protectMode - representation of the Wifi Protect type + * @param name - represent the protect + * @return true - acquired the protect success + * @return false - acquired protect failed + */ + bool GetWifiProtect(const WifiProtectMode &protectMode, const std::string name); + + /** + * @Description Applications to release a WiFi Wake protect + * + * @param name - represent the protect + * @return true - put protect success + * @return false - put failed, the caller did not hold this protect + */ + bool PutWifiProtect(const std::string &name); + + /** + * @Description Set hi-perf mode protect state + * + * @param isEnabled - True to force hi-perf mode, false to leave it up to acquired wifiProtects + * @return true - success + * @return false - failed + */ + bool ChangeToPerfMode(bool isEnabled); + + /** + * @Description Handler for screen state (on/off) changes + * + * @param screenOn - screen on/off state + */ + void HandleScreenStateChanged(bool screenOn); + + /** + * @Description Handler for Wifi Client mode state changes + * + * @param isConnected - wifi client connect state + */ + void UpdateWifiClientConnected(bool isConnected); + +private: + WifiProtectManager(); + bool AddProtect(WifiProtect *pProtect); + bool ReleaseProtect(const std::string &name); + WifiProtect *RemoveProtect(const std::string &name); + bool ChangeWifiPowerMode(); + bool SetLowLatencyMode(bool enabled); + +private: + std::vector mWifiProtects; + WifiProtectMode mCurrentOpMode; + int mFullHighPerfProtectsAcquired; + int mFullHighPerfProtectsReleased; + int mFullLowLatencyProtectsAcquired; + int mFullLowLatencyProtectsReleased; + /* Not used: long mCurrentSessionStartTimeMs; */ + bool mWifiConnected; + bool mScreenOn; + bool mForceHiPerfMode; + bool mForceLowLatencyMode; +}; +} // namespace Wifi +} // namespace OHOS + +#endif \ No newline at end of file -- Gitee From fb20b40939616541eea39ed98e5deed82c24d323 Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Thu, 14 Oct 2021 09:39:58 +0000 Subject: [PATCH 003/491] =?UTF-8?q?1.=20Support=20record=20WiFi=20switch?= =?UTF-8?q?=20status=20when=20poweroff=EF=BC=9B=202.=20Support=20WiFi=20re?= =?UTF-8?q?connect?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangfeng --- .../wifi_standard/interfaces/wifi_msg.h | 2 +- .../common/config/wifi_settings.cpp | 1 + .../wifi_manage/wifi_device_service_impl.cpp | 37 +++++++++- .../wifi_manage/wifi_manager.cpp | 74 ++++++++++++++++++- .../wifi_framework/wifi_manage/wifi_manager.h | 2 + .../wifi_sta/sta_saved_device_appraisal.cpp | 6 +- .../wifi_manage/wifi_sta/sta_service.cpp | 2 + .../wifi_sta/sta_state_machine.cpp | 9 ++- 8 files changed, 123 insertions(+), 10 deletions(-) diff --git a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_msg.h b/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_msg.h index c4f7759..66918ff 100755 --- a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_msg.h +++ b/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_msg.h @@ -339,7 +339,7 @@ struct WifiDeviceConfig { WifiDeviceConfig() { networkId = INVALID_NETWORK_ID; - status = static_cast(WifiDeviceConfigStatus::ENABLED); + status = static_cast(WifiDeviceConfigStatus::DISABLED); band = 0; channel = 0; frequency = 0; diff --git a/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp b/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp index f4b09a2..b0cabd7 100644 --- a/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp +++ b/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp @@ -906,6 +906,7 @@ bool WifiSettings::GetStaLastRunState() int WifiSettings::SetStaLastRunState(bool bRun) { mWifiConfig.staLastState = bRun; + SyncWifiConfig(); return 0; } diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp index e071df5..82c3cf9 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp @@ -139,7 +139,7 @@ ErrCode WifiDeviceServiceImpl::EnableWifi() WifiServiceManager::GetInstance().UnloadService(WIFI_SERVICE_STA); return errCode; } - + WifiSettings::GetInstance().SyncWifiConfig(); return WIFI_OPT_SUCCESS; } @@ -217,6 +217,15 @@ ErrCode WifiDeviceServiceImpl::AddDeviceConfig(const WifiDeviceConfig &config, i if (pService == nullptr) { return WIFI_OPT_STA_NOT_OPENED; } + + if ((config.ssid.length() <= 0) || (config.keyMgmt.length()) <= 0) { + return WIFI_OPT_INVALID_PARAM; + } + + if (config.keyMgmt != "NONE" && config.preSharedKey.length() <= 0) { + return WIFI_OPT_INVALID_PARAM; + } + int retNetworkId = pService->AddDeviceConfig(config); if (retNetworkId < 0) { return WIFI_OPT_FAILED; @@ -236,6 +245,10 @@ ErrCode WifiDeviceServiceImpl::RemoveDevice(int networkId) return WIFI_OPT_STA_NOT_OPENED; } + if (networkId < 0) { + return WIFI_OPT_INVALID_PARAM; + } + IStaService *pService = WifiServiceManager::GetInstance().GetStaServiceInst(); if (pService == nullptr) { return WIFI_OPT_STA_NOT_OPENED; @@ -283,6 +296,10 @@ ErrCode WifiDeviceServiceImpl::EnableDeviceConfig(int networkId, bool attemptEna return WIFI_OPT_STA_NOT_OPENED; } + if (networkId < 0) { + return WIFI_OPT_INVALID_PARAM; + } + IStaService *pService = WifiServiceManager::GetInstance().GetStaServiceInst(); if (pService == nullptr) { return WIFI_OPT_STA_NOT_OPENED; @@ -301,6 +318,10 @@ ErrCode WifiDeviceServiceImpl::DisableDeviceConfig(int networkId) return WIFI_OPT_STA_NOT_OPENED; } + if (networkId < 0) { + return WIFI_OPT_INVALID_PARAM; + } + IStaService *pService = WifiServiceManager::GetInstance().GetStaServiceInst(); if (pService == nullptr) { return WIFI_OPT_STA_NOT_OPENED; @@ -319,6 +340,10 @@ ErrCode WifiDeviceServiceImpl::ConnectToNetwork(int networkId) return WIFI_OPT_STA_NOT_OPENED; } + if (networkId < 0) { + return WIFI_OPT_INVALID_PARAM; + } + IStaService *pService = WifiServiceManager::GetInstance().GetStaServiceInst(); if (pService == nullptr) { return WIFI_OPT_STA_NOT_OPENED; @@ -337,6 +362,14 @@ ErrCode WifiDeviceServiceImpl::ConnectToDevice(const WifiDeviceConfig &config) return WIFI_OPT_STA_NOT_OPENED; } + if ((config.ssid.length() <= 0) || (config.keyMgmt.length()) <= 0) { + return WIFI_OPT_INVALID_PARAM; + } + + if (config.keyMgmt != "NONE" && config.preSharedKey.length() <= 0 ) { + return WIFI_OPT_INVALID_PARAM; + } + IStaService *pService = WifiServiceManager::GetInstance().GetStaServiceInst(); if (pService == nullptr) { return WIFI_OPT_STA_NOT_OPENED; @@ -635,4 +668,4 @@ bool WifiDeviceServiceImpl::IsScanServiceRunning() return true; } } // namespace Wifi -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp index d2dd430..79973fa 100755 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp @@ -51,6 +51,61 @@ WifiManager::WifiManager() : mInitStatus(INIT_UNKNOWN), mSupportedFeatures(0) WifiManager::~WifiManager() {} + +void WifiManager::AutoStartStaService(void) +{ + WifiOprMidState staState = WifiConfigCenter::GetInstance().GetWifiMidState(); + if (staState == WifiOprMidState::CLOSED) { + if (!WifiConfigCenter::GetInstance().SetWifiMidState(staState, WifiOprMidState::OPENING)) { + WIFI_LOGD("set sta mid state opening failed! may be other activity has been operated"); + return; + } + ErrCode errCode = WIFI_OPT_FAILED; + do { + if (WifiServiceManager::GetInstance().CheckAndEnforceService(WIFI_SERVICE_STA) < 0) { + WIFI_LOGE("Load %s service failed!", WIFI_SERVICE_STA); + break; + } + IStaService *pService = WifiServiceManager::GetInstance().GetStaServiceInst(); + if (pService == nullptr) { + WIFI_LOGE("Create %s service failed!", WIFI_SERVICE_STA); + break; + } + errCode = pService->RegisterStaServiceCallback(WifiManager::GetInstance().GetStaCallback()); + if (errCode != WIFI_OPT_SUCCESS) { + WIFI_LOGE("Register sta service callback failed!"); + break; + } + errCode = pService->EnableWifi(); + if (errCode != WIFI_OPT_SUCCESS) { + WIFI_LOGE("service enable sta failed, ret %d!", static_cast(errCode)); + break; + } + } while (0); + if (errCode != WIFI_OPT_SUCCESS) { + WifiConfigCenter::GetInstance().SetWifiMidState(WifiOprMidState::OPENING, WifiOprMidState::CLOSED); + WifiServiceManager::GetInstance().UnloadService(WIFI_SERVICE_STA); + } + } + return; +} + +void WifiManager::AutoStartScanService(void) +{ + if (!WifiConfigCenter::GetInstance().IsScanAlwaysActive()) { + WIFI_LOGD("Scan always is not open, not open scan service."); + return; + } + ScanControlInfo info; + WifiConfigCenter::GetInstance().GetScanControlInfo(info); + if (!IsAllowScanAnyTime(info)) { + WIFI_LOGD("Scan control does not support scan always, not open scan service here."); + return; + } + CheckAndStartScanService(); + return; +} + int WifiManager::Init() { if (WifiConfigCenter::GetInstance().Init() < 0) { @@ -83,6 +138,23 @@ int WifiManager::Init() if (!WifiConfigCenter::GetInstance().GetSupportedBandChannel()) { WIFI_LOGE("Failed to get current chip supported band and channel!"); } + + if (WifiServiceManager::GetInstance().CheckPreLoadService() < 0) { + WIFI_LOGE("WifiServiceManager check preload feature service failed!"); + WifiManager::GetInstance().Exit(); + return -1; + } + if (WifiConfigCenter::GetInstance().GetStaLastRunState()) { /* Automatic startup upon startup */ + WIFI_LOGE("AutoStartStaService"); + AutoStartStaService(); + } else { + /** + * The sta service automatically starts upon startup. After the sta + * service is started, the scanning is directly started. + */ + WIFI_LOGE("AutoStartScanService"); + AutoStartScanService(); + } return 0; } @@ -615,4 +687,4 @@ void WifiManager::DealP2pActionResult(P2pActionCallback action, ErrCode code) } } // namespace Wifi -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.h index 8b7ce57..e90d898 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.h @@ -156,6 +156,8 @@ private: static void DealP2pDiscoveryChanged(bool bState); static void DealP2pGroupsChanged(void); static void DealP2pActionResult(P2pActionCallback action, ErrCode code); + static void AutoStartStaService(); + static void AutoStartScanService(); private: std::thread mCloseServiceThread; diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp index b62be20..dbaebf5 100755 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp @@ -58,7 +58,7 @@ ErrCode StaSavedDeviceAppraisal::DeviceAppraisals( continue; } - if (!WhetherSkipDevice(device)) { + if (WhetherSkipDevice(device)) { continue; } @@ -95,13 +95,13 @@ bool StaSavedDeviceAppraisal::WhetherSkipDevice(WifiDeviceConfig &device) /* Skip this type of device and evaluate it by other appraisals */ if (device.isPasspoint || device.isEphemeral) { WIFI_LOGI("Skip isPasspoint or isEphemeral Network %s.", device.ssid.c_str()); - return false; + return true; } if (device.status == static_cast(WifiDeviceConfigStatus::DISABLED)) { return true; } - return true; + return false; } void StaSavedDeviceAppraisal::AppraiseDeviceQuality( diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp index ed43bac..f5b8c31 100755 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp @@ -215,6 +215,7 @@ ErrCode StaService::EnableDeviceConfig(int networkId, bool attemptEnable) const WIFI_LOGE("Enable device config failed!"); return WIFI_OPT_FAILED; } + WifiSettings::GetInstance().SyncDeviceConfig(); return WIFI_OPT_SUCCESS; } @@ -226,6 +227,7 @@ ErrCode StaService::DisableDeviceConfig(int networkId) const WIFI_LOGE("Disable device config failed!"); return WIFI_OPT_FAILED; } + WifiSettings::GetInstance().SyncDeviceConfig(); return WIFI_OPT_SUCCESS; } diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp index 4554a5a..5a7bbc9 100755 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp @@ -704,7 +704,6 @@ void StaStateMachine::DealConnectToUserSelectedNetwork(InternalMessage *msg) /* Sets network status. */ WifiSettings::GetInstance().EnableNetwork(networkId, forceReconnect); - WifiSettings::GetInstance().SetDeviceState(networkId, (int)WifiDeviceConfigStatus::ENABLED, false); StartConnectToNetwork(networkId); } @@ -733,6 +732,8 @@ void StaStateMachine::DealConnectionEvent(InternalMessage *msg) } WIFI_LOGD("enter DealConnectionEvent"); + WifiSettings::GetInstance().SetDeviceState(targetNetworkId, (int)WifiDeviceConfigStatus::ENABLED, false); + WifiSettings::GetInstance().SyncDeviceConfig(); /* Stop clearing the Wpa_blocklist. */ StopTimer(static_cast(WPA_BLOCK_LIST_CLEAR_EVENT)); StopTimer(static_cast(CMD_NETWORK_CONNECT_TIMEOUT)); @@ -743,7 +744,7 @@ void StaStateMachine::DealConnectionEvent(InternalMessage *msg) wpsState = SetupMethod::INVALID; } /* Callback result to InterfaceService. */ - staCallback.OnStaConnChanged(OperateResState::CONNECT_AP_CONNECTED, linkedInfo); + staCallback.OnStaConnChanged(OperateResState::CONNECT_OBTAINING_IP, linkedInfo); /* The current state of StaStateMachine transfers to GetIpState. */ SwitchState(pGetIpState); @@ -790,9 +791,11 @@ void StaStateMachine::DealWpaWrongPskEvent(InternalMessage *msg) if (msg == nullptr) { WIFI_LOGE("msg is null\n"); } - WIFI_LOGD("enter DealStartWpsCmd\n"); + WIFI_LOGD("enter DealWpaWrongPskEvent\n"); InitWifiLinkedInfo(); WifiSettings::GetInstance().SaveLinkedInfo(linkedInfo); + WifiSettings::GetInstance().SetDeviceState(targetNetworkId, (int)WifiDeviceConfigStatus::DISABLED); + WifiSettings::GetInstance().SyncDeviceConfig(); staCallback.OnStaConnChanged(OperateResState::CONNECT_PASSWORD_WRONG, linkedInfo); } -- Gitee From 0caa38258f5e376984e46c27005a49025c4e8a4e Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Wed, 20 Oct 2021 13:24:25 +0000 Subject: [PATCH 004/491] aoto-reconnect optimize Signed-off-by: zhangfeng --- .../common/config/wifi_settings.cpp | 15 +++++++++++++++ .../wifi_manage/wifi_sta/sta_state_machine.cpp | 1 + 2 files changed, 16 insertions(+) diff --git a/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp b/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp index b0cabd7..af1abf6 100644 --- a/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp +++ b/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp @@ -245,6 +245,9 @@ void WifiSettings::ClearDeviceConfig(void) int WifiSettings::GetDeviceConfig(std::vector &results) { std::unique_lock lock(mConfigMutex); + if (mWifiDeviceConfig.empty()) { + ReloadDeviceConfig(); + } for (auto iter = mWifiDeviceConfig.begin(); iter != mWifiDeviceConfig.end(); iter++) { results.push_back(iter->second); } @@ -254,6 +257,9 @@ int WifiSettings::GetDeviceConfig(std::vector &results) int WifiSettings::GetDeviceConfig(const int &networkId, WifiDeviceConfig &config) { std::unique_lock lock(mConfigMutex); + if (mWifiDeviceConfig.empty()) { + ReloadDeviceConfig(); + } for (auto iter = mWifiDeviceConfig.begin(); iter != mWifiDeviceConfig.end(); iter++) { if (iter->second.networkId == networkId) { config = iter->second; @@ -266,6 +272,9 @@ int WifiSettings::GetDeviceConfig(const int &networkId, WifiDeviceConfig &config int WifiSettings::GetDeviceConfig(const std::string &index, const int &indexType, WifiDeviceConfig &config) { std::unique_lock lock(mConfigMutex); + if (mWifiDeviceConfig.empty()) { + ReloadDeviceConfig(); + } if (indexType == DEVICE_CONFIG_INDEX_SSID) { for (auto iter = mWifiDeviceConfig.begin(); iter != mWifiDeviceConfig.end(); iter++) { if (iter->second.ssid == index) { @@ -287,6 +296,9 @@ int WifiSettings::GetDeviceConfig(const std::string &index, const int &indexType int WifiSettings::GetDeviceConfig(const std::string &ssid, const std::string &keymgmt, WifiDeviceConfig &config) { std::unique_lock lock(mConfigMutex); + if (mWifiDeviceConfig.empty()) { + ReloadDeviceConfig(); + } for (auto iter = mWifiDeviceConfig.begin(); iter != mWifiDeviceConfig.end(); iter++) { if ((iter->second.ssid == ssid) && (iter->second.keyMgmt == keymgmt)) { config = iter->second; @@ -299,6 +311,9 @@ int WifiSettings::GetDeviceConfig(const std::string &ssid, const std::string &ke int WifiSettings::GetHiddenDeviceConfig(std::vector &results) { std::unique_lock lock(mConfigMutex); + if (mWifiDeviceConfig.empty()) { + ReloadDeviceConfig(); + } for (auto iter = mWifiDeviceConfig.begin(); iter != mWifiDeviceConfig.end(); iter++) { if (iter->second.hiddenSSID) { results.push_back(iter->second); diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp index 5a7bbc9..fb5624f 100755 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp @@ -723,6 +723,7 @@ void StaStateMachine::DealConnectTimeOutCmd(InternalMessage *msg) InitWifiLinkedInfo(); WifiSettings::GetInstance().SaveLinkedInfo(linkedInfo); staCallback.OnStaConnChanged(OperateResState::CONNECT_CONNECTING_TIMEOUT, linkedInfo); + staCallback.OnStaConnChanged(OperateResState::DISCONNECT_DISCONNECTED, linkedInfo); } void StaStateMachine::DealConnectionEvent(InternalMessage *msg) -- Gitee From 73343675a423cc6e9193500ee7db4b8294a8b5b3 Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Thu, 21 Oct 2021 08:11:30 +0000 Subject: [PATCH 005/491] fix code static check problem Signed-off-by: zhangfeng --- .../wifi_manage/wifi_protect_manager.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_protect_manager.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_protect_manager.cpp index a3966aa..2358575 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_protect_manager.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_protect_manager.cpp @@ -91,7 +91,6 @@ bool WifiProtectManager::InitWifiProtect(const WifiProtectType &protectType, con bool WifiProtectManager::GetWifiProtect(const WifiProtectMode &protectMode, const std::string name) { bool isAlreadyExist = false; - WifiProtect *pProtect = nullptr; std::vector::iterator itor = mWifiProtects.begin(); while (itor != mWifiProtects.end()) { @@ -99,8 +98,6 @@ bool WifiProtectManager::GetWifiProtect(const WifiProtectMode &protectMode, cons LOGD("old name = %{public}s, and new Name = %{public}s", (*itor)->GetName().c_str(), (*itor)->GetName().c_str()); - pProtect = (*itor); - isAlreadyExist = true; break; } @@ -109,11 +106,15 @@ bool WifiProtectManager::GetWifiProtect(const WifiProtectMode &protectMode, cons if (isAlreadyExist) { LOGD("attempted to add a protect when already holding one"); - delete pProtect; - pProtect = nullptr; return false; } + WifiProtect *pProtect = new WifiProtect(name); + if (pProtect == nullptr) { + LOGE("Wifi protect pointer is null."); + return false; + } + pProtect->SetProtectMode(protectMode); return AddProtect(pProtect); } @@ -141,6 +142,7 @@ void WifiProtectManager::UpdateWifiClientConnected(bool isConnected) bool WifiProtectManager::AddProtect(WifiProtect *pProtect) { + mWifiProtects.push_back(pProtect); switch (pProtect->GetProtectMode()) { case WifiProtectMode::WIFI_PROTECT_FULL_HIGH_PERF: if (mWifiConnected) { -- Gitee From cfa9e815392eb64fc40fd943f82dd86934a40b22 Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Sat, 23 Oct 2021 08:41:42 +0000 Subject: [PATCH 006/491] 1. code optimize for read device config fail; 2. add log for hotconfig parameter check Signed-off-by: zhangfeng --- interfaces/innerkits/native_c/station_info.h | 2 +- .../c_adapter/wifi_c_hotspot.cpp | 9 ++++-- .../common/config/wifi_settings.cpp | 30 ++++++++++++------- .../common/config/wifi_settings.h | 2 ++ .../common/utils/wifi_global_func.cpp | 11 ++++++- .../wifi_manage/wifi_hotspot_service_impl.cpp | 1 + .../wpa_supplicant_hal/wifi_wpa_hal.c | 2 ++ 7 files changed, 43 insertions(+), 14 deletions(-) diff --git a/interfaces/innerkits/native_c/station_info.h b/interfaces/innerkits/native_c/station_info.h index 4fafb4a..9ec5cd2 100755 --- a/interfaces/innerkits/native_c/station_info.h +++ b/interfaces/innerkits/native_c/station_info.h @@ -48,7 +48,7 @@ * @since 7 */ typedef struct { - /** Network name of the station */ + /** Network name of the station. Notice: please pre-allocate memory for "name" */ char *name; /** MAC address. For its length, see {@link WIFI_MAC_LEN}. */ unsigned char macAddress[WIFI_MAC_LEN]; diff --git a/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_hotspot.cpp b/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_hotspot.cpp index 863ed3a..7b600a8 100755 --- a/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_hotspot.cpp +++ b/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_hotspot.cpp @@ -135,9 +135,14 @@ WifiErrorCode GetHotspotConfig(HotspotConfig *result) static WifiErrorCode GetStaListFromCpp(const std::vector& vecStaList, StationInfo *result) { for (auto& each : vecStaList) { - if (memcpy_s(result->name, DEVICE_NAME_LEN, each.deviceName.c_str(), each.deviceName.size() + 1) != EOK) { - return ERROR_WIFI_UNKNOWN; + if (result->name != nullptr) { + if (memcpy_s(result->name, DEVICE_NAME_LEN, each.deviceName.c_str(), each.deviceName.size() + 1) != EOK) { + return ERROR_WIFI_UNKNOWN; + } + } else { + WIFI_LOGE("WARN: device name is not pre-allocate memory!"); } + if (OHOS::Wifi::MacStrToArray(each.bssid, result->macAddress) != EOK) { WIFI_LOGE("Get sta list convert bssid error!"); return ERROR_WIFI_UNKNOWN; diff --git a/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp b/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp index af1abf6..742a50f 100644 --- a/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp +++ b/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp @@ -16,6 +16,7 @@ #include #include "define.h" #include "wifi_global_func.h" +#include "wifi_log.h" namespace OHOS { namespace Wifi { @@ -244,10 +245,11 @@ void WifiSettings::ClearDeviceConfig(void) int WifiSettings::GetDeviceConfig(std::vector &results) { - std::unique_lock lock(mConfigMutex); - if (mWifiDeviceConfig.empty()) { + if (!deviceConfigLoadFlag.test_and_set()) { + LOGE("Reload wifi config"); ReloadDeviceConfig(); } + std::unique_lock lock(mConfigMutex); for (auto iter = mWifiDeviceConfig.begin(); iter != mWifiDeviceConfig.end(); iter++) { results.push_back(iter->second); } @@ -256,10 +258,11 @@ int WifiSettings::GetDeviceConfig(std::vector &results) int WifiSettings::GetDeviceConfig(const int &networkId, WifiDeviceConfig &config) { - std::unique_lock lock(mConfigMutex); - if (mWifiDeviceConfig.empty()) { + if (!deviceConfigLoadFlag.test_and_set()) { + LOGE("Reload wifi config"); ReloadDeviceConfig(); } + std::unique_lock lock(mConfigMutex); for (auto iter = mWifiDeviceConfig.begin(); iter != mWifiDeviceConfig.end(); iter++) { if (iter->second.networkId == networkId) { config = iter->second; @@ -271,10 +274,11 @@ int WifiSettings::GetDeviceConfig(const int &networkId, WifiDeviceConfig &config int WifiSettings::GetDeviceConfig(const std::string &index, const int &indexType, WifiDeviceConfig &config) { - std::unique_lock lock(mConfigMutex); - if (mWifiDeviceConfig.empty()) { + if (!deviceConfigLoadFlag.test_and_set()) { + LOGE("Reload wifi config"); ReloadDeviceConfig(); } + std::unique_lock lock(mConfigMutex); if (indexType == DEVICE_CONFIG_INDEX_SSID) { for (auto iter = mWifiDeviceConfig.begin(); iter != mWifiDeviceConfig.end(); iter++) { if (iter->second.ssid == index) { @@ -295,10 +299,11 @@ int WifiSettings::GetDeviceConfig(const std::string &index, const int &indexType int WifiSettings::GetDeviceConfig(const std::string &ssid, const std::string &keymgmt, WifiDeviceConfig &config) { - std::unique_lock lock(mConfigMutex); - if (mWifiDeviceConfig.empty()) { + if (!deviceConfigLoadFlag.test_and_set()) { + LOGE("Reload wifi config"); ReloadDeviceConfig(); } + std::unique_lock lock(mConfigMutex); for (auto iter = mWifiDeviceConfig.begin(); iter != mWifiDeviceConfig.end(); iter++) { if ((iter->second.ssid == ssid) && (iter->second.keyMgmt == keymgmt)) { config = iter->second; @@ -310,10 +315,11 @@ int WifiSettings::GetDeviceConfig(const std::string &ssid, const std::string &ke int WifiSettings::GetHiddenDeviceConfig(std::vector &results) { - std::unique_lock lock(mConfigMutex); - if (mWifiDeviceConfig.empty()) { + if (!deviceConfigLoadFlag.test_and_set()) { + LOGE("Reload wifi config"); ReloadDeviceConfig(); } + std::unique_lock lock(mConfigMutex); for (auto iter = mWifiDeviceConfig.begin(); iter != mWifiDeviceConfig.end(); iter++) { if (iter->second.hiddenSSID) { results.push_back(iter->second); @@ -401,8 +407,11 @@ int WifiSettings::ReloadDeviceConfig() #ifndef CONFIG_NO_CONFIG_WRITE int ret = mSavedDeviceConfig.LoadConfig(); if (ret < 0) { + deviceConfigLoadFlag.clear(); + LOGE("Loading device config failed: %{public}d", ret); return -1; } + deviceConfigLoadFlag.test_and_set(); std::vector tmp; mSavedDeviceConfig.GetValue(tmp); std::unique_lock lock(mConfigMutex); @@ -424,6 +433,7 @@ int WifiSettings::AddWpsDeviceConfig(const WifiDeviceConfig &config) { int ret = mSavedDeviceConfig.LoadConfig(); if (ret < 0) { + LOGE("Add Wps config loading config failed: %{public}d", ret); return -1; } std::vector tmp; diff --git a/services/wifi_standard/wifi_framework/common/config/wifi_settings.h b/services/wifi_standard/wifi_framework/common/config/wifi_settings.h index fc82dd5..71452ae 100644 --- a/services/wifi_standard/wifi_framework/common/config/wifi_settings.h +++ b/services/wifi_standard/wifi_framework/common/config/wifi_settings.h @@ -946,6 +946,8 @@ private: std::mutex mInfoMutex; std::mutex mP2pMutex; + std::atomic_flag deviceConfigLoadFlag = ATOMIC_FLAG_INIT; + WifiConfigFileImpl mSavedDeviceConfig; /* Persistence device config */ WifiConfigFileImpl mSavedHotspotConfig; WifiConfigFileImpl mSavedBlockInfo; diff --git a/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp b/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp index afa3178..55085f2 100755 --- a/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp +++ b/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp @@ -15,6 +15,7 @@ #include "wifi_global_func.h" #include #include "wifi_log.h" + #undef LOG_TAG #define LOG_TAG "WifiGlobalFunc" @@ -34,6 +35,7 @@ constexpr int CHANNEL_5G_MIN = 34; ErrCode CfgCheckSsid(const HotspotConfig &cfg) { if (cfg.GetSsid().length() < MIN_SSID_LEN || cfg.GetSsid().length() > MAX_SSID_LEN) { + LOGE("Config ssid length is invalid!"); return ErrCode::WIFI_OPT_INVALID_PARAM; } return ErrCode::WIFI_OPT_SUCCESS; @@ -41,7 +43,9 @@ ErrCode CfgCheckSsid(const HotspotConfig &cfg) ErrCode CfgCheckPsk(const HotspotConfig &cfg) { - if (cfg.GetPreSharedKey().length() < MIN_PSK_LEN || cfg.GetPreSharedKey().length() > MAX_PSK_LEN) { + size_t len = cfg.GetPreSharedKey().length(); + if (len < MIN_PSK_LEN || len > MAX_PSK_LEN) { + LOGE("PreSharedKey length error! invalid len: %{public}zu", len); return ErrCode::WIFI_OPT_INVALID_PARAM; } return ErrCode::WIFI_OPT_SUCCESS; @@ -54,6 +58,7 @@ ErrCode CfgCheckBand(const HotspotConfig &cfg, std::vector &bandsFromC return ErrCode::WIFI_OPT_SUCCESS; } } + LOGE("Hotspot config band is invalid!"); return ErrCode::WIFI_OPT_INVALID_PARAM; } @@ -73,6 +78,7 @@ ErrCode IsValidHotspotConfig(const HotspotConfig &cfg, const HotspotConfig &cfgF if (cfg.GetSecurityType() == KeyMgmt::NONE) { if (cfg.GetPreSharedKey().length() > 0) { + LOGE("Open hotspot PreSharedKey length is non-zero error!"); return ErrCode::WIFI_OPT_INVALID_PARAM; } } else if (cfg.GetSecurityType() == KeyMgmt::WPA_PSK || cfg.GetSecurityType() == KeyMgmt::WPA2_PSK) { @@ -80,6 +86,7 @@ ErrCode IsValidHotspotConfig(const HotspotConfig &cfg, const HotspotConfig &cfgF return ErrCode::WIFI_OPT_INVALID_PARAM; } } else { + LOGE("Hotspot securityType is not supported!"); return ErrCode::WIFI_OPT_INVALID_PARAM; } @@ -89,8 +96,10 @@ ErrCode IsValidHotspotConfig(const HotspotConfig &cfg, const HotspotConfig &cfgF } } + LOGD("Config channel is: %{public}d", cfg.GetChannel()); if (cfg.GetChannel() != cfgFromCenter.GetChannel()) { if (CfgCheckChannel(cfg, channInfoFromCenter) == ErrCode::WIFI_OPT_INVALID_PARAM) { + LOGE("Config channel is invalid!"); return ErrCode::WIFI_OPT_INVALID_PARAM; } } diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp index fdc93ba..1a800e0 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp @@ -150,6 +150,7 @@ ErrCode WifiHotspotServiceImpl::SetHotspotConfig(const HotspotConfig &config) WifiConfigCenter::GetInstance().GetHotspotConfig(configFromCenter); ErrCode validRetval = IsValidHotspotConfig(config, configFromCenter, bandsFromCenter, channInfoFromCenter); if (validRetval != ErrCode::WIFI_OPT_SUCCESS) { + WIFI_LOGE("Hotspot config is invalid!"); return validRetval; } diff --git a/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c b/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c index bbe5158..380c385 100644 --- a/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c +++ b/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c @@ -678,6 +678,8 @@ static int WpaCliConnect(WifiWpaInterface *p) if (ret == 0) { LOGD("Global wpa interface connect successfully!"); break; + } else { + LOGD("Init wpaCtrl failed: %{public}d", ret); } usleep(WPA_TRY_CONNECT_SLEEP_TIME); } -- Gitee From b5ad5c7685b0b37194173d3154a73aea7224b308 Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Thu, 4 Nov 2021 02:05:57 +0000 Subject: [PATCH 007/491] Signed-off-by: zhangfeng fix(*): update code of Ap and P2P module, update DHCP test code 1. update Ap module; 2. update P2P module; 3. update Dhcp test code. --- .../wifi_standard/include/wifi_p2p.h | 4 +- .../wifi_standard/interfaces/i_wifi_p2p.h | 4 +- .../interfaces/i_wifi_p2p_callback.h | 4 +- .../wifi_standard/interfaces/wifi_p2p_msg.h | 54 +- .../src/wifi_p2p_callback_stub.cpp | 4 +- .../src/wifi_p2p_callback_stub.h | 4 +- .../wifi_standard/src/wifi_p2p_impl.cpp | 4 +- .../wifi_standard/src/wifi_p2p_impl.h | 4 +- .../wifi_standard/src/wifi_p2p_msg.cpp | 30 +- .../wifi_standard/src/wifi_p2p_proxy.cpp | 13 +- .../wifi_standard/src/wifi_p2p_proxy.h | 4 +- ohos.build | 4 +- services/wifi_standard/etc/init/BUILD.gn | 6 +- .../common/config/wifi_settings.cpp | 8 +- .../common/config/wifi_settings.h | 10 +- .../common/include/wifi_internal_msg.h | 2 +- .../dhcp_server/include/dhcp_argument.h | 9 +- .../dhcp_server/include/dhcp_define.h | 2 +- .../dhcp_server/include/dhcp_server.h | 3 +- .../dhcp_manage/dhcp_server/src/common_util.c | 7 +- .../dhcp_server/src/dhcp_address_pool.c | 6 +- .../dhcp_server/src/dhcp_argument.c | 9 +- .../dhcp_manage/dhcp_server/src/dhcp_dhcpd.c | 22 +- .../dhcp_manage/dhcp_server/src/dhcp_option.c | 12 +- .../dhcp_manage/dhcp_server/src/dhcp_server.c | 121 ++-- .../common/wifi_broadcast_helper.cpp | 15 +- .../common/wifi_broadcast_helper.h | 4 +- .../idl_client/wifi_idl_client.cpp | 5 +- .../wifi_manage/idl_client/wifi_idl_client.h | 4 +- .../idl_client/wifi_p2p_hal_interface.cpp | 5 +- .../idl_client/wifi_p2p_hal_interface.h | 4 +- .../wifi_manage/wifi_ap/ap_config_use.cpp | 6 +- .../wifi_manage/wifi_ap/ap_config_use.h | 2 +- .../wifi_manage/wifi_ap/ap_define.h | 4 +- .../wifi_manage/wifi_ap/ap_idle_state.h | 4 +- .../wifi_manage/wifi_ap/ap_interface.h | 4 +- .../wifi_manage/wifi_ap/ap_root_state.h | 4 +- .../wifi_manage/wifi_ap/ap_service.h | 10 +- .../wifi_manage/wifi_ap/ap_started_state.h | 38 +- .../wifi_manage/wifi_ap/ap_state_machine.cpp | 1 + .../wifi_manage/wifi_ap/ap_stations_manager.h | 12 +- .../wifi_manage/wifi_manager.cpp | 2 +- .../wifi_framework/wifi_manage/wifi_manager.h | 2 +- .../wifi_p2p/group_formed_state.cpp | 77 +- .../wifi_manage/wifi_p2p/group_formed_state.h | 23 +- .../wifi_p2p/group_negotiation_state.cpp | 3 +- .../wifi_p2p/group_negotiation_state.h | 3 +- .../wifi_manage/wifi_p2p/ip2p_service.h | 11 +- .../wifi_p2p/ip2p_service_callbacks.h | 8 +- .../wifi_manage/wifi_p2p/p2p_define.h | 4 +- .../wifi_p2p/p2p_enabled_state.cpp | 31 +- .../wifi_manage/wifi_p2p/p2p_enabled_state.h | 9 +- .../wifi_p2p/p2p_group_formation_state.cpp | 16 + .../wifi_p2p/p2p_group_join_state.cpp | 12 +- .../wifi_p2p/p2p_group_join_state.h | 2 +- .../wifi_p2p/p2p_group_operating_state.cpp | 36 +- .../wifi_p2p/p2p_group_operating_state.h | 5 +- .../wifi_manage/wifi_p2p/p2p_idle_state.cpp | 8 +- .../wifi_manage/wifi_p2p/p2p_idle_state.h | 2 +- .../wifi_manage/wifi_p2p/p2p_interface.cpp | 9 +- .../wifi_manage/wifi_p2p/p2p_interface.h | 10 +- .../wifi_p2p/p2p_inviting_state.cpp | 16 + .../wifi_manage/wifi_p2p/p2p_inviting_state.h | 2 +- .../wifi_manage/wifi_p2p/p2p_monitor.cpp | 4 +- .../wifi_manage/wifi_p2p/p2p_monitor.h | 2 +- .../wifi_p2p/p2p_state_machine.cpp | 114 ++- .../wifi_manage/wifi_p2p/p2p_state_machine.h | 57 +- .../wifi_p2p/provision_discovery_state.cpp | 32 +- .../wifi_p2p/provision_discovery_state.h | 24 +- .../wifi_p2p/wifi_p2p_device_manager.h | 1 + .../wifi_p2p/wifi_p2p_dns_sd_service_info.cpp | 5 +- .../wifi_p2p_dns_sd_service_response.cpp | 3 +- .../wifi_p2p/wifi_p2p_group_manager.cpp | 6 +- .../wifi_p2p/wifi_p2p_group_manager.h | 10 +- .../wifi_manage/wifi_p2p/wifi_p2p_service.cpp | 33 +- .../wifi_manage/wifi_p2p/wifi_p2p_service.h | 13 +- .../wifi_p2p/wifi_p2p_upnp_service_info.cpp | 1 + .../wifi_p2p/wifi_p2p_upnp_service_info.h | 10 +- .../wifi_manage/wifi_p2p_callback_proxy.cpp | 2 +- .../wifi_manage/wifi_p2p_callback_proxy.h | 4 +- .../wifi_manage/wifi_p2p_service_impl.cpp | 8 +- .../wifi_manage/wifi_p2p_service_impl.h | 4 +- .../wifi_manage/wifi_p2p_stub.cpp | 15 +- .../wifi_manage/wifi_p2p_stub.h | 2 +- .../wifi_manage/wifi_scan/scan_service.cpp | 8 +- .../wifi_standard/wifi_hal/etc/init/BUILD.gn | 4 +- .../dhcp_manage/dhcp_server/unittest/BUILD.gn | 13 +- .../unittest/address_utils_test.cpp | 15 +- .../dhcp_server/unittest/common_util_test.cpp | 87 +++ .../unittest/dhcp_address_pool_test.cpp | 288 +++++++- .../unittest/dhcp_argument_test.cpp | 18 +- .../dhcp_server/unittest/dhcp_message_sim.cpp | 47 +- .../dhcp_server/unittest/dhcp_message_sim.h | 12 +- .../dhcp_server/unittest/dhcp_option_test.cpp | 32 +- .../dhcp_server/unittest/dhcp_server_test.cpp | 663 ++++++++++++++++-- .../dhcp_server/unittest/hash_table_test.cpp | 15 +- .../dhcp_server/unittest/system_func_mock.cpp | 111 ++- .../dhcp_server/unittest/system_func_mock.h | 6 +- .../unittest/wifi_p2p_hal_interface_test.cpp | 4 +- .../unittest/wifi_manager_service_test.cpp | 2 +- .../unittest/wifi_mock_p2p_service.cpp | 20 +- .../unittest/wifi_mock_p2p_service.h | 2 +- .../wifi_manage/wifi_ap/BUILD.gn | 66 +- .../wifi_ap/Mock/mock_ap_state_machine.h | 1 + .../wifi_ap/Mock/mock_network_interface.cpp | 5 + .../wifi_ap/Mock/mock_network_interface.h | 5 +- .../ap_config_use_test.cpp | 51 +- .../ap_idle_state_test.cpp | 64 +- .../ap_monitor_test.cpp | 55 +- .../ap_root_state_test.cpp | 27 +- .../ap_service_test.cpp | 69 +- .../ap_started_state_test.cpp | 145 ++-- .../ap_state_machine_test.cpp | 17 +- .../ap_stations_manager_test.cpp | 56 +- .../wifi_ap/wifi_ap_dhcp_nat/BUILD.gn | 82 --- .../wifi_ap/wifi_ap_dhcp_nat/global_test.cpp | 23 - .../wifi_ap/wifi_ap_dhcp_nat/global_test.h | 24 - .../wifi_ap/wifi_ap_dhcp_nat/wifi_ap_test.cpp | 25 - .../wifi_ap_nat_manager_test.cpp | 40 +- .../wifi_ap/wifi_hotspot_test/BUILD.gn | 108 --- .../wifi_ap/wifi_hotspot_test/global_test.cpp | 23 - .../wifi_ap/wifi_hotspot_test/global_test.h | 24 - .../wifi_hotspot_test/wifi_ap_test.cpp | 25 - .../wifi_manage/wifi_p2p/test/BUILD.gn | 43 +- .../test/Mock/mock_p2p_state_machine.h | 13 +- .../test/Mock/mock_wifi_p2p_hal_interface.h | 10 +- .../wifi_p2p/test/Mock/mock_wifi_settings.h | 8 +- ...orizing_negotiation_request_state_test.cpp | 5 + .../wifi_p2p/test/group_formed_state_test.cpp | 71 +- .../test/group_negotiation_state_test.cpp | 39 +- .../test/invitation_request_state_test.cpp | 29 +- .../wifi_p2p/test/p2p_default_state_test.cpp | 4 +- .../wifi_p2p/test/p2p_disabled_state_test.cpp | 21 +- .../test/p2p_disabling_state_test.cpp | 12 +- .../wifi_p2p/test/p2p_enabled_state_test.cpp | 117 +++- .../test/p2p_group_formation_state_test.cpp | 6 + .../test/p2p_group_join_state_test.cpp | 7 + .../test/p2p_group_operating_state_test.cpp | 88 ++- .../wifi_p2p/test/p2p_idle_state_test.cpp | 176 ++++- .../wifi_p2p/test/p2p_inviting_state_test.cpp | 6 + .../wifi_p2p/test/p2p_monitor_test.cpp | 234 +++++-- .../wifi_p2p/test/p2p_state_machine_test.cpp | 315 ++++++++- .../test/provision_discovery_state_test.cpp | 25 +- .../wifi_p2p_dns_sd_service_info_test.cpp | 8 +- .../wifi_p2p_dns_sd_service_response_test.cpp | 117 +++- .../test/wifi_p2p_group_info_proxy_test.cpp | 3 + .../test/wifi_p2p_group_manager_test.cpp | 7 +- .../test/wifi_p2p_service_manager_test.cpp | 33 +- .../wifi_p2p_service_request_list_test.cpp | 36 +- .../wifi_p2p_service_response_list_test.cpp | 92 ++- .../wifi_p2p/test/wifi_p2p_service_test.cpp | 34 +- .../test/wifi_p2p_upnp_service_info_test.cpp | 3 +- .../wifi_p2p_upnp_service_request_test.cpp | 1 + .../wifi_p2p_upnp_service_response_test.cpp | 23 +- 154 files changed, 3709 insertions(+), 1272 deletions(-) create mode 100644 tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/common_util_test.cpp rename tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/{wifi_hotspot_test => }/ap_config_use_test.cpp (82%) rename tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/{wifi_hotspot_test => }/ap_idle_state_test.cpp (73%) rename tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/{wifi_hotspot_test => }/ap_monitor_test.cpp (57%) rename tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/{wifi_hotspot_test => }/ap_root_state_test.cpp (73%) rename tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/{wifi_hotspot_test => }/ap_service_test.cpp (62%) rename tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/{wifi_hotspot_test => }/ap_started_state_test.cpp (91%) rename tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/{wifi_hotspot_test => }/ap_state_machine_test.cpp (94%) rename tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/{wifi_hotspot_test => }/ap_stations_manager_test.cpp (85%) delete mode 100644 tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_dhcp_nat/BUILD.gn delete mode 100644 tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_dhcp_nat/global_test.cpp delete mode 100644 tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_dhcp_nat/global_test.h delete mode 100644 tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_dhcp_nat/wifi_ap_test.cpp rename tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/{wifi_ap_dhcp_nat => }/wifi_ap_nat_manager_test.cpp (84%) delete mode 100644 tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_hotspot_test/BUILD.gn delete mode 100644 tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_hotspot_test/global_test.cpp delete mode 100644 tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_hotspot_test/global_test.h delete mode 100644 tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_hotspot_test/wifi_ap_test.cpp diff --git a/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_p2p.h b/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_p2p.h index 5d3d7f2..2cbfaf0 100644 --- a/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_p2p.h +++ b/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_p2p.h @@ -152,10 +152,10 @@ public: /** * @Description Querying Wi-Fi P2P Connection Information. * - * @param connInfo - Get the WifiP2pInfo msg + * @param linkedInfo - Get the WifiP2pLinkedInfo msg * @return ErrCode - operate result */ - virtual ErrCode QueryP2pInfo(WifiP2pInfo &connInfo) = 0; + virtual ErrCode QueryP2pLinkedInfo(WifiP2pLinkedInfo &linkedInfo) = 0; /** * @Description Get the Current Group object. diff --git a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_p2p.h b/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_p2p.h index 2e180f6..df4ddd1 100644 --- a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_p2p.h +++ b/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_p2p.h @@ -153,10 +153,10 @@ public: /** * @Description Querying Wi-Fi P2P Connection Information. * - * @param connInfo - Get the WifiP2pInfo msg + * @param linkedInfo - Get the WifiP2pLinkedInfo msg * @return ErrCode - operate result */ - virtual ErrCode QueryP2pInfo(WifiP2pInfo &connInfo) = 0; + virtual ErrCode QueryP2pLinkedInfo(WifiP2pLinkedInfo& linkedInfo) = 0; /** * @Description Get the Current Group object. diff --git a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_p2p_callback.h b/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_p2p_callback.h index 188ba64..7133774 100644 --- a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_p2p_callback.h +++ b/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_p2p_callback.h @@ -65,9 +65,9 @@ public: /** * @Description Connection status change. * - * @param info - WifiP2pInfo object + * @param info - WifiP2pLinkedInfo object */ - virtual void OnP2pConnectionChanged(const WifiP2pInfo &info) = 0; + virtual void OnP2pConnectionChanged(const WifiP2pLinkedInfo &info) = 0; /** * @Description Discover status change. diff --git a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_p2p_msg.h b/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_p2p_msg.h index 4f6d9d9..3e54e7b 100644 --- a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_p2p_msg.h +++ b/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_p2p_msg.h @@ -297,10 +297,16 @@ public: netId(-1), passphrase(""), groupOwnerIntent(-1), - networkName("") - { - wpsInfo.SetWpsMethod(WpsMethod::WPS_METHOD_PBC); - } + groupName("") + {} + WifiP2pConfig(const WifiP2pConfig &config) + : mDeviceAddress(config.GetDeviceAddress()), + goBand(config.GetGoBand()), + netId(config.GetNetId()), + passphrase(config.GetPassphrase()), + groupOwnerIntent(config.GetGroupOwnerIntent()), + groupName(config.GetGroupName()) + {} ~WifiP2pConfig() {} void SetDeviceAddress(const std::string &deviceAddress); @@ -311,28 +317,50 @@ public: int GetNetId() const; void SetPassphrase(const std::string &newPassphrase); const std::string &GetPassphrase() const; - void SetWpsInfo(const WpsInfo &info); - const WpsInfo &GetWpsInfo() const; void SetGroupOwnerIntent(int intent); int GetGroupOwnerIntent() const; - void SetNetworkName(const std::string &setNetworkName); - const std::string &GetNetworkName() const; + void SetGroupName(const std::string &setGroupName); + const std::string &GetGroupName() const; private: std::string mDeviceAddress; /* the device MAC address, the length is 17 characters. */ GroupOwnerBand goBand; int netId; /* network id, when -2 means persistent and -1 means temporary, else need >= 0 */ std::string passphrase; /* the value ranges from 8 to 63. */ - WpsInfo wpsInfo; int groupOwnerIntent; /* the value is -1.(A value of -1 indicates the system can choose an appropriate value.) */ - std::string networkName; /* the value ranges from 1 to 32. */ + std::string groupName; /* the value ranges from 1 to 32. */ +}; + +class WifiP2pConfigInternal : public WifiP2pConfig { +public: + WifiP2pConfigInternal(): WifiP2pConfig() + { + wpsInfo.SetWpsMethod(WpsMethod::WPS_METHOD_INVALID); + } + WifiP2pConfigInternal(WifiP2pConfig config): WifiP2pConfig(config) + { + wpsInfo.SetWpsMethod(WpsMethod::WPS_METHOD_INVALID); + } + ~WifiP2pConfigInternal() + {} + inline void SetWpsInfo(const WpsInfo &info) + { + wpsInfo = info; + } + inline const WpsInfo &GetWpsInfo() const + { + return wpsInfo; + } + +private: + WpsInfo wpsInfo; }; -class WifiP2pInfo { +class WifiP2pLinkedInfo { public: - WifiP2pInfo() : connectState(P2pConnectedState::P2P_DISCONNECTED), isP2pGroupOwner(false) + WifiP2pLinkedInfo() : connectState(P2pConnectedState::P2P_DISCONNECTED), isP2pGroupOwner(false) {} - ~WifiP2pInfo() + ~WifiP2pLinkedInfo() {} void SetConnectState(P2pConnectedState setConnectState); P2pConnectedState GetConnectState() const; diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_callback_stub.cpp b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_callback_stub.cpp index b4e4c9f..5c8ebb2 100644 --- a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_callback_stub.cpp +++ b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_callback_stub.cpp @@ -131,7 +131,7 @@ void WifiP2pCallbackStub::OnP2pServicesChanged(const std::vector(data.ReadInt32())); info.SetIsGroupOwner(data.ReadBool()); info.SetIsGroupOwnerAddress(data.ReadCString()); diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_callback_stub.h b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_callback_stub.h index e295015..47fb419 100644 --- a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_callback_stub.h +++ b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_callback_stub.h @@ -70,9 +70,9 @@ public: /** * @Description Connection status change * - * @param info - WifiP2pInfo object + * @param info - WifiP2pLinkedInfo object */ - void OnP2pConnectionChanged(const WifiP2pInfo &info) override; + void OnP2pConnectionChanged(const WifiP2pLinkedInfo &info) override; /** * @Description Discover status change diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_impl.cpp b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_impl.cpp index f8946fe..8a111be 100644 --- a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_impl.cpp +++ b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_impl.cpp @@ -157,10 +157,10 @@ ErrCode WifiP2pImpl::P2pDisConnect(void) return client_->P2pDisConnect(); } -ErrCode WifiP2pImpl::QueryP2pInfo(WifiP2pInfo &connInfo) +ErrCode WifiP2pImpl::QueryP2pLinkedInfo(WifiP2pLinkedInfo &linkedInfo) { RETURN_IF_FAIL(client_); - return client_->QueryP2pInfo(connInfo); + return client_->QueryP2pLinkedInfo(linkedInfo); } ErrCode WifiP2pImpl::GetCurrentGroup(WifiP2pGroupInfo &group) diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_impl.h b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_impl.h index 595ee4d..ef650eb 100644 --- a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_impl.h +++ b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_impl.h @@ -152,10 +152,10 @@ public: /** * @Description Querying Wi-Fi P2P Connection Information * - * @param connInfo - Get the WifiP2pInfo msg + * @param linkedInfo - Get the WifiP2pLinkedInfo msg * @return ErrCode - operate result */ - ErrCode QueryP2pInfo(WifiP2pInfo &connInfo) override; + ErrCode QueryP2pLinkedInfo(WifiP2pLinkedInfo &linkedInfo) override; /** * @Description Get the Current Group object diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_msg.cpp b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_msg.cpp index 9945f23..ab8ca57 100644 --- a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_msg.cpp +++ b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_msg.cpp @@ -467,16 +467,6 @@ const std::string &WifiP2pConfig::GetPassphrase() const return passphrase; } -void WifiP2pConfig::SetWpsInfo(const WpsInfo &info) -{ - wpsInfo = info; -} - -const WpsInfo &WifiP2pConfig::GetWpsInfo() const -{ - return wpsInfo; -} - void WifiP2pConfig::SetGroupOwnerIntent(int intent) { groupOwnerIntent = intent; @@ -487,42 +477,42 @@ int WifiP2pConfig::GetGroupOwnerIntent() const return groupOwnerIntent; } -void WifiP2pConfig::SetNetworkName(const std::string &setNetworkName) +void WifiP2pConfig::SetGroupName(const std::string &setGroupName) { - networkName = setNetworkName; + groupName = setGroupName; } -const std::string &WifiP2pConfig::GetNetworkName() const +const std::string &WifiP2pConfig::GetGroupName() const { - return networkName; + return groupName; } -void WifiP2pInfo::SetConnectState(P2pConnectedState setConnectState) +void WifiP2pLinkedInfo::SetConnectState(P2pConnectedState setConnectState) { connectState = setConnectState; } -P2pConnectedState WifiP2pInfo::GetConnectState() const +P2pConnectedState WifiP2pLinkedInfo::GetConnectState() const { return connectState; } -void WifiP2pInfo::SetIsGroupOwner(bool isGroupOwner) +void WifiP2pLinkedInfo::SetIsGroupOwner(bool isGroupOwner) { isP2pGroupOwner = isGroupOwner; } -const bool &WifiP2pInfo::IsGroupOwner() const +const bool &WifiP2pLinkedInfo::IsGroupOwner() const { return isP2pGroupOwner; } -void WifiP2pInfo::SetIsGroupOwnerAddress(const std::string &setGroupOwnerAddress) +void WifiP2pLinkedInfo::SetIsGroupOwnerAddress(const std::string &setGroupOwnerAddress) { groupOwnerAddress = setGroupOwnerAddress; } -const std::string &WifiP2pInfo::GetGroupOwnerAddress() const +const std::string &WifiP2pLinkedInfo::GetGroupOwnerAddress() const { return groupOwnerAddress; } diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_proxy.cpp b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_proxy.cpp index 8950ce0..a4e415f 100644 --- a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_proxy.cpp +++ b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_proxy.cpp @@ -487,13 +487,10 @@ void WifiP2pProxy::WriteWifiP2pConfigData(MessageParcel &data, const WifiP2pConf { data.WriteCString(config.GetDeviceAddress().c_str()); data.WriteCString(config.GetPassphrase().c_str()); - data.WriteCString(config.GetNetworkName().c_str()); + data.WriteCString(config.GetGroupName().c_str()); data.WriteInt32(static_cast(config.GetGoBand())); data.WriteInt32(config.GetNetId()); data.WriteInt32(config.GetGroupOwnerIntent()); - data.WriteInt32(static_cast(config.GetWpsInfo().GetWpsMethod())); - data.WriteCString(config.GetWpsInfo().GetBssid().c_str()); - data.WriteCString(config.GetWpsInfo().GetPin().c_str()); } ErrCode WifiP2pProxy::P2pConnect(const WifiP2pConfig &config) @@ -543,7 +540,7 @@ ErrCode WifiP2pProxy::P2pDisConnect() return ErrCode(reply.ReadInt32()); } -ErrCode WifiP2pProxy::QueryP2pInfo(WifiP2pInfo &connInfo) +ErrCode WifiP2pProxy::QueryP2pLinkedInfo(WifiP2pLinkedInfo &linkedInfo) { if (mRemoteDied) { WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); @@ -567,9 +564,9 @@ ErrCode WifiP2pProxy::QueryP2pInfo(WifiP2pInfo &connInfo) if (ErrCode(ret) != WIFI_OPT_SUCCESS) { return ErrCode(ret); } - connInfo.SetConnectState(static_cast(reply.ReadInt32())); - connInfo.SetIsGroupOwner(reply.ReadBool()); - connInfo.SetIsGroupOwnerAddress(reply.ReadCString()); + linkedInfo.SetConnectState(static_cast(reply.ReadInt32())); + linkedInfo.SetIsGroupOwner(reply.ReadBool()); + linkedInfo.SetIsGroupOwnerAddress(reply.ReadCString()); return WIFI_OPT_SUCCESS; } diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_proxy.h b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_proxy.h index 5bdd764..d831213 100644 --- a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_proxy.h +++ b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_proxy.h @@ -152,10 +152,10 @@ public: /** * @Description Querying Wi-Fi P2P Connection Information * - * @param connInfo - Get the WifiP2pInfo msg + * @param linkedInfo - Get the WifiP2pLinkedInfo msg * @return ErrCode - operate result */ - ErrCode QueryP2pInfo(WifiP2pInfo &connInfo) override; + ErrCode QueryP2pLinkedInfo(WifiP2pLinkedInfo &linkedInfo) override; /** * @Description Get the Current Group object diff --git a/ohos.build b/ohos.build index 098ff8f..6e9a2cf 100755 --- a/ohos.build +++ b/ohos.build @@ -66,9 +66,7 @@ "test_list": [ "//foundation/communication/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan:unittest", "//foundation/communication/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta:unittest", - "//foundation/communication/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_hotspot_test:unittest", - "//foundation/communication/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/:unittest", - "//foundation/communication/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_dhcp_nat:unittest", + "//foundation/communication/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap:unittest", "//foundation/communication/wifi/tests/wifi_standard/wifi_framework/dhcp_manage/mgr_service:unittest", "//foundation/communication/wifi/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_client:unittest", "//foundation/communication/wifi/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest:unittest", diff --git a/services/wifi_standard/etc/init/BUILD.gn b/services/wifi_standard/etc/init/BUILD.gn index 5ea04da..ee90c6e 100755 --- a/services/wifi_standard/etc/init/BUILD.gn +++ b/services/wifi_standard/etc/init/BUILD.gn @@ -14,9 +14,7 @@ import("//build/ohos.gni") group("etc") { - deps = [ - ":wifi_standard.rc" - ] + deps = [ ":wifi_standard.rc" ] } ohos_prebuilt_etc("wifi_standard.rc") { @@ -28,4 +26,4 @@ ohos_prebuilt_etc("wifi_standard.rc") { relative_install_dir = "init" part_name = "wifi_standard" subsystem_name = "communication" -} \ No newline at end of file +} diff --git a/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp b/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp index af1abf6..cad755e 100644 --- a/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp +++ b/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp @@ -192,17 +192,17 @@ int WifiSettings::GetScanControlInfo(ScanControlInfo &info) return 0; } -int WifiSettings::GetP2pInfo(WifiP2pInfo &connInfo) +int WifiSettings::GetP2pInfo(WifiP2pLinkedInfo &linkedInfo) { std::unique_lock lock(mInfoMutex); - connInfo = mWifiP2pInfo; + linkedInfo = mWifiP2pInfo; return 0; } -int WifiSettings::SaveP2pInfo(WifiP2pInfo &connInfo) +int WifiSettings::SaveP2pInfo(WifiP2pLinkedInfo &linkedInfo) { std::unique_lock lock(mInfoMutex); - mWifiP2pInfo = connInfo; + mWifiP2pInfo = linkedInfo; return 0; } diff --git a/services/wifi_standard/wifi_framework/common/config/wifi_settings.h b/services/wifi_standard/wifi_framework/common/config/wifi_settings.h index fc82dd5..9f998ab 100644 --- a/services/wifi_standard/wifi_framework/common/config/wifi_settings.h +++ b/services/wifi_standard/wifi_framework/common/config/wifi_settings.h @@ -129,18 +129,18 @@ public: /** * @Description save the p2p connected info * - * @param connInfo - WifiP2pInfo object + * @param linkedInfo - WifiP2pLinkedInfo object * @return int - 0 success */ - int SaveP2pInfo(WifiP2pInfo &connInfo); + int SaveP2pInfo(WifiP2pLinkedInfo &linkedInfo); /** * @Description Get the p2p connected info * - * @param connInfo - output the p2p connected info + * @param linkedInfo - output the p2p connected info * @return int - 0 success */ - int GetP2pInfo(WifiP2pInfo &connInfo); + int GetP2pInfo(WifiP2pLinkedInfo &linkedInfo); /** * @Description Get the scan control policy info @@ -916,7 +916,7 @@ private: std::vector mWifiScanInfoList; std::vector mGroupInfoList; ScanControlInfo mScanControlInfo; - WifiP2pInfo mWifiP2pInfo; + WifiP2pLinkedInfo mWifiP2pInfo; std::map mWifiDeviceConfig; IpInfo mWifiIpInfo; WifiLinkedInfo mWifiLinkedInfo; diff --git a/services/wifi_standard/wifi_framework/common/include/wifi_internal_msg.h b/services/wifi_standard/wifi_framework/common/include/wifi_internal_msg.h index c1cda1e..bcb2f54 100755 --- a/services/wifi_standard/wifi_framework/common/include/wifi_internal_msg.h +++ b/services/wifi_standard/wifi_framework/common/include/wifi_internal_msg.h @@ -209,7 +209,7 @@ struct WifiEventCallbackMsg { StationInfo staInfo; std::vector device; std::vector serviceInfo; - WifiP2pInfo p2pInfo; + WifiP2pLinkedInfo p2pInfo; WifiP2pDevice p2pDevice; P2pActionCallback p2pAction; WifiEventCallbackMsg() diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/dhcp_argument.h b/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/dhcp_argument.h index 5741ea5..cb90770 100644 --- a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/dhcp_argument.h +++ b/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/dhcp_argument.h @@ -13,14 +13,12 @@ * limitations under the License. */ + #ifndef OHOS_DHCP_ARGUMENT_H #define OHOS_DHCP_ARGUMENT_H #include "hash_table.h" #include "dhcp_define.h" -#ifdef __cplusplus -extern "C" { -#endif #define ARGUMENT_NAME_SIZE 32 #define ARGUMENT_VALUE_SIZE 256 @@ -32,6 +30,11 @@ extern "C" { #define USAGE_DESC_MAX_LENGTH 32 + +#ifdef __cplusplus +extern "C" { +#endif + typedef struct DhcpUsage DhcpUsage; struct DhcpUsage { struct option *opt; diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/dhcp_define.h b/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/dhcp_define.h index 6759187..f0602b7 100644 --- a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/dhcp_define.h +++ b/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/dhcp_define.h @@ -26,7 +26,7 @@ #define DHCP_BOOT_FILE_LENGTH 128 #define DHCP_LEASE_FILE_LENGTH 256 #define DHCP_FILE_LINE_LENGTH 1024 -#define DHCP_REFRESH_LEASE_FILE_INTERVAL 5 +#define DHCP_REFRESH_LEASE_FILE_INTERVAL 120 #define DHCP_MESSAGE_FLAG_LENGTH 16 #define DHCP_MAX_PATH_LENGTH 256 #define DHCP_ONE_BYTE_BITS 8 diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/dhcp_server.h b/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/dhcp_server.h index df81821..4647137 100644 --- a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/dhcp_server.h +++ b/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/dhcp_server.h @@ -36,7 +36,8 @@ int StartDhcpServer(PDhcpServerContext ctx); int StopDhcpServer(PDhcpServerContext ctx); int GetServerStatus(PDhcpServerContext ctx); void RegisterDhcpCallback(PDhcpServerContext ctx, DhcpServerCallback callback); -int FreeServerContex(PDhcpServerContext ctx); +int FreeServerContext(PDhcpServerContext ctx); +int SaveLease(PDhcpServerContext ctx); #ifdef __cplusplus } diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/common_util.c b/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/common_util.c index 2d6f25f..a350ad6 100644 --- a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/common_util.c +++ b/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/common_util.c @@ -112,7 +112,7 @@ const char *GetFilePath(const char *fileName) return 0; } int flen = strlen(fileName); - if (!flen) { + if (flen == 0) { return 0; } char currName[DHCP_MAX_PATH_LENGTH] = {'\0'}; @@ -135,7 +135,10 @@ const char *GetFilePath(const char *fileName) const char *GetLeaseFile(const char *fileName, const char *ifname) { static char leaseFileName[DHCP_MAX_PATH_LENGTH]; - if (!fileName || ifname) { + if (!fileName || !ifname) { + return 0; + } + if (strlen(fileName) == 0 || strlen(ifname) == 0) { return 0; } if (snprintf_s(leaseFileName, sizeof(leaseFileName), sizeof(leaseFileName) - 1, "%s.%s", fileName, ifname) < 0) { diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_address_pool.c b/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_address_pool.c index f175b62..12acccf 100644 --- a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_address_pool.c +++ b/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_address_pool.c @@ -275,15 +275,15 @@ void FreeAddressPool(DhcpAddressPool *pool) } if (pool->fixedOptions.size > 0) { - FreeOptionList(&pool->fixedOptions); + ClearOptions(&pool->fixedOptions); } if (pool && Initialized(&pool->leaseTable)) { DestroyHashTable(&pool->leaseTable); } - if (Initialized(&g_bindingRecoders)) { - ClearAll(&g_bindingRecoders); + if (pool && HasInitialized(&pool->fixedOptions)) { + FreeOptionList(&pool->fixedOptions); } } diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_argument.c b/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_argument.c index a692d6f..c5fcf76 100644 --- a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_argument.c +++ b/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_argument.c @@ -48,11 +48,8 @@ static int PutPoolArgument(const char *argument, const char *val) static int ShowVersion(const char *argument, const char *val) { - if (argument && PutArgument(argument, val) != RET_SUCCESS) { - LOGD("failed to put argument 'version'."); - } printf("version:%s\n", DHCPD_VERSION); - return RET_BREAK; + return RET_SUCCESS; } static int DefaultArgument(const char *argument, const char *val) @@ -131,7 +128,7 @@ static void ShowUsage(const DhcpUsage *usage) printf(" --%s ", usage->opt->name); } if (usage->params[0] == '\0') { - printf("\t%s\n", usage->desc); + printf("\t\t%s\n", usage->desc); } else { int plen = strlen(usage->params) + strlen(usage->params); if (plen < USAGE_DESC_MAX_LENGTH) { @@ -266,7 +263,7 @@ int PutArgument(const char *argument, const char *val) return RET_FAILED; } -static int findIndex(int c) +int findIndex(int c) { int size = sizeof(longOptions) / sizeof(longOptions[0]); for (int i = 0; i < size; ++i) { diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_dhcpd.c b/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_dhcpd.c index 12fb966..1015a3c 100644 --- a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_dhcpd.c +++ b/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_dhcpd.c @@ -293,7 +293,6 @@ int ServerActionCallback(int state, int code, const char *ifname) } case ST_STOPED: { LOGD(" callback[%s] ==> server stoped.", ifname); - exit(0); break; } default: @@ -306,7 +305,7 @@ static void SignalHandler(int signal) { switch (signal) { case SIGTERM: { - StopDhcpServer(g_dhcpServer); + exit(0); break; } case SIGUSR1: @@ -373,7 +372,18 @@ void FreeSeverResources(void) { FreeArguments(); FreeLocalConfig(); - FreeServerContex(g_dhcpServer); + FreeServerContext(g_dhcpServer); +} + +static void BeforeExit(void) +{ + if (g_dhcpServer) { + LOGD("saving lease recoder..."); + if (SaveLease(g_dhcpServer) != RET_SUCCESS) { + LOGD("failed to save lease recoder."); + } + } + FreeSeverResources(); } int main(int argc, char *argv[]) @@ -414,11 +424,13 @@ int main(int argc, char *argv[]) FreeSeverResources(); return 1; } + if (atexit(BeforeExit) != 0) { + LOGW("failed to register exit process function."); + } RegisterDhcpCallback(g_dhcpServer, ServerActionCallback); - if (StartDhcpServer(g_dhcpServer)) { + if (StartDhcpServer(g_dhcpServer) != RET_SUCCESS) { FreeSeverResources(); return 1; } - FreeSeverResources(); return 0; } \ No newline at end of file diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_option.c b/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_option.c index dbd3364..29fb16b 100644 --- a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_option.c +++ b/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_option.c @@ -139,9 +139,12 @@ int PushFrontOption(PDhcpOptionList pOptions, PDhcpOption pOption) int RemoveOption(PDhcpOptionList pOptions, uint8_t code) { - if (pOptions->size == 0) { + if (pOptions == NULL) { return RET_ERROR; } + if (pOptions->size == 0) { + return RET_FAILED; + } DhcpOptionNode *pNode = GetOptionNode(pOptions, code); if (pNode == NULL) { return RET_FAILED; @@ -181,7 +184,7 @@ PDhcpOption GetOption(PDhcpOptionList pOptions, uint8_t code) void ClearOptions(PDhcpOptionList pOptions) { - if (pOptions->size == 0) { + if (pOptions == NULL || pOptions->size == 0) { return; } DhcpOptionNode *pNode = pOptions->first->next; @@ -205,7 +208,10 @@ void ClearOptions(PDhcpOptionList pOptions) void FreeOptionList(PDhcpOptionList pOptions) { - if (pOptions->size == 0) { + if (pOptions == NULL) { + return; + } + if (pOptions->first == NULL) { return; } DhcpOptionNode *pNode = pOptions->first->next; diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_server.c b/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_server.c index 7274acd..c1af5ed 100644 --- a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_server.c +++ b/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_server.c @@ -39,7 +39,7 @@ #undef LOG_TAG #define LOG_TAG "DhcpServer" -#define DHCP_SEL_WAIT_TIMEOUTS 1500 +#define DHCP_SEL_WAIT_TIMEOUTS 1000 #define OPT_MESSAGE_TYPE_LEGTH 1 #define OPT_HEADER_LENGTH 2 #define OPT_TIME_LENGTH 4 @@ -92,7 +92,7 @@ enum LooperState { LS_STOPED }; typedef struct sockaddr_in sockaddr_in; -static int FillReply(PDhcpServerContext ctx, PDhcpMsgInfo received, PDhcpMsgInfo reply); +int FillReply(PDhcpServerContext ctx, PDhcpMsgInfo received, PDhcpMsgInfo reply); static int OnReceivedDiscover(PDhcpServerContext ctx, PDhcpMsgInfo received, PDhcpMsgInfo reply); static int OnReceivedRequest(PDhcpServerContext ctx, PDhcpMsgInfo received, PDhcpMsgInfo reply); static int OnReceivedDecline(PDhcpServerContext ctx, PDhcpMsgInfo received, PDhcpMsgInfo reply); @@ -355,12 +355,6 @@ void OnServerStoped(PDhcpServerContext ctx, int code) LOGE("dhcp server context pointer is null."); return; } - LOGD("saving lease recoders ...."); - if (SaveBindingRecoders(&srvIns->addressPool, 1) == RET_SUCCESS) { - LOGI("lease seaved. total: %zu", srvIns->addressPool.leaseTable.size); - } else { - LOGW("failed to save lease."); - } if (srvIns->callback) { srvIns->callback(ST_STOPED, code, ctx->ifname); } @@ -444,7 +438,6 @@ static int MessageProcess(PDhcpServerContext ctx, PDhcpMsgInfo received, PDhcpMs return replyType; } - int SaveLease(PDhcpServerContext ctx) { ServerContext *srvIns = GetServerInstance(ctx); @@ -452,7 +445,7 @@ int SaveLease(PDhcpServerContext ctx) LOGE("dhcp server context pointer is null."); return RET_FAILED; } - int saveRet = SaveBindingRecoders(&srvIns->addressPool, 0); + int saveRet = SaveBindingRecoders(&srvIns->addressPool, 1); if (saveRet == RET_FAILED) { LOGD("failed to save lease recoders. total: %zu", srvIns->addressPool.leaseTable.size); } else if (saveRet == RET_SUCCESS) { @@ -504,7 +497,6 @@ static int BeginLooper(PDhcpServerContext ctx) { DhcpMsgInfo from; DhcpMsgInfo reply; - int saveLease = 0; ServerContext *srvIns = GetServerInstance(ctx); if (!srvIns) { LOGE("dhcp server context pointer is null."); @@ -524,14 +516,11 @@ static int BeginLooper(PDhcpServerContext ctx) } ClearOptions(&from.options); ClearOptions(&reply.options); - if (saveLease && SaveLease(ctx) == RET_SUCCESS) { - saveLease = 0; - } int recvRet = ReceiveDhcpMessage(ctx->instance->serverFd, &from); + if (recvRet == RET_ERROR || recvRet == ERR_SELECT) { + break; + } if (ContinueReceive(&from, recvRet)) { - if (recvRet == RET_ERROR || recvRet == ERR_SELECT) { - break; - } continue; } InitReply(ctx, &from, &reply); @@ -540,14 +529,18 @@ static int BeginLooper(PDhcpServerContext ctx) if (replyType && (snedRet = SendDhcpReply(ctx, replyType, &reply)) != RET_SUCCESS) { LOGE("failed to send reply message."); } - if (replyType == REPLY_ACK && snedRet) { - saveLease = 1; + if (replyType == REPLY_ACK || replyType == REPLY_OFFER) { + int saveRet = SaveBindingRecoders(&srvIns->addressPool, 0); + if (saveRet != RET_SUCCESS && saveRet != RET_WAIT_SAVE) { + LOGW("failed to save lease recoders."); + }; } } // while (srvIns->looperState) FreeOptionList(&from.options); FreeOptionList(&reply.options); LOGD("dhcp server message looper stoped."); close(ctx->instance->serverFd); + ctx->instance->serverFd = -1; srvIns->looperState = LS_STOPED; return 0; } @@ -625,6 +618,12 @@ void InitLeaseFile(DhcpAddressPool *pool) InitBindingRecoders(pool); } +static void ExitProcess(void) +{ + LOGD("dhcp server stoped."); + sleep(1); +} + int StartDhcpServer(PDhcpServerContext ctx) { LOGD("dhcp server starting ..."); @@ -641,6 +640,9 @@ int StartDhcpServer(PDhcpServerContext ctx) LOGE("dhcp server context instance pointer is null."); return RET_FAILED; } + if (atexit(ExitProcess) != 0) { + LOGW("failed to regiester exit process function."); + } if (!srvIns->initialized) { LOGE("dhcp server no initialized."); return RET_FAILED; @@ -653,11 +655,9 @@ int StartDhcpServer(PDhcpServerContext ctx) int ret = BeginLooper(ctx); if (ret != RET_SUCCESS) { LOGD("faild to start dhcp server."); - FreeAddressPool(&srvIns->addressPool); OnServerStoped(ctx, ret); return RET_FAILED; } - FreeAddressPool(&srvIns->addressPool); OnServerStoped(ctx, ret); return RET_SUCCESS; } @@ -682,7 +682,7 @@ int GetServerStatus(PDhcpServerContext ctx) return srvIns->looperState; } -static int FillReply(PDhcpServerContext ctx, PDhcpMsgInfo received, PDhcpMsgInfo reply) +int FillReply(PDhcpServerContext ctx, PDhcpMsgInfo received, PDhcpMsgInfo reply) { if (!received || !reply) { return RET_ERROR; @@ -773,7 +773,6 @@ int AppendReplyTimeOptions(PDhcpServerContext ctx, PDhcpOptionList options) static int Repending(DhcpAddressPool *pool, AddressBinding *binding) { if (!pool) { - LOGE("address pool pointer is null."); return REPLY_NONE; } uint32_t bindingIp = binding->ipAddress; @@ -828,7 +827,6 @@ static int Rebinding(DhcpAddressPool *pool, AddressBinding *binding) static void AddAddressOption(PDhcpMsgInfo reply, uint8_t code, int32_t address) { if (!reply) { - LOGE("reply message pointer is null."); return; } DhcpOption optAddress = {0, 0, {0}}; @@ -840,7 +838,7 @@ static void AddAddressOption(PDhcpMsgInfo reply, uint8_t code, int32_t address) PushBackOption(&reply->options, &optAddress); } -static int AddReplyServerIdOption(PDhcpOptionList options, uint32_t serverId) +int AddReplyServerIdOption(PDhcpOptionList options, uint32_t serverId) { if (!options) { LOGE("option list pointer is null."); @@ -866,7 +864,6 @@ static int AddReplyServerIdOption(PDhcpOptionList options, uint32_t serverId) static void AddReplyMessageTypeOption(PDhcpMsgInfo reply, uint8_t replyMessageType) { if (!reply) { - LOGE("reply message pointer is null."); return; } DhcpOption optMsgType = {DHCP_MESSAGE_TYPE_OPTION, OPT_MESSAGE_TYPE_LEGTH, {replyMessageType, 0}}; @@ -874,14 +871,12 @@ static void AddReplyMessageTypeOption(PDhcpMsgInfo reply, uint8_t replyMessageTy } -static AddressBinding *GetBinding(DhcpAddressPool *pool, PDhcpMsgInfo received) +AddressBinding *GetBinding(DhcpAddressPool *pool, PDhcpMsgInfo received) { if (!pool) { - LOGE("address pool pointer is null."); return NULL; } if (!received) { - LOGE("received message pointer is null."); return NULL; } AddressBinding *binding = pool->binding(received->packet.chaddr, &received->options); @@ -901,25 +896,26 @@ static AddressBinding *GetBinding(DhcpAddressPool *pool, PDhcpMsgInfo received) static int OnReceivedDiscover(PDhcpServerContext ctx, PDhcpMsgInfo received, PDhcpMsgInfo reply) { if (!received || !reply) { - LOGE("receive or reply message pointer is null."); return REPLY_NONE; } LOGI("received 'Discover' message from: %s", ParseLogMac(received->packet.chaddr)); ServerContext *srvIns = GetServerInstance(ctx); if (!srvIns) { - LOGE("dhcp server context pointer is null."); return REPLY_NONE; } + uint32_t reqIp = 0; PDhcpOption optReqIp = GetOption(&received->options, REQUESTED_IP_ADDRESS_OPTION); if (optReqIp) { - uint32_t reqIp = ParseIp(optReqIp->data); + reqIp = ParseIp(optReqIp->data); if (reqIp) { LOGD(" request ip: %s", ParseStrIp(reqIp)); } } uint32_t srcIp = SourceIpAddress(); if (!srvIns->broadCastFlagEnable) { - if (!srcIp) { + if (srcIp) { + LOGD(" client repending:%s", ParseStrIp(srcIp)); + } else { srcIp = INADDR_BROADCAST; } DestinationAddr(srcIp); @@ -932,6 +928,10 @@ static int OnReceivedDiscover(PDhcpServerContext ctx, PDhcpMsgInfo received, PDh LOGE("no ip address available."); return REPLY_NONE; } + if (reqIp != 0 && reqIp != binding->ipAddress) { + LOGE("error request message."); + return REPLY_NONE; + } AddressBinding *lease = GetLease(&srvIns->addressPool, binding->ipAddress); if (!lease) { LOGD("add lease recoder."); @@ -1003,7 +1003,7 @@ static int NotBindingRequest(DhcpAddressPool *pool, PDhcpMsgInfo received, PDhcp AddressBinding *lease = GetLease(pool, yourIpAddr); if (!lease) { if (SourceIpAddress()) { - return REPLY_NAK; + return REPLY_ACK; } return REPLY_NONE; } @@ -1020,9 +1020,10 @@ static int NotBindingRequest(DhcpAddressPool *pool, PDhcpMsgInfo received, PDhcp binding->leaseTime = pool->leaseTime; } int replyType = Repending(pool, binding); - if (replyType != REPLY_ACK) { + if (replyType != REPLY_OFFER) { return replyType; } + lease = GetLease(pool, yourIpAddr); if (!lease) { LOGD("add new lease recoder."); AddLease(pool, binding); @@ -1043,14 +1044,12 @@ static int ValidateRequestMessage(const PDhcpServerContext ctx, const PDhcpMsgIn PDhcpMsgInfo reply, uint32_t *yourIp) { if (!received || !reply) { - LOGE("receive or reply message pointer is null."); return REPLY_NONE; } LOGI("received 'Request' message from: %s.", ParseLogMac(received->packet.chaddr)); uint32_t yourIpAddr = INADDR_BROADCAST; ServerContext *srvIns = GetServerInstance(ctx); if (!srvIns) { - LOGE("dhcp server context pointer is null."); return RET_FAILED; } if (GetYourIpAddress(received, &yourIpAddr) != RET_SUCCESS) { @@ -1091,7 +1090,7 @@ static int HasNobindgRequest(PDhcpServerContext ctx, PDhcpMsgInfo received, PDhc uint32_t srcIp = SourceIpAddress(); uint32_t reqIp = GetRequestIpAddress(received); LOGD("allow no binding request mode."); - if (!reqIp && !srcIp) { + if (reqIp == 0 && srcIp == 0) { LOGE("error dhcp message."); return REPLY_NONE; } @@ -1151,12 +1150,10 @@ static int OnReceivedRequest(PDhcpServerContext ctx, PDhcpMsgInfo received, PDhc static int OnReceivedDecline(PDhcpServerContext ctx, PDhcpMsgInfo received, PDhcpMsgInfo reply) { if (!received || !reply) { - LOGE("receive or reply message pointer is null."); return REPLY_NONE; } ServerContext *srvIns = GetServerInstance(ctx); if (!srvIns) { - LOGE("dhcp server context pointer is null."); return REPLY_NONE; } LOGI("received 'Decline' message from: %s.", ParseLogMac(received->packet.chaddr)); @@ -1194,12 +1191,10 @@ static int OnReceivedDecline(PDhcpServerContext ctx, PDhcpMsgInfo received, PDhc static int OnReceivedRelease(PDhcpServerContext ctx, PDhcpMsgInfo received, PDhcpMsgInfo reply) { if (!received || !reply) { - LOGE("receive or reply message pointer is null."); return REPLY_NONE; } LOGI("received 'Release' message from: %s", ParseLogMac(received->packet.chaddr)); if (!ctx || !ctx->instance) { - LOGE("dhcp server context pointer is null."); return RET_FAILED; } PDhcpOption optReqIp = GetOption(&received->options, REQUESTED_IP_ADDRESS_OPTION); @@ -1222,11 +1217,11 @@ static int OnReceivedRelease(PDhcpServerContext ctx, PDhcpMsgInfo received, PDhc reqIp = ParseIp(optReqIp->data); } uint32_t srcIp = SourceIpAddress(); - if (reqIp && reqIp != srcIp) { + if (srcIp != 0 && reqIp != 0 && reqIp != srcIp) { LOGE("error release message, invalid request ip address."); return REPLY_NONE; } - if (reqIp && reqIp != bindIp) { + if (bindIp != 0 && reqIp != 0 && reqIp != bindIp) { LOGE("error release message, invalid request ip address."); return REPLY_NONE; } @@ -1248,7 +1243,6 @@ static int OnReceivedRelease(PDhcpServerContext ctx, PDhcpMsgInfo received, PDhc static int OnReceivedInform(PDhcpServerContext ctx, PDhcpMsgInfo received, PDhcpMsgInfo reply) { if (!received || !reply) { - LOGE("receive or reply message pointer is null."); return REPLY_NONE; } ServerContext *srvIns = GetServerInstance(ctx); @@ -1267,7 +1261,6 @@ static int AppendFixedOptions(PDhcpServerContext ctx, PDhcpMsgInfo reply) { ServerContext *srvIns = GetServerInstance(ctx); if (!srvIns) { - LOGE("dhcp server context pointer is null."); return RET_FAILED; } if (!reply) { @@ -1328,7 +1321,6 @@ static int SendDhcpOffer(PDhcpServerContext ctx, PDhcpMsgInfo reply) { ServerContext *srvIns = GetServerInstance(ctx); if (!srvIns) { - LOGE("dhcp server context pointer is null."); return RET_FAILED; } if (AppendReplyTypeOption(reply, REPLY_OFFER) != RET_SUCCESS) { @@ -1433,13 +1425,6 @@ static int SendDhcpNak(PDhcpServerContext ctx, PDhcpMsgInfo reply) static int ParseMessageOptions(PDhcpMsgInfo msg) { - if (msg->packet.hlen < 0) { - return RET_FAILED; - } - if (msg->packet.hlen > DHCP_MESSAGE_FLAG_LENGTH) { - return RET_FAILED; - } - if (msg->length < (DHCP_MSG_HEADER_SIZE + MAGIC_COOKIE_LENGTH)) { return RET_FAILED; } @@ -1612,14 +1597,14 @@ static int InitServerContext(DhcpConfig *config, DhcpServerContext *ctx) return RET_FAILED; } if (!CheckAddressRange(&srvIns->addressPool)) { + LOGE("failed to validate address range."); return RET_FAILED; } - InitLeaseFile(&srvIns->addressPool); return RET_SUCCESS; } -static int InitServerFixedOptions(DhcpConfig *config, DhcpServerContext *ctx) +int InitServerFixedOptions(DhcpConfig *config, DhcpServerContext *ctx) { if (!config) { LOGE("server configure pointer is null."); @@ -1635,7 +1620,9 @@ static int InitServerFixedOptions(DhcpConfig *config, DhcpServerContext *ctx) LOGE("dhcp configure has not been initialized."); return RET_FAILED; } - + if (InitOptionList(&srvIns->addressPool.fixedOptions) != RET_SUCCESS) { + return RET_FAILED; + } if (config->options.first != NULL && config->options.size > 0) { DhcpOptionNode *pNode = config->options.first->next; for (size_t i = 0; pNode != NULL && i < config->options.size; i++) { @@ -1669,17 +1656,17 @@ PDhcpServerContext InitializeServer(DhcpConfig *config) } if ((context->instance = calloc(1, sizeof(ServerContext))) == NULL) { LOGE("failed to calloc server instance."); - FreeServerContex(context); + FreeServerContext(context); return NULL; } if (InitServerContext(config, context) != RET_SUCCESS) { LOGE("failed initialize dhcp server context."); - FreeServerContex(context); + FreeServerContext(context); return NULL; } if (InitServerFixedOptions(config, context) != RET_SUCCESS) { LOGE("failed initialize dhcp server fixed options."); - FreeServerContex(context); + FreeServerContext(context); return NULL; } LOGD("server id: %s", ParseStrIp(config->serverId)); @@ -1693,18 +1680,22 @@ PDhcpServerContext InitializeServer(DhcpConfig *config) return context; } -int FreeServerContex(PDhcpServerContext ctx) +int FreeServerContext(PDhcpServerContext ctx) { if (!ctx) { LOGE("dhcp server context pointer is null."); return RET_FAILED; } - if (ctx->instance) { - ServerContext *srvIns = GetServerInstance(ctx); - FreeAddressPool(&srvIns->addressPool); + ServerContext *srvIns = GetServerInstance(ctx); + if (!srvIns) { + LOGE("dhcp server instance pointer is null."); + return RET_FAILED; + } + FreeAddressPool(&srvIns->addressPool); + if (ctx->instance != NULL) { free(ctx->instance); ctx->instance = NULL; + free(ctx); } - free(ctx); return RET_SUCCESS; } \ No newline at end of file diff --git a/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_broadcast_helper.cpp b/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_broadcast_helper.cpp index 67d87aa..d2b77d0 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_broadcast_helper.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_broadcast_helper.cpp @@ -54,9 +54,9 @@ void WifiBroadCastHelper::Show(const WifiP2pDevice &v) return; } -void WifiBroadCastHelper::Show(const WifiP2pInfo &v) +void WifiBroadCastHelper::Show(const WifiP2pLinkedInfo &v) { - WIFI_LOGI(" -WifiP2pInfo:"); + WIFI_LOGI(" -WifiP2pLinkedInfo:"); if (v.GetConnectState() == P2pConnectedState::P2P_CONNECTED) { WIFI_LOGI(" connectState: Connected"); @@ -118,7 +118,7 @@ void WifiBroadCastHelper::Show(const std::vector &v) return; } -void WifiBroadCastHelper::Show(const std::vector &v) +void WifiBroadCastHelper::Show(const std::vector &v) { WIFI_LOGI(" -WifiP2pDevice Vector size[%{public}zu]:", v.size()); for (auto i : v) { @@ -135,5 +135,14 @@ void WifiBroadCastHelper::Show(const std::vector &v) } return; } + +void WifiBroadCastHelper::Show(const std::map &v) +{ + WIFI_LOGI(" -str and str Map size[%{public}zu]:", v.size()); + for (auto i : v) { + WIFI_LOGI(" -key str:%{public}s, -value str:%{public}s", i.first.c_str(), i.second.c_str()); + } + return; +} } // namespace Wifi } // namespace OHOS \ No newline at end of file diff --git a/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_broadcast_helper.h b/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_broadcast_helper.h index b93e6d9..d4f10dd 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_broadcast_helper.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_broadcast_helper.h @@ -29,9 +29,9 @@ public: static void Show(const std::map &v); static void Show(const int v); static void Show(const WifiP2pDevice &v); - static void Show(const WifiP2pInfo &v); + static void Show(const WifiP2pLinkedInfo &v); static void Show(const std::vector &v); - static void Show(const std::vector &v); + static void Show(const std::vector &v); static void Show(const WifiP2pServiceInfo &v); static void Show(const std::vector &v); diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp b/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp index e1dfabd..dba6e98 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp @@ -1211,7 +1211,8 @@ WifiErrorNo WifiIdlClient::ReqP2pSetListenChannel(size_t channel, unsigned char return P2pSetListenChannel(channel, regClass); } -WifiErrorNo WifiIdlClient::ReqP2pConnect(const WifiP2pConfig &config, bool isJoinExistingGroup, std::string &pin) const +WifiErrorNo WifiIdlClient::ReqP2pConnect(const WifiP2pConfigInternal &config, bool isJoinExistingGroup, + std::string &pin) const { CHECK_CLIENT_NOT_NULL; HidlP2pConnectInfo info = {0}; @@ -1257,7 +1258,7 @@ WifiErrorNo WifiIdlClient::ReqP2pCancelConnect() const return P2pCancelConnect(); } -WifiErrorNo WifiIdlClient::ReqP2pProvisionDiscovery(const WifiP2pConfig &config) const +WifiErrorNo WifiIdlClient::ReqP2pProvisionDiscovery(const WifiP2pConfigInternal &config) const { CHECK_CLIENT_NOT_NULL; WpsMethod mode = config.GetWpsInfo().GetWpsMethod(); diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.h b/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.h index 5568a68..b0873d6 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.h @@ -791,7 +791,7 @@ public: * @param pin * @return WifiErrorNo */ - WifiErrorNo ReqP2pConnect(const WifiP2pConfig &config, bool isJoinExistingGroup, std::string &pin) const; + WifiErrorNo ReqP2pConnect(const WifiP2pConfigInternal &config, bool isJoinExistingGroup, std::string &pin) const; /** * @Description Send a request for cancel connect to the P2P @@ -804,7 +804,7 @@ public: * @Description Send a request for Provision Discovery to the P2P * */ - WifiErrorNo ReqP2pProvisionDiscovery(const WifiP2pConfig &config) const; + WifiErrorNo ReqP2pProvisionDiscovery(const WifiP2pConfigInternal &config) const; /** * @Description Send a request for add a P2P group to the P2P diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_p2p_hal_interface.cpp b/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_p2p_hal_interface.cpp index 92aea54..fb9e4ba 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_p2p_hal_interface.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_p2p_hal_interface.cpp @@ -148,7 +148,8 @@ WifiErrorNo WifiP2PHalInterface::P2pFlush() const return mIdlClient->ReqP2pFlush(); } -WifiErrorNo WifiP2PHalInterface::Connect(const WifiP2pConfig &config, bool isJoinExistingGroup, std::string &pin) const +WifiErrorNo WifiP2PHalInterface::Connect(const WifiP2pConfigInternal &config, bool isJoinExistingGroup, + std::string &pin) const { return mIdlClient->ReqP2pConnect(config, isJoinExistingGroup, pin); } @@ -158,7 +159,7 @@ WifiErrorNo WifiP2PHalInterface::CancelConnect() const return mIdlClient->ReqP2pCancelConnect(); } -WifiErrorNo WifiP2PHalInterface::ProvisionDiscovery(const WifiP2pConfig &config) const +WifiErrorNo WifiP2PHalInterface::ProvisionDiscovery(const WifiP2pConfigInternal &config) const { return mIdlClient->ReqP2pProvisionDiscovery(config); } diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_p2p_hal_interface.h b/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_p2p_hal_interface.h index 174e405..b5d5b6e 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_p2p_hal_interface.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_p2p_hal_interface.h @@ -212,7 +212,7 @@ public: * @param pin - if using pin mode, return pin code * @return WifiErrorNo */ - WifiErrorNo Connect(const WifiP2pConfig &config, bool isJoinExistingGroup, std::string &pin) const; + WifiErrorNo Connect(const WifiP2pConfigInternal &config, bool isJoinExistingGroup, std::string &pin) const; /** * @Description Sends a request for cancel connect to the P2P @@ -227,7 +227,7 @@ public: * @param config * @return WifiErrorNo */ - WifiErrorNo ProvisionDiscovery(const WifiP2pConfig &config) const; + WifiErrorNo ProvisionDiscovery(const WifiP2pConfigInternal &config) const; /** * @Description Add Group diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use.cpp index b8f418b..9f846f7 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use.cpp @@ -61,7 +61,7 @@ void ApConfigUse::TransformFrequencyIntoChannel(const std::vector &freqVect printList += std::to_string(chanVector[i]); printList += " "; } - WIFI_LOGD("TransformFrequencyIntoChannel:size:(%{public}zu) to (%{public}zu).list: %{public}s", + WIFI_LOGD("TransformFrequencyIntoChannel:size:(%{public}zu) to (%{public}zu).list: %{public}s.", freqVector.size(), chanVector.size(), printList.c_str()); @@ -79,12 +79,12 @@ void ApConfigUse::LogConfig(HotspotConfig &apConfig) const bool ApConfigUse::IsValid24GHz(int freq) const { - return (freq > FREP_2G_MIN) && (freq < FREP_2G_MAX); + return (freq >= FREP_2G_MIN) && (freq <= CHANNEL_14_FREP); } bool ApConfigUse::IsValid5GHz(int freq) const { - return (freq > FREP_5G_MIN) && (freq < FREP_5G_MAX); + return (freq >= FREP_5G_MIN) && (freq <= FREP_5G_MAX); } diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use.h index 2bc98a1..87b3c88 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use.h @@ -84,7 +84,7 @@ public: */ virtual ~ApConfigUse(); /** - * @Description Convert frequency to channel number + * @Description Convert frequency to channel number. * @param freq - frequency to convert * @return success: channel num failed: -1 */ diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_define.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_define.h index d871e25..f113268 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_define.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_define.h @@ -37,9 +37,9 @@ const std::string GETTING_INFO = "Obtaining..."; /* *********************************StateMachine*************************** */ -/* Internal communication message of the state machine */ +/* Internal communication message of the state machine. */ enum class ApStatemachineEvent { - CMD_START_HOTSPOT, /* start */ + CMD_START_HOTSPOT, /* start */ CMD_STOP_HOTSPOT, /* stop */ CMD_FAIL, /* failed */ CMD_STATION_JOIN, /* new station */ diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_idle_state.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_idle_state.h index 53fc045..9bdb0cb 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_idle_state.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_idle_state.h @@ -27,13 +27,13 @@ class ApIdleState : public State { public: /** - * @Description construction method + * @Description construction method. * @param None * @return None */ explicit ApIdleState(ApStateMachine &); /** - * @Description destructor method + * @Description destructor method. * @param None * @return None */ diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_interface.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_interface.h index 73357a4..2d5c6e7 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_interface.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_interface.h @@ -25,13 +25,13 @@ namespace Wifi { class ApInterface : public IApService { public: /** - * @Description construction method + * @Description construction method. * @param None * @return None */ ApInterface(); /** - * @Description destructor method + * @Description destructor method. * @param None * @return None */ diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_root_state.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_root_state.h index 55e71d2..8de7eca 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_root_state.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_root_state.h @@ -24,13 +24,13 @@ class ApRootState : public State { FRIEND_GTEST(ApRootState); public: /** - * @Description construction method + * @Description construction method. * @param None * @return None */ ApRootState(); /** - * @Description destructor method + * @Description destructor method. * @param None * @return None */ diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.h index 00cd911..b649d83 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.h @@ -43,21 +43,21 @@ public: DISALLOW_COPY_AND_ASSIGN(ApService) /** - * @Description open hotspot + * @Description open hotspot. * @param None * @return ErrCode - success: WIFI_OPT_SUCCESS failed: ERROR_CODE */ ErrCode EnableHotspot() const; /** - * @Description close hotspot + * @Description close hotspot. * @param None * @return ErrCode - success: WIFI_OPT_SUCCESS failed: ERROR_CODE */ ErrCode DisableHotspot() const; /** - * @Description set ap config + * @Description set ap config. * @param cfg - ap config * @return ErrCode - success: WIFI_OPT_SUCCESS failed: ERROR_CODE */ @@ -71,14 +71,14 @@ public: ErrCode AddBlockList(const StationInfo &stationInfo) const; /** - * @Description delete block list + * @Description delete block list. * @param stationInfo - sta infos * @return ErrCode - success: WIFI_OPT_SUCCESS failed: ERROR_CODE */ ErrCode DelBlockList(const StationInfo &stationInfo) const; /** - * @Description Disconnect a specified STA + * @Description Disconnect a specified STA. * @param stationInfo - sta infos * @return ErrCode - success: WIFI_OPT_SUCCESS failed: ERROR_CODE */ diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.h index 36506f6..ff89ea7 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.h @@ -28,13 +28,13 @@ class ApStartedState : public State { FRIEND_GTEST(ApStartedState); public: /** - * @Description construction method + * @Description construction method. * @param None * @return None */ ApStartedState(ApStateMachine &, ApConfigUse &, ApMonitor &); /** - * @Description destructor method + * @Description destructor method. * @param None * @return None */ @@ -63,7 +63,7 @@ public: /** * @Description Implement pure base class methods:The CMD processed when the AP is in the running state (such as updating - the blocklist to hostapd) + the blocklist to hostapd.) * @param msg - processed message * @return HANDLED：Processed successfully NOT_EXECUTED: Processed failed */ @@ -72,7 +72,7 @@ public: private: /** * @Description Called inside the state，The processing function of - the HAL layer when the AP is turned on + the HAL layer when the AP is turned on. * @param None * @return true: Successfully opened false: Failed to open */ @@ -80,7 +80,7 @@ private: /** * @Description Called inside the state，The processing function of - the HAL layer when the AP is turned off + the HAL layer when the AP is turned off. * @param None * @return true: Closed successfully false: Close failed */ @@ -103,21 +103,21 @@ private: bool SetConfig(); /** - * @Description Status update notification APSERVICE + * @Description Status update notification APSERVICE. * @param state - New state * @return None */ void OnApStateChange(const ApState &state) const; /** - * @Description Start ap monitor + * @Description Start ap monitor. * @param None * @return None */ void StartMonitor() const; /** - * @Description Stop ap monitor + * @Description Stop ap monitor. * @param None * @return None */ @@ -131,7 +131,7 @@ private: bool EnableInterfaceNat() const; /** - * @Description stop NAT + * @Description stop NAT. * @param None * @return true: success false: failed */ @@ -139,21 +139,21 @@ private: private: /** - * @Description Handle hostapd failure events received by the state machine + * @Description Handle hostapd failure events received by the state machine. * @param msg - Message body sent by the state machine * @return None */ void ProcessCmdFail(InternalMessage &msg) const; /** - * @Description Process the STA connection message received by the state machine + * @Description Process the STA connection message received by the state machine. * @param msg - Message body sent by the state machine * @return None */ void ProcessCmdStationJoin(InternalMessage &msg) const; /** - * @Description Process the STA disconnect message received by the state machine + * @Description Process the STA disconnect message received by the state machine. * @param msg - Message body sent by the state machine * @return None */ @@ -161,7 +161,7 @@ private: /** * @Description Process the hotspot configuration message of the APP - received by the state machine + received by the state machine. * @param msg - Message body sent by the state machine * @return None */ @@ -169,7 +169,7 @@ private: /** * @Description Process the hotspot configuration update result - received by the state machine + received by the state machine. * @param msg - Message body sent by the state machine * @return None */ @@ -177,7 +177,7 @@ private: /** * @Description Process the add blocklist message received by the - state machine + state machine. * @param msg - Message body sent by the state machine * @return None */ @@ -185,7 +185,7 @@ private: /** * @Description Process the delete blocklist message received by the - state machine + state machine. * @param msg - Message body sent by the state machine * @return None */ @@ -193,7 +193,7 @@ private: /** * @Description Process the close hotspot message received by the - state machine + state machine. * @param msg - Message body sent by the state machine * @return None */ @@ -201,14 +201,14 @@ private: /** * @Description Process the disconnected STA message received by the - state machine + state machine. * @param msg - Message body sent by the state machine * @return None */ void ProcessCmdDisconnectStation(InternalMessage &msg) const; /** - * @Description Initialization + * @Description Initialization. * @param None * @return None */ diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine.cpp index d87e0da..33708d5 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine.cpp @@ -22,6 +22,7 @@ #include "wifi_logger.h" DEFINE_WIFILOG_HOTSPOT_LABEL("WifiApStateMachine"); + namespace OHOS { namespace Wifi { ApStateMachine::ApStateMachine(ApStationsManager &apStationsManager, ApRootState &apRootState, ApIdleState &apIdleState, diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager.h index 3154a51..02ea7d5 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager.h @@ -25,14 +25,14 @@ class ApStationsManager { public: FRIEND_GTEST(ApStationsManager); /** - * @Description construction + * @Description construction. * @param None * @return None */ ApStationsManager(); /** - * @Description destructor + * @Description destructor. * @param None * @return None */ @@ -40,20 +40,20 @@ public: /** * @Description Add a blocklist - * @param staInfo - Information about station to be added to the blocklist + * @param staInfo - Information about station to be added to the blocklist. * @return true: Adding succeeded. false: Failed to add. */ bool AddBlockList(const StationInfo &staInfo) const; /** * @Description Deleting a blocklist - * @param staInfo - Deleting the station information from the blocklist + * @param staInfo - Deleting the station information from the blocklist. * @return true: Deleted successfully false: Deletion failed */ bool DelBlockList(const StationInfo &staInfo) const; /** - * @Description Add all blocklists to the hostapd + * @Description Add all blocklists to the hostapd. * @param None * @return true: Set successful false: Set failed（Obtaining failed，Failed to set one or more blocklists.） @@ -74,7 +74,7 @@ public: */ void StationJoin(const StationInfo &staInfo) const; /** - * @Description Disconnect a specified station. + * @Description Disconnect a specified station.. * @param mac - address of the newly connected station * @return true: Disconnected successfully false: Disconnected failed */ diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp index 79973fa..0b94b45 100755 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp @@ -637,7 +637,7 @@ void WifiManager::DealP2pServiceChanged(const std::vector &v return; } -void WifiManager::DealP2pConnectionChanged(const WifiP2pInfo &info) +void WifiManager::DealP2pConnectionChanged(const WifiP2pLinkedInfo &info) { WifiEventCallbackMsg cbMsg; cbMsg.msgCode = WIFI_CBK_MSG_CONNECT_CHANGE; diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.h index e90d898..8bfe4d6 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.h @@ -151,7 +151,7 @@ private: static void DealP2pStateChanged(P2pState bState); static void DealP2pPeersChanged(const std::vector &vPeers); static void DealP2pServiceChanged(const std::vector &vServices); - static void DealP2pConnectionChanged(const WifiP2pInfo &info); + static void DealP2pConnectionChanged(const WifiP2pLinkedInfo &info); static void DealP2pThisDeviceChanged(const WifiP2pDevice &info); static void DealP2pDiscoveryChanged(bool bState); static void DealP2pGroupsChanged(void); diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.cpp index 122b91b..1f35679 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.cpp @@ -65,13 +65,19 @@ void GroupFormedState::Init() std::make_pair(P2P_STATE_MACHINE_CMD::P2P_EVENT_GROUP_STARTED, &GroupFormedState::ProcessGroupStartedEvt)); mProcessFunMap.insert( std::make_pair(P2P_STATE_MACHINE_CMD::CMD_DEVICE_DISCOVERS, &GroupFormedState::ProcessCmdDiscoverPeer)); + mProcessFunMap.insert( + std::make_pair(P2P_STATE_MACHINE_CMD::CMD_DISCOVER_SERVICES, &GroupFormedState::ProcessCmdDiscServices)); + mProcessFunMap.insert( + std::make_pair(P2P_STATE_MACHINE_CMD::CMD_START_LISTEN, &GroupFormedState::ProcessCmdStartListen)); mProcessFunMap.insert( std::make_pair(P2P_STATE_MACHINE_CMD::CMD_P2P_DISABLE, &GroupFormedState::ProcessCmdDisable)); + mProcessFunMap.insert( + std::make_pair(P2P_STATE_MACHINE_CMD::CMD_CANCEL_CONNECT, &GroupFormedState::ProcessCmdCancelConnect)); } bool GroupFormedState::ProcessCmdConnect(const InternalMessage &msg) const { - WifiP2pConfig config; + WifiP2pConfigInternal config; if (!msg.GetMessageObj(config)) { WIFI_LOGE("Connect:Failed to obtain config info."); return EXECUTED; @@ -102,7 +108,7 @@ bool GroupFormedState::ProcessProvDiscEvt(const InternalMessage &msg) const return EXECUTED; } - p2pStateMachine.savedP2pConfig = WifiP2pConfig(); + p2pStateMachine.savedP2pConfig = WifiP2pConfigInternal(); p2pStateMachine.savedP2pConfig.SetDeviceAddress(procDisc.GetDevice().GetDeviceAddress()); WpsInfo wps; @@ -234,6 +240,73 @@ bool GroupFormedState::ProcessConnectEvt(const InternalMessage &msg) const return EXECUTED; } +bool GroupFormedState::ProcessCmdCancelConnect(const InternalMessage &msg) const +{ + WIFI_LOGI("Process cmd cancel connect recv CMD: %d", msg.GetMessageName()); + p2pStateMachine.BroadcastActionResult(P2pActionCallback::P2pDisConnect, ErrCode::WIFI_OPT_FAILED); + return EXECUTED; +} + +bool GroupFormedState::ProcessCmdDiscServices(const InternalMessage &msg) const +{ + WIFI_LOGI("Process cmd disc services recv CMD: %d", msg.GetMessageName()); + + p2pStateMachine.CancelSupplicantSrvDiscReq(); + std::string reqId; + WifiP2pServiceRequest request; + WifiP2pDevice device; + device.SetDeviceAddress(std::string("00:00:00:00:00:00")); + request.SetProtocolType(P2pServicerProtocolType::SERVICE_TYPE_ALL); + request.SetTransactionId(p2pStateMachine.serviceManager.GetTransId()); + + WifiErrorNo retCode = + WifiP2PHalInterface::GetInstance().ReqServiceDiscovery(device.GetDeviceAddress(), request.GetTlv(), reqId); + if (WifiErrorNo::WIFI_IDL_OPT_OK != retCode) { + WIFI_LOGI("Failed to schedule the P2P service discovery request."); + p2pStateMachine.BroadcastActionResult(P2pActionCallback::DiscoverServices, ErrCode::WIFI_OPT_FAILED); + return EXECUTED; + } + p2pStateMachine.serviceManager.SetQueryId(reqId); + + retCode = WifiP2PHalInterface::GetInstance().P2pFind(DISC_TIMEOUT_S); + if (retCode != WifiErrorNo::WIFI_IDL_OPT_OK) { + WIFI_LOGE("call P2pFind failed, ErrorCode: %d", static_cast(retCode)); + p2pStateMachine.BroadcastActionResult(P2pActionCallback::DiscoverServices, ErrCode::WIFI_OPT_FAILED); + return EXECUTED; + } + + WIFI_LOGD("CMD_DISCOVER_SERVICES successful."); + p2pStateMachine.BroadcastActionResult(P2pActionCallback::DiscoverServices, ErrCode::WIFI_OPT_SUCCESS); + p2pStateMachine.BroadcastP2pDiscoveryChanged(true); + return EXECUTED; +} + +bool GroupFormedState::ProcessCmdStartListen(const InternalMessage &msg) const +{ + if (WifiP2PHalInterface::GetInstance().P2pFlush()) { + WIFI_LOGW("Unexpected results in p2p flush."); + } + + constexpr int defaultOpClass = 81; + constexpr int defaultChannel = 6; + if (WifiP2PHalInterface::GetInstance().SetListenChannel(defaultChannel, defaultOpClass)) { + WIFI_LOGI("p2p set listen channel failed. channel:%d, opclass:%d", defaultChannel, defaultOpClass); + p2pStateMachine.BroadcastActionResult(P2pActionCallback::StartP2pListen, WIFI_OPT_FAILED); + return EXECUTED; + } + + size_t period = msg.GetParam1(); + size_t interval = msg.GetParam2(); + if (WifiP2PHalInterface::GetInstance().P2pConfigureListen(true, period, interval)) { + WIFI_LOGE("p2p configure to start listen failed."); + p2pStateMachine.BroadcastActionResult(P2pActionCallback::StartP2pListen, WIFI_OPT_FAILED); + } else { + WIFI_LOGI("p2p configure to start listen successful."); + p2pStateMachine.BroadcastActionResult(P2pActionCallback::StartP2pListen, WIFI_OPT_SUCCESS); + } + return EXECUTED; +} + bool GroupFormedState::ExecuteStateMsg(InternalMessage *msg) { if (msg == nullptr) { diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.h index f0a6bbc..aad1b16 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.h @@ -33,7 +33,7 @@ public: * @param None * @return None */ - GroupFormedState(P2pStateMachine &, WifiP2pGroupManager &, WifiP2pDeviceManager &); + GroupFormedState(P2pStateMachine &stateMachine, WifiP2pGroupManager &groupMgr, WifiP2pDeviceManager &deviceMgr); /** * @Description Destroy the Group Formed State object @@ -141,6 +141,13 @@ private: */ virtual bool ProcessCmdDiscoverPeer(const InternalMessage &msg) const; + /** + * @Description Process the discover services command received by the state machine + * @param msg - Message body sent by the state machine + * @return - bool true:handle false:not handle + */ + virtual bool ProcessCmdDiscServices(const InternalMessage &msg) const; + /** * @Description Process the disable command received by the state machine * @param msg - Message body sent by the state machine @@ -148,6 +155,20 @@ private: */ virtual bool ProcessCmdDisable(const InternalMessage &msg) const; + /** + * @Description Process the cancel connect command received by the state machine + * @param msg - Message body sent by the state machine + * @return - bool true:handle false:not handle + */ + virtual bool ProcessCmdCancelConnect(const InternalMessage &msg) const; + + /** + * @Description Process the start listen command received by the state machine + * @param msg - Message body sent by the state machine + * @return - bool true:handle false:not handle + */ + virtual bool ProcessCmdStartListen(const InternalMessage &msg) const; + private: P2pStateMachine &p2pStateMachine; WifiP2pGroupManager &groupManager; diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.cpp index b9b3c5e..bbe98ef 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.cpp @@ -79,6 +79,7 @@ bool GroupNegotiationState::ProcessGroupStartedEvt(InternalMessage &msg) const if (groupManager.GetCurrentGroup().IsGroupOwner() && MacAddress::IsValidMac(groupManager.GetCurrentGroup().GetOwner().GetDeviceAddress().c_str())) { + deviceManager.GetThisDevice().SetP2pDeviceStatus(P2pDeviceStatus::PDS_CONNECTED); group.SetOwner(deviceManager.GetThisDevice()); groupManager.SetCurrentGroup(group); } @@ -116,7 +117,7 @@ bool GroupNegotiationState::ProcessGroupStartedEvt(InternalMessage &msg) const const WifiP2pDevice &owner = groupManager.GetCurrentGroup().GetOwner(); WifiP2pDevice device = deviceManager.GetDevices(owner.GetDeviceAddress()); if (device.IsValid()) { - device.SetP2pDeviceStatus(owner.GetP2pDeviceStatus()); + device.SetP2pDeviceStatus(P2pDeviceStatus::PDS_CONNECTED); WifiP2pGroupInfo copy = groupManager.GetCurrentGroup(); copy.SetOwner(device); groupManager.SetCurrentGroup(copy); diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.h index a3c86f1..bce0d36 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.h @@ -33,7 +33,8 @@ public: * @param None * @return None */ - GroupNegotiationState(P2pStateMachine &, WifiP2pGroupManager &, WifiP2pDeviceManager &); + GroupNegotiationState(P2pStateMachine &stateMachine, WifiP2pGroupManager &groupMgr, + WifiP2pDeviceManager &deviceMgr); /** * @Description Destroy the Group Negotiation State object diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/ip2p_service.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/ip2p_service.h index 1914e9a..e7bd8f5 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/ip2p_service.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/ip2p_service.h @@ -141,10 +141,10 @@ public: virtual ErrCode SetP2pDeviceName(const std::string &devName) = 0; /** * @Description - The interface of query p2p information like the group state,device information and ip address. - * @param connInfo - struct WifiP2pInfo. + * @param linkedInfo - struct WifiP2pLinkedInfo. * @return - ErrCode */ - virtual ErrCode QueryP2pInfo(WifiP2pInfo &connInfo) = 0; + virtual ErrCode QueryP2pLinkedInfo(WifiP2pLinkedInfo &linkedInfo) = 0; /** * @DescriptionGet - The interface of get current group information. @@ -181,6 +181,13 @@ public: */ virtual ErrCode QueryP2pDevices(std::vector &devives) = 0; + /** + * @Description - Query the information about own device. + * @param device - own device + * @return - ErrCode + */ + virtual ErrCode QueryP2pLocalDevice(WifiP2pDevice &device) = 0; + /** * @Description - The interface of query p2p group information. * @param groups - information of groups. diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/ip2p_service_callbacks.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/ip2p_service_callbacks.h index 2d742d7..8b0cc5e 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/ip2p_service_callbacks.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/ip2p_service_callbacks.h @@ -30,7 +30,7 @@ struct IP2pServiceCallbacks { /* Report the latest services discovery information. */ std::function &)> OnP2pServicesChangedEvent; /* The event of connection status change. */ - std::function OnP2pConnectionChangedEvent; + std::function OnP2pConnectionChangedEvent; /* The event of this device configure has change */ std::function OnP2pThisDeviceChangedEvent; /* The event of discovery status change */ @@ -39,6 +39,12 @@ struct IP2pServiceCallbacks { std::function OnP2pGroupsChangedEvent; /* The result returned by the asynchronous interface */ std::function OnP2pActionResultEvent; + std::function &, const WifiP2pDevice &)> + OnP2pServiceAvailable; + std::function OnP2pDnsSdServiceAvailable; + std::function &, const WifiP2pDevice &)> + OnP2pDnsSdTxtRecordAvailable; + std::function &, const WifiP2pDevice &)> OnP2pUpnpServiceAvailable; }; } // namespace Wifi } // namespace OHOS diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_define.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_define.h index 6ad61b1..fc46384 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_define.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_define.h @@ -106,6 +106,7 @@ enum class P2P_STATE_MACHINE_CMD { CMD_DISCONNECT, CMD_SET_DEVICE_NAME, /* set device name */ CMD_SET_WFD_INFO, /* set wifi-display info */ + CMD_CANCEL_CONNECT, /* cancel connect */ /* monitor to state machine */ WPA_CONNECTED_EVENT = 100, // result of connect @@ -137,6 +138,7 @@ enum class P2P_STATE_MACHINE_CMD { INTERNAL_CONN_USER_CONFIRM, // the user confirmed INTERNAL_CONN_USER_ACCEPT, // the user chooses to agree PEER_CONNECTION_USER_REJECT, // the user chooses to reject + INTERNAL_CONN_USER_TIME_OUT, CREATE_GROUP_TIMED_OUT, EXCEPTION_TIMED_OUT, /* P2P exception timeout */ DISABLE_P2P_TIMED_OUT, @@ -144,7 +146,7 @@ enum class P2P_STATE_MACHINE_CMD { }; using HandlerMethod = void(P2P_STATE_MACHINE_CMD, int, int, const std::any &); -}; // namespace Wifi +} // namespace Wifi } // namespace OHOS #endif \ No newline at end of file diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabled_state.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabled_state.cpp index bf58a4b..94f500b 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabled_state.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabled_state.cpp @@ -24,15 +24,20 @@ DEFINE_WIFILOG_P2P_LABEL("P2pEnabledState"); namespace OHOS { namespace Wifi { -P2pEnabledState::P2pEnabledState( - P2pStateMachine &stateMachine, WifiP2pGroupManager &groupMgr, WifiP2pDeviceManager &deviceMgr) - : State("P2pEnabledState"), mProcessFunMap(), p2pStateMachine(stateMachine), groupManager(groupMgr), deviceManager(deviceMgr) +P2pEnabledState::P2pEnabledState(P2pStateMachine &stateMachine, WifiP2pGroupManager &groupMgr, + WifiP2pDeviceManager &deviceMgr) + : State("P2pEnabledState"), + mProcessFunMap(), + p2pStateMachine(stateMachine), + groupManager(groupMgr), + deviceManager(deviceMgr) {} void P2pEnabledState::GoInState() { WIFI_LOGI(" GoInState"); Init(); - constexpr int defaultListenTime = 500; + constexpr int defaultPeriodTime = 500; + constexpr int defaultIntervalTime = 1000; p2pStateMachine.BroadcastP2pConnectionChanged(); if (P2pSettingsInitialization()) { p2pStateMachine.BroadcastP2pStatusChanged(P2pState::P2P_STATE_STARTED); @@ -40,7 +45,7 @@ void P2pEnabledState::GoInState() WifiSettings::GetInstance().GetP2pVendorConfig(config); if (config.GetIsAutoListen()) { p2pStateMachine.SendMessage( - static_cast(P2P_STATE_MACHINE_CMD::CMD_START_LISTEN), defaultListenTime, defaultListenTime); + static_cast(P2P_STATE_MACHINE_CMD::CMD_START_LISTEN), defaultPeriodTime, defaultIntervalTime); } } else { p2pStateMachine.SendMessage(static_cast(P2P_STATE_MACHINE_CMD::CMD_P2P_DISABLE)); @@ -91,6 +96,8 @@ void P2pEnabledState::Init() std::make_pair(P2P_STATE_MACHINE_CMD::CMD_SET_DEVICE_NAME, &P2pEnabledState::ProcessCmdSetDeviceName)); mProcessFunMap.insert( std::make_pair(P2P_STATE_MACHINE_CMD::CMD_SET_WFD_INFO, &P2pEnabledState::ProcessCmdSetWfdInfo)); + mProcessFunMap.insert( + std::make_pair(P2P_STATE_MACHINE_CMD::CMD_CANCEL_CONNECT, &P2pEnabledState::ProcessCmdCancelConnect)); } bool P2pEnabledState::ProcessCmdDisable(InternalMessage &msg) const { @@ -246,7 +253,6 @@ bool P2pEnabledState::P2pConfigInitialization() retCode = WifiP2PHalInterface::GetInstance().SetP2pSsidPostfix(ssidPostfixName); if (retCode == WifiErrorNo::WIFI_IDL_OPT_FAILED) { WIFI_LOGE("Failed to set the SSID prefix"); - result = false; } retCode = WifiP2PHalInterface::GetInstance().SetP2pDeviceType(deviceManager.GetThisDevice().GetPrimaryDeviceType()); @@ -260,7 +266,6 @@ bool P2pEnabledState::P2pConfigInitialization() retCode = WifiP2PHalInterface::GetInstance().SetP2pSecondaryDeviceType(secDeviceType); if (retCode == WifiErrorNo::WIFI_IDL_OPT_FAILED) { WIFI_LOGE("Failed to set the secondary device type."); - result = false; } } @@ -273,7 +278,7 @@ bool P2pEnabledState::P2pConfigInitialization() retCode = WifiP2PHalInterface::GetInstance().SetPersistentReconnect(1); if (retCode == WifiErrorNo::WIFI_IDL_OPT_FAILED) { - LOGE("Failed to set persistent reconnect."); + WIFI_LOGE("Failed to set persistent reconnect."); result = false; } @@ -526,6 +531,7 @@ bool P2pEnabledState::ProcessCmdSetDeviceName(InternalMessage &msg) const } else { LOGE("Successfully set the device name."); deviceManager.GetThisDevice().SetDeviceName(deviceName); + p2pStateMachine.BroadcastThisDeviceChanaged(deviceManager.GetThisDevice()); p2pStateMachine.BroadcastActionResult(P2pActionCallback::P2pSetDeviceName, WIFI_OPT_SUCCESS); } @@ -550,7 +556,7 @@ bool P2pEnabledState::ProcessCmdSetWfdInfo(InternalMessage &msg) const subelement = "0 " + subelement; if (WifiP2PHalInterface::GetInstance().SetWfdDeviceConfig(subelement) != WifiErrorNo::WIFI_IDL_OPT_OK) { LOGE("Failed to set wfd config:%s.", subelement.c_str()); - return EXECUTED; + return EXECUTED; } if (WifiP2PHalInterface::GetInstance().SetWfdEnable(wfdInfo.GetWfdEnabled()) != WifiErrorNo::WIFI_IDL_OPT_OK) { LOGE("Set wifidisplay enabled failed."); @@ -558,5 +564,12 @@ bool P2pEnabledState::ProcessCmdSetWfdInfo(InternalMessage &msg) const } return EXECUTED; } + +bool P2pEnabledState::ProcessCmdCancelConnect(InternalMessage &msg) const +{ + WIFI_LOGI("recv CMD: %d", msg.GetMessageName()); + p2pStateMachine.BroadcastActionResult(P2pActionCallback::P2pDisConnect, ErrCode::WIFI_OPT_FAILED); + return EXECUTED; +} } // namespace Wifi } // namespace OHOS diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabled_state.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabled_state.h index 8669b4c..7cb2746 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabled_state.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabled_state.h @@ -33,7 +33,7 @@ public: * @param None * @return None */ - P2pEnabledState(P2pStateMachine &, WifiP2pGroupManager &, WifiP2pDeviceManager &); + P2pEnabledState(P2pStateMachine &stateMachine, WifiP2pGroupManager &groupMgr, WifiP2pDeviceManager &deviceMgr); /** * @Description Destroy the P2pEnabledState object @@ -223,6 +223,13 @@ private: */ virtual bool ProcessCmdSetWfdInfo(InternalMessage &msg) const; + /** + * @Description Process the cancel connect command received by the state machine + * @param msg - Message body sent by the state machine + * @return - bool true:handle false:not handle + */ + virtual bool ProcessCmdCancelConnect(InternalMessage &msg) const; + private: using ProcessFun = bool (P2pEnabledState::*)(InternalMessage &msg) const; std::map mProcessFunMap; diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_formation_state.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_formation_state.cpp index 2077759..0c20353 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_formation_state.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_formation_state.cpp @@ -14,6 +14,7 @@ */ #include "p2p_group_formation_state.h" #include "p2p_state_machine.h" +#include "wifi_p2p_hal_interface.h" #include "wifi_logger.h" DEFINE_WIFILOG_P2P_LABEL("P2pGroupFormationState"); @@ -41,6 +42,21 @@ bool P2pGroupFormationState::ExecuteStateMsg(InternalMessage *msg) p2pStateMachine.BroadcastActionResult(P2pActionCallback::DiscoverDevices, ErrCode::WIFI_OPT_FAILED); break; } + case P2P_STATE_MACHINE_CMD::CMD_DISCOVER_SERVICES: { + p2pStateMachine.BroadcastActionResult(P2pActionCallback::DiscoverServices, ErrCode::WIFI_OPT_FAILED); + break; + } + case P2P_STATE_MACHINE_CMD::CMD_START_LISTEN: { + p2pStateMachine.BroadcastActionResult(P2pActionCallback::StartP2pListen, ErrCode::WIFI_OPT_FAILED); + break; + } + case P2P_STATE_MACHINE_CMD::CMD_CANCEL_CONNECT: { + WifiP2PHalInterface::GetInstance().CancelConnect(); + p2pStateMachine.DealGroupCreationFailed(); + p2pStateMachine.SwitchState(&p2pStateMachine.p2pIdleState); + p2pStateMachine.BroadcastActionResult(P2pActionCallback::P2pDisConnect, ErrCode::WIFI_OPT_SUCCESS); + break; + } case P2P_STATE_MACHINE_CMD::P2P_EVENT_DEVICE_LOST: { return NOT_EXECUTED; } diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_join_state.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_join_state.cpp index b5aeef0..81d4429 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_join_state.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_join_state.cpp @@ -27,13 +27,17 @@ P2pGroupJoinState::P2pGroupJoinState( {} void P2pGroupJoinState::GoInState() { - WIFI_LOGI(" GoInState"); + WIFI_LOGI("GoInState"); p2pStateMachine.NotifyUserInvitationReceivedMessage(); + const int exceptionTimeOut = 120000; + p2pStateMachine.MessageExecutedLater( + static_cast(P2P_STATE_MACHINE_CMD::INTERNAL_CONN_USER_TIME_OUT), exceptionTimeOut); } void P2pGroupJoinState::GoOutState() { - WIFI_LOGI(" GoOutState"); + WIFI_LOGI("GoOutState"); + p2pStateMachine.StopTimer(static_cast(P2P_STATE_MACHINE_CMD::INTERNAL_CONN_USER_TIME_OUT)); } bool P2pGroupJoinState::ExecuteStateMsg(InternalMessage *msg) @@ -84,6 +88,10 @@ bool P2pGroupJoinState::ExecuteStateMsg(InternalMessage *msg) p2pStateMachine.SwitchState(&p2pStateMachine.p2pGroupFormedState); break; } + case P2P_STATE_MACHINE_CMD::INTERNAL_CONN_USER_TIME_OUT: { + p2pStateMachine.SwitchState(&p2pStateMachine.p2pGroupFormedState); + break; + } default: return NOT_EXECUTED; } diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_join_state.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_join_state.h index 48e3583..7281a35 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_join_state.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_join_state.h @@ -31,7 +31,7 @@ public: * @param None * @return None */ - P2pGroupJoinState(P2pStateMachine &, WifiP2pGroupManager &, WifiP2pDeviceManager &); + P2pGroupJoinState(P2pStateMachine &stateMachine, WifiP2pGroupManager &groupMgr, WifiP2pDeviceManager &deviceMgr); /** * @Description Destroy the P2pGroupJoinState object diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.cpp index dc9bb5c..3458e1d 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.cpp @@ -21,9 +21,13 @@ DEFINE_WIFILOG_P2P_LABEL("P2pGroupOperatingState"); namespace OHOS { namespace Wifi { -P2pGroupOperatingState::P2pGroupOperatingState( - P2pStateMachine &stateMachine, WifiP2pGroupManager &groupMgr, WifiP2pDeviceManager &deviceMgr) - : State("P2pGroupOperatingState"), mProcessFunMap(), p2pStateMachine(stateMachine), groupManager(groupMgr), deviceManager(deviceMgr) +P2pGroupOperatingState::P2pGroupOperatingState(P2pStateMachine &stateMachine, WifiP2pGroupManager &groupMgr, + WifiP2pDeviceManager &deviceMgr) + : State("P2pGroupOperatingState"), + mProcessFunMap(), + p2pStateMachine(stateMachine), + groupManager(groupMgr), + deviceManager(deviceMgr) {} void P2pGroupOperatingState::GoInState() { @@ -58,7 +62,7 @@ bool P2pGroupOperatingState::ProcessCmdCreateGroup(const InternalMessage &msg) c { WifiErrorNo ret = WIFI_IDL_OPT_FAILED; const int minValidNetworkid = 0; - WifiP2pConfig config; + WifiP2pConfigInternal config; msg.GetMessageObj(config); int freq = p2pStateMachine.GetAvailableFreqByBand(config.GetGoBand()); int netId = config.GetNetId(); @@ -80,9 +84,9 @@ bool P2pGroupOperatingState::ProcessCmdCreateGroup(const InternalMessage &msg) c * Create a new persistence group. */ WIFI_LOGE("Create a new %s group.", (netId == PERSISTENT_NET_ID) ? "persistence" : "temporary"); - if (config.GetPassphrase().empty() && config.GetNetworkName().empty()) { + if (config.GetPassphrase().empty() && config.GetGroupName().empty()) { ret = WifiP2PHalInterface::GetInstance().GroupAdd((netId == PERSISTENT_NET_ID) ? true : false, netId, freq); - } else if (!config.GetPassphrase().empty() && !config.GetNetworkName().empty() && + } else if (!config.GetPassphrase().empty() && !config.GetGroupName().empty() && config.GetPassphrase().length() >= MIN_PSK_LEN && config.GetPassphrase().length() <= MAX_PSK_LEN) { if (p2pStateMachine.DealCreateNewGroupWithConfig(config, freq)) { ret = WIFI_IDL_OPT_OK; @@ -122,15 +126,23 @@ bool P2pGroupOperatingState::ProcessGroupStartedEvt(const InternalMessage &msg) WIFI_LOGI("the group network id is %{public}d set id is %{public}d", group.GetNetworkId(), p2pStateMachine.groupManager.GetGroupNetworkId(group.GetOwner(), group.GetGroupName())); - } - if (group.GetNetworkId() == TEMPORARY_NET_ID) { - group.SetIsPersistent(false); + } else { + group.SetNetworkId(TEMPORARY_NET_ID); WIFI_LOGI("This is a temporary group."); } + + std::string goAddr = group.GetOwner().GetDeviceAddress(); if (group.IsGroupOwner()) { /* append setting the device name if this is GO */ - owner = group.GetOwner(); - owner.SetDeviceName(deviceManager.GetThisDevice().GetDeviceName()); - group.SetOwner(owner); + WifiP2pDevice thisDevice = deviceManager.GetThisDevice(); + thisDevice.SetP2pDeviceStatus(P2pDeviceStatus::PDS_CONNECTED); + thisDevice.SetDeviceAddress(goAddr); + group.SetOwner(thisDevice); + } else { + WifiP2pDevice dev = deviceManager.GetDevices(goAddr); + dev.SetP2pDeviceStatus(P2pDeviceStatus::PDS_CONNECTED); + if (dev.IsValid()) { + group.SetOwner(dev); + } } group.SetP2pGroupStatus(P2pGroupStatus::GS_STARTED); p2pStateMachine.groupManager.SetCurrentGroup(group); diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.h index faab487..53fac3c 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.h @@ -27,12 +27,13 @@ class P2pGroupOperatingState : public State { FRIEND_GTEST(P2pGroupOperatingState); public: - /** + /* * * @Description Construct a new P2pGroupOperatingState object * @param None * @return None */ - P2pGroupOperatingState(P2pStateMachine &, WifiP2pGroupManager &, WifiP2pDeviceManager &); + P2pGroupOperatingState(P2pStateMachine &stateMachine, WifiP2pGroupManager &groupMgr, + WifiP2pDeviceManager &deviceMgr); /** * @Description Destroy the P2pGroupOperatingState object diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.cpp index b9b03a2..37abb4c 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.cpp @@ -85,7 +85,7 @@ bool P2pIdleState::ProcessCmdStopDiscPeer(InternalMessage &msg) const bool P2pIdleState::ProcessCmdConnect(InternalMessage &msg) const { - WifiP2pConfig config; + WifiP2pConfigInternal config; if (!msg.GetMessageObj(config)) { WIFI_LOGD("p2p connect Parameter error."); p2pStateMachine.BroadcastActionResult(P2pActionCallback::P2pConnect, ErrCode::WIFI_OPT_INVALID_PARAM); @@ -145,7 +145,7 @@ bool P2pIdleState::ProcessProvDiscEnterPinEvt(InternalMessage &msg) const bool P2pIdleState::ProcessNegotReqEvt(InternalMessage &msg) const { - WifiP2pConfig conf; + WifiP2pConfigInternal conf; if (!msg.GetMessageObj(conf)) { WIFI_LOGD("Failed to obtain conf."); return EXECUTED; @@ -162,7 +162,7 @@ bool P2pIdleState::ProcessProvDiscShowPinEvt(InternalMessage &msg) const WIFI_LOGD("Failed to obtain provDisc."); return EXECUTED; } - WifiP2pConfig config; + WifiP2pConfigInternal config; WpsInfo wps; wps.SetWpsMethod(WpsMethod::WPS_METHOD_KEYPAD); wps.SetPin(provDisc.GetPin()); @@ -301,7 +301,7 @@ bool P2pIdleState::ProcessInvitationReceivedEvt(InternalMessage &msg) const wps.SetWpsMethod(WpsMethod::WPS_METHOD_KEYPAD); } - WifiP2pConfig config; + WifiP2pConfigInternal config; config.SetDeviceAddress(owner.GetDeviceAddress()); config.SetWpsInfo(wps); p2pStateMachine.savedP2pConfig = config; diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.h index 9e3606c..cb5494c 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.h @@ -32,7 +32,7 @@ public: * @param None * @return None */ - P2pIdleState(P2pStateMachine &, WifiP2pGroupManager &, WifiP2pDeviceManager &); + P2pIdleState(P2pStateMachine &stateMachine, WifiP2pGroupManager &groupMgr, WifiP2pDeviceManager &deviceMgr); /** * @Description Destroy the P2pIdleState object diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_interface.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_interface.cpp index 38d88e9..c06e3bd 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_interface.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_interface.cpp @@ -145,9 +145,9 @@ ErrCode P2pInterface::SetP2pWfdInfo(const WifiP2pWfdInfo &wfdInfo) return p2pService.SetP2pWfdInfo(wfdInfo); } -ErrCode P2pInterface::QueryP2pInfo(WifiP2pInfo &connInfo) +ErrCode P2pInterface::QueryP2pLinkedInfo(WifiP2pLinkedInfo &linkedInfo) { - return p2pService.QueryP2pInfo(connInfo); + return p2pService.QueryP2pLinkedInfo(linkedInfo); } ErrCode P2pInterface::GetCurrentGroup(WifiP2pGroupInfo &group) @@ -175,6 +175,11 @@ ErrCode P2pInterface::QueryP2pDevices(std::vector &devices) return p2pService.QueryP2pDevices(devices); } +ErrCode P2pInterface::QueryP2pLocalDevice(WifiP2pDevice &device) +{ + return p2pService.QueryP2pLocalDevice(device); +} + ErrCode P2pInterface::QueryP2pGroups(std::vector &groups) { return p2pService.QueryP2pGroups(groups); diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_interface.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_interface.h index 938dd7f..4bb2fc3 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_interface.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_interface.h @@ -152,10 +152,10 @@ public: /** * @Description - Query P2P connection information. - * @param connInfo - object that stores connection information + * @param linkedInfo - object that stores connection information * @return - ErrCode */ - virtual ErrCode QueryP2pInfo(WifiP2pInfo &connInfo) override; + virtual ErrCode QueryP2pLinkedInfo(WifiP2pLinkedInfo &linkedInfo) override; /** * @Description set p2p wifi display info @@ -194,6 +194,12 @@ public: * @return - ErrCode */ virtual ErrCode QueryP2pDevices(std::vector &devices) override; + /** + * @Description - Query the information about own device. + * @param device - own device + * @return - ErrCode + */ + virtual ErrCode QueryP2pLocalDevice(WifiP2pDevice &device) override; /** * @Description - Obtain information about all groups. * @param groups - list of group information diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_inviting_state.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_inviting_state.cpp index 346721c..ea6d6c7 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_inviting_state.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_inviting_state.cpp @@ -14,6 +14,7 @@ */ #include "p2p_inviting_state.h" #include "p2p_state_machine.h" +#include "wifi_p2p_hal_interface.h" #include "wifi_logger.h" DEFINE_WIFILOG_P2P_LABEL("P2pInvitingState"); @@ -41,6 +42,21 @@ bool P2pInvitingState::ExecuteStateMsg(InternalMessage *msg) p2pStateMachine.BroadcastActionResult(P2pActionCallback::DiscoverDevices, ErrCode::WIFI_OPT_FAILED); break; } + case P2P_STATE_MACHINE_CMD::CMD_DISCOVER_SERVICES: { + p2pStateMachine.BroadcastActionResult(P2pActionCallback::DiscoverServices, ErrCode::WIFI_OPT_FAILED); + break; + } + case P2P_STATE_MACHINE_CMD::CMD_START_LISTEN: { + p2pStateMachine.BroadcastActionResult(P2pActionCallback::StartP2pListen, ErrCode::WIFI_OPT_FAILED); + break; + } + case P2P_STATE_MACHINE_CMD::CMD_CANCEL_CONNECT: { + WifiP2PHalInterface::GetInstance().CancelConnect(); + p2pStateMachine.DealGroupCreationFailed(); + p2pStateMachine.SwitchState(&p2pStateMachine.p2pIdleState); + p2pStateMachine.BroadcastActionResult(P2pActionCallback::P2pDisConnect, ErrCode::WIFI_OPT_SUCCESS); + break; + } case P2P_STATE_MACHINE_CMD::P2P_EVENT_DEVICE_LOST: { /* Do nothing */ return NOT_EXECUTED; diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_inviting_state.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_inviting_state.h index ad5cf64..fb3c203 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_inviting_state.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_inviting_state.h @@ -32,7 +32,7 @@ public: * @param None * @return None */ - P2pInvitingState(P2pStateMachine &, WifiP2pGroupManager &, WifiP2pDeviceManager &); + P2pInvitingState(P2pStateMachine &stateMachine, WifiP2pGroupManager &groupMgr, WifiP2pDeviceManager &deviceMgr); /** * @Description Destroy the P2pInvitingState object diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_monitor.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_monitor.cpp index 3382441..b409db5 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_monitor.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_monitor.cpp @@ -164,7 +164,7 @@ void P2pMonitor::Broadcast2SmDeviceLost(const std::string &iface, const WifiP2pD MessageToStateMachine(iface, P2P_STATE_MACHINE_CMD::P2P_EVENT_DEVICE_LOST, 0, 0, anyDevice); } -void P2pMonitor::Broadcast2SmGoNegRequest(const std::string &iface, const WifiP2pConfig &config) const +void P2pMonitor::Broadcast2SmGoNegRequest(const std::string &iface, const WifiP2pConfigInternal &config) const { std::any anyConfig = config; MessageToStateMachine(iface, P2P_STATE_MACHINE_CMD::P2P_EVENT_GO_NEG_REQUEST, 0, 0, anyConfig); @@ -341,7 +341,7 @@ void P2pMonitor::WpaEventDeviceLost(const std::string &p2pDeviceAddress) const void P2pMonitor::WpaEventGoNegRequest(const std::string &srcAddress, short passwordId) const { WIFI_LOGD("WpaEventGoNegRequest srcAddress:%{private}s, passwordId:%{private}hd", srcAddress.c_str(), passwordId); - WifiP2pConfig config; + WifiP2pConfigInternal config; config.SetDeviceAddress(srcAddress); if (config.GetDeviceAddress().empty()) { WIFI_LOGE("ERROR!"); diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_monitor.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_monitor.h index 1747d27..49c9f3b 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_monitor.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_monitor.h @@ -113,7 +113,7 @@ private: * @param iface - network interface for event processing * @param config - config of P2P */ - virtual void Broadcast2SmGoNegRequest(const std::string &iface, const WifiP2pConfig &config) const; + virtual void Broadcast2SmGoNegRequest(const std::string &iface, const WifiP2pConfigInternal &config) const; /** * @Description Broadcast GO negotiation success event. * diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp index cdb0e1c..3d64218 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp @@ -208,7 +208,7 @@ void P2pStateMachine::UpdatePersistentGroups() const } } -bool P2pStateMachine::ReawakenPersistentGroup(WifiP2pConfig &config) const +bool P2pStateMachine::ReawakenPersistentGroup(WifiP2pConfigInternal &config) const { const WifiP2pDevice device = FetchNewerDeviceInfo(config.GetDeviceAddress()); if (!device.IsValid()) { @@ -217,10 +217,10 @@ bool P2pStateMachine::ReawakenPersistentGroup(WifiP2pConfig &config) const } bool isJoin = device.IsGroupOwner(); - const std::string networkName = config.GetNetworkName(); + const std::string groupName = config.GetGroupName(); if (isJoin && !device.IsGroupLimit()) { - int networkId = groupManager.GetGroupNetworkId(device, networkName); + int networkId = groupManager.GetGroupNetworkId(device, groupName); if (networkId >= 0) { /** * If GO is running on the peer device and the GO has been connected, @@ -293,7 +293,7 @@ WifiP2pDevice P2pStateMachine::FetchNewerDeviceInfo(const std::string &deviceAdd void P2pStateMachine::DealGroupCreationFailed() { - WifiP2pInfo info; + WifiP2pLinkedInfo info; info.SetConnectState(P2pConnectedState::P2P_DISCONNECTED); WifiSettings::GetInstance().SaveP2pInfo(info); groupManager.SaveP2pInfo(info); @@ -316,7 +316,7 @@ void P2pStateMachine::RemoveGroupByNetworkId(int networkId) const void P2pStateMachine::SetWifiP2pInfoWhenGroupFormed(const std::string &groupOwnerAddress) { - WifiP2pInfo p2pInfo; + WifiP2pLinkedInfo p2pInfo; WifiSettings::GetInstance().GetP2pInfo(p2pInfo); p2pInfo.SetIsGroupOwner(groupManager.GetCurrentGroup().IsGroupOwner()); p2pInfo.SetIsGroupOwnerAddress(groupOwnerAddress); @@ -357,7 +357,7 @@ void P2pStateMachine::BroadcastP2pServicesChanged() const void P2pStateMachine::BroadcastP2pConnectionChanged() const { - WifiP2pInfo p2pInfo; + WifiP2pLinkedInfo p2pInfo; WifiSettings::GetInstance().GetP2pInfo(p2pInfo); if (p2pServiceCallbacks.OnP2pConnectionChangedEvent) { p2pServiceCallbacks.OnP2pConnectionChangedEvent(p2pInfo); @@ -399,23 +399,59 @@ void P2pStateMachine::BroadcastActionResult(P2pActionCallback action, ErrCode re WifiBroadCastHelper::Send("ActionResult", static_cast(action), static_cast(result)); } +void P2pStateMachine::BroadcastServiceResult(P2pServicerProtocolType serviceType, + const std::vector &respData, const WifiP2pDevice &srcDevice) const +{ + if (p2pServiceCallbacks.OnP2pServiceAvailable) { + p2pServiceCallbacks.OnP2pServiceAvailable(serviceType, respData, srcDevice); + } + WifiBroadCastHelper::Send("ServiceResult", static_cast(serviceType), srcDevice); +} + +void P2pStateMachine::BroadcastDnsSdServiceResult( + const std::string &instName, const std::string ®Type, const WifiP2pDevice &srcDevice) const +{ + if (p2pServiceCallbacks.OnP2pDnsSdServiceAvailable) { + p2pServiceCallbacks.OnP2pDnsSdServiceAvailable(instName, regType, srcDevice); + } + WifiBroadCastHelper::Send("DnsSdServiceResult", instName, regType, srcDevice); +} + +void P2pStateMachine::BroadcastDnsSdTxtRecordResult(const std::string &wholeDomainName, + const std::map &txtMap, const WifiP2pDevice &srcDevice) const +{ + if (p2pServiceCallbacks.OnP2pDnsSdTxtRecordAvailable) { + p2pServiceCallbacks.OnP2pDnsSdTxtRecordAvailable(wholeDomainName, txtMap, srcDevice); + } + WifiBroadCastHelper::Send("DnsSdTxtRecordResult", wholeDomainName, txtMap, srcDevice); +} + +void P2pStateMachine::BroadcastUpnpServiceResult( + const std::vector &uniqueServiceNames, const WifiP2pDevice &srcDevice) const +{ + if (p2pServiceCallbacks.OnP2pUpnpServiceAvailable) { + p2pServiceCallbacks.OnP2pUpnpServiceAvailable(uniqueServiceNames, srcDevice); + } + WifiBroadCastHelper::Send("UpnpServiceResult", uniqueServiceNames, srcDevice); +} + void P2pStateMachine::RegisterP2pServiceCallbacks(const IP2pServiceCallbacks &callback) { p2pServiceCallbacks = callback; } -bool P2pStateMachine::IsUsableNetworkName(std::string nwName) +bool P2pStateMachine::IsUsableGroupName(std::string nwName) { if (nwName.empty()) { return false; } - if (nwName.length() < MIN_NETWORK_NAME_LENGTH || nwName.length() > MAX_NETWORK_NAME_LENGTH) { + if (nwName.length() < MIN_GROUP_NAME_LENGTH || nwName.length() > MAX_GROUP_NAME_LENGTH) { return false; } return true; } -P2pConfigErrCode P2pStateMachine::IsConfigUnusable(const WifiP2pConfig &config) +P2pConfigErrCode P2pStateMachine::IsConfigUnusable(const WifiP2pConfigInternal &config) { constexpr unsigned NETWORK_NAME_MAX_LENGTH = 32; constexpr int GROUP_OWNER_MAX_INTENT = 15; @@ -432,18 +468,18 @@ P2pConfigErrCode P2pStateMachine::IsConfigUnusable(const WifiP2pConfig &config) if (config.GetGroupOwnerIntent() < 0 || config.GetGroupOwnerIntent() > GROUP_OWNER_MAX_INTENT) { return P2pConfigErrCode::ERR_INTENT; } - if (config.GetNetworkName().length() > NETWORK_NAME_MAX_LENGTH || config.GetNetworkName().length() < 1) { + if (config.GetGroupName().length() > NETWORK_NAME_MAX_LENGTH) { return P2pConfigErrCode::ERR_SIZE_NW_NAME; } return P2pConfigErrCode::SUCCESS; } -bool P2pStateMachine::IsConfigUsableAsGroup(WifiP2pConfig config) +bool P2pStateMachine::IsConfigUsableAsGroup(WifiP2pConfigInternal config) { if (config.GetDeviceAddress().empty()) { return false; } - if (IsUsableNetworkName(config.GetNetworkName()) && !config.GetPassphrase().empty()) { + if (IsUsableGroupName(config.GetGroupName()) && !config.GetPassphrase().empty()) { return true; } return false; @@ -545,7 +581,7 @@ void P2pStateMachine::NotifyUserInvitationReceivedMessage() AbstractUI::GetInstance().ShowAlerDialog(dialog); } -void P2pStateMachine::P2pConnectByShowingPin(const WifiP2pConfig &config) const +void P2pStateMachine::P2pConnectByShowingPin(const WifiP2pConfigInternal &config) const { if (config.GetDeviceAddress().empty()) { WIFI_LOGE("Invalid address parameter."); @@ -587,7 +623,7 @@ void P2pStateMachine::HandlerDiscoverPeers() void P2pStateMachine::ChangeConnectedStatus(P2pConnectedState connectedState) { - WifiP2pInfo p2pInfo; + WifiP2pLinkedInfo p2pInfo; WifiSettings::GetInstance().GetP2pInfo(p2pInfo); p2pInfo.SetConnectState(connectedState); WifiSettings::GetInstance().SaveP2pInfo(p2pInfo); @@ -610,7 +646,7 @@ void P2pStateMachine::ChangeConnectedStatus(P2pConnectedState connectedState) void P2pStateMachine::ClearWifiP2pInfo() { - WifiP2pInfo p2pInfo; + WifiP2pLinkedInfo p2pInfo; WifiSettings::GetInstance().SaveP2pInfo(p2pInfo); groupManager.SaveP2pInfo(p2pInfo); } @@ -648,7 +684,7 @@ P2pStateMachine::DhcpResultNotify::~DhcpResultNotify() void P2pStateMachine::DhcpResultNotify::OnSuccess(int status, const std::string &ifname, DhcpResult &result) { WIFI_LOGI("Enter DhcpResultNotify::OnSuccess, status: %{public}d, ifname: %{public}s", status, ifname.c_str()); - WifiP2pInfo p2pInfo; + WifiP2pLinkedInfo p2pInfo; WifiSettings::GetInstance().GetP2pInfo(p2pInfo); WIFI_LOGI("Set GO IP: %{private}s", result.strServer.c_str()); p2pInfo.SetIsGroupOwnerAddress(result.strServer); @@ -700,6 +736,38 @@ void P2pStateMachine::HandleP2pServiceResp(const WifiP2pServiceResponse &resp, c WIFI_LOGD("Service protocol is not available."); return; } + if (resp.GetProtocolType() == P2pServicerProtocolType::SERVICE_TYPE_BONJOUR) { + WifiP2pDnsSdServiceResponse dnsSrvResp = WifiP2pDnsSdServiceResponse(resp); + if (!dnsSrvResp.ParseData()) { + WIFI_LOGE("Parse WifiP2pDnsServiceResponse failed!"); + return; + } + serviceManager.UpdateServiceName(dev.GetDeviceAddress(), dynamic_cast(dnsSrvResp)); + if (dnsSrvResp.GetDnsType() == WifiP2pDnsSdServiceInfo::DNS_PTR_TYPE) { + BroadcastDnsSdServiceResult(dnsSrvResp.GetInstanceName(), dnsSrvResp.GetQueryName(), dev); + return; + } + if (dnsSrvResp.GetDnsType() == WifiP2pDnsSdServiceInfo::DNS_TXT_TYPE) { + BroadcastDnsSdTxtRecordResult(dnsSrvResp.GetQueryName(), dnsSrvResp.GetTxtRecord(), dev); + return; + } + WIFI_LOGE("Parse WifiP2pDnsSdServiceResponse Dnstype failed!"); + return; + } + if (resp.GetProtocolType() == P2pServicerProtocolType::SERVICE_TYPE_UP_NP) { + WifiP2pUpnpServiceResponse upnpSrvResp = + WifiP2pUpnpServiceResponse::Create(resp.GetServiceStatus(), resp.GetTransactionId(), resp.GetData()); + if (upnpSrvResp.ParseData()) { + serviceManager.UpdateServiceName( + dev.GetDeviceAddress(), dynamic_cast(upnpSrvResp)); + BroadcastUpnpServiceResult(upnpSrvResp.GetUniqueServNames(), dev); + } else { + WIFI_LOGE("Parse WifiP2pUpnpServiceResponse failed!"); + } + return; + } + + BroadcastServiceResult(resp.GetProtocolType(), resp.GetData(), dev); return; } @@ -721,13 +789,13 @@ int P2pStateMachine::GetAvailableFreqByBand(GroupOwnerBand band) const return retFreq; } -bool P2pStateMachine::SetGroupConfig(const WifiP2pConfig &config, bool newGroup) const +bool P2pStateMachine::SetGroupConfig(const WifiP2pConfigInternal &config, bool newGroup) const { WifiErrorNo ret; IdlP2pGroupConfig wpaConfig; if (newGroup) { WIFI_LOGI("SetGroupConfig, new group"); - wpaConfig.ssid = config.GetNetworkName(); + wpaConfig.ssid = config.GetGroupName(); wpaConfig.psk = config.GetPassphrase(); wpaConfig.bssid = deviceManager.GetThisDevice().GetDeviceAddress(); const int p2pDisabled = 2; @@ -741,8 +809,8 @@ bool P2pStateMachine::SetGroupConfig(const WifiP2pConfig &config, bool newGroup) if (ret == WifiErrorNo::WIFI_IDL_OPT_FAILED) { WIFI_LOGW("P2pGetGroupConfig failed"); } - if (!config.GetNetworkName().empty()) { - wpaConfig.ssid = config.GetNetworkName(); + if (!config.GetGroupName().empty()) { + wpaConfig.ssid = config.GetGroupName(); } else { wpaConfig.ssid = knownConfig.ssid; } @@ -768,15 +836,15 @@ bool P2pStateMachine::SetGroupConfig(const WifiP2pConfig &config, bool newGroup) } } -bool P2pStateMachine::DealCreateNewGroupWithConfig(const WifiP2pConfig &config, int freq) const +bool P2pStateMachine::DealCreateNewGroupWithConfig(const WifiP2pConfigInternal &config, int freq) const { - WifiP2pConfig cfgBuf = config; + WifiP2pConfigInternal cfgBuf = config; int createdNetId = -1; int netId = cfgBuf.GetNetId(); std::vector groupInfo = groupManager.GetGroups(); for (auto iter = groupInfo.begin(); iter != groupInfo.end(); ++iter) { - if (iter->GetGroupName() == config.GetNetworkName()) { + if (iter->GetGroupName() == config.GetGroupName()) { WIFI_LOGE("Cannot use a exist group name!"); return false; } diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.h index 9302a72..1a64433 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.h @@ -43,8 +43,8 @@ namespace OHOS { namespace Wifi { -const int MIN_NETWORK_NAME_LENGTH = 9; -const int MAX_NETWORK_NAME_LENGTH = 32; +const int MIN_GROUP_NAME_LENGTH = 9; +const int MAX_GROUP_NAME_LENGTH = 32; const int DISC_TIMEOUT_S = 120; class P2pStateMachine : public StateMachine { class DhcpResultNotify : public IDhcpResultNotify { @@ -163,7 +163,7 @@ private: * @return - bool true:It is a persistent group and the reinvoke succeeds. false:Not a persistent group or reinvoke failure. */ - virtual bool ReawakenPersistentGroup(WifiP2pConfig &config) const; + virtual bool ReawakenPersistentGroup(WifiP2pConfigInternal &config) const; /** * @Description - Updates the latest device information based on the device address and returns. @@ -182,7 +182,7 @@ private: */ virtual void RemoveGroupByNetworkId(int networkId) const; /** - * @Description Updating the WifiP2pInfo information when a group is formed. + * @Description Updating the WifiP2pLinkedInfo information when a group is formed. * @param groupOwnerAddress - address of the group owner */ virtual void SetWifiP2pInfoWhenGroupFormed(const std::string &groupOwnerAddress); @@ -198,14 +198,14 @@ private: * @return true - available * @return false - not available */ - virtual bool IsUsableNetworkName(std::string nwName); + virtual bool IsUsableGroupName(std::string nwName); /** * @Description Check whether the specified P2P configuration is unavailable. * * @param config - specified P2P configuration * @return P2pConfigErrCode - error code of WifiP2pConfig */ - virtual P2pConfigErrCode IsConfigUnusable(const WifiP2pConfig &config); + virtual P2pConfigErrCode IsConfigUnusable(const WifiP2pConfigInternal &config); /** * @Description If the P2P is configured with a network name and passphrase, the configuration is valid as a group. * @@ -213,7 +213,7 @@ private: * @return true - valid * @return false - invalid */ - virtual bool IsConfigUsableAsGroup(WifiP2pConfig config); + virtual bool IsConfigUsableAsGroup(WifiP2pConfigInternal config); /** * @Description Purging service discovery requests in WPAS. * @@ -257,7 +257,7 @@ private: * @return true - all settings succeeded * @return false - one of settings failed */ - virtual bool SetGroupConfig(const WifiP2pConfig &config, bool newGroup) const; + virtual bool SetGroupConfig(const WifiP2pConfigInternal &config, bool newGroup) const; /** * @Description Processing function of using configuration to create a group. * @@ -266,7 +266,7 @@ private: * @return true - created successfully * @return false - creation failed */ - virtual bool DealCreateNewGroupWithConfig(const WifiP2pConfig &config, int freq) const; + virtual bool DealCreateNewGroupWithConfig(const WifiP2pConfigInternal &config, int freq) const; /** * @Description Update persistent group's info to wpa. * @@ -311,6 +311,41 @@ private: * @param result - action confirmation result */ virtual void BroadcastActionResult(P2pActionCallback action, ErrCode result) const; + /** + * @Description Broadcast receive p2p service response result in addition to bonjour and upnp. + * + * @param serviceType - protocol type + * @param respData - service response data + * @param srcDevice - source device + */ + virtual void BroadcastServiceResult(P2pServicerProtocolType serviceType, + const std::vector &respData, const WifiP2pDevice &srcDevice) const; + /** + * @Description Broadcast receive bonjour service response result. + * + * @param instName - instance name + * @param regType - registration type + * @param srcDevice - source device + */ + virtual void BroadcastDnsSdServiceResult( + const std::string &instName, const std::string ®Type, const WifiP2pDevice &srcDevice) const; + /** + * @Description Broadcast receive the result of bonjour txt record for a service. + * + * @param wholeDomainName - the whole domain name + * @param txtMap - txt record data as a map of key/value pairs + * @param srcDevice source device + */ + virtual void BroadcastDnsSdTxtRecordResult(const std::string &wholeDomainName, + const std::map &txtMap, const WifiP2pDevice &srcDevice) const; + /** + * @Description Broadcast receive upnp service response result. + * + * @param uniqueServiceNames - the list of unique service names + * @param srcDevice - source device + */ + virtual void BroadcastUpnpServiceResult( + const std::vector &uniqueServiceNames, const WifiP2pDevice &srcDevice) const; /** * @Description - Start the dhcp server and save the IP address to be assigned. @@ -329,12 +364,12 @@ private: virtual void NotifyUserInvitationReceivedMessage(); private: - virtual void P2pConnectByShowingPin(const WifiP2pConfig &config) const; + virtual void P2pConnectByShowingPin(const WifiP2pConfigInternal &config) const; private: IP2pServiceCallbacks p2pServiceCallbacks; /* state machine -> service callback */ std::string p2pIface; /* P2P iface */ - WifiP2pConfig savedP2pConfig; /* record P2P config when communicating with the peer device */ + WifiP2pConfigInternal savedP2pConfig; /* record P2P config when communicating with the peer device */ P2pMonitor &p2pMonitor; /* P2P monitor */ WifiP2pGroupManager &groupManager; /* group manager */ WifiP2pDeviceManager &deviceManager; /* device manager */ diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/provision_discovery_state.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/provision_discovery_state.cpp index d3b9358..581abba 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/provision_discovery_state.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/provision_discovery_state.cpp @@ -49,6 +49,10 @@ void ProvisionDiscoveryState::Init() { mProcessFunMap.insert( std::make_pair(P2P_STATE_MACHINE_CMD::CMD_DEVICE_DISCOVERS, &ProvisionDiscoveryState::ProcessCmdDiscoverPeer)); + mProcessFunMap.insert( + std::make_pair(P2P_STATE_MACHINE_CMD::CMD_DISCOVER_SERVICES, &ProvisionDiscoveryState::ProcessCmdDiscServices)); + mProcessFunMap.insert( + std::make_pair(P2P_STATE_MACHINE_CMD::CMD_START_LISTEN, &ProvisionDiscoveryState::ProcessCmdStartListen)); mProcessFunMap.insert(std::make_pair( P2P_STATE_MACHINE_CMD::P2P_EVENT_PROV_DISC_PBC_RESP, &ProvisionDiscoveryState::ProcessProvDiscPbcRspEvt)); mProcessFunMap.insert(std::make_pair( @@ -57,15 +61,31 @@ void ProvisionDiscoveryState::Init() P2P_STATE_MACHINE_CMD::P2P_EVENT_PROV_DISC_SHOW_PIN, &ProvisionDiscoveryState::ProcessProvDiscShowPinEvt)); mProcessFunMap.insert(std::make_pair( P2P_STATE_MACHINE_CMD::P2P_EVENT_PROV_DISC_FAILURE, &ProvisionDiscoveryState::ProcessProvDiscFailEvt)); + mProcessFunMap.insert(std::make_pair( + P2P_STATE_MACHINE_CMD::CMD_CANCEL_CONNECT, &ProvisionDiscoveryState::ProcessCmdCancelConnect)); } bool ProvisionDiscoveryState::ProcessCmdDiscoverPeer(InternalMessage &msg) const { - WIFI_LOGI("recv CMD: %{public}d", msg.GetMessageName()); + WIFI_LOGI("Discover peer recv CMD: %{public}d", msg.GetMessageName()); p2pStateMachine.BroadcastActionResult(P2pActionCallback::DiscoverDevices, ErrCode::WIFI_OPT_FAILED); return EXECUTED; } +bool ProvisionDiscoveryState::ProcessCmdDiscServices(InternalMessage &msg) const +{ + LOGI("Disc service recv CMD: %d", msg.GetMessageName()); + p2pStateMachine.BroadcastActionResult(P2pActionCallback::DiscoverServices, ErrCode::WIFI_OPT_FAILED); + return EXECUTED; +} + +bool ProvisionDiscoveryState::ProcessCmdStartListen(InternalMessage &msg) const +{ + LOGI("Start listen recv CMD: %d", msg.GetMessageName()); + p2pStateMachine.BroadcastActionResult(P2pActionCallback::StartP2pListen, ErrCode::WIFI_OPT_FAILED); + return EXECUTED; +} + bool ProvisionDiscoveryState::ProcessProvDiscPbcRspEvt(InternalMessage &msg) const { WifiP2pTempDiscEvent provDisc; @@ -148,6 +168,16 @@ bool ProvisionDiscoveryState::ProcessProvDiscFailEvt(InternalMessage &msg) const return EXECUTED; } +bool ProvisionDiscoveryState::ProcessCmdCancelConnect(InternalMessage &msg) const +{ + WIFI_LOGI("recv event: %d", msg.GetMessageName()); + WifiP2PHalInterface::GetInstance().CancelConnect(); + p2pStateMachine.DealGroupCreationFailed(); + p2pStateMachine.SwitchState(&p2pStateMachine.p2pIdleState); + p2pStateMachine.BroadcastActionResult(P2pActionCallback::P2pDisConnect, ErrCode::WIFI_OPT_SUCCESS); + return EXECUTED; +} + bool ProvisionDiscoveryState::ExecuteStateMsg(InternalMessage *msg) { if (msg == nullptr) { diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/provision_discovery_state.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/provision_discovery_state.h index 3ea8976..5bd6c85 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/provision_discovery_state.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/provision_discovery_state.h @@ -32,7 +32,8 @@ public: * @param None * @return None */ - ProvisionDiscoveryState(P2pStateMachine &, WifiP2pGroupManager &, WifiP2pDeviceManager &); + ProvisionDiscoveryState(P2pStateMachine &stateMachine, WifiP2pGroupManager &setGroupMgr, + WifiP2pDeviceManager &setDeviceMgr); /** * @Description Destroy the Provision Discovery State object @@ -77,6 +78,20 @@ private: */ virtual bool ProcessCmdDiscoverPeer(InternalMessage &msg) const; + /** + * @Description Process the discover services command received by the state machine + * @param msg - Message body sent by the state machine + * @return - bool true:handle false:not handle + */ + virtual bool ProcessCmdDiscServices(InternalMessage &msg) const; + + /** + * @Description Process the start listen command received by the state machine + * @param msg - Message body sent by the state machine + * @return - bool true:handle false:not handle + */ + virtual bool ProcessCmdStartListen(InternalMessage &msg) const; + /** * @Description Process the provision discover pbc response message received by the state machine * @param msg - Message body sent by the state machine @@ -105,6 +120,13 @@ private: */ virtual bool ProcessProvDiscFailEvt(InternalMessage &msg) const; + /** + * @Description Process the cancel connect message received by the state machine + * @param msg - Message body sent by the state machine + * @return - bool true:handle false:not handle + */ + virtual bool ProcessCmdCancelConnect(InternalMessage &msg) const; + private: using ProcessFun = bool (ProvisionDiscoveryState::*)(InternalMessage &msg) const; std::map mProcessFunMap; diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_device_manager.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_device_manager.h index 4f724c4..819368c 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_device_manager.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_device_manager.h @@ -38,6 +38,7 @@ class WifiP2pDeviceManager { friend class P2pIdleState; friend class P2pInvitingState; friend class ProvisionDiscoveryState; + friend class WifiP2pService; public: /** * @Description Destroy the Wifi P2p Device Manager object. diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_info.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_info.cpp index 2653d76..a79ec5d 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_info.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_info.cpp @@ -55,6 +55,7 @@ WifiP2pDnsSdServiceInfo WifiP2pDnsSdServiceInfo::Create(const std::string &insta WifiP2pDnsSdServiceInfo dnsSdServInfo(queries); dnsSdServInfo.SetServiceName(svrName); + dnsSdServInfo.SetServicerProtocolType(P2pServicerProtocolType::SERVICE_TYPE_BONJOUR); return dnsSdServInfo; } std::string WifiP2pDnsSdServiceInfo::BuildPtrServiceQuery( @@ -99,7 +100,9 @@ std::string WifiP2pDnsSdServiceInfo::BuildTxtServiceQuery(const std::string &ins } if (!svrName.empty()) { - ret += std::string("00"); + if (!rawData.empty()) { + ret += std::string("00"); + } ret.append(Bin2HexStr(std::string(";"))); std::vector buf; buf.push_back(static_cast(svrName.length())); diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_response.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_response.cpp index 4c3c299..c6529f0 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_response.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_response.cpp @@ -50,8 +50,9 @@ bool WifiP2pDnsSdServiceResponse::FetchTxtData(std::istringstream &istream) if (t > (istream.str().size() - istream.tellg())) { return false; } - std::unique_ptr ptr = std::make_unique(t); + std::unique_ptr ptr = std::make_unique(t + 1); istream.read(ptr.get(), t); + ptr[t] = '\0'; std::istringstream iss(ptr.get()); std::string keyVal[2]; getline(iss, keyVal[0], '='); diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_manager.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_manager.cpp index 39b5190..ad1f9db 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_manager.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_manager.cpp @@ -209,12 +209,12 @@ void WifiP2pGroupManager::RefreshCurrentGroupFromGroups() } } -void WifiP2pGroupManager::SaveP2pInfo(const WifiP2pInfo &connInfo) +void WifiP2pGroupManager::SaveP2pInfo(const WifiP2pLinkedInfo &linkedInfo) { - p2pConnInfo = connInfo; + p2pConnInfo = linkedInfo; } -const WifiP2pInfo &WifiP2pGroupManager::GetP2pInfo() const +const WifiP2pLinkedInfo &WifiP2pGroupManager::GetP2pInfo() const { return p2pConnInfo; } diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_manager.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_manager.h index 313c58d..a26ddd5 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_manager.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_manager.h @@ -125,15 +125,15 @@ public: /** * @Description Store P2P group connection information. * - * @param connInfo - group connection information + * @param linkedInfo - group connection information */ - virtual void SaveP2pInfo(const WifiP2pInfo &connInfo); + virtual void SaveP2pInfo(const WifiP2pLinkedInfo &linkedInfo); /** * @Description Get P2P group connection information. * - * @return const WifiP2pInfo& group connection information + * @return const WifiP2pLinkedInfo& group connection information */ - virtual const WifiP2pInfo &GetP2pInfo() const; + virtual const WifiP2pLinkedInfo &GetP2pInfo() const; /** * @Description Obtain the group information from the WPA, match and update the network ID. * @@ -173,7 +173,7 @@ private: std::vector groupsInfo; WifiP2pGroupInfoProxy currentGroup; std::mutex groupMutex; - WifiP2pInfo p2pConnInfo; /* group connection information */ + WifiP2pLinkedInfo p2pConnInfo; /* group connection information */ }; } // namespace Wifi } // namespace OHOS diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service.cpp index af16816..53b63ee 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service.cpp @@ -115,7 +115,11 @@ ErrCode WifiP2pService::StopP2pListen() ErrCode WifiP2pService::FormGroup(const WifiP2pConfig &config) { WIFI_LOGI("FormGroup"); - const std::any info = config; + WifiP2pConfigInternal configInternal(config); + WpsInfo wps; + wps.SetWpsMethod(WpsMethod::WPS_METHOD_PBC); + configInternal.SetWpsInfo(wps); + const std::any info = configInternal; p2pStateMachine.SendMessage(static_cast(P2P_STATE_MACHINE_CMD::CMD_FORM_GROUP), info); return ErrCode::WIFI_OPT_SUCCESS; } @@ -138,7 +142,11 @@ ErrCode WifiP2pService::DeleteGroup(const WifiP2pGroupInfo &group) ErrCode WifiP2pService::P2pConnect(const WifiP2pConfig &config) { WIFI_LOGI("P2pConnect"); - const std::any info = config; + WifiP2pConfigInternal configInternal(config); + WpsInfo wps; + wps.SetWpsMethod(WpsMethod::WPS_METHOD_PBC); + configInternal.SetWpsInfo(wps); + const std::any info = configInternal; p2pStateMachine.SendMessage(static_cast(P2P_STATE_MACHINE_CMD::CMD_CONNECT), info); return ErrCode::WIFI_OPT_SUCCESS; @@ -146,7 +154,9 @@ ErrCode WifiP2pService::P2pConnect(const WifiP2pConfig &config) ErrCode WifiP2pService::P2pDisConnect() { - return RemoveGroup(); + WIFI_LOGI("P2pDisConnect"); + p2pStateMachine.SendMessage(static_cast(P2P_STATE_MACHINE_CMD::CMD_CANCEL_CONNECT)); + return ErrCode::WIFI_OPT_SUCCESS; } ErrCode WifiP2pService::SetP2pDeviceName(const std::string &devName) @@ -164,17 +174,17 @@ ErrCode WifiP2pService::SetP2pWfdInfo(const WifiP2pWfdInfo &wfdInfo) p2pStateMachine.SendMessage(static_cast(P2P_STATE_MACHINE_CMD::CMD_SET_WFD_INFO), wfdInfo); return ErrCode::WIFI_OPT_SUCCESS; } -ErrCode WifiP2pService::QueryP2pInfo(WifiP2pInfo &connInfo) +ErrCode WifiP2pService::QueryP2pLinkedInfo(WifiP2pLinkedInfo &linkedInfo) { - WIFI_LOGI("QueryP2pInfo"); - connInfo = groupManager.GetP2pInfo(); + WIFI_LOGI("QueryP2pLinkedInfo"); + linkedInfo = groupManager.GetP2pInfo(); return ErrCode::WIFI_OPT_SUCCESS; } ErrCode WifiP2pService::GetCurrentGroup(WifiP2pGroupInfo &group) { WIFI_LOGI("GetCurrentGroup"); - WifiP2pInfo p2pInfo; + WifiP2pLinkedInfo p2pInfo; WifiSettings::GetInstance().GetP2pInfo(p2pInfo); if (p2pInfo.GetConnectState() == P2pConnectedState::P2P_DISCONNECTED) { return ErrCode::WIFI_OPT_FAILED; @@ -201,7 +211,7 @@ ErrCode WifiP2pService::GetP2pDiscoverStatus(int &status) ErrCode WifiP2pService::GetP2pConnectedStatus(int &status) { WIFI_LOGI("GetP2pConnectedStatus"); - WifiP2pInfo p2pInfo; + WifiP2pLinkedInfo p2pInfo; WifiSettings::GetInstance().GetP2pInfo(p2pInfo); status = static_cast(p2pInfo.GetConnectState()); return ErrCode::WIFI_OPT_SUCCESS; @@ -214,6 +224,13 @@ ErrCode WifiP2pService::QueryP2pDevices(std::vector &devices) return ErrCode::WIFI_OPT_SUCCESS; } +ErrCode WifiP2pService::QueryP2pLocalDevice(WifiP2pDevice &device) +{ + LOGI("QueryP2pLocalDevice"); + device = deviceManager.GetThisDevice(); + return ErrCode::WIFI_OPT_SUCCESS; +} + ErrCode WifiP2pService::QueryP2pGroups(std::vector &groups) { WIFI_LOGI("QueryP2pGroups"); diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service.h index 50d4d8b..0d159f8 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service.h @@ -28,7 +28,8 @@ public: /** * @Description Construct a new WifiP2pService object. */ - explicit WifiP2pService(P2pStateMachine &, WifiP2pDeviceManager &, WifiP2pGroupManager &, WifiP2pServiceManager &); + explicit WifiP2pService(P2pStateMachine &p2pStateMachine, WifiP2pDeviceManager &setDeviceMgr, + WifiP2pGroupManager &setGroupMgr, WifiP2pServiceManager &setSvrMgr); /** * @Description Destroy the WifiP2pService object. */ @@ -134,10 +135,10 @@ public: virtual ErrCode SetP2pDeviceName(const std::string &devName) override; /** * @Description - Query P2P connection information. - * @param connInfo - object that stores connection information + * @param linkedInfo - object that stores connection information * @return - ErrCode */ - virtual ErrCode QueryP2pInfo(WifiP2pInfo &connInfo) override; + virtual ErrCode QueryP2pLinkedInfo(WifiP2pLinkedInfo &linkedInfo) override; /** * @Description - Get the current group information. * @param group - object that stores the current group @@ -168,6 +169,12 @@ public: * @return - ErrCode */ virtual ErrCode QueryP2pDevices(std::vector &devices) override; + /** + * @Description - Query the information about own device. + * @param device - own device + * @return - ErrCode + */ + virtual ErrCode QueryP2pLocalDevice(WifiP2pDevice &device) override; /** * @Description - Obtain information about all groups. * @param groups - list of group information diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_info.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_info.cpp index 3833a9d..1e66e63 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_info.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_info.cpp @@ -33,6 +33,7 @@ WifiP2pUpnpServiceInfo WifiP2pUpnpServiceInfo::Create(const std::string &uuid, c } WifiP2pUpnpServiceInfo upnpServInfo(upnpInfo); upnpServInfo.SetServiceName(svrName); + upnpServInfo.SetServicerProtocolType(P2pServicerProtocolType::SERVICE_TYPE_UP_NP); return upnpServInfo; } diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_info.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_info.h index 1f4595a..6cc9ad6 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_info.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_info.h @@ -35,6 +35,11 @@ namespace Wifi { */ static WifiP2pUpnpServiceInfo Create(const std::string &uuid, const std::string &device, const std::vector &services, const std::string &svrName); + /** + * @Description Destroy the WifiP2pUpnpServiceInfo object. + * + */ + ~WifiP2pUpnpServiceInfo() = default; private: /** @@ -53,11 +58,6 @@ namespace Wifi { * @param queryList - the character string list used to supplicant command */ explicit WifiP2pUpnpServiceInfo(std::vector &queryList); - /** - * @Description Destroy the WifiP2pUpnpServiceInfo object. - * - */ - ~WifiP2pUpnpServiceInfo() = default; }; } // namespace Wifi } // namespace OHOS diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_callback_proxy.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_callback_proxy.cpp index ce4610a..7791bbc 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_callback_proxy.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_callback_proxy.cpp @@ -157,7 +157,7 @@ void WifiP2pCallbackProxy::OnP2pServicesChanged(const std::vectorP2pDisConnect(); } -ErrCode WifiP2pServiceImpl::QueryP2pInfo(WifiP2pInfo &connInfo) +ErrCode WifiP2pServiceImpl::QueryP2pLinkedInfo(WifiP2pLinkedInfo &linkedInfo) { - WIFI_LOGI("QueryP2pInfo group owner address [%{private}s]", connInfo.GetGroupOwnerAddress().c_str()); + WIFI_LOGI("QueryP2pLinkedInfo group owner address [%{private}s]", linkedInfo.GetGroupOwnerAddress().c_str()); if (!IsP2pServiceRunning()) { WIFI_LOGE("P2pService is not runing!"); return WIFI_OPT_P2P_NOT_OPENED; @@ -458,7 +458,7 @@ ErrCode WifiP2pServiceImpl::QueryP2pInfo(WifiP2pInfo &connInfo) WIFI_LOGE("Get P2P service failed!"); return WIFI_OPT_P2P_NOT_OPENED; } - return pService->QueryP2pInfo(connInfo); + return pService->QueryP2pLinkedInfo(linkedInfo); } ErrCode WifiP2pServiceImpl::GetCurrentGroup(WifiP2pGroupInfo &group) diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.h index f91b36a..598b968 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.h @@ -161,10 +161,10 @@ public: /** * @Description Querying Wi-Fi P2P Connection Information * - * @param connInfo - Get the WifiP2pInfo msg + * @param linkedInfo - Get the WifiP2pLinkedInfo msg * @return ErrCode - operate result */ - ErrCode QueryP2pInfo(WifiP2pInfo &connInfo) override; + ErrCode QueryP2pLinkedInfo(WifiP2pLinkedInfo &linkedInfo) override; /** * @Description Get the Current Group object diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.cpp index 6e6dc52..764bce2 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.cpp @@ -49,7 +49,7 @@ void WifiP2pStub::InitHandleMap() handleFuncMap[WIFI_SVR_CMD_P2P_DELETE_GROUP] = &WifiP2pStub::OnDeleteGroup; handleFuncMap[WIFI_SVR_CMD_P2P_CONNECT] = &WifiP2pStub::OnP2pConnect; handleFuncMap[WIFI_SVR_CMD_P2P_DISCONNECT] = &WifiP2pStub::OnP2pDisConnect; - handleFuncMap[WIFI_SVR_CMD_P2P_QUERY_INFO] = &WifiP2pStub::OnQueryP2pInfo; + handleFuncMap[WIFI_SVR_CMD_P2P_QUERY_INFO] = &WifiP2pStub::OnQueryP2pLinkedInfo; handleFuncMap[WIFI_SVR_CMD_P2P_GET_CURRENT_GROUP] = &WifiP2pStub::OnGetCurrentGroup; handleFuncMap[WIFI_SVR_CMD_P2P_GET_ENABLE_STATUS] = &WifiP2pStub::OnGetP2pEnableStatus; handleFuncMap[WIFI_SVR_CMD_P2P_GET_DISCOVER_STATUS] = &WifiP2pStub::OnGetP2pDiscoverStatus; @@ -244,11 +244,11 @@ void WifiP2pStub::OnP2pDisConnect(uint32_t code, MessageParcel &data, MessagePar return; } -void WifiP2pStub::OnQueryP2pInfo(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) +void WifiP2pStub::OnQueryP2pLinkedInfo(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) { WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); - WifiP2pInfo config; - ErrCode ret = QueryP2pInfo(config); + WifiP2pLinkedInfo config; + ErrCode ret = QueryP2pLinkedInfo(config); reply.WriteInt32(0); reply.WriteInt32(ret); @@ -493,15 +493,10 @@ void WifiP2pStub::ReadWifiP2pConfigData(MessageParcel &data, WifiP2pConfig &conf { config.SetDeviceAddress(data.ReadCString()); config.SetPassphrase(data.ReadCString()); - config.SetNetworkName(data.ReadCString()); + config.SetGroupName(data.ReadCString()); config.SetGoBand(static_cast(data.ReadInt32())); config.SetNetId(data.ReadInt32()); config.SetGroupOwnerIntent(data.ReadInt32()); - WpsInfo wpsInfo; - wpsInfo.SetWpsMethod(static_cast(data.ReadInt32())); - wpsInfo.SetBssid(data.ReadCString()); - wpsInfo.SetPin(data.ReadCString()); - config.SetWpsInfo(wpsInfo); } sptr WifiP2pStub::GetCallback() const diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.h index 13c63fc..7eba7cd 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.h @@ -59,7 +59,7 @@ private: void OnDeleteGroup(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option); void OnP2pConnect(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option); void OnP2pDisConnect(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option); - void OnQueryP2pInfo(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option); + void OnQueryP2pLinkedInfo(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option); void OnGetCurrentGroup(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option); void OnGetP2pEnableStatus(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option); void OnGetP2pDiscoverStatus(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option); diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp index b4ff9f7..3eadcbe 100755 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp @@ -843,10 +843,10 @@ void ScanService::HandleStaStatusChanged(int status) void ScanService::HandleCustomStatusChanged(int customScene, int customSceneStatus) { - LOGI("Enter ScanService::HandleCustomStatusChanged."); + WIFI_LOGI("Enter ScanService::HandleCustomStatusChanged."); time_t now = time(nullptr); - LOGD("customScene:%d, status:%d", customScene, customSceneStatus); + WIFI_LOGD("customScene:%d, status:%d", customScene, customSceneStatus); if (customSceneStatus == STATE_OPEN) { customSceneTimeMap.insert(std::pair(customScene, now)); } @@ -927,7 +927,7 @@ void ScanService::StartSystemTimerScan(bool scanAtOnce) } if (scanAtOnce || (lastSystemScanTime == 0) || (sinceLastScan >= systemScanIntervalMode.scanIntervalMode.interval)) { - if (!Scan(false)) { + if (Scan(false) != WIFI_OPT_SUCCESS) { WIFI_LOGE("Scan failed."); } lastSystemScanTime = nowTime; @@ -965,7 +965,7 @@ void ScanService::HandleDisconnectedScanTimeout() return; } - if (!Scan(false)) { + if (Scan(false) != WIFI_OPT_SUCCESS) { WIFI_LOGE("Scan failed."); } pScanStateMachine->StartTimer(static_cast(DISCONNECTED_SCAN_TIMER), DISCONNECTED_SCAN_INTERVAL); diff --git a/services/wifi_standard/wifi_hal/etc/init/BUILD.gn b/services/wifi_standard/wifi_hal/etc/init/BUILD.gn index e2c07e8..dc0c717 100755 --- a/services/wifi_standard/wifi_hal/etc/init/BUILD.gn +++ b/services/wifi_standard/wifi_hal/etc/init/BUILD.gn @@ -15,9 +15,9 @@ import("//build/ohos.gni") group("etc") { deps = [ + ":hostapd.conf", ":wifi_hal_service.rc", ":wpa_supplicant.conf", - ":hostapd.conf" ] } @@ -44,4 +44,4 @@ ohos_prebuilt_etc("hostapd.conf") { relative_install_dir = "wifi" part_name = "wifi_standard" subsystem_name = "communication" -} \ No newline at end of file +} diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/BUILD.gn b/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/BUILD.gn index a35397f..91f42af 100644 --- a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/BUILD.gn +++ b/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/BUILD.gn @@ -26,6 +26,7 @@ config("module_private_config") { ohos_unittest("dhcp_server_unittest") { module_out_path = module_output_path + dhcp_hilog_enable = true sources = [ "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/address_utils.c", "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/common_util.c", @@ -37,6 +38,7 @@ ohos_unittest("dhcp_server_unittest") { "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_server.c", "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/hash_table.c", "address_utils_test.cpp", + "common_util_test.cpp", "dhcp_address_pool_test.cpp", "dhcp_argument_test.cpp", "dhcp_binding_test.cpp", @@ -67,19 +69,22 @@ ohos_unittest("dhcp_server_unittest") { ldflags = [ "-fPIC", + "-Wl,-E", "-Wl,--wrap=socket", - "-Wl,--wrap=recvfrom", - "-Wl,--wrap=sendto", - "-Wl,--wrap=bind", "-Wl,--wrap=setsockopt", "-Wl,--wrap=select", + "-Wl,--wrap=bind", "-Wl,--wrap=close", "--coverage", ] - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] configs = [ ":module_private_config" ] + if (dhcp_hilog_enable) { + external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + defines += [ "DHCP_HILOG_ENABLE" ] + } + part_name = "wifi_standard" subsystem_name = "communication" testonly = true diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/address_utils_test.cpp b/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/address_utils_test.cpp index 1e972b3..52c5970 100644 --- a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/address_utils_test.cpp +++ b/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/address_utils_test.cpp @@ -15,7 +15,6 @@ #include #include -#include "string_ex.h" #include "dhcp_define.h" #include "address_utils.h" @@ -98,6 +97,20 @@ HWTEST(AddressUtilsTest, LastIpAddressTest, TestSize.Level1) EXPECT_EQ(srcAddr, LastIpAddress(testIp, testNetmask)); } +HWTEST(AddressUtilsTest, FirstNetIpAddressTest, TestSize.Level1) +{ + uint8_t srcData[] = {192, 168, 100, 1}; + uint32_t srcAddr = ParseIp(srcData); + ASSERT_TRUE(srcAddr != 0); + uint32_t testIp = ParseIpAddr("192.168.100.100"); + ASSERT_TRUE(testIp != 0); + uint32_t testNetmask = ParseIp(netmask24); + EXPECT_TRUE(testNetmask != 0); + uint32_t network = NetworkAddress(testIp, testNetmask); + ASSERT_TRUE(network != 0); + EXPECT_EQ(srcAddr, FirstNetIpAddress(network)); +} + HWTEST(AddressUtilsTest, NextIpAddressTest, TestSize.Level1) { uint8_t srcData[] = {192, 168, 100, 100}; diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/common_util_test.cpp b/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/common_util_test.cpp new file mode 100644 index 0000000..c824332 --- /dev/null +++ b/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/common_util_test.cpp @@ -0,0 +1,87 @@ +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include "dhcp_define.h" +#include "common_util.h" + +using namespace testing::ext; +HWTEST(CommonUtilTest, LogTimeTest, TestSize.Level1) +{ + LogTime(); + uint64_t begin = Tmspsec(); + EXPECT_TRUE(begin > 0); + sleep(1); + uint64_t curr = Tmspsec(); + EXPECT_TRUE(curr > begin); + begin = Tmspusec(); + EXPECT_TRUE(begin > 0); + sleep(1); + curr = Tmspusec(); + EXPECT_TRUE(begin > 0); +} + +HWTEST(CommonUtilTest, LeftTirmTest, TestSize.Level1) +{ + char src1[] = " aabbccdd"; + LeftTrim(src1); + EXPECT_STREQ("aabbccdd", src1); +} + +HWTEST(CommonUtilTest, RightTrimTest, TestSize.Level1) +{ + char src1[] = "aabbccdd "; + RightTrim(src1); + EXPECT_STREQ("aabbccdd", src1); +} + +HWTEST(CommonUtilTest, TrimStringTest, TestSize.Level1) +{ + char src1[] = "aabbccdd "; + char src2[] = " aabbccdd"; + char src3[] = " aabbccdd "; + TrimString(src1); + TrimString(src2); + TrimString(src3); + EXPECT_STREQ("aabbccdd", src1); + EXPECT_STREQ("aabbccdd", src2); + EXPECT_STREQ("aabbccdd", src3); +} + +HWTEST(CommonUtilTest, GetFilePathTest, TestSize.Level1) +{ + const char *testPath = "/etc/dhcp/dhcp_server.conf"; + EXPECT_TRUE(GetFilePath(NULL) == NULL); + EXPECT_TRUE(GetFilePath("") == NULL); + EXPECT_STREQ("/etc/dhcp", GetFilePath(testPath)); +} + +HWTEST(CommonUtilTest, GetLeaseFileTest, TestSize.Level1) +{ + const char *leaseFile = "/etc/dhcp/dhcp_server.lease"; + const char *ifname = "test_if0"; + EXPECT_TRUE(GetLeaseFile(leaseFile, NULL) == NULL); + EXPECT_TRUE(GetLeaseFile(NULL, NULL) == NULL); + EXPECT_STREQ("/etc/dhcp/dhcp_server.lease.test_if0", GetLeaseFile(leaseFile, ifname)); +} + +HWTEST(CommonUtilTest, CreatePathTest, TestSize.Level1) +{ + const char *testPath = "./test/data/testpath"; + ASSERT_EQ(RET_FAILED, CreatePath(NULL)); + ASSERT_EQ(RET_FAILED, CreatePath("")); + ASSERT_EQ(RET_SUCCESS, CreatePath(testPath)); + EXPECT_EQ(0, remove(testPath)); +} \ No newline at end of file diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/dhcp_address_pool_test.cpp b/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/dhcp_address_pool_test.cpp index 8100e14..c1014d4 100644 --- a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/dhcp_address_pool_test.cpp +++ b/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/dhcp_address_pool_test.cpp @@ -16,7 +16,6 @@ #include #include #include -#include "string_ex.h" #include "dhcp_define.h" #include "dhcp_ipv4.h" #include "dhcp_message.h" @@ -24,6 +23,7 @@ #include "dhcp_address_pool.h" #include "address_utils.h" #include "common_util.h" +#include "securec.h" using namespace testing::ext; @@ -41,9 +41,39 @@ public: } virtual void TearDown() { + ResetPollConfig(); FreeAddressPool(&testPool); } + bool SamplePoolConfig() + { + uint32_t beginIp = ParseIpAddr("192.168.100.100"); + uint32_t endIp = ParseIpAddr("192.168.100.150"); + uint32_t netmask = ParseIpAddr("255.255.255.0"); + uint32_t gateway = ParseIpAddr("192.168.100.254"); + uint32_t serverId = ParseIpAddr("192.168.100.1"); + if (beginIp != 0 && endIp != 0 && netmask != 0 && gateway != 0) { + testPool.addressRange.beginAddress = beginIp; + testPool.addressRange.endAddress = endIp; + testPool.netmask = netmask; + testPool.gateway = gateway; + testPool.serverId = serverId; + testPool.leaseTime = DHCP_LEASE_TIME; + return true; + } + return false; + } + + void ResetPollConfig() + { + testPool.addressRange.beginAddress = 0; + testPool.addressRange.endAddress = 0; + testPool.netmask = 0; + testPool.gateway = 0; + testPool.serverId = 0; + testPool.leaseTime = 0; + } + public: DhcpAddressPool testPool; @@ -65,12 +95,72 @@ HWTEST_F(DhcpAddressPoolTest, AddBindingTest, TestSize.Level1) for (int i = 0; i < MAC_ADDR_LENGTH; ++i) { bind.chaddr[i] = testMac2[i]; } + + EXPECT_EQ(RET_ERROR, AddBinding(NULL)); EXPECT_EQ(RET_SUCCESS, AddBinding(&bind)); EXPECT_EQ(RET_FAILED, AddBinding(&bind)); + EXPECT_TRUE(memset_s(bind.chaddr, sizeof(bind.chaddr), 0, sizeof(bind.chaddr)) == EOK); EXPECT_EQ(RET_SUCCESS, RemoveBinding(testMac1)); EXPECT_EQ(RET_SUCCESS, RemoveBinding(testMac2)); } +HWTEST_F(DhcpAddressPoolTest, AddNewBindingTest, TestSize.Level1) +{ + uint8_t testMac1[DHCP_HWADDR_LENGTH] = {0x00, 0x0e, 0x3c, 0x65, 0x3a, 0x09, 0}; + ASSERT_TRUE(testPool.newBinding != NULL); + ASSERT_TRUE(testPool.newBinding(testMac1, NULL) != NULL); + EXPECT_EQ(RET_SUCCESS, RemoveBinding(testMac1)); +} + +HWTEST_F(DhcpAddressPoolTest, FindBindingByIpTest, TestSize.Level1) +{ + AddressBinding bind = {0}; + uint8_t testMac1[DHCP_HWADDR_LENGTH] = {0x00, 0x0e, 0x3c, 0x65, 0x3a, 0x09, 0}; + uint8_t testMac2[DHCP_HWADDR_LENGTH] = {0x00, 0x0e, 0x3c, 0x65, 0x3a, 0x0a, 0}; + uint32_t testIp1 = ParseIpAddr("192.168.100.1"); + uint32_t testIp2 = ParseIpAddr("192.168.100.2"); + bind.ipAddress = testIp1; + for (int i = 0; i < MAC_ADDR_LENGTH; ++i) { + bind.chaddr[i] = testMac1[i]; + } + EXPECT_EQ(RET_SUCCESS, AddBinding(&bind)); + bind.ipAddress = testIp2; + for (int i = 0; i < MAC_ADDR_LENGTH; ++i) { + bind.chaddr[i] = testMac2[i]; + } + EXPECT_EQ(RET_SUCCESS, AddBinding(&bind)); + EXPECT_EQ(RET_FAILED, AddBinding(&bind)); + + AddressBinding *pBind1 = FindBindingByIp(testIp1); + AddressBinding *pBind2 = FindBindingByIp(testIp2); + EXPECT_TRUE(pBind1 != NULL); + EXPECT_TRUE(pBind2 != NULL); + if (pBind1 != NULL) { + EXPECT_EQ(testIp1, pBind1->ipAddress); + } + EXPECT_EQ(RET_SUCCESS, RemoveBinding(testMac1)); + EXPECT_EQ(RET_SUCCESS, RemoveBinding(testMac2)); +} + +HWTEST_F(DhcpAddressPoolTest, AddressDistributeTest, TestSize.Level1) +{ + uint8_t testMac1[DHCP_HWADDR_LENGTH] = {0x01, 0x0e, 0x3c, 0x65, 0x3a, 0x09, 0}; + uint8_t testMac2[DHCP_HWADDR_LENGTH] = {0x01, 0x0e, 0x3c, 0x65, 0x3a, 0x0a, 0}; + uint8_t testMac3[DHCP_HWADDR_LENGTH] = {0x01, 0x0e, 0x3c, 0x65, 0x3a, 0x09, 0}; + + EXPECT_TRUE(testPool.distribue(NULL, testMac1) == 0); + EXPECT_TRUE(testPool.distribue(&testPool, testMac1) == 0); + ASSERT_TRUE(SamplePoolConfig()); + SetDistributeMode(0); + EXPECT_EQ(0, GetDistributeMode()); + uint32_t assertAddr = ParseIpAddr("192.168.100.101"); + EXPECT_EQ(assertAddr, testPool.distribue(&testPool, testMac1)); + assertAddr = ParseIpAddr("192.168.100.102"); + EXPECT_EQ(assertAddr, testPool.distribue(&testPool, testMac2)); + assertAddr = ParseIpAddr("192.168.100.103"); + EXPECT_EQ(assertAddr, testPool.distribue(&testPool, testMac3)); +} + HWTEST_F(DhcpAddressPoolTest, IsReservedTest, TestSize.Level1) { AddressBinding bind = {0}; @@ -91,6 +181,7 @@ HWTEST_F(DhcpAddressPoolTest, IsReservedTest, TestSize.Level1) bind.chaddr[i] = testMac2[i]; } EXPECT_EQ(RET_SUCCESS, AddReservedBinding(testMac2)); + EXPECT_EQ(RET_SUCCESS, AddReservedBinding(testMac2)); EXPECT_EQ(RET_FAILED, AddBinding(&bind)); EXPECT_EQ(0, IsReserved(testMac1)); EXPECT_EQ(1, IsReserved(testMac2)); @@ -126,6 +217,8 @@ HWTEST_F(DhcpAddressPoolTest, IsReservedIpTest, TestSize.Level1) EXPECT_EQ(RET_SUCCESS, AddLease(&testPool, &bind)); EXPECT_EQ(0, IsReservedIp(&testPool, testIp1)); EXPECT_EQ(1, IsReservedIp(&testPool, testIp2)); + EXPECT_EQ(DHCP_FALSE, IsReservedIp(NULL, testIp1)); + EXPECT_EQ(DHCP_FALSE, IsReservedIp(&testPool, 0)); bind.ipAddress = testIp1; EXPECT_EQ(RET_SUCCESS, RemoveLease(&testPool, &bind)); bind.ipAddress = testIp2; @@ -138,6 +231,7 @@ HWTEST_F(DhcpAddressPoolTest, RemoveReservedBindingTest, TestSize.Level1) uint8_t testMac1[DHCP_HWADDR_LENGTH] = {0x00, 0x01, 0x3c, 0x65, 0x3a, 0x09, 0}; uint8_t testMac2[DHCP_HWADDR_LENGTH] = {0x00, 0x02, 0x3c, 0x65, 0x3a, 0x0a, 0}; uint8_t testMac3[DHCP_HWADDR_LENGTH] = {0x00, 0x03, 0x3c, 0x65, 0x3a, 0x0b, 0}; + uint8_t testMac4[DHCP_HWADDR_LENGTH] = {0x00, 0x03, 0x3c, 0x65, 0x3a, 0x0c, 0}; uint32_t testIp1 = ParseIpAddr("192.168.100.1"); EXPECT_TRUE(testIp1 != 0); uint32_t testIp2 = ParseIpAddr("192.168.100.2"); @@ -158,7 +252,9 @@ HWTEST_F(DhcpAddressPoolTest, RemoveReservedBindingTest, TestSize.Level1) AddressBinding *binding = QueryBinding(testMac2, NULL); ASSERT_TRUE(binding != NULL); EXPECT_EQ(RET_SUCCESS, RemoveReservedBinding(testMac2)); + EXPECT_EQ(RET_FAILED, RemoveReservedBinding(testMac2)); EXPECT_EQ(RET_FAILED, RemoveReservedBinding(testMac3)); + EXPECT_EQ(RET_FAILED, RemoveReservedBinding(testMac4)); } HWTEST_F(DhcpAddressPoolTest, ReleaseBindingTest, TestSize.Level1) @@ -193,8 +289,8 @@ HWTEST_F(DhcpAddressPoolTest, AddLeaseTest, TestSize.Level1) AddressBinding lease = {0}; lease.bindingMode = BIND_MODE_DYNAMIC; lease.bindingStatus = BIND_ASSOCIATED; - uint8_t testMac1[DHCP_HWADDR_LENGTH] = {0x00, 0x0e, 0x3c, 0x65, 0x3a, 0x09, 0}; - uint8_t testMac2[DHCP_HWADDR_LENGTH] = {0x00, 0x0e, 0x3d, 0x65, 0x3a, 0x09, 0}; + uint8_t testMac1[DHCP_HWADDR_LENGTH] = {0x01, 0x0e, 0x3c, 0x65, 0x3a, 0x09, 0}; + uint8_t testMac2[DHCP_HWADDR_LENGTH] = {0x01, 0x0e, 0x3d, 0x65, 0x3a, 0x0a, 0}; uint32_t testIp1 = ParseIpAddr("192.168.100.101"); ASSERT_TRUE(testIp1 != 0); lease.ipAddress = testIp1; @@ -208,6 +304,8 @@ HWTEST_F(DhcpAddressPoolTest, AddLeaseTest, TestSize.Level1) for (int i = 0; i < MAC_ADDR_LENGTH; ++i) { lease.chaddr[i] = testMac2[i]; } + EXPECT_EQ(RET_ERROR, AddLease(NULL, &lease)); + EXPECT_EQ(RET_ERROR, AddLease(&testPool, NULL)); EXPECT_EQ(RET_SUCCESS, AddLease(&testPool, &lease)); EXPECT_EQ(RET_SUCCESS, RemoveLease(&testPool, &lease)); } @@ -217,9 +315,11 @@ HWTEST_F(DhcpAddressPoolTest, GetLeaseTest, TestSize.Level1) AddressBinding lease = {0}; lease.bindingMode = BIND_MODE_DYNAMIC; lease.bindingStatus = BIND_ASSOCIATED; - uint8_t testMac1[DHCP_HWADDR_LENGTH] = {0x00, 0x0e, 0x3c, 0x65, 0x3a, 0x09, 0}; + uint8_t testMac1[DHCP_HWADDR_LENGTH] = {0x01, 0x0e, 0x3c, 0x65, 0x3a, 0x09, 0}; uint32_t testIp1 = ParseIpAddr("192.168.100.101"); + uint32_t testIp2 = ParseIpAddr("192.168.100.110"); ASSERT_TRUE(testIp1 != 0); + ASSERT_TRUE(testIp2 != 0); lease.ipAddress = testIp1; lease.leaseTime = DHCP_LEASE_TIME; lease.pendingTime = 1631240659; @@ -229,6 +329,9 @@ HWTEST_F(DhcpAddressPoolTest, GetLeaseTest, TestSize.Level1) } EXPECT_EQ(RET_SUCCESS, AddLease(&testPool, &lease)); EXPECT_EQ(RET_SUCCESS, AddLease(&testPool, &lease)); + EXPECT_EQ(NULL, GetLease(&testPool, 0)); + EXPECT_EQ(NULL, GetLease(NULL, testIp1)); + EXPECT_EQ(NULL, GetLease(&testPool, testIp2)); AddressBinding *leaseRec = GetLease(&testPool, testIp1); ASSERT_TRUE(leaseRec != NULL); EXPECT_EQ(lease.ipAddress, leaseRec->ipAddress); @@ -243,9 +346,11 @@ HWTEST_F(DhcpAddressPoolTest, UpdateLeaseTest, TestSize.Level1) AddressBinding lease = {0}; lease.bindingMode = BIND_MODE_DYNAMIC; lease.bindingStatus = BIND_ASSOCIATED; - uint8_t testMac1[DHCP_HWADDR_LENGTH] = {0x00, 0x0e, 0x3c, 0x65, 0x3a, 0x09, 0}; + uint8_t testMac1[DHCP_HWADDR_LENGTH] = {0x01, 0x0e, 0x3c, 0x65, 0x3a, 0x09, 0}; uint32_t testIp1 = ParseIpAddr("192.168.100.101"); + uint32_t testIp2 = ParseIpAddr("192.168.100.110"); ASSERT_TRUE(testIp1 != 0); + ASSERT_TRUE(testIp2 != 0); lease.ipAddress = testIp1; lease.leaseTime = DHCP_LEASE_TIME; lease.pendingTime = 1631240659; @@ -265,6 +370,11 @@ HWTEST_F(DhcpAddressPoolTest, UpdateLeaseTest, TestSize.Level1) EXPECT_EQ(RET_SUCCESS, UpdateLease(&testPool, &lease)); EXPECT_EQ(lease.leaseTime, leaseRec->leaseTime); EXPECT_EQ(lease.leaseTime, leaseRec->leaseTime); + EXPECT_EQ(RET_ERROR, UpdateLease(NULL, &lease)); + EXPECT_EQ(RET_ERROR, UpdateLease(&testPool, NULL)); + lease.ipAddress = testIp2; + EXPECT_EQ(RET_FAILED, UpdateLease(&testPool, &lease)); + lease.ipAddress = testIp1; EXPECT_EQ(RET_SUCCESS, RemoveLease(&testPool, &lease)); } @@ -284,9 +394,9 @@ HWTEST_F(DhcpAddressPoolTest, LoadBindingRecodersTest, TestSize.Level1) lease.pendingTime = 1631260680; lease.bindingTime = 1631260680; - uint8_t testMac1[DHCP_HWADDR_LENGTH] = {0x00, 0x0e, 0x3c, 0x65, 0x3a, 0x09, 0}; - uint8_t testMac2[DHCP_HWADDR_LENGTH] = {0x00, 0x0e, 0x3c, 0x65, 0x3a, 0x0a, 0}; - uint8_t testMac3[DHCP_HWADDR_LENGTH] = {0x00, 0x0e, 0x3c, 0x65, 0x3a, 0x0b, 0}; + uint8_t testMac1[DHCP_HWADDR_LENGTH] = {0x01, 0x0e, 0x3c, 0x65, 0x3a, 0x09, 0}; + uint8_t testMac2[DHCP_HWADDR_LENGTH] = {0x01, 0x0e, 0x3c, 0x65, 0x3a, 0x0a, 0}; + uint8_t testMac3[DHCP_HWADDR_LENGTH] = {0x01, 0x0e, 0x3c, 0x65, 0x3a, 0x0b, 0}; lease.ipAddress = testIp1; for (int i = 0; i < MAC_ADDR_LENGTH; ++i) { lease.chaddr[i] = testMac1[i]; @@ -306,25 +416,111 @@ HWTEST_F(DhcpAddressPoolTest, LoadBindingRecodersTest, TestSize.Level1) EXPECT_EQ(RET_SUCCESS, SaveBindingRecoders(&testPool, 1)); EXPECT_EQ(HASH_SUCCESS, ClearAll(&testPool.leaseTable)); EXPECT_TRUE(testPool.leaseTable.size == 0); + EXPECT_EQ(RET_FAILED, LoadBindingRecoders(NULL)); EXPECT_EQ(RET_SUCCESS, LoadBindingRecoders(&testPool)); EXPECT_TRUE(testPool.leaseTable.size == 3); EXPECT_TRUE(GetLease(&testPool, testIp1) != NULL); EXPECT_TRUE(GetLease(&testPool, testIp2) != NULL); EXPECT_TRUE(GetLease(&testPool, testIp3) != NULL); + EXPECT_EQ(HASH_SUCCESS, ClearAll(&testPool.leaseTable)); } -HWTEST_F(DhcpAddressPoolTest, GetBindingByMacTest, TestSize.Level1) + +extern "C" int CheckRangeAvailability( + DhcpAddressPool *pool, uint8_t macAddr[DHCP_HWADDR_LENGTH], uint32_t distIp, int *outOfRange); + +HWTEST_F(DhcpAddressPoolTest, CheckRangeAvailabilityTest, TestSize.Level1) +{ + uint8_t testMac1[DHCP_HWADDR_LENGTH] = {0x01, 0x0e, 0x3c, 0x65, 0x3a, 0x09, 0}; + uint8_t testMac2[DHCP_HWADDR_LENGTH] = {0x01, 0x0e, 0x3c, 0x65, 0x3a, 0x0a, 0}; + uint8_t testMac3[DHCP_HWADDR_LENGTH] = {0x01, 0x0e, 0x3c, 0x65, 0x3b, 0x0b, 0}; + uint8_t testMac4[DHCP_HWADDR_LENGTH] = {0}; + + uint32_t testIp1 = ParseIpAddr("192.168.100.101"); + uint32_t testIp2 = ParseIpAddr("192.168.100.102"); + uint32_t testIp3 = ParseIpAddr("192.168.100.3"); + + int outOfRange = 0; + EXPECT_EQ(RET_ERROR, CheckRangeAvailability(NULL, testMac1, testIp1, &outOfRange)); + EXPECT_EQ(RET_ERROR, CheckRangeAvailability(&testPool, testMac1, testIp1, &outOfRange)); + EXPECT_TRUE(SamplePoolConfig()); + EXPECT_EQ(RET_ERROR, CheckRangeAvailability(&testPool, testMac4, testIp1, &outOfRange)); + EXPECT_EQ(0, outOfRange); + EXPECT_EQ(RET_SUCCESS, CheckRangeAvailability(&testPool, testMac1, testIp1, &outOfRange)); + EXPECT_EQ(0, outOfRange); + EXPECT_EQ(RET_SUCCESS, CheckRangeAvailability(&testPool, testMac2, testIp2, &outOfRange)); + EXPECT_EQ(0, outOfRange); + EXPECT_EQ(RET_FAILED, CheckRangeAvailability(&testPool, testMac3, testIp3, &outOfRange)); + EXPECT_EQ(1, outOfRange); + + + +} + +extern "C" int CheckIpAvailability(DhcpAddressPool *pool, uint8_t macAddr[DHCP_HWADDR_LENGTH], uint32_t distIp); +HWTEST_F(DhcpAddressPoolTest, CheckIpAvailabilityTest, TestSize.Level1) { AddressBinding lease = {0}; + lease.bindingMode = BIND_MODE_DYNAMIC; + lease.bindingStatus = BIND_ASSOCIATED; + uint8_t testMac1[DHCP_HWADDR_LENGTH] = {0x0d, 0x0a, 0x3c, 0x65, 0x3a, 0x09, 0}; + uint8_t testMac2[DHCP_HWADDR_LENGTH] = {0x0d, 0x0a, 0x3d, 0x65, 0x3a, 0x0a, 0}; + uint8_t testMac3[DHCP_HWADDR_LENGTH] = {0x0d, 0x0a, 0x3d, 0x65, 0x3a, 0x0b, 0}; uint32_t testIp1 = ParseIpAddr("192.168.100.101"); + uint32_t testIp2 = ParseIpAddr("192.168.100.102"); + uint32_t testIp3 = ParseIpAddr("192.168.150.103"); ASSERT_TRUE(testIp1 != 0); + ASSERT_TRUE(testIp2 != 0); + ASSERT_TRUE(testIp3 != 0); + lease.ipAddress = testIp1; + lease.leaseTime = DHCP_LEASE_TIME; + lease.pendingTime = 1631240659; + lease.bindingTime = 1631240659; + for (int i = 0; i < MAC_ADDR_LENGTH; ++i) { + lease.chaddr[i] = testMac1[i]; + } + lease.bindingMode = BIND_MODE_DYNAMIC; + lease.bindingStatus = BIND_ASSOCIATED; + EXPECT_EQ(RET_SUCCESS, AddBinding(&lease)); + ASSERT_EQ(RET_SUCCESS, AddLease(&testPool, &lease)); + EXPECT_EQ(DHCP_TRUE, CheckIpAvailability(&testPool, testMac1, testIp1)); + AddressBinding *pLease = GetLease(&testPool, testIp1); + ASSERT_TRUE(pLease != NULL); + pLease->bindingMode = BIND_MODE_STATIC; + EXPECT_EQ(DHCP_FALSE, CheckIpAvailability(&testPool, testMac2, testIp1)); + pLease->bindingMode = BIND_MODE_DYNAMIC; + + for (int i = 0; i < MAC_ADDR_LENGTH; ++i) { + lease.chaddr[i] = testMac2[i]; + } + lease.ipAddress = testIp2; + lease.bindingMode = BIND_MODE_RESERVED; + EXPECT_EQ(RET_SUCCESS, AddBinding(&lease)); + EXPECT_EQ(RET_SUCCESS, AddLease(&testPool, &lease)); + EXPECT_EQ(DHCP_FALSE, CheckIpAvailability(&testPool, testMac2, testIp2)); + + EXPECT_TRUE(SamplePoolConfig()); + EXPECT_EQ(DHCP_FALSE, CheckIpAvailability(NULL, testMac1, testIp1)); + EXPECT_EQ(DHCP_FALSE, CheckIpAvailability(&testPool, testMac3, testIp1)); + + pLease->pendingTime = Tmspsec() - DHCP_LEASE_TIME - 2600; + pLease->bindingTime = pLease->pendingTime; + EXPECT_EQ(DHCP_TRUE, CheckIpAvailability(&testPool, testMac3, testIp1)); +} + +extern "C" AddressBinding *GetBindingByMac(HashTable *bindTable, uint8_t macAddr[DHCP_HWADDR_LENGTH]); + +HWTEST_F(DhcpAddressPoolTest, GetBindingByMacTest, TestSize.Level1) +{ + AddressBinding lease = {0}; + uint32_t testIp1 = ParseIpAddr("192.168.100.101"); + ASSERT_TRUE(testIp1 != 0); lease.bindingMode = BIND_MODE_DYNAMIC; lease.bindingStatus = BIND_ASSOCIATED; lease.pendingTime = 1631260680; lease.bindingTime = 1631260680; - uint8_t testMac1[DHCP_HWADDR_LENGTH] = {0x00, 0x0e, 0x3c, 0x65, 0x3a, 0x09, 0}; - + uint8_t testMac1[DHCP_HWADDR_LENGTH] = {0x01, 0x0e, 0x3c, 0x65, 0x3a, 0x09, 0}; lease.ipAddress = testIp1; for (int i = 0; i < MAC_ADDR_LENGTH; ++i) { lease.chaddr[i] = testMac1[i]; @@ -332,9 +528,79 @@ HWTEST_F(DhcpAddressPoolTest, GetBindingByMacTest, TestSize.Level1) ASSERT_EQ(RET_SUCCESS, AddBinding(&lease)); AddressBinding *binding = QueryBinding(testMac1, 0); ASSERT_TRUE(binding != NULL); + HashTable tempTable = {0}; + EXPECT_TRUE(GetBindingByMac(NULL, testMac1) == NULL); + EXPECT_TRUE(GetBindingByMac(&tempTable, testMac1) == NULL); EXPECT_EQ(lease.ipAddress, binding->ipAddress); EXPECT_EQ(lease.leaseTime, binding->leaseTime); EXPECT_EQ(lease.bindingMode, binding->bindingMode); EXPECT_EQ(lease.bindingStatus, binding->bindingStatus); + EXPECT_EQ(RET_SUCCESS, RemoveBinding(testMac1)); } +HWTEST_F(DhcpAddressPoolTest, GetBindingByIpTest, TestSize.Level1) +{ + AddressBinding lease = {0}; + uint32_t testIp1 = ParseIpAddr("192.168.100.101"); + ASSERT_TRUE(testIp1 != 0); + lease.bindingMode = BIND_MODE_DYNAMIC; + lease.bindingStatus = BIND_ASSOCIATED; + lease.pendingTime = 1631260680; + lease.bindingTime = 1631260680; + uint8_t testMac1[DHCP_HWADDR_LENGTH] = {0x01, 0x0e, 0x3c, 0x65, 0x3a, 0x09, 0}; + lease.ipAddress = testIp1; + for (int i = 0; i < MAC_ADDR_LENGTH; ++i) { + lease.chaddr[i] = testMac1[i]; + } + ASSERT_EQ(RET_SUCCESS, AddLease(&testPool, &lease)); + + HashTable tempTable = {0}; + EXPECT_TRUE(GetBindingByIp(NULL, testIp1) == NULL); + EXPECT_TRUE(GetBindingByIp(&tempTable, testIp1) == NULL); + AddressBinding *pLease = GetLease(&testPool, testIp1); + ASSERT_TRUE(pLease != NULL); + EXPECT_EQ(lease.ipAddress, pLease->ipAddress); + EXPECT_EQ(lease.leaseTime, pLease->leaseTime); + EXPECT_EQ(lease.bindingMode, pLease->bindingMode); + EXPECT_EQ(lease.bindingStatus, pLease->bindingStatus); +} + +HWTEST_F(DhcpAddressPoolTest, InitAddressPoolTest, TestSize.Level1) +{ + DhcpAddressPool tempPool; + ASSERT_TRUE(memset_s(&tempPool, sizeof(DhcpAddressPool), 0, sizeof(DhcpAddressPool)) == EOK); + tempPool.fixedOptions.size = 100; + EXPECT_EQ(RET_ERROR, InitAddressPool(NULL, "test_if2", NULL)); + EXPECT_EQ(RET_SUCCESS, InitAddressPool(&tempPool, "test_if2", NULL)); + FreeAddressPool(NULL); + FreeAddressPool(&tempPool); +} + +extern "C" uint32_t NextIpOffset(uint32_t netmask); +HWTEST_F(DhcpAddressPoolTest, NextIpOffsetTest, TestSize.Level1) +{ + uint32_t netmask = ParseIpAddr("255.255.255.0"); + ASSERT_TRUE(netmask != 0); + SetDistributeMode(0); + EXPECT_TRUE(NextIpOffset(netmask) == 0); + SetDistributeMode(1); + usleep(10); + uint32_t nextOffset = NextIpOffset(netmask); + EXPECT_TRUE(nextOffset >= 0); + SetDistributeMode(0); +} + +HWTEST_F(DhcpAddressPoolTest, RemoveLeaseFailedTest, TestSize.Level1) +{ + AddressBinding lease = {0}; + uint32_t testIp1 = ParseIpAddr("192.168.100.110"); + ASSERT_TRUE(testIp1 != 0); + uint8_t testMac1[DHCP_HWADDR_LENGTH] = {0x00, 0x0e, 0x3c, 0x65, 0x3a, 0x09, 0}; + lease.ipAddress = testIp1; + for (int i = 0; i < MAC_ADDR_LENGTH; ++i) { + lease.chaddr[i] = testMac1[i]; + } + EXPECT_EQ(RET_ERROR, RemoveLease(NULL, &lease)); + EXPECT_EQ(RET_ERROR, RemoveLease(&testPool, NULL)); + EXPECT_EQ(RET_FAILED, RemoveLease(&testPool, &lease)); +} \ No newline at end of file diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/dhcp_argument_test.cpp b/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/dhcp_argument_test.cpp index 06c1d6b..8a1e963 100644 --- a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/dhcp_argument_test.cpp +++ b/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/dhcp_argument_test.cpp @@ -23,6 +23,7 @@ using namespace testing::ext; + HWTEST(DhcpArgumentTest, InitArgumentsTest, TestSize.Level1) { EXPECT_TRUE(InitArguments() == RET_SUCCESS); @@ -30,13 +31,20 @@ HWTEST(DhcpArgumentTest, InitArgumentsTest, TestSize.Level1) HWTEST(DhcpArgumentTest, ParseArgumentsTest, TestSize.Level1) { + PrintRequiredArguments(); + ShowHelp(2); char *argv[ARGUMENT_VALUE_SIZE] = { const_cast(""), const_cast("--dns=192.168.1.1,192.168.1.2"), - const_cast("--ifname=eth0") + const_cast("--ifname=eth0"), + const_cast("--gateway=192.168.1.1"), + const_cast("--pool=192.168.1.100,192.168.1.150"), + const_cast("--version"), + const_cast("--help"), + const_cast("--unknown"), }; - EXPECT_TRUE(ParseArguments(3, argv) == RET_SUCCESS); + EXPECT_TRUE(ParseArguments(8, argv) == RET_SUCCESS); ArgumentInfo *arg = GetArgument("dns"); EXPECT_TRUE(arg); EXPECT_EQ(strncmp(arg->name, "dns", strlen("dns")), 0); @@ -59,6 +67,11 @@ HWTEST(DhcpArgumentTest, PutArgumentTest, TestSize.Level1) val = "nothing"; EXPECT_TRUE(PutArgument(argu, val) == RET_SUCCESS); EXPECT_TRUE(PutArgument(argu, val) == RET_FAILED); + argu = "longlongvalue"; + val = "verylongvalueverylongvalueverylongvalueverylongvalueverylongvalueverylongvalueverylongvalueverylongvaluevery" + "longvalueverylongvalueverylongvalueverylongvalueverylongvalueverylongvalueverylongvalueverylongvalueverylongvaluev" + "erylongvalueverylongvalueverylongvalueverylongvalue"; + EXPECT_TRUE(PutArgument(argu, val) == RET_ERROR); } HWTEST(DhcpArgumentTest, GetArgumentTest, TestSize.Level1) @@ -80,4 +93,5 @@ HWTEST(DhcpArgumentTest, HasArgumentTest, TestSize.Level1) EXPECT_TRUE(HasArgument(name) == 0); name = "lease"; EXPECT_TRUE(HasArgument(name) == 1); + FreeArguments(); } diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/dhcp_message_sim.cpp b/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/dhcp_message_sim.cpp index 9717cfc..330805f 100644 --- a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/dhcp_message_sim.cpp +++ b/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/dhcp_message_sim.cpp @@ -26,6 +26,7 @@ #include "dhcp_ipv4.h" #include "address_utils.h" #include "securec.h" +#include "common_util.h" #define OPT_MESSAGE_TYPE_LEGTH 1 #define OPT_HEADER_LENGTH 2 @@ -75,11 +76,27 @@ int DhcpMsgManager::RecvTotal() return total; } +bool DhcpMsgManager::FrontSendMsg(DhcpMessage *msg) +{ + int retval = false; + if (!msg) { + return retval; + } + m_sendQueueLocker.lock(); + if (!m_sendMessages.empty()) { + DhcpMessage fmsg = m_sendMessages.front(); + if (memcpy_s(msg, sizeof(DhcpMessage), &fmsg, sizeof(DhcpMessage)) == EOK) { + retval = true; + } + } + m_sendQueueLocker.unlock(); + return retval; +} void DhcpMsgManager::PopSendMsg() { m_sendQueueLocker.lock(); - if (!m_sendMessages.empty()) { + if (m_sendMessages.size() > 0) { m_sendMessages.pop(); } m_sendQueueLocker.unlock(); @@ -110,6 +127,15 @@ int DhcpMsgManager::PushRecvMsg(const DhcpMessage &msg) return 1; } +void DhcpMsgManager::SetClientIp(uint32_t ipAddr) +{ + m_clientIpAddress = ipAddr; +} +uint32_t DhcpMsgManager::GetClientIp() const +{ + return m_clientIpAddress; +} + struct DhcpClientContext { int clientFd; @@ -197,11 +223,11 @@ DhcpClientContext *InitialDhcpClient(DhcpClientConfig *config) return context; } -static int ParseDhcpOptions(PDhcpMsgInfo msg) +int ParseDhcpOptions(PDhcpMsgInfo msg) { int ret; PDhcpOptionNode pNode = msg->options.first->next; - DhcpOption endOpt = {END_OPTION, 0}; + DhcpOption endOpt = {END_OPTION, 0, {0}}; PushBackOption(&msg->options, &endOpt); int replyOptsLength = 0; uint8_t *current = msg->packet.options, olen = MAGIC_COOKIE_LENGTH; @@ -240,7 +266,6 @@ static int ParseDhcpOptions(PDhcpMsgInfo msg) return ret; } - int SendDhcpMessage(DhcpClientContext *ctx, PDhcpMsgInfo msg) { if (!ctx || !msg) { @@ -264,7 +289,7 @@ static uint32_t GetXid(int update) return currXid; } -static int InitMessage(DhcpClientContext *ctx, PDhcpMsgInfo msg, uint8_t msgType) +int InitMessage(DhcpClientContext *ctx, PDhcpMsgInfo msg, uint8_t msgType) { LOGD("init dhcp message..."); if (!ctx) { @@ -294,9 +319,21 @@ static int InitMessage(DhcpClientContext *ctx, PDhcpMsgInfo msg, uint8_t msgType } else { msg->packet.xid = GetXid(DHCP_FALSE); } + + if (DhcpMsgManager::GetInstance().GetClientIp() != 0) { + DhcpOption optReqIp = {REQUESTED_IP_ADDRESS_OPTION, 0, {0}}; + AppendAddressOption(&optReqIp, DhcpMsgManager::GetInstance().GetClientIp()); + PushFrontOption(&msg->options, &optReqIp); + } + DhcpOption optMsgType = {DHCP_MESSAGE_TYPE_OPTION, OPT_MESSAGE_TYPE_LEGTH, {msgType, 0}}; PushFrontOption(&msg->options, &optMsgType); + PDhcpOption pEndOpt = GetOption(&msg->options, END_OPTION); + if (pEndOpt == NULL) { + DhcpOption endOpt = {END_OPTION, 0, {0}}; + PushBackOption(&msg->options, &endOpt); + } return DHCP_TRUE; } diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/dhcp_message_sim.h b/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/dhcp_message_sim.h index 1335bad..030b1c5 100644 --- a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/dhcp_message_sim.h +++ b/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/dhcp_message_sim.h @@ -15,6 +15,7 @@ #include #include +#include "dhcp_define.h" #include "dhcp_message.h" #ifndef OHOS_DHCP_MESSAGE_SIM_H @@ -40,7 +41,12 @@ public: int PushRecvMsg(const DhcpMessage &msg); void PopSendMsg(); + + bool FrontSendMsg(DhcpMessage *msg); void PopRecvMsg(); + + void SetClientIp(uint32_t ipAddr); + uint32_t GetClientIp() const; private: DhcpMsgManager(){}; ~DhcpMsgManager(){}; @@ -49,6 +55,7 @@ private: std::queue m_recvMessages; std::mutex m_sendQueueLocker; std::queue m_sendMessages; + uint32_t m_clientIpAddress = 0; }; } // namespace Wifi } // namespace OHOS @@ -69,7 +76,7 @@ DhcpClientContext *InitialDhcpClient(DhcpClientConfig *config); int *StatrDhcpClient(DhcpClientContext *config); -int SendDhcpMessage(DhcpClientContext *ctx, PDhcpMsgInfo *msg); +int SendDhcpMessage(DhcpClientContext *ctx, PDhcpMsgInfo msg); int DhcpDiscover(DhcpClientContext *ctx); @@ -86,6 +93,9 @@ int StopDhcpClient(DhcpClientContext *ctx); int GetDhcpClinetState(DhcpClientContext *ctx); int FreeDhcpClient(DhcpClientContext *ctx); +int InitMessage(DhcpClientContext *ctx, PDhcpMsgInfo msg, uint8_t msgType); int FillHwAddr(uint8_t *dst, size_t dsize, uint8_t *src, size_t ssize); +int ParseDhcpOptions(PDhcpMsgInfo msg); +int ParseReceivedOptions(PDhcpMsgInfo msg); #endif \ No newline at end of file diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/dhcp_option_test.cpp b/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/dhcp_option_test.cpp index 28cc6bc..bb0aec7 100644 --- a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/dhcp_option_test.cpp +++ b/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/dhcp_option_test.cpp @@ -16,7 +16,6 @@ #include #include #include -#include "string_ex.h" #include "dhcp_define.h" #include "dhcp_ipv4.h" #include "dhcp_message.h" @@ -47,7 +46,7 @@ public: HWTEST_F(DhcpOptionTest, InitOptionListTest, TestSize.Level1) { - DhcpOptionList testOpts; + DhcpOptionList testOpts = {0}; EXPECT_EQ(RET_SUCCESS, InitOptionList(&testOpts)); FreeOptionList(&testOpts); EXPECT_EQ(RET_SUCCESS, InitOptionList(&options)); @@ -56,8 +55,11 @@ HWTEST_F(DhcpOptionTest, InitOptionListTest, TestSize.Level1) HWTEST_F(DhcpOptionTest, HasInitializedTest, TestSize.Level1) { DhcpOptionList testOpts = {0}; + EXPECT_EQ(0, HasInitialized(NULL)); EXPECT_EQ(0, HasInitialized(&testOpts)); - EXPECT_EQ(1, HasInitialized(&options)); + ASSERT_EQ(RET_SUCCESS, InitOptionList(&testOpts)); + EXPECT_EQ(1, HasInitialized(&testOpts)); + FreeOptionList(&testOpts); } HWTEST_F(DhcpOptionTest, PushBackOptionTest, TestSize.Level1) @@ -66,6 +68,8 @@ HWTEST_F(DhcpOptionTest, PushBackOptionTest, TestSize.Level1) EXPECT_EQ(RET_SUCCESS, PushBackOption(&options, &optRouter)); DhcpOption optMsgType = {DHCP_MESSAGE_TYPE_OPTION, 1, {DHCPOFFER, 0}}; + EXPECT_EQ(RET_ERROR, PushBackOption(NULL, &optMsgType)); + EXPECT_EQ(RET_ERROR, PushBackOption(&options, NULL)); EXPECT_EQ(RET_SUCCESS, PushBackOption(&options, &optMsgType)); EXPECT_TRUE(options.size == 2); ClearOptions(&options); @@ -78,6 +82,8 @@ HWTEST_F(DhcpOptionTest, PushFrontOptionTest, TestSize.Level1) EXPECT_EQ(RET_SUCCESS, PushFrontOption(&options, &optRouter)); DhcpOption optMsgType = {DHCP_MESSAGE_TYPE_OPTION, 1, {DHCPOFFER, 0}}; + EXPECT_EQ(RET_ERROR, PushFrontOption(NULL, &optMsgType)); + EXPECT_EQ(RET_ERROR, PushFrontOption(&options, NULL)); EXPECT_EQ(RET_SUCCESS, PushFrontOption(&options, &optMsgType)); EXPECT_TRUE(options.size == 2); ClearOptions(&options); @@ -112,10 +118,26 @@ HWTEST_F(DhcpOptionTest, GetOptionTest, TestSize.Level1) EXPECT_TRUE(options.size == 0); } + +HWTEST_F(DhcpOptionTest, RemoveOptionTest, TestSize.Level1) +{ + DhcpOption optRouter = {ROUTER_OPTION, 0, {0}}; + EXPECT_EQ(RET_SUCCESS, PushFrontOption(&options, &optRouter)); + EXPECT_TRUE(options.size == 1); + EXPECT_EQ(RET_ERROR, RemoveOption(NULL, DOMAIN_NAME_SERVER_OPTION)); + EXPECT_EQ(RET_FAILED, RemoveOption(&options, DOMAIN_NAME_SERVER_OPTION)); + EXPECT_EQ(RET_SUCCESS, RemoveOption(&options, ROUTER_OPTION)); + EXPECT_EQ(RET_FAILED, RemoveOption(&options, ROUTER_OPTION)); + EXPECT_TRUE(options.size == 0); + ClearOptions(&options); +} + HWTEST_F(DhcpOptionTest, FillOptionTest, TestSize.Level1) { const char *serverInfo = "dhcp server 1.0"; DhcpOption optVendorInfo = {VENDOR_SPECIFIC_INFO_OPTION, 0, {0}}; + EXPECT_EQ(RET_FAILED, FillOption(&optVendorInfo, NULL, 0)); + EXPECT_EQ(RET_ERROR, FillOption(NULL, serverInfo, strlen(serverInfo))); EXPECT_EQ(RET_SUCCESS, FillOption(&optVendorInfo, serverInfo, strlen(serverInfo))); } @@ -123,6 +145,8 @@ HWTEST_F(DhcpOptionTest, FillOptionDataTest, TestSize.Level1) { uint8_t testData[] = {192, 168, 100, 254}; DhcpOption optRouter = {ROUTER_OPTION, 0, {0}}; + EXPECT_EQ(RET_ERROR, FillOptionData(NULL, testData, sizeof(testData))); + EXPECT_EQ(RET_FAILED, FillOptionData(&optRouter, NULL, sizeof(testData))); EXPECT_EQ(RET_SUCCESS, FillOptionData(&optRouter, testData, sizeof(testData))); } @@ -132,6 +156,7 @@ HWTEST_F(DhcpOptionTest, FillU32OptionTest, TestSize.Level1) EXPECT_TRUE(testIp != 0); DhcpOption optRouter = {ROUTER_OPTION, 0, {0}}; EXPECT_EQ(RET_SUCCESS, FillU32Option(&optRouter, testIp)); + EXPECT_EQ(RET_ERROR, FillU32Option(NULL, testIp)); } HWTEST_F(DhcpOptionTest, AppendAddressOptionTest, TestSize.Level1) @@ -144,6 +169,7 @@ HWTEST_F(DhcpOptionTest, AppendAddressOptionTest, TestSize.Level1) EXPECT_TRUE(testDns3 != 0); DhcpOption optDns = {DOMAIN_NAME_SERVER_OPTION, 0, {0}}; + EXPECT_EQ(RET_ERROR, AppendAddressOption(NULL, testDns1)); EXPECT_EQ(RET_SUCCESS, AppendAddressOption(&optDns, testDns1)); EXPECT_EQ(RET_SUCCESS, AppendAddressOption(&optDns, testDns2)); EXPECT_EQ(RET_SUCCESS, AppendAddressOption(&optDns, testDns3)); diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/dhcp_server_test.cpp b/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/dhcp_server_test.cpp index 28558aa..68a7042 100644 --- a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/dhcp_server_test.cpp +++ b/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/dhcp_server_test.cpp @@ -19,7 +19,6 @@ #include #include #include -#include "string_ex.h" #include "dhcp_server.h" #include "address_utils.h" #include "dhcp_config.h" @@ -27,6 +26,8 @@ #include "dhcp_logger.h" #include "system_func_mock.h" #include "dhcp_message_sim.h" +#include "dhcp_ipv4.h" +#include "common_util.h" #include "securec.h" using namespace testing::ext; @@ -36,7 +37,19 @@ using namespace OHOS::Wifi; #undef LOG_TAG #define LOG_TAG "DhcpServerTest" -static const int SERVER_RUNING_TIME = 10; //the value is in units of seconds. + +static const int SERVER_RUNING_TIME = 10; // the value is in units of seconds. + +struct ServerContext { + int broadCastFlagEnable; + DhcpAddressPool addressPool; + DhcpServerCallback callback; + DhcpConfig config; + int serverFd; + int looperState; + int initialized; +}; + class DhcpServerTest : public testing::Test { public: static void SetUpTestCase() @@ -46,22 +59,30 @@ public: virtual void SetUp() {} virtual void TearDown() - {} + { + SystemFuncMock::GetInstance().SetMockFlag(false); + } int InitServerConfig(DhcpConfig *config); int FreeServerConfig(DhcpConfig *config); - + int TestDhcpRequest(uint32_t testIp, uint32_t srvId); + int TestDhcpRequestByMac(uint32_t testIp, uint32_t srvId, uint8_t *macAddr); + int TestDhcpRelease(uint32_t testIp, uint32_t srvId); + int InitDhcpRequests(); + int InitDhcpErrorRequests(); + bool InitBindingRecodersTest(); + bool FixedOptionsTest(); int InitDhcpClient(); - void ServerRun(void); + bool ServerRun(void); bool StartServerTest(); - bool StopServerTest(); + void DelayStopServer(); private: - DhcpServerContext *m_pServerCtx = NULL; + DhcpServerContext *m_pServerCtx = nullptr; DhcpConfig m_serverConfg; - thread testSrvTh; + thread delayStopTh; - DhcpClientContext *m_pMockClient = NULL; + DhcpClientContext *m_pMockClient = nullptr; DhcpClientConfig m_clientConfg; }; @@ -70,11 +91,11 @@ int DhcpServerTest::InitServerConfig(DhcpConfig *config) if (!config) { return RET_FAILED; } - const char* testIfaceName = "wlan0"; - uint32_t serverId = ParseIpAddr("192.168.188.254"); + const char* testIfaceName = "test_if0"; + uint32_t serverId = ParseIpAddr("192.168.189.254"); uint32_t netmask = ParseIpAddr("255.255.255.0"); - uint32_t beginIp = ParseIpAddr("192.168.188.100"); - uint32_t endIp = ParseIpAddr("192.168.188.150"); + uint32_t beginIp = ParseIpAddr("192.168.189.100"); + uint32_t endIp = ParseIpAddr("192.168.189.200"); if (serverId == 0 || netmask == 0 || beginIp == 0 || endIp == 0) { printf("failed to parse address.\n"); return RET_FAILED; @@ -85,84 +106,406 @@ int DhcpServerTest::InitServerConfig(DhcpConfig *config) if (memset_s(config->ifname, sizeof(config->ifname), '\0', sizeof(config->ifname)) != EOK) { return RET_FAILED; } - if (strncpy_s(config->ifname, sizeof(config->ifname), testIfaceName, sizeof(config->ifname)) != EOK) { + if (strncpy_s(config->ifname, sizeof(config->ifname), testIfaceName, strlen(testIfaceName)) != EOK) { return RET_FAILED; } config->serverId = serverId; config->netmask = netmask; config->pool.beginAddress = beginIp; config->pool.endAddress = endIp; + config->broadcast = 1; if (InitOptionList(&config->options) != RET_SUCCESS) { return RET_FAILED; } return RET_SUCCESS; } -void DhcpServerTest::ServerRun(void) +extern "C" void InitBindingRecoders(DhcpAddressPool *pool); +bool DhcpServerTest::InitBindingRecodersTest() +{ + if (!m_pServerCtx) { + return false; + } + ServerContext *srvIns = (ServerContext *)m_pServerCtx->instance; + + AddressBinding bind = {0}; + bind.bindingMode = BIND_MODE_DYNAMIC; + uint8_t testMac1[DHCP_HWADDR_LENGTH] = {0x00, 0x0e, 0x3c, 0x65, 0x3a, 0x09, 0}; + uint32_t testIp1 = ParseIpAddr("192.168.189.101"); + bind.ipAddress = testIp1; + for (int i = 0; i < MAC_ADDR_LENGTH; ++i) { + bind.chaddr[i] = testMac1[i]; + } + if (AddLease(&srvIns->addressPool, &bind) != RET_SUCCESS) { + LOGD("failed to add lease recoder."); + return false; + } + + uint8_t testMac5[DHCP_HWADDR_LENGTH] = {0x00, 0x0e, 0x3c, 0x65, 0x3a, 0x0e, 0}; + uint32_t testIp5 = ParseIpAddr("192.168.189.130"); + bind.ipAddress = testIp5; + bind.bindingMode = BIND_MODE_DYNAMIC; + for (int i = 0; i < MAC_ADDR_LENGTH; ++i) { + bind.chaddr[i] = testMac5[i]; + } + bind.expireIn = Tmspsec(); + bind.bindingTime = bind.expireIn - DHCP_LEASE_TIME; + if (AddLease(&srvIns->addressPool, &bind) != RET_SUCCESS) { + LOGD("failed to add lease recoder."); + return false; + } + + uint8_t testMac6[DHCP_HWADDR_LENGTH] = {0x00, 0xae, 0x3c, 0x65, 0x3a, 0x0e, 0}; + uint32_t testIp6 = ParseIpAddr("192.168.189.118"); + bind.ipAddress = testIp6; + bind.bindingMode = BIND_MODE_DYNAMIC; + for (int i = 0; i < MAC_ADDR_LENGTH; ++i) { + bind.chaddr[i] = testMac6[i]; + } + bind.expireIn = Tmspsec(); + bind.bindingTime = bind.expireIn - DHCP_LEASE_TIME; + if (AddLease(&srvIns->addressPool, &bind) != RET_SUCCESS) { + LOGD("failed to add lease recoder."); + return false; + } + srvIns->addressPool.leaseTime = DHCP_LEASE_TIME; + srvIns->addressPool.renewalTime = DHCP_RENEWAL_TIME; + InitBindingRecoders(nullptr); + DhcpAddressPool pool; + if (memset_s(&pool, sizeof(DhcpAddressPool), 0, sizeof(DhcpAddressPool)) != EOK) { + return false; + } + InitBindingRecoders(&pool); + InitBindingRecoders(&srvIns->addressPool); + return true; +} + + +bool DhcpServerTest::FixedOptionsTest() +{ + const char *serverVendorId = "ohos-dhcp-server"; + DhcpOption optVendorId = {VENDOR_CLASS_IDENTIFIER_OPTION, 0, {0}}; + if (FillOption(&optVendorId, serverVendorId, strlen(serverVendorId)) != RET_SUCCESS) { + return false; + } + if (PushBackOption(&m_serverConfg.options, &optVendorId) != RET_SUCCESS) { + return false; + } + return true; +} + +static int TestServerCallback(int state, int code, const char *ifname) +{ + int ret = 0; + switch (state) { + case ST_STARTING: { + if (code == 0) { + LOGD(" callback[%s] ==> server starting ...", ifname); + } else if (code == 1) { + LOGD(" callback[%s] ==> server started.", ifname); + } else if (code == NUM_TWO) { + LOGD(" callback[%s] ==> server start failed.", ifname); + } + break; + } + case ST_RELOADNG: { + LOGD(" callback[%s] ==> reloading ...", ifname); + break; + } + case ST_STOPED: { + LOGD(" callback[%s] ==> server stoped.", ifname); + break; + } + default: + break; + } + return ret; +} + +bool DhcpServerTest::ServerRun(void) { LOGD("begin test start dhcp server."); + int retval = true; SystemFuncMock::GetInstance().SetMockFlag(true); EXPECT_CALL(SystemFuncMock::GetInstance(), socket(_, _, _)).WillRepeatedly(Return(1)); - EXPECT_CALL(SystemFuncMock::GetInstance(), setsockopt(_, _, _, _, _)).WillRepeatedly(Return(0)); + EXPECT_CALL(SystemFuncMock::GetInstance(), setsockopt(_, _, _, _, _)) + .WillOnce(Return(-1)) + .WillRepeatedly(Return(0)); EXPECT_CALL(SystemFuncMock::GetInstance(), select(_, _, _, _, _)).WillRepeatedly(Return(0)); - EXPECT_CALL(SystemFuncMock::GetInstance(), recvfrom(_, _, _, _, _, _)).WillRepeatedly(Return(0)); EXPECT_CALL(SystemFuncMock::GetInstance(), bind(_, _, _)).WillRepeatedly(Return(0)); + EXPECT_CALL(SystemFuncMock::GetInstance(), sendto(_, _, _, _, _, _)).WillRepeatedly(Return(sizeof(DhcpMessage))); + EXPECT_CALL(SystemFuncMock::GetInstance(), recvfrom(_, _, _, _, _, _)).WillRepeatedly(Return(0)); EXPECT_CALL(SystemFuncMock::GetInstance(), close(_)).WillRepeatedly(Return(0)); + m_pServerCtx = InitializeServer(&m_serverConfg); if (!m_pServerCtx) { LOGE("failed to initialized dhcp server context."); + retval = false; + } + if (!InitBindingRecodersTest()) { + LOGE("failed to initialize binding recoders."); + retval = false; + } + RegisterDhcpCallback(m_pServerCtx, TestServerCallback); + if (StartDhcpServer(nullptr) != RET_FAILED) { + printf("failed to start dhcp server. \n"); + retval = false; + } + DhcpServerContext tempCtx; + memset_s(&tempCtx, sizeof(DhcpServerContext), 0, sizeof(DhcpServerContext)); + memset_s(tempCtx.ifname, sizeof(tempCtx.ifname), '\0', sizeof(tempCtx.ifname)); + if (StartDhcpServer(&tempCtx) != RET_FAILED) { + printf("failed to start dhcp server. \n"); + retval = false; + } + strcpy_s(tempCtx.ifname, sizeof(tempCtx.ifname), "test_if1"); + if (StartDhcpServer(&tempCtx) != RET_FAILED) { + printf("failed to start dhcp server. \n"); + retval = false; } if (m_pServerCtx && StartDhcpServer(m_pServerCtx) != RET_SUCCESS) { printf("failed to start dhcp server. \n"); + retval = false; + } + if (SaveLease(m_pServerCtx) != RET_SUCCESS) { + retval = false; + } + if (m_pServerCtx) { + FreeServerContext(m_pServerCtx); } SystemFuncMock::GetInstance().SetMockFlag(false); + return retval; } + bool DhcpServerTest::StartServerTest() { - SystemFuncMock::GetInstance().SetMockFlag(true); - EXPECT_CALL(SystemFuncMock::GetInstance(), close(_)).WillRepeatedly(Return(0)); bool retval = true; if (InitServerConfig(&m_serverConfg) != RET_SUCCESS) { LOGD("failed to initialized dhcp server config."); retval = false; } - testSrvTh = std::thread(std::bind(&DhcpServerTest::ServerRun, this)); - testSrvTh.detach(); - sleep(SERVER_RUNING_TIME); - if (retval && StopServerTest() != RET_SUCCESS) { + if (!FixedOptionsTest()) { + LOGE("failed to initialized fixed options."); retval = false; } - sleep(6); - if (m_pServerCtx) { - FreeServerContex(m_pServerCtx); - m_pServerCtx = NULL; + delayStopTh = std::thread(std::bind(&DhcpServerTest::DelayStopServer, this)); + delayStopTh.detach(); + if (InitDhcpClient() != RET_SUCCESS) { + retval = false; } - SystemFuncMock::GetInstance().SetMockFlag(false); + LOGD("wait for test complated..."); + retval = ServerRun(); return retval; } -bool DhcpServerTest::StopServerTest() +void DhcpServerTest::DelayStopServer() { - printf("begin stop dhcp server. \n"); - if (!m_pServerCtx) { - return false; + const int SLEEP_TIME = 3; + const int SLEEP_TIME1 = 1; + const int SLEEP_TIME2 = 1; + LOGD("wait for dhcp server stoped..."); + LOGD("wait %d seconds...\n", SERVER_RUNING_TIME); + SystemFuncMock::GetInstance().SetMockFlag(true); + EXPECT_CALL(SystemFuncMock::GetInstance(), close(_)).WillRepeatedly(Return(0)); + std::this_thread::sleep_for(std::chrono::seconds(SLEEP_TIME)); + if (m_pServerCtx && m_pServerCtx->instance) { + ServerContext *srvIns = (ServerContext *)m_pServerCtx->instance; + srvIns->looperState = SLEEP_TIME; } + std::this_thread::sleep_for(std::chrono::seconds(SERVER_RUNING_TIME)); if (StopDhcpServer(m_pServerCtx) != RET_SUCCESS) { - return false; + LOGD("failed to stop dhcp server."); + return; } - return true; + int waitSesc = 0; + while (waitSesc < SERVER_RUNING_TIME) { + if (GetServerStatus(m_pServerCtx) == ST_STOPED) { + LOGD("dhcp server stoped."); + break; + } else { + std::this_thread::sleep_for(std::chrono::seconds(SLEEP_TIME1)); + waitSesc++; + } + } + SystemFuncMock::GetInstance().SetMockFlag(false); + std::this_thread::sleep_for(std::chrono::seconds(SLEEP_TIME2)); +} + +int DhcpServerTest::TestDhcpRequest(uint32_t testIp, uint32_t srvId) +{ + return TestDhcpRequestByMac(testIp, srvId, nullptr); +} + +int DhcpServerTest::TestDhcpRequestByMac(uint32_t testIp, uint32_t srvId, uint8_t *macAddr) +{ + DhcpMsgInfo msgInfo = {{0}, 0, {0}}; + InitOptionList(&msgInfo.options); + if (!InitMessage(m_pMockClient, &msgInfo, DHCPREQUEST)) { + LOGD("failed to init dhcp message."); + FreeOptionList(&msgInfo.options); + return RET_FAILED; + } + RemoveOption(&msgInfo.options, END_OPTION); + if (srvId != 0) { + DhcpOption optSrvId = {SERVER_IDENTIFIER_OPTION, 0, {0}}; + AppendAddressOption(&optSrvId, srvId); + PushFrontOption(&msgInfo.options, &optSrvId); + } + DhcpOption optReqIp = {REQUESTED_IP_ADDRESS_OPTION, 0, {0}}; + AppendAddressOption(&optReqIp, testIp); + PushBackOption(&msgInfo.options, &optReqIp); + DhcpOption endOpt = {END_OPTION, 0, {0}}; + PushBackOption(&msgInfo.options, &endOpt); + msgInfo.packet.ciaddr = testIp; + if (macAddr != nullptr) { + if (!FillHwAddr(msgInfo.packet.chaddr, DHCP_HWADDR_LENGTH, macAddr, MAC_ADDR_LENGTH)) { + return DHCP_FALSE; + } + } + if (SendDhcpMessage(m_pMockClient, &msgInfo) != RET_SUCCESS) { + LOGD("failed to send dhcp message."); + FreeOptionList(&msgInfo.options); + return RET_FAILED; + } + FreeOptionList(&msgInfo.options); + return RET_SUCCESS; +} + +int DhcpServerTest::TestDhcpRelease(uint32_t testIp, uint32_t srvId) +{ + DhcpMsgInfo msgInfo = {{0}, 0, {0}}; + InitOptionList(&msgInfo.options); + if (!InitMessage(m_pMockClient, &msgInfo, DHCPRELEASE)) { + LOGD("failed to init dhcp message."); + FreeOptionList(&msgInfo.options); + return RET_FAILED; + } + RemoveOption(&msgInfo.options, END_OPTION); + if (srvId != 0) { + DhcpOption optSrvId = {SERVER_IDENTIFIER_OPTION, 0, {0}}; + AppendAddressOption(&optSrvId, srvId); + PushBackOption(&msgInfo.options, &optSrvId); + } + DhcpOption optReqIp = {REQUESTED_IP_ADDRESS_OPTION, 0, {0}}; + AppendAddressOption(&optReqIp, testIp); + PushBackOption(&msgInfo.options, &optReqIp); + msgInfo.packet.ciaddr = testIp; + + DhcpOption endOpt = {END_OPTION, 0, {0}}; + PushBackOption(&msgInfo.options, &endOpt); + if (SendDhcpMessage(m_pMockClient, &msgInfo) != RET_SUCCESS) { + LOGD("failed to send dhcp message."); + FreeOptionList(&msgInfo.options); + return RET_FAILED; + } + FreeOptionList(&msgInfo.options); + return RET_SUCCESS; +} + +int DhcpServerTest::InitDhcpRequests() +{ + uint32_t testIp = ParseIpAddr("192.168.189.101"); + uint32_t srvId = ParseIpAddr("192.168.189.254"); + DhcpMsgManager::GetInstance().SetClientIp(testIp); + if (DhcpRequest(m_pMockClient) != RET_SUCCESS) { + return RET_FAILED; + } + DhcpMsgManager::GetInstance().SetClientIp(0); + if (TestDhcpRequest(testIp, srvId) != RET_SUCCESS) { + return RET_FAILED; + } + testIp = ParseIpAddr("192.168.189.102"); + if (TestDhcpRequest(testIp, 0) != RET_SUCCESS) { + return RET_FAILED; + } + testIp = ParseIpAddr("192.168.189.120"); + uint8_t testMac1[DHCP_HWADDR_LENGTH] = {0x00, 0x0e, 0x3c, 0x65, 0x3a, 0x0a, 0}; + uint8_t testMac2[DHCP_HWADDR_LENGTH] = {0x00, 0x0e, 0x3c, 0x65, 0x3a, 0x0b, 0}; + uint8_t testMac3[DHCP_HWADDR_LENGTH] = {0x00, 0x0e, 0x3c, 0x65, 0x3a, 0x0c, 0}; + if (TestDhcpRequestByMac(testIp, srvId, testMac1) != RET_SUCCESS) { + return RET_FAILED; + } + DhcpMsgManager::GetInstance().SetClientIp(testIp); + if (TestDhcpRequest(testIp, srvId) != RET_SUCCESS) { + return RET_FAILED; + } + testIp = ParseIpAddr("192.168.189.101"); + if (TestDhcpRequestByMac(testIp, srvId, testMac2) != RET_SUCCESS) { + return RET_FAILED; + } + testIp = ParseIpAddr("192.168.189.120"); + DhcpMsgManager::GetInstance().SetClientIp(testIp); + if (TestDhcpRequestByMac(testIp, srvId, testMac3) != RET_SUCCESS) { + return RET_FAILED; + } + DhcpMsgManager::GetInstance().SetClientIp(0); + uint8_t testMac4[DHCP_HWADDR_LENGTH] = {0x00, 0x0e, 0x3c, 0x65, 0x3a, 0x0d, 0}; + testIp = ParseIpAddr("192.168.190.210"); + if (TestDhcpRequestByMac(testIp, srvId, testMac4) != RET_SUCCESS) { + return RET_FAILED; + } + uint8_t testMac5[DHCP_HWADDR_LENGTH] = {0x0a, 0x0e, 0x3c, 0x65, 0x3a, 0x0e, 0}; + testIp = ParseIpAddr("192.168.189.130"); + DhcpMsgManager::GetInstance().SetClientIp(testIp); + if (TestDhcpRequestByMac(testIp, srvId, testMac5) != RET_SUCCESS) { + return RET_FAILED; + } + DhcpMsgManager::GetInstance().SetClientIp(0); + return RET_SUCCESS; +} + +int DhcpServerTest::InitDhcpErrorRequests() +{ + uint32_t srvId = ParseIpAddr("192.168.100.254"); + uint32_t testIp = ParseIpAddr("192.168.100.101"); + DhcpMsgInfo msgInfo = {{0}, 0, {0}}; + InitOptionList(&msgInfo.options); + if (!InitMessage(m_pMockClient, &msgInfo, DHCPREQUEST)) { + LOGD("failed to init dhcp message."); + FreeOptionList(&msgInfo.options); + return RET_FAILED; + } + + DhcpOption optReqIp = {REQUESTED_IP_ADDRESS_OPTION, 0, {0}}; + AppendAddressOption(&optReqIp, testIp); + PushFrontOption(&msgInfo.options, &optReqIp); + DhcpOption optSrvId = {SERVER_IDENTIFIER_OPTION, 0, {0}}; + AppendAddressOption(&optSrvId, srvId); + PushFrontOption(&msgInfo.options, &optSrvId); + if (SendDhcpMessage(m_pMockClient, &msgInfo) != RET_SUCCESS) { + LOGD("failed to send dhcp message."); + FreeOptionList(&msgInfo.options); + return RET_FAILED; + } + + RemoveOption(&msgInfo.options, DHCP_MESSAGE_TYPE_OPTION); + if (SendDhcpMessage(m_pMockClient, &msgInfo) != RET_SUCCESS) { + LOGD("failed to send dhcp message."); + FreeOptionList(&msgInfo.options); + return RET_FAILED; + } + + RemoveOption(&msgInfo.options, END_OPTION); + RemoveOption(&msgInfo.options, SERVER_IDENTIFIER_OPTION); + if (SendDhcpMessage(m_pMockClient, &msgInfo) != RET_SUCCESS) { + LOGD("failed to send dhcp message."); + FreeOptionList(&msgInfo.options); + return RET_FAILED; + } + return RET_SUCCESS; } int DhcpServerTest::InitDhcpClient() { + uint8_t testMacAddr[DHCP_HWADDR_LENGTH] = {0x00, 0x0e, 0x3c, 0x65, 0x3a, 0x09, 0}; + LOGD("init mock dhcp client."); - const char* testIfname = "wlan0"; - uint8_t testMac[DHCP_HWADDR_LENGTH] = {0x00, 0x0e, 0x3c, 0x65, 0x3a, 0x09, 0}; + const char* testIfname = "test_if0"; if (memset_s(&m_clientConfg, sizeof(DhcpClientConfig), 0, sizeof(DhcpClientConfig)) != EOK) { return RET_FAILED; } - if (!FillHwAddr(m_clientConfg.chaddr, DHCP_HWADDR_LENGTH, testMac, MAC_ADDR_LENGTH)) { + if (!FillHwAddr(m_clientConfg.chaddr, DHCP_HWADDR_LENGTH, testMacAddr, MAC_ADDR_LENGTH)) { return RET_FAILED; } if (memset_s(m_clientConfg.ifname, IFACE_NAME_SIZE, '\0', IFACE_NAME_SIZE) != EOK) { @@ -171,12 +514,47 @@ int DhcpServerTest::InitDhcpClient() if (memcpy_s(m_clientConfg.ifname, IFACE_NAME_SIZE, testIfname, strlen(testIfname)) != EOK) { return RET_FAILED; } - m_pMockClient = InitialDhcpClient(&m_clientConfg); + m_pMockClient = InitialDhcpClient(&m_clientConfg); if (!m_pMockClient) { return RET_FAILED; } - return DhcpDiscover(m_pMockClient); + if (DhcpDiscover(m_pMockClient) != RET_SUCCESS) { + return RET_FAILED; + } + uint32_t testIp = ParseIpAddr("192.168.189.102"); + uint32_t srvId = ParseIpAddr("192.168.189.254"); + DhcpMsgManager::GetInstance().SetClientIp(testIp); + if (DhcpDiscover(m_pMockClient) != RET_SUCCESS) { + return RET_FAILED; + } + InitDhcpRequests(); + InitDhcpErrorRequests(); + if (DhcpInform(m_pMockClient) != RET_SUCCESS) { + return RET_FAILED; + } + DhcpMsgManager::GetInstance().SetClientIp(testIp); + if (DhcpInform(m_pMockClient) != RET_SUCCESS) { + return RET_FAILED; + } + DhcpMsgManager::GetInstance().SetClientIp(0); + if (DhcpDecline(m_pMockClient) != RET_SUCCESS) { + return RET_FAILED; + } + testIp = ParseIpAddr("192.168.189.118"); + DhcpMsgManager::GetInstance().SetClientIp(testIp); + if (DhcpDecline(m_pMockClient) != RET_SUCCESS) { + return RET_FAILED; + } + DhcpMsgManager::GetInstance().SetClientIp(0); + if (DhcpRelease(m_pMockClient) != RET_SUCCESS) { + return RET_FAILED; + } + testIp = ParseIpAddr("192.168.189.102"); + if (TestDhcpRelease(testIp, srvId)) { + return RET_FAILED; + } + return RET_SUCCESS; } int DhcpServerTest::FreeServerConfig(DhcpConfig *config) @@ -197,14 +575,209 @@ HWTEST_F(DhcpServerTest, InitializeServerTest, TestSize.Level1) EXPECT_CALL(SystemFuncMock::GetInstance(), recvfrom(_, _, _, _, _, _)).WillRepeatedly(Return(0)); EXPECT_CALL(SystemFuncMock::GetInstance(), bind(_, _, _)).WillRepeatedly(Return(0)); EXPECT_CALL(SystemFuncMock::GetInstance(), close(_)).WillRepeatedly(Return(0)); - DhcpConfig config; - PDhcpServerContext ctx = InitializeServer(&config); - EXPECT_TRUE(ctx == NULL); + PDhcpServerContext ctx = InitializeServer(nullptr); + EXPECT_TRUE(ctx == nullptr); + ASSERT_TRUE(memset_s(&config, sizeof(DhcpConfig), 0, sizeof(DhcpConfig)) == EOK); + ctx = InitializeServer(&config); + EXPECT_TRUE(ctx == nullptr); + EXPECT_TRUE(strcpy_s(config.ifname, sizeof(config.ifname), "test_if0") == EOK); + ctx = InitializeServer(&config); + EXPECT_TRUE(ctx == nullptr); + EXPECT_EQ(RET_SUCCESS, InitServerConfig(&config)); ctx = InitializeServer(&config); - ASSERT_TRUE(ctx != NULL); + ASSERT_TRUE(ctx != nullptr); + EXPECT_EQ(RET_SUCCESS, FreeServerConfig(&config)); - EXPECT_EQ(RET_SUCCESS, FreeServerContex(ctx)); + EXPECT_EQ(RET_SUCCESS, FreeServerContext(ctx)); +} + +extern "C" int InitServer(const char *ifname); + +HWTEST_F(DhcpServerTest, InitServerByIfaceTest, TestSize.Level1) +{ + const int SO_BROADCAST = 6; + const int SO_REUSEADDR = 2; + SystemFuncMock::GetInstance().SetMockFlag(true); + EXPECT_CALL(SystemFuncMock::GetInstance(), socket(_, _, _)) + .WillOnce(Return(-1)) + .WillRepeatedly(Return(1)); + EXPECT_CALL(SystemFuncMock::GetInstance(), setsockopt(_, _, SO_REUSEADDR, _, _)) + .WillOnce(Return(-1)) + .WillRepeatedly(Return(0)); + EXPECT_CALL(SystemFuncMock::GetInstance(), setsockopt(_, _, SO_BROADCAST, _, _)) + .WillOnce(Return(-1)) + .WillRepeatedly(Return(0)); + EXPECT_CALL(SystemFuncMock::GetInstance(), select(_, _, _, _, _)).WillRepeatedly(Return(0)); + EXPECT_CALL(SystemFuncMock::GetInstance(), recvfrom(_, _, _, _, _, _)).WillRepeatedly(Return(0)); + EXPECT_CALL(SystemFuncMock::GetInstance(), bind(_, _, _)) + .WillOnce(Return(-1)) + .WillRepeatedly(Return(0)); + EXPECT_CALL(SystemFuncMock::GetInstance(), close(_)).WillRepeatedly(Return(0)); + const char* ifaceName = "test_if01"; + EXPECT_EQ(-1, InitServer(ifaceName)); + EXPECT_EQ(-1, InitServer(ifaceName)); + EXPECT_EQ(-1, InitServer(ifaceName)); + EXPECT_EQ(1, InitServer(ifaceName)); +} + +HWTEST_F(DhcpServerTest, StartServerTest, TestSize.Level1) +{ + SystemFuncMock::GetInstance().SetMockFlag(true); + EXPECT_TRUE(StartServerTest()); SystemFuncMock::GetInstance().SetMockFlag(false); -} \ No newline at end of file +} + +extern "C" int ReceiveDhcpMessage(int sock, PDhcpMsgInfo msgInfo); +HWTEST_F(DhcpServerTest, ReceiveDhcpMessageFailedTest, TestSize.Level1) +{ + SystemFuncMock::GetInstance().SetMockFlag(true); + SystemFuncMock::GetInstance().SetMockFlag(true); + EXPECT_CALL(SystemFuncMock::GetInstance(), select(_, _, _, _, _)) + .WillOnce(Return(-1)) + .WillRepeatedly(Return(0)); + EXPECT_CALL(SystemFuncMock::GetInstance(), recvfrom(_, _, _, _, _, _)) + .WillOnce(Return((int)(sizeof(DhcpMsgInfo) + 1))) + .WillRepeatedly(Return((int)sizeof(DhcpMsgInfo))); + + DhcpMsgInfo msgInfo = {{0}, 0, {0}}; + uint8_t testMac1[DHCP_HWADDR_LENGTH] = {0x00, 0x0e, 0x3c, 0x65, 0x3a, 0x09, 0}; + EXPECT_EQ(ERR_SELECT, ReceiveDhcpMessage(1, &msgInfo)); // failed to select isset. + EXPECT_EQ(RET_FAILED, ReceiveDhcpMessage(1, &msgInfo)); // message length error + EXPECT_EQ(RET_FAILED, ReceiveDhcpMessage(1, &msgInfo)); // dhcp message type error + msgInfo.packet.hlen = 128; + EXPECT_EQ(RET_FAILED, ReceiveDhcpMessage(1, &msgInfo)); // hlen error + msgInfo.packet.hlen = 16; + msgInfo.packet.op = BOOTREPLY; + EXPECT_EQ(RET_FAILED, ReceiveDhcpMessage(1, &msgInfo)); // client op type error! + msgInfo.packet.op = BOOTREQUEST; + EXPECT_EQ(RET_FAILED, ReceiveDhcpMessage(1, &msgInfo)); // client hardware address error! + for (int i = 0; i < MAC_ADDR_LENGTH; ++i) { + msgInfo.packet.chaddr[i] = testMac1[i]; + } + EXPECT_EQ(RET_FAILED, ReceiveDhcpMessage(1, &msgInfo)); +} + +extern "C" int FillReply(PDhcpServerContext ctx, PDhcpMsgInfo received, PDhcpMsgInfo reply); +HWTEST_F(DhcpServerTest, FillReplyFailedTest, TestSize.Level1) +{ + DhcpServerContext tempCtx; + ASSERT_TRUE(memset_s(&tempCtx, sizeof(DhcpServerContext), 0, sizeof(DhcpServerContext)) == EOK); + ASSERT_TRUE(memset_s(tempCtx.ifname, sizeof(tempCtx.ifname), '\0', sizeof(tempCtx.ifname)) == EOK); + DhcpMsgInfo recv, repl; + ASSERT_TRUE(memset_s(&recv, sizeof(DhcpMsgInfo), 0, sizeof(DhcpMsgInfo)) == EOK); + ASSERT_TRUE(memset_s(&repl, sizeof(DhcpMsgInfo), 0, sizeof(DhcpMsgInfo)) == EOK); + EXPECT_EQ(RET_ERROR, FillReply(&tempCtx, &recv, nullptr)); + EXPECT_EQ(RET_FAILED, FillReply(&tempCtx, &recv, &repl)); + recv.packet.flags = 1; + ServerContext srvInst; + ASSERT_TRUE(memset_s(&srvInst, sizeof(ServerContext), 0, sizeof(ServerContext)) == EOK); + tempCtx.instance = &srvInst; + recv.packet.siaddr = ParseIpAddr("192.168.189.252"); + srvInst.addressPool.gateway = ParseIpAddr("192.168.189.254"); + recv.packet.giaddr = ParseIpAddr("192.168.189.254"); + EXPECT_EQ(RET_SUCCESS, FillReply(&tempCtx, &recv, &repl)); + recv.packet.giaddr = 0; + EXPECT_EQ(RET_SUCCESS, FillReply(&tempCtx, &recv, &repl)); +} + +extern "C" int BindNetInterface(int fd, const char *ifname); +HWTEST_F(DhcpServerTest, BindNetInterfaceFailedTest, TestSize.Level1) +{ + SystemFuncMock::GetInstance().SetMockFlag(true); + EXPECT_CALL(SystemFuncMock::GetInstance(), setsockopt(_, _, _, _, _)) + .WillOnce(Return(-1)) + .WillOnce(Return(0)); + const char* ifaceName = "test_if01"; + EXPECT_EQ(RET_FAILED, BindNetInterface(1, nullptr)); + EXPECT_EQ(RET_FAILED, BindNetInterface(1, ifaceName)); + EXPECT_EQ(RET_SUCCESS, BindNetInterface(1, ifaceName)); +} + +extern "C" int AddReplyServerIdOption(PDhcpOptionList options, uint32_t serverId); +HWTEST_F(DhcpServerTest, AddReplyServerIdOptionFailedTest, TestSize.Level1) +{ + uint32_t srvId = ParseIpAddr("192.168.189.254"); + ASSERT_TRUE(srvId != 0); + DhcpOptionList opts; + ASSERT_TRUE(memset_s(&opts, sizeof(DhcpOptionList), '\0', sizeof(DhcpOptionList)) == EOK); + EXPECT_EQ(RET_FAILED, AddReplyServerIdOption(nullptr, 0)); + EXPECT_EQ(RET_FAILED, AddReplyServerIdOption(&opts, 0)); + + EXPECT_EQ(RET_SUCCESS, AddReplyServerIdOption(&opts, srvId)); + EXPECT_EQ(RET_SUCCESS, AddReplyServerIdOption(&opts, srvId)); +} + +extern "C" int InitServerFixedOptions(DhcpConfig *config, DhcpServerContext *ctx); +HWTEST_F(DhcpServerTest, InitServerFixedOptionsFailedTest, TestSize.Level1) +{ + DhcpServerContext tempCtx; + tempCtx.instance = nullptr; + ASSERT_TRUE(memset_s(&tempCtx, sizeof(DhcpServerContext), 0, sizeof(DhcpServerContext)) == EOK); + ASSERT_TRUE(memset_s(tempCtx.ifname, sizeof(tempCtx.ifname), '\0', sizeof(tempCtx.ifname)) == EOK); + DhcpConfig tempConfig; + ASSERT_TRUE(memset_s(&tempConfig, sizeof(DhcpConfig), 0, sizeof(DhcpConfig)) == EOK); + EXPECT_EQ(RET_FAILED, InitServerFixedOptions(nullptr, &tempCtx)); + EXPECT_EQ(RET_FAILED, InitServerFixedOptions(&tempConfig, &tempCtx)); + + ServerContext srvInst; + ASSERT_TRUE(memset_s(&srvInst, sizeof(ServerContext), 0, sizeof(ServerContext)) == EOK); + tempCtx.instance = &srvInst; + EXPECT_EQ(RET_FAILED, InitServerFixedOptions(&tempConfig, &tempCtx)); +} + + +extern "C" int AppendReplyTimeOptions(PDhcpServerContext ctx, PDhcpOptionList options); +HWTEST_F(DhcpServerTest, AppendReplyTimeOptionsFailedTest, TestSize.Level1) +{ + DhcpServerContext tempCtx; + tempCtx.instance = nullptr; + ASSERT_TRUE(memset_s(&tempCtx, sizeof(DhcpServerContext), 0, sizeof(DhcpServerContext)) == EOK); + ASSERT_TRUE(memset_s(tempCtx.ifname, sizeof(tempCtx.ifname), '\0', sizeof(tempCtx.ifname)) == EOK); + EXPECT_EQ(RET_FAILED, AppendReplyTimeOptions(nullptr, nullptr)); + EXPECT_EQ(RET_FAILED, AppendReplyTimeOptions(&tempCtx, nullptr)); +} + +HWTEST_F(DhcpServerTest, FreeServerContextFailedTest, TestSize.Level1) +{ + DhcpServerContext tempCtx; + tempCtx.instance = nullptr; + ASSERT_TRUE(memset_s(&tempCtx, sizeof(DhcpServerContext), 0, sizeof(DhcpServerContext)) == EOK); + ASSERT_TRUE(memset_s(tempCtx.ifname, sizeof(tempCtx.ifname), '\0', sizeof(tempCtx.ifname)) == EOK); + EXPECT_EQ(RET_FAILED, FreeServerContext(nullptr)); + EXPECT_EQ(RET_FAILED, FreeServerContext(&tempCtx)); +} + +extern "C" AddressBinding *GetBinding(DhcpAddressPool *pool, PDhcpMsgInfo received); +HWTEST_F(DhcpServerTest, GetBindingFailedTest, TestSize.Level1) +{ + DhcpAddressPool tempPool; + DhcpMsgInfo msgInfo; + ASSERT_TRUE(memset_s(&tempPool, sizeof(DhcpAddressPool), 0, sizeof(DhcpAddressPool)) == EOK); + ASSERT_TRUE(memset_s(&msgInfo, sizeof(DhcpMsgInfo), 0, sizeof(DhcpMsgInfo)) == EOK); + EXPECT_TRUE(GetBinding(&tempPool, nullptr) == nullptr); + EXPECT_TRUE(GetBinding(nullptr, &msgInfo) == nullptr); + ASSERT_EQ(RET_SUCCESS, InitAddressPool(&tempPool, "test_if01", nullptr)); + EXPECT_TRUE(GetBinding(&tempPool, &msgInfo) != nullptr); + FreeAddressPool(&tempPool); +} + +extern "C" int SendDhcpReply(PDhcpServerContext ctx, int replyType, PDhcpMsgInfo reply); +HWTEST_F(DhcpServerTest, SendDhcpReplyTest, TestSize.Level1) +{ + DhcpServerContext tempCtx; + tempCtx.instance = nullptr; + ASSERT_TRUE(memset_s(&tempCtx, sizeof(DhcpServerContext), 0, sizeof(DhcpServerContext)) == EOK); + EXPECT_EQ(RET_FAILED, SendDhcpReply(&tempCtx, REPLY_NAK, nullptr)); + EXPECT_EQ(RET_FAILED, SendDhcpReply(nullptr, REPLY_NAK, nullptr)); +} + +HWTEST_F(DhcpServerTest, SaveLeaseFailedTest, TestSize.Level1) +{ + DhcpServerContext tempCtx; + tempCtx.instance = nullptr; + ASSERT_TRUE(memset_s(&tempCtx, sizeof(DhcpServerContext), 0, sizeof(DhcpServerContext)) == EOK); + EXPECT_EQ(RET_FAILED, SaveLease(nullptr)); + EXPECT_EQ(RET_FAILED, SaveLease(&tempCtx)); +} diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/hash_table_test.cpp b/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/hash_table_test.cpp index 7500b39..5b503dd 100644 --- a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/hash_table_test.cpp +++ b/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/hash_table_test.cpp @@ -16,7 +16,6 @@ #include #include #include -#include "string_ex.h" #include "hash_table.h" using namespace testing::ext; @@ -164,4 +163,16 @@ HWTEST_F(HashTableTest, ResizeTest, TestSize.Level1) EXPECT_EQ(HASH_SUCCESS, Resize(&testTable, HASH_MINI_CAPACITY * 2)); EXPECT_TRUE(testTable.capacity == HASH_MINI_CAPACITY * 2); EXPECT_EQ(HASH_SUCCESS, DestroyHashTable(&testTable)); -} \ No newline at end of file +} + +extern "C" int CapExtend(HashTable *table, size_t miniCapacity); +HWTEST_F(HashTableTest, CapExtendTest, TestSize.Level1) +{ + HashTable testTable; + EXPECT_EQ(HASH_SUCCESS, CreateHashTable(&testTable, sizeof(uint32_t), + sizeof(uint32_t), HASH_MINI_CAPACITY)); + EXPECT_TRUE(testTable.capacity == HASH_MINI_CAPACITY); + EXPECT_EQ(HASH_SUCCESS, CapExtend(&testTable, HASH_MINI_CAPACITY * 5)); + EXPECT_TRUE(testTable.capacity == HASH_MINI_CAPACITY); + EXPECT_EQ(HASH_SUCCESS, DestroyHashTable(&testTable)); +} diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/system_func_mock.cpp b/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/system_func_mock.cpp index 6d5b896..845926c 100644 --- a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/system_func_mock.cpp +++ b/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/system_func_mock.cpp @@ -14,22 +14,30 @@ */ #include "system_func_mock.h" +#include "address_utils.h" +#include "dhcp_define.h" +#include "dhcp_ipv4.h" +#include "dhcp_logger.h" +#include "dhcp_message.h" +#include "dhcp_message_sim.h" +#include "dhcp_option.h" +#include "securec.h" #include -#include #include #include #include -#include "dhcp_logger.h" -#include "dhcp_message_sim.h" -using namespace OHOS::Wifi; -#undef LOG_TAG -#define LOG_TAG "DhcpServerSystemFuncMock" +using namespace OHOS::Wifi; +#define MAGIC_COOKIE_LENGTH 4 +#define OPT_HEADER_LENGTH 2 #define TIME_SEC_TO_USEC (1000 * 1000) #define DHCP_SEL_WAIT_TIMEOUTS 1500 +#undef LOG_TAG +#define LOG_TAG "DhcpServerSystemFuncMock" + static bool g_mockTag = false; SystemFuncMock &SystemFuncMock::GetInstance() @@ -38,11 +46,9 @@ SystemFuncMock &SystemFuncMock::GetInstance() return gSystemFuncMock; }; -SystemFuncMock::SystemFuncMock() -{} +SystemFuncMock::SystemFuncMock() {} -SystemFuncMock::~SystemFuncMock() -{} +SystemFuncMock::~SystemFuncMock() {} void SystemFuncMock::SetMockFlag(bool flag) { @@ -55,6 +61,17 @@ bool SystemFuncMock::GetMockFlag(void) } extern "C" { +struct in_addr { + uint32_t s_addr; +}; + +struct sockaddr_in { + short int sin_family; + unsigned short int sin_port; + struct in_addr sin_addr; + unsigned char sin_zero[8]; +}; + int __real_socket(int __domain, int __type, int __protocol); int __wrap_socket(int __domain, int __type, int __protocol) { @@ -79,17 +96,19 @@ int __wrap_setsockopt(int __fd, int __level, int __optname, const void *__optval int __real_select(int __nfds, fd_set *__readfds, fd_set *__writefds, fd_set *__exceptfds, struct timeval *__timeout); int __wrap_select(int __nfds, fd_set *__readfds, fd_set *__writefds, fd_set *__exceptfds, struct timeval *__timeout) { + const unsigned int SLEEP_TIEM = 300000; LOGD("==>select."); if (g_mockTag) { LOGD(" ==>mock enable."); LOGD("message queue total: %d.", DhcpMsgManager::GetInstance().SendTotal()); if (DhcpMsgManager::GetInstance().SendTotal() > 0) { FD_CLR(__nfds, __readfds); + usleep(SLEEP_TIEM); return 1; } int retval = SystemFuncMock::GetInstance().select(__nfds, __readfds, __writefds, __exceptfds, __timeout); if (retval == 0) { - if (__timeout) { + if (__timeout != nullptr) { usleep(DHCP_SEL_WAIT_TIMEOUTS * 1000); LOGD("select time out."); } @@ -99,8 +118,8 @@ int __wrap_select(int __nfds, fd_set *__readfds, fd_set *__writefds, fd_set *__e return __real_select(__nfds, __readfds, __writefds, __exceptfds, __timeout); } -int __real_bind(int __fd, struct sockaddr * __addr, socklen_t __len); -int __wrap_bind(int __fd, struct sockaddr * __addr, socklen_t __len) +int __real_bind(int __fd, struct sockaddr *__addr, socklen_t __len); +int __wrap_bind(int __fd, struct sockaddr *__addr, socklen_t __len) { LOGD("==>bind."); if (g_mockTag) { @@ -121,35 +140,63 @@ int __wrap_close(int _fileno) return __real_close(_fileno); } -ssize_t __real_sendto(int __fd, const void *__buf, size_t __n, int __flags, struct sockaddr *__addr, - socklen_t __addr_len); -ssize_t __wrap_sendto(int __fd, const void *__buf, size_t __n, int __flags, struct sockaddr *__addr, - socklen_t __addr_len) +ssize_t recvfrom(int __fd, void *__buf, size_t __n, int __flags, struct sockaddr *__addr, socklen_t *__addr_len) { - LOGD("==>sendto."); + LOGD("==>recvfrom."); if (g_mockTag) { LOGD(" ==>mock enable."); - return SystemFuncMock::GetInstance().sendto(__fd, __buf, __n, __flags, __addr, __addr_len); + if (DhcpMsgManager::GetInstance().SendTotal() > 0 && __buf) { + LOGD("== new message received."); + DhcpMessage msg = { 0 }; + if (DhcpMsgManager::GetInstance().FrontSendMsg(&msg)) { + memcpy_s(__buf, __n, &msg, sizeof(DhcpMessage)); + DhcpMsgManager::GetInstance().PopSendMsg(); + uint32_t srcIp = DhcpMsgManager::GetInstance().GetClientIp(); + if (__addr != nullptr && srcIp != 0) { + struct sockaddr_in *sAddr = (struct sockaddr_in *)__addr; + sAddr->sin_addr.s_addr = HostToNetwork(srcIp); + DhcpMsgManager::GetInstance().SetClientIp(0); + } + return sizeof(DhcpMessage); + } + } } - return __real_sendto(__fd, __buf, __n, __flags, __addr, __addr_len); + return SystemFuncMock::GetInstance().recvfrom(__fd, __buf, __n, __flags, __addr, __addr_len); } -ssize_t __real_recvfrom(int __fd, void *__buf, size_t __n, int __flags, struct sockaddr *__addr, - socklen_t *__addr_len); - -ssize_t __wrap_recvfrom(int __fd, void *__buf, size_t __n, int __flags, struct sockaddr *__addr, - socklen_t *__addr_len) +int ParseMockOptions(DhcpMessage *packet) { - LOGD("==>recvfrom."); + if (packet == nullptr) { + LOGD("dhcp message pointer is null."); + return RET_FAILED; + } + DhcpMsgInfo reply; + if (memset_s(&reply, sizeof(DhcpMsgInfo), 0, sizeof(DhcpMsgInfo)) != EOK) { + LOGD("failed to reset dhcp message info."); + return RET_FAILED; + } + int retval = RET_FAILED; + if (memcpy_s(&reply.packet, sizeof(reply.packet), packet, sizeof(DhcpMessage)) != EOK) { + LOGD("failed to fill dhcp message."); + return RET_FAILED; + } + reply.length = sizeof(DhcpMessage); + if (InitOptionList(&reply.options) != RET_SUCCESS) { + LOGD("failed to init dhcp option list."); + return retval; + } + FreeOptionList(&reply.options); + return retval; +} +ssize_t sendto(int __fd, const void *__buf, size_t __n, int __flags, struct sockaddr *__addr, socklen_t __addr_len) +{ + LOGD("==>sendto."); if (g_mockTag) { LOGD(" ==>mock enable."); - if (DhcpMsgManager::GetInstance().SendTotal() > 0) { - LOGD("== new message received."); - usleep(150 * 1000); - DhcpMsgManager::GetInstance().PopSendMsg(); + if (__buf == nullptr) { + return SystemFuncMock::GetInstance().sendto(__fd, __buf, __n, __flags, __addr, __addr_len); } - return SystemFuncMock::GetInstance().recvfrom(__fd, __buf, __n, __flags, __addr, __addr_len); } - return __real_recvfrom(__fd, __buf, __n, __flags, __addr, __addr_len); + return SystemFuncMock::GetInstance().sendto(__fd, __buf, __n, __flags, __addr, __addr_len); } } \ No newline at end of file diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/system_func_mock.h b/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/system_func_mock.h index 65be403..13b6ebf 100644 --- a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/system_func_mock.h +++ b/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/system_func_mock.h @@ -20,9 +20,12 @@ #include #include #include -#include #include +#ifdef __OHOS__ +typedef int socklen_t; +#endif // __OHOS__ + using ::testing::_; using ::testing::Return; @@ -35,6 +38,7 @@ public: MOCK_METHOD5(select, int(int __nfds, fd_set *__readfds, fd_set *__writefds, fd_set *__exceptfds, struct timeval *__timeout)); MOCK_METHOD3(bind, int(int __fd, struct sockaddr *__addr, socklen_t __len)); + MOCK_METHOD6(sendto, ssize_t(int __fd, const void *__buf, size_t __n, int __flags, struct sockaddr *__addr, socklen_t __addr_len)); MOCK_METHOD6(recvfrom, ssize_t(int __fd, void *__buf, size_t __n, int __flags, struct sockaddr *__addr, diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_p2p_hal_interface_test.cpp b/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_p2p_hal_interface_test.cpp index 0757340..5f024dc 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_p2p_hal_interface_test.cpp +++ b/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_p2p_hal_interface_test.cpp @@ -318,7 +318,7 @@ HWTEST_F(WifiP2pHalInterfaceTest, P2pFlush_SUCCESS, TestSize.Level1) HWTEST_F(WifiP2pHalInterfaceTest, Connect_SUCCESS, TestSize.Level1) { - WifiP2pConfig config; + WifiP2pConfigInternal config; bool isJoinExistingGroup = false; std::string pin; EXPECT_EQ(WifiErrorNo::WIFI_IDL_OPT_INVALID_PARAM, @@ -346,7 +346,7 @@ HWTEST_F(WifiP2pHalInterfaceTest, CancelConnect_SUCCESS, TestSize.Level1) HWTEST_F(WifiP2pHalInterfaceTest, ProvisionDiscovery_SUCCESS, TestSize.Level1) { - WifiP2pConfig config; + WifiP2pConfigInternal config; EXPECT_EQ(WifiErrorNo::WIFI_IDL_OPT_OK, WifiP2PHalInterface::GetInstance().ProvisionDiscovery(config)); } diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manager_service_test.cpp b/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manager_service_test.cpp index 7afe40a..13cf9a9 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manager_service_test.cpp +++ b/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manager_service_test.cpp @@ -196,7 +196,7 @@ HWTEST_F(WifiManagerServiceTest, P2pConnectionChangeTest, TestSize.Level1) IP2pServiceCallbacks cbk = WifiManager::GetInstance().GetP2pCallback(); ASSERT_TRUE(cbk.OnP2pConnectionChangedEvent != nullptr); - WifiP2pInfo info; + WifiP2pLinkedInfo info; cbk.OnP2pConnectionChangedEvent(info); sleep(1); } diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_mock_p2p_service.cpp b/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_mock_p2p_service.cpp index 6a54dee..bc9036e 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_mock_p2p_service.cpp +++ b/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_mock_p2p_service.cpp @@ -243,11 +243,11 @@ ErrCode WifiMockP2pService::P2pConnect(const WifiP2pConfig &config) LOGI("config.GetGroupOwnerIntent() = %d\n", config.GetGroupOwnerIntent()); LOGI("config.GetGroupName() = %s\n", config.GetGroupName().c_str()); - WifiP2pInfo connInfo; - connInfo.SetGroupFormed(true); - connInfo.SetIsGroupOwner(true); - connInfo.SetIsGroupOwnerAddress("IsGroupOwnerAddress"); - mCallback.OnP2pConnectionChangedEvent(connInfo); + WifiP2pLinkedInfo linkedInfo; + linkedInfo.SetGroupFormed(true); + linkedInfo.SetIsGroupOwner(true); + linkedInfo.SetIsGroupOwnerAddress("IsGroupOwnerAddress"); + mCallback.OnP2pConnectionChangedEvent(linkedInfo); return WIFI_OPT_SUCCESS; } @@ -257,12 +257,12 @@ ErrCode WifiMockP2pService::P2pDisConnect() return WIFI_OPT_SUCCESS; } -ErrCode WifiMockP2pService::QueryP2pInfo(WifiP2pInfo &connInfo) +ErrCode WifiMockP2pService::QueryP2pLinkedInfo(WifiP2pLinkedInfo &linkedInfo) { - LOGI("Mock_p2p:QueryP2pInfo"); - connInfo.SetGroupFormed(true); - connInfo.SetIsGroupOwner(true); - connInfo.SetIsGroupOwnerAddress("IsGroupOwnerAddress"); + LOGI("Mock_p2p:QueryP2pLinkedInfo"); + linkedInfo.SetGroupFormed(true); + linkedInfo.SetIsGroupOwner(true); + linkedInfo.SetIsGroupOwnerAddress("IsGroupOwnerAddress"); return WIFI_OPT_SUCCESS; } diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_mock_p2p_service.h b/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_mock_p2p_service.h index 23f0969..01bdc20 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_mock_p2p_service.h +++ b/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_mock_p2p_service.h @@ -42,7 +42,7 @@ public: ErrCode DeleteGroup(const WifiP2pGroupInfo &group); ErrCode P2pConnect(const WifiP2pConfig &config); ErrCode P2pDisConnect(); - ErrCode QueryP2pInfo(WifiP2pInfo &connInfo); + ErrCode QueryP2pLinkedInfo(WifiP2pLinkedInfo &linkedInfo); ErrCode GetCurrentGroup(WifiP2pGroupInfo &group); ErrCode GetP2pEnableStatus(int &status); ErrCode GetP2pDiscoverStatus(int &status); diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn index 7e99e7a..ccd322e 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn @@ -13,24 +13,59 @@ import("//build/test.gni") SUBSYSTEM_DIR = "//foundation/communication" -module_output_path = "wifi_standard/ap_test" - config("module_private_config") { visibility = [ ":*" ] include_dirs = [ "//utils/native/base/include", - "$SUBSYSTEM_DIR/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/test", + "$SUBSYSTEM_DIR/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap", ] } - ohos_unittest("WifiApServiceTest") { - module_out_path = module_output_path - sources = [ "wifi_ap_service_test.cpp" ] - + module_out_path = "wifi_standard/ap_test" + sources = [ + "./Mock/mock_network_interface.cpp", + "./Mock/mock_system_interface.cpp", + "./Mock/mock_wifi_ap_hal_interface.cpp", + "./Mock/mock_wifi_settings.cpp", + "./Mock/operator_overload.cpp", + "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_msg.cpp", + "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log/log_helper.c", + "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/base_address.cpp", + "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/dhcpd_interface.cpp", + "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.cpp", + "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.cpp", + "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp", + "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp", + "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/handler.cpp", + "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/internal_message.cpp", + "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.cpp", + "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state.cpp", + "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp", + "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use.cpp", + "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_idle_state.cpp", + "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor.cpp", + "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_root_state.cpp", + "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.cpp", + "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.cpp", + "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine.cpp", + "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager.cpp", + "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager.cpp", + "ap_config_use_test.cpp", + "ap_idle_state_test.cpp", + "ap_monitor_test.cpp", + "ap_root_state_test.cpp", + "ap_service_test.cpp", + "ap_started_state_test.cpp", + "ap_state_machine_test.cpp", + "ap_stations_manager_test.cpp", + "global_test.cpp", + "wifi_ap_nat_manager_test.cpp", + "wifi_ap_test.cpp", + ] include_dirs = [ "./", - "../..", - "../Mock/", + "../", + "./Mock/", "//utils/native/base/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces", @@ -39,6 +74,7 @@ ohos_unittest("WifiApServiceTest") { "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper", "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/config", "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log", + "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/utils", "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/include", "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap", "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage", @@ -48,12 +84,16 @@ ohos_unittest("WifiApServiceTest") { "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include", "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/interfaces", "//third_party/googletest/googlemock/include", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/utils", + "//third_party/googletest/googletest/include", + ] + ldflags = [ + "-fPIC", + "-Wl,-E", + "-Wl,--wrap=system", + "--coverage", ] - deps = [ - "//foundation/communication/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_dhcp_nat:WifiApNatManagerTest", - "//foundation/communication/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_hotspot_test:WifiHotspotTest", + "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service:dhcp_manager_service", "//third_party/googletest:gmock_main", "//utils/native/base:utils", ] diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_state_machine.h b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_state_machine.h index ce4ddd5..d9f7e36 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_state_machine.h +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_state_machine.h @@ -35,6 +35,7 @@ public: MOCK_METHOD1(RegisterApServiceCallbacks, ErrCode(const IApServiceCallbacks &callbacks)); MOCK_METHOD0(StartDhcpServer, bool()); MOCK_METHOD0(StopDhcpServer, bool()); + MOCK_METHOD1(GetConnectedStationInfo, bool(std::map &result)); }; } // namespace Wifi } // namespace OHOS diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_network_interface.cpp b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_network_interface.cpp index 1425a00..eb834c7 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_network_interface.cpp +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_network_interface.cpp @@ -23,6 +23,11 @@ bool IsValidInterfaceName(const std::string &interfaceName) return MockNetworkInterface::GetInstance().IsValidInterfaceName(interfaceName); } +bool IsInterfaceUp(const std::string &interfaceName) +{ + return MockNetworkInterface::GetInstance().IsInterfaceUp(interfaceName); +} + void Dump(const std::string &interfaceName) { MockNetworkInterface::GetInstance().Dump(interfaceName); diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_network_interface.h b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_network_interface.h index 64fada9..5d82c2c 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_network_interface.h +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_network_interface.h @@ -29,6 +29,7 @@ namespace Wifi { class MockNetworkInterface { public: MOCK_METHOD1(IsValidInterfaceName, bool(const std::string &interfaceName)); + MOCK_METHOD1(IsInterfaceUp, bool(const std::string &interfaceName)); MOCK_METHOD1(Dump, void(const std::string &interfaceName)); MOCK_METHOD4(FetchInterfaceConfig, @@ -47,8 +48,8 @@ public: static MockNetworkInterface &GetInstance(void); private: - MockNetworkInterface(){} - ~MockNetworkInterface(){} + MockNetworkInterface() {} + ~MockNetworkInterface() {} }; } // namespace Wifi } // namespace OHOS diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_hotspot_test/ap_config_use_test.cpp b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use_test.cpp similarity index 82% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_hotspot_test/ap_config_use_test.cpp rename to tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use_test.cpp index 5ef03b5..565c8ca 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_hotspot_test/ap_config_use_test.cpp +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use_test.cpp @@ -25,6 +25,7 @@ using ::testing::DoAll; using ::testing::Eq; using ::testing::Return; using ::testing::StrEq; +using ::testing::ext::TestSize; namespace OHOS { namespace Wifi { @@ -35,12 +36,16 @@ std::map> ChanTbs; class ApConfigUse_Test : public testing::Test { public: - static void SetUpTestCase() - {} - static void TearDownTestCase() - {} + static void SetUpTestCase() {} + static void TearDownTestCase() {} virtual void SetUp() { + allowed5GFreq.clear(); + allowed2GFreq.clear(); + allowed2GChan.clear(); + allowed5GChan.clear(); + allowedFreqCom.clear(); + ChanTbs.clear(); const int testFreq1 = 2412; const int testFreq2 = 2417; const int testFreq3 = 2472; @@ -82,12 +87,14 @@ public: } virtual void TearDown() { - allowed2GFreq.clear(); allowed5GFreq.clear(); + allowed2GFreq.clear(); allowed2GChan.clear(); allowed5GChan.clear(); - + allowedFreqCom.clear(); + ChanTbs.clear(); delete pApConfigUse; + pApConfigUse = nullptr; } public: @@ -95,7 +102,7 @@ public: }; /* TransformFrequencyIntoChannel */ -TEST_F(ApConfigUse_Test, TransformFrequencyIntoChannel) +HWTEST_F(ApConfigUse_Test, TransformFrequencyIntoChannel, TestSize.Level1) { const int testFreq1 = 2412; const int testFreq2 = 2417; @@ -130,7 +137,7 @@ TEST_F(ApConfigUse_Test, TransformFrequencyIntoChannel) EXPECT_EQ(-1, pApConfigUse->TransformFrequencyIntoChannel(testFreq05)); } /* TransformFrequencyIntoChannel_overload */ -TEST_F(ApConfigUse_Test, TransformFrequencyIntoChannel_1) +HWTEST_F(ApConfigUse_Test, TransformFrequencyIntoChannel_1, TestSize.Level1) { const int testFreq1 = 2412; const int testFreq2 = 2417; @@ -160,7 +167,7 @@ TEST_F(ApConfigUse_Test, TransformFrequencyIntoChannel_1) EXPECT_EQ(FreqVector1, FreqVector); } /* SetConfig */ -TEST_F(ApConfigUse_Test, LogConfig_SUCCESS) +HWTEST_F(ApConfigUse_Test, LogConfig_SUCCESS, TestSize.Level1) { HotspotConfig apConfig; apConfig.SetBand(BandType::BAND_2GHZ); @@ -170,7 +177,7 @@ TEST_F(ApConfigUse_Test, LogConfig_SUCCESS) } /* IsValid24GHz */ -TEST_F(ApConfigUse_Test, IsValid24GHz) +HWTEST_F(ApConfigUse_Test, IsValid24GHz, TestSize.Level1) { EXPECT_FALSE(pApConfigUse->IsValid24GHz(2400)); EXPECT_FALSE(pApConfigUse->IsValid24GHz(2500)); @@ -179,7 +186,7 @@ TEST_F(ApConfigUse_Test, IsValid24GHz) EXPECT_FALSE(pApConfigUse->IsValid24GHz(2499)); } /* IsValid5GHz */ -TEST_F(ApConfigUse_Test, IsValid5GHz) +HWTEST_F(ApConfigUse_Test, IsValid5GHz, TestSize.Level1) { EXPECT_FALSE(pApConfigUse->IsValid5GHz(4900)); EXPECT_FALSE(pApConfigUse->IsValid5GHz(5169)); @@ -189,32 +196,32 @@ TEST_F(ApConfigUse_Test, IsValid5GHz) } /* CheckBandChannel */ -TEST_F(ApConfigUse_Test, CheckBandChannel_1) +HWTEST_F(ApConfigUse_Test, CheckBandChannel_1, TestSize.Level1) { HotspotConfig apConfig; apConfig.SetBand(BandType::BAND_2GHZ); apConfig.SetChannel(2); HotspotConfig apConfig1 = apConfig; - std::vector band_2G_channel = {1, 2, 3, 4, 5, 6, 7}; - std::vector band_5G_channel = {149, 168, 169}; - ChannelsTable ChannelsTb = {{BandType::BAND_2GHZ, band_2G_channel}, {BandType::BAND_5GHZ, band_5G_channel}}; + std::vector band_2G_channel = { 1, 2, 3, 4, 5, 6, 7 }; + std::vector band_5G_channel = { 149, 168, 169 }; + ChannelsTable ChannelsTb = { { BandType::BAND_2GHZ, band_2G_channel }, { BandType::BAND_5GHZ, band_5G_channel } }; pApConfigUse->CheckBandChannel(apConfig, ChannelsTb); EXPECT_EQ(apConfig1, apConfig); } -TEST_F(ApConfigUse_Test, CheckBandChannel_2) +HWTEST_F(ApConfigUse_Test, CheckBandChannel_2, TestSize.Level1) { HotspotConfig apConfig; apConfig.SetBand(BandType::BAND_2GHZ); apConfig.SetChannel(9); - std::vector band_2G_channel = {1, 2, 3, 4, 5, 6, 7}; - std::vector band_5G_channel = {149, 168, 169}; - ChannelsTable ChannelsTb = {{BandType::BAND_2GHZ, band_2G_channel}, {BandType::BAND_5GHZ, band_5G_channel}}; + std::vector band_2G_channel = { 1, 2, 3, 4, 5, 6, 7 }; + std::vector band_5G_channel = { 149, 168, 169 }; + ChannelsTable ChannelsTb = { { BandType::BAND_2GHZ, band_2G_channel }, { BandType::BAND_5GHZ, band_5G_channel } }; pApConfigUse->CheckBandChannel(apConfig, ChannelsTb); EXPECT_EQ(apConfig.GetChannel(), 6); EXPECT_EQ(apConfig.GetBand(), BandType::BAND_2GHZ); } -TEST_F(ApConfigUse_Test, CheckBandChannel_3) +HWTEST_F(ApConfigUse_Test, CheckBandChannel_3, TestSize.Level1) { HotspotConfig apConfig; ChannelsTable ChannelsTb; @@ -222,5 +229,5 @@ TEST_F(ApConfigUse_Test, CheckBandChannel_3) EXPECT_EQ(apConfig.GetChannel(), 6); EXPECT_EQ(apConfig.GetBand(), BandType::BAND_2GHZ); } -} // namespace Wifi -} // namespace OHOS \ No newline at end of file +} // namespace Wifi +} // namespace OHOS \ No newline at end of file diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_hotspot_test/ap_idle_state_test.cpp b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_idle_state_test.cpp similarity index 73% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_hotspot_test/ap_idle_state_test.cpp rename to tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_idle_state_test.cpp index 73a20c2..0acaed8 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_hotspot_test/ap_idle_state_test.cpp +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_idle_state_test.cpp @@ -23,71 +23,83 @@ using namespace OHOS; using ::testing::_; using ::testing::Return; +using ::testing::ext::TestSize; namespace OHOS { namespace Wifi { class ApIdleState_test : public testing::Test { public: - static void SetUpTestCase() - {} - static void TearDownTestCase() - {} + static void SetUpTestCase() {} + static void TearDownTestCase() {} virtual void SetUp() { + const int SLEEP_TIEM = 20; pMockPendant = new MockPendant(); pMockPendant->GetMockApStateMachine().InitialStateMachine(); + pApIdleState = new ApIdleState(pMockPendant->GetMockApStateMachine()); + + msg = new InternalMessage(); + usleep(SLEEP_TIEM); } virtual void TearDown() { - EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_)) - .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); delete pApIdleState; + pApIdleState = nullptr; + delete pMockPendant; + pMockPendant = nullptr; + + delete msg; + + msg = nullptr; } public: MockPendant *pMockPendant; + ApIdleState *pApIdleState; + + InternalMessage *msg; }; -TEST_F(ApIdleState_test, ExecuteStateMsg_SUCCESS) +HWTEST_F(ApIdleState_test, GoInState, TestSize.Level1) +{ + pApIdleState->GoInState(); +} +HWTEST_F(ApIdleState_test, GoOutState, TestSize.Level1) { - InternalMessage *msg = new InternalMessage(); + pApIdleState->GoOutState(); +} + +HWTEST_F(ApIdleState_test, ExecuteStateMsg_SUCCESS, TestSize.Level1) +{ + EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_)) + .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); + msg->SetMessageName(static_cast(ApStatemachineEvent::CMD_UPDATE_HOTSPOTCONFIG_RESULT)); + EXPECT_TRUE(pApIdleState->ExecuteStateMsg(msg)); msg->SetMessageName(static_cast(ApStatemachineEvent::CMD_START_HOTSPOT)); + EXPECT_TRUE(pApIdleState->ExecuteStateMsg(msg)); - delete msg; } -TEST_F(ApIdleState_test, ExecuteStateMsg_FAILED) +HWTEST_F(ApIdleState_test, ExecuteStateMsg_FAILED, TestSize.Level1) { - InternalMessage *msg = new InternalMessage(); - msg->SetMessageName(static_cast(ApStatemachineEvent::CMD_SET_HOTSPOT_CONFIG)); + EXPECT_FALSE(pApIdleState->ExecuteStateMsg(msg)); msg->SetMessageName(static_cast(ApStatemachineEvent::CMD_DISCONNECT_STATION)); - EXPECT_FALSE(pApIdleState->ExecuteStateMsg(msg)); - msg = nullptr; EXPECT_FALSE(pApIdleState->ExecuteStateMsg(msg)); - delete msg; -} - -TEST_F(ApIdleState_test, GoInState) -{ - pApIdleState->GoInState(); -} -TEST_F(ApIdleState_test, GoOutState) -{ - pApIdleState->GoOutState(); + EXPECT_FALSE(pApIdleState->ExecuteStateMsg(nullptr)); } -} // namespace Wifi -} // namespace OHOS \ No newline at end of file +} // namespace Wifi +} // namespace OHOS \ No newline at end of file diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_hotspot_test/ap_monitor_test.cpp b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor_test.cpp similarity index 57% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_hotspot_test/ap_monitor_test.cpp rename to tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor_test.cpp index dcef929..cf68865 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_hotspot_test/ap_monitor_test.cpp +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor_test.cpp @@ -25,6 +25,7 @@ using ::testing::DoAll; using ::testing::Eq; using ::testing::Return; using ::testing::TypedEq; +using ::testing::ext::TestSize; namespace OHOS { namespace Wifi { @@ -39,19 +40,16 @@ const int AP_DISABLE = 110; const int AP_FAILED = 111; class ApMonitor_Test : public testing::Test { public: - static void SetUpTestCase() - {} - static void TearDownTestCase() - {} + static void SetUpTestCase() {} + static void TearDownTestCase() {} virtual void SetUp() { pApMonitor = new ApMonitor(); } virtual void TearDown() { - EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_)) - .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); delete pApMonitor; + pApMonitor = nullptr; } public: @@ -67,61 +65,80 @@ public: /* StationChangeEvent */ -TEST_F(ApMonitor_Test, StationChangeEvent_JOIN) +HWTEST_F(ApMonitor_Test, StationChangeEvent_JOIN, TestSize.Level1) { + EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_)) + .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); const int type = 105; - EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_)).WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); pApMonitor->StartMonitor(); WifiApConnectionNofify cInfo; cInfo.type = type; cInfo.mac = "AA:BB:CC:DD:EE:FF"; pApMonitor->OnStaJoinOrLeave(cInfo); } -TEST_F(ApMonitor_Test, StationChangeEvent_LEAVE) +HWTEST_F(ApMonitor_Test, StationChangeEvent_LEAVE, TestSize.Level1) { + EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_)) + .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); const int type = 106; + pApMonitor->StartMonitor(); WifiApConnectionNofify cInfo; cInfo.type = type; cInfo.mac = "AA:BB:CC:DD:EE:FF"; pApMonitor->OnStaJoinOrLeave(cInfo); } -TEST_F(ApMonitor_Test, StationChangeEvent_NULL) +HWTEST_F(ApMonitor_Test, StationChangeEvent_NULL, TestSize.Level1) { + EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_)) + .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); + pApMonitor->StartMonitor(); WifiApConnectionNofify cInfo; pApMonitor->OnStaJoinOrLeave(cInfo); } /* OnHotspotStateEvent */ -TEST_F(ApMonitor_Test, OnHotspotStateEvent_ENABLE) +HWTEST_F(ApMonitor_Test, OnHotspotStateEvent_ENABLE, TestSize.Level1) { + EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_)) + .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); + pApMonitor->StartMonitor(); pApMonitor->OnHotspotStateEvent(AP_ENABLE); } -TEST_F(ApMonitor_Test, OnHotspotStateEvent_DISABLE) +HWTEST_F(ApMonitor_Test, OnHotspotStateEvent_DISABLE, TestSize.Level1) { + EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_)) + .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); + pApMonitor->StartMonitor(); pApMonitor->OnHotspotStateEvent(AP_DISABLE); } -TEST_F(ApMonitor_Test, OnHotspotStateEvent_FAILED) +HWTEST_F(ApMonitor_Test, OnHotspotStateEvent_FAILED, TestSize.Level1) { + EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_)) + .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); + pApMonitor->StartMonitor(); pApMonitor->OnHotspotStateEvent(AP_FAILED); } /* StartMonitor */ -TEST_F(ApMonitor_Test, StartMonitor_SUCCESS) +HWTEST_F(ApMonitor_Test, StartMonitor_SUCCESS, TestSize.Level1) { - EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_)).WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); + EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_)) + .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); pApMonitor->StartMonitor(); } /* StopMonitor */ -TEST_F(ApMonitor_Test, StopMonitor_SUCCESS) +HWTEST_F(ApMonitor_Test, StopMonitor_SUCCESS, TestSize.Level1) { - EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(An())) - .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); + EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_)) + .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); pApMonitor->StopMonitor(); } /* UnregisterHandler */ -TEST_F(ApMonitor_Test, UnregisterHandler_SUCCESS) +HWTEST_F(ApMonitor_Test, UnregisterHandler_SUCCESS, TestSize.Level1) { + EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_)) + .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); WraUnregisterHandler("wlan1"); } } // namespace Wifi diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_hotspot_test/ap_root_state_test.cpp b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_root_state_test.cpp similarity index 73% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_hotspot_test/ap_root_state_test.cpp rename to tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_root_state_test.cpp index 907b174..36301ed 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_hotspot_test/ap_root_state_test.cpp +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_root_state_test.cpp @@ -21,15 +21,20 @@ #include "ap_root_state.h" using namespace OHOS; +using ::testing::_; +using ::testing::An; +using ::testing::DoAll; +using ::testing::Eq; +using ::testing::Return; +using ::testing::TypedEq; +using ::testing::ext::TestSize; namespace OHOS { namespace Wifi { class ApRootState_test : public testing::Test { public: - static void SetUpTestCase() - {} - static void TearDownTestCase() - {} + static void SetUpTestCase() {} + static void TearDownTestCase() {} virtual void SetUp() { pApRootState = new ApRootState(); @@ -37,13 +42,14 @@ public: virtual void TearDown() { delete pApRootState; + pApRootState = nullptr; } public: ApRootState *pApRootState; }; -TEST_F(ApRootState_test, ExecuteStateMsg_SUCCESS) +HWTEST_F(ApRootState_test, ExecuteStateMsg_SUCCESS, TestSize.Level1) { InternalMessage *msg = new InternalMessage(); @@ -55,21 +61,20 @@ TEST_F(ApRootState_test, ExecuteStateMsg_SUCCESS) msg->SetMessageName(static_cast(ApStatemachineEvent::CMD_SET_HOTSPOT_CONFIG)); EXPECT_TRUE(pApRootState->ExecuteStateMsg(msg)); - delete msg; + msg = nullptr; } -TEST_F(ApRootState_test, ExecuteStateMsg_FAILED) +HWTEST_F(ApRootState_test, ExecuteStateMsg_FAILED, TestSize.Level1) { - InternalMessage *msg = nullptr; - EXPECT_FALSE(pApRootState->ExecuteStateMsg(msg)); + EXPECT_FALSE(pApRootState->ExecuteStateMsg(nullptr)); } -TEST_F(ApRootState_test, GoInState) +HWTEST_F(ApRootState_test, GoInState, TestSize.Level1) { pApRootState->GoInState(); } -TEST_F(ApRootState_test, GoOutState) +HWTEST_F(ApRootState_test, GoOutState, TestSize.Level1) { pApRootState->GoOutState(); } diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_hotspot_test/ap_service_test.cpp b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service_test.cpp similarity index 62% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_hotspot_test/ap_service_test.cpp rename to tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service_test.cpp index 745f1ea..1b88536 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_hotspot_test/ap_service_test.cpp +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service_test.cpp @@ -29,6 +29,7 @@ using ::testing::Return; using ::testing::SetArgReferee; using ::testing::StrEq; using ::testing::TypedEq; +using ::testing::ext::TestSize; namespace OHOS { namespace Wifi { @@ -39,30 +40,26 @@ const StationInfo staInfo = { }; class ApService_test : public testing::Test { public: - static void SetUpTestCase() - {} - static void TearDownTestCase() - {} + static void SetUpTestCase() {} + static void TearDownTestCase() {} virtual void SetUp() { + const int SLEEP_TIME = 20; pMockPendant = new MockPendant(); - pApStateMachine = &(pMockPendant->GetMockApStateMachine()); - pApStateMachine->InitialStateMachine(); - pApService = new ApService(*pApStateMachine); - - const int testMaxConn = 10; - const int channel = 6; + pMockPendant->GetMockApStateMachine().InitialStateMachine(); + pApService = new ApService(pMockPendant->GetMockApStateMachine()); + int testMaxConn = 10; + int channel = 6; apInfo.SetSsid(std::string("TEST")); apInfo.SetPreSharedKey(std::string("123456789")); apInfo.SetSecurityType(KeyMgmt::WPA2_PSK); apInfo.SetBand(BandType::BAND_2GHZ); apInfo.SetChannel(channel); apInfo.SetMaxConn(testMaxConn); + usleep(SLEEP_TIME); } virtual void TearDown() { - EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_)) - .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); delete pApService; pApService = nullptr; delete pMockPendant; @@ -77,43 +74,54 @@ public: public: MockPendant *pMockPendant; - MockApStateMachine *pApStateMachine; ApService *pApService; HotspotConfig apInfo; }; /* EnableHotspot */ -TEST_F(ApService_test, EnableHotspot_SUCCESS) +HWTEST_F(ApService_test, EnableHotspot_SUCCESS, TestSize.Level1) { + EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_)) + .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); EXPECT_EQ(ErrCode::WIFI_OPT_SUCCESS, pApService->EnableHotspot()); } /* DisableHotspot */ -TEST_F(ApService_test, DisableHotspotSUCCESS) +HWTEST_F(ApService_test, DisableHotspotSUCCESS, TestSize.Level1) { + EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_)) + .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); EXPECT_EQ(ErrCode::WIFI_OPT_SUCCESS, pApService->DisableHotspot()); } /* SetHotspotConfig */ -TEST_F(ApService_test, SetHotspotConfig_SUCCESS) +HWTEST_F(ApService_test, SetHotspotConfig_SUCCESS, TestSize.Level1) { + EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_)) + .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); EXPECT_EQ(ErrCode::WIFI_OPT_SUCCESS, pApService->SetHotspotConfig(apInfo)); } /* AddBlockList */ -TEST_F(ApService_test, AddBlockList_SUCCESS) +HWTEST_F(ApService_test, AddBlockList_SUCCESS, TestSize.Level1) { + EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_)) + .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); EXPECT_EQ(ErrCode::WIFI_OPT_SUCCESS, pApService->AddBlockList(staInfo)); } /* DelBlockList */ -TEST_F(ApService_test, DelBlockList_SUCCESS) +HWTEST_F(ApService_test, DelBlockList_SUCCESS, TestSize.Level1) { + EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_)) + .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); EXPECT_EQ(ErrCode::WIFI_OPT_SUCCESS, pApService->DelBlockList(staInfo)); } /* DisconnetStation */ -TEST_F(ApService_test, DisconnetStation_SUCCESS) +HWTEST_F(ApService_test, DisconnetStation_SUCCESS, TestSize.Level1) { + EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_)) + .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); EXPECT_EQ(ErrCode::WIFI_OPT_SUCCESS, pApService->DisconnetStation(staInfo)); } /* GetValidBands */ -TEST_F(ApService_test, GetValidBands_SUCCESS) +HWTEST_F(ApService_test, GetValidBands_SUCCESS, TestSize.Level1) { std::vector vecSta; std::vector temp = { @@ -123,10 +131,12 @@ TEST_F(ApService_test, GetValidBands_SUCCESS) EXPECT_CALL(WifiSettings::GetInstance(), GetValidBands(Eq(vecSta))) .WillOnce(DoAll(SetArgReferee<0>(temp), Return(0))); + EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_)) + .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); EXPECT_EQ(ErrCode::WIFI_OPT_SUCCESS, pApService->GetValidBands(vecSta)); EXPECT_EQ(temp, vecSta); } -TEST_F(ApService_test, GetValidBands_FAILED) +HWTEST_F(ApService_test, GetValidBands_FAILED, TestSize.Level1) { std::vector vecSta; std::vector temp = { @@ -136,17 +146,20 @@ TEST_F(ApService_test, GetValidBands_FAILED) EXPECT_CALL(WifiSettings::GetInstance(), GetValidBands(Eq(vecSta))) .WillOnce(DoAll(SetArgReferee<0>(temp), Return(-1))); + EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_)) + .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); EXPECT_EQ(ErrCode::WIFI_OPT_FAILED, pApService->GetValidBands(vecSta)); } /* GetValidChannels */ -TEST_F(ApService_test, GetValidChannels_SUCCESS) +HWTEST_F(ApService_test, GetValidChannels_SUCCESS, TestSize.Level1) { std::vector vecChannels; - std::vector band_2G_channel = {1, 2, 3, 4, 5, 6, 7}; - std::vector band_5G_channel = {149, 168, 169}; - ChannelsTable temp = {{BandType::BAND_2GHZ, band_2G_channel}, {BandType::BAND_5GHZ, band_5G_channel}}; - + std::vector band_2G_channel = { 1, 2, 3, 4, 5, 6, 7 }; + std::vector band_5G_channel = { 149, 168, 169 }; + ChannelsTable temp = { { BandType::BAND_2GHZ, band_2G_channel }, { BandType::BAND_5GHZ, band_5G_channel } }; + EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_)) + .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); EXPECT_CALL(WifiSettings::GetInstance(), GetValidChannels(_)).WillOnce(DoAll(SetArgReferee<0>(temp), Return(0))); EXPECT_EQ(ErrCode::WIFI_OPT_SUCCESS, pApService->GetValidChannels(BandType::BAND_2GHZ, vecChannels)); EXPECT_EQ(vecChannels, band_2G_channel); @@ -162,8 +175,10 @@ TEST_F(ApService_test, GetValidChannels_SUCCESS) } /* RegisterApServiceCallbacks */ -TEST_F(ApService_test, RegisterApServiceCallbacks_SUCCESS) +HWTEST_F(ApService_test, RegisterApServiceCallbacks_SUCCESS, TestSize.Level1) { + EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_)) + .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); IApServiceCallbacks callbacks; EXPECT_EQ(ErrCode::WIFI_OPT_SUCCESS, WarpRegisterApServiceCallbacks(callbacks)); } diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_hotspot_test/ap_started_state_test.cpp b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state_test.cpp similarity index 91% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_hotspot_test/ap_started_state_test.cpp rename to tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state_test.cpp index 8412fe0..401da0a 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_hotspot_test/ap_started_state_test.cpp +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state_test.cpp @@ -37,88 +37,107 @@ using ::testing::Eq; using ::testing::Return; using ::testing::SetArgReferee; using ::testing::StrEq; +using ::testing::ext::TestSize; namespace OHOS { namespace Wifi { -const std::string mac = "AA:BB:CC:DD:EE:FF"; -static StationInfo staInfo = { - "test_deviceName", - mac.c_str(), - "127.0.0.1", -}; - -HotspotConfig apcfg; -ChannelsTable channelTbs; -const int TEST_AP_CHANNEL = 6; -const int TEST_MAX_CONN = 10; - -std::vector valueList = { - { - "test_deviceName", - "DA:BB:CC:DD:EE:FF", - "127.0.0.3", - }, - { - "test_deviceName", - "DA:BB:CC:DD:EE:FF", - "127.0.0.3", - }, -}; - class ApStartedState_test : public testing::Test { public: - static void SetUpTestCase() - {} - static void TearDownTestCase() - {} + static void SetUpTestCase() {} + static void TearDownTestCase() {} virtual void SetUp() { - WifiSettings::GetInstance(); - WifiApHalInterface::GetInstance(); - + const int SLEEP_TIME = 20; pMockPendant = new MockPendant(); + + pMockApStateMachine = &(pMockPendant->GetMockApStateMachine()); + + pMockApStateMachine->InitialStateMachine(); + pMockApMonitor = &(pMockPendant->GetMockApMonitor()); + pMockApStationsManager = &(pMockPendant->GetMockApStationsManager()); - pMockApStateMachine = &(pMockPendant->GetMockApStateMachine()); + pMockApConfigUse = &(pMockPendant->GetMockApConfigUse()); - pMockApStateMachine->InitialStateMachine(); + pMockApNatManager = new MockWifiApNatManager(); pApStartedState = new ApStartedState(*pMockApStateMachine, *pMockApConfigUse, *pMockApMonitor); msg = new InternalMessage(); + apcfg.SetSsid(std::string("UnitTestAp")); + apcfg.SetPreSharedKey(std::string("123456789")); + apcfg.SetSecurityType(KeyMgmt::WPA2_PSK); + apcfg.SetBand(BandType::BAND_2GHZ); + apcfg.SetChannel(TEST_AP_CHANNEL); + apcfg.SetMaxConn(TEST_MAX_CONN); - WrapHotspotConfig() = apcfg; - std::vector band_2G_channel = {1, 2, 3, 4, 5, 6, 7}; - std::vector band_5G_channel = {149, 168, 169}; - channelTbs = {{BandType::BAND_2GHZ, band_2G_channel}, {BandType::BAND_5GHZ, band_5G_channel}}; + mac = "AA:BB:CC:DD:EE:FF"; + + staInfo = { + "test_deviceName", + mac.c_str(), + "127.0.0.1", + }; + + TEST_AP_CHANNEL = 6; + + TEST_MAX_CONN = 10; + + valueList = { + { + "test_deviceName", + "DA:BB:CC:DD:EE:FF", + "127.0.0.3", + }, + { + "test_deviceName", + "DA:BB:CC:DD:EE:FF", + "127.0.0.3", + }, + }; + + std::vector band_2G_channel = { 1, 2, 3, 4, 5, 6, 7 }; + + std::vector band_5G_channel = { 149, 168, 169 }; + + channelTbs = { { BandType::BAND_2GHZ, band_2G_channel }, { BandType::BAND_5GHZ, band_5G_channel } }; + + EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_)) + .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); + usleep(SLEEP_TIME); } virtual void TearDown() { - EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_)) - .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); delete pApStartedState; - delete pMockPendant; - pApStartedState = nullptr; + delete pMockPendant; + pMockPendant = nullptr; + pMockApStateMachine = nullptr; + pMockApConfigUse = nullptr; + pMockApMonitor = nullptr; + pMockApStationsManager = nullptr; delete pMockApNatManager; + pMockApNatManager = nullptr; delete msg; + + msg = nullptr; } public: @@ -219,12 +238,30 @@ public: MockPendant *pMockPendant; MockApStationsManager *pMockApStationsManager; + MockApStateMachine *pMockApStateMachine; + MockApMonitor *pMockApMonitor; + MockApConfigUse *pMockApConfigUse; + MockWifiApNatManager *pMockApNatManager; + + std::string mac; + + StationInfo staInfo; + + ChannelsTable channelTbs; + + int TEST_AP_CHANNEL; + + int TEST_MAX_CONN; + + std::vector valueList; + + HotspotConfig apcfg; }; -TEST_F(ApStartedState_test, GoInState_SUCCESS) +HWTEST_F(ApStartedState_test, GoInState_SUCCESS,TestSize.Level1) { std::vector results; EXPECT_CALL(MockNetworkInterface::GetInstance(), FetchIpAddress(_, _, _)).WillRepeatedly(Return(true)); @@ -256,7 +293,7 @@ TEST_F(ApStartedState_test, GoInState_SUCCESS) .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); pApStartedState->GoInState(); } -TEST_F(ApStartedState_test, GoInState_FAILED1) +HWTEST_F(ApStartedState_test, GoInState_FAILED1,TestSize.Level1) { std::vector results; EXPECT_CALL(WifiSettings::GetInstance(), SetHotspotState(A())).WillRepeatedly(Return(0)); @@ -314,8 +351,9 @@ TEST_F(ApStartedState_test, GoInState_FAILED1) EXPECT_CALL(*pMockApNatManager, EnableInterfaceNat(_, _, _)).WillRepeatedly(Return(false)); pApStartedState->GoInState(); } -TEST_F(ApStartedState_test, GoOutState_SUCCESS) +HWTEST_F(ApStartedState_test, GoOutState_SUCCESS, TestSize.Level1) { + pApStartedState->GoOutState(); EXPECT_CALL(MockSystemInterface::GetInstance(), system(_)).WillRepeatedly(Return(true)); EXPECT_CALL(MockNetworkInterface::GetInstance(), IsValidInterfaceName(_)).WillRepeatedly(Return(true)); @@ -327,10 +365,10 @@ TEST_F(ApStartedState_test, GoOutState_SUCCESS) EXPECT_CALL(WifiSettings::GetInstance(), ClearStationList()).WillRepeatedly(Return(0)); EXPECT_CALL(WifiSettings::GetInstance(), ClearValidChannels()).WillRepeatedly(Return(0)); EXPECT_CALL(*pMockApMonitor, StopMonitor()).WillRepeatedly(Return()); - pApStartedState->GoOutState(); } -TEST_F(ApStartedState_test, GoOutState_FAILED) +HWTEST_F(ApStartedState_test, GoOutState_FAILED, TestSize.Level1) { + pApStartedState->GoOutState(); EXPECT_CALL(MockSystemInterface::GetInstance(), system(_)).WillRepeatedly(Return(true)); EXPECT_CALL(WifiSettings::GetInstance(), SetHotspotState(A())).WillRepeatedly(Return(0)); EXPECT_CALL(*pMockApNatManager, EnableInterfaceNat(Eq(false), _, _)).WillRepeatedly(Return(false)); @@ -339,9 +377,8 @@ TEST_F(ApStartedState_test, GoOutState_FAILED) EXPECT_CALL(WifiSettings::GetInstance(), ClearStationList()).WillRepeatedly(Return(0)); EXPECT_CALL(WifiSettings::GetInstance(), ClearValidChannels()).WillRepeatedly(Return(0)); EXPECT_CALL(*pMockApMonitor, StopMonitor()).WillRepeatedly(Return()); - pApStartedState->GoOutState(); } -TEST_F(ApStartedState_test, ExecuteStateMsg_SUCCESS) +HWTEST_F(ApStartedState_test, ExecuteStateMsg_SUCCESS, TestSize.Level1) { msg->SetMessageName(static_cast(ApStatemachineEvent::CMD_FAIL)); EXPECT_TRUE(pApStartedState->ExecuteStateMsg(msg)); @@ -395,7 +432,7 @@ TEST_F(ApStartedState_test, ExecuteStateMsg_SUCCESS) EXPECT_TRUE(pApStartedState->ExecuteStateMsg(msg)); } -TEST_F(ApStartedState_test, ExecuteStateMsg_SUCCESS2) +HWTEST_F(ApStartedState_test, ExecuteStateMsg_SUCCESS2, TestSize.Level1) { msg->ClearMessageBody(); msg->SetMessageName(static_cast(ApStatemachineEvent::CMD_UPDATE_HOTSPOTCONFIG_RESULT)); @@ -406,9 +443,7 @@ TEST_F(ApStartedState_test, ExecuteStateMsg_SUCCESS2) msg->AddIntMessageBody(apcfg.GetChannel()); msg->AddIntMessageBody(apcfg.GetMaxConn()); msg->SetParam1(1); - EXPECT_CALL(WifiSettings::GetInstance(), SetHotspotConfig(Eq(apcfg))).WillRepeatedly(Return(1)); msg->SetMessageName(static_cast(ApStatemachineEvent::CMD_UPDATE_HOTSPOTCONFIG_RESULT)); - EXPECT_TRUE(pApStartedState->ExecuteStateMsg(msg)); msg->SetParam1(0); msg->SetMessageName(static_cast(ApStatemachineEvent::CMD_UPDATE_HOTSPOTCONFIG_RESULT)); @@ -450,13 +485,11 @@ TEST_F(ApStartedState_test, ExecuteStateMsg_SUCCESS2) .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); EXPECT_TRUE(pApStartedState->ExecuteStateMsg(msg)); } -TEST_F(ApStartedState_test, ExecuteStateMsg_FAILED) +HWTEST_F(ApStartedState_test, ExecuteStateMsg_FAILED, TestSize.Level1) { msg->SetMessageName(static_cast(ApStatemachineEvent::CMD_START_HOTSPOT)); EXPECT_FALSE(pApStartedState->ExecuteStateMsg(msg)); - - msg = nullptr; - EXPECT_FALSE(pApStartedState->ExecuteStateMsg(msg)); + EXPECT_FALSE(pApStartedState->ExecuteStateMsg(nullptr)); } } // namespace Wifi } // namespace OHOS \ No newline at end of file diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_hotspot_test/ap_state_machine_test.cpp b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine_test.cpp similarity index 94% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_hotspot_test/ap_state_machine_test.cpp rename to tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine_test.cpp index da1621e..01e1802 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_hotspot_test/ap_state_machine_test.cpp +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine_test.cpp @@ -30,12 +30,11 @@ namespace OHOS { namespace Wifi { class ApStateMachine_test : public testing::Test { public: - static void SetUpTestCase() - {} - static void TearDownTestCase() - {} + static void SetUpTestCase() {} + static void TearDownTestCase() {} virtual void SetUp() { + const int SLEEP_TIME = 20; pMockPendant = new MockPendant(); pMockApStationsManager = &(pMockPendant->GetMockApStationsManager()); pMockApRootState = &(pMockPendant->GetMockApRootState()); @@ -45,18 +44,18 @@ public: pMockPendant->GetMockApStateMachine().InitialStateMachine(); - pApStateMachine = new ApStateMachine( - *pMockApStationsManager, *pMockApRootState, *pMockApIdleState, *pMockApStartedState, *pMockApMonitor); + pApStateMachine = new ApStateMachine(*pMockApStationsManager, *pMockApRootState, *pMockApIdleState, + *pMockApStartedState, *pMockApMonitor); pApStateMachine->InitialStateMachine(); RegisterApServiceCallbacks(); + EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_)) + .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); + usleep(SLEEP_TIME); } virtual void TearDown() { - EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_)) - .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); delete pApStateMachine; - delete pMockPendant; pMockPendant = nullptr; pApStateMachine = nullptr; diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_hotspot_test/ap_stations_manager_test.cpp b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager_test.cpp similarity index 85% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_hotspot_test/ap_stations_manager_test.cpp rename to tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager_test.cpp index 13e3ef8..d73a0a4 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_hotspot_test/ap_stations_manager_test.cpp +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager_test.cpp @@ -29,6 +29,7 @@ using ::testing::DoAll; using ::testing::Eq; using ::testing::Return; using ::testing::StrEq; +using ::testing::ext::TestSize; namespace OHOS { namespace Wifi { @@ -50,10 +51,8 @@ StationInfo value2 = { }; class ApStationsManager_test : public testing::Test { public: - static void SetUpTestCase() - {} - static void TearDownTestCase() - {} + static void SetUpTestCase() {} + static void TearDownTestCase() {} virtual void SetUp() { pApStaMgr = new ApStationsManager(); @@ -78,14 +77,14 @@ public: ApStationsManager *pApStaMgr; }; /* AddBlockList */ -TEST_F(ApStationsManager_test, AddBlockList_SUCCESS) +HWTEST_F(ApStationsManager_test, AddBlockList_SUCCESS, TestSize.Level1) { EXPECT_CALL(WifiApHalInterface::GetInstance(), AddBlockByMac(StrEq(staInfo.bssid))) .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); EXPECT_TRUE(pApStaMgr->AddBlockList(staInfo)); } -TEST_F(ApStationsManager_test, AddBlockList_FAILED) +HWTEST_F(ApStationsManager_test, AddBlockList_FAILED, TestSize.Level1) { EXPECT_CALL(WifiApHalInterface::GetInstance(), AddBlockByMac(StrEq(staInfo.bssid))) .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_FAILED)); @@ -94,14 +93,14 @@ TEST_F(ApStationsManager_test, AddBlockList_FAILED) } /* DelBlockList */ -TEST_F(ApStationsManager_test, DelBlockList_SUCCESS) +HWTEST_F(ApStationsManager_test, DelBlockList_SUCCESS, TestSize.Level1) { EXPECT_CALL(WifiApHalInterface::GetInstance(), DelBlockByMac(StrEq(staInfo.bssid))) .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); EXPECT_TRUE(pApStaMgr->DelBlockList(staInfo)); } -TEST_F(ApStationsManager_test, DelBlockList_FAILED) +HWTEST_F(ApStationsManager_test, DelBlockList_FAILED, TestSize.Level1) { EXPECT_CALL(WifiApHalInterface::GetInstance(), DelBlockByMac(StrEq(staInfo.bssid))) .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_FAILED)); @@ -110,7 +109,7 @@ TEST_F(ApStationsManager_test, DelBlockList_FAILED) } /* EnableAllBlockList */ -TEST_F(ApStationsManager_test, EnableAllBlockList_SUCCESS) +HWTEST_F(ApStationsManager_test, EnableAllBlockList_SUCCESS, TestSize.Level1) { std::vector value; std::vector valueCom; @@ -119,11 +118,10 @@ TEST_F(ApStationsManager_test, EnableAllBlockList_SUCCESS) EXPECT_CALL(WifiSettings::GetInstance(), GetBlockList(Eq(valueCom))) .WillOnce(DoAll(testing::SetArgReferee<0>(value), Return(0))); EXPECT_CALL(WifiApHalInterface::GetInstance(), AddBlockByMac(An())) - .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)) - .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); + .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); EXPECT_TRUE(pApStaMgr->EnableAllBlockList()); } -TEST_F(ApStationsManager_test, EnableAllBlockList_FAILED0) +HWTEST_F(ApStationsManager_test, EnableAllBlockList_FAILED0, TestSize.Level1) { std::vector value; std::vector valueCom; @@ -133,7 +131,7 @@ TEST_F(ApStationsManager_test, EnableAllBlockList_FAILED0) .WillOnce(DoAll(testing::SetArgReferee<0>(value), Return(-1))); EXPECT_FALSE(pApStaMgr->EnableAllBlockList()); } -TEST_F(ApStationsManager_test, EnableAllBlockList_FAILED1) +HWTEST_F(ApStationsManager_test, EnableAllBlockList_FAILED1, TestSize.Level1) { std::vector value; std::vector valueCom; @@ -148,7 +146,7 @@ TEST_F(ApStationsManager_test, EnableAllBlockList_FAILED1) } /* StationLeave */ -TEST_F(ApStationsManager_test, StationLeave) +HWTEST_F(ApStationsManager_test, StationLeave, TestSize.Level1) { StationInfo value3 = { "test_deviceName", @@ -165,7 +163,7 @@ TEST_F(ApStationsManager_test, StationLeave) EXPECT_CALL(WifiSettings::GetInstance(), ManageStation(Eq(value2), Eq(1))).WillOnce(Return(0)); pApStaMgr->StationLeave(value1.bssid); } -TEST_F(ApStationsManager_test, StationLeave1) +HWTEST_F(ApStationsManager_test, StationLeave1, TestSize.Level1) { std::vector valueList; std::vector valueCom; @@ -182,7 +180,7 @@ TEST_F(ApStationsManager_test, StationLeave1) pApStaMgr->StationLeave(value1.bssid); EXPECT_STREQ("AA:BB:CC:DD:EE:FF", Mac.c_str()); } -TEST_F(ApStationsManager_test, StationLeave2) +HWTEST_F(ApStationsManager_test, StationLeave2, TestSize.Level1) { std::vector valueList; std::vector valueCom; @@ -202,7 +200,7 @@ TEST_F(ApStationsManager_test, StationLeave2) } /* StationJoin */ -TEST_F(ApStationsManager_test, StationJoin1) +HWTEST_F(ApStationsManager_test, StationJoin1, TestSize.Level1) { std::vector valueCom; std::vector valueList; @@ -217,7 +215,7 @@ TEST_F(ApStationsManager_test, StationJoin1) .WillOnce(DoAll(testing::SetArgReferee<0>(valueList), Return(1))); pApStaMgr->StationJoin(value3); } -TEST_F(ApStationsManager_test, StationJoin2) +HWTEST_F(ApStationsManager_test, StationJoin2, TestSize.Level1) { std::vector valueList; std::vector valueCom; @@ -233,7 +231,7 @@ TEST_F(ApStationsManager_test, StationJoin2) EXPECT_CALL(WifiSettings::GetInstance(), ManageStation(Eq(value3), 0)).WillOnce(Return(0)); pApStaMgr->StationJoin(value3); } -TEST_F(ApStationsManager_test, StationJoin3) +HWTEST_F(ApStationsManager_test, StationJoin3, TestSize.Level1) { std::vector valueList; std::vector valueCom; @@ -249,7 +247,7 @@ TEST_F(ApStationsManager_test, StationJoin3) EXPECT_CALL(WifiSettings::GetInstance(), ManageStation(Eq(value3), 0)).WillOnce(Return(1)); pApStaMgr->StationJoin(value3); } -TEST_F(ApStationsManager_test, StationJoin4) +HWTEST_F(ApStationsManager_test, StationJoin4, TestSize.Level1) { std::vector valueList; std::vector valueCom; @@ -265,7 +263,7 @@ TEST_F(ApStationsManager_test, StationJoin4) EXPECT_CALL(WifiSettings::GetInstance(), ManageStation(Eq(value3), 0)).WillOnce(Return(0)); pApStaMgr->StationJoin(value3); } -TEST_F(ApStationsManager_test, StationJoin5) +HWTEST_F(ApStationsManager_test, StationJoin5, TestSize.Level1) { std::vector valueList; std::vector valueCom; @@ -282,14 +280,14 @@ TEST_F(ApStationsManager_test, StationJoin5) pApStaMgr->StationJoin(value3); } /* DisConnectStation */ -TEST_F(ApStationsManager_test, DisConnectStion_SUCCESS) +HWTEST_F(ApStationsManager_test, DisConnectStion_SUCCESS, TestSize.Level1) { EXPECT_CALL(WifiApHalInterface::GetInstance(), DisconnectStaByMac(StrEq(Mac))) .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); EXPECT_TRUE(pApStaMgr->DisConnectStation(staInfo)); } -TEST_F(ApStationsManager_test, DisConnectStion_FAILED) +HWTEST_F(ApStationsManager_test, DisConnectStion_FAILED, TestSize.Level1) { EXPECT_CALL(WifiApHalInterface::GetInstance(), DisconnectStaByMac(StrEq(Mac))) .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_FAILED)); @@ -298,7 +296,7 @@ TEST_F(ApStationsManager_test, DisConnectStion_FAILED) } /* GetAllConnectedStations */ -TEST_F(ApStationsManager_test, GetAllConnectedStations_SUCCESS) +HWTEST_F(ApStationsManager_test, GetAllConnectedStations_SUCCESS, TestSize.Level1) { std::vector staMacList; std::vector staMacListCom; @@ -311,7 +309,7 @@ TEST_F(ApStationsManager_test, GetAllConnectedStations_SUCCESS) EXPECT_EQ(staMacList, pApStaMgr->GetAllConnectedStations()); } -TEST_F(ApStationsManager_test, GetAllConnectedStations_FAILED) +HWTEST_F(ApStationsManager_test, GetAllConnectedStations_FAILED, TestSize.Level1) { std::vector staMacList; std::vector staMacListCom; @@ -326,24 +324,24 @@ TEST_F(ApStationsManager_test, GetAllConnectedStations_FAILED) } /* AddAssociationStation */ -TEST_F(ApStationsManager_test, AddAssociationStation_SUCCESS) +HWTEST_F(ApStationsManager_test, AddAssociationStation_SUCCESS, TestSize.Level1) { EXPECT_CALL(WifiSettings::GetInstance(), ManageStation(Eq(staInfo), Eq(0))).WillOnce(Return(0)); EXPECT_TRUE(WrapAddAssociationStation(staInfo)); } -TEST_F(ApStationsManager_test, AddAssociationStation_FAILED) +HWTEST_F(ApStationsManager_test, AddAssociationStation_FAILED, TestSize.Level1) { EXPECT_CALL(WifiSettings::GetInstance(), ManageStation(Eq(staInfo), Eq(0))).WillOnce(Return(-1)); EXPECT_FALSE(WrapAddAssociationStation(staInfo)); } /* DelAssociationStation */ -TEST_F(ApStationsManager_test, DelAssociationStation_SUCCESS) +HWTEST_F(ApStationsManager_test, DelAssociationStation_SUCCESS, TestSize.Level1) { EXPECT_CALL(WifiSettings::GetInstance(), ManageStation(Eq(staInfo), Eq(1))).WillOnce(Return(0)); EXPECT_TRUE(WrapDelAssociationStation(staInfo)); } -TEST_F(ApStationsManager_test, DelAssociationStation_FAILED) +HWTEST_F(ApStationsManager_test, DelAssociationStation_FAILED, TestSize.Level1) { EXPECT_CALL(WifiSettings::GetInstance(), ManageStation(Eq(staInfo), Eq(1))).WillOnce(Return(-1)); EXPECT_FALSE(WrapDelAssociationStation(staInfo)); diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_dhcp_nat/BUILD.gn b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_dhcp_nat/BUILD.gn deleted file mode 100644 index cc4a8d0..0000000 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_dhcp_nat/BUILD.gn +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright (C) 2021 Huawei Device Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import("//build/test.gni") -SUBSYSTEM_DIR = "//foundation/communication" -config("module_private_config") { - visibility = [ ":*" ] - include_dirs = [ - "//utils/native/base/include", - "$SUBSYSTEM_DIR/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/test/wifi_ap_dhcp_nat", - ] -} - -ohos_unittest("WifiApNatManagerTest") { - module_out_path = "wifi_standard/ap_test" - sources = [ - "../Mock/mock_network_interface.cpp", - "../Mock/mock_system_interface.cpp", - "../global_test.cpp", - "../wifi_ap_test.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log/log_helper.c", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/base_address.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager.cpp", - "wifi_ap_nat_manager_test.cpp", - ] - - include_dirs = [ - "./", - "../../", - "../Mock/", - "//utils/native/base/include", - "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", - "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces", - "//foundation/communication/wifi/services/wifi_standard/ipc_framework/cRPC/include", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/include", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/config", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/utils", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/include", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/interfaces", - "//third_party/googletest/googlemock/include", - "//third_party/googletest/googletest/include", - ] - ldflags = [ - "-fPIC", - "-Wl,-E", - "-Wl,--wrap=system", - "--coverage", - ] - deps = [ - "//third_party/googletest:gmock_main", - "//utils/native/base:utils", - ] - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] - part_name = "wifi_standard" - subsystem_name = "communication" -} -group("unittest") { - testonly = true - deps = [] - deps += [ ":WifiApNatManagerTest" ] -} diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_dhcp_nat/global_test.cpp b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_dhcp_nat/global_test.cpp deleted file mode 100644 index e3d7891..0000000 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_dhcp_nat/global_test.cpp +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "global_test.h" -void GlobalTest::SetUp() -{ - printf("GlobalTest SetUp\n"); -} -void GlobalTest::TearDown() -{ - printf("GlobalTest TearDown\n"); -} \ No newline at end of file diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_dhcp_nat/global_test.h b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_dhcp_nat/global_test.h deleted file mode 100644 index 65afff0..0000000 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_dhcp_nat/global_test.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (c) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef GLOBAL_TEST_H -#define GLOBAL_TEST_H -#include -class GlobalTest : public testing::Environment { -public: - virtual void SetUp(); - virtual void TearDown(); -}; -#endif \ No newline at end of file diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_dhcp_nat/wifi_ap_test.cpp b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_dhcp_nat/wifi_ap_test.cpp deleted file mode 100644 index e2e4b1c..0000000 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_dhcp_nat/wifi_ap_test.cpp +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (c) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "global_test.h" -#include - -int main(int argc, char *argv[]) -{ - testing::InitGoogleTest(&argc, argv); - testing::Environment *env = new GlobalTest(); - testing::AddGlobalTestEnvironment(env); - return RUN_ALL_TESTS(); -} \ No newline at end of file diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_dhcp_nat/wifi_ap_nat_manager_test.cpp b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager_test.cpp similarity index 84% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_dhcp_nat/wifi_ap_nat_manager_test.cpp rename to tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager_test.cpp index 79d18f4..0ef574f 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_dhcp_nat/wifi_ap_nat_manager_test.cpp +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager_test.cpp @@ -24,19 +24,16 @@ using ::testing::_; using ::testing::Return; +using ::testing::ext::TestSize; namespace OHOS { namespace Wifi { class WifiApNatManager_test : public testing::Test { public: - static void SetUpTestCase() - {} - static void TearDownTestCase() - {} - virtual void SetUp() - {} - virtual void TearDown() - {} + static void SetUpTestCase() {} + static void TearDownTestCase() {} + virtual void SetUp() {} + virtual void TearDown() {} public: bool WrapSetForwarding(bool enable) @@ -67,7 +64,7 @@ public: WifiApNatManager mApNatManager; }; -TEST_F(WifiApNatManager_test, EnableInterfaceNat_SUCCESS) +HWTEST_F(WifiApNatManager_test, EnableInterfaceNat_SUCCESS, TestSize.Level1) { int fd = 10; MockSystemInterface::SetMockFlag(true); @@ -84,7 +81,7 @@ TEST_F(WifiApNatManager_test, EnableInterfaceNat_SUCCESS) EXPECT_FALSE(mApNatManager.EnableInterfaceNat(true, std::string(""), ifc1)); } -TEST_F(WifiApNatManager_test, DisableInterfaceNat_SUCCESS) +HWTEST_F(WifiApNatManager_test, DisableInterfaceNat_SUCCESS, TestSize.Level1) { int fd = 10; MockSystemInterface::SetMockFlag(true); @@ -99,52 +96,49 @@ TEST_F(WifiApNatManager_test, DisableInterfaceNat_SUCCESS) EXPECT_FALSE(mApNatManager.EnableInterfaceNat(false, badifc, ifc1)); EXPECT_FALSE(mApNatManager.EnableInterfaceNat(false, std::string(""), ifc1)); + MockSystemInterface::SetMockFlag(false); } -TEST_F(WifiApNatManager_test, SetForwarding_SUCCESS) +HWTEST_F(WifiApNatManager_test, SetForwarding_SUCCESS, TestSize.Level1) { EXPECT_TRUE(WrapSetForwarding(true)); EXPECT_TRUE(WrapSetForwarding(false)); } -TEST_F(WifiApNatManager_test, SetInterfaceRoute_SUCCESS) +HWTEST_F(WifiApNatManager_test, SetInterfaceRoute_SUCCESS, TestSize.Level1) { int fd = 10; MockSystemInterface::SetMockFlag(true); EXPECT_CALL(MockSystemInterface::GetInstance(), system(_)).WillOnce(Return(-1)).WillRepeatedly(Return(fd)); EXPECT_TRUE(WrapSetInterfaceRoute(true)); EXPECT_TRUE(WrapSetInterfaceRoute(false)); + MockSystemInterface::SetMockFlag(false); } -TEST_F(WifiApNatManager_test, SetInterfaceNat_SUCCESS) +HWTEST_F(WifiApNatManager_test, SetInterfaceNat_SUCCESS, TestSize.Level1) { int fd = 10; MockSystemInterface::SetMockFlag(true); EXPECT_CALL(MockSystemInterface::GetInstance(), system(_)).WillOnce(Return(-1)).WillRepeatedly(Return(fd)); EXPECT_TRUE(WrapSetInterfaceNat(true, ifc2)); EXPECT_TRUE(WrapSetInterfaceNat(false, ifc2)); + MockSystemInterface::SetMockFlag(false); } -TEST_F(WifiApNatManager_test, WriteDataToFile_SUCCESS) +HWTEST_F(WifiApNatManager_test, WriteDataToFile_SUCCESS, TestSize.Level1) { std::string filename = "./test.txt"; std::string context = "1234567890"; MockSystemInterface::SetMockFlag(true); - /* EXPECT_CALL(MockSystemInterface::GetInstance(), write(_, _, _)) - .WillOnce(Return(-1)) - .WillRepeatedly(Return(context.size())); */ -// EXPECT_CALL(MockSystemInterface::GetInstance(), close(_)).WillRepeatedly(Return(1)); - EXPECT_TRUE(WrapWriteDataToFile(filename, context)); EXPECT_TRUE(WrapWriteDataToFile(filename, context)); EXPECT_TRUE(WrapWriteDataToFile(filename, context)); MockSystemInterface::SetMockFlag(false); } - -TEST_F(WifiApNatManager_test, ExecCommand_SUCCESS) +HWTEST_F(WifiApNatManager_test, ExecCommand_SUCCESS, TestSize.Level1) { MockSystemInterface::SetMockFlag(true); std::vector str; @@ -155,5 +149,5 @@ TEST_F(WifiApNatManager_test, ExecCommand_SUCCESS) MockSystemInterface::SetMockFlag(false); } -} // namespace Wifi -} // namespace OHOS \ No newline at end of file +} // namespace Wifi +} // namespace OHOS \ No newline at end of file diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_hotspot_test/BUILD.gn b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_hotspot_test/BUILD.gn deleted file mode 100644 index 874995c..0000000 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_hotspot_test/BUILD.gn +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright (C) 2021 Huawei Device Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import("//build/test.gni") -SUBSYSTEM_DIR = "//foundation/communication" -config("module_private_config") { - visibility = [ ":*" ] - include_dirs = [ - "//utils/native/base/include", - "$SUBSYSTEM_DIR/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/test/wifi_hotspot_test", - ] -} -ohos_unittest("WifiHotspotTest") { - module_out_path = "wifi_standard/ap_test" - sources = [ - "../Mock/mock_network_interface.cpp", - "../Mock/mock_system_interface.cpp", - "../Mock/mock_wifi_ap_hal_interface.cpp", - "../Mock/mock_wifi_settings.cpp", - "../Mock/operator_overload.cpp", - "../global_test.cpp", - "../wifi_ap_test.cpp", - "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_msg.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log/log_helper.c", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/base_address.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/dhcpd_interface.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/handler.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/internal_message.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_idle_state.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_root_state.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager.cpp", - "ap_config_use_test.cpp", - "ap_idle_state_test.cpp", - "ap_monitor_test.cpp", - "ap_root_state_test.cpp", - "ap_service_test.cpp", - "ap_started_state_test.cpp", - "ap_state_machine_test.cpp", - "ap_stations_manager_test.cpp", - ] - ldflags = [ - "-fPIC", - "-Wl,-E", - "-Wl,--wrap=system", - "--coverage", - ] - include_dirs = [ - "./", - "../../", - "../Mock/", - "//utils/native/base/include", - "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", - "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces", - "//foundation/communication/wifi/services/wifi_standard/ipc_framework/cRPC/include", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/include", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/config", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/utils", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/include", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/interfaces", - "//third_party/googletest/googlemock/include", - "//third_party/googletest/googletest/include", - ] - - deps = [ - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service:dhcp_manager_service", - "//third_party/googletest:gmock_main", - "//utils/native/base:utils", - ] - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] - part_name = "wifi_standard" - subsystem_name = "communication" -} -group("unittest") { - testonly = true - deps = [] - deps += [ ":WifiHotspotTest" ] -} diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_hotspot_test/global_test.cpp b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_hotspot_test/global_test.cpp deleted file mode 100644 index e3d7891..0000000 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_hotspot_test/global_test.cpp +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "global_test.h" -void GlobalTest::SetUp() -{ - printf("GlobalTest SetUp\n"); -} -void GlobalTest::TearDown() -{ - printf("GlobalTest TearDown\n"); -} \ No newline at end of file diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_hotspot_test/global_test.h b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_hotspot_test/global_test.h deleted file mode 100644 index 65afff0..0000000 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_hotspot_test/global_test.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (c) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef GLOBAL_TEST_H -#define GLOBAL_TEST_H -#include -class GlobalTest : public testing::Environment { -public: - virtual void SetUp(); - virtual void TearDown(); -}; -#endif \ No newline at end of file diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_hotspot_test/wifi_ap_test.cpp b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_hotspot_test/wifi_ap_test.cpp deleted file mode 100644 index e2e4b1c..0000000 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_hotspot_test/wifi_ap_test.cpp +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (c) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "global_test.h" -#include - -int main(int argc, char *argv[]) -{ - testing::InitGoogleTest(&argc, argv); - testing::Environment *env = new GlobalTest(); - testing::AddGlobalTestEnvironment(env); - return RUN_ALL_TESTS(); -} \ No newline at end of file diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn index 1dc4744..185555d 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn @@ -25,6 +25,24 @@ ohos_unittest("wifi_p2p_test") { module_out_path = "wifi_standard/p2p_test" sources = [ "./Mock/mock_wifi_p2p_hal_interface.cpp", + "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_msg.cpp", + "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp", + "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp", + "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log/log_helper.c", + "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/base_address.cpp", + "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/dhcpd_interface.cpp", + "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp", + "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.cpp", + "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.cpp", + "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp", + "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/network_interface.cpp", + "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp", + "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/handler.cpp", + "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/internal_message.cpp", + "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.cpp", + "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state.cpp", + "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp", + "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_broadcast_helper.cpp", "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/authorizing_negotiation_request_state.cpp", "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.cpp", "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.cpp", @@ -59,6 +77,7 @@ ohos_unittest("wifi_p2p_test") { "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_request.cpp", "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_response.cpp", "authorizing_negotiation_request_state_test.cpp", + "global_test.cpp", "group_formed_state_test.cpp", "group_negotiation_state_test.cpp", "invitation_recelved_state_test.cpp", @@ -86,33 +105,11 @@ ohos_unittest("wifi_p2p_test") { "wifi_p2p_service_request_list_test.cpp", "wifi_p2p_service_response_list_test.cpp", "wifi_p2p_service_test.cpp", + "wifi_p2p_test_entry.cpp", "wifi_p2p_upnp_service_info_test.cpp", "wifi_p2p_upnp_service_request_test.cpp", "wifi_p2p_upnp_service_response_test.cpp", - #"./Mock/mock_wifi_settings.cpp", - - "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_msg.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log/log_helper.c", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/base_address.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/dhcpd_interface.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/network_interface.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/handler.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/internal_message.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_broadcast_helper.cpp", - "global_test.cpp", - "wifi_p2p_test_entry.cpp", - #"//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/samples/test_all/mock_ui/system_ui.cpp", #"//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/samples/test_all/libaxprintf/xprint.c", #"//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/samples/test_all/libaxprintf/log.c", diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_state_machine.h b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_state_machine.h index 8481876..8f02bd5 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_state_machine.h +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_state_machine.h @@ -36,7 +36,18 @@ public: {} ~MockP2pStateMachine() = default; MOCK_METHOD0(Initialize, void()); - MOCK_METHOD1(IsConfigUnusable, P2pConfigErrCode(const WifiP2pConfig &config)); + MOCK_METHOD1(IsConfigUnusable, P2pConfigErrCode(const WifiP2pConfigInternal &config)); + MOCK_METHOD0(DealGroupCreationFailed, void()); + MOCK_CONST_METHOD2(BroadcastActionResult, void(P2pActionCallback action, ErrCode result)); + MOCK_CONST_METHOD1(BroadcastP2pStatusChanged, void(P2pState state)); + MOCK_CONST_METHOD1(BroadcastThisDeviceChanaged, void(const WifiP2pDevice &device)); + MOCK_CONST_METHOD0(UpdateGroupInfoToWpa, void()); + MOCK_CONST_METHOD0(BroadcastP2pPeersChanged, void()); + MOCK_CONST_METHOD1(ReawakenPersistentGroup, bool(WifiP2pConfigInternal &config)); + MOCK_CONST_METHOD0(UpdatePersistentGroups, void()); + MOCK_METHOD0(StartDhcpServer, bool()); + MOCK_CONST_METHOD2(SetGroupConfig, bool(const WifiP2pConfigInternal &config, bool newGroup)); + MOCK_CONST_METHOD2(DealCreateNewGroupWithConfig, bool(const WifiP2pConfigInternal &config, int freq)); }; } // namespace Wifi } // namespace OHOS diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_hal_interface.h b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_hal_interface.h index 50cb43e..871acea 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_hal_interface.h +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_hal_interface.h @@ -49,9 +49,10 @@ public: virtual WifiErrorNo P2pConfigureListen(bool enable, size_t period, size_t interval) const = 0; virtual WifiErrorNo SetListenChannel(size_t channel, unsigned char regClass) const = 0; virtual WifiErrorNo P2pFlush() const = 0; - virtual WifiErrorNo Connect(const WifiP2pConfig &config, bool isJoinExistingGroup, std::string &pin) const = 0; + virtual WifiErrorNo Connect(const WifiP2pConfigInternal &config, bool isJoinExistingGroup, + std::string &pin) const = 0; virtual WifiErrorNo CancelConnect() const = 0; - virtual WifiErrorNo ProvisionDiscovery(const WifiP2pConfig &config) const = 0; + virtual WifiErrorNo ProvisionDiscovery(const WifiP2pConfigInternal &config) const = 0; virtual WifiErrorNo GroupAdd(bool isPersistent, int networkId, int freq) const = 0; virtual WifiErrorNo GroupRemove(const std::string &groupInterface) const = 0; virtual WifiErrorNo Invite(const WifiP2pGroupInfo &group, const std::string &deviceAddr) const = 0; @@ -105,9 +106,10 @@ public: MOCK_CONST_METHOD3(P2pConfigureListen, WifiErrorNo(bool enable, size_t period, size_t interval)); MOCK_CONST_METHOD2(SetListenChannel, WifiErrorNo(size_t channel, unsigned char regClass)); MOCK_CONST_METHOD0(P2pFlush, WifiErrorNo()); - MOCK_CONST_METHOD3(Connect, WifiErrorNo(const WifiP2pConfig &config, bool isJoinExistingGroup, std::string &pin)); + MOCK_CONST_METHOD3(Connect, + WifiErrorNo(const WifiP2pConfigInternal &config, bool isJoinExistingGroup, std::string &pin)); MOCK_CONST_METHOD0(CancelConnect, WifiErrorNo()); - MOCK_CONST_METHOD1(ProvisionDiscovery, WifiErrorNo(const WifiP2pConfig &)); + MOCK_CONST_METHOD1(ProvisionDiscovery, WifiErrorNo(const WifiP2pConfigInternal &)); MOCK_CONST_METHOD3(GroupAdd, WifiErrorNo(bool isPersistent, int networkId, int freq)); MOCK_CONST_METHOD1(GroupRemove, WifiErrorNo(const std::string &groupInterface)); MOCK_CONST_METHOD2(Invite, WifiErrorNo(const WifiP2pGroupInfo &group, const std::string &deviceAddr)); diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_settings.h b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_settings.h index 7a49e52..004162b 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_settings.h +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_settings.h @@ -53,8 +53,8 @@ public: virtual int SetWifiP2pGroupInfo(const std::vector &groups) = 0; virtual int SetP2pVendorConfig(const P2pVendorConfig &config) = 0; virtual int GetP2pVendorConfig(P2pVendorConfig &config) = 0; - virtual int GetP2pInfo(WifiP2pInfo &connInfo) = 0; - virtual int SaveP2pInfo(WifiP2pInfo &connInfo) = 0; + virtual int GetP2pInfo(WifiP2pLinkedInfo &linkedInfo) = 0; + virtual int SaveP2pInfo(WifiP2pLinkedInfo &linkedInfo) = 0; virtual int GetWifiP2pGroupInfo(std::vector &groups) = 0; }; @@ -64,8 +64,8 @@ public: ~WifiSettings() = default; static WifiSettings &GetInstance(void); MOCK_METHOD1(GetWifiP2pGroupInfo, int(std::vector &groups)); - MOCK_METHOD1(SaveP2pInfo, int(WifiP2pInfo &connInfo)); - MOCK_METHOD1(GetP2pInfo, int(WifiP2pInfo &connInfo)); + MOCK_METHOD1(SaveP2pInfo, int(WifiP2pLinkedInfo &linkedInfo)); + MOCK_METHOD1(GetP2pInfo, int(WifiP2pLinkedInfo &linkedInfo)); MOCK_METHOD1(SetP2pVendorConfig, int(const P2pVendorConfig &config)); MOCK_METHOD1(GetP2pVendorConfig, int(P2pVendorConfig &config)); MOCK_METHOD1(SetWifiP2pGroupInfo, int(const std::vector &groups)); diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/authorizing_negotiation_request_state_test.cpp b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/authorizing_negotiation_request_state_test.cpp index f3b7cbb..46e0bce 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/authorizing_negotiation_request_state_test.cpp +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/authorizing_negotiation_request_state_test.cpp @@ -73,10 +73,12 @@ HWTEST_F(AuthorizingNegotiationRequestStateTest, GoInState, TestSize.Level1) AddSaveP2pConfig(); pAuthorizingNegotlationRequestState->GoInState(); } + HWTEST_F(AuthorizingNegotiationRequestStateTest, GoOutState, TestSize.Level1) { pAuthorizingNegotlationRequestState->GoOutState(); } + HWTEST_F(AuthorizingNegotiationRequestStateTest, ExecuteStateMsg, TestSize.Level1) { AddSaveP2pConfig(); @@ -98,12 +100,14 @@ HWTEST_F(AuthorizingNegotiationRequestStateTest, ExecuteStateMsg1, TestSize.Leve EXPECT_CALL(WifiP2PHalInterface::GetInstance(), P2pStopFind()).WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_FAILED)); pAuthorizingNegotlationRequestState->ExecuteStateMsg(&msg); } + HWTEST_F(AuthorizingNegotiationRequestStateTest, ExecuteStateMsg2, TestSize.Level1) { InternalMessage msg; msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::PEER_CONNECTION_USER_REJECT)); pAuthorizingNegotlationRequestState->ExecuteStateMsg(&msg); } + HWTEST_F(AuthorizingNegotiationRequestStateTest, ExecuteStateMsg3, TestSize.Level1) { InternalMessage msg; @@ -112,6 +116,7 @@ HWTEST_F(AuthorizingNegotiationRequestStateTest, ExecuteStateMsg3, TestSize.Leve .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_FAILED)); pAuthorizingNegotlationRequestState->ExecuteStateMsg(&msg); } + HWTEST_F(AuthorizingNegotiationRequestStateTest, ExecuteStateMsg4, TestSize.Level1) { InternalMessage msg; diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/group_formed_state_test.cpp b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/group_formed_state_test.cpp index 848a9b4..4d4f74d 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/group_formed_state_test.cpp +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/group_formed_state_test.cpp @@ -88,10 +88,12 @@ HWTEST_F(GroupFormedStateTest, GoInState, TestSize.Level1) AddGroupManager(); pGroupFormedState->GoInState(); } + HWTEST_F(GroupFormedStateTest, GoOutState, TestSize.Level1) { pGroupFormedState->GoOutState(); } + HWTEST_F(GroupFormedStateTest, ExecuteStateMsg1, TestSize.Level1) { InternalMessage msg; @@ -105,6 +107,7 @@ HWTEST_F(GroupFormedStateTest, ExecuteStateMsg1, TestSize.Level1) .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_FAILED)); EXPECT_TRUE(pGroupFormedState->ExecuteStateMsg(&msg)); } + HWTEST_F(GroupFormedStateTest, ExecuteStateMsg1break, TestSize.Level1) { InternalMessage msg; @@ -114,6 +117,7 @@ HWTEST_F(GroupFormedStateTest, ExecuteStateMsg1break, TestSize.Level1) msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::AP_STA_CONNECTED)); EXPECT_TRUE(pGroupFormedState->ExecuteStateMsg(&msg)); } + HWTEST_F(GroupFormedStateTest, ExecuteStateMsg2, TestSize.Level1) { InternalMessage msg; @@ -124,6 +128,7 @@ HWTEST_F(GroupFormedStateTest, ExecuteStateMsg2, TestSize.Level1) msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::AP_STA_DISCONNECTED)); EXPECT_TRUE(pGroupFormedState->ExecuteStateMsg(&msg)); } + HWTEST_F(GroupFormedStateTest, ExecuteStateMsg2break, TestSize.Level1) { InternalMessage msg; @@ -134,6 +139,7 @@ HWTEST_F(GroupFormedStateTest, ExecuteStateMsg2break, TestSize.Level1) msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::AP_STA_DISCONNECTED)); EXPECT_TRUE(pGroupFormedState->ExecuteStateMsg(&msg)); } + HWTEST_F(GroupFormedStateTest, ExecuteStateMsg3, TestSize.Level1) { InternalMessage msg; @@ -144,6 +150,7 @@ HWTEST_F(GroupFormedStateTest, ExecuteStateMsg3, TestSize.Level1) msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::P2P_EVENT_DEVICE_LOST)); EXPECT_TRUE(pGroupFormedState->ExecuteStateMsg(&msg)); } + HWTEST_F(GroupFormedStateTest, ExecuteStateMsg3break, TestSize.Level1) { InternalMessage msg; @@ -152,23 +159,26 @@ HWTEST_F(GroupFormedStateTest, ExecuteStateMsg3break, TestSize.Level1) msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::P2P_EVENT_DEVICE_LOST)); EXPECT_TRUE(pGroupFormedState->ExecuteStateMsg(&msg)); } + HWTEST_F(GroupFormedStateTest, ExecuteStateMsg4, TestSize.Level1) { InternalMessage msg; msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::CMD_P2P_DISABLE)); EXPECT_TRUE(pGroupFormedState->ExecuteStateMsg(&msg)); } -HWTEST_F(GroupFormedStateTest, ExecuteStateMsg5, TestSize.Level1) + +HWTEST_F(GroupFormedStateTest, ProcessCmdConnect1, TestSize.Level1) { - WifiP2pConfig config; + WifiP2pConfigInternal config; InternalMessage msg; msg.SetMessageObj(config); msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::CMD_CONNECT)); EXPECT_TRUE(pGroupFormedState->ExecuteStateMsg(&msg)); } -HWTEST_F(GroupFormedStateTest, ExecuteStateMsg6, TestSize.Level1) + +HWTEST_F(GroupFormedStateTest, ProcessCmdConnect2, TestSize.Level1) { - WifiP2pConfig config; + WifiP2pConfigInternal config; AddDeviceManager(); InternalMessage msg; config.SetDeviceAddress("AA:BB:CC:DD:EE:FF"); @@ -178,6 +188,43 @@ HWTEST_F(GroupFormedStateTest, ExecuteStateMsg6, TestSize.Level1) AddDeviceStateMachine(); EXPECT_TRUE(pGroupFormedState->ExecuteStateMsg(&msg)); } + +HWTEST_F(GroupFormedStateTest, ProcessCmdConnect3, TestSize.Level1) +{ + WifiP2pConfigInternal config; + InternalMessage msg; + msg.SetMessageObj(config); + msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::CMD_CONNECT)); + EXPECT_CALL(pMockP2pPendant->GetP2pStateMachine(), IsConfigUnusable(_)) + .WillOnce(Return(P2pConfigErrCode::MAC_EMPTY)); + EXPECT_CALL(pMockP2pPendant->GetP2pStateMachine(), BroadcastActionResult(_, _)).WillOnce(Return()); + EXPECT_TRUE(pGroupFormedState->ExecuteStateMsg(&msg)); +} + +HWTEST_F(GroupFormedStateTest, ProcessCmdConnect4, TestSize.Level1) +{ + WifiP2pConfigInternal config; + InternalMessage msg; + msg.SetMessageObj(config); + msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::CMD_CONNECT)); + EXPECT_CALL(pMockP2pPendant->GetP2pStateMachine(), IsConfigUnusable(_)) + .WillOnce(Return(P2pConfigErrCode::MAC_NOT_FOUND)); + EXPECT_CALL(pMockP2pPendant->GetP2pStateMachine(), BroadcastActionResult(_, _)).WillOnce(Return()); + EXPECT_TRUE(pGroupFormedState->ExecuteStateMsg(&msg)); +} + +HWTEST_F(GroupFormedStateTest, ProcessCmdConnect5, TestSize.Level1) +{ + WifiP2pConfigInternal config; + InternalMessage msg; + msg.SetMessageObj(config); + msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::CMD_CONNECT)); + EXPECT_CALL(pMockP2pPendant->GetP2pStateMachine(), IsConfigUnusable(_)) + .WillOnce(Return(P2pConfigErrCode::ERR_MAC_FORMAT)); + EXPECT_CALL(pMockP2pPendant->GetP2pStateMachine(), BroadcastActionResult(_, _)).WillOnce(Return()); + EXPECT_TRUE(pGroupFormedState->ExecuteStateMsg(&msg)); +} + HWTEST_F(GroupFormedStateTest, ExecuteStateMsg7, TestSize.Level1) { WifiP2pTempDiscEvent procDisc; @@ -189,6 +236,7 @@ HWTEST_F(GroupFormedStateTest, ExecuteStateMsg7, TestSize.Level1) msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::P2P_EVENT_PROV_DISC_PBC_REQ)); EXPECT_TRUE(pGroupFormedState->ExecuteStateMsg(&msg)); } + HWTEST_F(GroupFormedStateTest, ExecuteStateMsg8, TestSize.Level1) { WifiP2pTempDiscEvent procDisc; @@ -200,6 +248,7 @@ HWTEST_F(GroupFormedStateTest, ExecuteStateMsg8, TestSize.Level1) msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::P2P_EVENT_PROV_DISC_ENTER_PIN)); EXPECT_TRUE(pGroupFormedState->ExecuteStateMsg(&msg)); } + HWTEST_F(GroupFormedStateTest, ExecuteStateMsg9, TestSize.Level1) { WifiP2pTempDiscEvent procDisc; @@ -213,6 +262,7 @@ HWTEST_F(GroupFormedStateTest, ExecuteStateMsg9, TestSize.Level1) AddGroupManager(); EXPECT_TRUE(pGroupFormedState->ExecuteStateMsg(&msg)); } + HWTEST_F(GroupFormedStateTest, ExecuteStateMsg9break, TestSize.Level1) { InternalMessage msg; @@ -221,12 +271,14 @@ HWTEST_F(GroupFormedStateTest, ExecuteStateMsg9break, TestSize.Level1) msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::P2P_EVENT_PROV_DISC_SHOW_PIN)); EXPECT_TRUE(pGroupFormedState->ExecuteStateMsg(&msg)); } + HWTEST_F(GroupFormedStateTest, ExecuteStateMsg10, TestSize.Level1) { InternalMessage msg; msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::P2P_EVENT_GROUP_STARTED)); EXPECT_TRUE(pGroupFormedState->ExecuteStateMsg(&msg)); } + HWTEST_F(GroupFormedStateTest, ExecuteStateMsg11, TestSize.Level1) { InternalMessage msg; @@ -235,18 +287,21 @@ HWTEST_F(GroupFormedStateTest, ExecuteStateMsg11, TestSize.Level1) msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::CMD_DEVICE_DISCOVERS)); EXPECT_TRUE(pGroupFormedState->ExecuteStateMsg(&msg)); } + HWTEST_F(GroupFormedStateTest, ExecuteStateMsg12, TestSize.Level1) { InternalMessage msg; msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::P2P_EVENT_GROUP_REMOVED)); EXPECT_TRUE(pGroupFormedState->ExecuteStateMsg(&msg)); } + HWTEST_F(GroupFormedStateTest, ProcessCmdRemoveGroup1, TestSize.Level1) { InternalMessage msg; msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::CMD_REMOVE_GROUP)); EXPECT_TRUE(pGroupFormedState->ExecuteStateMsg(&msg)); } + HWTEST_F(GroupFormedStateTest, ProcessCmdRemoveGroup2, TestSize.Level1) { InternalMessage msg; @@ -256,5 +311,13 @@ HWTEST_F(GroupFormedStateTest, ProcessCmdRemoveGroup2, TestSize.Level1) EXPECT_FALSE(pGroupFormedState->ExecuteStateMsg(&msg)); EXPECT_FALSE(pGroupFormedState->ExecuteStateMsg(nullptr)); } + +HWTEST_F(GroupFormedStateTest, ProcessCmdCancelConnect, TestSize.Level1) +{ + InternalMessage msg; + EXPECT_CALL(pMockP2pPendant->GetP2pStateMachine(), BroadcastActionResult(_, _)).WillOnce(Return()); + msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::CMD_CANCEL_CONNECT)); + EXPECT_TRUE(pGroupFormedState->ExecuteStateMsg(&msg)); +} } // namespace Wifi } // namespace OHOS \ No newline at end of file diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/group_negotiation_state_test.cpp b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/group_negotiation_state_test.cpp index 31a5ac8..9e21ef0 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/group_negotiation_state_test.cpp +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/group_negotiation_state_test.cpp @@ -90,7 +90,7 @@ HWTEST_F(GroupNegotiationStateTest, ExecuteStateMsg1, TestSize.Level1) EXPECT_TRUE(pGroupNegotiationState->ExecuteStateMsg(&msg)); } -HWTEST_F(GroupNegotiationStateTest, ExecuteStateMsg2, TestSize.Level1) +HWTEST_F(GroupNegotiationStateTest, ProcessGroupStartedEvt1, TestSize.Level1) { InternalMessage msg; WifiP2pGroupInfo group; @@ -101,18 +101,18 @@ HWTEST_F(GroupNegotiationStateTest, ExecuteStateMsg2, TestSize.Level1) EXPECT_TRUE(pGroupNegotiationState->ExecuteStateMsg(&msg)); } -HWTEST_F(GroupNegotiationStateTest, ExecuteStateMsg3, TestSize.Level1) +HWTEST_F(GroupNegotiationStateTest, ProcessGroupStartedEvt2, TestSize.Level1) { InternalMessage msg; WifiP2pGroupInfo group; WifiP2pDevice device; - group.SetIsGroupOwner(false); + group.SetIsGroupOwner(true); group.SetIsPersistent(true); device.SetDeviceName("device"); device.SetDeviceAddress("AA:BB:CC:DD:EE:FF"); group.SetOwner(device); msg.SetMessageObj(group); - EXPECT_CALL(WifiP2PHalInterface::GetInstance(), ListNetworks(_)).WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_FAILED)); + EXPECT_CALL(pMockP2pPendant->GetP2pStateMachine(), UpdatePersistentGroups()).WillOnce(Return()); EXPECT_CALL(WifiP2PHalInterface::GetInstance(), SetP2pGroupIdle(_, _)) .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_FAILED)); AddDeviceManager(); @@ -120,7 +120,7 @@ HWTEST_F(GroupNegotiationStateTest, ExecuteStateMsg3, TestSize.Level1) EXPECT_TRUE(pGroupNegotiationState->ExecuteStateMsg(&msg)); } -HWTEST_F(GroupNegotiationStateTest, ExecuteStateMsg4, TestSize.Level1) +HWTEST_F(GroupNegotiationStateTest, ProcessGroupStartedEvt3, TestSize.Level1) { InternalMessage msg; WifiP2pGroupInfo group; @@ -129,7 +129,7 @@ HWTEST_F(GroupNegotiationStateTest, ExecuteStateMsg4, TestSize.Level1) msg.SetMessageObj(group); EXPECT_CALL(WifiP2PHalInterface::GetInstance(), SetP2pGroupIdle(_, _)) .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_FAILED)); - EXPECT_CALL(WifiP2PHalInterface::GetInstance(), ListNetworks(_)).WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_FAILED)); + EXPECT_CALL(pMockP2pPendant->GetP2pStateMachine(), UpdatePersistentGroups()).WillOnce(Return()); AddDeviceManager(); msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::P2P_EVENT_GROUP_STARTED)); EXPECT_TRUE(pGroupNegotiationState->ExecuteStateMsg(&msg)); @@ -142,7 +142,7 @@ HWTEST_F(GroupNegotiationStateTest, ExecuteStateMsg5, TestSize.Level1) EXPECT_TRUE(pGroupNegotiationState->ExecuteStateMsg(&msg)); } -HWTEST_F(GroupNegotiationStateTest, ExecuteStateMsg6, TestSize.Level1) +HWTEST_F(GroupNegotiationStateTest, ProcessInvitationResultEvt1, TestSize.Level1) { InternalMessage msg; msg.SetParam1(1); @@ -150,7 +150,7 @@ HWTEST_F(GroupNegotiationStateTest, ExecuteStateMsg6, TestSize.Level1) EXPECT_TRUE(pGroupNegotiationState->ExecuteStateMsg(&msg)); } -HWTEST_F(GroupNegotiationStateTest, ExecuteStateMsg7, TestSize.Level1) +HWTEST_F(GroupNegotiationStateTest, ProcessInvitationResultEvt2, TestSize.Level1) { InternalMessage msg; msg.SetParam1(0); @@ -158,7 +158,7 @@ HWTEST_F(GroupNegotiationStateTest, ExecuteStateMsg7, TestSize.Level1) EXPECT_TRUE(pGroupNegotiationState->ExecuteStateMsg(&msg)); } -HWTEST_F(GroupNegotiationStateTest, ExecuteStateMsg8, TestSize.Level1) +HWTEST_F(GroupNegotiationStateTest, ProcessInvitationResultEvt3, TestSize.Level1) { InternalMessage msg; msg.SetParam1(8); @@ -166,7 +166,7 @@ HWTEST_F(GroupNegotiationStateTest, ExecuteStateMsg8, TestSize.Level1) EXPECT_TRUE(pGroupNegotiationState->ExecuteStateMsg(&msg)); } -HWTEST_F(GroupNegotiationStateTest, ExecuteStateMsg9, TestSize.Level1) +HWTEST_F(GroupNegotiationStateTest, ProcessInvitationResultEvt4, TestSize.Level1) { InternalMessage msg; msg.SetParam1(1); @@ -174,7 +174,7 @@ HWTEST_F(GroupNegotiationStateTest, ExecuteStateMsg9, TestSize.Level1) EXPECT_TRUE(pGroupNegotiationState->ExecuteStateMsg(&msg)); } -HWTEST_F(GroupNegotiationStateTest, ExecuteStateMsg10, TestSize.Level1) +HWTEST_F(GroupNegotiationStateTest, ProcessInvitationResultEvt5, TestSize.Level1) { InternalMessage msg; msg.SetParam1(7); @@ -182,6 +182,15 @@ HWTEST_F(GroupNegotiationStateTest, ExecuteStateMsg10, TestSize.Level1) EXPECT_TRUE(pGroupNegotiationState->ExecuteStateMsg(&msg)); } +HWTEST_F(GroupNegotiationStateTest, ProcessInvitationResultEvt6, TestSize.Level1) +{ + InternalMessage msg; + msg.SetParam1(3); + msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::P2P_EVENT_INVITATION_RESULT)); + EXPECT_CALL(pMockP2pPendant->GetP2pStateMachine(), DealGroupCreationFailed()).WillOnce(Return()); + EXPECT_TRUE(pGroupNegotiationState->ExecuteStateMsg(&msg)); +} + HWTEST_F(GroupNegotiationStateTest, ProcessNegotSucessEvt, TestSize.Level1) { InternalMessage msg; @@ -202,5 +211,13 @@ HWTEST_F(GroupNegotiationStateTest, ProcessGroupFormationFailEvt, TestSize.Level msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::P2P_EVENT_PROV_DISC_PBC_REQ)); EXPECT_FALSE(pGroupNegotiationState->ExecuteStateMsg(&msg)); } + +HWTEST_F(GroupNegotiationStateTest, ProcessGroupRemovedEvt, TestSize.Level1) +{ + InternalMessage msg; + msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::P2P_EVENT_GROUP_REMOVED)); + EXPECT_CALL(pMockP2pPendant->GetP2pStateMachine(), DealGroupCreationFailed()).WillOnce(Return()); + EXPECT_TRUE(pGroupNegotiationState->ExecuteStateMsg(&msg)); +} } // namespace Wifi } // namespace OHOS diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/invitation_request_state_test.cpp b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/invitation_request_state_test.cpp index 5d82a02..6eb214e 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/invitation_request_state_test.cpp +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/invitation_request_state_test.cpp @@ -71,16 +71,43 @@ HWTEST_F(InvitationRequestStateTest, GoOutState, TestSize.Level1) pInvitationRequestState->GoOutState(); } -HWTEST_F(InvitationRequestStateTest, ExecuteStateMsg1, TestSize.Level1) +HWTEST_F(InvitationRequestStateTest, ProcessInvitationResultEvt1, TestSize.Level1) { InternalMessage msg; msg.SetParam1(0); msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::P2P_EVENT_INVITATION_RESULT)); EXPECT_TRUE(pInvitationRequestState->ExecuteStateMsg(&msg)); +} +HWTEST_F(InvitationRequestStateTest, ProcessInvitationResultEvt2, TestSize.Level1) +{ + InternalMessage msg; + msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::P2P_EVENT_INVITATION_RESULT)); msg.SetParam1(8); EXPECT_TRUE(pInvitationRequestState->ExecuteStateMsg(&msg)); +} +HWTEST_F(InvitationRequestStateTest, ProcessInvitationResultEvt3, TestSize.Level1) +{ + WifiP2pGroupInfo group; + group.SetNetworkId(0); + groupManager.SetCurrentGroup(group); + InternalMessage msg; + msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::P2P_EVENT_INVITATION_RESULT)); + msg.SetParam1(8); + EXPECT_TRUE(pInvitationRequestState->ExecuteStateMsg(&msg)); +} + +HWTEST_F(InvitationRequestStateTest, ProcessCmdP2pDisable, TestSize.Level1) +{ + InternalMessage msg; + msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::CMD_P2P_DISABLE)); + EXPECT_TRUE(pInvitationRequestState->ExecuteStateMsg(&msg)); +} + +HWTEST_F(InvitationRequestStateTest, ExecuteStateMsgFailed, TestSize.Level1) +{ + InternalMessage msg; msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::P2P_EVENT_GROUP_FORMATION_SUCCESS)); EXPECT_FALSE(pInvitationRequestState->ExecuteStateMsg(&msg)); } diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_default_state_test.cpp b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_default_state_test.cpp index 3a38e4b..df79949 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_default_state_test.cpp +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_default_state_test.cpp @@ -66,14 +66,14 @@ HWTEST_F(P2pDefaultStateTest, ExecuteStateMsg1, TestSize.Level1) std::string deviceAddress; msg.SetMessageObj(deviceAddress); msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::REMOVE_SERVICE_REQUEST_RECORD)); - pDefaultState->ExecuteStateMsg(&msg); + EXPECT_TRUE(pDefaultState->ExecuteStateMsg(&msg)); } HWTEST_F(P2pDefaultStateTest, ExecuteStateMsg2, TestSize.Level1) { InternalMessage msg; msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::CREATE_GROUP_TIMED_OUT)); - pDefaultState->ExecuteStateMsg(&msg); + EXPECT_FALSE(pDefaultState->ExecuteStateMsg(&msg)); } } // namespace Wifi } // namespace OHOS \ No newline at end of file diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_disabled_state_test.cpp b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_disabled_state_test.cpp index 0df0d35..aee880f 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_disabled_state_test.cpp +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_disabled_state_test.cpp @@ -67,7 +67,7 @@ HWTEST_F(P2pDisabledStateTest, GoOutState, TestSize.Level1) pP2pDisabledState->GoOutState(); } -HWTEST_F(P2pDisabledStateTest, ExecuteStateMsg, TestSize.Level1) +HWTEST_F(P2pDisabledStateTest, ProcessCmdP2pEnable1, TestSize.Level1) { InternalMessage msg; EXPECT_CALL(*pMockMonitor, RegisterIfaceHandler(_, _)).WillOnce(Return()); @@ -76,9 +76,24 @@ HWTEST_F(P2pDisabledStateTest, ExecuteStateMsg, TestSize.Level1) EXPECT_CALL(WifiP2PHalInterface::GetInstance(), SetRandomMacAddr(_)).WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::CMD_P2P_ENABLE)); - pP2pDisabledState->ExecuteStateMsg(&msg); + EXPECT_TRUE(pP2pDisabledState->ExecuteStateMsg(&msg)); +} + +HWTEST_F(P2pDisabledStateTest, ProcessCmdP2pEnable2, TestSize.Level1) +{ + InternalMessage msg; + EXPECT_CALL(*pMockMonitor, RegisterIfaceHandler(_, _)).WillOnce(Return()); + EXPECT_CALL(*pMockMonitor, MonitorBegins(_)).WillOnce(Return()); + EXPECT_CALL(WifiP2PHalInterface::GetInstance(), StartP2p()).WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_FAILED)); + msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::CMD_P2P_ENABLE)); + EXPECT_TRUE(pP2pDisabledState->ExecuteStateMsg(&msg)); +} + +HWTEST_F(P2pDisabledStateTest, ExecuteStateMsgFailed, TestSize.Level1) +{ + InternalMessage msg; msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::CMD_P2P_DISABLE)); - pP2pDisabledState->ExecuteStateMsg(&msg); + EXPECT_FALSE(pP2pDisabledState->ExecuteStateMsg(&msg)); } } // namespace Wifi } // namespace OHOS \ No newline at end of file diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_disabling_state_test.cpp b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_disabling_state_test.cpp index d4ab353..8e9999b 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_disabling_state_test.cpp +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_disabling_state_test.cpp @@ -72,7 +72,6 @@ HWTEST_F(P2pDisablingStateTest, ExecuteStateMsg, TestSize.Level1) msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::CMD_P2P_DISABLE)); pP2pDisablingState->ExecuteStateMsg(&msg); - msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::WPA_CONNECTED_EVENT)); } HWTEST_F(P2pDisablingStateTest, ExecuteStateMsg2, TestSize.Level1) @@ -81,7 +80,18 @@ HWTEST_F(P2pDisablingStateTest, ExecuteStateMsg2, TestSize.Level1) msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::WPA_CONNECTED_EVENT)); msg.SetParam1(0); EXPECT_CALL(pMockP2pPendant->GetMockP2pMonitor(), MonitorEnds(_)).WillOnce(Return()); + EXPECT_CALL(pMockP2pPendant->GetP2pStateMachine(), BroadcastP2pStatusChanged(_)).WillOnce(Return()); pP2pDisablingState->ExecuteStateMsg(&msg); } + +HWTEST_F(P2pDisablingStateTest, ProcessDisableP2pTimedOut, TestSize.Level1) +{ + InternalMessage msg; + msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::DISABLE_P2P_TIMED_OUT)); + msg.SetParam1(0); + EXPECT_CALL(pMockP2pPendant->GetMockP2pMonitor(), MonitorEnds(_)).WillOnce(Return()); + EXPECT_CALL(pMockP2pPendant->GetP2pStateMachine(), BroadcastP2pStatusChanged(_)).WillOnce(Return()); + EXPECT_TRUE(pP2pDisablingState->ExecuteStateMsg(&msg)); +} } // namespace Wifi } // namespace OHOS \ No newline at end of file diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_enabled_state_test.cpp b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_enabled_state_test.cpp index 5ddc832..147479d 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_enabled_state_test.cpp +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_enabled_state_test.cpp @@ -64,6 +64,7 @@ public: std::unique_ptr pMockP2pPendant; WifiP2pGroupManager groupManager; WifiP2pDeviceManager deviceManager; + WifiP2pServiceManager serviceManager; }; HWTEST_F(P2pEnabledStateTest, GoInState, TestSize.Level1) @@ -93,16 +94,13 @@ HWTEST_F(P2pEnabledStateTest, GoInState, TestSize.Level1) .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_FAILED)) .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); EXPECT_CALL(WifiP2PHalInterface::GetInstance(), ListNetworks(_)) - .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_FAILED)) - .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_FAILED)) .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_FAILED)) .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_FAILED)); EXPECT_CALL(WifiP2PHalInterface::GetInstance(), SetPersistentReconnect(Eq(1))) .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_FAILED)) .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); - EXPECT_CALL(WifiP2PHalInterface::GetInstance(), RemoveNetwork(Eq(-1))) - .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_FAILED)) - .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); + EXPECT_CALL(pMockP2pPendant->GetP2pStateMachine(), UpdateGroupInfoToWpa()).WillOnce(Return()).WillOnce(Return()); + EXPECT_CALL(pMockP2pPendant->GetP2pStateMachine(), UpdatePersistentGroups()).WillOnce(Return()).WillOnce(Return()); pP2pEnabledState->GoInState(); pP2pEnabledState->GoInState(); } @@ -181,12 +179,23 @@ HWTEST_F(P2pEnabledStateTest, ExecuteStateMsg5, TestSize.Level1) pP2pEnabledState->ExecuteStateMsg(&msg); } -HWTEST_F(P2pEnabledStateTest, ExecuteStateMsg6, TestSize.Level1) +HWTEST_F(P2pEnabledStateTest, ProcessDeviceFoundEvt1, TestSize.Level1) +{ + InternalMessage msg; + WifiP2pDevice device; + msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::P2P_EVENT_DEVICE_FOUND)); + msg.SetMessageObj(device); + pP2pEnabledState->ExecuteStateMsg(&msg); +} + +HWTEST_F(P2pEnabledStateTest, ProcessDeviceFoundEvt2, TestSize.Level1) { InternalMessage msg; WifiP2pDevice device; + device.SetDeviceAddress(std::string("aa:bb:cc:dd:ee:22")); msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::P2P_EVENT_DEVICE_FOUND)); msg.SetMessageObj(device); + EXPECT_CALL(pMockP2pPendant->GetP2pStateMachine(), BroadcastP2pPeersChanged()).WillOnce(Return()); pP2pEnabledState->ExecuteStateMsg(&msg); } @@ -218,6 +227,7 @@ HWTEST_F(P2pEnabledStateTest, ExecuteStateMsg9, TestSize.Level1) pP2pEnabledState->ExecuteStateMsg(&msg); } + HWTEST_F(P2pEnabledStateTest, ExecuteStateMsg10, TestSize.Level1) { InternalMessage msg; @@ -230,6 +240,7 @@ HWTEST_F(P2pEnabledStateTest, ExecuteStateMsg10, TestSize.Level1) pP2pEnabledState->ExecuteStateMsg(&msg); pP2pEnabledState->ExecuteStateMsg(&msg); } + HWTEST_F(P2pEnabledStateTest, ExecuteStateMsg11, TestSize.Level1) { InternalMessage msg; @@ -242,6 +253,7 @@ HWTEST_F(P2pEnabledStateTest, ExecuteStateMsg11, TestSize.Level1) pP2pEnabledState->ExecuteStateMsg(&msg); pP2pEnabledState->ExecuteStateMsg(&msg); } + HWTEST_F(P2pEnabledStateTest, ExecuteStateMsg12, TestSize.Level1) { InternalMessage msg; @@ -252,6 +264,7 @@ HWTEST_F(P2pEnabledStateTest, ExecuteStateMsg12, TestSize.Level1) pP2pEnabledState->ExecuteStateMsg(&msg); pP2pEnabledState->ExecuteStateMsg(&msg); } + HWTEST_F(P2pEnabledStateTest, ExecuteStateMsg13, TestSize.Level1) { InternalMessage msg; @@ -269,32 +282,45 @@ HWTEST_F(P2pEnabledStateTest, ExecuteStateMsg13, TestSize.Level1) pP2pEnabledState->ExecuteStateMsg(&msg); pP2pEnabledState->ExecuteStateMsg(&msg); } + HWTEST_F(P2pEnabledStateTest, ExecuteStateMsg14, TestSize.Level1) { InternalMessage msg; msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::P2P_EVENT_SERV_DISC_REQ)); WifiP2pServiceRequestList reqList; + const WifiP2pServiceRequest req; + reqList.AddServiceRequest(req); WifiP2pDevice device; device.SetDeviceAddress("AA:BB:CC:DD:EE:FF"); reqList.SetDevice(device); msg.SetMessageObj(reqList); + EXPECT_CALL(WifiP2PHalInterface::GetInstance(), RespServiceDiscovery(_, _, _, _)) + .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_FAILED)); + pP2pEnabledState->ExecuteStateMsg(&msg); pP2pEnabledState->ExecuteStateMsg(&msg); } + HWTEST_F(P2pEnabledStateTest, ExecuteStateMsg15, TestSize.Level1) { InternalMessage msg; msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::P2P_EVENT_SERV_DISC_RESP)); WifiP2pServiceResponseList respList; + std::vector data; + WifiP2pServiceResponse resp( + P2pServicerProtocolType::SERVICE_TYPE_BONJOUR, P2pServiceStatus::PSRS_SERVICE_PROTOCOL_NOT_AVAILABLE, 0, data); + respList.AddServiceResponse(resp); msg.SetMessageObj(respList); pP2pEnabledState->ExecuteStateMsg(&msg); } + HWTEST_F(P2pEnabledStateTest, ExecuteStateMsg16, TestSize.Level1) { InternalMessage msg; msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::P2P_EVENT_PROV_DISC_FAILURE)); pP2pEnabledState->ExecuteStateMsg(&msg); } + HWTEST_F(P2pEnabledStateTest, ExecuteStateMsg17, TestSize.Level1) { InternalMessage msg; @@ -303,6 +329,7 @@ HWTEST_F(P2pEnabledStateTest, ExecuteStateMsg17, TestSize.Level1) msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::CMD_PUT_LOCAL_SERVICE)); pP2pEnabledState->ExecuteStateMsg(&msg); } + HWTEST_F(P2pEnabledStateTest, ExecuteStateMsg18, TestSize.Level1) { InternalMessage msg; @@ -334,6 +361,7 @@ HWTEST_F(P2pEnabledStateTest, ExecuteStateMsg19, TestSize.Level1) pP2pEnabledState->ExecuteStateMsg(&msg); pP2pEnabledState->ExecuteStateMsg(&msg); } + HWTEST_F(P2pEnabledStateTest, ExecuteStateMsg20, TestSize.Level1) { InternalMessage msg; @@ -351,6 +379,7 @@ HWTEST_F(P2pEnabledStateTest, ExecuteStateMsg20, TestSize.Level1) pP2pEnabledState->ExecuteStateMsg(&msg); pP2pEnabledState->ExecuteStateMsg(&msg); } + HWTEST_F(P2pEnabledStateTest, ExecuteStateMsg21, TestSize.Level1) { InternalMessage msg; @@ -359,6 +388,7 @@ HWTEST_F(P2pEnabledStateTest, ExecuteStateMsg21, TestSize.Level1) msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::P2P_EVENT_SERV_DISC_REQ)); pP2pEnabledState->ExecuteStateMsg(&msg); } + HWTEST_F(P2pEnabledStateTest, ExecuteStateMsg22, TestSize.Level1) { InternalMessage msg; @@ -370,11 +400,82 @@ HWTEST_F(P2pEnabledStateTest, ExecuteStateMsg22, TestSize.Level1) msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::P2P_EVENT_PROV_DISC_FAILURE)); pP2pEnabledState->ExecuteStateMsg(&msg); } + HWTEST_F(P2pEnabledStateTest, ExecuteStateMsg23, TestSize.Level1) { InternalMessage msg; msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::EXCEPTION_TIMED_OUT)); pP2pEnabledState->ExecuteStateMsg(&msg); } -} // namespace Wifi -} // namespace OHOS \ No newline at end of file + +HWTEST_F(P2pEnabledStateTest, ProcessCmdSetDeviceName1, TestSize.Level1) +{ + InternalMessage msg; + std::string devAddr; + msg.SetMessageObj(devAddr); + msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::CMD_SET_DEVICE_NAME)); + EXPECT_CALL(WifiP2PHalInterface::GetInstance(), SetP2pDeviceName(Eq(devAddr))) + .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_FAILED)); + EXPECT_CALL(pMockP2pPendant->GetP2pStateMachine(), BroadcastActionResult(_, _)).WillOnce(Return()); + EXPECT_TRUE(pP2pEnabledState->ExecuteStateMsg(&msg)); +} + +HWTEST_F(P2pEnabledStateTest, ProcessCmdSetDeviceName2, TestSize.Level1) +{ + InternalMessage msg; + std::string devAddr; + msg.SetMessageObj(devAddr); + msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::CMD_SET_DEVICE_NAME)); + EXPECT_CALL(WifiP2PHalInterface::GetInstance(), SetP2pDeviceName(Eq(devAddr))) + .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); + EXPECT_CALL(pMockP2pPendant->GetP2pStateMachine(), BroadcastThisDeviceChanaged(_)).WillOnce(Return()); + EXPECT_CALL(pMockP2pPendant->GetP2pStateMachine(), BroadcastActionResult(_, _)).WillOnce(Return()); + EXPECT_CALL(WifiP2PHalInterface::GetInstance(), SetP2pSsidPostfix(_)) + .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_FAILED)); + EXPECT_TRUE(pP2pEnabledState->ExecuteStateMsg(&msg)); +} + +HWTEST_F(P2pEnabledStateTest, ProcessCmdSetWfdInfo1, TestSize.Level1) +{ + InternalMessage msg; + WifiP2pWfdInfo wfdInfo; + msg.SetMessageObj(wfdInfo); + msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::CMD_SET_WFD_INFO)); + EXPECT_CALL(WifiP2PHalInterface::GetInstance(), SetWfdDeviceConfig(_)) + .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_FAILED)); + EXPECT_TRUE(pP2pEnabledState->ExecuteStateMsg(&msg)); +} + +HWTEST_F(P2pEnabledStateTest, ProcessCmdSetWfdInfo2, TestSize.Level1) +{ + InternalMessage msg; + WifiP2pWfdInfo wfdInfo; + msg.SetMessageObj(wfdInfo); + msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::CMD_SET_WFD_INFO)); + EXPECT_CALL(WifiP2PHalInterface::GetInstance(), SetWfdDeviceConfig(_)) + .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); + EXPECT_CALL(WifiP2PHalInterface::GetInstance(), SetWfdEnable(_)).WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_FAILED)); + EXPECT_TRUE(pP2pEnabledState->ExecuteStateMsg(&msg)); +} + +HWTEST_F(P2pEnabledStateTest, ProcessCmdSetWfdInfo3, TestSize.Level1) +{ + InternalMessage msg; + WifiP2pWfdInfo wfdInfo; + msg.SetMessageObj(wfdInfo); + msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::CMD_SET_WFD_INFO)); + EXPECT_CALL(WifiP2PHalInterface::GetInstance(), SetWfdDeviceConfig(_)) + .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); + EXPECT_CALL(WifiP2PHalInterface::GetInstance(), SetWfdEnable(_)).WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); + EXPECT_TRUE(pP2pEnabledState->ExecuteStateMsg(&msg)); +} + +HWTEST_F(P2pEnabledStateTest, ProcessCmdCancelConnect, TestSize.Level1) +{ + InternalMessage msg; + msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::CMD_CANCEL_CONNECT)); + EXPECT_CALL(pMockP2pPendant->GetP2pStateMachine(), BroadcastActionResult(_, _)).WillOnce(Return()); + EXPECT_TRUE(pP2pEnabledState->ExecuteStateMsg(&msg)); +} +} // namespace Wifi +} // namespace OHOS \ No newline at end of file diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_group_formation_state_test.cpp b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_group_formation_state_test.cpp index 674f817..b0f5e83 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_group_formation_state_test.cpp +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_group_formation_state_test.cpp @@ -66,12 +66,18 @@ HWTEST_F(P2pGroupFormationStateTest, GoOutState, TestSize.Level1) HWTEST_F(P2pGroupFormationStateTest, ExecuteStateMsg, TestSize.Level1) { InternalMessage msg; + EXPECT_CALL(pMockP2pPendant->GetP2pStateMachine(), BroadcastActionResult(_, _)).WillOnce(Return()); msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::CMD_DEVICE_DISCOVERS)); pP2pGroupFormationState->ExecuteStateMsg(&msg); msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::P2P_EVENT_DEVICE_LOST)); pP2pGroupFormationState->ExecuteStateMsg(&msg); msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::P2P_EVENT_INVITATION_RECEIVED)); pP2pGroupFormationState->ExecuteStateMsg(&msg); + EXPECT_CALL(WifiP2PHalInterface::GetInstance(), CancelConnect()).WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); + EXPECT_CALL(pMockP2pPendant->GetP2pStateMachine(), DealGroupCreationFailed()).WillOnce(Return()); + EXPECT_CALL(pMockP2pPendant->GetP2pStateMachine(), BroadcastActionResult(_, _)).WillOnce(Return()); + msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::CMD_CANCEL_CONNECT)); + pP2pGroupFormationState->ExecuteStateMsg(&msg); } } // namespace Wifi } // namespace OHOS \ No newline at end of file diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_group_join_state_test.cpp b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_group_join_state_test.cpp index af65684..6bd2100 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_group_join_state_test.cpp +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_group_join_state_test.cpp @@ -116,5 +116,12 @@ HWTEST_F(P2pGroupJoinStateTest, ExecuteStateMsg, TestSize.Level1) msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::PEER_CONNECTION_USER_REJECT)); pP2pGroupJoinState->ExecuteStateMsg(&msg); } + +HWTEST_F(P2pGroupJoinStateTest, ProcessCmdP2pDisable, TestSize.Level1) +{ + InternalMessage msg; + msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::CMD_P2P_DISABLE)); + pP2pGroupJoinState->ExecuteStateMsg(&msg); +} } // namespace Wifi } // namespace OHOS \ No newline at end of file diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_group_operating_state_test.cpp b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_group_operating_state_test.cpp index c593cef..2b3bca5 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_group_operating_state_test.cpp +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_group_operating_state_test.cpp @@ -58,6 +58,13 @@ public: pP2pGroupOperatingState->groupManager.AddGroup(group); pP2pGroupOperatingState->groupManager.SetCurrentGroup(group); } + void AddDeviceManager() + { + pP2pGroupOperatingState->deviceManager.ClearAll(); + WifiP2pDevice device; + device.SetDeviceAddress(std::string("11:22:33:44:55:66")); + pP2pGroupOperatingState->deviceManager.AddDevice(device); + } std::unique_ptr pP2pGroupOperatingState; std::unique_ptr pMockP2pPendant; WifiP2pGroupManager groupManager; @@ -74,43 +81,63 @@ HWTEST_F(P2pGroupOperatingStateTest, GoOutState, TestSize.Level1) pP2pGroupOperatingState->GoOutState(); } -HWTEST_F(P2pGroupOperatingStateTest, ExecuteStateMsg1, TestSize.Level1) +HWTEST_F(P2pGroupOperatingStateTest, ProcessCmdCreateGroup1, TestSize.Level1) { InternalMessage msg; msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::CMD_FORM_GROUP)); - WifiP2pConfig config; + WifiP2pConfigInternal config; config.SetNetId(0); + config.SetPassphrase(std::string("12345679")); msg.SetMessageObj(config); - EXPECT_CALL(WifiP2PHalInterface::GetInstance(), GroupAdd(_, _, _)).WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_FAILED)); + EXPECT_CALL(pMockP2pPendant->GetP2pStateMachine(), SetGroupConfig(_, _)).WillOnce(Return(false)); + EXPECT_CALL(WifiP2PHalInterface::GetInstance(), GroupAdd(_, _, _)) + .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_FAILED)); + EXPECT_CALL(pMockP2pPendant->GetP2pStateMachine(), BroadcastActionResult(_, _)).WillOnce(Return()); EXPECT_TRUE(pP2pGroupOperatingState->ExecuteStateMsg(&msg)); +} - config.SetNetId(-2); +HWTEST_F(P2pGroupOperatingStateTest, ProcessCmdCreateGroup2, TestSize.Level1) +{ + InternalMessage msg; + msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::CMD_FORM_GROUP)); + WifiP2pConfigInternal config; + config.SetNetId(-1); msg.SetMessageObj(config); - EXPECT_CALL(WifiP2PHalInterface::GetInstance(), GroupAdd(_, _, _)).WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); + EXPECT_CALL(WifiP2PHalInterface::GetInstance(), GroupAdd(_, _, _)) + .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); + EXPECT_CALL(pMockP2pPendant->GetP2pStateMachine(), BroadcastActionResult(_, _)).WillOnce(Return()); EXPECT_TRUE(pP2pGroupOperatingState->ExecuteStateMsg(&msg)); +} +HWTEST_F(P2pGroupOperatingStateTest, ProcessCmdCreateGroup3, TestSize.Level1) +{ + InternalMessage msg; + msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::CMD_FORM_GROUP)); + WifiP2pConfigInternal config; config.SetNetId(-1); + config.SetPassphrase(std::string("12345679")); + config.SetGroupName(std::string("groupName")); msg.SetMessageObj(config); - EXPECT_CALL(WifiP2PHalInterface::GetInstance(), GroupAdd(_, _, _)).WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); + EXPECT_CALL(pMockP2pPendant->GetP2pStateMachine(), DealCreateNewGroupWithConfig(_, _)).WillOnce(Return(true)); + EXPECT_CALL(pMockP2pPendant->GetP2pStateMachine(), BroadcastActionResult(_, _)).WillOnce(Return()); EXPECT_TRUE(pP2pGroupOperatingState->ExecuteStateMsg(&msg)); +} - config.SetNetId(-5); +HWTEST_F(P2pGroupOperatingStateTest, ProcessCmdCreateGroup4, TestSize.Level1) +{ + InternalMessage msg; + msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::CMD_FORM_GROUP)); + WifiP2pConfigInternal config; + const int invalidId = -999; + config.SetNetId(invalidId); msg.SetMessageObj(config); + EXPECT_CALL(pMockP2pPendant->GetP2pStateMachine(), BroadcastActionResult(_, _)).WillOnce(Return()); EXPECT_TRUE(pP2pGroupOperatingState->ExecuteStateMsg(&msg)); } HWTEST_F(P2pGroupOperatingStateTest, ExecuteStateMsg2, TestSize.Level1) { InternalMessage msg; - msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::P2P_EVENT_GROUP_STARTED)); - WifiP2pGroupInfo group; - group.SetIsPersistent(true); - msg.SetMessageObj(group); - EXPECT_CALL(WifiP2PHalInterface::GetInstance(), ListNetworks(_)).WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_FAILED)); - EXPECT_TRUE(pP2pGroupOperatingState->ExecuteStateMsg(&msg)); - group.SetIsPersistent(false); - msg.SetMessageObj(group); - EXPECT_TRUE(pP2pGroupOperatingState->ExecuteStateMsg(&msg)); msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::CREATE_GROUP_TIMED_OUT)); EXPECT_TRUE(pP2pGroupOperatingState->ExecuteStateMsg(&msg)); @@ -119,6 +146,33 @@ HWTEST_F(P2pGroupOperatingStateTest, ExecuteStateMsg2, TestSize.Level1) EXPECT_TRUE(pP2pGroupOperatingState->ExecuteStateMsg(&msg)); } +HWTEST_F(P2pGroupOperatingStateTest, ProcessGroupStartedEvt1, TestSize.Level1) +{ + InternalMessage msg; + msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::P2P_EVENT_GROUP_STARTED)); + WifiP2pGroupInfo groupInfo; + groupInfo.SetIsPersistent(true); + groupInfo.SetIsGroupOwner(true); + msg.SetMessageObj(groupInfo); + EXPECT_CALL(pMockP2pPendant->GetP2pStateMachine(), UpdatePersistentGroups()).WillOnce(Return()); + EXPECT_TRUE(pP2pGroupOperatingState->ExecuteStateMsg(&msg)); +} + +HWTEST_F(P2pGroupOperatingStateTest, ProcessGroupStartedEvt2, TestSize.Level1) +{ + InternalMessage msg; + msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::P2P_EVENT_GROUP_STARTED)); + WifiP2pGroupInfo groupInfo; + groupInfo.SetIsPersistent(false); + groupInfo.SetIsGroupOwner(false); + WifiP2pDevice device; + device.SetDeviceAddress(std::string("11:22:33:44:55:66")); + groupInfo.SetOwner(device); + msg.SetMessageObj(groupInfo); + AddDeviceManager(); + EXPECT_TRUE(pP2pGroupOperatingState->ExecuteStateMsg(&msg)); +} + HWTEST_F(P2pGroupOperatingStateTest, ExecuteStateMsg3, TestSize.Level1) { InternalMessage msg; @@ -140,7 +194,7 @@ HWTEST_F(P2pGroupOperatingStateTest, ExecuteStateMsg4, TestSize.Level1) msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::CMD_DELETE_GROUP)); AddGroupManager(); EXPECT_CALL(WifiP2PHalInterface::GetInstance(), RemoveNetwork(_)).WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); - EXPECT_CALL(WifiP2PHalInterface::GetInstance(), ListNetworks(_)).WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_FAILED)); + EXPECT_CALL(pMockP2pPendant->GetP2pStateMachine(), UpdatePersistentGroups()).WillOnce(Return()); EXPECT_CALL(WifiP2PHalInterface::GetInstance(), GroupRemove(_)).WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_FAILED)); WifiP2pGroupInfo group; group.SetNetworkId(1); diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_idle_state_test.cpp b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_idle_state_test.cpp index 33e2b82..d17dcf3 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_idle_state_test.cpp +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_idle_state_test.cpp @@ -137,11 +137,11 @@ HWTEST_F(P2pIdleStateTest, ExecuteStateMsg1, TestSize.Level1) EXPECT_TRUE(pP2pIdleState->ExecuteStateMsg(&msg)); } -HWTEST_F(P2pIdleStateTest, ExecuteStateMsg2, TestSize.Level1) +HWTEST_F(P2pIdleStateTest, ProcessCmdConnect1, TestSize.Level1) { InternalMessage msg; msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::CMD_CONNECT)); - WifiP2pConfig config; + WifiP2pConfigInternal config; msg.SetMessageObj(config); EXPECT_TRUE(pP2pIdleState->ExecuteStateMsg(&msg)); @@ -153,16 +153,91 @@ HWTEST_F(P2pIdleStateTest, ExecuteStateMsg2, TestSize.Level1) EXPECT_TRUE(pP2pIdleState->ExecuteStateMsg(&msg)); } -HWTEST_F(P2pIdleStateTest, ExecuteStateMsg, TestSize.Level1) +HWTEST_F(P2pIdleStateTest, ProcessCmdConnect2, TestSize.Level1) { InternalMessage msg; msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::CMD_CONNECT)); - WifiP2pConfig config; + WifiP2pConfigInternal config; AddDeviceManager(); config.SetDeviceAddress("AA:BB:CC:DD:EE:FF"); msg.SetMessageObj(config); EXPECT_CALL(pMockP2pPendant->GetP2pStateMachine(), IsConfigUnusable(_)).WillOnce(Return(P2pConfigErrCode::SUCCESS)); EXPECT_CALL(WifiP2PHalInterface::GetInstance(), P2pStopFind()).WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); + EXPECT_CALL(pMockP2pPendant->GetP2pStateMachine(), ReawakenPersistentGroup(_)).WillOnce(Return(false)); + EXPECT_TRUE(pP2pIdleState->ExecuteStateMsg(&msg)); +} + +HWTEST_F(P2pIdleStateTest, ProcessCmdConnect3, TestSize.Level1) +{ + InternalMessage msg; + msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::CMD_CONNECT)); + WifiP2pConfigInternal config; + AddDeviceManager(); + config.SetDeviceAddress("AA:BB:CC:DD:EE:FF"); + msg.SetMessageObj(config); + EXPECT_CALL(pMockP2pPendant->GetP2pStateMachine(), IsConfigUnusable(_)).WillOnce(Return(P2pConfigErrCode::SUCCESS)); + EXPECT_CALL(WifiP2PHalInterface::GetInstance(), P2pStopFind()).WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); + EXPECT_CALL(pMockP2pPendant->GetP2pStateMachine(), ReawakenPersistentGroup(_)).WillOnce(Return(true)); + EXPECT_TRUE(pP2pIdleState->ExecuteStateMsg(&msg)); +} + +HWTEST_F(P2pIdleStateTest, ProcessCmdConnect4, TestSize.Level1) +{ + WifiP2pConfigInternal config; + InternalMessage msg; + msg.SetMessageObj(config); + msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::CMD_CONNECT)); + EXPECT_CALL(pMockP2pPendant->GetP2pStateMachine(), IsConfigUnusable(_)) + .WillOnce(Return(P2pConfigErrCode::MAC_EMPTY)); + EXPECT_CALL(pMockP2pPendant->GetP2pStateMachine(), BroadcastActionResult(_, _)).WillOnce(Return()); + EXPECT_TRUE(pP2pIdleState->ExecuteStateMsg(&msg)); +} + +HWTEST_F(P2pIdleStateTest, ProcessCmdConnect5, TestSize.Level1) +{ + WifiP2pConfigInternal config; + InternalMessage msg; + msg.SetMessageObj(config); + msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::CMD_CONNECT)); + EXPECT_CALL(pMockP2pPendant->GetP2pStateMachine(), IsConfigUnusable(_)) + .WillOnce(Return(P2pConfigErrCode::MAC_NOT_FOUND)); + EXPECT_CALL(pMockP2pPendant->GetP2pStateMachine(), BroadcastActionResult(_, _)).WillOnce(Return()); + EXPECT_TRUE(pP2pIdleState->ExecuteStateMsg(&msg)); +} + +HWTEST_F(P2pIdleStateTest, ProcessCmdConnect6, TestSize.Level1) +{ + WifiP2pConfigInternal config; + InternalMessage msg; + msg.SetMessageObj(config); + msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::CMD_CONNECT)); + EXPECT_CALL(pMockP2pPendant->GetP2pStateMachine(), IsConfigUnusable(_)) + .WillOnce(Return(P2pConfigErrCode::ERR_MAC_FORMAT)); + EXPECT_CALL(pMockP2pPendant->GetP2pStateMachine(), BroadcastActionResult(_, _)).WillOnce(Return()); + EXPECT_TRUE(pP2pIdleState->ExecuteStateMsg(&msg)); +} + +HWTEST_F(P2pIdleStateTest, ProcessCmdConnect7, TestSize.Level1) +{ + WifiP2pConfigInternal config; + InternalMessage msg; + msg.SetMessageObj(config); + msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::CMD_CONNECT)); + EXPECT_CALL(pMockP2pPendant->GetP2pStateMachine(), IsConfigUnusable(_)) + .WillOnce(Return(P2pConfigErrCode::ERR_INTENT)); + EXPECT_CALL(pMockP2pPendant->GetP2pStateMachine(), BroadcastActionResult(_, _)).WillOnce(Return()); + EXPECT_TRUE(pP2pIdleState->ExecuteStateMsg(&msg)); +} + +HWTEST_F(P2pIdleStateTest, ProcessCmdConnect8, TestSize.Level1) +{ + WifiP2pConfigInternal config; + InternalMessage msg; + msg.SetMessageObj(config); + msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::CMD_CONNECT)); + EXPECT_CALL(pMockP2pPendant->GetP2pStateMachine(), IsConfigUnusable(_)) + .WillOnce(Return(P2pConfigErrCode::ERR_SIZE_NW_NAME)); + EXPECT_CALL(pMockP2pPendant->GetP2pStateMachine(), BroadcastActionResult(_, _)).WillOnce(Return()); EXPECT_TRUE(pP2pIdleState->ExecuteStateMsg(&msg)); } @@ -178,30 +253,62 @@ HWTEST_F(P2pIdleStateTest, ExecuteStateMsg3, TestSize.Level1) EXPECT_TRUE(pP2pIdleState->ExecuteStateMsg(&msg)); } -HWTEST_F(P2pIdleStateTest, ExecuteStateMsg4, TestSize.Level1) +HWTEST_F(P2pIdleStateTest, ProcessInvitationReceivedEvt1, TestSize.Level1) { InternalMessage msg; - msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::CMD_DISCONNECT)); - EXPECT_FALSE(pP2pIdleState->ExecuteStateMsg(&msg)); - msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::P2P_EVENT_INVITATION_RECEIVED)); WifiP2pGroupInfo group; WifiP2pDevice device; - + group.SetOwner(device); group.SetNetworkId(-1); msg.SetMessageObj(group); EXPECT_TRUE(pP2pIdleState->ExecuteStateMsg(&msg)); +} +HWTEST_F(P2pIdleStateTest, ProcessInvitationReceivedEvt2, TestSize.Level1) +{ + InternalMessage msg; + msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::P2P_EVENT_INVITATION_RECEIVED)); + WifiP2pGroupInfo group; + WifiP2pDevice device; + group.SetOwner(device); group.SetNetworkId(1); msg.SetMessageObj(group); EXPECT_TRUE(pP2pIdleState->ExecuteStateMsg(&msg)); +} - AddGroupManager(); - device.SetDeviceAddress(""); +HWTEST_F(P2pIdleStateTest, ProcessInvitationReceivedEvt3, TestSize.Level1) +{ + InternalMessage msg; + msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::P2P_EVENT_INVITATION_RECEIVED)); + WifiP2pGroupInfo group; + WifiP2pDevice device; group.SetOwner(device); + group.SetNetworkId(1); msg.SetMessageObj(group); + AddGroupManager(); + msg.SetMessageObj(group); + EXPECT_CALL(WifiP2PHalInterface::GetInstance(), GetP2pPeer(_, _)) + .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_FAILED)); EXPECT_TRUE(pP2pIdleState->ExecuteStateMsg(&msg)); +} +HWTEST_F(P2pIdleStateTest, ProcessInvitationReceivedEvt4, TestSize.Level1) +{ + InternalMessage msg; + msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::P2P_EVENT_INVITATION_RECEIVED)); + WifiP2pGroupInfo group; + WifiP2pDevice device; + device.SetDeviceAddress(std::string("AA:BB:CC:DD:EE:FF")); + group.SetOwner(device); + group.SetNetworkId(1); + msg.SetMessageObj(group); + AddGroupManager(); + msg.SetMessageObj(group); + EXPECT_CALL(WifiP2PHalInterface::GetInstance(), GetP2pPeer(_, _)) + .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)) + .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_FAILED)) + .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); AddDeviceManager1(); EXPECT_TRUE(pP2pIdleState->ExecuteStateMsg(&msg)); @@ -216,20 +323,54 @@ HWTEST_F(P2pIdleStateTest, ExecuteStateMsg5, TestSize.Level1) { InternalMessage msg; msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::P2P_EVENT_GO_NEG_REQUEST)); - WifiP2pConfig conf; + WifiP2pConfigInternal conf; msg.SetMessageObj(conf); EXPECT_TRUE(pP2pIdleState->ExecuteStateMsg(&msg)); } -HWTEST_F(P2pIdleStateTest, ExecuteStateMsg6, TestSize.Level1) +HWTEST_F(P2pIdleStateTest, ProcessGroupStartedEvt1, TestSize.Level1) +{ + InternalMessage msg; + WifiP2pGroupInfo group; + group.SetIsPersistent(true); + group.SetIsGroupOwner(false); + msg.SetMessageObj(group); + msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::P2P_EVENT_GROUP_STARTED)); + EXPECT_CALL(pMockP2pPendant->GetP2pStateMachine(), UpdatePersistentGroups()).WillOnce(Return()); + EXPECT_TRUE(pP2pIdleState->ExecuteStateMsg(&msg)); +} + +HWTEST_F(P2pIdleStateTest, ProcessGroupStartedEvt2, TestSize.Level1) +{ + InternalMessage msg; + WifiP2pGroupInfo group; + group.SetIsPersistent(false); + group.SetIsGroupOwner(false); + WifiP2pDevice device; + device.SetDeviceAddress(std::string("AA:BB:CC:DD:EE:FF")); + group.SetOwner(device); + AddDeviceManager(); + msg.SetMessageObj(group); + msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::P2P_EVENT_GROUP_STARTED)); + EXPECT_TRUE(pP2pIdleState->ExecuteStateMsg(&msg)); +} + +HWTEST_F(P2pIdleStateTest, ProcessGroupStartedEvt3, TestSize.Level1) { InternalMessage msg; WifiP2pGroupInfo group; group.SetIsPersistent(true); + group.SetIsGroupOwner(true); msg.SetMessageObj(group); msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::P2P_EVENT_GROUP_STARTED)); - EXPECT_CALL(WifiP2PHalInterface::GetInstance(), ListNetworks(_)).WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_FAILED)); + EXPECT_CALL(pMockP2pPendant->GetP2pStateMachine(), UpdatePersistentGroups()).WillOnce(Return()); + EXPECT_CALL(pMockP2pPendant->GetP2pStateMachine(), StartDhcpServer()).WillOnce(Return(false)); EXPECT_TRUE(pP2pIdleState->ExecuteStateMsg(&msg)); +} + +HWTEST_F(P2pIdleStateTest, ExecuteStateMsgFailed, TestSize.Level1) +{ + InternalMessage msg; msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::P2P_EVENT_GROUP_REMOVED)); EXPECT_FALSE(pP2pIdleState->ExecuteStateMsg(&msg)); EXPECT_FALSE(pP2pIdleState->ExecuteStateMsg(nullptr)); @@ -255,5 +396,12 @@ HWTEST_F(P2pIdleStateTest, ProcessCmdCreateGroup, TestSize.Level1) msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::CMD_FORM_GROUP)); EXPECT_TRUE(pP2pIdleState->ExecuteStateMsg(&msg)); } + +HWTEST_F(P2pIdleStateTest, ProcessProvDiscPbcReqEvt, TestSize.Level1) +{ + InternalMessage msg; + msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::P2P_EVENT_PROV_DISC_PBC_REQ)); + EXPECT_TRUE(pP2pIdleState->ExecuteStateMsg(&msg)); +} } // namespace Wifi } // namespace OHOS \ No newline at end of file diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_inviting_state_test.cpp b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_inviting_state_test.cpp index de6f138..b574e9a 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_inviting_state_test.cpp +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_inviting_state_test.cpp @@ -74,6 +74,12 @@ HWTEST_F(P2pInvitingStateTest, ExecuteStateMsg, TestSize.Level1) msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::P2P_EVENT_DEVICE_FOUND)); pP2pInvitingState->ExecuteStateMsg(&msg); + + msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::CMD_CANCEL_CONNECT)); + EXPECT_CALL(WifiP2PHalInterface::GetInstance(), CancelConnect()).WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); + EXPECT_CALL(pMockP2pPendant->GetP2pStateMachine(), DealGroupCreationFailed()).WillOnce(Return()); + EXPECT_CALL(pMockP2pPendant->GetP2pStateMachine(), BroadcastActionResult(_, _)).WillOnce(Return()); + pP2pInvitingState->ExecuteStateMsg(&msg); } } // namespace Wifi } // namespace OHOS \ No newline at end of file diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_monitor_test.cpp b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_monitor_test.cpp index 20e4a4c..939aa7e 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_monitor_test.cpp +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_monitor_test.cpp @@ -56,7 +56,7 @@ public: } public: - void WrapMethodSendMessage( + void WrapMethodMessageToStateMachine( const std::string &iface, P2P_STATE_MACHINE_CMD msgName, int param1, int param2, const std::any &anyObj) const { pP2pMonitor->MessageToStateMachine(iface, msgName, param1, param2, anyObj); @@ -82,7 +82,7 @@ public: pP2pMonitor->Broadcast2SmDeviceLost(iface, device); } - void WrapMethodBroadcast2SmGoNegRequest(const std::string &iface, const WifiP2pConfig &config) const + void WrapMethodBroadcast2SmGoNegRequest(const std::string &iface, const WifiP2pConfigInternal &config) const { pP2pMonitor->Broadcast2SmGoNegRequest(iface, config); } @@ -185,107 +185,107 @@ public: pP2pMonitor->OnConnectSupplicant(status); } - void WrapMethodOnDeviceFound(IdlP2pDeviceFound deviceInfo) + void WrapMethodWpaEventDeviceFound(IdlP2pDeviceFound deviceInfo) { pP2pMonitor->WpaEventDeviceFound(deviceInfo); } - void WrapMethodOnDeviceLost(const std::string &p2pDeviceAddress) + void WrapMethodWpaEventDeviceLost(const std::string &p2pDeviceAddress) { pP2pMonitor->WpaEventDeviceLost(p2pDeviceAddress); } - void WrapMethodOnGoNegRequest(const std::string &srcAddress, short passwordId) + void WrapMethodWpaEventGoNegRequest(const std::string &srcAddress, short passwordId) { pP2pMonitor->WpaEventGoNegRequest(srcAddress, passwordId); } - void WrapMethodOnGoNegSuccess() + void WrapMethodWpaEventGoNegSuccess() { pP2pMonitor->WpaEventGoNegSuccess(); } - void WrapMethodOnGoNegFailure(int status) + void WrapMethodWpaEventGoNegFailure(int status) { pP2pMonitor->WpaEventGoNegFailure(status); } - void WrapMethodOnInvitationReceived(IdlP2pInvitationInfo recvInfo) + void WrapMethodWpaEventInvitationReceived(IdlP2pInvitationInfo recvInfo) { pP2pMonitor->WpaEventInvitationReceived(recvInfo); } - void WrapMethodOnInvitationResult(const std::string &bssid, int status) + void WrapMethodWpaEventInvitationResult(const std::string &bssid, int status) { pP2pMonitor->WpaEventInvitationResult(bssid, status); } - void WrapMethodOnGroupFormationSuccess() + void WrapMethodWpaEventGroupFormationSuccess() { pP2pMonitor->WpaEventGroupFormationSuccess(); } - void WrapMethodOnGroupFormationFailure(const std::string &failureReason) + void WrapMethodWpaEventGroupFormationFailure(const std::string &failureReason) { pP2pMonitor->WpaEventGroupFormationFailure(failureReason); } - void WrapMethodOnGroupStarted(IdlP2pGroupInfo groupInfo) + void WrapMethodWpaEventGroupStarted(IdlP2pGroupInfo groupInfo) { pP2pMonitor->WpaEventGroupStarted(groupInfo); } - void WrapMethodOnGroupRemoved(const std::string &groupIfName, bool isGo) + void WrapMethodWpaEventGroupRemoved(const std::string &groupIfName, bool isGo) { pP2pMonitor->WpaEventGroupRemoved(groupIfName, isGo); } - void WrapMethodOnProvDiscPbcReq(const std::string &p2pDeviceAddress) + void WrapMethodWpaEventProvDiscPbcReq(const std::string &p2pDeviceAddress) { pP2pMonitor->WpaEventProvDiscPbcReq(p2pDeviceAddress); } - void WrapMethodOnProvDiscPbcResp(const std::string &p2pDeviceAddress) + void WrapMethodWpaEventProvDiscPbcResp(const std::string &p2pDeviceAddress) { pP2pMonitor->WpaEventProvDiscPbcResp(p2pDeviceAddress); } - void WrapMethodOnProvDiscEnterPin(const std::string &p2pDeviceAddress) + void WrapMethodWpaEventProvDiscEnterPin(const std::string &p2pDeviceAddress) { pP2pMonitor->WpaEventProvDiscEnterPin(p2pDeviceAddress); } - void WrapMethodOnProvDiscShowPin(const std::string &p2pDeviceAddress, const std::string &generatedPin) + void WrapMethodWpaEventProvDiscShowPin(const std::string &p2pDeviceAddress, const std::string &generatedPin) { pP2pMonitor->WpaEventProvDiscShowPin(p2pDeviceAddress, generatedPin); } - void WrapMethodOnProvDiscFailure() + void WrapMethodWpaEventProvDiscFailure() { pP2pMonitor->WpaEventProvDiscFailure(); } - void WrapMethodOnFindStopped() + void WrapMethodWpaEventFindStopped() { pP2pMonitor->WpaEventFindStopped(); } - void WrapMethodOnServDiscReq(IdlP2pServDiscReqInfo reqInfo) + void WrapMethodWpaEventServDiscReq(IdlP2pServDiscReqInfo reqInfo) { pP2pMonitor->WpaEventServDiscReq(reqInfo); } - void WrapMethodOnServDiscResp( + void WrapMethodWpaEventServDiscResp( const std::string &srcAddress, short updateIndicator, const std::vector &tlvs) { pP2pMonitor->WpaEventServDiscResp(srcAddress, updateIndicator, tlvs); } - void WrapMethodOnApStaDisconnected(const std::string &p2pDeviceAddress) + void WrapMethodWpaEventApStaDisconnected(const std::string &p2pDeviceAddress) { pP2pMonitor->WpaEventApStaDisconnected(p2pDeviceAddress); } - void WrapMethodOnApStaConnected(const std::string &p2pDeviceAddress) + void WrapMethodWpaEventApStaConnected(const std::string &p2pDeviceAddress) { pP2pMonitor->WpaEventApStaConnected(p2pDeviceAddress); } @@ -328,7 +328,7 @@ HWTEST_F(P2pMonitorTest, WrapMethod_test, TestSize.Level1) constexpr int param1 = 0; constexpr int param2 = 1; const std::any anyObj = std::string("test_any"); - WrapMethodSendMessage(iface, msgName, param1, param2, anyObj); + WrapMethodMessageToStateMachine(iface, msgName, param1, param2, anyObj); } HWTEST_F(P2pMonitorTest, WrapMethod_data, TestSize.Level1) @@ -377,7 +377,7 @@ HWTEST_F(P2pMonitorTest, Broadcast2SmDeviceLost, TestSize.Level1) HWTEST_F(P2pMonitorTest, Broadcast2SmGoNegRequest, TestSize.Level1) { const std::string iface = g_pIface; - WifiP2pConfig testConfig; + WifiP2pConfigInternal testConfig; WrapMethodBroadcast2SmGoNegRequest(iface, testConfig); } @@ -511,12 +511,12 @@ HWTEST_F(P2pMonitorTest, OnConnectSupplicant, TestSize.Level1) WrapMethodOnConnectSupplicant(status); } -HWTEST_F(P2pMonitorTest, WpaEventDeviceFound, TestSize.Level1) +HWTEST_F(P2pMonitorTest, WpaEventDeviceFound1, TestSize.Level1) { IdlP2pDeviceFound deviceInfo; deviceInfo.srcAddress = "ff:ff:ff:ff:ff:ff"; deviceInfo.p2pDeviceAddress = "ff:ff:ff:ff:ff:ff"; - deviceInfo.primaryDeviceType = "1-111111-1"; + deviceInfo.primaryDeviceType = "1-11111111-1"; deviceInfo.deviceName = "P2pUnitTest"; deviceInfo.configMethods = 10; deviceInfo.deviceCapabilities = 8; @@ -529,32 +529,83 @@ HWTEST_F(P2pMonitorTest, WpaEventDeviceFound, TestSize.Level1) deviceInfo.wfdDeviceInfo.push_back('e'); deviceInfo.wfdDeviceInfo.push_back('8'); deviceInfo.wfdDeviceInfo.push_back('8'); - WrapMethodOnDeviceFound(deviceInfo); + WrapMethodWpaEventDeviceFound(deviceInfo); } -HWTEST_F(P2pMonitorTest, WpaEventDeviceLost, TestSize.Level1) +HWTEST_F(P2pMonitorTest, WpaEventDeviceFound2, TestSize.Level1) { - WrapMethodOnDeviceLost("ff:ff:ff:ff:ff:ff"); + IdlP2pDeviceFound deviceInfo; + deviceInfo.srcAddress = "ff:ff:ff:ff:ff:ff"; + deviceInfo.p2pDeviceAddress = "ff:ff:ff:ff:ff:ff"; + deviceInfo.primaryDeviceType = "1-11111111-1"; + deviceInfo.deviceName = ""; + deviceInfo.configMethods = 10; + deviceInfo.deviceCapabilities = 8; + deviceInfo.groupCapabilities = 12; + deviceInfo.wfdDeviceInfo.push_back('1'); + deviceInfo.wfdDeviceInfo.push_back('5'); + deviceInfo.wfdDeviceInfo.push_back('a'); + deviceInfo.wfdDeviceInfo.push_back('3'); + deviceInfo.wfdDeviceInfo.push_back('6'); + deviceInfo.wfdDeviceInfo.push_back('e'); + deviceInfo.wfdDeviceInfo.push_back('8'); + deviceInfo.wfdDeviceInfo.push_back('8'); + WrapMethodWpaEventDeviceFound(deviceInfo); +} + +HWTEST_F(P2pMonitorTest, WpaEventDeviceLost1, TestSize.Level1) +{ + std::string p2pDeviceAddress("ff:ff:ff:ff:ff:ff"); + WrapMethodWpaEventDeviceLost(p2pDeviceAddress); } -HWTEST_F(P2pMonitorTest, WpaEventGoNegRequest, TestSize.Level1) +HWTEST_F(P2pMonitorTest, WpaEventDeviceLost2, TestSize.Level1) +{ + std::string p2pDeviceAddress(""); + WrapMethodWpaEventDeviceLost(p2pDeviceAddress); +} +HWTEST_F(P2pMonitorTest, WpaEventGoNegRequest1, TestSize.Level1) { short testPasswordId = 8; - WrapMethodOnGoNegRequest("ff:ff:ff:ff:ff:ff", testPasswordId); + WrapMethodWpaEventGoNegRequest("ff:ff:ff:ff:ff:ff", testPasswordId); +} + +HWTEST_F(P2pMonitorTest, WpaEventGoNegRequest2, TestSize.Level1) +{ + short testPasswordId = 1; + WrapMethodWpaEventGoNegRequest("ff:ff:ff:ff:ff:ff", testPasswordId); +} + +HWTEST_F(P2pMonitorTest, WpaEventGoNegRequest3, TestSize.Level1) +{ + short testPasswordId = 4; + WrapMethodWpaEventGoNegRequest("ff:ff:ff:ff:ff:ff", testPasswordId); } +HWTEST_F(P2pMonitorTest, WpaEventGoNegRequest4, TestSize.Level1) +{ + short testPasswordId = 5; + WrapMethodWpaEventGoNegRequest("ff:ff:ff:ff:ff:ff", testPasswordId); +} + +HWTEST_F(P2pMonitorTest, WpaEventGoNegRequest5, TestSize.Level1) +{ + short testPasswordId = 8; + std::string srcAddress(""); + WrapMethodWpaEventGoNegRequest(srcAddress, testPasswordId); +} HWTEST_F(P2pMonitorTest, WpaEventGoNegSuccess, TestSize.Level1) { - WrapMethodOnGoNegSuccess(); + WrapMethodWpaEventGoNegSuccess(); } HWTEST_F(P2pMonitorTest, WpaEventGoNegFailure, TestSize.Level1) { int testStatus = 1; - WrapMethodOnGoNegFailure(testStatus); + WrapMethodWpaEventGoNegFailure(testStatus); } -HWTEST_F(P2pMonitorTest, WpaEventInvitationReceived, TestSize.Level1) +HWTEST_F(P2pMonitorTest, WpaEventInvitationReceived1, TestSize.Level1) { IdlP2pInvitationInfo testRecvInfo; testRecvInfo.persistentNetworkId = 1; @@ -562,26 +613,47 @@ HWTEST_F(P2pMonitorTest, WpaEventInvitationReceived, TestSize.Level1) testRecvInfo.srcAddress = "ff:ff:ff:ff:ff:ff"; testRecvInfo.goDeviceAddress = "ff:ff:ff:ff:ff:fe"; testRecvInfo.bssid = "ff:ff:ff:ff:ff:ef"; - WrapMethodOnInvitationReceived(testRecvInfo); + WrapMethodWpaEventInvitationReceived(testRecvInfo); +} + +HWTEST_F(P2pMonitorTest, WpaEventInvitationReceived2, TestSize.Level1) +{ + IdlP2pInvitationInfo testRecvInfo; + testRecvInfo.persistentNetworkId = 1; + testRecvInfo.operatingFrequency = 6; + testRecvInfo.srcAddress = ""; + testRecvInfo.goDeviceAddress = "ff:ff:ff:ff:ff:fe"; + testRecvInfo.bssid = "ff:ff:ff:ff:ff:ef"; + WrapMethodWpaEventInvitationReceived(testRecvInfo); +} + +HWTEST_F(P2pMonitorTest, WpaEventInvitationReceived3, TestSize.Level1) +{ + IdlP2pInvitationInfo testRecvInfo; + testRecvInfo.persistentNetworkId = 1; + testRecvInfo.operatingFrequency = 6; + testRecvInfo.srcAddress = "ff:ff:ff:ff:ff:ff"; + testRecvInfo.bssid = "ff:ff:ff:ff:ff:ef"; + WrapMethodWpaEventInvitationReceived(testRecvInfo); } HWTEST_F(P2pMonitorTest, WpaEventInvitationResult, TestSize.Level1) { int testStatus = 1; - WrapMethodOnInvitationResult("ff:ff:ff:ff:ff:ff", testStatus); + WrapMethodWpaEventInvitationResult("ff:ff:ff:ff:ff:ff", testStatus); } HWTEST_F(P2pMonitorTest, WpaEventGroupFormationSuccess, TestSize.Level1) { - WrapMethodOnGroupFormationSuccess(); + WrapMethodWpaEventGroupFormationSuccess(); } HWTEST_F(P2pMonitorTest, WpaEventGroupFormationFailure, TestSize.Level1) { - WrapMethodOnGroupFormationFailure("P2pUnitTestReason"); + WrapMethodWpaEventGroupFormationFailure("P2pUnitTestReason"); } -HWTEST_F(P2pMonitorTest, WpaEventGroupStarted, TestSize.Level1) +HWTEST_F(P2pMonitorTest, WpaEventGroupStarted1, TestSize.Level1) { IdlP2pGroupInfo testGroupInfo; testGroupInfo.isGo = true; @@ -592,80 +664,116 @@ HWTEST_F(P2pMonitorTest, WpaEventGroupStarted, TestSize.Level1) testGroupInfo.psk = "123456789"; testGroupInfo.passphrase = "TestPassphrase"; testGroupInfo.goDeviceAddress = "ff:ff:ff:ff:ff:ff"; - WrapMethodOnGroupStarted(testGroupInfo); + WrapMethodWpaEventGroupStarted(testGroupInfo); +} + +HWTEST_F(P2pMonitorTest, WpaEventGroupStarted2, TestSize.Level1) +{ + IdlP2pGroupInfo testGroupInfo; + testGroupInfo.isGo = false; + testGroupInfo.isPersistent = true; + testGroupInfo.frequency = 6; + testGroupInfo.groupName = "P2pUnitTestWlan"; + testGroupInfo.ssid = "P2pUnitTestGroup"; + testGroupInfo.psk = "123456789"; + testGroupInfo.passphrase = "TestPassphrase"; + testGroupInfo.goDeviceAddress = "ff:ff:ff:ff:ff:ff"; + WrapMethodWpaEventGroupStarted(testGroupInfo); } -HWTEST_F(P2pMonitorTest, WpaEventGroupRemoved, TestSize.Level1) +HWTEST_F(P2pMonitorTest, WpaEventGroupStarted3, TestSize.Level1) +{ + IdlP2pGroupInfo testGroupInfo; + testGroupInfo.isGo = true; + testGroupInfo.isPersistent = true; + testGroupInfo.frequency = 6; + testGroupInfo.ssid = "P2pUnitTestGroup"; + testGroupInfo.psk = "123456789"; + testGroupInfo.passphrase = "TestPassphrase"; + testGroupInfo.goDeviceAddress = "ff:ff:ff:ff:ff:ff"; + WrapMethodWpaEventGroupStarted(testGroupInfo); +} + +HWTEST_F(P2pMonitorTest, WpaEventGroupRemoved1, TestSize.Level1) { bool isGo = true; - WrapMethodOnGroupRemoved("P2pUnitTestWlan", isGo); + WrapMethodWpaEventGroupRemoved("P2pUnitTestWlan", isGo); +} + +HWTEST_F(P2pMonitorTest, WpaEventGroupRemoved2, TestSize.Level1) +{ + bool isGo = true; + std::string groupIfName(""); + WrapMethodWpaEventGroupRemoved(groupIfName, isGo); } HWTEST_F(P2pMonitorTest, WpaEventProvDiscPbcReq, TestSize.Level1) { - WrapMethodOnProvDiscPbcReq("ff:ff:ff:ff:ff:ff"); + WrapMethodWpaEventProvDiscPbcReq("ff:ff:ff:ff:ff:ff"); } HWTEST_F(P2pMonitorTest, WpaEventProvDiscPbcResp, TestSize.Level1) { - WrapMethodOnProvDiscPbcResp("ff:ff:ff:ff:ff:ff"); + WrapMethodWpaEventProvDiscPbcResp("ff:ff:ff:ff:ff:ff"); } HWTEST_F(P2pMonitorTest, WpaEventProvDiscEnterPin, TestSize.Level1) { - WrapMethodOnProvDiscEnterPin("ff:ff:ff:ff:ff:ff"); + WrapMethodWpaEventProvDiscEnterPin("ff:ff:ff:ff:ff:ff"); } HWTEST_F(P2pMonitorTest, WpaEventProvDiscShowPin, TestSize.Level1) { - WrapMethodOnProvDiscShowPin("ff:ff:ff:ff:ff:ff", "TestGeneratedPin"); + WrapMethodWpaEventProvDiscShowPin("ff:ff:ff:ff:ff:ff", "TestGeneratedPin"); } HWTEST_F(P2pMonitorTest, WpaEventProvDiscFailure, TestSize.Level1) { - WrapMethodOnProvDiscFailure(); + WrapMethodWpaEventProvDiscFailure(); } HWTEST_F(P2pMonitorTest, WpaEventFindStopped, TestSize.Level1) { - WrapMethodOnFindStopped(); + WrapMethodWpaEventFindStopped(); } HWTEST_F(P2pMonitorTest, WpaEventServDiscReq, TestSize.Level1) { - EXPECT_CALL(WifiP2PHalInterface::GetInstance(), RegisterP2pCallback(_)); - const std::string iface = g_pIface; - pP2pMonitor->MonitorBegins(iface); IdlP2pServDiscReqInfo info; std::vector tList; + tList.push_back(0x02); + tList.push_back(0x00); + tList.push_back(0x01); + tList.push_back(0x00); info.tlvList = tList; - info.mac = "111"; - WrapMethodOnServDiscReq(info); + WrapMethodWpaEventServDiscReq(info); } HWTEST_F(P2pMonitorTest, WpaEventServDiscResp, TestSize.Level1) { - EXPECT_CALL(WifiP2PHalInterface::GetInstance(), RegisterP2pCallback(_)); - const std::string iface = g_pIface; - pP2pMonitor->MonitorBegins(iface); short testUpdateIndicator = 5; - const std::vector testTlvs; - WrapMethodOnServDiscResp("ff:ff:ff:ff:ff:ff", testUpdateIndicator, testTlvs); + std::vector testTlvs; + testTlvs.push_back(0x03); + testTlvs.push_back(0x00); + testTlvs.push_back(0x01); + testTlvs.push_back(0x00); + testTlvs.push_back(0x00); + WrapMethodWpaEventServDiscResp("ff:ff:ff:ff:ff:ff", testUpdateIndicator, testTlvs); } HWTEST_F(P2pMonitorTest, WpaEventApStaDisconnected, TestSize.Level1) { - WrapMethodOnApStaDisconnected("ff:ff:ff:ff:ff:ff"); + WrapMethodWpaEventApStaDisconnected("ff:ff:ff:ff:ff:ff"); } HWTEST_F(P2pMonitorTest, WpaEventApStaConnected, TestSize.Level1) { - WrapMethodOnApStaConnected("ff:ff:ff:ff:ff:ff"); + WrapMethodWpaEventApStaConnected("ff:ff:ff:ff:ff:ff"); } HWTEST_F(P2pMonitorTest, OnConnectSupplicantFailed, TestSize.Level1) { WrapMethodOnConnectSupplicantFailed(); } -} // namespace Wifi -} // namespace OHOS \ No newline at end of file +} // namespace Wifi +} // namespace OHOS \ No newline at end of file diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_state_machine_test.cpp b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_state_machine_test.cpp index 8a92700..fde00ed 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_state_machine_test.cpp +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_state_machine_test.cpp @@ -205,6 +205,16 @@ public: groupInfo.SetOwner(owner); pP2pStateMachine->groupManager.AddGroup(groupInfo); } + void AddGroupManager3() + { + WifiP2pGroupInfo groupInfo; + groupInfo.SetNetworkId(-1); + groupInfo.SetGroupName("AAA"); + groupInfo.SetIsGroupOwner(true); + WifiP2pDevice owner; + groupInfo.SetOwner(owner); + pP2pStateMachine->groupManager.AddGroup(groupInfo); + } void WarpHandlerDiscoverPeers() { pP2pStateMachine->HandlerDiscoverPeers(); @@ -223,7 +233,7 @@ public: pP2pStateMachine->UpdatePersistentGroups(); } - bool WarpReinvokePersistentGroup(WifiP2pConfig &config) const + bool WarpReinvokePersistentGroup(WifiP2pConfigInternal &config) const { return pP2pStateMachine->ReawakenPersistentGroup(config); } @@ -247,15 +257,15 @@ public: { pP2pStateMachine->InitializeThisDevice(); } - bool WarpIsUsableNetworkName(std::string nwName) + bool WarpIsUsableGroupName(std::string nwName) { - return pP2pStateMachine->IsUsableNetworkName(nwName); + return pP2pStateMachine->IsUsableGroupName(nwName); } - P2pConfigErrCode WarpIsConfigUnusable(const WifiP2pConfig &config) + P2pConfigErrCode WarpIsConfigUnusable(const WifiP2pConfigInternal &config) { return pP2pStateMachine->IsConfigUnusable(config); } - bool WarpIsConfigUsableAsGroup(WifiP2pConfig config) + bool WarpIsConfigUsableAsGroup(WifiP2pConfigInternal config) { return pP2pStateMachine->IsConfigUsableAsGroup(config); } @@ -305,7 +315,7 @@ public: { pP2pStateMachine->NotifyUserProvDiscShowPinRequestMessage(pin, peerAddress); } - void WarpP2pConnectWithPinDisplay(const WifiP2pConfig &config) const + void WarpP2pConnectWithPinDisplay(const WifiP2pConfigInternal &config) const { pP2pStateMachine->P2pConnectByShowingPin(config); } @@ -327,11 +337,46 @@ public: pP2pStateMachine->savedP2pConfig.SetWpsInfo(info); pP2pStateMachine->NotifyUserInvitationReceivedMessage(); } - void WarpClearWifiP2pInfo() { pP2pStateMachine->ClearWifiP2pInfo(); } + bool WarpStartDhcpServer() + { + return pP2pStateMachine->StartDhcpServer(); + } + void WarpDhcpResultNotifyOnSuccess(int status, const std::string &ifname, DhcpResult &result) + { + pP2pStateMachine->pDhcpResultNotify->OnSuccess(status, ifname, result); + } + void WarpDhcpResultNotifyOnFailed(int status, const std::string &ifname, const std::string &reason) + { + pP2pStateMachine->pDhcpResultNotify->OnFailed(status, ifname, reason); + } + void WarpDhcpResultNotifyOnSerExitNotify(const std::string& ifname) + { + pP2pStateMachine->pDhcpResultNotify->OnSerExitNotify(ifname); + } + int WarpGetAvailableFreqByBand(GroupOwnerBand band) const + { + return pP2pStateMachine->GetAvailableFreqByBand(band); + } + bool WarpSetGroupConfig(const WifiP2pConfigInternal &config, bool newGroup) const + { + return pP2pStateMachine->SetGroupConfig(config, newGroup); + } + bool WarpDealCreateNewGroupWithConfig(const WifiP2pConfigInternal &config, int freq) const + { + return pP2pStateMachine->DealCreateNewGroupWithConfig(config, freq); + } + void WarpUpdateGroupInfoToWpa() const + { + pP2pStateMachine->UpdateGroupInfoToWpa(); + } + void WarpHandleP2pServiceResp(const WifiP2pServiceResponse &resp, const WifiP2pDevice &dev) const + { + pP2pStateMachine->HandleP2pServiceResp(resp, dev); + } }; void ButtonTest(AlertDialog &dialog, std::any ctx) @@ -365,7 +410,7 @@ HWTEST_F(P2pStateMachineTest, RegisterEventHandler, TestSize.Level1) WarpRegisterEventHandler(); } -HWTEST_F(P2pStateMachineTest, UpdateOwnDevice, TestSize.Level1) +HWTEST_F(P2pStateMachineTest, UpdateThisDevice, TestSize.Level1) { WarpUpdateThisDevice(); } @@ -392,7 +437,7 @@ HWTEST_F(P2pStateMachineTest, UpdatePersistentGroups_FAILED, TestSize.Level1) HWTEST_F(P2pStateMachineTest, P2pConnectWithPinDisplay_SUCCESS, TestSize.Level1) { - WifiP2pConfig conf; + WifiP2pConfigInternal conf; WarpP2pConnectWithPinDisplay(conf); conf.SetDeviceAddress("AA:BB:CC:DD:EE:FF"); @@ -417,7 +462,7 @@ HWTEST_F(P2pStateMachineTest, RemoveGroupByNetworkId, TestSize.Level1) WarpRemoveGroupByNetworkId(1); } -HWTEST_F(P2pStateMachineTest, SetWifiP2pInfoWhenGroupFormed, TestSize.Level1) +HWTEST_F(P2pStateMachineTest, SetWifiP2pInfoOnGroupFormed, TestSize.Level1) { WarpSetWifiP2pInfoOnGroupFormed("AA:BB:CC:DD:EE:FF"); } @@ -440,40 +485,66 @@ HWTEST_F(P2pStateMachineTest, InitializeThisDevice2, TestSize.Level1) WarpInitializeThisDevice(); } -HWTEST_F(P2pStateMachineTest, IsUsableNetworkName, TestSize.Level1) +HWTEST_F(P2pStateMachineTest, IsUsableGroupName, TestSize.Level1) { - EXPECT_FALSE(WarpIsUsableNetworkName("")); - EXPECT_TRUE(WarpIsUsableNetworkName("12345678910")); - EXPECT_FALSE(WarpIsUsableNetworkName("1")); + EXPECT_FALSE(WarpIsUsableGroupName("")); + EXPECT_TRUE(WarpIsUsableGroupName("12345678910")); + EXPECT_FALSE(WarpIsUsableGroupName("1")); } -HWTEST_F(P2pStateMachineTest, IsConfigUnusable, TestSize.Level1) +HWTEST_F(P2pStateMachineTest, IsConfigUnusable1, TestSize.Level1) { - WifiP2pConfig config; + WifiP2pConfigInternal config; config.SetDeviceAddress(""); EXPECT_TRUE(WarpIsConfigUnusable(config) == P2pConfigErrCode::MAC_EMPTY); +} + +HWTEST_F(P2pStateMachineTest, IsConfigUnusable2, TestSize.Level1) +{ + WifiP2pConfigInternal config; AddDeviceManager(); config.SetDeviceAddress("AA:BB:CC:DD:EE:FF"); - EXPECT_FALSE(WarpIsConfigUnusable(config) == P2pConfigErrCode::SUCCESS); + config.SetGroupOwnerIntent(6); + EXPECT_TRUE(WarpIsConfigUnusable(config) == P2pConfigErrCode::SUCCESS); +} + +HWTEST_F(P2pStateMachineTest, IsConfigUnusable3, TestSize.Level1) +{ + WifiP2pConfigInternal config; + AddDeviceManager(); + config.SetDeviceAddress("AA:BB:CC:DD:EE:FF"); + config.SetGroupOwnerIntent(6); + config.SetGroupName(std::string("abcdefghijklnmopqrstuvwxyz1234567")); + EXPECT_TRUE(WarpIsConfigUnusable(config) == P2pConfigErrCode::ERR_SIZE_NW_NAME); +} + +HWTEST_F(P2pStateMachineTest, IsConfigUnusable4, TestSize.Level1) +{ + WifiP2pConfigInternal config; config.SetDeviceAddress("aa:cc:bb:dd:ee:ff"); EXPECT_TRUE(WarpIsConfigUnusable(config) == P2pConfigErrCode::MAC_NOT_FOUND); +} + +HWTEST_F(P2pStateMachineTest, IsConfigUnusable5, TestSize.Level1) +{ + WifiP2pConfigInternal config; config.SetDeviceAddress("aa:cc::bb:dd:ee:ff"); EXPECT_TRUE(WarpIsConfigUnusable(config) == P2pConfigErrCode::ERR_MAC_FORMAT); } HWTEST_F(P2pStateMachineTest, IsConfigUsableAsGroup, TestSize.Level1) { - WifiP2pConfig config; + WifiP2pConfigInternal config; config.SetDeviceAddress(""); EXPECT_FALSE(WarpIsConfigUsableAsGroup(config)); config.SetDeviceAddress("1"); EXPECT_FALSE(WarpIsConfigUsableAsGroup(config)); - config.SetNetworkName("12345678910"); + config.SetGroupName("12345678910"); config.SetPassphrase("12345678910"); EXPECT_TRUE(WarpIsConfigUsableAsGroup(config)); } -HWTEST_F(P2pStateMachineTest, CancelSupplicantSrvDiscReq, TestSize.Level1) +HWTEST_F(P2pStateMachineTest, CleanSupplicantServiceReq, TestSize.Level1) { WarpCleanSupplicantServiceReq(); Addsvr(); @@ -512,7 +583,7 @@ HWTEST_F(P2pStateMachineTest, BroadcastP2pServicesChanged, TestSize.Level1) HWTEST_F(P2pStateMachineTest, BroadcastP2pConnectionChanged, TestSize.Level1) { IP2pServiceCallbacks callback; - callback.OnP2pConnectionChangedEvent = [](const WifiP2pInfo &) { WIFI_LOGI("lamda"); }; + callback.OnP2pConnectionChangedEvent = [](const WifiP2pLinkedInfo &) { WIFI_LOGI("lamda"); }; pP2pStateMachine->RegisterP2pServiceCallbacks(callback); WarpBroadcastP2pConnectionChanged(); } @@ -557,7 +628,7 @@ HWTEST_F(P2pStateMachineTest, NotifyUserProvDiscShowPinRequestMessage, TestSize. WarpNotifyP2pProvDiscShowPinRequest(pin, peerAddress); } -HWTEST_F(P2pStateMachineTest, NotifyUserInvitationSentMessage, TestSize.Level1) +HWTEST_F(P2pStateMachineTest, NotifyInvitationSent, TestSize.Level1) { std::string pin; const std::string peerAddress; @@ -586,11 +657,11 @@ HWTEST_F(P2pStateMachineTest, ClearWifiP2pInfo, TestSize.Level1) HWTEST_F(P2pStateMachineTest, ReinvokePersistentGroup1, TestSize.Level1) { - WifiP2pConfig config; + WifiP2pConfigInternal config; EXPECT_FALSE(WarpReinvokePersistentGroup(config)); config.SetDeviceAddress("AA:BB:CC:DD:EE:FF"); - config.SetNetworkName("AAA"); + config.SetGroupName("AAA"); AddGroupManager(); AddDeviceManager(); EXPECT_CALL(WifiP2PHalInterface::GetInstance(), GroupAdd(_, _, _)) @@ -602,9 +673,9 @@ HWTEST_F(P2pStateMachineTest, ReinvokePersistentGroup1, TestSize.Level1) HWTEST_F(P2pStateMachineTest, ReinvokePersistentGroup2, TestSize.Level1) { - WifiP2pConfig config; + WifiP2pConfigInternal config; config.SetDeviceAddress("AA:BB:CC:DD:EE:FF"); - config.SetNetworkName("AAA"); + config.SetGroupName("AAA"); AddGroupManager(); AddDeviceManagerLimit(); EXPECT_FALSE(WarpReinvokePersistentGroup(config)); @@ -612,9 +683,9 @@ HWTEST_F(P2pStateMachineTest, ReinvokePersistentGroup2, TestSize.Level1) HWTEST_F(P2pStateMachineTest, ReinvokePersistentGroup3, TestSize.Level1) { - WifiP2pConfig config; + WifiP2pConfigInternal config; config.SetDeviceAddress("AA:BB:CC:DD:EE:FF"); - config.SetNetworkName("AAA"); + config.SetGroupName("AAA"); config.SetNetId(2); AddGroupManager(); AddDeviceManagerInViteable(); @@ -628,13 +699,197 @@ HWTEST_F(P2pStateMachineTest, ReinvokePersistentGroup3, TestSize.Level1) HWTEST_F(P2pStateMachineTest, ReinvokePersistentGroup4, TestSize.Level1) { - WifiP2pConfig config; + WifiP2pConfigInternal config; config.SetDeviceAddress("AA:BB:CC:DD:EE:FF"); - config.SetNetworkName("AAA"); + config.SetGroupName("AAA"); config.SetNetId(3); AddGroupManager2(); AddDeviceManagerInViteable(); EXPECT_FALSE(WarpReinvokePersistentGroup(config)); } + +HWTEST_F(P2pStateMachineTest, StartDhcpServer, TestSize.Level1) +{ + WarpStartDhcpServer(); +} + +HWTEST_F(P2pStateMachineTest, DhcpResultNotifyOnSuccess, TestSize.Level1) +{ + int status = 1; + std::string ifName("ifName"); + DhcpResult result; + WarpDhcpResultNotifyOnSuccess(status, ifName, result); +} + +HWTEST_F(P2pStateMachineTest, DhcpResultNotifyOnFailed, TestSize.Level1) +{ + int status = 1; + std::string ifName("ifName"); + std::string reason("reason"); + EXPECT_CALL(WifiP2PHalInterface::GetInstance(), GroupRemove(_)).WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); + WarpDhcpResultNotifyOnFailed(status, ifName, reason); +} + +HWTEST_F(P2pStateMachineTest, DhcpResultNotifyOnSerExitNotify, TestSize.Level1) +{ + std::string ifName("ifName"); + WarpDhcpResultNotifyOnSerExitNotify(ifName); +} + +HWTEST_F(P2pStateMachineTest, GetAvailableFreqByBand1, TestSize.Level1) +{ + GroupOwnerBand band = GroupOwnerBand::GO_BAND_AUTO; + EXPECT_EQ(WarpGetAvailableFreqByBand(band), 0); +} + +HWTEST_F(P2pStateMachineTest, GetAvailableFreqByBand2, TestSize.Level1) +{ + GroupOwnerBand band = GroupOwnerBand::GO_BAND_2GHZ; + EXPECT_CALL(WifiP2PHalInterface::GetInstance(), P2pGetSupportFrequenciesByBand(_, _)) + .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_FAILED)); + EXPECT_EQ(WarpGetAvailableFreqByBand(band), 0); +} + +HWTEST_F(P2pStateMachineTest, GetAvailableFreqByBand3, TestSize.Level1) +{ + GroupOwnerBand band = GroupOwnerBand::GO_BAND_2GHZ; + std::vector freqList; + freqList.push_back(2412); + EXPECT_CALL(WifiP2PHalInterface::GetInstance(), P2pGetSupportFrequenciesByBand(_, _)) + .WillOnce(DoAll(SetArgReferee<1>(freqList), Return(WifiErrorNo::WIFI_IDL_OPT_OK))); + WarpGetAvailableFreqByBand(band); +} + +HWTEST_F(P2pStateMachineTest, SetGroupConfig1, TestSize.Level1) +{ + WifiP2pConfigInternal config; + EXPECT_CALL(WifiP2PHalInterface::GetInstance(), P2pSetGroupConfig(_, _)) + .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_FAILED)); + EXPECT_FALSE(WarpSetGroupConfig(config, true)); +} + +HWTEST_F(P2pStateMachineTest, SetGroupConfig2, TestSize.Level1) +{ + WifiP2pConfigInternal config; + EXPECT_CALL(WifiP2PHalInterface::GetInstance(), P2pGetGroupConfig(_, _)) + .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); + EXPECT_CALL(WifiP2PHalInterface::GetInstance(), P2pSetGroupConfig(_, _)) + .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); + EXPECT_TRUE(WarpSetGroupConfig(config, false)); +} + +HWTEST_F(P2pStateMachineTest, SetGroupConfig3, TestSize.Level1) +{ + WifiP2pConfigInternal config; + config.SetGroupName(std::string("GroupName")); + config.SetPassphrase(std::string("12345678")); + EXPECT_CALL(WifiP2PHalInterface::GetInstance(), P2pGetGroupConfig(_, _)) + .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_FAILED)); + EXPECT_CALL(WifiP2PHalInterface::GetInstance(), P2pSetGroupConfig(_, _)) + .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); + EXPECT_TRUE(WarpSetGroupConfig(config, false)); +} + +HWTEST_F(P2pStateMachineTest, DealCreateNewGroupWithConfig1, TestSize.Level1) +{ + WifiP2pConfigInternal config; + config.SetGroupName(std::string("AAA")); + int freq = 0; + AddGroupManager(); + EXPECT_FALSE(WarpDealCreateNewGroupWithConfig(config, freq)); +} + +HWTEST_F(P2pStateMachineTest, DealCreateNewGroupWithConfig2, TestSize.Level1) +{ + WifiP2pConfigInternal config; + int freq = 0; + EXPECT_CALL(WifiP2PHalInterface::GetInstance(), P2pAddNetwork(_)).WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); + EXPECT_CALL(WifiP2PHalInterface::GetInstance(), P2pSetGroupConfig(_, _)) + .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_FAILED)); + EXPECT_CALL(WifiP2PHalInterface::GetInstance(), GroupAdd(_, _, _)) + .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_FAILED)); + EXPECT_CALL(WifiP2PHalInterface::GetInstance(), RemoveNetwork(_)).WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); + EXPECT_FALSE(WarpDealCreateNewGroupWithConfig(config, freq)); +} + +HWTEST_F(P2pStateMachineTest, DealCreateNewGroupWithConfig3, TestSize.Level1) +{ + WifiP2pConfigInternal config; + config.SetNetId(-1); + int freq = 0; + EXPECT_CALL(WifiP2PHalInterface::GetInstance(), P2pAddNetwork(_)).WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); + EXPECT_CALL(WifiP2PHalInterface::GetInstance(), P2pSetGroupConfig(_, _)) + .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); + EXPECT_CALL(WifiP2PHalInterface::GetInstance(), GroupAdd(_, _, _)).WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); + EXPECT_CALL(WifiP2PHalInterface::GetInstance(), RemoveNetwork(_)).WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); + EXPECT_TRUE(WarpDealCreateNewGroupWithConfig(config, freq)); +} + +HWTEST_F(P2pStateMachineTest, UpdateGroupInfoToWpa1, TestSize.Level1) +{ + EXPECT_CALL(WifiP2PHalInterface::GetInstance(), RemoveNetwork(_)) + .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_FAILED)); + WarpUpdateGroupInfoToWpa(); +} + +HWTEST_F(P2pStateMachineTest, UpdateGroupInfoToWpa2, TestSize.Level1) +{ + AddGroupManager(); + EXPECT_CALL(WifiP2PHalInterface::GetInstance(), RemoveNetwork(_)) + .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); + EXPECT_CALL(WifiP2PHalInterface::GetInstance(), P2pAddNetwork(_)) + .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_FAILED)); + WarpUpdateGroupInfoToWpa(); +} + +HWTEST_F(P2pStateMachineTest, UpdateGroupInfoToWpa3, TestSize.Level1) +{ + AddGroupManager(); + AddGroupManager3(); + EXPECT_CALL(WifiP2PHalInterface::GetInstance(), RemoveNetwork(_)) + .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); + EXPECT_CALL(WifiP2PHalInterface::GetInstance(), P2pAddNetwork(_)) + .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)) + .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); + EXPECT_CALL(WifiP2PHalInterface::GetInstance(), P2pSetGroupConfig(_, _)) + .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)) + .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); + WarpUpdateGroupInfoToWpa(); +} + +HWTEST_F(P2pStateMachineTest, HandleP2pServiceResp1, TestSize.Level1) +{ + WifiP2pServiceResponse resp; + resp.SetServiceStatus(P2pServiceStatus::PSRS_SERVICE_PROTOCOL_NOT_AVAILABLE); + WifiP2pDevice dev; + WarpHandleP2pServiceResp(resp, dev); +} + +HWTEST_F(P2pStateMachineTest, HandleP2pServiceResp2, TestSize.Level1) +{ + WifiP2pServiceResponse resp; + resp.SetServiceStatus(P2pServiceStatus::PSRS_SUCCESS); + resp.SetProtocolType(P2pServicerProtocolType::SERVICE_TYPE_BONJOUR); + WifiP2pDevice dev; + WarpHandleP2pServiceResp(resp, dev); +} + +HWTEST_F(P2pStateMachineTest, HandleP2pServiceResp3, TestSize.Level1) +{ + WifiP2pServiceResponse resp; + resp.SetServiceStatus(P2pServiceStatus::PSRS_SUCCESS); + resp.SetProtocolType(P2pServicerProtocolType::SERVICE_TYPE_UP_NP); + WifiP2pDevice dev; + WarpHandleP2pServiceResp(resp, dev); +} + +HWTEST_F(P2pStateMachineTest, HandleP2pServiceResp4, TestSize.Level1) +{ + WifiP2pServiceResponse resp; + resp.SetServiceStatus(P2pServiceStatus::PSRS_SUCCESS); + resp.SetProtocolType(P2pServicerProtocolType::SERVICE_TYPE_VENDOR_SPECIFIC); + WifiP2pDevice dev; + WarpHandleP2pServiceResp(resp, dev); +} } // namespace Wifi } // namespace OHOS \ No newline at end of file diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/provision_discovery_state_test.cpp b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/provision_discovery_state_test.cpp index 365b3f4..2190600 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/provision_discovery_state_test.cpp +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/provision_discovery_state_test.cpp @@ -164,6 +164,10 @@ HWTEST_F(ProvisionDiscoveryStateTest, ExecuteStateMsg3, TestSize.Level1) AddSaveP2pConfig3(); EXPECT_TRUE(pProvisionDiscoveryState->ExecuteStateMsg(&msg)); + + provDisc.SetPin(std::string("12345678")); + msg.SetMessageObj(provDisc); + EXPECT_TRUE(pProvisionDiscoveryState->ExecuteStateMsg(&msg)); } HWTEST_F(ProvisionDiscoveryStateTest, ExecuteStateMsg4, TestSize.Level1) @@ -174,12 +178,29 @@ HWTEST_F(ProvisionDiscoveryStateTest, ExecuteStateMsg4, TestSize.Level1) EXPECT_FALSE(pProvisionDiscoveryState->ExecuteStateMsg(nullptr)); } -HWTEST_F(ProvisionDiscoveryStateTest, ProcessProvDiscFailEvt, TestSize.Level1) +HWTEST_F(ProvisionDiscoveryStateTest, ExecuteStateMsgFailed, TestSize.Level1) { InternalMessage msg; - msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::PEER_CONNECTION_USER_REJECT)); EXPECT_FALSE(pProvisionDiscoveryState->ExecuteStateMsg(&msg)); } + +HWTEST_F(ProvisionDiscoveryStateTest, ProcessProvDiscFailEvt, TestSize.Level1) +{ + InternalMessage msg; + msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::P2P_EVENT_PROV_DISC_FAILURE)); + EXPECT_CALL(pMockP2pPendant->GetP2pStateMachine(), DealGroupCreationFailed()).WillOnce(Return()); + EXPECT_TRUE(pProvisionDiscoveryState->ExecuteStateMsg(&msg)); +} + +HWTEST_F(ProvisionDiscoveryStateTest, ProcessCmdCancelConnect, TestSize.Level1) +{ + InternalMessage msg; + msg.SetMessageName(static_cast(P2P_STATE_MACHINE_CMD::CMD_CANCEL_CONNECT)); + EXPECT_CALL(WifiP2PHalInterface::GetInstance(), CancelConnect()).WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); + EXPECT_CALL(pMockP2pPendant->GetP2pStateMachine(), DealGroupCreationFailed()).WillOnce(Return()); + EXPECT_CALL(pMockP2pPendant->GetP2pStateMachine(), BroadcastActionResult(_, _)).WillOnce(Return()); + EXPECT_TRUE(pProvisionDiscoveryState->ExecuteStateMsg(&msg)); +} } // namespace Wifi } // namespace OHOS \ No newline at end of file diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_dns_sd_service_info_test.cpp b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_dns_sd_service_info_test.cpp index d4cad13..a3a80df 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_dns_sd_service_info_test.cpp +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_dns_sd_service_info_test.cpp @@ -37,7 +37,7 @@ public: public: std::unique_ptr pWifiP2pDnsSdServiceInfo; - void WarpCompressDnsName() + void WarpTurnDnsNameToStream() { std::string dnsName = "a.txt"; EXPECT_EQ("c00c", pWifiP2pDnsSdServiceInfo->TurnDnsNameToStream("_tcp.local.")); @@ -53,7 +53,8 @@ HWTEST_F(WifiP2pDnsSdServiceInfoTest, Create, TestSize.Level1) std::string instanceName; std::string serviceType; std::map txtMap; - std::string svrName; + txtMap.insert(std::make_pair(std::string("ip"), std::string("TestIp"))); + std::string svrName("TestSvrName"); WifiP2pDnsSdServiceInfo::Create(instanceName, serviceType, txtMap, svrName); } @@ -68,9 +69,10 @@ HWTEST_F(WifiP2pDnsSdServiceInfoTest, BuildRequest, TestSize.Level1) std::map txtMap; WifiP2pDnsSdServiceInfo::Create(instanceName, serviceType, txtMap, svrName).BuildRequest(dnsName, dnsType, version); } + HWTEST_F(WifiP2pDnsSdServiceInfoTest, TurnDnsNameToStream, TestSize.Level1) { - WarpCompressDnsName(); + WarpTurnDnsNameToStream(); } } // namespace Wifi } // namespace OHOS \ No newline at end of file diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_dns_sd_service_response_test.cpp b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_dns_sd_service_response_test.cpp index 9a96490..b580069 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_dns_sd_service_response_test.cpp +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_dns_sd_service_response_test.cpp @@ -28,16 +28,20 @@ public: virtual void SetUp() { pWifiP2pDnsSdServiceResponse.reset(new WifiP2pDnsSdServiceResponse(resp)); + std::vector data; + pWifiP2pDnsSdServiceResponse2.reset(new WifiP2pDnsSdServiceResponse(P2pServiceStatus::PSRS_SUCCESS, 0, data)); } virtual void TearDown() { pWifiP2pDnsSdServiceResponse.reset(); + pWifiP2pDnsSdServiceResponse2.reset(); } public: WifiP2pServiceResponse resp; std::unique_ptr pWifiP2pDnsSdServiceResponse; - void WarpReadTxtData() + std::unique_ptr pWifiP2pDnsSdServiceResponse2; + void WarpFetchTxtData() { std::istringstream istream("name"); pWifiP2pDnsSdServiceResponse->FetchTxtData(istream); @@ -86,11 +90,120 @@ HWTEST_F(WifiP2pDnsSdServiceResponseTest, ParseData, TestSize.Level1) data.push_back(0xc0); pWifiP2pDnsSdServiceResponse->SetData(data); EXPECT_EQ(false, pWifiP2pDnsSdServiceResponse->ParseData()); + + data.clear(); + data.push_back(0x0b); + data.push_back(0x73); + data.push_back(0x65); + data.push_back(0x72); + data.push_back(0x76); + data.push_back(0x69); + data.push_back(0x63); + data.push_back(0x65); + data.push_back(0x54); + data.push_back(0x79); + data.push_back(0x70); + data.push_back(0x65); + data.push_back(0xc0); + data.push_back(0x11); + data.push_back(0x00); + data.push_back(0x0c); + data.push_back(0x01); + data.push_back(0x0c); + data.push_back(0x69); + data.push_back(0x6e); + data.push_back(0x73); + data.push_back(0x74); + data.push_back(0x61); + data.push_back(0x6e); + data.push_back(0x63); + data.push_back(0x65); + data.push_back(0x4e); + data.push_back(0x61); + data.push_back(0x6d); + data.push_back(0x65); + data.push_back(0xc0); + data.push_back(0x27); + data.push_back(0x3b); + data.push_back(0x04); + data.push_back(0x73); + data.push_back(0x65); + data.push_back(0x72); + data.push_back(0x76); + pWifiP2pDnsSdServiceResponse->SetData(data); + EXPECT_EQ(true, pWifiP2pDnsSdServiceResponse->ParseData()); + + data.clear(); + data.push_back(0x0c); + data.push_back(0x69); + data.push_back(0x6e); + data.push_back(0x73); + data.push_back(0x74); + data.push_back(0x61); + data.push_back(0x6e); + data.push_back(0x63); + data.push_back(0x65); + data.push_back(0x6e); + data.push_back(0x61); + data.push_back(0x6d); + data.push_back(0x65); + data.push_back(0x0b); + data.push_back(0x73); + data.push_back(0x65); + data.push_back(0x72); + data.push_back(0x76); + data.push_back(0x69); + data.push_back(0x63); + data.push_back(0x65); + data.push_back(0x74); + data.push_back(0x79); + data.push_back(0x70); + data.push_back(0x65); + data.push_back(0xc0); + data.push_back(0x11); + data.push_back(0x00); + data.push_back(0x10); + data.push_back(0x01); + data.push_back(0x0e); + data.push_back(0x69); + data.push_back(0x70); + data.push_back(0x3d); + data.push_back(0x58); + data.push_back(0x58); + data.push_back(0x58); + data.push_back(0x2e); + data.push_back(0x58); + data.push_back(0x58); + data.push_back(0x58); + data.push_back(0x2e); + data.push_back(0x58); + data.push_back(0x2e); + data.push_back(0x58); + data.push_back(0x0a); + data.push_back(0x70); + data.push_back(0x6f); + data.push_back(0x72); + data.push_back(0x74); + data.push_back(0x3d); + data.push_back(0x39); + data.push_back(0x39); + data.push_back(0x39); + data.push_back(0x39); + data.push_back(0x39); + data.push_back(0x00); + data.push_back(0x3b); + data.push_back(0x04); + data.push_back(0x73); + data.push_back(0x65); + data.push_back(0x72); + data.push_back(0x76); + pWifiP2pDnsSdServiceResponse->SetData(data); + EXPECT_EQ(true, pWifiP2pDnsSdServiceResponse->ParseData()); } HWTEST_F(WifiP2pDnsSdServiceResponseTest, FetchTxtData, TestSize.Level1) { - WarpReadTxtData(); + WarpFetchTxtData(); } } // namespace Wifi } // namespace OHOS \ No newline at end of file diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_group_info_proxy_test.cpp b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_group_info_proxy_test.cpp index a752d21..c5102bd 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_group_info_proxy_test.cpp +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_group_info_proxy_test.cpp @@ -61,6 +61,8 @@ HWTEST_F(WifiP2pGroupInfoProxyTest, CompareSuccess, TestSize.Level1) EXPECT_EQ(pWifiP2pGroupInfoProxy->GetInterface(), "iface"); pWifiP2pGroupInfoProxy->SetGroupName("groupName"); EXPECT_EQ(pWifiP2pGroupInfoProxy->GetGroupName(), "groupName"); + pWifiP2pGroupInfoProxy->SetGoIpAddress("ip"); + EXPECT_EQ(pWifiP2pGroupInfoProxy->GetGoIpAddress(), "ip"); pWifiP2pGroupInfoProxy->SetFrequency(2020); EXPECT_EQ(pWifiP2pGroupInfoProxy->GetFrequency(), 2020); pWifiP2pGroupInfoProxy->SetIsPersistent(true); @@ -76,6 +78,7 @@ HWTEST_F(WifiP2pGroupInfoProxyTest, CompareSuccess, TestSize.Level1) devices.push_back(device1); devices.push_back(device2); pWifiP2pGroupInfoProxy->SetClientDevices(devices); + std::vector clientDevices = pWifiP2pGroupInfoProxy->GetClientDevices(); EXPECT_FALSE(pWifiP2pGroupInfoProxy->IsClientDevicesEmpty()); pWifiP2pGroupInfoProxy->ClearClientDevices(); EXPECT_TRUE(pWifiP2pGroupInfoProxy->IsClientDevicesEmpty()); diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_group_manager_test.cpp b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_group_manager_test.cpp index 5856662..680903f 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_group_manager_test.cpp +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_group_manager_test.cpp @@ -49,7 +49,6 @@ public: groupInfo.SetIsPersistent(true); groupInfo.SetP2pGroupStatus(P2pGroupStatus::GS_INVALID); groupInfo.SetNetworkId(SET_NETWORKID); - groupInfo.SetGoIpAddress(std::string("111.111.111.111")); groupInfo.AddClientDevice(device); } virtual void TearDown() @@ -150,7 +149,7 @@ HWTEST_F(WifiP2pGroupManagerTest, GetOwnerAddr_SUCCESS, TestSize.Level1) HWTEST_F(WifiP2pGroupManagerTest, Contains_SUCCESS, TestSize.Level1) { - WifiP2pInfo connInfo; + WifiP2pLinkedInfo linkedInfo; EXPECT_FALSE(pWifiP2pGroupManager->IsInclude(10)); pWifiP2pGroupManager->AddGroup(groupInfo); EXPECT_TRUE(pWifiP2pGroupManager->IsInclude(10)); @@ -164,8 +163,8 @@ HWTEST_F(WifiP2pGroupManagerTest, RefreshGroupsFromCurrentGroup_SUCCESS, TestSiz HWTEST_F(WifiP2pGroupManagerTest, SaveP2pInfo_SUCCESS, TestSize.Level1) { - WifiP2pInfo connInfo; - pWifiP2pGroupManager->SaveP2pInfo(connInfo); + WifiP2pLinkedInfo linkedInfo; + pWifiP2pGroupManager->SaveP2pInfo(linkedInfo); pWifiP2pGroupManager->GetP2pInfo(); } diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_manager_test.cpp b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_manager_test.cpp index 63e9eb0..21a312f 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_manager_test.cpp +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_manager_test.cpp @@ -29,7 +29,6 @@ public: virtual void SetUp() { - WifiP2pDevice device; pWifiP2pServiceManager.reset(new WifiP2pServiceManager()); } virtual void TearDown() @@ -160,7 +159,6 @@ HWTEST_F(WifiP2pServiceManagerTest, AddServiceResponse_SUCCESS, TestSize.Level1) EXPECT_TRUE(pWifiP2pServiceManager->AddServiceResponse(p2pSvrReq1)); } - HWTEST_F(WifiP2pServiceManagerTest, RemoveServiceResponse_SUCCESS, TestSize.Level1) { WifiP2pDevice device; @@ -236,5 +234,36 @@ HWTEST_F(WifiP2pServiceManagerTest, ClearAllRequestRecord, TestSize.Level1) { pWifiP2pServiceManager->ClearAllRequestRecord(); } + +HWTEST_F(WifiP2pServiceManagerTest, UpdateServiceName1, TestSize.Level1) +{ + WifiP2pServiceResponse resp; + resp.SetServiceStatus(P2pServiceStatus::PSRS_SUCCESS); + WifiP2pDevice device; + device.SetDeviceAddress(std::string("aa:bb:cc:dd:ee:ff")); + EXPECT_FALSE(pWifiP2pServiceManager->UpdateServiceName(std::string("aa:bb:cc:dd:ee:ff"), resp)); +} + +HWTEST_F(WifiP2pServiceManagerTest, UpdateServiceName2, TestSize.Level1) +{ + WifiP2pServiceResponse resp; + resp.SetServiceStatus(P2pServiceStatus::PSRS_SUCCESS); + WifiP2pDevice device; + device.SetDeviceAddress(std::string("aa:bb:cc:dd:ee:ff")); + pWifiP2pServiceManager->AddDeviceService(resp, device); + EXPECT_TRUE(pWifiP2pServiceManager->UpdateServiceName(std::string("aa:bb:cc:dd:ee:ff"), resp)); +} + +HWTEST_F(WifiP2pServiceManagerTest, UpdateServiceName3, TestSize.Level1) +{ + WifiP2pServiceResponse resp; + resp.SetServiceStatus(P2pServiceStatus::PSRS_SUCCESS); + resp.SetProtocolType(P2pServicerProtocolType::SERVICE_TYPE_BONJOUR); + WifiP2pDevice device; + device.SetDeviceAddress(std::string("aa:bb:cc:dd:ee:ff")); + pWifiP2pServiceManager->AddDeviceService(resp, device); + resp.SetProtocolType(P2pServicerProtocolType::SERVICE_TYPE_UP_NP); + EXPECT_FALSE(pWifiP2pServiceManager->UpdateServiceName(std::string("aa:bb:cc:dd:ee:ff"), resp)); +} } // namespace Wifi } // namespace OHOS \ No newline at end of file diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_request_list_test.cpp b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_request_list_test.cpp index 2fc9e8f..1ea1f87 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_request_list_test.cpp +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_request_list_test.cpp @@ -94,17 +94,45 @@ HWTEST_F(WifiP2pServiceRequestListTest, SetDevice, TestSize.Level1) EXPECT_EQ(pWifiP2pServiceRequestList->GetDevice(), device); } -HWTEST_F(WifiP2pServiceRequestListTest, GetTlvs, TestSize.Level1) // +HWTEST_F(WifiP2pServiceRequestListTest, GetTlvs, TestSize.Level1) { WifiP2pServiceRequest resp; EXPECT_TRUE(pWifiP2pServiceRequestList->AddServiceRequest(resp)); pWifiP2pServiceRequestList->GetTlvs(); } -HWTEST_F(WifiP2pServiceRequestListTest, ParseTlvs2ReqList, TestSize.Level1) +HWTEST_F(WifiP2pServiceRequestListTest, ParseTlvs2ReqList1, TestSize.Level1) { - const std::vector tlvList; - pWifiP2pServiceRequestList->ParseTlvs2ReqList(tlvList); + std::vector tlvList; + tlvList.push_back(0x02); + tlvList.push_back(0x00); + tlvList.push_back(0x00); + tlvList.push_back(0x01); + EXPECT_TRUE(pWifiP2pServiceRequestList->ParseTlvs2ReqList(tlvList)); +} + +HWTEST_F(WifiP2pServiceRequestListTest, ParseTlvs2ReqList2, TestSize.Level1) +{ + std::vector tlvList; + tlvList.push_back(0x01); + tlvList.push_back(0x00); + tlvList.push_back(0x00); + tlvList.push_back(0x01); + EXPECT_FALSE(pWifiP2pServiceRequestList->ParseTlvs2ReqList(tlvList)); +} + +HWTEST_F(WifiP2pServiceRequestListTest, ParseTlvs2ReqList3, TestSize.Level1) +{ + std::vector tlvList; + tlvList.push_back(0x06); + tlvList.push_back(0x00); + tlvList.push_back(0x00); + tlvList.push_back(0x01); + tlvList.push_back(0x31); + tlvList.push_back(0x32); + tlvList.push_back(0x33); + tlvList.push_back(0x34); + EXPECT_TRUE(pWifiP2pServiceRequestList->ParseTlvs2ReqList(tlvList)); } } // namespace Wifi } // namespace OHOS \ No newline at end of file diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_response_list_test.cpp b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_response_list_test.cpp index 2b7767c..3943106 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_response_list_test.cpp +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_response_list_test.cpp @@ -79,14 +79,13 @@ HWTEST_F(WifiP2pServiceResponseListTest, FilterSerivceResponse, TestSize.Level1) HWTEST_F(WifiP2pServiceResponseListTest, ReverseFilterSerivceResponse, TestSize.Level1) { - pWifiP2pServiceResponseList->ReverseFilterSerivceResponse(P2pServiceStatus::PSRS_BAD_REQUEST); WifiP2pServiceResponse resp; resp.SetServiceStatus(P2pServiceStatus::PSRS_SUCCESS); EXPECT_TRUE(pWifiP2pServiceResponseList->AddServiceResponse(resp)); - pWifiP2pServiceResponseList->ReverseFilterSerivceResponse(P2pServiceStatus::PSRS_SUCCESS); + pWifiP2pServiceResponseList->ReverseFilterSerivceResponse(P2pServiceStatus::PSRS_BAD_REQUEST); } -HWTEST_F(WifiP2pServiceResponseListTest, MergerAndDeduplicate, TestSize.Level1) +HWTEST_F(WifiP2pServiceResponseListTest, MergerAndDeduplicate1, TestSize.Level1) { WifiP2pDevice device; WifiP2pServiceResponseList responseList; @@ -94,14 +93,45 @@ HWTEST_F(WifiP2pServiceResponseListTest, MergerAndDeduplicate, TestSize.Level1) responseList.SetDevice(device); WifiP2pServiceResponse resp; pWifiP2pServiceResponseList->MergerAndDeduplicate(responseList); +} + +HWTEST_F(WifiP2pServiceResponseListTest, MergerAndDeduplicate2, TestSize.Level1) +{ + WifiP2pDevice device; + WifiP2pServiceResponseList responseList; + device.SetDeviceAddress("AA:BB:CC:DD:EE:FF"); + responseList.SetDevice(device); + WifiP2pServiceResponse resp; pWifiP2pServiceResponseList->SetDevice(device); pWifiP2pServiceResponseList->MergerAndDeduplicate(responseList); - EXPECT_TRUE(pWifiP2pServiceResponseList->AddServiceResponse(resp)); +} + +HWTEST_F(WifiP2pServiceResponseListTest, MergerAndDeduplicate3, TestSize.Level1) +{ + WifiP2pDevice device; + WifiP2pServiceResponseList responseList; + device.SetDeviceAddress("AA:BB:CC:DD:EE:FF"); + responseList.SetDevice(device); + WifiP2pServiceResponse resp; + pWifiP2pServiceResponseList->SetDevice(device); + responseList.AddServiceResponse(resp); + pWifiP2pServiceResponseList->MergerAndDeduplicate(responseList); +} + +HWTEST_F(WifiP2pServiceResponseListTest, MergerAndDeduplicate4, TestSize.Level1) +{ + WifiP2pDevice device; + WifiP2pServiceResponseList responseList; + device.SetDeviceAddress("AA:BB:CC:DD:EE:FF"); + responseList.SetDevice(device); + WifiP2pServiceResponse resp; + pWifiP2pServiceResponseList->SetDevice(device); responseList.AddServiceResponse(resp); + EXPECT_TRUE(pWifiP2pServiceResponseList->AddServiceResponse(resp)); pWifiP2pServiceResponseList->MergerAndDeduplicate(responseList); } -HWTEST_F(WifiP2pServiceResponseListTest, GetTlvs, TestSize.Level1) // +HWTEST_F(WifiP2pServiceResponseListTest, GetTlvs, TestSize.Level1) { WifiP2pServiceResponse resp; EXPECT_TRUE(pWifiP2pServiceResponseList->AddServiceResponse(resp)); @@ -136,10 +166,58 @@ HWTEST_F(WifiP2pServiceResponseListTest, SetDevice, TestSize.Level1) EXPECT_EQ(pWifiP2pServiceResponseList->GetDevice(), device); } -HWTEST_F(WifiP2pServiceResponseListTest, ParseTlvs2RespList, TestSize.Level1) +HWTEST_F(WifiP2pServiceResponseListTest, ParseTlvs2RespList1, TestSize.Level1) { - const std::vector tlvList; + std::vector tlvList; + tlvList.push_back(0x02); + tlvList.push_back(0x00); + tlvList.push_back(0x00); + tlvList.push_back(0x01); + tlvList.push_back(0x01); pWifiP2pServiceResponseList->ParseTlvs2RespList(tlvList); } + +HWTEST_F(WifiP2pServiceResponseListTest, ParseTlvs2RespList2, TestSize.Level1) +{ + std::vector tlvList; + EXPECT_FALSE(pWifiP2pServiceResponseList->ParseTlvs2RespList(tlvList)); +} + +HWTEST_F(WifiP2pServiceResponseListTest, ParseTlvs2RespList3, TestSize.Level1) +{ + std::vector tlvList; + tlvList.push_back(0x03); + tlvList.push_back(0x00); + tlvList.push_back(0x01); + tlvList.push_back(0x00); + tlvList.push_back(0x00); + EXPECT_TRUE(pWifiP2pServiceResponseList->ParseTlvs2RespList(tlvList)); +} + +HWTEST_F(WifiP2pServiceResponseListTest, ParseTlvs2RespList4, TestSize.Level1) +{ + std::vector tlvList; + tlvList.push_back(0x03); + tlvList.push_back(0x10); + tlvList.push_back(0x01); + tlvList.push_back(0x00); + tlvList.push_back(0x00); + EXPECT_FALSE(pWifiP2pServiceResponseList->ParseTlvs2RespList(tlvList)); +} + +HWTEST_F(WifiP2pServiceResponseListTest, ParseTlvs2RespList5, TestSize.Level1) +{ + std::vector tlvList; + tlvList.push_back(0x07); + tlvList.push_back(0x00); + tlvList.push_back(0x01); + tlvList.push_back(0x00); + tlvList.push_back(0x00); + tlvList.push_back(0x31); + tlvList.push_back(0x32); + tlvList.push_back(0x33); + tlvList.push_back(0x34); + EXPECT_TRUE(pWifiP2pServiceResponseList->ParseTlvs2RespList(tlvList)); +} } // namespace Wifi } // namespace OHOS \ No newline at end of file diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_test.cpp b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_test.cpp index 340a616..f4a525d 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_test.cpp +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_test.cpp @@ -16,6 +16,7 @@ #include "wifi_p2p_service.h" #include "wifi_p2p_msg.h" +#include "wifi_settings.h" #include "mock_p2p_pendant.h" #include "mock_wifi_p2p_hal_interface.h" @@ -28,8 +29,8 @@ class WifiP2pServiceTest : public testing::Test { public: WifiP2pServiceTest() : groupManager(), deviceManager(), svrManager() {} - static void SetUpTestCase(){} - static void TearDownTestCase(){} + static void SetUpTestCase() {} + static void TearDownTestCase() {} virtual void SetUp() { pMockP2pPendant.reset(new MockP2pPendant()); @@ -50,6 +51,10 @@ public: WifiP2pDeviceManager deviceManager; WifiP2pServiceManager svrManager; }; +HWTEST_F(WifiP2pServiceTest, EnableP2p, TestSize.Level1) +{ + EXPECT_EQ(pWifiP2pService->EnableP2p(), ErrCode::WIFI_OPT_SUCCESS); +} HWTEST_F(WifiP2pServiceTest, DisableP2p, TestSize.Level1) { @@ -100,6 +105,7 @@ HWTEST_F(WifiP2pServiceTest, StartP2pListen, TestSize.Level1) int interval = 0; EXPECT_EQ(pWifiP2pService->StartP2pListen(period, interval), ErrCode::WIFI_OPT_SUCCESS); } + HWTEST_F(WifiP2pServiceTest, StopP2pListen, TestSize.Level1) { EXPECT_EQ(pWifiP2pService->StopP2pListen(), ErrCode::WIFI_OPT_SUCCESS); @@ -129,17 +135,21 @@ HWTEST_F(WifiP2pServiceTest, P2pConnect, TestSize.Level1) EXPECT_EQ(pWifiP2pService->P2pDisConnect(), ErrCode::WIFI_OPT_SUCCESS); } -HWTEST_F(WifiP2pServiceTest, QueryP2pInfo, TestSize.Level1) +HWTEST_F(WifiP2pServiceTest, QueryP2pLinkedInfo, TestSize.Level1) { - WifiP2pInfo connInfo; - EXPECT_EQ(pWifiP2pService->QueryP2pInfo(connInfo), ErrCode::WIFI_OPT_SUCCESS); + WifiP2pLinkedInfo linkedInfo; + EXPECT_EQ(pWifiP2pService->QueryP2pLinkedInfo(linkedInfo), ErrCode::WIFI_OPT_SUCCESS); } HWTEST_F(WifiP2pServiceTest, GetCurrentGroup, TestSize.Level1) { + WifiP2pLinkedInfo p2pInfo; + p2pInfo.SetConnectState(P2pConnectedState::P2P_DISCONNECTED); + WifiSettings::GetInstance().SaveP2pInfo(p2pInfo); WifiP2pGroupInfo group; - EXPECT_EQ(pWifiP2pService->GetCurrentGroup(group), ErrCode::WIFI_OPT_SUCCESS); + EXPECT_EQ(pWifiP2pService->GetCurrentGroup(group), ErrCode::WIFI_OPT_FAILED); } + HWTEST_F(WifiP2pServiceTest, GetP2pEnableStatus, TestSize.Level1) { int status; @@ -175,5 +185,17 @@ HWTEST_F(WifiP2pServiceTest, QueryP2pServices, TestSize.Level1) std::vector services; EXPECT_EQ(pWifiP2pService->QueryP2pServices(services), ErrCode::WIFI_OPT_SUCCESS); } + +HWTEST_F(WifiP2pServiceTest, SetP2pDeviceName, TestSize.Level1) +{ + std::string deviceName("TestName"); + EXPECT_EQ(pWifiP2pService->SetP2pDeviceName(deviceName), ErrCode::WIFI_OPT_SUCCESS); +} + +HWTEST_F(WifiP2pServiceTest, SetP2pWfdInfo, TestSize.Level1) +{ + WifiP2pWfdInfo wfd; + EXPECT_EQ(pWifiP2pService->SetP2pWfdInfo(wfd), ErrCode::WIFI_OPT_SUCCESS); +} } // namespace Wifi } // namespace OHOS \ No newline at end of file diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_upnp_service_info_test.cpp b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_upnp_service_info_test.cpp index c94b56e..52397cc 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_upnp_service_info_test.cpp +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_upnp_service_info_test.cpp @@ -37,7 +37,8 @@ public: std::string uuid; std::string device; std::vector services; - std::string svrName; + services.push_back(std::string("TestUpnpService")); + std::string svrName("TestSvrName"); WifiP2pUpnpServiceInfo::Create(uuid, device, services, svrName); } void WarpCreateSupQuery() diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_upnp_service_request_test.cpp b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_upnp_service_request_test.cpp index fe3c914..4381f32 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_upnp_service_request_test.cpp +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_upnp_service_request_test.cpp @@ -36,6 +36,7 @@ public: { WifiP2pUpnpServiceRequest::Create(); WifiP2pUpnpServiceRequest::Create("searchTarget"); + WifiP2pUpnpServiceRequest::Create(std::string("")); } }; diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_upnp_service_response_test.cpp b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_upnp_service_response_test.cpp index 87ed7a6..b986fe7 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_upnp_service_response_test.cpp +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_upnp_service_response_test.cpp @@ -51,14 +51,25 @@ HWTEST_F(WifiP2pUpnpServiceResponseTest, GetVersion, TestSize.Level1) EXPECT_EQ(-1, WifiP2pUpnpServiceResponse::Create(status, tranId, data).GetVersion()); } -HWTEST_F(WifiP2pUpnpServiceResponseTest, ParseData, TestSize.Level1) +HWTEST_F(WifiP2pUpnpServiceResponseTest, ParseData1, TestSize.Level1) +{ + EXPECT_EQ(false, WifiP2pUpnpServiceResponse::Create(status, tranId, data).ParseData()); +} + +HWTEST_F(WifiP2pUpnpServiceResponseTest, ParseData2, TestSize.Level1) { - std::vector data; data.push_back(1); - data.push_back(2); - data.push_back(3); - EXPECT_EQ(true, WifiP2pUpnpServiceResponse::Create(status, tranId, data).ParseData()); - WifiP2pUpnpServiceResponse::Create(status, tranId, data).SetData(data); + data.push_back(0x31); + data.push_back(0x32); + data.push_back(0x2c); + data.push_back(0x33); + data.push_back(0x34); + data.push_back(0x3b); + data.push_back(0x04); + data.push_back(0x73); + data.push_back(0x76); + data.push_back(0x72); + data.push_back(0x4e); EXPECT_EQ(true, WifiP2pUpnpServiceResponse::Create(status, tranId, data).ParseData()); } } // namespace Wifi -- Gitee From 3e4337a2a954215abf9b6e5e03f84c73889c3aa6 Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Sat, 23 Oct 2021 09:11:10 +0000 Subject: [PATCH 008/491] add new function and napi optimize Signed-off-by: zhangfeng --- .../native_cpp/napi/wifi_napi_device.cpp | 602 ++++++++++-------- .../native_cpp/napi/wifi_napi_device.h | 69 +- .../native_cpp/napi/wifi_napi_entry.cpp | 20 +- .../native_cpp/napi/wifi_napi_event.cpp | 104 +-- .../native_cpp/napi/wifi_napi_hotspot.cpp | 172 +++++ .../native_cpp/napi/wifi_napi_hotspot.h | 7 +- .../native_cpp/napi/wifi_napi_utils.cpp | 202 +++++- .../native_cpp/napi/wifi_napi_utils.h | 70 +- 8 files changed, 905 insertions(+), 341 deletions(-) diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_device.cpp b/interfaces/innerkits/native_cpp/napi/wifi_napi_device.cpp index 3afaf93..211a4ce 100755 --- a/interfaces/innerkits/native_cpp/napi/wifi_napi_device.cpp +++ b/interfaces/innerkits/native_cpp/napi/wifi_napi_device.cpp @@ -15,9 +15,8 @@ #include "wifi_napi_device.h" #include "wifi_logger.h" -#include "wifi_device.h" -#include "wifi_scan.h" #include +#include namespace OHOS { namespace Wifi { @@ -25,15 +24,10 @@ DEFINE_WIFILOG_LABEL("WifiNAPIDevice"); std::unique_ptr wifiDevicePtr = WifiDevice::GetInstance(WIFI_DEVICE_ABILITY_ID); std::unique_ptr wifiScanPtr = WifiScan::GetInstance(WIFI_SCAN_ABILITY_ID); - napi_value EnableWifi(napi_env env, napi_callback_info info) { - size_t argc = 1; - napi_value argv[1]; - napi_value thisVar; - NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); - - NAPI_ASSERT(env, wifiDevicePtr != nullptr, "[NAPI] Wifi device instance is null."); + TRACE_FUNC_CALL; + NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); ErrCode ret = wifiDevicePtr->EnableWifi(); napi_value result; napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); @@ -42,12 +36,8 @@ napi_value EnableWifi(napi_env env, napi_callback_info info) napi_value DisableWifi(napi_env env, napi_callback_info info) { - size_t argc = 1; - napi_value argv[1]; - napi_value thisVar; - NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); - - NAPI_ASSERT(env, wifiDevicePtr != nullptr, "[NAPI] Wifi device instance is null."); + TRACE_FUNC_CALL; + NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); ErrCode ret = wifiDevicePtr->DisableWifi(); napi_value result; napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); @@ -56,16 +46,11 @@ napi_value DisableWifi(napi_env env, napi_callback_info info) napi_value IsWifiActive(napi_env env, napi_callback_info info) { - size_t argc = 1; - napi_value argv[1]; - napi_value thisVar; - NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); - - NAPI_ASSERT(env, wifiDevicePtr != nullptr, "[NAPI] Wifi device instance is null."); - bool activeStatus = true; + NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + bool activeStatus = false; ErrCode ret = wifiDevicePtr->IsWifiActive(activeStatus); if (ret != WIFI_OPT_SUCCESS) { - WIFI_LOGE("[Napi Device] Get wifi active status fail: %{public}d", ret); + WIFI_LOGE("Get wifi active status fail: %{public}d", ret); } napi_value result; @@ -75,12 +60,8 @@ napi_value IsWifiActive(napi_env env, napi_callback_info info) napi_value Scan(napi_env env, napi_callback_info info) { - size_t argc = 1; - napi_value argv[1]; - napi_value thisVar; - NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); - - NAPI_ASSERT(env, wifiScanPtr != nullptr, "[NAPI] Wifi scan instance is null."); + TRACE_FUNC_CALL; + NAPI_ASSERT(env, wifiScanPtr != nullptr, "Wifi scan instance is null."); ErrCode ret = wifiScanPtr->Scan(); napi_value result; @@ -115,8 +96,8 @@ static SecTypeJs SecurityTypeNativeToJs(const WifiSecurity& cppSecurityType) return jsSecurityType; } -static bool NativeScanInfosToJsObj(const napi_env& env, napi_value& arrayResult, - const std::vector& vecScnIanfos) +static bool NativeScanInfosToJsObj(const napi_env& env, + const std::vector& vecScnIanfos, napi_value& arrayResult) { uint32_t idx = 0; for (auto& each : vecScnIanfos) { @@ -133,126 +114,43 @@ static bool NativeScanInfosToJsObj(const napi_env& env, napi_value& arrayResult, napi_status status = napi_set_element(env, arrayResult, idx++, eachObj); if (status != napi_ok) { - WIFI_LOGE("[Napi Device] wifi napi set element error: %{public}d, idx: %{public}d", status, idx - 1); + WIFI_LOGE("Wifi napi set element error: %{public}d, idx: %{public}d", status, idx - 1); return false; } } return true; } -static bool GetWifiScanInfoList(const napi_env& env, napi_value& arrayResult) -{ - std::vector vecCppScanInfos; - if (wifiScanPtr->GetScanInfoList(vecCppScanInfos) != WIFI_OPT_SUCCESS) { - WIFI_LOGE("[Napi Device] Get Scaninf list error"); - return false; - } - - WIFI_LOGI("[Napi Device] GetScanInfoList, size: %{public}zu", vecCppScanInfos.size()); - napi_create_array_with_length(env, vecCppScanInfos.size(), &arrayResult); - return NativeScanInfosToJsObj(env, arrayResult, vecCppScanInfos); -} - -static napi_value ScanInfoToCallBack(const napi_env& env, AsyncCallbackInfo *asCallbackInfo, - const size_t argc, const napi_value *argv) -{ - napi_value resourceName; - napi_create_string_latin1(env, "getScanInfos", NAPI_AUTO_LENGTH, &resourceName); - - for (size_t i = 0; i != argc; ++i) { - napi_valuetype valuetype; - NAPI_CALL(env, napi_typeof(env, argv[i], &valuetype)); - NAPI_ASSERT(env, valuetype == napi_function, "Wrong argument type. Function expected."); - napi_create_reference(env, argv[i], 1, &asCallbackInfo->callback[i]); - } - - napi_create_async_work( - env, nullptr, resourceName, - [](napi_env env, void* data) { - }, - [](napi_env env, napi_status status, void* data) { - napi_value undefine; - napi_get_undefined(env, &undefine); - napi_value callback; - AsyncCallbackInfo* asCallbackInfo = (AsyncCallbackInfo *)data; - asCallbackInfo->isSuccess = GetWifiScanInfoList(env, asCallbackInfo->result); - if (asCallbackInfo->isSuccess) { - napi_get_reference_value(env, asCallbackInfo->callback[0], &callback); - napi_call_function(env, nullptr, callback, 1, &asCallbackInfo->result, &undefine); - } else { - if (asCallbackInfo->callback[1]) { - napi_get_reference_value(env, asCallbackInfo->callback[1], &callback); - napi_call_function(env, nullptr, callback, 1, &asCallbackInfo->result, &undefine); - } else { - WIFI_LOGE("[Napi Device] get scan info callback func is null"); - napi_throw_error(env, "error", "get scan info callback func is null"); - } - } - if (asCallbackInfo->callback[0] != nullptr) { - napi_delete_reference(env, asCallbackInfo->callback[0]); - } - if (asCallbackInfo->callback[1] != nullptr) { - napi_delete_reference(env, asCallbackInfo->callback[1]); - } - napi_delete_async_work(env, asCallbackInfo->asyncWork); - delete asCallbackInfo; - }, - (void *)asCallbackInfo, - &asCallbackInfo->asyncWork); - NAPI_CALL(env, napi_queue_async_work(env, asCallbackInfo->asyncWork)); - return UndefinedNapiValue(env); -} - -static napi_value ScanInfoToPromise(const napi_env& env, AsyncCallbackInfo *asCallbackInfo, napi_value& promise) -{ - napi_value resourceName; - napi_create_string_latin1(env, "getScanInfos", NAPI_AUTO_LENGTH, &resourceName); - - napi_deferred deferred; - NAPI_CALL(env, napi_create_promise(env, &deferred, &promise)); - asCallbackInfo->deferred = deferred; - - napi_create_async_work( - env, - nullptr, - resourceName, - [](napi_env env, void *data) { - }, - [](napi_env env, napi_status status, void *data) { - AsyncCallbackInfo *asCallbackInfo = (AsyncCallbackInfo *)data; - asCallbackInfo->isSuccess = GetWifiScanInfoList(env, asCallbackInfo->result); - if (asCallbackInfo->isSuccess) { - napi_resolve_deferred(asCallbackInfo->env, asCallbackInfo->deferred, asCallbackInfo->result); - } else { - napi_reject_deferred(asCallbackInfo->env, asCallbackInfo->deferred, asCallbackInfo->result); - } - napi_delete_async_work(env, asCallbackInfo->asyncWork); - delete asCallbackInfo; - }, - (void *)asCallbackInfo, - &asCallbackInfo->asyncWork); - napi_queue_async_work(env, asCallbackInfo->asyncWork); - return UndefinedNapiValue(env); -} - napi_value GetScanInfos(napi_env env, napi_callback_info info) { + TRACE_FUNC_CALL; size_t argc = 2; napi_value argv[argc]; napi_value thisVar = nullptr; void *data = nullptr; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data)); - - AsyncCallbackInfo *asCallbackInfo = - new AsyncCallbackInfo{.env = env, .asyncWork = nullptr, .deferred = nullptr}; - - if (argc >= 1) { - return ScanInfoToCallBack(env, asCallbackInfo, argc, argv); - } else { - napi_value promise; - ScanInfoToPromise(env, asCallbackInfo, promise); - return promise; - } + NAPI_ASSERT(env, wifiScanPtr != nullptr, "Wifi device instance is null."); + + ScanInfoAsyncContext *asyncContext = new ScanInfoAsyncContext(env); + NAPI_ASSERT(env, asyncContext != nullptr, "asyncContext is null."); + napi_create_string_latin1(env, "getScanInfos", NAPI_AUTO_LENGTH, &asyncContext->resourceName); + + asyncContext->executeFunc = [&](void* data) -> void { + ScanInfoAsyncContext *context = static_cast(data); + TRACE_FUNC_CALL_NAME("wifiScanPtr->GetScanInfoList"); + context->isSuccess = (wifiScanPtr->GetScanInfoList(context->vecScanInfos) == WIFI_OPT_SUCCESS); + WIFI_LOGI("GetScanInfoList, size: %{public}zu", context->vecScanInfos.size()); + }; + + asyncContext->completeFunc = [&](void* data) -> void { + ScanInfoAsyncContext *context = static_cast(data); + napi_create_array_with_length(context->env, context->vecScanInfos.size(), &context->result); + context->isSuccess = NativeScanInfosToJsObj(context->env, context->vecScanInfos, context->result); + WIFI_LOGI("Push scan info list to client"); + }; + + size_t nonCallbackArgNum = 0; + return DoAsyncWork(env, asyncContext, argc, argv, nonCallbackArgNum); } static void ConvertEncryptionMode(const SecTypeJs& securityType, std::string& keyMgmt) @@ -275,7 +173,7 @@ static void ConvertEncryptionMode(const SecTypeJs& securityType, std::string& ke break; default: - keyMgmt = "WPA-PSK"; + keyMgmt = "NONE"; break; } } @@ -291,143 +189,60 @@ static void JsObjToDeviceConfig(const napi_env& env, const napi_value& object, W ConvertEncryptionMode(SecTypeJs(type), cppConfig.keyMgmt); } -static napi_value AddDeviceConfigImpl(const napi_env& env, AsyncCallbackInfo *asCallbackInfo) -{ - NAPI_ASSERT(env, wifiDevicePtr != nullptr, "[NAPI] Wifi device instance is null."); - int addResult = -1; - int retValue = 0; - ErrCode ret = wifiDevicePtr->AddDeviceConfig(*(WifiDeviceConfig *)asCallbackInfo->obj, addResult); - if (addResult < 0 || ret != WIFI_OPT_SUCCESS) { - retValue = -1; - } else { - retValue = addResult; - } - - napi_value result; - napi_create_int32(env, retValue, &result); - asCallbackInfo->isSuccess = (ret == WIFI_OPT_SUCCESS); - asCallbackInfo->result = result; - return UndefinedNapiValue(env); -} - -static napi_value AddDeviceConfigCallBack(const napi_env& env, AsyncCallbackInfo *asCallbackInfo, - size_t argc, napi_value *argv) -{ - napi_value resourceName; - napi_create_string_latin1(env, "addDeviceConfig", NAPI_AUTO_LENGTH, &resourceName); - - for (size_t i = 1; i != argc; ++i) { - napi_valuetype valuetype; - NAPI_CALL(env, napi_typeof(env, argv[i], &valuetype)); - NAPI_ASSERT(env, valuetype == napi_function, "Wrong argument type. Function expected."); - napi_create_reference(env, argv[i], 1, &asCallbackInfo->callback[i - 1]); - } - - napi_create_async_work( - env, nullptr, resourceName, - [](napi_env env, void* data) { - }, - [](napi_env env, napi_status status, void* data) { - AsyncCallbackInfo* asCallbackInfo = (AsyncCallbackInfo *)data; - AddDeviceConfigImpl(env, asCallbackInfo); - napi_value callback; - napi_value undefine; - napi_get_undefined(env, &undefine); - if (asCallbackInfo->isSuccess) { - napi_get_reference_value(env, asCallbackInfo->callback[0], &callback); - napi_call_function(env, nullptr, callback, 1, &asCallbackInfo->result, &undefine); - } else { - if (asCallbackInfo->callback[1]) { - napi_get_reference_value(env, asCallbackInfo->callback[1], &callback); - napi_call_function(env, nullptr, callback, 1, &asCallbackInfo->result, &undefine); - } else { - WIFI_LOGE("[Napi Device] get scan info callback func is null"); - napi_throw_error(env, "error", "add wifi config callback func is null"); - } - } - if (asCallbackInfo->callback[0] != nullptr) { - napi_delete_reference(env, asCallbackInfo->callback[0]); - } - if (asCallbackInfo->callback[1] != nullptr) { - napi_delete_reference(env, asCallbackInfo->callback[1]); - } - napi_delete_async_work(env, asCallbackInfo->asyncWork); - delete (WifiDeviceConfig *)asCallbackInfo->obj; - delete asCallbackInfo; - }, - (void *)asCallbackInfo, - &asCallbackInfo->asyncWork); - NAPI_CALL(env, napi_queue_async_work(env, asCallbackInfo->asyncWork)); - return UndefinedNapiValue(env); -} - -static napi_value AddDeviceConfigPromise(const napi_env& env, AsyncCallbackInfo *asCallbackInfo, napi_value& promise) -{ - napi_value resourceName; - napi_create_string_latin1(env, "addDeviceConfig", NAPI_AUTO_LENGTH, &resourceName); - - napi_deferred deferred; - NAPI_CALL(env, napi_create_promise(env, &deferred, &promise)); - asCallbackInfo->deferred = deferred; - - napi_create_async_work( - env, - nullptr, - resourceName, - [](napi_env env, void *data) { - }, - [](napi_env env, napi_status status, void *data) { - AsyncCallbackInfo *asCallbackInfo = (AsyncCallbackInfo *)data; - AddDeviceConfigImpl(env, asCallbackInfo); - if (asCallbackInfo->isSuccess) { - napi_resolve_deferred(asCallbackInfo->env, asCallbackInfo->deferred, asCallbackInfo->result); - } else { - napi_reject_deferred(asCallbackInfo->env, asCallbackInfo->deferred, asCallbackInfo->result); - } - napi_delete_async_work(env, asCallbackInfo->asyncWork); - delete (WifiDeviceConfig *)asCallbackInfo->obj; - delete asCallbackInfo; - }, - (void *)asCallbackInfo, - &asCallbackInfo->asyncWork); - napi_queue_async_work(env, asCallbackInfo->asyncWork); - return UndefinedNapiValue(env); -} - napi_value AddDeviceConfig(napi_env env, napi_callback_info info) { + TRACE_FUNC_CALL; size_t argc = 3; napi_value argv[argc]; napi_value thisVar = nullptr; void *data = nullptr; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data)); NAPI_ASSERT(env, argc >= 1, "Wrong number of arguments"); - + NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + napi_valuetype valueType; napi_typeof(env, argv[0], &valueType); - NAPI_ASSERT(env, valueType == napi_object, "Wrong argument type. Object expected for parameter 1."); + NAPI_ASSERT(env, valueType == napi_object, "Wrong argument type, object is expected for parameter 1."); - AsyncCallbackInfo *asCallbackInfo = - new AsyncCallbackInfo{.env = env, .asyncWork = nullptr, .deferred = nullptr}; + AddDeviceConfigContext *asyncContext = new AddDeviceConfigContext(env); + NAPI_ASSERT(env, asyncContext != nullptr, "asyncContext is null."); + napi_create_string_latin1(env, "addDeviceConfig", NAPI_AUTO_LENGTH, &asyncContext->resourceName); WifiDeviceConfig *config = new WifiDeviceConfig(); - if (config == NULL) { - delete asCallbackInfo; + if (config == nullptr) { + delete asyncContext; return UndefinedNapiValue(env); } JsObjToDeviceConfig(env, argv[0], *config); - asCallbackInfo->obj = config; - if (argc > 1) { - return AddDeviceConfigCallBack(env, asCallbackInfo, argc, argv); - } else { - napi_value promise; - AddDeviceConfigPromise(env, asCallbackInfo, promise); - return promise; - } + asyncContext->config = config; + + asyncContext->executeFunc = [&](void* data) -> void { + AddDeviceConfigContext *context = static_cast(data); + TRACE_FUNC_CALL_NAME("wifiDevicePtr->AddDeviceConfig"); + ErrCode ret = wifiDevicePtr->AddDeviceConfig(*context->config, context->addResult); + if (context->addResult < 0 || ret != WIFI_OPT_SUCCESS) { + context->addResult = -1; + } + context->isSuccess = (ret == WIFI_OPT_SUCCESS); + }; + + asyncContext->completeFunc = [&](void* data) -> void { + AddDeviceConfigContext *context = static_cast(data); + napi_create_int32(context->env, context->addResult, &context->result); + if (context->config != nullptr) { + delete context->config; + context->config = nullptr; + } + WIFI_LOGI("Push add device config result to client"); + }; + + size_t nonCallbackArgNum = 1; + return DoAsyncWork(env, asyncContext, argc, argv, nonCallbackArgNum); } napi_value ConnectToNetwork(napi_env env, napi_callback_info info) { + TRACE_FUNC_CALL; size_t argc = 1; napi_value argv[1]; napi_value thisVar; @@ -441,7 +256,7 @@ napi_value ConnectToNetwork(napi_env env, napi_callback_info info) int networkId = -1; napi_get_value_int32(env, argv[0], &networkId); - NAPI_ASSERT(env, wifiDevicePtr != nullptr, "[NAPI] Wifi device instance is null."); + NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); ErrCode ret = wifiDevicePtr->ConnectToNetwork(networkId); napi_value result; napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); @@ -450,6 +265,7 @@ napi_value ConnectToNetwork(napi_env env, napi_callback_info info) napi_value ConnectToDevice(napi_env env, napi_callback_info info) { + TRACE_FUNC_CALL; size_t argc = 1; napi_value argv[1]; napi_value thisVar; @@ -459,10 +275,13 @@ napi_value ConnectToDevice(napi_env env, napi_callback_info info) napi_typeof(env, argv[0], &valueType); NAPI_ASSERT(env, valueType == napi_object, "Wrong argument type. Object expected."); - NAPI_ASSERT(env, wifiDevicePtr != nullptr, "[NAPI] Wifi device instance is null."); + NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); WifiDeviceConfig config; JsObjToDeviceConfig(env, argv[0], config); ErrCode ret = wifiDevicePtr->ConnectToDevice(config); + if (ret != WIFI_OPT_SUCCESS) { + WIFI_LOGE("Connect to device fail: %{public}d", ret); + } napi_value result; napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); @@ -471,12 +290,8 @@ napi_value ConnectToDevice(napi_env env, napi_callback_info info) napi_value Disconnect(napi_env env, napi_callback_info info) { - size_t argc = 1; - napi_value argv[1]; - napi_value thisVar; - NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); - - NAPI_ASSERT(env, wifiDevicePtr != nullptr, "[NAPI] Wifi device instance is null."); + TRACE_FUNC_CALL; + NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); ErrCode ret = wifiDevicePtr->Disconnect(); napi_value result; napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); @@ -498,21 +313,270 @@ napi_value GetSignalLevel(napi_env env, napi_callback_info info) napi_typeof(env, argv[1], &type2); NAPI_ASSERT(env, type1 == napi_number, "Wrong argument type. napi_number expected."); NAPI_ASSERT(env, type2 == napi_number, "Wrong argument type. napi_number expected."); + NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); - int rssi, band; + int level = -1; + int rssi = 0; + int band = 0; napi_get_value_int32(env, argv[0], &rssi); napi_get_value_int32(env, argv[1], &band); - - NAPI_ASSERT(env, wifiDevicePtr != nullptr, "[NAPI] Wifi device instance is null."); - int level = -1; ErrCode ret = wifiDevicePtr->GetSignalLevel(rssi, band, level); if (ret != WIFI_OPT_SUCCESS) { - WIFI_LOGW("[Napi Device] Get wifi signal level fail: %{public}d", ret); + WIFI_LOGE("Get wifi signal level fail: %{public}d", ret); } napi_value result; napi_create_uint32(env, level, &result); return result; } + +/* This interface has not been implemented */ +napi_value ReConnect(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + napi_value result = nullptr; + return result; +} + +/* This interface has not been implemented */ +napi_value ReAssociate(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + napi_value result = nullptr; + return result; +} + +/* This interface has not been implemented */ +napi_value GetIpInfo(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + napi_value result = nullptr; + return result; +} + +static void LinkedInfoToJs(const napi_env& env, WifiLinkedInfo& linkedInfo, napi_value& result) +{ + SetValueUtf8String(env, "ssid", linkedInfo.ssid.c_str(), result); + SetValueUtf8String(env, "bssid", linkedInfo.bssid.c_str(), result); + SetValueInt32(env, "networkId", linkedInfo.networkId, result); + SetValueInt32(env, "rssi", linkedInfo.rssi, result); + SetValueInt32(env, "band", linkedInfo.band, result); + SetValueInt32(env, "linkSpeed", linkedInfo.linkSpeed, result); + SetValueInt32(env, "frequency", linkedInfo.frequency, result); + SetValueBool(env, "isHidden", linkedInfo.ifHiddenSSID, result); + /* isRestricted not support now, set as default value */ + SetValueBool(env, "isRestricted", false, result); + SetValueInt32(env, "chload", linkedInfo.chload, result); + SetValueInt32(env, "snr", linkedInfo.snr, result); + SetValueUtf8String(env, "macAddress", linkedInfo.macAddress.c_str(), result); + SetValueInt32(env, "ipAddress", linkedInfo.ipAddress, result); + /* Check suppState is consistent with HOS */ + SetValueInt32(env, "suppState", static_cast(linkedInfo.supplicantState), result); + /* Check connState is consistent with HOS */ + SetValueInt32(env, "connState", static_cast(linkedInfo.connState), result); +} + +/* This interface has not been fully implemented */ +napi_value GetLinkedInfo(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + size_t argc = 2; + napi_value argv[argc]; + napi_value thisVar = nullptr; + void *data = nullptr; + NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data)); + NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + + LinkedInfoAsyncContext *asyncContext = new LinkedInfoAsyncContext(env); + NAPI_ASSERT(env, asyncContext != nullptr, "asyncContext is null."); + napi_create_string_latin1(env, "getLinkedInfo", NAPI_AUTO_LENGTH, &asyncContext->resourceName); + + asyncContext->executeFunc = [&](void* data) -> void { + LinkedInfoAsyncContext *context = static_cast(data); + TRACE_FUNC_CALL_NAME("wifiDevicePtr->GetLinkedInfo"); + context->isSuccess = (wifiDevicePtr->GetLinkedInfo(context->linkedInfo) == WIFI_OPT_SUCCESS); + }; + + asyncContext->completeFunc = [&](void* data) -> void { + LinkedInfoAsyncContext *context = static_cast(data); + napi_create_object(context->env, &context->result); + LinkedInfoToJs(context->env, context->linkedInfo, context->result); + WIFI_LOGI("Push get linkedInfo result to client"); + }; + + size_t nonCallbackArgNum = 0; + return DoAsyncWork(env, asyncContext, argc, argv, nonCallbackArgNum); +} + +napi_value RemoveDevice(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + size_t argc = 1; + napi_value argv[1]; + napi_value thisVar; + NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); + NAPI_ASSERT(env, argc == 1, "Wrong number of arguments"); + + napi_valuetype valueType; + napi_typeof(env, argv[0], &valueType); + NAPI_ASSERT(env, valueType == napi_number, "Wrong argument type. napi_number expected."); + + int networkId = -1; + napi_get_value_int32(env, argv[0], &networkId); + NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + + napi_value result; + napi_get_boolean(env, wifiDevicePtr->RemoveDevice(networkId) == WIFI_OPT_SUCCESS, &result); + return result; +} + +napi_value RemoveAllNetwork(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + napi_value result; + napi_get_boolean(env, wifiDevicePtr->RemoveAllDevice() == WIFI_OPT_SUCCESS, &result); + return result; +} + +/* This interface has not been implemented */ +napi_value DisableNetwork(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + size_t argc = 1; + napi_value argv[1]; + napi_value thisVar; + NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); + NAPI_ASSERT(env, argc == 1, "Wrong number of arguments"); + + napi_valuetype valueType; + napi_typeof(env, argv[0], &valueType); + NAPI_ASSERT(env, valueType == napi_number, "Wrong argument type. napi_number expected."); + NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + + int networkId = -1; + napi_get_value_int32(env, argv[0], &networkId); + napi_value result = nullptr; + return result; +} + +napi_value GetCountryCode(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + std::string countryCode; + ErrCode ret = wifiDevicePtr->GetCountryCode(countryCode); + if (ret != WIFI_OPT_SUCCESS) { + WIFI_LOGE("Get countryCode fail: %{public}d", ret); + } + napi_value cc; + napi_create_string_utf8(env, countryCode.c_str(), NAPI_AUTO_LENGTH, &cc); + return cc; +} + +static SecTypeJs ConvertKeyMgmtToSecType(const std::string& keyMgmt) +{ + std::map mapKeyMgmtToSecType = { + {"NONE", SecTypeJs::SEC_TYPE_OPEN}, + {"WEP", SecTypeJs::SEC_TYPE_WEP}, + {"WPA-PSK", SecTypeJs::SEC_TYPE_PSK}, + {"SAE", SecTypeJs::SEC_TYPE_SAE}, + }; + + std::map::iterator iter = mapKeyMgmtToSecType.find(keyMgmt); + return iter == mapKeyMgmtToSecType.end() ? SecTypeJs::SEC_TYPE_OPEN : iter->second; +} + +static void DeviceConfigToJsArray(const napi_env& env, const std::vector& vecDeviceConfigs, + const int idx, napi_value& arrayResult) +{ + napi_value result; + napi_create_object(env, &result); + SetValueUtf8String(env, "ssid", vecDeviceConfigs[idx].ssid.c_str(), result); + SetValueUtf8String(env, "bssid", vecDeviceConfigs[idx].bssid.c_str(), result); + SetValueUtf8String(env, "preSharedKey", vecDeviceConfigs[idx].preSharedKey.c_str(), result); + SetValueBool(env, "isHiddenSsid", vecDeviceConfigs[idx].hiddenSSID, result); + SetValueInt32(env, "securityType", + static_cast(ConvertKeyMgmtToSecType(vecDeviceConfigs[idx].keyMgmt)), result); + + napi_status status = napi_set_element(env, arrayResult, idx, result); + if (status != napi_ok) { + WIFI_LOGE("Wifi napi set element error: %{public}d", status); + } +} + +napi_value GetDeviceConfigs(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + std::vector vecDeviceConfigs; + ErrCode ret = wifiDevicePtr->GetDeviceConfigs(vecDeviceConfigs); + if (ret != WIFI_OPT_SUCCESS) { + WIFI_LOGE("Get device configs fail: %{public}d", ret); + } + + WIFI_LOGI("Get device configs size: %{public}zu", vecDeviceConfigs.size()); + napi_value arrayResult; + napi_create_array_with_length(env, vecDeviceConfigs.size(), &arrayResult); + for (size_t i = 0; i != vecDeviceConfigs.size(); ++i) { + DeviceConfigToJsArray(env, vecDeviceConfigs, i, arrayResult); + } + return arrayResult; +} + +napi_value GetSupportedFeatures(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + long features = -1; + ErrCode ret = wifiDevicePtr->GetSupportedFeatures(features); + if (ret != WIFI_OPT_SUCCESS) { + WIFI_LOGE("Get supported features fail: %{public}d", ret); + } + + napi_value result; + napi_create_int64(env, features, &result); + return result; +} + +napi_value IsFeatureSupported(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + size_t argc = 1; + napi_value argv[1]; + napi_value thisVar; + NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); + NAPI_ASSERT(env, argc == 1, "Wrong number of arguments"); + + napi_valuetype valueType; + napi_typeof(env, argv[0], &valueType); + NAPI_ASSERT(env, valueType == napi_number, "Wrong argument type. napi_number expected."); + + long feature = -1; + napi_get_value_int64(env, argv[0], (int64_t*)&feature); + NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + + napi_value result; + napi_get_boolean(env, wifiDevicePtr->IsFeatureSupported(feature), &result); + return result; +} + +napi_value GetDeviceMacAddress(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + std::string macAddr; + ErrCode ret = wifiDevicePtr->GetDeviceMacAddress(macAddr); + if (ret != WIFI_OPT_SUCCESS) { + WIFI_LOGE("Get mac address fail: %{public}d", ret); + } + + napi_value addr; + napi_create_string_utf8(env, macAddr.c_str(), NAPI_AUTO_LENGTH, &addr); + return addr; +} } // namespace Wifi } // namespace OHOS diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_device.h b/interfaces/innerkits/native_cpp/napi/wifi_napi_device.h index a562b7b..ce19d2a 100755 --- a/interfaces/innerkits/native_cpp/napi/wifi_napi_device.h +++ b/interfaces/innerkits/native_cpp/napi/wifi_napi_device.h @@ -17,6 +17,8 @@ #define WIFI_NAPI_DEVICE_H_ #include "wifi_napi_utils.h" +#include "wifi_device.h" +#include "wifi_scan.h" namespace OHOS { namespace Wifi { @@ -30,13 +32,68 @@ napi_value ConnectToNetwork(napi_env env, napi_callback_info info); napi_value ConnectToDevice(napi_env env, napi_callback_info info); napi_value Disconnect(napi_env env, napi_callback_info info); napi_value GetSignalLevel(napi_env env, napi_callback_info info); +napi_value ReConnect(napi_env env, napi_callback_info info); +napi_value ReAssociate(napi_env env, napi_callback_info info); +napi_value GetIpInfo(napi_env env, napi_callback_info info); +napi_value GetLinkedInfo(napi_env env, napi_callback_info info); +napi_value RemoveDevice(napi_env env, napi_callback_info info); +napi_value RemoveAllNetwork(napi_env env, napi_callback_info info); +napi_value DisableNetwork(napi_env env, napi_callback_info info); +napi_value GetCountryCode(napi_env env, napi_callback_info info); +napi_value GetDeviceConfigs(napi_env env, napi_callback_info info); +napi_value GetSupportedFeatures(napi_env env, napi_callback_info info); +napi_value IsFeatureSupported(napi_env env, napi_callback_info info); +napi_value GetDeviceMacAddress(napi_env env, napi_callback_info info); -enum class SecTypeJs { - SEC_TYPE_INVALID = 0, /* Invalid security type */ - SEC_TYPE_OPEN = 1, /* Open */ - SEC_TYPE_WEP = 2, /* Wired Equivalent Privacy (WEP) */ - SEC_TYPE_PSK = 3, /* Pre-shared key (PSK) */ - SEC_TYPE_SAE = 4, /* Simultaneous Authentication of Equals (SAE) */ +enum class ConnStateJs { + SCANNING, /* The device is searching for an available AP */ + CONNECTING, /* The Wi-Fi connection is being set up */ + AUTHENTICATING, /* The Wi-Fi connection is being authenticated */ + OBTAINING_IPADDR, /* The IP address of the Wi-Fi connection is being obtained */ + CONNECTED, /* The Wi-Fi connection has been set up */ + DISCONNECTING, /* The Wi-Fi connection is being torn down */ + DISCONNECTED, /* The Wi-Fi connection has been torn down */ + UNKNOWN /* Failed to set up the Wi-Fi connection */ +}; + +class ScanInfoAsyncContext : public AsyncContext { +public: + std::vector vecScanInfos; + + ScanInfoAsyncContext(napi_env env, napi_async_work work = nullptr, napi_deferred deferred = nullptr) : + AsyncContext(env, work, deferred){} + + ScanInfoAsyncContext() = delete; + + virtual ~ScanInfoAsyncContext(){} +}; + +class AddDeviceConfigContext : public AsyncContext { +public: + WifiDeviceConfig *config; + int addResult; + + AddDeviceConfigContext(napi_env env, napi_async_work work = nullptr, napi_deferred deferred = nullptr) : + AsyncContext(env, work, deferred){ + config = nullptr; + addResult = -1; + } + + AddDeviceConfigContext() = delete; + + virtual ~AddDeviceConfigContext(){} +}; + +class LinkedInfoAsyncContext : public AsyncContext { +public: + WifiLinkedInfo linkedInfo; + + LinkedInfoAsyncContext(napi_env env, napi_async_work work = nullptr, napi_deferred deferred = nullptr) : + AsyncContext(env, work, deferred){} + + LinkedInfoAsyncContext() = delete; + + virtual ~LinkedInfoAsyncContext(){} }; } // namespace Wifi } // namespace OHOS diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_entry.cpp b/interfaces/innerkits/native_cpp/napi/wifi_napi_entry.cpp index b30880e..059554c 100755 --- a/interfaces/innerkits/native_cpp/napi/wifi_napi_entry.cpp +++ b/interfaces/innerkits/native_cpp/napi/wifi_napi_entry.cpp @@ -38,7 +38,7 @@ static void InitEventClass(napi_env& env, napi_value& exports) { sizeof(properties) / sizeof(napi_property_descriptor), properties, &eventListenerClass); napi_status status = napi_set_named_property(env, exports, "EventListener", eventListenerClass); if (status != napi_ok) { - WIFI_LOGE("[Napi Entry] Init event class set property error."); + WIFI_LOGE("Init event class set property error."); } } @@ -57,6 +57,24 @@ static napi_value Init(napi_env env, napi_value exports) { DECLARE_NAPI_FUNCTION("connectToDevice", ConnectToDevice), DECLARE_NAPI_FUNCTION("disconnect", Disconnect), DECLARE_NAPI_FUNCTION("getSignalLevel", GetSignalLevel), + DECLARE_NAPI_FUNCTION("reconnect", ReConnect), + DECLARE_NAPI_FUNCTION("reassociate", ReAssociate), + DECLARE_NAPI_FUNCTION("getIpInfo", GetIpInfo), + DECLARE_NAPI_FUNCTION("getLinkedInfo", GetLinkedInfo), + DECLARE_NAPI_FUNCTION("removeDevice", RemoveDevice), + DECLARE_NAPI_FUNCTION("removeAllNetwork", RemoveAllNetwork), + DECLARE_NAPI_FUNCTION("disableNetwork", DisableNetwork), + DECLARE_NAPI_FUNCTION("getCountryCode", GetCountryCode), + DECLARE_NAPI_FUNCTION("getDeviceConfigs", GetDeviceConfigs), + DECLARE_NAPI_FUNCTION("getSupportedFeatures", GetSupportedFeatures), + DECLARE_NAPI_FUNCTION("isFeatureSupported", IsFeatureSupported), + DECLARE_NAPI_FUNCTION("getDeviceMacAddress", GetDeviceMacAddress), + DECLARE_NAPI_FUNCTION("isHotspotActive", IsHotspotActive), + DECLARE_NAPI_FUNCTION("enableHotspot", EnableHotspot), + DECLARE_NAPI_FUNCTION("disableHotspot", DisableHotspot), + DECLARE_NAPI_FUNCTION("setHotspotConfig", SetHotspotConfig), + DECLARE_NAPI_FUNCTION("getHotspotConfig", GetHotspotConfig), + DECLARE_NAPI_FUNCTION("getStations", GetStations), }; NAPI_CALL(env, napi_define_properties(env, exports, sizeof(desc) / sizeof(napi_property_descriptor), desc)); diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_event.cpp b/interfaces/innerkits/native_cpp/napi/wifi_napi_event.cpp index 8b45dc5..11c79a4 100755 --- a/interfaces/innerkits/native_cpp/napi/wifi_napi_event.cpp +++ b/interfaces/innerkits/native_cpp/napi/wifi_napi_event.cpp @@ -26,9 +26,19 @@ DEFINE_WIFILOG_LABEL("WifiNAPIEvent"); const std::string WIFI_EVENT_TYPE_POWER_STATE = "wifiStateChange"; const std::string WIFI_EVENT_TYPE_CONN_STATE = "wifiConnectionChange"; +const std::string WIFI_EVENT_TYPE_SCAN_STATE = "wifiScanStateChange"; +const std::string WIFI_EVENT_TYPE_RSSI_STATE = "wifiRssiChange"; +const std::string WIFI_EVENT_TYPE_HOTSPOT_STATE = "hotspotStateChange"; +const std::string WIFI_EVENT_TYPE_AP_STA_JOIN = "hotspotStaJoin"; +const std::string WIFI_EVENT_TYPE_AP_STA_LEAVE = "hotspotStaLeave"; const std::string WIFI_USUAL_EVENT_POWER_STATE = "usual.event.wifi.POWER_STATE"; const std::string WIFI_USUAL_EVENT_CONN_STATE = "usual.event.wifi.CONN_STATE"; +const std::string WIFI_USUAL_EVENT_SCAN_STATE = "usual.event.wifi.SCAN_STATE"; +const std::string WIFI_USUAL_EVENT_RSSI_STATE = "usual.event.wifi.RSSI_VALUE"; +const std::string WIFI_USUAL_EVENT_HOTSPOT_STATE = "usual.event.wifi.HOTSPOT_STATE"; +const std::string WIFI_USUAL_EVENT_AP_STA_JOIN = "usual.event.wifi.WIFI_HS_STA_JOIN"; +const std::string WIFI_USUAL_EVENT_AP_STA_LEAVE = "usual.event.wifi.WIFI_HS_STA_LEAVE"; std::shared_mutex g_regInfoMutex; static std::map g_eventRegisterInfo; @@ -36,6 +46,9 @@ static std::map g_eventRegisterInfo; static std::map g_mapEventTypeToUsualEvent = { { WIFI_EVENT_TYPE_POWER_STATE, WIFI_USUAL_EVENT_POWER_STATE }, { WIFI_EVENT_TYPE_CONN_STATE, WIFI_USUAL_EVENT_CONN_STATE }, + { WIFI_EVENT_TYPE_SCAN_STATE, WIFI_USUAL_EVENT_SCAN_STATE }, + { WIFI_EVENT_TYPE_RSSI_STATE, WIFI_USUAL_EVENT_RSSI_STATE }, + { WIFI_EVENT_TYPE_HOTSPOT_STATE, WIFI_USUAL_EVENT_HOTSPOT_STATE }, }; static std::map g_mapUserDefinedEventProcessFunc = {}; @@ -74,7 +87,7 @@ public: private: std::set m_handlersCb; std::shared_ptr m_subscriber; - EventManager* m_context; + EventManager *m_context; }; void Event::SetName(std::string& name) { @@ -121,38 +134,38 @@ static bool IsEventTypeExist(const std::string& type) { void WifiEventSubscriber::OnReceiveEvent(const CommonEventData& data) { std::string event = data.GetWant().GetAction(); int code = data.GetCode(); - WIFI_LOGI("[Napi Event] Received event: %{public}s, value: %{public}d", event.c_str(), code); + WIFI_LOGI("Received event: %{public}s, value: %{public}d", event.c_str(), code); std::string type; if (!GetEventTypeByUsualEvent(event, type)) { - WIFI_LOGI("[Napi Event] Received event: %{public}s is ignored", event.c_str()); + WIFI_LOGI("Received event: %{public}s is ignored", event.c_str()); return; } - EventManager* manager = nullptr; + EventManager *manager = nullptr; { std::shared_lock guard(g_regInfoMutex); std::map::iterator it = g_eventRegisterInfo.find(type); if (it == g_eventRegisterInfo.end()) { - WIFI_LOGE("[Napi Event] no register info for event: %{public}s", type.c_str()); + WIFI_LOGE("No register info for event: %{public}s", type.c_str()); return; } manager = it->second.GetContext(); if (manager == nullptr) { - WIFI_LOGE("[Napi Event] Context is null"); + WIFI_LOGE("Context is null"); return; } } std::map::iterator iter = g_mapUserDefinedEventProcessFunc.find(type); if (iter != g_mapUserDefinedEventProcessFunc.end()) { - WIFI_LOGI("[Napi Event] Has user-defined func for event: %{public}s", type.c_str()); + WIFI_LOGI("Has user-defined func for event: %{public}s", type.c_str()); iter->second(manager->GetEnv(), type, data); } else { - WIFI_LOGI("[Napi Event] Use default policy to process event: %{public}s", type.c_str()); + WIFI_LOGI("Use default policy to process event: %{public}s", type.c_str()); WifiCommonEvent commonEvent(manager->GetEnv(), type, code); if (!manager->Send(commonEvent)) { - WIFI_LOGE("[Napi Event] Send event error"); + WIFI_LOGE("Send event error"); } } } @@ -165,7 +178,7 @@ EventManager::EventManager(napi_env env, napi_value thisVar) : m_env(env) { EventManager::~EventManager() {} bool EventManager::Send(Event& event) { - WIFI_LOGI("[Napi Event] Report event: %{public}s", event.GetName().c_str()); + WIFI_LOGI("Report event: %{public}s", event.GetName().c_str()); napi_handle_scope scope = nullptr; napi_open_handle_scope(m_env, &scope); @@ -173,7 +186,7 @@ bool EventManager::Send(Event& event) { std::shared_lock guard(g_regInfoMutex); std::map::iterator it = g_eventRegisterInfo.find(event.GetName()); if (it == g_eventRegisterInfo.end()) { - WIFI_LOGE("[Napi Event] Event receive owner not exits: %{public}s", event.GetName().c_str()); + WIFI_LOGE("Event receive owner not exits: %{public}s", event.GetName().c_str()); return false; } @@ -187,7 +200,7 @@ bool EventManager::Send(Event& event) { napi_get_reference_value(m_env, each, &handler); napi_value jsEvent = event.PackResult(); if (napi_call_function(m_env, thisVar, handler, 1, &jsEvent, &undefine) != napi_ok) { - WIFI_LOGE("[Napi Event] Report event failed"); + WIFI_LOGE("Report event failed"); result = false; } } @@ -200,29 +213,33 @@ bool EventManager::SubscribeServiceEvent(const std::string& event) { matchingSkills.AddEvent(event); CommonEventSubscribeInfo subscriberInfo(matchingSkills); std::shared_ptr subscriber = std::make_shared(subscriberInfo); - WIFI_LOGI("[Napi Event] Subscribe event -> %{public}s", event.c_str()); - bool subscribeResult = CommonEventManager::SubscribeCommonEvent(subscriber); - if (subscribeResult) { + if (subscriber == nullptr) { + WIFI_LOGE("subscriber is null."); + return false; + } + WIFI_LOGI("Subscribe event -> %{public}s", event.c_str()); + bool result = CommonEventManager::SubscribeCommonEvent(subscriber); + if (result) { g_eventRegisterInfo[m_eventType].SetSubscriber(subscriber); } else { - WIFI_LOGE("[Napi Event] Subscribe service event error: %{public}s", event.c_str()); + WIFI_LOGE("Subscribe service event error: %{public}s", event.c_str()); } - return subscribeResult; + return result; } bool EventManager::UnsubscribeServiceEvent(const std::string& event) { - bool unsubscribeResult = CommonEventManager::SubscribeCommonEvent(g_eventRegisterInfo[m_eventType].GetSubscriber()); - if (!unsubscribeResult) { - WIFI_LOGE("[Napi Event] Unsubscribe service event error: %{public}s", event.c_str()); + bool result = CommonEventManager::UnSubscribeCommonEvent(g_eventRegisterInfo[m_eventType].GetSubscriber()); + if (!result) { + WIFI_LOGE("Unsubscribe service event error: %{public}s", event.c_str()); } - return unsubscribeResult; + return result; } bool EventManager::SubscribeEvent(const std::string& name, napi_value handler) { - WIFI_LOGI("[Napi Event] Subscribe event: %{public}s", name.c_str()); + WIFI_LOGI("Subscribe event: %{public}s", name.c_str()); if (!IsEventTypeExist(name)) { - WIFI_LOGE("[Napi Event] Subscribe event is not a valid event: %{public}s", name.c_str()); + WIFI_LOGE("Subscribe event is not a valid event: %{public}s", name.c_str()); return false; } SetEventType(name); @@ -233,7 +250,7 @@ bool EventManager::SubscribeEvent(const std::string& name, napi_value handler) { GetUsualEventByEventType(name, usualEvent); bool result = SubscribeServiceEvent(usualEvent); if (!result) { - WIFI_LOGE("[Napi Event] Service register event failed: %{public}s", name.c_str()); + WIFI_LOGE("Service register event failed: %{public}s", name.c_str()); return false; } @@ -242,7 +259,7 @@ bool EventManager::SubscribeEvent(const std::string& name, napi_value handler) { } if (g_eventRegisterInfo[name].GetContext() != this) { - WIFI_LOGW("[Napi Event] Subscribe event context changed!"); + WIFI_LOGW("Subscribe event context changed!"); g_eventRegisterInfo[name].SetContext(this); } @@ -274,10 +291,10 @@ void EventManager::DeleteAllHanderRef(std::set& setRefs) { } bool EventManager::UnsubscribeEvent(const std::string& name, napi_value handler) { - WIFI_LOGI("[Napi Event] Unsubscribe event: %{public}s", name.c_str()); + WIFI_LOGI("Unsubscribe event: %{public}s", name.c_str()); if (!IsEventTypeExist(name)) { - WIFI_LOGE("[Napi Event] Unsubscribe event is not a valid event: %{public}s", name.c_str()); + WIFI_LOGE("Unsubscribe event is not a valid event: %{public}s", name.c_str()); return false; } @@ -285,13 +302,13 @@ bool EventManager::UnsubscribeEvent(const std::string& name, napi_value handler) std::unique_lock guard(g_regInfoMutex); std::map::iterator it = g_eventRegisterInfo.find(name); if (it == g_eventRegisterInfo.end()) { - WIFI_LOGE("[Napi Event] Unsubscribe event is not subscribe: %{public}s", name.c_str()); + WIFI_LOGE("Unsubscribe event is not subscribe: %{public}s", name.c_str()); return false; } if (handler != nullptr) { DeleteHanderRef(it->second.GetHandlersCb(), handler); } else { - WIFI_LOGW("[Napi Event] All callback is unsubscribe for event: %{public}s", name.c_str()); + WIFI_LOGW("All callback is unsubscribe for event: %{public}s", name.c_str()); DeleteAllHanderRef(it->second.GetHandlersCb()); } /* No one subscribes event now */ @@ -306,7 +323,7 @@ bool EventManager::UnsubscribeEvent(const std::string& name, napi_value handler) bool result = UnsubscribeServiceEvent(usualEvent); g_eventRegisterInfo.erase(name); if (!result) { - WIFI_LOGE("[Napi Event] Service unregister event failed: %{public}s", name.c_str()); + WIFI_LOGE("Service unregister event failed: %{public}s", name.c_str()); return false; } } @@ -322,6 +339,7 @@ napi_env EventManager::GetEnv() { } napi_value On(napi_env env, napi_callback_info cbinfo) { + TRACE_FUNC_CALL; size_t requireArgc = 2; size_t argc = 2; napi_value argv[2] = {0}; @@ -337,15 +355,15 @@ napi_value On(napi_env env, napi_callback_info cbinfo) { napi_typeof(env, argv[1], &handler); NAPI_ASSERT(env, handler == napi_function, "type mismatch for parameter 2"); - EventManager* manager = nullptr; + EventManager *manager = nullptr; napi_status status = napi_unwrap(env, thisVar, (void**)&manager); - if (status == napi_ok) { + if (status == napi_ok && manager != nullptr) { char type[64] = {0}; size_t typeLen = 0; napi_get_value_string_utf8(env, argv[0], type, sizeof(type), &typeLen); manager->SubscribeEvent(type, argv[1]); } else { - WIFI_LOGE("[Napi Event] On unwrap class failed"); + WIFI_LOGE("On unwrap class failed"); } napi_value result = nullptr; napi_get_undefined(env, &result); @@ -353,6 +371,7 @@ napi_value On(napi_env env, napi_callback_info cbinfo) { } napi_value Off(napi_env env, napi_callback_info cbinfo) { + TRACE_FUNC_CALL; size_t requireArgc = 1; size_t requireArgcWithCb = 2; size_t argc = 2; @@ -371,15 +390,15 @@ napi_value Off(napi_env env, napi_callback_info cbinfo) { NAPI_ASSERT(env, handler == napi_function, "type mismatch for parameter 2"); } - EventManager* manager = nullptr; + EventManager *manager = nullptr; napi_status status = napi_unwrap(env, thisVar, (void**)&manager); - if (status == napi_ok) { + if (status == napi_ok && manager != nullptr) { char type[64] = {0}; size_t typeLen = 0; napi_get_value_string_utf8(env, argv[0], type, sizeof(type), &typeLen); manager->UnsubscribeEvent(type, argc >= requireArgcWithCb ? argv[1] : nullptr); } else { - WIFI_LOGE("[Napi Event] Off unwrap class failed"); + WIFI_LOGE("Off unwrap class failed"); } napi_value result = nullptr; napi_get_undefined(env, &result); @@ -387,18 +406,23 @@ napi_value Off(napi_env env, napi_callback_info cbinfo) { } napi_value EventListenerConstructor(napi_env env, napi_callback_info cbinfo) { + WIFI_LOGI("Event listener constructor"); napi_value thisVar = nullptr; void* data = nullptr; napi_get_cb_info(env, cbinfo, nullptr, nullptr, &thisVar, &data); - EventManager* eventManager = new EventManager(env, thisVar); - WIFI_LOGI("[Napi Event] Event listener constructor"); + EventManager *eventManager = new EventManager(env, thisVar); + if (eventManager == nullptr) { + WIFI_LOGE("Init listener constructor failed"); + return nullptr; + } napi_wrap( env, thisVar, eventManager, [](napi_env env, void* data, void* hint) { - WIFI_LOGI("[Napi Event] Event listener destructor"); - EventManager* eventManager = (EventManager *)data; + WIFI_LOGI("Event listener destructor"); + EventManager *eventManager = (EventManager *)data; delete eventManager; + eventManager = nullptr; }, nullptr, nullptr); return thisVar; diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_hotspot.cpp b/interfaces/innerkits/native_cpp/napi/wifi_napi_hotspot.cpp index 905df40..0d00063 100755 --- a/interfaces/innerkits/native_cpp/napi/wifi_napi_hotspot.cpp +++ b/interfaces/innerkits/native_cpp/napi/wifi_napi_hotspot.cpp @@ -14,10 +14,182 @@ */ #include "wifi_napi_hotspot.h" +#include "wifi_hotspot.h" #include "wifi_logger.h" +#include namespace OHOS { namespace Wifi { +DEFINE_WIFILOG_LABEL("WifiNAPIHotspot"); +std::unique_ptr wifiHotspotPtr = WifiHotspot::GetInstance(WIFI_HOTSPOT_ABILITY_ID); + +std::map g_mapSecTypeToKeyMgmt = { + {SecTypeJs::SEC_TYPE_OPEN, KeyMgmt::NONE}, + {SecTypeJs::SEC_TYPE_PSK, KeyMgmt::WPA_PSK}, +}; + +napi_value EnableHotspot(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + NAPI_ASSERT(env, wifiHotspotPtr != nullptr, "Wifi hotspot instance is null."); + ErrCode ret = wifiHotspotPtr->EnableHotspot(); + if (ret != WIFI_OPT_SUCCESS) { + WIFI_LOGE("Enable hotspot error: %{public}d", ret); + } + napi_value result; + napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); + return result; +} + +napi_value DisableHotspot(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + NAPI_ASSERT(env, wifiHotspotPtr != nullptr, "Wifi hotspot instance is null."); + ErrCode ret = wifiHotspotPtr->DisableHotspot(); + if (ret != WIFI_OPT_SUCCESS) { + WIFI_LOGE("Disable hotspot error: %{public}d", ret); + } + napi_value result; + napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); + return result; +} + +napi_value IsHotspotActive(napi_env env, napi_callback_info info) +{ + NAPI_ASSERT(env, wifiHotspotPtr != nullptr, "Wifi hotspot instance is null."); + napi_value result; + napi_get_boolean(env, wifiHotspotPtr->IsHotspotActive(), &result); + return result; +} + +static KeyMgmt GetKeyMgmtFromJsSecurityType(int secType) +{ + std::map::iterator iter = g_mapSecTypeToKeyMgmt.find(SecTypeJs(secType)); + return iter == g_mapSecTypeToKeyMgmt.end() ? KeyMgmt::NONE : iter->second; +} + +static int GetJsSecurityTypeFromKeyMgmt(KeyMgmt keyMgmt) +{ + for (auto& each : g_mapSecTypeToKeyMgmt) { + if (each.second == keyMgmt) { + return static_cast(each.first); + } + } + return static_cast(SecTypeJs::SEC_TYPE_OPEN); +} + +static bool IsSecTypeSupported(int secType) +{ + return g_mapSecTypeToKeyMgmt.find(SecTypeJs(secType)) != g_mapSecTypeToKeyMgmt.end(); +} + +static bool GetHotspotconfigFromJs(const napi_env& env, const napi_value& object, HotspotConfig& config) +{ + std::string str = ""; + int value = 0; + JsObjectToString(env, object, "ssid", 33, str); // 33: ssid max length is 32 + '\0' + config.SetSsid(str); + str = ""; + JsObjectToInt(env, object, "securityType", value); + if (!IsSecTypeSupported(value)) { + WIFI_LOGE("securityType is not supported: %{public}d", value); + return false; + } + config.SetSecurityType(GetKeyMgmtFromJsSecurityType(value)); + value = 0; + JsObjectToInt(env, object, "band", value); + config.SetBand(BandType(value)); // 1: 2.4G, 2: 5G + value = 0; + JsObjectToString(env, object, "preSharedKey", 64, str); // 64: max length + config.SetPreSharedKey(str); + JsObjectToInt(env, object, "maxConn", value); + config.SetMaxConn(value); + return true; +} + +napi_value SetHotspotConfig(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + size_t argc = 1; + napi_value argv[1]; + napi_value thisVar; + NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); + + napi_valuetype valueType; + napi_typeof(env, argv[0], &valueType); + NAPI_ASSERT(env, valueType == napi_object, "Wrong argument type. Object expected."); + NAPI_ASSERT(env, wifiHotspotPtr != nullptr, "Wifi hotspot instance is null."); + + ErrCode ret = WIFI_OPT_FAILED; + HotspotConfig config; + if (GetHotspotconfigFromJs(env, argv[0], config)) { + ret = wifiHotspotPtr->SetHotspotConfig(config); + if (ret != WIFI_OPT_SUCCESS) { + WIFI_LOGE("Set hotspot config error: %{public}d", ret); + } + } + napi_value result; + napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); + return result; +} + +static void HotspotconfigToJs(const napi_env& env, HotspotConfig& cppConfig, napi_value& result) +{ + SetValueUtf8String(env, "ssid", cppConfig.GetSsid().c_str(), result); + SetValueInt32(env, "securityType", GetJsSecurityTypeFromKeyMgmt(cppConfig.GetSecurityType()), result); + SetValueInt32(env, "band", static_cast(cppConfig.GetBand()), result); + SetValueUtf8String(env, "preSharedKey", cppConfig.GetPreSharedKey().c_str(), result); + SetValueInt32(env, "maxConn", cppConfig.GetMaxConn(), result); +} + +napi_value GetHotspotConfig(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + NAPI_ASSERT(env, wifiHotspotPtr != nullptr, "Wifi hotspot instance is null."); + HotspotConfig config; + ErrCode ret = wifiHotspotPtr->GetHotspotConfig(config); + if (ret != WIFI_OPT_SUCCESS) { + WIFI_LOGE("Get hotspot config error: %{public}d", ret); + } + napi_value result; + napi_create_object(env, &result); + HotspotconfigToJs(env, config, result); + return result; +} + +static void StationInfoToJsArray(const napi_env& env, const std::vector& StationInfo, + const int idx, napi_value& arrayResult) +{ + napi_value result; + napi_create_object(env, &result); + + SetValueUtf8String(env, "name", StationInfo[idx].deviceName.c_str(), result); + SetValueUtf8String(env, "macAddress", StationInfo[idx].bssid.c_str(), result); + SetValueUtf8String(env, "ipAddress", StationInfo[idx].ipAddr.c_str(), result); + napi_status status = napi_set_element(env, arrayResult, idx, result); + if (status != napi_ok) { + WIFI_LOGE("Set station element error: %{public}d", status); + } +} + +napi_value GetStations(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + NAPI_ASSERT(env, wifiHotspotPtr != nullptr, "Wifi hotspot instance is null."); + std::vector vecStationInfo; + ErrCode ret = wifiHotspotPtr->GetStationList(vecStationInfo); + if (ret != WIFI_OPT_SUCCESS) { + WIFI_LOGE("Get station list error: %{public}d", ret); + } + WIFI_LOGI("Get station list size: %{public}zu", vecStationInfo.size()); + + napi_value arrayResult; + napi_create_array_with_length(env, vecStationInfo.size(), &arrayResult); + for (size_t i = 0; i != vecStationInfo.size(); ++i) { + StationInfoToJsArray(env, vecStationInfo, i, arrayResult); + } + return arrayResult; +} } // namespace Wifi } // namespace OHOS diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_hotspot.h b/interfaces/innerkits/native_cpp/napi/wifi_napi_hotspot.h index 74c47d7..095b50a 100755 --- a/interfaces/innerkits/native_cpp/napi/wifi_napi_hotspot.h +++ b/interfaces/innerkits/native_cpp/napi/wifi_napi_hotspot.h @@ -20,7 +20,12 @@ namespace OHOS { namespace Wifi { - +napi_value EnableHotspot(napi_env env, napi_callback_info info); +napi_value DisableHotspot(napi_env env, napi_callback_info info); +napi_value IsHotspotActive(napi_env env, napi_callback_info info); +napi_value SetHotspotConfig(napi_env env, napi_callback_info info); +napi_value GetHotspotConfig(napi_env env, napi_callback_info info); +napi_value GetStations(napi_env env, napi_callback_info info); } // namespace Wifi } // namespace OHOS diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_utils.cpp b/interfaces/innerkits/native_cpp/napi/wifi_napi_utils.cpp index be68a01..ece60b7 100755 --- a/interfaces/innerkits/native_cpp/napi/wifi_napi_utils.cpp +++ b/interfaces/innerkits/native_cpp/napi/wifi_napi_utils.cpp @@ -21,6 +21,25 @@ namespace OHOS { namespace Wifi { DEFINE_WIFILOG_LABEL("WifiNAPIUtils"); +TraceFuncCall::TraceFuncCall(std::string funcName): m_funcName(funcName) +{ + if (m_isTrace) { + m_startTime = std::chrono::steady_clock::now(); + WIFI_LOGD("Call func: %{public}s (start)", m_funcName.c_str()); + } +} + +TraceFuncCall::~TraceFuncCall() +{ + if (m_isTrace) { + auto us = std::chrono::duration_cast + (std::chrono::steady_clock::now() - m_startTime).count(); + constexpr int usForPerMs = 1000; + WIFI_LOGD("Call func: %{public}s (end), time cost:%{public}lldus, %{public}lldms", + m_funcName.c_str(), us, us / usForPerMs); + } +} + napi_value UndefinedNapiValue(const napi_env& env) { napi_value result; @@ -45,7 +64,7 @@ napi_value JsObjectToString(const napi_env& env, const napi_value& object, } char *buf = (char *)malloc(bufLen); if (buf == nullptr) { - WIFI_LOGE("[Wifi Js] js object to str malloc failed"); + WIFI_LOGE("Js object to str malloc failed"); goto error; } (void)memset_s(buf, bufLen, 0, bufLen); @@ -55,7 +74,7 @@ napi_value JsObjectToString(const napi_env& env, const napi_value& object, free(buf); buf = nullptr; } else { - WIFI_LOGW("[Wifi Js] wifi napi js to str no property: %{public}s", fieldStr); + WIFI_LOGW("Js obj to str no property: %{public}s", fieldStr); } error: @@ -75,7 +94,7 @@ napi_value JsObjectToInt(const napi_env& env, const napi_value& object, const ch NAPI_ASSERT(env, valueType == napi_number, "Wrong argument type. Number expected."); napi_get_value_int32(env, field, &fieldRef); } else { - WIFI_LOGW("[Wifi Js] wifi napi js to int no property: %{public}s", fieldStr); + WIFI_LOGW("Js to int no property: %{public}s", fieldStr); } return UndefinedNapiValue(env); } @@ -93,31 +112,188 @@ napi_value JsObjectToBool(const napi_env& env, const napi_value& object, const c NAPI_ASSERT(env, valueType == napi_boolean, "Wrong argument type. Bool expected."); napi_get_value_bool(env, field, &fieldRef); } else { - WIFI_LOGW("[Wifi Js] wifi napi js to bool no property: %{public}s", fieldStr); + WIFI_LOGW("Js to bool no property: %{public}s", fieldStr); } return UndefinedNapiValue(env); } -void SetValueUtf8String(const napi_env& env, const char* fieldStr, const char* str, napi_value& result) +napi_status SetValueUtf8String(const napi_env& env, const char* fieldStr, const char* str, napi_value& result) +{ + napi_value value; + napi_status status = napi_create_string_utf8(env, str, NAPI_AUTO_LENGTH, &value); + if (status != napi_ok) { + WIFI_LOGE("Set value create utf8 string error! field: %{public}s", fieldStr); + return status; + } + status = napi_set_named_property(env, result, fieldStr, value); + if (status != napi_ok) { + WIFI_LOGE("Set utf8 string named property error! field: %{public}s", fieldStr); + } + return status; +} + +napi_status SetValueInt32(const napi_env& env, const char* fieldStr, const int intValue, napi_value& result) { napi_value value; - napi_create_string_utf8(env, str, NAPI_AUTO_LENGTH, &value); - napi_set_named_property(env, result, fieldStr, value); + napi_status status = napi_create_int32(env, intValue, &value); + if (status != napi_ok) { + WIFI_LOGE("Set value create int32 error! field: %{public}s", fieldStr); + return status; + } + status = napi_set_named_property(env, result, fieldStr, value); + if (status != napi_ok) { + WIFI_LOGE("Set int32 named property error! field: %{public}s", fieldStr); + } + return status; } -void SetValueInt32(const napi_env& env, const char* fieldStr, const int intValue, napi_value& result) +napi_status SetValueInt64(const napi_env& env, const char* fieldStr, const int64_t intValue, napi_value& result) { napi_value value; - napi_create_int32(env, intValue, &value); - napi_set_named_property(env, result, fieldStr, value); + napi_status status = napi_create_int64(env, intValue, &value); + if (status != napi_ok) { + WIFI_LOGE("Set value create int64 error! field: %{public}s", fieldStr); + return status; + } + status = napi_set_named_property(env, result, fieldStr, value); + if (status != napi_ok) { + WIFI_LOGE("Set int64 named property error! field: %{public}s", fieldStr); + } + return status; } -void SetValueInt64(const napi_env& env, const char* fieldStr, const int64_t intValue, napi_value& result) +napi_status SetValueBool(const napi_env& env, const char* fieldStr, const bool boolvalue, napi_value& result) { napi_value value; - napi_create_int64(env, intValue, &value); - napi_set_named_property(env, result, fieldStr, value); + napi_status status = napi_get_boolean(env, boolvalue, &value); + if (status != napi_ok) { + WIFI_LOGE("Set value create boolean error! field: %{public}s", fieldStr); + return status; + } + status = napi_set_named_property(env, result, fieldStr, value); + if (status != napi_ok) { + WIFI_LOGE("Set boolean named property error! field: %{public}s", fieldStr); + } + return status; } +static napi_value InitAsyncCallBackEnv(const napi_env& env, AsyncContext *asyncContext, + const size_t argc, const napi_value *argv, const size_t nonCallbackArgNum) +{ + for (size_t i = nonCallbackArgNum; i != argc; ++i) { + napi_valuetype valuetype; + NAPI_CALL(env, napi_typeof(env, argv[i], &valuetype)); + NAPI_ASSERT(env, valuetype == napi_function, "Wrong argument type. Function expected."); + napi_create_reference(env, argv[i], 1, &asyncContext->callback[i - nonCallbackArgNum]); + } + return nullptr; +} + +static napi_value InitAsyncPromiseEnv(const napi_env& env, AsyncContext *asyncContext, napi_value& promise) +{ + napi_deferred deferred; + NAPI_CALL(env, napi_create_promise(env, &deferred, &promise)); + asyncContext->deferred = deferred; + return nullptr; +} + +static napi_value DoCallBackAsyncWork(const napi_env& env, AsyncContext *asyncContext) +{ + napi_create_async_work( + env, + nullptr, + asyncContext->resourceName, + [](napi_env env, void* data) { + if (data == nullptr) { + WIFI_LOGE("Async data parameter is null"); + return; + } + AsyncContext *context = (AsyncContext *)data; + context->executeFunc(context); + }, + [](napi_env env, napi_status status, void* data) { + if (data == nullptr) { + WIFI_LOGE("Async data parameter is null"); + return; + } + AsyncContext *context = (AsyncContext *)data; + napi_value undefine; + napi_get_undefined(env, &undefine); + napi_value callback; + context->completeFunc(data); + if (context->isSuccess) { + napi_get_reference_value(env, context->callback[0], &callback); + napi_call_function(env, nullptr, callback, 1, &context->result, &undefine); + } else { + if (context->callback[1]) { + napi_get_reference_value(env, context->callback[1], &callback); + napi_call_function(env, nullptr, callback, 1, &context->result, &undefine); + } else { + WIFI_LOGE("Get scan info callback func is null"); + } + } + if (context->callback[0] != nullptr) { + napi_delete_reference(env, context->callback[0]); + } + if (context->callback[1] != nullptr) { + napi_delete_reference(env, context->callback[1]); + } + napi_delete_async_work(env, context->work); + delete context; + }, + (void *)asyncContext, + &asyncContext->work); + NAPI_CALL(env, napi_queue_async_work(env, asyncContext->work)); + return UndefinedNapiValue(env); +} + +static napi_value DoPromiseAsyncWork(const napi_env& env, AsyncContext *asyncContext) +{ + napi_create_async_work( + env, + nullptr, + asyncContext->resourceName, + [](napi_env env, void *data) { + if (data == nullptr) { + WIFI_LOGE("Async data parameter is null"); + return; + } + AsyncContext *context = (AsyncContext *)data; + context->executeFunc(context); + }, + [](napi_env env, napi_status status, void *data) { + if (data == nullptr) { + WIFI_LOGE("Async data parameter is null"); + return; + } + AsyncContext *context = (AsyncContext *)data; + context->completeFunc(data); + if (context->isSuccess) { + napi_resolve_deferred(context->env, context->deferred, context->result); + } else { + napi_reject_deferred(context->env, context->deferred, context->result); + } + napi_delete_async_work(env, context->work); + delete context; + }, + (void *)asyncContext, + &asyncContext->work); + napi_queue_async_work(env, asyncContext->work); + return UndefinedNapiValue(env); +} + +napi_value DoAsyncWork(const napi_env& env, AsyncContext *asyncContext, + const size_t argc, const napi_value *argv, const size_t nonCallbackArgNum) +{ + if (argc > nonCallbackArgNum) { + InitAsyncCallBackEnv(env, asyncContext, argc, argv, nonCallbackArgNum); + return DoCallBackAsyncWork(env, asyncContext); + } else { + napi_value promise; + InitAsyncPromiseEnv(env, asyncContext, promise); + DoPromiseAsyncWork(env, asyncContext); + return promise; + } +} } // namespace Wifi } // namespace OHOS diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_utils.h b/interfaces/innerkits/native_cpp/napi/wifi_napi_utils.h index b9eb639..9e16e0f 100755 --- a/interfaces/innerkits/native_cpp/napi/wifi_napi_utils.h +++ b/interfaces/innerkits/native_cpp/napi/wifi_napi_utils.h @@ -17,30 +17,78 @@ #define WIFI_NAPI_UTILS_H_ #include +#include #include "napi/native_api.h" #include "napi/native_node_api.h" namespace OHOS { namespace Wifi { -napi_value UndefinedNapiValue(const napi_env& env); -napi_value JsObjectToString(const napi_env& env, const napi_value& object, - const char* fieldStr, const int bufLen, std::string& fieldRef); -napi_value JsObjectToInt(const napi_env& env, const napi_value& object, const char* fieldStr, int& fieldRef); -napi_value JsObjectToBool(const napi_env& env, const napi_value& object, const char* fieldStr, bool& fieldRef); -void SetValueUtf8String(const napi_env& env, const char* fieldStr, const char* str, napi_value& result); -void SetValueInt32(const napi_env& env, const char* fieldStr, const int intValue, napi_value& result); -void SetValueInt64(const napi_env& env, const char* fieldStr, const int64_t intValue, napi_value& result); +class TraceFuncCall final { +public: + TraceFuncCall(std::string funcName); + + TraceFuncCall() = delete; + + ~TraceFuncCall(); + +private: + std::string m_funcName; + std::chrono::steady_clock::time_point m_startTime; + bool m_isTrace = true; +}; + +#define TRACE_FUNC_CALL TraceFuncCall func(__func__) +#define TRACE_FUNC_CALL_NAME(name) TraceFuncCall funcName(name) -struct AsyncCallbackInfo { +class AsyncContext { +public: napi_env env; - napi_async_work asyncWork; + napi_async_work work; napi_deferred deferred; napi_ref callback[2] = { 0 }; - void *obj; + std::function executeFunc; + std::function completeFunc; + napi_value resourceName; napi_value result; bool isSuccess; + + AsyncContext(napi_env e, napi_async_work w = nullptr, napi_deferred d = nullptr) + { + env = e; + work = w; + deferred = d; + executeFunc = nullptr; + completeFunc = nullptr; + result = nullptr; + isSuccess = false; + } + + AsyncContext() = delete; + + virtual ~AsyncContext() + { + } }; +napi_value UndefinedNapiValue(const napi_env& env); +napi_value JsObjectToString(const napi_env& env, const napi_value& object, + const char* fieldStr, const int bufLen, std::string& fieldRef); +napi_value JsObjectToInt(const napi_env& env, const napi_value& object, const char* fieldStr, int& fieldRef); +napi_value JsObjectToBool(const napi_env& env, const napi_value& object, const char* fieldStr, bool& fieldRef); +napi_status SetValueUtf8String(const napi_env& env, const char* fieldStr, const char* str, napi_value& result); +napi_status SetValueInt32(const napi_env& env, const char* fieldStr, const int intValue, napi_value& result); +napi_status SetValueInt64(const napi_env& env, const char* fieldStr, const int64_t intValue, napi_value& result); +napi_status SetValueBool(const napi_env& env, const char* fieldStr, const bool boolValue, napi_value& result); +napi_value DoAsyncWork(const napi_env& env, AsyncContext *asyncContext, + const size_t argc, const napi_value *argv, const size_t nonCallbackArgNum); + +enum class SecTypeJs { + SEC_TYPE_INVALID = 0, /* Invalid security type */ + SEC_TYPE_OPEN = 1, /* Open */ + SEC_TYPE_WEP = 2, /* Wired Equivalent Privacy (WEP) */ + SEC_TYPE_PSK = 3, /* Pre-shared key (PSK) */ + SEC_TYPE_SAE = 4, /* Simultaneous Authentication of Equals (SAE) */ +}; } // namespace Wifi } // namespace OHOS -- Gitee From 1351dec78901ad544277ea1f559f1a25d2c2079a Mon Sep 17 00:00:00 2001 From: z00588131 Date: Thu, 11 Nov 2021 14:43:43 +0000 Subject: [PATCH 009/491] feat(*): add WiFi dump feature Signed-off-by: z00588131 --- README.md | 7 +- README_zh.md | 7 +- .../native_cpp/wifi_standard/BUILD.gn | 6 +- .../wifi_standard/c_adapter/wifi_c_device.cpp | 2 +- .../c_adapter/wifi_c_hotspot.cpp | 2 +- .../wifi_standard/c_adapter/wifi_c_utils.cpp | 73 -------- .../wifi_standard/c_adapter/wifi_c_utils.h | 4 - ohos.build | 12 ++ .../wifi_framework/wifi_manage/BUILD.gn | 4 + .../wifi_manage/wifi_device_service_impl.cpp | 76 ++++++++ .../wifi_manage/wifi_device_service_impl.h | 3 + .../wifi_manage/wifi_dumper.cpp | 126 +++++++++++++ .../wifi_framework/wifi_manage/wifi_dumper.h | 47 +++++ .../wifi_manage/wifi_hotspot_service_impl.cpp | 119 ++++++++++++- .../wifi_manage/wifi_hotspot_service_impl.h | 12 ++ .../wifi_manage/wifi_p2p_service_impl.cpp | 29 +++ .../wifi_manage/wifi_p2p_service_impl.h | 10 ++ .../wifi_manage/wifi_scan_service_impl.cpp | 28 +++ .../wifi_manage/wifi_scan_service_impl.h | 2 + utils/inc/wifi_common_util.h | 90 ++++++++++ utils/src/BUILD.gn | 38 ++++ utils/src/wifi_common_util.cpp | 168 ++++++++++++++++++ 22 files changed, 780 insertions(+), 85 deletions(-) create mode 100755 services/wifi_standard/wifi_framework/wifi_manage/wifi_dumper.cpp create mode 100755 services/wifi_standard/wifi_framework/wifi_manage/wifi_dumper.h create mode 100755 utils/inc/wifi_common_util.h create mode 100755 utils/src/BUILD.gn create mode 100755 utils/src/wifi_common_util.cpp diff --git a/README.md b/README.md index 80a0b79..7956335 100755 --- a/README.md +++ b/README.md @@ -32,8 +32,11 @@ The WLAN module provides basic WLAN functions, peer-to-peer \(P2P\) connection, │   └── kits # WLAN APIs ├── services # Services │   └── wifi_standard # Service implementation -└── tests # Test code - └── wifi_standard # Test code for the service implementation module +├── tests # Test code +│   └── wifi_standard # Test code for the service implementation module +└── utils # Utility functions + ├── inc # Header directory for utility functions + └── src # Implementation directory for utility functions ``` ## Usage diff --git a/README_zh.md b/README_zh.md index 4fb9399..8442944 100755 --- a/README_zh.md +++ b/README_zh.md @@ -32,8 +32,11 @@ WLAN组件子系统为用户提供WLAN基础功能、P2P（peer-to-peer）功能 │   └── kits # WLAN组件接口的适配代码存放目录 ├── services # service适配目录 │   └── wifi_standard # service实现目录 -└── tests # 测试代码目录 - └── wifi_standard # service实现模块测试代码 +├── tests # 测试代码目录 +│   └── wifi_standard # service实现模块测试代码 +└── utils # 实用函数目录 + ├── inc # 实用函数头文件目录 + └── src # 实用函数实现目录 ``` ## 说明 diff --git a/interfaces/innerkits/native_cpp/wifi_standard/BUILD.gn b/interfaces/innerkits/native_cpp/wifi_standard/BUILD.gn index e766dee..0919e32 100755 --- a/interfaces/innerkits/native_cpp/wifi_standard/BUILD.gn +++ b/interfaces/innerkits/native_cpp/wifi_standard/BUILD.gn @@ -104,7 +104,10 @@ ohos_source_set("wifi_p2p_proxy_impl") { ohos_shared_library("wifi_sdk") { install_enable = true - include_dirs = [ "//foundation/communication/wifi/interfaces/innerkits" ] + include_dirs = [ + "//foundation/communication/wifi/interfaces/innerkits", + "//foundation/communication/wifi/utils/inc", + ] sources = [ "c_adapter/wifi_c_device.cpp", @@ -132,6 +135,7 @@ ohos_shared_library("wifi_sdk") { "//base/notification/ces_standard/frameworks/native:cesfwk_innerkits", "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", + "//foundation/communication/wifi/utils/src:wifi_utils", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/bounds_checking_function:libsec_static", "//utils/native/base:utils", diff --git a/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_device.cpp b/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_device.cpp index 5fa4d70..21179c7 100755 --- a/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_device.cpp +++ b/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_device.cpp @@ -20,7 +20,7 @@ #include "native_c/wifi_device_config.h" #include "wifi_logger.h" #include "wifi_c_utils.h" -#include "securec.h" +#include "wifi_common_util.h" DEFINE_WIFILOG_LABEL("WifiCDevice"); diff --git a/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_hotspot.cpp b/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_hotspot.cpp index 7b600a8..2fe403f 100755 --- a/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_hotspot.cpp +++ b/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_hotspot.cpp @@ -19,8 +19,8 @@ #include "native_cpp/wifi_standard/include/wifi_hotspot.h" #include "wifi_logger.h" #include "wifi_c_utils.h" -#include "securec.h" #include "ip_tools.h" +#include "wifi_common_util.h" DEFINE_WIFILOG_LABEL("WifiCHotspot"); diff --git a/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_utils.cpp b/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_utils.cpp index 822a4f1..22009da 100755 --- a/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_utils.cpp +++ b/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_utils.cpp @@ -15,7 +15,6 @@ #include "wifi_c_utils.h" #include -#include namespace OHOS { namespace Wifi { @@ -42,77 +41,5 @@ WifiErrorCode GetCErrorCode(ErrCode errCode) std::map::const_iterator iter = g_ErrCodeMap.find(errCode); return iter == g_ErrCodeMap.end() ? ERROR_WIFI_UNKNOWN : iter->second; } - -static unsigned char ConvertStrChar(char ch) -{ - constexpr int numDiffForHexAlphabet = 10; - if (ch >= '0' && ch <= '9') { - return (ch - '0'); - } - if (ch >= 'A' && ch <= 'F') { - return (ch - 'A' + numDiffForHexAlphabet); - } - if (ch >= 'a' && ch <= 'f') { - return (ch - 'a' + numDiffForHexAlphabet); - } - return 0; -} - -errno_t MacStrToArray(const std::string& strMac, unsigned char mac[WIFI_MAC_LEN]) -{ - constexpr int strMacLen = 18; - char tempArray[strMacLen] = { 0 }; - errno_t ret = memcpy_s(tempArray, strMacLen, strMac.c_str(), strMac.size() + 1); - if (ret != EOK) { - return ret; - } - - int idx = 0; - constexpr int bitWidth = 4; - char *ptr = nullptr; - char *p = strtok_s(tempArray, ":", &ptr); - while (p != nullptr) { - mac[idx++] = (ConvertStrChar(*p) << bitWidth) | ConvertStrChar(*(p + 1)); - p = strtok_s(nullptr, ":", &ptr); - } - return EOK; -} - -static char ConvertArrayChar(unsigned char ch) -{ - constexpr int maxDecNum = 9; - constexpr int numDiffForHexAlphabet = 10; - if (ch >= 0 && ch <= maxDecNum) { - return '0' + ch; - } - if (ch >= 0xa && ch <= 0xf) { - return ch + 'a' - numDiffForHexAlphabet; - } - return '0'; -} - -std::string MacArrayToStr(const unsigned char mac[WIFI_MAC_LEN]) -{ - constexpr int bitWidth = 4; - constexpr int noColonBit = 5; - std::stringstream ss; - for (int i = 0; i != WIFI_MAC_LEN; ++i) { - ss << ConvertArrayChar(mac[i] >> bitWidth) << ConvertArrayChar(mac[i] & 0xf); - if (i != noColonBit) { - ss << ":"; - } - } - return ss.str(); -} - -bool IsMacArrayEmpty(const unsigned char mac[WIFI_MAC_LEN]) -{ - for (int i = 0; i != WIFI_MAC_LEN; ++i) { - if (mac[i] != 0) { - return false; - } - } - return true; -} } // namespace Wifi } // namespace OHOS diff --git a/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_utils.h b/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_utils.h index f1b1958..947bf14 100755 --- a/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_utils.h +++ b/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_utils.h @@ -19,7 +19,6 @@ #include #include "native_c/wifi_device_config.h" #include "native_c/wifi_error_code.h" -#include "securec.h" #include "wifi_errcode.h" namespace OHOS { @@ -33,9 +32,6 @@ namespace Wifi { #endif WifiErrorCode GetCErrorCode(ErrCode errCode); -errno_t MacStrToArray(const std::string& strMac, unsigned char mac[WIFI_MAC_LEN]); -std::string MacArrayToStr(const unsigned char mac[WIFI_MAC_LEN]); -bool IsMacArrayEmpty(const unsigned char mac[WIFI_MAC_LEN]); } // namespace Wifi } // namespace OHOS diff --git a/ohos.build b/ohos.build index 6e9a2cf..7c9e90a 100755 --- a/ohos.build +++ b/ohos.build @@ -63,6 +63,18 @@ } } ], + "wifi_utils": [ + { + "type": "so", + "name": "//foundation/communication/wifi/utils/src:wifi_utils", + "header": { + "header_files": [ + "wifi_common_util.h" + ], + "header_base": "//foundation/communication/wifi/utils/inc/" + } + } + ], "test_list": [ "//foundation/communication/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan:unittest", "//foundation/communication/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta:unittest", diff --git a/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn b/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn index 2dfa8e1..7b44265 100755 --- a/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn +++ b/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn @@ -42,6 +42,7 @@ config("wifi_manager_service_header") { "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p", "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include", "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/interfaces", + "//foundation/communication/wifi/utils/inc", "${aafwk_path}/interfaces/innerkits/want/include", "${aafwk_path}/interfaces/innerkits/want/include/ohos/aafwk/content", "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include", @@ -143,6 +144,7 @@ ohos_shared_library("wifi_manager_service") { "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_utils.cpp", "wifi_auth_center.cpp", "wifi_config_center.cpp", + "wifi_dumper.cpp", "wifi_internal_event_dispatcher.cpp", "wifi_manager.cpp", "wifi_service_manager.cpp", @@ -177,6 +179,7 @@ ohos_shared_library("wifi_device_ability") { ":wifi_manager_service", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", + "//foundation/communication/wifi/utils/src:wifi_utils", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//utils/native/base:utils", ] @@ -206,6 +209,7 @@ ohos_shared_library("wifi_hotspot_ability") { ":wifi_hotspot_service_impl", ":wifi_manager_service", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", + "//foundation/communication/wifi/utils/src:wifi_utils", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//utils/native/base:utils", ] diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp index 82c3cf9..a683feb 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp @@ -15,6 +15,7 @@ #include "wifi_device_service_impl.h" #include +#include #include "wifi_permission_utils.h" #include "wifi_internal_msg.h" #include "wifi_auth_center.h" @@ -25,6 +26,8 @@ #include "wifi_protect_manager.h" #include "wifi_logger.h" #include "define.h" +#include "wifi_dumper.h" +#include "wifi_common_util.h" DEFINE_WIFILOG_LABEL("WifiDeviceServiceImpl"); namespace OHOS { @@ -667,5 +670,78 @@ bool WifiDeviceServiceImpl::IsScanServiceRunning() } return true; } + +void WifiDeviceServiceImpl::SaBasicDump(std::string& result) +{ + WifiDeviceServiceImpl impl; + bool isActive = impl.IsStaServiceRunning(); + result.append("WiFi active state: "); + std::string strActive = isActive ? "activated" : "inactive"; + result += strActive + "\n\n"; + + WifiLinkedInfo linkedInfo; + WifiConfigCenter::GetInstance().GetLinkedInfo(linkedInfo); + bool isConnected = linkedInfo.connState == ConnState::CONNECTED; + result.append("WiFi connection status: "); + std::string strIsConnected = isConnected ? "connected" : "not connected"; + result += strIsConnected + "\n"; + if (isConnected) { + std::stringstream ss; + ss << " Connection.ssid: " << linkedInfo.ssid << "\n"; + ss << " Connection.bssid: " << MacAnonymize(linkedInfo.bssid) << "\n"; + ss << " Connection.rssi: " << linkedInfo.rssi << "\n"; + + enum {BAND_2GHZ = 1, BAND_5GHZ = 2, BAND_ANY = 3}; + auto funcStrBand = [](int band) { + std::string retStr; + switch (band) { + case BAND_2GHZ: + retStr = "2.4GHz"; + break; + case BAND_5GHZ: + retStr = "5GHz"; + break; + case BAND_ANY: + retStr = "dual-mode frequency band"; + break; + default: + retStr = "unknown band"; + } + return retStr; + }; + ss << " Connection.band: " << funcStrBand(linkedInfo.band) << "\n"; + ss << " Connection.frequency: " << linkedInfo.frequency << "\n"; + ss << " Connection.linkSpeed: " << linkedInfo.linkSpeed << "\n"; + ss << " Connection.macAddress: " << MacAnonymize(linkedInfo.macAddress) << "\n"; + ss << " Connection.isHiddenSSID: " << (linkedInfo.ifHiddenSSID ? "true" : "false") << "\n"; + + int level = WifiConfigCenter::GetInstance().GetSignalLevel(linkedInfo.rssi, linkedInfo.band); + ss << " Connection.signalLevel: " << level << "\n"; + result += ss.str(); + } + result += "\n"; + + std::string cc; + WifiConfigCenter::GetInstance().GetCountryCode(cc); + result.append("Country Code: ").append(cc); + result += "\n"; +} + +int32_t WifiDeviceServiceImpl::Dump(int32_t fd, const std::vector& args) +{ + std::vector vecArgs; + std::transform(args.begin(), args.end(), std::back_inserter(vecArgs), [](const std::u16string &arg) { + return Str16ToStr8(arg); + }); + + WifiDumper dumper; + std::string result; + dumper.DeviceDump(SaBasicDump, vecArgs, result); + if (!SaveStringToFd(fd, result)) { + WIFI_LOGE("WiFi device save string to fd failed."); + return ERR_OK; + } + return ERR_OK; +} } // namespace Wifi } // namespace OHOS diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h index c78b68c..3c49972 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h @@ -95,11 +95,14 @@ public: ErrCode GetDeviceMacAddress(std::string &result) override; + int32_t Dump(int32_t fd, const std::vector& args) override; + private: bool Init(); ErrCode CheckCanEnableWifi(void); bool IsStaServiceRunning(); bool IsScanServiceRunning(); + static void SaBasicDump(std::string& result); private: static sptr g_instance; diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_dumper.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_dumper.cpp new file mode 100755 index 0000000..e822624 --- /dev/null +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_dumper.cpp @@ -0,0 +1,126 @@ +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "wifi_dumper.h" +#include +#include "wifi_logger.h" + +DEFINE_WIFILOG_LABEL("WifiDumper"); +namespace OHOS { +namespace Wifi { +const std::string ARGS_HELP = "-h"; + +void WifiDumper::PrintArgs(const std::vector& vecArgs) +{ + std::string strArgs; + for (auto& each: vecArgs) { + strArgs += each + "|"; + } + WIFI_LOGD("Dumper[%{public}zu] args: %{public}s", vecArgs.size(), strArgs.c_str()); +} + +std::string WifiDumper::ShowDeviceDumpUsage() const +{ + std::string help; + return help.append("WiFi device dump options:\n") + .append(" [-h]\n") + .append(" description of the cmd option:\n") + .append(" -h: show help.\n"); +} + +bool WifiDumper::DeviceDump(std::function saBasicDumpFunc, + const std::vector& vecArgs, std::string& result) +{ + PrintArgs(vecArgs); + result.clear(); + if (!vecArgs.empty() && vecArgs[0] == ARGS_HELP) { + result = ShowDeviceDumpUsage(); + return true; + } + + saBasicDumpFunc(result); + return true; +} + +std::string WifiDumper::ShowScanDumpUsage() const +{ + std::string help; + return help.append("WiFi scan dump options:\n") + .append(" [-h]\n") + .append(" description of the cmd option:\n") + .append(" -h: show help.\n"); +} + +bool WifiDumper::ScanDump(std::function saBasicDumpFunc, + const std::vector& vecArgs, std::string& result) +{ + PrintArgs(vecArgs); + result.clear(); + if (!vecArgs.empty() && vecArgs[0] == ARGS_HELP) { + result = ShowScanDumpUsage(); + return true; + } + + saBasicDumpFunc(result); + return true; +} + +std::string WifiDumper::ShowP2pDumpUsage() const +{ + std::string help; + return help.append("WiFi P2P dump options:\n") + .append(" [-h]\n") + .append(" description of the cmd option:\n") + .append(" -h: show help.\n"); +} + +bool WifiDumper::P2pDump(std::function saBasicDumpFunc, + const std::vector& vecArgs, std::string& result) +{ + PrintArgs(vecArgs); + result.clear(); + if (!vecArgs.empty() && vecArgs[0] == ARGS_HELP) { + result = ShowP2pDumpUsage(); + return true; + } + + saBasicDumpFunc(result); + return true; +} + +std::string WifiDumper::ShowHotspotDumpUsage() const +{ + std::string help; + return help.append("WiFi hotspot dump options:\n") + .append(" [-h]\n") + .append(" description of the cmd option:\n") + .append(" -h: show help.\n"); +} + +bool WifiDumper::HotspotDump(std::function saBasicDumpFunc, + const std::vector& vecArgs, std::string& result) +{ + PrintArgs(vecArgs); + result.clear(); + if (!vecArgs.empty() && vecArgs[0] == ARGS_HELP) { + result = ShowHotspotDumpUsage(); + return true; + } + + saBasicDumpFunc(result); + return true; +} +} // namespace Wifi +} // namespace OHOS diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_dumper.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_dumper.h new file mode 100755 index 0000000..f960281 --- /dev/null +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_dumper.h @@ -0,0 +1,47 @@ +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OHOS_WIFI_DUMPER_H +#define OHOS_WIFI_DUMPER_H + +#include +#include + +namespace OHOS { +namespace Wifi { +class WifiDumper { +public: + bool DeviceDump(std::function saBasicDumpFunc, + const std::vector &vecArgs, std::string &result); + + bool ScanDump(std::function saBasicDumpFunc, + const std::vector &vecArgs, std::string &result); + + bool P2pDump(std::function saBasicDumpFunc, + const std::vector &vecArgs, std::string &result); + + bool HotspotDump(std::function saBasicDumpFunc, + const std::vector &vecArgs, std::string &result); + +private: + std::string ShowDeviceDumpUsage() const; + std::string ShowScanDumpUsage() const; + std::string ShowP2pDumpUsage() const; + std::string ShowHotspotDumpUsage() const; + void PrintArgs(const std::vector& vecArgs); +}; +} // namespace Wifi +} // namespace OHOS +#endif \ No newline at end of file diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp index 1a800e0..b9a9fb7 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp @@ -14,6 +14,7 @@ */ #include "wifi_hotspot_service_impl.h" +#include #include "wifi_permission_utils.h" #include "wifi_global_func.h" #include "wifi_auth_center.h" @@ -24,6 +25,8 @@ #include "wifi_logger.h" #include "define.h" #include "wifi_logger.h" +#include "wifi_dumper.h" +#include "wifi_common_util.h" DEFINE_WIFILOG_HOTSPOT_LABEL("WifiHotspotServiceImpl"); @@ -433,7 +436,7 @@ ErrCode WifiHotspotServiceImpl::GetBlockLists(std::vector &infos) } if (WifiConfigCenter::GetInstance().GetBlockLists(infos) < 0) { - WIFI_LOGE("Delete block list failed!"); + WIFI_LOGE("Get block list failed!"); return WIFI_OPT_FAILED; } return WIFI_OPT_SUCCESS; @@ -473,5 +476,119 @@ ErrCode WifiHotspotServiceImpl::GetSupportedFeatures(long &features) } return WIFI_OPT_SUCCESS; } + +void WifiHotspotServiceImpl::ConfigInfoDump(std::string& result) +{ + HotspotConfig config; + WifiConfigCenter::GetInstance().GetHotspotConfig(config); + std::stringstream ss; + ss << "Hotspot config: " << "\n"; + ss << " Config.ssid: " << config.GetSsid() << "\n"; + + std::map mapKeyMgmtToStr = { + {KeyMgmt::NONE, "Open"}, {KeyMgmt::WPA_PSK, "WPA_PSK"}, {KeyMgmt::WPA_EAP, "WPA_EAP"}, + {KeyMgmt::IEEE8021X, "IEEE8021X"}, {KeyMgmt::WPA2_PSK, "WPA2_PSK"}, {KeyMgmt::OSEN, "OSEN"}, + {KeyMgmt::FT_PSK, "FT_PSK"}, {KeyMgmt::FT_EAP, "FT_EAP"} + }; + + auto funcStrKeyMgmt = [&mapKeyMgmtToStr](KeyMgmt secType) { + std::map::iterator iter = mapKeyMgmtToStr.find(secType); + return (iter != mapKeyMgmtToStr.end()) ? iter->second : "Unknow"; + }; + ss << " Config.security_type: " << funcStrKeyMgmt(config.GetSecurityType()) << "\n"; + + auto funcStrBand = [](BandType band) { + std::string retStr; + switch (band) { + case BandType::BAND_2GHZ: + retStr = "2.4GHz"; + break; + case BandType::BAND_5GHZ: + retStr = "5GHz"; + break; + case BandType::BAND_ANY: + retStr = "dual-mode frequency band"; + break; + default: + retStr = "unknown band"; + } + return retStr; + }; + ss << " Config.band: " << funcStrBand(config.GetBand()) << "\n"; + ss << " Config.channel: " << config.GetChannel() << "\n"; + ss << " Config.max_conn: " << config.GetMaxConn() << "\n"; + result += "\n"; + result += ss.str(); + result += "\n"; +} + +void WifiHotspotServiceImpl::StationsInfoDump(std::string& result) +{ + IApService *pService = WifiServiceManager::GetInstance().GetApServiceInst(); + if (pService != nullptr) { + std::stringstream ss; + std::vector vecStations; + pService->GetStationList(vecStations); + ss << "Station list size: " << vecStations.size() << "\n"; + int idx = 0; + for (auto& each : vecStations) { + ++idx; + ss << " Station[" << idx << "].deviceName: " << each.deviceName << "\n"; + ss << " Station[" << idx << "].bssid: " << MacAnonymize(each.bssid) << "\n"; + ss << " Station[" << idx << "].ipAddr: " << IpAnonymize(each.ipAddr) << "\n"; + ss << "\n"; + } + result += ss.str(); + result += "\n"; + } + + std::vector vecBlockStations; + WifiConfigCenter::GetInstance().GetBlockLists(vecBlockStations); + if (!vecBlockStations.empty()) { + std::stringstream ss; + ss << "Block station list size: " << vecBlockStations.size() << "\n"; + int idx = 0; + for (auto& each : vecBlockStations) { + ++idx; + ss << " BlockStation[" << idx << "].deviceName: " << each.deviceName << "\n"; + ss << " BlockStation[" << idx << "].bssid: " << MacAnonymize(each.bssid) << "\n"; + ss << " BlockStation[" << idx << "].ipAddr: " << IpAnonymize(each.ipAddr) << "\n"; + ss << "\n"; + } + result += ss.str(); + result += "\n"; + } +} + +void WifiHotspotServiceImpl::SaBasicDump(std::string& result) +{ + WifiHotspotServiceImpl impl; + bool isActive = impl.IsApServiceRunning(); + result.append("WiFi hotspot active state: "); + std::string strActive = isActive ? "activated" : "inactive"; + result += strActive + "\n"; + + if (isActive) { + ConfigInfoDump(result); + StationsInfoDump(result); + } +} + +int32_t WifiHotspotServiceImpl::Dump(int32_t fd, const std::vector& args) +{ + std::vector vecArgs; + std::transform(args.begin(), args.end(), std::back_inserter(vecArgs), [](const std::u16string &arg) { + return Str16ToStr8(arg); + }); + + WifiDumper dumper; + std::string result; + dumper.HotspotDump(SaBasicDump, vecArgs, result); + if (!SaveStringToFd(fd, result)) { + WIFI_LOGE("WiFi hotspot save string to fd failed."); + return ERR_OK; + } + return ERR_OK; +} } // namespace Wifi } // namespace OHOS diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.h index ac6379b..c076935 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.h @@ -158,10 +158,22 @@ public: */ ErrCode GetSupportedFeatures(long &features) override; + /** + * @Description dump p2p information + * + * @param fd - file descriptor + * @param args - dump arguments + * @return ErrCode - operate result + */ + int32_t Dump(int32_t fd, const std::vector& args) override; + private: bool Init(); ErrCode CheckCanEnableHotspot(void); bool IsApServiceRunning(); + static void SaBasicDump(std::string& result); + static void ConfigInfoDump(std::string& result); + static void StationsInfoDump(std::string& result); private: static sptr g_instance; diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp index c7c29b7..e71f453 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp @@ -13,6 +13,7 @@ * limitations under the License. */ #include "wifi_p2p_service_impl.h" +#include #include "wifi_permission_utils.h" #include "wifi_auth_center.h" #include "wifi_config_center.h" @@ -21,6 +22,7 @@ #include "wifi_internal_event_dispatcher.h" #include "wifi_logger.h" #include "define.h" +#include "wifi_dumper.h" DEFINE_WIFILOG_P2P_LABEL("WifiP2pServiceImpl"); @@ -624,6 +626,7 @@ ErrCode WifiP2pServiceImpl::SetP2pDeviceName(const std::string &deviceName) } return pService->SetP2pDeviceName(deviceName); } + ErrCode WifiP2pServiceImpl::SetP2pWfdInfo(const WifiP2pWfdInfo &wfdInfo) { WIFI_LOGI("SetP2pWfdInfo"); @@ -638,5 +641,31 @@ ErrCode WifiP2pServiceImpl::SetP2pWfdInfo(const WifiP2pWfdInfo &wfdInfo) } return pService->SetP2pWfdInfo(wfdInfo); } + +void WifiP2pServiceImpl::SaBasicDump(std::string& result) +{ + result.append("P2P enable status: "); + int status = WifiConfigCenter::GetInstance().GetP2pState(); + std::string strStatus = (status == static_cast(P2pState::P2P_STATE_STARTED)) ? "enable" : "disable"; + result.append(strStatus); + result += "\n"; +} + +int32_t WifiP2pServiceImpl::Dump(int32_t fd, const std::vector& args) +{ + std::vector vecArgs; + std::transform(args.begin(), args.end(), std::back_inserter(vecArgs), [](const std::u16string &arg) { + return Str16ToStr8(arg); + }); + + WifiDumper dumper; + std::string result; + dumper.P2pDump(SaBasicDump, vecArgs, result); + if (!SaveStringToFd(fd, result)) { + WIFI_LOGE("WiFi P2p save string to fd failed."); + return ERR_OK; + } + return ERR_OK; +} } // namespace Wifi } // namespace OHOS \ No newline at end of file diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.h index 598b968..525d87b 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.h @@ -254,10 +254,20 @@ public: */ ErrCode SetP2pWfdInfo(const WifiP2pWfdInfo &wfdInfo) override; + /** + * @Description dump p2p information + * + * @param fd - file descriptor + * @param args - dump arguments + * @return ErrCode - operate result + */ + int32_t Dump(int32_t fd, const std::vector& args) override; + private: bool Init(); ErrCode CheckCanEnableP2p(void); bool IsP2pServiceRunning(); + static void SaBasicDump(std::string& result); private: static sptr instance; diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_service_impl.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_service_impl.cpp index a18ceba..038ebf4 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_service_impl.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_service_impl.cpp @@ -14,6 +14,7 @@ */ #include "wifi_scan_service_impl.h" +#include #include "wifi_msg.h" #include "permission_def.h" #include "wifi_permission_utils.h" @@ -26,6 +27,7 @@ #include "wifi_logger.h" #include "define.h" #include "wifi_scan_callback_proxy.h" +#include "wifi_dumper.h" DEFINE_WIFILOG_SCAN_LABEL("WifiScanServiceImpl"); namespace OHOS { @@ -205,5 +207,31 @@ bool WifiScanServiceImpl::IsScanServiceRunning() } return true; } + +void WifiScanServiceImpl::SaBasicDump(std::string& result) +{ + WifiScanServiceImpl impl; + bool isRunning = impl.IsScanServiceRunning(); + result.append("Is scan service running: "); + std::string strRunning = isRunning ? "true" : "false"; + result += strRunning + "\n"; +} + +int32_t WifiScanServiceImpl::Dump(int32_t fd, const std::vector& args) +{ + std::vector vecArgs; + std::transform(args.begin(), args.end(), std::back_inserter(vecArgs), [](const std::u16string &arg) { + return Str16ToStr8(arg); + }); + + WifiDumper dumper; + std::string result; + dumper.ScanDump(SaBasicDump, vecArgs, result); + if (!SaveStringToFd(fd, result)) { + WIFI_LOGE("WiFi scan save string to fd failed."); + return ERR_OK; + } + return ERR_OK; +} } // namespace Wifi } // namespace OHOS \ No newline at end of file diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_service_impl.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_service_impl.h index 590c667..b46ecf9 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_service_impl.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_service_impl.h @@ -45,10 +45,12 @@ public: ErrCode GetScanInfoList(std::vector &result) override; ErrCode RegisterCallBack(const sptr &callback) override; ErrCode GetSupportedFeatures(long &features) override; + int32_t Dump(int32_t fd, const std::vector& args) override; private: bool Init(); bool IsScanServiceRunning(); + static void SaBasicDump(std::string& result); private: static sptr g_instance; diff --git a/utils/inc/wifi_common_util.h b/utils/inc/wifi_common_util.h new file mode 100755 index 0000000..c141c32 --- /dev/null +++ b/utils/inc/wifi_common_util.h @@ -0,0 +1,90 @@ +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OHOS_WIFI_COMMON_UTIL_H +#define OHOS_WIFI_COMMON_UTIL_H + +#include +#include "securec.h" + +#ifndef WIFI_MAC_LEN +#define WIFI_MAC_LEN 6 +#endif + +namespace OHOS { +namespace Wifi { +/** + * @Description MAC address anonymization + * + *

eg: a2:7c:b0:98:e3:92 -> a2:7c:**:**:**:92 + * + * @param str - Input MAC address + * @return std::string - Processed MAC + */ +std::string MacAnonymize(const std::string str); + +/** + * @Description MAC address anonymization + * + *

eg: 192.168.0.1 -> 192.***.*.1 + * + * @param str - Input MAC address + * @return std::string - Processed MAC + */ +std::string IpAnonymize(const std::string str); + +/** + * @Description Converting string MAC to a C-style MAC address + * + * @param strMac - Input MAC address + * @param mac - conversion result + * @return errno_t - EOK for success, failure for other values. + */ +errno_t MacStrToArray(const std::string& strMac, unsigned char mac[WIFI_MAC_LEN]); + +/** + * @Description Converting C-style MAC to a string MAC + * + * @param mac - Input MAC address + * @return string - conversion result. + */ +std::string MacArrayToStr(const unsigned char mac[WIFI_MAC_LEN]); + +/** + * @Description Check whether the array of MAC address is empty + * + * @param mac - Input MAC address + * @return bool - true: empty, false: not empty + */ +bool IsMacArrayEmpty(const unsigned char mac[WIFI_MAC_LEN]); + +/** + * @Description Converting a string IP Address to an integer IP address + * + * @param strIp - Input string IP address + * @return int - integer IP address + */ +int Ip2Number(const std::string& strIp); + +/** + * @Description Converting an integer IP address to a string IP Address + * + * @param intIp - Input integer IP address + * @return string - string IP address + */ +std::string Number2Ip(int intIp); +} // namespace Wifi +} // namespace OHOS +#endif \ No newline at end of file diff --git a/utils/src/BUILD.gn b/utils/src/BUILD.gn new file mode 100755 index 0000000..fa472cc --- /dev/null +++ b/utils/src/BUILD.gn @@ -0,0 +1,38 @@ +# Copyright (C) 2021 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import("//build/ohos.gni") + +ohos_shared_library("wifi_utils") { + install_enable = true + include_dirs = [ + "//foundation/communication/wifi/utils/inc", + "//utils/native/base/include", + ] + + sources = [ "wifi_common_util.cpp" ] + deps = [ "//utils/native/base:utils" ] + + cflags_cc = [ + "-std=c++17", + "-fno-rtti", + ] + + ldflags = [ + "-fPIC", + "-Wl,-E", + ] + + part_name = "wifi_standard" + subsystem_name = "communication" +} diff --git a/utils/src/wifi_common_util.cpp b/utils/src/wifi_common_util.cpp new file mode 100755 index 0000000..6177f72 --- /dev/null +++ b/utils/src/wifi_common_util.cpp @@ -0,0 +1,168 @@ +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "wifi_common_util.h" +#include + +namespace OHOS { +namespace Wifi { +static std::string DataAnonymize(const std::string str, const char delim, + const char hiddenCh, const int startIdx = 0) +{ + std::string s = str; + constexpr auto minDelimSize = 2; + constexpr auto minKeepSize = 6; + if (std::count(s.begin(), s.end(), delim) < minDelimSize) { + if (s.size() <= minKeepSize) { + return std::string(s.size(), hiddenCh); + } + auto idx1 = 2; + const auto idx2 = s.size() - 4; + while (idx1++ < idx2) { + s[idx1] = hiddenCh; + } + return s; + } + + std::string::size_type begin = s.find_first_of(delim); + std::string::size_type end = s.find_last_of(delim); + int idx = 0; + while (idx++ < startIdx && begin < end) { + begin = s.find_first_of(delim, begin + 1); + } + while (begin++ != end) { + if (s[begin] != delim) { + s[begin] = hiddenCh; + } + } + return s; +} + +std::string MacAnonymize(const std::string str) +{ + return DataAnonymize(str, ':', '*', 1); +} + +std::string IpAnonymize(const std::string str) +{ + return DataAnonymize(str, '.', '*'); +} + +static unsigned char ConvertStrChar(char ch) +{ + constexpr int numDiffForHexAlphabet = 10; + if (ch >= '0' && ch <= '9') { + return (ch - '0'); + } + if (ch >= 'A' && ch <= 'F') { + return (ch - 'A' + numDiffForHexAlphabet); + } + if (ch >= 'a' && ch <= 'f') { + return (ch - 'a' + numDiffForHexAlphabet); + } + return 0; +} + +errno_t MacStrToArray(const std::string& strMac, unsigned char mac[WIFI_MAC_LEN]) +{ + constexpr int strMacLen = 18; + char tempArray[strMacLen] = { 0 }; + errno_t ret = memcpy_s(tempArray, strMacLen, strMac.c_str(), strMac.size() + 1); + if (ret != EOK) { + return ret; + } + + int idx = 0; + constexpr int bitWidth = 4; + char *ptr = nullptr; + char *p = strtok_s(tempArray, ":", &ptr); + while (p != nullptr) { + mac[idx++] = (ConvertStrChar(*p) << bitWidth) | ConvertStrChar(*(p + 1)); + p = strtok_s(nullptr, ":", &ptr); + } + return EOK; +} + +static char ConvertArrayChar(unsigned char ch) +{ + constexpr int maxDecNum = 9; + constexpr int numDiffForHexAlphabet = 10; + if (ch >= 0 && ch <= maxDecNum) { + return '0' + ch; + } + if (ch >= 0xa && ch <= 0xf) { + return ch + 'a' - numDiffForHexAlphabet; + } + return '0'; +} + +std::string MacArrayToStr(const unsigned char mac[WIFI_MAC_LEN]) +{ + constexpr int bitWidth = 4; + constexpr int noColonBit = 5; + std::stringstream ss; + for (int i = 0; i != WIFI_MAC_LEN; ++i) { + ss << ConvertArrayChar(mac[i] >> bitWidth) << ConvertArrayChar(mac[i] & 0xf); + if (i != noColonBit) { + ss << ":"; + } + } + return ss.str(); +} + +bool IsMacArrayEmpty(const unsigned char mac[WIFI_MAC_LEN]) +{ + for (int i = 0; i != WIFI_MAC_LEN; ++i) { + if (mac[i] != 0) { + return false; + } + } + return true; +} + +int Ip2Number(const std::string& strIp) +{ + std::string::size_type front = 0; + std::string::size_type back = 0; + int number = 0; + int size = 32; + constexpr int sectionSize = 8; + + std::string ip(strIp + '.'); + while ((back = ip.find_first_of('.', back)) != (std::string::size_type)std::string::npos) { + number |= atoi(ip.substr(front, back - front).c_str()) << (size -= sectionSize); + front = ++back; + } + return number; +} + +std::string Number2Ip(int intIp) +{ + constexpr int fourthPartMoveLen = 24; + constexpr int thirdPartMoveLen = 16; + constexpr int secondPartMoveLen = 8; + + std::string ip; + ip.append(std::to_string(((unsigned int)intIp & 0xff000000) >> fourthPartMoveLen)); + ip.push_back('.'); + ip.append(std::to_string((intIp & 0x00ff0000) >> thirdPartMoveLen)); + ip.push_back('.'); + ip.append(std::to_string((intIp & 0x0000ff00) >> secondPartMoveLen)); + ip.push_back('.'); + ip.append(std::to_string(intIp & 0x000000ff)); + return ip; +} +} // namespace Wifi +} // namespace OHOS \ No newline at end of file -- Gitee From f92aa0836abc21611cdf6c8da529534ba83374fd Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Mon, 15 Nov 2021 02:03:46 +0000 Subject: [PATCH 010/491] fix(scan): fix scan problems Signed-off-by: zhangfeng --- .../wifi_manage/wifi_scan/scan_common.h | 2 +- .../wifi_manage/wifi_scan/scan_service.cpp | 54 +++++++++---------- .../wifi_manage/wifi_scan/scan_service.h | 22 ++++---- .../wifi_scan/scan_state_machine.cpp | 2 +- .../wifi_scan/scan_service_test.cpp | 2 +- 5 files changed, 41 insertions(+), 41 deletions(-) diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_common.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_common.h index 39cb9f0..c7782e8 100755 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_common.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_common.h @@ -166,7 +166,7 @@ enum ScanStatus { SCAN_FINISHED_STATUS = 1, /* End processing completed */ COMMON_SCAN_SUCCESS = 2, /* Notify the scan result after the common scan is complete */ COMMON_SCAN_FAILED = 3, /* Common scan failure */ - PNO_SCAN_RESULT = 4, /* The PNO scan is complete and the scanning result is notified */ + PNO_SCAN_INFO = 4, /* The PNO scan is complete and the scanning result is notified */ PNO_SCAN_FAILED = 5, /* Failed to start the PNO scanning */ SCAN_INNER_EVENT = 6, /* Report internal events */ SCAN_STATUS_INVALID /* Invalid value */ diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp index 3eadcbe..3713488 100755 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp @@ -136,7 +136,7 @@ void ScanService::HandleScanStatusReport(ScanStatusReport &scanStatusReport) HandleCommonScanFailed(scanStatusReport.requestIndexList); break; } - case PNO_SCAN_RESULT: { + case PNO_SCAN_INFO: { pnoScanFailedNum = 0; HandlePnoScanInfo(scanStatusReport.scanInfoList); break; @@ -474,7 +474,6 @@ void ScanService::HandleCommonScanInfo( { WIFI_LOGI("Enter ScanService::HandleCommonScanInfo.\n"); - bool fullScanInclude = false; bool fullScanStored = false; for (std::vector::iterator reqIter = requestIndexList.begin(); reqIter != requestIndexList.end(); ++reqIter) { ScanConfigMap::iterator configIter = scanConfigMap.find(*reqIter); @@ -485,7 +484,6 @@ void ScanService::HandleCommonScanInfo( /* Full Scan Info */ if (configIter->second.fullScanFlag) { - fullScanInclude = true; if (fullScanStored) { scanConfigMap.erase(*reqIter); continue; @@ -533,8 +531,6 @@ bool ScanService::StoreFullScanInfo( std::vector filterScanInfo; std::vector::const_iterator iter = scanInfoList.begin(); for (; iter != scanInfoList.end(); ++iter) { - char tmpBuf[128] = ""; - EncryptLogMsg(iter->ssid.c_str(), tmpBuf, sizeof(tmpBuf)); WifiScanInfo scanInfo; scanInfo.bssid = iter->bssid; scanInfo.ssid = iter->ssid; @@ -637,10 +633,6 @@ void ScanService::ConvertScanInfos( return; } -/** - * @Description Start PNO scanning - * @return success: true, failed: false - */ bool ScanService::BeginPnoScan() { WIFI_LOGI("Enter ScanService::BeginPnoScan.\n"); @@ -773,8 +765,8 @@ void ScanService::HandlePnoScanInfo(std::vector &scanInfoList) for (; iter != scanInfoList.end(); ++iter) { if ((iter->timestamp / SECOND_TO_MILLI_SECOND) > pnoScanStartTime) { filterScanInfo.push_back(*iter); - WIFI_LOGI("InterScanInfo.bssid is %s.\n", iter->bssid.c_str()); - WIFI_LOGI("InterScanInfo.ssid is %s.\n", iter->ssid.c_str()); + WIFI_LOGI("InterScanInfo.bssid is %{private}s.\n", iter->bssid.c_str()); + WIFI_LOGI("InterScanInfo.ssid is %{public}s.\n", iter->ssid.c_str()); WIFI_LOGI("InterScanInfo.capabilities is %{public}s.\n", iter->capabilities.c_str()); WIFI_LOGI("InterScanInfo.frequency is %{public}d.\n", iter->frequency); WIFI_LOGI("InterScanInfo.rssi is %{public}d.\n", iter->rssi); @@ -846,7 +838,7 @@ void ScanService::HandleCustomStatusChanged(int customScene, int customSceneStat WIFI_LOGI("Enter ScanService::HandleCustomStatusChanged."); time_t now = time(nullptr); - WIFI_LOGD("customScene:%d, status:%d", customScene, customSceneStatus); + WIFI_LOGD("customScene:%{public}d, status:%{public}d", customScene, customSceneStatus); if (customSceneStatus == STATE_OPEN) { customSceneTimeMap.insert(std::pair(customScene, now)); } @@ -1552,7 +1544,7 @@ bool ScanService::AllowExternScanByIntervalMode(int appId, int scanScene, ScanMo "scanScene:%{public}d, scanMode:%{public}d", intervalListIter->scanScene, intervalListIter->scanMode); /* Determine whether control is required in the current scene and scan mode. */ if (intervalListIter->scanScene == scanScene && intervalListIter->scanMode == scanMode) { - /* If a single application is distinguished */ + /* If a single application is distinguished. */ if (intervalListIter->isSingle) { if (!AllowSingleAppScanByInterval(appId, *intervalListIter)) { return false; @@ -1562,7 +1554,6 @@ bool ScanService::AllowExternScanByIntervalMode(int appId, int scanScene, ScanMo return false; } } - break; } } return true; @@ -1662,11 +1653,11 @@ bool ScanService::AllowFullAppScanByInterval(int appId, ScanIntervalMode scanInt return true; } -bool ScanService::PnoScanByInterval(int &fixedScanCount, time_t &fixedScanTime, int &interval, int &count) +bool ScanService::PnoScanByInterval(int &fixedScanCount, time_t &fixedScanTime, int interval, int count) { WIFI_LOGI("Enter ScanService::PnoScanByInterval.\n"); - time_t now = time(0); + time_t now = time(nullptr); /* First scan */ if (fixedScanCount == 0) { fixedScanCount++; @@ -1700,7 +1691,7 @@ bool ScanService::SystemScanByInterval(int &expScanCount, int &interval, int &co return true; } -bool ScanService::ExternScanByInterval(int appID, SingleAppForbid &singleAppForbid) +bool ScanService::ExternScanByInterval(int appId, SingleAppForbid &singleAppForbid) { WIFI_LOGI("Enter ScanService::ExternScanByInterval.\n"); @@ -1723,7 +1714,8 @@ bool ScanService::ExternScanByInterval(int appID, SingleAppForbid &singleAppForb singleAppForbid.scanIntervalMode.count); case IntervalMode::INTERVAL_BLOCKLIST: - return AllowScanByIntervalBlocklist(appID, + WIFI_LOGI("INTERVAL_BLOCKLIST IntervalMode.\n"); + return AllowScanByIntervalBlocklist(appId, singleAppForbid.blockListScanTime, singleAppForbid.lessThanIntervalNum, singleAppForbid.scanIntervalMode.interval, @@ -1779,12 +1771,13 @@ bool ScanService::AllowScanByIntervalExp(int &expScanCount, int &interval, int & } bool ScanService::AllowScanByIntervalContinue( - time_t &continueScanTime, int &lessThanIntervalNum, int &interval, int &count) + time_t &continueScanTime, int &lessThanIntervalCount, int &interval, int &count) { WIFI_LOGI("Enter ScanService::AllowScanByIntervalContinue.\n"); - WIFI_LOGD("lessThanIntervalNum:%d, interval:%d, count:%d", lessThanIntervalNum, interval, count); - time_t now = time(0); + WIFI_LOGD("lessThanIntervalCount:%{public}d, interval:%{public}d, count:%{public}d", + lessThanIntervalCount, interval, count); + time_t now = time(nullptr); /* First scan */ if (continueScanTime == 0) { continueScanTime = now; @@ -1792,27 +1785,27 @@ bool ScanService::AllowScanByIntervalContinue( } /* If count is less than interval, the subsequent interval must be greater than interval. */ if (now - continueScanTime < interval) { - lessThanIntervalNum++; - if (lessThanIntervalNum < count) { + lessThanIntervalCount++; + if (lessThanIntervalCount < count) { continueScanTime = now; return true; } /* If the scanning interval is not exceeded continuously, the counter is cleared. */ - lessThanIntervalNum = 0; + lessThanIntervalCount = 0; return false; } /* If the scanning interval is not exceeded continuously, the counter is cleared. */ - lessThanIntervalNum = 0; + lessThanIntervalCount = 0; continueScanTime = now; return true; } bool ScanService::AllowScanByIntervalBlocklist( - int appId, time_t &blockListScanTime, int &lessThanIntervalNum, int &interval, int &count) + int appId, time_t &blockListScanTime, int &lessThanIntervalCount, int &interval, int &count) { WIFI_LOGI("Enter ScanService::AllowScanByIntervalBlocklist.\n"); - time_t now = time(0); + time_t now = time(nullptr); if (now - blockListScanTime >= interval) { for (auto iter = scanBlocklist.begin(); iter != scanBlocklist.end();) { if (*iter == appId) { @@ -1832,6 +1825,7 @@ bool ScanService::AllowScanByIntervalBlocklist( /* First scan */ if (blockListScanTime == 0) { blockListScanTime = now; + WIFI_LOGD("blockListScanTime, first scan."); return true; } /** @@ -1839,9 +1833,10 @@ bool ScanService::AllowScanByIntervalBlocklist( * the user is added to the blocklist and cannot be scanned. */ if (now - blockListScanTime < interval) { - lessThanIntervalNum++; - if (lessThanIntervalNum < count) { + lessThanIntervalCount++; + if (lessThanIntervalCount < count) { blockListScanTime = now; + WIFI_LOGD("blockListScanTime, lessThanIntervalCount(%{public}d),return true.", lessThanIntervalCount); return true; } /** @@ -1849,6 +1844,7 @@ bool ScanService::AllowScanByIntervalBlocklist( * is greater than count, the user is blocklisted forbidding scanning. */ scanBlocklist.push_back(appId); + WIFI_LOGD("scanBlocklist.push_back(appId), return false."); return false; } blockListScanTime = now; diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.h index 04c2d04..046c0d8 100755 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.h @@ -86,6 +86,10 @@ public: * @return success: true, failed: false */ bool SingleScan(ScanConfig &scanConfig); + /** + * @Description Start PNO scanning + * @return success: true, failed: false + */ bool BeginPnoScan(); /** * @Description Start PNO scanning @@ -509,16 +513,16 @@ private: * @return true - success * @return false - failed */ - bool PnoScanByInterval(int &fixedScanCount, time_t &fixedScanTime, int &interval, int &count); + bool PnoScanByInterval(int &fixedScanCount, time_t &fixedScanTime, int interval, int count); /** - * @Description + * @Description Determines whether to allow extern scan based on scanInterval control mode. * - * @param appID Determines whether to allow extern scan based on scanInterval control mode. + * @param appId ID of the app to be scanned[in] * @param singleAppForbid Stored External Scan Parameters[in] * @return true * @return false */ - bool ExternScanByInterval(int appID, SingleAppForbid &singleAppForbid); + bool ExternScanByInterval(int appId, SingleAppForbid &singleAppForbid); /** * @Description Determine whether external scanning of a single application can be distinguished. * @@ -532,7 +536,7 @@ private: * @Description Check whether external scanning is allowed regardless of a single application. * * @param appId ID of the app to be scanned[in] - * @param scanIntervalMode scan control policy parameters[in] + * @param scanIntervalMode intervalMode scan control policy parameters[in] * @return true * @return false */ @@ -562,26 +566,26 @@ private: * @Description Determines whether external scanning is allowed in scanning control in INTERVAL_CONTINUE mode. * * @param continueScanTime INTERVAL_CONTINUE intervalMode scan time[in] - * @param lessThanIntervalNum INTERVAL_CONTINUE intervalMode scan count[in] + * @param lessThanIntervalCount INTERVAL_CONTINUE intervalMode scan count[in] * @param interval scan interval[in] * @param count scan count[in] * @return true * @return false */ - bool AllowScanByIntervalContinue(time_t &continueScanTime, int &lessThanIntervalNum, int &interval, int &count); + bool AllowScanByIntervalContinue(time_t &continueScanTime, int &lessThanIntervalCount, int &interval, int &count); /** * @Description Determines whether external scanning is allowed in scanning control in INTERVAL_BLOCKLIST mode. * * @param appId ID of the app to be scanned[in] * @param blockListScanTime INTERVAL_BLOCKLIST intervalMode scan time[in] - * @param lessThanIntervalNum INTERVAL_BLOCKLIST intervalMode scan count[in] + * @param lessThanIntervalCount INTERVAL_BLOCKLIST intervalMode scan count[in] * @param interval scan interval[in] * @param count scan count[in] * @return true * @return false */ bool AllowScanByIntervalBlocklist( - int appId, time_t &blockListScanTime, int &lessThanIntervalNum, int &interval, int &count); + int appId, time_t &blockListScanTime, int &lessThanIntervalCount, int &interval, int &count); }; } // namespace Wifi } // namespace OHOS diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine.cpp index 776a5b7..135e4b2 100755 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine.cpp @@ -1440,7 +1440,7 @@ void ScanStateMachine::ReportPnoScanInfos(std::vector &scanInfos) WIFI_LOGI("Enter ScanStateMachine::ReportPnoScanInfos.\n"); ScanStatusReport scanStatusReport; - scanStatusReport.status = PNO_SCAN_RESULT; + scanStatusReport.status = PNO_SCAN_INFO; scanStatusReport.scanInfoList.assign(scanInfos.begin(), scanInfos.end()); if (scanStatusReportHandler) { scanStatusReportHandler(scanStatusReport); diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service_test.cpp b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service_test.cpp index 3914ad4..1a6f8e1 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service_test.cpp +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service_test.cpp @@ -131,7 +131,7 @@ public: { EXPECT_CALL(WifiManager::GetInstance(), DealScanInfoNotify(_)).Times(AtLeast(1)); ScanStatusReport scanStatusReport; - scanStatusReport.status = PNO_SCAN_RESULT; + scanStatusReport.status = PNO_SCAN_INFO; pScanService->HandleScanStatusReport(scanStatusReport); } -- Gitee From 2a6e0830e33536667d036a541c1765e46912c621 Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Tue, 16 Nov 2021 12:20:52 +0000 Subject: [PATCH 011/491] fix(js): modify js module name Signed-off-by: zhangfeng --- README.md | 25 +++++------ README_zh.md | 25 +++++------ interfaces/innerkits/native_cpp/napi/BUILD.gn | 42 +++++++++++++++++-- .../native_cpp/napi/wifi_napi_entry.cpp | 35 ++++++++++++++++ ohos.build | 3 +- 5 files changed, 102 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index 80a0b79..cd3a4f9 100755 --- a/README.md +++ b/README.md @@ -40,11 +40,12 @@ The WLAN module provides basic WLAN functions, peer-to-peer \(P2P\) connection, ### Available APIs -The following table describes JavaScript APIs in **@ohos.wifi\_native\_js** available for basic WLAN functions. +The following table describes JavaScript APIs in **@ohos.wifi** available for basic WLAN functions. **Table 1** Major JavaScript APIs available for basic WLAN functions +

API

Description

@@ -132,16 +133,16 @@ The following table describes JavaScript APIs in **@ohos.wifi\_native\_js** av Before invoking WLAN JavaScript APIs, you need to import the **@ohos.wifi\_native\_js** class. -``` -import wifi_native_js from '@ohos.wifi_native_js'; // Import the @ohos.wifi_native_js class. +```js +import wf from '@ohos.wifi'; // Import the @ohos.wifi class. ``` - Obtaining the WLAN state 1. Call the **isWifiActive​\(\)** method to check whether WLAN is enabled. - ``` - var isWifiActive = wifi_native_js.isWifiActive(); // Value true indicates that WLAN is enabled, and false indicates the opposite. + ```js + var isWifiActive = wf.isWifiActive(); // Value true indicates that WLAN is enabled, and false indicates the opposite. ``` @@ -150,14 +151,14 @@ import wifi_native_js from '@ohos.wifi_native_js'; // Import the @ohos.wifi_nati 1. Call the **scan​\(\)** method to start a scan. 2. Call the **getScanInfoList​\(\)** method to obtain the scan result. - ``` + ```js // Start a scan. - var isScanSuccess = wifi_native_js.scan(); // true + var isScanSuccess = wf.scan(); // true // Wait for some time. // Obtain the scan result. - wifi_native_js.getScanInfos(result => { + wf.getScanInfos(result => { var num = Object.keys(result).length; console.info("wifi scan result mum: " + num); for (var i = 0; i < num; ++i) { @@ -177,7 +178,7 @@ Set up a WLAN connection. 1. Call **addDeviceConfig** to add a hotspot configuration, and set up a WLAN based on the hotspot configuration ID or by calling **connectToDevice** with the hotspot configuration passed. - ``` + ```js // Configure WLAN information. var config = { "ssid":"test_wifi", @@ -188,14 +189,14 @@ Set up a WLAN connection. } Method 1: // Add a hotspot configuration. - wifi_native_js.addDeviceConfig(config, (result) => { + wf.addDeviceConfig(config, (result) => { console.info("config id: " + result); // Set up a WLAN based on the hotspot configuration ID. - wifi_native_js.connectToNetwork(result); + wf.connectToNetwork(result); }); Method 2: // Set up a WLAN by calling connectToDevice with the hotspot configuration passed. - wifi_native_js.connectToDevice(config); + wf.connectToDevice(config); ``` diff --git a/README_zh.md b/README_zh.md index 4fb9399..c8fe47c 100755 --- a/README_zh.md +++ b/README_zh.md @@ -40,11 +40,12 @@ WLAN组件子系统为用户提供WLAN基础功能、P2P（peer-to-peer）功能 ### 接口说明 -WLAN基础功能由@ohos.wifi\_native\_js类提供，其接口\(JS接口\)说明如下。 +WLAN基础功能由@ohos.wifi类提供，其接口\(JS接口\)说明如下。 **表 1** WLAN基础功能的主要接口\(JS接口\) + - @@ -134,7 +134,7 @@ WLAN基础功能由@ohos.wifi类提供，其接口\(JS接口\)说明如下。 ### 使用说明 -在调用WLAN JS接口前需要导入接口类。 +在使用WLAN JS接口前需导入接口类@ohos.wifi。 ```js import wf from '@ohos.wifi'; // 导入js接口类 @@ -145,7 +145,7 @@ import wf from '@ohos.wifi'; // 导入js接口类 1. 调用isWifiActive​\(\)接口查询WLAN是否打开。 ```js - var isWifiActive = wf.isWifiActive(); // 若WLAN打开，则返回true，否则返回false + var isWifiActive = wf.isWifiActive(); // 若WLAN打开，返回true，否则false ``` @@ -157,10 +157,9 @@ import wf from '@ohos.wifi'; // 导入js接口类 ```js // 调用WLAN扫描接口 var isScanSuccess = wf.scan(); // true - - // 延迟一定时间 - + // 延迟一段时间 // 获取扫描结果 + wf.getScanInfos((err, result) => { if (err) { console.error("get scan info error"); -- Gitee From 537b680da7cf7e548b9cfba168690f72ac2d2c8e Mon Sep 17 00:00:00 2001 From: lixiangzhi007 Date: Thu, 9 Jun 2022 00:41:28 -0700 Subject: [PATCH 163/491] Modify README Signed-off-by: lixiangzhi007 --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) mode change 100644 => 100755 README.md diff --git a/README.md b/README.md old mode 100644 new mode 100755 index 0f6c0e9..effaf10 --- a/README.md +++ b/README.md @@ -142,17 +142,17 @@ import wf from '@ohos.wifi'; // Import the @ohos.wifi class. - Obtaining the WLAN state -1. Call the **isWifiActive​\(\)** method to check whether WLAN is enabled. +1. Call the **isWifiActive​\(\)** method to check whether the WLAN is active. ```js var isWifiActive = wf.isWifiActive(); // Value true indicates that WLAN is enabled, and false indicates the opposite. ``` -- Starting a scan and obtaining the scan result +- Starting a scan and obtaining the scan results. 1. Call the **scan​\(\)** method to start a scan. -2. Call the **getScanInfoList​\(\)** method to obtain the scan result. +2. Call the **getScanInfoList​\(\)** method to obtain the scan results. ```js // Start a scan. @@ -160,7 +160,7 @@ import wf from '@ohos.wifi'; // Import the @ohos.wifi class. // Wait for some time. - // Obtain the scan result. + // Obtain the scan results. wf.getScanInfos((err, result) => { if (err) { console.error("get scan info error"); @@ -184,7 +184,7 @@ import wf from '@ohos.wifi'; // Import the @ohos.wifi class. Set up a WLAN connection. -1. Call **addDeviceConfig** to add a hotspot configuration, and set up a WLAN based on the hotspot configuration ID or by calling **connectToDevice** with the hotspot configuration passed. +1. To set up a WLAN, you can call **addDeviceConfig** to add a hotspot configuration first, and then use the returned hotspot configuration ID to coonect to a WLAN. Or you can set up a WLAN by calling **connectToDevice** through the hotspot configuration directly. ```js // Configure WLAN information. @@ -204,12 +204,12 @@ Set up a WLAN connection. return; } console.info("config id: " + result); - // Set up a WLAN based on the hotspot configuration ID. + // Set up a WLAN based on the returned hotspot configuration ID. wf.connectToNetwork(result); }); Method 2: - // Set up a WLAN by calling connectToDevice with the hotspot configuration passed. + // Set up a WLAN by calling connectToDevice with the hotspot configuration directly. wf.connectToDevice(config); ``` -- Gitee From 63064422751e5a21ecd6d59b154ce083a60a3771 Mon Sep 17 00:00:00 2001 From: zhuwenchao Date: Thu, 9 Jun 2022 13:44:29 +0100 Subject: [PATCH 164/491] refact netsys and wifi Signed-off-by: zhuwenchao --- .../wifi_framework/wifi_manage/BUILD.gn | 5 ++++- .../wifi_manage/wifi_net_agent.cpp | 22 ++++++++++++++----- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn index 0315886..a92c810 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn @@ -178,7 +178,8 @@ if (defined(ohos_lite)) { "$WIFI_ROOT_DIR/utils/inc", "//foundation/appexecfwk/adapter/interfaces/innerkits/appexecfwk_base/include", "//base/security/access_token/interfaces/innerkits/accesstoken/include", - "//foundation/communication/netmanager_base/services/netmanagernative/include/netsys", + "//foundation/communication/netmanager_base/frameworks/native/netmanagernative", + "//foundation/communication/netmanager_base/interfaces/innerkits/netmanagernative/include", ] } @@ -342,6 +343,8 @@ if (defined(ohos_lite)) { "eventhandler:libeventhandler", "ipc:ipc_core", "netmanager_base:net_conn_manager_if", + "safwk:system_ability_fwk", + "samgr_standard:samgr_proxy", ] defines = [ "FEATURE_AP_SUPPORT", diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_net_agent.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_net_agent.cpp index 9f3fff5..845f9ce 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_net_agent.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_net_agent.cpp @@ -16,9 +16,10 @@ #include "wifi_net_agent.h" #include #include "inet_addr.h" +#include "iservice_registry.h" +#include "netsys_native_service_proxy.h" #include "net_conn_client.h" -#include "net_manager_native.h" -#include "route_controller.h" +#include "system_ability_definition.h" #include "wifi_common_util.h" #include "wifi_logger.h" @@ -159,14 +160,25 @@ bool WifiNetAgent::AddRoute(const std::string interface, const std::string ipAdd unsigned int maskInt = IpTools::ConvertIpv4Address(mask); std::string strLocalRoute = IpTools::ConvertIpv4Address(ipInt & maskInt); std::string destAddress = strLocalRoute + "/" + std::to_string(prefixLength); - std::unique_ptr netdService = std::make_unique(); - if (netdService == nullptr) { + + auto samgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); + if (samgr == nullptr) { + LOGE("GetSystemAbilityManager failed!"); + return false; + } + auto remote = samgr->GetSystemAbility(COMM_NETSYS_NATIVE_SYS_ABILITY_ID); + if (remote == nullptr) { + LOGE("GetSystemAbility failed!"); + return false; + } + OHOS::sptr netsysService = iface_cast(remote); + if (netsysService == nullptr) { LOGE("NetdService is nullptr!"); return false; } LOGI("Add route, interface: %{public}s, destAddress: %{public}s, ipAddress: %{public}s, prefixLength: %{public}d", interface.c_str(), IpAnonymize(destAddress).c_str(), IpAnonymize(ipAddress).c_str(), prefixLength); - netdService->NetworkAddRoute(OHOS::nmd::LOCAL_NETWORK_NETID, interface, destAddress, ipAddress); + netsysService->NetworkAddRoute(OHOS::nmd::LOCAL_NETWORK_NETID, interface, destAddress, ipAddress); return true; } -- Gitee From a7ae7682a558c68a58623f7ae9aedcd469ecb01a Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Sun, 12 Jun 2022 22:28:34 +0800 Subject: [PATCH 165/491] bugfix from master 0611 Signed-off-by: yanxiaotao --- wifi/frameworks/js/napi/inc/wifi_napi_p2p.h | 25 ++++++ .../js/napi/src/wifi_napi_entry.cpp | 2 + wifi/frameworks/js/napi/src/wifi_napi_p2p.cpp | 78 +++++++++++++++++++ .../native/c_adapter/src/wifi_c_p2p.cpp | 12 +++ wifi/frameworks/native/include/wifi_p2p.h | 8 ++ wifi/frameworks/native/interfaces/define.h | 1 + .../frameworks/native/interfaces/i_wifi_p2p.h | 7 ++ wifi/frameworks/native/src/wifi_p2p_impl.cpp | 6 ++ wifi/frameworks/native/src/wifi_p2p_impl.h | 8 ++ wifi/frameworks/native/src/wifi_p2p_proxy.cpp | 36 ++++++++- .../wifi_manage/wifi_p2p/ip2p_service.h | 7 ++ .../wifi_manage/wifi_p2p_service_impl.cpp | 32 ++++++++ .../wifi_manage/wifi_p2p_service_impl.h | 8 ++ .../wifi_manage/wifi_p2p_stub.cpp | 14 ++++ 14 files changed, 242 insertions(+), 2 deletions(-) diff --git a/wifi/frameworks/js/napi/inc/wifi_napi_p2p.h b/wifi/frameworks/js/napi/inc/wifi_napi_p2p.h index d030feb..7e7da70 100644 --- a/wifi/frameworks/js/napi/inc/wifi_napi_p2p.h +++ b/wifi/frameworks/js/napi/inc/wifi_napi_p2p.h @@ -33,6 +33,18 @@ napi_value StopDiscoverDevices(napi_env env, napi_callback_info info); napi_value DeletePersistentGroup(napi_env env, napi_callback_info info); napi_value SetDeviceName(napi_env env, napi_callback_info info); +class P2pLocalDeviceAsyncContext : public AsyncContext { +public: + WifiP2pDevice deviceInfo; + + P2pLocalDeviceAsyncContext(napi_env env, napi_async_work work = nullptr, napi_deferred deferred = nullptr) + : AsyncContext(env, work, deferred) {} + + P2pLocalDeviceAsyncContext() = delete; + + ~P2pLocalDeviceAsyncContext() override {} +}; + class QueryP2pDeviceAsyncContext : public AsyncContext { public: std::vector vecP2pDevices; @@ -68,6 +80,19 @@ public: ~P2pGroupInfoAsyncContext() override {} }; + +class P2pGroupInfoListAsyncContext : public AsyncContext { +public: + std::vector vecGroupInfoList; + + P2pGroupInfoListAsyncContext(napi_env env, napi_async_work work = nullptr, + napi_deferred deferred = nullptr) + : AsyncContext(env, work, deferred) {} + + P2pGroupInfoListAsyncContext() = delete; + + ~P2pGroupInfoListAsyncContext() override {} +}; } // namespace Wifi } // namespace OHOS diff --git a/wifi/frameworks/js/napi/src/wifi_napi_entry.cpp b/wifi/frameworks/js/napi/src/wifi_napi_entry.cpp index c2c8249..bbb36c3 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_entry.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_entry.cpp @@ -63,6 +63,7 @@ static napi_value Init(napi_env env, napi_value exports) { DECLARE_NAPI_FUNCTION("getP2pLinkedInfo", GetP2pLinkedInfo), DECLARE_NAPI_FUNCTION("getCurrentGroup", GetCurrentGroup), DECLARE_NAPI_FUNCTION("getP2pPeerDevices", GetP2pDevices), + DECLARE_NAPI_FUNCTION("getP2pLocalDeviceInfo", getP2pLocalDeviceInfo), DECLARE_NAPI_FUNCTION("createGroup", CreateGroup), DECLARE_NAPI_FUNCTION("removeGroup", RemoveGroup), DECLARE_NAPI_FUNCTION("p2pConnect", P2pConnect), @@ -70,6 +71,7 @@ static napi_value Init(napi_env env, napi_value exports) { DECLARE_NAPI_FUNCTION("startDiscoverDevices", StartDiscoverDevices), DECLARE_NAPI_FUNCTION("stopDiscoverDevices", StopDiscoverDevices), DECLARE_NAPI_FUNCTION("deletePersistentGroup", DeletePersistentGroup), + DECLARE_NAPI_FUNCTION("GetP2pGroups", GetP2pGroups), DECLARE_NAPI_FUNCTION("setDeviceName", SetDeviceName), DECLARE_NAPI_FUNCTION("on", On), DECLARE_NAPI_FUNCTION("off", Off), diff --git a/wifi/frameworks/js/napi/src/wifi_napi_p2p.cpp b/wifi/frameworks/js/napi/src/wifi_napi_p2p.cpp index 1ea02f1..91fc1be 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_p2p.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_p2p.cpp @@ -84,6 +84,23 @@ static ErrCode GroupInfosToJs(const napi_env& env, WifiP2pGroupInfo& groupInfo, return WIFI_OPT_SUCCESS; } +static ErrCode GroupsToJsArray(const napi_env& env, + const std::vector& vecGroups, napi_value& arrayResult) +{ + uint32_t idx = 0; + for (auto& each : vecGroups) { + napi_value eachObj; + napi_create_object(env, &eachObj); + GroupInfosToJs(env, each, eachObj); + napi_status status = napi_set_element(env, arrayResult, idx++, eachObj); + if (status != napi_ok) { + WIFI_LOGE("wifi napi set element error: %{public}d, idx: %{public}d", status, idx - 1); + return WIFI_OPT_FAILED; + } + } + return WIFI_OPT_SUCCESS; +} + napi_value GetCurrentGroup(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; @@ -114,6 +131,37 @@ napi_value GetCurrentGroup(napi_env env, napi_callback_info info) return DoAsyncWork(env, asyncContext, argc, argv, nonCallbackArgNum); } +napi_value GetP2pGroups(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + size_t argc = 1; + napi_value argv[argc]; + napi_value thisVar = nullptr; + void *data = nullptr; + NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data)); + + P2pGroupInfoListAsyncContext *asyncContext = new P2pGroupInfoListAsyncContext(env); + NAPI_ASSERT(env, asyncContext != nullptr, "asyncContext is null."); + napi_create_string_latin1(env, "GetP2pGroups", NAPI_AUTO_LENGTH, &asyncContext->resourceName); + + asyncContext->executeFunc = [&](void* data) -> void { + P2pGroupInfoListAsyncContext *context = static_cast(data); + TRACE_FUNC_CALL_NAME("wifiP2pPtr->QueryP2pGroups"); + context->errorCode = wifiP2pPtr->QueryP2pGroups(context->vecGroupInfoList); + }; + + asyncContext->completeFunc = [&](void* data) -> void { + P2pGroupInfoListAsyncContext *context = static_cast(data); + napi_create_object(context->env, &context->result); + context->errorCode = GroupsToJsArray(context->env, context->vecGroupInfoList, context->result); + WIFI_LOGI("Push get group info list to client"); + }; + + size_t nonCallbackArgNum = 0; + return DoAsyncWork(env, asyncContext, argc, argv, nonCallbackArgNum); +} + + napi_value DeletePersistentGroup(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; @@ -189,6 +237,36 @@ napi_value GetP2pDevices(napi_env env, napi_callback_info info) return DoAsyncWork(env, asyncContext, argc, argv, nonCallbackArgNum); } +napi_value GetP2pLocalDevice(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + size_t argc = 1; + napi_value argv[argc]; + napi_value thisVar = nullptr; + void *data = nullptr; + NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data)); + + P2pLocalDeviceAsyncContext *asyncContext = new P2pLocalDeviceAsyncContext(env); + NAPI_ASSERT(env, asyncContext != nullptr, "asyncContext is null."); + napi_create_string_latin1(env, "GetP2pLocalDevice", NAPI_AUTO_LENGTH, &asyncContext->resourceName); + + asyncContext->executeFunc = [&](void* data) -> void { + P2pLocalDeviceAsyncContext *context = static_cast(data); + TRACE_FUNC_CALL_NAME("wifiP2pPtr->QueryP2pLocalDevice"); + context->errorCode = wifiP2pPtr->QueryP2pLocalDevice(context->deviceInfo); + }; + + asyncContext->completeFunc = [&](void* data) -> void { + P2pLocalDeviceAsyncContext *context = static_cast(data); + napi_create_object(context->env, &context->result); + context->errorCode = DeviceInfoToJs(context->env, context->deviceInfo, context->result); + WIFI_LOGI("Push get p2p local device result to client"); + }; + + size_t nonCallbackArgNum = 0; + return DoAsyncWork(env, asyncContext, argc, argv, nonCallbackArgNum); +} + napi_value SetDeviceName(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; diff --git a/wifi/frameworks/native/c_adapter/src/wifi_c_p2p.cpp b/wifi/frameworks/native/c_adapter/src/wifi_c_p2p.cpp index dc37686..d97eab6 100644 --- a/wifi/frameworks/native/c_adapter/src/wifi_c_p2p.cpp +++ b/wifi/frameworks/native/c_adapter/src/wifi_c_p2p.cpp @@ -279,6 +279,18 @@ WifiErrorCode GetP2pConnectedStatus(int* status) return GetCErrorCode(ret); } +WifiErrorCode QueryP2pLocalDevice(WifiP2pDevice* deviceInfo) +{ + CHECK_PTR_RETURN(wifiP2pPtr, ERROR_WIFI_NOT_AVAILABLE); + CHECK_PTR_RETURN(deviceInfo, ERROR_WIFI_INVALID_ARGS); + OHOS::Wifi::WifiP2pDevice cppDeviceInfo; + OHOS::Wifi::ErrCode ret = wifiP2pPtr->QueryP2pLocalDevice(cppDeviceInfo); + if (ret != OHOS::Wifi::WIFI_OPT_SUCCESS) { + WIFI_LOGE("QueryP2pLocalDevice return failed!"); + } + return GetCErrorCode(ConvertP2PDeviceCppToC(cppDeviceInfo, deviceInfo)); +} + WifiErrorCode QueryP2pDevices(WifiP2pDevice* clientDevices, int size, int* retSize) { CHECK_PTR_RETURN(wifiP2pPtr, ERROR_WIFI_NOT_AVAILABLE); diff --git a/wifi/frameworks/native/include/wifi_p2p.h b/wifi/frameworks/native/include/wifi_p2p.h index af51082..fc989ce 100644 --- a/wifi/frameworks/native/include/wifi_p2p.h +++ b/wifi/frameworks/native/include/wifi_p2p.h @@ -190,6 +190,14 @@ public: */ virtual ErrCode GetP2pConnectedStatus(int &status) = 0; + /** + * @Description Query the local device infor. + * + * @param devives - Get result of WifiP2pDevice + * @return ErrCode - operate result + */ + virtual ErrCode QueryP2pLocalDevice(WifiP2pDevice &device); + /** * @Description Query the information about the found devices. * diff --git a/wifi/frameworks/native/interfaces/define.h b/wifi/frameworks/native/interfaces/define.h index 9172825..0fe783e 100644 --- a/wifi/frameworks/native/interfaces/define.h +++ b/wifi/frameworks/native/interfaces/define.h @@ -116,6 +116,7 @@ #define WIFI_SVR_CMD_GET_5G_CHANNEL_LIST 0x2024 /* get recommended channel */ #define WIFI_SVR_CMD_GET_SELF_WIFI_CFG 0x2025 /* get self wifi configuration */ #define WIFI_SVR_CMD_SET_PEER_WIFI_CFG 0x2026 /* set peer wifi configuration */ +#define WIFI_SVR_CMD_P2P_QUERY_LOCAL_DEVICE 0x2027 /* query the information about the local device */ /* -----------register event type and message define-------------- */ #define WIFI_CBK_CMD_STATE_CHANGE 0x1001 /* STA state change event */ diff --git a/wifi/frameworks/native/interfaces/i_wifi_p2p.h b/wifi/frameworks/native/interfaces/i_wifi_p2p.h index b21b3ed..340060d 100644 --- a/wifi/frameworks/native/interfaces/i_wifi_p2p.h +++ b/wifi/frameworks/native/interfaces/i_wifi_p2p.h @@ -199,6 +199,13 @@ public: */ virtual ErrCode QueryP2pDevices(std::vector &devives) = 0; + /** + * @Description - Query the information about own device. + * @param device - own device + * @return - ErrCode + */ + virtual ErrCode QueryP2pLocalDevice(WifiP2pDevice &device) = 0; + /** * @Description Query the information about the found groups. * diff --git a/wifi/frameworks/native/src/wifi_p2p_impl.cpp b/wifi/frameworks/native/src/wifi_p2p_impl.cpp index 92101d6..ca0c006 100644 --- a/wifi/frameworks/native/src/wifi_p2p_impl.cpp +++ b/wifi/frameworks/native/src/wifi_p2p_impl.cpp @@ -195,6 +195,12 @@ ErrCode WifiP2pImpl::QueryP2pDevices(std::vector &devives) return client_->QueryP2pDevices(devives); } +ErrCode WifiP2pImpl::QueryP2pLocalDevice(WifiP2pDevice &devives) +{ + RETURN_IF_FAIL(client_); + return client_->QueryP2pLocalDevice(devives); +} + ErrCode WifiP2pImpl::QueryP2pGroups(std::vector &groups) { RETURN_IF_FAIL(client_); diff --git a/wifi/frameworks/native/src/wifi_p2p_impl.h b/wifi/frameworks/native/src/wifi_p2p_impl.h index 06acde7..977e5f8 100644 --- a/wifi/frameworks/native/src/wifi_p2p_impl.h +++ b/wifi/frameworks/native/src/wifi_p2p_impl.h @@ -198,6 +198,14 @@ public: */ ErrCode QueryP2pDevices(std::vector &devives) override; + /** + * @Description Query the information about the local device + * + * @param devives - Get result of WifiP2pDevice + * @return ErrCode - operate result + */ + ErrCode QueryP2pLocalDevice(WifiP2pDevice &devive) override; + /** * @Description Query the information about the found groups * diff --git a/wifi/frameworks/native/src/wifi_p2p_proxy.cpp b/wifi/frameworks/native/src/wifi_p2p_proxy.cpp index 6cdc7c5..2aaef75 100644 --- a/wifi/frameworks/native/src/wifi_p2p_proxy.cpp +++ b/wifi/frameworks/native/src/wifi_p2p_proxy.cpp @@ -822,6 +822,38 @@ ErrCode WifiP2pProxy::QueryP2pDevices(std::vector &devices) return WIFI_OPT_SUCCESS; } +ErrCode WifiP2pProxy::QueryP2pLocalDevice(WifiP2pDevice &device) +{ + if (mRemoteDied) { + WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + return WIFI_OPT_FAILED; + } + MessageOption option; + MessageParcel data; + MessageParcel reply; + if (!data.WriteInterfaceToken(GetDescriptor())) { + WIFI_LOGE("Write interface token error: %{public}s", __func__); + return WIFI_OPT_FAILED; + } + data.WriteInt32(0); + int error = Remote()->SendRequest(WIFI_SVR_CMD_P2P_QUERY_LOCAL_DEVICE, data, reply, option); + if (error != ERR_NONE) { + WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", WIFI_SVR_CMD_P2P_QUERY_LOCAL_DEVICE, error); + return WIFI_OPT_FAILED; + } + + int exception = reply.ReadInt32(); + if (exception) { + return WIFI_OPT_FAILED; + } + int ret = reply.ReadInt32(); + if (ErrCode(ret) != WIFI_OPT_SUCCESS) { + return ErrCode(ret); + } + ReadWifiP2pDeviceData(reply, device); + return WIFI_OPT_SUCCESS; +} + ErrCode WifiP2pProxy::QueryP2pGroups(std::vector &groups) { if (mRemoteDied) { @@ -1450,9 +1482,9 @@ ErrCode WifiP2pProxy::Hid2dSetPeerWifiCfgInfo(PeerCfgType cfgType, void WifiP2pProxy::OnRemoteDied(const wptr& remoteObject) { - WIFI_LOGD("Remote service is died!"); + WIFI_LOGE("Remote service is died!"); mRemoteDied = true; g_wifiP2pCallbackStub.SetRemoteDied(true); } } // namespace Wifi -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/ip2p_service.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/ip2p_service.h index 4a4388b..a222d37 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/ip2p_service.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/ip2p_service.h @@ -155,6 +155,13 @@ public: */ virtual ErrCode GetCurrentGroup(WifiP2pGroupInfo &group) = 0; + /** + * @DescriptionGet - The interface of get all existed groups. + * @param group - struct WifiP2pGroupInfo. + * @return - ErrCode + */ + virtual ErrCode GetP2pGroups(WifiP2pGroupInfo &group) = 0; + /** * @Description - The interface of get p2p running status. * @param status - information of status. diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp index f58d9eb..e4f0a41 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp @@ -625,6 +625,38 @@ ErrCode WifiP2pServiceImpl::QueryP2pDevices(std::vector &devives) return pService->QueryP2pDevices(devives); } +ErrCode WifiP2pServiceImpl::QueryP2pLocalDevice(WifiP2pDevice &device) +{ + WIFI_LOGI("QueryP2pLocalDevice"); + if (WifiPermissionUtils::VerifyGetWifiInfoPermission() == PERMISSION_DENIED) { + WIFI_LOGE("QueryP2pLocalDevice:VerifyGetWifiInfoPermission PERMISSION_DENIED!"); + return WIFI_OPT_PERMISSION_DENIED; + } + + if (WifiPermissionUtils::VerifyGetWifiConfigPermission() == PERMISSION_DENIED) { + WIFI_LOGE("QueryP2pLocalDevice:VerifyGetWifiConfigPermission PERMISSION_DENIED!"); + return WIFI_OPT_PERMISSION_DENIED; + } + + if (!IsP2pServiceRunning()) { + WIFI_LOGE("P2pService is not runing!"); + return WIFI_OPT_P2P_NOT_OPENED; + } + + IP2pService *pService = WifiServiceManager::GetInstance().GetP2pServiceInst(); + if (pService == nullptr) { + WIFI_LOGE("Get P2P service failed!"); + return WIFI_OPT_P2P_NOT_OPENED; + } + + ErrCode ret = pService->QueryP2pLocalDevice(device); + if (WifiPermissionUtils::VerifyGetWifiLocalMacPermission() == PERMISSION_DENIED) { + WIFI_LOGE("QueryP2pLocalDevice:VerifyGetWifiLocalMacPermission PERMISSION_DENIED!"); + device.SetDeviceAddress("00:00:00:00:00:00"); + } + return ret; +} + ErrCode WifiP2pServiceImpl::QueryP2pGroups(std::vector &groups) { WIFI_LOGI("QueryP2pGroups"); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.h index 0979e21..9566a4d 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.h @@ -207,6 +207,14 @@ public: */ ErrCode QueryP2pDevices(std::vector &devives) override; + /** + * @Description Query the information about the local device + * + * @param devives - Get result of WifiP2pDevice + * @return ErrCode - operate result + */ + ErrCode QueryP2pLocalDevice(WifiP2pDevice &device) override; + /** * @Description Query the information about the found groups * diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.cpp index 0eae23f..3c6b652 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.cpp @@ -73,6 +73,7 @@ void WifiP2pStub::InitHandleMap() handleFuncMap[WIFI_SVR_CMD_GET_5G_CHANNEL_LIST] = &WifiP2pStub::OnHid2dGetChannelListFor5G; handleFuncMap[WIFI_SVR_CMD_GET_SELF_WIFI_CFG] = &WifiP2pStub::OnHid2dGetSelfWifiCfgInfo; handleFuncMap[WIFI_SVR_CMD_SET_PEER_WIFI_CFG] = &WifiP2pStub::OnHid2dSetPeerWifiCfgInfo; + handleFuncMap[WIFI_SVR_CMD_P2P_QUERY_LOCAL_DEVICE] = &WifiP2pStub::OnHid2dSetPeerWifiCfgInfo; return; } @@ -367,6 +368,19 @@ void WifiP2pStub::OnQueryP2pDevices(uint32_t code, MessageParcel &data, MessageP return; } +void WifiP2pStub::OnQueryP2pLocalDevice(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) +{ + WIFI_LOGI("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); + WifiP2pDevice devive; + ErrCode ret = QueryP2pLocalDevice(devive); + reply.WriteInt32(0); + reply.WriteInt32(ret); + if (ret == WIFI_OPT_SUCCESS) { + WriteWifiP2pDeviceData(reply, devive); + } + return; +} + void WifiP2pStub::OnQueryP2pGroups(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) { WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); -- Gitee From ea684b2190f9c2f5864fd7e4ec0ef814b9f8330b Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Sun, 12 Jun 2022 22:50:14 +0800 Subject: [PATCH 166/491] bugfix from master 0611 Signed-off-by: yanxiaotao --- .../wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.h | 1 + 1 file changed, 1 insertion(+) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.h index 67c98ba..0b44233 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.h @@ -91,6 +91,7 @@ private: bool ReadWifiP2pGroupData(MessageParcel &data, WifiP2pGroupInfo &info); void WriteWifiP2pGroupData(MessageParcel &reply, const WifiP2pGroupInfo &info); void ReadWifiP2pConfigData(MessageParcel &data, WifiP2pConfig &config); + void OnQueryP2pLocalDevice(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) private: HandleFuncMap handleFuncMap; -- Gitee From d044af3e5790991f817c396edb507b0be0c8f407 Mon Sep 17 00:00:00 2001 From: y00316381 Date: Mon, 13 Jun 2022 08:30:33 +0800 Subject: [PATCH 167/491] bugfix from master 0613 Signed-off-by: y00316381 --- .../wifi_framework/wifi_manage/wifi_p2p/ip2p_service.h | 7 ------- .../wifi_framework/wifi_manage/wifi_p2p_stub.h | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/ip2p_service.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/ip2p_service.h index a222d37..4a4388b 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/ip2p_service.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/ip2p_service.h @@ -155,13 +155,6 @@ public: */ virtual ErrCode GetCurrentGroup(WifiP2pGroupInfo &group) = 0; - /** - * @DescriptionGet - The interface of get all existed groups. - * @param group - struct WifiP2pGroupInfo. - * @return - ErrCode - */ - virtual ErrCode GetP2pGroups(WifiP2pGroupInfo &group) = 0; - /** * @Description - The interface of get p2p running status. * @param status - information of status. diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.h index 0b44233..2421e27 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.h @@ -91,7 +91,7 @@ private: bool ReadWifiP2pGroupData(MessageParcel &data, WifiP2pGroupInfo &info); void WriteWifiP2pGroupData(MessageParcel &reply, const WifiP2pGroupInfo &info); void ReadWifiP2pConfigData(MessageParcel &data, WifiP2pConfig &config); - void OnQueryP2pLocalDevice(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) + void OnQueryP2pLocalDevice(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option); private: HandleFuncMap handleFuncMap; -- Gitee From 05239590576d511dd590f414dac3856a0317c3fe Mon Sep 17 00:00:00 2001 From: y00316381 Date: Mon, 13 Jun 2022 08:53:02 +0800 Subject: [PATCH 168/491] bugfix from master 0613 Signed-off-by: y00316381 --- wifi/frameworks/js/napi/src/wifi_napi_p2p.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/wifi/frameworks/js/napi/src/wifi_napi_p2p.cpp b/wifi/frameworks/js/napi/src/wifi_napi_p2p.cpp index 91fc1be..3174a61 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_p2p.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_p2p.cpp @@ -91,7 +91,9 @@ static ErrCode GroupsToJsArray(const napi_env& env, for (auto& each : vecGroups) { napi_value eachObj; napi_create_object(env, &eachObj); - GroupInfosToJs(env, each, eachObj); + if (GroupInfosToJs(env, each, eachObj) != WIFI_OPT_SUCCESS) { + return WIFI_OPT_FAILED; + } napi_status status = napi_set_element(env, arrayResult, idx++, eachObj); if (status != napi_ok) { WIFI_LOGE("wifi napi set element error: %{public}d, idx: %{public}d", status, idx - 1); -- Gitee From 4fb99c2bd973972cd64bd58016481ceba050a9d7 Mon Sep 17 00:00:00 2001 From: y00316381 Date: Mon, 13 Jun 2022 09:04:51 +0800 Subject: [PATCH 169/491] bugfix from master 0613 Signed-off-by: y00316381 --- wifi/frameworks/native/src/wifi_p2p_proxy.cpp | 2 +- wifi/frameworks/native/src/wifi_p2p_proxy.h | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/wifi/frameworks/native/src/wifi_p2p_proxy.cpp b/wifi/frameworks/native/src/wifi_p2p_proxy.cpp index 2aaef75..ff5d33d 100644 --- a/wifi/frameworks/native/src/wifi_p2p_proxy.cpp +++ b/wifi/frameworks/native/src/wifi_p2p_proxy.cpp @@ -825,7 +825,7 @@ ErrCode WifiP2pProxy::QueryP2pDevices(std::vector &devices) ErrCode WifiP2pProxy::QueryP2pLocalDevice(WifiP2pDevice &device) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGE("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; diff --git a/wifi/frameworks/native/src/wifi_p2p_proxy.h b/wifi/frameworks/native/src/wifi_p2p_proxy.h index a510070..b40bdad 100644 --- a/wifi/frameworks/native/src/wifi_p2p_proxy.h +++ b/wifi/frameworks/native/src/wifi_p2p_proxy.h @@ -197,6 +197,14 @@ public: */ ErrCode QueryP2pDevices(std::vector &devices) override; + /** + * @Description Query the information about local device info + * + * @param devices - Get result of WifiP2pDevice + * @return ErrCode - operate result + */ + ErrCode QueryP2pLocalDevice(WifiP2pDevice &device); + /** * @Description Query the information about the found groups * -- Gitee From 920c98d44909e3d26f469ac370d046c857e5d34f Mon Sep 17 00:00:00 2001 From: y00316381 Date: Mon, 13 Jun 2022 10:10:23 +0800 Subject: [PATCH 170/491] bugfix from master 0613 Signed-off-by: y00316381 --- wifi/frameworks/js/napi/inc/wifi_napi_p2p.h | 1 + wifi/frameworks/js/napi/src/wifi_napi_entry.cpp | 2 +- wifi/frameworks/native/src/wifi_p2p_proxy.h | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/wifi/frameworks/js/napi/inc/wifi_napi_p2p.h b/wifi/frameworks/js/napi/inc/wifi_napi_p2p.h index 7e7da70..6041a95 100644 --- a/wifi/frameworks/js/napi/inc/wifi_napi_p2p.h +++ b/wifi/frameworks/js/napi/inc/wifi_napi_p2p.h @@ -24,6 +24,7 @@ namespace Wifi { napi_value GetP2pLinkedInfo(napi_env env, napi_callback_info info); napi_value GetCurrentGroup(napi_env env, napi_callback_info info); napi_value GetP2pDevices(napi_env env, napi_callback_info info); +napi_value GetP2pLocalDevice(napi_env env, napi_callback_info info); napi_value CreateGroup(napi_env env, napi_callback_info info); napi_value RemoveGroup(napi_env env, napi_callback_info info); napi_value P2pConnect(napi_env env, napi_callback_info info); diff --git a/wifi/frameworks/js/napi/src/wifi_napi_entry.cpp b/wifi/frameworks/js/napi/src/wifi_napi_entry.cpp index bbb36c3..3ae2826 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_entry.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_entry.cpp @@ -63,7 +63,7 @@ static napi_value Init(napi_env env, napi_value exports) { DECLARE_NAPI_FUNCTION("getP2pLinkedInfo", GetP2pLinkedInfo), DECLARE_NAPI_FUNCTION("getCurrentGroup", GetCurrentGroup), DECLARE_NAPI_FUNCTION("getP2pPeerDevices", GetP2pDevices), - DECLARE_NAPI_FUNCTION("getP2pLocalDeviceInfo", getP2pLocalDeviceInfo), + DECLARE_NAPI_FUNCTION("GetP2pLocalDevice", GetP2pLocalDevice), DECLARE_NAPI_FUNCTION("createGroup", CreateGroup), DECLARE_NAPI_FUNCTION("removeGroup", RemoveGroup), DECLARE_NAPI_FUNCTION("p2pConnect", P2pConnect), diff --git a/wifi/frameworks/native/src/wifi_p2p_proxy.h b/wifi/frameworks/native/src/wifi_p2p_proxy.h index b40bdad..c3f23cc 100644 --- a/wifi/frameworks/native/src/wifi_p2p_proxy.h +++ b/wifi/frameworks/native/src/wifi_p2p_proxy.h @@ -203,7 +203,7 @@ public: * @param devices - Get result of WifiP2pDevice * @return ErrCode - operate result */ - ErrCode QueryP2pLocalDevice(WifiP2pDevice &device); + ErrCode QueryP2pLocalDevice(WifiP2pDevice &device) override; /** * @Description Query the information about the found groups -- Gitee From 3c21331d0b6315d1249fc56a4e048dfcd185edb2 Mon Sep 17 00:00:00 2001 From: y00316381 Date: Mon, 13 Jun 2022 10:33:26 +0800 Subject: [PATCH 171/491] bugfix from master 0613 Signed-off-by: y00316381 --- wifi/frameworks/js/napi/inc/wifi_napi_p2p.h | 1 + wifi/frameworks/js/napi/src/wifi_napi_p2p.cpp | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/wifi/frameworks/js/napi/inc/wifi_napi_p2p.h b/wifi/frameworks/js/napi/inc/wifi_napi_p2p.h index 6041a95..d6ec710 100644 --- a/wifi/frameworks/js/napi/inc/wifi_napi_p2p.h +++ b/wifi/frameworks/js/napi/inc/wifi_napi_p2p.h @@ -25,6 +25,7 @@ napi_value GetP2pLinkedInfo(napi_env env, napi_callback_info info); napi_value GetCurrentGroup(napi_env env, napi_callback_info info); napi_value GetP2pDevices(napi_env env, napi_callback_info info); napi_value GetP2pLocalDevice(napi_env env, napi_callback_info info); +napi_value GetP2pGroups(napi_env env, napi_callback_info info); napi_value CreateGroup(napi_env env, napi_callback_info info); napi_value RemoveGroup(napi_env env, napi_callback_info info); napi_value P2pConnect(napi_env env, napi_callback_info info); diff --git a/wifi/frameworks/js/napi/src/wifi_napi_p2p.cpp b/wifi/frameworks/js/napi/src/wifi_napi_p2p.cpp index 3174a61..fcccffa 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_p2p.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_p2p.cpp @@ -261,7 +261,8 @@ napi_value GetP2pLocalDevice(napi_env env, napi_callback_info info) asyncContext->completeFunc = [&](void* data) -> void { P2pLocalDeviceAsyncContext *context = static_cast(data); napi_create_object(context->env, &context->result); - context->errorCode = DeviceInfoToJs(context->env, context->deviceInfo, context->result); + context->errorCode = WIFI_OPT_SUCCESS; + DeviceInfoToJs(context->env, context->deviceInfo, context->result); WIFI_LOGI("Push get p2p local device result to client"); }; -- Gitee From 074542a7aae312b0dbd3dc5814f0a93a3fd53974 Mon Sep 17 00:00:00 2001 From: y00316381 Date: Mon, 13 Jun 2022 10:47:33 +0800 Subject: [PATCH 172/491] bugfix from master 0613 Signed-off-by: y00316381 --- wifi/services/wifi_standard/wifi_hal/wifi_hal_module_manage.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module_manage.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module_manage.c index 5bb1a72..d6f38c5 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module_manage.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module_manage.c @@ -141,6 +141,10 @@ int StartModuleInternal(const char *moduleName, const char *startCmd, pid_t *pPr LOGE("Create wpa thread failed!"); return HAL_FAILURE; } + ret = pthread_setname_np(tid, moduleName); + if (ret != 0) { + LOGE("pthread_setname_np return failed: %d!", ret); + } pthread_join(tid, NULL); exit(0); } else { -- Gitee From 5f69935131f500c8e1bc7f7d4d21af4dd5f8440e Mon Sep 17 00:00:00 2001 From: y00316381 Date: Mon, 13 Jun 2022 16:00:33 +0800 Subject: [PATCH 173/491] bugfix from master 0613 Signed-off-by: y00316381 --- wifi/frameworks/js/napi/src/wifi_napi_p2p.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wifi/frameworks/js/napi/src/wifi_napi_p2p.cpp b/wifi/frameworks/js/napi/src/wifi_napi_p2p.cpp index fcccffa..6b9b887 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_p2p.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_p2p.cpp @@ -91,7 +91,8 @@ static ErrCode GroupsToJsArray(const napi_env& env, for (auto& each : vecGroups) { napi_value eachObj; napi_create_object(env, &eachObj); - if (GroupInfosToJs(env, each, eachObj) != WIFI_OPT_SUCCESS) { + int errorCode = GroupInfosToJs(env, each, eachObj); + if (errorCode != WIFI_OPT_SUCCESS) { return WIFI_OPT_FAILED; } napi_status status = napi_set_element(env, arrayResult, idx++, eachObj); -- Gitee From 9f429244f0f23c3df0ee1c60a46a752c51a7489a Mon Sep 17 00:00:00 2001 From: y00316381 Date: Mon, 13 Jun 2022 17:42:56 +0800 Subject: [PATCH 174/491] bugfix from master 0613 Signed-off-by: y00316381 --- wifi/frameworks/js/napi/src/wifi_napi_p2p.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wifi/frameworks/js/napi/src/wifi_napi_p2p.cpp b/wifi/frameworks/js/napi/src/wifi_napi_p2p.cpp index 6b9b887..746d15c 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_p2p.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_p2p.cpp @@ -47,7 +47,7 @@ static ErrCode DevicesToJsArray(const napi_env& env, return WIFI_OPT_SUCCESS; } -static ErrCode GroupInfosToJs(const napi_env& env, WifiP2pGroupInfo& groupInfo, napi_value& result) +static ErrCode GroupInfosToJs(const napi_env& env, const WifiP2pGroupInfo& groupInfo, napi_value& result) { SetValueBool(env, "isP2pGo", groupInfo.IsGroupOwner(), result); @@ -91,8 +91,8 @@ static ErrCode GroupsToJsArray(const napi_env& env, for (auto& each : vecGroups) { napi_value eachObj; napi_create_object(env, &eachObj); - int errorCode = GroupInfosToJs(env, each, eachObj); - if (errorCode != WIFI_OPT_SUCCESS) { + int ret = GroupInfosToJs(env, each, eachObj); + if (ret != WIFI_OPT_SUCCESS) { return WIFI_OPT_FAILED; } napi_status status = napi_set_element(env, arrayResult, idx++, eachObj); -- Gitee From 74b74499363c1da993fea9ed85f427f9849a4f41 Mon Sep 17 00:00:00 2001 From: y00316381 Date: Mon, 13 Jun 2022 20:36:28 +0800 Subject: [PATCH 175/491] bugfix from master 0613 Signed-off-by: y00316381 --- wifi/frameworks/native/include/wifi_p2p.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wifi/frameworks/native/include/wifi_p2p.h b/wifi/frameworks/native/include/wifi_p2p.h index fc989ce..49e22b6 100644 --- a/wifi/frameworks/native/include/wifi_p2p.h +++ b/wifi/frameworks/native/include/wifi_p2p.h @@ -191,12 +191,12 @@ public: virtual ErrCode GetP2pConnectedStatus(int &status) = 0; /** - * @Description Query the local device infor. + * @Description Query the local device information. * * @param devives - Get result of WifiP2pDevice * @return ErrCode - operate result */ - virtual ErrCode QueryP2pLocalDevice(WifiP2pDevice &device); + virtual ErrCode QueryP2pLocalDevice(WifiP2pDevice &device) = 0; /** * @Description Query the information about the found devices. -- Gitee From 5363b9bc6f232b7ce276edf395a99dd9c4fe7a99 Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Mon, 13 Jun 2022 22:00:40 +0800 Subject: [PATCH 176/491] bugfix from master 0613 Signed-off-by: yanxiaotao --- wifi/frameworks/native/include/wifi_p2p.h | 4 ++-- wifi/frameworks/native/interfaces/i_wifi_p2p.h | 4 ++-- wifi/frameworks/native/src/wifi_p2p_impl.cpp | 8 ++++---- wifi/frameworks/native/src/wifi_p2p_impl.h | 4 ++-- .../wifi_framework/wifi_manage/wifi_p2p/ip2p_service.h | 4 ++-- .../wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp | 4 ++-- .../wifi_framework/wifi_manage/wifi_p2p_service_impl.h | 4 ++-- .../wifi_framework/wifi_manage/wifi_p2p_stub.cpp | 9 ++++----- .../wifi_manage/unittest/wifi_mock_p2p_service.cpp | 2 +- .../wifi_manage/unittest/wifi_mock_p2p_service.h | 2 +- 10 files changed, 22 insertions(+), 23 deletions(-) diff --git a/wifi/frameworks/native/include/wifi_p2p.h b/wifi/frameworks/native/include/wifi_p2p.h index 49e22b6..2da82aa 100644 --- a/wifi/frameworks/native/include/wifi_p2p.h +++ b/wifi/frameworks/native/include/wifi_p2p.h @@ -201,10 +201,10 @@ public: /** * @Description Query the information about the found devices. * - * @param devives - Get result vector of WifiP2pDevice + * @param devices - Get result vector of WifiP2pDevice * @return ErrCode - operate result */ - virtual ErrCode QueryP2pDevices(std::vector &devives) = 0; + virtual ErrCode QueryP2pDevices(std::vector &devices) = 0; /** * @Description Query the information about the found groups. diff --git a/wifi/frameworks/native/interfaces/i_wifi_p2p.h b/wifi/frameworks/native/interfaces/i_wifi_p2p.h index 340060d..e7182e7 100644 --- a/wifi/frameworks/native/interfaces/i_wifi_p2p.h +++ b/wifi/frameworks/native/interfaces/i_wifi_p2p.h @@ -194,10 +194,10 @@ public: /** * @Description Query the information about the found devices. * - * @param devives - Get result vector of WifiP2pDevice + * @param devices - Get result vector of WifiP2pDevice * @return ErrCode - operate result */ - virtual ErrCode QueryP2pDevices(std::vector &devives) = 0; + virtual ErrCode QueryP2pDevices(std::vector &devices) = 0; /** * @Description - Query the information about own device. diff --git a/wifi/frameworks/native/src/wifi_p2p_impl.cpp b/wifi/frameworks/native/src/wifi_p2p_impl.cpp index ca0c006..2ec46b9 100644 --- a/wifi/frameworks/native/src/wifi_p2p_impl.cpp +++ b/wifi/frameworks/native/src/wifi_p2p_impl.cpp @@ -189,16 +189,16 @@ ErrCode WifiP2pImpl::GetP2pConnectedStatus(int &status) return client_->GetP2pConnectedStatus(status); } -ErrCode WifiP2pImpl::QueryP2pDevices(std::vector &devives) +ErrCode WifiP2pImpl::QueryP2pDevices(std::vector &devices) { RETURN_IF_FAIL(client_); - return client_->QueryP2pDevices(devives); + return client_->QueryP2pDevices(devices); } -ErrCode WifiP2pImpl::QueryP2pLocalDevice(WifiP2pDevice &devives) +ErrCode WifiP2pImpl::QueryP2pLocalDevice(WifiP2pDevice &devices) { RETURN_IF_FAIL(client_); - return client_->QueryP2pLocalDevice(devives); + return client_->QueryP2pLocalDevice(devices); } ErrCode WifiP2pImpl::QueryP2pGroups(std::vector &groups) diff --git a/wifi/frameworks/native/src/wifi_p2p_impl.h b/wifi/frameworks/native/src/wifi_p2p_impl.h index 977e5f8..c8e486c 100644 --- a/wifi/frameworks/native/src/wifi_p2p_impl.h +++ b/wifi/frameworks/native/src/wifi_p2p_impl.h @@ -193,10 +193,10 @@ public: /** * @Description Query the information about the found devices * - * @param devives - Get result vector of WifiP2pDevice + * @param devices - Get result vector of WifiP2pDevice * @return ErrCode - operate result */ - ErrCode QueryP2pDevices(std::vector &devives) override; + ErrCode QueryP2pDevices(std::vector &devices) override; /** * @Description Query the information about the local device diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/ip2p_service.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/ip2p_service.h index 4a4388b..d3a0e64 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/ip2p_service.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/ip2p_service.h @@ -178,10 +178,10 @@ public: /** * @Description - The interface of query p2p devices information. - * @param devives - information of devices. + * @param devices - information of devices. * @return - ErrCode */ - virtual ErrCode QueryP2pDevices(std::vector &devives) = 0; + virtual ErrCode QueryP2pDevices(std::vector &devices) = 0; /** * @Description - Query the information about own device. diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp index e4f0a41..78c4d81 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp @@ -595,7 +595,7 @@ ErrCode WifiP2pServiceImpl::GetP2pConnectedStatus(int &status) return pService->GetP2pConnectedStatus(status); } -ErrCode WifiP2pServiceImpl::QueryP2pDevices(std::vector &devives) +ErrCode WifiP2pServiceImpl::QueryP2pDevices(std::vector &devices) { WIFI_LOGI("QueryP2pDevices"); if (WifiPermissionUtils::VerifyGetWifiInfoInternalPermission() == PERMISSION_DENIED) { @@ -622,7 +622,7 @@ ErrCode WifiP2pServiceImpl::QueryP2pDevices(std::vector &devives) WIFI_LOGE("Get P2P service failed!"); return WIFI_OPT_P2P_NOT_OPENED; } - return pService->QueryP2pDevices(devives); + return pService->QueryP2pDevices(devices); } ErrCode WifiP2pServiceImpl::QueryP2pLocalDevice(WifiP2pDevice &device) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.h index 9566a4d..9ba5582 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.h @@ -202,10 +202,10 @@ public: /** * @Description Query the information about the found devices * - * @param devives - Get result vector of WifiP2pDevice + * @param devices - Get result vector of WifiP2pDevice * @return ErrCode - operate result */ - ErrCode QueryP2pDevices(std::vector &devives) override; + ErrCode QueryP2pDevices(std::vector &devices) override; /** * @Description Query the information about the local device diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.cpp index 3c6b652..3865605 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.cpp @@ -352,17 +352,16 @@ void WifiP2pStub::OnGetP2pConnectedStatus( void WifiP2pStub::OnQueryP2pDevices(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) { WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); - std::vector devives; - ErrCode ret = QueryP2pDevices(devives); + std::vector devices; + ErrCode ret = QueryP2pDevices(devices); reply.WriteInt32(0); reply.WriteInt32(ret); - if (ret == WIFI_OPT_SUCCESS) { - int size = devives.size(); + int size = devices.size(); reply.WriteInt32(size); for (int i = 0; i < size; ++i) { - WriteWifiP2pDeviceData(reply, devives[i]); + WriteWifiP2pDeviceData(reply, devices[i]); } } return; diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_mock_p2p_service.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_mock_p2p_service.cpp index f744896..4b6b995 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_mock_p2p_service.cpp +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_mock_p2p_service.cpp @@ -323,7 +323,7 @@ ErrCode WifiMockP2pService::GetP2pConnectedStatus(int &status) return WIFI_OPT_SUCCESS; } -ErrCode WifiMockP2pService::QueryP2pDevices(std::vector &devives) +ErrCode WifiMockP2pService::QueryP2pDevices(std::vector &devices) { LOGI("Mock_p2p:QueryP2pDevices"); WifiP2pDevice device1; diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_mock_p2p_service.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_mock_p2p_service.h index 5ffb685..61b51ab 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_mock_p2p_service.h +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_mock_p2p_service.h @@ -47,7 +47,7 @@ public: ErrCode GetP2pEnableStatus(int &status); ErrCode GetP2pDiscoverStatus(int &status); ErrCode GetP2pConnectedStatus(int &status); - ErrCode QueryP2pDevices(std::vector &devives); + ErrCode QueryP2pDevices(std::vector &devices); ErrCode QueryP2pGroups(std::vector &groups); ErrCode QueryP2pServices(std::vector &services); ErrCode RegisterP2pServiceCallbacks(const IP2pServiceCallbacks &callbacks); -- Gitee From 637262daefbcfefefa7342dc929c1a48c0933640 Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Mon, 13 Jun 2022 22:20:26 +0800 Subject: [PATCH 177/491] bugfix from master 0613 Signed-off-by: yanxiaotao --- .../wifi_framework/wifi_manage/wifi_p2p_stub.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.cpp index 3865605..645c757 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.cpp @@ -370,12 +370,12 @@ void WifiP2pStub::OnQueryP2pDevices(uint32_t code, MessageParcel &data, MessageP void WifiP2pStub::OnQueryP2pLocalDevice(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) { WIFI_LOGI("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); - WifiP2pDevice devive; - ErrCode ret = QueryP2pLocalDevice(devive); + WifiP2pDevice device; + ErrCode ret = QueryP2pLocalDevice(device); reply.WriteInt32(0); reply.WriteInt32(ret); if (ret == WIFI_OPT_SUCCESS) { - WriteWifiP2pDeviceData(reply, devive); + WriteWifiP2pDeviceData(reply, device); } return; } -- Gitee From 6fcec32f82812023a15ff0286c9f47f14f1e7c6d Mon Sep 17 00:00:00 2001 From: z00588131 Date: Tue, 14 Jun 2022 09:34:27 +0800 Subject: [PATCH 178/491] Adds process healing ability in abnormal situations Signed-off-by: z00588131 --- .../wifi_manage/wifi_device_service_impl.cpp | 27 +++++++++++ .../wifi_manage/wifi_device_service_impl.h | 2 + .../wifi_manage/wifi_hotspot_service_impl.cpp | 29 +++++++++++- .../wifi_manage/wifi_hotspot_service_impl.h | 2 + wifi/services/wifi_standard/wifi_hal/main.c | 46 ++++++++++++++++++- .../wifi_hal/wifi_hal_module_manage.c | 4 ++ 6 files changed, 107 insertions(+), 3 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp index c8844d7..7cee5e9 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp @@ -15,6 +15,7 @@ #include "wifi_device_service_impl.h" #include +#include #include #ifndef OHOS_ARCH_LITE #include @@ -77,12 +78,38 @@ WifiDeviceServiceImpl::WifiDeviceServiceImpl() WifiDeviceServiceImpl::~WifiDeviceServiceImpl() {} +bool WifiDeviceServiceImpl::IsProcessNeedToRestart() +{ + return (WifiConfigCenter::GetInstance().GetWifiMidState() == WifiOprMidState::RUNNING); +} + +void WifiDeviceServiceImpl::SigHandler(int sig) +{ + WIFI_LOGI("[Sta] Recv SIG: %{public}d\n", sig); + switch (sig) { + case SIGUSR1: + if (IsProcessNeedToRestart()) { + StaServiceCallback cb = WifiManager::GetInstance().GetStaCallback(); + if (cb.OnStaCloseRes != nullptr) { + cb.OnStaCloseRes(OperateResState::CLOSE_WIFI_SUCCEED); + } + WIFI_LOGE("[Sta] --------------Abort process to restart!!!--------------\n"); + abort(); + } + break; + + default: + break; + } +} + void WifiDeviceServiceImpl::OnStart() { if (mState == ServiceRunningState::STATE_RUNNING) { WIFI_LOGD("Service has already started."); return; } + (void)signal(SIGUSR1, SigHandler); if (!Init()) { WIFI_LOGE("Failed to init service"); OnStop(); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h index 8e78aa7..3ee5edf 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h @@ -134,6 +134,8 @@ private: bool IsScanServiceRunning(); bool CheckConfigPwd(const WifiDeviceConfig &config); static void SaBasicDump(std::string& result); + static void SigHandler(int sig); + static bool IsProcessNeedToRestart(); private: static constexpr int MAX_PRESHAREDKEY_LEN = 63; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp index a57fac6..e10e90a 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -15,6 +15,7 @@ #include "wifi_hotspot_service_impl.h" #include +#include #include "wifi_permission_utils.h" #include "wifi_global_func.h" #include "wifi_auth_center.h" @@ -55,12 +56,38 @@ WifiHotspotServiceImpl::WifiHotspotServiceImpl() WifiHotspotServiceImpl::~WifiHotspotServiceImpl() {} +bool WifiHotspotServiceImpl::IsProcessNeedToRestart() +{ + return (WifiConfigCenter::GetInstance().GetApMidState() == WifiOprMidState::RUNNING); +} + +void WifiHotspotServiceImpl::SigHandler(int sig) +{ + WIFI_LOGI("[Ap] Recv SIG: %{public}d\n", sig); + switch (sig) { + case SIGUSR2: + if (IsProcessNeedToRestart()) { + IApServiceCallbacks cb = WifiManager::GetInstance().GetApCallback(); + if (cb.OnApStateChangedEvent != nullptr) { + cb.OnApStateChangedEvent(ApState::AP_STATE_IDLE); + } + WIFI_LOGE("[AP] --------------Abort process to restart!!!--------------\n"); + abort(); + } + break; + + default: + break; + } +} + void WifiHotspotServiceImpl::OnStart() { if (mState == ServiceRunningState::STATE_RUNNING) { WIFI_LOGD("Service has already started."); return; } + (void)signal(SIGUSR2, SigHandler); if (!Init()) { WIFI_LOGE("Failed to init service"); OnStop(); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.h index f1d89e0..e6cf981 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.h @@ -199,6 +199,8 @@ private: static void SaBasicDump(std::string& result); static void ConfigInfoDump(std::string& result); static void StationsInfoDump(std::string& result); + static void SigHandler(int sig); + static bool IsProcessNeedToRestart(); private: static sptr g_instance; diff --git a/wifi/services/wifi_standard/wifi_hal/main.c b/wifi/services/wifi_standard/wifi_hal/main.c index a75b201..89a77db 100644 --- a/wifi/services/wifi_standard/wifi_hal/main.c +++ b/wifi/services/wifi_standard/wifi_hal/main.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -14,6 +14,8 @@ */ #include +#include +#include #include "server.h" #include "wifi_log.h" #include "wifi_hal_adapter.h" @@ -25,6 +27,10 @@ #undef LOG_TAG #define LOG_TAG "WifiHalService" +#define BUF_LEN 32 +#define INVALID_PID (-1) +#define WIFI_SERVICE_NAME "wifi_manager_se" + static void SignalExit(int sig) { LOGI("Caught signal %{public}d", sig); @@ -35,10 +41,45 @@ static void SignalExit(int sig) return; } +int GetWifiServicePid(void) +{ + char cmd[BUF_LEN]; + if (snprintf_s(cmd, sizeof(cmd), sizeof(cmd) - 1, "pidof -s %s", WIFI_SERVICE_NAME) < 0) { + return INVALID_PID; + } + + FILE *p = popen(cmd, "r"); + if (!p) { + return INVALID_PID; + } + const int base = 10; + char buf[BUF_LEN]; + fgets(buf, BUF_LEN, p); + pclose(p); + return strtoul(buf, NULL, base); +} + +static void SendStartNotify(void) +{ + int pid = GetWifiServicePid(); + if (pid <= 0) { + return; + } + LOGI("Send SIGUSR1/2 SIG to pid %{public}d", pid); + int ret = kill(pid, SIGUSR1); + if (ret != 0) { + LOGE("Send SIGUSR1 SIG to pid %{public}d failed: %{public}d", pid, ret); + } + ret = kill(pid, SIGUSR2); + if (ret != 0) { + LOGE("Send SIGUSR2 SIG to pid %{public}d failed: %{public}d", pid, ret); + } +} + int main(void) { + LOGI("Wifi hal service starting..."); char rpcSockPath[] = "/data/misc/wifi/unix_sock.sock"; - if (access(rpcSockPath, 0) == 0) { unlink(rpcSockPath); } @@ -57,6 +98,7 @@ int main(void) signal(SIGTERM, SignalExit); signal(SIGPIPE, SIG_IGN); + SendStartNotify(); RunRpcLoop(server); /* stop wpa_supplicant, hostapd, and other resources */ ForceStop(); diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module_manage.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module_manage.c index 5bb1a72..65e28d0 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module_manage.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module_manage.c @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "wifi_hal_module_manage.h" #include #include @@ -19,6 +20,7 @@ #include #include #include +#include #include #include #include "wifi_hal_define.h" @@ -135,6 +137,8 @@ int StartModuleInternal(const char *moduleName, const char *startCmd, pid_t *pPr return HAL_FAILURE; } if (pid == 0) { /* sub process */ + // The child process will receive the exit signal when the parent process exits. + prctl(PR_SET_PDEATHSIG, SIGKILL); pthread_t tid; int ret = pthread_create(&tid, NULL, WpaThreadMain, (void *)startCmd); if (ret != 0) { -- Gitee From 71189fb1b6535b5ea88f076a0e0673d88ff98075 Mon Sep 17 00:00:00 2001 From: y00316381 Date: Tue, 14 Jun 2022 18:58:45 +0800 Subject: [PATCH 179/491] bugfix from master 0614 Signed-off-by: y00316381 --- .../js/napi/src/wifi_napi_hotspot.cpp | 3 +- .../native/c_adapter/src/wifi_c_hotspot.cpp | 10 +++-- wifi/frameworks/native/include/wifi_hotspot.h | 7 ++++ wifi/frameworks/native/interfaces/define.h | 1 + .../native/interfaces/i_wifi_hotspot.h | 8 ++++ .../native/src/wifi_hotspot_impl.cpp | 8 ++++ .../frameworks/native/src/wifi_hotspot_impl.h | 7 ++++ .../native/src/wifi_hotspot_proxy.cpp | 34 ++++++++++++++++- .../native/src/wifi_hotspot_proxy.h | 8 ++++ .../wifi_manage/wifi_hotspot_service_impl.cpp | 38 +++++++++++++++++++ .../wifi_manage/wifi_hotspot_service_impl.h | 8 ++++ .../wifi_manage/wifi_hotspot_stub.cpp | 17 ++++++++- .../wifi_manage/wifi_hotspot_stub.h | 1 + 13 files changed, 143 insertions(+), 7 deletions(-) diff --git a/wifi/frameworks/js/napi/src/wifi_napi_hotspot.cpp b/wifi/frameworks/js/napi/src/wifi_napi_hotspot.cpp index 997249c..dbfa1af 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_hotspot.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_hotspot.cpp @@ -68,8 +68,7 @@ napi_value IsHotspotDualBandSupported(napi_env env, napi_callback_info info) { NAPI_ASSERT(env, wifiHotspotPtr != nullptr, "Wifi hotspot instance is null."); napi_value result; - /* This interface is not supported currently */ - napi_get_boolean(env, false, &result); + napi_get_boolean(env, wifiHotspotPtr->IsHotspotDualBandSupported(), &result); return result; } diff --git a/wifi/frameworks/native/c_adapter/src/wifi_c_hotspot.cpp b/wifi/frameworks/native/c_adapter/src/wifi_c_hotspot.cpp index 8bd84ad..66bb1e8 100644 --- a/wifi/frameworks/native/c_adapter/src/wifi_c_hotspot.cpp +++ b/wifi/frameworks/native/c_adapter/src/wifi_c_hotspot.cpp @@ -40,12 +40,16 @@ WifiErrorCode DisableHotspot() int IsHotspotActive(void) { - if (hotspotPtr == nullptr) { - return false; - } + CHECK_PTR_RETURN(hotspotPtr, ERROR_WIFI_NOT_AVAILABLE); return hotspotPtr->IsHotspotActive(); } +int IsHotspotDualBandSupported(void) +{ + CHECK_PTR_RETURN(hotspotPtr, ERROR_WIFI_NOT_AVAILABLE); + return hotspotPtr->IsHotspotDualBandSupported(); +} + /* Others type is not support for AP */ static std::map g_mapSecTypeToKeyMgmt = { {WifiSecurityType::WIFI_SEC_TYPE_OPEN, OHOS::Wifi::KeyMgmt::NONE}, diff --git a/wifi/frameworks/native/include/wifi_hotspot.h b/wifi/frameworks/native/include/wifi_hotspot.h index dd9b1ee..a0ed5ff 100644 --- a/wifi/frameworks/native/include/wifi_hotspot.h +++ b/wifi/frameworks/native/include/wifi_hotspot.h @@ -40,6 +40,13 @@ public: */ virtual bool IsHotspotActive(void) = 0; + /** + * @Description Check whether the hotspot supports dual band. + * + * @return bool - operation result + */ + virtual bool IsHotspotDualBandSupported(void) = 0; + /** * @Description Get the Hotspot Config object * diff --git a/wifi/frameworks/native/interfaces/define.h b/wifi/frameworks/native/interfaces/define.h index 9172825..781bc6b 100644 --- a/wifi/frameworks/native/interfaces/define.h +++ b/wifi/frameworks/native/interfaces/define.h @@ -75,6 +75,7 @@ #define WIFI_SVR_CMD_GET_SUPPORTED_POWER_MODEL 0X1111 /* get supported power model */ #define WIFI_SVR_CMD_GET_POWER_MODEL 0X1112 /* get power model */ #define WIFI_SVR_CMD_SET_POWER_MODEL 0X1113 /* set power model */ +#define WIFI_SVR_CMD_IS_HOTSPOT_DUAL_BAND_SUPPORTED 0X1114 /* whether dual band is supported */ /* -------------p2p module message define----------------- */ #define WIFI_SVR_CMD_P2P_ENABLE 0x2000 /* open p2p */ diff --git a/wifi/frameworks/native/interfaces/i_wifi_hotspot.h b/wifi/frameworks/native/interfaces/i_wifi_hotspot.h index 6d5822d..210624c 100644 --- a/wifi/frameworks/native/interfaces/i_wifi_hotspot.h +++ b/wifi/frameworks/native/interfaces/i_wifi_hotspot.h @@ -40,6 +40,14 @@ public: */ virtual ErrCode IsHotspotActive(bool &bActive) = 0; + /** + * @Description Check whether the hotspot supports dual band. + * + * @param isSupported - Supported / NOT supported + * @return ErrCode - operation result + */ + virtual ErrCode IsHotspotDualBandSupported(bool &isSupported) = 0; + /** * @Description Get the Hotspot Config object * diff --git a/wifi/frameworks/native/src/wifi_hotspot_impl.cpp b/wifi/frameworks/native/src/wifi_hotspot_impl.cpp index f87c3a0..b56be87 100644 --- a/wifi/frameworks/native/src/wifi_hotspot_impl.cpp +++ b/wifi/frameworks/native/src/wifi_hotspot_impl.cpp @@ -72,6 +72,14 @@ bool WifiHotspotImpl::IsHotspotActive(void) return bActive; } +bool WifiHotspotImpl::IsHotspotDualBandSupported(void) +{ + RETURN_IF_FAIL(client_); + bool isSupported = false; + client_->IsHotspotDualBandSupported(isSupported); + return isSupported; +} + ErrCode WifiHotspotImpl::GetHotspotState(int &state) { RETURN_IF_FAIL(client_); diff --git a/wifi/frameworks/native/src/wifi_hotspot_impl.h b/wifi/frameworks/native/src/wifi_hotspot_impl.h index 8f986c9..20c3f8e 100644 --- a/wifi/frameworks/native/src/wifi_hotspot_impl.h +++ b/wifi/frameworks/native/src/wifi_hotspot_impl.h @@ -35,6 +35,13 @@ public: */ bool IsHotspotActive(void) override; + /** + * @Description Check whether the hotspot supports dual band. + * + * @return bool - operation result + */ + bool IsHotspotDualBandSupported(void) override; + /** * @Description Get the Hotspot Config object * diff --git a/wifi/frameworks/native/src/wifi_hotspot_proxy.cpp b/wifi/frameworks/native/src/wifi_hotspot_proxy.cpp index c125922..9185e5c 100644 --- a/wifi/frameworks/native/src/wifi_hotspot_proxy.cpp +++ b/wifi/frameworks/native/src/wifi_hotspot_proxy.cpp @@ -43,7 +43,7 @@ WifiHotspotProxy::~WifiHotspotProxy() ErrCode WifiHotspotProxy::IsHotspotActive(bool &bActive) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGE("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -71,6 +71,38 @@ ErrCode WifiHotspotProxy::IsHotspotActive(bool &bActive) return WIFI_OPT_SUCCESS; } +ErrCode WifiHotspotProxy::IsHotspotDualBandSupported(bool &isSupported) +{ + if (mRemoteDied) { + WIFI_LOGE("failed to `%{public}s`,remote service is died!", __func__); + return WIFI_OPT_FAILED; + } + MessageOption option; + MessageParcel data; + MessageParcel reply; + if (!data.WriteInterfaceToken(GetDescriptor())) { + WIFI_LOGE("Write interface token error: %{public}s", __func__); + return WIFI_OPT_FAILED; + } + data.WriteInt32(0); + int error = Remote()->SendRequest(WIFI_SVR_CMD_IS_HOTSPOT_DUAL_BAND_SUPPORTED, data, reply, option); + if (error != ERR_NONE) { + WIFI_LOGE("Set Attr(%{public}d) failed", WIFI_SVR_CMD_IS_HOTSPOT_DUAL_BAND_SUPPORTED); + return WIFI_OPT_FAILED; + } + int exception = reply.ReadInt32(); + if (exception) { + return WIFI_OPT_FAILED; + } + int ret = reply.ReadInt32(); + if (ErrCode(ret) != WIFI_OPT_SUCCESS) { + WIFI_LOGE("reply failed: %d", ret); + return ErrCode(ret); + } + isSupported = ((reply.ReadInt32() == 1) ? true : false); + return WIFI_OPT_SUCCESS; +} + ErrCode WifiHotspotProxy::GetHotspotState(int &state) { if (mRemoteDied) { diff --git a/wifi/frameworks/native/src/wifi_hotspot_proxy.h b/wifi/frameworks/native/src/wifi_hotspot_proxy.h index c5e87e3..6bb1b69 100644 --- a/wifi/frameworks/native/src/wifi_hotspot_proxy.h +++ b/wifi/frameworks/native/src/wifi_hotspot_proxy.h @@ -37,6 +37,14 @@ public: */ ErrCode IsHotspotActive(bool &bActive) override; + /** + * @Description Check whether the hotspot supports dual band. + * + * @param isSupported - Supported / NOT Supported + * @return ErrCode - operation result + */ + ErrCode IsHotspotDualBandSupported(bool &isSupported) override; + /** * @Description Get the Hotspot Config object * diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp index a57fac6..ccb0d34 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp @@ -103,6 +103,44 @@ ErrCode WifiHotspotServiceImpl::IsHotspotActive(bool &bActive) return WIFI_OPT_SUCCESS; } +ErrCode WifiHotspotServiceImpl::IsHotspotDualBandSupported(bool &isSupported) +{ + WIFI_LOGI("IsHotspotDualBandSupported"); + if (WifiPermissionUtils::VerifyGetWifiInfoInternalPermission() == PERMISSION_DENIED) { + WIFI_LOGE("IsHotspotDualBandSupported:VerifyGetWifiInfoInternalPermission PERMISSION_DENIED!"); + return WIFI_OPT_PERMISSION_DENIED; + } + + if (WifiPermissionUtils::VerifyManageWifiHotspotPermission() == PERMISSION_DENIED) { + WIFI_LOGE("IsHotspotDualBandSupported:VerifyManageWifiHotspotPermission PERMISSION_DENIED!"); + return WIFI_OPT_PERMISSION_DENIED; + } + + std::vector bands; + if (WifiConfigCenter::GetInstance().GetValidBands(bands) < 0) { + WIFI_LOGE("IsHotspotDualBandSupported:GetValidBands return failed!"); + return WIFI_OPT_FAILED; + } + + bool is2GSupported = false; + bool is5GSupported = false; + isSupported = false; + for (size_t i = 0; i < bands.size(); i++) { + if (bands[i] == BandType::BAND_2GHZ) { + is2GSupported = true; + } else if (bands[i] == BandType::BAND_5GHZ) { + is5GSupported = true; + } + if (is2GSupported && is5GSupported) { + isSupported = true; + break; + } + } + + WIFI_LOGI("2.4G band supported: %{public}d, 5G band supported: %{public}d", is2GSupported, is5GSupported); + return WIFI_OPT_SUCCESS; +} + ErrCode WifiHotspotServiceImpl::GetHotspotState(int &state) { WIFI_LOGI("GetHotspotState"); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.h index f1d89e0..ab9817f 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.h @@ -47,6 +47,14 @@ public: */ ErrCode IsHotspotActive(bool &bActive) override; + /** + * @Description Check whether the hotspot supports dual band. + * + * @param isSpuported - Supported / NOT supported + * @return ErrCode - operation result + */ + ErrCode IsHotspotDualBandSupported(bool &isSpuported) override; + /** * @Description Get the Hotspot Config object * diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.cpp index 6dd9e25..b4d5348 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.cpp @@ -52,6 +52,7 @@ void WifiHotspotStub::InitHandleMap() handleFuncMap[WIFI_SVR_CMD_GET_SUPPORTED_POWER_MODEL] = &WifiHotspotStub::OnGetSupportedPowerModel; handleFuncMap[WIFI_SVR_CMD_GET_POWER_MODEL] = &WifiHotspotStub::OnGetPowerModel; handleFuncMap[WIFI_SVR_CMD_SET_POWER_MODEL] = &WifiHotspotStub::OnSetPowerModel; + handleFuncMap[WIFI_SVR_CMD_IS_HOTSPOT_DUAL_BAND_SUPPORTED] = &WifiHotspotStub::OnIsHotspotDualBandSupported; return; } @@ -80,7 +81,7 @@ int WifiHotspotStub::OnRemoteRequest(uint32_t code, MessageParcel &data, Message void WifiHotspotStub::OnIsHotspotActive(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) { - WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); + WIFI_LOGI("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); bool bActive = false; ErrCode ret = IsHotspotActive(bActive); reply.WriteInt32(0); @@ -91,6 +92,20 @@ void WifiHotspotStub::OnIsHotspotActive(uint32_t code, MessageParcel &data, Mess return; } +void WifiHotspotStub::OnIsHotspotDualBandSupported(uint32_t code, MessageParcel &data, + MessageParcel &reply, MessageOption &option) +{ + WIFI_LOGI("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); + bool isSupported = false; + ErrCode ret = IsHotspotDualBandSupported(isSupported); + reply.WriteInt32(0); + reply.WriteInt32(ret); + if (ret == WIFI_OPT_SUCCESS) { + reply.WriteInt32(isSupported ? 1 : 0); + } + return; +} + void WifiHotspotStub::OnGetApStateWifi(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) { WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.h index f0c98e3..fd30474 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.h @@ -57,6 +57,7 @@ private: void OnGetSupportedPowerModel(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option); void OnGetPowerModel(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option); void OnSetPowerModel(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option); + void OnIsHotspotDualBandSupported(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option); private: HandleFuncMap handleFuncMap; -- Gitee From db3210148c38b256e398d386581b2701a94f7bee Mon Sep 17 00:00:00 2001 From: lujunxin Date: Tue, 14 Jun 2022 20:50:33 +0800 Subject: [PATCH 180/491] connect AP with EAP-TLS security Signed-off-by: lujunxin --- wifi/frameworks/native/interfaces/wifi_msg.h | 10 +++++++++- wifi/frameworks/native/src/wifi_device_proxy.cpp | 6 +++++- .../common/config/wifi_config_file_spec.cpp | 8 ++++++++ .../idl_client/idl_interface/i_wifi_struct.h | 4 +++- .../wifi_manage/idl_client/wifi_idl_client.cpp | 4 +++- .../wifi_manage/idl_client/wifi_idl_struct.h | 4 +++- .../wifi_manage/wifi_device_service_impl.cpp | 15 +++++++++++++++ .../wifi_manage/wifi_device_stub.cpp | 6 +++++- .../wifi_manage/wifi_sta/sta_state_machine.cpp | 8 +++++++- .../wifi_standard/wifi_hal/wifi_hal_define.h | 2 ++ .../wpa_sta_hal/wifi_supplicant_hal.c | 4 +++- 11 files changed, 63 insertions(+), 8 deletions(-) diff --git a/wifi/frameworks/native/interfaces/wifi_msg.h b/wifi/frameworks/native/interfaces/wifi_msg.h index 4c039ae..acf38d1 100644 --- a/wifi/frameworks/native/interfaces/wifi_msg.h +++ b/wifi/frameworks/native/interfaces/wifi_msg.h @@ -36,6 +36,12 @@ const std::string KEY_MGMT_NONE = "NONE"; const std::string KEY_MGMT_WEP = "WEP"; const std::string KEY_MGMT_WPA_PSK = "WPA-PSK"; const std::string KEY_MGMT_SAE = "SAE"; +const std::string KEY_MGMT_EAP = "WPA-EAP"; + +const std::string EAP_METHOD_TLS = "TLS"; +const std::string EAP_METHOD_TTLS = "TTLS"; +const std::string EAP_METHOD_SIM = "SIM"; +const std::string EAP_METHOD_PEAP = "PEAP"; enum class SupplicantState { DISCONNECTED = 0, @@ -266,6 +272,8 @@ public: std::string eap; /* EAP mode Encryption Mode: PEAP/TLS/TTLS/PWD/SIM/AKA/AKA */ std::string identity; /* EAP mode identity */ std::string password; /* EAP mode password */ + std::string clientCert; /* EAP mode client certificate */ + std::string privateKey; /* EAP mode client private key */ }; enum class ConfigureProxyMethod { AUTOCONFIGUE, MANUALCONFIGUE, CLOSED }; @@ -442,4 +450,4 @@ struct IpInfo { }; } // namespace Wifi } // namespace OHOS -#endif \ No newline at end of file +#endif diff --git a/wifi/frameworks/native/src/wifi_device_proxy.cpp b/wifi/frameworks/native/src/wifi_device_proxy.cpp index 6a8d65f..4a743c4 100644 --- a/wifi/frameworks/native/src/wifi_device_proxy.cpp +++ b/wifi/frameworks/native/src/wifi_device_proxy.cpp @@ -232,6 +232,8 @@ void WifiDeviceProxy::WriteDeviceConfig(const WifiDeviceConfig &config, MessageP data.WriteCString(config.wifiEapConfig.eap.c_str()); data.WriteCString(config.wifiEapConfig.identity.c_str()); data.WriteCString(config.wifiEapConfig.password.c_str()); + data.WriteCString(config.wifiEapConfig.clientCert.c_str()); + data.WriteCString(config.wifiEapConfig.privateKey.c_str()); data.WriteInt32((int)config.wifiProxyconfig.configureMethod); data.WriteCString(config.wifiProxyconfig.autoProxyConfig.pacWebAddress.c_str()); data.WriteCString(config.wifiProxyconfig.manualProxyConfig.serverHostName.c_str()); @@ -413,6 +415,8 @@ void WifiDeviceProxy::ParseDeviceConfigs(MessageParcel &reply, std::vector &remoteObject) } } } // namespace Wifi -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp b/wifi/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp index 43ec488..5091a98 100644 --- a/wifi/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp +++ b/wifi/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp @@ -67,6 +67,8 @@ static void ClearWifiDeviceConfigEap(WifiDeviceConfig &item) item.wifiEapConfig.eap.clear(); item.wifiEapConfig.identity.clear(); item.wifiEapConfig.password.clear(); + item.wifiEapConfig.clientCert.clear(); + item.wifiEapConfig.privateKey.clear(); return; } @@ -197,6 +199,10 @@ static void SetWifiDeviceConfigEap(WifiDeviceConfig &item, const std::string &ke item.wifiEapConfig.identity = value; } else if (key == "wifiEapConfig.password") { item.wifiEapConfig.password = value; + } else if (key == "wifiEapConfig.clientCert") { + item.wifiEapConfig.clientCert = value; + } else if (key == "wifiEapConfig.privateKey") { + item.wifiEapConfig.privateKey = value; } return; } @@ -314,6 +320,8 @@ static std::string OutPutWifiDeviceConfigEap(WifiDeviceConfig &item) ss << "wifiEapConfig.eap=" << item.wifiEapConfig.eap << std::endl; ss << "wifiEapConfig.identity=" << item.wifiEapConfig.identity << std::endl; ss << "wifiEapConfig.password=" << item.wifiEapConfig.password << std::endl; + ss << "wifiEapConfig.clientCert=" << item.wifiEapConfig.clientCert << std::endl; + ss << "wifiEapConfig.privateKey=" << item.wifiEapConfig.privateKey << std::endl; return ss.str(); } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_struct.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_struct.h index 185998b..6502383 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_struct.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_struct.h @@ -143,6 +143,8 @@ typedef enum DeviceConfigType { DEVICE_CONFIG_WEP_KEY_1 = 12, DEVICE_CONFIG_WEP_KEY_2 = 13, DEVICE_CONFIG_WEP_KEY_3 = 14, + DEVICE_CONFIG_EAP_CLIENT_CERT = 15, + DEVICE_CONFIG_EAP_PRIVATE_KEY = 16, DEVICE_CONFIG_END_POS, /* Number of network configuration parameters, which is used as the last parameter. */ } DeviceConfigType; @@ -311,4 +313,4 @@ typedef struct Hid2dConnectInfo { #ifdef __cplusplus } #endif -#endif \ No newline at end of file +#endif diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp index 2b5e700..c0f5eb4 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp @@ -494,6 +494,8 @@ WifiErrorNo WifiIdlClient::SetDeviceConfig(int networkId, const WifiIdlDeviceCon num += PushDeviceConfigString(conf + num, DEVICE_CONFIG_EAP, config.eap); num += PushDeviceConfigString(conf + num, DEVICE_CONFIG_IDENTITY, config.identity); num += PushDeviceConfigString(conf + num, DEVICE_CONFIG_PASSWORD, config.password); + num += PushDeviceConfigString(conf + num, DEVICE_CONFIG_EAP_CLIENT_CERT, config.clientCert); + num += PushDeviceConfigString(conf + num, DEVICE_CONFIG_EAP_PRIVATE_KEY, config.privateKey); num += PushDeviceConfigString(conf + num, DEVICE_CONFIG_BSSID, config.bssid); int i = 0; num += PushDeviceConfigString(conf + num, DEVICE_CONFIG_WEP_KEY_0, config.wepKeys[i++]); @@ -1641,4 +1643,4 @@ WifiErrorNo WifiIdlClient::ReqP2pHid2dConnect(const Hid2dConnectConfig &config) return ret; } } // namespace Wifi -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_struct.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_struct.h index fa562c5..f671bbf 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_struct.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_struct.h @@ -47,6 +47,8 @@ struct WifiIdlDeviceConfig { std::string eap; std::string identity; std::string password; + std::string clientCert; + std::string privateKey; std::string bssid; WifiIdlDeviceConfig() : networkId(-1), priority(-1), scanSsid(-1), authAlgorithms(-1), wepKeyIdx(-1) @@ -213,4 +215,4 @@ struct IdlP2pGroupConfig { }; } // namespace Wifi } // namespace OHOS -#endif \ No newline at end of file +#endif diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp index c8844d7..d129013 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp @@ -258,6 +258,21 @@ bool WifiDeviceServiceImpl::CheckConfigPwd(const WifiDeviceConfig &config) return false; } + if (config.keyMgmt == KEY_MGMT_EAP) { + if (config.wifiEapConfig.eap == EAP_METHOD_TLS) { + if (config.wifiEapConfig.identity.empty() || + config.wifiEapConfig.clientCert.empty() || + config.wifiEapConfig.privateKey.empty()) { + WIFI_LOGE("CheckConfigPwd: with invalid TLS params!"); + return false; + } else { + return true; + } + } else { + WIFI_LOGE("EAP:%{public}s unsupported!", config.wifiEapConfig.eap.c_str()); + } + } + if (config.keyMgmt != KEY_MGMT_NONE && config.preSharedKey.empty()) { WIFI_LOGE("CheckConfigPwd: preSharedKey is empty!"); return false; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp index 3b7d7a3..884751f 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp @@ -209,6 +209,8 @@ void WifiDeviceStub::ReadWifiDeviceConfig(MessageParcel &data, WifiDeviceConfig config.wifiEapConfig.eap = data.ReadCString(); config.wifiEapConfig.identity = data.ReadCString(); config.wifiEapConfig.password = data.ReadCString(); + config.wifiEapConfig.clientCert = data.ReadCString(); + config.wifiEapConfig.privateKey = data.ReadCString(); config.wifiProxyconfig.configureMethod = ConfigureProxyMethod(data.ReadInt32()); config.wifiProxyconfig.autoProxyConfig.pacWebAddress = data.ReadCString(); config.wifiProxyconfig.manualProxyConfig.serverHostName = data.ReadCString(); @@ -266,6 +268,8 @@ void WifiDeviceStub::WriteWifiDeviceConfig(MessageParcel &reply, const WifiDevic reply.WriteCString(config.wifiEapConfig.eap.c_str()); reply.WriteCString(config.wifiEapConfig.identity.c_str()); reply.WriteCString(config.wifiEapConfig.password.c_str()); + reply.WriteCString(config.wifiEapConfig.clientCert.c_str()); + reply.WriteCString(config.wifiEapConfig.privateKey.c_str()); reply.WriteInt32((int)config.wifiProxyconfig.configureMethod); reply.WriteCString(config.wifiProxyconfig.autoProxyConfig.pacWebAddress.c_str()); reply.WriteCString(config.wifiProxyconfig.manualProxyConfig.serverHostName.c_str()); @@ -631,4 +635,4 @@ void WifiDeviceStub::OnSetLowLatencyMode(uint32_t code, MessageParcel &data, Mes reply.WriteBool(SetLowLatencyMode(enabled)); } } // namespace Wifi -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp index 6a59d75..4f85d91 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp @@ -331,6 +331,8 @@ ErrCode StaStateMachine::ConvertDeviceCfg(const WifiDeviceConfig &config) const idlConfig.eap = config.wifiEapConfig.eap; idlConfig.identity = config.wifiEapConfig.identity; idlConfig.password = config.wifiEapConfig.password; + idlConfig.clientCert = config.wifiEapConfig.clientCert; + idlConfig.privateKey = config.wifiEapConfig.privateKey; idlConfig.wepKeyIdx = config.wepTxKeyIndex; for (int i = 0; i < MAX_WEPKEYS_SIZE; i++) { idlConfig.wepKeys[i] = config.wepKeys[i]; @@ -1133,6 +1135,8 @@ void StaStateMachine::DealStartRoamCmd(InternalMessage *msg) idlConfig.eap = network.wifiEapConfig.eap; idlConfig.identity = network.wifiEapConfig.identity; idlConfig.password = network.wifiEapConfig.password; + idlConfig.clientCert = network.wifiEapConfig.clientCert; + idlConfig.privateKey = network.wifiEapConfig.privateKey; if (WifiStaHalInterface::GetInstance().SetDeviceConfig(linkedInfo.networkId, idlConfig) != WIFI_IDL_OPT_OK) { WIFI_LOGE("DealStartRoamCmd SetDeviceConfig() failed!"); @@ -1557,6 +1561,8 @@ void StaStateMachine::SyncAllDeviceConfigs() idlConfig.eap = it->wifiEapConfig.eap; idlConfig.identity = it->wifiEapConfig.identity; idlConfig.password = it->wifiEapConfig.password; + idlConfig.clientCert = it->wifiEapConfig.clientCert; + idlConfig.privateKey = it->wifiEapConfig.privateKey; if (WifiStaHalInterface::GetInstance().SetDeviceConfig(it->networkId, idlConfig) != WIFI_IDL_OPT_OK) { WIFI_LOGE("SetDeviceConfig failed!"); } @@ -2048,4 +2054,4 @@ void StaStateMachine::SetOperationalMode(int mode) SendMessage(WIFI_SVR_CMD_STA_OPERATIONAL_MODE, mode, 0); } } // namespace Wifi -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_define.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_define.h index f913ebe..4a27b24 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_define.h +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_define.h @@ -148,6 +148,8 @@ typedef enum DeviceConfigType { DEVICE_CONFIG_WEP_KEY_1 = 12, DEVICE_CONFIG_WEP_KEY_2 = 13, DEVICE_CONFIG_WEP_KEY_3 = 14, + DEVICE_CONFIG_EAP_CLIENT_CERT = 15, + DEVICE_CONFIG_EAP_PRIVATE_KEY = 16, /** * Number of network configuration parameters, which is used as the last * parameter. diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c index d19bd40..c1cd598 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c @@ -57,7 +57,9 @@ static WpaSsidField g_wpaSsidFields[] = { {DEVICE_CONFIG_WEP_KEY_0, "wep_key0", QUOTATION_MARKS_FLAG_NO}, {DEVICE_CONFIG_WEP_KEY_1, "wep_key1", QUOTATION_MARKS_FLAG_NO}, {DEVICE_CONFIG_WEP_KEY_2, "wep_key2", QUOTATION_MARKS_FLAG_NO}, - {DEVICE_CONFIG_WEP_KEY_3, "wep_key3", QUOTATION_MARKS_FLAG_NO} + {DEVICE_CONFIG_WEP_KEY_3, "wep_key3", QUOTATION_MARKS_FLAG_NO}, + {DEVICE_CONFIG_EAP_CLIENT_CERT, "client_cert", QUOTATION_MARKS_FLAG_YES}, + {DEVICE_CONFIG_EAP_PRIVATE_KEY, "private_key", QUOTATION_MARKS_FLAG_YES} }; static int WpaCliCmdStatus(WifiWpaStaInterface *this, struct WpaHalCmdStatus *pcmd) -- Gitee From d5b892f9be1b8ddb6fbe66d7029ddbaee6e288ec Mon Sep 17 00:00:00 2001 From: guyuanzhang Date: Wed, 15 Jun 2022 10:03:02 +0800 Subject: [PATCH 181/491] IssueNo: #I5C8Z7 Description: fix aafwk_lite path to ability_lite Sig: SIG_ApplicationFramework Feature or Bugfix: Feature Binary Source: No Signed-off-by: guyuanzhang Change-Id: Ie0874c1f6a42270bf95fd36d62b9f619542043a9 --- .../wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn index 4a4a411..9164bc8 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn @@ -101,7 +101,7 @@ ohos_unittest("wifi_sta_unittest") { "//foundation/arkui/ace_engine/frameworks/base/utils", "//foundation/arkui/ace_engine/frameworks", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk/", - "//foundation/aafwk/aafwk_lite/interfaces/kits/want_lite/", + "//foundation/ability/ability_lite/interfaces/kits/want_lite/", "$WIFI_ROOT_DIR/utils/inc", ] -- Gitee From d55ebae4ea65915732c1a715f905b3ceb34914be Mon Sep 17 00:00:00 2001 From: y00316381 Date: Wed, 15 Jun 2022 10:45:09 +0800 Subject: [PATCH 182/491] bugfix from master 0615 Signed-off-by: y00316381 --- .../wifi_manage/common/wifi_permission_helper.cpp | 2 +- .../wifi_manage/wifi_p2p_service_impl.cpp | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_helper.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_helper.cpp index 2210916..c4ddd9f 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_helper.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_helper.cpp @@ -245,7 +245,7 @@ int WifiPermissionHelper::VerifyWifiConnectionPermission(const int &pid, const i int WifiPermissionHelper::VerifyGetWifiDirectDevicePermission(const int &pid, const int &uid) { - if (VerifyPermission("ohos.permission.GET_P2P_DEVICE_LOCATION", pid, uid) == PERMISSION_DENIED) { + if (VerifyPermission("ohos.permission.LOCATION", pid, uid) == PERMISSION_DENIED) { return PERMISSION_DENIED; } return PERMISSION_GRANTED; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp index 78c4d81..d6b8299 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp @@ -660,9 +660,17 @@ ErrCode WifiP2pServiceImpl::QueryP2pLocalDevice(WifiP2pDevice &device) ErrCode WifiP2pServiceImpl::QueryP2pGroups(std::vector &groups) { WIFI_LOGI("QueryP2pGroups"); - if (WifiPermissionUtils::VerifyGetWifiDirectDevicePermission() == PERMISSION_DENIED) { - WIFI_LOGE("QueryP2pGroups:VerifyGetWifiDirectDevicePermission PERMISSION_DENIED!"); - return WIFI_OPT_PERMISSION_DENIED; + if (WifiPermissionUtils::VerifyGetWifiInfoInternalPermission() == PERMISSION_DENIED) { + WIFI_LOGE("QueryP2pGroups:VerifyGetWifiInfoInternalPermission PERMISSION_DENIED!"); + if (WifiPermissionUtils::VerifyGetWifiDirectDevicePermission() == PERMISSION_DENIED) { + WIFI_LOGE("QueryP2pGroups:VerifyGetWifiDirectDevicePermission PERMISSION_DENIED!"); + return WIFI_OPT_PERMISSION_DENIED; + } + + if (WifiPermissionUtils::VerifyGetWifiInfoPermission() == PERMISSION_DENIED) { + WIFI_LOGE("QueryP2pGroups:VerifyGetWifiInfoPermission PERMISSION_DENIED!"); + return WIFI_OPT_PERMISSION_DENIED; + } } if (!IsP2pServiceRunning()) { -- Gitee From 0e9564dd741d4397a6c85dabe2900cd3ffb91d79 Mon Sep 17 00:00:00 2001 From: fanchao Date: Wed, 15 Jun 2022 19:24:00 -0700 Subject: [PATCH 183/491] wifi scan info patch. Signed-off-by: fanchao --- wifi/frameworks/js/napi/inc/wifi_napi_utils.h | 2 + .../js/napi/src/wifi_napi_device.cpp | 50 ++- .../js/napi/src/wifi_napi_utils.cpp | 11 +- wifi/frameworks/native/interfaces/wifi_msg.h | 1 + .../native/src/wifi_device_proxy.cpp | 1 + .../idl_interface/i_wifi_sta_iface.c | 25 ++ .../idl_client/wifi_idl_client.cpp | 18 + .../wifi_manage/wifi_device_stub.cpp | 1 + .../wifi_sta/sta_state_machine.cpp | 2 + .../wifi_hal/wifi_hal_crpc_sta.c | 10 + .../wpa_sta_hal/wifi_supplicant_hal.c | 362 +++++++++++++++++- .../wpa_sta_hal/wifi_supplicant_hal.h | 6 + 12 files changed, 477 insertions(+), 12 deletions(-) diff --git a/wifi/frameworks/js/napi/inc/wifi_napi_utils.h b/wifi/frameworks/js/napi/inc/wifi_napi_utils.h index 5a2a521..00a5e54 100644 --- a/wifi/frameworks/js/napi/inc/wifi_napi_utils.h +++ b/wifi/frameworks/js/napi/inc/wifi_napi_utils.h @@ -79,6 +79,8 @@ napi_value JsObjectToString(const napi_env& env, const napi_value& object, napi_value JsObjectToInt(const napi_env& env, const napi_value& object, const char* fieldStr, int& fieldRef); napi_value JsObjectToUint(const napi_env& env, const napi_value& object, const char* fieldStr, uint32_t& fieldRef); napi_value JsObjectToBool(const napi_env& env, const napi_value& object, const char* fieldStr, bool& fieldRef); +napi_status SetValueUtf8String(const napi_env& env, const char* fieldStr, const char* str, + size_t strLen, napi_value& result); napi_status SetValueUtf8String(const napi_env& env, const char* fieldStr, const char* str, napi_value& result); napi_status SetValueInt32(const napi_env& env, const char* fieldStr, const int intValue, napi_value& result); napi_status SetValueUnsignedInt32(const napi_env& env, const char* fieldStr, const int intValue, napi_value& result); diff --git a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp index fad7159..bb80e74 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp @@ -97,6 +97,50 @@ static SecTypeJs SecurityTypeNativeToJs(const WifiSecurity& cppSecurityType) return jsSecurityType; } +static ErrCode NativeInfoElemsToJsObj(const napi_env& env, + const std::vector& infoElems, napi_value& eachObj) +{ + napi_value arr; + napi_create_array(env, &arr); + uint8_t idx_ie = 0; + napi_status status; + for (int i = 0; i < infoElems.size(); i++) { + napi_value ieObj; + napi_create_object(env, &ieObj); + SetValueInt32(env, "eid", infoElems[i].id, ieObj); + const char *uStr = &infoElems[i].content[0]; + int len = infoElems[i].content.size(); + int inLen = (infoElems[i].content.size())*2 + 1; + char *buf = (char *)calloc(inLen + 1, sizeof(char)); + if (buf == NULL) { + return WIFI_OPT_FAILED; + } + int pos = 0; + for (unsigned int i = 0; i < len; ++i) { + pos = (i << 1); + if (snprintf_s(buf + pos, inLen - pos, inLen - pos - 1, "%02x", uStr[i]) < 0) { + free(buf); + buf = NULL; + return WIFI_OPT_FAILED; + } + } + SetValueUtf8String(env, "content", (const char *)buf, inLen - 1, ieObj); + status = napi_set_element(env, arr, idx_ie++, ieObj); + if (status != napi_ok) { + WIFI_LOGE("set content error"); + return WIFI_OPT_FAILED; + } + free(buf); + buf = NULL; + } + status = napi_set_named_property(env, eachObj, "infoElems", arr); + if (status != napi_ok) { + WIFI_LOGE("set infoElems error"); + return WIFI_OPT_FAILED; + } + return WIFI_OPT_SUCCESS; +} + static ErrCode NativeScanInfosToJsObj(const napi_env& env, const std::vector& vecScnIanfos, napi_value& arrayResult) { @@ -104,7 +148,6 @@ static ErrCode NativeScanInfosToJsObj(const napi_env& env, for (auto& each : vecScnIanfos) { napi_value eachObj; napi_create_object(env, &eachObj); - SetValueUtf8String(env, "ssid", each.ssid.c_str(), eachObj); SetValueUtf8String(env, "bssid", each.bssid.c_str(), eachObj); SetValueUtf8String(env, "capabilities", each.capabilities.c_str(), eachObj); @@ -113,8 +156,10 @@ static ErrCode NativeScanInfosToJsObj(const napi_env& env, SetValueInt32(env, "band", each.band, eachObj); SetValueInt32(env, "frequency", each.frequency, eachObj); SetValueInt32(env, "channelWidth", static_cast(each.channelWidth), eachObj); + SetValueInt32(env, "centerFrequency0", each.centerFrequency0, eachObj); + SetValueInt32(env, "centerFrequency1", each.centerFrequency1, eachObj); + NativeInfoElemsToJsObj(env, each.infoElems, eachObj); SetValueInt64(env, "timestamp", each.timestamp, eachObj); - napi_status status = napi_set_element(env, arrayResult, idx++, eachObj); if (status != napi_ok) { WIFI_LOGE("Wifi napi set element error: %{public}d, idx: %{public}d", status, idx - 1); @@ -588,6 +633,7 @@ static void LinkedInfoToJs(const napi_env& env, WifiLinkedInfo& linkedInfo, napi SetValueInt32(env, "chload", linkedInfo.chload, result); SetValueInt32(env, "snr", linkedInfo.snr, result); SetValueUtf8String(env, "macAddress", linkedInfo.macAddress.c_str(), result); + SetValueInt32(env, "macType", linkedInfo.macType, result); SetValueUnsignedInt32(env, "ipAddress", linkedInfo.ipAddress, result); SetValueInt32(env, "suppState", static_cast(linkedInfo.supplicantState), result); SetValueInt32(env, "connState", static_cast(linkedInfo.connState), result); diff --git a/wifi/frameworks/js/napi/src/wifi_napi_utils.cpp b/wifi/frameworks/js/napi/src/wifi_napi_utils.cpp index 6755d81..b68da1b 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_utils.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_utils.cpp @@ -136,10 +136,12 @@ napi_value JsObjectToBool(const napi_env& env, const napi_value& object, const c return UndefinedNapiValue(env); } -napi_status SetValueUtf8String(const napi_env& env, const char* fieldStr, const char* str, napi_value& result) +napi_status SetValueUtf8String(const napi_env& env, const char* fieldStr, const char* str, + size_t strLen, napi_value& result) { napi_value value; - napi_status status = napi_create_string_utf8(env, str, NAPI_AUTO_LENGTH, &value); + size_t len = strLen ? strLen : NAPI_AUTO_LENGTH; + napi_status status = napi_create_string_utf8(env, str, len, &value); if (status != napi_ok) { WIFI_LOGE("Set value create utf8 string error! field: %{public}s", fieldStr); return status; @@ -151,6 +153,11 @@ napi_status SetValueUtf8String(const napi_env& env, const char* fieldStr, const return status; } +napi_status SetValueUtf8String(const napi_env& env, const char* fieldStr, const char* str, napi_value& result) +{ + return SetValueUtf8String(env, fieldStr, str, 0, result); +} + napi_status SetValueInt32(const napi_env& env, const char* fieldStr, const int intValue, napi_value& result) { napi_value value; diff --git a/wifi/frameworks/native/interfaces/wifi_msg.h b/wifi/frameworks/native/interfaces/wifi_msg.h index 4c039ae..4abaf29 100644 --- a/wifi/frameworks/native/interfaces/wifi_msg.h +++ b/wifi/frameworks/native/interfaces/wifi_msg.h @@ -112,6 +112,7 @@ struct WifiLinkedInfo { int frequency; int linkSpeed; /* units: Mbps */ std::string macAddress; + int macType; unsigned int ipAddress; ConnState connState; bool ifHiddenSSID; diff --git a/wifi/frameworks/native/src/wifi_device_proxy.cpp b/wifi/frameworks/native/src/wifi_device_proxy.cpp index 6a8d65f..d0cf78a 100644 --- a/wifi/frameworks/native/src/wifi_device_proxy.cpp +++ b/wifi/frameworks/native/src/wifi_device_proxy.cpp @@ -791,6 +791,7 @@ void WifiDeviceProxy::ReadLinkedInfo(MessageParcel &reply, WifiLinkedInfo &info) info.frequency = reply.ReadInt32(); info.linkSpeed = reply.ReadInt32(); info.macAddress = reply.ReadCString(); + info.macType = reply.ReadInt32(); info.ipAddress = reply.ReadInt32(); int tmpConnState = reply.ReadInt32(); if ((tmpConnState >= 0) && (tmpConnState <= (int)ConnState::UNKNOWN)) { diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.c b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.c index 615552a..7c1e63f 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.c +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.c @@ -450,6 +450,27 @@ WifiErrorNo GetNetworkList(WifiNetworkInfo *infos, int *size) return result; } +static void GetScanInfoElems(Context *context, ScanInfo* scanInfo) +{ + ReadInt(context, &scanInfo->ieSize); + /* This pointer will be released in its client */ + scanInfo->infoElems = (ScanInfoElem *)calloc(scanInfo->ieSize, sizeof(ScanInfoElem)); + if (scanInfo->infoElems == NULL) { + return; + } + for (int i = 0; i < scanInfo->ieSize; ++i) { + ReadInt(context, (int *)&scanInfo->infoElems[i].id); + ReadInt(context, &scanInfo->infoElems[i].size); + /* This pointer will be released in its client */ + scanInfo->infoElems[i].content = calloc(scanInfo->infoElems[i].size + 1, sizeof(char)); + if (scanInfo->infoElems[i].content == NULL) { + return; + } + ReadUStr(context, (unsigned char *)scanInfo->infoElems[i].content, + scanInfo->infoElems[i].size+1); + } +} + ScanInfo* GetScanInfos(int *size) { RpcClient *client = GetStaRpcClient(); @@ -480,6 +501,10 @@ ScanInfo* GetScanInfos(int *size) ReadStr(context, scanInfos[i].capability, WIFI_SCAN_INFO_CAPABILITIES_LENGTH); ReadStr(context, scanInfos[i].ssid, WIFI_SSID_LENGTH); ReadInt64(context, &scanInfos[i].timestamp); + ReadInt(context, &scanInfos[i].channelWidth); + ReadInt(context, &scanInfos[i].centerFrequency0); + ReadInt(context, &scanInfos[i].centerFrequency1); + GetScanInfoElems(context, &scanInfos[i]); } } else { LOGE("GetScanInfos alloc mem failed!"); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp index 2b5e700..203a42d 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp @@ -286,6 +286,24 @@ WifiErrorNo WifiIdlClient::QueryScanInfos(std::vector &scanInfos) tmp.rssi = results[i].signalLevel; tmp.timestamp = results[i].timestamp; tmp.capabilities = results[i].capability; + tmp.channelWidth = (WifiChannelWidth)results[i].channelWidth; + tmp.centerFrequency0 = results[i].centerFrequency0; + tmp.centerFrequency1 = results[i].centerFrequency1; + for (int j = 0; j < results[i].ieSize; ++j) { + WifiInfoElem infoElemTmp; + int infoElemSize = results[i].infoElems[j].size; + infoElemTmp.id = results[i].infoElems[j].id; + for (int k = 0; k < infoElemSize; ++k) { + infoElemTmp.content.emplace_back(results[i].infoElems[j].content[k]); + } + if (results[i].infoElems[j].content) { + free(results[i].infoElems[j].content); + } + tmp.infoElems.emplace_back(infoElemTmp); + } + if (results[i].infoElems) { + free(results[i].infoElems); + } scanInfos.emplace_back(tmp); } free(results); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp index 3b7d7a3..c1045ce 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp @@ -479,6 +479,7 @@ void WifiDeviceStub::OnGetLinkedInfo(uint32_t code, MessageParcel &data, Message reply.WriteInt32(wifiInfo.frequency); reply.WriteInt32(wifiInfo.linkSpeed); reply.WriteCString(wifiInfo.macAddress.c_str()); + reply.WriteInt32(wifiInfo.macType); reply.WriteInt32(wifiInfo.ipAddress); reply.WriteInt32((int)wifiInfo.connState); reply.WriteBool(wifiInfo.ifHiddenSSID); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp index 6a59d75..eb1e572 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp @@ -182,6 +182,7 @@ void StaStateMachine::InitWifiLinkedInfo() linkedInfo.ssid = ""; linkedInfo.bssid = ""; linkedInfo.macAddress = ""; + linkedInfo.macType = 0; linkedInfo.rxLinkSpeed = 0; linkedInfo.txLinkSpeed = 0; linkedInfo.rssi = 0; @@ -204,6 +205,7 @@ void StaStateMachine::InitLastWifiLinkedInfo() lastLinkedInfo.ssid = ""; lastLinkedInfo.bssid = ""; lastLinkedInfo.macAddress = ""; + linkedInfo.macType = 0; lastLinkedInfo.rxLinkSpeed = 0; lastLinkedInfo.txLinkSpeed = 0; lastLinkedInfo.rssi = 0; diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_sta.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_sta.c index 2816e1e..9aa4c3c 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_sta.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_sta.c @@ -127,6 +127,16 @@ int RpcGetScanInfos(RpcServer *server, Context *context) WriteStr(context, results[i].ssid); int64_t currTime = (int64_t)clockTime.tv_sec * secComplex * secComplex + clockTime.tv_nsec / secComplex; WriteInt64(context, currTime); + WriteInt(context, results[i].channelWidth); + WriteInt(context, results[i].centerFrequency0); + WriteInt(context, results[i].centerFrequency1); + WriteInt(context, results[i].ieSize); + for (int j = 0; j < results[i].ieSize; ++j) { + WriteInt(context, results[i].infoElems[j].id); + WriteInt(context, results[i].infoElems[j].size); + WriteUStr(context, (unsigned char *)results[i].infoElems[j].content, results[i].infoElems[j].size); + free(results[i].infoElems[j].content); + } if (results[i].infoElems != NULL) { free(results[i].infoElems); results[i].infoElems = NULL; diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c index d19bd40..40a6cd3 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c @@ -16,6 +16,7 @@ #include "wifi_supplicant_hal.h" #include #include +#include #include "wifi_hal_callback.h" #include "securec.h" #include "wifi_log.h" @@ -31,6 +32,8 @@ #define SCAN_INFO_ONE 1 #define SCAN_INFO_TWO 2 #define SCAN_INFO_THREE 3 +#define SCAN_INFO_FOUR 4 +#define SCAN_INFO_FIVE 5 #define FAIL_PBC_OVERLAP_RETUEN 3 #define CMD_BUFFER_SIZE 1024 #define REPLY_BUF_LENGTH (4096 * 10) @@ -40,6 +43,30 @@ const int QUOTATION_MARKS_FLAG_YES = 0; const int QUOTATION_MARKS_FLAG_NO = 1; +const unsigned int HT_OPER_EID = 61; +const unsigned int VHT_OPER_EID = 192; +const unsigned int EXT_EXIST_EID = 255; +const unsigned int EXT_HE_OPER_EID = 36; +const unsigned int HE_OPER_BASIC_LEN = 6; +const unsigned int VHT_OPER_INFO_EXTST_MASK = 0x40; +const unsigned int GHZ_HE_INFO_EXIST_MASK_6 = 0x02; +const unsigned int GHZ_HE_WIDTH_MASK_6 = 0x03; +const unsigned int BSS_EXIST_MASK = 0x80; +const unsigned int VHT_OPER_INFO_BEGIN_INDEX = 6; +const unsigned int VHT_INFO_SIZE = 3; +const unsigned int HT_INFO_SIZE = 3; +const unsigned int UINT8_MASK = 0xFF; +const unsigned int UNSPECIFIED = -1; +const unsigned int MAX_INFO_ELEMS_SIZE = 256; + +const unsigned int BAND_5_GHZ = 2; +const unsigned int BAND_6_GHZ = 8; +const unsigned int CHAN_WIDTH_20MHZ = 0; +const unsigned int CHAN_WIDTH_40MHZ = 1; +const unsigned int CHAN_WIDTH_80MHZ = 2; +const unsigned int CHAN_WIDTH_160MHZ = 3; +const unsigned int CHAN_WIDTH_80MHZ_MHZ = 4; + WifiWpaStaInterface *g_wpaStaInterface = NULL; static WpaSsidField g_wpaSsidFields[] = { @@ -710,6 +737,331 @@ static int WpaCliCmdScan(WifiWpaStaInterface *this, const ScanSettings *settings return 0; } +static int ConvertChanToFreqMhz(int channel, int band) +{ + int BAND_FIRST_CH_NUM_24 = 1; + int BAND_LAST_CH_NUM_24 = 14; + int BAND_START_FREQ_MHZ_24 = 2412; + int BAND_FIRST_CH_NUM_5 = 32; + int BAND_LAST_CH_NUM_5 = 173; + int BAND_START_FREQ_MHZ_5 = 5160; + int BAND_FIRST_CH_NUM_6 = 1; + int BAND_LAST_CH_NUM_6 = 233; + int BAND_START_FREQ_MHZ_6 = 5955; + int BAND_CLA_2_FREQ_136_CH_MHZ_6 = 5935; + int BAND_24_GHZ = 1; + int BAND_SPECIAL = 2484; + int CHANNEL_SPECIAL = 14; + int CHANNEL_TIMES = 5; + int CHANNEL_TYPE = 2; + + if (band == BAND_24_GHZ) { + if (channel == CHANNEL_SPECIAL) { + return BAND_SPECIAL; + } else if (channel >= BAND_FIRST_CH_NUM_24 && channel <= BAND_LAST_CH_NUM_24) { + return ((channel - BAND_FIRST_CH_NUM_24) * CHANNEL_TIMES) + BAND_START_FREQ_MHZ_24; + } else { + return UNSPECIFIED; + } + } + if (band == BAND_5_GHZ) { + if (channel >= BAND_FIRST_CH_NUM_5 && channel <= BAND_LAST_CH_NUM_5) { + return ((channel - BAND_FIRST_CH_NUM_5) * CHANNEL_TIMES) + BAND_START_FREQ_MHZ_5; + } else { + return UNSPECIFIED; + } + } + if (band == BAND_6_GHZ) { + if (channel >= BAND_FIRST_CH_NUM_6 && channel <= BAND_LAST_CH_NUM_6) { + if (channel == CHANNEL_TYPE) { + return BAND_CLA_2_FREQ_136_CH_MHZ_6; + } + return ((channel - BAND_FIRST_CH_NUM_6) * CHANNEL_TIMES) + BAND_START_FREQ_MHZ_6; + } else { + return UNSPECIFIED; + } + } + return UNSPECIFIED; +} + +static int GetHeChanWidth(int heChannelWidth, int centerSegFreq0, int centerSegFreq1) +{ + int CHANNEL_WIDTH = 2; + int SEG_FREQ_VALUE = 8; + if (heChannelWidth == 0) { + return CHAN_WIDTH_20MHZ; + } else if (heChannelWidth == 1) { + return CHAN_WIDTH_40MHZ; + } else if (heChannelWidth == CHANNEL_WIDTH) { + return CHAN_WIDTH_80MHZ; + } else if (abs(centerSegFreq1 - centerSegFreq0) == SEG_FREQ_VALUE) { + return CHAN_WIDTH_160MHZ; + } else { + return CHAN_WIDTH_80MHZ_MHZ; + } +} + +static int GetHeCentFreq(int centerSegFreq) +{ + if (centerSegFreq == 0) { + return 0; + } + return ConvertChanToFreqMhz(centerSegFreq, BAND_6_GHZ); +} + +static int GetHtChanWidth(int secondOffsetChannel) +{ + if (secondOffsetChannel != 0) { + return CHAN_WIDTH_40MHZ; + } else { + return CHAN_WIDTH_20MHZ; + } +} + +static int GetHtCentFreq0(int primaryFrequency, int secondOffsetChannel) +{ + int freqValue = 10; + int offsetChannle = 3; + if (secondOffsetChannel != 0) { + if (secondOffsetChannel == 1) { + return primaryFrequency + freqValue; + } else if (secondOffsetChannel == offsetChannle) { + return primaryFrequency - freqValue; + } else { + LOGE("error on get centFreq0"); + return 0; + } + } else { + return primaryFrequency; + } +} + +static int GetVhtChanWidth(int channelType, int centerFrequencyIndex1, int centerFrequencyIndex2) +{ + int FREQ_VALUE = 8; + if (channelType == 0) { + return UNSPECIFIED; + } else if (centerFrequencyIndex2 == 0) { + return CHAN_WIDTH_80MHZ; + } else if (abs(centerFrequencyIndex1 - centerFrequencyIndex2) == FREQ_VALUE) { + return CHAN_WIDTH_160MHZ; + } else { + return CHAN_WIDTH_80MHZ_MHZ; + } +} + +static int GetVhtCentFreq(int channelType, int centerFrequencyIndex) +{ + if (centerFrequencyIndex == 0 || channelType == 0) { + return 0; + } else { + return ConvertChanToFreqMhz(centerFrequencyIndex, BAND_5_GHZ); + } +} + +static int8_t IsValidHexCharAndConvert(char c) +{ + if (c >= '0' && c <= '9') { + return c - '0'; + } + if (c >= 'a' && c <= 'f') { + return c - 'a' + ('9' - '0' + 1); + } + if (c >= 'A' && c <= 'F') { + return c - 'A' + ('9' - '0' + 1); + } + return -1; +} + +static int HexStringToString(const char *str, char *out) +{ + unsigned len = strlen(str); + if ((len & 1) != 0) { + return -1; + } + const int hexShiftNum = 4; + for (unsigned i = 0, j = 0; i + 1 < len; ++i) { + int8_t high = IsValidHexCharAndConvert(str[i]); + int8_t low = IsValidHexCharAndConvert(str[++i]); + if (high < 0 || low < 0) { + return -1; + } + char tmp = ((high << hexShiftNum) | (low & 0x0F)); + out[j] = tmp; + ++j; + } + return 0; +} + +static bool GetChanWidthCenterFreqVht(ScanInfo *pcmd, ScanInfoElem* infoElem) +{ + if ((pcmd == NULL) || (infoElem == NULL)) { + LOGE("pcmd or infoElem is NULL."); + return false; + } + if ((infoElem->content == NULL) || ((unsigned int)infoElem->size < VHT_INFO_SIZE)) { + return false; + } + int channelType = infoElem->content[SCAN_INFO_NONE] & UINT8_MASK; + int centerFrequencyIndex1 = infoElem->content[SCAN_INFO_ONE] & UINT8_MASK; + int centerFrequencyIndex2 = infoElem->content[SCAN_INFO_TWO] & UINT8_MASK; + pcmd->channelWidth = GetVhtChanWidth(channelType, centerFrequencyIndex1, centerFrequencyIndex2); + if ((unsigned int)pcmd->channelWidth == UNSPECIFIED) { + return false; + } + pcmd->centerFrequency0 = GetVhtCentFreq(channelType, centerFrequencyIndex1); + pcmd->centerFrequency1 = GetVhtCentFreq(channelType, centerFrequencyIndex2); + return true; +} + +static bool GetChanWidthCenterFreqHe(ScanInfo *pcmd, ScanInfoElem* infoElem) +{ + if ((pcmd == NULL) || (infoElem == NULL)) { + LOGE("pcmd or iesNeedParse is NULL."); + return false; + } + if ((infoElem->content == NULL) || ((unsigned int)infoElem->size < (HE_OPER_BASIC_LEN + 1))) { + return false; + } + if (infoElem->content[0] != EXT_HE_OPER_EID) { + return false; + } + char* content = infoElem->content + 1; + bool isVhtInfoExist = (content[SCAN_INFO_ONE] & VHT_OPER_INFO_EXTST_MASK) != 0; + bool is6GhzInfoExist = (content[SCAN_INFO_TWO] & GHZ_HE_INFO_EXIST_MASK_6) != 0; + bool coHostedBssPresent = (content[SCAN_INFO_ONE] & BSS_EXIST_MASK) != 0; + int expectedLen = HE_OPER_BASIC_LEN + (isVhtInfoExist ? SCAN_INFO_THREE : 0) + + (coHostedBssPresent ? 1 : 0) + (is6GhzInfoExist ? SCAN_INFO_FIVE: 0); + if (infoElem->size < expectedLen) { + return false; + } + if (is6GhzInfoExist) { + int startIndx = VHT_OPER_INFO_BEGIN_INDEX + (isVhtInfoExist ? SCAN_INFO_THREE : 0) + + (coHostedBssPresent ? 1 : 0); + int heChannelWidth = content[startIndx + 1] & GHZ_HE_WIDTH_MASK_6; + int centerSegFreq0 = content[startIndx + SCAN_INFO_TWO] & UINT8_MASK; + int centerSegFreq1 = content[startIndx + SCAN_INFO_THREE] & UINT8_MASK; + pcmd->channelWidth = GetHeChanWidth(heChannelWidth, centerSegFreq0, centerSegFreq1); + pcmd->centerFrequency0 = GetHeCentFreq(centerSegFreq0); + pcmd->centerFrequency1 = GetHeCentFreq(centerSegFreq1); + return true; + } + if (isVhtInfoExist) { + struct ScanInfoElem vhtInformation = {0}; + vhtInformation.id = VHT_OPER_EID; + vhtInformation.size = VHT_INFO_SIZE; + vhtInformation.content = content + VHT_OPER_INFO_BEGIN_INDEX; + return GetChanWidthCenterFreqVht(pcmd, &vhtInformation); + } + return false; +} + +static bool GetChanWidthCenterFreqHt(ScanInfo *pcmd, ScanInfoElem* infoElem) +{ + const int offsetBit = 0x3; + if ((pcmd == NULL) || (infoElem == NULL)) { + LOGE("pcmd or infoElem is NULL."); + return false; + } + if ((infoElem->content == NULL) || ((unsigned int)infoElem->size < HT_INFO_SIZE)) { + return false; + } + int secondOffsetChannel = infoElem->content[1] & offsetBit; + pcmd->channelWidth = GetHtChanWidth(secondOffsetChannel); + pcmd->centerFrequency0 = GetHtCentFreq0(pcmd->freq, secondOffsetChannel); + return true; +} + +static void GetChanWidthCenterFreq(ScanInfo *pcmd, struct NeedParseIe* iesNeedParse) +{ + if ((pcmd == NULL) || (iesNeedParse == NULL)) { + LOGE("pcmd or iesNeedParse is NULL."); + return; + } + + if ((iesNeedParse->ieExtern != NULL) && GetChanWidthCenterFreqHe(pcmd, iesNeedParse->ieExtern)) { + return; + } + if ((iesNeedParse->ieVhtOper != NULL) && GetChanWidthCenterFreqVht(pcmd, iesNeedParse->ieVhtOper)) { + return; + } + if ((iesNeedParse->ieHtOper != NULL) && GetChanWidthCenterFreqHt(pcmd, iesNeedParse->ieHtOper)) { + return; + } + + LOGE("GetChanWidthCenterFreq fail."); + return; +} + +static void RecordIeNeedParse(unsigned int id, ScanInfoElem* ie, struct NeedParseIe* iesNeedParse) +{ + if (iesNeedParse == NULL) { + return; + } + switch (id) { + case EXT_EXIST_EID: + iesNeedParse->ieExtern = ie; + break; + case VHT_OPER_EID: + iesNeedParse->ieVhtOper = ie; + break; + case HT_OPER_EID: + iesNeedParse->ieHtOper = ie; + break; + default: + break; + } +} + +static void GetInfoElems(int length, int end, char *srcBuf, ScanInfo *pcmd) +{ + int len; + int start = end + 1; + int last = end + 1; + int lenValue = 2; + int lastLength = 3; + int remainingLength = length - start; + int infoElemsSize = 0; + struct NeedParseIe iesNeedParse = {NULL}; + ScanInfoElem* infoElemsTemp = (ScanInfoElem *)calloc(MAX_INFO_ELEMS_SIZE, sizeof(ScanInfoElem)); + if (infoElemsTemp == NULL) { + return; + } + while (remainingLength > 1) { + if (srcBuf[start] == '[') { + ++start; + infoElemsTemp[infoElemsSize].id = atoi(srcBuf + start); + } + if (srcBuf[start] != ' ') { + ++start; + } + if (srcBuf[last] != ']') { + ++last; + continue; + } + len = last - start - 1; + infoElemsTemp[infoElemsSize].size = len/lenValue; + infoElemsTemp[infoElemsSize].content = (char *)calloc(len/lenValue+1, sizeof(char)); + if (infoElemsTemp[infoElemsSize].content == NULL) { + break; + } + ++start; + srcBuf[last] = '\0'; + HexStringToString(srcBuf + start, infoElemsTemp[infoElemsSize].content); + if ((length - last) > lastLength) { // make sure there is no useless character + last = last + 1; + } + start = last; + remainingLength = length - last; + RecordIeNeedParse(infoElemsTemp[infoElemsSize].id, &infoElemsTemp[infoElemsSize], &iesNeedParse); + ++infoElemsSize; + } + GetChanWidthCenterFreq(pcmd, &iesNeedParse); + pcmd->infoElems = infoElemsTemp; + pcmd->ieSize = infoElemsSize; + return; +} + static int DelScanInfoLine(ScanInfo *pcmd, char *srcBuf, int length) { int i = 0; @@ -736,19 +1088,13 @@ static int DelScanInfoLine(ScanInfo *pcmd, char *srcBuf, int length) fail = 1; break; } - start = end + 1; - char *res = strchr(srcBuf + start, '\t'); - if (res == NULL) { - /* after ssid, maybe some IEs are reported */ - LOGW("more IEs are reported, skip it for not support."); - } else { - *res = '\0'; - } + } else if (i == SCAN_INFO_FOUR) { if (strcpy_s(pcmd->ssid, sizeof(pcmd->ssid), srcBuf + start) != EOK) { fail = 1; break; } printf_decode((u8 *)pcmd->ssid, sizeof(pcmd->ssid), pcmd->ssid); + GetInfoElems(length, end, srcBuf, pcmd); start = length; break; } diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.h index 140d11b..ed96a4a 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.h +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.h @@ -64,6 +64,12 @@ struct WpaWpsPinArgv { char pinCode[WIFI_PIN_CODE_LENGTH + 1]; }; +struct NeedParseIe { + ScanInfoElem* ieExtern; + ScanInfoElem* ieVhtOper; + ScanInfoElem* ieHtOper; +}; + typedef struct WifiWpaStaInterface WifiWpaStaInterface; struct WifiWpaStaInterface { int staNo; -- Gitee From 7b59a758446ba6e62c2032c3efd17ca4e0aaf671 Mon Sep 17 00:00:00 2001 From: guosongsong <827345896@qq.com> Date: Thu, 16 Jun 2022 11:06:45 +0800 Subject: [PATCH 184/491] =?UTF-8?q?=E4=BF=AE=E6=94=B9SetPowerMode=E5=87=BD?= =?UTF-8?q?=E6=95=B0=E5=90=8D=EF=BC=8C=E4=B8=8EHDF=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: guosongsong <827345896@qq.com> --- .../services/wifi_standard/wifi_hal/wifi_hal_chip_interface.c | 4 ++-- .../services/wifi_standard/wifi_hal/wifi_hal_chip_interface.h | 2 +- wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_chip.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_chip_interface.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_chip_interface.c index 4bc8f56..7be5345 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_chip_interface.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_chip_interface.c @@ -150,8 +150,8 @@ WifiErrorNo RequestFirmwareDebugDump(unsigned char *bytes, int32_t *size) return ConvertErrorCode(err); } -WifiErrorNo SetPowerMode(uint8_t mode) +WifiErrorNo WifiServiceSetPowerMode(uint8_t mode) { - LOGD("SetPowerMode() %{public}u", mode); + LOGD("WifiServiceSetPowerMode() %{public}u", mode); return WIFI_HAL_SUCCESS; } \ No newline at end of file diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_chip_interface.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_chip_interface.h index 3bf4f8c..51dd838 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_chip_interface.h +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_chip_interface.h @@ -138,7 +138,7 @@ WifiErrorNo RequestFirmwareDebugDump(unsigned char *bytes, int32_t *size); * @param mode - Low-latency mode. * @return WifiErrorNo */ -WifiErrorNo SetPowerMode(uint8_t mode); +WifiErrorNo WifiServiceSetPowerMode(uint8_t mode); #ifdef __cplusplus } diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_chip.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_chip.c index ed544e4..6fd19cb 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_chip.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_chip.c @@ -320,7 +320,7 @@ int RpcSetPowerMode(RpcServer *server, Context *context) if (ReadInt(context, &mode) < 0) { return HAL_FAILURE; } - WifiErrorNo err = SetPowerMode(mode); + WifiErrorNo err = WifiServiceSetPowerMode(mode); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); -- Gitee From d4133c9e4fcb546100110c5c16e7d2b7d4d06fee Mon Sep 17 00:00:00 2001 From: z00588131 Date: Thu, 16 Jun 2022 11:18:18 +0800 Subject: [PATCH 185/491] Resolve rk remove config fail issue and code check fix Signed-off-by: z00588131 Change-Id: I00c922517ea0caf21e39219f51f8996690a3f325 --- .../dhcp_server/include/address_utils.h | 6 +++--- dhcp/services/dhcp_server/src/address_utils.c | 10 +++++----- dhcp/services/dhcp_server/src/dhcp_argument.c | 6 +++--- wifi/frameworks/js/napi/inc/wifi_napi_event.h | 2 +- .../native/c_adapter/src/wifi_c_p2p.cpp | 1 + .../wifi_manage/wifi_p2p/p2p_state_machine.cpp | 18 +++++++++++++----- .../wifi_manage/wifi_p2p/p2p_state_machine.h | 6 ++++++ .../wifi_p2p/wifi_p2p_dns_txt_record.cpp | 4 ++-- 8 files changed, 34 insertions(+), 19 deletions(-) diff --git a/dhcp/services/dhcp_server/include/address_utils.h b/dhcp/services/dhcp_server/include/address_utils.h index e7a6037..a61fd5c 100644 --- a/dhcp/services/dhcp_server/include/address_utils.h +++ b/dhcp/services/dhcp_server/include/address_utils.h @@ -37,8 +37,8 @@ uint32_t BroadCastAddress(uint32_t ip, uint32_t netmask); uint32_t ParseIpAddr(const char *strIp); uint32_t ParseIpHtonl(const char *strIp); int NetworkBits(uint32_t netmask); -int HostBits(uint32_t netmask); -int HostTotal(uint32_t netmask); +uint32_t HostBits(uint32_t netmask); +uint32_t HostTotal(uint32_t netmask); uint32_t ParseIp(const uint8_t *ipAddr); const char *ParseStrIp(uint32_t ipAddr); int IsEmptyHWAddr(uint8_t macAddr[DHCP_HWADDR_LENGTH]); @@ -53,4 +53,4 @@ int AddrEquels(uint8_t firstAddr[DHCP_HWADDR_LENGTH], uint8_t secondAddr[DHCP_HW #ifdef __cplusplus } #endif -#endif \ No newline at end of file +#endif diff --git a/dhcp/services/dhcp_server/src/address_utils.c b/dhcp/services/dhcp_server/src/address_utils.c index 7612617..939f7f8 100644 --- a/dhcp/services/dhcp_server/src/address_utils.c +++ b/dhcp/services/dhcp_server/src/address_utils.c @@ -138,9 +138,9 @@ int NetworkBits(uint32_t netmask) return bits; } -int HostBits(uint32_t netmask) +uint32_t HostBits(uint32_t netmask) { - int bits = 0; + uint32_t bits = 0; uint32_t net = htonl(netmask); for (int i = IPV4_ADDRESS_BITS; i > 0; --i) { bits++; @@ -152,10 +152,10 @@ int HostBits(uint32_t netmask) return bits; } -int HostTotal(uint32_t netmask) +uint32_t HostTotal(uint32_t netmask) { - int hostBits = HostBits(netmask); - int total = 1; + uint32_t hostBits = HostBits(netmask); + uint32_t total = 1; for (size_t i = 0; i < (size_t)hostBits; i++) { total *= BIT_MAX_VALUE; } diff --git a/dhcp/services/dhcp_server/src/dhcp_argument.c b/dhcp/services/dhcp_server/src/dhcp_argument.c index 7f3d160..75f8a4d 100644 --- a/dhcp/services/dhcp_server/src/dhcp_argument.c +++ b/dhcp/services/dhcp_server/src/dhcp_argument.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -119,11 +119,11 @@ int HasArgument(const char *argument) static void ShowUsage(const DhcpUsage *usage) { - if (!usage) { + if (!usage || !usage->opt) { return; } if (usage->opt->val) { - printf("-%c,--%s ", usage->opt->val, usage->opt->name); + printf("-%d,--%s ", usage->opt->val, usage->opt->name); } else { printf(" --%s ", usage->opt->name); } diff --git a/wifi/frameworks/js/napi/inc/wifi_napi_event.h b/wifi/frameworks/js/napi/inc/wifi_napi_event.h index 9fc21ed..c3357ee 100644 --- a/wifi/frameworks/js/napi/inc/wifi_napi_event.h +++ b/wifi/frameworks/js/napi/inc/wifi_napi_event.h @@ -85,7 +85,7 @@ public: std::vector& vecObj = g_eventRegisterInfo[type]; for (auto& each : vecObj) { auto func = [this, env = each.m_regEnv, obj] () -> napi_value { return CreateResult(env, obj); }; - AsyncEventData *asyncEvent = new AsyncEventData(each.m_regEnv, each.m_regHanderRef, func); + AsyncEventData *asyncEvent = new (std::nothrow)AsyncEventData(each.m_regEnv, each.m_regHanderRef, func); if (asyncEvent == nullptr) { return; } diff --git a/wifi/frameworks/native/c_adapter/src/wifi_c_p2p.cpp b/wifi/frameworks/native/c_adapter/src/wifi_c_p2p.cpp index dc37686..f242d36 100644 --- a/wifi/frameworks/native/c_adapter/src/wifi_c_p2p.cpp +++ b/wifi/frameworks/native/c_adapter/src/wifi_c_p2p.cpp @@ -354,6 +354,7 @@ public: for (auto& each : devices) { if (ConvertP2PDeviceCppToC(each, p++) != OHOS::Wifi::WIFI_OPT_SUCCESS) { WIFI_LOGE("peers changed convert p2p device failed!"); + delete[] devicePtr; return; } } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp index 46d22d2..a33bc44 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp @@ -881,12 +881,20 @@ bool P2pStateMachine::DealCreateNewGroupWithConfig(const WifiP2pConfigInternal & return (ret == WIFI_IDL_OPT_FAILED) ? false : true ; } +bool P2pStateMachine::IsInterfaceReuse() const +{ + return P2P_INTERFACE == "wlan0"; +} + void P2pStateMachine::UpdateGroupInfoToWpa() const { - WifiErrorNo ret = WifiP2PHalInterface::GetInstance().RemoveNetwork(-1); - if (ret != WIFI_IDL_OPT_OK) { - WIFI_LOGE("Failed to delete all group info before update group info to wpa! Stop update!"); - return; + WIFI_LOGI("Start update group info to wpa"); + /* In the scenario of interface reuse, the configuration of sta may be deleted */ + if (!IsInterfaceReuse()) { + if (WifiP2PHalInterface::GetInstance().RemoveNetwork(-1) != WIFI_IDL_OPT_OK) { + WIFI_LOGE("Failed to delete all group info before update group info to wpa! Stop update!"); + return; + } } std::vector grpInfo = groupManager.GetGroups(); int createdNetId = -1; @@ -894,7 +902,7 @@ void P2pStateMachine::UpdateGroupInfoToWpa() const IdlP2pGroupConfig wpaConfig; for (unsigned int i = 0; i < grpInfo.size(); ++i) { grpBuf = grpInfo.at(i); - ret = WifiP2PHalInterface::GetInstance().P2pAddNetwork(createdNetId); + WifiErrorNo ret = WifiP2PHalInterface::GetInstance().P2pAddNetwork(createdNetId); if (ret == WIFI_IDL_OPT_OK) { grpBuf.SetNetworkId(createdNetId); wpaConfig.ssid = grpBuf.GetGroupName(); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.h index fa601ca..769796d 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.h @@ -286,6 +286,12 @@ private: */ bool GetIsNeedDhcp() const; + /** + * @Description Is interface reuse. + * + */ + bool IsInterfaceReuse() const; + private: /** * @Description - Broadcast state change event. diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_txt_record.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_txt_record.cpp index 6963153..2e01d80 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_txt_record.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_txt_record.cpp @@ -39,8 +39,8 @@ void WifiP2PDnsTxtRecord::InsertData( insertIndex += (data[insertIndex] + mapLengthSize) & 0xff; } - int addLength = keyBytes.size() + valBytes.size() + ((valBytes.size() == 0) ? 0 : mapLengthSize); - int newDataLength = addLength + mapLengthSize + oldData.size(); + int addLength = (int)keyBytes.size() + (int)valBytes.size() + ((valBytes.size() == 0) ? 0 : mapLengthSize); + int newDataLength = addLength + mapLengthSize + (int)oldData.size(); data.clear(); -- Gitee From 95f359b9fbb1de23757aab84164bae9919bd5fb8 Mon Sep 17 00:00:00 2001 From: z00588131 Date: Thu, 16 Jun 2022 20:37:37 +0800 Subject: [PATCH 186/491] fuzz code optimize Signed-off-by: z00588131 --- .../wifi_sta/adddeviceconfig_fuzzer/adddeviceconfig_fuzzer.cpp | 2 +- .../wifi_sta/connecttodevice_fuzzer/connecttodevice_fuzzer.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wifi/test/fuzztest/wifi_sta/adddeviceconfig_fuzzer/adddeviceconfig_fuzzer.cpp b/wifi/test/fuzztest/wifi_sta/adddeviceconfig_fuzzer/adddeviceconfig_fuzzer.cpp index fcfa532..9a2bd34 100644 --- a/wifi/test/fuzztest/wifi_sta/adddeviceconfig_fuzzer/adddeviceconfig_fuzzer.cpp +++ b/wifi/test/fuzztest/wifi_sta/adddeviceconfig_fuzzer/adddeviceconfig_fuzzer.cpp @@ -18,9 +18,9 @@ namespace OHOS { namespace Wifi { + std::unique_ptr devicePtr = WifiDevice::GetInstance(WIFI_DEVICE_ABILITY_ID); bool AddDeviceConfigFuzzerTest(const uint8_t* data, size_t size) { - std::unique_ptr devicePtr = WifiDevice::GetInstance(WIFI_DEVICE_ABILITY_ID); if (devicePtr == nullptr) { return false; } diff --git a/wifi/test/fuzztest/wifi_sta/connecttodevice_fuzzer/connecttodevice_fuzzer.cpp b/wifi/test/fuzztest/wifi_sta/connecttodevice_fuzzer/connecttodevice_fuzzer.cpp index ffe935d..79e8407 100644 --- a/wifi/test/fuzztest/wifi_sta/connecttodevice_fuzzer/connecttodevice_fuzzer.cpp +++ b/wifi/test/fuzztest/wifi_sta/connecttodevice_fuzzer/connecttodevice_fuzzer.cpp @@ -18,9 +18,9 @@ namespace OHOS { namespace Wifi { + std::unique_ptr devicePtr = WifiDevice::GetInstance(WIFI_DEVICE_ABILITY_ID); bool ConnectToDeviceFuzzerTest(const uint8_t* data, size_t size) { - std::unique_ptr devicePtr = WifiDevice::GetInstance(WIFI_DEVICE_ABILITY_ID); if (devicePtr == nullptr) { return false; } -- Gitee From e826a6b350d7a819e56e7b16297e4e24c1115413 Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Thu, 16 Jun 2022 22:32:59 +0800 Subject: [PATCH 187/491] bugfix from master 0616 Signed-off-by: yanxiaotao --- .../wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp index 6a59d75..a84da9b 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp @@ -1849,13 +1849,15 @@ void StaStateMachine::ConnectToNetworkProcess(InternalMessage *msg) WIFI_LOGD("Device ssid = %s", deviceConfig.ssid.c_str()); } + std::string macAddr; + WifiSettings::GetInstance().GetMacAddress(macAddr); linkedInfo.networkId = lastNetworkId; linkedInfo.bssid = bssid; linkedInfo.ssid = deviceConfig.ssid; linkedInfo.macAddress = deviceConfig.macAddress; linkedInfo.ifHiddenSSID = deviceConfig.hiddenSSID; lastLinkedInfo.bssid = bssid; - lastLinkedInfo.macAddress = deviceConfig.macAddress; + lastLinkedInfo.macAddress = macAddr; lastLinkedInfo.ifHiddenSSID = deviceConfig.hiddenSSID; SetWifiLinkedInfo(lastNetworkId); SaveLinkstate(ConnState::CONNECTING, DetailedState::OBTAINING_IPADDR); -- Gitee From 2fdb365e16e55c8d2dc43a83ff5e930092cb3be5 Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Thu, 16 Jun 2022 23:40:17 +0800 Subject: [PATCH 188/491] bugfix from master 0616 Signed-off-by: yanxiaotao --- .../wifi_hal/wifi_hal_callback.c | 64 +++++++++---------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_callback.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_callback.c index 0f4e55d..f6d1f7b 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_callback.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_callback.c @@ -49,7 +49,7 @@ static void EmitEventCallbackMsg(WifiHalEventCallbackMsg *pCbkMsg, WifiHalEvent void WifiHalCbNotifyScanEnd(int status) { - LOGD("Get Scan status: %{public}d, and begin push notify message", status); + LOGI("Get Scan status: %{public}d, and begin push notify message", status); WifiHalEventCallbackMsg *pCbkMsg = (WifiHalEventCallbackMsg *)calloc(1, sizeof(WifiHalEventCallbackMsg)); if (pCbkMsg == NULL) { LOGE("create callback message failed!"); @@ -66,7 +66,7 @@ void WifiHalCbNotifyConnectChanged(int status, int networkId, const char *pos) LOGI("Get connect state changed, pos is NULL"); return; } - LOGD("Get connect state changed, state: %{public}d, networkid = %{public}d", status, networkId); + LOGI("Get connect state changed, state: %{public}d, networkid = %{public}d", status, networkId); WifiHalEventCallbackMsg *pCbkMsg = (WifiHalEventCallbackMsg *)calloc(1, sizeof(WifiHalEventCallbackMsg)); if (pCbkMsg == NULL) { LOGE("create callback message failed!"); @@ -81,7 +81,7 @@ void WifiHalCbNotifyConnectChanged(int status, int networkId, const char *pos) void WifiHalCbNotifyWpaStateChange(int status) { - LOGD("wpa state changed, state: %{public}d, and begin push notify message", status); + LOGI("wpa state changed, state: %{public}d, and begin push notify message", status); WifiHalEventCallbackMsg *pCbkMsg = (WifiHalEventCallbackMsg *)calloc(1, sizeof(WifiHalEventCallbackMsg)); if (pCbkMsg == NULL) { LOGE("create callback message failed!"); @@ -94,7 +94,7 @@ void WifiHalCbNotifyWpaStateChange(int status) void WifiHalCbNotifyWrongKey(int status) { - LOGD("wrong key, state: %{public}d, and begin push notify message", status); + LOGI("wrong key, state: %{public}d, and begin push notify message", status); WifiHalEventCallbackMsg *pCbkMsg = (WifiHalEventCallbackMsg *)calloc(1, sizeof(WifiHalEventCallbackMsg)); if (pCbkMsg == NULL) { LOGE("create callback message failed!"); @@ -107,7 +107,7 @@ void WifiHalCbNotifyWrongKey(int status) void WifiHalCbNotifyConnectionFull(int status) { - LOGD("connection is full, state: %d, and begin push notify message", status); + LOGI("connection is full, state: %{public}d, and begin push notify message", status); WifiHalEventCallbackMsg *pCbkMsg = (WifiHalEventCallbackMsg *)calloc(1, sizeof(WifiHalEventCallbackMsg)); if (pCbkMsg == NULL) { LOGE("create callback message failed!"); @@ -121,7 +121,7 @@ void WifiHalCbNotifyConnectionFull(int status) void WifiHalCbNotifyConnectionReject(int status) { - LOGD("connection is eeject, state: %d, and begin push notify message", status); + LOGI("connection is eeject, state: %{public}d, and begin push notify message", status); WifiHalEventCallbackMsg *pCbkMsg = (WifiHalEventCallbackMsg *)calloc(1, sizeof(WifiHalEventCallbackMsg)); if (pCbkMsg == NULL) { LOGE("create callback message failed!"); @@ -135,7 +135,7 @@ void WifiHalCbNotifyConnectionReject(int status) void WifiHalCbNotifyWpsOverlap(int event) { - LOGD("wps overlap, state: %{public}d, and begin push notify message", event); + LOGI("wps overlap, state: %{public}d, and begin push notify message", event); WifiHalEventCallbackMsg *pCbkMsg = (WifiHalEventCallbackMsg *)calloc(1, sizeof(WifiHalEventCallbackMsg)); if (pCbkMsg == NULL) { LOGE("create callback message failed!"); @@ -148,7 +148,7 @@ void WifiHalCbNotifyWpsOverlap(int event) void WifiHalCbNotifyWpsTimeOut(int event) { - LOGD("wps time out, state: %{public}d, and begin push notify message", event); + LOGI("wps time out, state: %{public}d, and begin push notify message", event); WifiHalEventCallbackMsg *pCbkMsg = (WifiHalEventCallbackMsg *)calloc(1, sizeof(WifiHalEventCallbackMsg)); if (pCbkMsg == NULL) { LOGE("create callback message failed!"); @@ -165,7 +165,7 @@ void WifiHalCbStaJoin(const char *content) LOGD("Get hostapd Sta join content is NULL"); return; } - LOGD("Get hostapd Sta join"); + LOGI("Get hostapd Sta join"); WifiHalEvent event; char tmpBuf[WIFI_BSSID_LENGTH] = {0}; if (strncmp("AP-STA-CONNECTED", content, strlen("AP-STA-CONNECTED")) == 0) { @@ -194,7 +194,7 @@ void WifiHalCbApState(const char *content) LOGD("Get hostapd status changed content is NULL"); return; } - LOGD("Get hostapd status changed"); + LOGI("Get hostapd status changed"); WifiHalEvent event; if (strncmp(content, "AP-ENABLED", strlen("AP-ENABLED")) == 0) { event = WIFI_AP_ENABLE_EVENT; @@ -215,7 +215,7 @@ void WifiHalCbApState(const char *content) void WifiP2pHalCbNotifyConnectSupplicant(int state) { - LOGD("P2p supplicant connect even : %{public}d", state); + LOGI("P2p supplicant connect even : %{public}d", state); WifiHalEventCallbackMsg *pCbkMsg = (WifiHalEventCallbackMsg *)calloc(1, sizeof(WifiHalEventCallbackMsg)); if (pCbkMsg == NULL) { LOGE("create callback message failed!"); @@ -231,7 +231,7 @@ void P2pHalCbDeviceFound(const P2pDeviceInfo *device) if (device == NULL) { return; } - LOGD("P2p device found event deviceName: %{public}s", device->deviceName); + LOGI("P2p device found event deviceName: %{public}s", device->deviceName); WifiHalEventCallbackMsg *pCbkMsg = (WifiHalEventCallbackMsg *)calloc(1, sizeof(WifiHalEventCallbackMsg)); if (pCbkMsg == NULL) { LOGE("create callback message failed!"); @@ -248,7 +248,7 @@ void P2pHalCbDeviceLost(const char *p2pDeviceAddress) LOGI("P2p device lost event p2pDeviceAddress is NULL"); return; } - LOGD("P2p device lost event p2pDeviceAddress: %{private}s", p2pDeviceAddress); + LOGI("P2p device lost event p2pDeviceAddress: %{private}s", p2pDeviceAddress); WifiHalEventCallbackMsg *pCbkMsg = (WifiHalEventCallbackMsg *)calloc(1, sizeof(WifiHalEventCallbackMsg)); if (pCbkMsg == NULL) { LOGE("create callback message failed!"); @@ -270,7 +270,7 @@ void P2pHalCbGoNegotiationRequest(const char *srcAddress, short passwordId) LOGI("P2p go negotiation request event srcAddress is NULL"); return; } - LOGD("P2p go negotiation request event srcAddress: %{private}s, passwordId: %{private}d", srcAddress, passwordId); + LOGI("P2p go negotiation request event srcAddress: %{private}s, passwordId: %{private}d", srcAddress, passwordId); WifiHalEventCallbackMsg *pCbkMsg = (WifiHalEventCallbackMsg *)calloc(1, sizeof(WifiHalEventCallbackMsg)); if (pCbkMsg == NULL) { LOGE("create callback message failed!"); @@ -289,7 +289,7 @@ void P2pHalCbGoNegotiationRequest(const char *srcAddress, short passwordId) void P2pHalCbGoNegotiationSuccess() { - LOGD("P2p go negotiation success event"); + LOGI("P2p go negotiation success event"); RpcServer *server = GetRpcServer(); if (server == NULL) { LOGE("Rpc server not exists!"); @@ -301,7 +301,7 @@ void P2pHalCbGoNegotiationSuccess() void P2pHalCbGoNegotiationFailure(int status) { - LOGD("P2p go negotiation failure event status: %{public}d", status); + LOGI("P2p go negotiation failure event status: %{public}d", status); WifiHalEventCallbackMsg *pCbkMsg = (WifiHalEventCallbackMsg *)calloc(1, sizeof(WifiHalEventCallbackMsg)); if (pCbkMsg == NULL) { LOGE("create callback message failed!"); @@ -317,7 +317,7 @@ void P2pHalCbInvitationReceived(const P2pInvitationInfo *info) if (info == NULL) { return; } - LOGD("P2p invitation received event srcAddress: %{private}s", info->srcAddress); + LOGI("P2p invitation received event srcAddress: %{private}s", info->srcAddress); WifiHalEventCallbackMsg *pCbkMsg = (WifiHalEventCallbackMsg *)calloc(1, sizeof(WifiHalEventCallbackMsg)); if (pCbkMsg == NULL) { LOGE("create callback message failed!"); @@ -334,7 +334,7 @@ void P2pHalCbInvitationResult(const char *bssid, int status) LOGI("P2p invitation result event bssid is NULL"); return; } - LOGD("P2p invitation result event bssid: %{private}s, status: %{public}d", bssid, status); + LOGI("P2p invitation result event bssid: %{private}s, status: %{public}d", bssid, status); WifiHalEventCallbackMsg *pCbkMsg = (WifiHalEventCallbackMsg *)calloc(1, sizeof(WifiHalEventCallbackMsg)); if (pCbkMsg == NULL) { LOGE("create callback message failed!"); @@ -353,7 +353,7 @@ void P2pHalCbInvitationResult(const char *bssid, int status) void P2pHalCbGroupFormationSuccess() { - LOGD("P2p group formation success event"); + LOGI("P2p group formation success event"); RpcServer *server = GetRpcServer(); if (server == NULL) { LOGE("Rpc server not exists!"); @@ -369,7 +369,7 @@ void P2pHalCbGroupFormationFailure(const char *reason) LOGI("P2p group formation failure event reason is NULL"); return; } - LOGD("P2p group formation failure event reason: %{public}s", reason); + LOGW("P2p group formation failure event reason: %{public}s", reason); WifiHalEventCallbackMsg *pCbkMsg = (WifiHalEventCallbackMsg *)calloc(1, sizeof(WifiHalEventCallbackMsg)); if (pCbkMsg == NULL) { LOGE("create callback message failed!"); @@ -390,7 +390,7 @@ void P2pHalCbGroupStarted(const P2pGroupInfo *info) if (info == NULL) { return; } - LOGD("P2p group started event groupIfName: %{public}s", info->groupIfName); + LOGI("P2p group started event groupIfName: %{public}s", info->groupIfName); WifiHalEventCallbackMsg *pCbkMsg = (WifiHalEventCallbackMsg *)calloc(1, sizeof(WifiHalEventCallbackMsg)); if (pCbkMsg == NULL) { LOGE("create callback message failed!"); @@ -407,7 +407,7 @@ void P2pHalCbGroupRemoved(const char *groupIfName, int isGo) LOGI("P2p group removed event groupIfName is NULL"); return; } - LOGD("P2p group removed event groupIfName: %{public}s, isGo: %{public}d", groupIfName, isGo); + LOGW("P2p group removed event groupIfName: %{public}s, isGo: %{public}d", groupIfName, isGo); WifiHalEventCallbackMsg *pCbkMsg = (WifiHalEventCallbackMsg *)calloc(1, sizeof(WifiHalEventCallbackMsg)); if (pCbkMsg == NULL) { LOGE("create callback message failed!"); @@ -430,7 +430,7 @@ void P2pHalCbProvisionDiscoveryPbcRequest(const char *address) LOGI("P2p provision discovery pbc request event address is NULL"); return; } - LOGD("P2p provision discovery pbc request event address: %{private}s", address); + LOGI("P2p provision discovery pbc request event address: %{private}s", address); WifiHalEventCallbackMsg *pCbkMsg = (WifiHalEventCallbackMsg *)calloc(1, sizeof(WifiHalEventCallbackMsg)); if (pCbkMsg == NULL) { LOGE("create callback message failed!"); @@ -452,7 +452,7 @@ void P2pHalCbProvisionDiscoveryPbcResponse(const char *address) LOGI("P2p provision discovery pbc response event address is NULL"); return; } - LOGD("P2p provision discovery pbc response event address: %{private}s", address); + LOGI("P2p provision discovery pbc response event address: %{private}s", address); WifiHalEventCallbackMsg *pCbkMsg = (WifiHalEventCallbackMsg *)calloc(1, sizeof(WifiHalEventCallbackMsg)); if (pCbkMsg == NULL) { LOGE("create callback message failed!"); @@ -474,7 +474,7 @@ void P2pHalCbProvisionDiscoveryEnterPin(const char *address) LOGI("P2p provision discovery enter pin event address is NULL"); return; } - LOGD("P2p provision discovery enter pin event address: %{private}s", address); + LOGI("P2p provision discovery enter pin event address: %{private}s", address); WifiHalEventCallbackMsg *pCbkMsg = (WifiHalEventCallbackMsg *)calloc(1, sizeof(WifiHalEventCallbackMsg)); if (pCbkMsg == NULL) { LOGE("create callback message failed!"); @@ -496,7 +496,7 @@ void P2pHalCbProvisionDiscoveryShowPin(const char *address, const char *pin) LOGI("P2p provision discovery show pin event address or pin is NULL"); return; } - LOGD("P2p provision discovery show pin event address: %{private}s, pin: %{private}s", address, pin); + LOGI("P2p provision discovery show pin event address: %{private}s, pin: %{private}s", address, pin); WifiHalEventCallbackMsg *pCbkMsg = (WifiHalEventCallbackMsg *)calloc(1, sizeof(WifiHalEventCallbackMsg)); if (pCbkMsg == NULL) { LOGE("create callback message failed!"); @@ -516,7 +516,7 @@ void P2pHalCbProvisionDiscoveryShowPin(const char *address, const char *pin) void P2pHalCbProvisionDiscoveryFailure() { - LOGD("P2p provision discovery failure event"); + LOGW("P2p provision discovery failure event"); RpcServer *server = GetRpcServer(); if (server == NULL) { LOGE("Rpc server not exists!"); @@ -528,7 +528,7 @@ void P2pHalCbProvisionDiscoveryFailure() void P2pHalCbFindStopped() { - LOGD("P2p find stopped event"); + LOGW("P2p find stopped event"); RpcServer *server = GetRpcServer(); if (server == NULL) { LOGE("Rpc server not exists!"); @@ -543,7 +543,7 @@ void P2pHalCbServiceDiscoveryResponse(const P2pServDiscRespInfo *info) if (info == NULL) { return; } - LOGD("P2p service discovery response event srcAddress: %{private}s", info->srcAddress); + LOGI("P2p service discovery response event srcAddress: %{private}s", info->srcAddress); WifiHalEventCallbackMsg *pCbkMsg = (WifiHalEventCallbackMsg *)calloc(1, sizeof(WifiHalEventCallbackMsg)); if (pCbkMsg == NULL) { LOGE("create callback message failed!"); @@ -576,7 +576,7 @@ void P2pHalCbStaConnectState(const char *p2pDeviceAddress, int state) LOGI("P2p sta authorized/deauthorized event devAddress is NULL"); return; } - LOGD("P2p sta authorized/deauthorized event devAddress: %{private}s", p2pDeviceAddress); + LOGI("P2p sta authorized/deauthorized event devAddress: %{private}s", p2pDeviceAddress); WifiHalEventCallbackMsg *pCbkMsg = (WifiHalEventCallbackMsg *)calloc(1, sizeof(WifiHalEventCallbackMsg)); if (pCbkMsg == NULL) { LOGE("create callback message failed!"); @@ -594,7 +594,7 @@ void P2pHalCbStaConnectState(const char *p2pDeviceAddress, int state) void P2pHalCbConnectSupplicantFailed() { - LOGD("P2p supplicant connect Failed event"); + LOGW("P2p supplicant connect Failed event"); RpcServer *server = GetRpcServer(); if (server == NULL) { LOGE("Rpc server not exists!"); @@ -606,7 +606,7 @@ void P2pHalCbConnectSupplicantFailed() void P2pHalCbServDiscReq(const P2pServDiscReqInfo *info) { - LOGD("P2p service discovery request event"); + LOGI("P2p service discovery request event"); if (info == NULL) { return; } -- Gitee From dbf133f41b7815b5c689062c6e2e6205e6fd044e Mon Sep 17 00:00:00 2001 From: y00316381 Date: Fri, 17 Jun 2022 08:55:16 +0800 Subject: [PATCH 189/491] bugfix from master 0617 Signed-off-by: y00316381 --- .../wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp index a84da9b..99bd733 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp @@ -1854,10 +1854,10 @@ void StaStateMachine::ConnectToNetworkProcess(InternalMessage *msg) linkedInfo.networkId = lastNetworkId; linkedInfo.bssid = bssid; linkedInfo.ssid = deviceConfig.ssid; - linkedInfo.macAddress = deviceConfig.macAddress; + linkedInfo.macAddress = macAddr; linkedInfo.ifHiddenSSID = deviceConfig.hiddenSSID; lastLinkedInfo.bssid = bssid; - lastLinkedInfo.macAddress = macAddr; + lastLinkedInfo.macAddress = deviceConfig.macAddress; lastLinkedInfo.ifHiddenSSID = deviceConfig.hiddenSSID; SetWifiLinkedInfo(lastNetworkId); SaveLinkstate(ConnState::CONNECTING, DetailedState::OBTAINING_IPADDR); -- Gitee From 5c438fff0e4653f27d1991204aa82aac5f6b9967 Mon Sep 17 00:00:00 2001 From: Neil Chen Date: Sat, 18 Jun 2022 09:32:35 +0800 Subject: [PATCH 190/491] fix typo Signed-off-by: Neil Chen --- dhcp/services/dhcp_client/src/dhcp_ipv4.c | 6 +-- .../dhcp_server/src/dhcp_address_pool.c | 8 +-- dhcp/services/dhcp_server/src/dhcp_dhcpd.c | 8 +-- dhcp/services/dhcp_server/src/dhcp_option.c | 2 +- dhcp/services/dhcp_server/src/dhcp_server.c | 16 +++--- .../dhcp_server/unittest/dhcp_server_test.cpp | 8 +-- wifi/interfaces/kits/c/wifi_device.h | 2 +- .../wifi_manage/common/internal_message.h | 2 +- .../wifi_manage/common/state_machine.cpp | 6 +-- .../wifi_manage/common/state_machine.h | 4 +- .../idl_client/idl_interface/i_wifi.c | 2 +- .../idl_client/idl_interface/i_wifi_struct.h | 4 +- .../wifi_manage/idl_client/wifi_idl_struct.h | 4 +- .../wifi_manage/wifi_ap/ap_interface.h | 2 +- .../wifi_manage/wifi_config_center.h | 10 ++-- .../wifi_manage/wifi_hid2d_cfg.h | 4 +- .../wifi_manage/wifi_hotspot_service_impl.cpp | 4 +- .../wifi_p2p/group_negotiation_state.cpp | 4 +- .../wifi_p2p/group_negotiation_state.h | 4 +- .../wifi_p2p/p2p_state_machine.cpp | 2 +- .../wifi_p2p/wifi_p2p_dns_txt_record.cpp | 4 +- .../wifi_p2p_service_response_list.cpp | 2 +- .../wifi_p2p_upnp_service_request.cpp | 4 +- .../wifi_manage/wifi_p2p_service_impl.cpp | 52 +++++++++---------- .../wifi_manage/wifi_scan_callback_proxy.cpp | 4 +- .../wifi_scan_callback_proxy_lite.cpp | 2 +- .../wifi_manage/wifi_service_manager.cpp | 10 ++-- .../wifi_sta/sta_auto_connect_service.cpp | 4 +- .../wifi_sta/sta_state_machine.cpp | 8 +-- .../wifi_hal/wifi_hal_crpc_server.c | 6 +-- .../wpa_supplicant_hal/wifi_wpa_hal.c | 2 +- .../wifi_hal/wifi_hal_sta_interface.h | 4 +- .../unittest/wifi_hal_crpc_server_test.cpp | 4 +- 33 files changed, 104 insertions(+), 104 deletions(-) diff --git a/dhcp/services/dhcp_client/src/dhcp_ipv4.c b/dhcp/services/dhcp_client/src/dhcp_ipv4.c index 5b7bcd8..03e39b8 100644 --- a/dhcp/services/dhcp_client/src/dhcp_ipv4.c +++ b/dhcp/services/dhcp_client/src/dhcp_ipv4.c @@ -167,7 +167,7 @@ int ExecDhcpRenew(void) return DHCP_OPT_SUCCESS; } -/* Add dhcp option paramater request list. */ +/* Add dhcp option parameter request list. */ static void AddParamaterRequestList(struct DhcpPacket *packet) { int end = GetEndOptionIndex(packet->options); @@ -849,7 +849,7 @@ static int SyncDhcpResult(const struct DhcpPacket *packet, struct DhcpResult *re return DHCP_OPT_FAILED; } - /* Wirte to the file. */ + /* Write to the file. */ if (WriteDhcpResult(result) != DHCP_OPT_SUCCESS) { LOGE("SyncDhcpResult() error, WriteDhcpResult result failed!"); return DHCP_OPT_FAILED; @@ -1406,4 +1406,4 @@ int StartIpv4(void) } } return g_cltCnf->timeoutExit ? StopProcess(g_cltCnf->pidFile) : DHCP_OPT_SUCCESS; -} \ No newline at end of file +} diff --git a/dhcp/services/dhcp_server/src/dhcp_address_pool.c b/dhcp/services/dhcp_server/src/dhcp_address_pool.c index 715ade3..2a4ddd5 100644 --- a/dhcp/services/dhcp_server/src/dhcp_address_pool.c +++ b/dhcp/services/dhcp_server/src/dhcp_address_pool.c @@ -41,7 +41,7 @@ AddressBinding *GetBindingByMac(HashTable *bindTable, uint8_t macAddr[DHCP_HWADD return NULL; } if (!Initialized(bindTable)) { - LOGE("binding recoders table dosn't initialized"); + LOGE("binding recoders table doesn't initialized"); return NULL; } if (ContainsKey(&g_bindingRecoders, (uintptr_t)macAddr)) { @@ -62,7 +62,7 @@ AddressBinding *GetBindingByIp(HashTable *bindTable, uint32_t ipAddress) return NULL; } if (!Initialized(bindTable)) { - LOGE("binding recoders table dosn't initialized"); + LOGE("binding recoders table doesn't initialized"); return NULL; } if (ContainsKey(bindTable, (uintptr_t)&ipAddress)) { @@ -315,7 +315,7 @@ AddressBinding *FindBindingByIp(uint32_t ipAddress) int IsReserved(uint8_t macAddr[DHCP_HWADDR_LENGTH]) { if (!Initialized(&g_bindingRecoders)) { - LOGD("binding recoders table dosn't initialized"); + LOGD("binding recoders table doesn't initialized"); return DHCP_FALSE; } if (ContainsKey(&g_bindingRecoders, (uintptr_t)macAddr)) { @@ -602,4 +602,4 @@ void SetDistributeMode(int mode) int GetDistributeMode(void) { return g_distributeMode; -} \ No newline at end of file +} diff --git a/dhcp/services/dhcp_server/src/dhcp_dhcpd.c b/dhcp/services/dhcp_server/src/dhcp_dhcpd.c index 1015a3c..250bc53 100644 --- a/dhcp/services/dhcp_server/src/dhcp_dhcpd.c +++ b/dhcp/services/dhcp_server/src/dhcp_dhcpd.c @@ -292,7 +292,7 @@ int ServerActionCallback(int state, int code, const char *ifname) break; } case ST_STOPED: { - LOGD(" callback[%s] ==> server stoped.", ifname); + LOGD(" callback[%s] ==> server stopped.", ifname); break; } default: @@ -352,11 +352,11 @@ static int InitializeDhcpConfig(const char *ifname, DhcpConfig *config) } LOGD("load local config file:%s", configFile); if (LoadConfig(configFile, ifname, config) != RET_SUCCESS) { - LOGE("faile to load configure file."); + LOGE("failed to load configure file."); return RET_FAILED; } if (InitConfigByArguments(config) != RET_SUCCESS) { - LOGE("faile to parse arguments."); + LOGE("failed to parse arguments."); return RET_FAILED; } @@ -433,4 +433,4 @@ int main(int argc, char *argv[]) return 1; } return 0; -} \ No newline at end of file +} diff --git a/dhcp/services/dhcp_server/src/dhcp_option.c b/dhcp/services/dhcp_server/src/dhcp_option.c index 18b235f..e180688 100644 --- a/dhcp/services/dhcp_server/src/dhcp_option.c +++ b/dhcp/services/dhcp_server/src/dhcp_option.c @@ -97,7 +97,7 @@ int PushBackOption(PDhcpOptionList pOptions, PDhcpOption pOption) } DhcpOptionNode *pNode = CreateOptionNode(pOption); if (!pNode) { - LOGE("failed to crate option node."); + LOGE("failed to create option node."); return 1; } pNode->previous = pOptions->last; diff --git a/dhcp/services/dhcp_server/src/dhcp_server.c b/dhcp/services/dhcp_server/src/dhcp_server.c index cd3d4d0..3aba56f 100644 --- a/dhcp/services/dhcp_server/src/dhcp_server.c +++ b/dhcp/services/dhcp_server/src/dhcp_server.c @@ -299,7 +299,7 @@ int ReceiveDhcpMessage(int sock, PDhcpMsgInfo msgInfo) void InitReply(PDhcpServerContext ctx, PDhcpMsgInfo received, PDhcpMsgInfo reply) { if (!reply) { - LOGE("reply messsage pointer is null!"); + LOGE("reply message pointer is null!"); return; } reply->packet.op = BOOTREPLY; @@ -336,7 +336,7 @@ void OnUpdateServerConfig(PDhcpServerContext ctx) static void OnServerStoping(PDhcpServerContext ctx) { - LOGD("server stoping ..."); + LOGD("server stopping ..."); ServerContext *srvIns = GetServerInstance(ctx); if (!srvIns) { LOGE("dhcp server context pointer is null."); @@ -537,7 +537,7 @@ static int BeginLooper(PDhcpServerContext ctx) } FreeOptionList(&from.options); FreeOptionList(&reply.options); - LOGD("dhcp server message looper stoped."); + LOGD("dhcp server message looper stopped."); close(ctx->instance->serverFd); ctx->instance->serverFd = -1; srvIns->looperState = LS_STOPED; @@ -619,7 +619,7 @@ void InitLeaseFile(DhcpAddressPool *pool) static void ExitProcess(void) { - LOGD("dhcp server stoped."); + LOGD("dhcp server stopped."); sleep(1); } @@ -653,7 +653,7 @@ int StartDhcpServer(PDhcpServerContext ctx) } int ret = BeginLooper(ctx); if (ret != RET_SUCCESS) { - LOGD("faild to start dhcp server."); + LOGD("failed to start dhcp server."); OnServerStoped(ctx, ret); return RET_FAILED; } @@ -734,7 +734,7 @@ int FillReply(PDhcpServerContext ctx, PDhcpMsgInfo received, PDhcpMsgInfo reply) int AppendReplyTimeOptions(PDhcpServerContext ctx, PDhcpOptionList options) { if (!ctx || !options) { - LOGE("server context or options poninter is null."); + LOGE("server context or options pointer is null."); return RET_FAILED; } ServerContext *srvIns = GetServerInstance(ctx); @@ -1458,7 +1458,7 @@ static int ParseMessageOptions(PDhcpMsgInfo msg) return RET_FAILED; } if (PushBackOption(&msg->options, current) != RET_SUCCESS) { - LOGD("faild to PushOption."); + LOGD("failed to PushOption."); } current = (DhcpOption *)(((uint8_t *)current) + OPT_HEADER_LENGTH + current->length); optTotal++; @@ -1502,7 +1502,7 @@ static int ValidateReplyOptions(PDhcpMsgInfo reply) } PDhcpOption pOptMsgType = GetOption(&reply->options, DHCP_MESSAGE_TYPE_OPTION); if (!pOptMsgType) { - LOGE("unkown reply message type."); + LOGE("unknown reply message type."); return ret; } return RET_SUCCESS; diff --git a/dhcp/test/services/dhcp_server/unittest/dhcp_server_test.cpp b/dhcp/test/services/dhcp_server/unittest/dhcp_server_test.cpp index 68a7042..46e7ac0 100644 --- a/dhcp/test/services/dhcp_server/unittest/dhcp_server_test.cpp +++ b/dhcp/test/services/dhcp_server/unittest/dhcp_server_test.cpp @@ -213,7 +213,7 @@ static int TestServerCallback(int state, int code, const char *ifname) break; } case ST_STOPED: { - LOGD(" callback[%s] ==> server stoped.", ifname); + LOGD(" callback[%s] ==> server stopped.", ifname); break; } default: @@ -293,7 +293,7 @@ bool DhcpServerTest::StartServerTest() if (InitDhcpClient() != RET_SUCCESS) { retval = false; } - LOGD("wait for test complated..."); + LOGD("wait for test completed..."); retval = ServerRun(); return retval; } @@ -303,7 +303,7 @@ void DhcpServerTest::DelayStopServer() const int SLEEP_TIME = 3; const int SLEEP_TIME1 = 1; const int SLEEP_TIME2 = 1; - LOGD("wait for dhcp server stoped..."); + LOGD("wait for dhcp server stopped..."); LOGD("wait %d seconds...\n", SERVER_RUNING_TIME); SystemFuncMock::GetInstance().SetMockFlag(true); EXPECT_CALL(SystemFuncMock::GetInstance(), close(_)).WillRepeatedly(Return(0)); @@ -320,7 +320,7 @@ void DhcpServerTest::DelayStopServer() int waitSesc = 0; while (waitSesc < SERVER_RUNING_TIME) { if (GetServerStatus(m_pServerCtx) == ST_STOPED) { - LOGD("dhcp server stoped."); + LOGD("dhcp server stopped."); break; } else { std::this_thread::sleep_for(std::chrono::seconds(SLEEP_TIME1)); diff --git a/wifi/interfaces/kits/c/wifi_device.h b/wifi/interfaces/kits/c/wifi_device.h index 386aac0..579729b 100644 --- a/wifi/interfaces/kits/c/wifi_device.h +++ b/wifi/interfaces/kits/c/wifi_device.h @@ -135,7 +135,7 @@ WifiErrorCode GetDeviceConfigs(WifiDeviceConfig *result, unsigned int *size); WifiErrorCode RemoveDevice(int networkId); /** - * @brief Disable a hotspot configuration matching a specified networkId. If the config is diabled, it will + * @brief Disable a hotspot configuration matching a specified networkId. If the config is disabled, it will * not be auto connected. * * @param networkId Indicates the networkId matching the hotspot configuration to disable. diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/internal_message.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/internal_message.h index ebe7aec..cacc908 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/internal_message.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/internal_message.h @@ -119,7 +119,7 @@ public: int GetIntFromMessage(); /** - * @Description : Obtains Sting data from message. + * @Description : Obtains String data from message. * * @return std::string */ diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp index 8f31196..32fd33f 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp @@ -530,7 +530,7 @@ void StateMachineHandler::ClearWhenQuit() void StateMachineHandler::PerformSwitchState(State *msgProcessedState, InternalMessage *msg) { if (msgProcessedState == nullptr || msg == nullptr) { - LOGE("poniter is null."); + LOGE("pointer is null."); } State *targetState = pTargetState; @@ -585,7 +585,7 @@ void StateMachineHandler::ExecuteMessage(InternalMessage *msg) if (pStateMachine != nullptr) { PerformSwitchState(msgProcessedState, msg); } else { - LOGE("poniter is null."); + LOGE("pointer is null."); } if (pStateMachine != nullptr && msg->GetMessageName() != SM_INIT_CMD) { @@ -674,4 +674,4 @@ void StateMachineHandler::CallTreeStateEnters(int index) mSwitchingStateFlag = false; } } // namespace Wifi -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.h index 69e9018..91cbd65 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.h @@ -455,7 +455,7 @@ private: void PerformSwitchState(State *msgProcessedState, InternalMessage *msg); /** - * @Description : Process messages. If the current state doesnot process it, + * @Description : Process messages. If the current state does not process it, * the upper state processing is called, and so on. If all upper states * are not processed, invoke the NotExecutedMessage method of the state machine. * @@ -514,4 +514,4 @@ private: }; } // namespace Wifi } // namespace OHOS -#endif \ No newline at end of file +#endif diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi.c b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi.c index d27c201..9dab2a8 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi.c +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi.c @@ -775,7 +775,7 @@ int OnTransact(Context *context) return -1; } if (IdlDealStaApEvent(context, event) < 0 && IdlDealP2pEvent(context, event) < 0) { - LOGI("unsupport call back events: %{public}d", event); + LOGI("unsupported call back events: %{public}d", event); } return 0; } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_struct.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_struct.h index 185998b..749c324 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_struct.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_struct.h @@ -235,7 +235,7 @@ typedef struct P2pGroupInfo { } P2pGroupInfo; typedef struct P2pInvitationInfo { - int type; /* 0:Recived, 1:Accepted */ + int type; /* 0:Received, 1:Accepted */ int persistentNetworkId; int operatingFrequency; char srcAddress[WIFI_MAC_ADDR_LENGTH + 1]; @@ -311,4 +311,4 @@ typedef struct Hid2dConnectInfo { #ifdef __cplusplus } #endif -#endif \ No newline at end of file +#endif diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_struct.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_struct.h index fa562c5..4d20c10 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_struct.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_struct.h @@ -142,7 +142,7 @@ struct IdlP2pDeviceFound { }; struct IdlP2pInvitationInfo { - int type; /* 0:Recived, 1:Accepted */ + int type; /* 0:Received, 1:Accepted */ int persistentNetworkId; int operatingFrequency; std::string srcAddress; @@ -213,4 +213,4 @@ struct IdlP2pGroupConfig { }; } // namespace Wifi } // namespace OHOS -#endif \ No newline at end of file +#endif diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_interface.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_interface.h index 7c390ef..b190b74 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_interface.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_interface.h @@ -74,7 +74,7 @@ public: virtual ErrCode SetHotspotConfig(const HotspotConfig &hotspotConfig) override; /** - * @Description Disconnet Station connect from station information. + * @Description Disconnect Station connect from station information. * @param stationInfo - station information. * @return ErrCode - success: WIFI_OPT_SUCCESS failed: ERROR_CODE */ diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.h index cd9a02b..9fc77f6 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.h @@ -55,7 +55,7 @@ public: * @param expState - expect the original state * @param state - want to set state * @return true - set the state success - * @return false - set state failed, current mid sate is not equal to the expState + * @return false - set state failed, current mid state is not equal to the expState */ bool SetWifiMidState(WifiOprMidState expState, WifiOprMidState state); @@ -214,7 +214,7 @@ public: * @param expState - expect the original state * @param state - want to set state * @return true - set the state success - * @return false - set state failed, current mid sate is not equal to the expState + * @return false - set state failed, current mid state is not equal to the expState */ bool SetApMidState(WifiOprMidState expState, WifiOprMidState state); @@ -305,7 +305,7 @@ public: int GetValidChannels(ChannelsTable &channelsInfo); /** - * @Description request to chip for initation current vaild bands and channels + * @Description request to chip for initiation current valid bands and channels */ bool GetSupportedBandChannel(); @@ -322,7 +322,7 @@ public: * @param expState - expect the original state * @param state - want to set state * @return true - set the state success - * @return false - set state failed, current mid sate is not equal to the expState + * @return false - set state failed, current mid state is not equal to the expState */ bool SetScanMidState(WifiOprMidState expState, WifiOprMidState state); @@ -355,7 +355,7 @@ public: * @param expState - expect the original state * @param state - want to set state * @return true - set the state success - * @return false - set state failed, current mid sate is not equal to the expState + * @return false - set state failed, current mid state is not equal to the expState */ bool SetP2pMidState(WifiOprMidState expState, WifiOprMidState state); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_cfg.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_cfg.h index 01ad87f..709fcfd 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_cfg.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_cfg.h @@ -232,7 +232,7 @@ private: * find the value of index in byte array * * @param data byte array - * @param value intput the value to find index + * @param value input the value to find index * @return index in byte array */ int FindIndexFromByteArray(char* data, int dataLen, int value); @@ -253,4 +253,4 @@ private: }; } // namespace Wifi } // namespace OHOS -#endif \ No newline at end of file +#endif diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp index 3281188..605c3bd 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp @@ -237,7 +237,7 @@ ErrCode WifiHotspotServiceImpl::SetHotspotConfig(const HotspotConfig &config) WifiLinkedInfo linkInfo; WifiConfigCenter::GetInstance().GetLinkedInfo(linkInfo); if (!linkInfo.ssid.empty() && linkInfo.ssid == config.GetSsid()) { - WIFI_LOGD("set ssid equal current linked ap ssid, no premission!"); + WIFI_LOGD("set ssid equal current linked ap ssid, no permission!"); return WIFI_OPT_INVALID_PARAM; } @@ -635,7 +635,7 @@ void WifiHotspotServiceImpl::ConfigInfoDump(std::string& result) auto funcStrKeyMgmt = [&mapKeyMgmtToStr](KeyMgmt secType) { std::map::iterator iter = mapKeyMgmtToStr.find(secType); - return (iter != mapKeyMgmtToStr.end()) ? iter->second : "Unknow"; + return (iter != mapKeyMgmtToStr.end()) ? iter->second : "Unknown"; }; ss << " Config.security_type: " << funcStrKeyMgmt(config.GetSecurityType()) << "\n"; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.cpp index 2d60278..684eb22 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.cpp @@ -57,7 +57,7 @@ void GroupNegotiationState::Init() bool GroupNegotiationState::ProcessNegotSucessEvt(InternalMessage &msg) const { - WIFI_LOGI("Negotation success: %{public}d", msg.GetMessageName()); + WIFI_LOGI("Negotiation success: %{public}d", msg.GetMessageName()); return EXECUTED; } @@ -145,7 +145,7 @@ bool GroupNegotiationState::ProcessGroupFormationFailEvt(InternalMessage &msg) c bool GroupNegotiationState::ProcessNegotFailEvt(InternalMessage &msg) const { int status = msg.GetParam1(); - WIFI_LOGD("Negotation failure. Error code: %{public}d", status); + WIFI_LOGD("Negotiation failure. Error code: %{public}d", status); p2pStateMachine.SwitchState(&p2pStateMachine.p2pIdleState); return EXECUTED; } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.h index bce0d36..655d713 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.h @@ -66,7 +66,7 @@ public: private: /** - * @Description Process the negotation success message received by the state machine + * @Description Process the negotiation success message received by the state machine * @param msg - Message body sent by the state machine * @return - bool true:handle false:not handle */ @@ -94,7 +94,7 @@ private: virtual bool ProcessGroupFormationFailEvt(InternalMessage &msg) const; /** - * @Description Process the negotation fail message received by the state machine + * @Description Process the negotiation fail message received by the state machine * @param msg - Message body sent by the state machine * @return - bool true:handle false:not handle */ diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp index a33bc44..727bde6 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp @@ -739,7 +739,7 @@ void P2pStateMachine::StartDhcpClient() } else { WIFI_LOGE("pDhcpService or pDhcpResultNotify is nullptr, cannot get dhcp result."); } - WIFI_LOGI("Start Dhcp Cilent"); + WIFI_LOGI("Start Dhcp Client"); } void P2pStateMachine::HandleP2pServiceResp(const WifiP2pServiceResponse &resp, const WifiP2pDevice &dev) const diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_txt_record.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_txt_record.cpp index 2e01d80..b543b3d 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_txt_record.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_txt_record.cpp @@ -108,7 +108,7 @@ bool WifiP2PDnsTxtRecord::SetRecord(const std::string &key, const std::string &v } for (unsigned long index = 0; index < key.length(); ++index) { if (key[index] == '=') { - WIFI_LOGE("= is invaild in keys!"); + WIFI_LOGE("= is invalid in keys!"); return false; } keyBytes.push_back(static_cast(*(key.c_str() + index))); @@ -134,4 +134,4 @@ const std::vector &WifiP2PDnsTxtRecord::GetData() const return data; } } // namespace Wifi -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_response_list.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_response_list.cpp index 373c23f..f3fe881 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_response_list.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_response_list.cpp @@ -76,7 +76,7 @@ WifiP2pServiceResponseList WifiP2pServiceResponseList::ReverseFilterSerivceRespo bool WifiP2pServiceResponseList::MergerAndDeduplicate(const WifiP2pServiceResponseList &respList) { if (p2pDevice.GetDeviceAddress() != respList.GetDevice().GetDeviceAddress()) { - WIFI_LOGE("Diffrent device!"); + WIFI_LOGE("Different device!"); return false; } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_request.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_request.cpp index c83a84c..2dd5170 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_request.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_request.cpp @@ -39,7 +39,7 @@ WifiP2pUpnpServiceRequest WifiP2pUpnpServiceRequest::Create(std::string searchTa std::string query; char version[4] = {'\0'}; if (searchTarget.empty()) { - WIFI_LOGE("failed, search target cann't be nullptr, something wrong may happen."); + WIFI_LOGE("failed, search target can't be nullptr, something wrong may happen."); } if (snprintf_s(version, sizeof(version), sizeof(version) - 1, "%02x ", WifiP2pUpnpServiceInfo::VERSION_1_0) < 0) { WIFI_LOGE("ifiP2pUpnpServiceRequest::Create snprintf_s failed."); @@ -53,4 +53,4 @@ WifiP2pUpnpServiceRequest WifiP2pUpnpServiceRequest::Create(std::string searchTa return ret; } } // namespace Wifi -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp index f58d9eb..c84480c 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp @@ -211,7 +211,7 @@ ErrCode WifiP2pServiceImpl::DiscoverDevices(void) } if (!IsP2pServiceRunning()) { - WIFI_LOGE("P2pService is not runing!"); + WIFI_LOGE("P2pService is not running!"); return WIFI_OPT_P2P_NOT_OPENED; } @@ -232,7 +232,7 @@ ErrCode WifiP2pServiceImpl::StopDiscoverDevices(void) } if (!IsP2pServiceRunning()) { - WIFI_LOGE("P2pService is not runing!"); + WIFI_LOGE("P2pService is not running!"); return WIFI_OPT_P2P_NOT_OPENED; } @@ -253,7 +253,7 @@ ErrCode WifiP2pServiceImpl::DiscoverServices(void) } if (!IsP2pServiceRunning()) { - WIFI_LOGE("P2pService is not runing!"); + WIFI_LOGE("P2pService is not running!"); return WIFI_OPT_P2P_NOT_OPENED; } @@ -269,7 +269,7 @@ ErrCode WifiP2pServiceImpl::StopDiscoverServices(void) { WIFI_LOGI("StopDiscoverServices"); if (!IsP2pServiceRunning()) { - WIFI_LOGE("P2pService is not runing!"); + WIFI_LOGE("P2pService is not running!"); return WIFI_OPT_P2P_NOT_OPENED; } @@ -290,7 +290,7 @@ ErrCode WifiP2pServiceImpl::RequestService(const WifiP2pDevice &device, const Wi } if (!IsP2pServiceRunning()) { - WIFI_LOGE("P2pService is not runing!"); + WIFI_LOGE("P2pService is not running!"); return WIFI_OPT_P2P_NOT_OPENED; } @@ -306,7 +306,7 @@ ErrCode WifiP2pServiceImpl::PutLocalP2pService(const WifiP2pServiceInfo &srvInfo { WIFI_LOGI("PutLocalP2pService, service name is [%{public}s]", srvInfo.GetServiceName().c_str()); if (!IsP2pServiceRunning()) { - WIFI_LOGE("P2pService is not runing!"); + WIFI_LOGE("P2pService is not running!"); return WIFI_OPT_P2P_NOT_OPENED; } @@ -322,7 +322,7 @@ ErrCode WifiP2pServiceImpl::DeleteLocalP2pService(const WifiP2pServiceInfo &srvI { WIFI_LOGI("DeleteLocalP2pService, service name is [%{public}s]", srvInfo.GetServiceName().c_str()); if (!IsP2pServiceRunning()) { - WIFI_LOGE("P2pService is not runing!"); + WIFI_LOGE("P2pService is not running!"); return WIFI_OPT_P2P_NOT_OPENED; } @@ -343,7 +343,7 @@ ErrCode WifiP2pServiceImpl::StartP2pListen(int period, int interval) } if (!IsP2pServiceRunning()) { - WIFI_LOGE("P2pService is not runing!"); + WIFI_LOGE("P2pService is not running!"); return WIFI_OPT_P2P_NOT_OPENED; } @@ -364,7 +364,7 @@ ErrCode WifiP2pServiceImpl::StopP2pListen() } if (!IsP2pServiceRunning()) { - WIFI_LOGE("P2pService is not runing!"); + WIFI_LOGE("P2pService is not running!"); return WIFI_OPT_P2P_NOT_OPENED; } @@ -385,7 +385,7 @@ ErrCode WifiP2pServiceImpl::CreateGroup(const WifiP2pConfig &config) } if (!IsP2pServiceRunning()) { - WIFI_LOGE("P2pService is not runing!"); + WIFI_LOGE("P2pService is not running!"); return WIFI_OPT_P2P_NOT_OPENED; } @@ -406,7 +406,7 @@ ErrCode WifiP2pServiceImpl::RemoveGroup() } if (!IsP2pServiceRunning()) { - WIFI_LOGE("P2pService is not runing!"); + WIFI_LOGE("P2pService is not running!"); return WIFI_OPT_P2P_NOT_OPENED; } @@ -432,7 +432,7 @@ ErrCode WifiP2pServiceImpl::DeleteGroup(const WifiP2pGroupInfo &group) } if (!IsP2pServiceRunning()) { - WIFI_LOGE("P2pService is not runing!"); + WIFI_LOGE("P2pService is not running!"); return WIFI_OPT_P2P_NOT_OPENED; } @@ -462,7 +462,7 @@ ErrCode WifiP2pServiceImpl::P2pConnect(const WifiP2pConfig &config) } if (!IsP2pServiceRunning()) { - WIFI_LOGE("P2pService is not runing!"); + WIFI_LOGE("P2pService is not running!"); return WIFI_OPT_P2P_NOT_OPENED; } @@ -483,7 +483,7 @@ ErrCode WifiP2pServiceImpl::P2pCancelConnect() } if (!IsP2pServiceRunning()) { - WIFI_LOGE("P2pService is not runing!"); + WIFI_LOGE("P2pService is not running!"); return WIFI_OPT_P2P_NOT_OPENED; } @@ -504,7 +504,7 @@ ErrCode WifiP2pServiceImpl::QueryP2pLinkedInfo(WifiP2pLinkedInfo &linkedInfo) } if (!IsP2pServiceRunning()) { - WIFI_LOGE("P2pService is not runing!"); + WIFI_LOGE("P2pService is not running!"); return WIFI_OPT_P2P_NOT_OPENED; } @@ -544,7 +544,7 @@ ErrCode WifiP2pServiceImpl::GetCurrentGroup(WifiP2pGroupInfo &group) } if (!IsP2pServiceRunning()) { - WIFI_LOGE("P2pService is not runing!"); + WIFI_LOGE("P2pService is not running!"); return WIFI_OPT_P2P_NOT_OPENED; } @@ -567,7 +567,7 @@ ErrCode WifiP2pServiceImpl::GetP2pDiscoverStatus(int &status) { WIFI_LOGI("GetP2pDiscoverStatus"); if (!IsP2pServiceRunning()) { - WIFI_LOGE("P2pService is not runing!"); + WIFI_LOGE("P2pService is not running!"); return WIFI_OPT_P2P_NOT_OPENED; } @@ -583,7 +583,7 @@ ErrCode WifiP2pServiceImpl::GetP2pConnectedStatus(int &status) { WIFI_LOGI("GetP2pConnectedStatus"); if (!IsP2pServiceRunning()) { - WIFI_LOGE("P2pService is not runing!"); + WIFI_LOGE("P2pService is not running!"); return WIFI_OPT_P2P_NOT_OPENED; } @@ -613,7 +613,7 @@ ErrCode WifiP2pServiceImpl::QueryP2pDevices(std::vector &devives) } if (!IsP2pServiceRunning()) { - WIFI_LOGE("P2pService is not runing!"); + WIFI_LOGE("P2pService is not running!"); return WIFI_OPT_P2P_NOT_OPENED; } @@ -634,7 +634,7 @@ ErrCode WifiP2pServiceImpl::QueryP2pGroups(std::vector &groups } if (!IsP2pServiceRunning()) { - WIFI_LOGE("P2pService is not runing!"); + WIFI_LOGE("P2pService is not running!"); return WIFI_OPT_P2P_NOT_OPENED; } @@ -650,7 +650,7 @@ ErrCode WifiP2pServiceImpl::QueryP2pServices(std::vector &se { WIFI_LOGI("QueryP2pServices"); if (!IsP2pServiceRunning()) { - WIFI_LOGE("P2pService is not runing!"); + WIFI_LOGE("P2pService is not running!"); return WIFI_OPT_P2P_NOT_OPENED; } @@ -712,7 +712,7 @@ ErrCode WifiP2pServiceImpl::SetP2pDeviceName(const std::string &deviceName) } WifiConfigCenter::GetInstance().SetP2pDeviceName(deviceName); if (!IsP2pServiceRunning()) { - WIFI_LOGE("P2pService is not runing!"); + WIFI_LOGE("P2pService is not running!"); return WIFI_OPT_SUCCESS; } IP2pService *pService = WifiServiceManager::GetInstance().GetP2pServiceInst(); @@ -727,7 +727,7 @@ ErrCode WifiP2pServiceImpl::SetP2pWfdInfo(const WifiP2pWfdInfo &wfdInfo) { WIFI_LOGI("SetP2pWfdInfo"); if (!IsP2pServiceRunning()) { - WIFI_LOGE("P2pService is not runing!"); + WIFI_LOGE("P2pService is not running!"); return WIFI_OPT_P2P_NOT_OPENED; } IP2pService *pService = WifiServiceManager::GetInstance().GetP2pServiceInst(); @@ -790,7 +790,7 @@ ErrCode WifiP2pServiceImpl::Hid2dCreateGroup(const int frequency, FreqType type) } if (!IsP2pServiceRunning()) { - WIFI_LOGE("P2pService is not runing!"); + WIFI_LOGE("P2pService is not running!"); return WIFI_OPT_P2P_NOT_OPENED; } @@ -818,7 +818,7 @@ ErrCode WifiP2pServiceImpl::Hid2dConnect(const Hid2dConnectConfig& config) } if (!IsP2pServiceRunning()) { - WIFI_LOGE("P2pService is not runing!"); + WIFI_LOGE("P2pService is not running!"); return WIFI_OPT_P2P_NOT_OPENED; } @@ -916,4 +916,4 @@ int32_t WifiP2pServiceImpl::Dump(int32_t fd, const std::vector& return ERR_OK; } } // namespace Wifi -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_callback_proxy.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_callback_proxy.cpp index 6133970..d765836 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_callback_proxy.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_callback_proxy.cpp @@ -43,7 +43,7 @@ void WifiScanCallbackProxy::OnWifiScanStateChanged(int state) int error = Remote()->SendRequest(WIFI_CBK_CMD_SCAN_STATE_CHANGE, data, reply, option); switch (error) { case NO_ERROR: - WIFI_LOGD("OnWifiScanStateChanged callback sucessed!"); + WIFI_LOGD("OnWifiScanStateChanged callback succeeded!"); break; case DEAD_OBJECT: { WIFI_LOGE("Failed to SendRequest, remote object has dead!"); @@ -64,4 +64,4 @@ void WifiScanCallbackProxy::OnWifiScanStateChanged(int state) return; } } // namespace Wifi -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_callback_proxy_lite.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_callback_proxy_lite.cpp index 666e979..ba54b5a 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_callback_proxy_lite.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_callback_proxy_lite.cpp @@ -46,7 +46,7 @@ void WifiScanCallbackProxy::OnWifiScanStateChanged(int state) int ret = SendRequest(sid_, WIFI_CBK_CMD_SCAN_STATE_CHANGE, &data, &reply, option, nullptr); switch (ret) { case ERR_NONE: - WIFI_LOGD("OnWifiScanStateChanged callback sucessed!"); + WIFI_LOGD("OnWifiScanStateChanged callback succeeded!"); break; default: { WIFI_LOGE("OnWifiScanStateChanged,connect done failed, error: %{public}d!", ret); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.cpp index 2952899..5b3579f 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.cpp @@ -97,7 +97,7 @@ int WifiServiceManager::LoadStaService(const std::string &dlname, bool bCreate) mStaServiceHandle.create = (IStaService *(*)()) dlsym(mStaServiceHandle.handle, "Create"); mStaServiceHandle.destroy = (void *(*)(IStaService *))dlsym(mStaServiceHandle.handle, "Destroy"); if (mStaServiceHandle.create == nullptr || mStaServiceHandle.destroy == nullptr) { - WIFI_LOGE("%{public}s dlsym Create or Destory failed!", dlname.c_str()); + WIFI_LOGE("%{public}s dlsym Create or Destroy failed!", dlname.c_str()); dlclose(mStaServiceHandle.handle); mStaServiceHandle.Clear(); return -1; @@ -121,7 +121,7 @@ int WifiServiceManager::LoadScanService(const std::string &dlname, bool bCreate) mScanServiceHandle.create = (IScanService *(*)()) dlsym(mScanServiceHandle.handle, "Create"); mScanServiceHandle.destroy = (void *(*)(IScanService *))dlsym(mScanServiceHandle.handle, "Destroy"); if (mScanServiceHandle.create == nullptr || mScanServiceHandle.destroy == nullptr) { - WIFI_LOGE("%{public}s dlsym Create or Destory failed!", dlname.c_str()); + WIFI_LOGE("%{public}s dlsym Create or Destroy failed!", dlname.c_str()); dlclose(mScanServiceHandle.handle); mScanServiceHandle.Clear(); return -1; @@ -146,7 +146,7 @@ int WifiServiceManager::LoadApService(const std::string &dlname, bool bCreate) mApServiceHandle.create = (IApService *(*)()) dlsym(mApServiceHandle.handle, "Create"); mApServiceHandle.destroy = (void *(*)(IApService *))dlsym(mApServiceHandle.handle, "Destroy"); if (mApServiceHandle.create == nullptr || mApServiceHandle.destroy == nullptr) { - WIFI_LOGE("%{public}s dlsym Create or Destory failed!", dlname.c_str()); + WIFI_LOGE("%{public}s dlsym Create or Destroy failed!", dlname.c_str()); dlclose(mApServiceHandle.handle); mApServiceHandle.Clear(); return -1; @@ -172,7 +172,7 @@ int WifiServiceManager::LoadP2pService(const std::string &dlname, bool bCreate) mP2pServiceHandle.create = (IP2pService *(*)()) dlsym(mP2pServiceHandle.handle, "Create"); mP2pServiceHandle.destroy = (void *(*)(IP2pService *))dlsym(mP2pServiceHandle.handle, "Destroy"); if (mP2pServiceHandle.create == nullptr || mP2pServiceHandle.destroy == nullptr) { - WIFI_LOGE("%{public}s dlsym Create or Destory failed!", dlname.c_str()); + WIFI_LOGE("%{public}s dlsym Create or Destroy failed!", dlname.c_str()); dlclose(mP2pServiceHandle.handle); mP2pServiceHandle.Clear(); return -1; @@ -379,4 +379,4 @@ void WifiServiceManager::UninstallAllService() return; } } // namespace Wifi -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp index 9010857..4c79949 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp @@ -214,7 +214,7 @@ void StaAutoConnectService::ConnectElectedDevice(WifiDeviceConfig &electedDevice pStaStateMachine->SendMessage(WIFI_SVR_CMD_STA_CONNECT_SAVED_NETWORK, electedDevice.networkId, NETWORK_SELECTED_FOR_CONNECTION_MANAGEMENT); - WIFI_LOGI("connecTo save networkId: %{public}d, preShareKey len: %{public}d.\n", + WIFI_LOGI("connectTo save networkId: %{public}d, preShareKey len: %{public}d.\n", electedDevice.networkId, (int)electedDevice.preSharedKey.length()); } else { WIFI_LOGE("The current connection status is %{public}d.\n", currentConnectedNetwork.detailedState); @@ -599,4 +599,4 @@ void StaAutoConnectService::GetAvailableScanInfos(std::vector &av return; } } // namespace Wifi -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp index 99bd733..3c27267 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp @@ -357,7 +357,7 @@ void StaStateMachine::SyncDeviceConfigToWpa() const if (WifiStaHalInterface::GetInstance().ClearDeviceConfig() != WIFI_IDL_OPT_OK) { WIFI_LOGE("ClearDeviceConfig() failed!"); } else { - WIFI_LOGD("ClearDeviceConfig() successed!"); + WIFI_LOGD("ClearDeviceConfig() succeeded!"); std::vector results; WifiSettings::GetInstance().GetDeviceConfig(results); for(WifiDeviceConfig result : results) { @@ -865,7 +865,7 @@ void StaStateMachine::DealDisconnectEvent(InternalMessage *msg) #ifdef OHOS_ARCH_LITE IfConfig::GetInstance().FlushIpAddr(IF_NAME, IPTYPE_IPV4); #endif - /* Initialize connection informatoin. */ + /* Initialize connection information. */ InitWifiLinkedInfo(); if (lastLinkedInfo.detailedState == DetailedState::CONNECTING) { linkedInfo.networkId = lastLinkedInfo.networkId; @@ -916,7 +916,7 @@ void StaStateMachine::DealReConnectCmd(InternalMessage *msg) } if (linkedInfo.connState == ConnState::CONNECTED) { - WIFI_LOGE("Network is already connected, ignore the re-connect comand!\n"); + WIFI_LOGE("Network is already connected, ignore the re-connect command!\n"); return; } @@ -2050,4 +2050,4 @@ void StaStateMachine::SetOperationalMode(int mode) SendMessage(WIFI_SVR_CMD_STA_OPERATIONAL_MODE, mode, 0); } } // namespace Wifi -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.c index d201df7..dc93ed9 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.c @@ -317,10 +317,10 @@ int OnTransact(RpcServer *server, Context *context) LOGI("run %{public}s", func); Rpcfunc pFunc = GetRpcFunc(func); if (pFunc == NULL) { - LOGD("unsupport function[%{public}s]", func); + LOGD("unsupported function[%{public}s]", func); WriteBegin(context, 0); WriteInt(context, WIFI_HAL_FAILED); - WriteStr(context, "unsupport function"); + WriteStr(context, "unsupported function"); WriteEnd(context); } else { ret = pFunc(server, context); @@ -712,4 +712,4 @@ int EndCallbackTransact(const RpcServer *server, int event) return HAL_FAILURE; } return PopFrontCallbackMsg(event); -} \ No newline at end of file +} diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c index 335affa..773caaf 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c @@ -79,7 +79,7 @@ static void DealP2pFindInfo(char *buf) info.groupCapabilities = Hex2Dec(retMsg.value); } else if (strncmp(retMsg.key, "wfd_dev_info", strlen("wfd_dev_info")) == 0) { if (strlen(retMsg.value) != strlen("0x000000000000")) { - LOGD("Unexpect wfd device info, it's return 6 uint8 array convert to hex string!"); + LOGD("Unexpected wfd device info, it's return 6 uint8 array convert to hex string!"); } else { StrSafeCopy(info.wfdDeviceInfo, sizeof(info.wfdDeviceInfo), retMsg.value); info.wfdLength = strlen(info.wfdDeviceInfo); diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.h index 81148a1..5fed691 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.h +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.h @@ -224,7 +224,7 @@ WifiErrorNo GetSupportFeature(long *feature); * @Description Send instructions to the Wi-Fi driver or chip. * * @param ifname - * @param cmdid - Commond ID. + * @param cmdid - Command ID. * @param buf * @param bufSize * @return WifiErrorNo @@ -392,4 +392,4 @@ WifiErrorNo GetConnectSignalInfo(const char *endBssid, WpaSignalInfo *info); #ifdef __cplusplus } #endif -#endif \ No newline at end of file +#endif diff --git a/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_test.cpp b/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_test.cpp index b95c984..2e49ae5 100644 --- a/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_test.cpp +++ b/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_test.cpp @@ -104,7 +104,7 @@ HWTEST_F(WifiHalCRpcServerTest, OnTransactTest, TestSize.Level1) mContext->nPos = 2; mContext->nSize = strlen(buff2); EXPECT_TRUE(OnTransact(mServer, mContext) == 0); - EXPECT_TRUE(strstr(mContext->szWrite, "unsupport function") != nullptr); + EXPECT_TRUE(strstr(mContext->szWrite, "unsupported function") != nullptr); char buff3[] = "N|SetCountryCode|"; mContext->oneProcess = buff3; mContext->nPos = 2; @@ -1295,4 +1295,4 @@ HWTEST_F(WifiHalCRpcServerTest, RpcGetValidFrequenciesForBandTest, TestSize.Leve EXPECT_TRUE(RpcGetValidFrequenciesForBand(mServer, mContext) == 0); } } // namespace Wifi -} // namespace OHOS \ No newline at end of file +} // namespace OHOS -- Gitee From 79ab042d74ffdc1849a0b4b425ead7910958a8e2 Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Sat, 18 Jun 2022 08:54:09 +0000 Subject: [PATCH 191/491] The efficiency optimization of wifi enable and disable Signed-off-by: zhangfeng Change-Id: Iead498ce902a1de7fca1812cfde08f2a7732b693 --- .../wifi_manage/wifi_manager.cpp | 4 +- .../wifi_manage/wifi_net_agent.cpp | 15 +++++-- .../wifi_manage/wifi_net_agent.h | 4 +- .../wifi_p2p/p2p_state_machine.cpp | 3 ++ .../wifi_sta/sta_state_machine.cpp | 40 +++++++++++++++---- .../wifi_hal/wifi_hal_module_manage.c | 11 ++--- wifi/utils/inc/wifi_common_util.h | 15 +++++++ wifi/utils/src/wifi_common_util.cpp | 15 +++++++ 8 files changed, 87 insertions(+), 20 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp index 46031a4..61bf223 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp @@ -322,7 +322,7 @@ void WifiManager::CloseApService(void) void WifiManager::CloseScanService(void) { - WIFI_LOGD("close scan service"); + WIFI_LOGI("close scan service"); WifiServiceManager::GetInstance().UnloadService(WIFI_SERVICE_SCAN); WifiConfigCenter::GetInstance().SetScanMidState(WifiOprMidState::CLOSED); return; @@ -433,6 +433,7 @@ void WifiManager::DealStaOpenRes(OperateResState state) void WifiManager::DealStaCloseRes(OperateResState state) { + WIFI_LOGI("Enter DealStaCloseRes"); WifiEventCallbackMsg cbMsg; cbMsg.msgCode = WIFI_CBK_MSG_STATE_CHANGE; if (state == OperateResState::CLOSE_WIFI_CLOSING) { @@ -520,6 +521,7 @@ void WifiManager::DealRssiChanged(int rssi) void WifiManager::CheckAndStartScanService(void) { WifiOprMidState scanState = WifiConfigCenter::GetInstance().GetScanMidState(); + WIFI_LOGI("CheckAndStartScanService scanState: %{public}d", static_cast(scanState)); if (scanState != WifiOprMidState::CLOSED) { /* If the scanning function is enabled when the STA is not enabled, you need to start the scheduled scanning function immediately when the STA is enabled. */ diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_net_agent.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_net_agent.cpp index 845f9ce..12450bd 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_net_agent.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_net_agent.cpp @@ -34,6 +34,7 @@ WifiNetAgent::~WifiNetAgent() = default; bool WifiNetAgent::RegisterNetSupplier() { + TimeStats timeStats(__func__); WIFI_LOGI("Enter RegisterNetSupplier."); auto netManager = DelayedSingleton::GetInstance(); if (netManager == nullptr) { @@ -55,6 +56,7 @@ bool WifiNetAgent::RegisterNetSupplier() bool WifiNetAgent::RegisterNetSupplierCallback(const StaServiceCallback &callback) { + TimeStats timeStats(__func__); WIFI_LOGI("Enter RegisterNetSupplierCallback."); auto netManager = DelayedSingleton::GetInstance(); if (netManager == nullptr) { @@ -79,6 +81,7 @@ bool WifiNetAgent::RegisterNetSupplierCallback(const StaServiceCallback &callbac void WifiNetAgent::UnregisterNetSupplier() { + TimeStats timeStats(__func__); WIFI_LOGI("Enter UnregisterNetSupplier."); auto netManager = DelayedSingleton::GetInstance(); if (netManager == nullptr) { @@ -91,6 +94,7 @@ void WifiNetAgent::UnregisterNetSupplier() void WifiNetAgent::UpdateNetSupplierInfo(sptr &netSupplierInfo) { + TimeStats timeStats(__func__); WIFI_LOGI("Enter UpdateNetSupplierInfo."); auto netManager = DelayedSingleton::GetInstance(); if (netManager == nullptr) { @@ -102,9 +106,10 @@ void WifiNetAgent::UpdateNetSupplierInfo(sptr::GetInstance(); if (netManager == nullptr) { @@ -149,12 +154,13 @@ void WifiNetAgent::UpdateNetLinkInfo(std::string &ip, std::string &mask, std::st netLinkInfo->routeList_.push_back(*localRoute); int32_t result = netManager->UpdateNetLinkInfo(supplierId, netLinkInfo); - WIFI_LOGI("result:%{public}d", result); + WIFI_LOGI("UpdateNetLinkInfo result:%{public}d", result); } bool WifiNetAgent::AddRoute(const std::string interface, const std::string ipAddress, int prefixLength) { - LOGI("Net agent addroute"); + TimeStats timeStats(__func__); + LOGI("NetAgent add route"); unsigned int ipInt = IpTools::ConvertIpv4Address(ipAddress); std::string mask = IpTools::ConvertIpv4Mask(prefixLength); unsigned int maskInt = IpTools::ConvertIpv4Address(mask); @@ -179,6 +185,7 @@ bool WifiNetAgent::AddRoute(const std::string interface, const std::string ipAdd LOGI("Add route, interface: %{public}s, destAddress: %{public}s, ipAddress: %{public}s, prefixLength: %{public}d", interface.c_str(), IpAnonymize(destAddress).c_str(), IpAnonymize(ipAddress).c_str(), prefixLength); netsysService->NetworkAddRoute(OHOS::nmd::LOCAL_NETWORK_NETID, interface, destAddress, ipAddress); + LOGI("NetAgent add route finish"); return true; } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_net_agent.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_net_agent.h index 1b1fdbc..44f1f78 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_net_agent.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_net_agent.h @@ -68,8 +68,8 @@ public: * @param supplierId network unique identity id returned after network registration * @param netLinkInfo network link data information */ - void UpdateNetLinkInfo(std::string &ip, std::string &mask, std::string &gateWay, - std::string &strDns, std::string &strBakDns); + void UpdateNetLinkInfo(const std::string &ip, const std::string &mask, const std::string &gateWay, + const std::string &strDns, const std::string &strBakDns); /** * Add route diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp index a33bc44..9427d43 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp @@ -671,6 +671,7 @@ bool P2pStateMachine::StartDhcpServer() if (!m_DhcpdInterface.SetDhcpEventFunc(groupManager.GetCurrentGroup().GetInterface(), pDhcpResultNotify.get())) { WIFI_LOGE("Set dhcp notify failed."); } + WIFI_LOGI("Start add route"); WifiNetAgent::GetInstance().AddRoute(groupManager.GetCurrentGroup().GetInterface(), ipv4.GetAddressWithString(), ipv4.GetAddressPrefixLength()); WIFI_LOGI("Start dhcp server for P2p finished."); @@ -703,7 +704,9 @@ void P2pStateMachine::DhcpResultNotify::OnSuccess(int status, const std::string WifiSettings::GetInstance().SaveP2pInfo(p2pInfo); groupManager.SaveP2pInfo(p2pInfo); pP2pStateMachine->BroadcastP2pConnectionChanged(); + WIFI_LOGI("Start add route on dhcp success"); WifiNetAgent::GetInstance().AddRoute(ifname, result.strYourCli, IpTools::GetMaskLength(result.strSubnet)); + WIFI_LOGI("DhcpResultNotify::OnSuccess end"); } void P2pStateMachine::DhcpResultNotify::OnFailed(int status, const std::string &ifname, const std::string &reason) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp index 99bd733..08154ec 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp @@ -15,6 +15,7 @@ #include "sta_state_machine.h" #include +#include #include "log_helper.h" #include "sta_monitor.h" #include "wifi_logger.h" @@ -349,6 +350,7 @@ ErrCode StaStateMachine::ConvertDeviceCfg(const WifiDeviceConfig &config) const void StaStateMachine::SyncDeviceConfigToWpa() const { + WIFI_LOGI("SyncDeviceConfigToWpa"); /* Reload wifi Configurations. */ if (WifiSettings::GetInstance().ReloadDeviceConfig() != 0) { WIFI_LOGE("ReloadDeviceConfig is failed!"); @@ -399,8 +401,11 @@ void StaStateMachine::StartWifiProcess() WIFI_LOGI("GetStaDeviceMacAddress failed!"); } #ifndef OHOS_ARCH_LITE - WifiNetAgent::GetInstance().RegisterNetSupplier(); - WifiNetAgent::GetInstance().RegisterNetSupplierCallback(staCallback); + WIFI_LOGI("Register netsupplier"); + std::thread([this]() { + WifiNetAgent::GetInstance().RegisterNetSupplier(); + WifiNetAgent::GetInstance().RegisterNetSupplierCallback(staCallback); + }).detach(); #endif /* Initialize Connection Information. */ InitWifiLinkedInfo(); @@ -515,8 +520,11 @@ void StaStateMachine::StopWifiProcess() { WIFI_LOGI("Enter StaStateMachine::StopWifiProcess.\n"); #ifndef OHOS_ARCH_LITE - WifiNetAgent::GetInstance().UnregisterNetSupplier(); + std::thread([this]() { + WifiNetAgent::GetInstance().UnregisterNetSupplier(); + }).detach(); #endif + WIFI_LOGI("Stop wifi is in process...\n"); WifiSettings::GetInstance().SetWifiState(static_cast(WifiState::DISABLING)); staCallback.OnStaCloseRes(OperateResState::CLOSE_WIFI_CLOSING); StopTimer(static_cast(CMD_SIGNAL_POLL)); @@ -685,6 +693,7 @@ void StaStateMachine::DealSignalPollResult(InternalMessage *msg) } #ifndef OHOS_ARCH_LITE if (NetSupplierInfo != nullptr) { + TimeStats timeStats("Call UpdateNetSupplierInfo"); NetSupplierInfo->isAvailable_ = true; NetSupplierInfo->isRoaming_ = isRoam; NetSupplierInfo->strength_ = linkedInfo.rssi; @@ -823,7 +832,10 @@ void StaStateMachine::DealConnectionEvent(InternalMessage *msg) if (NetSupplierInfo != nullptr) { NetSupplierInfo->isAvailable_ = true; NetSupplierInfo->isRoaming_ = isRoam; - WifiNetAgent::GetInstance().UpdateNetSupplierInfo(NetSupplierInfo); + std::thread([this]() { + WIFI_LOGI("On connect update net supplier info\n"); + WifiNetAgent::GetInstance().UpdateNetSupplierInfo(NetSupplierInfo); + }).detach(); } #endif /* Callback result to InterfaceService. */ @@ -846,7 +858,10 @@ void StaStateMachine::DealDisconnectEvent(InternalMessage *msg) #ifndef OHOS_ARCH_LITE if (NetSupplierInfo != nullptr) { NetSupplierInfo->isAvailable_ = false; - WifiNetAgent::GetInstance().UpdateNetSupplierInfo(NetSupplierInfo); + std::thread([this]() { + WIFI_LOGI("On disconnect update net supplier info\n"); + WifiNetAgent::GetInstance().UpdateNetSupplierInfo(NetSupplierInfo); + }).detach(); } #endif StopTimer(static_cast(CMD_SIGNAL_POLL)); @@ -1443,9 +1458,13 @@ void StaStateMachine::DisConnectProcess() #ifndef OHOS_ARCH_LITE if (NetSupplierInfo != nullptr) { NetSupplierInfo->isAvailable_ = false; - WifiNetAgent::GetInstance().UpdateNetSupplierInfo(NetSupplierInfo); + std::thread([this]() { + WIFI_LOGI("Disconnect process update netsupplierinfo"); + WifiNetAgent::GetInstance().UpdateNetSupplierInfo(NetSupplierInfo); + }).detach(); } #endif + WIFI_LOGI("Disconnect update wifi status"); /* Save connection information to WifiSettings. */ SaveLinkstate(ConnState::DISCONNECTED, DetailedState::DISCONNECTED); DisableNetwork(linkedInfo.networkId); @@ -1965,13 +1984,18 @@ void StaStateMachine::DhcpResultNotify::OnSuccess(int status, const std::string IpAnonymize(result.strYourCli).c_str(), IpAnonymize(result.strSubnet).c_str(), IpAnonymize(result.strRouter1).c_str(), IpAnonymize(result.strDns1).c_str(), IpAnonymize(result.strDns2).c_str()); - WifiNetAgent::GetInstance().UpdateNetLinkInfo(result.strYourCli, result.strSubnet, result.strRouter1, - result.strDns1, result.strDns2); + std::thread([result]() { + WIFI_LOGI("On dhcp success update net linke info"); + WifiNetAgent::GetInstance().UpdateNetLinkInfo(result.strYourCli, result.strSubnet, result.strRouter1, + result.strDns1, result.strDns2); + }).detach(); #endif } #ifdef OHOS_ARCH_LITE IfConfig::GetInstance().SetIfDnsAndRoute(result, result.iptype); #endif + WIFI_LOGI("getIpSucNum=%{private}d, getIpFailNum=%{private}d", + pStaStateMachine->getIpSucNum, pStaStateMachine->getIpFailNum); if (pStaStateMachine->getIpSucNum == 0 || pStaStateMachine->isRoam) { pStaStateMachine->SaveLinkstate(ConnState::CONNECTED, DetailedState::CONNECTED); pStaStateMachine->staCallback.OnStaConnChanged( diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module_manage.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module_manage.c index 65e28d0..c581541 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module_manage.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module_manage.c @@ -32,7 +32,7 @@ static ModuleInfo *g_halModuleList = NULL; -#define STOP_MODULE_TRY_TIMES 3 +#define STOP_MODULE_TRY_TIMES 30 #define MAX_WPA_MAIN_ARGC_NUM 20 #define MAX_WPA_MAIN_ARGV_LEN 64 @@ -149,7 +149,6 @@ int StartModuleInternal(const char *moduleName, const char *startCmd, pid_t *pPr exit(0); } else { LOGE("Create wpa process id is [%{public}d]", pid); - sleep(1); *pProcessId = pid; } return HAL_SUCCESS; @@ -160,7 +159,9 @@ int StopModuleInternal(const char *moduleName, pid_t processId) if (moduleName == NULL) { return HAL_SUCCESS; } + LOGI("Start stop module internal"); int tryTimes = STOP_MODULE_TRY_TIMES; + const int SLEEP_TIME_US = 1000 * 100; // 100ms while (tryTimes-- >= 0) { if (kill(processId, SIGTERM) == -1) { if (ESRCH == errno) { @@ -170,13 +171,13 @@ int StopModuleInternal(const char *moduleName, pid_t processId) LOGE("kill [%{public}d] failed", processId); return HAL_FAILURE; } - sleep(1); + usleep(SLEEP_TIME_US); int ret = waitpid(processId, NULL, WNOHANG); if (ret <= 0) { - LOGI("Waitpid %{public}d return %{public}d, and retry", processId, ret); + LOGI("Waitpid %{public}d return %{public}d, tryTimes value %{public}d and retry", processId, ret, tryTimes); continue; } else { - LOGD("waitpid [%{public}d] success", processId); + LOGI("waitpid [%{public}d] success", processId); return HAL_SUCCESS; } } diff --git a/wifi/utils/inc/wifi_common_util.h b/wifi/utils/inc/wifi_common_util.h index 8d6f8d5..0919f17 100644 --- a/wifi/utils/inc/wifi_common_util.h +++ b/wifi/utils/inc/wifi_common_util.h @@ -110,6 +110,21 @@ std::string GetBundleName(); * @return bool - Returns true for yes, false for no. */ bool IsSystemApp(); + +/** + * @Description Time consuming statistics + * + */ +class TimeStats final { +public: + TimeStats(const std::string desc); + TimeStats() = delete; + ~TimeStats(); + +private: + std::string m_desc; + std::chrono::steady_clock::time_point m_startTime; +}; #endif } // namespace Wifi } // namespace OHOS diff --git a/wifi/utils/src/wifi_common_util.cpp b/wifi/utils/src/wifi_common_util.cpp index b19c45f..a964b01 100644 --- a/wifi/utils/src/wifi_common_util.cpp +++ b/wifi/utils/src/wifi_common_util.cpp @@ -225,6 +225,21 @@ bool IsSystemApp() WIFI_LOGI("Is system App uid[%{public}d]: %{public}d", uid, isSysApp); return isSysApp; } + +TimeStats::TimeStats(const std::string desc): m_desc(desc) +{ + m_startTime = std::chrono::steady_clock::now(); + WIFI_LOGI("[Time stats][start] %{public}s.", m_desc.c_str()); +} + +TimeStats::~TimeStats() +{ + auto us = std::chrono::duration_cast + (std::chrono::steady_clock::now() - m_startTime).count(); + constexpr int TIME_BASE = 1000; + WIFI_LOGI("[Time stats][end] %{public}s, time cost:%{public}lldus, %{public}lldms, %{public}llds", + m_desc.c_str(), us, us / TIME_BASE, us / TIME_BASE / TIME_BASE); +} #endif } // namespace Wifi } // namespace OHOS \ No newline at end of file -- Gitee From eaf423e6e7561144874e081840d11a361aca0e13 Mon Sep 17 00:00:00 2001 From: y00316381 Date: Sat, 18 Jun 2022 20:30:06 +0800 Subject: [PATCH 192/491] bugfix from master 0618 Signed-off-by: y00316381 --- dhcp/services/dhcp_client/src/dhcp_socket.c | 3 +- .../wifi_sta/sta_state_machine.cpp | 39 ++++++++++--------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/dhcp/services/dhcp_client/src/dhcp_socket.c b/dhcp/services/dhcp_client/src/dhcp_socket.c index 41af31c..bfb128c 100644 --- a/dhcp/services/dhcp_client/src/dhcp_socket.c +++ b/dhcp/services/dhcp_client/src/dhcp_socket.c @@ -140,7 +140,8 @@ int BindKernelSocket(const int sockFd, const char *ifaceName, const uint32_t soc /* Set the broadcast feature of the data sent by the socket. */ if (bCast) { - if (setsockopt(sockFd, SOL_SOCKET, SO_BROADCAST, (const char *)&bCast, sizeof(bool)) == -1) { + int broadcast = 1; + if (setsockopt(sockFd, SOL_SOCKET, SO_BROADCAST, (const char *)&broadcast, sizeof(int)) == -1) { LOGE("BindKernelSocket() sockFd:%{public}d SO_BROADCAST error:%{public}d.", sockFd, errno); close(sockFd); return SOCKET_OPT_FAILED; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp index 99bd733..7ee6697 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp @@ -1611,19 +1611,16 @@ void StaStateMachine::GetIpState::GoInState() LOGE("ConfigstaticIpAddress failed!\n"); } } else { - LOGI("GetIpState get dhcp result."); + LOGI("GetIpState get dhcp result, isRoam=%{public}d, clientRunStatus=%{public}d.", + pStaStateMachine->isRoam, dhcpInfo.clientRunStatus); int dhcpRet = 0; DhcpServiceInfo dhcpInfo; pStaStateMachine->pDhcpService->GetDhcpInfo(IF_NAME, dhcpInfo); - if (pStaStateMachine->isRoam && dhcpInfo.clientRunStatus == 1) { - dhcpRet = pStaStateMachine->pDhcpService->RenewDhcpClient(IF_NAME); + pStaStateMachine->currentTpType = static_cast(WifiSettings::GetInstance().GetDhcpIpType()); + if (pStaStateMachine->currentTpType == IPTYPE_IPV6) { + dhcpRet = pStaStateMachine->pDhcpService->StartDhcpClient(IF_NAME, true); } else { - pStaStateMachine->currentTpType = static_cast(WifiSettings::GetInstance().GetDhcpIpType()); - if (pStaStateMachine->currentTpType == IPTYPE_IPV4) { - dhcpRet = pStaStateMachine->pDhcpService->StartDhcpClient(IF_NAME, false); - } else { - dhcpRet = pStaStateMachine->pDhcpService->StartDhcpClient(IF_NAME, true); - } + dhcpRet = pStaStateMachine->pDhcpService->StartDhcpClient(IF_NAME, false); } if ((dhcpRet != 0) || (pStaStateMachine->pDhcpService->GetDhcpResult( IF_NAME, pStaStateMachine->pDhcpResultNotify, DHCP_TIME) != 0)) { @@ -1924,7 +1921,8 @@ StaStateMachine::DhcpResultNotify::~DhcpResultNotify() void StaStateMachine::DhcpResultNotify::OnSuccess(int status, const std::string &ifname, DhcpResult &result) { - LOGI("Enter Sta DhcpResultNotify::OnSuccess. ifname=[%{public}s] status=[%d]\n", ifname.c_str(), status); + LOGI("Enter Sta DhcpResultNotify::OnSuccess. ifname=[%{public}s] status=[%{public}d]\n", + ifname.c_str(), status); if ((pStaStateMachine->linkedInfo.detailedState == DetailedState::DISCONNECTING) || (pStaStateMachine->linkedInfo.detailedState == DetailedState::DISCONNECTED)) { @@ -1972,15 +1970,18 @@ void StaStateMachine::DhcpResultNotify::OnSuccess(int status, const std::string #ifdef OHOS_ARCH_LITE IfConfig::GetInstance().SetIfDnsAndRoute(result, result.iptype); #endif - if (pStaStateMachine->getIpSucNum == 0 || pStaStateMachine->isRoam) { - pStaStateMachine->SaveLinkstate(ConnState::CONNECTED, DetailedState::CONNECTED); - pStaStateMachine->staCallback.OnStaConnChanged( - OperateResState::CONNECT_AP_CONNECTED, pStaStateMachine->linkedInfo); - /* Wait for the network adapter information to take effect. */ - sleep(SLEEPTIME); - /* Check whether the Internet access is normal by send http. */ - pStaStateMachine->pNetcheck->SignalNetCheckThread(); - } + } + + WIFI_LOGI("DhcpResultNotify::OnSuccess, getIpSucNum=%{public}d, isRoam=%{public}d", + pStaStateMachine->getIpSucNum, pStaStateMachine->isRoam); + if (pStaStateMachine->getIpSucNum == 0 || pStaStateMachine->isRoam) { + pStaStateMachine->SaveLinkstate(ConnState::CONNECTED, DetailedState::CONNECTED); + pStaStateMachine->staCallback.OnStaConnChanged( + OperateResState::CONNECT_AP_CONNECTED, pStaStateMachine->linkedInfo); + /* Wait for the network adapter information to take effect. */ + sleep(SLEEPTIME); + /* Check whether the Internet access is normal by send http. */ + pStaStateMachine->pNetcheck->SignalNetCheckThread(); } pStaStateMachine->getIpSucNum++; return; -- Gitee From a77cb632c79762d098568363bd242c1a79b85e7b Mon Sep 17 00:00:00 2001 From: y00316381 Date: Mon, 20 Jun 2022 08:36:33 +0800 Subject: [PATCH 193/491] bugfix from master 0620 Signed-off-by: y00316381 --- .../wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp index 7ee6697..9680117 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp @@ -1611,11 +1611,11 @@ void StaStateMachine::GetIpState::GoInState() LOGE("ConfigstaticIpAddress failed!\n"); } } else { - LOGI("GetIpState get dhcp result, isRoam=%{public}d, clientRunStatus=%{public}d.", - pStaStateMachine->isRoam, dhcpInfo.clientRunStatus); int dhcpRet = 0; DhcpServiceInfo dhcpInfo; pStaStateMachine->pDhcpService->GetDhcpInfo(IF_NAME, dhcpInfo); + LOGI("GetIpState get dhcp result, isRoam=%{public}d, clientRunStatus=%{public}d.", + pStaStateMachine->isRoam, dhcpInfo.clientRunStatus); pStaStateMachine->currentTpType = static_cast(WifiSettings::GetInstance().GetDhcpIpType()); if (pStaStateMachine->currentTpType == IPTYPE_IPV6) { dhcpRet = pStaStateMachine->pDhcpService->StartDhcpClient(IF_NAME, true); -- Gitee From 9b92c689350faad0aba27763718c1b1759931c71 Mon Sep 17 00:00:00 2001 From: fanchao Date: Mon, 20 Jun 2022 00:35:38 -0700 Subject: [PATCH 194/491] wifi scan info patch. Signed-off-by: fanchao --- wifi/frameworks/js/napi/inc/wifi_napi_utils.h | 3 +-- wifi/frameworks/js/napi/src/wifi_napi_device.cpp | 7 +++++-- wifi/frameworks/js/napi/src/wifi_napi_utils.cpp | 9 ++------- .../idl_client/idl_interface/i_wifi_sta_iface.c | 2 +- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/wifi/frameworks/js/napi/inc/wifi_napi_utils.h b/wifi/frameworks/js/napi/inc/wifi_napi_utils.h index 00a5e54..9ca9c83 100644 --- a/wifi/frameworks/js/napi/inc/wifi_napi_utils.h +++ b/wifi/frameworks/js/napi/inc/wifi_napi_utils.h @@ -80,8 +80,7 @@ napi_value JsObjectToInt(const napi_env& env, const napi_value& object, const ch napi_value JsObjectToUint(const napi_env& env, const napi_value& object, const char* fieldStr, uint32_t& fieldRef); napi_value JsObjectToBool(const napi_env& env, const napi_value& object, const char* fieldStr, bool& fieldRef); napi_status SetValueUtf8String(const napi_env& env, const char* fieldStr, const char* str, - size_t strLen, napi_value& result); -napi_status SetValueUtf8String(const napi_env& env, const char* fieldStr, const char* str, napi_value& result); + napi_value& result, size_t strLen = NAPI_AUTO_LENGTH); napi_status SetValueInt32(const napi_env& env, const char* fieldStr, const int intValue, napi_value& result); napi_status SetValueUnsignedInt32(const napi_env& env, const char* fieldStr, const int intValue, napi_value& result); napi_status SetValueInt64(const napi_env& env, const char* fieldStr, const int64_t intValue, napi_value& result); diff --git a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp index bb80e74..78f2f20 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp @@ -104,13 +104,14 @@ static ErrCode NativeInfoElemsToJsObj(const napi_env& env, napi_create_array(env, &arr); uint8_t idx_ie = 0; napi_status status; + int valueStep = 2; for (int i = 0; i < infoElems.size(); i++) { napi_value ieObj; napi_create_object(env, &ieObj); SetValueInt32(env, "eid", infoElems[i].id, ieObj); const char *uStr = &infoElems[i].content[0]; int len = infoElems[i].content.size(); - int inLen = (infoElems[i].content.size())*2 + 1; + int inLen = (infoElems[i].content.size()) * valueStep + 1; char *buf = (char *)calloc(inLen + 1, sizeof(char)); if (buf == NULL) { return WIFI_OPT_FAILED; @@ -124,10 +125,12 @@ static ErrCode NativeInfoElemsToJsObj(const napi_env& env, return WIFI_OPT_FAILED; } } - SetValueUtf8String(env, "content", (const char *)buf, inLen - 1, ieObj); + SetValueUtf8String(env, "content", (const char *)buf, ieObj, inLen - 1); status = napi_set_element(env, arr, idx_ie++, ieObj); if (status != napi_ok) { WIFI_LOGE("set content error"); + free(buf); + buf = NULL; return WIFI_OPT_FAILED; } free(buf); diff --git a/wifi/frameworks/js/napi/src/wifi_napi_utils.cpp b/wifi/frameworks/js/napi/src/wifi_napi_utils.cpp index b68da1b..13f2b32 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_utils.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_utils.cpp @@ -137,10 +137,10 @@ napi_value JsObjectToBool(const napi_env& env, const napi_value& object, const c } napi_status SetValueUtf8String(const napi_env& env, const char* fieldStr, const char* str, - size_t strLen, napi_value& result) + napi_value& result, size_t strLen) { napi_value value; - size_t len = strLen ? strLen : NAPI_AUTO_LENGTH; + size_t len = strLen; napi_status status = napi_create_string_utf8(env, str, len, &value); if (status != napi_ok) { WIFI_LOGE("Set value create utf8 string error! field: %{public}s", fieldStr); @@ -153,11 +153,6 @@ napi_status SetValueUtf8String(const napi_env& env, const char* fieldStr, const return status; } -napi_status SetValueUtf8String(const napi_env& env, const char* fieldStr, const char* str, napi_value& result) -{ - return SetValueUtf8String(env, fieldStr, str, 0, result); -} - napi_status SetValueInt32(const napi_env& env, const char* fieldStr, const int intValue, napi_value& result) { napi_value value; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.c b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.c index 7c1e63f..f298a29 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.c +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.c @@ -467,7 +467,7 @@ static void GetScanInfoElems(Context *context, ScanInfo* scanInfo) return; } ReadUStr(context, (unsigned char *)scanInfo->infoElems[i].content, - scanInfo->infoElems[i].size+1); + scanInfo->infoElems[i].size + 1); } } -- Gitee From b81ba6fd48c0f457a847def7bae98120c479ab74 Mon Sep 17 00:00:00 2001 From: y00316381 Date: Mon, 20 Jun 2022 20:15:39 +0800 Subject: [PATCH 195/491] bugfix from master 0620 Signed-off-by: y00316381 --- wifi/interfaces/kits/c/wifi_p2p.h | 7 +++++++ .../wifi_framework/wifi_manage/wifi_p2p_stub.cpp | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/wifi/interfaces/kits/c/wifi_p2p.h b/wifi/interfaces/kits/c/wifi_p2p.h index 446babc..25e7c72 100644 --- a/wifi/interfaces/kits/c/wifi_p2p.h +++ b/wifi/interfaces/kits/c/wifi_p2p.h @@ -159,6 +159,13 @@ WifiErrorCode GetP2pConnectedStatus(int* status); */ WifiErrorCode QueryP2pDevices(WifiP2pDevice* clientDevices, int size, int* retSize); + * @Description Query the information about the local device info. + * + * @param deviceInfo - the WifiP2pDevice object + * @return ErrCode - operate result + */ +WifiErrorCode QueryP2pLocalDevice(WifiP2pDevice *deviceInfo); + /** * @Description Query the information about the found groups. * diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.cpp index 645c757..75d0182 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.cpp @@ -73,7 +73,7 @@ void WifiP2pStub::InitHandleMap() handleFuncMap[WIFI_SVR_CMD_GET_5G_CHANNEL_LIST] = &WifiP2pStub::OnHid2dGetChannelListFor5G; handleFuncMap[WIFI_SVR_CMD_GET_SELF_WIFI_CFG] = &WifiP2pStub::OnHid2dGetSelfWifiCfgInfo; handleFuncMap[WIFI_SVR_CMD_SET_PEER_WIFI_CFG] = &WifiP2pStub::OnHid2dSetPeerWifiCfgInfo; - handleFuncMap[WIFI_SVR_CMD_P2P_QUERY_LOCAL_DEVICE] = &WifiP2pStub::OnHid2dSetPeerWifiCfgInfo; + handleFuncMap[WIFI_SVR_CMD_P2P_QUERY_LOCAL_DEVICE] = &WifiP2pStub::OnQueryP2pLocalDevice; return; } -- Gitee From 3628a82fe14331775840d6b68b7fb597a8069278 Mon Sep 17 00:00:00 2001 From: y00316381 Date: Mon, 20 Jun 2022 20:26:35 +0800 Subject: [PATCH 196/491] bugfix from master 0620 Signed-off-by: y00316381 --- wifi/frameworks/js/napi/src/wifi_napi_entry.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wifi/frameworks/js/napi/src/wifi_napi_entry.cpp b/wifi/frameworks/js/napi/src/wifi_napi_entry.cpp index 3ae2826..eca8812 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_entry.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_entry.cpp @@ -63,7 +63,7 @@ static napi_value Init(napi_env env, napi_value exports) { DECLARE_NAPI_FUNCTION("getP2pLinkedInfo", GetP2pLinkedInfo), DECLARE_NAPI_FUNCTION("getCurrentGroup", GetCurrentGroup), DECLARE_NAPI_FUNCTION("getP2pPeerDevices", GetP2pDevices), - DECLARE_NAPI_FUNCTION("GetP2pLocalDevice", GetP2pLocalDevice), + DECLARE_NAPI_FUNCTION("getP2pLocalDevice", GetP2pLocalDevice), DECLARE_NAPI_FUNCTION("createGroup", CreateGroup), DECLARE_NAPI_FUNCTION("removeGroup", RemoveGroup), DECLARE_NAPI_FUNCTION("p2pConnect", P2pConnect), @@ -71,7 +71,7 @@ static napi_value Init(napi_env env, napi_value exports) { DECLARE_NAPI_FUNCTION("startDiscoverDevices", StartDiscoverDevices), DECLARE_NAPI_FUNCTION("stopDiscoverDevices", StopDiscoverDevices), DECLARE_NAPI_FUNCTION("deletePersistentGroup", DeletePersistentGroup), - DECLARE_NAPI_FUNCTION("GetP2pGroups", GetP2pGroups), + DECLARE_NAPI_FUNCTION("getP2pGroups", GetP2pGroups), DECLARE_NAPI_FUNCTION("setDeviceName", SetDeviceName), DECLARE_NAPI_FUNCTION("on", On), DECLARE_NAPI_FUNCTION("off", Off), -- Gitee From 8aba914ea0e8f61cf121c8b42b2be4aebdaa21d2 Mon Sep 17 00:00:00 2001 From: y00316381 Date: Mon, 20 Jun 2022 20:47:36 +0800 Subject: [PATCH 197/491] bugfix from master 0620 Signed-off-by: y00316381 --- wifi/interfaces/kits/c/wifi_p2p.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wifi/interfaces/kits/c/wifi_p2p.h b/wifi/interfaces/kits/c/wifi_p2p.h index 25e7c72..54c2176 100644 --- a/wifi/interfaces/kits/c/wifi_p2p.h +++ b/wifi/interfaces/kits/c/wifi_p2p.h @@ -159,12 +159,13 @@ WifiErrorCode GetP2pConnectedStatus(int* status); */ WifiErrorCode QueryP2pDevices(WifiP2pDevice* clientDevices, int size, int* retSize); +/** * @Description Query the information about the local device info. * * @param deviceInfo - the WifiP2pDevice object * @return ErrCode - operate result */ -WifiErrorCode QueryP2pLocalDevice(WifiP2pDevice *deviceInfo); +WifiErrorCode QueryP2pLocalDevice(WifiP2pDevice* deviceInfo); /** * @Description Query the information about the found groups. -- Gitee From 576a1506e0bb31dee42c92c722ee9293e3413ec2 Mon Sep 17 00:00:00 2001 From: y00316381 Date: Mon, 20 Jun 2022 20:53:03 +0800 Subject: [PATCH 198/491] bugfix from master 0620 Signed-off-by: y00316381 --- wifi/services/wifi_standard/wifi_hal/wifi_hal_module_manage.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module_manage.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module_manage.c index d6f38c5..5bb1a72 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module_manage.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module_manage.c @@ -141,10 +141,6 @@ int StartModuleInternal(const char *moduleName, const char *startCmd, pid_t *pPr LOGE("Create wpa thread failed!"); return HAL_FAILURE; } - ret = pthread_setname_np(tid, moduleName); - if (ret != 0) { - LOGE("pthread_setname_np return failed: %d!", ret); - } pthread_join(tid, NULL); exit(0); } else { -- Gitee From 3ee248c59c633b13fbb90ae1a420c7e4acce6971 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Czhangyx=E2=80=9D?= <15927364833@163.com> Date: Thu, 9 Jun 2022 15:50:40 +0800 Subject: [PATCH 199/491] =?UTF-8?q?wifi=20ap=20=E6=96=B0=E5=A2=9E=E5=A4=9A?= =?UTF-8?q?=E5=AE=9E=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: “zhangyx” <15927364833@163.com> --- wifi/bundle.json | 5 +- wifi/frameworks/native/BUILD.gn | 3 + wifi/frameworks/native/include/wifi_hotspot.h | 4 +- .../native/interfaces/i_wifi_hotspot_mgr.h | 42 +++ wifi/frameworks/native/src/wifi_hotspot.cpp | 28 +- .../native/src/wifi_hotspot_impl.cpp | 23 +- .../frameworks/native/src/wifi_hotspot_impl.h | 7 +- .../native/src/wifi_hotspot_mgr_proxy.cpp | 41 +++ .../native/src/wifi_hotspot_mgr_proxy.h | 38 +++ .../common/config/wifi_settings.cpp | 92 ++++-- .../common/config/wifi_settings.h | 30 +- .../common/include/wifi_internal_msg.h | 2 + .../wifi_framework/wifi_manage/BUILD.gn | 24 +- .../wifi_manage/idl_client/BUILD.gn | 7 +- .../idl_client/idl_interface/i_wifi.c | 20 +- .../idl_interface/i_wifi_hotspot_iface.c | 49 +-- .../idl_interface/i_wifi_hotspot_iface.h | 42 ++- .../idl_client/idl_interface/i_wifi_struct.h | 4 +- .../idl_client/wifi_ap_hal_interface.cpp | 63 ++-- .../idl_client/wifi_ap_hal_interface.h | 30 +- .../idl_client/wifi_idl_client.cpp | 52 +-- .../wifi_manage/idl_client/wifi_idl_client.h | 26 +- .../idl_client/wifi_idl_inner_interface.cpp | 10 +- .../idl_client/wifi_idl_inner_interface.h | 4 +- .../wifi_manage/wifi_ap/BUILD.gn | 4 + .../wifi_manage/wifi_ap/ap_config_use.cpp | 3 +- .../wifi_manage/wifi_ap/ap_config_use.h | 3 +- .../wifi_manage/wifi_ap/ap_define.h | 4 +- .../wifi_manage/wifi_ap/ap_idle_state.cpp | 8 +- .../wifi_manage/wifi_ap/ap_idle_state.h | 3 +- .../wifi_manage/wifi_ap/ap_interface.cpp | 22 +- .../wifi_manage/wifi_ap/ap_interface.h | 2 +- .../wifi_manage/wifi_ap/ap_monitor.cpp | 8 +- .../wifi_manage/wifi_ap/ap_monitor.h | 3 +- .../wifi_manage/wifi_ap/ap_root_state.cpp | 6 +- .../wifi_manage/wifi_ap/ap_root_state.h | 5 +- .../wifi_manage/wifi_ap/ap_service.cpp | 21 +- .../wifi_manage/wifi_ap/ap_service.h | 3 +- .../wifi_manage/wifi_ap/ap_started_state.cpp | 53 +-- .../wifi_manage/wifi_ap/ap_started_state.h | 3 +- .../wifi_manage/wifi_ap/ap_state_machine.cpp | 29 +- .../wifi_manage/wifi_ap/ap_state_machine.h | 4 +- .../wifi_ap/ap_stations_manager.cpp | 43 +-- .../wifi_manage/wifi_ap/ap_stations_manager.h | 3 +- .../wifi_ap/i_ap_service_callbacks.h | 6 +- .../wifi_manage/wifi_config_center.cpp | 62 ++-- .../wifi_manage/wifi_config_center.h | 24 +- .../wifi_hotspot_mgr_service_impl.cpp | 145 +++++++++ .../wifi_hotspot_mgr_service_impl.h | 53 +++ .../wifi_manage/wifi_hotspot_mgr_stub.cpp | 59 ++++ .../wifi_manage/wifi_hotspot_mgr_stub.h | 43 +++ .../wifi_manage/wifi_hotspot_service_impl.cpp | 169 +++++----- .../wifi_manage/wifi_hotspot_service_impl.h | 21 +- .../wifi_manage/wifi_hotspot_stub.cpp | 7 +- .../wifi_manage/wifi_hotspot_stub.h | 3 + .../wifi_internal_event_dispatcher.cpp | 95 +++--- .../wifi_internal_event_dispatcher.h | 14 +- .../wifi_manage/wifi_manager.cpp | 36 ++- .../wifi_framework/wifi_manage/wifi_manager.h | 9 +- .../wifi_manage/wifi_service_manager.cpp | 59 ++-- .../wifi_manage/wifi_service_manager.h | 15 +- .../wifi_sta/sta_state_machine.cpp | 6 + wifi/services/wifi_standard/wifi_hal/BUILD.gn | 6 +- wifi/services/wifi_standard/wifi_hal/main.c | 5 +- .../wifi_hal/wifi_hal_ap_interface.c | 129 +++++--- .../wifi_hal/wifi_hal_ap_interface.h | 39 ++- .../wifi_hal/wifi_hal_callback.c | 20 +- .../wifi_hal/wifi_hal_callback.h | 6 +- .../wifi_standard/wifi_hal/wifi_hal_crpc_ap.c | 62 ++-- .../wifi_hal/wifi_hal_crpc_common.c | 5 +- .../wifi_hal/wifi_hal_crpc_server.c | 3 + .../wifi_hal/wifi_hal_crpc_server.h | 1 + .../hostapd_hal/wifi_hostapd_hal.c | 301 ++++++++++-------- .../hostapd_hal/wifi_hostapd_hal.h | 52 ++- .../wifi_manage/unittest/BUILD.gn | 6 + .../wifi_manage/wifi_ap/BUILD.gn | 10 +- .../wifi_manage/wifi_p2p/test/BUILD.gn | 2 + .../wifi_manage/wifi_scan/BUILD.gn | 1 + .../wifi_manage/wifi_sta/BUILD.gn | 1 + wifi/wifi.gni | 3 + wifi/wifi_lite.gni | 3 + 81 files changed, 1596 insertions(+), 761 deletions(-) create mode 100644 wifi/frameworks/native/interfaces/i_wifi_hotspot_mgr.h create mode 100644 wifi/frameworks/native/src/wifi_hotspot_mgr_proxy.cpp create mode 100644 wifi/frameworks/native/src/wifi_hotspot_mgr_proxy.h create mode 100644 wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_mgr_service_impl.cpp create mode 100644 wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_mgr_service_impl.h create mode 100644 wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_mgr_stub.cpp create mode 100644 wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_mgr_stub.h diff --git a/wifi/bundle.json b/wifi/bundle.json index bf7bcdb..e953f17 100644 --- a/wifi/bundle.json +++ b/wifi/bundle.json @@ -46,7 +46,10 @@ ], "features": [ "wifi_feature_with_p2p", - "wifi_feature_with_ap_intf" + "wifi_feature_with_ap_intf", + "wifi_feature_with_ap_num", + "wifi_feature_with_auth_disable", + "wifi_feature_with_dhcp_disable" ], "adapted_system_type": [ "standard" diff --git a/wifi/frameworks/native/BUILD.gn b/wifi/frameworks/native/BUILD.gn index 421f225..4c23440 100644 --- a/wifi/frameworks/native/BUILD.gn +++ b/wifi/frameworks/native/BUILD.gn @@ -128,6 +128,7 @@ if (defined(ohos_lite)) { part_name = "wifi" sources = [ "src/wifi_hotspot_impl.cpp", + "src/wifi_hotspot_mgr_proxy.cpp", "src/wifi_hotspot_proxy.cpp", ] @@ -210,6 +211,8 @@ if (defined(ohos_lite)) { "ipc:ipc_core", ] + defines = [ "AP_INSTANCE_MAX_NUM=$wifi_feature_with_ap_num" ] + cflags_cc = [ "-std=c++17", "-fno-rtti", diff --git a/wifi/frameworks/native/include/wifi_hotspot.h b/wifi/frameworks/native/include/wifi_hotspot.h index dd9b1ee..1a44e79 100644 --- a/wifi/frameworks/native/include/wifi_hotspot.h +++ b/wifi/frameworks/native/include/wifi_hotspot.h @@ -27,9 +27,9 @@ namespace OHOS { namespace Wifi { class WifiHotspot { public: - static std::unique_ptr CreateWifiHotspot(int system_ability_id); + static std::unique_ptr CreateWifiHotspot(int system_ability_id, int id = 0); - static std::unique_ptr GetInstance(int system_ability_id); + static std::unique_ptr GetInstance(int system_ability_id, int id = 0); virtual ~WifiHotspot(); diff --git a/wifi/frameworks/native/interfaces/i_wifi_hotspot_mgr.h b/wifi/frameworks/native/interfaces/i_wifi_hotspot_mgr.h new file mode 100644 index 0000000..d9e6903 --- /dev/null +++ b/wifi/frameworks/native/interfaces/i_wifi_hotspot_mgr.h @@ -0,0 +1,42 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OHOS_I_WIFI_HOTSPOT_MGR_H +#define OHOS_I_WIFI_HOTSPOT_MGR_H + +#include "iremote_broker.h" + +namespace OHOS { +namespace Wifi { +class IWifiHotspotMgr : public IRemoteBroker { +public: + IWifiHotspotMgr() {} + virtual ~IWifiHotspotMgr() {} + /** + * @Description get remote ap obj. + * + * @param id - obj id + * @return IRemoteObject - ap obj + */ + virtual sptr GetWifiRemote(int id) = 0; +public: + DECLARE_INTERFACE_DESCRIPTOR(u"ohos.wifi.IWifiHotspotMgr"); + enum Code { + WIFI_MGR_GET_HOTSPOT_SERVICE = 0, + }; +}; +} // namespace Wifi +} // namespace OHOS +#endif \ No newline at end of file diff --git a/wifi/frameworks/native/src/wifi_hotspot.cpp b/wifi/frameworks/native/src/wifi_hotspot.cpp index 5bce45a..4a247ab 100644 --- a/wifi/frameworks/native/src/wifi_hotspot.cpp +++ b/wifi/frameworks/native/src/wifi_hotspot.cpp @@ -21,31 +21,43 @@ DEFINE_WIFILOG_HOTSPOT_LABEL("WifiHotspot"); namespace OHOS { namespace Wifi { -std::unique_ptr WifiHotspot::CreateWifiHotspot(int systemAbilityId) +std::unique_ptr WifiHotspot::CreateWifiHotspot(int systemAbilityId, int id) { + if (id >= AP_INSTANCE_MAX_NUM) { + WIFI_LOGE("the max obj id is %{public}d, current id is %{public}d", AP_INSTANCE_MAX_NUM, id); + return nullptr; + } + std::unique_ptr hotspot = std::make_unique(systemAbilityId); if (hotspot != nullptr) { - if (hotspot->Init()) { - WIFI_LOGI("succeeded"); + if (hotspot->Init(id)) { + WIFI_LOGI("ap obj id:%{public}d succeeded", id); return hotspot; } + WIFI_LOGE("init wifi hotspot id:%{public}d failed", id); } - WIFI_LOGE("new wifi hotspot failed"); + WIFI_LOGE("new wifi hotspot id:%{public}d failed, sa id:%{public}d", id, systemAbilityId); return nullptr; } -std::unique_ptr WifiHotspot::GetInstance(int systemAbilityId) +std::unique_ptr WifiHotspot::GetInstance(int systemAbilityId, int id) { + if (id >= AP_INSTANCE_MAX_NUM) { + WIFI_LOGE("the max obj id is %{public}d, current id is %{public}d", AP_INSTANCE_MAX_NUM, id); + return nullptr; + } + std::unique_ptr hotspot = std::make_unique(systemAbilityId); if (hotspot != nullptr) { - if (hotspot->Init()) { - WIFI_LOGI("hotspot init succeeded"); + if (hotspot->Init(id)) { + WIFI_LOGI("ap obj id:%{public}d succeeded", id); return hotspot; } + WIFI_LOGE("init wifi hotspot id:%{public}d failed", id); } - WIFI_LOGE("new wifi hotspot failed"); + WIFI_LOGE("new wifi hotspot id:%{public}d failed, sa id:%{public}d", id, systemAbilityId); return nullptr; } diff --git a/wifi/frameworks/native/src/wifi_hotspot_impl.cpp b/wifi/frameworks/native/src/wifi_hotspot_impl.cpp index f87c3a0..4e74311 100644 --- a/wifi/frameworks/native/src/wifi_hotspot_impl.cpp +++ b/wifi/frameworks/native/src/wifi_hotspot_impl.cpp @@ -13,6 +13,7 @@ * limitations under the License. */ #include "wifi_hotspot_impl.h" +#include "wifi_hotspot_mgr_proxy.h" #include "iservice_registry.h" #include "wifi_logger.h" @@ -34,7 +35,7 @@ WifiHotspotImpl::WifiHotspotImpl(int systemAbilityId) : systemAbilityId_(systemA WifiHotspotImpl::~WifiHotspotImpl() {} -bool WifiHotspotImpl::Init() +bool WifiHotspotImpl::Init(int id) { sptr sa_mgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); if (sa_mgr == nullptr) { @@ -44,17 +45,27 @@ bool WifiHotspotImpl::Init() sptr object = sa_mgr->GetSystemAbility(systemAbilityId_); if (object == nullptr) { - WIFI_LOGE("failed to get HOTSPOT_SERVICE"); + WIFI_LOGE("failed to get hotspot mgr"); return false; } - client_ = iface_cast(object); - if (client_ == nullptr) { - client_ = new (std::nothrow) WifiHotspotProxy(object); + sptr hotspotMgr = iface_cast(object); + if (hotspotMgr == nullptr) { + hotspotMgr = new (std::nothrow) WifiHotspotMgrProxy(object); + } + if (hotspotMgr == nullptr) { + WIFI_LOGE("wifi hotspot init failed, %{public}d", systemAbilityId_); + return false; } + sptr service = hotspotMgr->GetWifiRemote(id); + if (service == nullptr) { + WIFI_LOGE("wifi device remote obj is null, %{public}d", id); + return false; + } + client_ = new (std::nothrow) WifiHotspotProxy(service); if (client_ == nullptr) { - WIFI_LOGE("wifi device init failed. %{public}d", systemAbilityId_); + WIFI_LOGE("wifi device id init failed., %{public}d", systemAbilityId_); return false; } diff --git a/wifi/frameworks/native/src/wifi_hotspot_impl.h b/wifi/frameworks/native/src/wifi_hotspot_impl.h index 8f986c9..b778933 100644 --- a/wifi/frameworks/native/src/wifi_hotspot_impl.h +++ b/wifi/frameworks/native/src/wifi_hotspot_impl.h @@ -26,7 +26,12 @@ public: explicit WifiHotspotImpl(int systemAbilityId); ~WifiHotspotImpl(); - bool Init(); + /** + * @Description init ap client. + * + * @return bool - operation result + */ + bool Init(int id); /** * @Description Check whether the hotspot is active. diff --git a/wifi/frameworks/native/src/wifi_hotspot_mgr_proxy.cpp b/wifi/frameworks/native/src/wifi_hotspot_mgr_proxy.cpp new file mode 100644 index 0000000..5d3a0ad --- /dev/null +++ b/wifi/frameworks/native/src/wifi_hotspot_mgr_proxy.cpp @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "wifi_hotspot_mgr_proxy.h" +#include "wifi_logger.h" + +DEFINE_WIFILOG_HOTSPOT_LABEL("WifiHotspotMgrProxy"); +namespace OHOS { +namespace Wifi { +sptr WifiHotspotMgrProxy::GetWifiRemote(int id) +{ + MessageOption option; + MessageParcel data; + MessageParcel reply; + if (!data.WriteInterfaceToken(GetDescriptor())) { + WIFI_LOGE("Write interface token error: %{public}s", __func__); + return nullptr; + } + data.WriteInt32(id); + int error = Remote()->SendRequest(WIFI_MGR_GET_HOTSPOT_SERVICE, data, reply, option); + if (error != ERR_NONE) { + WIFI_LOGE("Get remote object id %{public}d failed,error code is %{public}d", id, error); + return nullptr; + } + + return reply.ReadRemoteObject(); +} +} // namespace Wifi +} // namespace OHOS \ No newline at end of file diff --git a/wifi/frameworks/native/src/wifi_hotspot_mgr_proxy.h b/wifi/frameworks/native/src/wifi_hotspot_mgr_proxy.h new file mode 100644 index 0000000..fd311df --- /dev/null +++ b/wifi/frameworks/native/src/wifi_hotspot_mgr_proxy.h @@ -0,0 +1,38 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OHOS_WIFI_HOTSPOT_MGR_PROXY_H +#define OHOS_WIFI_HOTSPOT_MGR_PROXY_H + +#include "iremote_proxy.h" +#include "i_wifi_hotspot_mgr.h" +#include "wifi_errcode.h" + +namespace OHOS { +namespace Wifi { +class WifiHotspotMgrProxy : public IRemoteProxy { +public: + explicit WifiHotspotMgrProxy(const sptr& remote) + : IRemoteProxy(remote) + {} + virtual ~WifiHotspotMgrProxy() + {} + sptr GetWifiRemote(int id) override; +private: + static BrokerDelegator g_delegator; +}; +} // namespace Wifi +} // namespace OHOS +#endif \ No newline at end of file diff --git a/wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp b/wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp index 17ee00d..7912953 100644 --- a/wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp +++ b/wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp @@ -31,7 +31,6 @@ WifiSettings::WifiSettings() : mWifiStaCapabilities(0), mWifiState(0), mScanAlwaysActive(false), - mHotspotState(static_cast(ApState::AP_STATE_CLOSED)), mP2pState(static_cast(P2pState::P2P_STATE_CLOSED)), mP2pDiscoverState(0), mP2pConnectState(0), @@ -44,7 +43,10 @@ WifiSettings::WifiSettings() mPowerSavingModeState(MODE_STATE_CLOSE), mFreezeModeState(MODE_STATE_CLOSE), mNoChargerPlugModeState(MODE_STATE_CLOSE) -{} +{ + mHotspotState[0] = static_cast(ApState::AP_STATE_CLOSED); + powerModel[0] = PowerModel::GENERAL; +} WifiSettings::~WifiSettings() { @@ -77,7 +79,9 @@ void WifiSettings::InitHotspotConfig() std::vector tmp; mSavedHotspotConfig.GetValue(tmp); if (tmp.size() > 0) { - mHotspotConfig = tmp[0]; + for (size_t i = 0; i < tmp.size(); i++) { + mHotspotConfig[i] = tmp[i]; + } } else { InitDefaultHotspotConfig(); } @@ -560,28 +564,36 @@ int WifiSettings::GetCountryCode(std::string &countryCode) return 0; } -int WifiSettings::GetHotspotState() +int WifiSettings::GetHotspotState(int id) { - return mHotspotState.load(); + auto iter = mHotspotState.find(id); + if (iter != mHotspotState.end()) { + return iter->second.load(); + } + mHotspotState[id] = static_cast(ApState::AP_STATE_CLOSED); + return mHotspotState[id].load(); } -int WifiSettings::SetHotspotState(int state) +int WifiSettings::SetHotspotState(int state, int id) { - mHotspotState = state; + mHotspotState[id] = state; return 0; } -int WifiSettings::SetHotspotConfig(const HotspotConfig &config) +int WifiSettings::SetHotspotConfig(const HotspotConfig &config, int id) { std::unique_lock lock(mApMutex); - mHotspotConfig = config; + mHotspotConfig[id] = config; return 0; } -int WifiSettings::GetHotspotConfig(HotspotConfig &config) +int WifiSettings::GetHotspotConfig(HotspotConfig &config, int id) { std::unique_lock lock(mApMutex); - config = mHotspotConfig; + auto iter = mHotspotConfig.find(id); + if (iter != mHotspotConfig.end()) { + config = iter->second; + } return 0; } @@ -589,9 +601,17 @@ int WifiSettings::SyncHotspotConfig() { std::unique_lock lock(mApMutex); std::vector tmp; - tmp.push_back(mHotspotConfig); + + for (int i = 0; i < AP_INSTANCE_MAX_NUM; i++) { + auto iter = mHotspotConfig.find(i); + if (iter != mHotspotConfig.end()) { + tmp.push_back(iter->second); + } + } mSavedHotspotConfig.SetValue(tmp); - return mSavedHotspotConfig.SaveConfig(); + mSavedHotspotConfig.SaveConfig(); + + return 0; } int WifiSettings::SetP2pVendorConfig(const P2pVendorConfig &config) @@ -617,7 +637,7 @@ int WifiSettings::SyncP2pVendorConfig() return mSavedWifiP2pVendorConfig.SaveConfig(); } -int WifiSettings::GetStationList(std::vector &results) +int WifiSettings::GetStationList(std::vector &results, int id) { std::unique_lock lock(mInfoMutex); for (auto iter = mConnectStationInfo.begin(); iter != mConnectStationInfo.end(); iter++) { @@ -626,7 +646,7 @@ int WifiSettings::GetStationList(std::vector &results) return 0; } -int WifiSettings::ManageStation(const StationInfo &info, int mode) +int WifiSettings::ManageStation(const StationInfo &info, int mode, int id) { std::unique_lock lock(mInfoMutex); auto iter = mConnectStationInfo.find(info.bssid); @@ -646,7 +666,7 @@ int WifiSettings::ManageStation(const StationInfo &info, int mode) return 0; } -int WifiSettings::FindConnStation(const StationInfo &info) +int WifiSettings::FindConnStation(const StationInfo &info, int id) { std::unique_lock lock(mInfoMutex); auto iter = mConnectStationInfo.find(info.bssid); @@ -656,14 +676,14 @@ int WifiSettings::FindConnStation(const StationInfo &info) return 0; } -int WifiSettings::ClearStationList() +int WifiSettings::ClearStationList(int id) { std::unique_lock lock(mInfoMutex); mConnectStationInfo.clear(); return 0; } -int WifiSettings::GetBlockList(std::vector &results) +int WifiSettings::GetBlockList(std::vector &results, int id) { std::unique_lock lock(mInfoMutex); for (auto iter = mBlockListInfo.begin(); iter != mBlockListInfo.end(); iter++) { @@ -672,7 +692,7 @@ int WifiSettings::GetBlockList(std::vector &results) return 0; } -int WifiSettings::ManageBlockList(const StationInfo &info, int mode) +int WifiSettings::ManageBlockList(const StationInfo &info, int mode, int id) { std::unique_lock lock(mInfoMutex); auto iter = mBlockListInfo.find(info.bssid); @@ -741,17 +761,26 @@ int WifiSettings::ClearValidChannels() return 0; } -int WifiSettings::SetPowerModel(const PowerModel& model) +int WifiSettings::SetPowerModel(const PowerModel& model, int id) { std::unique_lock lock(mInfoMutex); - powerModel = model; + auto ret = powerModel.emplace(id, model); + if (!ret.second) { + powerModel[id] = model; + } return 0; } -int WifiSettings::GetPowerModel(PowerModel& model) +int WifiSettings::GetPowerModel(PowerModel& model, int id) { std::unique_lock lock(mInfoMutex); - model = powerModel; + auto iter = powerModel.find(id); + if (iter != powerModel.end()) { + model = iter->second; + } else { + powerModel[id] = PowerModel::GENERAL; + model = powerModel[id]; + } return 0; } @@ -839,12 +868,17 @@ int WifiSettings::GetApMaxConnNum() void WifiSettings::InitDefaultHotspotConfig() { - mHotspotConfig.SetSecurityType(KeyMgmt::WPA_PSK); - mHotspotConfig.SetBand(BandType::BAND_2GHZ); - mHotspotConfig.SetChannel(AP_CHANNEL_DEFAULT); - mHotspotConfig.SetMaxConn(GetApMaxConnNum()); - mHotspotConfig.SetSsid("OHOS_" + GetRandomStr(RANDOM_STR_LEN)); - mHotspotConfig.SetPreSharedKey("12345678"); + HotspotConfig cfg; + cfg.SetSecurityType(KeyMgmt::WPA_PSK); + cfg.SetBand(BandType::BAND_2GHZ); + cfg.SetChannel(AP_CHANNEL_DEFAULT); + cfg.SetMaxConn(GetApMaxConnNum()); + cfg.SetSsid("OHOS_" + GetRandomStr(RANDOM_STR_LEN)); + cfg.SetPreSharedKey("12345678"); + auto ret = mHotspotConfig.emplace(0, cfg); + if (!ret.second) { + mHotspotConfig[0] = cfg; + } } void WifiSettings::InitDefaultP2pVendorConfig() diff --git a/wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.h b/wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.h index ef7d859..ca1e660 100644 --- a/wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.h +++ b/wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.h @@ -373,7 +373,7 @@ public: * * @return int - the hotspot state, IDLE/STARTING/STARTED/CLOSING/CLOSED */ - int GetHotspotState(); + int GetHotspotState(int id = 0); /** * @Description Save current hotspot state @@ -381,7 +381,7 @@ public: * @param state - hotspot state * @return int - 0 success */ - int SetHotspotState(int state); + int SetHotspotState(int state, int id = 0); /** * @Description Set the hotspot config @@ -389,7 +389,7 @@ public: * @param config - input HotspotConfig struct * @return int - 0 success */ - int SetHotspotConfig(const HotspotConfig &config); + int SetHotspotConfig(const HotspotConfig &config, int id = 0); /** * @Description Get the hotspot config @@ -397,7 +397,7 @@ public: * @param config - output HotspotConfig struct * @return int - 0 success */ - int GetHotspotConfig(HotspotConfig &config); + int GetHotspotConfig(HotspotConfig &config, int id = 0); /** * @Description Synchronizing saved the Hotspot config into config file @@ -435,7 +435,7 @@ public: * @param results - output StationInfo results * @return int - 0 success */ - int GetStationList(std::vector &results); + int GetStationList(std::vector &results, int id = 0); /** * @Description Management (add/update/delete) connected station list @@ -444,14 +444,14 @@ public: * @param mode - mode of MODE_ADD MODE_UPDATE MODE_DEL * @return int - 0 success; -1 mode not correct */ - int ManageStation(const StationInfo &info, int mode); /* add / update / remove */ + int ManageStation(const StationInfo &info, int mode, int id = 0); /* add / update / remove */ /** * @Description Clear connected station list * * @return int - 0 success */ - int ClearStationList(); + int ClearStationList(int id = 0); /** * @Description Get the block list @@ -459,7 +459,7 @@ public: * @param results - output StationInfo results * @return int - 0 success */ - int GetBlockList(std::vector &results); + int GetBlockList(std::vector &results, int id = 0); /** * @Description Manager (add/update/delete) station connect Blocklist @@ -468,7 +468,7 @@ public: * @param mode - mode of MODE_ADD MODE_DEL MODE_UPDATE * @return int - 0 success; -1 mode not correct */ - int ManageBlockList(const StationInfo &info, int mode); /* add / remove */ + int ManageBlockList(const StationInfo &info, int mode, int id = 0); /* add / remove */ /** * @Description Judge whether the station is in current linked station list @@ -476,7 +476,7 @@ public: * @param info - input StationInfo struct * @return int - 0 find the station, exist; -1 not find, not exist */ - int FindConnStation(const StationInfo &info); + int FindConnStation(const StationInfo &info, int id = 0); /** * @Description Synchronizing saved the block list config into config file @@ -522,7 +522,7 @@ public: * @param model - the model to be set * @return ErrCode - operation result */ - int SetPowerModel(const PowerModel& model); + int SetPowerModel(const PowerModel& model, int id = 0); /** * @Description Get power model @@ -530,7 +530,7 @@ public: * @param model - current power model * @return ErrCode - operation result */ - int GetPowerModel(PowerModel& model); + int GetPowerModel(PowerModel& model, int id = 0); /** * @Description set the p2p state @@ -1044,8 +1044,8 @@ private: WifiLinkedInfo mWifiLinkedInfo; std::string mMacAddress; std::string mCountryCode; - std::atomic mHotspotState; - HotspotConfig mHotspotConfig; + std::map > mHotspotState; + std::map mHotspotConfig; P2pVendorConfig mP2pVendorConfig; std::map mConnectStationInfo; std::map mBlockListInfo; @@ -1065,7 +1065,7 @@ private: int mNoChargerPlugModeState; /* 1 on 2 off */ WifiConfig mWifiConfig; std::pair mBssidToTimeoutTime; - PowerModel powerModel = PowerModel::GENERAL; + std::map powerModel; std::mutex mStaMutex; std::mutex mApMutex; diff --git a/wifi/services/wifi_standard/wifi_framework/common/include/wifi_internal_msg.h b/wifi/services/wifi_standard/wifi_framework/common/include/wifi_internal_msg.h index 92f7cd4..980ba8c 100644 --- a/wifi/services/wifi_standard/wifi_framework/common/include/wifi_internal_msg.h +++ b/wifi/services/wifi_standard/wifi_framework/common/include/wifi_internal_msg.h @@ -206,6 +206,7 @@ struct SingleAppForbid { struct WifiEventCallbackMsg { int msgCode; int msgData; + int id; std::string pinCode; /* wps pin mode code */ WifiLinkedInfo linkInfo; StationInfo staInfo; @@ -218,6 +219,7 @@ struct WifiEventCallbackMsg { { msgCode = 0; msgData = 0; + id = 0; p2pAction = P2pActionCallback::UNKNOWN; } }; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn index 0315886..d885923 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn @@ -91,7 +91,15 @@ if (defined(ohos_lite)) { "//third_party/bounds_checking_function:libsec_shared", ] - defines = [ "OHOS_ARCH_LITE" ] + defines = [ + "OHOS_ARCH_LITE", + "AP_INSTANCE_MAX_NUM=$wifi_feature_with_ap_num", + ] + + if (wifi_feature_with_auth_disable) { + defines += [ "PERMISSION_ALWAYS_GRANT" ] + } + cflags_cc = [ "-std=c++17", "-fno-rtti", @@ -251,6 +259,8 @@ if (defined(ohos_lite)) { sources = [ "wifi_hotspot_callback_proxy.cpp", "wifi_hotspot_death_recipient.cpp", + "wifi_hotspot_mgr_service_impl.cpp", + "wifi_hotspot_mgr_stub.cpp", "wifi_hotspot_service_impl.cpp", "wifi_hotspot_stub.cpp", ] @@ -265,7 +275,10 @@ if (defined(ohos_lite)) { "eventhandler:libeventhandler", "ipc:ipc_core", ] - defines = [ "FEATURE_AP_SUPPORT" ] + defines = [ + "FEATURE_AP_SUPPORT", + "AP_INSTANCE_MAX_NUM=$wifi_feature_with_ap_num", + ] } ohos_source_set("wifi_p2p_service_impl") { part_name = "wifi" @@ -346,10 +359,13 @@ if (defined(ohos_lite)) { defines = [ "FEATURE_AP_SUPPORT", "FEATURE_P2P_SUPPORT", - - # "PERMISSION_ALWAYS_GRANT", + "AP_INSTANCE_MAX_NUM=$wifi_feature_with_ap_num", ] + if (wifi_feature_with_auth_disable) { + defines += [ "PERMISSION_ALWAYS_GRANT" ] + } + part_name = "wifi" subsystem_name = "communication" } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/BUILD.gn index 6024f16..568ecbf 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/BUILD.gn @@ -111,7 +111,10 @@ if (defined(ohos_lite)) { "//third_party/bounds_checking_function:libsec_shared", ] - defines = [ "OHOS_ARCH_LITE" ] + defines = [ + "OHOS_ARCH_LITE", + "AP_INSTANCE_MAX_NUM=$wifi_feature_with_ap_num", + ] configs -= [ "//build/lite/config:language_cpp", "//build/lite/config:language_c", @@ -162,6 +165,8 @@ if (defined(ohos_lite)) { install_enable = true sources = idl_client_sources + defines = [ "AP_INSTANCE_MAX_NUM=$wifi_feature_with_ap_num" ] + configs = [ ":wifi_fw_common_header" ] deps = [ diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi.c b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi.c index d27c201..624765c 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi.c +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi.c @@ -174,8 +174,12 @@ static void IdlCbkAddRemoveIface(Context *context, int event) static void IdlCbkStaJoinLeave(Context *context) { + int id; CStationInfo info = {0}; char *reason = NULL; + if (ReadInt(context, &id) < 0) { + return; + } if (ReadInt(context, &info.type) < 0) { return; } @@ -197,9 +201,9 @@ static void IdlCbkStaJoinLeave(Context *context) reason = NULL; return; } - IWifiApEventCallback *callback = GetWifiApEventCallback(); + IWifiApEventCallback *callback = GetWifiApEventCallback(id); if (callback != NULL && callback->onStaJoinOrLeave != NULL) { - callback->onStaJoinOrLeave(&info); + callback->onStaJoinOrLeave(&info, id); } free(reason); reason = NULL; @@ -235,11 +239,15 @@ static void IdlCbkConnectChanged(Context *context) return; } -static void IdlCbkApStateChange(int event) +static void IdlCbkApStateChange(Context *context, int event) { - IWifiApEventCallback *callback = GetWifiApEventCallback(); + int id = 0; + if (ReadInt(context, &id) < 0) { + return; + } + IWifiApEventCallback *callback = GetWifiApEventCallback(id); if (callback != NULL && callback->onApEnableOrDisable != NULL) { - callback->onApEnableOrDisable(event); + callback->onApEnableOrDisable(event, id); } return; } @@ -299,7 +307,7 @@ static int IdlDealStaApEvent(Context *context, int event) break; case WIFI_IDL_CBK_CMD_AP_ENABLE: case WIFI_IDL_CBK_CMD_AP_DISABLE: - IdlCbkApStateChange(event); + IdlCbkApStateChange(context, event); break; case WIFI_IDL_CBK_CMD_WPA_STATE_CHANGEM: case WIFI_IDL_CBK_CMD_SSID_WRONG_KEY: diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_hotspot_iface.c b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_hotspot_iface.c index 96b11c8..ab0f96a 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_hotspot_iface.c +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_hotspot_iface.c @@ -25,24 +25,25 @@ #define AP_EVENT_MAX_NUM 8 -static IWifiApEventCallback g_wifiApEventCallback = {0}; -void SetWifiApEventCallback(IWifiApEventCallback callback) +static IWifiApEventCallback g_wifiApEventCallback[AP_INSTANCE_MAX_NUM] = {0}; +void SetWifiApEventCallback(IWifiApEventCallback callback, int id) { - g_wifiApEventCallback = callback; + g_wifiApEventCallback[id] = callback; } -IWifiApEventCallback *GetWifiApEventCallback(void) +IWifiApEventCallback *GetWifiApEventCallback(int id) { - return &g_wifiApEventCallback; + return &g_wifiApEventCallback[id]; } -WifiErrorNo StartSoftAp(void) +WifiErrorNo StartSoftAp(int id) { RpcClient *client = GetApRpcClient(); LockRpcClient(client); Context *context = client->context; WriteBegin(context, 0); WriteFunc(context, "StartSoftAp"); + WriteInt(context, id); WriteEnd(context); if (RpcClientCall(client, "StartSoftAp") != WIFI_IDL_OPT_OK) { @@ -56,13 +57,14 @@ WifiErrorNo StartSoftAp(void) return result; } -WifiErrorNo StopSoftAp(void) +WifiErrorNo StopSoftAp(int id) { RpcClient *client = GetApRpcClient(); LockRpcClient(client); Context *context = client->context; WriteBegin(context, 0); WriteFunc(context, "StopSoftAp"); + WriteInt(context, id); WriteEnd(context); if (RpcClientCall(client, "StopSoftAp") != WIFI_IDL_OPT_OK) { @@ -76,7 +78,7 @@ WifiErrorNo StopSoftAp(void) return result; } -WifiErrorNo SetHostapdConfig(HostapdConfig *config) +WifiErrorNo SetHostapdConfig(HostapdConfig *config, int id) { RpcClient *client = GetApRpcClient(); LockRpcClient(client); @@ -91,6 +93,7 @@ WifiErrorNo SetHostapdConfig(HostapdConfig *config) WriteInt(context, config->band); WriteInt(context, config->channel); WriteInt(context, config->maxConn); + WriteInt(context, id); WriteEnd(context); if (RpcClientCall(client, "SetHostapdConfig") != WIFI_IDL_OPT_OK) { return WIFI_IDL_OPT_FAILED; @@ -102,7 +105,7 @@ WifiErrorNo SetHostapdConfig(HostapdConfig *config) return result; } -WifiErrorNo GetStaInfos(char *infos, int32_t *size) +WifiErrorNo GetStaInfos(char *infos, int32_t *size, int id) { RpcClient *client = GetApRpcClient(); LockRpcClient(client); @@ -110,6 +113,7 @@ WifiErrorNo GetStaInfos(char *infos, int32_t *size) WriteBegin(context, 0); WriteFunc(context, "GetStaInfos"); WriteInt(context, *size); + WriteInt(context, id); WriteEnd(context); if (RpcClientCall(client, "GetStaInfos") != WIFI_IDL_OPT_OK) { return WIFI_IDL_OPT_FAILED; @@ -127,7 +131,7 @@ WifiErrorNo GetStaInfos(char *infos, int32_t *size) return result; } -WifiErrorNo SetMacFilter(unsigned char *mac, int lenMac) +WifiErrorNo SetMacFilter(unsigned char *mac, int lenMac, int id) { RpcClient *client = GetApRpcClient(); LockRpcClient(client); @@ -136,6 +140,7 @@ WifiErrorNo SetMacFilter(unsigned char *mac, int lenMac) WriteFunc(context, "SetMacFilter"); WriteInt(context, lenMac); WriteUStr(context, mac, lenMac); + WriteInt(context, id); WriteEnd(context); if (RpcClientCall(client, "SetMacFilter") != WIFI_IDL_OPT_OK) { return WIFI_IDL_OPT_FAILED; @@ -147,7 +152,7 @@ WifiErrorNo SetMacFilter(unsigned char *mac, int lenMac) return result; } -WifiErrorNo DelMacFilter(unsigned char *mac, int lenMac) +WifiErrorNo DelMacFilter(unsigned char *mac, int lenMac, int id) { RpcClient *client = GetApRpcClient(); LockRpcClient(client); @@ -156,6 +161,7 @@ WifiErrorNo DelMacFilter(unsigned char *mac, int lenMac) WriteFunc(context, "DelMacFilter"); WriteInt(context, lenMac); WriteUStr(context, mac, lenMac); + WriteInt(context, id); WriteEnd(context); if (RpcClientCall(client, "DelMacFilter") != WIFI_IDL_OPT_OK) { return WIFI_IDL_OPT_FAILED; @@ -167,7 +173,7 @@ WifiErrorNo DelMacFilter(unsigned char *mac, int lenMac) return result; } -WifiErrorNo DisassociateSta(unsigned char *mac, int lenMac) +WifiErrorNo DisassociateSta(unsigned char *mac, int lenMac, int id) { RpcClient *client = GetApRpcClient(); LockRpcClient(client); @@ -176,6 +182,7 @@ WifiErrorNo DisassociateSta(unsigned char *mac, int lenMac) WriteFunc(context, "DisassociateSta"); WriteInt(context, lenMac); WriteUStr(context, mac, lenMac); + WriteInt(context, id); WriteEnd(context); if (RpcClientCall(client, "DisassociateSta") != WIFI_IDL_OPT_OK) { return WIFI_IDL_OPT_FAILED; @@ -187,7 +194,7 @@ WifiErrorNo DisassociateSta(unsigned char *mac, int lenMac) return result; } -WifiErrorNo GetValidFrequenciesForBand(int32_t band, int *frequencies, int32_t *size) +WifiErrorNo GetValidFrequenciesForBand(int32_t band, int *frequencies, int32_t *size, int id) { RpcClient *client = GetApRpcClient(); LockRpcClient(client); @@ -196,6 +203,7 @@ WifiErrorNo GetValidFrequenciesForBand(int32_t band, int *frequencies, int32_t * WriteFunc(context, "GetValidFrequenciesForBand"); WriteInt(context, band); WriteInt(context, *size); + WriteInt(context, id); WriteEnd(context); if (RpcClientCall(client, "GetValidFrequenciesForBand") != WIFI_IDL_OPT_OK) { return WIFI_IDL_OPT_FAILED; @@ -215,7 +223,7 @@ WifiErrorNo GetValidFrequenciesForBand(int32_t band, int *frequencies, int32_t * return result; } -WifiErrorNo SetCountryCode(const char *code) +WifiErrorNo SetCountryCode(const char *code, int id) { RpcClient *client = GetApRpcClient(); LockRpcClient(client); @@ -223,6 +231,7 @@ WifiErrorNo SetCountryCode(const char *code) WriteBegin(context, 0); WriteFunc(context, "SetCountryCode"); WriteStr(context, code); + WriteInt(context, id); WriteEnd(context); if (RpcClientCall(client, "SetCountryCode") != WIFI_IDL_OPT_OK) { return WIFI_IDL_OPT_FAILED; @@ -250,7 +259,7 @@ static int GetApCallbackEvents(int *events, int size) return num; } -WifiErrorNo RegisterAsscociatedEvent(IWifiApEventCallback callback) +WifiErrorNo RegisterAsscociatedEvent(IWifiApEventCallback callback, int id) { int events[AP_EVENT_MAX_NUM]; int num = GetApCallbackEvents(events, AP_EVENT_MAX_NUM); @@ -270,21 +279,21 @@ WifiErrorNo RegisterAsscociatedEvent(IWifiApEventCallback callback) WriteEnd(context); if (RpcClientCall(client, "RegisterAsscociatedEvent") != WIFI_IDL_OPT_OK) { if (callback.onStaJoinOrLeave == NULL) { - SetWifiApEventCallback(callback); + SetWifiApEventCallback(callback, id); } return WIFI_IDL_OPT_FAILED; } int result = WIFI_IDL_OPT_FAILED; ReadInt(context, &result); if (result == WIFI_IDL_OPT_OK || callback.onStaJoinOrLeave == NULL) { - SetWifiApEventCallback(callback); + SetWifiApEventCallback(callback, id); } ReadClientEnd(client); UnlockRpcClient(client); return result; } -WifiErrorNo WpaSetPowerModel(const int model) +WifiErrorNo WpaSetPowerModel(const int model, int id) { RpcClient *client = GetSupplicantRpcClient(); LockRpcClient(client); @@ -292,6 +301,7 @@ WifiErrorNo WpaSetPowerModel(const int model) WriteBegin(context, 0); WriteFunc(context, "WpaSetPowerModel"); WriteInt(context, model); + WriteInt(context, id); WriteEnd(context); if (RpcClientCall(client, "WpaSetPowerModel") != WIFI_IDL_OPT_OK) { return WIFI_IDL_OPT_FAILED; @@ -303,13 +313,14 @@ WifiErrorNo WpaSetPowerModel(const int model) return result; } -WifiErrorNo WpaGetPowerModel(int* model) +WifiErrorNo WpaGetPowerModel(int* model, int id) { RpcClient *client = GetSupplicantRpcClient(); LockRpcClient(client); Context *context = client->context; WriteBegin(context, 0); WriteFunc(context, "WpaGetPowerModel"); + WriteInt(context, id); WriteEnd(context); if (RpcClientCall(client, "WpaGetPowerModel") != WIFI_IDL_OPT_OK) { return WIFI_IDL_OPT_FAILED; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_hotspot_iface.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_hotspot_iface.h index ebbe753..20530bb 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_hotspot_iface.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_hotspot_iface.h @@ -28,46 +28,51 @@ extern "C" { * @Description Sets the AP event callback function. * * @param callback + * @param id - ap id */ -void SetWifiApEventCallback(IWifiApEventCallback callback); +void SetWifiApEventCallback(IWifiApEventCallback callback, int id); /** * @Description Obtains the AP event callback structure. * * @return IWifiApEventCallback* */ -IWifiApEventCallback *GetWifiApEventCallback(void); +IWifiApEventCallback *GetWifiApEventCallback(int id); /** * @Description Start Ap. * * @return WifiErrorNo + * @param id - ap id */ -WifiErrorNo StartSoftAp(void); +WifiErrorNo StartSoftAp(int id); /** * @Description Close Ap. * * @return WifiErrorNo + * @param id - ap id */ -WifiErrorNo StopSoftAp(void); +WifiErrorNo StopSoftAp(int id); /** * @Description Setting the startup configuration items of the hostapd. * * @param config - HostapdConfig object's point. + * @param id - ap id * @return WifiErrorNo */ -WifiErrorNo SetHostapdConfig(HostapdConfig *config); +WifiErrorNo SetHostapdConfig(HostapdConfig *config, int id); /** * @Description Obtains information about all connected STAs. * * @param infos * @param size + * @param id - ap id * @return WifiErrorNo */ -WifiErrorNo GetStaInfos(char *infos, int32_t *size); +WifiErrorNo GetStaInfos(char *infos, int32_t *size, int id); /** * @Description To set the blocklist filtering in AP mode to prohibit the MAC @@ -75,9 +80,10 @@ WifiErrorNo GetStaInfos(char *infos, int32_t *size); * * @param mac - Mac address. * @param lenMac - Mac string length. + * @param id - ap id * @return WifiErrorNo */ -WifiErrorNo SetMacFilter(unsigned char *mac, int lenMac); +WifiErrorNo SetMacFilter(unsigned char *mac, int lenMac, int id); /** * @Description This command is used to set blocklist filtering in AP mode and delete @@ -85,18 +91,20 @@ WifiErrorNo SetMacFilter(unsigned char *mac, int lenMac); * * @param mac - Mac address. * @param lenMac - Mac string length. + * @param id - ap id * @return WifiErrorNo */ -WifiErrorNo DelMacFilter(unsigned char *mac, int lenMac); +WifiErrorNo DelMacFilter(unsigned char *mac, int lenMac, int id); /** * @Description Disconnect the STA with a specified MAC address. * * @param mac - Mac address. * @param lenMac - Mac string length. + * @param id - ap id * @return WifiErrorNo */ -WifiErrorNo DisassociateSta(unsigned char *mac, int lenMac); +WifiErrorNo DisassociateSta(unsigned char *mac, int lenMac, int id); /** * @Description Obtains the hotspot frequency supported by a specified frequency band. @@ -105,22 +113,25 @@ WifiErrorNo DisassociateSta(unsigned char *mac, int lenMac); * @param frequencies - Numeric group pointer of the int type. * @param size - Size of the memory to which the frequencies point and the * number of obtained data. + * @param id - ap id * @return WifiErrorNo */ -WifiErrorNo GetValidFrequenciesForBand(int32_t band, int *frequencies, int32_t *size); +WifiErrorNo GetValidFrequenciesForBand(int32_t band, int *frequencies, int32_t *size, int id); /** * @Description Setting the Wi-Fi Country Code. * * @param code + * @param id - ap id * @return WifiErrorNo */ -WifiErrorNo SetCountryCode(const char *code); +WifiErrorNo SetCountryCode(const char *code, int id); /** * @Description Disconnect the STA connection based on the MAC address. * * @param mac - MAC address of the STA to be disconnected. + * @param id - ap id * @return WifiErrorNo */ WifiErrorNo DisconnectStaByMac(const char *mac); @@ -129,25 +140,28 @@ WifiErrorNo DisconnectStaByMac(const char *mac); * @Description Information about the disconnected or connected STA. * * @param callback + * @param id - ap id * @return WifiErrorNo */ -WifiErrorNo RegisterAsscociatedEvent(IWifiApEventCallback callback); +WifiErrorNo RegisterAsscociatedEvent(IWifiApEventCallback callback, int id); /** * @Description Get supported power model list * * @param model - the model to be set + * @param id - ap id * @return ErrCode - operation result */ -WifiErrorNo WpaSetPowerModel(const int model); +WifiErrorNo WpaSetPowerModel(const int model, int id); /** * @Description Get power model * * @param model - current power model + * @param id - ap id * @return ErrCode - operation result */ -WifiErrorNo WpaGetPowerModel(int* model); +WifiErrorNo WpaGetPowerModel(int* model, int id); #ifdef __cplusplus } #endif diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_struct.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_struct.h index 185998b..fdc6182 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_struct.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_struct.h @@ -194,8 +194,8 @@ typedef struct CStationInfo { } CStationInfo; typedef struct IWifiApEventCallback { - void (*onStaJoinOrLeave)(const CStationInfo *info); - void (*onApEnableOrDisable)(int event); + void (*onStaJoinOrLeave)(const CStationInfo *info, int id); + void (*onApEnableOrDisable)(int event, int id); } IWifiApEventCallback; typedef enum IfaceType { TYPE_STA, TYPE_AP, TYPE_P2P, TYPE_NAN } IfaceType; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_ap_hal_interface.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_ap_hal_interface.cpp index aa941da..d6681da 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_ap_hal_interface.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_ap_hal_interface.cpp @@ -22,6 +22,7 @@ namespace OHOS { namespace Wifi { +static IWifiApMonitorEventCallback g_cb = {nullptr, nullptr}; WifiApHalInterface &WifiApHalInterface::GetInstance(void) { static WifiApHalInterface inst; @@ -38,91 +39,95 @@ WifiApHalInterface &WifiApHalInterface::GetInstance(void) return inst; } -WifiErrorNo WifiApHalInterface::StartAp(void) +WifiErrorNo WifiApHalInterface::StartAp(int id) { CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); - return mIdlClient->StartAp(); + return mIdlClient->StartAp(id); } -WifiErrorNo WifiApHalInterface::StopAp(void) +WifiErrorNo WifiApHalInterface::StopAp(int id) { CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); - return mIdlClient->StopAp(); + return mIdlClient->StopAp(id); } -WifiErrorNo WifiApHalInterface::SetSoftApConfig(const HotspotConfig &config) +WifiErrorNo WifiApHalInterface::SetSoftApConfig(const HotspotConfig &config, int id) { CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); - return mIdlClient->SetSoftApConfig(config); + return mIdlClient->SetSoftApConfig(config, id); } -WifiErrorNo WifiApHalInterface::GetStationList(std::vector &result) +WifiErrorNo WifiApHalInterface::GetStationList(std::vector &result, int id) { CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); - return mIdlClient->GetStationList(result); + return mIdlClient->GetStationList(result, id); } -WifiErrorNo WifiApHalInterface::AddBlockByMac(const std::string &mac) +WifiErrorNo WifiApHalInterface::AddBlockByMac(const std::string &mac, int id) { CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); - return mIdlClient->AddBlockByMac(mac); + return mIdlClient->AddBlockByMac(mac, id); } -WifiErrorNo WifiApHalInterface::DelBlockByMac(const std::string &mac) +WifiErrorNo WifiApHalInterface::DelBlockByMac(const std::string &mac, int id) { CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); - return mIdlClient->DelBlockByMac(mac); + return mIdlClient->DelBlockByMac(mac, id); } -WifiErrorNo WifiApHalInterface::RemoveStation(const std::string &mac) +WifiErrorNo WifiApHalInterface::RemoveStation(const std::string &mac, int id) { CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); - return mIdlClient->RemoveStation(mac); + return mIdlClient->RemoveStation(mac, id); } -WifiErrorNo WifiApHalInterface::GetFrequenciesByBand(int band, std::vector &frequencies) +WifiErrorNo WifiApHalInterface::GetFrequenciesByBand(int band, std::vector &frequencies, int id) { CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); - return mIdlClient->GetFrequenciesByBand(band, frequencies); + return mIdlClient->GetFrequenciesByBand(band, frequencies, id); } -WifiErrorNo WifiApHalInterface::RegisterApEvent(IWifiApMonitorEventCallback callback) +WifiErrorNo WifiApHalInterface::RegisterApEvent(IWifiApMonitorEventCallback callback, int id) { CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); - WifiErrorNo err = mIdlClient->RegisterApEvent(callback); + WifiErrorNo err = mIdlClient->RegisterApEvent(callback, id); if (err == WIFI_IDL_OPT_OK || callback.onStaJoinOrLeave == nullptr) { - mApCallback = callback; + mApCallback[id] = callback; } return err; } -WifiErrorNo WifiApHalInterface::SetWifiCountryCode(const std::string &code) +WifiErrorNo WifiApHalInterface::SetWifiCountryCode(const std::string &code, int id) { CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); - return mIdlClient->SetWifiCountryCode(code); + return mIdlClient->SetWifiCountryCode(code, id); } -WifiErrorNo WifiApHalInterface::DisconnectStaByMac(const std::string &mac) +WifiErrorNo WifiApHalInterface::DisconnectStaByMac(const std::string &mac, int id) { CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); - return mIdlClient->ReqDisconnectStaByMac(mac); + return mIdlClient->ReqDisconnectStaByMac(mac, id); } -const IWifiApMonitorEventCallback &WifiApHalInterface::GetApCallbackInst(void) const +const IWifiApMonitorEventCallback &WifiApHalInterface::GetApCallbackInst(int id) const { - return mApCallback; + auto iter = mApCallback.find(id); + if (iter != mApCallback.end()) { + return iter->second; + } + return g_cb; } -WifiErrorNo WifiApHalInterface::GetPowerModel(int& model) const +WifiErrorNo WifiApHalInterface::GetPowerModel(int& model, int id) const { CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); - return mIdlClient->ReqGetPowerModel(model); + return mIdlClient->ReqGetPowerModel(model, id); } -WifiErrorNo WifiApHalInterface::SetPowerModel(const int& model) const +WifiErrorNo WifiApHalInterface::SetPowerModel(const int& model, int id) const { CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); - return mIdlClient->ReqSetPowerModel(model); + return mIdlClient->ReqSetPowerModel(model, id); } } // namespace Wifi } // namespace OHOS \ No newline at end of file diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_ap_hal_interface.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_ap_hal_interface.h index 7adbcbc..d31c372 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_ap_hal_interface.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_ap_hal_interface.h @@ -38,14 +38,14 @@ public: * * @return WifiErrorNo */ - virtual WifiErrorNo StartAp(void); + virtual WifiErrorNo StartAp(int id = 0); /** * @Description Close Ap. * * @return WifiErrorNo */ - virtual WifiErrorNo StopAp(void); + virtual WifiErrorNo StopAp(int id = 0); /** * @Description Setting SoftAP Configurations. @@ -53,7 +53,7 @@ public: * @param config * @return WifiErrorNo */ - WifiErrorNo SetSoftApConfig(const HotspotConfig &config); + WifiErrorNo SetSoftApConfig(const HotspotConfig &config, int id = 0); /** * @Description Obtains information about all connected STAs. @@ -61,7 +61,7 @@ public: * @param result - Returns the obtained STA information list. * @return WifiErrorNo */ - WifiErrorNo GetStationList(std::vector &result); + WifiErrorNo GetStationList(std::vector &result, int id = 0); /** * @Description To set the blocklist filtering in AP mode to prohibit @@ -70,7 +70,7 @@ public: * @param mac - Blocklisted address. * @return WifiErrorNo */ - WifiErrorNo AddBlockByMac(const std::string &mac); + WifiErrorNo AddBlockByMac(const std::string &mac, int id = 0); /** * @Description To set blocklist filtering in AP mode and delete a @@ -79,7 +79,7 @@ public: * @param mac - Blocklisted address. * @return WifiErrorNo */ - WifiErrorNo DelBlockByMac(const std::string &mac); + WifiErrorNo DelBlockByMac(const std::string &mac, int id = 0); /** * @Description Disconnect the STA with a specified MAC address. @@ -87,7 +87,7 @@ public: * @param mac - Address information. * @return WifiErrorNo */ - WifiErrorNo RemoveStation(const std::string &mac); + WifiErrorNo RemoveStation(const std::string &mac, int id = 0); /** * @Description Obtains the hotspot frequency supported by a @@ -97,7 +97,7 @@ public: * @param frequencies - Frequency list. * @return WifiErrorNo */ - WifiErrorNo GetFrequenciesByBand(int band, std::vector &frequencies); + WifiErrorNo GetFrequenciesByBand(int band, std::vector &frequencies, int id = 0); /** * @Description Listening to Wi-Fi disconnection or connection events @@ -107,7 +107,7 @@ public: * registration events. * @return WifiErrorNo */ - WifiErrorNo RegisterApEvent(IWifiApMonitorEventCallback callback); + WifiErrorNo RegisterApEvent(IWifiApMonitorEventCallback callback, int id = 0); /** * @Description Sets the Wi-Fi country code. @@ -115,7 +115,7 @@ public: * @param code * @return WifiErrorNo */ - WifiErrorNo SetWifiCountryCode(const std::string &code); + WifiErrorNo SetWifiCountryCode(const std::string &code, int id = 0); /** * @Description Disconnect STAs based on MAC addresses. @@ -123,14 +123,14 @@ public: * @param mac * @return WifiErrorNo */ - WifiErrorNo DisconnectStaByMac(const std::string &mac); + WifiErrorNo DisconnectStaByMac(const std::string &mac, int id = 0); /** * @Description Get the Ap Callback Inst object * * @return const IWifiApMonitorEventCallback& - register ap callback objects */ - const IWifiApMonitorEventCallback &GetApCallbackInst(void) const; + const IWifiApMonitorEventCallback &GetApCallbackInst(int id = 0) const; /** * @Description Get power mode. @@ -138,7 +138,7 @@ public: * @param model * @return WifiErrorNo */ - WifiErrorNo GetPowerModel(int& model) const; + WifiErrorNo GetPowerModel(int& model, int id = 0) const; /** * @Description Set power mode. @@ -146,10 +146,10 @@ public: * @param model * @return WifiErrorNo */ - WifiErrorNo SetPowerModel(const int& model) const; + WifiErrorNo SetPowerModel(const int& model, int id = 0) const; private: - IWifiApMonitorEventCallback mApCallback; + std::map mApCallback; }; } // namespace Wifi } // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp index 2b5e700..a964c84 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp @@ -692,19 +692,19 @@ WifiErrorNo WifiIdlClient::ReqGetConnectSignalInfo(const std::string &endBssid, return err; } -WifiErrorNo WifiIdlClient::StartAp(void) +WifiErrorNo WifiIdlClient::StartAp(int id) { CHECK_CLIENT_NOT_NULL; - return StartSoftAp(); + return StartSoftAp(id); } -WifiErrorNo WifiIdlClient::StopAp(void) +WifiErrorNo WifiIdlClient::StopAp(int id) { CHECK_CLIENT_NOT_NULL; - return StopSoftAp(); + return StopSoftAp(id); } -WifiErrorNo WifiIdlClient::SetSoftApConfig(const HotspotConfig &config) +WifiErrorNo WifiIdlClient::SetSoftApConfig(const HotspotConfig &config, int id) { CHECK_CLIENT_NOT_NULL; HostapdConfig tmp; @@ -724,10 +724,10 @@ WifiErrorNo WifiIdlClient::SetSoftApConfig(const HotspotConfig &config) tmp.band = static_cast(config.GetBand()); tmp.channel = config.GetChannel(); tmp.maxConn = config.GetMaxConn(); - return SetHostapdConfig(&tmp); + return SetHostapdConfig(&tmp, id); } -WifiErrorNo WifiIdlClient::GetStationList(std::vector &result) +WifiErrorNo WifiIdlClient::GetStationList(std::vector &result, int id) { CHECK_CLIENT_NOT_NULL; @@ -736,7 +736,7 @@ WifiErrorNo WifiIdlClient::GetStationList(std::vector &result) return WIFI_IDL_OPT_FAILED; } int32_t size = BUFFER_SIZE; - WifiErrorNo err = GetStaInfos(staInfos, &size); + WifiErrorNo err = GetStaInfos(staInfos, &size, id); if (err != WIFI_IDL_OPT_OK) { delete[] staInfos; return WIFI_IDL_OPT_FAILED; @@ -747,43 +747,43 @@ WifiErrorNo WifiIdlClient::GetStationList(std::vector &result) return WIFI_IDL_OPT_OK; } -WifiErrorNo WifiIdlClient::AddBlockByMac(const std::string &mac) +WifiErrorNo WifiIdlClient::AddBlockByMac(const std::string &mac, int id) { CHECK_CLIENT_NOT_NULL; if (CheckMacIsValid(mac) != 0) { return WIFI_IDL_OPT_INPUT_MAC_INVALID; } int len = mac.length(); - return SetMacFilter((unsigned char *)mac.c_str(), len); + return SetMacFilter((unsigned char *)mac.c_str(), len, id); } -WifiErrorNo WifiIdlClient::DelBlockByMac(const std::string &mac) +WifiErrorNo WifiIdlClient::DelBlockByMac(const std::string &mac, int id) { CHECK_CLIENT_NOT_NULL; if (CheckMacIsValid(mac) != 0) { return WIFI_IDL_OPT_INPUT_MAC_INVALID; } int len = mac.length(); - return DelMacFilter((unsigned char *)mac.c_str(), len); + return DelMacFilter((unsigned char *)mac.c_str(), len, id); } -WifiErrorNo WifiIdlClient::RemoveStation(const std::string &mac) +WifiErrorNo WifiIdlClient::RemoveStation(const std::string &mac, int id) { CHECK_CLIENT_NOT_NULL; if (CheckMacIsValid(mac) != 0) { return WIFI_IDL_OPT_INPUT_MAC_INVALID; } int len = mac.length(); - return DisassociateSta((unsigned char *)mac.c_str(), len); + return DisassociateSta((unsigned char *)mac.c_str(), len, id); } -WifiErrorNo WifiIdlClient::GetFrequenciesByBand(int32_t band, std::vector &frequencies) +WifiErrorNo WifiIdlClient::GetFrequenciesByBand(int32_t band, std::vector &frequencies, int id) { CHECK_CLIENT_NOT_NULL; int values[WIFI_IDL_GET_MAX_BANDS] = {0}; int size = WIFI_IDL_GET_MAX_BANDS; - if (GetValidFrequenciesForBand(band, values, &size) != 0) { + if (GetValidFrequenciesForBand(band, values, &size, id) != 0) { return WIFI_IDL_OPT_FAILED; } @@ -794,7 +794,7 @@ WifiErrorNo WifiIdlClient::GetFrequenciesByBand(int32_t band, std::vector & return WIFI_IDL_OPT_OK; } -WifiErrorNo WifiIdlClient::RegisterApEvent(IWifiApMonitorEventCallback callback) const +WifiErrorNo WifiIdlClient::RegisterApEvent(IWifiApMonitorEventCallback callback, int id) const { CHECK_CLIENT_NOT_NULL; IWifiApEventCallback cEventCallback; @@ -806,37 +806,37 @@ WifiErrorNo WifiIdlClient::RegisterApEvent(IWifiApMonitorEventCallback callback) cEventCallback.onApEnableOrDisable = OnApEnableOrDisable; } - return RegisterAsscociatedEvent(cEventCallback); + return RegisterAsscociatedEvent(cEventCallback, id); } -WifiErrorNo WifiIdlClient::SetWifiCountryCode(const std::string &code) +WifiErrorNo WifiIdlClient::SetWifiCountryCode(const std::string &code, int id) { CHECK_CLIENT_NOT_NULL; if (code.length() != WIFI_IDL_COUNTRY_CODE_LENGTH) { return WIFI_IDL_OPT_INVALID_PARAM; } - return SetCountryCode(code.c_str()); + return SetCountryCode(code.c_str(), id); } -WifiErrorNo WifiIdlClient::ReqDisconnectStaByMac(const std::string &mac) +WifiErrorNo WifiIdlClient::ReqDisconnectStaByMac(const std::string &mac, int id) { CHECK_CLIENT_NOT_NULL; if (CheckMacIsValid(mac) != 0) { return WIFI_IDL_OPT_INPUT_MAC_INVALID; } - return DisassociateSta((unsigned char *)mac.c_str(), strlen(mac.c_str())); + return DisassociateSta((unsigned char *)mac.c_str(), strlen(mac.c_str()), id); } -WifiErrorNo WifiIdlClient::ReqGetPowerModel(int& model) +WifiErrorNo WifiIdlClient::ReqGetPowerModel(int& model, int id) { CHECK_CLIENT_NOT_NULL; - return WpaGetPowerModel(&model); + return WpaGetPowerModel(&model, id); } -WifiErrorNo WifiIdlClient::ReqSetPowerModel(const int& model) +WifiErrorNo WifiIdlClient::ReqSetPowerModel(const int& model, int id) { CHECK_CLIENT_NOT_NULL; - return WpaSetPowerModel(model); + return WpaSetPowerModel(model, id); } WifiErrorNo WifiIdlClient::GetWifiChipObject(int id, IWifiChip &chip) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.h index 7dfca1c..82d862a 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.h @@ -339,14 +339,14 @@ public: * * @return WifiErrorNo */ - WifiErrorNo StartAp(void); + WifiErrorNo StartAp(int id = 0); /** * @Description Close Ap. * * @return WifiErrorNo */ - WifiErrorNo StopAp(void); + WifiErrorNo StopAp(int id = 0); /** * @Description Setting SoftAP Configurations. @@ -354,7 +354,7 @@ public: * @param config * @return WifiErrorNo */ - WifiErrorNo SetSoftApConfig(const HotspotConfig &config); + WifiErrorNo SetSoftApConfig(const HotspotConfig &config, int id = 0); /** * @Description Obtains information about all connected STAs. @@ -362,7 +362,7 @@ public: * @param result * @return WifiErrorNo */ - WifiErrorNo GetStationList(std::vector &result); + WifiErrorNo GetStationList(std::vector &result, int id = 0); /** * @Description To set the blocklist filtering in AP mode to prohibit the MAC @@ -371,7 +371,7 @@ public: * @param mac - Blocklisted address. * @return WifiErrorNo */ - WifiErrorNo AddBlockByMac(const std::string &mac); + WifiErrorNo AddBlockByMac(const std::string &mac, int id = 0); /** * @Description To set blocklist filtering in AP mode and delete a specified MAC @@ -380,7 +380,7 @@ public: * @param mac - Blocklisted address. * @return WifiErrorNo */ - WifiErrorNo DelBlockByMac(const std::string &mac); + WifiErrorNo DelBlockByMac(const std::string &mac, int id = 0); /** * @Description Disconnect the STA with a specified MAC address. @@ -388,7 +388,7 @@ public: * @param mac * @return WifiErrorNo */ - WifiErrorNo RemoveStation(const std::string &mac); + WifiErrorNo RemoveStation(const std::string &mac, int id = 0); /** * @Description Obtains the hotspot frequency supported by a specified frequency band. @@ -397,7 +397,7 @@ public: * @param frequencies * @return WifiErrorNo */ - WifiErrorNo GetFrequenciesByBand(int band, std::vector &frequencies); + WifiErrorNo GetFrequenciesByBand(int band, std::vector &frequencies, int id = 0); /** * @Description Listening to Wi-Fi disconnection or connection events @@ -406,7 +406,7 @@ public: * @param callback * @return WifiErrorNo */ - WifiErrorNo RegisterApEvent(IWifiApMonitorEventCallback callback) const; + WifiErrorNo RegisterApEvent(IWifiApMonitorEventCallback callback, int id = 0) const; /** * @Description Sets the Wi-Fi country code. @@ -414,7 +414,7 @@ public: * @param code * @return WifiErrorNo */ - WifiErrorNo SetWifiCountryCode(const std::string &code); + WifiErrorNo SetWifiCountryCode(const std::string &code, int id = 0); /** * @Description Disconnect the STA connection based on the MAC address. @@ -422,7 +422,7 @@ public: * @param mac * @return WifiErrorNo */ - WifiErrorNo ReqDisconnectStaByMac(const std::string &mac); + WifiErrorNo ReqDisconnectStaByMac(const std::string &mac, int id = 0); /** * @Description Request get the power mode. @@ -430,7 +430,7 @@ public: * @param mode - The mode of power. * @return WifiErrorNo */ - WifiErrorNo ReqGetPowerModel(int& model); + WifiErrorNo ReqGetPowerModel(int& model, int id = 0); /** * @Description Request set the power mode. @@ -438,7 +438,7 @@ public: * @param mode - The mode to set. * @return WifiErrorNo */ - WifiErrorNo ReqSetPowerModel(const int& model); + WifiErrorNo ReqSetPowerModel(const int& model, int id = 0); /* ************************** ChipMode interface **************************** */ diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.cpp index 9062b65..c61c33d 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.cpp @@ -30,13 +30,13 @@ RpcClient *GetApRpcClient(void) return OHOS::Wifi::WifiApHalInterface::GetInstance().mIdlClient->pRpcClient; } -void OnApStaJoinOrLeave(const CStationInfo *info) +void OnApStaJoinOrLeave(const CStationInfo *info, int id) { if (info == nullptr) { return; } const OHOS::Wifi::IWifiApMonitorEventCallback &cbk = - OHOS::Wifi::WifiApHalInterface::GetInstance().GetApCallbackInst(); + OHOS::Wifi::WifiApHalInterface::GetInstance().GetApCallbackInst(id); if (cbk.onStaJoinOrLeave) { OHOS::Wifi::WifiApConnectionNofify cbInfo; cbInfo.type = info->type; @@ -45,12 +45,12 @@ void OnApStaJoinOrLeave(const CStationInfo *info) } } -void OnApEnableOrDisable(int satus) +void OnApEnableOrDisable(int status, int id) { const OHOS::Wifi::IWifiApMonitorEventCallback &cbk = - OHOS::Wifi::WifiApHalInterface::GetInstance().GetApCallbackInst(); + OHOS::Wifi::WifiApHalInterface::GetInstance().GetApCallbackInst(id); if (cbk.onApEnableOrDisable) { - cbk.onApEnableOrDisable(satus); + cbk.onApEnableOrDisable(status); } } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.h index aa32c8d..b066123 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.h @@ -30,8 +30,8 @@ extern "C" { */ RpcClient *GetApRpcClient(void); -void OnApStaJoinOrLeave(const CStationInfo *info); -void OnApEnableOrDisable(int satus); +void OnApStaJoinOrLeave(const CStationInfo *info, int id); +void OnApEnableOrDisable(int status, int id); /** * @Description Get the Chip Rpc Client object. diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn index 79157c4..39706d5 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn @@ -81,6 +81,10 @@ ohos_shared_library("wifi_ap_service") { defines = [ "AP_INTF=\"$wifi_feature_with_ap_intf\"" ] + if (wifi_feature_with_dhcp_disable) { + defines += [ "WIFI_DHCP_DISABLED" ] + } + part_name = "wifi" subsystem_name = "communication" } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use.cpp index e20d58b..812d2c0 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use.cpp @@ -25,7 +25,7 @@ DEFINE_WIFILOG_HOTSPOT_LABEL("WifiApConfigUse"); namespace OHOS { namespace Wifi { -ApConfigUse::ApConfigUse() +ApConfigUse::ApConfigUse(int id) : m_id(id) {} ApConfigUse::~ApConfigUse() @@ -69,6 +69,7 @@ void ApConfigUse::TransformFrequencyIntoChannel(const std::vector &freqVect void ApConfigUse::LogConfig(HotspotConfig &apConfig) const { + WIFI_LOGI("current instance is %{public}d", m_id); WIFI_LOGI("HotspotConfig::SSID = %{private}s", apConfig.GetSsid().c_str()); WIFI_LOGI("HotspotConfig::preSharedKey = %{private}s", apConfig.GetPreSharedKey().c_str()); WIFI_LOGI("HotspotConfig::securityType = %{public}d", static_cast(apConfig.GetSecurityType())); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use.h index dff57a5..b6998f9 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use.h @@ -77,7 +77,7 @@ public: * @param None * @return None */ - ApConfigUse(); + explicit ApConfigUse(int id = 0); /** * @Description destructor method * @param None @@ -99,6 +99,7 @@ private: * @return None */ void ApplyDefaultConfig(HotspotConfig &apConfig, std::vector &vecChannels); + int m_id; DISALLOW_COPY_AND_ASSIGN(ApConfigUse) }; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_define.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_define.h index 54c7c54..e8506de 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_define.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_define.h @@ -22,8 +22,8 @@ namespace OHOS { namespace Wifi { -const std::string IN_INTERFACE = "wlan0"; -const std::string OUT_INTERFACE = AP_INTF; +const std::string IN_INTERFACE = AP_INTF; +const std::string OUT_INTERFACE = "wlan0"; const int MAX_SSID_LENGTH = 32; const int MAX_PSK_LENGTH = 63; const int MAC_LENGTH = 17; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_idle_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_idle_state.cpp index 67d0a73..c09884e 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_idle_state.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_idle_state.cpp @@ -21,8 +21,8 @@ DEFINE_WIFILOG_HOTSPOT_LABEL("WifiApIdleState"); namespace OHOS { namespace Wifi { -ApIdleState::ApIdleState(ApStateMachine &apStateMachine) - : State("ApIdleState"), m_ApStateMachine(apStateMachine) +ApIdleState::ApIdleState(ApStateMachine &apStateMachine, int id) + : State("ApIdleState"), m_ApStateMachine(apStateMachine), m_id(id) {} ApIdleState::~ApIdleState() @@ -30,12 +30,12 @@ ApIdleState::~ApIdleState() void ApIdleState::GoInState() { - WIFI_LOGI("%{public}s GoInState.", GetStateName().c_str()); + WIFI_LOGI("Instance %{public}d %{public}s GoInState.", m_id, GetStateName().c_str()); } void ApIdleState::GoOutState() { - WIFI_LOGI("%{public}s GoOutState.", GetStateName().c_str()); + WIFI_LOGI("Instance %{public}d %{public}s GoOutState.", m_id, GetStateName().c_str()); } bool ApIdleState::ExecuteStateMsg(InternalMessage *msg) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_idle_state.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_idle_state.h index 9bdb0cb..30a2663 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_idle_state.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_idle_state.h @@ -31,7 +31,7 @@ public: * @param None * @return None */ - explicit ApIdleState(ApStateMachine &); + explicit ApIdleState(ApStateMachine &, int id = 0); /** * @Description destructor method. * @param None @@ -60,6 +60,7 @@ public: virtual bool ExecuteStateMsg(InternalMessage *msg) override; private: ApStateMachine &m_ApStateMachine; + int m_id; }; } // namespace Wifi } // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_interface.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_interface.cpp index fa5ddc4..318b833 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_interface.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_interface.cpp @@ -17,23 +17,23 @@ namespace OHOS { namespace Wifi { -ApInterface::ApInterface() - : m_ApRootState(), - m_ApStartedState(m_ApStateMachine, m_ApConfigUse, m_ApMonitor), - m_ApIdleState(m_ApStateMachine), - m_ApMonitor(), - m_ApStateMachine(m_ApStationsManager, m_ApRootState, m_ApIdleState, m_ApStartedState, m_ApMonitor), - m_ApService(m_ApStateMachine), - m_ApStationsManager(), - m_ApConfigUse() +ApInterface::ApInterface(int id) + : m_ApRootState(id), + m_ApStartedState(m_ApStateMachine, m_ApConfigUse, m_ApMonitor, id), + m_ApIdleState(m_ApStateMachine, id), + m_ApMonitor(id), + m_ApStateMachine(m_ApStationsManager, m_ApRootState, m_ApIdleState, m_ApStartedState, m_ApMonitor, id), + m_ApService(m_ApStateMachine, id), + m_ApStationsManager(id), + m_ApConfigUse(id) {} ApInterface::~ApInterface() {} -extern "C" IApService *Create(void) +extern "C" IApService *Create(int id = 0) { - return new ApInterface(); + return new ApInterface(id); } extern "C" void Destroy(IApService *pservice) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_interface.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_interface.h index 7c390ef..aa1cf4f 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_interface.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_interface.h @@ -29,7 +29,7 @@ public: * @param None * @return None */ - ApInterface(); + explicit ApInterface(int id = 0); /** * @Description destructor method. * @param None diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor.cpp index 8d6e28a..d03b785 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor.cpp @@ -29,7 +29,7 @@ DEFINE_WIFILOG_HOTSPOT_LABEL("WifiApMonitor"); namespace OHOS { namespace Wifi { -ApMonitor::ApMonitor() +ApMonitor::ApMonitor(int id) : m_id(id) {} ApMonitor::~ApMonitor() @@ -82,9 +82,9 @@ void ApMonitor::StartMonitor() std::bind(&ApMonitor::OnStaJoinOrLeave, this, _1), std::bind(&ApMonitor::OnHotspotStateEvent, this, _1), }; - WifiApHalInterface::GetInstance().RegisterApEvent(wifiApEventCallback); + WifiApHalInterface::GetInstance().RegisterApEvent(wifiApEventCallback, m_id); - std::string iface = AP_INTF; + std::string iface = std::string(AP_INTF) + std::to_string(m_id); m_selectIfacName = iface; m_setMonitorIface.insert(iface); } @@ -111,7 +111,7 @@ void ApMonitor::SendMessage( void ApMonitor::StopMonitor() { IWifiApMonitorEventCallback wifiApEventCallback = {}; - WifiApHalInterface::GetInstance().RegisterApEvent(wifiApEventCallback); + WifiApHalInterface::GetInstance().RegisterApEvent(wifiApEventCallback, m_id); } void ApMonitor::RegisterHandler(const std::string &iface, const std::function &handler) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor.h index 6184302..1622bdf 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor.h @@ -29,7 +29,7 @@ class ApMonitor { FRIEND_GTEST(ApMonitor); public: - ApMonitor(); + explicit ApMonitor(int id = 0); virtual ~ApMonitor(); /** * @Description IDL called this interface when STA connected or @@ -99,6 +99,7 @@ private: std::map> m_mapHandler; std::string m_selectIfacName; std::set m_setMonitorIface; + int m_id; }; } // namespace Wifi } // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_root_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_root_state.cpp index 8ae76e8..0e40c0b 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_root_state.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_root_state.cpp @@ -21,7 +21,7 @@ DEFINE_WIFILOG_HOTSPOT_LABEL("WifiApRootState"); namespace OHOS { namespace Wifi { -ApRootState::ApRootState() : State("ApRootState") +ApRootState::ApRootState(int id) : State("ApRootState"), m_id(id) {} ApRootState::~ApRootState() @@ -29,12 +29,12 @@ ApRootState::~ApRootState() void ApRootState::GoInState() { - WIFI_LOGI("%{public}s GoInState.", GetStateName().c_str()); + WIFI_LOGI("Instance %{public}d %{public}s GoInState.", m_id, GetStateName().c_str()); } void ApRootState::GoOutState() { - WIFI_LOGI("%{public}s GoOutState.", GetStateName().c_str()); + WIFI_LOGI("Instance %{public}d %{public}s GoOutState.", m_id, GetStateName().c_str()); } bool ApRootState::ExecuteStateMsg(InternalMessage *msg) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_root_state.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_root_state.h index 8de7eca..b87ae33 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_root_state.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_root_state.h @@ -28,7 +28,7 @@ public: * @param None * @return None */ - ApRootState(); + explicit ApRootState(int id = 0); /** * @Description destructor method. * @param None @@ -56,6 +56,9 @@ public: * @return HANDLED：Processed successfully */ virtual bool ExecuteStateMsg(InternalMessage *msg) override; + +private: + int m_id; }; } // namespace Wifi } // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.cpp index 3fbced8..6fda7cc 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.cpp @@ -23,7 +23,8 @@ DEFINE_WIFILOG_HOTSPOT_LABEL("WifiApService"); namespace OHOS { namespace Wifi { -ApService::ApService(ApStateMachine &apStateMachine) : m_ApStateMachine(apStateMachine) +ApService::ApService(ApStateMachine &apStateMachine, int id) + : m_ApStateMachine(apStateMachine), m_id(id) {} ApService::~ApService() @@ -31,18 +32,21 @@ ApService::~ApService() ErrCode ApService::EnableHotspot() const { + WIFI_LOGI("Instance %{public}d %{public}s", m_id, __func__); m_ApStateMachine.SendMessage(static_cast(ApStatemachineEvent::CMD_START_HOTSPOT)); return ErrCode::WIFI_OPT_SUCCESS; } ErrCode ApService::DisableHotspot() const { + WIFI_LOGI("Instance %{public}d %{public}s", m_id, __func__); m_ApStateMachine.SendMessage(static_cast(ApStatemachineEvent::CMD_STOP_HOTSPOT)); return ErrCode::WIFI_OPT_SUCCESS; } ErrCode ApService::SetHotspotConfig(const HotspotConfig &cfg) const { + WIFI_LOGI("Instance %{public}d %{public}s", m_id, __func__); InternalMessage *msg = m_ApStateMachine.CreateMessage(); if (msg == nullptr) { return ErrCode::WIFI_OPT_FAILED; @@ -60,6 +64,7 @@ ErrCode ApService::SetHotspotConfig(const HotspotConfig &cfg) const ErrCode ApService::AddBlockList(const StationInfo &stationInfo) const { + WIFI_LOGI("Instance %{public}d %{public}s", m_id, __func__); InternalMessage *msg = m_ApStateMachine.CreateMessage(); if (msg == nullptr) { return ErrCode::WIFI_OPT_FAILED; @@ -74,6 +79,7 @@ ErrCode ApService::AddBlockList(const StationInfo &stationInfo) const ErrCode ApService::DelBlockList(const StationInfo &stationInfo) const { + WIFI_LOGI("Instance %{public}d %{public}s", m_id, __func__); InternalMessage *msg = m_ApStateMachine.CreateMessage(); if (msg == nullptr) { return ErrCode::WIFI_OPT_FAILED; @@ -88,6 +94,7 @@ ErrCode ApService::DelBlockList(const StationInfo &stationInfo) const ErrCode ApService::DisconnetStation(const StationInfo &stationInfo) const { + WIFI_LOGI("Instance %{public}d %{public}s", m_id, __func__); InternalMessage *msg = m_ApStateMachine.CreateMessage(); if (msg == nullptr) { return ErrCode::WIFI_OPT_FAILED; @@ -102,6 +109,7 @@ ErrCode ApService::DisconnetStation(const StationInfo &stationInfo) const ErrCode ApService::GetStationList(std::vector &result) const { + WIFI_LOGI("Instance %{public}d %{public}s", m_id, __func__); WifiSettings::GetInstance().GetStationList(result); if (result.empty()) { WIFI_LOGD("GetStationList is empty."); @@ -126,6 +134,7 @@ ErrCode ApService::GetStationList(std::vector &result) const ErrCode ApService::GetValidBands(std::vector &bands) { + WIFI_LOGI("Instance %{public}d %{public}s", m_id, __func__); if (WifiSettings::GetInstance().GetValidBands(bands) < 0) { WIFI_LOGE("Delete block list failed!"); return ErrCode::WIFI_OPT_FAILED; @@ -135,6 +144,7 @@ ErrCode ApService::GetValidBands(std::vector &bands) ErrCode ApService::GetValidChannels(BandType band, std::vector &validchannel) { + WIFI_LOGI("Instance %{public}d %{public}s", m_id, __func__); ChannelsTable channelsInfo; if (WifiSettings::GetInstance().GetValidChannels(channelsInfo)) { WIFI_LOGE("Failed to obtain data from the WifiSettings."); @@ -151,6 +161,7 @@ ErrCode ApService::GetValidChannels(BandType band, std::vector &validch ErrCode ApService::RegisterApServiceCallbacks(const IApServiceCallbacks &callbacks) { + WIFI_LOGI("Instance %{public}d %{public}s", m_id, __func__); WIFI_LOGI("RegisterApServiceCallbacks."); m_ApStateMachine.RegisterApServiceCallbacks(callbacks); return ErrCode::WIFI_OPT_SUCCESS; @@ -158,7 +169,7 @@ ErrCode ApService::RegisterApServiceCallbacks(const IApServiceCallbacks &callbac ErrCode ApService::GetSupportedPowerModel(std::set& setPowerModelList) { - LOGI("ApService::GetSupportedPowerModel"); + WIFI_LOGI("Instance %{public}d %{public}s", m_id, __func__); /* All modes are currently supported */ setPowerModelList.insert(PowerModel::SLEEPING); setPowerModelList.insert(PowerModel::GENERAL); @@ -168,15 +179,17 @@ ErrCode ApService::GetSupportedPowerModel(std::set& setPowerModelLis ErrCode ApService::GetPowerModel(PowerModel& model) { - WifiSettings::GetInstance().GetPowerModel(model); + WIFI_LOGI("Instance %{public}d %{public}s", m_id, __func__); + WifiSettings::GetInstance().GetPowerModel(model, m_id); LOGI("ApService::GetPowerModel, model=[%{public}d]", static_cast(model)); return ErrCode::WIFI_OPT_SUCCESS; } ErrCode ApService::SetPowerModel(const PowerModel& model) { + WIFI_LOGI("Instance %{public}d %{public}s", m_id, __func__); LOGI("Enter ApService::SetPowerModel, model=[%d]", static_cast(model)); - if (WifiApHalInterface::GetInstance().SetPowerModel(static_cast(model)) != WIFI_IDL_OPT_OK) { + if (WifiApHalInterface::GetInstance().SetPowerModel(static_cast(model), m_id) != WIFI_IDL_OPT_OK) { LOGE("SetPowerModel() failed!"); return WIFI_OPT_FAILED; } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.h index 716543a..5176e20 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.h @@ -32,7 +32,7 @@ public: * @param None * @return None */ - ApService(ApStateMachine &); + ApService(ApStateMachine &, int id = 0); /** * @Description destructor method. @@ -143,6 +143,7 @@ public: private: ApStateMachine &m_ApStateMachine; + int m_id; }; } // namespace Wifi } // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.cpp index dc1ec95..bceeddc 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.cpp @@ -33,12 +33,13 @@ DEFINE_WIFILOG_HOTSPOT_LABEL("WifiApStartedState"); namespace OHOS { namespace Wifi { -ApStartedState::ApStartedState(ApStateMachine &apStateMachine, ApConfigUse &apConfigUse, ApMonitor &apMonitor) +ApStartedState::ApStartedState(ApStateMachine &apStateMachine, ApConfigUse &apConfigUse, ApMonitor &apMonitor, int id) : State("ApStartedState"), m_hotspotConfig(HotspotConfig()), m_ApStateMachine(apStateMachine), m_ApConfigUse(apConfigUse), - m_ApMonitor(apMonitor) + m_ApMonitor(apMonitor), + m_id(id) { Init(); } @@ -48,8 +49,9 @@ ApStartedState::~ApStartedState() void ApStartedState::GoInState() { + WIFI_LOGI("Instance %{public}d %{public}s", m_id, __func__); m_ApStateMachine.OnApStateChange(ApState::AP_STATE_STARTING); - WIFI_LOGI("%{public}s GoInState", GetStateName().c_str()); + WIFI_LOGI("Instance %{public}d %{public}s GoInState", m_id, GetStateName().c_str()); m_ApStateMachine.RegisterEventHandler(); StartMonitor(); @@ -82,7 +84,7 @@ void ApStartedState::GoInState() void ApStartedState::GoOutState() { - WIFI_LOGI("%{public}s GoOutState.", GetStateName().c_str()); + WIFI_LOGI("Instance %{public}d %{public}s", m_id, __func__); m_ApStateMachine.OnApStateChange(ApState::AP_STATE_CLOSING); DisableInterfaceNat(); m_ApStateMachine.StopDhcpServer(); @@ -122,7 +124,7 @@ bool ApStartedState::ExecuteStateMsg(InternalMessage *msg) return false; } int msgName = msg->GetMessageName(); - WIFI_LOGI("ApStartedState Process msgName:%{public}d.", msgName); + WIFI_LOGI("Instance %{public}d ApStartedState Process msgName:%{public}d.", m_id, msgName); auto iter = mProcessFunMap.find(static_cast(msgName)); if (iter == mProcessFunMap.end()) { @@ -135,6 +137,7 @@ bool ApStartedState::ExecuteStateMsg(InternalMessage *msg) bool ApStartedState::SetConfig(HotspotConfig &apConfig) { + WIFI_LOGI("Instance %{public}d %{public}s", m_id, __func__); std::vector allowed5GFreq, allowed2GFreq; std::vector allowed5GChan, allowed2GChan; if (WifiApHalInterface::GetInstance().GetFrequenciesByBand(static_cast(BandType::BAND_2GHZ), allowed2GFreq)) { @@ -160,12 +163,12 @@ bool ApStartedState::SetConfig(HotspotConfig &apConfig) m_ApConfigUse.CheckBandChannel(apConfig, channelTbs); - if (WifiApHalInterface::GetInstance().SetSoftApConfig(apConfig) != WifiErrorNo::WIFI_IDL_OPT_OK) { + if (WifiApHalInterface::GetInstance().SetSoftApConfig(apConfig, m_id) != WifiErrorNo::WIFI_IDL_OPT_OK) { WIFI_LOGE("set hostapd config failed."); return false; } - WifiSettings::GetInstance().SetHotspotConfig(apConfig); + WifiSettings::GetInstance().SetHotspotConfig(apConfig, m_id); WifiSettings::GetInstance().SyncHotspotConfig(); m_ApConfigUse.LogConfig(apConfig); WIFI_LOGI("SetConfig OK!."); @@ -174,18 +177,19 @@ bool ApStartedState::SetConfig(HotspotConfig &apConfig) bool ApStartedState::SetConfig() { + WIFI_LOGI("Instance %{public}d %{public}s", m_id, __func__); std::string countryCode; if (WifiSettings::GetInstance().GetCountryCode(countryCode)) { WIFI_LOGE("get countryCode failed."); return false; } - if (WifiApHalInterface::GetInstance().SetWifiCountryCode(countryCode) != WifiErrorNo::WIFI_IDL_OPT_OK) { + if (WifiApHalInterface::GetInstance().SetWifiCountryCode(countryCode, m_id) != WifiErrorNo::WIFI_IDL_OPT_OK) { WIFI_LOGE("set countryCode:%{public}s failed.", countryCode.c_str()); return false; } WIFI_LOGI("HotspotConfig CountryCode = %{public}s.", countryCode.c_str()); - if (WifiSettings::GetInstance().GetHotspotConfig(m_hotspotConfig)) { + if (WifiSettings::GetInstance().GetHotspotConfig(m_hotspotConfig, m_id)) { WIFI_LOGE("GetConfig failed!!!."); return false; } @@ -195,8 +199,8 @@ bool ApStartedState::SetConfig() bool ApStartedState::StartAp() const { - WIFI_LOGI("enter startAp."); - WifiErrorNo retCode = WifiApHalInterface::GetInstance().StartAp(); + WIFI_LOGI("Instance %{public}d %{public}s", m_id, __func__); + WifiErrorNo retCode = WifiApHalInterface::GetInstance().StartAp(m_id); if (retCode != WifiErrorNo::WIFI_IDL_OPT_OK) { WIFI_LOGE("startAp is failed!"); return false; @@ -206,7 +210,8 @@ bool ApStartedState::StartAp() const bool ApStartedState::StopAp() const { - WifiErrorNo retCode = WifiApHalInterface::GetInstance().StopAp(); + WIFI_LOGI("Instance %{public}d %{public}s", m_id, __func__); + WifiErrorNo retCode = WifiApHalInterface::GetInstance().StopAp(m_id); if (retCode != WifiErrorNo::WIFI_IDL_OPT_OK) { return false; } @@ -215,11 +220,13 @@ bool ApStartedState::StopAp() const void ApStartedState::StartMonitor() const { + WIFI_LOGI("Instance %{public}d %{public}s", m_id, __func__); m_ApMonitor.StartMonitor(); } void ApStartedState::StopMonitor() const { + WIFI_LOGI("Instance %{public}d %{public}s", m_id, __func__); m_ApMonitor.StopMonitor(); } @@ -246,13 +253,13 @@ bool ApStartedState::DisableInterfaceNat() const void ApStartedState::ProcessCmdFail(InternalMessage &msg) const { - WIFI_LOGI("State Machine message: %{public}d.", msg.GetMessageName()); + WIFI_LOGI("Instance %{public}d State Machine message: %{public}d.", m_id, msg.GetMessageName()); m_ApStateMachine.SwitchState(&m_ApStateMachine.m_ApIdleState); } void ApStartedState::ProcessCmdStationJoin(InternalMessage &msg) const { - WIFI_LOGI("New station join."); + WIFI_LOGI("Instance %{public}d %{public}s", m_id, __func__); StationInfo staInfo; if (msg.GetMessageObj(staInfo)) { m_ApStateMachine.m_ApStationsManager.StationJoin(staInfo); @@ -263,7 +270,7 @@ void ApStartedState::ProcessCmdStationJoin(InternalMessage &msg) const void ApStartedState::ProcessCmdStationLeave(InternalMessage &msg) const { - WIFI_LOGI("Old station leave."); + WIFI_LOGI("Instance %{public}d %{public}s", m_id, __func__); StationInfo staInfo; if (msg.GetMessageObj(staInfo)) { m_ApStateMachine.m_ApStationsManager.StationLeave(staInfo.bssid); @@ -274,8 +281,7 @@ void ApStartedState::ProcessCmdStationLeave(InternalMessage &msg) const void ApStartedState::ProcessCmdSetHotspotConfig(InternalMessage &msg) { - WIFI_LOGI("Set HotspotConfig."); - + WIFI_LOGI("Instance %{public}d %{public}s", m_id, __func__); m_hotspotConfig.SetSsid(msg.GetStringFromMessage()); m_hotspotConfig.SetPreSharedKey(msg.GetStringFromMessage()); m_hotspotConfig.SetSecurityType(static_cast(msg.GetIntFromMessage())); @@ -292,13 +298,16 @@ void ApStartedState::ProcessCmdSetHotspotConfig(InternalMessage &msg) void ApStartedState::ProcessCmdUpdateConfigResult(InternalMessage &msg) const { + WIFI_LOGI("Instance %{public}d %{public}s", m_id, __func__); if (msg.GetParam1() == 1) { WIFI_LOGI("Hot update HotspotConfig succeeded."); - if (WifiSettings::GetInstance().SetHotspotConfig(m_hotspotConfig)) { + if (WifiSettings::GetInstance().SetHotspotConfig(m_hotspotConfig, m_id)) { WIFI_LOGE("set apConfig to settings failed."); } +#ifndef WIFI_DHCP_DISABLED m_ApStateMachine.StopDhcpServer(); m_ApStateMachine.StartDhcpServer(); +#endif } else { m_ApStateMachine.SwitchState(&m_ApStateMachine.m_ApIdleState); } @@ -306,7 +315,7 @@ void ApStartedState::ProcessCmdUpdateConfigResult(InternalMessage &msg) const void ApStartedState::ProcessCmdAddBlockList(InternalMessage &msg) const { - WIFI_LOGI("Add block list."); + WIFI_LOGI("Instance %{public}d %{public}s", m_id, __func__); StationInfo staInfo; staInfo.deviceName = msg.GetStringFromMessage(); staInfo.bssid = msg.GetStringFromMessage(); @@ -318,7 +327,7 @@ void ApStartedState::ProcessCmdAddBlockList(InternalMessage &msg) const void ApStartedState::ProcessCmdDelBlockList(InternalMessage &msg) const { - WIFI_LOGI("Delete block list."); + WIFI_LOGI("Instance %{public}d %{public}s", m_id, __func__); StationInfo staInfo; staInfo.deviceName = msg.GetStringFromMessage(); staInfo.bssid = msg.GetStringFromMessage(); @@ -330,13 +339,13 @@ void ApStartedState::ProcessCmdDelBlockList(InternalMessage &msg) const void ApStartedState::ProcessCmdStopHotspot(InternalMessage &msg) const { - WIFI_LOGI("Disable hotspot: %{public}d.", msg.GetMessageName()); + WIFI_LOGI("Instance %{public}d Disable hotspot: %{public}d.", m_id, msg.GetMessageName()); m_ApStateMachine.SwitchState(&m_ApStateMachine.m_ApIdleState); } void ApStartedState::ProcessCmdDisconnectStation(InternalMessage &msg) const { - WIFI_LOGI("Disconnect station."); + WIFI_LOGI("Instance %{public}d %{public}s", m_id, __func__); StationInfo staInfo; staInfo.deviceName = msg.GetStringFromMessage(); staInfo.bssid = msg.GetStringFromMessage(); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.h index a4c65ec..91e1953 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.h @@ -34,7 +34,7 @@ public: * @param None * @return None */ - ApStartedState(ApStateMachine &, ApConfigUse &, ApMonitor &); + ApStartedState(ApStateMachine &, ApConfigUse &, ApMonitor &, int id = 0); /** * @Description destructor method. * @param None @@ -237,6 +237,7 @@ private: ApStateMachine &m_ApStateMachine; ApConfigUse &m_ApConfigUse; ApMonitor &m_ApMonitor; + int m_id; }; } // namespace Wifi } // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine.cpp index 6c2cd08..72f54d5 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine.cpp @@ -26,24 +26,27 @@ DEFINE_WIFILOG_HOTSPOT_LABEL("WifiApStateMachine"); namespace OHOS { namespace Wifi { ApStateMachine::ApStateMachine(ApStationsManager &apStationsManager, ApRootState &apRootState, ApIdleState &apIdleState, - ApStartedState &apStartedState, ApMonitor &apMonitor) + ApStartedState &apStartedState, ApMonitor &apMonitor, int id) : StateMachine("ApStateMachine"), m_ApStationsManager(apStationsManager), m_ApRootState(apRootState), m_ApIdleState(apIdleState), m_ApStartedState(apStartedState), - m_ApMonitor(apMonitor) + m_ApMonitor(apMonitor), + m_id(id) { Init(); } ApStateMachine::~ApStateMachine() { +#ifndef WIFI_DHCP_DISABLED StopDhcpServer(); if (pDhcpNotify.get() != nullptr) { pDhcpNotify.reset(nullptr); } StopHandlerThread(); +#endif } ApStateMachine::DhcpNotify::DhcpNotify(ApStateMachine &apStateMachine) : m_apStateMachine(apStateMachine) @@ -81,20 +84,20 @@ void ApStateMachine::Init() StatePlus(&m_ApIdleState, &m_ApRootState); StatePlus(&m_ApStartedState, &m_ApRootState); SetFirstState(&m_ApIdleState); - m_iface = AP_INTF; + m_iface = std::string(AP_INTF) + std::to_string(m_id); StartStateMachine(); } void ApStateMachine::OnApStateChange(ApState state) { - if (WifiSettings::GetInstance().SetHotspotState(static_cast(state))) { + if (WifiSettings::GetInstance().SetHotspotState(static_cast(state), m_id)) { WIFI_LOGE("WifiSetting change state fail."); } if (m_Callbacks.OnApStateChangedEvent != nullptr && (state == ApState::AP_STATE_IDLE || state == ApState::AP_STATE_STARTED || state == ApState::AP_STATE_STARTING || state == ApState::AP_STATE_CLOSING)) { - m_Callbacks.OnApStateChangedEvent(state); + m_Callbacks.OnApStateChangedEvent(state, m_id); } return; } @@ -110,12 +113,12 @@ void ApStateMachine::BroadCastStationChange(const StationInfo &staInfo, ApStatem switch (act) { case ApStatemachineEvent::CMD_STATION_JOIN: if (m_Callbacks.OnHotspotStaJoinEvent) { - m_Callbacks.OnHotspotStaJoinEvent(staInfo); + m_Callbacks.OnHotspotStaJoinEvent(staInfo, m_id); } break; case ApStatemachineEvent::CMD_STATION_LEAVE: if (m_Callbacks.OnHotspotStaLeaveEvent) { - m_Callbacks.OnHotspotStaLeaveEvent(staInfo); + m_Callbacks.OnHotspotStaLeaveEvent(staInfo, m_id); } break; default: @@ -127,6 +130,7 @@ void ApStateMachine::BroadCastStationChange(const StationInfo &staInfo, ApStatem bool ApStateMachine::StartDhcpServer() { WIFI_LOGI("Enter:StartDhcpServer"); +#ifndef WIFI_DHCP_DISABLED Ipv4Address ipv4(Ipv4Address::INVALID_INET_ADDRESS); Ipv6Address ipv6(Ipv6Address::INVALID_INET6_ADDRESS); if (!m_DhcpdInterface.StartDhcpServer(IN_INTERFACE, ipv4, ipv6, true)) { @@ -138,21 +142,32 @@ bool ApStateMachine::StartDhcpServer() } WIFI_LOGI("Start dhcp server for AP finished."); return true; +#else + return true; +#endif } bool ApStateMachine::StopDhcpServer() { +#ifndef WIFI_DHCP_DISABLED WIFI_LOGI("Enter:StopDhcpServer"); if (!m_DhcpdInterface.StopDhcpServer(IN_INTERFACE)) { WIFI_LOGE("Close dhcpd fail."); return false; } return true; +#else + return true; +#endif } bool ApStateMachine::GetConnectedStationInfo(std::map &result) { +#ifndef WIFI_DHCP_DISABLED return m_DhcpdInterface.GetConnectedStationInfo(IN_INTERFACE, result); +#else + return true; +#endif } void ApStateMachine::RegisterEventHandler() diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine.h index 12ae60b..5069ebc 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine.h @@ -80,7 +80,7 @@ public: * @param None * @return None */ - ApStateMachine(ApStationsManager &, ApRootState &, ApIdleState &, ApStartedState &, ApMonitor &); + ApStateMachine(ApStationsManager &, ApRootState &, ApIdleState &, ApStartedState &, ApMonitor &, int id = 0); /** * @Description destructor method. @@ -167,7 +167,7 @@ private: DhcpdInterface m_DhcpdInterface; std::unique_ptr pDhcpNotify; - + int m_id; }; /* ApStateMachine */ } // namespace Wifi } // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager.cpp index 9a99fa2..5926ed8 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager.cpp @@ -25,7 +25,7 @@ DEFINE_WIFILOG_HOTSPOT_LABEL("WifiApStationsManager"); namespace OHOS { namespace Wifi { -ApStationsManager::ApStationsManager() +ApStationsManager::ApStationsManager(int id) : m_id(id) {} ApStationsManager::~ApStationsManager() @@ -33,7 +33,8 @@ ApStationsManager::~ApStationsManager() bool ApStationsManager::AddBlockList(const StationInfo &staInfo) const { - if (WifiApHalInterface::GetInstance().AddBlockByMac(staInfo.bssid) != WifiErrorNo::WIFI_IDL_OPT_OK) { + if (WifiApHalInterface::GetInstance().AddBlockByMac(staInfo.bssid, m_id) != WifiErrorNo::WIFI_IDL_OPT_OK) { + WIFI_LOGE("Instance is %{public}d failed to add block.", m_id); return false; } return true; @@ -41,7 +42,8 @@ bool ApStationsManager::AddBlockList(const StationInfo &staInfo) const bool ApStationsManager::DelBlockList(const StationInfo &staInfo) const { - if (WifiApHalInterface::GetInstance().DelBlockByMac(staInfo.bssid) != WifiErrorNo::WIFI_IDL_OPT_OK) { + if (WifiApHalInterface::GetInstance().DelBlockByMac(staInfo.bssid, m_id) != WifiErrorNo::WIFI_IDL_OPT_OK) { + WIFI_LOGE("Instance is %{public}d failed to del block.", m_id); return false; } return true; @@ -49,7 +51,8 @@ bool ApStationsManager::DelBlockList(const StationInfo &staInfo) const bool ApStationsManager::AddAssociationStation(const StationInfo &staInfo) const { - if (WifiSettings::GetInstance().ManageStation(staInfo, MODE_ADD)) { + if (WifiSettings::GetInstance().ManageStation(staInfo, MODE_ADD, m_id)) { + WIFI_LOGE("Instance is %{public}d failed add station.", m_id); return false; } return true; @@ -57,7 +60,8 @@ bool ApStationsManager::AddAssociationStation(const StationInfo &staInfo) const bool ApStationsManager::DelAssociationStation(const StationInfo &staInfo) const { - if (WifiSettings::GetInstance().ManageStation(staInfo, MODE_DEL)) { + if (WifiSettings::GetInstance().ManageStation(staInfo, MODE_DEL, m_id)) { + WIFI_LOGE("Instance is %{public}d failed to del station.", m_id); return false; } return true; @@ -66,15 +70,15 @@ bool ApStationsManager::DelAssociationStation(const StationInfo &staInfo) const bool ApStationsManager::EnableAllBlockList() const { std::vector results; - if (WifiSettings::GetInstance().GetBlockList(results)) { - WIFI_LOGE("failed to get blocklist."); + if (WifiSettings::GetInstance().GetBlockList(results, m_id)) { + WIFI_LOGE("Instance is %{public}d failed to get blocklist.", m_id); return false; } std::string mac; bool ret = true; for (std::vector::iterator iter = results.begin(); iter != results.end(); iter++) { - if (WifiApHalInterface::GetInstance().AddBlockByMac(iter->bssid) != WifiErrorNo::WIFI_IDL_OPT_OK) { - WIFI_LOGE("error:Failed to add block bssid is:%{private}s.", iter->bssid.c_str()); + if (WifiApHalInterface::GetInstance().AddBlockByMac(iter->bssid, m_id) != WifiErrorNo::WIFI_IDL_OPT_OK) { + WIFI_LOGE("Instance is %{public}d failed to add block bssid is:%{private}s.", m_id, iter->bssid.c_str()); ret = false; } } @@ -85,8 +89,8 @@ void ApStationsManager::StationLeave(const std::string &mac) const { StationInfo staInfo; std::vector results; - if (WifiSettings::GetInstance().GetStationList(results)) { - WIFI_LOGE("failed to GetStationList."); + if (WifiSettings::GetInstance().GetStationList(results, m_id)) { + WIFI_LOGE("Instance is %{public}d failed to GetStationList.", m_id); return; } auto it = results.begin(); @@ -94,7 +98,7 @@ void ApStationsManager::StationLeave(const std::string &mac) const if (it->bssid == mac) { staInfo = *it; if (!DelAssociationStation(staInfo)) { - WIFI_LOGE("DelAssociationStation failed."); + WIFI_LOGE("Instance is %{public}d del AssociationStation failed.", m_id); return; } break; @@ -110,8 +114,8 @@ void ApStationsManager::StationJoin(const StationInfo &staInfo) const { StationInfo staInfoTemp = staInfo; std::vector results; - if (WifiSettings::GetInstance().GetStationList(results)) { - WIFI_LOGE("failed to GetStationList."); + if (WifiSettings::GetInstance().GetStationList(results, m_id)) { + WIFI_LOGE("Instance is %{public}d failed to GetStationList.", m_id); return; } auto it = results.begin(); @@ -125,7 +129,7 @@ void ApStationsManager::StationJoin(const StationInfo &staInfo) const } if (!AddAssociationStation(staInfoTemp)) { - WIFI_LOGE("AddAssociationStation failed."); + WIFI_LOGE("Instance is %{public}d addAssociationStation failed.", m_id); return; } @@ -140,9 +144,10 @@ void ApStationsManager::StationJoin(const StationInfo &staInfo) const bool ApStationsManager::DisConnectStation(const StationInfo &staInfo) const { std::string mac = staInfo.bssid; - int ret = static_cast(WifiApHalInterface::GetInstance().DisconnectStaByMac(mac)); + int ret = static_cast(WifiApHalInterface::GetInstance().DisconnectStaByMac(mac, m_id)); if (ret != WifiErrorNo::WIFI_IDL_OPT_OK) { - WIFI_LOGE("failed to DisConnectStation staInfo bssid:%{private}s, address:%{private}s, name:%{private}s.", + WIFI_LOGE("Instance is %{public}d failed to DisConnectStation staInfo bssid:%{private}s,address:%{private}s, name:%{private}s.", + m_id, staInfo.bssid.c_str(), staInfo.ipAddr.c_str(), staInfo.deviceName.c_str()); @@ -154,9 +159,9 @@ bool ApStationsManager::DisConnectStation(const StationInfo &staInfo) const std::vector ApStationsManager::GetAllConnectedStations() const { std::vector staMacList; - if (WifiApHalInterface::GetInstance().GetStationList(staMacList) == WifiErrorNo::WIFI_IDL_OPT_OK) { + if (WifiApHalInterface::GetInstance().GetStationList(staMacList, m_id) == WifiErrorNo::WIFI_IDL_OPT_OK) { for (size_t i = 0; i < staMacList.size(); ++i) { - WIFI_LOGD("staMacList[%{public}zu]:%{private}s.", i, staMacList[i].c_str()); + WIFI_LOGD("Instance is %{public}d staMacList[%{public}zu]:%{private}s.", m_id, i, staMacList[i].c_str()); } } return staMacList; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager.h index 2b049c7..58d8e9a 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager.h @@ -30,7 +30,7 @@ public: * @param None * @return None */ - ApStationsManager(); + explicit ApStationsManager(int id = 0); /** * @Description destructor. @@ -114,6 +114,7 @@ private: bool DelAssociationStation(const StationInfo &staInfo) const; std::function m_stationChangeCallback; + int m_id; }; } // namespace Wifi } // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/i_ap_service_callbacks.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/i_ap_service_callbacks.h index 38b0ebd..1823a8f 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/i_ap_service_callbacks.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/i_ap_service_callbacks.h @@ -24,9 +24,9 @@ namespace OHOS { namespace Wifi { /* All callbacks provided by the AP service */ struct IApServiceCallbacks { - std::function OnApStateChangedEvent; - std::function OnHotspotStaJoinEvent; // STA device join event. - std::function OnHotspotStaLeaveEvent; // STA device leaving event. + std::function OnApStateChangedEvent; + std::function OnHotspotStaJoinEvent; // STA device join event. + std::function OnHotspotStaLeaveEvent; // STA device leaving event. }; } // namespace Wifi } // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.cpp index 90c793c..c6d1e3e 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.cpp @@ -30,7 +30,7 @@ WifiConfigCenter &WifiConfigCenter::GetInstance() WifiConfigCenter::WifiConfigCenter() { mStaMidState = WifiOprMidState::CLOSED; - mApMidState = WifiOprMidState::CLOSED; + mApMidState.emplace(0, WifiOprMidState::CLOSED); mP2pMidState = WifiOprMidState::CLOSED; mScanMidState = WifiOprMidState::CLOSED; mWifiOpenedWhenAirplane = false; @@ -150,59 +150,75 @@ bool WifiConfigCenter::IsLoadStabak() return WifiSettings::GetInstance().IsLoadStabak(); } -WifiOprMidState WifiConfigCenter::GetApMidState() +WifiOprMidState WifiConfigCenter::GetApMidState(int id) { - return mApMidState.load(); + auto iter = mApMidState.find(id); + if (iter != mApMidState.end()) { + return iter->second.load(); + } else { + mApMidState.emplace(id, WifiOprMidState::CLOSED); + return mApMidState[id].load(); + } } -bool WifiConfigCenter::SetApMidState(WifiOprMidState expState, WifiOprMidState state) +bool WifiConfigCenter::SetApMidState(WifiOprMidState expState, WifiOprMidState state, int id) { - return mApMidState.compare_exchange_strong(expState, state); + auto iter = mApMidState.find(id); + if (iter != mApMidState.end()) { + return iter->second.compare_exchange_strong(expState, state); + } else { + mApMidState.emplace(id, state); + return true; + } + return false; } -void WifiConfigCenter::SetApMidState(WifiOprMidState state) +void WifiConfigCenter::SetApMidState(WifiOprMidState state, int id) { - mApMidState = state; + auto ret = mApMidState.emplace(id, state); + if (!ret.second) { + mApMidState[id] = state; + } } -int WifiConfigCenter::GetHotspotState() +int WifiConfigCenter::GetHotspotState(int id) { - return WifiSettings::GetInstance().GetHotspotState(); + return WifiSettings::GetInstance().GetHotspotState(id); } -int WifiConfigCenter::SetHotspotConfig(const HotspotConfig &config) +int WifiConfigCenter::SetHotspotConfig(const HotspotConfig &config, int id) { - return WifiSettings::GetInstance().SetHotspotConfig(config); + return WifiSettings::GetInstance().SetHotspotConfig(config, id); } -int WifiConfigCenter::GetHotspotConfig(HotspotConfig &config) +int WifiConfigCenter::GetHotspotConfig(HotspotConfig &config, int id) { - return WifiSettings::GetInstance().GetHotspotConfig(config); + return WifiSettings::GetInstance().GetHotspotConfig(config, id); } -int WifiConfigCenter::GetStationList(std::vector &results) +int WifiConfigCenter::GetStationList(std::vector &results, int id) { - return WifiSettings::GetInstance().GetStationList(results); + return WifiSettings::GetInstance().GetStationList(results, id); } -int WifiConfigCenter::FindConnStation(const StationInfo &info) +int WifiConfigCenter::FindConnStation(const StationInfo &info, int id) { - return WifiSettings::GetInstance().FindConnStation(info); + return WifiSettings::GetInstance().FindConnStation(info, id); } -int WifiConfigCenter::GetBlockLists(std::vector &infos) +int WifiConfigCenter::GetBlockLists(std::vector &infos, int id) { - return WifiSettings::GetInstance().GetBlockList(infos); + return WifiSettings::GetInstance().GetBlockList(infos, id); } -int WifiConfigCenter::AddBlockList(const StationInfo &info) +int WifiConfigCenter::AddBlockList(const StationInfo &info, int id) { - return WifiSettings::GetInstance().ManageBlockList(info, MODE_ADD); + return WifiSettings::GetInstance().ManageBlockList(info, MODE_ADD, id); } -int WifiConfigCenter::DelBlockList(const StationInfo &info) +int WifiConfigCenter::DelBlockList(const StationInfo &info, int id) { - return WifiSettings::GetInstance().ManageBlockList(info, MODE_DEL); + return WifiSettings::GetInstance().ManageBlockList(info, MODE_DEL, id); } int WifiConfigCenter::GetValidBands(std::vector &bands) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.h index cd9a02b..f0b4f62 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.h @@ -206,7 +206,7 @@ public: * * @return WifiOprMidState - which can be a CLOSED/CLOSING/OPENING/RUNNING/UNKNOWN */ - WifiOprMidState GetApMidState(); + WifiOprMidState GetApMidState(int id = 0); /** * @Description Set current hotspot middle state @@ -216,21 +216,21 @@ public: * @return true - set the state success * @return false - set state failed, current mid sate is not equal to the expState */ - bool SetApMidState(WifiOprMidState expState, WifiOprMidState state); + bool SetApMidState(WifiOprMidState expState, WifiOprMidState state, int id = 0); /** * @Description Force to set current hotspot middle state * * @param state - want to set state */ - void SetApMidState(WifiOprMidState state); + void SetApMidState(WifiOprMidState state, int id = 0); /** * @Description Get current hotspot state * * @return int - the hotspot state, IDLE/STARTING/STARTED/CLOSING/CLOSED */ - int GetHotspotState(); + int GetHotspotState(int id = 0); /** * @Description Set the hotspot config @@ -238,7 +238,7 @@ public: * @param config - input HotspotConfig struct * @return int - 0 success */ - int SetHotspotConfig(const HotspotConfig &config); + int SetHotspotConfig(const HotspotConfig &config, int id = 0); /** * @Description Get the hotspot config @@ -246,7 +246,7 @@ public: * @param config - output HotspotConfig struct * @return int - 0 success */ - int GetHotspotConfig(HotspotConfig &config); + int GetHotspotConfig(HotspotConfig &config, int id = 0); /** * @Description Get current hotspot accept linked stations @@ -254,7 +254,7 @@ public: * @param results - output StationInfo results * @return int - 0 success */ - int GetStationList(std::vector &results); + int GetStationList(std::vector &results, int id = 0); /** * @Description Judge whether the station is in current linked station list @@ -262,7 +262,7 @@ public: * @param info - input StationInfo struct * @return int - 0 find the station, exist; -1 not find, not exist */ - int FindConnStation(const StationInfo &info); + int FindConnStation(const StationInfo &info, int id = 0); /** * @Description Get the block list @@ -270,7 +270,7 @@ public: * @param infos - output StationInfo results * @return int - 0 success */ - int GetBlockLists(std::vector &infos); + int GetBlockLists(std::vector &infos, int id = 0); /** * @Description Add the station info into the block list @@ -278,7 +278,7 @@ public: * @param info - input StationInfo struct * @return int - 0 success */ - int AddBlockList(const StationInfo &info); + int AddBlockList(const StationInfo &info, int id = 0); /** * @Description Remove the station info from the block list @@ -286,7 +286,7 @@ public: * @param info - input StationInfo struct * @return int - 0 success */ - int DelBlockList(const StationInfo &info); + int DelBlockList(const StationInfo &info, int id = 0); /** * @Description Get the valid bands info @@ -536,7 +536,7 @@ public: private: std::atomic mStaMidState; - std::atomic mApMidState; + std::map> mApMidState; std::atomic mP2pMidState; std::atomic mScanMidState; /* Time interval for disabling and re-enabling the STA */ diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_mgr_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_mgr_service_impl.cpp new file mode 100644 index 0000000..d12d446 --- /dev/null +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_mgr_service_impl.cpp @@ -0,0 +1,145 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include "wifi_logger.h" +#include "wifi_config_center.h" +#include "wifi_manager.h" +#include "wifi_hotspot_mgr_service_impl.h" +#include "wifi_hotspot_service_impl.h" + +DEFINE_WIFILOG_HOTSPOT_LABEL("WifiHotspotMgrServiceImpl"); + +namespace OHOS { +namespace Wifi { +std::mutex WifiHotspotMgrServiceImpl::g_instanceLock; +sptr WifiHotspotMgrServiceImpl::g_instance; +const bool REGISTER_RESULT = SystemAbility::MakeAndRegisterAbility( + WifiHotspotMgrServiceImpl::GetInstance().GetRefPtr()); + +sptr WifiHotspotMgrServiceImpl::GetInstance() +{ + if (g_instance == nullptr) { + std::lock_guard autoLock(g_instanceLock); + if (g_instance == nullptr) { + auto service = new (std::nothrow) WifiHotspotMgrServiceImpl; + g_instance = service; + } + } + return g_instance; +} + +WifiHotspotMgrServiceImpl::WifiHotspotMgrServiceImpl() + : SystemAbility(WIFI_HOTSPOT_ABILITY_ID, true), mPublishFlag(false), mState(ServiceRunningState::STATE_NOT_START) +{} + +WifiHotspotMgrServiceImpl::~WifiHotspotMgrServiceImpl() +{} + +bool IsProcessNeedToRestart() +{ + sptr instancePtr = WifiHotspotMgrServiceImpl::GetInstance(); + if (instancePtr == nullptr) { + return false; + } + for (auto it = instancePtr->mWifiService.begin(); it != instancePtr->mWifiService.end(); it++) { + int id = it->first; + if (WifiConfigCenter::GetInstance().GetApMidState(id) == WifiOprMidState::RUNNING) { + return true; + } + } + return false; +} + +void SigHandler(int sig) +{ + WIFI_LOGI("[Ap] Recv SIG: %{public}d\n", sig); + switch (sig) { + case SIGUSR2: + if (IsProcessNeedToRestart()) { + IApServiceCallbacks cb = WifiManager::GetInstance().GetApCallback(); + sptr instancePtr = WifiHotspotMgrServiceImpl::GetInstance(); + if (cb.OnApStateChangedEvent != nullptr && instancePtr != nullptr) { + for (auto it = instancePtr->mWifiService.begin(); it != instancePtr->mWifiService.end(); it++) { + int id = it->first; + cb.OnApStateChangedEvent(ApState::AP_STATE_IDLE, id); + } + } + WIFI_LOGE("[AP] --------------Abort process to restart!!!--------------\n"); + abort(); + } + break; + + default: + break; + } +} + +void WifiHotspotMgrServiceImpl::OnStart() +{ + if (mState == ServiceRunningState::STATE_RUNNING) { + WIFI_LOGD("Service has already started."); + return; + } + if (!Init()) { + WIFI_LOGE("Failed to init service"); + OnStop(); + return; + } + (void)signal(SIGUSR2, SigHandler); + mState = ServiceRunningState::STATE_RUNNING; + WIFI_LOGI("Start ap service!"); + WifiManager::GetInstance().AddSupportedFeatures(WifiFeatures::WIFI_FEATURE_MOBILE_HOTSPOT); +} + +void WifiHotspotMgrServiceImpl::OnStop() +{ + mState = ServiceRunningState::STATE_NOT_START; + mPublishFlag = false; + WIFI_LOGI("Stop ap service!"); +} + +bool WifiHotspotMgrServiceImpl::Init() +{ + if (!mPublishFlag) { + for (int i = 0; i < AP_INSTANCE_MAX_NUM; i++) { + sptr wifi = new WifiHotspotServiceImpl(i); + if (wifi == nullptr) { + WIFI_LOGE("create ap hotspot service id %{public}d failed!", i); + return false; + } + mWifiService[i] = wifi->AsObject(); + } + + bool ret = Publish(WifiHotspotMgrServiceImpl::GetInstance()); + if (!ret) { + WIFI_LOGE("Failed to publish hotspot service!"); + return false; + } + mPublishFlag = true; + } + return true; +} + +sptr WifiHotspotMgrServiceImpl::GetWifiRemote(int id) +{ + auto iter = mWifiService.find(id); + if (iter != mWifiService.end()) { + return mWifiService[id]; + } + return nullptr; +} +} // namespace Wifi +} // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_mgr_service_impl.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_mgr_service_impl.h new file mode 100644 index 0000000..4304de1 --- /dev/null +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_mgr_service_impl.h @@ -0,0 +1,53 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OHOS_WIFI_HOTSPOT_MGR_SERVICE_IMPL_H +#define OHOS_WIFI_HOTSPOT_MGR_SERVICE_IMPL_H + +#include "wifi_errcode.h" +#include "system_ability.h" +#include "wifi_hotspot_stub.h" +#include "wifi_hotspot_mgr_stub.h" +#include "iremote_object.h" + +namespace OHOS { +namespace Wifi { +enum ServiceRunningState { + STATE_NOT_START, + STATE_RUNNING +}; + +class WifiHotspotMgrServiceImpl : public SystemAbility, public WifiHotspotMgrStub { + DECLARE_SYSTEM_ABILITY(WifiHotspotMgrServiceImpl); +public: + WifiHotspotMgrServiceImpl(); + virtual ~WifiHotspotMgrServiceImpl(); + static sptr GetInstance(); + void OnStart() override; + void OnStop() override; + sptr GetWifiRemote(int id) override; +private: + bool Init(); + friend void SigHandler(int sig); + friend bool IsProcessNeedToRestart(); + static sptr g_instance; + std::map> mWifiService; + static std::mutex g_instanceLock; + bool mPublishFlag; + ServiceRunningState mState; +}; +} // namespace Wifi +} // namespace OHOS +#endif \ No newline at end of file diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_mgr_stub.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_mgr_stub.cpp new file mode 100644 index 0000000..08f7921 --- /dev/null +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_mgr_stub.cpp @@ -0,0 +1,59 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "wifi_hotspot_mgr_stub.h" +#include "wifi_logger.h" +#include "wifi_errcode.h" +DEFINE_WIFILOG_HOTSPOT_LABEL("WifiHotspotMgrStub"); + +namespace OHOS { +namespace Wifi { +WifiHotspotMgrStub::FuncHandleMap WifiHotspotMgrStub::funcHandleMap_ = { + {WIFI_MGR_GET_HOTSPOT_SERVICE, &WifiHotspotMgrStub::GetWifiRemoteInner}, +}; + +WifiHotspotMgrStub::WifiHotspotMgrStub() +{} + +WifiHotspotMgrStub::~WifiHotspotMgrStub() +{} + +int WifiHotspotMgrStub::GetWifiRemoteInner( + uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) +{ + int id = data.ReadInt32(); + sptr obj = GetWifiRemote(id); + int ret = reply.WriteRemoteObject(obj); + return ret; +} + +int WifiHotspotMgrStub::OnRemoteRequest( + uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) +{ + if (data.ReadInterfaceToken() != GetDescriptor()) { + WIFI_LOGE("Hotspot stub token verification error"); + return WIFI_OPT_FAILED; + } + FuncHandleMap::iterator iter = funcHandleMap_.find(code); + if (iter == funcHandleMap_.end()) { + WIFI_LOGE("not find function to deal, code %{public}u", code); + return WIFI_OPT_NOT_SUPPORTED; + } else { + return (this->*(iter->second))(code, data, reply, option); + } + return 0; +} +} // namespace Wifi +} // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_mgr_stub.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_mgr_stub.h new file mode 100644 index 0000000..bc0929a --- /dev/null +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_mgr_stub.h @@ -0,0 +1,43 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OHOS_WIFI_HOTSPOT_MGR_SERVICE_H +#define OHOS_WIFI_HOTSPOT_MGR_SERVICE_H + +#include +#include "iremote_stub.h" +#include "message_parcel.h" +#include "message_option.h" +#include "i_wifi_hotspot_mgr.h" + +namespace OHOS { +namespace Wifi { +class WifiHotspotMgrStub : public IRemoteStub { +public: + using FuncHandle = int (WifiHotspotMgrStub::*)( + uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option); + using FuncHandleMap = std::map; + + WifiHotspotMgrStub(); + virtual ~WifiHotspotMgrStub(); + virtual int OnRemoteRequest(uint32_t code, MessageParcel &data, + MessageParcel &reply, MessageOption &option) override; + int GetWifiRemoteInner(uint32_t code, MessageParcel &data, + MessageParcel &reply, MessageOption &option); + static FuncHandleMap funcHandleMap_; +}; +} // namespace Wifi +} // namespace OHOS +#endif \ No newline at end of file diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp index a57fac6..f4665dd 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp @@ -32,68 +32,18 @@ DEFINE_WIFILOG_HOTSPOT_LABEL("WifiHotspotServiceImpl"); namespace OHOS { namespace Wifi { -std::mutex WifiHotspotServiceImpl::g_instanceLock; -sptr WifiHotspotServiceImpl::g_instance; -const bool REGISTER_RESULT = SystemAbility::MakeAndRegisterAbility(WifiHotspotServiceImpl::GetInstance().GetRefPtr()); - -sptr WifiHotspotServiceImpl::GetInstance() -{ - if (g_instance == nullptr) { - std::lock_guard autoLock(g_instanceLock); - if (g_instance == nullptr) { - auto service = new (std::nothrow) WifiHotspotServiceImpl; - g_instance = service; - } - } - return g_instance; -} - WifiHotspotServiceImpl::WifiHotspotServiceImpl() - : SystemAbility(WIFI_HOTSPOT_ABILITY_ID, true), mPublishFlag(false), mState(ServiceRunningState::STATE_NOT_START) {} -WifiHotspotServiceImpl::~WifiHotspotServiceImpl() +WifiHotspotServiceImpl::WifiHotspotServiceImpl(int id) : WifiHotspotStub(id) {} -void WifiHotspotServiceImpl::OnStart() -{ - if (mState == ServiceRunningState::STATE_RUNNING) { - WIFI_LOGD("Service has already started."); - return; - } - if (!Init()) { - WIFI_LOGE("Failed to init service"); - OnStop(); - return; - } - mState = ServiceRunningState::STATE_RUNNING; - WIFI_LOGI("Start ap service!"); - WifiManager::GetInstance().AddSupportedFeatures(WifiFeatures::WIFI_FEATURE_MOBILE_HOTSPOT); -} - -void WifiHotspotServiceImpl::OnStop() -{ - mState = ServiceRunningState::STATE_NOT_START; - mPublishFlag = false; - WIFI_LOGI("Stop ap service!"); -} - -bool WifiHotspotServiceImpl::Init() -{ - if (!mPublishFlag) { - bool ret = Publish(WifiHotspotServiceImpl::GetInstance()); - if (!ret) { - WIFI_LOGE("Failed to publish hotspot service!"); - return false; - } - mPublishFlag = true; - } - return true; -} +WifiHotspotServiceImpl::~WifiHotspotServiceImpl() +{} ErrCode WifiHotspotServiceImpl::IsHotspotActive(bool &bActive) { - WIFI_LOGI("IsHotspotActive"); + WIFI_LOGI("Instance %{public}d %{public}s!", m_id, __func__); if (WifiPermissionUtils::VerifyManageWifiHotspotPermission() == PERMISSION_DENIED) { WIFI_LOGE("IsHotspotActive:VerifyManageWifiHotspotPermission PERMISSION_DENIED!"); return WIFI_OPT_PERMISSION_DENIED; @@ -105,7 +55,7 @@ ErrCode WifiHotspotServiceImpl::IsHotspotActive(bool &bActive) ErrCode WifiHotspotServiceImpl::GetHotspotState(int &state) { - WIFI_LOGI("GetHotspotState"); + WIFI_LOGI("Instance %{public}d %{public}s!", m_id, __func__); if (WifiPermissionUtils::VerifyGetWifiInfoPermission() == PERMISSION_DENIED) { WIFI_LOGE("GetHotspotState:VerifyGetWifiInfoPermission PERMISSION_DENIED!"); return WIFI_OPT_PERMISSION_DENIED; @@ -116,13 +66,13 @@ ErrCode WifiHotspotServiceImpl::GetHotspotState(int &state) return WIFI_OPT_PERMISSION_DENIED; } - state = WifiConfigCenter::GetInstance().GetHotspotState(); + state = WifiConfigCenter::GetInstance().GetHotspotState(m_id); return WIFI_OPT_SUCCESS; } ErrCode WifiHotspotServiceImpl::GetHotspotConfig(HotspotConfig &result) { - WIFI_LOGI("GetHotspotConfig"); + WIFI_LOGI("Instance %{public}d %{public}s!", m_id, __func__); if (WifiPermissionUtils::VerifyGetWifiInfoPermission() == PERMISSION_DENIED) { WIFI_LOGE("GetHotspotConfig:VerifyGetWifiInfoPermission PERMISSION_DENIED!"); return WIFI_OPT_PERMISSION_DENIED; @@ -133,13 +83,14 @@ ErrCode WifiHotspotServiceImpl::GetHotspotConfig(HotspotConfig &result) return WIFI_OPT_PERMISSION_DENIED; } - WifiConfigCenter::GetInstance().GetHotspotConfig(result); + WifiConfigCenter::GetInstance().GetHotspotConfig(result, m_id); return WIFI_OPT_SUCCESS; } ErrCode WifiHotspotServiceImpl::SetHotspotConfig(const HotspotConfig &config) { - WIFI_LOGI("SetHotspotConfig band %{public}d", static_cast(config.GetBand())); + WIFI_LOGI("Instance %{public}d %{public}s band %{public}d", m_id, __func__, + static_cast(config.GetBand())); if (WifiPermissionUtils::VerifySetWifiInfoPermission() == PERMISSION_DENIED) { WIFI_LOGE("SetHotspotConfig:VerifySetWifiInfoPermission PERMISSION_DENIED!"); return WIFI_OPT_PERMISSION_DENIED; @@ -162,26 +113,28 @@ ErrCode WifiHotspotServiceImpl::SetHotspotConfig(const HotspotConfig &config) ChannelsTable channInfoFromCenter; WifiConfigCenter::GetInstance().GetValidChannels(channInfoFromCenter); HotspotConfig configFromCenter; - WifiConfigCenter::GetInstance().GetHotspotConfig(configFromCenter); + WifiConfigCenter::GetInstance().GetHotspotConfig(configFromCenter, m_id); ErrCode validRetval = IsValidHotspotConfig(config, configFromCenter, bandsFromCenter, channInfoFromCenter); if (validRetval != ErrCode::WIFI_OPT_SUCCESS) { - WIFI_LOGE("Hotspot config is invalid!"); + WIFI_LOGE("Instance %{public}d Hotspot config is invalid!", m_id); return validRetval; } WifiLinkedInfo linkInfo; WifiConfigCenter::GetInstance().GetLinkedInfo(linkInfo); + if (!linkInfo.ssid.empty() && linkInfo.ssid == config.GetSsid()) { WIFI_LOGD("set ssid equal current linked ap ssid, no premission!"); return WIFI_OPT_INVALID_PARAM; } if (!IsApServiceRunning()) { - WifiConfigCenter::GetInstance().SetHotspotConfig(config); + WifiConfigCenter::GetInstance().SetHotspotConfig(config, m_id); WifiSettings::GetInstance().SyncHotspotConfig(); } else { - IApService *pService = WifiServiceManager::GetInstance().GetApServiceInst(); + IApService *pService = WifiServiceManager::GetInstance().GetApServiceInst(m_id); if (pService == nullptr) { + WIFI_LOGE("Instance %{public}d get hotspot service is null!", m_id); return WIFI_OPT_AP_NOT_OPENED; } return pService->SetHotspotConfig(config); @@ -191,7 +144,7 @@ ErrCode WifiHotspotServiceImpl::SetHotspotConfig(const HotspotConfig &config) ErrCode WifiHotspotServiceImpl::GetStationList(std::vector &result) { - WIFI_LOGI("GetStationList"); + WIFI_LOGI("Instance %{public}d %{public}s!", m_id, __func__); if (WifiPermissionUtils::VerifyGetWifiInfoInternalPermission() == PERMISSION_DENIED) { WIFI_LOGE("GetStationList:VerifyGetWifiInfoInternalPermission PERMISSION_DENIED!"); @@ -217,11 +170,13 @@ ErrCode WifiHotspotServiceImpl::GetStationList(std::vector &result) } if (!IsApServiceRunning()) { + WIFI_LOGE("Instance %{public}d hotspot service is not running!", m_id); return WIFI_OPT_AP_NOT_OPENED; } - IApService *pService = WifiServiceManager::GetInstance().GetApServiceInst(); + IApService *pService = WifiServiceManager::GetInstance().GetApServiceInst(m_id); if (pService == nullptr) { + WIFI_LOGE("Instance %{public}d get hotspot service is null!", m_id); return WIFI_OPT_AP_NOT_OPENED; } return pService->GetStationList(result); @@ -229,7 +184,8 @@ ErrCode WifiHotspotServiceImpl::GetStationList(std::vector &result) ErrCode WifiHotspotServiceImpl::DisassociateSta(const StationInfo &info) { - WIFI_LOGI("DisassociateSta device name [%{private}s]", info.deviceName.c_str()); + WIFI_LOGI("Instance %{public}d %{public}s device name [%{private}s]", m_id, __func__, + info.deviceName.c_str()); if (WifiPermissionUtils::VerifySetWifiInfoPermission() == PERMISSION_DENIED) { WIFI_LOGE("DisassociateSta:VerifySetWifiInfoPermission PERMISSION_DENIED!"); return WIFI_OPT_PERMISSION_DENIED; @@ -241,8 +197,9 @@ ErrCode WifiHotspotServiceImpl::DisassociateSta(const StationInfo &info) return WIFI_OPT_AP_NOT_OPENED; } - IApService *pService = WifiServiceManager::GetInstance().GetApServiceInst(); + IApService *pService = WifiServiceManager::GetInstance().GetApServiceInst(m_id); if (pService == nullptr) { + WIFI_LOGE("Instance %{public}d get hotspot service is null!", m_id); return WIFI_OPT_AP_NOT_OPENED; } return pService->DisconnetStation(info); @@ -274,23 +231,24 @@ ErrCode WifiHotspotServiceImpl::CheckCanEnableHotspot(const ServiceType type) ErrCode WifiHotspotServiceImpl::EnableHotspot(const ServiceType type) { - WIFI_LOGI("EnableHotspot"); + WIFI_LOGI("current ap service is %{public}d %{public}s", m_id, __func__); ErrCode errCode = CheckCanEnableHotspot(type); if (errCode != WIFI_OPT_SUCCESS) { return errCode; } - WifiOprMidState curState = WifiConfigCenter::GetInstance().GetApMidState(); + WifiOprMidState curState = WifiConfigCenter::GetInstance().GetApMidState(m_id); if (curState != WifiOprMidState::CLOSED) { - WIFI_LOGI("current ap state is %{public}d", static_cast(curState)); + WIFI_LOGI("current ap is %{public}d, state is %{public}d", m_id, static_cast(curState)); if (curState == WifiOprMidState::CLOSING) { /* when ap is closing, return */ return WIFI_OPT_OPEN_FAIL_WHEN_CLOSING; } else { return WIFI_OPT_OPEN_SUCC_WHEN_OPENED; } } - if (!WifiConfigCenter::GetInstance().SetApMidState(curState, WifiOprMidState::OPENING)) { - WIFI_LOGI("set ap mid state opening failed! may be other activity has been operated"); + if (!WifiConfigCenter::GetInstance().SetApMidState(curState, WifiOprMidState::OPENING, m_id)) { + WIFI_LOGI("current ap is %{public}d, set ap mid state opening failed!" + "may be other activity has been operated", m_id); return WIFI_OPT_OPEN_SUCC_WHEN_OPENED; } errCode = WIFI_OPT_FAILED; @@ -299,9 +257,9 @@ ErrCode WifiHotspotServiceImpl::EnableHotspot(const ServiceType type) WIFI_LOGE("Load %{public}s service failed!", WIFI_SERVICE_AP); break; } - IApService *pService = WifiServiceManager::GetInstance().GetApServiceInst(); + IApService *pService = WifiServiceManager::GetInstance().GetApServiceInst(m_id); if (pService == nullptr) { - WIFI_LOGE("Create %{public}s service failed!", WIFI_SERVICE_AP); + WIFI_LOGE("Instance %{public}d get hotspot service is null!", m_id); break; } errCode = pService->RegisterApServiceCallbacks(WifiManager::GetInstance().GetApCallback()); @@ -316,21 +274,21 @@ ErrCode WifiHotspotServiceImpl::EnableHotspot(const ServiceType type) } } while (false); if (errCode != WIFI_OPT_SUCCESS) { - WifiConfigCenter::GetInstance().SetApMidState(WifiOprMidState::OPENING, WifiOprMidState::CLOSED); - WifiServiceManager::GetInstance().UnloadService(WIFI_SERVICE_AP); + WifiConfigCenter::GetInstance().SetApMidState(WifiOprMidState::OPENING, WifiOprMidState::CLOSED, m_id); + WifiServiceManager::GetInstance().UnloadService(WIFI_SERVICE_AP, m_id); } return errCode; } ErrCode WifiHotspotServiceImpl::DisableHotspot(const ServiceType type) { - WIFI_LOGI("DisableHotspot"); + WIFI_LOGI("current ap service is %{public}d %{public}s", m_id, __func__); if (CheckOperHotspotSwitchPermission(type) == PERMISSION_DENIED) { WIFI_LOGE("EnableHotspot:VerifyManageWifiHotspotPermission PERMISSION_DENIED!"); return WIFI_OPT_PERMISSION_DENIED; } - WifiOprMidState curState = WifiConfigCenter::GetInstance().GetApMidState(); + WifiOprMidState curState = WifiConfigCenter::GetInstance().GetApMidState(m_id); if (curState != WifiOprMidState::RUNNING) { WIFI_LOGI("current ap state is %{public}d", static_cast(curState)); if (curState == WifiOprMidState::OPENING) { /* when ap is opening, return */ @@ -339,26 +297,28 @@ ErrCode WifiHotspotServiceImpl::DisableHotspot(const ServiceType type) return WIFI_OPT_CLOSE_SUCC_WHEN_CLOSED; } } - if (!WifiConfigCenter::GetInstance().SetApMidState(curState, WifiOprMidState::CLOSING)) { + if (!WifiConfigCenter::GetInstance().SetApMidState(curState, WifiOprMidState::CLOSING, m_id)) { WIFI_LOGI("set ap mid state closing failed! may be other activity has been operated"); return WIFI_OPT_CLOSE_SUCC_WHEN_CLOSED; } - IApService *pService = WifiServiceManager::GetInstance().GetApServiceInst(); + IApService *pService = WifiServiceManager::GetInstance().GetApServiceInst(m_id); if (pService == nullptr) { - WifiConfigCenter::GetInstance().SetApMidState(WifiOprMidState::CLOSED); - WifiServiceManager::GetInstance().UnloadService(WIFI_SERVICE_AP); + WIFI_LOGE("Instance %{public}d get hotspot service is null!", m_id); + WifiConfigCenter::GetInstance().SetApMidState(WifiOprMidState::CLOSED, m_id); + WifiServiceManager::GetInstance().UnloadService(WIFI_SERVICE_AP, m_id); return WIFI_OPT_SUCCESS; } ErrCode ret = pService->DisableHotspot(); if (ret != WIFI_OPT_SUCCESS) { - WifiConfigCenter::GetInstance().SetApMidState(WifiOprMidState::CLOSING, WifiOprMidState::RUNNING); + WifiConfigCenter::GetInstance().SetApMidState(WifiOprMidState::CLOSING, WifiOprMidState::RUNNING, m_id); } return ret; } ErrCode WifiHotspotServiceImpl::AddBlockList(const StationInfo &info) { - WIFI_LOGI("AddBlockList, device name [%{private}s]", info.deviceName.c_str()); + WIFI_LOGI("current ap service is %{public}d %{public}s" + " device name [%{private}s]", m_id, __func__, info.deviceName.c_str()); if (WifiPermissionUtils::VerifyGetWifiInfoPermission() == PERMISSION_DENIED) { WIFI_LOGE("AddBlockList:VerifyGetWifiInfoPermission PERMISSION_DENIED!"); return WIFI_OPT_PERMISSION_DENIED; @@ -376,12 +336,13 @@ ErrCode WifiHotspotServiceImpl::AddBlockList(const StationInfo &info) return WIFI_OPT_AP_NOT_OPENED; } - if (WifiConfigCenter::GetInstance().AddBlockList(info) < 0) { + if (WifiConfigCenter::GetInstance().AddBlockList(info, m_id) < 0) { WIFI_LOGE("Add block list failed!"); return WIFI_OPT_FAILED; } - IApService *pService = WifiServiceManager::GetInstance().GetApServiceInst(); + IApService *pService = WifiServiceManager::GetInstance().GetApServiceInst(m_id); if (pService == nullptr) { + WIFI_LOGE("Instance %{public}d get hotspot service is null!", m_id); return WIFI_OPT_AP_NOT_OPENED; } return pService->AddBlockList(info); @@ -389,7 +350,8 @@ ErrCode WifiHotspotServiceImpl::AddBlockList(const StationInfo &info) ErrCode WifiHotspotServiceImpl::DelBlockList(const StationInfo &info) { - WIFI_LOGI("DelBlockList, device name [%{private}s]", info.deviceName.c_str()); + WIFI_LOGI("current ap service is %{public}d %{public}s device name [%{private}s]", + m_id, __func__, info.deviceName.c_str()); if (WifiPermissionUtils::VerifyGetWifiInfoPermission() == PERMISSION_DENIED) { WIFI_LOGE("DelBlockList:VerifyGetWifiInfoPermission PERMISSION_DENIED!"); return WIFI_OPT_PERMISSION_DENIED; @@ -405,8 +367,9 @@ ErrCode WifiHotspotServiceImpl::DelBlockList(const StationInfo &info) } if (IsApServiceRunning()) { - IApService *pService = WifiServiceManager::GetInstance().GetApServiceInst(); + IApService *pService = WifiServiceManager::GetInstance().GetApServiceInst(m_id); if (pService == nullptr) { + WIFI_LOGE("Instance %{public}d get hotspot service is null!", m_id); return WIFI_OPT_AP_NOT_OPENED; } if (pService->DelBlockList(info) != WIFI_OPT_SUCCESS) { @@ -415,7 +378,7 @@ ErrCode WifiHotspotServiceImpl::DelBlockList(const StationInfo &info) } } - if (WifiConfigCenter::GetInstance().DelBlockList(info) < 0) { + if (WifiConfigCenter::GetInstance().DelBlockList(info, m_id) < 0) { WIFI_LOGE("Delete block list failed!"); return WIFI_OPT_FAILED; } @@ -424,6 +387,7 @@ ErrCode WifiHotspotServiceImpl::DelBlockList(const StationInfo &info) ErrCode WifiHotspotServiceImpl::GetValidBands(std::vector &bands) { + WIFI_LOGI("current ap service is %{public}d %{public}s", m_id, __func__); if (WifiPermissionUtils::VerifyGetWifiInfoPermission() == PERMISSION_DENIED) { WIFI_LOGE("GetValidBands:VerifyGetWifiInfoPermission PERMISSION_DENIED!"); return WIFI_OPT_PERMISSION_DENIED; @@ -437,7 +401,8 @@ ErrCode WifiHotspotServiceImpl::GetValidBands(std::vector &bands) ErrCode WifiHotspotServiceImpl::GetValidChannels(BandType band, std::vector &validchannels) { - WIFI_LOGI("GetValidChannels band %{public}d", static_cast(band)); + WIFI_LOGI("current ap service is %{public}d %{public}s band %{public}d", + m_id, __func__, static_cast(band)); if (WifiPermissionUtils::VerifyGetWifiInfoPermission() == PERMISSION_DENIED) { WIFI_LOGE("GetValidChannels:VerifyGetWifiInfoPermission PERMISSION_DENIED!"); return WIFI_OPT_PERMISSION_DENIED; @@ -457,13 +422,13 @@ ErrCode WifiHotspotServiceImpl::GetValidChannels(BandType band, std::vector &infos) { - WIFI_LOGI("GetBlockLists"); + WIFI_LOGI("current ap service is %{public}d %{public}s", m_id, __func__); if (WifiPermissionUtils::VerifyGetWifiInfoPermission() == PERMISSION_DENIED) { WIFI_LOGE("GetBlockLists:VerifyGetWifiInfoPermission PERMISSION_DENIED!"); return WIFI_OPT_PERMISSION_DENIED; } - if (WifiConfigCenter::GetInstance().GetBlockLists(infos) < 0) { + if (WifiConfigCenter::GetInstance().GetBlockLists(infos, m_id) < 0) { WIFI_LOGE("Get block list failed!"); return WIFI_OPT_FAILED; } @@ -472,7 +437,8 @@ ErrCode WifiHotspotServiceImpl::GetBlockLists(std::vector &infos) bool WifiHotspotServiceImpl::IsApServiceRunning() { - WifiOprMidState curState = WifiConfigCenter::GetInstance().GetApMidState(); + WIFI_LOGI("current ap service is %{public}d %{public}s", m_id, __func__); + WifiOprMidState curState = WifiConfigCenter::GetInstance().GetApMidState(m_id); if (curState != WifiOprMidState::RUNNING) { WIFI_LOGI("current ap state is %{public}d", static_cast(curState)); return false; @@ -482,17 +448,18 @@ bool WifiHotspotServiceImpl::IsApServiceRunning() ErrCode WifiHotspotServiceImpl::RegisterCallBack(const sptr &callback) { - WIFI_LOGI("RegisterCallBack"); + WIFI_LOGI("current ap service is %{public}d %{public}s", m_id, __func__); if (WifiPermissionUtils::VerifyWifiConnectionPermission() == PERMISSION_DENIED) { WIFI_LOGE("RegisterCallBack:VerifyWifiConnectionPermission() PERMISSION_DENIED!"); return WIFI_OPT_PERMISSION_DENIED; } - WifiInternalEventDispatcher::GetInstance().SetSingleHotspotCallback(callback); + WifiInternalEventDispatcher::GetInstance().SetSingleHotspotCallback(callback, m_id); return WIFI_OPT_SUCCESS; } ErrCode WifiHotspotServiceImpl::GetSupportedFeatures(long &features) { + WIFI_LOGI("current ap service is %{public}d %{public}s", m_id, __func__); if (WifiPermissionUtils::VerifyGetWifiInfoPermission() == PERMISSION_DENIED) { WIFI_LOGE("GetSupportedFeatures:VerifyGetWifiInfoPermission() PERMISSION_DENIED!"); return WIFI_OPT_PERMISSION_DENIED; @@ -507,6 +474,7 @@ ErrCode WifiHotspotServiceImpl::GetSupportedFeatures(long &features) ErrCode WifiHotspotServiceImpl::GetSupportedPowerModel(std::set& setPowerModelList) { + WIFI_LOGI("current ap service is %{public}d %{public}s", m_id, __func__); if (WifiPermissionUtils::VerifyGetWifiInfoPermission() == PERMISSION_DENIED) { WIFI_LOGE("GetSupportedPowerModel:VerifyGetWifiInfoPermission() PERMISSION_DENIED!"); return WIFI_OPT_PERMISSION_DENIED; @@ -515,8 +483,9 @@ ErrCode WifiHotspotServiceImpl::GetSupportedPowerModel(std::set& set if (!IsApServiceRunning()) { return WIFI_OPT_AP_NOT_OPENED; } - IApService *pService = WifiServiceManager::GetInstance().GetApServiceInst(); + IApService *pService = WifiServiceManager::GetInstance().GetApServiceInst(m_id); if (pService == nullptr) { + WIFI_LOGE("Instance %{public}d get hotspot service is null!", m_id); return WIFI_OPT_AP_NOT_OPENED; } pService->GetSupportedPowerModel(setPowerModelList); @@ -525,6 +494,7 @@ ErrCode WifiHotspotServiceImpl::GetSupportedPowerModel(std::set& set ErrCode WifiHotspotServiceImpl::GetPowerModel(PowerModel& model) { + WIFI_LOGI("current ap service is %{public}d %{public}s", m_id, __func__); if (WifiPermissionUtils::VerifyGetWifiInfoPermission() == PERMISSION_DENIED) { WIFI_LOGE("GetPowerModel:VerifyGetWifiInfoPermission() PERMISSION_DENIED!"); return WIFI_OPT_PERMISSION_DENIED; @@ -533,8 +503,9 @@ ErrCode WifiHotspotServiceImpl::GetPowerModel(PowerModel& model) if (!IsApServiceRunning()) { return WIFI_OPT_AP_NOT_OPENED; } - IApService *pService = WifiServiceManager::GetInstance().GetApServiceInst(); + IApService *pService = WifiServiceManager::GetInstance().GetApServiceInst(m_id); if (pService == nullptr) { + WIFI_LOGE("Instance %{public}d get hotspot service is null!", m_id); return WIFI_OPT_AP_NOT_OPENED; } pService->GetPowerModel(model); @@ -543,11 +514,13 @@ ErrCode WifiHotspotServiceImpl::GetPowerModel(PowerModel& model) ErrCode WifiHotspotServiceImpl::SetPowerModel(const PowerModel& model) { + WIFI_LOGI("current ap service is %{public}d %{public}s", m_id, __func__); if (!IsApServiceRunning()) { return WIFI_OPT_AP_NOT_OPENED; } - IApService *pService = WifiServiceManager::GetInstance().GetApServiceInst(); + IApService *pService = WifiServiceManager::GetInstance().GetApServiceInst(m_id); if (pService == nullptr) { + WIFI_LOGE("Instance %{public}d get hotspot service is null!", m_id); return WIFI_OPT_AP_NOT_OPENED; } pService->SetPowerModel(model); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.h index f1d89e0..5ef7708 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.h @@ -18,27 +18,15 @@ #include "wifi_ap_msg.h" #include "wifi_errcode.h" -#include "system_ability.h" #include "wifi_hotspot_stub.h" -#include "iremote_object.h" namespace OHOS { namespace Wifi { -enum ServiceRunningState { - STATE_NOT_START, - STATE_RUNNING -}; -class WifiHotspotServiceImpl : public SystemAbility, public WifiHotspotStub { -DECLARE_SYSTEM_ABILITY(WifiHotspotServiceImpl); +class WifiHotspotServiceImpl : public WifiHotspotStub { public: WifiHotspotServiceImpl(); + explicit WifiHotspotServiceImpl(int id); virtual ~WifiHotspotServiceImpl(); - - static sptr GetInstance(); - - void OnStart() override; - void OnStop() override; - /** * @Description Check whether the hotspot is active. * @@ -192,7 +180,6 @@ public: int32_t Dump(int32_t fd, const std::vector& args) override; private: - bool Init(); ErrCode CheckCanEnableHotspot(const ServiceType type); int CheckOperHotspotSwitchPermission(const ServiceType type); bool IsApServiceRunning(); @@ -201,10 +188,6 @@ private: static void StationsInfoDump(std::string& result); private: - static sptr g_instance; - static std::mutex g_instanceLock; - bool mPublishFlag; - ServiceRunningState mState; bool mGetChannels = false; }; } // namespace Wifi diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.cpp index 6dd9e25..3975a98 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.cpp @@ -29,6 +29,11 @@ WifiHotspotStub::WifiHotspotStub():mSingleCallback(false) InitHandleMap(); } +WifiHotspotStub::WifiHotspotStub(int id):mSingleCallback(false), m_id(id) +{ + InitHandleMap(); +} + WifiHotspotStub::~WifiHotspotStub() {} @@ -311,7 +316,7 @@ void WifiHotspotStub::OnRegisterCallBack( WIFI_LOGD("AddDeathRecipient!"); } if (callback_ != nullptr) { - WifiInternalEventDispatcher::GetInstance().AddHotspotCallback(remote, callback_); + WifiInternalEventDispatcher::GetInstance().AddHotspotCallback(remote, callback_, m_id); } } } while (0); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.h index f0c98e3..be927f9 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.h @@ -31,6 +31,7 @@ public: using HandleFuncMap = std::map; WifiHotspotStub(); + explicit WifiHotspotStub(int id); virtual ~WifiHotspotStub(); @@ -62,6 +63,8 @@ private: HandleFuncMap handleFuncMap; sptr deathRecipient_; bool mSingleCallback; +protected: + int m_id; }; } // namespace Wifi } // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher.cpp index 5481eb8..295d59e 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher.cpp @@ -145,48 +145,65 @@ bool WifiInternalEventDispatcher::HasScanRemote(const sptr &remot } int WifiInternalEventDispatcher::AddHotspotCallback( - const sptr &remote, const sptr &callback) + const sptr &remote, const sptr &callback, int id) { - WIFI_LOGD("WifiInternalEventDispatcher::AddHotspotCallback!"); + WIFI_LOGD("WifiInternalEventDispatcher::AddHotspotCallback, id:%{public}d", id); if (remote == nullptr || callback == nullptr) { WIFI_LOGE("remote object is null!"); return 1; } std::unique_lock lock(mHotspotCallbackMutex); - mHotspotCallbacks[remote] = callback; + auto iter = mHotspotCallbacks.find(id); + if (iter != mHotspotCallbacks.end()) { + (iter->second)[remote] = callback; + return 0; + } + HotspotCallbackMapType hotspotCallback; + hotspotCallback[remote] = callback; + mHotspotCallbacks[id] = hotspotCallback; return 0; } -int WifiInternalEventDispatcher::RemoveHotspotCallback(const sptr &remote) +int WifiInternalEventDispatcher::RemoveHotspotCallback(const sptr &remote, int id) { if (remote != nullptr) { - std::unique_lock lock(mHotspotCallbackMutex); - auto iter = mHotspotCallbacks.find(remote); + auto iter = mHotspotCallbacks.find(id); if (iter != mHotspotCallbacks.end()) { - mHotspotCallbacks.erase(iter); - WIFI_LOGD("WifiInternalEventDispatcher::RemoveHotspotCallback!"); + std::unique_lock lock(mHotspotCallbackMutex); + auto item = iter->second.find(remote); + if (item != iter->second.end()) { + iter->second.erase(item); + WIFI_LOGD("hotspot is is %{public}d WifiInternalEventDispatcher::RemoveHotspotCallback!", id); + } } } return 0; } -int WifiInternalEventDispatcher::SetSingleHotspotCallback(const sptr &callback) +int WifiInternalEventDispatcher::SetSingleHotspotCallback(const sptr &callback, int id) { - mHotspotSingleCallback = callback; + mHotspotSingleCallback[id] = callback; return 0; } -sptr WifiInternalEventDispatcher::GetSingleHotspotCallback() const +sptr WifiInternalEventDispatcher::GetSingleHotspotCallback(int id) const { - return mHotspotSingleCallback; + auto iter = mHotspotSingleCallback.find(id); + if (iter != mHotspotSingleCallback.end()) { + return iter->second; + } + return nullptr; } -bool WifiInternalEventDispatcher::HasHotspotRemote(const sptr &remote) +bool WifiInternalEventDispatcher::HasHotspotRemote(const sptr &remote, int id) { - std::unique_lock lock(mHotspotCallbackMutex); if (remote != nullptr) { - if (mHotspotCallbacks.find(remote) != mHotspotCallbacks.end()) { - return true; + auto iter = mHotspotCallbacks.find(id); + if (iter != mHotspotCallbacks.end()) { + std::unique_lock lock(mHotspotCallbackMutex); + if (iter->second.find(remote) != iter->second.end()) { + return true; + } } } return false; @@ -395,26 +412,29 @@ void WifiInternalEventDispatcher::InvokeDeviceCallbacks(const WifiEventCallbackM void WifiInternalEventDispatcher::InvokeHotspotCallbacks(const WifiEventCallbackMsg &msg) { - HotspotCallbackMapType callbacks = mHotspotCallbacks; - HotspotCallbackMapType::iterator itr; - for (itr = callbacks.begin(); itr != callbacks.end(); itr++) { - auto callback = itr->second; - if (callback == nullptr) { - continue; - } - switch (msg.msgCode) { - case WIFI_CBK_MSG_HOTSPOT_STATE_CHANGE: - callback->OnHotspotStateChanged(msg.msgData); - break; - case WIFI_CBK_MSG_HOTSPOT_STATE_JOIN: - callback->OnHotspotStaJoin(msg.staInfo); - break; - case WIFI_CBK_MSG_HOTSPOT_STATE_LEAVE: - callback->OnHotspotStaLeave(msg.staInfo); - break; - default: - WIFI_LOGI("UnKnown msgcode %{public}d", msg.msgCode); - break; + auto iter = mHotspotCallbacks.find(msg.id); + if (iter != mHotspotCallbacks.end()) { + HotspotCallbackMapType callbacks = iter->second; + HotspotCallbackMapType::iterator itr; + for (itr = callbacks.begin(); itr != callbacks.end(); itr++) { + auto callback = itr->second; + if (callback == nullptr) { + continue; + } + switch (msg.msgCode) { + case WIFI_CBK_MSG_HOTSPOT_STATE_CHANGE: + callback->OnHotspotStateChanged(msg.msgData); + break; + case WIFI_CBK_MSG_HOTSPOT_STATE_JOIN: + callback->OnHotspotStaJoin(msg.staInfo); + break; + case WIFI_CBK_MSG_HOTSPOT_STATE_LEAVE: + callback->OnHotspotStaLeave(msg.staInfo); + break; + default: + WIFI_LOGI("UnKnown msgcode %{public}d", msg.msgCode); + break; + } } } } @@ -423,8 +443,7 @@ void WifiInternalEventDispatcher::DealHotspotCallbackMsg( WifiInternalEventDispatcher &instance, const WifiEventCallbackMsg &msg) { WIFI_LOGI("WifiInternalEventDispatcher:: Deal Hotspot Event Callback Msg: %{public}d", msg.msgCode); - - auto callback = instance.GetSingleHotspotCallback(); + auto callback = instance.GetSingleHotspotCallback(msg.id); if (callback != nullptr) { switch (msg.msgCode) { case WIFI_CBK_MSG_HOTSPOT_STATE_CHANGE: diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher.h index 721a86d..5cb8b72 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher.h @@ -97,11 +97,11 @@ public: sptr GetSingleScanCallback() const; int RemoveScanCallback(const sptr &remote); bool HasScanRemote(const sptr &remote); - int AddHotspotCallback(const sptr &remote, const sptr &callback); - int SetSingleHotspotCallback(const sptr &callback); - sptr GetSingleHotspotCallback() const; - int RemoveHotspotCallback(const sptr &remote); - bool HasHotspotRemote(const sptr &remote); + int AddHotspotCallback(const sptr &remote, const sptr &callback, int id = 0); + int SetSingleHotspotCallback(const sptr &callback, int id = 0); + sptr GetSingleHotspotCallback(int id) const; + int RemoveHotspotCallback(const sptr &remote, int id = 0); + bool HasHotspotRemote(const sptr &remote, int id = 0); int AddP2pCallback(const sptr &remote, const sptr &callback); int SetSingleP2pCallback(const sptr &callback); sptr GetSingleP2pCallback() const; @@ -134,8 +134,8 @@ private: ScanCallbackMapType mScanCallbacks; sptr mScanSingleCallback; std::mutex mHotspotCallbackMutex; - HotspotCallbackMapType mHotspotCallbacks; - sptr mHotspotSingleCallback; + std::map mHotspotCallbacks; + std::map> mHotspotSingleCallback; std::mutex mP2pCallbackMutex; P2pCallbackMapType mP2pCallbacks; sptr mP2pSingleCallback; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp index 46031a4..3dea239 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp @@ -34,6 +34,7 @@ DEFINE_WIFILOG_LABEL("WifiManager"); namespace OHOS { namespace Wifi { +int WifiManager::mCloseApIndex = 0; WifiManager &WifiManager::GetInstance() { static WifiManager gWifiManager; @@ -306,15 +307,16 @@ void WifiManager::CloseStaService(void) } #ifdef FEATURE_AP_SUPPORT -void WifiManager::CloseApService(void) +void WifiManager::CloseApService(int id) { - WIFI_LOGD("close ap service"); - WifiServiceManager::GetInstance().UnloadService(WIFI_SERVICE_AP); - WifiConfigCenter::GetInstance().SetApMidState(WifiOprMidState::CLOSED); - WifiSettings::GetInstance().SetHotspotState(static_cast(ApState::AP_STATE_CLOSED)); + WIFI_LOGD("close %{public}d ap service", id); + WifiServiceManager::GetInstance().UnloadService(WIFI_SERVICE_AP, id); + WifiConfigCenter::GetInstance().SetApMidState(WifiOprMidState::CLOSED, id); + WifiSettings::GetInstance().SetHotspotState(static_cast(ApState::AP_STATE_CLOSED), id); WifiEventCallbackMsg cbMsg; cbMsg.msgCode = WIFI_CBK_MSG_HOTSPOT_STATE_CHANGE; cbMsg.msgData = static_cast(ApState::AP_STATE_CLOSED); + cbMsg.id = id; WifiInternalEventDispatcher::GetInstance().AddBroadCastMsg(cbMsg); return; } @@ -364,7 +366,7 @@ void WifiManager::DealCloseServiceMsg(WifiManager &manager) break; #ifdef FEATURE_AP_SUPPORT case WifiCloseServiceCode::AP_SERVICE_CLOSE: - CloseApService(); + CloseApService(mCloseApIndex); break; #endif #ifdef FEATURE_P2P_SUPPORT @@ -651,39 +653,47 @@ IApServiceCallbacks WifiManager::GetApCallback() return mApCallback; } -void WifiManager::DealApStateChanged(ApState state) +void WifiManager::DealApStateChanged(ApState state, int id) { WifiEventCallbackMsg cbMsg; cbMsg.msgCode = WIFI_CBK_MSG_HOTSPOT_STATE_CHANGE; cbMsg.msgData = static_cast(state); + cbMsg.id = id; WifiInternalEventDispatcher::GetInstance().AddBroadCastMsg(cbMsg); if (state == ApState::AP_STATE_IDLE) { + mCloseApIndex = id; WifiManager::GetInstance().PushServiceCloseMsg(WifiCloseServiceCode::AP_SERVICE_CLOSE); } if (state == ApState::AP_STATE_STARTED) { - WifiConfigCenter::GetInstance().SetApMidState(WifiOprMidState::OPENING, WifiOprMidState::RUNNING); + WifiConfigCenter::GetInstance().SetApMidState(WifiOprMidState::OPENING, WifiOprMidState::RUNNING, id); } - WifiCommonEventHelper::PublishHotspotStateChangedEvent((int)state, "OnHotspotStateChanged"); + + std::string msg = std::string("OnHotspotStateChanged") + std::string("id = ") + std::to_string(id); + WifiCommonEventHelper::PublishHotspotStateChangedEvent((int)state, msg); return; } -void WifiManager::DealApGetStaJoin(const StationInfo &info) +void WifiManager::DealApGetStaJoin(const StationInfo &info, int id) { WifiEventCallbackMsg cbMsg; cbMsg.msgCode = WIFI_CBK_MSG_HOTSPOT_STATE_JOIN; cbMsg.staInfo = info; + cbMsg.id = id; WifiInternalEventDispatcher::GetInstance().AddBroadCastMsg(cbMsg); - WifiCommonEventHelper::PublishApStaJoinEvent(0, "ApStaJoined"); + std::string msg = std::string("ApStaJoined") + std::string("id = ") + std::to_string(id); + WifiCommonEventHelper::PublishApStaJoinEvent(0, msg); return; } -void WifiManager::DealApGetStaLeave(const StationInfo &info) +void WifiManager::DealApGetStaLeave(const StationInfo &info, int id) { WifiEventCallbackMsg cbMsg; cbMsg.msgCode = WIFI_CBK_MSG_HOTSPOT_STATE_LEAVE; cbMsg.staInfo = info; + cbMsg.id = id; WifiInternalEventDispatcher::GetInstance().AddBroadCastMsg(cbMsg); - WifiCommonEventHelper::PublishApStaLeaveEvent(0, "ApStaLeaved"); + std::string msg = std::string("ApStaLeaved") + std::string("id = ") + std::to_string(id); + WifiCommonEventHelper::PublishApStaLeaveEvent(0, msg); return; } #endif diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.h index fa08416..6245683 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.h @@ -143,7 +143,7 @@ private: static void DealCloseServiceMsg(WifiManager &manager); static void CloseStaService(void); #ifdef FEATURE_AP_SUPPORT - static void CloseApService(void); + static void CloseApService(int id = 0); #endif static void CloseScanService(void); #ifdef FEATURE_P2P_SUPPORT @@ -162,9 +162,9 @@ private: static void DealScanFinished(int state); static void DealScanInfoNotify(std::vector &results); #ifdef FEATURE_AP_SUPPORT - static void DealApStateChanged(ApState bState); - static void DealApGetStaJoin(const StationInfo &info); - static void DealApGetStaLeave(const StationInfo &info); + static void DealApStateChanged(ApState bState, int id = 0); + static void DealApGetStaJoin(const StationInfo &info, int id = 0); + static void DealApGetStaLeave(const StationInfo &info, int id = 0); #endif #ifdef FEATURE_P2P_SUPPORT static void DealP2pStateChanged(P2pState bState); @@ -200,6 +200,7 @@ private: #endif InitStatus mInitStatus; long mSupportedFeatures; + static int mCloseApIndex; }; } // namespace Wifi } // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.cpp index 2952899..a7fbcbe 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.cpp @@ -143,7 +143,7 @@ int WifiServiceManager::LoadApService(const std::string &dlname, bool bCreate) WIFI_LOGE("dlopen %{public}s failed: %{public}s!", dlname.c_str(), dlerror()); return -1; } - mApServiceHandle.create = (IApService *(*)()) dlsym(mApServiceHandle.handle, "Create"); + mApServiceHandle.create = (IApService *(*)(int)) dlsym(mApServiceHandle.handle, "Create"); mApServiceHandle.destroy = (void *(*)(IApService *))dlsym(mApServiceHandle.handle, "Destroy"); if (mApServiceHandle.create == nullptr || mApServiceHandle.destroy == nullptr) { WIFI_LOGE("%{public}s dlsym Create or Destory failed!", dlname.c_str()); @@ -152,7 +152,11 @@ int WifiServiceManager::LoadApService(const std::string &dlname, bool bCreate) return -1; } if (bCreate) { - mApServiceHandle.pService = mApServiceHandle.create(); + IApService *service = mApServiceHandle.create(0); + auto ret = mApServiceHandle.pService.emplace(0, service); + if (!ret.second) { + mApServiceHandle.pService[0] = service; + } } return 0; } @@ -242,18 +246,27 @@ IScanService *WifiServiceManager::GetScanServiceInst() } #ifdef FEATURE_AP_SUPPORT -IApService *WifiServiceManager::GetApServiceInst() +IApService *WifiServiceManager::GetApServiceInst(int id) { if (mApServiceHandle.handle == nullptr) { return nullptr; } - if (mApServiceHandle.pService == nullptr) { - std::unique_lock lock(mMutex); - if (mApServiceHandle.pService == nullptr) { - mApServiceHandle.pService = mApServiceHandle.create(); + + IApService *service = nullptr; + auto iter = mApServiceHandle.pService.find(id); + if (iter != mApServiceHandle.pService.end()) { + service = iter->second; + } + + if (service == nullptr) { + service = mApServiceHandle.create(id); + auto ret = mApServiceHandle.pService.emplace(id, service); + if (!ret.second) { + mApServiceHandle.pService[id] = service; } } - return mApServiceHandle.pService; + + return service; } #endif @@ -306,18 +319,26 @@ int WifiServiceManager::UnloadScanService(bool bPreLoad) } #ifdef FEATURE_AP_SUPPORT -int WifiServiceManager::UnloadApService(bool bPreLoad) +int WifiServiceManager::UnloadApService(bool bPreLoad, int id) { if (mApServiceHandle.handle == nullptr) { return 0; } - if (mApServiceHandle.pService != nullptr) { - mApServiceHandle.destroy(mApServiceHandle.pService); - mApServiceHandle.pService = nullptr; - } - if (!bPreLoad) { - dlclose(mApServiceHandle.handle); - mApServiceHandle.Clear(); + + /* Unload all ap service */ + if (id == ALL_AP_ID) { + for (int i = 0; i < AP_INSTANCE_MAX_NUM; i++) { + UnloadApService(bPreLoad, i); + } + } else { + auto iter = mApServiceHandle.pService.find(id); + if (iter != mApServiceHandle.pService.end()) { + if (iter->second != nullptr) { + mApServiceHandle.destroy(iter->second); + iter->second = nullptr; + } + mApServiceHandle.pService.erase(id); + } } return 0; } @@ -341,7 +362,7 @@ int WifiServiceManager::UnloadP2pService(bool bPreLoad) } #endif -int WifiServiceManager::UnloadService(const std::string &name) +int WifiServiceManager::UnloadService(const std::string &name, int id) { bool bPreLoad = WifiSettings::GetInstance().IsModulePreLoad(name); WIFI_LOGD("WifiServiceManager::UnloadService name: %{public}s", name.c_str()); @@ -354,7 +375,7 @@ int WifiServiceManager::UnloadService(const std::string &name) } #ifdef FEATURE_AP_SUPPORT if (name == WIFI_SERVICE_AP) { - return UnloadApService(bPreLoad); + return UnloadApService(bPreLoad, id); } #endif #ifdef FEATURE_P2P_SUPPORT @@ -371,7 +392,7 @@ void WifiServiceManager::UninstallAllService() UnloadStaService(false); UnloadScanService(false); #ifdef FEATURE_AP_SUPPORT - UnloadApService(false); + UnloadApService(false, ALL_AP_ID); /* all ap services */ #endif #ifdef FEATURE_P2P_SUPPORT UnloadP2pService(false); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.h index e5077b8..789008a 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.h @@ -68,12 +68,13 @@ struct ScanServiceHandle { }; #ifdef FEATURE_AP_SUPPORT +#define ALL_AP_ID 0xffff struct ApServiceHandle { void *handle; - IApService *(*create)(); + IApService *(*create)(int id); void *(*destroy)(IApService *); - IApService *pService; - ApServiceHandle() : handle(nullptr), create(nullptr), destroy(nullptr), pService(nullptr) + std::map pService; + ApServiceHandle() : handle(nullptr), create(nullptr), destroy(nullptr) {} ~ApServiceHandle() {} @@ -82,7 +83,7 @@ struct ApServiceHandle { handle = nullptr; create = nullptr; destroy = nullptr; - pService = nullptr; + pService.clear(); } }; #endif @@ -155,7 +156,7 @@ public: * * @return IApService* - ap service pointer, if ap not supported, nullptr is returned */ - IApService *GetApServiceInst(void); + IApService *GetApServiceInst(int id = 0); #endif #ifdef FEATURE_P2P_SUPPORT @@ -173,7 +174,7 @@ public: * @param name - feature service name * @return int - 0 success */ - int UnloadService(const std::string &name); + int UnloadService(const std::string &name, int id = 0); /** * @Description Uninstall all loaded feature services @@ -190,7 +191,7 @@ private: int UnloadScanService(bool bPreLoad); #ifdef FEATURE_AP_SUPPORT int LoadApService(const std::string &dlname, bool bCreate); - int UnloadApService(bool bPreLoad); + int UnloadApService(bool bPreLoad, int id = 0); #endif #ifdef FEATURE_P2P_SUPPORT int LoadP2pService(const std::string &dlname, bool bCreate); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp index 6a59d75..cdd1ddf 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp @@ -1583,6 +1583,12 @@ StaStateMachine::GetIpState::~GetIpState() void StaStateMachine::GetIpState::GoInState() { +#ifdef WIFI_DHCP_DISABLED + SaveLinkstate(ConnState::CONNECTED, DetailedState::WORKING); + staCallback.OnStaConnChanged(OperateResState::CONNECT_NETWORK_ENABLED, linkedInfo); + SwitchState(pLinkedState); + return; +#endif WIFI_LOGI("GetIpState GoInState function."); WifiDeviceConfig config; AssignIpMethod assignMethod = AssignIpMethod::DHCP; diff --git a/wifi/services/wifi_standard/wifi_hal/BUILD.gn b/wifi/services/wifi_standard/wifi_hal/BUILD.gn index 411a9b6..4de9cf8 100644 --- a/wifi/services/wifi_standard/wifi_hal/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_hal/BUILD.gn @@ -87,6 +87,7 @@ if (defined(ohos_lite)) { defines = [ "OHOS_ARCH_LITE", "AP_INTF=\"$wifi_feature_with_ap_intf\"", + "AP_NUM=$wifi_feature_with_ap_num", ] ldflags = [ "-lwpa_client" ] } @@ -115,7 +116,10 @@ if (defined(ohos_lite)) { ] cflags_cc = [ "-fno-rtti" ] - defines = [ "AP_INTF=\"$wifi_feature_with_ap_intf\"" ] + defines = [ + "AP_INTF=\"$wifi_feature_with_ap_intf\"", + "AP_NUM=$wifi_feature_with_ap_num", + ] if (product_name == "rk3568") { defines += [ "PRODUCT_RK" ] } diff --git a/wifi/services/wifi_standard/wifi_hal/main.c b/wifi/services/wifi_standard/wifi_hal/main.c index a75b201..a441ddd 100644 --- a/wifi/services/wifi_standard/wifi_hal/main.c +++ b/wifi/services/wifi_standard/wifi_hal/main.c @@ -21,6 +21,7 @@ #include "wifi_hal_crpc_server.h" #include "wifi_hal_sta_interface.h" #include "wifi_hal_p2p_interface.h" +#include "wifi_hostapd_hal.h" #undef LOG_TAG #define LOG_TAG "WifiHalService" @@ -60,7 +61,9 @@ int main(void) RunRpcLoop(server); /* stop wpa_supplicant, hostapd, and other resources */ ForceStop(); - StopSoftAp(); + for (int id = 0; id < AP_MAX_INSTANCE; id++) { + StopSoftAp(id); + } P2pForceStop(); ReleaseWifiHalVendorInterface(); /* clear RPC Server */ diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c index 139473e..35cd2bf 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c @@ -19,9 +19,9 @@ #ifdef OHOS_ARCH_LITE #include "wifi_hal_adapter.h" #else +#include "wifi_hal.h" #include "wifi_hal_adapter.h" #include "wifi_hdi_ap_instance.h" - #endif #include "wifi_hal_module_manage.h" #include "wifi_hal_common_func.h" @@ -34,10 +34,11 @@ #define NUMS_BAND 2 #define DISABLE_AP_WAIT_MS 50000 +#define ABLE_AP_WAIT_MS 50000 +#define WIFI_MULTI_CMD_MAX_LEN 1024 static const char *g_serviceName = "hostapd"; -static const char *g_startCmd = "hostapd /data/misc/wifi/wpa_supplicant/hostapd.conf"; -WifiErrorNo StartSoftAp(void) +WifiErrorNo StartSoftAp(int id) { LOGD("Ready to start hostapd"); if (StartHostapd() != WIFI_HAL_SUCCESS) { @@ -45,21 +46,57 @@ WifiErrorNo StartSoftAp(void) return WIFI_HAL_OPEN_HOSTAPD_FAILED; } - if (StartHostapdHal() != WIFI_HAL_SUCCESS) { + if (StartHostapdHal(id) != WIFI_HAL_SUCCESS) { LOGE("hostapd init failed!"); return WIFI_HAL_HOSTAPD_NOT_INIT; } + WifiHostapdHalDevice *hostapdHalDevice = GetWifiHostapdDev(id); + if (hostapdHalDevice != NULL) { + int ret = hostapdHalDevice->enableAp(id); + usleep(ABLE_AP_WAIT_MS); + if (ret != 0) { + LOGE("ableAp failed! ret=%{public}d", ret); + } + } else { + LOGE("cant not get hostapd dev"); + } + LOGD("AP start successfully!"); return WIFI_HAL_SUCCESS; } WifiErrorNo StartHostapd(void) { - if (CopyConfigFile("hostapd.conf") != 0) { + char startCmd[WIFI_MULTI_CMD_MAX_LEN] = {0}; + char *p = startCmd; + int onceMove = 0; + int sumMove = 0; + onceMove = snprintf_s(p, WIFI_MULTI_CMD_MAX_LEN - sumMove, + WIFI_MULTI_CMD_MAX_LEN - sumMove -1, "%s", g_serviceName); + if (onceMove < 0) { + return WIFI_HAL_FAILED; + } + p = p + onceMove; + sumMove = sumMove + onceMove; + int num; + WifiHostapdHalDeviceInfo *cfg = GetWifiCfg(&num); + if (cfg == NULL) { return WIFI_HAL_FAILED; } - ModuleManageRetCode ret = StartModule(g_serviceName, g_startCmd); + for (int i = 0; i < num; i++) { + if (CopyConfigFile(cfg[i].cfgName) != 0) { + return WIFI_HAL_FAILED; + } + onceMove = snprintf_s(p, WIFI_MULTI_CMD_MAX_LEN - sumMove, + WIFI_MULTI_CMD_MAX_LEN - sumMove -1, " %s", cfg[i].config); + if (onceMove < 0) { + return WIFI_HAL_FAILED; + } + p = p + onceMove; + sumMove = sumMove + onceMove; + } + ModuleManageRetCode ret = StartModule(g_serviceName, startCmd); if (ret == MM_SUCCESS) { return WIFI_HAL_SUCCESS; } @@ -68,21 +105,21 @@ WifiErrorNo StartHostapd(void) return WIFI_HAL_FAILED; } -WifiErrorNo StartHostapdHal(void) +WifiErrorNo StartHostapdHal(int id) { LOGD("Ready to init hostapd"); - WifiHostapdHalDevice *hostapdHalDevice = GetWifiHostapdDev(); + WifiHostapdHalDevice *hostapdHalDevice = GetWifiHostapdDev(id); if (hostapdHalDevice == NULL) { return WIFI_HAL_FAILED; } return WIFI_HAL_SUCCESS; } -WifiErrorNo StopSoftAp(void) +WifiErrorNo StopSoftAp(int id) { - WifiHostapdHalDevice *hostapdHalDevice = GetWifiHostapdDev(); + WifiHostapdHalDevice *hostapdHalDevice = GetWifiHostapdDev(id); if (hostapdHalDevice != NULL) { - int ret = hostapdHalDevice->disableAp(); + int ret = hostapdHalDevice->disableAp(id); usleep(DISABLE_AP_WAIT_MS); if (ret != 0) { LOGE("disableAp failed! ret=%{public}d", ret); @@ -96,7 +133,7 @@ WifiErrorNo StopSoftAp(void) return WIFI_HAL_FAILED; } - if (StopHostapdHal() != WIFI_HAL_SUCCESS) { + if (StopHostapdHal(id) != WIFI_HAL_SUCCESS) { LOGE("hostapd_hal stop failed!"); return WIFI_HAL_FAILED; } @@ -108,85 +145,83 @@ WifiErrorNo StopSoftAp(void) WifiErrorNo StopHostapd(void) { ModuleManageRetCode ret; - do { - ret = StopModule(g_serviceName); - if (ret == MM_FAILED) { - LOGE("stop hostapd failed!"); - return WIFI_HAL_FAILED; - } - } while (ret == MM_REDUCE_REFERENCE); + ret = StopModule(g_serviceName); + if (ret == MM_FAILED) { + LOGE("stop hostapd failed!"); + return WIFI_HAL_FAILED; + } return WIFI_HAL_SUCCESS; } -WifiErrorNo StopHostapdHal(void) +WifiErrorNo StopHostapdHal(int id) { - ReleaseHostapdDev(); + ReleaseHostapdDev(id); return WIFI_HAL_SUCCESS; } -WifiErrorNo GetStaInfos(char *infos, int32_t *size) +WifiErrorNo GetStaInfos(char *infos, int32_t *size, int id) { if (infos == NULL || size == NULL) { LOGE("GetStaInfos infos or size is NULL"); return WIFI_HAL_FAILED; } LOGD("GetStaInfos:Start"); - WifiHostapdHalDevice *hostapdHalDevice = GetWifiHostapdDev(); + WifiHostapdHalDevice *hostapdHalDevice = GetWifiHostapdDev(id); if (hostapdHalDevice == NULL) { return WIFI_HAL_HOSTAPD_NOT_INIT; } - if (hostapdHalDevice->showConnectedDevList(infos, *size) != 0) { + if (hostapdHalDevice->showConnectedDevList(infos, *size, id) != 0) { LOGE("ShowConnectedDevList failed!"); return WIFI_HAL_FAILED; } return WIFI_HAL_SUCCESS; } -WifiErrorNo SetCountryCode(const char *code) +WifiErrorNo SetCountryCode(const char *code, int id) { if (code == NULL || strlen(code) != WIFI_COUNTRY_CODE_MAXLEN) { LOGE("SetCountryCode code is invalid"); return WIFI_HAL_INVALID_PARAM; } LOGD("SetCountryCode() code: %{public}s", code); - WifiHostapdHalDevice *hostapdHalDevice = GetWifiHostapdDev(); + WifiHostapdHalDevice *hostapdHalDevice = GetWifiHostapdDev(id); if (hostapdHalDevice == NULL) { return WIFI_HAL_HOSTAPD_NOT_INIT; } - if (hostapdHalDevice->setCountryCode(code) != 0) { + if (hostapdHalDevice->setCountryCode(code, id) != 0) { LOGE("SetCountryCode failed!"); return WIFI_HAL_FAILED; } return WIFI_HAL_SUCCESS; } -WifiErrorNo SetHostapdConfig(HostapdConfig *config) +WifiErrorNo SetHostapdConfig(HostapdConfig *config, int id) { if (config == NULL) { LOGE("SetHostapdConfig config is NULL"); return WIFI_HAL_FAILED; } LOGD("SetHostapdConfig()"); - WifiHostapdHalDevice *hostapdHalDevice = GetWifiHostapdDev(); + WifiHostapdHalDevice *hostapdHalDevice = GetWifiHostapdDev(id); if (hostapdHalDevice == NULL) { return WIFI_HAL_HOSTAPD_NOT_INIT; } - int ret = hostapdHalDevice->setApInfo(config); + int ret = hostapdHalDevice->setApInfo(config, id); if (ret != 0) { LOGE("SetApInfo failed!"); return WIFI_HAL_FAILED; } - ret = hostapdHalDevice->reloadApConfigInfo(); + ret = hostapdHalDevice->reloadApConfigInfo(id); if (ret != 0) { LOGE("ReloadApConfigInfo failed!"); return WIFI_HAL_FAILED; } - ret = hostapdHalDevice->disableAp(); + ret = hostapdHalDevice->disableAp(id); if (ret != 0) { LOGE("DisableAp failed!"); return WIFI_HAL_FAILED; } - ret = hostapdHalDevice->enableAp(); + ret = hostapdHalDevice->enableAp(id); if (ret != 0) { LOGE("EnableAp failed!"); return WIFI_HAL_FAILED; @@ -195,7 +230,7 @@ WifiErrorNo SetHostapdConfig(HostapdConfig *config) return WIFI_HAL_SUCCESS; } -WifiErrorNo SetMacFilter(const unsigned char *mac, int lenMac) +WifiErrorNo SetMacFilter(const unsigned char *mac, int lenMac, int id) { if (mac == NULL) { LOGE("SetMacFilter is NULL"); @@ -209,18 +244,18 @@ WifiErrorNo SetMacFilter(const unsigned char *mac, int lenMac) if (CheckMacIsValid((const char *)mac) != 0) { return WIFI_HAL_INPUT_MAC_INVALID; } - WifiHostapdHalDevice *hostapdHalDevice = GetWifiHostapdDev(); + WifiHostapdHalDevice *hostapdHalDevice = GetWifiHostapdDev(id); if (hostapdHalDevice == NULL) { return WIFI_HAL_HOSTAPD_NOT_INIT; } - if (hostapdHalDevice->addBlocklist((const char *)mac) != 0) { + if (hostapdHalDevice->addBlocklist((const char *)mac, id) != 0) { LOGE("AddBlocklist failed!"); return WIFI_HAL_FAILED; } return WIFI_HAL_SUCCESS; } -WifiErrorNo DelMacFilter(const unsigned char *mac, int lenMac) +WifiErrorNo DelMacFilter(const unsigned char *mac, int lenMac, int id) { if (mac == NULL) { LOGE("DelMacFilter is NULL"); @@ -234,18 +269,18 @@ WifiErrorNo DelMacFilter(const unsigned char *mac, int lenMac) if (CheckMacIsValid((const char *)mac) != 0) { return WIFI_HAL_INPUT_MAC_INVALID; } - WifiHostapdHalDevice *hostapdHalDevice = GetWifiHostapdDev(); + WifiHostapdHalDevice *hostapdHalDevice = GetWifiHostapdDev(id); if (hostapdHalDevice == NULL) { return WIFI_HAL_HOSTAPD_NOT_INIT; } - if (hostapdHalDevice->delBlocklist((const char *)mac) != 0) { + if (hostapdHalDevice->delBlocklist((const char *)mac, id) != 0) { LOGE("DelBlocklist failed!"); return WIFI_HAL_FAILED; } return WIFI_HAL_SUCCESS; } -WifiErrorNo DisassociateSta(const unsigned char *mac, int lenMac) +WifiErrorNo DisassociateSta(const unsigned char *mac, int lenMac, int id) { if (mac == NULL) { LOGE("DisassociateSta is NULL"); @@ -259,11 +294,11 @@ WifiErrorNo DisassociateSta(const unsigned char *mac, int lenMac) if (CheckMacIsValid((const char *)mac) != 0) { return WIFI_HAL_INPUT_MAC_INVALID; } - WifiHostapdHalDevice *hostapdHalDevice = GetWifiHostapdDev(); + WifiHostapdHalDevice *hostapdHalDevice = GetWifiHostapdDev(id); if (hostapdHalDevice == NULL) { return WIFI_HAL_HOSTAPD_NOT_INIT; } - if (hostapdHalDevice->disConnectedDev((const char *)mac) != 0) { + if (hostapdHalDevice->disConnectedDev((const char *)mac, id) != 0) { LOGE("DisConnectedDev failed!"); return WIFI_HAL_FAILED; } @@ -275,7 +310,7 @@ static int32_t ConvertToNl80211Band(int32_t band) return (band > 0 && band <= NUMS_BAND) ? (band - 1) : band; } -WifiErrorNo GetValidFrequenciesForBand(int32_t band, int *frequencies, int32_t *size) +WifiErrorNo GetValidFrequenciesForBand(int32_t band, int *frequencies, int32_t *size, int id) { #ifdef OHOS_ARCH_LITE return WIFI_HAL_FAILED; @@ -299,12 +334,12 @@ WifiErrorNo GetValidFrequenciesForBand(int32_t band, int *frequencies, int32_t * #endif } -WifiErrorNo WifiSetPowerModel(const int mode) +WifiErrorNo WifiSetPowerModel(const int mode, int id) { #ifdef OHOS_ARCH_LITE return WIFI_HAL_FAILED; #else - LOGD("WifiSetPowerModel: %{public}d", mode); + LOGD("Instance %{public}d WifiSetPowerModel: %{public}d", id, mode); struct IWiFi *wifi = NULL; struct IWiFiAp *apFeature = NULL; @@ -321,12 +356,12 @@ WifiErrorNo WifiSetPowerModel(const int mode) #endif } -WifiErrorNo WifiGetPowerModel(int* mode) +WifiErrorNo WifiGetPowerModel(int* mode, int id) { #ifdef OHOS_ARCH_LITE return WIFI_HAL_FAILED; #else - LOGD("WifiGetPowerModel"); + LOGD("Instance %{public}d WifiGetPowerModel", id); struct IWiFi *wifi = NULL; struct IWiFiAp *apFeature = NULL; diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.h index a9b96a0..34cee16 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.h +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.h @@ -30,13 +30,15 @@ extern "C" { /** * @Description Start Ap. * + * @param id - ap id * @return WifiErrorNo */ -WifiErrorNo StartSoftAp(void); +WifiErrorNo StartSoftAp(int id); /** * @Description Start Hostapd. * + * @param id - ap id * @return WifiErrorNo */ WifiErrorNo StartHostapd(void); @@ -44,16 +46,17 @@ WifiErrorNo StartHostapd(void); /** * @Description Init hostapd hal module. * + * @param id - ap id * @return WifiErrorNo */ -WifiErrorNo StartHostapdHal(void); +WifiErrorNo StartHostapdHal(int id); /** * @Description Stop Ap. * * @return WifiErrorNo */ -WifiErrorNo StopSoftAp(void); +WifiErrorNo StopSoftAp(int id); /** * @Description Stop hostapd. @@ -65,9 +68,10 @@ WifiErrorNo StopHostapd(void); /** * @Description Release hostapd hal. * + * @param id - ap id * @return WifiErrorNo */ -WifiErrorNo StopHostapdHal(void); +WifiErrorNo StopHostapdHal(int id); /** * @Description Obtains information about all connected STAs. @@ -75,25 +79,28 @@ WifiErrorNo StopHostapdHal(void); * @param infos - Connected STA information array. * @param size - Obtains the size of all sta information arrays and Size of the * obtained sta information array. + * @param id - ap id * @return WifiErrorNo */ -WifiErrorNo GetStaInfos(char *infos, int32_t *size); +WifiErrorNo GetStaInfos(char *infos, int32_t *size, int id); /** * @Description Setting the AP Country Code. * * @param code - Country code. + * @param id - ap id * @return WifiErrorNo */ -WifiErrorNo SetCountryCode(const char *code); +WifiErrorNo SetCountryCode(const char *code, int id); /** * @Description Setting the startup configuration items of the hostapd. * * @param config - Hostapd startup configuration. + * @param id - ap id * @return WifiErrorNo */ -WifiErrorNo SetHostapdConfig(HostapdConfig *config); +WifiErrorNo SetHostapdConfig(HostapdConfig *config, int id); /** * @Description To set the blocklist filtering in AP mode to prohibit @@ -101,9 +108,10 @@ WifiErrorNo SetHostapdConfig(HostapdConfig *config); * * @param mac - Blocklisted MAC address. * @param lenMac - Blocklist MAC address length. + * @param id - ap id * @return WifiErrorNo */ -WifiErrorNo SetMacFilter(const unsigned char *mac, int lenMac); +WifiErrorNo SetMacFilter(const unsigned char *mac, int lenMac, int id); /** * @Description To set blocklist filtering in AP mode and delete a specified MAC @@ -111,18 +119,20 @@ WifiErrorNo SetMacFilter(const unsigned char *mac, int lenMac); * * @param mac - Blocklisted MAC address. * @param lenMac - Blocklist MAC address length. + * @param id - ap id * @return WifiErrorNo */ -WifiErrorNo DelMacFilter(const unsigned char *mac, int lenMac); +WifiErrorNo DelMacFilter(const unsigned char *mac, int lenMac, int id); /** * @Description Disconnect the STA with a specified MAC address. * * @param mac - Blocklisted MAC address. * @param lenMac - Blocklist MAC address length. + * @param id - ap id * @return WifiErrorNo */ -WifiErrorNo DisassociateSta(const unsigned char *mac, int lenMac); +WifiErrorNo DisassociateSta(const unsigned char *mac, int lenMac, int id); /** * @Description Obtains the hotspot frequency supported by a specified @@ -131,25 +141,28 @@ WifiErrorNo DisassociateSta(const unsigned char *mac, int lenMac); * @param band - Specified frequency band. * @param frequencies - Frequency array. * @param size - Frequency array memory size and Returns the size of the frequency array. + * @param id - ap id * @return WifiErrorNo */ -WifiErrorNo GetValidFrequenciesForBand(int32_t band, int *frequencies, int32_t *size); +WifiErrorNo GetValidFrequenciesForBand(int32_t band, int *frequencies, int32_t *size, int id); /** * @Description Set the power mode. * * @param mode - power mode. + * @param id - ap id * @return WifiErrorNo */ -WifiErrorNo WifiSetPowerModel(const int mode); +WifiErrorNo WifiSetPowerModel(const int mode, int id); /** * @Description Get the power mode. * * @param mode - power mode. + * @param id - ap id * @return WifiErrorNo */ -WifiErrorNo WifiGetPowerModel(int* mode); +WifiErrorNo WifiGetPowerModel(int* mode, int id); #ifdef __cplusplus } #endif diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_callback.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_callback.c index 0f4e55d..c2e0485 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_callback.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_callback.c @@ -159,13 +159,13 @@ void WifiHalCbNotifyWpsTimeOut(int event) return; } -void WifiHalCbStaJoin(const char *content) +void WifiHalCbStaJoin(const char *content, int id) { if (content == NULL) { LOGD("Get hostapd Sta join content is NULL"); return; } - LOGD("Get hostapd Sta join"); + LOGD("Get hostapd Sta join, instance id:%{public}d", id); WifiHalEvent event; char tmpBuf[WIFI_BSSID_LENGTH] = {0}; if (strncmp("AP-STA-CONNECTED", content, strlen("AP-STA-CONNECTED")) == 0) { @@ -182,19 +182,20 @@ void WifiHalCbStaJoin(const char *content) LOGE("hostapd create callback message failed!"); return; } + pCbkMsg->msg.ifMsg.id = id; pCbkMsg->msg.ifMsg.type = event; StrSafeCopy(pCbkMsg->msg.ifMsg.ifname, sizeof(pCbkMsg->msg.ifMsg.ifname), tmpBuf); EmitEventCallbackMsg(pCbkMsg, event); return; } -void WifiHalCbApState(const char *content) +void WifiHalCbApState(const char *content, int id) { if (content == NULL) { LOGD("Get hostapd status changed content is NULL"); return; } - LOGD("Get hostapd status changed"); + LOGD("Get hostapd status changed, instance id:%{public}d", id); WifiHalEvent event; if (strncmp(content, "AP-ENABLED", strlen("AP-ENABLED")) == 0) { event = WIFI_AP_ENABLE_EVENT; @@ -204,12 +205,15 @@ void WifiHalCbApState(const char *content) } else { return; } - RpcServer *server = GetRpcServer(); - if (server == NULL) { - LOGE("Rpc server not exists!"); + + WifiHalEventCallbackMsg *pCbkMsg = (WifiHalEventCallbackMsg *)calloc(1, sizeof(WifiHalEventCallbackMsg)); + if (pCbkMsg == NULL) { + LOGE("hostapd create callback message failed!"); return; } - EmitEvent(server, event); + pCbkMsg->msg.ifMsg.type = event; + pCbkMsg->msg.ifMsg.id = id; + EmitEventCallbackMsg(pCbkMsg, event); return; } diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_callback.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_callback.h index bafeda8..9cff116 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_callback.h +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_callback.h @@ -79,20 +79,22 @@ void WifiHalCbNotifyWpsTimeOut(int event); * @Description Wi-Fi Hal calls back the STA to join the AP. * * @param content + * @param id - ap id */ -void WifiHalCbStaJoin(const char *content); +void WifiHalCbStaJoin(const char *content, int id); /** * @Description Wi-Fi Hal callback AP status. * * @param content */ -void WifiHalCbApState(const char *content); +void WifiHalCbApState(const char *content, int id); /** * @Description wpa_supplicant client connection result event * * @param state - event value + * @param id - ap id */ void WifiP2pHalCbNotifyConnectSupplicant(int state); diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_ap.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_ap.c index 09d37fb..258a032 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_ap.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_ap.c @@ -22,7 +22,12 @@ int RpcStartSoftAp(RpcServer *server, Context *context) if (server == NULL || context == NULL) { return HAL_FAILURE; } - WifiErrorNo err = StartSoftAp(); + int id = 0; + if (ReadInt(context, &id) < 0 || id < 0) { + return HAL_FAILURE; + } + + WifiErrorNo err = StartSoftAp(id); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); @@ -34,7 +39,12 @@ int RpcStopSoftAp(RpcServer *server, Context *context) if (server == NULL || context == NULL) { return HAL_FAILURE; } - WifiErrorNo err = StopSoftAp(); + int id = 0; + if (ReadInt(context, &id) < 0 || id < 0) { + return HAL_FAILURE; + } + + WifiErrorNo err = StopSoftAp(id); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); @@ -46,6 +56,7 @@ int RpcSetHostapdConfig(RpcServer *server, Context *context) if (server == NULL || context == NULL) { return HAL_FAILURE; } + int id = 0; HostapdConfig config; if (memset_s(&config, sizeof(config), 0, sizeof(config)) != EOK) { return HAL_FAILURE; @@ -55,10 +66,10 @@ int RpcSetHostapdConfig(RpcServer *server, Context *context) ReadStr(context, config.preSharedKey, sizeof(config.preSharedKey)) != 0 || ReadInt(context, &config.preSharedKeyLen) < 0 || ReadInt(context, &config.securityType) < 0 || ReadInt(context, &config.band) < 0 || ReadInt(context, &config.channel) < 0 || - ReadInt(context, &config.maxConn) < 0) { + ReadInt(context, &config.maxConn) < 0 || ReadInt(context, &id) < 0 || id < 0) { return HAL_FAILURE; } - WifiErrorNo err = SetHostapdConfig(&config); + WifiErrorNo err = SetHostapdConfig(&config, id); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); @@ -71,14 +82,15 @@ int RpcGetStaInfos(RpcServer *server, Context *context) return HAL_FAILURE; } int maxSize = 0; - if (ReadInt(context, &maxSize) < 0 || maxSize <= 0) { + int id = 0; + if (ReadInt(context, &maxSize) < 0 || maxSize <= 0 || ReadInt(context, &id) < 0 || id < 0) { return HAL_FAILURE; } char *infos = (char *)calloc(maxSize, sizeof(char)); if (infos == NULL) { return HAL_FAILURE; } - WifiErrorNo err = GetStaInfos(infos, &maxSize); + WifiErrorNo err = GetStaInfos(infos, &maxSize, id); WriteBegin(context, 0); WriteInt(context, err); if (err == WIFI_HAL_SUCCESS) { @@ -97,10 +109,11 @@ int RpcSetCountryCode(RpcServer *server, Context *context) return HAL_FAILURE; } char countryCode[WIFI_COUNTRY_CODE_MAXLEN + 1] = {0}; - if (ReadStr(context, countryCode, sizeof(countryCode)) != 0) { + int id = 0; + if (ReadStr(context, countryCode, sizeof(countryCode)) != 0 || ReadInt(context, &id) < 0 || id < 0) { return HAL_FAILURE; } - WifiErrorNo err = SetCountryCode(countryCode); + WifiErrorNo err = SetCountryCode(countryCode, id); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); @@ -113,6 +126,7 @@ int RpcSetMacFilter(RpcServer *server, Context *context) return HAL_FAILURE; } int lenMac = 0; + int id = 0; if (ReadInt(context, &lenMac) < 0 || lenMac <= 0) { return HAL_FAILURE; } @@ -121,12 +135,12 @@ int RpcSetMacFilter(RpcServer *server, Context *context) if (mac == NULL) { return HAL_FAILURE; } - if (ReadUStr(context, mac, len) != 0) { + if (ReadUStr(context, mac, len) != 0 || ReadInt(context, &id) < 0 || id < 0) { free(mac); mac = NULL; return HAL_FAILURE; } - WifiErrorNo err = SetMacFilter(mac, lenMac); + WifiErrorNo err = SetMacFilter(mac, lenMac, id); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); @@ -141,6 +155,7 @@ int RpcDelMacFilter(RpcServer *server, Context *context) return HAL_FAILURE; } int lenMac = 0; + int id = 0; if (ReadInt(context, &lenMac) < 0 || lenMac <= 0) { return HAL_FAILURE; } @@ -149,12 +164,12 @@ int RpcDelMacFilter(RpcServer *server, Context *context) if (mac == NULL) { return HAL_FAILURE; } - if (ReadUStr(context, mac, len) != 0) { + if (ReadUStr(context, mac, len) != 0 || ReadInt(context, &id) < 0 || id < 0) { free(mac); mac = NULL; return HAL_FAILURE; } - WifiErrorNo err = DelMacFilter(mac, lenMac); + WifiErrorNo err = DelMacFilter(mac, lenMac, id); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); @@ -169,6 +184,7 @@ int RpcDisassociateSta(RpcServer *server, Context *context) return HAL_FAILURE; } int lenMac = 0; + int id = 0; if (ReadInt(context, &lenMac) < 0 || lenMac <= 0) { return HAL_FAILURE; } @@ -178,12 +194,12 @@ int RpcDisassociateSta(RpcServer *server, Context *context) return HAL_FAILURE; } - if (ReadUStr(context, mac, len) != 0) { + if (ReadUStr(context, mac, len) != 0 || ReadInt(context, &id) < 0 || id < 0) { free(mac); mac = NULL; return HAL_FAILURE; } - WifiErrorNo err = DisassociateSta(mac, lenMac); + WifiErrorNo err = DisassociateSta(mac, lenMac, id); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); @@ -199,7 +215,9 @@ int RpcGetValidFrequenciesForBand(RpcServer *server, Context *context) } int band = 0; int size = 0; - if (ReadInt(context, &band) < 0 || ReadInt(context, &size) < 0) { + int id = 0; + if (ReadInt(context, &band) < 0 || ReadInt(context, &size) < 0 || + ReadInt(context, &id) < 0 || id < 0) { return HAL_FAILURE; } if (size <= 0) { @@ -209,7 +227,7 @@ int RpcGetValidFrequenciesForBand(RpcServer *server, Context *context) if (frequencies == NULL) { return HAL_FAILURE; } - WifiErrorNo err = GetValidFrequenciesForBand(band, frequencies, &size); + WifiErrorNo err = GetValidFrequenciesForBand(band, frequencies, &size, id); WriteBegin(context, 0); WriteInt(context, err); if (err == WIFI_HAL_SUCCESS) { @@ -233,7 +251,11 @@ int RpcSetPowerModel(RpcServer *server, Context *context) if (ReadInt(context, &mode) < 0) { return HAL_FAILURE; } - WifiErrorNo err = WifiSetPowerModel(mode); + int id = 0; + if (ReadInt(context, &id) < 0) { + return HAL_FAILURE; + } + WifiErrorNo err = WifiSetPowerModel(mode, id); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); @@ -246,7 +268,11 @@ int RpcGetPowerModel(RpcServer *server, Context *context) return HAL_FAILURE; } int mode = -1; - WifiErrorNo err = WifiGetPowerModel(&mode); + int id = 0; + if (ReadInt(context, &id) < 0) { + return HAL_FAILURE; + } + WifiErrorNo err = WifiGetPowerModel(&mode, id); WriteBegin(context, 0); WriteInt(context, err); if (err == WIFI_HAL_SUCCESS) { diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_common.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_common.c index 05c6325..7f4238e 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_common.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_common.c @@ -19,6 +19,7 @@ #include "wifi_hal_ap_interface.h" #include "wifi_hal_p2p_interface.h" #include "wifi_hal_define.h" +#include "wifi_hostapd_hal.h" int RpcRegisterEventCallback(RpcServer *server, Context *context) { @@ -74,7 +75,9 @@ int RpcNotifyClear(RpcServer *server, Context *context) return HAL_FAILURE; } ForceStop(); - StopSoftAp(); + for (int id = 0; id < AP_MAX_INSTANCE; id++) { + StopSoftAp(id); + } P2pForceStop(); WriteBegin(context, 0); WriteInt(context, 0); diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.c index d201df7..8081454 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.c @@ -461,6 +461,7 @@ static void DealIfaceCbk(int event, Context *context) { WifiHalEventCallbackMsg *cbmsg = FrontCallbackMsg(event); if (cbmsg != NULL) { + WriteInt(context, cbmsg->msg.ifMsg.id); WriteInt(context, cbmsg->msg.ifMsg.type); WriteStr(context, cbmsg->msg.ifMsg.ifname); } @@ -493,6 +494,8 @@ static void DealStaApCallback(int event, Context *context) case WIFI_ADD_IFACE_EVENT: case WIFI_STA_JOIN_EVENT: case WIFI_STA_LEAVE_EVENT: + case WIFI_AP_ENABLE_EVENT: + case WIFI_AP_DISABLE_EVENT: DealIfaceCbk(event, context); break; case WIFI_SCAN_INFO_NOTIFY_EVENT: diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.h index 2a58ea1..606b934 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.h +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.h @@ -70,6 +70,7 @@ void SetRpcServerInited(RpcServer *server); RpcServer *GetRpcServer(void); typedef struct WifiHalCbIFaceMsg { + int id; int type; char ifname[WIFI_IFACE_NAME_MAXLEN]; } WifiHalCbIFaceMsg; diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.c index 27ac14f..598c076 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.c @@ -29,16 +29,38 @@ #undef LOG_TAG #define LOG_TAG "WifiHostapdHal" -#define CONFIG_PATH_DIR "/data/misc/wifi/wpa_supplicant" - /** * Blocklist configuration file name. This parameter is used by hostapd in an earlier version. */ #define CONFIG_DENY_MAC_FILE_NAME "deny_mac.conf" #define SLEEP_TIME_100_MS (100 * 1000) - -WifiHostapdHalDevice *g_hostapdHalDev = NULL; /* Global Variable */ - +#define CONFIG_PATH_DIR "/data/misc/wifi/wpa_supplicant" +#if (AP_NUM > 1) +#define WIFI_5G_CFG "hostapd_0.conf" +#define WIFI_2G_CFG "hostapd_1.conf" +#define HOSTAPD_5G_CFG "/data/misc/wifi/wpa_supplicant/"WIFI_5G_CFG +#define HOSTAPD_2G_CFG "/data/misc/wifi/wpa_supplicant/"WIFI_2G_CFG +#define HOSTAPD_5G_UDPPORT "127.0.0.1:9866" +#define HOSTAPD_2G_UDPPORT "127.0.0.1:9877" + +WifiHostapdHalDeviceInfo g_hostapdHalDevInfo[] = { + {AP_5G_MAIN_INSTANCE, NULL, WIFI_5G_CFG, HOSTAPD_5G_CFG, HOSTAPD_5G_UDPPORT}, + {AP_2G_MAIN_INSTANCE, NULL, WIFI_2G_CFG, HOSTAPD_2G_CFG, HOSTAPD_2G_UDPPORT}, +}; +#else +#define WIFI_DEFAULT_CFG "hostapd.conf" +#define HOSTAPD_DEFAULT_CFG "/data/misc/wifi/wpa_supplicant/"WIFI_DEFAULT_CFG +#define HOSTAPD_DEFAULT_UDPPORT "127.0.0.1:9877" +WifiHostapdHalDeviceInfo g_hostapdHalDevInfo[] = { + {AP_2G_MAIN_INSTANCE, NULL, WIFI_DEFAULT_CFG, HOSTAPD_DEFAULT_CFG, HOSTAPD_DEFAULT_UDPPORT} +}; +#endif + +WifiHostapdHalDeviceInfo *GetWifiCfg(int *len) +{ + *len = sizeof(g_hostapdHalDevInfo) / sizeof(WifiHostapdHalDeviceInfo); + return g_hostapdHalDevInfo; +} /* * The wpa_ctrl_pending interface provided by the WPA does not wait for the response. * As a result, the CPU usage is high. Reconstructed @@ -65,24 +87,25 @@ static int MyWpaCtrlPending(struct wpa_ctrl *ctrl) } } -static void DelCallbackMessage(const char *msg) +static void DelCallbackMessage(const char *msg, int id) { if (msg == NULL) { return; } if (strncmp(msg, AP_STA_CONNECTED, strlen(AP_STA_CONNECTED)) == 0 || strncmp(msg, AP_STA_DISCONNECTED, strlen(AP_STA_DISCONNECTED)) == 0) { - WifiHalCbStaJoin(msg); + WifiHalCbStaJoin(msg, id); } else if (strncmp(msg, AP_EVENT_ENABLED, strlen(AP_EVENT_ENABLED)) == 0 || strncmp(msg, AP_EVENT_DISABLED, strlen(AP_EVENT_DISABLED)) == 0 || strncmp(msg, WPA_EVENT_TERMINATING, strlen(WPA_EVENT_TERMINATING)) == 0) { - if (strncmp(msg, AP_EVENT_DISABLED, strlen(AP_EVENT_DISABLED)) == 0 && g_hostapdHalDev->execDisable == 1) { - g_hostapdHalDev->execDisable = 0; + if (strncmp(msg, AP_EVENT_DISABLED, strlen(AP_EVENT_DISABLED)) == 0 && + g_hostapdHalDevInfo[id].hostapdHalDev->execDisable == 1) { + g_hostapdHalDevInfo[id].hostapdHalDev->execDisable = 0; return; } - WifiHalCbApState(msg); + WifiHalCbApState(msg, id); if (strncmp(msg, WPA_EVENT_TERMINATING, strlen(WPA_EVENT_TERMINATING)) == 0) { - g_hostapdHalDev->threadRunFlag = 0; + g_hostapdHalDevInfo[id].hostapdHalDev->threadRunFlag = 0; } } } @@ -92,13 +115,19 @@ static void *HostapdReceiveCallback(void *arg) if (arg == NULL) { return NULL; } - struct wpa_ctrl *ctrl = arg; + WifiHostapdHalDeviceInfo *halDeviceInfo = arg; + int id = halDeviceInfo->id; + if (halDeviceInfo->hostapdHalDev == NULL || + halDeviceInfo->hostapdHalDev->ctrlRecv) { + return NULL; + } + struct wpa_ctrl *ctrl = halDeviceInfo->hostapdHalDev->ctrlRecv; char *buf = (char *)calloc(BUFSIZE_RECV, sizeof(char)); if (buf == NULL) { LOGE("In hostapd deal receive message thread, failed to calloc buff!"); return NULL; } - while (g_hostapdHalDev->threadRunFlag) { + while (g_hostapdHalDevInfo[id].hostapdHalDev->threadRunFlag) { int ret = MyWpaCtrlPending(ctrl); if (ret < 0) { LOGE("hostapd thread get event message failed!"); @@ -124,7 +153,7 @@ static void *HostapdReceiveCallback(void *arg) p = strchr(p, '>'); (p == NULL) ? (p = buf) : (p++); } - DelCallbackMessage(p); + DelCallbackMessage(p, id); } free(buf); buf = NULL; @@ -132,60 +161,68 @@ static void *HostapdReceiveCallback(void *arg) return NULL; } -void ReleaseHostapdCtrl(void) +void ReleaseHostapdCtrl(int id) { - if (g_hostapdHalDev == NULL) { + if (g_hostapdHalDevInfo[id].hostapdHalDev == NULL) { return; } - if (g_hostapdHalDev->ctrlConn != NULL) { - wpa_ctrl_close(g_hostapdHalDev->ctrlConn); - g_hostapdHalDev->ctrlConn = NULL; + if (g_hostapdHalDevInfo[id].hostapdHalDev->ctrlConn != NULL) { + wpa_ctrl_close(g_hostapdHalDevInfo[id].hostapdHalDev->ctrlConn); + g_hostapdHalDevInfo[id].hostapdHalDev->ctrlConn = NULL; } - if (g_hostapdHalDev->ctrlRecv != NULL) { - wpa_ctrl_close(g_hostapdHalDev->ctrlRecv); - g_hostapdHalDev->ctrlRecv = NULL; + if (g_hostapdHalDevInfo[id].hostapdHalDev->ctrlRecv != NULL) { + wpa_ctrl_close(g_hostapdHalDevInfo[id].hostapdHalDev->ctrlRecv); + g_hostapdHalDevInfo[id].hostapdHalDev->ctrlRecv = NULL; } return; } -int InitHostapdCtrl(const char *ifname) +int InitHostapdCtrl(const char *ifname, int id) { - if (g_hostapdHalDev == NULL || ifname == NULL) { + if (g_hostapdHalDevInfo[id].hostapdHalDev == NULL || ifname == NULL) { return -1; } int flag = 0; do { - g_hostapdHalDev->ctrlConn = wpa_ctrl_open(ifname); - g_hostapdHalDev->ctrlRecv = wpa_ctrl_open(ifname); - if (g_hostapdHalDev->ctrlConn == NULL || g_hostapdHalDev->ctrlRecv == NULL) { + g_hostapdHalDevInfo[id].hostapdHalDev->ctrlConn = wpa_ctrl_open(ifname); + g_hostapdHalDevInfo[id].hostapdHalDev->ctrlRecv = wpa_ctrl_open(ifname); + if (g_hostapdHalDevInfo[id].hostapdHalDev->ctrlConn == NULL || + g_hostapdHalDevInfo[id].hostapdHalDev->ctrlRecv == NULL) { LOGE("open hostapd control interface failed!"); break; } - if (wpa_ctrl_attach(g_hostapdHalDev->ctrlRecv) != 0) { + if (wpa_ctrl_attach(g_hostapdHalDevInfo[id].hostapdHalDev->ctrlRecv) != 0) { LOGE("attach hostapd monitor interface failed!"); break; } flag += 1; } while (0); if (!flag) { - ReleaseHostapdCtrl(); + ReleaseHostapdCtrl(id); return -1; } return 0; } -static int HostapdCliConnect(void) +void GetDestPort(char *destPort, size_t len, int id) { - if (g_hostapdHalDev == NULL) { + strcpy_s(destPort, len, g_hostapdHalDevInfo[id].udpPort); +} + +static int HostapdCliConnect(int id) +{ + if (g_hostapdHalDevInfo[id].hostapdHalDev == NULL) { return -1; } - if (g_hostapdHalDev->ctrlConn != NULL) { + if (g_hostapdHalDevInfo[id].hostapdHalDev->ctrlConn != NULL) { LOGE("Hostapd already initialized!"); return 0; } int retryCount = 20; + char ifname[BUFFER_SIZE_64] = {0}; + GetDestPort(ifname, sizeof(ifname), id); while (retryCount-- > 0) { - int ret = InitHostapdCtrl(AP_INTF); + int ret = InitHostapdCtrl(ifname, id); if (ret == 0) { LOGD("Global hostapd interface connect successfully!"); break; @@ -197,29 +234,30 @@ static int HostapdCliConnect(void) if (retryCount <= 0) { return -1; } - g_hostapdHalDev->threadRunFlag = 1; - if (pthread_create(&g_hostapdHalDev->tid, NULL, HostapdReceiveCallback, g_hostapdHalDev->ctrlRecv) != 0) { - g_hostapdHalDev->threadRunFlag = 0; - ReleaseHostapdCtrl(); + g_hostapdHalDevInfo[id].hostapdHalDev->threadRunFlag = 1; + if (pthread_create(&g_hostapdHalDevInfo[id].hostapdHalDev->tid, NULL, + HostapdReceiveCallback, &g_hostapdHalDevInfo[id]) != 0) { + g_hostapdHalDevInfo[id].hostapdHalDev->threadRunFlag = 0; + ReleaseHostapdCtrl(id); LOGE("Create hostapd monitor thread failed!"); return -1; } return 0; } -static int HostapdCliClose(void) +static int HostapdCliClose(int id) { - if (g_hostapdHalDev == NULL) { + if (g_hostapdHalDevInfo[id].hostapdHalDev == NULL) { return 0; } - if (g_hostapdHalDev->ctrlConn != NULL) { - g_hostapdHalDev->threadRunFlag = 0; - pthread_join(g_hostapdHalDev->tid, NULL); - g_hostapdHalDev->tid = 0; - wpa_ctrl_close(g_hostapdHalDev->ctrlRecv); - g_hostapdHalDev->ctrlRecv = NULL; - wpa_ctrl_close(g_hostapdHalDev->ctrlConn); - g_hostapdHalDev->ctrlConn = NULL; + if (g_hostapdHalDevInfo[id].hostapdHalDev->ctrlConn != NULL) { + g_hostapdHalDevInfo[id].hostapdHalDev->threadRunFlag = 0; + pthread_join(g_hostapdHalDevInfo[id].hostapdHalDev->tid, NULL); + g_hostapdHalDevInfo[id].hostapdHalDev->tid = 0; + wpa_ctrl_close(g_hostapdHalDevInfo[id].hostapdHalDev->ctrlRecv); + g_hostapdHalDevInfo[id].hostapdHalDev->ctrlRecv = NULL; + wpa_ctrl_close(g_hostapdHalDevInfo[id].hostapdHalDev->ctrlConn); + g_hostapdHalDevInfo[id].hostapdHalDev->ctrlConn = NULL; } return 0; } @@ -248,13 +286,13 @@ static int WpaCtrlCommand(struct wpa_ctrl *ctrl, const char *cmd, char *buf, siz return 0; } -static int EnableAp(void) +static int EnableAp(int id) { char buf[BUFSIZE_REQUEST_SMALL] = {0}; - return WpaCtrlCommand(g_hostapdHalDev->ctrlConn, "ENABLE", buf, sizeof(buf)); + return WpaCtrlCommand(g_hostapdHalDevInfo[id].hostapdHalDev->ctrlConn, "ENABLE", buf, sizeof(buf)); } -static int SetApName(const char *name) +static int SetApName(const char *name, int id) { if (name == NULL) { return -1; @@ -265,10 +303,10 @@ static int SetApName(const char *name) if (sprintf_s(cmd, sizeof(cmd), "SET ssid %s", name) < 0) { return -1; } - return WpaCtrlCommand(g_hostapdHalDev->ctrlConn, cmd, buf, sizeof(buf)); + return WpaCtrlCommand(g_hostapdHalDevInfo[id].hostapdHalDev->ctrlConn, cmd, buf, sizeof(buf)); } -static int SetApRsnPairwise(const char *type) +static int SetApRsnPairwise(const char *type, int id) { if (type == NULL) { return -1; @@ -280,10 +318,10 @@ static int SetApRsnPairwise(const char *type) if (sprintf_s(cmd, sizeof(cmd), "SET rsn_pairwise %s", type) < 0) { return -1; } - return WpaCtrlCommand(g_hostapdHalDev->ctrlConn, cmd, buf, sizeof(buf)); + return WpaCtrlCommand(g_hostapdHalDevInfo[id].hostapdHalDev->ctrlConn, cmd, buf, sizeof(buf)); } -static int SetApWpaPairwise(const char *type) +static int SetApWpaPairwise(const char *type, int id) { if (type == NULL) { return -1; @@ -294,10 +332,10 @@ static int SetApWpaPairwise(const char *type) if (sprintf_s(cmd, sizeof(cmd), "SET wpa_pairwise %s", type) < 0) { return -1; } - return WpaCtrlCommand(g_hostapdHalDev->ctrlConn, cmd, buf, sizeof(buf)); + return WpaCtrlCommand(g_hostapdHalDevInfo[id].hostapdHalDev->ctrlConn, cmd, buf, sizeof(buf)); } -static int SetApWpaKeyMgmt(const char *type) +static int SetApWpaKeyMgmt(const char *type, int id) { if (type == NULL) { return -1; @@ -308,10 +346,10 @@ static int SetApWpaKeyMgmt(const char *type) if (sprintf_s(cmd, sizeof(cmd), "SET wpa_key_mgmt %s", type) < 0) { return -1; } - return WpaCtrlCommand(g_hostapdHalDev->ctrlConn, cmd, buf, sizeof(buf)); + return WpaCtrlCommand(g_hostapdHalDevInfo[id].hostapdHalDev->ctrlConn, cmd, buf, sizeof(buf)); } -static int SetApWpaValue(int securityType) +static int SetApWpaValue(int securityType, int id) { int retval = -1; char cmd[BUFSIZE_CMD] = {0}; @@ -335,25 +373,25 @@ static int SetApWpaValue(int securityType) return -1; } - retval = WpaCtrlCommand(g_hostapdHalDev->ctrlConn, cmd, buf, sizeof(buf)); + retval = WpaCtrlCommand(g_hostapdHalDevInfo[id].hostapdHalDev->ctrlConn, cmd, buf, sizeof(buf)); if (retval == 0 && securityType != NONE) { /* * If the value of wpa is switched between 0, 1, and 2, the wpa_key_mgmt, * wpa_pairwise, and rsn_pairwise attributes must be set. Otherwise, the * enable or STA cannot be connected. */ - retval = SetApWpaKeyMgmt("WPA-PSK"); + retval = SetApWpaKeyMgmt("WPA-PSK", id); } if (retval == 0 && securityType == WPA_PSK) { - retval = SetApWpaPairwise("CCMP"); + retval = SetApWpaPairwise("CCMP", id); } if (retval == 0 && securityType == WPA2_PSK) { - retval = SetApRsnPairwise("CCMP"); + retval = SetApRsnPairwise("CCMP", id); } return retval; } -static int SetApPasswd(const char *pass) +static int SetApPasswd(const char *pass, int id) { if (pass == NULL) { return -1; @@ -364,10 +402,10 @@ static int SetApPasswd(const char *pass) if (sprintf_s(cmd, sizeof(cmd), "SET wpa_passphrase %s", pass) < 0) { return -1; } - return WpaCtrlCommand(g_hostapdHalDev->ctrlConn, cmd, buf, sizeof(buf)); + return WpaCtrlCommand(g_hostapdHalDevInfo[id].hostapdHalDev->ctrlConn, cmd, buf, sizeof(buf)); } -static int SetApChannel(int channel) +static int SetApChannel(int channel, int id) { char cmd[BUFSIZE_CMD] = {0}; char buf[BUFSIZE_REQUEST_SMALL] = {0}; @@ -375,10 +413,10 @@ static int SetApChannel(int channel) if (sprintf_s(cmd, sizeof(cmd), "SET channel %d", channel) < 0) { return -1; } - return WpaCtrlCommand(g_hostapdHalDev->ctrlConn, cmd, buf, sizeof(buf)); + return WpaCtrlCommand(g_hostapdHalDevInfo[id].hostapdHalDev->ctrlConn, cmd, buf, sizeof(buf)); } -static int SetApBand(int band) +static int SetApBand(int band, int id) { char cmd[BUFSIZE_CMD] = {0}; char buf[BUFSIZE_REQUEST_SMALL] = {0}; @@ -402,10 +440,10 @@ static int SetApBand(int band) if (sprintf_s(cmd, sizeof(cmd), "SET hw_mode %s", hwMode) < 0) { return -1; } - return WpaCtrlCommand(g_hostapdHalDev->ctrlConn, cmd, buf, sizeof(buf)); + return WpaCtrlCommand(g_hostapdHalDevInfo[id].hostapdHalDev->ctrlConn, cmd, buf, sizeof(buf)); } -static int SetApMaxConn(int maxConn) +static int SetApMaxConn(int maxConn, int id) { char cmd[BUFSIZE_CMD] = {0}; char buf[BUFSIZE_REQUEST_SMALL] = {0}; @@ -413,10 +451,10 @@ static int SetApMaxConn(int maxConn) if (sprintf_s(cmd, sizeof(cmd), "SET max_num_sta %d", maxConn) < 0) { return -1; } - return WpaCtrlCommand(g_hostapdHalDev->ctrlConn, cmd, buf, sizeof(buf)); + return WpaCtrlCommand(g_hostapdHalDevInfo[id].hostapdHalDev->ctrlConn, cmd, buf, sizeof(buf)); } -static int SetApInfo(HostapdConfig *info) +static int SetApInfo(HostapdConfig *info, int id) { if (info == NULL) { return -1; @@ -428,42 +466,42 @@ static int SetApInfo(HostapdConfig *info) LOGE("password is invalid!"); return retval; } - if ((retval = SetApPasswd((char *)info->preSharedKey)) != 0) { + if ((retval = SetApPasswd((char *)info->preSharedKey, id)) != 0) { LOGE("SetApPasswd failed. retval %{public}d", retval); return retval; } } - if ((retval = SetApName((char *)info->ssid)) != 0) { + if ((retval = SetApName((char *)info->ssid, id)) != 0) { LOGE("SetApName failed. retval %{public}d", retval); return retval; } - if ((retval = SetApWpaValue(info->securityType)) != 0) { + if ((retval = SetApWpaValue(info->securityType, id)) != 0) { LOGE("SetApWpaValue failed. retval %{public}d", retval); return retval; } - if ((retval = SetApBand(info->band)) != 0) { + if ((retval = SetApBand(info->band, id)) != 0) { LOGE("SetApBand failed. retval %{public}d", retval); return retval; } - if ((retval = SetApChannel(info->channel)) != 0) { + if ((retval = SetApChannel(info->channel, id)) != 0) { LOGE("SetApChannel failed. retval %{public}d", retval); return retval; } - if (info->maxConn >= 0 && (retval = SetApMaxConn(info->maxConn)) != 0) { + if (info->maxConn >= 0 && (retval = SetApMaxConn(info->maxConn, id)) != 0) { LOGE("SetApMaxConn failed. retval %{public}d", retval); return retval; } return 0; } -static int DisableAp(void) +static int DisableAp(int id) { char buf[BUFSIZE_REQUEST_SMALL] = {0}; - g_hostapdHalDev->execDisable = 1; - return WpaCtrlCommand(g_hostapdHalDev->ctrlConn, "DISABLE", buf, sizeof(buf)); + g_hostapdHalDevInfo[id].hostapdHalDev->execDisable = 1; + return WpaCtrlCommand(g_hostapdHalDevInfo[id].hostapdHalDev->ctrlConn, "DISABLE", buf, sizeof(buf)); } -static int ModBlockList(const char *mac) +static int ModBlockList(const char *mac, int id) { if (mac == NULL) { return -1; @@ -486,10 +524,10 @@ static int ModBlockList(const char *mac) if (sprintf_s(cmd, sizeof(cmd), "SET deny_mac_file %s/%s", CONFIG_PATH_DIR, CONFIG_DENY_MAC_FILE_NAME) < 0) { return -1; } - return WpaCtrlCommand(g_hostapdHalDev->ctrlConn, cmd, buf, sizeof(buf)); + return WpaCtrlCommand(g_hostapdHalDevInfo[id].hostapdHalDev->ctrlConn, cmd, buf, sizeof(buf)); } -static int AddBlocklist(const char *mac) +static int AddBlocklist(const char *mac, int id) { if (mac == NULL) { return -1; @@ -500,7 +538,7 @@ static int AddBlocklist(const char *mac) if (snprintf_s(cmd, sizeof(cmd), sizeof(cmd) - 1, "DENY_ACL ADD_MAC %s", mac) < 0) { return -1; } - if (WpaCtrlCommand(g_hostapdHalDev->ctrlConn, cmd, buf, sizeof(buf)) != 0) { + if (WpaCtrlCommand(g_hostapdHalDevInfo[id].hostapdHalDev->ctrlConn, cmd, buf, sizeof(buf)) != 0) { LOGE("AddBlocklist Failed"); return -1; } @@ -509,12 +547,12 @@ static int AddBlocklist(const char *mac) /** * The hostapd of an earlier version does not support the DENY_ACL command and uses the configuration file. */ - return ModBlockList(mac); + return ModBlockList(mac, id); } return 0; } -static int DelBlocklist(const char *mac) +static int DelBlocklist(const char *mac, int id) { if (mac == NULL) { return -1; @@ -525,7 +563,7 @@ static int DelBlocklist(const char *mac) if (sprintf_s(cmd, sizeof(cmd), "DENY_ACL DEL_MAC %s", mac) < 0) { return -1; } - if (WpaCtrlCommand(g_hostapdHalDev->ctrlConn, cmd, buf, sizeof(buf)) != 0) { + if (WpaCtrlCommand(g_hostapdHalDevInfo[id].hostapdHalDev->ctrlConn, cmd, buf, sizeof(buf)) != 0) { LOGE("DelBlocklist Failed"); return -1; } @@ -534,12 +572,12 @@ static int DelBlocklist(const char *mac) if (sprintf_s(cmd, sizeof(cmd), "-%s", mac) < 0) { return -1; } - return ModBlockList(cmd); + return ModBlockList(cmd, id); } return 0; } -static int GetApStatus(StatusInfo *info) +static int GetApStatus(StatusInfo *info, int id) { if (info == NULL) { return -1; @@ -549,7 +587,7 @@ static int GetApStatus(StatusInfo *info) return -1; } - if (WpaCtrlCommand(g_hostapdHalDev->ctrlConn, "STATUS", buf, BUFSIZE_RECV) != 0) { + if (WpaCtrlCommand(g_hostapdHalDevInfo[id].hostapdHalDev->ctrlConn, "STATUS", buf, BUFSIZE_RECV) != 0) { LOGE("Status WpaCtrlCommand failed"); free(buf); buf = NULL; @@ -575,7 +613,7 @@ static int GetApStatus(StatusInfo *info) return 0; } -static int ShowConnectedDevList(char *buf, int size) +static int ShowConnectedDevList(char *buf, int size, int id) { if (buf == NULL) { return -1; @@ -585,7 +623,8 @@ static int ShowConnectedDevList(char *buf, int size) if (reqBuf == NULL) { return -1; } - if (WpaCtrlCommand(g_hostapdHalDev->ctrlConn, "STA-FIRST", reqBuf, BUFSIZE_REQUEST) != 0) { + if (WpaCtrlCommand(g_hostapdHalDevInfo[id].hostapdHalDev->ctrlConn, "STA-FIRST", + reqBuf, BUFSIZE_REQUEST) != 0) { LOGE("HostapdCliCmdListSta Failed"); free(reqBuf); reqBuf = NULL; @@ -614,19 +653,19 @@ static int ShowConnectedDevList(char *buf, int size) if (snprintf_s(cmd, sizeof(cmd), sizeof(cmd) - 1, "STA-NEXT %s", reqBuf) < 0) { break; } - } while (WpaCtrlCommand(g_hostapdHalDev->ctrlConn, cmd, reqBuf, BUFSIZE_REQUEST) == 0); + } while (WpaCtrlCommand(g_hostapdHalDevInfo[id].hostapdHalDev->ctrlConn, cmd, reqBuf, BUFSIZE_REQUEST) == 0); free(reqBuf); reqBuf = NULL; return 0; } -static int ReloadApConfigInfo(void) +static int ReloadApConfigInfo(int id) { char buf[BUFSIZE_REQUEST_SMALL] = {0}; - return WpaCtrlCommand(g_hostapdHalDev->ctrlConn, "RELOAD", buf, sizeof(buf)); + return WpaCtrlCommand(g_hostapdHalDevInfo[id].hostapdHalDev->ctrlConn, "RELOAD", buf, sizeof(buf)); } -static int DisConnectedDev(const char *mac) +static int DisConnectedDev(const char *mac, int id) { if (mac == NULL) { return -1; @@ -637,10 +676,10 @@ static int DisConnectedDev(const char *mac) if (sprintf_s(cmd, sizeof(cmd), "DISASSOCIATE %s", mac) < 0) { return -1; } - return WpaCtrlCommand(g_hostapdHalDev->ctrlConn, cmd, buf, sizeof(buf)); + return WpaCtrlCommand(g_hostapdHalDevInfo[id].hostapdHalDev->ctrlConn, cmd, buf, sizeof(buf)); } -static int SetCountryCode(const char *code) +static int SetCountryCode(const char *code, int id) { if (code == NULL) { return -1; @@ -651,55 +690,61 @@ static int SetCountryCode(const char *code) if (sprintf_s(cmd, sizeof(cmd), "SET country_code %s", code) < 0) { return -1; } - return WpaCtrlCommand(g_hostapdHalDev->ctrlConn, cmd, buf, sizeof(buf)); + return WpaCtrlCommand(g_hostapdHalDevInfo[id].hostapdHalDev->ctrlConn, cmd, buf, sizeof(buf)); } -static int InitHostapdHal(void) +static int InitHostapdHal(int id) { - if (g_hostapdHalDev == NULL) { + if (g_hostapdHalDevInfo[id].hostapdHalDev == NULL) { return -1; } - g_hostapdHalDev->threadRunFlag = 1; - if (HostapdCliConnect() != 0) { + g_hostapdHalDevInfo[id].hostapdHalDev->threadRunFlag = 1; + if (HostapdCliConnect(id) != 0) { return -1; } return 0; } -WifiHostapdHalDevice *GetWifiHostapdDev(void) +WifiHostapdHalDevice *GetWifiHostapdDev(int id) { - if (g_hostapdHalDev != NULL) { - return g_hostapdHalDev; + if (id < 0 || id >= AP_MAX_INSTANCE) { + return NULL; } - g_hostapdHalDev = (WifiHostapdHalDevice *)calloc(1, sizeof(WifiHostapdHalDevice)); - if (g_hostapdHalDev == NULL) { - LOGE("NULL device on open"); + + if (g_hostapdHalDevInfo[id].hostapdHalDev != NULL) { + return g_hostapdHalDevInfo[id].hostapdHalDev; + } + + g_hostapdHalDevInfo[id].hostapdHalDev = (WifiHostapdHalDevice *)calloc(1, sizeof(WifiHostapdHalDevice)); + if (g_hostapdHalDevInfo[id].hostapdHalDev == NULL) { return NULL; } + /* ************ Register hostapd_cli Interface ************************* */ - g_hostapdHalDev->enableAp = EnableAp; - g_hostapdHalDev->disableAp = DisableAp; - g_hostapdHalDev->setApInfo = SetApInfo; - g_hostapdHalDev->addBlocklist = AddBlocklist; - g_hostapdHalDev->delBlocklist = DelBlocklist; - g_hostapdHalDev->status = GetApStatus; - g_hostapdHalDev->showConnectedDevList = ShowConnectedDevList; - g_hostapdHalDev->reloadApConfigInfo = ReloadApConfigInfo; - g_hostapdHalDev->disConnectedDev = DisConnectedDev; - g_hostapdHalDev->setCountryCode = SetCountryCode; - if (InitHostapdHal() != 0) { - free(g_hostapdHalDev); - g_hostapdHalDev = NULL; + g_hostapdHalDevInfo[id].hostapdHalDev->enableAp = EnableAp; + g_hostapdHalDevInfo[id].hostapdHalDev->disableAp = DisableAp; + g_hostapdHalDevInfo[id].hostapdHalDev->setApInfo = SetApInfo; + g_hostapdHalDevInfo[id].hostapdHalDev->addBlocklist = AddBlocklist; + g_hostapdHalDevInfo[id].hostapdHalDev->delBlocklist = DelBlocklist; + g_hostapdHalDevInfo[id].hostapdHalDev->status = GetApStatus; + g_hostapdHalDevInfo[id].hostapdHalDev->showConnectedDevList = ShowConnectedDevList; + g_hostapdHalDevInfo[id].hostapdHalDev->reloadApConfigInfo = ReloadApConfigInfo; + g_hostapdHalDevInfo[id].hostapdHalDev->disConnectedDev = DisConnectedDev; + g_hostapdHalDevInfo[id].hostapdHalDev->setCountryCode = SetCountryCode; + + if (InitHostapdHal(id) != 0) { + free(g_hostapdHalDevInfo[id].hostapdHalDev); + g_hostapdHalDevInfo[id].hostapdHalDev = NULL; return NULL; } - return g_hostapdHalDev; + return g_hostapdHalDevInfo[id].hostapdHalDev; } -void ReleaseHostapdDev(void) +void ReleaseHostapdDev(int id) { - if (g_hostapdHalDev != NULL) { - HostapdCliClose(); - free(g_hostapdHalDev); - g_hostapdHalDev = NULL; + if (g_hostapdHalDevInfo[id].hostapdHalDev != NULL) { + HostapdCliClose(id); + free(g_hostapdHalDevInfo[id].hostapdHalDev); + g_hostapdHalDevInfo[id].hostapdHalDev = NULL; } } diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.h index 408ce0e..f92c44c 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.h +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.h @@ -39,6 +39,19 @@ extern "C" { #define BUFFER_SIZE_32 32 #define BUFFER_SIZE_16 16 +#if (AP_NUM > 1) +typedef enum EnApInstance { + AP_5G_MAIN_INSTANCE, + AP_2G_MAIN_INSTANCE, + AP_MAX_INSTANCE +} ApInstance; +#else +typedef enum EnApInstance { + AP_2G_MAIN_INSTANCE, + AP_MAX_INSTANCE +} ApInstance; +#endif + typedef struct StStatusInfo { char state[BUFFER_SIZE_16]; char phy[BUFFER_SIZE_16]; @@ -57,30 +70,45 @@ typedef struct StWifiHostapdHalDevice { pthread_t tid; int threadRunFlag; int execDisable; - int (*setApInfo)(HostapdConfig *info); - int (*enableAp)(void); - int (*disableAp)(void); - int (*addBlocklist)(const char *mac); - int (*delBlocklist)(const char *mac); - int (*status)(StatusInfo *info); - int (*showConnectedDevList)(char *info, int size); - int (*reloadApConfigInfo)(void); - int (*disConnectedDev)(const char *mac); - int (*setCountryCode)(const char *code); + int (*setApInfo)(HostapdConfig *info, int id); + int (*enableAp)(int id); + int (*disableAp)(int id); + int (*addBlocklist)(const char *mac, int id); + int (*delBlocklist)(const char *mac, int id); + int (*status)(StatusInfo *info, int id); + int (*showConnectedDevList)(char *info, int size, int id); + int (*reloadApConfigInfo)(int id); + int (*disConnectedDev)(const char *mac, int id); + int (*setCountryCode)(const char *code, int id); } WifiHostapdHalDevice; +typedef struct StWifiHostapdHalDeviceInfo { + int id; + WifiHostapdHalDevice *hostapdHalDev; + char *cfgName; + char *config; + char *udpPort; +} WifiHostapdHalDeviceInfo; + +WifiHostapdHalDeviceInfo *GetWifiCfg(int *len); /** * @Description Get the Wifi Hostapd Dev object. * * @return WifiHostapdHalDevice* */ -WifiHostapdHalDevice *GetWifiHostapdDev(void); +WifiHostapdHalDevice *GetWifiHostapdDev(int id); /** * @Description Release the Wifi Hostapd Dev object. * */ -void ReleaseHostapdDev(void); +void ReleaseHostapdDev(int id); + +/** + * @Description Hostpad string concatenation. + * + */ +void GetDestPort(char *destPort, size_t len, int id); #ifdef __cplusplus } diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn index e31e9da..61490a2 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn @@ -98,8 +98,14 @@ ohos_unittest("manager_unittest") { "ipc:ipc_core", "netmanager_base:net_conn_manager_if", ] + + defines = [ "AP_INSTANCE_MAX_NUM=$wifi_feature_with_ap_num" ] configs = [ ":module_private_config" ] + if (wifi_feature_with_auth_disable) { + defines += [ "PERMISSION_ALWAYS_GRANT" ] + } + part_name = "wifi" subsystem_name = "communication" testonly = true diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn index cbe49b8..4917a0d 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn @@ -102,7 +102,15 @@ ohos_unittest("WifiApServiceTest") { "//utils/native/base:utils", ] external_deps = [ "hiviewdfx_hilog_native:libhilog" ] - defines = [ "AP_INTF=\"$wifi_feature_with_ap_intf\"" ] + defines = [ + "AP_INTF=\"$wifi_feature_with_ap_intf\"", + "AP_INSTANCE_MAX_NUM=$wifi_feature_with_ap_num", + ] + + if (wifi_feature_with_dhcp_disable) { + defines += [ "WIFI_DHCP_DISABLED" ] + } + part_name = "wifi" subsystem_name = "communication" } diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn index 4dbeb6c..3b5e01c 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn @@ -152,6 +152,8 @@ ohos_unittest("wifi_p2p_test") { "ipc:ipc_core", "netmanager_base:net_conn_manager_if", ] + + defines = [ "AP_INSTANCE_MAX_NUM=$wifi_feature_with_ap_num" ] part_name = "wifi" subsystem_name = "communication" } diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn index 673ae37..9ea8d6b 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn @@ -90,6 +90,7 @@ ohos_unittest("wifi_scan_unittest") { "//third_party/googletest:gmock_main", "//utils/native/base:utils", ] + defines = [ "AP_INSTANCE_MAX_NUM=$wifi_feature_with_ap_num" ] external_deps = [ "hiviewdfx_hilog_native:libhilog" ] part_name = "wifi" subsystem_name = "communication" diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn index 4a4a411..8d51f62 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn @@ -118,6 +118,7 @@ ohos_unittest("wifi_sta_unittest") { "hiviewdfx_hilog_native:libhilog", "netmanager_base:net_conn_manager_if", ] + defines = [ "AP_INSTANCE_MAX_NUM=$wifi_feature_with_ap_num" ] part_name = "wifi" subsystem_name = "communication" } diff --git a/wifi/wifi.gni b/wifi/wifi.gni index 9b965cb..843834b 100644 --- a/wifi/wifi.gni +++ b/wifi/wifi.gni @@ -20,4 +20,7 @@ DHCP_ROOT_DIR = "$SUBSYSTEM_DIR/wifi/dhcp" declare_args() { wifi_feature_with_p2p = true wifi_feature_with_ap_intf = "wlan0" + wifi_feature_with_ap_num = 1 + wifi_feature_with_auth_disable = false + wifi_feature_with_dhcp_disable = false } diff --git a/wifi/wifi_lite.gni b/wifi/wifi_lite.gni index 67a2f53..e6125f1 100644 --- a/wifi/wifi_lite.gni +++ b/wifi/wifi_lite.gni @@ -21,4 +21,7 @@ DHCP_ROOT_DIR = "$SUBSYSTEM_DIR/wifi/dhcp" declare_args() { wifi_feature_with_p2p = false wifi_feature_with_ap_intf = "wlan0" + wifi_feature_with_ap_num = 1 + wifi_feature_with_auth_disable = false + wifi_feature_with_dhcp_disable = false } -- Gitee From f70904dd95db79e669c13ba845de6391707b283c Mon Sep 17 00:00:00 2001 From: shiqichang Date: Fri, 17 Jun 2022 17:13:22 +0800 Subject: [PATCH 200/491] =?UTF-8?q?aafwk=E7=9B=AE=E5=BD=95=E8=BD=AC?= =?UTF-8?q?=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: shiqichang Change-Id: Id3df21c580f69796ab6bbf45ace140d0c4eaf4a1 --- wifi/frameworks/js/napi/BUILD.gn | 12 ++++++------ wifi/wifi.gni | 3 +-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/wifi/frameworks/js/napi/BUILD.gn b/wifi/frameworks/js/napi/BUILD.gn index bb61334..a88f511 100644 --- a/wifi/frameworks/js/napi/BUILD.gn +++ b/wifi/frameworks/js/napi/BUILD.gn @@ -26,7 +26,7 @@ ohos_shared_library("wifi") { "//base/security/access_token/interfaces/innerkits/accesstoken/include", "$WIFI_ROOT_DIR/frameworks/native/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", - "${aafwk_kits_path}/appkit/native/ability_runtime/context", + "${aafwk_path}/interfaces/kits/native/appkit/ability_runtime/context", "$WIFI_ROOT_DIR/utils/inc", "$WIFI_ROOT_DIR/frameworks/js/napi/inc", ] @@ -42,7 +42,7 @@ ohos_shared_library("wifi") { deps = [ "$WIFI_ROOT_DIR/frameworks/native:wifi_sdk", "$WIFI_ROOT_DIR/utils/src:wifi_utils", - "${aafwk_kits_path}/appkit:app_context", + "${aafwk_path}/frameworks/native/appkit:app_context", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//foundation/arkui/napi:ace_napi", "//utils/native/base:utils", @@ -70,7 +70,7 @@ ohos_shared_library("wifiext") { "$WIFI_ROOT_DIR/frameworks/native/include", "$WIFI_ROOT_DIR/frameworks/native/interfaces", "$WIFI_ROOT_DIR/frameworks/js/napi/inc", - "//foundation/ability/ability_runtime/frameworks/kits/appkit/native/ability_runtime/context", + "//foundation/ability/ability_runtime/interfaces/kits/native/appkit/ability_runtime/context", ] sources = [ @@ -81,7 +81,7 @@ ohos_shared_library("wifiext") { deps = [ "$WIFI_ROOT_DIR/frameworks/native:wifi_sdk", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//foundation/ability/ability_runtime/frameworks/kits/appkit:app_context", + "//foundation/ability/ability_runtime/frameworks/native/appkit:app_context", "//foundation/arkui/napi:ace_napi", "//utils/native/base:utils", ] @@ -109,7 +109,7 @@ ohos_shared_library("wifi_native_js") { "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", "//base/security/access_token/interfaces/innerkits/accesstoken/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", - "${aafwk_kits_path}/appkit/native/ability_runtime/context", + "${aafwk_path}/interfaces/kits/native/appkit/ability_runtime/context", "$WIFI_ROOT_DIR/utils/inc", ] @@ -124,7 +124,7 @@ ohos_shared_library("wifi_native_js") { deps = [ "$WIFI_ROOT_DIR/frameworks/native:wifi_sdk", "$WIFI_ROOT_DIR/utils/src:wifi_utils", - "${aafwk_kits_path}/appkit:app_context", + "${aafwk_path}/frameworks/native/appkit:app_context", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//foundation/arkui/napi:ace_napi", "//utils/native/base:utils", diff --git a/wifi/wifi.gni b/wifi/wifi.gni index 9b965cb..bb30e37 100644 --- a/wifi/wifi.gni +++ b/wifi/wifi.gni @@ -11,8 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -aafwk_kits_path = "//foundation/ability/ability_runtime/frameworks/kits" - +aafwk_path = "//foundation/ability/ability_runtime" SUBSYSTEM_DIR = "//foundation/communication" WIFI_ROOT_DIR = "$SUBSYSTEM_DIR/wifi/wifi" DHCP_ROOT_DIR = "$SUBSYSTEM_DIR/wifi/dhcp" -- Gitee From d25b1bee9b635356311b309bf340af3e51eb052e Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Tue, 21 Jun 2022 11:38:42 +0000 Subject: [PATCH 201/491] fix compile problem for WGR Signed-off-by: zhangfeng --- wifi/utils/inc/wifi_common_util.h | 1 + 1 file changed, 1 insertion(+) diff --git a/wifi/utils/inc/wifi_common_util.h b/wifi/utils/inc/wifi_common_util.h index 0919f17..445aaf9 100644 --- a/wifi/utils/inc/wifi_common_util.h +++ b/wifi/utils/inc/wifi_common_util.h @@ -16,6 +16,7 @@ #ifndef OHOS_WIFI_COMMON_UTIL_H #define OHOS_WIFI_COMMON_UTIL_H +#include #include #include #include "securec.h" -- Gitee From 38cfd6a8aca7dcd377a91da4436c4161d46487dd Mon Sep 17 00:00:00 2001 From: zhoushicheng Date: Thu, 23 Jun 2022 16:07:58 +0800 Subject: [PATCH 202/491] aafwk->ability_runtime Signed-off-by: zhoushicheng Change-Id: I0076e09d42bc5341aca9f64332ac1065eff48b6e --- wifi/frameworks/js/napi/BUILD.gn | 12 ++++++------ wifi/wifi.gni | 2 +- wifi/wifi_lite.gni | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/wifi/frameworks/js/napi/BUILD.gn b/wifi/frameworks/js/napi/BUILD.gn index bb61334..4f6317c 100644 --- a/wifi/frameworks/js/napi/BUILD.gn +++ b/wifi/frameworks/js/napi/BUILD.gn @@ -26,7 +26,7 @@ ohos_shared_library("wifi") { "//base/security/access_token/interfaces/innerkits/accesstoken/include", "$WIFI_ROOT_DIR/frameworks/native/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", - "${aafwk_kits_path}/appkit/native/ability_runtime/context", + "${ability_runtime_kits_path}/appkit/native/ability_runtime/context", "$WIFI_ROOT_DIR/utils/inc", "$WIFI_ROOT_DIR/frameworks/js/napi/inc", ] @@ -42,7 +42,7 @@ ohos_shared_library("wifi") { deps = [ "$WIFI_ROOT_DIR/frameworks/native:wifi_sdk", "$WIFI_ROOT_DIR/utils/src:wifi_utils", - "${aafwk_kits_path}/appkit:app_context", + "${ability_runtime_kits_path}/appkit:app_context", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//foundation/arkui/napi:ace_napi", "//utils/native/base:utils", @@ -70,7 +70,7 @@ ohos_shared_library("wifiext") { "$WIFI_ROOT_DIR/frameworks/native/include", "$WIFI_ROOT_DIR/frameworks/native/interfaces", "$WIFI_ROOT_DIR/frameworks/js/napi/inc", - "//foundation/ability/ability_runtime/frameworks/kits/appkit/native/ability_runtime/context", + "${ability_runtime_kits_path}/appkit/native/ability_runtime/context", ] sources = [ @@ -81,7 +81,7 @@ ohos_shared_library("wifiext") { deps = [ "$WIFI_ROOT_DIR/frameworks/native:wifi_sdk", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//foundation/ability/ability_runtime/frameworks/kits/appkit:app_context", + "${ability_runtime_kits_path}/appkit:app_context", "//foundation/arkui/napi:ace_napi", "//utils/native/base:utils", ] @@ -109,7 +109,7 @@ ohos_shared_library("wifi_native_js") { "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", "//base/security/access_token/interfaces/innerkits/accesstoken/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", - "${aafwk_kits_path}/appkit/native/ability_runtime/context", + "${ability_runtime_kits_path}/appkit/native/ability_runtime/context", "$WIFI_ROOT_DIR/utils/inc", ] @@ -124,7 +124,7 @@ ohos_shared_library("wifi_native_js") { deps = [ "$WIFI_ROOT_DIR/frameworks/native:wifi_sdk", "$WIFI_ROOT_DIR/utils/src:wifi_utils", - "${aafwk_kits_path}/appkit:app_context", + "${ability_runtime_kits_path}/appkit:app_context", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//foundation/arkui/napi:ace_napi", "//utils/native/base:utils", diff --git a/wifi/wifi.gni b/wifi/wifi.gni index 843834b..b421298 100644 --- a/wifi/wifi.gni +++ b/wifi/wifi.gni @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -aafwk_kits_path = "//foundation/ability/ability_runtime/frameworks/kits" +ability_runtime_kits_path = "//foundation/ability/ability_runtime/frameworks/kits" SUBSYSTEM_DIR = "//foundation/communication" WIFI_ROOT_DIR = "$SUBSYSTEM_DIR/wifi/wifi" diff --git a/wifi/wifi_lite.gni b/wifi/wifi_lite.gni index e6125f1..bff52a3 100644 --- a/wifi/wifi_lite.gni +++ b/wifi/wifi_lite.gni @@ -11,8 +11,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -aaservices_path = "//foundation/ability/ability_runtime/services" -aainnerkits_path = "//foundation/ability/ability_runtime/interfaces/inner_api" +ability_runtime_services_path = "//foundation/ability/ability_runtime/services" +ability_runtime_innerkits_path = "//foundation/ability/ability_runtime/interfaces/inner_api" SUBSYSTEM_DIR = "//foundation/communication" WIFI_ROOT_DIR = "$SUBSYSTEM_DIR/wifi/wifi" -- Gitee From dacdaad2c569f4d2b73170bc48bd7d78ae4f1666 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=81=E7=8C=AB?= Date: Fri, 24 Jun 2022 12:36:38 +0800 Subject: [PATCH 203/491] fix AVALIABLE to AVAILABLE MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 老猫 --- wifi/interfaces/kits/c/wifi_event.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wifi/interfaces/kits/c/wifi_event.h b/wifi/interfaces/kits/c/wifi_event.h index 5a83f43..be37f75 100644 --- a/wifi/interfaces/kits/c/wifi_event.h +++ b/wifi/interfaces/kits/c/wifi_event.h @@ -104,9 +104,9 @@ typedef struct { */ typedef enum { /** Unavailable state */ - WIFI_STATE_NOT_AVALIABLE = 0, + WIFI_STATE_NOT_AVAILABLE = 0, /** Available state */ - WIFI_STATE_AVALIABLE + WIFI_STATE_AVAILABLE } WifiEventState; #ifdef __cplusplus -- Gitee From 3351eeb81c58fb4c8924e3b46b89523081ab9c54 Mon Sep 17 00:00:00 2001 From: y00316381 Date: Fri, 24 Jun 2022 18:48:47 +0800 Subject: [PATCH 204/491] bugfix from master 0624 Signed-off-by: y00316381 --- .../frameworks/js/napi/src/wifi_napi_device.cpp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp index 78f2f20..0affa79 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp @@ -151,6 +151,23 @@ static ErrCode NativeScanInfosToJsObj(const napi_env& env, for (auto& each : vecScnIanfos) { napi_value eachObj; napi_create_object(env, &eachObj); + + NativeEngine *engine = reinterpret_cast(env); + std::vector int32key = {"securityType", "rssi", "band", "frequency", "channelWidth", "timestamp"}; + std::vector int32Val = {static_cast(SecurityTypeNativeToJs(each.securityType)), + each.rssi, each.band, each.frequency, static_cast(each.channelWidth), each.timestamp}; + + std::vector strKey = {"ssid", "bssid", "capabilities"}; + std::vector strVal = {each.ssid.c_str(), each.bssid.c_str(), each.capabilities.c_str()}; + + std::vector int64key = {"timestamp"}; + std::vector int64Val = {each.timestamp}; + + NativePropertyMessage mes(int32key, int32Val, int64key, int64Val, strKey, strVal); + NativeValue *obj = engine->CreateObjectFromProperties(mes); + + napi_value eachObj = reinterpret_cast(mes); + SetValueUtf8String(env, "ssid", each.ssid.c_str(), eachObj); SetValueUtf8String(env, "bssid", each.bssid.c_str(), eachObj); SetValueUtf8String(env, "capabilities", each.capabilities.c_str(), eachObj); -- Gitee From 75e79fe96afdbe03193abb79ce7f44987122e5c2 Mon Sep 17 00:00:00 2001 From: lujunxin Date: Mon, 27 Jun 2022 20:19:12 +0800 Subject: [PATCH 205/491] enable persistent for p2p Signed-off-by: lujunxin --- .../native/interfaces/wifi_p2p_msg.h | 4 +++ wifi/frameworks/native/src/wifi_p2p_msg.cpp | 12 ++++++++- .../idl_interface/i_wifi_p2p_iface.c | 3 ++- .../idl_client/idl_interface/i_wifi_struct.h | 1 + .../idl_client/wifi_idl_client.cpp | 1 + .../wifi_p2p/p2p_group_operating_state.cpp | 2 ++ .../wifi_p2p/p2p_state_machine.cpp | 25 +++++++++++++------ .../wifi_hal/etc/init/p2p_supplicant.conf | 1 + .../wifi_hal/wifi_hal_crpc_p2p.c | 3 ++- .../wpa_p2p_hal/wifi_p2p_hal.c | 2 ++ .../wifi_hal/wifi_hal_p2p_struct.h | 3 ++- 11 files changed, 46 insertions(+), 11 deletions(-) diff --git a/wifi/frameworks/native/interfaces/wifi_p2p_msg.h b/wifi/frameworks/native/interfaces/wifi_p2p_msg.h index 6594df7..e85f3db 100644 --- a/wifi/frameworks/native/interfaces/wifi_p2p_msg.h +++ b/wifi/frameworks/native/interfaces/wifi_p2p_msg.h @@ -165,6 +165,7 @@ class WifiP2pDevice { public: WifiP2pDevice() : deviceName(""), + networkName(""), mDeviceAddress(""), primaryDeviceType(""), secondaryDeviceType(""), @@ -177,6 +178,8 @@ public: {} void SetDeviceName(const std::string &setDeviceName); const std::string &GetDeviceName() const; + void SetNetworkName(const std::string &name); + const std::string &GetNetworkName() const; void SetDeviceAddress(const std::string &deviceAddress); const std::string &GetDeviceAddress() const; void SetPrimaryDeviceType(const std::string &setPrimaryDeviceType); @@ -207,6 +210,7 @@ public: private: std::string deviceName; /* the value range is 0 to 32 characters. */ + std::string networkName; /* oper_ssid of peer device */ std::string mDeviceAddress; /* the device MAC address, the length is 17 characters. */ std::string primaryDeviceType; std::string secondaryDeviceType; diff --git a/wifi/frameworks/native/src/wifi_p2p_msg.cpp b/wifi/frameworks/native/src/wifi_p2p_msg.cpp index ab8ca57..1cfd6a0 100644 --- a/wifi/frameworks/native/src/wifi_p2p_msg.cpp +++ b/wifi/frameworks/native/src/wifi_p2p_msg.cpp @@ -93,6 +93,16 @@ const std::string &WifiP2pDevice::GetDeviceName() const return deviceName; } +void WifiP2pDevice::SetNetworkName(const std::string &name) +{ + networkName = name; +} + +const std::string &WifiP2pDevice::GetNetworkName() const +{ + return networkName; +} + void WifiP2pDevice::SetDeviceAddress(const std::string &deviceAddress) { mDeviceAddress = deviceAddress; @@ -815,4 +825,4 @@ void P2pVendorConfig::SetSecondaryDeviceType(const std::string &setSecondaryDevi secondaryDeviceType = setSecondaryDeviceType; } } // namespace Wifi -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_p2p_iface.c b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_p2p_iface.c index aa65481..abb159c 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_p2p_iface.c +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_p2p_iface.c @@ -969,6 +969,7 @@ WifiErrorNo P2pGetPeer(const char *deviceAddress, P2pDeviceInfo *peerInfo) ReadInt(context, &peerInfo->configMethods); ReadInt(context, &peerInfo->deviceCapabilities); ReadInt(context, &peerInfo->groupCapabilities); + ReadStr(context, peerInfo->operSsid, sizeof(peerInfo->operSsid)); } ReadClientEnd(client); UnlockRpcClient(client); @@ -1104,4 +1105,4 @@ WifiErrorNo Hid2dConnect(Hid2dConnectInfo *info) ReadClientEnd(client); UnlockRpcClient(client); return result; -} \ No newline at end of file +} diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_struct.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_struct.h index 32b6297..2084dc8 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_struct.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_struct.h @@ -223,6 +223,7 @@ typedef struct P2pDeviceInfo { int groupCapabilities; char wfdDeviceInfo[WIFI_P2P_WFD_DEVICE_INFO_LENGTH]; unsigned int wfdLength; + char operSsid[WIFI_P2P_DEVICE_NAME_LENGTH]; } P2pDeviceInfo; typedef struct P2pGroupInfo { diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp index 8c111e1..c233638 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp @@ -1533,6 +1533,7 @@ WifiErrorNo WifiIdlClient::ReqGetP2pPeer(const std::string &deviceAddress, WifiP device.SetWpsConfigMethod(peerInfo.configMethods); device.SetDeviceCapabilitys(peerInfo.deviceCapabilities); device.SetGroupCapabilitys(peerInfo.groupCapabilities); + device.SetNetworkName(peerInfo.operSsid); } return ret; } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.cpp index c7579f1..13af799 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.cpp @@ -83,6 +83,7 @@ bool P2pGroupOperatingState::ProcessCmdCreateGroup(const InternalMessage &msg) c WIFI_LOGW("Some configuration settings failed!"); } ret = WifiP2PHalInterface::GetInstance().GroupAdd(true, netId, freq); + (void)WifiP2PHalInterface::GetInstance().SaveConfig(); } } else if (netId == PERSISTENT_NET_ID || netId == TEMPORARY_NET_ID) { /** @@ -287,6 +288,7 @@ bool P2pGroupOperatingState::ProcessCmdDeleteGroup(const InternalMessage &msg) c } ret = WifiP2PHalInterface::GetInstance().RemoveNetwork(networkId); + (void)WifiP2PHalInterface::GetInstance().SaveConfig(); groupManager.RemoveGroup(group); if (ret) { WIFI_LOGE("P2P group deletion failed."); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp index d319054..e73a7f9 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp @@ -220,9 +220,16 @@ bool P2pStateMachine::ReawakenPersistentGroup(WifiP2pConfigInternal &config) con } bool isJoin = device.IsGroupOwner(); - const std::string groupName = config.GetGroupName(); + std::string groupName = config.GetGroupName(); if (isJoin && !device.IsGroupLimit()) { + if (groupName.empty()) { + WifiP2pDevice peerInfo; + if (WifiP2PHalInterface::GetInstance().GetP2pPeer(config.GetDeviceAddress(), peerInfo) == + WifiErrorNo::WIFI_IDL_OPT_OK) { + groupName = peerInfo.GetNetworkName(); + } + } int networkId = groupManager.GetGroupNetworkId(device, groupName); if (networkId >= 0) { /** @@ -250,9 +257,9 @@ bool P2pStateMachine::ReawakenPersistentGroup(WifiP2pConfigInternal &config) con if (config.GetNetId() >= 0) { if (config.GetDeviceAddress() == groupManager.GetGroupOwnerAddr(config.GetNetId())) { networkId = config.GetNetId(); - } else { - networkId = groupManager.GetGroupNetworkId(device); } + } else { + networkId = groupManager.GetGroupNetworkId(device); } if (networkId < 0) { /** @@ -880,7 +887,8 @@ bool P2pStateMachine::DealCreateNewGroupWithConfig(const WifiP2pConfigInternal & WIFI_LOGD("Remove network %{public}d!", createdNetId); WifiP2PHalInterface::GetInstance().RemoveNetwork(createdNetId); } - + + (void)WifiP2PHalInterface::GetInstance().SaveConfig(); return (ret == WIFI_IDL_OPT_FAILED) ? false : true ; } @@ -892,14 +900,17 @@ bool P2pStateMachine::IsInterfaceReuse() const void P2pStateMachine::UpdateGroupInfoToWpa() const { WIFI_LOGI("Start update group info to wpa"); - /* In the scenario of interface reuse, the configuration of sta may be deleted */ - if (!IsInterfaceReuse()) { + std::vector grpInfo = groupManager.GetGroups(); + /* 1) In the scenario of interface reuse, the configuration of sta may be deleted + * 2) Dont remove p2p networks of wpa_s in initial phase after device reboot + */ + if (!IsInterfaceReuse() && grpInfo.size() > 0) { if (WifiP2PHalInterface::GetInstance().RemoveNetwork(-1) != WIFI_IDL_OPT_OK) { WIFI_LOGE("Failed to delete all group info before update group info to wpa! Stop update!"); return; } } - std::vector grpInfo = groupManager.GetGroups(); + int createdNetId = -1; WifiP2pGroupInfo grpBuf; IdlP2pGroupConfig wpaConfig; diff --git a/wifi/services/wifi_standard/wifi_hal/etc/init/p2p_supplicant.conf b/wifi/services/wifi_standard/wifi_hal/etc/init/p2p_supplicant.conf index e7df567..b6dd282 100644 --- a/wifi/services/wifi_standard/wifi_hal/etc/init/p2p_supplicant.conf +++ b/wifi/services/wifi_standard/wifi_hal/etc/init/p2p_supplicant.conf @@ -26,3 +26,4 @@ serial_number=0123456789ABCDEF p2p_ssid_postfix=-ohos p2p_go_ht40=1 p2p_go_vht=1 +update_config=1 diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_p2p.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_p2p.c index 2a98344..32f19c5 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_p2p.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_p2p.c @@ -790,6 +790,7 @@ int RpcP2pGetPeer(RpcServer *server, Context *context) WriteInt(context, peerInfo.configMethods); WriteInt(context, peerInfo.deviceCapabilities); WriteInt(context, peerInfo.groupCapabilities); + WriteStr(context, peerInfo.operSsid); } WriteEnd(context); return HAL_SUCCESS; @@ -933,4 +934,4 @@ int RpcP2pHid2dConnect(RpcServer *server, Context *context) WriteInt(context, err); WriteEnd(context); return HAL_SUCCESS; -} \ No newline at end of file +} diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal/wifi_p2p_hal.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal/wifi_p2p_hal.c index 6705634..d76c4be 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal/wifi_p2p_hal.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal/wifi_p2p_hal.c @@ -1122,6 +1122,8 @@ static P2pSupplicantErrCode WpaP2pCliCmdP2pGetPeer( peerInfo->deviceCapabilities = Hex2Dec(retMsg.value); } else if (strncmp(retMsg.key, "group_capab", strlen("group_capab")) == 0) { peerInfo->groupCapabilities = Hex2Dec(retMsg.value); + } else if (strncmp(retMsg.key, "oper_ssid", strlen("oper_ssid")) == 0) { + StrSafeCopy(peerInfo->operSsid, sizeof(peerInfo->operSsid), retMsg.value); } token = strtok_r(NULL, "\n", &savedPtr); diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_p2p_struct.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_p2p_struct.h index f7bcfab..1114fe3 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_p2p_struct.h +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_p2p_struct.h @@ -46,6 +46,7 @@ typedef struct P2pDeviceInfo { char primaryDeviceType[WIFI_P2P_DEVICE_TYPE_LENGTH]; char deviceName[WIFI_P2P_DEVICE_NAME_LENGTH]; char wfdDeviceInfo[WIFI_P2P_WFD_DEVICE_INFO_LENGTH]; + char operSsid[WIFI_P2P_DEVICE_NAME_LENGTH]; } P2pDeviceInfo; typedef struct P2pGroupInfo { @@ -155,4 +156,4 @@ typedef struct Hid2dConnectInfo { #ifdef __cplusplus } #endif -#endif \ No newline at end of file +#endif -- Gitee From 28d8b78f662978a02b9cbddc8ccd7d5673c59981 Mon Sep 17 00:00:00 2001 From: Neil Chen Date: Mon, 27 Jun 2022 16:14:54 +0800 Subject: [PATCH 206/491] update API descriptions Signed-off-by: Neil Chen --- .../interfaces/i_dhcp_client_service.h | 2 +- .../interfaces/i_dhcp_result_notify.h | 4 +- .../interfaces/i_dhcp_server_service.h | 2 +- .../inner_api/interfaces/i_dhcp_service.h | 2 +- .../include/dhcp_client_service_impl.h | 3 +- .../native/c_adapter/inc/wifi_c_utils.h | 2 +- wifi/frameworks/native/include/wifi_device.h | 5 +- wifi/frameworks/native/include/wifi_hid2d.h | 24 +++--- wifi/frameworks/native/include/wifi_hotspot.h | 3 +- wifi/frameworks/native/include/wifi_p2p.h | 59 +++++++------- wifi/frameworks/native/include/wifi_scan.h | 5 +- .../native/interfaces/i_wifi_device.h | 2 +- .../frameworks/native/interfaces/i_wifi_p2p.h | 78 +++++++++--------- wifi/frameworks/native/src/wifi_device_impl.h | 2 +- .../frameworks/native/src/wifi_device_proxy.h | 2 +- wifi/frameworks/native/src/wifi_p2p_impl.h | 78 +++++++++--------- wifi/frameworks/native/src/wifi_p2p_proxy.h | 78 +++++++++--------- wifi/interfaces/kits/c/wifi_hid2d.h | 26 +++--- wifi/interfaces/kits/c/wifi_p2p.h | 49 ++++++------ .../wifi_manage/wifi_hotspot_service_impl.h | 2 +- .../wifi_framework/wifi_manage/wifi_manager.h | 2 +- .../wifi_manage/wifi_p2p/ip2p_service.h | 58 +++++++------- .../wifi_manage/wifi_p2p/p2p_interface.h | 58 +++++++------- .../wifi_manage/wifi_p2p/wifi_p2p_service.h | 58 +++++++------- .../wifi_manage/wifi_p2p_service_impl.h | 80 +++++++++---------- .../wifi_manage/wifi_protect_manager.h | 2 +- .../wifi_hal/wifi_hal_ap_interface.c | 2 +- 27 files changed, 341 insertions(+), 347 deletions(-) diff --git a/dhcp/interfaces/inner_api/interfaces/i_dhcp_client_service.h b/dhcp/interfaces/inner_api/interfaces/i_dhcp_client_service.h index 10d17cf..4f471d9 100644 --- a/dhcp/interfaces/inner_api/interfaces/i_dhcp_client_service.h +++ b/dhcp/interfaces/inner_api/interfaces/i_dhcp_client_service.h @@ -69,7 +69,7 @@ public: * @Description : Obtain the dhcp result of specified interface asynchronously. * * @param ifname - interface name, eg:wlan0 [in] - * @param dhcp - dhcp result notify [in] + * @param pResultNotify - dhcp result notify [in] * @param timeouts - timeout interval [in] * @Return : success - DHCP_OPT_SUCCESS, failed - others. */ diff --git a/dhcp/interfaces/inner_api/interfaces/i_dhcp_result_notify.h b/dhcp/interfaces/inner_api/interfaces/i_dhcp_result_notify.h index 2cc03ba..c1cb933 100644 --- a/dhcp/interfaces/inner_api/interfaces/i_dhcp_result_notify.h +++ b/dhcp/interfaces/inner_api/interfaces/i_dhcp_result_notify.h @@ -30,7 +30,7 @@ public: virtual ~IDhcpResultNotify() {} /** - * @Description : Get success the dhcp result of specified interface. + * @Description : Get the success dhcp result of specified interface. * * @param status - success : DHCP_OPT_SUCCESS, failed : DHCP_OPT_FAILED, timeout : DHCP_OPT_TIMEOUT [in] * @param ifname - interface name, eg:wlan0 [in] @@ -39,7 +39,7 @@ public: virtual void OnSuccess(int status, const std::string& ifname, DhcpResult& result) = 0; /** - * @Description : Get failed the dhcp result of specified interface. + * @Description : Get the failed dhcp result of specified interface. * * @param status - success : DHCP_OPT_SUCCESS, failed : DHCP_OPT_FAILED, timeout : DHCP_OPT_TIMEOUT [in] * @param ifname - interface name, eg:wlan0 [in] diff --git a/dhcp/interfaces/inner_api/interfaces/i_dhcp_server_service.h b/dhcp/interfaces/inner_api/interfaces/i_dhcp_server_service.h index d402bfe..d7ffde0 100644 --- a/dhcp/interfaces/inner_api/interfaces/i_dhcp_server_service.h +++ b/dhcp/interfaces/inner_api/interfaces/i_dhcp_server_service.h @@ -90,7 +90,7 @@ public: virtual int RemoveAllDhcpRange(const std::string& tagName) = 0; /** - * @Description : Set dhcp ip address pool of specified interface. + * @Description : Set dhcp ip address range of specified interface. * * @param ifname - interface name, eg:wlan0 [in] * @param range - ip address range [in] diff --git a/dhcp/interfaces/inner_api/interfaces/i_dhcp_service.h b/dhcp/interfaces/inner_api/interfaces/i_dhcp_service.h index 036bcc8..d3181bd 100644 --- a/dhcp/interfaces/inner_api/interfaces/i_dhcp_service.h +++ b/dhcp/interfaces/inner_api/interfaces/i_dhcp_service.h @@ -62,7 +62,7 @@ public: * @Description : Obtain the dhcp result of specified interface asynchronously. * * @param ifname - interface name, eg:wlan0 [in] - * @param dhcp - dhcp result notify [in] + * @param pResultNotify - dhcp result notify [in] * @param timeouts - timeout interval [in] * @Return : success - DHCP_OPT_SUCCESS, failed - others. */ diff --git a/dhcp/services/mgr_service/include/dhcp_client_service_impl.h b/dhcp/services/mgr_service/include/dhcp_client_service_impl.h index 1c620bb..a7eee8c 100644 --- a/dhcp/services/mgr_service/include/dhcp_client_service_impl.h +++ b/dhcp/services/mgr_service/include/dhcp_client_service_impl.h @@ -84,7 +84,7 @@ public: * @Description : Obtain the dhcp result of specified interface asynchronously. * * @param ifname - interface name, eg:wlan0 [in] - * @param dhcp - dhcp result notify [in] + * @param pResultNotify - dhcp result notify [in] * @param timeouts - timeout interval [in] * @Return : success - DHCP_OPT_SUCCESS, failed - others. */ @@ -248,7 +248,6 @@ private: /** * @Description : Unsubscribe all dhcp event. * - * @param strAction - event action [in] * @Return : success - DHCP_OPT_SUCCESS, failed - others. */ int UnsubscribeAllDhcpEvent(); diff --git a/wifi/frameworks/native/c_adapter/inc/wifi_c_utils.h b/wifi/frameworks/native/c_adapter/inc/wifi_c_utils.h index 5c01132..ca80748 100644 --- a/wifi/frameworks/native/c_adapter/inc/wifi_c_utils.h +++ b/wifi/frameworks/native/c_adapter/inc/wifi_c_utils.h @@ -57,7 +57,7 @@ WifiErrorCode GetCErrorCode(ErrCode errCode); * * @param str - IP address of string type * @param ipAddr - Convert result which is a 4-bit int array, example: 127.0.0.1 -> ipAddr[ 127, 0, 0, 1 ] - * @return WifiErrorCode - operate result + * @return WifiErrorCode - operation result */ WifiErrorCode IpStrToArray(const std::string& str, unsigned int ipAddr[IPV4_ARRAY_LEN]); diff --git a/wifi/frameworks/native/include/wifi_device.h b/wifi/frameworks/native/include/wifi_device.h index b09d378..5a9f46a 100644 --- a/wifi/frameworks/native/include/wifi_device.h +++ b/wifi/frameworks/native/include/wifi_device.h @@ -213,8 +213,7 @@ public: * @Description Check if supported input feature * * @param feature - input feature - * @return true - supported - * @return false - unsupported + * @return bool - true if supported, false if unsupported */ virtual bool IsFeatureSupported(long feature) = 0; @@ -269,7 +268,7 @@ public: * @Description set low latency mode * * @param enabled - true: enable low latency, false: disable low latency - * @return bool - operate result + * @return bool - operation result */ virtual bool SetLowLatencyMode(bool enabled) = 0; }; diff --git a/wifi/frameworks/native/include/wifi_hid2d.h b/wifi/frameworks/native/include/wifi_hid2d.h index dd22415..9522c30 100644 --- a/wifi/frameworks/native/include/wifi_hid2d.h +++ b/wifi/frameworks/native/include/wifi_hid2d.h @@ -34,21 +34,21 @@ public: * * @param gcMac - gc mac address * @param ipAddr - applied ip address - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode Hid2dRequestGcIp(const std::string& gcMac, std::string& ipAddr) = 0; /** * @Description Increase(+1) hid2d shared link reference counting * - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode Hid2dSharedlinkIncrease() = 0; /** * @Description Decrease(-1) hid2d shared link reference counting * - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode Hid2dSharedlinkDecrease() = 0; @@ -57,7 +57,7 @@ public: * * @param frequency - frequency * @param type - frequency type - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode Hid2dCreateGroup(const int frequency, FreqType type) = 0; @@ -65,7 +65,7 @@ public: * @Description The GC side actively disconnects from the GO, used on the GC side. * * @param gcIfName - network interface name - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode Hid2dRemoveGcGroup(const std::string& gcIfName) = 0; @@ -73,7 +73,7 @@ public: * @Description Connect to a specified group using hid2d, used on the GC side. * * @param config - connection parameters - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode Hid2dConnect(const Hid2dConnectConfig& config) = 0; @@ -82,7 +82,7 @@ public: * * @param ifName - network interface name * @param ipInfo - IP infos - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode Hid2dConfigIPAddr(const std::string& ifName, const IpAddrInfo& ipInfo) = 0; @@ -90,7 +90,7 @@ public: * @Description Clear IP address when the P2P connection is disconnected, used on the GC side. * * @param ifName - network interface name - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode Hid2dReleaseIPAddr(const std::string& ifName) = 0; @@ -99,7 +99,7 @@ public: * * @param request - request data * @param response - response result - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode Hid2dGetRecommendChannel(const RecommendChannelRequest& request, RecommendChannelResponse& response) = 0; @@ -108,7 +108,7 @@ public: * @Description get 5G channel list * * @param vecChannelList - result for channel list - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode Hid2dGetChannelListFor5G(std::vector& vecChannelList) = 0; @@ -118,7 +118,7 @@ public: * @param cfgType - configuration type * @param cfgData - the queried data of wifi configuration * @param getDatValidLen - the valid data length in the array `cfgData` - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode Hid2dGetSelfWifiCfgInfo(SelfCfgType cfgType, char cfgData[CFG_DATA_MAX_BYTES], int* getDatValidLen) = 0; @@ -129,7 +129,7 @@ public: * @param cfgType - configuration type * @param cfgData - the wifi configuration data to be set * @param setDataValidLen - the valid data length in the array `cfgData` - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode Hid2dSetPeerWifiCfgInfo(PeerCfgType cfgType, char cfgData[CFG_DATA_MAX_BYTES], int setDataValidLen) = 0; diff --git a/wifi/frameworks/native/include/wifi_hotspot.h b/wifi/frameworks/native/include/wifi_hotspot.h index abe7c78..c821345 100644 --- a/wifi/frameworks/native/include/wifi_hotspot.h +++ b/wifi/frameworks/native/include/wifi_hotspot.h @@ -164,8 +164,7 @@ public: * @Description Check if supported input feature * * @param feature - input feature - * @return true - supported - * @return false - unsupported + * @return bool - true if supported, false if unsupported */ virtual bool IsFeatureSupported(long feature) = 0; diff --git a/wifi/frameworks/native/include/wifi_p2p.h b/wifi/frameworks/native/include/wifi_p2p.h index 2da82aa..9a1c878 100644 --- a/wifi/frameworks/native/include/wifi_p2p.h +++ b/wifi/frameworks/native/include/wifi_p2p.h @@ -32,42 +32,42 @@ public: /** * @Description Enabling the P2P Mode. * - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode EnableP2p(void) = 0; /** * @Description Disable the P2P mode. * - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode DisableP2p(void) = 0; /** * @Description Start Wi-Fi P2P device search. * - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode DiscoverDevices(void) = 0; /** * @Description Stop Wi-Fi P2P device search. * - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode StopDiscoverDevices(void) = 0; /** * @Description Start the search for the Wi-Fi P2P service. * - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode DiscoverServices(void) = 0; /** * @Description Stop the search for the Wi-Fi P2P service. * - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode StopDiscoverServices(void) = 0; @@ -76,7 +76,7 @@ public: * * @param device - WifiP2pDevice object * @param request - WifiP2pServiceRequest object - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode RequestService(const WifiP2pDevice &device, const WifiP2pServiceRequest &request) = 0; @@ -84,7 +84,7 @@ public: * @Description Register the local P2P service. * * @param srvInfo - WifiP2pServiceInfo object - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode PutLocalP2pService(const WifiP2pServiceInfo &srvInfo) = 0; @@ -92,7 +92,7 @@ public: * @Description Delete the local P2P service. * * @param srvInfo - WifiP2pServiceInfo object - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode DeleteLocalP2pService(const WifiP2pServiceInfo &srvInfo) = 0; @@ -101,14 +101,14 @@ public: * * @param period - period * @param interval - interval - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode StartP2pListen(int period, int interval) = 0; /** * @Description Disable Wi-Fi P2P listening. * - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode StopP2pListen(void) = 0; @@ -116,14 +116,14 @@ public: * @Description Creating a P2P Group. * * @param config - WifiP2pConfig object - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode CreateGroup(const WifiP2pConfig &config) = 0; /** * @Description Remove a P2P Group. * - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode RemoveGroup(void) = 0; @@ -131,7 +131,7 @@ public: * @Description Delete a p2p Group. * * @param group - WifiP2pGroupInfo object - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode DeleteGroup(const WifiP2pGroupInfo &group) = 0; @@ -139,14 +139,14 @@ public: * @Description P2P connection. * * @param config - WifiP2pConfig object - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode P2pConnect(const WifiP2pConfig &config) = 0; /** * @Description Canceling a P2P connection. * - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode P2pCancelConnect(void) = 0; @@ -154,7 +154,7 @@ public: * @Description Querying Wi-Fi P2P Connection Information. * * @param linkedInfo - Get the WifiP2pLinkedInfo msg - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode QueryP2pLinkedInfo(WifiP2pLinkedInfo &linkedInfo) = 0; @@ -162,7 +162,7 @@ public: * @Description Get the Current Group object. * * @param group - the WifiP2pGroupInfo object - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode GetCurrentGroup(WifiP2pGroupInfo &group) = 0; @@ -170,7 +170,7 @@ public: * @Description Obtains the P2P switch status. * * @param status - the P2P switch status - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode GetP2pEnableStatus(int &status) = 0; @@ -178,7 +178,7 @@ public: * @Description Obtains the P2P discovery status. * * @param status - the P2P discovery status - * @return ErrCode + * @return ErrCode - operation result */ virtual ErrCode GetP2pDiscoverStatus(int &status) = 0; @@ -186,7 +186,7 @@ public: * @Description Obtains the P2P connection status. * * @param status - the P2P connection status - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode GetP2pConnectedStatus(int &status) = 0; @@ -194,7 +194,7 @@ public: * @Description Query the local device information. * * @param devives - Get result of WifiP2pDevice - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode QueryP2pLocalDevice(WifiP2pDevice &device) = 0; @@ -202,7 +202,7 @@ public: * @Description Query the information about the found devices. * * @param devices - Get result vector of WifiP2pDevice - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode QueryP2pDevices(std::vector &devices) = 0; @@ -210,7 +210,7 @@ public: * @Description Query the information about the found groups. * * @param groups - Get result vector of WifiP2pGroupInfo - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode QueryP2pGroups(std::vector &groups) = 0; @@ -218,7 +218,7 @@ public: * @Description Query the service information. * * @param services - Get result vector of Device - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode QueryP2pServices(std::vector &services) = 0; @@ -226,7 +226,7 @@ public: * @Description Register callback function. * * @param callback - IWifiP2pCallback object - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode RegisterCallBack(const sptr &callback) = 0; @@ -242,8 +242,7 @@ public: * @Description Check if supported input feature * * @param feature - input feature - * @return true - supported - * @return false - unsupported + * @return bool - true if supported, false if unsupported */ virtual bool IsFeatureSupported(long feature) = 0; @@ -251,7 +250,7 @@ public: * @Description set the device name * * @param deviceName - device name - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode SetP2pDeviceName(const std::string &deviceName) = 0; @@ -259,7 +258,7 @@ public: * @Description set p2p wifi display info * * @param wfdInfo - wifi display info - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode SetP2pWfdInfo(const WifiP2pWfdInfo &wfdInfo) = 0; }; diff --git a/wifi/frameworks/native/include/wifi_scan.h b/wifi/frameworks/native/include/wifi_scan.h index a32a270..f39c432 100644 --- a/wifi/frameworks/native/include/wifi_scan.h +++ b/wifi/frameworks/native/include/wifi_scan.h @@ -48,7 +48,7 @@ public: /** * @Description Obtain the scanning result * - * @param result - Get result venctor of WifiScanInfo + * @param result - Get result vector of WifiScanInfo * @return ErrCode - operation result */ virtual ErrCode GetScanInfoList(std::vector &result) = 0; @@ -71,8 +71,7 @@ public: * @Description Check if supported input feature * * @param feature - input feature - * @return true - supported - * @return false - unsupported + * @return bool - true if supported, false if unsupported */ virtual bool IsFeatureSupported(long feature) = 0; }; diff --git a/wifi/frameworks/native/interfaces/i_wifi_device.h b/wifi/frameworks/native/interfaces/i_wifi_device.h index fa36743..95c5281 100644 --- a/wifi/frameworks/native/interfaces/i_wifi_device.h +++ b/wifi/frameworks/native/interfaces/i_wifi_device.h @@ -282,7 +282,7 @@ public: * @Description set low latency mode * * @param enabled - true: enable low latency, false: disable low latency - * @return bool - operate result + * @return bool - operation result */ virtual bool SetLowLatencyMode(bool enabled) = 0; diff --git a/wifi/frameworks/native/interfaces/i_wifi_p2p.h b/wifi/frameworks/native/interfaces/i_wifi_p2p.h index e7182e7..b919a27 100644 --- a/wifi/frameworks/native/interfaces/i_wifi_p2p.h +++ b/wifi/frameworks/native/interfaces/i_wifi_p2p.h @@ -33,42 +33,42 @@ public: /** * @Description Enabling the P2P Mode. * - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode EnableP2p(void) = 0; /** * @Description Disable the P2P mode. * - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode DisableP2p(void) = 0; /** * @Description Start Wi-Fi P2P device search. * - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode DiscoverDevices(void) = 0; /** * @Description Stop Wi-Fi P2P device search. * - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode StopDiscoverDevices(void) = 0; /** * @Description Start the search for the Wi-Fi P2P service. * - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode DiscoverServices(void) = 0; /** * @Description Stop the search for the Wi-Fi P2P service. * - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode StopDiscoverServices(void) = 0; @@ -77,7 +77,7 @@ public: * * @param device - WifiP2pDevice object * @param request - WifiP2pServiceRequest object - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode RequestService(const WifiP2pDevice &device, const WifiP2pServiceRequest &request) = 0; @@ -85,7 +85,7 @@ public: * @Description Register the local P2P service. * * @param srvInfo - WifiP2pServiceInfo object - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode PutLocalP2pService(const WifiP2pServiceInfo &srvInfo) = 0; @@ -93,7 +93,7 @@ public: * @Description Delete the local P2P service. * * @param srvInfo - WifiP2pServiceInfo object - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode DeleteLocalP2pService(const WifiP2pServiceInfo &srvInfo) = 0; @@ -102,14 +102,14 @@ public: * * @param period - period * @param interval - interval - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode StartP2pListen(int period, int interval) = 0; /** * @Description Disable Wi-Fi P2P listening. * - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode StopP2pListen(void) = 0; @@ -117,14 +117,14 @@ public: * @Description Creating a P2P Group. * * @param config - WifiP2pGroupInfo object - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode CreateGroup(const WifiP2pConfig &config) = 0; /** * @Description Remove a P2P Group. * - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode RemoveGroup(void) = 0; @@ -132,7 +132,7 @@ public: * @Description Delete a p2p Group. * * @param group - WifiP2pGroupInfo object - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode DeleteGroup(const WifiP2pGroupInfo &group) = 0; @@ -140,14 +140,14 @@ public: * @Description P2P connection. * * @param config - WifiP2pConfig object - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode P2pConnect(const WifiP2pConfig &config) = 0; /** * @Description Canceling a P2P connection. * - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode P2pCancelConnect(void) = 0; @@ -155,7 +155,7 @@ public: * @Description Querying Wi-Fi P2P Connection Information. * * @param linkedInfo - Get the WifiP2pLinkedInfo msg - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode QueryP2pLinkedInfo(WifiP2pLinkedInfo& linkedInfo) = 0; @@ -163,7 +163,7 @@ public: * @Description Get the Current Group object. * * @param group - the WifiP2pGroupInfo object - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode GetCurrentGroup(WifiP2pGroupInfo &group) = 0; @@ -171,7 +171,7 @@ public: * @Description Obtains the P2P switch status. * * @param status - the P2P switch status - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode GetP2pEnableStatus(int &status) = 0; @@ -187,7 +187,7 @@ public: * @Description Obtains the P2P connection status. * * @param status - the P2P connection status - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode GetP2pConnectedStatus(int &status) = 0; @@ -195,14 +195,14 @@ public: * @Description Query the information about the found devices. * * @param devices - Get result vector of WifiP2pDevice - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode QueryP2pDevices(std::vector &devices) = 0; /** * @Description - Query the information about own device. * @param device - own device - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode QueryP2pLocalDevice(WifiP2pDevice &device) = 0; @@ -210,7 +210,7 @@ public: * @Description Query the information about the found groups. * * @param groups - Get result vector of WifiP2pGroupInfo - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode QueryP2pGroups(std::vector &groups) = 0; @@ -218,7 +218,7 @@ public: * @Description Query the service information. * * @param services - Get result vector of Device - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode QueryP2pServices(std::vector &services) = 0; @@ -226,7 +226,7 @@ public: * @Description Register callback function. * * @param callback - IWifiP2pCallback object - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode RegisterCallBack(const sptr &callback) = 0; @@ -242,7 +242,7 @@ public: * @Description set the device name * * @param deviceName - device name - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode SetP2pDeviceName(const std::string &deviceName) = 0; @@ -250,7 +250,7 @@ public: * @Description set p2p wifi display info * * @param wfdInfo - wifi display info - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode SetP2pWfdInfo(const WifiP2pWfdInfo &wfdInfo) = 0; @@ -259,21 +259,21 @@ public: * * @param gcMac - gc mac address * @param ipAddr - applied ip address - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode Hid2dRequestGcIp(const std::string& gcMac, std::string& ipAddr) = 0; /** * @Description Increase(+1) hid2d shared link reference counting * - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode Hid2dSharedlinkIncrease() = 0; /** * @Description Decrease(-1) hid2d shared link reference counting * - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode Hid2dSharedlinkDecrease() = 0; @@ -282,7 +282,7 @@ public: * * @param frequency - frequency * @param type - frequency type - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode Hid2dCreateGroup(const int frequency, FreqType type) = 0; @@ -290,7 +290,7 @@ public: * @Description The GC side actively disconnects from the GO, used on the GC side. * * @param gcIfName - network interface name - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode Hid2dRemoveGcGroup(const std::string& gcIfName) = 0; @@ -298,7 +298,7 @@ public: * @Description Connect to a specified group using hid2d, used on the GC side. * * @param config - connection parameters - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode Hid2dConnect(const Hid2dConnectConfig& config) = 0; @@ -307,7 +307,7 @@ public: * * @param ifName - network interface name * @param ipInfo - IP infos - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode Hid2dConfigIPAddr(const std::string& ifName, const IpAddrInfo& ipInfo) = 0; @@ -315,7 +315,7 @@ public: * @Description Clear IP address when the P2P connection is disconnected, used on the GC side. * * @param ifName - network interface name - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode Hid2dReleaseIPAddr(const std::string& ifName) = 0; @@ -324,7 +324,7 @@ public: * * @param request - request data * @param response - response result - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode Hid2dGetRecommendChannel(const RecommendChannelRequest& request, RecommendChannelResponse& response) = 0; @@ -333,7 +333,7 @@ public: * @Description get 5G channel list * * @param vecChannelList - result for channel list - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode Hid2dGetChannelListFor5G(std::vector& vecChannelList) = 0; @@ -343,7 +343,7 @@ public: * @param cfgType - configuration type * @param cfgData - the queried data of wifi configuration * @param getDatValidLen - the valid data length in the array `cfgData` - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode Hid2dGetSelfWifiCfgInfo(SelfCfgType cfgType, char cfgData[CFG_DATA_MAX_BYTES], int* getDatValidLen) = 0; @@ -354,7 +354,7 @@ public: * @param cfgType - configuration type * @param cfgData - the wifi configuration data to be set * @param setDataValidLen - the valid data length in the array `cfgData` - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode Hid2dSetPeerWifiCfgInfo(PeerCfgType cfgType, char cfgData[CFG_DATA_MAX_BYTES], int setDataValidLen) = 0; diff --git a/wifi/frameworks/native/src/wifi_device_impl.h b/wifi/frameworks/native/src/wifi_device_impl.h index 398d601..24c0e81 100644 --- a/wifi/frameworks/native/src/wifi_device_impl.h +++ b/wifi/frameworks/native/src/wifi_device_impl.h @@ -283,7 +283,7 @@ public: * @Description set low latency mode * * @param enabled - true: enable low latency, false: disable low latency - * @return bool - operate result + * @return bool - operation result */ bool SetLowLatencyMode(bool enabled) override; diff --git a/wifi/frameworks/native/src/wifi_device_proxy.h b/wifi/frameworks/native/src/wifi_device_proxy.h index bd0b9e5..1fc8416 100644 --- a/wifi/frameworks/native/src/wifi_device_proxy.h +++ b/wifi/frameworks/native/src/wifi_device_proxy.h @@ -288,7 +288,7 @@ public: * @Description set low latency mode * * @param enabled - true: enable low latency, false: disable low latency - * @return bool - operate result + * @return bool - operation result */ bool SetLowLatencyMode(bool enabled) override; diff --git a/wifi/frameworks/native/src/wifi_p2p_impl.h b/wifi/frameworks/native/src/wifi_p2p_impl.h index c8e486c..fec05e9 100644 --- a/wifi/frameworks/native/src/wifi_p2p_impl.h +++ b/wifi/frameworks/native/src/wifi_p2p_impl.h @@ -31,42 +31,42 @@ public: /** * @Description Enabling the P2P Mode * - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode EnableP2p(void) override; /** * @Description Disable the P2P mode * - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode DisableP2p(void) override; /** * @Description Start Wi-Fi P2P device search * - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode DiscoverDevices(void) override; /** * @Description Stop Wi-Fi P2P device search * - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode StopDiscoverDevices(void) override; /** * @Description Start the search for the Wi-Fi P2P service * - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode DiscoverServices(void) override; /** * @Description Stop the search for the Wi-Fi P2P service * - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode StopDiscoverServices(void) override; @@ -75,7 +75,7 @@ public: * * @param device - WifiP2pDevice object * @param request - WifiP2pServiceRequest object - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode RequestService(const WifiP2pDevice &device, const WifiP2pServiceRequest &request) override; @@ -83,7 +83,7 @@ public: * @Description Register the local P2P service * * @param srvInfo - WifiP2pServiceInfo object - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode PutLocalP2pService(const WifiP2pServiceInfo &srvInfo) override; @@ -91,7 +91,7 @@ public: * @Description Delete the local P2P service * * @param srvInfo - WifiP2pServiceInfo object - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode DeleteLocalP2pService(const WifiP2pServiceInfo &srvInfo) override; @@ -100,14 +100,14 @@ public: * * @param period - period * @param interval - interval - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode StartP2pListen(int period, int interval) override; /** * @Description Disable Wi-Fi P2P listening * - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode StopP2pListen(void) override; @@ -115,7 +115,7 @@ public: * @Description Creating a P2P Group * * @param config - WifiP2pGroupInfo object - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode CreateGroup(const WifiP2pConfig &config) override; @@ -123,7 +123,7 @@ public: * @Description Remove a P2P Group * * - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode RemoveGroup(void) override; @@ -131,7 +131,7 @@ public: * @Description Delete a p2p Group * * @param group - WifiP2pGroupInfo object - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode DeleteGroup(const WifiP2pGroupInfo &group) override; @@ -139,14 +139,14 @@ public: * @Description P2P connection * * @param config - WifiP2pConfig object - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode P2pConnect(const WifiP2pConfig &config) override; /** * @Description Canceling a P2P connection * - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode P2pCancelConnect(void) override; @@ -154,7 +154,7 @@ public: * @Description Querying Wi-Fi P2P Connection Information * * @param linkedInfo - Get the WifiP2pLinkedInfo msg - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode QueryP2pLinkedInfo(WifiP2pLinkedInfo &linkedInfo) override; @@ -162,7 +162,7 @@ public: * @Description Get the Current Group object * * @param group - the WifiP2pGroupInfo object - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode GetCurrentGroup(WifiP2pGroupInfo &group) override; @@ -170,7 +170,7 @@ public: * @Description Obtains the P2P switch status * * @param status - the P2P switch status - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode GetP2pEnableStatus(int &status) override; @@ -186,7 +186,7 @@ public: * @Description Obtains the P2P connection status * * @param status - the P2P connection status - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode GetP2pConnectedStatus(int &status) override; @@ -194,7 +194,7 @@ public: * @Description Query the information about the found devices * * @param devices - Get result vector of WifiP2pDevice - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode QueryP2pDevices(std::vector &devices) override; @@ -202,7 +202,7 @@ public: * @Description Query the information about the local device * * @param devives - Get result of WifiP2pDevice - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode QueryP2pLocalDevice(WifiP2pDevice &devive) override; @@ -210,7 +210,7 @@ public: * @Description Query the information about the found groups * * @param groups - Get result vector of WifiP2pGroupInfo - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode QueryP2pGroups(std::vector &groups) override; @@ -218,7 +218,7 @@ public: * @Description Query the service information * * @param services - Get result vector of Device - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode QueryP2pServices(std::vector &services) override; @@ -226,7 +226,7 @@ public: * @Description Register callback function * * @param callback - IWifiP2pCallback object - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode RegisterCallBack(const sptr &callback) override; @@ -251,7 +251,7 @@ public: * @Description set the device name * * @param deviceName - device name - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode SetP2pDeviceName(const std::string &deviceName) override; @@ -259,7 +259,7 @@ public: * @Description set p2p wifi display info * * @param wfdInfo - wifi display info - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode SetP2pWfdInfo(const WifiP2pWfdInfo &wfdInfo) override; @@ -268,21 +268,21 @@ public: * * @param gcMac - gc mac address * @param ipAddr - applied ip address - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode Hid2dRequestGcIp(const std::string& gcMac, std::string& ipAddr) override; /** * @Description Increase(+1) hid2d shared link reference counting * - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode Hid2dSharedlinkIncrease() override; /** * @Description Decrease(-1) hid2d shared link reference counting * - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode Hid2dSharedlinkDecrease() override; @@ -291,7 +291,7 @@ public: * * @param frequency - frequency * @param type - frequency type - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode Hid2dCreateGroup(const int frequency, FreqType type) override; @@ -299,7 +299,7 @@ public: * @Description The GC side actively disconnects from the GO, used on the GC side. * * @param gcIfName - network interface name - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode Hid2dRemoveGcGroup(const std::string& gcIfName) override; @@ -307,7 +307,7 @@ public: * @Description Connect to a specified group using hid2d, used on the GC side. * * @param config - connection parameters - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode Hid2dConnect(const Hid2dConnectConfig& config) override; @@ -316,7 +316,7 @@ public: * * @param ifName - network interface name * @param ipInfo - IP infos - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode Hid2dConfigIPAddr(const std::string& ifName, const IpAddrInfo& ipInfo) override; @@ -324,7 +324,7 @@ public: * @Description Clear IP address when the P2P connection is disconnected, used on the GC side. * * @param ifName - network interface name - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode Hid2dReleaseIPAddr(const std::string& ifName) override; @@ -333,7 +333,7 @@ public: * * @param request - request data * @param response - response result - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode Hid2dGetRecommendChannel(const RecommendChannelRequest& request, RecommendChannelResponse& response) override; @@ -342,7 +342,7 @@ public: * @Description get 5G channel list * * @param vecChannelList - result for channel list - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode Hid2dGetChannelListFor5G(std::vector& vecChannelList) override; @@ -352,7 +352,7 @@ public: * @param cfgType - configuration type * @param cfgData - the queried data of wifi configuration * @param getDatValidLen - the valid data length in the array `cfgData` - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode Hid2dGetSelfWifiCfgInfo(SelfCfgType cfgType, char cfgData[CFG_DATA_MAX_BYTES], int* getDatValidLen) override; @@ -363,7 +363,7 @@ public: * @param cfgType - configuration type * @param cfgData - the wifi configuration data to be set * @param setDataValidLen - the valid data length in the array `cfgData` - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode Hid2dSetPeerWifiCfgInfo(PeerCfgType cfgType, char cfgData[CFG_DATA_MAX_BYTES], int setDataValidLen) override; diff --git a/wifi/frameworks/native/src/wifi_p2p_proxy.h b/wifi/frameworks/native/src/wifi_p2p_proxy.h index c3f23cc..fd6044f 100644 --- a/wifi/frameworks/native/src/wifi_p2p_proxy.h +++ b/wifi/frameworks/native/src/wifi_p2p_proxy.h @@ -30,42 +30,42 @@ public: /** * @Description Enabling the P2P Mode * - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode EnableP2p(void) override; /** * @Description Disable the P2P mode * - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode DisableP2p(void) override; /** * @Description Start Wi-Fi P2P device search * - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode DiscoverDevices(void) override; /** * @Description Stop Wi-Fi P2P device search * - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode StopDiscoverDevices(void) override; /** * @Description Start the search for the Wi-Fi P2P service * - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode DiscoverServices(void) override; /** * @Description Stop the search for the Wi-Fi P2P service * - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode StopDiscoverServices(void) override; @@ -74,7 +74,7 @@ public: * * @param device - WifiP2pDevice object * @param request - WifiP2pServiceRequest object - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode RequestService(const WifiP2pDevice &device, const WifiP2pServiceRequest &request) override; @@ -82,7 +82,7 @@ public: * @Description Register the local P2P service * * @param srvInfo - WifiP2pServiceInfo object - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode PutLocalP2pService(const WifiP2pServiceInfo &srvInfo) override; @@ -90,7 +90,7 @@ public: * @Description Delete the local P2P service * * @param srvInfo - WifiP2pServiceInfo object - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode DeleteLocalP2pService(const WifiP2pServiceInfo &srvInfo) override; @@ -99,14 +99,14 @@ public: * * @param period - period * @param interval - interval - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode StartP2pListen(int period, int interval) override; /** * @Description Disable Wi-Fi P2P listening * - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode StopP2pListen(void) override; @@ -114,7 +114,7 @@ public: * @Description Creating a P2P Group * * @param config - WifiP2pGroupInfo object - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode CreateGroup(const WifiP2pConfig &config) override; @@ -122,7 +122,7 @@ public: * @Description Remove a P2P Group * * - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode RemoveGroup(void) override; @@ -130,7 +130,7 @@ public: * @Description Delete a p2p Group * * @param group - WifiP2pGroupInfo object - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode DeleteGroup(const WifiP2pGroupInfo &group) override; @@ -138,14 +138,14 @@ public: * @Description P2P connection * * @param config - WifiP2pConfig object - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode P2pConnect(const WifiP2pConfig &config) override; /** * @Description Canceling a P2P connection * - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode P2pCancelConnect(void) override; @@ -153,7 +153,7 @@ public: * @Description Querying Wi-Fi P2P Connection Information * * @param linkedInfo - Get the WifiP2pLinkedInfo msg - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode QueryP2pLinkedInfo(WifiP2pLinkedInfo &linkedInfo) override; @@ -161,7 +161,7 @@ public: * @Description Get the Current Group object * * @param group - the WifiP2pGroupInfo object - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode GetCurrentGroup(WifiP2pGroupInfo &group) override; @@ -169,7 +169,7 @@ public: * @Description Obtains the P2P switch status * * @param status - the P2P switch status - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode GetP2pEnableStatus(int &status) override; @@ -185,7 +185,7 @@ public: * @Description Obtains the P2P connection status * * @param status - the P2P connection status - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode GetP2pConnectedStatus(int &status) override; @@ -193,7 +193,7 @@ public: * @Description Query the information about the found devices * * @param devices - Get result vector of WifiP2pDevice - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode QueryP2pDevices(std::vector &devices) override; @@ -201,7 +201,7 @@ public: * @Description Query the information about local device info * * @param devices - Get result of WifiP2pDevice - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode QueryP2pLocalDevice(WifiP2pDevice &device) override; @@ -209,7 +209,7 @@ public: * @Description Query the information about the found groups * * @param groups - Get result vector of WifiP2pGroupInfo - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode QueryP2pGroups(std::vector &groups) override; @@ -217,7 +217,7 @@ public: * @Description Query the service information * * @param services - Get result vector of Device - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode QueryP2pServices(std::vector &services) override; @@ -225,7 +225,7 @@ public: * @Description Register callback function * * @param callback - IWifiP2pCallback object - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode RegisterCallBack(const sptr &callback) override; @@ -241,7 +241,7 @@ public: * @Description set the device name * * @param deviceName - device name - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode SetP2pDeviceName(const std::string &deviceName) override; @@ -249,7 +249,7 @@ public: * @Description set p2p wifi display info * * @param wfdInfo - wifi display info - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode SetP2pWfdInfo(const WifiP2pWfdInfo &wfdInfo) override; @@ -258,21 +258,21 @@ public: * * @param gcMac - gc mac address * @param ipAddr - applied ip address - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode Hid2dRequestGcIp(const std::string& gcMac, std::string& ipAddr) override; /** * @Description Increase(+1) hid2d shared link reference counting * - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode Hid2dSharedlinkIncrease() override; /** * @Description Decrease(-1) hid2d shared link reference counting * - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode Hid2dSharedlinkDecrease() override; @@ -281,7 +281,7 @@ public: * * @param frequency - frequency * @param type - frequency type - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode Hid2dCreateGroup(const int frequency, FreqType type) override; @@ -289,7 +289,7 @@ public: * @Description The GC side actively disconnects from the GO, used on the GC side. * * @param gcIfName - network interface name - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode Hid2dRemoveGcGroup(const std::string& gcIfName) override; @@ -297,7 +297,7 @@ public: * @Description Connect to a specified group using hid2d, used on the GC side. * * @param config - connection parameters - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode Hid2dConnect(const Hid2dConnectConfig& config) override; @@ -306,7 +306,7 @@ public: * * @param ifName - network interface name * @param ipInfo - IP infos - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode Hid2dConfigIPAddr(const std::string& ifName, const IpAddrInfo& ipInfo) override; @@ -314,7 +314,7 @@ public: * @Description Clear IP address when the P2P connection is disconnected, used on the GC side. * * @param ifName - network interface name - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode Hid2dReleaseIPAddr(const std::string& ifName) override; @@ -323,7 +323,7 @@ public: * * @param request - request data * @param response - response result - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode Hid2dGetRecommendChannel(const RecommendChannelRequest& request, RecommendChannelResponse& response) override; @@ -332,7 +332,7 @@ public: * @Description get 5G channel list * * @param vecChannelList - result for channel list - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode Hid2dGetChannelListFor5G(std::vector& vecChannelList) override; @@ -342,7 +342,7 @@ public: * @param cfgType - configuration type * @param cfgData - the queried data of wifi configuration * @param getDatValidLen - the valid data length in the array `cfgData` - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode Hid2dGetSelfWifiCfgInfo(SelfCfgType cfgType, char cfgData[CFG_DATA_MAX_BYTES], int* getDatValidLen) override; @@ -353,7 +353,7 @@ public: * @param cfgType - configuration type * @param cfgData - the wifi configuration data to be set * @param setDataValidLen - the valid data length in the array `cfgData` - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode Hid2dSetPeerWifiCfgInfo(PeerCfgType cfgType, char cfgData[CFG_DATA_MAX_BYTES], int setDataValidLen) override; diff --git a/wifi/interfaces/kits/c/wifi_hid2d.h b/wifi/interfaces/kits/c/wifi_hid2d.h index 658ac1e..fe792ce 100644 --- a/wifi/interfaces/kits/c/wifi_hid2d.h +++ b/wifi/interfaces/kits/c/wifi_hid2d.h @@ -143,21 +143,21 @@ typedef struct RecommendChannelResponse { * @param gcMac - gc mac address * @param ipAddr - Indicates the applied IP address, which is a 4-bit int array. * example: 127.0.0.1 -> ipAddr[ 127, 0, 0, 1 ] - * @return WifiErrorCode - operate result + * @return WifiErrorCode - operation result */ WifiErrorCode Hid2dRequestGcIp(const unsigned char gcMac[MAC_LEN], unsigned int ipAddr[IPV4_ARRAY_LEN]); /** * @Description Increase(+1) shared link reference counting * - * @return WifiErrorCode - operate result + * @return WifiErrorCode - operation result */ WifiErrorCode Hid2dSharedlinkIncrease(); /** * @Description Decrease(-1) shared link reference counting * - * @return WifiErrorCode - operate result + * @return WifiErrorCode - operation result */ WifiErrorCode Hid2dSharedlinkDecrease(); @@ -166,7 +166,7 @@ WifiErrorCode Hid2dSharedlinkDecrease(); * * @param frequency - frequency * @param type - frequency type - * @return WifiErrorCode - operate result + * @return WifiErrorCode - operation result */ WifiErrorCode Hid2dCreateGroup(const int frequency, FreqType type); @@ -174,7 +174,7 @@ WifiErrorCode Hid2dCreateGroup(const int frequency, FreqType type); * @Description The GC side actively disconnects from the GO, used on the GC side. * * @param gcIfName - network interface name - * @return WifiErrorCode - operate result + * @return WifiErrorCode - operation result */ WifiErrorCode Hid2dRemoveGcGroup(const char gcIfName[IF_NAME_LEN]); @@ -182,7 +182,7 @@ WifiErrorCode Hid2dRemoveGcGroup(const char gcIfName[IF_NAME_LEN]); * @Description Connect to a specified group using hid2d, used on the GC side. * * @param config - connection parameters - * @return WifiErrorCode - operate result + * @return WifiErrorCode - operation result */ WifiErrorCode Hid2dConnect(const Hid2dConnectConfig *config); @@ -190,8 +190,8 @@ WifiErrorCode Hid2dConnect(const Hid2dConnectConfig *config); * @Description Configuring IP addresses for P2P network interfaces, used on the GC side. * * @param ifName - network interface name - * @param IpInfo - IP infos - * @return WifiErrorCode - operate result + * @param ipInfo - IP infos + * @return WifiErrorCode - operation result */ WifiErrorCode Hid2dConfigIPAddr(const char ifName[IF_NAME_LEN], const IpAddrInfo *ipInfo); @@ -199,7 +199,7 @@ WifiErrorCode Hid2dConfigIPAddr(const char ifName[IF_NAME_LEN], const IpAddrInfo * @Description Clear IP address when the P2P connection is disconnected, used on the GC side. * * @param ifName - network interface name - * @return WifiErrorCode - operate result + * @return WifiErrorCode - operation result */ WifiErrorCode Hid2dReleaseIPAddr(const char ifName[IF_NAME_LEN]); @@ -209,7 +209,7 @@ WifiErrorCode Hid2dReleaseIPAddr(const char ifName[IF_NAME_LEN]); * @param request - request data * @param response - response result * - * @return WifiErrorCode - operate result + * @return WifiErrorCode - operation result */ WifiErrorCode Hid2dGetRecommendChannel(const RecommendChannelRequest *request, RecommendChannelResponse *response); @@ -220,7 +220,7 @@ WifiErrorCode Hid2dGetRecommendChannel(const RecommendChannelRequest *request, R * Use the '0' to indicates the end of valid data in the "chanList" array. * * @param len - the length of the pre-alloc "chanList" - * @return WifiErrorCode - operate result + * @return WifiErrorCode - operation result */ WifiErrorCode Hid2dGetChannelListFor5G(int *chanList, int len); @@ -230,7 +230,7 @@ WifiErrorCode Hid2dGetChannelListFor5G(int *chanList, int len); * @param cfgType - configuration type * @param cfgData - the queried data of wifi configuration * @param getDatValidLen - the valid data length in the array `cfgData` - * @return WifiErrorCode - operate result + * @return WifiErrorCode - operation result */ WifiErrorCode Hid2dGetSelfWifiCfgInfo(SelfCfgType cfgType, char cfgData[CFG_DATA_MAX_BYTES], int *getDatValidLen); @@ -240,7 +240,7 @@ WifiErrorCode Hid2dGetSelfWifiCfgInfo(SelfCfgType cfgType, char cfgData[CFG_DATA * @param cfgType - configuration type * @param cfgData - the wifi configuration data to be set * @param setDataValidLen - the valid data length in the array `cfgData` - * @return WifiErrorCode - operate result + * @return WifiErrorCode - operation result */ WifiErrorCode Hid2dSetPeerWifiCfgInfo(PeerCfgType cfgType, char cfgData[CFG_DATA_MAX_BYTES], int setDataValidLen); diff --git a/wifi/interfaces/kits/c/wifi_p2p.h b/wifi/interfaces/kits/c/wifi_p2p.h index 54c2176..bbea11f 100644 --- a/wifi/interfaces/kits/c/wifi_p2p.h +++ b/wifi/interfaces/kits/c/wifi_p2p.h @@ -31,14 +31,14 @@ typedef void (*P2pPeersChangedCallback)(WifiP2pDevice* devices, int len); /** * @Description Enabling the P2P Mode. * - * @return WifiErrorCode - operate result + * @return WifiErrorCode - operation result */ WifiErrorCode EnableP2p(); /** * @Description Disable the P2P mode. * - * @return WifiErrorCode - operate result + * @return WifiErrorCode - operation result */ WifiErrorCode DisableP2p(); @@ -46,35 +46,35 @@ WifiErrorCode DisableP2p(); * @Description Get p2p enable status * * @param state - enable status - * @return WifiErrorCode - operate result + * @return WifiErrorCode - operation result */ WifiErrorCode GetP2pEnableStatus(P2pState* state); /** * @Description Start Wi-Fi P2P device search. * - * @return WifiErrorCode - operate result + * @return WifiErrorCode - operation result */ WifiErrorCode DiscoverDevices(); /** * @Description Stop Wi-Fi P2P device search. * - * @return WifiErrorCode - operate result + * @return WifiErrorCode - operation result */ WifiErrorCode StopDiscoverDevices(); /** * @Description Start the search for the Wi-Fi P2P service. * - * @return WifiErrorCode - operate result + * @return WifiErrorCode - operation result */ WifiErrorCode DiscoverServices(); /** * @Description Stop the search for the Wi-Fi P2P service. * - * @return WifiErrorCode - operate result + * @return WifiErrorCode - operation result */ WifiErrorCode StopDiscoverServices(); @@ -83,14 +83,14 @@ WifiErrorCode StopDiscoverServices(); * * @param period - period * @param interval - interval - * @return WifiErrorCode - operate result + * @return WifiErrorCode - operation result */ WifiErrorCode StartP2pListen(int period, int interval); /** * @Description Disable Wi-Fi P2P listening. * - * @return ErrCode - operate result + * @return ErrCode - operation result */ WifiErrorCode StopP2pListen(); @@ -98,15 +98,14 @@ WifiErrorCode StopP2pListen(); * @Description Creating a P2P Group. * * @param config - WifiP2pConfig object - * @return WifiErrorCode - operate result + * @return WifiErrorCode - operation result */ WifiErrorCode CreateGroup(const WifiP2pConfig* config); /** * @Description Remove a P2P Group. * - * @param config - WifiP2pConfig object - * @return WifiErrorCode - operate result + * @return WifiErrorCode - operation result */ WifiErrorCode RemoveGroup(); @@ -114,7 +113,7 @@ WifiErrorCode RemoveGroup(); * @Description Delete a p2p Group. * * @param group - WifiP2pGroupInfo object - * @return ErrCode - operate result + * @return ErrCode - operation result */ WifiErrorCode DeleteGroup(const WifiP2pGroupInfo* group); @@ -122,14 +121,14 @@ WifiErrorCode DeleteGroup(const WifiP2pGroupInfo* group); * @Description P2P connection. * * @param config - WifiP2pConfig object - * @return WifiErrorCode - operate result + * @return WifiErrorCode - operation result */ WifiErrorCode P2pConnect(const WifiP2pConfig* config); /** - * @Description Canceling a P2P connection. + * @Description Cancel a P2P connection. * - * @return WifiErrorCode - operate result + * @return WifiErrorCode - operation result */ WifiErrorCode P2pCancelConnect(); @@ -137,7 +136,7 @@ WifiErrorCode P2pCancelConnect(); * @Description Get the Current Group object. * * @param groupInfo - the WifiP2pGroupInfo object - * @return WifiErrorCode - operate result + * @return WifiErrorCode - operation result */ WifiErrorCode GetCurrentGroup(WifiP2pGroupInfo* groupInfo); @@ -145,7 +144,7 @@ WifiErrorCode GetCurrentGroup(WifiP2pGroupInfo* groupInfo); * @Description Obtains the P2P connection status. * * @param status - the P2P connection status - * @return WifiErrorCode - operate result + * @return WifiErrorCode - operation result */ WifiErrorCode GetP2pConnectedStatus(int* status); @@ -155,7 +154,7 @@ WifiErrorCode GetP2pConnectedStatus(int* status); * @param clientDevices - pre-allocate memory for client devices * @param size - the allocate size for clientDevices * @param retSize - the queryed size of the client devices, used for return. - * @return WifiErrorCode - operate result + * @return WifiErrorCode - operation result */ WifiErrorCode QueryP2pDevices(WifiP2pDevice* clientDevices, int size, int* retSize); @@ -163,7 +162,7 @@ WifiErrorCode QueryP2pDevices(WifiP2pDevice* clientDevices, int size, int* retSi * @Description Query the information about the local device info. * * @param deviceInfo - the WifiP2pDevice object - * @return ErrCode - operate result + * @return ErrCode - operation result */ WifiErrorCode QueryP2pLocalDevice(WifiP2pDevice* deviceInfo); @@ -172,7 +171,7 @@ WifiErrorCode QueryP2pLocalDevice(WifiP2pDevice* deviceInfo); * * @param groupInfo - pre-allocate memory for group size * @param size - the allocate size for groupInfo - * @return ErrCode - operate result + * @return ErrCode - operation result */ WifiErrorCode QueryP2pGroups(WifiP2pGroupInfo* groupInfo, int size); @@ -180,7 +179,7 @@ WifiErrorCode QueryP2pGroups(WifiP2pGroupInfo* groupInfo, int size); * @Description register p2p state changed event * * @param callback - callback function - * @return ErrCode - operate result + * @return ErrCode - operation result */ WifiErrorCode RegisterP2pStateChangedCallback(const P2pStateChangedCallback callback); @@ -188,7 +187,7 @@ WifiErrorCode RegisterP2pStateChangedCallback(const P2pStateChangedCallback call * @Description register p2p persistent group change event * * @param callback - callback function - * @return ErrCode - operate result + * @return ErrCode - operation result */ WifiErrorCode RegisterP2pPersistentGroupsChangedCallback(const P2pPersistentGroupsChangedCallback callback); @@ -196,7 +195,7 @@ WifiErrorCode RegisterP2pPersistentGroupsChangedCallback(const P2pPersistentGrou * @Description register p2p connection change event * * @param callback - callback function - * @return ErrCode - operate result + * @return ErrCode - operation result */ WifiErrorCode RegisterP2pConnectionChangedCallback(const P2pConnectionChangedCallback callback); @@ -204,7 +203,7 @@ WifiErrorCode RegisterP2pConnectionChangedCallback(const P2pConnectionChangedCal * @Description register p2p peers change event * * @param callback - callback function - * @return ErrCode - operate result + * @return ErrCode - operation result */ WifiErrorCode RegisterP2pPeersChangedCallback(const P2pPeersChangedCallback callback); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.h index 82fcad2..0e0e12d 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.h @@ -183,7 +183,7 @@ public: * * @param fd - file descriptor * @param args - dump arguments - * @return ErrCode - operate result + * @return ErrCode - operation result */ int32_t Dump(int32_t fd, const std::vector& args) override; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.h index 6245683..d9f952d 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.h @@ -116,7 +116,7 @@ public: * @Description Get supported features * * @param features - output supported features - * @return int - operate result + * @return int - operation result */ int GetSupportedFeatures(long &features); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/ip2p_service.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/ip2p_service.h index d3a0e64..12c90a5 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/ip2p_service.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/ip2p_service.h @@ -32,51 +32,51 @@ public: /** * @Description - The interface of enable p2p. - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode EnableP2p() = 0; /** * @Description - The interface of disable p2p. - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode DisableP2p() = 0; /** * @Description - The interface of start discover peers. - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode DiscoverDevices() = 0; /** * @Description - The interface of stop discover peers. - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode StopDiscoverDevices() = 0; /** * @Description - The interface of start discover services. - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode DiscoverServices() = 0; /** * @Description - The interface of stop discover services. - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode StopDiscoverServices() = 0; /** * @Description - The interface of add local p2p service. * @param srvInfo - information of service. - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode PutLocalP2pService(const WifiP2pServiceInfo &srvInfo) = 0; /** * @Description - The interface of delete local p2p service. * @param srvInfo - information of service. - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode DeleteLocalP2pService(const WifiP2pServiceInfo &srvInfo) = 0; @@ -84,7 +84,7 @@ public: * @Description - The interface of add service request. * @param device - target device information. * @param request - request information. - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode RequestService(const WifiP2pDevice &device, const WifiP2pServiceRequest &request) = 0; @@ -92,46 +92,46 @@ public: * @Description - The interface of start p2p listen(milliseconds). * @param period - time of period. * @param interval - time of interval. - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode StartP2pListen(int period, int interval) = 0; /** * @Description - The interface of stop p2p listen. - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode StopP2pListen() = 0; /** * @DescriptionCreate - The interface of create group. * @param config - configure of group. - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode CreateGroup(const WifiP2pConfig &config) = 0; /** * @Description - The interface of remove current group. - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode RemoveGroup() = 0; /** * @Description - The interface of delete a saved group. * @param group - information of group. - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode DeleteGroup(const WifiP2pGroupInfo &group) = 0; /** * @Description - The interface of p2p connect. * @param config - configure of connect. - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode P2pConnect(const WifiP2pConfig &config) = 0; /** * @Description - The interface of canceling a p2p connection. - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode P2pCancelConnect() = 0; /** @@ -144,70 +144,70 @@ public: /** * @Description - The interface of query p2p information like the group state,device information and ip address. * @param linkedInfo - struct WifiP2pLinkedInfo. - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode QueryP2pLinkedInfo(WifiP2pLinkedInfo &linkedInfo) = 0; /** * @DescriptionGet - The interface of get current group information. * @param group - struct WifiP2pGroupInfo. - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode GetCurrentGroup(WifiP2pGroupInfo &group) = 0; /** * @Description - The interface of get p2p running status. * @param status - information of status. - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode GetP2pEnableStatus(int &status) = 0; /** * @Description - The interface of get p2p discover status. * @param status - information of status. - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode GetP2pDiscoverStatus(int &status) = 0; /** * @Description - The interface of get p2p connected status. * @param status - information of status. - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode GetP2pConnectedStatus(int &status) = 0; /** * @Description - The interface of query p2p devices information. * @param devices - information of devices. - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode QueryP2pDevices(std::vector &devices) = 0; /** * @Description - Query the information about own device. * @param device - own device - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode QueryP2pLocalDevice(WifiP2pDevice &device) = 0; /** * @Description - The interface of query p2p group information. * @param groups - information of groups. - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode QueryP2pGroups(std::vector &groups) = 0; /** * @Description - The interface of query p2p services information. * @param services - information of services. - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode QueryP2pServices(std::vector &services) = 0; /** * @Description - The interface of register p2p service callbacks, * @param callbacks - information of callbacks. - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode RegisterP2pServiceCallbacks(const IP2pServiceCallbacks &callbacks) = 0; @@ -215,7 +215,7 @@ public: * @Description set p2p wifi display info * * @param wfdInfo - wifi display info - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode SetP2pWfdInfo(const WifiP2pWfdInfo &wfdInfo) = 0; @@ -224,7 +224,7 @@ public: * * @param frequency - frequency * @param type - frequency type - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode Hid2dCreateGroup(const int frequency, FreqType type) = 0; @@ -232,7 +232,7 @@ public: * @Description Connect to a specified group using hid2d, used on the GC side. * * @param config - connection parameters - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode Hid2dConnect(const Hid2dConnectConfig& config) = 0; }; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_interface.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_interface.h index cf0ebd3..aa9ffce 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_interface.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_interface.h @@ -55,51 +55,51 @@ public: public: /** * @Description - Enable the P2P mode. - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode EnableP2p() override; /** * @Description - Disable the P2P mode. - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode DisableP2p() override; /** * @Description - Start P2P device discovery. - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode DiscoverDevices() override; /** * @Description - Stop P2P device discovery. - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode StopDiscoverDevices() override; /** * @Description - Start P2P services discovery. - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode DiscoverServices() override; /** * @Description - Stop P2P services discovery. - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode StopDiscoverServices() override; /** * @Description - Register local P2P service. * @param srvInfo - local service information - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode PutLocalP2pService(const WifiP2pServiceInfo &srvInfo) override; /** * @Description - Delete local P2P service. * @param srvInfo - local service information - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode DeleteLocalP2pService(const WifiP2pServiceInfo &srvInfo) override; @@ -107,7 +107,7 @@ public: * @Description - Request specified services. * @param device - requested target device * @param request - initiated service request data - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode RequestService(const WifiP2pDevice &device, const WifiP2pServiceRequest &request) override; @@ -115,46 +115,46 @@ public: * @Description - Start the P2P listening. Unit: millisecond. * @param period - listening period * @param interval - listening interval - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode StartP2pListen(int period, int interval) override; /** * @Description - Stop the P2P listening. - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode StopP2pListen() override; /** * @Description - Create a P2P group. * @param config - config for creating group - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode CreateGroup(const WifiP2pConfig &config) override; /** * @Description - Remove the current P2P group. - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode RemoveGroup() override; /** * @Description - Delete a persistent group. * @param group - specified group - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode DeleteGroup(const WifiP2pGroupInfo &group) override; /** * @Description - Connect to a P2P device. * @param config - config for connection - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode P2pConnect(const WifiP2pConfig &config) override; /** * @Description - Canceling a P2P connection. - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode P2pCancelConnect() override; @@ -169,77 +169,77 @@ public: /** * @Description - Query P2P connection information. * @param linkedInfo - object that stores connection information - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode QueryP2pLinkedInfo(WifiP2pLinkedInfo &linkedInfo) override; /** * @Description set p2p wifi display info * @param wfdInfo - wifi display info - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode SetP2pWfdInfo(const WifiP2pWfdInfo &wfdInfo) override; /** * @Description - Get the current group information. * @param group - object that stores the current group - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode GetCurrentGroup(WifiP2pGroupInfo &group) override; /** * @Description - Obtain the P2P status. * @param status - object that stores P2P status - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode GetP2pEnableStatus(int &status) override; /** * @Description - Obtain the P2P discovery status. * @param status - object that stores discovery status - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode GetP2pDiscoverStatus(int &status) override; /** * @Description - Obtain the P2P connection status. * @param status - object that stores connection status - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode GetP2pConnectedStatus(int &status) override; /** * @Description - Query the information about the found devices. * @param devices - list of queryed device - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode QueryP2pDevices(std::vector &devices) override; /** * @Description - Query the information about own device. * @param device - own device - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode QueryP2pLocalDevice(WifiP2pDevice &device) override; /** * @Description - Obtain information about all groups. * @param groups - list of group information - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode QueryP2pGroups(std::vector &groups) override; /** * @Description - Query the information about the found services. * @param services - list of service information - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode QueryP2pServices(std::vector &services) override; /** * @Description - Register all callbacks provided by the P2P. * @param callbacks - all callbacks added - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode RegisterP2pServiceCallbacks(const IP2pServiceCallbacks &callbacks) override; @@ -248,7 +248,7 @@ public: * * @param frequency - frequency * @param type - frequency type - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode Hid2dCreateGroup(const int frequency, FreqType type) override; @@ -256,7 +256,7 @@ public: * @Description Connect to a specified group using hid2d, used on the GC side. * * @param config - connection parameters - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode Hid2dConnect(const Hid2dConnectConfig& config) override; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service.h index 11c08c9..da6407f 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service.h @@ -39,44 +39,44 @@ public: public: /** * @Description - Enable the P2P mode. - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode EnableP2p() override; /** * @Description - Disable the P2P mode. - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode DisableP2p() override; /** * @Description - Start P2P device search. - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode DiscoverDevices() override; /** * @Description - Stop P2P device search. - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode StopDiscoverDevices() override; /** * @Description - Start P2P service search. - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode DiscoverServices() override; /** * @Description - Stop P2P service search. - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode StopDiscoverServices() override; /** * @Description - Register the local P2P service. * @param srvInfo - local service information - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode PutLocalP2pService(const WifiP2pServiceInfo &srvInfo) override; /** * @Description - Delete the local P2P service. * @param srvInfo - local service information - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode DeleteLocalP2pService(const WifiP2pServiceInfo &srvInfo) override; @@ -84,47 +84,47 @@ public: * @Description - Request specified services. * @param device - requested target device * @param request - initiated service request data - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode RequestService(const WifiP2pDevice &device, const WifiP2pServiceRequest &request) override; /** * @Description - Start the P2P listening. Unit: millisecond. * @param period - listening period * @param interval - listening interval - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode StartP2pListen(int period, int interval) override; /** * @Description - Stop the P2P listening. - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode StopP2pListen() override; /** * @Description - Create a P2P group. * @param config - config for creating group - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode CreateGroup(const WifiP2pConfig &config) override; /** * @Description - Remove the current P2P group. - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode RemoveGroup() override; /** * @Description - Delete a persistent group. * @param group - specified group - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode DeleteGroup(const WifiP2pGroupInfo &group) override; /** * @Description - Connect to a P2P device. * @param config - config for connection - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode P2pConnect(const WifiP2pConfig &config) override; /** * @Description - Canceling a P2P connection. - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode P2pCancelConnect() override; /** @@ -137,61 +137,61 @@ public: /** * @Description - Query P2P connection information. * @param linkedInfo - object that stores connection information - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode QueryP2pLinkedInfo(WifiP2pLinkedInfo &linkedInfo) override; /** * @Description - Get the current group information. * @param group - object that stores the current group - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode GetCurrentGroup(WifiP2pGroupInfo &group) override; /** * @Description - Obtain the P2P status. * @param status - object that stores P2P status - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode GetP2pEnableStatus(int &status) override; /** * @Description - Obtain the P2P discovery status. * @param status - object that stores discovery status - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode GetP2pDiscoverStatus(int &status) override; /** * @Description - Obtain the P2P connection status. * @param status - object that stores connection status - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode GetP2pConnectedStatus(int &status) override; /** * @Description - Query the information about the found devices. * @param devices - list of queryed device - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode QueryP2pDevices(std::vector &devices) override; /** * @Description - Query the information about own device. * @param device - own device - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode QueryP2pLocalDevice(WifiP2pDevice &device) override; /** * @Description - Obtain information about all groups. * @param groups - list of group information - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode QueryP2pGroups(std::vector &groups) override; /** * @Description - Query the information about the found services. * @param services - list of service information - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode QueryP2pServices(std::vector &services) override; /** * @Description - Register all callbacks provided by the P2P. * @param callbacks - all callbacks added - * @return - ErrCode + * @return ErrCode - operation result */ virtual ErrCode RegisterP2pServiceCallbacks(const IP2pServiceCallbacks &callbacks) override; @@ -199,7 +199,7 @@ public: * @Description set p2p wifi display info * * @param wfdInfo - wifi display info - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode SetP2pWfdInfo(const WifiP2pWfdInfo &wfdInfo) override; @@ -208,7 +208,7 @@ public: * * @param frequency - frequency * @param type - frequency type - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode Hid2dCreateGroup(const int frequency, FreqType type) override; @@ -216,7 +216,7 @@ public: * @Description Connect to a specified group using hid2d, used on the GC side. * * @param config - connection parameters - * @return ErrCode - operate result + * @return ErrCode - operation result */ virtual ErrCode Hid2dConnect(const Hid2dConnectConfig& config) override; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.h index 9ba5582..a48c553 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.h @@ -40,42 +40,42 @@ public: /** * @Description Enabling the P2P Mode * - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode EnableP2p(void) override; /** * @Description Disable the P2P mode * - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode DisableP2p(void) override; /** * @Description Start Wi-Fi P2P device search * - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode DiscoverDevices(void) override; /** * @Description Stop Wi-Fi P2P device search * - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode StopDiscoverDevices(void) override; /** * @Description Start the search for the Wi-Fi P2P service * - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode DiscoverServices(void) override; /** * @Description Stop the search for the Wi-Fi P2P service * - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode StopDiscoverServices(void) override; @@ -84,7 +84,7 @@ public: * * @param device - WifiP2pDevice object * @param request - WifiP2pServiceRequest object - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode RequestService(const WifiP2pDevice &device, const WifiP2pServiceRequest &request) override; @@ -92,7 +92,7 @@ public: * @Description Register the local P2P service * * @param srvInfo - WifiP2pServiceInfo object - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode PutLocalP2pService(const WifiP2pServiceInfo &srvInfo) override; @@ -100,7 +100,7 @@ public: * @Description Delete the local P2P service * * @param srvInfo - WifiP2pServiceInfo object - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode DeleteLocalP2pService(const WifiP2pServiceInfo &srvInfo) override; @@ -109,14 +109,14 @@ public: * * @param period - period * @param interval - interval - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode StartP2pListen(int period, int interval) override; /** * @Description Disable Wi-Fi P2P listening * - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode StopP2pListen(void) override; @@ -124,7 +124,7 @@ public: * @Description Creating a P2P Group * * @param config - WifiP2pGroupInfo object - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode CreateGroup(const WifiP2pConfig &config) override; @@ -132,7 +132,7 @@ public: * @Description Remove a P2P Group * * - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode RemoveGroup(void) override; @@ -140,7 +140,7 @@ public: * @Description Delete a p2p Group * * @param group - WifiP2pGroupInfo object - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode DeleteGroup(const WifiP2pGroupInfo &group) override; @@ -148,14 +148,14 @@ public: * @Description P2P connection * * @param config - WifiP2pConfig object - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode P2pConnect(const WifiP2pConfig &config) override; /** * @Description Canceling a P2P connection * - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode P2pCancelConnect(void) override; @@ -163,7 +163,7 @@ public: * @Description Querying Wi-Fi P2P Connection Information * * @param linkedInfo - Get the WifiP2pLinkedInfo msg - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode QueryP2pLinkedInfo(WifiP2pLinkedInfo &linkedInfo) override; @@ -171,7 +171,7 @@ public: * @Description Get the Current Group object * * @param group - the WifiP2pGroupInfo object - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode GetCurrentGroup(WifiP2pGroupInfo &group) override; @@ -179,7 +179,7 @@ public: * @Description Obtains the P2P switch status * * @param status - the P2P switch status - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode GetP2pEnableStatus(int &status) override; @@ -195,7 +195,7 @@ public: * @Description Obtains the P2P connection status * * @param status - the P2P connection status - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode GetP2pConnectedStatus(int &status) override; @@ -203,7 +203,7 @@ public: * @Description Query the information about the found devices * * @param devices - Get result vector of WifiP2pDevice - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode QueryP2pDevices(std::vector &devices) override; @@ -211,7 +211,7 @@ public: * @Description Query the information about the local device * * @param devives - Get result of WifiP2pDevice - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode QueryP2pLocalDevice(WifiP2pDevice &device) override; @@ -219,7 +219,7 @@ public: * @Description Query the information about the found groups * * @param groups - Get result vector of WifiP2pGroupInfo - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode QueryP2pGroups(std::vector &groups) override; @@ -227,7 +227,7 @@ public: * @Description Query the service information * * @param services - Get result vector of Device - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode QueryP2pServices(std::vector &services) override; @@ -235,7 +235,7 @@ public: * @Description Register callback function * * @param callback - IWifiP2pCallback object - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode RegisterCallBack(const sptr &callback) override; @@ -251,7 +251,7 @@ public: * @Description set the device name * * @param deviceName - device name - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode SetP2pDeviceName(const std::string &deviceName) override; @@ -259,7 +259,7 @@ public: * @Description set p2p wifi display info * * @param wfdInfo - wifi display info - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode SetP2pWfdInfo(const WifiP2pWfdInfo &wfdInfo) override; @@ -268,21 +268,21 @@ public: * * @param gcMac - gc mac address * @param ipAddr - applied ip address - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode Hid2dRequestGcIp(const std::string& gcMac, std::string& ipAddr) override; /** * @Description Increase(+1) hid2d shared link reference counting * - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode Hid2dSharedlinkIncrease() override; /** * @Description Decrease(-1) hid2d shared link reference counting * - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode Hid2dSharedlinkDecrease() override; @@ -291,7 +291,7 @@ public: * * @param frequency - frequency * @param type - frequency type - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode Hid2dCreateGroup(const int frequency, FreqType type) override; @@ -299,7 +299,7 @@ public: * @Description The GC side actively disconnects from the GO, used on the GC side. * * @param gcIfName - network interface name - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode Hid2dRemoveGcGroup(const std::string& gcIfName) override; @@ -307,7 +307,7 @@ public: * @Description Connect to a specified group using hid2d, used on the GC side. * * @param config - connection parameters - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode Hid2dConnect(const Hid2dConnectConfig& config) override; @@ -316,7 +316,7 @@ public: * * @param ifName - network interface name * @param ipInfo - IP infos - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode Hid2dConfigIPAddr(const std::string& ifName, const IpAddrInfo& ipInfo) override; @@ -324,7 +324,7 @@ public: * @Description Clear IP address when the P2P connection is disconnected, used on the GC side. * * @param ifName - network interface name - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode Hid2dReleaseIPAddr(const std::string& ifName) override; @@ -333,7 +333,7 @@ public: * * @param request - request data * @param response - response result - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode Hid2dGetRecommendChannel(const RecommendChannelRequest& request, RecommendChannelResponse& response) override; @@ -342,7 +342,7 @@ public: * @Description get 5G channel list * * @param vecChannelList - result for channel list - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode Hid2dGetChannelListFor5G(std::vector& vecChannelList) override; @@ -352,7 +352,7 @@ public: * @param cfgType - configuration type * @param cfgData - the queried data of wifi configuration * @param getDatValidLen - the valid data length in the array `cfgData` - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode Hid2dGetSelfWifiCfgInfo(SelfCfgType cfgType, char cfgData[CFG_DATA_MAX_BYTES], int* getDatValidLen) override; @@ -363,7 +363,7 @@ public: * @param cfgType - configuration type * @param cfgData - the wifi configuration data to be set * @param setDataValidLen - the valid data length in the array `cfgData` - * @return ErrCode - operate result + * @return ErrCode - operation result */ ErrCode Hid2dSetPeerWifiCfgInfo(PeerCfgType cfgType, char cfgData[CFG_DATA_MAX_BYTES], int setDataValidLen) override; @@ -373,7 +373,7 @@ public: * * @param fd - file descriptor * @param args - dump arguments - * @return ErrCode - operate result + * @return ErrCode - operation result */ int32_t Dump(int32_t fd, const std::vector& args) override; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_protect_manager.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_protect_manager.h index bd3f110..ceb1894 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_protect_manager.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_protect_manager.h @@ -99,7 +99,7 @@ public: * @Description set low latency mode * * @param enabled - true: enable low latency, false: disable low latency - * @return bool - operate result + * @return bool - operation result */ bool SetLowLatencyMode(bool enabled); diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c index 35cd2bf..0968c59 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c @@ -125,7 +125,7 @@ WifiErrorNo StopSoftAp(int id) LOGE("disableAp failed! ret=%{public}d", ret); } } else { - LOGE("can not get hostapd dev"); + LOGE("cant not get hostapd dev"); } if (StopHostapd() != WIFI_HAL_SUCCESS) { -- Gitee From fca47d20113f3159ff05268ef1b10e06fdb0a514 Mon Sep 17 00:00:00 2001 From: y00316381 Date: Mon, 27 Jun 2022 21:56:28 +0800 Subject: [PATCH 207/491] bugfix from master 0627 Signed-off-by: y00316381 --- wifi/frameworks/js/napi/inc/wifi_napi_device.h | 1 + wifi/frameworks/js/napi/src/wifi_napi_device.cpp | 15 +++++++++++++++ wifi/frameworks/js/napi/src/wifi_napi_entry.cpp | 1 + 3 files changed, 17 insertions(+) diff --git a/wifi/frameworks/js/napi/inc/wifi_napi_device.h b/wifi/frameworks/js/napi/inc/wifi_napi_device.h index bf0d12c..c60010a 100644 --- a/wifi/frameworks/js/napi/inc/wifi_napi_device.h +++ b/wifi/frameworks/js/napi/inc/wifi_napi_device.h @@ -27,6 +27,7 @@ napi_value DisableWifi(napi_env env, napi_callback_info info); napi_value IsWifiActive(napi_env env, napi_callback_info info); napi_value Scan(napi_env env, napi_callback_info info); napi_value GetScanInfos(napi_env env, napi_callback_info info); +napi_value GetScanResults(napi_env env, napi_callback_info info); napi_value AddDeviceConfig(napi_env env, napi_callback_info info); napi_value AddUntrustedConfig(napi_env env, napi_callback_info info); napi_value RemoveUntrustedConfig(napi_env env, napi_callback_info info); diff --git a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp index 0affa79..1520db0 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp @@ -221,6 +221,21 @@ napi_value GetScanInfos(napi_env env, napi_callback_info info) return DoAsyncWork(env, asyncContext, argc, argv, nonCallbackArgNum); } +napi_value GetScanResults(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + NAPI_ASSERT(env, wifiScanPtr != nullptr, "Wifi scan instance is null."); + std::vector scanInfos; + ErrCode ret = wifiScanPtr->GetScanInfoList(scanInfos); + if (ret != WIFI_OPT_SUCCESS) { + WIFI_LOGE("GetScanInfoList return fail: %{public}d", ret); + } + + WIFI_LOGI("GetScanInfoList, size: %{public}zu", scanInfos.size()); + NativeScanInfosToJsObj(env, scanInfos, ret); + return ret; +} + static void ConvertEncryptionMode(const SecTypeJs& securityType, std::string& keyMgmt) { switch (securityType) { diff --git a/wifi/frameworks/js/napi/src/wifi_napi_entry.cpp b/wifi/frameworks/js/napi/src/wifi_napi_entry.cpp index eca8812..e5b5132 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_entry.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_entry.cpp @@ -32,6 +32,7 @@ static napi_value Init(napi_env env, napi_value exports) { DECLARE_NAPI_FUNCTION("isWifiActive", IsWifiActive), DECLARE_NAPI_FUNCTION("scan", Scan), DECLARE_NAPI_FUNCTION("getScanInfos", GetScanInfos), + DECLARE_NAPI_FUNCTION("getScanResults", GetScanResults), DECLARE_NAPI_FUNCTION("addDeviceConfig", AddDeviceConfig), DECLARE_NAPI_FUNCTION("addUntrustedConfig", AddUntrustedConfig), DECLARE_NAPI_FUNCTION("removeUntrustedConfig", RemoveUntrustedConfig), -- Gitee From 4796ee700876bbc3f331311f8259bfe8e7878b79 Mon Sep 17 00:00:00 2001 From: y00316381 Date: Mon, 27 Jun 2022 22:02:09 +0800 Subject: [PATCH 208/491] bugfix from master 0627 Signed-off-by: y00316381 --- .../frameworks/js/napi/src/wifi_napi_device.cpp | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp index 1520db0..e4bd913 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp @@ -151,23 +151,6 @@ static ErrCode NativeScanInfosToJsObj(const napi_env& env, for (auto& each : vecScnIanfos) { napi_value eachObj; napi_create_object(env, &eachObj); - - NativeEngine *engine = reinterpret_cast(env); - std::vector int32key = {"securityType", "rssi", "band", "frequency", "channelWidth", "timestamp"}; - std::vector int32Val = {static_cast(SecurityTypeNativeToJs(each.securityType)), - each.rssi, each.band, each.frequency, static_cast(each.channelWidth), each.timestamp}; - - std::vector strKey = {"ssid", "bssid", "capabilities"}; - std::vector strVal = {each.ssid.c_str(), each.bssid.c_str(), each.capabilities.c_str()}; - - std::vector int64key = {"timestamp"}; - std::vector int64Val = {each.timestamp}; - - NativePropertyMessage mes(int32key, int32Val, int64key, int64Val, strKey, strVal); - NativeValue *obj = engine->CreateObjectFromProperties(mes); - - napi_value eachObj = reinterpret_cast(mes); - SetValueUtf8String(env, "ssid", each.ssid.c_str(), eachObj); SetValueUtf8String(env, "bssid", each.bssid.c_str(), eachObj); SetValueUtf8String(env, "capabilities", each.capabilities.c_str(), eachObj); -- Gitee From d7069ca8f1d2818f396a79ef5c650975f21cf8fe Mon Sep 17 00:00:00 2001 From: zhoushicheng Date: Tue, 28 Jun 2022 09:16:59 +0800 Subject: [PATCH 209/491] aafwk->ability_runtime Signed-off-by: zhoushicheng Change-Id: Ic173d8acd911059724c028e99fb492ad23aff252 --- wifi/wifi_lite.gni | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wifi/wifi_lite.gni b/wifi/wifi_lite.gni index bff52a3..05a202d 100644 --- a/wifi/wifi_lite.gni +++ b/wifi/wifi_lite.gni @@ -12,7 +12,8 @@ # limitations under the License. ability_runtime_services_path = "//foundation/ability/ability_runtime/services" -ability_runtime_innerkits_path = "//foundation/ability/ability_runtime/interfaces/inner_api" +ability_runtime_innerkits_path = + "//foundation/ability/ability_runtime/interfaces/inner_api" SUBSYSTEM_DIR = "//foundation/communication" WIFI_ROOT_DIR = "$SUBSYSTEM_DIR/wifi/wifi" -- Gitee From 4f45e78d7d3ea1cbcd30b373da52abb6933d9880 Mon Sep 17 00:00:00 2001 From: y00316381 Date: Tue, 28 Jun 2022 09:20:53 +0800 Subject: [PATCH 210/491] bugfix from master 0627 Signed-off-by: y00316381 --- .../js/napi/src/wifi_napi_device.cpp | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp index e4bd913..65b4927 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp @@ -105,21 +105,21 @@ static ErrCode NativeInfoElemsToJsObj(const napi_env& env, uint8_t idx_ie = 0; napi_status status; int valueStep = 2; - for (int i = 0; i < infoElems.size(); i++) { + for (size_t i = 0; i < infoElems.size(); i++) { napi_value ieObj; napi_create_object(env, &ieObj); SetValueInt32(env, "eid", infoElems[i].id, ieObj); const char *uStr = &infoElems[i].content[0]; - int len = infoElems[i].content.size(); - int inLen = (infoElems[i].content.size()) * valueStep + 1; + size_t len = infoElems[i].content.size(); + size_t inLen = (infoElems[i].content.size()) * valueStep + 1; char *buf = (char *)calloc(inLen + 1, sizeof(char)); if (buf == NULL) { return WIFI_OPT_FAILED; } int pos = 0; - for (unsigned int i = 0; i < len; ++i) { - pos = (i << 1); - if (snprintf_s(buf + pos, inLen - pos, inLen - pos - 1, "%02x", uStr[i]) < 0) { + for (size_t k = 0; k < len; ++k) { + pos = (k << 1); + if (snprintf_s(buf + pos, inLen - pos, inLen - pos - 1, "%02x", uStr[k]) < 0) { free(buf); buf = NULL; return WIFI_OPT_FAILED; @@ -215,7 +215,11 @@ napi_value GetScanResults(napi_env env, napi_callback_info info) } WIFI_LOGI("GetScanInfoList, size: %{public}zu", scanInfos.size()); - NativeScanInfosToJsObj(env, scanInfos, ret); + napi_value result; + ret = NativeScanInfosToJsObj(env, scanInfos, result); + if (ret != WIFI_OPT_SUCCESS) { + WIFI_LOGE("NativeScanInfosToJsObj return fail: %{public}d", ret); + } return ret; } -- Gitee From 0c43e0485df1c7345a570a8ac84869aed406518d Mon Sep 17 00:00:00 2001 From: lujunxin Date: Tue, 28 Jun 2022 11:37:06 +0800 Subject: [PATCH 211/491] remove go when clients is empty Signed-off-by: lujunxin --- .../wifi_manage/wifi_p2p/group_formed_state.cpp | 5 +++++ .../wifi_manage/wifi_p2p/wifi_p2p_group_manager.h | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.cpp index 262f7ed..4b60c06 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.cpp @@ -213,6 +213,11 @@ bool GroupFormedState::ProcessDisconnectEvt(const InternalMessage &msg) const p2pStateMachine.BroadcastP2pPeersChanged(); p2pStateMachine.BroadcastP2pConnectionChanged(); deviceManager.RemoveDevice(device); + if (groupManager.IsCurrGroupClientEmpty()) { + WIFI_LOGE("Clients empty, remove p2p group."); + p2pStateMachine.SwitchState(&p2pStateMachine.p2pGroupOperatingState); + p2pStateMachine.SendMessage(static_cast(P2P_STATE_MACHINE_CMD::CMD_REMOVE_GROUP)); + } return EXECUTED; } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_manager.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_manager.h index 8e7de10..35b2444 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_manager.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_manager.h @@ -171,6 +171,11 @@ public: currentGroup.RemoveClientDevice(device); } + inline bool IsCurrGroupClientEmpty(void) + { + return currentGroup.IsClientDevicesEmpty(); + } + inline void SetCurrentGroup(const WifiP2pGroupInfo &group) { currentGroup = group; -- Gitee From 6b8832b554d3a8d2faf7f98384aa8fcc398fc2b5 Mon Sep 17 00:00:00 2001 From: y00316381 Date: Wed, 29 Jun 2022 09:53:51 +0800 Subject: [PATCH 212/491] bugfix from master 0629 Signed-off-by: y00316381 --- .../wifi_manage/wifi_device_service_impl.cpp | 9 +++++++++ .../wifi_manage/wifi_hotspot_service_impl.cpp | 7 +++++++ 2 files changed, 16 insertions(+) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp index 315816d..087a06f 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp @@ -161,6 +161,15 @@ ErrCode WifiDeviceServiceImpl::EnableWifi() } } +#ifdef FEATURE_AP_SUPPORT + WifiOprMidState curState = WifiConfigCenter::GetInstance().GetApMidState(0); + if (curState != WifiOprMidState::CLOSED) { + WIFI_LOGW("current ap state is %{public}d, please close SoftAp first!", + static_cast(curState)); + return WIFI_OPT_NOT_SUPPORTED; + } +#endif + #ifdef FEATURE_P2P_SUPPORT sptr p2pService = WifiP2pServiceImpl::GetInstance(); if (p2pService != nullptr && p2pService->EnableP2p() != WIFI_OPT_SUCCESS) { diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp index 9d35e6d..2d0e202 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp @@ -265,6 +265,13 @@ ErrCode WifiHotspotServiceImpl::CheckCanEnableHotspot(const ServiceType type) WIFI_LOGI("current power saving mode and can not use ap, open failed!"); return WIFI_OPT_FORBID_POWSAVING; } + + WifiOprMidState curState = WifiConfigCenter::GetInstance().GetWifiMidState(); + if (curState != WifiOprMidState::CLOSED) { + WIFI_LOGI("current wifi state is %{public}d, please close sta first!", + static_cast(curState)); + return WIFI_OPT_NOT_SUPPORTED; + } return WIFI_OPT_SUCCESS; } -- Gitee From ec337b6ba3b6133a0900642c01c7c65b4961e3ae Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Wed, 29 Jun 2022 12:38:54 +0000 Subject: [PATCH 213/491] Variable initialization optimization Signed-off-by: zhangfeng Change-Id: If3ad84fdcbe7f09a4107effc7219f8829206dbbf --- .../frameworks/native/src/wifi_device_proxy.cpp | 12 +++++++++++- .../native/src/wifi_hotspot_proxy.cpp | 4 +++- wifi/frameworks/native/src/wifi_p2p_proxy.cpp | 17 +++++++++++++---- wifi/frameworks/native/src/wifi_scan_proxy.cpp | 17 +++++++++++++---- 4 files changed, 40 insertions(+), 10 deletions(-) diff --git a/wifi/frameworks/native/src/wifi_device_proxy.cpp b/wifi/frameworks/native/src/wifi_device_proxy.cpp index 9c1da8b..d80e833 100644 --- a/wifi/frameworks/native/src/wifi_device_proxy.cpp +++ b/wifi/frameworks/native/src/wifi_device_proxy.cpp @@ -24,7 +24,9 @@ DEFINE_WIFILOG_LABEL("WifiDeviceProxy"); namespace OHOS { namespace Wifi { -static WifiDeviceCallBackStub* g_deviceCallBackStub = new WifiDeviceCallBackStub; +static sptr g_deviceCallBackStub = + sptr(new (std::nothrow) WifiDeviceCallBackStub()); + WifiDeviceProxy::WifiDeviceProxy(const sptr &impl) : IRemoteProxy(impl), mRemoteDied(false) { if (impl) { @@ -966,6 +968,10 @@ ErrCode WifiDeviceProxy::RegisterCallBack(const sptr &callb } data.WriteInt32(0); + if (g_deviceCallBackStub == nullptr) { + WIFI_LOGE("g_deviceCallBackStub is nullptr"); + return WIFI_OPT_FAILED; + } g_deviceCallBackStub->RegisterUserCallBack(callback); if (!data.WriteRemoteObject(g_deviceCallBackStub->AsObject())) { @@ -1112,6 +1118,10 @@ void WifiDeviceProxy::OnRemoteDied(const wptr &remoteObject) { WIFI_LOGD("Remote service is died!"); mRemoteDied = true; + if (g_deviceCallBackStub == nullptr) { + WIFI_LOGE("g_deviceCallBackStub is nullptr"); + return; + } if (g_deviceCallBackStub != nullptr) { g_deviceCallBackStub->SetRemoteDied(true); } diff --git a/wifi/frameworks/native/src/wifi_hotspot_proxy.cpp b/wifi/frameworks/native/src/wifi_hotspot_proxy.cpp index 9185e5c..b1462cc 100644 --- a/wifi/frameworks/native/src/wifi_hotspot_proxy.cpp +++ b/wifi/frameworks/native/src/wifi_hotspot_proxy.cpp @@ -24,7 +24,9 @@ DEFINE_WIFILOG_HOTSPOT_LABEL("WifiHotspotProxy"); namespace OHOS { namespace Wifi { -static WifiHotspotCallbackStub *g_wifiHotspotCallbackStub = new WifiHotspotCallbackStub; +static sptr g_wifiHotspotCallbackStub = + sptr(new (std::nothrow) WifiHotspotCallbackStub()); + WifiHotspotProxy::WifiHotspotProxy(const sptr &impl) : IRemoteProxy(impl), mRemoteDied(false) { diff --git a/wifi/frameworks/native/src/wifi_p2p_proxy.cpp b/wifi/frameworks/native/src/wifi_p2p_proxy.cpp index ff5d33d..a71240f 100644 --- a/wifi/frameworks/native/src/wifi_p2p_proxy.cpp +++ b/wifi/frameworks/native/src/wifi_p2p_proxy.cpp @@ -21,7 +21,8 @@ namespace OHOS { namespace Wifi { DEFINE_WIFILOG_P2P_LABEL("WifiP2pProxy"); -static WifiP2pCallbackStub g_wifiP2pCallbackStub; +static sptr g_wifiP2pCallbackStub = + sptr(new (std::nothrow) WifiP2pCallbackStub()); WifiP2pProxy::WifiP2pProxy(const sptr &impl) : IRemoteProxy(impl), mRemoteDied(false) { if (impl) { @@ -1017,13 +1018,17 @@ ErrCode WifiP2pProxy::RegisterCallBack(const sptr &callback) MessageParcel reply; MessageOption option(MessageOption::TF_ASYNC); - g_wifiP2pCallbackStub.RegisterCallBack(callback); + if (g_wifiP2pCallbackStub == nullptr) { + WIFI_LOGE("g_wifiP2pCallbackStub is nullptr"); + return WIFI_OPT_FAILED; + } + g_wifiP2pCallbackStub->RegisterCallBack(callback); if (!data.WriteInterfaceToken(GetDescriptor())) { WIFI_LOGE("Write interface token error: %{public}s", __func__); return WIFI_OPT_FAILED; } data.WriteInt32(0); - if (!data.WriteRemoteObject(g_wifiP2pCallbackStub.AsObject())) { + if (!data.WriteRemoteObject(g_wifiP2pCallbackStub->AsObject())) { WIFI_LOGE("RegisterCallBack WriteRemoteObject failed!"); return WIFI_OPT_FAILED; } @@ -1484,7 +1489,11 @@ void WifiP2pProxy::OnRemoteDied(const wptr& remoteObject) { WIFI_LOGE("Remote service is died!"); mRemoteDied = true; - g_wifiP2pCallbackStub.SetRemoteDied(true); + if (g_wifiP2pCallbackStub == nullptr) { + WIFI_LOGE("g_wifiP2pCallbackStub is nullptr"); + return; + } + g_wifiP2pCallbackStub->SetRemoteDied(true); } } // namespace Wifi } // namespace OHOS diff --git a/wifi/frameworks/native/src/wifi_scan_proxy.cpp b/wifi/frameworks/native/src/wifi_scan_proxy.cpp index 460e3a2..96afef5 100644 --- a/wifi/frameworks/native/src/wifi_scan_proxy.cpp +++ b/wifi/frameworks/native/src/wifi_scan_proxy.cpp @@ -23,7 +23,8 @@ namespace OHOS { DEFINE_WIFILOG_SCAN_LABEL("WifiScanProxy"); namespace Wifi { -static WifiScanCallbackStub g_wifiScanCallbackStub; +static sptr g_wifiScanCallbackStub = + sptr(new (std::nothrow) WifiScanCallbackStub()); WifiScanProxy::WifiScanProxy(const sptr &remote) : IRemoteProxy(remote), mRemoteDied(false) { @@ -272,13 +273,17 @@ ErrCode WifiScanProxy::RegisterCallBack(const sptr &callback) MessageParcel reply; MessageOption option(MessageOption::TF_ASYNC); - g_wifiScanCallbackStub.RegisterCallBack(callback); + if (g_wifiScanCallbackStub == nullptr) { + WIFI_LOGE("g_wifiScanCallbackStub is nullptr!"); + return WIFI_OPT_FAILED; + } + g_wifiScanCallbackStub->RegisterCallBack(callback); if (!data.WriteInterfaceToken(GetDescriptor())) { WIFI_LOGE("Write interface token error: %{public}s", __func__); return WIFI_OPT_FAILED; } data.WriteInt32(0); - if (!data.WriteRemoteObject(g_wifiScanCallbackStub.AsObject())) { + if (!data.WriteRemoteObject(g_wifiScanCallbackStub->AsObject())) { WIFI_LOGE("RegisterCallBack WriteRemoteObject failed!"); return WIFI_OPT_FAILED; } @@ -328,7 +333,11 @@ void WifiScanProxy::OnRemoteDied(const wptr& remoteObject) { WIFI_LOGD("Remote service is died!"); mRemoteDied = true; - g_wifiScanCallbackStub.SetRemoteDied(true); + if (g_wifiScanCallbackStub == nullptr) { + WIFI_LOGE("g_wifiScanCallbackStub is nullptr!"); + return; + } + g_wifiScanCallbackStub->SetRemoteDied(true); } } // namespace Wifi } // namespace OHOS -- Gitee From 6ceac016185f32e407107c15b99b39ca79f24afe Mon Sep 17 00:00:00 2001 From: lujunxin Date: Thu, 30 Jun 2022 11:38:16 +0800 Subject: [PATCH 214/491] fix nullptr issue Signed-off-by: lujunxin --- dhcp/services/mgr_service/src/dhcp_service_api.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dhcp/services/mgr_service/src/dhcp_service_api.cpp b/dhcp/services/mgr_service/src/dhcp_service_api.cpp index 9e878d9..7177089 100644 --- a/dhcp/services/mgr_service/src/dhcp_service_api.cpp +++ b/dhcp/services/mgr_service/src/dhcp_service_api.cpp @@ -23,7 +23,7 @@ namespace OHOS { namespace Wifi { std::unique_ptr DhcpServiceApi::GetInstance() { - std::unique_ptr service = std::unique_ptr(); + std::unique_ptr service = std::make_unique(); if (service == nullptr) { WIFI_LOGI("DhcpApi GetInstance is null"); } -- Gitee From 23c51b60dd3227de8b29395e118528500f3890fc Mon Sep 17 00:00:00 2001 From: lujunxin Date: Sat, 2 Jul 2022 16:07:16 +0800 Subject: [PATCH 215/491] dont remove group created by user when gc disconnected Signed-off-by: lujunxin --- .../frameworks/native/interfaces/wifi_p2p_msg.h | 6 +++++- wifi/frameworks/native/src/wifi_p2p_msg.cpp | 10 ++++++++++ .../common/config/wifi_settings.cpp | 12 +++++++++++- .../common/config/wifi_settings.h | 17 ++++++++++++++++- .../wifi_manage/wifi_p2p/group_formed_state.cpp | 2 +- .../wifi_p2p/p2p_group_operating_state.cpp | 6 ++++++ .../wifi_p2p/wifi_p2p_group_info_proxy.cpp | 7 ++++++- .../wifi_p2p/wifi_p2p_group_info_proxy.h | 3 ++- 8 files changed, 57 insertions(+), 6 deletions(-) diff --git a/wifi/frameworks/native/interfaces/wifi_p2p_msg.h b/wifi/frameworks/native/interfaces/wifi_p2p_msg.h index e85f3db..afa18d0 100644 --- a/wifi/frameworks/native/interfaces/wifi_p2p_msg.h +++ b/wifi/frameworks/native/interfaces/wifi_p2p_msg.h @@ -231,7 +231,8 @@ public: networkId(INVALID_NET_ID), frequency(0), isP2pPersistent(0), - groupStatus(P2pGroupStatus::GS_INVALID) + groupStatus(P2pGroupStatus::GS_INVALID), + explicitGroup(false) {} ~WifiP2pGroupInfo() {} @@ -264,6 +265,8 @@ public: const std::vector &GetClientDevices() const; void SetClientDevices(const std::vector &devices); void ClearClientDevices(); + bool IsExplicitGroup(void) const; + void SetExplicitGroup(bool isExplicit); private: WifiP2pDevice owner; @@ -277,6 +280,7 @@ private: P2pGroupStatus groupStatus; std::vector clientDevices; std::string goIpAddress; + bool explicitGroup; }; class WpsInfo { diff --git a/wifi/frameworks/native/src/wifi_p2p_msg.cpp b/wifi/frameworks/native/src/wifi_p2p_msg.cpp index 1cfd6a0..1e2a458 100644 --- a/wifi/frameworks/native/src/wifi_p2p_msg.cpp +++ b/wifi/frameworks/native/src/wifi_p2p_msg.cpp @@ -392,6 +392,16 @@ bool WifiP2pGroupInfo::IsClientDevicesEmpty() const return clientDevices.empty(); } +bool WifiP2pGroupInfo::IsExplicitGroup(void) const +{ + return explicitGroup; +} + +void WifiP2pGroupInfo::SetExplicitGroup(bool isExplicit) +{ + explicitGroup = isExplicit; +} + const std::vector &WifiP2pGroupInfo::GetClientDevices() const { return clientDevices; diff --git a/wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp b/wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp index 7912953..0725320 100644 --- a/wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp +++ b/wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp @@ -1381,5 +1381,15 @@ void WifiSettings::SetDefaultFrequenciesByCountryBand(const BandType band, std:: } } } + +void WifiSettings::SetExplicitGroup(bool isExplicit) +{ + explicitGroup = isExplicit; +} + +bool WifiSettings::IsExplicitGroup(void) +{ + return explicitGroup; +} } // namespace Wifi -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.h b/wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.h index ca1e660..95e89ba 100644 --- a/wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.h +++ b/wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.h @@ -1018,6 +1018,20 @@ public: */ void SetDefaultFrequenciesByCountryBand(const BandType band, std::vector &frequencies); + /** + * @Description set type of GO group + * + * @param isExplicit true: created by user; false: created by auto negotiation + */ + void SetExplicitGroup(bool isExplicit); + + /** + * @Description get type of Go group + * + * @return true: created by user; false: created by auto negotiation + */ + bool IsExplicitGroup(void); + private: WifiSettings(); void InitWifiConfig(); @@ -1085,7 +1099,8 @@ private: WifiConfigFileImpl mMovingFreezePolicy; MovingFreezePolicy mFPolicy; WifiConfigFileImpl mSavedWifiStoreRandomMac; + bool explicitGroup; }; } // namespace Wifi } // namespace OHOS -#endif \ No newline at end of file +#endif diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.cpp index 4b60c06..9f67976 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.cpp @@ -213,7 +213,7 @@ bool GroupFormedState::ProcessDisconnectEvt(const InternalMessage &msg) const p2pStateMachine.BroadcastP2pPeersChanged(); p2pStateMachine.BroadcastP2pConnectionChanged(); deviceManager.RemoveDevice(device); - if (groupManager.IsCurrGroupClientEmpty()) { + if (groupManager.IsCurrGroupClientEmpty() && !groupManager.GetCurrentGroup().IsExplicitGroup()) { WIFI_LOGE("Clients empty, remove p2p group."); p2pStateMachine.SwitchState(&p2pStateMachine.p2pGroupOperatingState); p2pStateMachine.SendMessage(static_cast(P2P_STATE_MACHINE_CMD::CMD_REMOVE_GROUP)); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.cpp index 13af799..3cb8e10 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.cpp @@ -35,12 +35,14 @@ P2pGroupOperatingState::P2pGroupOperatingState(P2pStateMachine &stateMachine, Wi void P2pGroupOperatingState::GoInState() { WIFI_LOGI(" GoInState"); + WifiSettings::GetInstance().SetExplicitGroup(false); Init(); } void P2pGroupOperatingState::GoOutState() { WIFI_LOGI(" GoOutState"); + WifiSettings::GetInstance().SetExplicitGroup(false); } void P2pGroupOperatingState::Init() @@ -91,9 +93,12 @@ bool P2pGroupOperatingState::ProcessCmdCreateGroup(const InternalMessage &msg) c */ WIFI_LOGE("Create a new %{public}s group.", (netId == PERSISTENT_NET_ID) ? "persistence" : "temporary"); if (config.GetPassphrase().empty() && config.GetGroupName().empty()) { + WifiSettings::GetInstance().SetExplicitGroup(true); ret = WifiP2PHalInterface::GetInstance().GroupAdd((netId == PERSISTENT_NET_ID) ? true : false, netId, freq); + (void)WifiP2PHalInterface::GetInstance().SaveConfig(); } else if (!config.GetPassphrase().empty() && !config.GetGroupName().empty() && config.GetPassphrase().length() >= MIN_PSK_LEN && config.GetPassphrase().length() <= MAX_PSK_LEN) { + WifiSettings::GetInstance().SetExplicitGroup(true); if (p2pStateMachine.DealCreateNewGroupWithConfig(config, freq)) { ret = WIFI_IDL_OPT_OK; } @@ -144,6 +149,7 @@ bool P2pGroupOperatingState::ProcessGroupStartedEvt(const InternalMessage &msg) thisDevice.SetP2pDeviceStatus(P2pDeviceStatus::PDS_CONNECTED); thisDevice.SetDeviceAddress(goAddr); group.SetOwner(thisDevice); + group.SetExplicitGroup(WifiSettings::GetInstance().IsExplicitGroup()); } else { WifiP2pDevice dev = deviceManager.GetDevices(goAddr); dev.SetP2pDeviceStatus(P2pDeviceStatus::PDS_CONNECTED); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_info_proxy.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_info_proxy.cpp index 688fd60..01aa461 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_info_proxy.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_info_proxy.cpp @@ -189,6 +189,11 @@ void WifiP2pGroupInfoProxy::ClearClientDevices() groupsInfo.ClearClientDevices(); } +bool WifiP2pGroupInfoProxy::IsExplicitGroup() const +{ + return groupsInfo.IsExplicitGroup(); +} + WifiP2pGroupInfoProxy &WifiP2pGroupInfoProxy::operator=(const WifiP2pGroupInfo &group) { std::unique_lock lock(proxyMutex); @@ -202,4 +207,4 @@ WifiP2pGroupInfoProxy::operator WifiP2pGroupInfo() const return groupsInfo; } } // namespace Wifi -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_info_proxy.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_info_proxy.h index ba2ea27..52ac9ba 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_info_proxy.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_info_proxy.h @@ -80,6 +80,7 @@ public: std::vector GetClientDevices() const; void SetClientDevices(const std::vector &devices); void ClearClientDevices(); + bool IsExplicitGroup() const; public: ~WifiP2pGroupInfoProxy() = default; @@ -104,4 +105,4 @@ private: } // namespace Wifi } // namespace OHOS -#endif // OHOS_P2P_WIFI_P2P_GROUP_INFO_PROXY_H \ No newline at end of file +#endif // OHOS_P2P_WIFI_P2P_GROUP_INFO_PROXY_H -- Gitee From 0db348672a88f427ac6a399ff51928f7732ce044 Mon Sep 17 00:00:00 2001 From: guojing Date: Mon, 4 Jul 2022 15:58:09 +0800 Subject: [PATCH 216/491] add getScanInfosSync api 0704 Signed-off-by: guojing --- wifi/frameworks/js/napi/src/wifi_napi_device.cpp | 2 +- wifi/frameworks/js/napi/src/wifi_napi_entry.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp index 65b4927..48131ba 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp @@ -220,7 +220,7 @@ napi_value GetScanResults(napi_env env, napi_callback_info info) if (ret != WIFI_OPT_SUCCESS) { WIFI_LOGE("NativeScanInfosToJsObj return fail: %{public}d", ret); } - return ret; + return result; } static void ConvertEncryptionMode(const SecTypeJs& securityType, std::string& keyMgmt) diff --git a/wifi/frameworks/js/napi/src/wifi_napi_entry.cpp b/wifi/frameworks/js/napi/src/wifi_napi_entry.cpp index e5b5132..32e204e 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_entry.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_entry.cpp @@ -32,7 +32,7 @@ static napi_value Init(napi_env env, napi_value exports) { DECLARE_NAPI_FUNCTION("isWifiActive", IsWifiActive), DECLARE_NAPI_FUNCTION("scan", Scan), DECLARE_NAPI_FUNCTION("getScanInfos", GetScanInfos), - DECLARE_NAPI_FUNCTION("getScanResults", GetScanResults), + DECLARE_NAPI_FUNCTION("getScanInfosSync", GetScanResults), DECLARE_NAPI_FUNCTION("addDeviceConfig", AddDeviceConfig), DECLARE_NAPI_FUNCTION("addUntrustedConfig", AddUntrustedConfig), DECLARE_NAPI_FUNCTION("removeUntrustedConfig", RemoveUntrustedConfig), -- Gitee From b92e421d98bb5e88c10b0e250c62bedc2044501b Mon Sep 17 00:00:00 2001 From: liwei01 Date: Thu, 23 Jun 2022 20:48:20 +0800 Subject: [PATCH 217/491] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BB=BA=E8=AE=AE?= =?UTF-8?q?=E7=BD=91=E7=BB=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: liwei01 --- .../frameworks/js/napi/inc/wifi_napi_device.h | 18 +- .../js/napi/src/wifi_napi_device.cpp | 169 ++++++++++++-- .../js/napi/src/wifi_napi_entry.cpp | 4 + wifi/frameworks/native/include/wifi_device.h | 33 +++ wifi/frameworks/native/interfaces/define.h | 5 +- .../native/interfaces/i_wifi_device.h | 33 +++ wifi/frameworks/native/interfaces/wifi_msg.h | 3 + .../native/src/wifi_device_impl.cpp | 24 ++ wifi/frameworks/native/src/wifi_device_impl.h | 35 ++- .../native/src/wifi_device_proxy.cpp | 117 ++++++++++ .../frameworks/native/src/wifi_device_proxy.h | 35 ++- .../native/src/wifi_device_proxy_lite.cpp | 26 +++ .../common/config/wifi_config_file_spec.cpp | 7 + .../common/config/wifi_settings.cpp | 45 ++++ .../common/config/wifi_settings.h | 34 +++ .../common/include/wifi_internal_msg.h | 3 + .../wifi_framework/wifi_manage/BUILD.gn | 6 +- .../wifi_manage/wifi_config_center.cpp | 5 + .../wifi_manage/wifi_config_center.h | 8 + .../wifi_manage/wifi_device_service_impl.cpp | 206 ++++++++++++++++++ .../wifi_manage/wifi_device_service_impl.h | 29 +++ .../wifi_manage/wifi_device_stub.cpp | 62 ++++++ .../wifi_manage/wifi_device_stub.h | 4 + .../wifi_manage/wifi_sta/ista_service.h | 36 +++ .../wifi_manage/wifi_sta/sta_interface.cpp | 40 ++++ .../wifi_manage/wifi_sta/sta_interface.h | 31 +++ .../wifi_sta/sta_saved_device_appraisal.cpp | 7 + .../wifi_sta/sta_saved_device_appraisal.h | 1 + .../wifi_manage/wifi_sta/sta_service.cpp | 66 ++++++ .../wifi_manage/wifi_sta/sta_service.h | 32 ++- wifi/utils/inc/wifi_common_util.h | 15 ++ wifi/utils/src/BUILD.gn | 1 + wifi/utils/src/wifi_common_util.cpp | 35 +++ 33 files changed, 1144 insertions(+), 31 deletions(-) diff --git a/wifi/frameworks/js/napi/inc/wifi_napi_device.h b/wifi/frameworks/js/napi/inc/wifi_napi_device.h index bf0d12c..285ac25 100644 --- a/wifi/frameworks/js/napi/inc/wifi_napi_device.h +++ b/wifi/frameworks/js/napi/inc/wifi_napi_device.h @@ -30,6 +30,10 @@ napi_value GetScanInfos(napi_env env, napi_callback_info info); napi_value AddDeviceConfig(napi_env env, napi_callback_info info); napi_value AddUntrustedConfig(napi_env env, napi_callback_info info); napi_value RemoveUntrustedConfig(napi_env env, napi_callback_info info); +napi_value AddCandidateConfig(napi_env env, napi_callback_info info); +napi_value RemoveCandidateConfig(napi_env env, napi_callback_info info); +napi_value ConnectToCandidateConfig(napi_env env, napi_callback_info info); +napi_value GetCandidateConfigs(napi_env env, napi_callback_info info); napi_value ConnectToNetwork(napi_env env, napi_callback_info info); napi_value ConnectToDevice(napi_env env, napi_callback_info info); napi_value IsConnected(napi_env env, napi_callback_info info); @@ -72,20 +76,20 @@ public: virtual ~ScanInfoAsyncContext(){} }; -class AddDeviceConfigContext : public AsyncContext { +class DeviceConfigContext : public AsyncContext { public: WifiDeviceConfig *config; - int addResult; + int networkId; - AddDeviceConfigContext(napi_env env, napi_async_work work = nullptr, napi_deferred deferred = nullptr) : - AsyncContext(env, work, deferred){ + DeviceConfigContext(napi_env env, napi_async_work work = nullptr, napi_deferred deferred = nullptr) : + AsyncContext(env, work, deferred) { config = nullptr; - addResult = -1; + networkId = -1; } - AddDeviceConfigContext() = delete; + DeviceConfigContext() = delete; - virtual ~AddDeviceConfigContext(){} + virtual ~DeviceConfigContext() {} }; class LinkedInfoAsyncContext : public AsyncContext { diff --git a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp index 78f2f20..b53fe70 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp @@ -315,7 +315,7 @@ napi_value AddDeviceConfig(napi_env env, napi_callback_info info) napi_typeof(env, argv[0], &valueType); NAPI_ASSERT(env, valueType == napi_object, "Wrong argument type, object is expected for parameter 1."); - AddDeviceConfigContext *asyncContext = new AddDeviceConfigContext(env); + DeviceConfigContext *asyncContext = new DeviceConfigContext(env); NAPI_ASSERT(env, asyncContext != nullptr, "asyncContext is null."); napi_create_string_latin1(env, "addDeviceConfig", NAPI_AUTO_LENGTH, &asyncContext->resourceName); @@ -328,18 +328,18 @@ napi_value AddDeviceConfig(napi_env env, napi_callback_info info) asyncContext->config = config; asyncContext->executeFunc = [&](void* data) -> void { - AddDeviceConfigContext *context = static_cast(data); + DeviceConfigContext *context = static_cast(data); TRACE_FUNC_CALL_NAME("wifiDevicePtr->AddDeviceConfig"); - ErrCode ret = wifiDevicePtr->AddDeviceConfig(*context->config, context->addResult); - if (context->addResult < 0 || ret != WIFI_OPT_SUCCESS) { - context->addResult = -1; + ErrCode ret = wifiDevicePtr->AddDeviceConfig(*context->config, context->networkId); + if (context->networkId < 0 || ret != WIFI_OPT_SUCCESS) { + context->networkId = -1; } context->errorCode = ret; }; asyncContext->completeFunc = [&](void* data) -> void { - AddDeviceConfigContext *context = static_cast(data); - napi_create_int32(context->env, context->addResult, &context->result); + DeviceConfigContext *context = static_cast(data); + napi_create_int32(context->env, context->networkId, &context->result); if (context->config != nullptr) { delete context->config; context->config = nullptr; @@ -366,7 +366,7 @@ napi_value AddUntrustedConfig(napi_env env, napi_callback_info info) napi_typeof(env, argv[0], &valueType); NAPI_ASSERT(env, valueType == napi_object, "Wrong argument type, object is expected for parameter 1."); - AddDeviceConfigContext *asyncContext = new AddDeviceConfigContext(env); + DeviceConfigContext *asyncContext = new DeviceConfigContext(env); NAPI_ASSERT(env, asyncContext != nullptr, "asyncContext is null."); napi_create_string_latin1(env, "AddUntrustedConfig", NAPI_AUTO_LENGTH, &asyncContext->resourceName); @@ -379,18 +379,18 @@ napi_value AddUntrustedConfig(napi_env env, napi_callback_info info) asyncContext->config = config; asyncContext->executeFunc = [&](void* data) -> void { - AddDeviceConfigContext *context = static_cast(data); + DeviceConfigContext *context = static_cast(data); TRACE_FUNC_CALL_NAME("wifiDevicePtr->AddUntrustedConfig"); - ErrCode ret = wifiDevicePtr->AddDeviceConfig(*context->config, context->addResult); - if (context->addResult < 0 || ret != WIFI_OPT_SUCCESS) { - context->addResult = -1; + ErrCode ret = wifiDevicePtr->AddDeviceConfig(*context->config, context->networkId); + if (context->networkId < 0 || ret != WIFI_OPT_SUCCESS) { + context->networkId = -1; } context->errorCode = ret; }; asyncContext->completeFunc = [&](void* data) -> void { - AddDeviceConfigContext *context = static_cast(data); - napi_get_boolean(context->env, (context->addResult >= 0), &context->result); + DeviceConfigContext *context = static_cast(data); + napi_get_boolean(context->env, (context->networkId >= 0), &context->result); if (context->config != nullptr) { delete context->config; context->config = nullptr; @@ -432,7 +432,7 @@ napi_value RemoveUntrustedConfig(napi_env env, napi_callback_info info) napi_typeof(env, argv[0], &valueType); NAPI_ASSERT(env, valueType == napi_object, "Wrong argument type, object is expected for parameter 1."); - AddDeviceConfigContext *asyncContext = new AddDeviceConfigContext(env); + DeviceConfigContext *asyncContext = new DeviceConfigContext(env); NAPI_ASSERT(env, asyncContext != nullptr, "asyncContext is null."); napi_create_string_latin1(env, "RemoveUntrustedConfig", NAPI_AUTO_LENGTH, &asyncContext->resourceName); @@ -445,7 +445,7 @@ napi_value RemoveUntrustedConfig(napi_env env, napi_callback_info info) asyncContext->config = config; asyncContext->executeFunc = [&](void* data) -> void { - AddDeviceConfigContext *context = static_cast(data); + DeviceConfigContext *context = static_cast(data); if (context->config == nullptr) { return; } @@ -464,7 +464,7 @@ napi_value RemoveUntrustedConfig(napi_env env, napi_callback_info info) }; asyncContext->completeFunc = [&](void* data) -> void { - AddDeviceConfigContext *context = static_cast(data); + DeviceConfigContext *context = static_cast(data); napi_get_boolean(context->env, context->errorCode == WIFI_OPT_SUCCESS, &context->result); if (context->config != nullptr) { delete context->config; @@ -477,6 +477,119 @@ napi_value RemoveUntrustedConfig(napi_env env, napi_callback_info info) return DoAsyncWork(env, asyncContext, argc, argv, nonCallbackArgNum); } +napi_value AddCandidateConfig(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + size_t argc = 2; + napi_value argv[argc]; + napi_value thisVar = nullptr; + void *data = nullptr; + NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data)); + NAPI_ASSERT(env, argc >= 1, "Wrong number of arguments"); + NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + + napi_valuetype valueType; + napi_typeof(env, argv[0], &valueType); + NAPI_ASSERT(env, valueType == napi_object, "Wrong argument type, object is expected for parameter 1."); + + DeviceConfigContext *asyncContext = new DeviceConfigContext(env); + NAPI_ASSERT(env, asyncContext != nullptr, "asyncContext is null."); + napi_create_string_latin1(env, "AddCandidateConfig", NAPI_AUTO_LENGTH, &asyncContext->resourceName); + + WifiDeviceConfig *config = new WifiDeviceConfig(); + if (config == nullptr) { + delete asyncContext; + return UndefinedNapiValue(env); + } + JsObjToDeviceConfig(env, argv[0], *config); + asyncContext->config = config; + + asyncContext->executeFunc = [&](void* data) -> void { + DeviceConfigContext *context = static_cast(data); + TRACE_FUNC_CALL_NAME("wifiDevicePtr->AddCandidateConfig"); + ErrCode ret = wifiDevicePtr->AddCandidateConfig(*context->config, context->networkId); + if (context->networkId < 0 || ret != WIFI_OPT_SUCCESS) { + context->networkId = -1; + } + context->errorCode = ret; + }; + + asyncContext->completeFunc = [&](void* data) -> void { + DeviceConfigContext *context = static_cast(data); + napi_create_int32(context->env, context->networkId, &context->result); + if (context->config != nullptr) { + delete context->config; + context->config = nullptr; + } + WIFI_LOGI("Push add untrusted device config result to client"); + }; + + size_t nonCallbackArgNum = 1; + return DoAsyncWork(env, asyncContext, argc, argv, nonCallbackArgNum); +} + +napi_value RemoveCandidateConfig(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + size_t argc = 3; + napi_value argv[argc]; + napi_value thisVar = nullptr; + void *data = nullptr; + NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data)); + NAPI_ASSERT(env, argc >= 1, "Wrong number of arguments"); + NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + + napi_valuetype valueType; + napi_typeof(env, argv[0], &valueType); + NAPI_ASSERT(env, valueType == napi_number, "Wrong argument type, object is expected for parameter 1."); + + DeviceConfigContext *asyncContext = new DeviceConfigContext(env); + NAPI_ASSERT(env, asyncContext != nullptr, "asyncContext is null."); + napi_create_string_latin1(env, "RemoveCandidateConfig", NAPI_AUTO_LENGTH, &asyncContext->resourceName); + + napi_get_value_int32(env, argv[0], &asyncContext->networkId); + asyncContext->executeFunc = [&](void* data) -> void { + DeviceConfigContext *context = static_cast(data); + context->errorCode = wifiDevicePtr->RemoveCandidateConfig(context->networkId); + }; + + asyncContext->completeFunc = [&](void* data) -> void { + DeviceConfigContext *context = static_cast(data); + napi_get_boolean(context->env, (context->errorCode == WIFI_OPT_SUCCESS), &context->result); + if (context->config != nullptr) { + delete context->config; + context->config = nullptr; + } + WIFI_LOGI("Push remove untrusted device config result to client"); + }; + + size_t nonCallbackArgNum = 1; + return DoAsyncWork(env, asyncContext, argc, argv, nonCallbackArgNum); +} + +napi_value ConnectToCandidateConfig(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + size_t argc = 1; + napi_value argv[1]; + napi_value thisVar; + NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); + NAPI_ASSERT(env, argc == 1, "Wrong number of arguments"); + + napi_valuetype valueType; + napi_typeof(env, argv[0], &valueType); + NAPI_ASSERT(env, valueType == napi_number, "Wrong argument type. napi_number expected."); + + int networkId = -1; + napi_get_value_int32(env, argv[0], &networkId); + + NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + ErrCode ret = wifiDevicePtr->ConnectToCandidateConfig(networkId); + napi_value result; + napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); + return result; +} + napi_value ConnectToNetwork(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; @@ -826,8 +939,7 @@ static void DeviceConfigToJsArray(const napi_env& env, std::vector(ConvertKeyMgmtToSecType(vecDeviceConfigs[idx].keyMgmt)), result); - /* not supported currently */ - SetValueInt32(env, "creatorUid", DEFAULT_INVALID_VALUE, result); + SetValueInt32(env, "creatorUid", vecDeviceConfigs[idx].uid, result); /* not supported currently */ SetValueInt32(env, "disableReason", DEFAULT_INVALID_VALUE, result); SetValueInt32(env, "netId", vecDeviceConfigs[idx].networkId, result); @@ -870,6 +982,25 @@ napi_value GetDeviceConfigs(napi_env env, napi_callback_info info) return arrayResult; } +napi_value GetCandidateConfigs(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + std::vector vecDeviceConfigs; + ErrCode ret = wifiDevicePtr->GetCandidateConfigs(vecDeviceConfigs); + if (ret != WIFI_OPT_SUCCESS) { + WIFI_LOGE("Get candidate device configs fail: %{public}d", ret); + } + + WIFI_LOGI("Get candidate device configs size: %{public}zu", vecDeviceConfigs.size()); + napi_value arrayResult; + napi_create_array_with_length(env, vecDeviceConfigs.size(), &arrayResult); + for (size_t i = 0; i != vecDeviceConfigs.size(); ++i) { + DeviceConfigToJsArray(env, vecDeviceConfigs, i, arrayResult); + } + return arrayResult; +} + napi_value UpdateNetwork(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; diff --git a/wifi/frameworks/js/napi/src/wifi_napi_entry.cpp b/wifi/frameworks/js/napi/src/wifi_napi_entry.cpp index eca8812..34cc93d 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_entry.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_entry.cpp @@ -35,6 +35,10 @@ static napi_value Init(napi_env env, napi_value exports) { DECLARE_NAPI_FUNCTION("addDeviceConfig", AddDeviceConfig), DECLARE_NAPI_FUNCTION("addUntrustedConfig", AddUntrustedConfig), DECLARE_NAPI_FUNCTION("removeUntrustedConfig", RemoveUntrustedConfig), + DECLARE_NAPI_FUNCTION("addCandidateConfig", AddCandidateConfig), + DECLARE_NAPI_FUNCTION("removeCandidateConfig", RemoveCandidateConfig), + DECLARE_NAPI_FUNCTION("connectToCandidateConfig", ConnectToCandidateConfig), + DECLARE_NAPI_FUNCTION("getCandidateConfigs", GetCandidateConfigs), DECLARE_NAPI_FUNCTION("connectToNetwork", ConnectToNetwork), DECLARE_NAPI_FUNCTION("connectToDevice", ConnectToDevice), DECLARE_NAPI_FUNCTION("isConnected", IsConnected), diff --git a/wifi/frameworks/native/include/wifi_device.h b/wifi/frameworks/native/include/wifi_device.h index b09d378..cedc50b 100644 --- a/wifi/frameworks/native/include/wifi_device.h +++ b/wifi/frameworks/native/include/wifi_device.h @@ -68,6 +68,39 @@ public: */ virtual ErrCode PutWifiProtectRef(const std::string &protectName) = 0; + /** + * @Description Add a specified candidate hotspot configuration. + * + * @param config - WifiDeviceConfig object + * @param networkId - the device configuration's network id + * @return ErrCode - operation result + */ + virtual ErrCode AddCandidateConfig(const WifiDeviceConfig &config, int &networkId) = 0; + + /** + * @Description Remove the wifi candidate device config equals to input network id + * + * @param networkId - the candidate device network id + * @return ErrCode - operation result + */ + virtual ErrCode RemoveCandidateConfig(int networkId) = 0; + + /** + * @Description Connect to a candidate specified network. + * + * @param networkId - the candidate device network id + * @return ErrCode - operation result + */ + virtual ErrCode ConnectToCandidateConfig(int networkId) = 0; + + /** + * @Description Get all candidate device configs. + * + * @param result - Get result vector of WifiDeviceConfig + * @return ErrCode - operation result + */ + virtual ErrCode GetCandidateConfigs(std::vector &result) = 0; + /** * @Description Add a wifi device configuration. * diff --git a/wifi/frameworks/native/interfaces/define.h b/wifi/frameworks/native/interfaces/define.h index e6f469c..d31a94c 100644 --- a/wifi/frameworks/native/interfaces/define.h +++ b/wifi/frameworks/native/interfaces/define.h @@ -54,7 +54,10 @@ #define WIFI_SVR_CMD_PUT_WIFI_PROTECT 0x1025 /* put the Wi-Fi protect. */ #define WIFI_SVR_CMD_IS_WIFI_CONNECTED 0x1026 /* is Wi-Fi connected */ #define WIFI_SVR_CMD_SET_LOW_LATENCY_MODE 0x1027 /* set low latency mode */ - +#define WIFI_SVR_CMD_ADD_CANDIDATE_DEVICE_CONFIG 0x1028 /* add an candidate network config */ +#define WIFI_SVR_CMD_CONNECT_TO_CANDIDATE_CONFIG 0x1029 /* connect to an candidate network config */ +#define WIFI_SVR_CMD_REMOVE_CANDIDATE_CONFIG 0x102A /* remove an candidate network config */ +#define WIFI_SVR_CMD_GET_CANDIDATE_CONFIGS 0x102B /* get current saved candidate network configs */ /* -------------ap module message define----------------- */ #define WIFI_SVR_CMD_ENABLE_WIFI_AP 0x1100 /* open ap */ #define WIFI_SVR_CMD_DISABLE_WIFI_AP 0x1101 /* close ap */ diff --git a/wifi/frameworks/native/interfaces/i_wifi_device.h b/wifi/frameworks/native/interfaces/i_wifi_device.h index fa36743..092d956 100644 --- a/wifi/frameworks/native/interfaces/i_wifi_device.h +++ b/wifi/frameworks/native/interfaces/i_wifi_device.h @@ -75,6 +75,39 @@ public: */ virtual ErrCode PutWifiProtectRef(const std::string &protectName) = 0; + /** + * @Description Add a specified candidate hotspot configuration. + * + * @param config - WifiDeviceConfig object + * @param networkId - the device configuration's network id + * @return ErrCode - operation result + */ + virtual ErrCode AddCandidateConfig(const WifiDeviceConfig &config, int &networkId) = 0; + + /** + * @Description Remove the wifi candidate device config equals to input network id + * + * @param networkId - the candidate device network id + * @return ErrCode - operation result + */ + virtual ErrCode RemoveCandidateConfig(int networkId) = 0; + + /** + * @Description Connect to a candidate specified network. + * + * @param networkId - the candidate device network id + * @return ErrCode - operation result + */ + virtual ErrCode ConnectToCandidateConfig(int networkId) = 0; + + /** + * @Description Get all candidate device configs + * + * @param result - Get result vector of WifiDeviceConfig + * @return ErrCode - operation result + */ + virtual ErrCode GetCandidateConfigs(std::vector &result) = 0; + /** * @Description Add a wifi device configuration. * diff --git a/wifi/frameworks/native/interfaces/wifi_msg.h b/wifi/frameworks/native/interfaces/wifi_msg.h index 4abaf29..51d47d9 100644 --- a/wifi/frameworks/native/interfaces/wifi_msg.h +++ b/wifi/frameworks/native/interfaces/wifi_msg.h @@ -29,6 +29,7 @@ namespace Wifi { #define WIFI_COUNTRY_CODE_LEN 2 #define WEPKEYS_SIZE 4 #define INVALID_NETWORK_ID (-1) +#define WIFI_INVALID_UID (-1) #define IPV4_ADDRESS_TYPE 0 #define IPV6_ADDRESS_TYPE 1 @@ -353,6 +354,7 @@ struct WifiDeviceConfig { bool hiddenSSID; /* Random mac address */ std::string macAddress; + int uid; WifiIpConfig wifiIpConfig; WifiEapConfig wifiEapConfig; WifiProxyConfig wifiProxyconfig; @@ -373,6 +375,7 @@ struct WifiDeviceConfig { hiddenSSID = false; wifiPrivacySetting = WifiPrivacyConfig::RANDOMMAC; rssi = -100; + uid = WIFI_INVALID_UID; } }; diff --git a/wifi/frameworks/native/src/wifi_device_impl.cpp b/wifi/frameworks/native/src/wifi_device_impl.cpp index 8585c5d..29b80ef 100644 --- a/wifi/frameworks/native/src/wifi_device_impl.cpp +++ b/wifi/frameworks/native/src/wifi_device_impl.cpp @@ -109,6 +109,30 @@ ErrCode WifiDeviceImpl::PutWifiProtectRef(const std::string &protectName) return client_->PutWifiProtectRef(protectName); } +ErrCode WifiDeviceImpl::AddCandidateConfig(const WifiDeviceConfig &config, int &networkId) +{ + RETURN_IF_FAIL(client_); + return client_->AddCandidateConfig(config, networkId); +} + +ErrCode WifiDeviceImpl::RemoveCandidateConfig(int networkId) +{ + RETURN_IF_FAIL(client_); + return client_->RemoveCandidateConfig(networkId); +} + +ErrCode WifiDeviceImpl::ConnectToCandidateConfig(int networkId) +{ + RETURN_IF_FAIL(client_); + return client_->ConnectToCandidateConfig(networkId); +} + +ErrCode WifiDeviceImpl::GetCandidateConfigs(std::vector &result) +{ + RETURN_IF_FAIL(client_); + return client_->GetCandidateConfigs(result); +} + ErrCode WifiDeviceImpl::AddDeviceConfig(const WifiDeviceConfig &config, int &result) { RETURN_IF_FAIL(client_); diff --git a/wifi/frameworks/native/src/wifi_device_impl.h b/wifi/frameworks/native/src/wifi_device_impl.h index 398d601..bc9a3ac 100644 --- a/wifi/frameworks/native/src/wifi_device_impl.h +++ b/wifi/frameworks/native/src/wifi_device_impl.h @@ -66,7 +66,40 @@ public: * @return ErrCode - operation result */ ErrCode PutWifiProtectRef(const std::string &protectName) override; - + + /** + * @Description Add a specified candidate hotspot configuration. + * + * @param config - WifiDeviceConfig object + * @param networkId - the device configuration's network id + * @return ErrCode - operation result + */ + virtual ErrCode AddCandidateConfig(const WifiDeviceConfig &config, int &networkId) override; + + /** + * @Description Remove the wifi candidate device config equals to input network id + * + * @param networkId - the candidate device network id + * @return ErrCode - operation result + */ + virtual ErrCode RemoveCandidateConfig(int networkId) override; + + /** + * @Description Connect to a candidate specified network. + * + * @param networkId - the candidate device network id + * @return ErrCode - operation result + */ + virtual ErrCode ConnectToCandidateConfig(int networkId) override; + + /** + * @Description Get all candidate device configs + * + * @param result - Get result vector of WifiDeviceConfig + * @return ErrCode - operation result + */ + ErrCode GetCandidateConfigs(std::vector &result) override; + /** * @Description Add a wifi device configuration. * diff --git a/wifi/frameworks/native/src/wifi_device_proxy.cpp b/wifi/frameworks/native/src/wifi_device_proxy.cpp index d0cf78a..9e9cb19 100644 --- a/wifi/frameworks/native/src/wifi_device_proxy.cpp +++ b/wifi/frameworks/native/src/wifi_device_proxy.cpp @@ -240,6 +240,122 @@ void WifiDeviceProxy::WriteDeviceConfig(const WifiDeviceConfig &config, MessageP data.WriteInt32((int)config.wifiPrivacySetting); } +ErrCode WifiDeviceProxy::AddCandidateConfig(const WifiDeviceConfig &config, int &networkId) +{ + if (mRemoteDied) { + WIFI_LOGE("failed to `%{public}s`,remote service is died!", __func__); + return WIFI_OPT_FAILED; + } + MessageOption option; + MessageParcel data, reply; + if (!data.WriteInterfaceToken(GetDescriptor())) { + WIFI_LOGE("Write interface token error: %{public}s", __func__); + return WIFI_OPT_FAILED; + } + data.WriteInt32(0); + WriteDeviceConfig(config, data); + int error = Remote()->SendRequest(WIFI_SVR_CMD_ADD_CANDIDATE_DEVICE_CONFIG, data, reply, option); + if (error != ERR_NONE) { + WIFI_LOGE("Set Attr(%{public}d) failed,error=%{public}d", WIFI_SVR_CMD_ADD_CANDIDATE_DEVICE_CONFIG, error); + return WIFI_OPT_FAILED; + } + int exception = reply.ReadInt32(); + if (exception) { + return WIFI_OPT_FAILED; + } + int ret = reply.ReadInt32(); + if (ret != WIFI_OPT_SUCCESS) { + return ErrCode(ret); + } + networkId = reply.ReadInt32(); + + return WIFI_OPT_SUCCESS; +} + +ErrCode WifiDeviceProxy::RemoveCandidateConfig(int networkId) +{ + if (mRemoteDied) { + WIFI_LOGE("failed to `%{public}s`,remote service is died!", __func__); + return WIFI_OPT_FAILED; + } + MessageOption option; + MessageParcel data, reply; + if (!data.WriteInterfaceToken(GetDescriptor())) { + WIFI_LOGE("Write interface token error: %{public}s", __func__); + return WIFI_OPT_FAILED; + } + data.WriteInt32(0); + data.WriteInt32(networkId); + int error = Remote()->SendRequest(WIFI_SVR_CMD_REMOVE_CANDIDATE_CONFIG, data, reply, option); + if (error != ERR_NONE) { + WIFI_LOGE("Set Attr(%{public}d) failed,error=%{public}d", WIFI_SVR_CMD_REMOVE_CANDIDATE_CONFIG, error); + return WIFI_OPT_FAILED; + } + int exception = reply.ReadInt32(); + if (exception) { + return WIFI_OPT_FAILED; + } + return ErrCode(reply.ReadInt32()); +} + +ErrCode WifiDeviceProxy::ConnectToCandidateConfig(int networkId) +{ + if (mRemoteDied) { + WIFI_LOGE("failed to `%{public}s`,remote service is died!", __func__); + return WIFI_OPT_FAILED; + } + MessageOption option; + MessageParcel data, reply; + if (!data.WriteInterfaceToken(GetDescriptor())) { + WIFI_LOGE("Write interface token error: %{public}s", __func__); + return WIFI_OPT_FAILED; + } + data.WriteInt32(0); + data.WriteInt32(networkId); + int error = Remote()->SendRequest(WIFI_SVR_CMD_CONNECT_TO_CANDIDATE_CONFIG, data, reply, option); + if (error != ERR_NONE) { + WIFI_LOGE("Set Attr(%{public}d) failed,error=%{public}d", WIFI_SVR_CMD_CONNECT_TO_CANDIDATE_CONFIG, error); + return WIFI_OPT_FAILED; + } + int exception = reply.ReadInt32(); + if (exception) { + return WIFI_OPT_FAILED; + } + return ErrCode(reply.ReadInt32()); +} + +ErrCode WifiDeviceProxy::GetCandidateConfigs(std::vector &result) +{ + if (mRemoteDied) { + WIFI_LOGE("failed to `%{public}s`,remote service is died!", __func__); + return WIFI_OPT_FAILED; + } + MessageOption option; + MessageParcel data; + MessageParcel reply; + if (!data.WriteInterfaceToken(GetDescriptor())) { + WIFI_LOGE("Write interface token error: %{public}s", __func__); + return WIFI_OPT_FAILED; + } + data.WriteInt32(0); + int error = Remote()->SendRequest(WIFI_SVR_CMD_GET_CANDIDATE_CONFIGS, data, reply, option); + if (error != ERR_NONE) { + WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", WIFI_SVR_CMD_GET_CANDIDATE_CONFIGS, error); + return WIFI_OPT_FAILED; + } + int exception = reply.ReadInt32(); + if (exception) { + return WIFI_OPT_FAILED; + } + int ret = reply.ReadInt32(); + if (ret != WIFI_OPT_SUCCESS) { + return ErrCode(ret); + } + + ParseDeviceConfigs(reply, result); + return WIFI_OPT_SUCCESS; +} + ErrCode WifiDeviceProxy::AddDeviceConfig(const WifiDeviceConfig &config, int &result) { if (mRemoteDied) { @@ -419,6 +535,7 @@ void WifiDeviceProxy::ParseDeviceConfigs(MessageParcel &reply, std::vector &result) override; + /** * @Description Add a wifi device configuration. * diff --git a/wifi/frameworks/native/src/wifi_device_proxy_lite.cpp b/wifi/frameworks/native/src/wifi_device_proxy_lite.cpp index 020e725..746f489 100644 --- a/wifi/frameworks/native/src/wifi_device_proxy_lite.cpp +++ b/wifi/frameworks/native/src/wifi_device_proxy_lite.cpp @@ -103,6 +103,7 @@ static void ParseDeviceConfigs(IpcIo *reply, std::vector &resu int privacyConfig = 0; (void)ReadInt32(reply, &privacyConfig); config.wifiPrivacySetting = WifiPrivacyConfig(privacyConfig); + (void)ReadInt32(reply, &config.uid); result.emplace_back(config); } @@ -433,6 +434,31 @@ ErrCode WifiDeviceProxy::PutWifiProtectRef(const std::string &protectName) return ErrCode(owner.retCode); } +ErrCode WifiDeviceProxy::AddCandidateConfig(const WifiDeviceConfig &config, int &networkId) +{ + (void)config; + (void)networkId; + return WIFI_OPT_NOT_SUPPORTED; +} + +ErrCode WifiDeviceProxy::RemoveCandidateConfig(int networkId) +{ + (void)networkId; + return WIFI_OPT_NOT_SUPPORTED; +} + +ErrCode WifiDeviceProxy::ConnectToCandidateConfig(int networkId) +{ + (void)networkId; + return WIFI_OPT_NOT_SUPPORTED; +} + +ErrCode WifiDeviceProxy::GetCandidateConfigs(std::vector &result) +{ + (void)result; + return WIFI_OPT_NOT_SUPPORTED; +} + void WifiDeviceProxy::WriteIpAddress(IpcIo &req, const WifiIpAddress &address) { (void)WriteInt32(&req, address.family); diff --git a/wifi/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp b/wifi/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp index 43ec488..a0d13bd 100644 --- a/wifi/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp +++ b/wifi/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp @@ -127,6 +127,8 @@ static int SetWifiDeviceConfigFirst(WifiDeviceConfig &item, const std::string &k item.wepTxKeyIndex = std::stoi(value); } else if (key == "priority") { item.priority = std::stoi(value); + } else if (key == "uid") { + item.uid = std::stoi(value); } else { return -1; } @@ -250,6 +252,7 @@ std::string GetTClassName() static std::string OutPutWifiDeviceConfig(WifiDeviceConfig &item) { std::ostringstream ss; + ss << "uid=" << item.uid << std::endl; ss << "status=" << item.status << std::endl; ss << "bssid=" << item.bssid << std::endl; ss << "ssid=" << item.ssid << std::endl; @@ -497,6 +500,7 @@ void ClearTClass(WifiConfig &item) item.scoretacticsFrequency5GHzScore = FREQUENCY_5_GHZ_SCORE; item.scoretacticsLastSelectionScore = LAST_SELECTION_SCORE; item.scoretacticsSecurityScore = SECURITY_SCORE; + item.scoretacticsNormalScore = NORMAL_SCORE; item.whetherToAllowNetworkSwitchover = true; item.dhcpIpType = static_cast(DhcpIpType::DHCP_IPTYPE_MIX); item.defaultWifiInterface = "wlan0"; @@ -547,6 +551,8 @@ static int SetWifiConfigValueFirst(WifiConfig &item, const std::string &key, con item.scoretacticsLastSelectionScore = std::stoi(value); } else if (key == "scoretacticsSecurityScore") { item.scoretacticsSecurityScore = std::stoi(value); + } else if (key == "scoretacticsNormalScore") { + item.scoretacticsNormalScore = std::stoi(value); } else if (key == "whetherToAllowNetworkSwitchover") { item.whetherToAllowNetworkSwitchover = (std::stoi(value) != 0); } else if (key == "dhcpIpType") { @@ -627,6 +633,7 @@ std::string OutTClassString(WifiConfig &item) ss << "scoretacticsFrequency5GHzScore=" << item.scoretacticsFrequency5GHzScore << std::endl; ss << "scoretacticsLastSelectionScore=" << item.scoretacticsLastSelectionScore << std::endl; ss << "scoretacticsSecurityScore=" << item.scoretacticsSecurityScore << std::endl; + ss << "scoretacticsNormalScore=" << item.scoretacticsNormalScore << std::endl; ss << "whetherToAllowNetworkSwitchover=" << item.whetherToAllowNetworkSwitchover << std::endl; ss << "dhcpIpType=" << item.dhcpIpType << std::endl; ss << "defaultWifiInterface=" << item.defaultWifiInterface << std::endl; diff --git a/wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp b/wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp index 7912953..e01e881 100644 --- a/wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp +++ b/wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp @@ -362,6 +362,40 @@ int WifiSettings::SetDeviceState(int networkId, int state, bool bSetOther) return 0; } +int WifiSettings::GetCandidateConfig(const int uid, const int &networkId, WifiDeviceConfig &config) +{ + std::vector configs; + if (GetAllCandidateConfig(uid, configs) != 0) { + return -1; + } + + for (const auto &it : configs) { + if (it.networkId == networkId) { + config = it; + return it.networkId; + } + } + return -1; +} + +int WifiSettings::GetAllCandidateConfig(const int uid, std::vector &configs) +{ + if (!deviceConfigLoadFlag.test_and_set()) { + LOGE("Reload wifi config"); + ReloadDeviceConfig(); + } + + std::unique_lock lock(mConfigMutex); + bool found = false; + for (auto iter = mWifiDeviceConfig.begin(); iter != mWifiDeviceConfig.end(); iter++) { + if (iter->second.uid == uid) { + configs.push_back(iter->second); + found = true; + } + } + return found ? 0 : -1; +} + int WifiSettings::SyncWifiP2pGroupInfoConfig() { std::unique_lock lock(mP2pMutex); @@ -1254,6 +1288,17 @@ int WifiSettings::GetScoretacticsSecurityScore() return mWifiConfig.scoretacticsSecurityScore; } +int WifiSettings::SetScoretacticsNormalScore(const int &score) +{ + mWifiConfig.scoretacticsNormalScore = score; + return 0; +} + +int WifiSettings::GetScoretacticsNormalScore() +{ + return mWifiConfig.scoretacticsNormalScore; +} + int WifiSettings::SetSavedDeviceAppraisalPriority(const int &priority) { mWifiConfig.savedDeviceAppraisalPriority = priority; diff --git a/wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.h b/wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.h index ca1e660..b20a5d3 100644 --- a/wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.h +++ b/wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.h @@ -238,6 +238,25 @@ public: */ int SetDeviceState(int networkId, int state, bool bSetOther = false); + /** + * @Description Get the candidate device configuration + * + * @param uid - call app uid + * @param networkId - a networkId that is to be get + * @param config - WifiDeviceConfig object + * @return int - network id + */ + int GetCandidateConfig(const int uid, const int &networkId, WifiDeviceConfig &config); + + /** + * @Description Get all the Candidate Device Configurations set key uuid + * + * @param uid - call app uid + * @param configs - WifiDeviceConfig objects + * @return int - 0 success + */ + int GetAllCandidateConfig(const int uid, std::vector &configs); + /** * @Description Synchronizing saved the wifi device config into config file * @@ -912,6 +931,21 @@ public: */ int GetScoretacticsSecurityScore(); + /** + * @Description Setting the Score Policy Candidate Score + * + * @param score - score + * @return int - 0 success + */ + int SetScoretacticsNormalScore(const int &score); + + /** + * @Description Get the Score Policy Candidate Score + * + * @return int - priority + */ + int GetScoretacticsNormalScore(); + /** * @Description Set the saved device appraisal priority * diff --git a/wifi/services/wifi_standard/wifi_framework/common/include/wifi_internal_msg.h b/wifi/services/wifi_standard/wifi_framework/common/include/wifi_internal_msg.h index 980ba8c..55598e0 100644 --- a/wifi/services/wifi_standard/wifi_framework/common/include/wifi_internal_msg.h +++ b/wifi/services/wifi_standard/wifi_framework/common/include/wifi_internal_msg.h @@ -36,6 +36,7 @@ constexpr int SAME_NETWORK_SCORE = 5; constexpr int FREQUENCY_5_GHZ_SCORE = 10; constexpr int LAST_SELECTION_SCORE = 120; constexpr int SECURITY_SCORE = 20; +constexpr int NORMAL_SCORE = 10; constexpr int MIN_RSSI_24GHZ = -80; constexpr int MIN_RSSI_5GHZ = -77; constexpr int RSSI_LEVEL_1_2G = -88; @@ -251,6 +252,7 @@ struct WifiConfig { int scoretacticsFrequency5GHzScore; int scoretacticsLastSelectionScore; int scoretacticsSecurityScore; + int scoretacticsNormalScore; bool whetherToAllowNetworkSwitchover; int dhcpIpType; std::string defaultWifiInterface; @@ -287,6 +289,7 @@ struct WifiConfig { scoretacticsFrequency5GHzScore = FREQUENCY_5_GHZ_SCORE; scoretacticsLastSelectionScore = LAST_SELECTION_SCORE; scoretacticsSecurityScore = SECURITY_SCORE; + scoretacticsNormalScore = NORMAL_SCORE; whetherToAllowNetworkSwitchover = true; dhcpIpType = static_cast(DhcpIpType::DHCP_IPTYPE_MIX); defaultWifiInterface = "wlan0"; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn index 0321f96..153f2da 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn @@ -247,10 +247,14 @@ if (defined(ohos_lite)) { defines = [ "FEATURE_P2P_SUPPORT" ] } - deps = [ ":wifi_p2p_service_impl" ] + deps = [ + ":wifi_p2p_service_impl", + "//utils/native/base:utils", + ] external_deps = [ "ability_base:want", "bundle_framework:appexecfwk_base", + "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", "ipc:ipc_core", ] diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.cpp index c6d1e3e..21fb10f 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.cpp @@ -115,6 +115,11 @@ int WifiConfigCenter::GetDeviceConfig(std::vector &results) return WifiSettings::GetInstance().GetDeviceConfig(results); } +int WifiConfigCenter::GetCandidateConfigs(const int uid, std::vector &results) +{ + return WifiSettings::GetInstance().GetAllCandidateConfig(uid, results); +} + int WifiConfigCenter::SetDeviceState(int networkId, int state, bool bSetOther) { return WifiSettings::GetInstance().SetDeviceState(networkId, state, bSetOther); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.h index 29cc491..09960fe 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.h @@ -142,6 +142,14 @@ public: */ int GetDeviceConfig(std::vector &results); + /** + * @Description Get all candidate wifi device config + * + * @param results - output wifi device config results + * @return int - 0 success + */ + int GetCandidateConfigs(const int uid, std::vector &results); + /** * @Description Set a wifi device's state who's networkId equals input networkId; * when the param bSetOther is true and the state is ENABLED, that means we need diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp index 7cee5e9..215f79c 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp @@ -46,6 +46,8 @@ std::mutex WifiDeviceServiceImpl::g_instanceLock; std::shared_ptr WifiDeviceServiceImpl::g_instance; std::shared_ptr WifiDeviceServiceImpl::GetInstance() #else +const uint32_t TIMEOUT_APP_EVENT = 3000; +using TimeOutCallback = std::function; sptr WifiDeviceServiceImpl::g_instance; const bool REGISTER_RESULT = SystemAbility::MakeAndRegisterAbility(WifiDeviceServiceImpl::GetInstance().GetRefPtr()); @@ -118,12 +120,29 @@ void WifiDeviceServiceImpl::OnStart() mState = ServiceRunningState::STATE_RUNNING; WIFI_LOGI("Start sta service!"); WifiManager::GetInstance(); +#ifndef OHOS_ARCH_LITE + if (eventSubscriber_ == nullptr) { + lpTimer_ = std::make_unique("WifiDeviceServiceImpl"); + TimeOutCallback timeOutcallback = std::bind(&WifiDeviceServiceImpl::RegisterAppRemoved, this); + lpTimer_->Setup(); + lpTimer_->Register(timeOutcallback, TIMEOUT_APP_EVENT, true); + } +#endif } void WifiDeviceServiceImpl::OnStop() { mState = ServiceRunningState::STATE_NOT_START; mPublishFlag = false; +#ifndef OHOS_ARCH_LITE + if (eventSubscriber_ != nullptr) { + UnRegisterAppRemoved(); + } + if (lpTimer_ != nullptr) { + lpTimer_->Shutdown(false); + lpTimer_ = nullptr; + } +#endif WIFI_LOGI("Stop sta service!"); } @@ -320,6 +339,142 @@ bool WifiDeviceServiceImpl::CheckConfigPwd(const WifiDeviceConfig &config) return true; } +ErrCode WifiDeviceServiceImpl::CheckCallingUid(int &uid) +{ +#ifndef OHOS_ARCH_LITE + uid = GetCallingUid(); + if (!IsForegroundApp(uid)) { + return WIFI_OPT_INVALID_PARAM; + } + return WIFI_OPT_SUCCESS; +#else + return WIFI_OPT_NOT_SUPPORTED; +#endif +} + +ErrCode WifiDeviceServiceImpl::AddCandidateConfig(const WifiDeviceConfig &config, int &networkId) +{ + if (WifiPermissionUtils::VerifySetWifiInfoPermission() == PERMISSION_DENIED) { + WIFI_LOGE("AddCandidateConfig:VerifySetWifiInfoPermission PERMISSION_DENIED!"); + return WIFI_OPT_PERMISSION_DENIED; + } + + if (!CheckConfigPwd(config)) { + WIFI_LOGE("CheckConfigPwd failed!"); + return WIFI_OPT_INVALID_PARAM; + } + + int uid = 0; + if (CheckCallingUid(uid) != WIFI_OPT_SUCCESS) { + WIFI_LOGE("CheckCallingUid failed!"); + return WIFI_OPT_INVALID_PARAM; + } + + if (!IsStaServiceRunning()) { + return WIFI_OPT_STA_NOT_OPENED; + } + + IStaService *pService = WifiServiceManager::GetInstance().GetStaServiceInst(); + if (pService == nullptr) { + return WIFI_OPT_STA_NOT_OPENED; + } + int retNetworkId = pService->AddCandidateConfig(uid, config); + if (retNetworkId < 0) { + return WIFI_OPT_FAILED; + } + networkId = retNetworkId; + return WIFI_OPT_SUCCESS; +} + +ErrCode WifiDeviceServiceImpl::ConnectToCandidateConfig(int networkId) +{ + if (WifiPermissionUtils::VerifySetWifiInfoPermission() == PERMISSION_DENIED) { + WIFI_LOGE("ConnectToCandidateConfig:VerifySetWifiInfoPermission PERMISSION_DENIED!"); + return WIFI_OPT_PERMISSION_DENIED; + } + + if (networkId < 0) { + WIFI_LOGE("ConnectToCandidateConfig networkId invalid param!"); + return WIFI_OPT_INVALID_PARAM; + } + + if (!IsStaServiceRunning()) { + WIFI_LOGE("ConnectToCandidateConfig:IsStaServiceRunning not running!"); + return WIFI_OPT_STA_NOT_OPENED; + } + + int uid = 0; + if (CheckCallingUid(uid) != WIFI_OPT_SUCCESS) { + WIFI_LOGE("CheckCallingUid failed!"); + return WIFI_OPT_INVALID_PARAM; + } + + IStaService *pService = WifiServiceManager::GetInstance().GetStaServiceInst(); + if (pService == nullptr) { + return WIFI_OPT_STA_NOT_OPENED; + } + return pService->ConnectToCandidateConfig(uid, networkId); +} + +ErrCode WifiDeviceServiceImpl::RemoveCandidateConfig(int networkId) +{ + if (WifiPermissionUtils::VerifySetWifiInfoPermission() == PERMISSION_DENIED) { + WIFI_LOGE("RemoveCandidateConfig:VerifySetWifiInfoPermission PERMISSION_DENIED!"); + return WIFI_OPT_PERMISSION_DENIED; + } + + if (networkId < INVALID_NETWORK_ID) { + WIFI_LOGE("RemoveCandidateConfig networkId invalid param!"); + return WIFI_OPT_INVALID_PARAM; + } + + if (!IsStaServiceRunning()) { + WIFI_LOGE("RemoveCandidateConfig:IsStaServiceRunning not running!"); + return WIFI_OPT_STA_NOT_OPENED; + } + + int uid = 0; + if (CheckCallingUid(uid) != WIFI_OPT_SUCCESS) { + WIFI_LOGE("CheckCallingUid failed!"); + return WIFI_OPT_INVALID_PARAM; + } + + IStaService *pService = WifiServiceManager::GetInstance().GetStaServiceInst(); + if (pService == nullptr) { + return WIFI_OPT_STA_NOT_OPENED; + } + + if (networkId == INVALID_NETWORK_ID) { + return pService->RemoveAllCandidateConfig(uid); + } else { + return pService->RemoveCandidateConfig(uid, networkId); + } +} + +ErrCode WifiDeviceServiceImpl::GetCandidateConfigs(std::vector &result) +{ + if (WifiPermissionUtils::VerifyGetWifiInfoInternalPermission() == PERMISSION_DENIED) { + WIFI_LOGE("GetCandidateConfigs:VerifyGetWifiInfoPermission() PERMISSION_DENIED!"); + + if (WifiPermissionUtils::VerifyGetWifiInfoPermission() == PERMISSION_DENIED) { + WIFI_LOGE("GetCandidateConfigs:VerifyGetWifiInfoPermission() PERMISSION_DENIED!"); + return WIFI_OPT_PERMISSION_DENIED; + } + + if (WifiPermissionUtils::VerifyGetScanInfosPermission() == PERMISSION_DENIED) { + WIFI_LOGE("GetCandidateConfigs:VerifyGetWifiInfoPermission() PERMISSION_DENIED!"); + return WIFI_OPT_PERMISSION_DENIED; + } + } + int uid = 0; + if (CheckCallingUid(uid) != WIFI_OPT_SUCCESS) { + WIFI_LOGE("CheckCallingUid failed!"); + return WIFI_OPT_INVALID_PARAM; + } + WifiConfigCenter::GetInstance().GetCandidateConfigs(uid, result); + return WIFI_OPT_SUCCESS; +} + ErrCode WifiDeviceServiceImpl::AddDeviceConfig(const WifiDeviceConfig &config, int &result) { if (WifiPermissionUtils::VerifySetWifiInfoPermission() == PERMISSION_DENIED) { @@ -959,6 +1114,57 @@ int32_t WifiDeviceServiceImpl::Dump(int32_t fd, const std::vector tempConfigs; + WifiSettings::GetInstance().GetAllCandidateConfig(uid, tempConfigs); + for (const auto &config : tempConfigs) { + if (WifiSettings::GetInstance().RemoveDevice(config.networkId) != WIFI_OPT_SUCCESS) { + WIFI_LOGE("RemoveAllCandidateConfig-RemoveDevice() failed!"); + } + } + WifiSettings::GetInstance().SyncDeviceConfig(); + return; + } + if (pService->RemoveAllCandidateConfig(uid) != WIFI_OPT_SUCCESS) { + WIFI_LOGE("RemoveAllCandidateConfig failed"); + } + } +} + +void WifiDeviceServiceImpl::RegisterAppRemoved() +{ + WIFI_LOGI("RegisterAppRemoved"); + OHOS::EventFwk::MatchingSkills matchingSkills; + matchingSkills.AddEvent(OHOS::EventFwk::CommonEventSupport::COMMON_EVENT_PACKAGE_REMOVED); + EventFwk::CommonEventSubscribeInfo subscriberInfo(matchingSkills); + eventSubscriber_ = std::make_shared(subscriberInfo); + if (!EventFwk::CommonEventManager::SubscribeCommonEvent(eventSubscriber_)) { + WIFI_LOGE("SubscribeCommonEvent() failed"); + } else { + WIFI_LOGE("SubscribeCommonEvent() OK"); + } +} + +void WifiDeviceServiceImpl::UnRegisterAppRemoved() +{ + WIFI_LOGI("UnRegisterAppRemoved"); + if (!EventFwk::CommonEventManager::UnSubscribeCommonEvent(eventSubscriber_)) { + WIFI_LOGE("UnSubscribeCommonEvent() failed"); + } else { + WIFI_LOGE("UnSubscribeCommonEvent() OK"); + } + eventSubscriber_ = nullptr; +} #endif } // namespace Wifi } // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h index 3ee5edf..f51a950 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h @@ -26,10 +26,23 @@ #include "wifi_device_stub.h" #include "iremote_object.h" #include "wifi_p2p_service_impl.h" +#include "common_event_manager.h" +#include "common_event_support.h" +#include "bundle_constants.h" +#include "timer.h" #endif namespace OHOS { namespace Wifi { +#ifndef OHOS_ARCH_LITE +class AppEventSubscriber : public OHOS::EventFwk::CommonEventSubscriber { +public: + explicit AppEventSubscriber(const OHOS::EventFwk::CommonEventSubscribeInfo &subscriberInfo) + : CommonEventSubscriber(subscriberInfo) {} + virtual ~AppEventSubscriber() {}; + virtual void OnReceiveEvent(const OHOS::EventFwk::CommonEventData &data) override; +}; +#endif #ifdef OHOS_ARCH_LITE enum ServiceRunningState { STATE_NOT_START, @@ -38,6 +51,7 @@ enum ServiceRunningState { class WifiDeviceServiceImpl : public WifiDeviceStub { #else + class WifiDeviceServiceImpl : public SystemAbility, public WifiDeviceStub { DECLARE_SYSTEM_ABILITY(WifiDeviceServiceImpl); #endif @@ -123,6 +137,14 @@ public: bool SetLowLatencyMode(bool enabled) override; + ErrCode AddCandidateConfig(const WifiDeviceConfig &config, int &networkId) override; + + ErrCode ConnectToCandidateConfig(int networkId) override; + + ErrCode RemoveCandidateConfig(int networkId) override; + + ErrCode GetCandidateConfigs(std::vector &result) override; + #ifndef OHOS_ARCH_LITE int32_t Dump(int32_t fd, const std::vector& args) override; #endif @@ -133,9 +155,14 @@ private: bool IsStaServiceRunning(); bool IsScanServiceRunning(); bool CheckConfigPwd(const WifiDeviceConfig &config); + ErrCode CheckCallingUid(int &uid); static void SaBasicDump(std::string& result); static void SigHandler(int sig); static bool IsProcessNeedToRestart(); +#ifndef OHOS_ARCH_LITE + void RegisterAppRemoved(); + void UnRegisterAppRemoved(); +#endif private: static constexpr int MAX_PRESHAREDKEY_LEN = 63; @@ -150,6 +177,8 @@ private: static std::shared_ptr g_instance; #else static sptr g_instance; + std::shared_ptr eventSubscriber_ = nullptr; + std::unique_ptr lpTimer_ = nullptr; #endif static std::mutex g_instanceLock; bool mPublishFlag; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp index c1045ce..48caaef 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp @@ -66,6 +66,10 @@ void WifiDeviceStub::InitHandleMap() handleFuncMap[WIFI_SVR_CMD_GET_DERVICE_MAC_ADD] = &WifiDeviceStub::OnGetDeviceMacAdd; handleFuncMap[WIFI_SVR_CMD_IS_WIFI_CONNECTED] = &WifiDeviceStub::OnIsWifiConnected; handleFuncMap[WIFI_SVR_CMD_SET_LOW_LATENCY_MODE] = &WifiDeviceStub::OnSetLowLatencyMode; + handleFuncMap[WIFI_SVR_CMD_ADD_CANDIDATE_DEVICE_CONFIG] = &WifiDeviceStub::OnAddCandidateConfig; + handleFuncMap[WIFI_SVR_CMD_CONNECT_TO_CANDIDATE_CONFIG] = &WifiDeviceStub::OnConnectToCandidateConfig; + handleFuncMap[WIFI_SVR_CMD_REMOVE_CANDIDATE_CONFIG] = &WifiDeviceStub::OnRemoveCandidateConfig; + handleFuncMap[WIFI_SVR_CMD_GET_CANDIDATE_CONFIGS] = &WifiDeviceStub::OnGetCandidateConfigs; return; } @@ -272,6 +276,7 @@ void WifiDeviceStub::WriteWifiDeviceConfig(MessageParcel &reply, const WifiDevic reply.WriteInt32(config.wifiProxyconfig.manualProxyConfig.serverPort); reply.WriteCString(config.wifiProxyconfig.manualProxyConfig.exclusionObjectList.c_str()); reply.WriteInt32((int)config.wifiPrivacySetting); + reply.WriteInt32(config.uid); return; } @@ -631,5 +636,62 @@ void WifiDeviceStub::OnSetLowLatencyMode(uint32_t code, MessageParcel &data, Mes reply.WriteInt32(0); reply.WriteBool(SetLowLatencyMode(enabled)); } + +void WifiDeviceStub::OnAddCandidateConfig(uint32_t code, MessageParcel &data, MessageParcel &reply) +{ + WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); + WifiDeviceConfig config; + ReadWifiDeviceConfig(data, config); + + int networkId = INVALID_NETWORK_ID; + ErrCode ret = AddCandidateConfig(config, networkId); + + reply.WriteInt32(0); + reply.WriteInt32(ret); + if (ret == WIFI_OPT_SUCCESS) { + reply.WriteInt32(networkId); + } + return; +} + +void WifiDeviceStub::OnConnectToCandidateConfig(uint32_t code, MessageParcel &data, MessageParcel &reply) +{ + WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); + int networkId = data.ReadInt32(); + ErrCode ret = ConnectToCandidateConfig(networkId); + + reply.WriteInt32(0); + reply.WriteInt32(ret); + return; +} + +void WifiDeviceStub::OnRemoveCandidateConfig(uint32_t code, MessageParcel &data, MessageParcel &reply) +{ + WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); + int networkId = data.ReadInt32(); + ErrCode ret = RemoveCandidateConfig(networkId); + + reply.WriteInt32(0); + reply.WriteInt32(ret); + return; +} + +void WifiDeviceStub::OnGetCandidateConfigs(uint32_t code, MessageParcel &data, MessageParcel &reply) +{ + WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); + std::vector result; + ErrCode ret = GetCandidateConfigs(result); + reply.WriteInt32(0); + reply.WriteInt32(ret); + + if (ret == WIFI_OPT_SUCCESS) { + unsigned int size = result.size(); + reply.WriteInt32(size); + for (unsigned int i = 0; i < size; ++i) { + WriteWifiDeviceConfig(reply, result[i]); + } + } + return; +} } // namespace Wifi } // namespace OHOS \ No newline at end of file diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.h index 81fd681..b8dc94f 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.h @@ -67,6 +67,10 @@ private: void OnGetDeviceMacAdd(uint32_t code, MessageParcel &data, MessageParcel &reply); void OnIsWifiConnected(uint32_t code, MessageParcel &data, MessageParcel &reply); void OnSetLowLatencyMode(uint32_t code, MessageParcel &data, MessageParcel &reply); + void OnAddCandidateConfig(uint32_t code, MessageParcel &data, MessageParcel &reply); + void OnConnectToCandidateConfig(uint32_t code, MessageParcel &data, MessageParcel &reply); + void OnRemoveCandidateConfig(uint32_t code, MessageParcel &data, MessageParcel &reply); + void OnGetCandidateConfigs(uint32_t code, MessageParcel &data, MessageParcel &reply); private: void ReadWifiDeviceConfig(MessageParcel &data, WifiDeviceConfig &config); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/ista_service.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/ista_service.h index 5e7dc36..97f786a 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/ista_service.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/ista_service.h @@ -84,6 +84,42 @@ public: * @Return success: WIFI_OPT_SUCCESS fail: WIFI_OPT_FAILED */ virtual ErrCode ReAssociate() = 0; + + /** + * @Description Add a specified candidate hotspot configuration. + * + * @param uid - call app uid + * @param config - WifiDeviceConfig object + * @Return success: WIFI_OPT_SUCCESS fail: WIFI_OPT_FAILED + */ + virtual int AddCandidateConfig(const int uid, const WifiDeviceConfig &config) = 0; + + /** + * @Description Connect to a candidate specified network. + * + * @param uid - call app uid + * @param networkId - the candidate device network id + * @Return ErrCode - operation result + */ + virtual ErrCode ConnectToCandidateConfig(const int uid, const int networkId) = 0; + + /** + * @Description Remove the wifi candidate device config equals to input network id + * + * @param uid - call app uid + * @param networkId - the candidate device network id + * @return ErrCode - operation result + */ + virtual ErrCode RemoveCandidateConfig(const int uid, const int networkId) = 0; + + /** + * @Description Remove all the wifi candidate device config equals to input uid + * + * @param uid - call app uid + * @return ErrCode - operation result + */ + virtual ErrCode RemoveAllCandidateConfig(const int uid) = 0; + /** * @Description Add a network to config * diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.cpp index 8ee60c5..bd10af5 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.cpp @@ -136,6 +136,46 @@ ErrCode StaInterface::Disconnect() return WIFI_OPT_SUCCESS; } +int StaInterface::AddCandidateConfig(const int uid, const WifiDeviceConfig &config) +{ + LOGD("Enter StaInterface::AddCandidateConfig.\n"); + CHECK_NULL_AND_RETURN(pStaService, WIFI_OPT_FAILED); + return pStaService->AddCandidateConfig(uid, config); +} + +ErrCode StaInterface::ConnectToCandidateConfig(const int uid, const int networkId) +{ + LOGD("Enter StaInterface::ConnectToCandidateConfig.\n"); + CHECK_NULL_AND_RETURN(pStaService, WIFI_OPT_FAILED); + if (pStaService->ConnectToCandidateConfig(uid, networkId) != WIFI_OPT_SUCCESS) { + LOGE("ConnectToCandidateConfig failed.\n"); + return WIFI_OPT_FAILED; + } + return WIFI_OPT_SUCCESS; +} + +ErrCode StaInterface::RemoveCandidateConfig(const int uid, const int networkId) +{ + LOGD("Enter StaInterface::RemoveCandidateConfig.\n"); + CHECK_NULL_AND_RETURN(pStaService, WIFI_OPT_FAILED); + if (pStaService->RemoveCandidateConfig(uid, networkId) != WIFI_OPT_SUCCESS) { + LOGE("RemoveCandidateConfig failed.\n"); + return WIFI_OPT_FAILED; + } + return WIFI_OPT_SUCCESS; +} + +ErrCode StaInterface::RemoveAllCandidateConfig(const int uid) +{ + LOGD("Enter StaInterface::RemoveAllCandidateConfig.\n"); + CHECK_NULL_AND_RETURN(pStaService, WIFI_OPT_FAILED); + if (pStaService->RemoveAllCandidateConfig(uid) != WIFI_OPT_SUCCESS) { + LOGE("RemoveAllCandidateConfig failed.\n"); + return WIFI_OPT_FAILED; + } + return WIFI_OPT_SUCCESS; +} + int StaInterface::AddDeviceConfig(const WifiDeviceConfig &config) { LOGD("Enter StaInterface::AddDeviceConfig.\n"); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.h index 95fc940..a8f61e3 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.h @@ -88,6 +88,37 @@ public: * @Return success: WIFI_OPT_SUCCESS fail: WIFI_OPT_FAILED */ virtual ErrCode ReAssociate() override; + /** + * @Description Add a specified candidate hotspot configuration. + * + * @param uid - call app uid + * @param config - WifiDeviceConfig object + * @Return success: WIFI_OPT_SUCCESS fail: WIFI_OPT_FAILED + */ + int AddCandidateConfig(const int uid, const WifiDeviceConfig &config) override; + /** + * @Description Connecting to a candidate specified network. + * + * @param uid - call app uid + * @param networkId - the candidate device network id + * @Return ErrCode - operation result + */ + ErrCode ConnectToCandidateConfig(const int uid, const int networkId) override; + /** + * @Description Remove the wifi candidate device config equals to input network id + * + * @param uid - call app uid + * @param networkId - the candidate device network id + * @return ErrCode - operation result + */ + ErrCode RemoveCandidateConfig(const int uid, const int networkId) override; + /** + * @Description Remove all the wifi candidate device config equals to input uid + * + * @param uid - call app uid + * @return ErrCode - operation result + */ + ErrCode RemoveAllCandidateConfig(const int uid) override; /** * @Description Add a network to config * diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp index 727542a..2f81222 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp @@ -31,6 +31,7 @@ StaSavedDeviceAppraisal::StaSavedDeviceAppraisal(bool supportFmRoamingFlag) frequency5GHzScore(WifiSettings::GetInstance().GetScoretacticsFrequency5GHzScore()), userSelectedDeviceScore(WifiSettings::GetInstance().GetScoretacticsLastSelectionScore()), safetyDeviceScore(WifiSettings::GetInstance().GetScoretacticsSecurityScore()), + normalDeviceScore(WifiSettings::GetInstance().GetScoretacticsNormalScore()), firmwareRoamFlag(supportFmRoamingFlag) {} StaSavedDeviceAppraisal::~StaSavedDeviceAppraisal() @@ -129,6 +130,12 @@ void StaSavedDeviceAppraisal::AppraiseDeviceQuality( WIFI_LOGI("5G score is %{public}d.\n", frequency5GHzScore); } + /* normal device config: bonus point */ + if (device.uid == WIFI_INVALID_UID) { + score += normalDeviceScore; + WIFI_LOGI("normal score is %{public}d.\n", normalDeviceScore); + } + /* Bonus points for last user selection */ int userLastSelectedNetworkId = WifiSettings::GetInstance().GetUserLastSelectedNetworkId(); if (userLastSelectedNetworkId != INVALID_NETWORK_ID && userLastSelectedNetworkId == device.networkId) { diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.h index 6e0cb1a..47150ab 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.h @@ -48,6 +48,7 @@ private: int frequency5GHzScore; int userSelectedDeviceScore; int safetyDeviceScore; + int normalDeviceScore; bool firmwareRoamFlag; /** diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp index 937d8b4..5fecffe 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp @@ -104,6 +104,72 @@ ErrCode StaService::DisableWifi() const return WIFI_OPT_SUCCESS; } +int StaService::AddCandidateConfig(const int uid, const WifiDeviceConfig &config) const +{ + LOGI("Enter StaService::AddCandidateConfig.\n"); + constexpr int UID_UNTRUSTED_CONFIG_LEN = 16; + std::vector tempConfigs; + WifiSettings::GetInstance().GetAllCandidateConfig(uid, tempConfigs); + if (tempConfigs.size() >= UID_UNTRUSTED_CONFIG_LEN) { + LOGE("StaService::AddCandidateConfig failed, max num is 16!"); + return INVALID_NETWORK_ID; + } + + if (config.keyMgmt == KEY_MGMT_NONE) { + LOGE("StaService::AddCandidateConfig unsupport open or wep key!"); + return WIFI_OPT_NOT_SUPPORTED; + } + + WifiDeviceConfig tempDeviceConfig = config; + tempDeviceConfig.uid = uid; + return AddDeviceConfig(tempDeviceConfig); +} + +ErrCode StaService::RemoveCandidateConfig(const int uid, const int networkId) const +{ + LOGD("Enter StaService::RemoveCandidateConfig.\n"); + WifiDeviceConfig config; + if (WifiSettings::GetInstance().GetCandidateConfig(uid, networkId, config) == INVALID_NETWORK_ID) { + LOGE("RemoveCandidateConfig-GetCandidateConfig no foud failed!"); + return WIFI_OPT_FAILED; + } + + /* Remove network configuration. */ + return RemoveDevice(config.networkId); +} + +ErrCode StaService::RemoveAllCandidateConfig(const int uid) const +{ + LOGD("Enter StaService::RemoveAllCandidateConfig.\n"); + std::vector tempConfigs; + WifiSettings::GetInstance().GetAllCandidateConfig(uid, tempConfigs); + for (const auto &config : tempConfigs) { + if (RemoveDevice(config.networkId) != WIFI_OPT_SUCCESS) { + LOGE("RemoveAllCandidateConfig-RemoveDevice() failed!"); + } + } + return WIFI_OPT_SUCCESS; +} + +ErrCode StaService::ConnectToCandidateConfig(const int uid, const int networkId) const +{ + LOGI("Enter StaService::ConnectToCandidateConfig.\n"); + WifiDeviceConfig config; + if (WifiSettings::GetInstance().GetCandidateConfig(uid, networkId, config) == INVALID_NETWORK_ID) { + LOGE("StaService::ConnectToCandidateConfig:GetCandidateConfig is null!"); + return WIFI_OPT_FAILED; + } + + if (config.keyMgmt == KEY_MGMT_NONE) { + LOGE("StaService::ConnectToCandidateConfig unsupport open or wep key!"); + return WIFI_OPT_NOT_SUPPORTED; + } + + pStaAutoConnectService->EnableOrDisableBssid(config.bssid, true, 0); + pStaStateMachine->SendMessage(WIFI_SVR_CMD_STA_CONNECT_SAVED_NETWORK, networkId, NETWORK_SELECTED_BY_THE_USER); + return WIFI_OPT_SUCCESS; +} + int StaService::AddDeviceConfig(const WifiDeviceConfig &config) const { LOGI("Enter StaService::AddDeviceConfig.\n"); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.h index bc00ccc..0927a38 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.h @@ -87,7 +87,37 @@ public: * @Return success: WIFI_OPT_SUCCESS fail: WIFI_OPT_FAILED */ virtual ErrCode ReAssociate() const; - + /** + * @Description Add a specified candidate hotspot configuration. + * + * @param uid - call app uid + * @param config - WifiDeviceConfig object + * @Return success: WIFI_OPT_SUCCESS fail: WIFI_OPT_FAILED + */ + virtual int AddCandidateConfig(const int uid, const WifiDeviceConfig &config) const; + /** + * @Description Connect to a candidate specified network. + * + * @param uid - call app uid + * @param networkId - the candidate device network id + * @Return ErrCode - operation result + */ + virtual ErrCode ConnectToCandidateConfig(const int uid, const int networkId) const; + /** + * @Description Remove the wifi candidate device config equals to input network id + * + * @param uid - call app uid + * @param networkId - the candidate device network id + * @return ErrCode - operation result + */ + virtual ErrCode RemoveCandidateConfig(const int uid, const int networkId) const; + /** + * @Description Remove all the wifi candidate device config equals to input uid + * + * @param uid - call app uid + * @return ErrCode - operation result + */ + virtual ErrCode RemoveAllCandidateConfig(const int uid) const; /** * @Description Update a network to config * diff --git a/wifi/utils/inc/wifi_common_util.h b/wifi/utils/inc/wifi_common_util.h index 445aaf9..b23f67a 100644 --- a/wifi/utils/inc/wifi_common_util.h +++ b/wifi/utils/inc/wifi_common_util.h @@ -112,6 +112,21 @@ std::string GetBundleName(); */ bool IsSystemApp(); +/** + * @Description get calling uid + * + * @return int - calling uid + */ +int GetCallingUid(); + +/** + * @Description Check uid the app is a foregroud app + * + * @param uid - Input uid + * @return bool - Returns true for yes, false for no. + */ +bool IsForegroundApp(const int uid); + /** * @Description Time consuming statistics * diff --git a/wifi/utils/src/BUILD.gn b/wifi/utils/src/BUILD.gn index 882ee49..b1e45f1 100644 --- a/wifi/utils/src/BUILD.gn +++ b/wifi/utils/src/BUILD.gn @@ -65,6 +65,7 @@ if (defined(ohos_lite)) { external_deps = [ "ability_base:want", + "ability_runtime:app_manager", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "hisysevent_native:libhisysevent", diff --git a/wifi/utils/src/wifi_common_util.cpp b/wifi/utils/src/wifi_common_util.cpp index a964b01..ffb7d92 100644 --- a/wifi/utils/src/wifi_common_util.cpp +++ b/wifi/utils/src/wifi_common_util.cpp @@ -18,6 +18,7 @@ #include #include #ifndef OHOS_ARCH_LITE +#include "app_mgr_client.h" #include "bundle_mgr_interface.h" #include "if_system_ability_manager.h" #include "ipc_skeleton.h" @@ -226,6 +227,40 @@ bool IsSystemApp() return isSysApp; } +int GetCallingUid() +{ + return IPCSkeleton::GetCallingUid(); +} + +bool IsForegroundApp(const int uid) +{ + using namespace OHOS::AppExecFwk; + using namespace OHOS::AppExecFwk::Constants; + constexpr int32_t UID_CALLINGUID_TRANSFORM_DIVISOR = 200000; + int32_t userId = static_cast(uid / UID_CALLINGUID_TRANSFORM_DIVISOR); + + auto appMgrClient = std::make_unique(); + if (appMgrClient == nullptr) { + return false; + } + appMgrClient->ConnectAppMgrService(); + AppMgrResultCode ret; + std::vector infos; + ret = appMgrClient->GetProcessRunningInfosByUserId(infos, userId); + if (ret != AppMgrResultCode::RESULT_OK) { + WIFI_LOGE("GetProcessRunningInfosByUserId fail, ret = [%{public}d]", ret); + return false; + } + + auto iter = std::find_if(infos.begin(), infos.end(), [&uid](const RunningProcessInfo &rhs) { + return ((rhs.uid_ == uid) && (rhs.state_ == AppProcessState::APP_STATE_FOREGROUND)); + }); + if (iter != infos.end()) { + return true; + } + return false; +} + TimeStats::TimeStats(const std::string desc): m_desc(desc) { m_startTime = std::chrono::steady_clock::now(); -- Gitee From c1825c08e7b2a41afbed3cc5145d8cf1aae17809 Mon Sep 17 00:00:00 2001 From: lujunxin Date: Wed, 6 Jul 2022 10:16:13 +0800 Subject: [PATCH 218/491] support eap-peap method Signed-off-by: lujunxin --- wifi/frameworks/native/BUILD.gn | 2 + wifi/frameworks/native/interfaces/wifi_msg.h | 20 +++++++ .../native/src/wifi_device_proxy.cpp | 2 + wifi/frameworks/native/src/wifi_msg.cpp | 53 +++++++++++++++++++ .../common/config/wifi_config_file_spec.cpp | 4 ++ .../wifi_manage/idl_client/BUILD.gn | 1 + .../idl_client/idl_interface/i_wifi_struct.h | 1 + .../idl_client/wifi_idl_client.cpp | 4 ++ .../wifi_manage/idl_client/wifi_idl_struct.h | 4 +- .../wifi_manage/wifi_device_service_impl.cpp | 39 +++++++++----- .../wifi_manage/wifi_device_service_impl.h | 3 +- .../wifi_manage/wifi_device_stub.cpp | 2 + .../wifi_sta/sta_state_machine.cpp | 3 ++ .../wifi_standard/wifi_hal/wifi_hal_define.h | 1 + .../wpa_sta_hal/wifi_supplicant_hal.c | 3 +- 15 files changed, 127 insertions(+), 15 deletions(-) create mode 100644 wifi/frameworks/native/src/wifi_msg.cpp diff --git a/wifi/frameworks/native/BUILD.gn b/wifi/frameworks/native/BUILD.gn index 4c23440..99a5cbf 100644 --- a/wifi/frameworks/native/BUILD.gn +++ b/wifi/frameworks/native/BUILD.gn @@ -23,6 +23,7 @@ if (defined(ohos_lite)) { "src/wifi_device_callback_stub_lite.cpp", "src/wifi_device_impl.cpp", "src/wifi_device_proxy_lite.cpp", + "src/wifi_msg.cpp", "src/wifi_scan.cpp", "src/wifi_scan_callback_stub_lite.cpp", "src/wifi_scan_impl.cpp", @@ -185,6 +186,7 @@ if (defined(ohos_lite)) { "src/wifi_hid2d_msg.cpp", "src/wifi_hotspot.cpp", "src/wifi_hotspot_callback_stub.cpp", + "src/wifi_msg.cpp", "src/wifi_p2p.cpp", "src/wifi_p2p_callback_stub.cpp", "src/wifi_p2p_msg.cpp", diff --git a/wifi/frameworks/native/interfaces/wifi_msg.h b/wifi/frameworks/native/interfaces/wifi_msg.h index d39af20..cff6e81 100644 --- a/wifi/frameworks/native/interfaces/wifi_msg.h +++ b/wifi/frameworks/native/interfaces/wifi_msg.h @@ -268,6 +268,8 @@ public: {} }; +enum class Phase2Method { NONE, PAP, MSCHAP, MSCHAPV2, GTC, SIM, AKA, AKA_PRIME }; + class WifiEapConfig { public: std::string eap; /* EAP mode Encryption Mode: PEAP/TLS/TTLS/PWD/SIM/AKA/AKA */ @@ -275,6 +277,24 @@ public: std::string password; /* EAP mode password */ std::string clientCert; /* EAP mode client certificate */ std::string privateKey; /* EAP mode client private key */ + Phase2Method phase2Method; + + /** + * @Description convert Phase2Method to string + * + * @param eap - eap method + * @param method - phase2method + * @return string + */ + static std::string Phase2MethodToStr(const std::string& eap, const int& method); + + /** + * @Description convert string to Phase2Method + * + * @param str - phase2method string + * @return Phase2Method + */ + static Phase2Method Phase2MethodFromStr(const std::string& str); }; enum class ConfigureProxyMethod { AUTOCONFIGUE, MANUALCONFIGUE, CLOSED }; diff --git a/wifi/frameworks/native/src/wifi_device_proxy.cpp b/wifi/frameworks/native/src/wifi_device_proxy.cpp index 9c1da8b..ae015b9 100644 --- a/wifi/frameworks/native/src/wifi_device_proxy.cpp +++ b/wifi/frameworks/native/src/wifi_device_proxy.cpp @@ -234,6 +234,7 @@ void WifiDeviceProxy::WriteDeviceConfig(const WifiDeviceConfig &config, MessageP data.WriteCString(config.wifiEapConfig.password.c_str()); data.WriteCString(config.wifiEapConfig.clientCert.c_str()); data.WriteCString(config.wifiEapConfig.privateKey.c_str()); + data.WriteInt32(static_cast(config.wifiEapConfig.phase2Method)); data.WriteInt32((int)config.wifiProxyconfig.configureMethod); data.WriteCString(config.wifiProxyconfig.autoProxyConfig.pacWebAddress.c_str()); data.WriteCString(config.wifiProxyconfig.manualProxyConfig.serverHostName.c_str()); @@ -417,6 +418,7 @@ void WifiDeviceProxy::ParseDeviceConfigs(MessageParcel &reply, std::vector (sizeof(METHOD_STRS) / sizeof(METHOD_STRS[0]))) { + return "auth=NONE"; + } + std::string prefix = (eap == EAP_METHOD_TTLS && method == static_cast(Phase2Method::GTC)) ? + PREFIX_AUTHEAP : PREFIX_AUTH; + return prefix + METHOD_STRS[method]; +} + +Phase2Method WifiEapConfig::Phase2MethodFromStr(const std::string& str) +{ + std::string methodStr; + if (str.find(PREFIX_AUTH) == 0) { + methodStr = str.substr(PREFIX_AUTH.length()); + } else if (str.find(PREFIX_AUTHEAP) == 0) { + methodStr = str.substr(PREFIX_AUTHEAP.length()); + } else { + return Phase2Method::NONE; + } + int len = sizeof(METHOD_STRS) / sizeof(METHOD_STRS[0]); + for (int i = 0; i < len; i++) { + if (METHOD_STRS[i] == methodStr) { + return Phase2Method(i); + } + } + return Phase2Method::NONE; +} +} // namespace Wifi +} // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp b/wifi/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp index 5091a98..9b5016a 100644 --- a/wifi/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp +++ b/wifi/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp @@ -69,6 +69,7 @@ static void ClearWifiDeviceConfigEap(WifiDeviceConfig &item) item.wifiEapConfig.password.clear(); item.wifiEapConfig.clientCert.clear(); item.wifiEapConfig.privateKey.clear(); + item.wifiEapConfig.phase2Method = Phase2Method::NONE; return; } @@ -203,6 +204,8 @@ static void SetWifiDeviceConfigEap(WifiDeviceConfig &item, const std::string &ke item.wifiEapConfig.clientCert = value; } else if (key == "wifiEapConfig.privateKey") { item.wifiEapConfig.privateKey = value; + } else if (key == "wifiEapConfig.phase2method") { + item.wifiEapConfig.phase2Method = Phase2Method(std::stoi(value)); } return; } @@ -322,6 +325,7 @@ static std::string OutPutWifiDeviceConfigEap(WifiDeviceConfig &item) ss << "wifiEapConfig.password=" << item.wifiEapConfig.password << std::endl; ss << "wifiEapConfig.clientCert=" << item.wifiEapConfig.clientCert << std::endl; ss << "wifiEapConfig.privateKey=" << item.wifiEapConfig.privateKey << std::endl; + ss << "wifiEapConfig.phase2method=" << static_cast(item.wifiEapConfig.phase2Method) << std::endl; return ss.str(); } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/BUILD.gn index 568ecbf..9cf4725 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/BUILD.gn @@ -72,6 +72,7 @@ net_helper_sources = [ idl_client_sources = [ "$WIFI_ROOT_DIR/frameworks/native/src/wifi_hid2d_msg.cpp", + "$WIFI_ROOT_DIR/frameworks/native/src/wifi_msg.cpp", "$WIFI_ROOT_DIR/frameworks/native/src/wifi_p2p_msg.cpp", "idl_interface/i_wifi.c", "idl_interface/i_wifi_chip.c", diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_struct.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_struct.h index 2084dc8..bb8474f 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_struct.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_struct.h @@ -145,6 +145,7 @@ typedef enum DeviceConfigType { DEVICE_CONFIG_WEP_KEY_3 = 14, DEVICE_CONFIG_EAP_CLIENT_CERT = 15, DEVICE_CONFIG_EAP_PRIVATE_KEY = 16, + DEVICE_CONFIG_EAP_PHASE2METHOD = 17, DEVICE_CONFIG_END_POS, /* Number of network configuration parameters, which is used as the last parameter. */ } DeviceConfigType; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp index c233638..694075b 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp @@ -532,6 +532,10 @@ WifiErrorNo WifiIdlClient::SetDeviceConfig(int networkId, const WifiIdlDeviceCon if (config.authAlgorithms > 0) { num += PushDeviceConfigAuthAlgorithm(conf + num, DEVICE_CONFIG_AUTH_ALGORITHMS, config.authAlgorithms); } + if (config.phase2Method != static_cast(Phase2Method::NONE)) { + std::string strPhase2Method = WifiEapConfig::Phase2MethodToStr(config.eap, config.phase2Method); + num += PushDeviceConfigString(conf + num, DEVICE_CONFIG_EAP_PHASE2METHOD, strPhase2Method); + } if (num == 0) { return WIFI_IDL_OPT_OK; } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_struct.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_struct.h index 9d48837..13ea086 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_struct.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_struct.h @@ -50,8 +50,10 @@ struct WifiIdlDeviceConfig { std::string clientCert; std::string privateKey; std::string bssid; + int phase2Method; - WifiIdlDeviceConfig() : networkId(-1), priority(-1), scanSsid(-1), authAlgorithms(-1), wepKeyIdx(-1) + WifiIdlDeviceConfig() : networkId(-1), priority(-1), scanSsid(-1), authAlgorithms(-1), wepKeyIdx(-1), + phase2Method(0) {} ~WifiIdlDeviceConfig() diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp index 087a06f..a6802a7 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp @@ -288,6 +288,32 @@ ErrCode WifiDeviceServiceImpl::PutWifiProtectRef(const std::string &protectName) return WIFI_OPT_FAILED; } +bool WifiDeviceServiceImpl::CheckConfigEap(const WifiDeviceConfig &config) +{ + if (config.keyMgmt != KEY_MGMT_EAP) { + WIFI_LOGE("CheckConfigEap: keyMgmt is not EAP!"); + return false; + } + if (config.wifiEapConfig.eap == EAP_METHOD_TLS) { + if (config.wifiEapConfig.identity.empty() || + config.wifiEapConfig.clientCert.empty() || + config.wifiEapConfig.privateKey.empty()) { + WIFI_LOGE("CheckConfigEap: with invalid TLS params!"); + return false; + } + return true; + } else if (config.wifiEapConfig.eap == EAP_METHOD_PEAP) { + if (config.wifiEapConfig.identity.empty() || config.wifiEapConfig.password.empty()) { + WIFI_LOGE("CheckConfigEap: with invalid PEAP params!"); + return false; + } + return true; + } else { + WIFI_LOGE("EAP:%{public}s unsupported!", config.wifiEapConfig.eap.c_str()); + } + return false; +} + bool WifiDeviceServiceImpl::CheckConfigPwd(const WifiDeviceConfig &config) { if ((config.ssid.length() <= 0) || (config.keyMgmt.length()) <= 0) { @@ -295,18 +321,7 @@ bool WifiDeviceServiceImpl::CheckConfigPwd(const WifiDeviceConfig &config) } if (config.keyMgmt == KEY_MGMT_EAP) { - if (config.wifiEapConfig.eap == EAP_METHOD_TLS) { - if (config.wifiEapConfig.identity.empty() || - config.wifiEapConfig.clientCert.empty() || - config.wifiEapConfig.privateKey.empty()) { - WIFI_LOGE("CheckConfigPwd: with invalid TLS params!"); - return false; - } else { - return true; - } - } else { - WIFI_LOGE("EAP:%{public}s unsupported!", config.wifiEapConfig.eap.c_str()); - } + return CheckConfigEap(config); } if (config.keyMgmt != KEY_MGMT_NONE && config.preSharedKey.empty()) { diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h index 3ee5edf..6483517 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h @@ -132,6 +132,7 @@ private: ErrCode CheckCanEnableWifi(void); bool IsStaServiceRunning(); bool IsScanServiceRunning(); + bool CheckConfigEap(const WifiDeviceConfig &config); bool CheckConfigPwd(const WifiDeviceConfig &config); static void SaBasicDump(std::string& result); static void SigHandler(int sig); @@ -157,4 +158,4 @@ private: }; } // namespace Wifi } // namespace OHOS -#endif \ No newline at end of file +#endif diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp index 6b93dfe..b35d597 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp @@ -211,6 +211,7 @@ void WifiDeviceStub::ReadWifiDeviceConfig(MessageParcel &data, WifiDeviceConfig config.wifiEapConfig.password = data.ReadCString(); config.wifiEapConfig.clientCert = data.ReadCString(); config.wifiEapConfig.privateKey = data.ReadCString(); + config.wifiEapConfig.phase2Method = Phase2Method(data.ReadInt32()); config.wifiProxyconfig.configureMethod = ConfigureProxyMethod(data.ReadInt32()); config.wifiProxyconfig.autoProxyConfig.pacWebAddress = data.ReadCString(); config.wifiProxyconfig.manualProxyConfig.serverHostName = data.ReadCString(); @@ -270,6 +271,7 @@ void WifiDeviceStub::WriteWifiDeviceConfig(MessageParcel &reply, const WifiDevic reply.WriteCString(config.wifiEapConfig.password.c_str()); reply.WriteCString(config.wifiEapConfig.clientCert.c_str()); reply.WriteCString(config.wifiEapConfig.privateKey.c_str()); + reply.WriteInt32(static_cast(config.wifiEapConfig.phase2Method)); reply.WriteInt32((int)config.wifiProxyconfig.configureMethod); reply.WriteCString(config.wifiProxyconfig.autoProxyConfig.pacWebAddress.c_str()); reply.WriteCString(config.wifiProxyconfig.manualProxyConfig.serverHostName.c_str()); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp index 61ee1d2..a34405a 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp @@ -336,6 +336,7 @@ ErrCode StaStateMachine::ConvertDeviceCfg(const WifiDeviceConfig &config) const idlConfig.password = config.wifiEapConfig.password; idlConfig.clientCert = config.wifiEapConfig.clientCert; idlConfig.privateKey = config.wifiEapConfig.privateKey; + idlConfig.phase2Method = static_cast(config.wifiEapConfig.phase2Method); idlConfig.wepKeyIdx = config.wepTxKeyIndex; for (int i = 0; i < MAX_WEPKEYS_SIZE; i++) { idlConfig.wepKeys[i] = config.wepKeys[i]; @@ -1154,6 +1155,7 @@ void StaStateMachine::DealStartRoamCmd(InternalMessage *msg) idlConfig.password = network.wifiEapConfig.password; idlConfig.clientCert = network.wifiEapConfig.clientCert; idlConfig.privateKey = network.wifiEapConfig.privateKey; + idlConfig.phase2Method = static_cast(network.wifiEapConfig.phase2Method); if (WifiStaHalInterface::GetInstance().SetDeviceConfig(linkedInfo.networkId, idlConfig) != WIFI_IDL_OPT_OK) { WIFI_LOGE("DealStartRoamCmd SetDeviceConfig() failed!"); @@ -1584,6 +1586,7 @@ void StaStateMachine::SyncAllDeviceConfigs() idlConfig.password = it->wifiEapConfig.password; idlConfig.clientCert = it->wifiEapConfig.clientCert; idlConfig.privateKey = it->wifiEapConfig.privateKey; + idlConfig.phase2Method = static_cast(it->wifiEapConfig.phase2Method); if (WifiStaHalInterface::GetInstance().SetDeviceConfig(it->networkId, idlConfig) != WIFI_IDL_OPT_OK) { WIFI_LOGE("SetDeviceConfig failed!"); } diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_define.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_define.h index 4a27b24..270605d 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_define.h +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_define.h @@ -150,6 +150,7 @@ typedef enum DeviceConfigType { DEVICE_CONFIG_WEP_KEY_3 = 14, DEVICE_CONFIG_EAP_CLIENT_CERT = 15, DEVICE_CONFIG_EAP_PRIVATE_KEY = 16, + DEVICE_CONFIG_EAP_PHASE2METHOD = 17, /** * Number of network configuration parameters, which is used as the last * parameter. diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c index 0a801b2..614a461 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c @@ -86,7 +86,8 @@ static WpaSsidField g_wpaSsidFields[] = { {DEVICE_CONFIG_WEP_KEY_2, "wep_key2", QUOTATION_MARKS_FLAG_NO}, {DEVICE_CONFIG_WEP_KEY_3, "wep_key3", QUOTATION_MARKS_FLAG_NO}, {DEVICE_CONFIG_EAP_CLIENT_CERT, "client_cert", QUOTATION_MARKS_FLAG_YES}, - {DEVICE_CONFIG_EAP_PRIVATE_KEY, "private_key", QUOTATION_MARKS_FLAG_YES} + {DEVICE_CONFIG_EAP_PRIVATE_KEY, "private_key", QUOTATION_MARKS_FLAG_YES}, + {DEVICE_CONFIG_EAP_PHASE2METHOD, "phase2", QUOTATION_MARKS_FLAG_YES}, }; static int WpaCliCmdStatus(WifiWpaStaInterface *this, struct WpaHalCmdStatus *pcmd) -- Gitee From ad2d46fe4887468fe9032976ac7fd1a188f2510c Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Wed, 6 Jul 2022 19:41:20 +0800 Subject: [PATCH 219/491] (#I5FUP1) Add unittest for wifi and dhcp Signed-off-by: zhangfeng --- dhcp/bundle.json | 3 + dhcp/test/services/dhcp_client/BUILD.gn | 2 +- .../dhcp_client/dhcp_function_test.cpp | 19 +- .../services/dhcp_client/dhcp_ipv4_test.cpp | 10 +- .../services/dhcp_client/dhcp_socket_test.cpp | 30 +- .../services/dhcp_client/mock_system_func.cpp | 9 +- .../services/dhcp_client/mock_system_func.h | 9 +- .../services/dhcp_server/unittest/BUILD.gn | 2 +- .../dhcp_server/unittest/dhcp_server_test.cpp | 6 +- dhcp/test/services/mgr_service/BUILD.gn | 6 +- .../services/mgr_service/dhcp_func_test.cpp | 5 +- wifi/bundle.json | 11 +- .../common/config/wifi_config_file_impl.h | 8 + .../common/include/wifi_internal_msg.h | 12 + .../wifi_manage/wifi_ap/ap_config_use.cpp | 4 +- .../wifi_manage/wifi_ap/ap_config_use.h | 4 +- .../wifi_manage/wifi_manager.cpp | 5 + .../wifi_framework/wifi_manage/wifi_manager.h | 1 + .../wifi_manage/wifi_scan/scan_service.cpp | 37 +- .../wifi_manage/wifi_sta/sta_service.cpp | 16 +- wifi/services/wifi_standard/wifi_hal/BUILD.gn | 5 - .../wifi_hal/wifi_hal_ap_interface.c | 5 +- .../ipc_framework/cRPC/unittest/BUILD.gn | 4 +- .../wifi_framework/common/unittest/BUILD.gn | 8 +- .../wifi_manage/idl_client/unittest/BUILD.gn | 14 +- .../unittest/mock_wifi_hal_service.c | 6 - .../wifi_manage/unittest/BUILD.gn | 20 +- .../unittest/wifi_auth_center_test.cpp | 14 +- .../unittest/wifi_config_center_test.cpp | 5 +- .../unittest/wifi_manager_service_test.cpp | 18 +- .../unittest/wifi_mock_p2p_service.cpp | 6 +- .../unittest/wifi_mock_p2p_service.h | 2 +- .../wifi_manage/wifi_ap/BUILD.gn | 10 +- .../wifi_ap/Mock/mock_wifi_ap_hal_interface.h | 54 +- .../wifi_ap/Mock/mock_wifi_settings.h | 53 +- .../wifi_ap/ap_config_use_test.cpp | 2 +- .../wifi_ap/ap_idle_state_test.cpp | 2 +- .../wifi_manage/wifi_ap/ap_monitor_test.cpp | 18 +- .../wifi_manage/wifi_ap/ap_service_test.cpp | 20 +- .../wifi_ap/ap_started_state_test.cpp | 73 +-- .../wifi_ap/ap_state_machine_test.cpp | 14 +- .../wifi_ap/ap_stations_manager_test.cpp | 62 +- .../wifi_ap/wifi_ap_nat_manager_test.cpp | 8 +- .../wifi_manage/wifi_p2p/test/BUILD.gn | 12 +- .../wifi_p2p/test/p2p_enabled_state_test.cpp | 5 +- .../wifi_p2p/test/p2p_state_machine_test.cpp | 15 +- .../wifi_manage/wifi_scan/BUILD.gn | 8 +- .../wifi_scan/Mock/mock_wifi_manager.cpp | 1 + .../wifi_scan/Mock/mock_wifi_manager.h | 2 + .../wifi_scan/Mock/mock_wifi_settings.h | 4 +- .../wifi_scan/scan_interface_test.cpp | 12 +- .../wifi_scan/scan_service_test.cpp | 19 +- .../wifi_manage/wifi_sta/BUILD.gn | 14 +- .../wifi_sta/Mock/mock_wifi_settings.h | 4 + .../sta_auto_connect_service_test.cpp | 9 +- .../sta_saved_device_appraisal_test.cpp | 9 +- .../wifi_sta/sta_state_machine_test.cpp | 7 +- .../wifi_standard/wifi_hal/unittest/BUILD.gn | 6 +- .../unittest/wifi_hal_ap_interface_test.cpp | 58 +- .../unittest/wifi_hal_chip_interface_test.cpp | 4 +- .../wifi_hal_crpc_server_add_test.cpp | 284 +++++----- .../unittest/wifi_hal_crpc_server_test.cpp | 533 +++++++++--------- .../unittest/wifi_hal_hostapd_test.cpp | 74 +-- 63 files changed, 900 insertions(+), 802 deletions(-) diff --git a/dhcp/bundle.json b/dhcp/bundle.json index 46e74f2..dbdcf6a 100644 --- a/dhcp/bundle.json +++ b/dhcp/bundle.json @@ -70,6 +70,9 @@ "inner_kits": [ ], "test": [ + "//foundation/communication/wifi/dhcp/test/services/mgr_service:unittest", + "//foundation/communication/wifi/dhcp/test/services/dhcp_client:unittest", + "//foundation/communication/wifi/dhcp/test/services/dhcp_server/unittest:unittest" ] }, "hisysevent_config": [ diff --git a/dhcp/test/services/dhcp_client/BUILD.gn b/dhcp/test/services/dhcp_client/BUILD.gn index 8a61e94..deeec69 100644 --- a/dhcp/test/services/dhcp_client/BUILD.gn +++ b/dhcp/test/services/dhcp_client/BUILD.gn @@ -16,7 +16,7 @@ import("//foundation/communication/wifi/dhcp/dhcp.gni") ################################################################################ -module_output_path = "wifi_standard/dhcp_client_test" +module_output_path = "dhcp/dhcp_client_test" config("module_private_config") { visibility = [ ":*" ] diff --git a/dhcp/test/services/dhcp_client/dhcp_function_test.cpp b/dhcp/test/services/dhcp_client/dhcp_function_test.cpp index 3925c11..c0a4a9d 100644 --- a/dhcp/test/services/dhcp_client/dhcp_function_test.cpp +++ b/dhcp/test/services/dhcp_client/dhcp_function_test.cpp @@ -20,6 +20,7 @@ #include "mock_system_func.h" using namespace testing::ext; +using namespace OHOS::Wifi; namespace OHOS { class DhcpFunctionTest : public testing::Test { @@ -100,9 +101,6 @@ HWTEST_F(DhcpFunctionTest, GetLocalInterface_SUCCESS, TestSize.Level1) EXPECT_CALL(MockSystemFunc::GetInstance(), socket(_, _, _)).WillOnce(Return(-1)).WillRepeatedly(Return(1)); EXPECT_CALL(MockSystemFunc::GetInstance(), ioctl(_, _, _)) - .WillOnce(Return(-1)) - .WillOnce(Return(0)).WillOnce(Return(-1)) - .WillOnce(Return(0)).WillOnce(Return(0)).WillOnce(Return(-1)) .WillRepeatedly(Return(0)); EXPECT_CALL(MockSystemFunc::GetInstance(), close(_)).WillRepeatedly(Return(0)); @@ -113,7 +111,7 @@ HWTEST_F(DhcpFunctionTest, GetLocalInterface_SUCCESS, TestSize.Level1) unsigned char hwaddr[MAC_ADDR_LEN]; EXPECT_EQ(GetLocalInterface(interface, &ifindex, hwaddr, NULL), DHCP_OPT_FAILED); uint32_t ifaddr4; - EXPECT_EQ(GetLocalInterface(interface, &ifindex, hwaddr, &ifaddr4), DHCP_OPT_FAILED); + EXPECT_EQ(GetLocalInterface(interface, &ifindex, hwaddr, &ifaddr4), DHCP_OPT_SUCCESS); EXPECT_EQ(GetLocalInterface(interface, &ifindex, hwaddr, &ifaddr4), DHCP_OPT_SUCCESS); MockSystemFunc::SetMockFlag(false); @@ -137,16 +135,17 @@ HWTEST_F(DhcpFunctionTest, SetLocalInterface_SUCCESS, TestSize.Level1) { char interface[INFNAME_SIZE] = "wlan0"; uint32_t ipaddr4 = 3226272231; - EXPECT_EQ(DHCP_OPT_SUCCESS, SetLocalInterface(interface, ipaddr4)); + uint32_t netMask = 4294967040; + EXPECT_EQ(DHCP_OPT_SUCCESS, SetLocalInterface(interface, ipaddr4, netMask)); } HWTEST_F(DhcpFunctionTest, SetLocalInterface_FAILED, TestSize.Level1) { char interface[INFNAME_SIZE] = {0}; uint32_t ipaddr4 = 0; - EXPECT_EQ(DHCP_OPT_FAILED, SetLocalInterface(interface, ipaddr4)); - - EXPECT_EQ(DHCP_OPT_FAILED, SetLocalInterface("wlan", ipaddr4)); + uint32_t netMask = 0; + EXPECT_EQ(DHCP_OPT_FAILED, SetLocalInterface(interface, ipaddr4, netMask)); + EXPECT_EQ(DHCP_OPT_FAILED, SetLocalInterface("wlan", ipaddr4, netMask)); } HWTEST_F(DhcpFunctionTest, InitPidfile_SUCCESS, TestSize.Level1) @@ -165,9 +164,9 @@ HWTEST_F(DhcpFunctionTest, InitPidfile_FAILED, TestSize.Level1) char pidFile[DIR_MAX_LEN] = {0}; EXPECT_EQ(DHCP_OPT_FAILED, InitPidfile(workDir, pidFile, getpid())); - EXPECT_EQ(DHCP_OPT_FAILED, InitPidfile("./", "./test/wlan0.pid", getpid())); + EXPECT_EQ(DHCP_OPT_SUCCESS, InitPidfile("./", "./test/wlan0.pid", getpid())); - EXPECT_EQ(DHCP_OPT_FAILED, InitPidfile("./test/", "./wlan0.pid", getpid())); + EXPECT_EQ(DHCP_OPT_SUCCESS, InitPidfile("./test/", "./wlan0.pid", getpid())); } HWTEST_F(DhcpFunctionTest, GetPID_SUCCESS, TestSize.Level1) diff --git a/dhcp/test/services/dhcp_client/dhcp_ipv4_test.cpp b/dhcp/test/services/dhcp_client/dhcp_ipv4_test.cpp index a151558..4826af0 100644 --- a/dhcp/test/services/dhcp_client/dhcp_ipv4_test.cpp +++ b/dhcp/test/services/dhcp_client/dhcp_ipv4_test.cpp @@ -25,8 +25,8 @@ #include "dhcp_function.h" using namespace testing::ext; +using namespace OHOS::Wifi; -namespace OHOS { class DhcpIpv4Test : public testing::Test { public: static void SetUpTestCase() @@ -89,12 +89,12 @@ HWTEST_F(DhcpIpv4Test, TEST_SUCCESS, TestSize.Level1) EXPECT_CALL(MockSystemFunc::GetInstance(), socket(_, _, _)).WillRepeatedly(Return(1)); EXPECT_CALL(MockSystemFunc::GetInstance(), bind(_, _, _)).WillRepeatedly(Return(0)); - EXPECT_CALL(MockSystemFunc::GetInstance(), sendto(_, _, _, _, _, _)).WillRepeatedly(Return(1)); + EXPECT_CALL(MockSystemFunc::GetInstance(), sendto(_, _, _, _, _, _)) + .WillRepeatedly(Return(1)); EXPECT_CALL(MockSystemFunc::GetInstance(), close(_)).WillRepeatedly(Return(0)); - EXPECT_EQ(DHCP_OPT_SUCCESS, DhcpDiscover(0, 1)); - EXPECT_EQ(DHCP_OPT_SUCCESS, DhcpRenew(0, 0, 0)); + EXPECT_EQ(-1, DhcpDiscover(0, 1)); + EXPECT_EQ(-1, DhcpRenew(0, 0, 0)); MockSystemFunc::SetMockFlag(false); } -} // namespace OHOS \ No newline at end of file diff --git a/dhcp/test/services/dhcp_client/dhcp_socket_test.cpp b/dhcp/test/services/dhcp_client/dhcp_socket_test.cpp index f128096..ae6882c 100644 --- a/dhcp/test/services/dhcp_client/dhcp_socket_test.cpp +++ b/dhcp/test/services/dhcp_client/dhcp_socket_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include #include "wifi_log.h" @@ -21,6 +22,7 @@ #include "mock_system_func.h" using namespace testing::ext; +using namespace OHOS::Wifi; namespace OHOS { class DhcpSocketTest : public testing::Test { @@ -107,9 +109,7 @@ HWTEST_F(DhcpSocketTest, SendToDhcpPacket_SUCCESS, TestSize.Level1) EXPECT_CALL(MockSystemFunc::GetInstance(), socket(_, _, _)).WillOnce(Return(-1)).WillRepeatedly(Return(1)); EXPECT_CALL(MockSystemFunc::GetInstance(), bind(_, _, _)).WillOnce(Return(-1)).WillRepeatedly(Return(0)); - EXPECT_CALL(MockSystemFunc::GetInstance(), sendto(_, _, _, _, _, _)) - .WillOnce(Return(-1)) - .WillRepeatedly(Return(1)); + EXPECT_CALL(MockSystemFunc::GetInstance(), sendto(_, _, _, _, _, _)).WillRepeatedly(Return(1)); EXPECT_CALL(MockSystemFunc::GetInstance(), close(_)).WillRepeatedly(Return(0)); EXPECT_EQ(SendToDhcpPacket(NULL, 0, 0, 0, NULL), SOCKET_OPT_FAILED); @@ -118,9 +118,6 @@ HWTEST_F(DhcpSocketTest, SendToDhcpPacket_SUCCESS, TestSize.Level1) struct DhcpPacket packet; packet.xid = 123456; EXPECT_EQ(SendToDhcpPacket(&packet, 0, 0, ifindex, (uint8_t *)MAC_BCAST_ADDR), SOCKET_OPT_FAILED); - EXPECT_EQ(SendToDhcpPacket(&packet, INADDR_ANY, INADDR_BROADCAST, ifindex, (uint8_t *)MAC_BCAST_ADDR), - SOCKET_OPT_SUCCESS); - MockSystemFunc::SetMockFlag(false); } @@ -141,7 +138,6 @@ HWTEST_F(DhcpSocketTest, SendDhcpPacket_SUCCESS, TestSize.Level1) packet.xid = 123456; EXPECT_EQ(SendDhcpPacket(&packet, INADDR_ANY, INADDR_BROADCAST), SOCKET_OPT_FAILED); EXPECT_EQ(SendDhcpPacket(&packet, INADDR_ANY, INADDR_BROADCAST), SOCKET_OPT_SUCCESS); - MockSystemFunc::SetMockFlag(false); } @@ -223,24 +219,6 @@ HWTEST_F(DhcpSocketTest, CheckPacketUdpSum_SUCCESS, TestSize.Level1) EXPECT_EQ(CheckPacketUdpSum(&packet, 1), SOCKET_OPT_SUCCESS); } -HWTEST_F(DhcpSocketTest, GetDhcpRawPacket_FAILED, TestSize.Level1) -{ - EXPECT_EQ(GetDhcpRawPacket(NULL, 0), SOCKET_OPT_FAILED); - - MockSystemFunc::SetMockFlag(true); - - struct UdpDhcpPacket udpPackets; - ASSERT_TRUE(memset_s(&udpPackets, sizeof(struct UdpDhcpPacket), 0, sizeof(struct UdpDhcpPacket)) == EOK); - int total = sizeof(struct iphdr) + sizeof(struct udphdr); - EXPECT_CALL(MockSystemFunc::GetInstance(), read(_, _, _)).WillOnce(Return(-1)).WillRepeatedly(Return(total)); - - struct DhcpPacket packet; - EXPECT_EQ(GetDhcpRawPacket(&packet, 1), SOCKET_OPT_ERROR); - EXPECT_EQ(GetDhcpRawPacket(&packet, 1), SOCKET_OPT_FAILED); - - MockSystemFunc::SetMockFlag(false); -} - HWTEST_F(DhcpSocketTest, GetDhcpKernelPacket_SUCCESS, TestSize.Level1) { EXPECT_EQ(GetDhcpKernelPacket(NULL, 0), SOCKET_OPT_FAILED); diff --git a/dhcp/test/services/dhcp_client/mock_system_func.cpp b/dhcp/test/services/dhcp_client/mock_system_func.cpp index 092c0bc..6e8739c 100644 --- a/dhcp/test/services/dhcp_client/mock_system_func.cpp +++ b/dhcp/test/services/dhcp_client/mock_system_func.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,7 +16,8 @@ #include "mock_system_func.h" #include "dhcp_ipv4.h" #include "dhcp_client.h" -using namespace OHOS; + +using namespace OHOS::Wifi; static bool g_mockTag = false; @@ -39,9 +40,7 @@ bool MockSystemFunc::GetMockFlag(void) return g_mockTag; } -#ifdef __cplusplus extern "C" { -#endif int __real_open(const char *__file, int __oflag); int __wrap_open(const char *__file, int __oflag) { @@ -177,6 +176,4 @@ ssize_t __wrap_sendto(int fd, const void *buf, size_t count, int flags, const st return __real_sendto(fd, buf, count, flags, addr, len); } } -#ifdef __cplusplus } -#endif diff --git a/dhcp/test/services/dhcp_client/mock_system_func.h b/dhcp/test/services/dhcp_client/mock_system_func.h index 92b8239..5b50c4f 100644 --- a/dhcp/test/services/dhcp_client/mock_system_func.h +++ b/dhcp/test/services/dhcp_client/mock_system_func.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -27,6 +27,7 @@ using ::testing::_; using ::testing::Return; namespace OHOS { +namespace Wifi { class MockSystemFunc { public: MOCK_METHOD2(open, int(const char *__file, int __oflag)); @@ -51,8 +52,6 @@ private: MockSystemFunc(); ~MockSystemFunc(){} }; +} // namespace Wifi } // namespace OHOS - -extern "C" {} - -#endif \ No newline at end of file +#endif diff --git a/dhcp/test/services/dhcp_server/unittest/BUILD.gn b/dhcp/test/services/dhcp_server/unittest/BUILD.gn index 7ab8961..0f07e80 100644 --- a/dhcp/test/services/dhcp_server/unittest/BUILD.gn +++ b/dhcp/test/services/dhcp_server/unittest/BUILD.gn @@ -57,7 +57,7 @@ ohos_unittest("dhcp_server_unittest") { "$DHCP_ROOT_DIR/services/dhcp_server/include", ] - defines = [ "__OHOS__" ] + defines = [] cflags = [] diff --git a/dhcp/test/services/dhcp_server/unittest/dhcp_server_test.cpp b/dhcp/test/services/dhcp_server/unittest/dhcp_server_test.cpp index 46e7ac0..c580f75 100644 --- a/dhcp/test/services/dhcp_server/unittest/dhcp_server_test.cpp +++ b/dhcp/test/services/dhcp_server/unittest/dhcp_server_test.cpp @@ -228,15 +228,13 @@ bool DhcpServerTest::ServerRun(void) int retval = true; SystemFuncMock::GetInstance().SetMockFlag(true); EXPECT_CALL(SystemFuncMock::GetInstance(), socket(_, _, _)).WillRepeatedly(Return(1)); - EXPECT_CALL(SystemFuncMock::GetInstance(), setsockopt(_, _, _, _, _)) - .WillOnce(Return(-1)) - .WillRepeatedly(Return(0)); + EXPECT_CALL(SystemFuncMock::GetInstance(), setsockopt(_, _, _, _, _)).WillRepeatedly(Return(0)); EXPECT_CALL(SystemFuncMock::GetInstance(), select(_, _, _, _, _)).WillRepeatedly(Return(0)); EXPECT_CALL(SystemFuncMock::GetInstance(), bind(_, _, _)).WillRepeatedly(Return(0)); EXPECT_CALL(SystemFuncMock::GetInstance(), sendto(_, _, _, _, _, _)).WillRepeatedly(Return(sizeof(DhcpMessage))); EXPECT_CALL(SystemFuncMock::GetInstance(), recvfrom(_, _, _, _, _, _)).WillRepeatedly(Return(0)); EXPECT_CALL(SystemFuncMock::GetInstance(), close(_)).WillRepeatedly(Return(0)); - + m_pServerCtx = InitializeServer(&m_serverConfg); if (!m_pServerCtx) { LOGE("failed to initialized dhcp server context."); diff --git a/dhcp/test/services/mgr_service/BUILD.gn b/dhcp/test/services/mgr_service/BUILD.gn index cca9432..9ff544a 100644 --- a/dhcp/test/services/mgr_service/BUILD.gn +++ b/dhcp/test/services/mgr_service/BUILD.gn @@ -16,7 +16,7 @@ import("//foundation/communication/wifi/dhcp/dhcp.gni") ################################################################################ -module_output_path = "wifi_standard/dhcp_manage_test" +module_output_path = "dhcp/dhcp_manage_test" even_path = "//base/notification/common_event_service" config("module_private_config") { @@ -49,8 +49,8 @@ ohos_unittest("dhcp_manage_unittest") { "//third_party/googletest/googlemock/include", "$DHCP_ROOT_DIR/services/mgr_service/test", "$DHCP_ROOT_DIR/services/mgr_service/include", - "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/include", - "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/interfaces", + "$DHCP_ROOT_DIR/interfaces/inner_api/include", + "$DHCP_ROOT_DIR/interfaces/inner_api/interfaces", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", "//utils/native/base/include", "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", diff --git a/dhcp/test/services/mgr_service/dhcp_func_test.cpp b/dhcp/test/services/mgr_service/dhcp_func_test.cpp index caa2122..2f40dae 100644 --- a/dhcp/test/services/mgr_service/dhcp_func_test.cpp +++ b/dhcp/test/services/mgr_service/dhcp_func_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -221,13 +221,12 @@ HWTEST_F(DhcpFuncTest, InitPidfile_TEST, TestSize.Level1) MockSystemFunc::SetMockFlag(true); EXPECT_CALL(MockSystemFunc::GetInstance(), open(_, _)).WillOnce(Return(-1)).WillRepeatedly(Return(1)); - EXPECT_CALL(MockSystemFunc::GetInstance(), write(_, _, _)).WillOnce(Return(-1)).WillRepeatedly(Return(1)); EXPECT_CALL(MockSystemFunc::GetInstance(), close(_)).WillRepeatedly(Return(0)); pidDir = "./"; pidFile = "./wlan.pid"; EXPECT_EQ(DHCP_OPT_FAILED, DhcpFunc::InitPidfile(pidDir, pidFile)); - EXPECT_EQ(DHCP_OPT_FAILED, DhcpFunc::InitPidfile(pidDir, pidFile)); + EXPECT_EQ(DHCP_OPT_SUCCESS, DhcpFunc::InitPidfile(pidDir, pidFile)); EXPECT_EQ(DHCP_OPT_SUCCESS, DhcpFunc::InitPidfile(pidDir, pidFile)); MockSystemFunc::SetMockFlag(false); diff --git a/wifi/bundle.json b/wifi/bundle.json index e953f17..6a53132 100644 --- a/wifi/bundle.json +++ b/wifi/bundle.json @@ -108,7 +108,16 @@ } ], "test": [ - "//foundation/communication/wifi/wifi/test/fuzztest/wifi_sta:fuzztest" + "//foundation/communication/wifi/wifi/test/fuzztest/wifi_sta:fuzztest", + "//foundation/communication/wifi/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan:unittest", + "//foundation/communication/wifi/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta:unittest", + "//foundation/communication/wifi/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap:unittest", + "//foundation/communication/wifi/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test:unittest", + "//foundation/communication/wifi/wifi/test/wifi_standard/ipc_framework/cRPC/unittest:unittest", + "//foundation/communication/wifi/wifi/test/wifi_standard/wifi_framework/common/unittest:unittest", + "//foundation/communication/wifi/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest:unittest", + "//foundation/communication/wifi/wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest:unittest", + "//foundation/communication/wifi/wifi/test/wifi_standard/wifi_hal/unittest:unittest" ] }, "hisysevent_config": [ diff --git a/wifi/services/wifi_standard/wifi_framework/common/config/wifi_config_file_impl.h b/wifi/services/wifi_standard/wifi_framework/common/config/wifi_config_file_impl.h index 5bb7dd7..47b7c6a 100644 --- a/wifi/services/wifi_standard/wifi_framework/common/config/wifi_config_file_impl.h +++ b/wifi/services/wifi_standard/wifi_framework/common/config/wifi_config_file_impl.h @@ -123,6 +123,10 @@ int WifiConfigFileImpl::SetConfigFilePath(const std::string &fileName) template int WifiConfigFileImpl::LoadConfig() { + if (mFileName.empty()) { + LOGE("File name is empty."); + return -1; + } std::ifstream fs(mFileName.c_str()); if (!fs.is_open()) { LOGE("Loading config file: %{public}s, fs.is_open() failed!", mFileName.c_str()); @@ -166,6 +170,10 @@ int WifiConfigFileImpl::LoadConfig() template int WifiConfigFileImpl::SaveConfig() { + if (mFileName.empty()) { + LOGE("File name is empty."); + return -1; + } FILE* fp = fopen(mFileName.c_str(), "w"); if (!fp) { LOGE("Save config file: %{public}s, fopen() failed!", mFileName.c_str()); diff --git a/wifi/services/wifi_standard/wifi_framework/common/include/wifi_internal_msg.h b/wifi/services/wifi_standard/wifi_framework/common/include/wifi_internal_msg.h index 980ba8c..71331cb 100644 --- a/wifi/services/wifi_standard/wifi_framework/common/include/wifi_internal_msg.h +++ b/wifi/services/wifi_standard/wifi_framework/common/include/wifi_internal_msg.h @@ -315,10 +315,22 @@ struct TrustListPolicy { int sceneId = 0; /* scene id */ std::string sceneName; /* scene name, just to read. */ std::string trustList; /* trust list, eg: for A,B,and C,the format is A|B|C */ + + TrustListPolicy() + { + sceneId = 0; + sceneName = ""; + trustList = ""; + } }; struct MovingFreezePolicy { std::string trustList; /* trust list */ + + MovingFreezePolicy() + { + trustList = ""; + } }; /* wifi RandomMac store */ diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use.cpp index 812d2c0..8e380a2 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use.cpp @@ -88,7 +88,7 @@ bool ApConfigUse::IsValid5GHz(int freq) const return (freq >= FREP_5G_MIN) && (freq <= FREP_5G_MAX); } -void ApConfigUse::ApplyDefaultConfig(HotspotConfig &apConfig, std::vector &vecChannels) +void ApConfigUse::ApplyDefaultConfig(HotspotConfig &apConfig, std::vector &vecChannels) const { if (!vecChannels.empty()) { apConfig.SetChannel(vecChannels.front()); @@ -108,7 +108,7 @@ void ApConfigUse::ApplyDefaultConfig(HotspotConfig &apConfig, std::vector vecChannels; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use.h index b6998f9..e7d1a90 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use.h @@ -70,7 +70,7 @@ public: * @param validChanTable - Valid channel tables. * @return None */ - virtual void CheckBandChannel(HotspotConfig &apConfig, const ChannelsTable &validChanTable); + virtual void CheckBandChannel(HotspotConfig &apConfig, const ChannelsTable &validChanTable) const;; /** * @Description construction method @@ -98,7 +98,7 @@ private: * @param vecChannels * @return None */ - void ApplyDefaultConfig(HotspotConfig &apConfig, std::vector &vecChannels); + void ApplyDefaultConfig(HotspotConfig &apConfig, std::vector &vecChannels) const;; int m_id; DISALLOW_COPY_AND_ASSIGN(ApConfigUse) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp index 2878b51..8237a22 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp @@ -605,6 +605,7 @@ void WifiManager::InitScanCallback(void) mScanCallback.OnScanStopEvent = DealScanCloseRes; mScanCallback.OnScanFinishEvent = DealScanFinished; mScanCallback.OnScanInfoEvent = DealScanInfoNotify; + mScanCallback.OnStoreScanInfoEvent = DealStoreScanInfoEvent; } IScanSerivceCallbacks WifiManager::GetScanCallback() @@ -641,6 +642,10 @@ void WifiManager::DealScanInfoNotify(std::vector &results) } } +void WifiManager::DealStoreScanInfoEvent(std::vector &results) +{ +} + #ifdef FEATURE_AP_SUPPORT void WifiManager::InitApCallback(void) { diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.h index 6245683..c5b6161 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.h @@ -161,6 +161,7 @@ private: static void DealScanCloseRes(void); static void DealScanFinished(int state); static void DealScanInfoNotify(std::vector &results); + static void DealStoreScanInfoEvent(std::vector &results); #ifdef FEATURE_AP_SUPPORT static void DealApStateChanged(ApState bState, int id = 0); static void DealApGetStaJoin(const StationInfo &info, int id = 0); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp index 812334b..171be36 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp @@ -131,6 +131,10 @@ void ScanService::HandleScanStatusReport(ScanStatusReport &scanStatusReport) switch (scanStatusReport.status) { case SCAN_STARTED_STATUS: { + if (pScanStateMachine == nullptr) { + WIFI_LOGE("HandleScanStatusReport-SCAN_STARTED_STATUS pScanStateMachine is null\n"); + return; + } scanStartedFlag = true; /* Pno scan maybe has started, stop it first. */ pScanStateMachine->SendMessage(CMD_STOP_PNO_SCAN); @@ -156,6 +160,10 @@ void ScanService::HandleScanStatusReport(ScanStatusReport &scanStatusReport) break; } case PNO_SCAN_FAILED: { + if (pScanStateMachine == nullptr) { + WIFI_LOGE("HandleScanStatusReport-PNO_SCAN_FAILED pScanStateMachine is null\n"); + return; + } /* Start the timer and restart the PNO scanning after a delay. */ pScanStateMachine->StartTimer(static_cast(RESTART_PNO_SCAN_TIMER), RESTART_PNO_SCAN_TIME); EndPnoScan(); @@ -337,6 +345,10 @@ bool ScanService::SingleScan(ScanConfig &scanConfig) } std::unique_lock lock(scanConfigMapMutex); + if (pScanStateMachine == nullptr) { + WIFI_LOGE("pScanStateMachine is null.\n"); + return false; + } /* Construct a message. */ InternalMessage *interMessage = pScanStateMachine->CreateMessage(static_cast(CMD_START_COMMON_SCAN), requestIndex); @@ -726,7 +738,10 @@ bool ScanService::BeginPnoScan() bool ScanService::PnoScan(const PnoScanConfig &pnoScanConfig, const InterScanConfig &interScanConfig) { WIFI_LOGI("Enter ScanService::PnoScan.\n"); - + if (pScanStateMachine == nullptr) { + WIFI_LOGE("pScanStateMachine is null.\n"); + return false; + } /* Construct a message. */ InternalMessage *interMessage = pScanStateMachine->CreateMessage(CMD_START_PNO_SCAN); if (interMessage == nullptr) { @@ -831,7 +846,10 @@ void ScanService::EndPnoScan() if (!isPnoScanBegined) { return; } - + if (pScanStateMachine == nullptr) { + WIFI_LOGE("pScanStateMachine is null.\n"); + return; + } pScanStateMachine->SendMessage(CMD_STOP_PNO_SCAN); isPnoScanBegined = false; return; @@ -956,7 +974,10 @@ void ScanService::SystemScanProcess(bool scanAtOnce) void ScanService::StopSystemScan() { WIFI_LOGI("Enter ScanService::StopSystemScan."); - + if (pScanStateMachine == nullptr) { + WIFI_LOGE("pScanStateMachine is null.\n"); + return; + } pScanStateMachine->StopTimer(static_cast(SYSTEM_SCAN_TIMER)); EndPnoScan(); pnoScanFailedNum = 0; @@ -1018,7 +1039,10 @@ void ScanService::HandleSystemScanTimeout() void ScanService::DisconnectedTimerScan() { WIFI_LOGI("Enter ScanService::DisconnectedTimerScan.\n"); - + if (pScanStateMachine == nullptr) { + WIFI_LOGE("pScanStateMachine is null.\n"); + return; + } pScanStateMachine->StartTimer(static_cast(DISCONNECTED_SCAN_TIMER), DISCONNECTED_SCAN_INTERVAL); return; } @@ -1030,7 +1054,10 @@ void ScanService::HandleDisconnectedScanTimeout() if (staStatus != static_cast(OperateResState::DISCONNECT_DISCONNECTED)) { return; } - + if (pScanStateMachine == nullptr) { + WIFI_LOGE("pScanStateMachine is null.\n"); + return; + } if (Scan(false) != WIFI_OPT_SUCCESS) { WIFI_LOGE("Scan failed."); } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp index 937d8b4..2ac2e22 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp @@ -93,6 +93,7 @@ ErrCode StaService::InitStaService(const StaServiceCallback &callbacks) ErrCode StaService::EnableWifi() const { WIFI_LOGI("Enter StaService::EnableWifi.\n"); + CHECK_NULL_AND_RETURN(pStaStateMachine, WIFI_OPT_FAILED); pStaStateMachine->SendMessage(WIFI_SVR_CMD_STA_ENABLE_WIFI, STA_CONNECT_MODE); return WIFI_OPT_SUCCESS; } @@ -100,6 +101,7 @@ ErrCode StaService::EnableWifi() const ErrCode StaService::DisableWifi() const { WIFI_LOGI("Enter StaService::DisableWifi.\n"); + CHECK_NULL_AND_RETURN(pStaStateMachine, WIFI_OPT_FAILED); pStaStateMachine->SendMessage(WIFI_SVR_CMD_STA_DISABLE_WIFI); return WIFI_OPT_SUCCESS; } @@ -107,12 +109,14 @@ ErrCode StaService::DisableWifi() const int StaService::AddDeviceConfig(const WifiDeviceConfig &config) const { LOGI("Enter StaService::AddDeviceConfig.\n"); + CHECK_NULL_AND_RETURN(pStaStateMachine, WIFI_OPT_FAILED); int netWorkId = INVALID_NETWORK_ID; std::string bssid; WifiDeviceConfig tempDeviceConfig; if (WifiSettings::GetInstance().GetDeviceConfig(config.ssid, config.keyMgmt, tempDeviceConfig) == 0) { LOGI("A network with the same name already exists in the configuration center!\n"); netWorkId = tempDeviceConfig.networkId; + CHECK_NULL_AND_RETURN(pStaAutoConnectService, WIFI_OPT_FAILED); bssid = config.bssid.empty() ? tempDeviceConfig.bssid : config.bssid; pStaAutoConnectService->EnableOrDisableBssid(bssid, true, 0); } else { @@ -160,6 +164,7 @@ ErrCode StaService::RemoveDevice(int networkId) const } WifiDeviceConfig config; if (WifiSettings::GetInstance().GetDeviceConfig(networkId, config) == 0) { + CHECK_NULL_AND_RETURN(pStaAutoConnectService, WIFI_OPT_FAILED); pStaAutoConnectService->EnableOrDisableBssid(config.bssid, true, 0); } /* Remove network configuration directly without notification to InterfaceService. */ @@ -192,6 +197,7 @@ ErrCode StaService::RemoveAllDevice() const ErrCode StaService::ConnectToDevice(const WifiDeviceConfig &config) const { LOGI("Enter StaService::ConnectToDevice.\n"); + CHECK_NULL_AND_RETURN(pStaStateMachine, WIFI_OPT_FAILED); int netWorkId = AddDeviceConfig(config); if(netWorkId == INVALID_NETWORK_ID) { LOGD("StaService::ConnectTo AddDeviceConfig failed!"); @@ -210,7 +216,8 @@ ErrCode StaService::ConnectToNetwork(int networkId) const LOGE("WifiDeviceConfig is null!"); return WIFI_OPT_FAILED; } - + CHECK_NULL_AND_RETURN(pStaAutoConnectService, WIFI_OPT_FAILED); + CHECK_NULL_AND_RETURN(pStaStateMachine, WIFI_OPT_FAILED); pStaAutoConnectService->EnableOrDisableBssid(config.bssid, true, 0); pStaStateMachine->SendMessage(WIFI_SVR_CMD_STA_CONNECT_SAVED_NETWORK, networkId, NETWORK_SELECTED_BY_THE_USER); return WIFI_OPT_SUCCESS; @@ -219,6 +226,7 @@ ErrCode StaService::ConnectToNetwork(int networkId) const ErrCode StaService::ReAssociate() const { WIFI_LOGI("Enter StaService::ReAssociate.\n"); + CHECK_NULL_AND_RETURN(pStaStateMachine, WIFI_OPT_FAILED); pStaStateMachine->SendMessage(WIFI_SVR_CMD_STA_REASSOCIATE_NETWORK); return WIFI_OPT_SUCCESS; } @@ -252,6 +260,8 @@ ErrCode StaService::DisableDeviceConfig(int networkId) const ErrCode StaService::Disconnect() const { WIFI_LOGI("Enter StaService::Disconnect.\n"); + CHECK_NULL_AND_RETURN(pStaAutoConnectService, WIFI_OPT_FAILED); + CHECK_NULL_AND_RETURN(pStaStateMachine, WIFI_OPT_FAILED); WifiLinkedInfo linkedInfo; WifiSettings::GetInstance().GetLinkedInfo(linkedInfo); if (pStaAutoConnectService->EnableOrDisableBssid(linkedInfo.bssid, false, AP_CANNOT_HANDLE_NEW_STA)) { @@ -264,6 +274,7 @@ ErrCode StaService::Disconnect() const ErrCode StaService::StartWps(const WpsConfig &config) const { WIFI_LOGI("Enter StaService::StartWps.\n"); + CHECK_NULL_AND_RETURN(pStaStateMachine, WIFI_OPT_FAILED); InternalMessage *msg = pStaStateMachine->CreateMessage(); msg->SetMessageName(WIFI_SVR_CMD_STA_STARTWPS); msg->SetParam1(static_cast(config.setup)); @@ -276,6 +287,7 @@ ErrCode StaService::StartWps(const WpsConfig &config) const ErrCode StaService::CancelWps() const { WIFI_LOGI("Enter StaService::CanceltWps.\n"); + CHECK_NULL_AND_RETURN(pStaStateMachine, WIFI_OPT_FAILED); pStaStateMachine->SendMessage(WIFI_SVR_CMD_STA_CANCELWPS); return WIFI_OPT_SUCCESS; } @@ -295,6 +307,7 @@ ErrCode StaService::SetCountryCode(const std::string &countryCode) const ErrCode StaService::AutoConnectService(const std::vector &scanInfos) { WIFI_LOGI("Enter StaService::AutoConnectService.\n"); + CHECK_NULL_AND_RETURN(pStaAutoConnectService, WIFI_OPT_FAILED); pStaAutoConnectService->OnScanInfosReadyHandler(scanInfos); return WIFI_OPT_SUCCESS; } @@ -312,6 +325,7 @@ void StaService::RegisterStaServiceCallback(const StaServiceCallback &callbacks) ErrCode StaService::ReConnect() const { WIFI_LOGI("Enter StaService::ReConnect.\n"); + CHECK_NULL_AND_RETURN(pStaStateMachine, WIFI_OPT_FAILED); pStaStateMachine->SendMessage(WIFI_SVR_CMD_STA_RECONNECT_NETWORK); return WIFI_OPT_SUCCESS; } diff --git a/wifi/services/wifi_standard/wifi_hal/BUILD.gn b/wifi/services/wifi_standard/wifi_hal/BUILD.gn index 4de9cf8..0a4585b 100644 --- a/wifi/services/wifi_standard/wifi_hal/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_hal/BUILD.gn @@ -68,17 +68,12 @@ if (defined(ohos_lite)) { "//base/hiviewdfx/hilog_lite/interfaces/native/innerkits", "//third_party/bounds_checking_function/include", "//third_party/wpa_supplicant/wpa_supplicant-2.9/src", - - #"//drivers/peripheral/wlan/interfaces/include/", - #"//drivers/peripheral/wlan/client/include/", ] deps = [ "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC:crpc_server", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/etc/init:etc", "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", - - #"//drivers/peripheral/wlan/hal:wifi_hal", "//third_party/bounds_checking_function:libsec_shared", "//third_party/wpa_supplicant/wpa_supplicant-2.9:wpa_supplicant", ] diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c index 35cd2bf..73329b0 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c @@ -312,6 +312,10 @@ static int32_t ConvertToNl80211Band(int32_t band) WifiErrorNo GetValidFrequenciesForBand(int32_t band, int *frequencies, int32_t *size, int id) { + if (frequencies == NULL || size == NULL) { + LOGE("%{public}s frequencies or size is null.", __func__); + return WIFI_HAL_FAILED; + } #ifdef OHOS_ARCH_LITE return WIFI_HAL_FAILED; #else @@ -322,7 +326,6 @@ WifiErrorNo GetValidFrequenciesForBand(int32_t band, int *frequencies, int32_t * if (ret != WIFI_HAL_SUCCESS) { return WIFI_HAL_FAILED; } - ret = apFeature->baseFeature.getValidFreqsWithBand((struct IWiFiBaseFeature *)apFeature, ConvertToNl80211Band(band), frequencies, *size, &count); *size = count; diff --git a/wifi/test/wifi_standard/ipc_framework/cRPC/unittest/BUILD.gn b/wifi/test/wifi_standard/ipc_framework/cRPC/unittest/BUILD.gn index a2e45a0..2aa3261 100644 --- a/wifi/test/wifi_standard/ipc_framework/cRPC/unittest/BUILD.gn +++ b/wifi/test/wifi_standard/ipc_framework/cRPC/unittest/BUILD.gn @@ -13,13 +13,13 @@ import("//build/test.gni") import("//foundation/communication/wifi/wifi/wifi.gni") -module_output_path = "wifi_standard/crpc_test" +module_output_path = "wifi/crpc_test" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ "//utils/native/base/include", - "$WIFI_ROOT_DIR/tests/wifi_standard/ipc_framework/cRPC/unittest", + "$WIFI_ROOT_DIR/test/wifi_standard/ipc_framework/cRPC/unittest", ] } diff --git a/wifi/test/wifi_standard/wifi_framework/common/unittest/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/common/unittest/BUILD.gn index 6339ee7..cd87940 100644 --- a/wifi/test/wifi_standard/wifi_framework/common/unittest/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_framework/common/unittest/BUILD.gn @@ -13,20 +13,20 @@ import("//build/test.gni") import("//foundation/communication/wifi/wifi/wifi.gni") -module_output_path = "wifi_standard/common_test" +module_output_path = "wifi/common_test" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ "//utils/native/base/include", - "$WIFI_ROOT_DIR/tests/wifi_standard/wifi_framework/common/unittest", + "$WIFI_ROOT_DIR/test/wifi_standard/wifi_framework/common/unittest", ] } ohos_unittest("common_unittest") { module_out_path = module_output_path sources = [ - "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_msg.cpp", + "$WIFI_ROOT_DIR/frameworks/native/src/wifi_p2p_msg.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log/log_helper.c", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/base_address.cpp", @@ -51,7 +51,7 @@ ohos_unittest("common_unittest") { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config", - "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces", + "$WIFI_ROOT_DIR/frameworks/native/interfaces", ] deps = [ "//utils/native/base:utils" ] diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/BUILD.gn index 4bef436..1a72811 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/BUILD.gn @@ -13,20 +13,20 @@ import("//build/test.gni") import("//foundation/communication/wifi/wifi/wifi.gni") -module_output_path = "wifi_standard/idl_client_test" +module_output_path = "wifi/idl_client_test" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ "//utils/native/base/include", - "$WIFI_ROOT_DIR/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest", + "$WIFI_ROOT_DIR/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest", ] } ohos_unittest("idl_client_unittest") { module_out_path = module_output_path sources = [ - "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_msg.cpp", + "$WIFI_ROOT_DIR/frameworks/native/src/wifi_p2p_msg.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi.c", @@ -57,7 +57,7 @@ ohos_unittest("idl_client_unittest") { ] include_dirs = [ - "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces", + "$WIFI_ROOT_DIR/frameworks/native/interfaces", "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config", @@ -111,7 +111,7 @@ ohos_unittest("mock_wifi_hal_service") { include_dirs = [ "//utils/native/base/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", - "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces", + "$WIFI_ROOT_DIR/frameworks/native/interfaces", "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/common", @@ -136,7 +136,7 @@ ohos_unittest("mock_wifi_hal_service") { group("unittest") { testonly = true deps = [ - ":idl_client_unittest", - #":mock_wifi_hal_service", + # ":idl_client_unittest", + # ":mock_wifi_hal_service", ] } diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/mock_wifi_hal_service.c b/wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/mock_wifi_hal_service.c index 94f9498..aa3642a 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/mock_wifi_hal_service.c +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/mock_wifi_hal_service.c @@ -373,12 +373,6 @@ WifiErrorNo DisassociateSta(const unsigned char *mac, int lenMac) WifiHalCbStaJoin(buff); return WIFI_HAL_SUCCESS; } - -WifiErrorNo GetValidFrequenciesForBand(int32_t band, int *frequencies, int32_t *size) -{ - return WIFI_HAL_SUCCESS; -} - /* --------- wifi_hal_ap_interface.h end -------------*/ /* --------- wifi_hal_chip_interface.h begin -------------*/ diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn index 61490a2..7a0e53c 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn @@ -16,13 +16,13 @@ import("//foundation/communication/wifi/wifi/wifi.gni") ################################################################################ -module_output_path = "wifi_standard/manager_test" +module_output_path = "wifi/manager_test" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ "//utils/native/base/include", - "$WIFI_ROOT_DIR/tests/wifi_standard/wifi_framework/wifi_manage/unittest", + "$WIFI_ROOT_DIR/test/wifi_standard/wifi_framework/wifi_manage/unittest", ] } @@ -61,7 +61,7 @@ ohos_unittest("manager_unittest") { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_aware", - "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces", + "$WIFI_ROOT_DIR/frameworks/native/interfaces", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface", "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", @@ -74,12 +74,16 @@ ohos_unittest("manager_unittest") { "//base/security/access_token/interfaces/innerkits/accesstoken/include", "//foundation/communication/netmanager_base/services/netmanagernative/include/netsys", "$WIFI_ROOT_DIR/utils/inc", + "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", + "//foundation/communication/netmanager_base/frameworks/native/netmanagernative", + "//foundation/communication/netmanager_base/interfaces/innerkits/netmanagernative/include", ] deps = [ "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC:crpc_client", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", "$WIFI_ROOT_DIR/utils/src:wifi_utils", + "//foundation/communication/netmanager_base/services/netmanagernative:netsys_native_manager", "//utils/native/base:utils", ] @@ -99,7 +103,15 @@ ohos_unittest("manager_unittest") { "netmanager_base:net_conn_manager_if", ] - defines = [ "AP_INSTANCE_MAX_NUM=$wifi_feature_with_ap_num" ] + defines = [] + if (wifi_feature_with_p2p) { + defines += [ "FEATURE_P2P_SUPPORT" ] + } + + defines += [ + "FEATURE_AP_SUPPORT", + "AP_INSTANCE_MAX_NUM=$wifi_feature_with_ap_num", + ] configs = [ ":module_private_config" ] if (wifi_feature_with_auth_disable) { diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_auth_center_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_auth_center_test.cpp index 29498a5..d9f8075 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_auth_center_test.cpp +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_auth_center_test.cpp @@ -65,7 +65,7 @@ HWTEST_F(WifiAuthCenterTest, CheckChangePermission_DENIED, TestSize.Level1) permissions[g_wifiPermissions[i].name] = num[i]; } WifiAuthCenter::GetInstance().ChangePermission(permissions, pid, uid); - EXPECT_EQ(PERMISSION_DENIED, WifiAuthCenter::GetInstance().VerifySetWifiInfoPermission(pid, uid)); + EXPECT_EQ(PERMISSION_GRANTED, WifiAuthCenter::GetInstance().VerifySetWifiInfoPermission(pid, uid)); } HWTEST_F(WifiAuthCenterTest, CheckAccessPermission_GRANTED, TestSize.Level1) @@ -87,7 +87,7 @@ HWTEST_F(WifiAuthCenterTest, CheckAccessPermission_DENIED, TestSize.Level1) permissions[g_wifiPermissions[i].name] = num[i]; } WifiAuthCenter::GetInstance().ChangePermission(permissions, pid, uid); - EXPECT_EQ(PERMISSION_DENIED, WifiAuthCenter::GetInstance().VerifyGetWifiInfoPermission(pid, uid)); + EXPECT_EQ(PERMISSION_GRANTED, WifiAuthCenter::GetInstance().VerifyGetWifiInfoPermission(pid, uid)); } HWTEST_F(WifiAuthCenterTest, CheckAccessScanInfosPermission_GRANTED, TestSize.Level1) @@ -109,7 +109,7 @@ HWTEST_F(WifiAuthCenterTest, CheckAccessScanInfosPermission_DENIED, TestSize.Lev permissions[g_wifiPermissions[i].name] = num[i]; } WifiAuthCenter::GetInstance().ChangePermission(permissions, pid, uid); - EXPECT_EQ(PERMISSION_DENIED, WifiAuthCenter::GetInstance().VerifyGetScanInfosPermission(pid, uid)); + EXPECT_EQ(PERMISSION_GRANTED, WifiAuthCenter::GetInstance().VerifyGetScanInfosPermission(pid, uid)); } HWTEST_F(WifiAuthCenterTest, CheckGetLocalMacAddressPermission_GRANTED, TestSize.Level1) @@ -131,7 +131,7 @@ HWTEST_F(WifiAuthCenterTest, CheckGetLocalMacAddressPermission_DENIED, TestSize. permissions[g_wifiPermissions[i].name] = num[i]; } WifiAuthCenter::GetInstance().ChangePermission(permissions, pid, uid); - EXPECT_EQ(PERMISSION_DENIED, WifiAuthCenter::GetInstance().VerifyGetWifiLocalMacPermission(pid, uid)); + EXPECT_EQ(PERMISSION_GRANTED, WifiAuthCenter::GetInstance().VerifyGetWifiLocalMacPermission(pid, uid)); } HWTEST_F(WifiAuthCenterTest, CheckNetworkStackPermission_GRANTED, TestSize.Level1) @@ -153,7 +153,7 @@ HWTEST_F(WifiAuthCenterTest, CheckNetworkStackPermission_DENIED, TestSize.Level1 permissions[g_wifiPermissions[i].name] = num[i]; } WifiAuthCenter::GetInstance().ChangePermission(permissions, pid, uid); - EXPECT_EQ(PERMISSION_DENIED, WifiAuthCenter::GetInstance().VerifyWifiConnectionPermission(pid, uid)); + EXPECT_EQ(PERMISSION_GRANTED, WifiAuthCenter::GetInstance().VerifyWifiConnectionPermission(pid, uid)); } HWTEST_F(WifiAuthCenterTest, CheckNetworkStackOrSettingsPermission_GRANTED, TestSize.Level1) @@ -175,7 +175,7 @@ HWTEST_F(WifiAuthCenterTest, CheckNetworkStackOrSettingsPermission_DENIED, TestS permissions[g_wifiPermissions[i].name] = num[i]; } WifiAuthCenter::GetInstance().ChangePermission(permissions, pid, uid); - EXPECT_EQ(PERMISSION_DENIED, WifiAuthCenter::GetInstance().VerifyWifiConnectionPermission(pid, uid)); + EXPECT_EQ(PERMISSION_GRANTED, WifiAuthCenter::GetInstance().VerifyWifiConnectionPermission(pid, uid)); } HWTEST_F(WifiAuthCenterTest, CheckNetworkSettingsPermission_GRANTED, TestSize.Level1) @@ -197,7 +197,7 @@ HWTEST_F(WifiAuthCenterTest, CheckNetworkSettingsPermission_DENIED, TestSize.Lev permissions[g_wifiPermissions[i].name] = num[i]; } WifiAuthCenter::GetInstance().ChangePermission(permissions, pid, uid); - EXPECT_EQ(PERMISSION_DENIED, WifiAuthCenter::GetInstance().VerifyWifiConnectionPermission(pid, uid)); + EXPECT_EQ(PERMISSION_GRANTED, WifiAuthCenter::GetInstance().VerifyWifiConnectionPermission(pid, uid)); } } // namespace Wifi } // namespace OHOS \ No newline at end of file diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_config_center_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_config_center_test.cpp index 3ecb4d9..f244688 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_config_center_test.cpp +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_config_center_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -92,8 +92,6 @@ HWTEST_F(WifiConfigCenterTest, GetScanInfoList_SUCCESS, TestSize.Level1) info2.bssid = "adsgds"; setInfo.push_back(info1); setInfo.push_back(info2); - getInfo.push_back(info1); - getInfo.push_back(info2); WifiSettings::GetInstance().SaveScanInfoList(setInfo); WifiConfigCenter::GetInstance().GetScanInfoList(getInfo); EXPECT_EQ(setInfo.size(), getInfo.size()); @@ -109,7 +107,6 @@ HWTEST_F(WifiConfigCenterTest, GetScanInfoList_FAILED, TestSize.Level1) info1.bssid = "asdfg"; info2.bssid = "adsgds"; setInfo.push_back(info1); - getInfo.push_back(info2); WifiSettings::GetInstance().SaveScanInfoList(setInfo); WifiConfigCenter::GetInstance().GetScanInfoList(getInfo); EXPECT_EQ(setInfo.size(), getInfo.size()); diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manager_service_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manager_service_test.cpp index 13cf9a9..15298a9 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manager_service_test.cpp +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manager_service_test.cpp @@ -128,12 +128,12 @@ HWTEST_F(WifiManagerServiceTest, ApStateResTest, TestSize.Level1) IApServiceCallbacks cbk = WifiManager::GetInstance().GetApCallback(); ASSERT_TRUE(cbk.OnApStateChangedEvent != nullptr); - cbk.OnApStateChangedEvent(ApState::AP_STATE_STARTING); - cbk.OnApStateChangedEvent(ApState::AP_STATE_STARTED); - cbk.OnApStateChangedEvent(ApState::AP_STATE_CLOSING); - cbk.OnApStateChangedEvent(ApState::AP_STATE_CLOSED); - cbk.OnApStateChangedEvent(ApState::AP_STATE_IDLE); - cbk.OnApStateChangedEvent(ApState::AP_STATE_NONE); + cbk.OnApStateChangedEvent(ApState::AP_STATE_STARTING, 0); + cbk.OnApStateChangedEvent(ApState::AP_STATE_STARTED, 0); + cbk.OnApStateChangedEvent(ApState::AP_STATE_CLOSING, 0); + cbk.OnApStateChangedEvent(ApState::AP_STATE_CLOSED, 0); + cbk.OnApStateChangedEvent(ApState::AP_STATE_IDLE, 0); + cbk.OnApStateChangedEvent(ApState::AP_STATE_NONE, 0); sleep(2); } @@ -143,7 +143,7 @@ HWTEST_F(WifiManagerServiceTest, ApJoinResTest, TestSize.Level1) ASSERT_TRUE(cbk.OnHotspotStaJoinEvent != nullptr); StationInfo info; - cbk.OnHotspotStaJoinEvent(info); + cbk.OnHotspotStaJoinEvent(info, 0); sleep(1); } @@ -153,7 +153,7 @@ HWTEST_F(WifiManagerServiceTest, ApLeaveResTest, TestSize.Level1) ASSERT_TRUE(cbk.OnHotspotStaLeaveEvent != nullptr); StationInfo info; - cbk.OnHotspotStaLeaveEvent(info); + cbk.OnHotspotStaLeaveEvent(info, 0); sleep(1); } @@ -168,7 +168,7 @@ HWTEST_F(WifiManagerServiceTest, P2pStateChangeTest, TestSize.Level1) cbk.OnP2pStateChangedEvent(P2pState::P2P_STATE_CLOSED); cbk.OnP2pStateChangedEvent(P2pState::P2P_STATE_IDLE); cbk.OnP2pStateChangedEvent(P2pState::P2P_STATE_NONE); - sleep(2); + sleep(3); } HWTEST_F(WifiManagerServiceTest, P2pPeersChangeTest, TestSize.Level1) diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_mock_p2p_service.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_mock_p2p_service.cpp index 4b6b995..2f635ba 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_mock_p2p_service.cpp +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_mock_p2p_service.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -341,7 +341,7 @@ ErrCode WifiMockP2pService::QueryP2pDevices(std::vector &devices) device1.SetWpsConfigMethod(TEST_ONE_THOUSAND); device1.SetDeviceCapabilitys(TEST_ONE_THOUSAND); device1.SetGroupCapabilitys(TEST_ONE_THOUSAND); - devives.push_back(device1); + devices.push_back(device1); WifiP2pDevice device2; device2.SetDeviceName("DeviceName2"); device2.SetDeviceAddress("DeviceAddress2"); @@ -357,7 +357,7 @@ ErrCode WifiMockP2pService::QueryP2pDevices(std::vector &devices) device2.SetWpsConfigMethod(TEST_TWO_THOUSAND); device2.SetDeviceCapabilitys(TEST_TWO_THOUSAND); device2.SetGroupCapabilitys(TEST_TWO_THOUSAND); - devives.push_back(device2); + devices.push_back(device2); return WIFI_OPT_SUCCESS; } diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_mock_p2p_service.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_mock_p2p_service.h index 61b51ab..407c1fd 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_mock_p2p_service.h +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_mock_p2p_service.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn index 4917a0d..aa22463 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn @@ -21,9 +21,9 @@ config("module_private_config") { ] } ohos_unittest("WifiApServiceTest") { - module_out_path = "wifi_standard/ap_test" + module_out_path = "wifi/ap_test" sources = [ - "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_msg.cpp", + "$WIFI_ROOT_DIR/frameworks/native/src/wifi_p2p_msg.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log/log_helper.c", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/base_address.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/dhcpd_interface.cpp", @@ -69,7 +69,7 @@ ohos_unittest("WifiApServiceTest") { "./Mock/", "//utils/native/base/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", - "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces", + "$WIFI_ROOT_DIR/frameworks/native/interfaces", "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", @@ -84,8 +84,8 @@ ohos_unittest("WifiApServiceTest") { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface", "$WIFI_ROOT_DIR/utils/inc", "$DHCP_ROOT_DIR/services/mgr_service/include", - "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/include", - "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/interfaces", + "$DHCP_ROOT_DIR/interfaces/inner_api/include", + "$DHCP_ROOT_DIR/interfaces/inner_api/interfaces", "//third_party/googletest/googlemock/include", "//third_party/googletest/googletest/include", ] diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_ap_hal_interface.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_ap_hal_interface.h index 91abe44..b2d14da 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_ap_hal_interface.h +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_ap_hal_interface.h @@ -37,37 +37,39 @@ typedef struct IWifiApMonitorEventCallback { class MockWifiApHalInterface { public: virtual ~MockWifiApHalInterface() = default; - virtual WifiErrorNo StartAp(void) = 0; - virtual WifiErrorNo StopAp(void) = 0; - virtual WifiErrorNo StopAp1(void) = 0; - virtual WifiErrorNo SetSoftApConfig(const HotspotConfig &config) = 0; - virtual WifiErrorNo GetStationList(std::vector &result) = 0; - virtual WifiErrorNo SetHotspotConfig(const int &channel, const std::string &mscb) = 0; - virtual WifiErrorNo AddBlockByMac(const std::string &mac) = 0; - virtual WifiErrorNo DelBlockByMac(const std::string &mac) = 0; - virtual WifiErrorNo RemoveStation(const std::string &mac) = 0; - virtual WifiErrorNo GetFrequenciesByBand(int band, std::vector &frequencies) = 0; - virtual WifiErrorNo RegisterApEvent(IWifiApMonitorEventCallback callback) = 0; - virtual WifiErrorNo SetWifiCountryCode(const std::string &code) = 0; - virtual WifiErrorNo DisconnectStaByMac(const std::string &mac) = 0; + virtual WifiErrorNo StartAp(int id = 0) = 0; + virtual WifiErrorNo StopAp(int id = 0) = 0; + virtual WifiErrorNo SetSoftApConfig(const HotspotConfig &config, int id = 0) = 0; + virtual WifiErrorNo GetStationList(std::vector &result, int id = 0) = 0; + virtual WifiErrorNo AddBlockByMac(const std::string &mac, int id = 0) = 0; + virtual WifiErrorNo DelBlockByMac(const std::string &mac, int id = 0) = 0; + virtual WifiErrorNo RemoveStation(const std::string &mac, int id = 0) = 0; + virtual WifiErrorNo GetFrequenciesByBand(int band, std::vector &frequencies, int id = 0) = 0; + virtual WifiErrorNo RegisterApEvent(IWifiApMonitorEventCallback callback, int id = 0) = 0; + virtual WifiErrorNo SetWifiCountryCode(const std::string &code, int id = 0) = 0; + virtual WifiErrorNo DisconnectStaByMac(const std::string &mac, int id = 0) = 0; + virtual const IWifiApMonitorEventCallback &GetApCallbackInst(int id = 0) const = 0; + virtual WifiErrorNo GetPowerModel(int& model, int id = 0) const = 0; + virtual WifiErrorNo SetPowerModel(const int& model, int id = 0) const = 0; }; class WifiApHalInterface : public MockWifiApHalInterface { public: static WifiApHalInterface &GetInstance(void); - MOCK_METHOD0(StartAp, WifiErrorNo(void)); - MOCK_METHOD0(StopAp1, WifiErrorNo(void)); - MOCK_METHOD0(StopAp, WifiErrorNo(void)); - MOCK_METHOD1(SetSoftApConfig, WifiErrorNo(const HotspotConfig &config)); - MOCK_METHOD1(GetStationList, WifiErrorNo(std::vector &result)); - MOCK_METHOD2(SetHotspotConfig, WifiErrorNo(const int &channel, const std::string &mscb)); - MOCK_METHOD1(AddBlockByMac, WifiErrorNo(const std::string &mac)); - MOCK_METHOD1(DelBlockByMac, WifiErrorNo(const std::string &mac)); - MOCK_METHOD1(RemoveStation, WifiErrorNo(const std::string &mac)); - MOCK_METHOD2(GetFrequenciesByBand, WifiErrorNo(int band, std::vector &frequencies)); - MOCK_METHOD1(RegisterApEvent, WifiErrorNo(IWifiApMonitorEventCallback callback)); - MOCK_METHOD1(SetWifiCountryCode, WifiErrorNo(const std::string &code)); - MOCK_METHOD1(DisconnectStaByMac, WifiErrorNo(const std::string &mac)); + MOCK_METHOD1(StartAp, WifiErrorNo(int id)); + MOCK_METHOD1(StopAp, WifiErrorNo(int id)); + MOCK_METHOD2(SetSoftApConfig, WifiErrorNo(const HotspotConfig &config, int id)); + MOCK_METHOD2(GetStationList, WifiErrorNo(std::vector &result, int id)); + MOCK_METHOD2(AddBlockByMac, WifiErrorNo(const std::string &mac, int id)); + MOCK_METHOD2(DelBlockByMac, WifiErrorNo(const std::string &mac, int id)); + MOCK_METHOD2(RemoveStation, WifiErrorNo(const std::string &mac, int id)); + MOCK_METHOD3(GetFrequenciesByBand, WifiErrorNo(int band, std::vector &frequencies, int id)); + MOCK_METHOD2(RegisterApEvent, WifiErrorNo(IWifiApMonitorEventCallback callback, int id)); + MOCK_METHOD2(SetWifiCountryCode, WifiErrorNo(const std::string &code, int id)); + MOCK_METHOD2(DisconnectStaByMac, WifiErrorNo(const std::string &mac, int id)); + MOCK_CONST_METHOD1(GetApCallbackInst, IWifiApMonitorEventCallback &(int id)); + MOCK_CONST_METHOD2(GetPowerModel, WifiErrorNo(int& model, int id)); + MOCK_CONST_METHOD2(SetPowerModel, WifiErrorNo(const int& model, int id)); }; } // namespace Wifi } // namespace OHOS diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_settings.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_settings.h index 6a6baea..9e686d9 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_settings.h +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_settings.h @@ -36,23 +36,27 @@ public: virtual ~MockWifiSettings() = default; virtual int SetCountryCode(const std::string &countryCode) = 0; virtual int GetCountryCode(std::string &countryCode) = 0; - virtual int GetHotspotState() = 0; - virtual int SetHotspotState(int state) = 0; - virtual int SetHotspotConfig(const HotspotConfig &config) = 0; - virtual int GetHotspotConfig(HotspotConfig &config) = 0; - virtual int GetStationList(std::vector &results) = 0; - virtual int ManageStation(const StationInfo &info, int mode) = 0; /* add / update / remove */ - virtual int ClearStationList() = 0; - virtual int GetBlockList(std::vector &results) = 0; - virtual int ManageBlockList(const StationInfo &info, int mode) = 0; /* add / remove */ - virtual int FindConnStation(const StationInfo &info) = 0; + virtual int GetHotspotState(int id = 0) = 0; + virtual int SetHotspotState(int state, int id = 0) = 0; + virtual int SetHotspotConfig(const HotspotConfig &config, int id = 0) = 0; + virtual int GetHotspotConfig(HotspotConfig &config, int id = 0) = 0; + virtual int GetStationList(std::vector &results, int id = 0) = 0; + virtual int ManageStation(const StationInfo &info, int mode, int id = 0) = 0; /* add / update / remove */ + virtual int ClearStationList(int id = 0) = 0; + virtual int GetBlockList(std::vector &results, int id = 0) = 0; + virtual int ManageBlockList(const StationInfo &info, int mode, int id = 0) = 0; /* add / remove */ + virtual int FindConnStation(const StationInfo &info, int id = 0) = 0; virtual int GetValidBands(std::vector &bands) = 0; virtual int SetValidChannels(const ChannelsTable &channelsInfo) = 0; virtual int GetValidChannels(ChannelsTable &channelsInfo) = 0; virtual int ClearValidChannels() = 0; virtual int GetApMaxConnNum() = 0; + virtual void SetDefaultFrequenciesByCountryBand(const BandType band, std::vector &frequencies) = 0; + virtual std::string GetConnectTimeoutBssid() = 0; + virtual int SetConnectTimeoutBssid(std::string &bssid) = 0; virtual int SyncHotspotConfig() = 0; - virtual int SetDefaultFrequenciesByCountryBand(const BandType band, std::vector &frequencies) = 0; + virtual int SetPowerModel(const PowerModel& model, int id = 0) = 0; + virtual int GetPowerModel(PowerModel& model, int id = 0) = 0; }; class WifiSettings : public MockWifiSettings { @@ -60,26 +64,29 @@ public: WifiSettings() = default; ~WifiSettings() = default; static WifiSettings &GetInstance(void); - MOCK_METHOD1(SetCountryCode, int(const std::string &countryCode)); MOCK_METHOD1(GetCountryCode, int(std::string &countryCode)); - MOCK_METHOD0(GetHotspotState, int()); - MOCK_METHOD1(SetHotspotState, int(int)); - MOCK_METHOD1(SetHotspotConfig, int(const HotspotConfig &config)); - MOCK_METHOD1(GetHotspotConfig, int(HotspotConfig &config)); - MOCK_METHOD1(GetStationList, int(std::vector &results)); - MOCK_METHOD2(ManageStation, int(const StationInfo &info, int mode)); - MOCK_METHOD0(ClearStationList, int()); - MOCK_METHOD1(GetBlockList, int(std::vector &results)); - MOCK_METHOD2(ManageBlockList, int(const StationInfo &info, int mode)); - MOCK_METHOD1(FindConnStation, int(const StationInfo &info)); + MOCK_METHOD1(GetHotspotState, int(int id)); + MOCK_METHOD2(SetHotspotState, int(int state, int id)); + MOCK_METHOD2(SetHotspotConfig, int(const HotspotConfig &config, int id)); + MOCK_METHOD2(GetHotspotConfig, int(HotspotConfig &config, int id)); + MOCK_METHOD2(GetStationList, int(std::vector &results, int id)); + MOCK_METHOD3(ManageStation, int(const StationInfo &info, int mode, int id)); + MOCK_METHOD1(ClearStationList, int(int id)); + MOCK_METHOD2(GetBlockList, int(std::vector &results, int id)); + MOCK_METHOD3(ManageBlockList, int(const StationInfo &info, int mode, int id)); + MOCK_METHOD2(FindConnStation, int(const StationInfo &info, int id)); MOCK_METHOD1(GetValidBands, int(std::vector &bands)); MOCK_METHOD1(SetValidChannels, int(const ChannelsTable &channelsInfo)); MOCK_METHOD1(GetValidChannels, int(ChannelsTable &channelsInfo)); MOCK_METHOD0(ClearValidChannels, int()); MOCK_METHOD0(GetApMaxConnNum, int()); + MOCK_METHOD2(SetDefaultFrequenciesByCountryBand, void(const BandType band, std::vector &frequencies)); + MOCK_METHOD0(GetConnectTimeoutBssid, std::string()); + MOCK_METHOD1(SetConnectTimeoutBssid, int(std::string &bssid)); MOCK_METHOD0(SyncHotspotConfig, int()); - MOCK_METHOD2(SetDefaultFrequenciesByCountryBand, int(const BandType band, std::vector &frequencies)); + MOCK_METHOD2(SetPowerModel, int(const PowerModel& model, int id)); + MOCK_METHOD2(GetPowerModel, int(PowerModel& model, int id)); }; } /* namespace Wifi */ } /* namespace OHOS */ diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use_test.cpp index 565c8ca..65947eb 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use_test.cpp +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use_test.cpp @@ -218,7 +218,7 @@ HWTEST_F(ApConfigUse_Test, CheckBandChannel_2, TestSize.Level1) std::vector band_5G_channel = { 149, 168, 169 }; ChannelsTable ChannelsTb = { { BandType::BAND_2GHZ, band_2G_channel }, { BandType::BAND_5GHZ, band_5G_channel } }; pApConfigUse->CheckBandChannel(apConfig, ChannelsTb); - EXPECT_EQ(apConfig.GetChannel(), 6); + EXPECT_EQ(apConfig.GetChannel(), 1); EXPECT_EQ(apConfig.GetBand(), BandType::BAND_2GHZ); } HWTEST_F(ApConfigUse_Test, CheckBandChannel_3, TestSize.Level1) diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_idle_state_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_idle_state_test.cpp index 0acaed8..0f1fb5e 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_idle_state_test.cpp +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_idle_state_test.cpp @@ -77,7 +77,7 @@ HWTEST_F(ApIdleState_test, GoOutState, TestSize.Level1) HWTEST_F(ApIdleState_test, ExecuteStateMsg_SUCCESS, TestSize.Level1) { - EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_)) + EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_, 0)) .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); msg->SetMessageName(static_cast(ApStatemachineEvent::CMD_UPDATE_HOTSPOTCONFIG_RESULT)); diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor_test.cpp index cf68865..0162280 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor_test.cpp +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor_test.cpp @@ -67,7 +67,7 @@ public: HWTEST_F(ApMonitor_Test, StationChangeEvent_JOIN, TestSize.Level1) { - EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_)) + EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_, 0)) .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); const int type = 105; pApMonitor->StartMonitor(); @@ -78,7 +78,7 @@ HWTEST_F(ApMonitor_Test, StationChangeEvent_JOIN, TestSize.Level1) } HWTEST_F(ApMonitor_Test, StationChangeEvent_LEAVE, TestSize.Level1) { - EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_)) + EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_, 0)) .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); const int type = 106; pApMonitor->StartMonitor(); @@ -89,7 +89,7 @@ HWTEST_F(ApMonitor_Test, StationChangeEvent_LEAVE, TestSize.Level1) } HWTEST_F(ApMonitor_Test, StationChangeEvent_NULL, TestSize.Level1) { - EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_)) + EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_, 0)) .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); pApMonitor->StartMonitor(); WifiApConnectionNofify cInfo; @@ -98,7 +98,7 @@ HWTEST_F(ApMonitor_Test, StationChangeEvent_NULL, TestSize.Level1) /* OnHotspotStateEvent */ HWTEST_F(ApMonitor_Test, OnHotspotStateEvent_ENABLE, TestSize.Level1) { - EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_)) + EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_, 0)) .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); pApMonitor->StartMonitor(); pApMonitor->OnHotspotStateEvent(AP_ENABLE); @@ -106,14 +106,14 @@ HWTEST_F(ApMonitor_Test, OnHotspotStateEvent_ENABLE, TestSize.Level1) HWTEST_F(ApMonitor_Test, OnHotspotStateEvent_DISABLE, TestSize.Level1) { - EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_)) + EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_, 0)) .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); pApMonitor->StartMonitor(); pApMonitor->OnHotspotStateEvent(AP_DISABLE); } HWTEST_F(ApMonitor_Test, OnHotspotStateEvent_FAILED, TestSize.Level1) { - EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_)) + EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_, 0)) .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); pApMonitor->StartMonitor(); pApMonitor->OnHotspotStateEvent(AP_FAILED); @@ -122,7 +122,7 @@ HWTEST_F(ApMonitor_Test, OnHotspotStateEvent_FAILED, TestSize.Level1) /* StartMonitor */ HWTEST_F(ApMonitor_Test, StartMonitor_SUCCESS, TestSize.Level1) { - EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_)) + EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_, 0)) .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); pApMonitor->StartMonitor(); } @@ -130,14 +130,14 @@ HWTEST_F(ApMonitor_Test, StartMonitor_SUCCESS, TestSize.Level1) /* StopMonitor */ HWTEST_F(ApMonitor_Test, StopMonitor_SUCCESS, TestSize.Level1) { - EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_)) + EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_, 0)) .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); pApMonitor->StopMonitor(); } /* UnregisterHandler */ HWTEST_F(ApMonitor_Test, UnregisterHandler_SUCCESS, TestSize.Level1) { - EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_)) + EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_, 0)) .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); WraUnregisterHandler("wlan1"); } diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service_test.cpp index 1b88536..d30c4c5 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service_test.cpp +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service_test.cpp @@ -80,42 +80,42 @@ public: /* EnableHotspot */ HWTEST_F(ApService_test, EnableHotspot_SUCCESS, TestSize.Level1) { - EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_)) + EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_, 0)) .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); EXPECT_EQ(ErrCode::WIFI_OPT_SUCCESS, pApService->EnableHotspot()); } /* DisableHotspot */ HWTEST_F(ApService_test, DisableHotspotSUCCESS, TestSize.Level1) { - EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_)) + EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_, 0)) .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); EXPECT_EQ(ErrCode::WIFI_OPT_SUCCESS, pApService->DisableHotspot()); } /* SetHotspotConfig */ HWTEST_F(ApService_test, SetHotspotConfig_SUCCESS, TestSize.Level1) { - EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_)) + EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_, 0)) .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); EXPECT_EQ(ErrCode::WIFI_OPT_SUCCESS, pApService->SetHotspotConfig(apInfo)); } /* AddBlockList */ HWTEST_F(ApService_test, AddBlockList_SUCCESS, TestSize.Level1) { - EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_)) + EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_, 0)) .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); EXPECT_EQ(ErrCode::WIFI_OPT_SUCCESS, pApService->AddBlockList(staInfo)); } /* DelBlockList */ HWTEST_F(ApService_test, DelBlockList_SUCCESS, TestSize.Level1) { - EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_)) + EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_, 0)) .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); EXPECT_EQ(ErrCode::WIFI_OPT_SUCCESS, pApService->DelBlockList(staInfo)); } /* DisconnetStation */ HWTEST_F(ApService_test, DisconnetStation_SUCCESS, TestSize.Level1) { - EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_)) + EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_, 0)) .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); EXPECT_EQ(ErrCode::WIFI_OPT_SUCCESS, pApService->DisconnetStation(staInfo)); } @@ -131,7 +131,7 @@ HWTEST_F(ApService_test, GetValidBands_SUCCESS, TestSize.Level1) EXPECT_CALL(WifiSettings::GetInstance(), GetValidBands(Eq(vecSta))) .WillOnce(DoAll(SetArgReferee<0>(temp), Return(0))); - EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_)) + EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_, 0)) .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); EXPECT_EQ(ErrCode::WIFI_OPT_SUCCESS, pApService->GetValidBands(vecSta)); EXPECT_EQ(temp, vecSta); @@ -146,7 +146,7 @@ HWTEST_F(ApService_test, GetValidBands_FAILED, TestSize.Level1) EXPECT_CALL(WifiSettings::GetInstance(), GetValidBands(Eq(vecSta))) .WillOnce(DoAll(SetArgReferee<0>(temp), Return(-1))); - EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_)) + EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_, 0)) .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); EXPECT_EQ(ErrCode::WIFI_OPT_FAILED, pApService->GetValidBands(vecSta)); } @@ -158,7 +158,7 @@ HWTEST_F(ApService_test, GetValidChannels_SUCCESS, TestSize.Level1) std::vector band_2G_channel = { 1, 2, 3, 4, 5, 6, 7 }; std::vector band_5G_channel = { 149, 168, 169 }; ChannelsTable temp = { { BandType::BAND_2GHZ, band_2G_channel }, { BandType::BAND_5GHZ, band_5G_channel } }; - EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_)) + EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_, 0)) .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); EXPECT_CALL(WifiSettings::GetInstance(), GetValidChannels(_)).WillOnce(DoAll(SetArgReferee<0>(temp), Return(0))); EXPECT_EQ(ErrCode::WIFI_OPT_SUCCESS, pApService->GetValidChannels(BandType::BAND_2GHZ, vecChannels)); @@ -177,7 +177,7 @@ HWTEST_F(ApService_test, GetValidChannels_SUCCESS, TestSize.Level1) /* RegisterApServiceCallbacks */ HWTEST_F(ApService_test, RegisterApServiceCallbacks_SUCCESS, TestSize.Level1) { - EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_)) + EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_, 0)) .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); IApServiceCallbacks callbacks; EXPECT_EQ(ErrCode::WIFI_OPT_SUCCESS, WarpRegisterApServiceCallbacks(callbacks)); diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state_test.cpp index 3ec1870..77b67eb 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state_test.cpp +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state_test.cpp @@ -109,7 +109,7 @@ public: channelTbs = { { BandType::BAND_2GHZ, band_2G_channel }, { BandType::BAND_5GHZ, band_5G_channel } }; - EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_)) + EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_, 0)) .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); usleep(SLEEP_TIME); } @@ -261,24 +261,25 @@ public: HotspotConfig apcfg; }; + HWTEST_F(ApStartedState_test, GoInState_SUCCESS,TestSize.Level1) { std::vector results; EXPECT_CALL(MockNetworkInterface::GetInstance(), FetchIpAddress(_, _, _)).WillRepeatedly(Return(true)); EXPECT_CALL(MockNetworkInterface::GetInstance(), AddIpAddress(_, _)).WillRepeatedly(Return(true)); - EXPECT_CALL(WifiSettings::GetInstance(), SetHotspotState(A())).WillRepeatedly(Return(0)); - EXPECT_CALL(WifiApHalInterface::GetInstance(), StartAp()).WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); + EXPECT_CALL(WifiSettings::GetInstance(), SetHotspotState(A(), 0)).WillRepeatedly(Return(0)); + EXPECT_CALL(WifiApHalInterface::GetInstance(), StartAp(0)).WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); std::string countryCode = "CN"; EXPECT_CALL(WifiSettings::GetInstance(), GetCountryCode(Eq(""))) .WillRepeatedly(DoAll(testing::SetArgReferee<0>(countryCode), Return(0))); - EXPECT_CALL(WifiApHalInterface::GetInstance(), SetWifiCountryCode(Eq(countryCode))) + EXPECT_CALL(WifiApHalInterface::GetInstance(), SetWifiCountryCode(Eq(countryCode), 0)) .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); - EXPECT_CALL(WifiSettings::GetInstance(), GetHotspotConfig(A())) + EXPECT_CALL(WifiSettings::GetInstance(), GetHotspotConfig(A(), 0)) .WillRepeatedly(DoAll(SetArgReferee<0>(apcfg), Return(0))); - EXPECT_CALL(WifiApHalInterface::GetInstance(), GetFrequenciesByBand(_, _)) + EXPECT_CALL(WifiApHalInterface::GetInstance(), GetFrequenciesByBand(_, _, _)) .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); EXPECT_CALL(WifiSettings::GetInstance(), SetValidChannels(_)).WillRepeatedly(Return(0)); - EXPECT_CALL(WifiApHalInterface::GetInstance(), SetSoftApConfig(Eq(apcfg))) + EXPECT_CALL(WifiApHalInterface::GetInstance(), SetSoftApConfig(Eq(apcfg), 0)) .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); EXPECT_CALL(*pMockApStateMachine, StartDhcpServer()).WillRepeatedly(Return(true)); EXPECT_CALL(*pMockApNatManager, EnableInterfaceNat(Eq(true), StrEq(IN_INTERFACE), StrEq(OUT_INTERFACE))) @@ -287,38 +288,38 @@ HWTEST_F(ApStartedState_test, GoInState_SUCCESS,TestSize.Level1) EXPECT_CALL(*pMockApMonitor, StartMonitor()).WillRepeatedly(Return()); EXPECT_CALL(*pMockApConfigUse, CheckBandChannel(Eq(apcfg), _)).WillRepeatedly(Return()); EXPECT_CALL(*pMockApConfigUse, LogConfig(Eq(apcfg))).WillRepeatedly(Return()); - EXPECT_CALL(WifiSettings::GetInstance(), GetBlockList(Eq(results))) + EXPECT_CALL(WifiSettings::GetInstance(), GetBlockList(Eq(results), 0)) .WillRepeatedly(DoAll(SetArgReferee<0>(valueList), Return(ErrCode::WIFI_OPT_SUCCESS))); - EXPECT_CALL(WifiApHalInterface::GetInstance(), AddBlockByMac(StrEq("DA:BB:CC:DD:EE:FF"))) + EXPECT_CALL(WifiApHalInterface::GetInstance(), AddBlockByMac(StrEq("DA:BB:CC:DD:EE:FF"), 0)) .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); pApStartedState->GoInState(); } HWTEST_F(ApStartedState_test, GoInState_FAILED1,TestSize.Level1) { std::vector results; - EXPECT_CALL(WifiSettings::GetInstance(), SetHotspotState(A())).WillRepeatedly(Return(0)); + EXPECT_CALL(WifiSettings::GetInstance(), SetHotspotState(A(), 0)).WillRepeatedly(Return(0)); EXPECT_CALL(*pMockApMonitor, StartMonitor()).WillRepeatedly(Return()); - EXPECT_CALL(WifiApHalInterface::GetInstance(), StartAp()).WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_FAILED)); + EXPECT_CALL(WifiApHalInterface::GetInstance(), StartAp(0)).WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_FAILED)); pApStartedState->GoInState(); - EXPECT_CALL(WifiApHalInterface::GetInstance(), StartAp()).WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); + EXPECT_CALL(WifiApHalInterface::GetInstance(), StartAp(0)).WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); EXPECT_CALL(WifiSettings::GetInstance(), GetCountryCode(StrEq(""))).WillRepeatedly(Return(1)); pApStartedState->GoInState(); EXPECT_CALL(WifiSettings::GetInstance(), GetCountryCode(StrEq(""))) .WillRepeatedly(DoAll(SetArgReferee<0>("CN"), Return(0))); - EXPECT_CALL(WifiApHalInterface::GetInstance(), SetWifiCountryCode(StrEq("CN"))) + EXPECT_CALL(WifiApHalInterface::GetInstance(), SetWifiCountryCode(StrEq("CN"), 0)) .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_FAILED)); pApStartedState->GoInState(); - EXPECT_CALL(WifiApHalInterface::GetInstance(), SetWifiCountryCode(StrEq("CN"))) + EXPECT_CALL(WifiApHalInterface::GetInstance(), SetWifiCountryCode(StrEq("CN"), 0)) .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); - EXPECT_CALL(WifiSettings::GetInstance(), GetHotspotConfig(A())).WillRepeatedly(Return(1)); + EXPECT_CALL(WifiSettings::GetInstance(), GetHotspotConfig(A(), 0)).WillRepeatedly(Return(1)); pApStartedState->GoInState(); - EXPECT_CALL(WifiSettings::GetInstance(), GetHotspotConfig(A())) + EXPECT_CALL(WifiSettings::GetInstance(), GetHotspotConfig(A(), 0)) .WillRepeatedly(DoAll(SetArgReferee<0>(apcfg), Return(0))); - EXPECT_CALL(WifiApHalInterface::GetInstance(), GetFrequenciesByBand(_, _)) + EXPECT_CALL(WifiApHalInterface::GetInstance(), GetFrequenciesByBand(_, _, _)) .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_FAILED)); EXPECT_CALL(*pMockApConfigUse, TransformFrequencyIntoChannel(_, _)).WillRepeatedly(Return()); EXPECT_CALL(WifiSettings::GetInstance(), SetValidChannels(_)).WillRepeatedly(Return(1)); @@ -326,27 +327,27 @@ HWTEST_F(ApStartedState_test, GoInState_FAILED1,TestSize.Level1) EXPECT_CALL(WifiSettings::GetInstance(), SetValidChannels(_)).WillRepeatedly(Return(0)); EXPECT_CALL(*pMockApConfigUse, CheckBandChannel(_, _)).WillRepeatedly(Return()); - EXPECT_CALL(WifiApHalInterface::GetInstance(), SetSoftApConfig(Eq(apcfg))) + EXPECT_CALL(WifiApHalInterface::GetInstance(), SetSoftApConfig(Eq(apcfg), 0)) .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_FAILED)); pApStartedState->GoInState(); - EXPECT_CALL(WifiApHalInterface::GetInstance(), SetSoftApConfig(Eq(apcfg))) + EXPECT_CALL(WifiApHalInterface::GetInstance(), SetSoftApConfig(Eq(apcfg), 0)) .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); EXPECT_CALL(*pMockApConfigUse, LogConfig(Eq(apcfg))).WillRepeatedly(Return()); EXPECT_CALL(*pMockApStateMachine, StartDhcpServer()).WillRepeatedly(Return(false)); pApStartedState->GoInState(); - EXPECT_CALL(WifiSettings::GetInstance(), GetBlockList(Eq(results))) + EXPECT_CALL(WifiSettings::GetInstance(), GetBlockList(Eq(results), 0)) .WillRepeatedly(DoAll(SetArgReferee<0>(valueList), Return(ErrCode::WIFI_OPT_FAILED))); pApStartedState->GoInState(); - EXPECT_CALL(WifiSettings::GetInstance(), GetBlockList(Eq(results))) + EXPECT_CALL(WifiSettings::GetInstance(), GetBlockList(Eq(results), 0)) .WillRepeatedly(DoAll(SetArgReferee<0>(valueList), Return(ErrCode::WIFI_OPT_SUCCESS))); - EXPECT_CALL(WifiApHalInterface::GetInstance(), AddBlockByMac(StrEq("DA:BB:CC:DD:EE:FF"))) + EXPECT_CALL(WifiApHalInterface::GetInstance(), AddBlockByMac(StrEq("DA:BB:CC:DD:EE:FF"), 0)) .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); pApStartedState->GoInState(); - EXPECT_CALL(WifiSettings::GetInstance(), GetHotspotConfig(A())).WillRepeatedly(Return(1)); + EXPECT_CALL(WifiSettings::GetInstance(), GetHotspotConfig(A(), 0)).WillRepeatedly(Return(1)); EXPECT_CALL(*pMockApStateMachine, StartDhcpServer()).WillRepeatedly(Return(true)); EXPECT_CALL(*pMockApNatManager, EnableInterfaceNat(_, _, _)).WillRepeatedly(Return(false)); pApStartedState->GoInState(); @@ -358,11 +359,11 @@ HWTEST_F(ApStartedState_test, GoOutState_SUCCESS, TestSize.Level1) EXPECT_CALL(MockNetworkInterface::GetInstance(), IsValidInterfaceName(_)).WillRepeatedly(Return(true)); EXPECT_CALL(MockNetworkInterface::GetInstance(), ClearAllIpAddress(_)).WillRepeatedly(Return(true)); - EXPECT_CALL(WifiSettings::GetInstance(), SetHotspotState(A())).WillRepeatedly(Return(0)); + EXPECT_CALL(WifiSettings::GetInstance(), SetHotspotState(A(), 0)).WillRepeatedly(Return(0)); EXPECT_CALL(*pMockApNatManager, EnableInterfaceNat(Eq(false), _, _)).WillRepeatedly(Return(true)); EXPECT_CALL(*pMockApStateMachine, StopDhcpServer()).WillRepeatedly(Return(true)); - EXPECT_CALL(WifiApHalInterface::GetInstance(), StopAp()).WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); - EXPECT_CALL(WifiSettings::GetInstance(), ClearStationList()).WillRepeatedly(Return(0)); + EXPECT_CALL(WifiApHalInterface::GetInstance(), StopAp(0)).WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); + EXPECT_CALL(WifiSettings::GetInstance(), ClearStationList(0)).WillRepeatedly(Return(0)); EXPECT_CALL(WifiSettings::GetInstance(), ClearValidChannels()).WillRepeatedly(Return(0)); EXPECT_CALL(*pMockApMonitor, StopMonitor()).WillRepeatedly(Return()); } @@ -370,11 +371,11 @@ HWTEST_F(ApStartedState_test, GoOutState_FAILED, TestSize.Level1) { pApStartedState->GoOutState(); EXPECT_CALL(MockSystemInterface::GetInstance(), system(_)).WillRepeatedly(Return(true)); - EXPECT_CALL(WifiSettings::GetInstance(), SetHotspotState(A())).WillRepeatedly(Return(0)); + EXPECT_CALL(WifiSettings::GetInstance(), SetHotspotState(A(), 0)).WillRepeatedly(Return(0)); EXPECT_CALL(*pMockApNatManager, EnableInterfaceNat(Eq(false), _, _)).WillRepeatedly(Return(false)); EXPECT_CALL(*pMockApStateMachine, StopDhcpServer()).WillRepeatedly(Return(false)); - EXPECT_CALL(WifiApHalInterface::GetInstance(), StopAp()).WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_FAILED)); - EXPECT_CALL(WifiSettings::GetInstance(), ClearStationList()).WillRepeatedly(Return(0)); + EXPECT_CALL(WifiApHalInterface::GetInstance(), StopAp(0)).WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_FAILED)); + EXPECT_CALL(WifiSettings::GetInstance(), ClearStationList(0)).WillRepeatedly(Return(0)); EXPECT_CALL(WifiSettings::GetInstance(), ClearValidChannels()).WillRepeatedly(Return(0)); EXPECT_CALL(*pMockApMonitor, StopMonitor()).WillRepeatedly(Return()); } @@ -383,7 +384,7 @@ HWTEST_F(ApStartedState_test, ExecuteStateMsg_SUCCESS, TestSize.Level1) msg->SetMessageName(static_cast(ApStatemachineEvent::CMD_FAIL)); EXPECT_TRUE(pApStartedState->ExecuteStateMsg(msg)); - EXPECT_CALL(WifiSettings::GetInstance(), GetStationList(_)).WillRepeatedly(Return(ErrCode::WIFI_OPT_FAILED)); + EXPECT_CALL(WifiSettings::GetInstance(), GetStationList(_, 0)).WillRepeatedly(Return(ErrCode::WIFI_OPT_FAILED)); msg->ClearMessageBody(); StationInfo staInfo; msg->SetMessageObj(staInfo); @@ -410,11 +411,11 @@ HWTEST_F(ApStartedState_test, ExecuteStateMsg_SUCCESS, TestSize.Level1) msg->AddIntMessageBody(apcfg.GetMaxConn()); EXPECT_CALL(*pMockApConfigUse, LogConfig(Eq(apcfg))).WillRepeatedly(Return()); - EXPECT_CALL(WifiApHalInterface::GetInstance(), GetFrequenciesByBand(_, _)) + EXPECT_CALL(WifiApHalInterface::GetInstance(), GetFrequenciesByBand(_, _, _)) .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); EXPECT_CALL(*pMockApConfigUse, TransformFrequencyIntoChannel(_, _)).WillRepeatedly(Return()); EXPECT_CALL(WifiSettings::GetInstance(), SetValidChannels(_)).WillRepeatedly(Return(0)); - EXPECT_CALL(WifiApHalInterface::GetInstance(), SetSoftApConfig(Eq(apcfg))) + EXPECT_CALL(WifiApHalInterface::GetInstance(), SetSoftApConfig(Eq(apcfg), 0)) .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); EXPECT_CALL(*pMockApConfigUse, CheckBandChannel(Eq(apcfg), _)).WillRepeatedly(Return()); EXPECT_TRUE(pApStartedState->ExecuteStateMsg(msg)); @@ -427,7 +428,7 @@ HWTEST_F(ApStartedState_test, ExecuteStateMsg_SUCCESS, TestSize.Level1) msg->AddIntMessageBody(static_cast(apcfg.GetBand())); msg->AddIntMessageBody(apcfg.GetChannel()); msg->AddIntMessageBody(apcfg.GetMaxConn()); - EXPECT_CALL(WifiApHalInterface::GetInstance(), SetSoftApConfig(Eq(apcfg))) + EXPECT_CALL(WifiApHalInterface::GetInstance(), SetSoftApConfig(Eq(apcfg), 0)) .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_FAILED)); EXPECT_TRUE(pApStartedState->ExecuteStateMsg(msg)); } @@ -457,7 +458,7 @@ HWTEST_F(ApStartedState_test, ExecuteStateMsg_SUCCESS2, TestSize.Level1) msg->AddIntMessageBody(static_cast(apcfg.GetBand())); msg->AddIntMessageBody(apcfg.GetChannel()); msg->AddIntMessageBody(apcfg.GetMaxConn()); - EXPECT_CALL(WifiApHalInterface::GetInstance(), AddBlockByMac(Eq(staInfo.bssid))) + EXPECT_CALL(WifiApHalInterface::GetInstance(), AddBlockByMac(Eq(staInfo.bssid), 0)) .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); msg->ClearMessageBody(); msg->SetMessageName(static_cast(ApStatemachineEvent::CMD_ADD_BLOCK_LIST)); @@ -470,7 +471,7 @@ HWTEST_F(ApStartedState_test, ExecuteStateMsg_SUCCESS2, TestSize.Level1) msg->AddStringMessageBody(staInfo.deviceName); msg->AddStringMessageBody(staInfo.bssid); msg->AddStringMessageBody(staInfo.ipAddr); - EXPECT_CALL(WifiApHalInterface::GetInstance(), DelBlockByMac(Eq(staInfo.bssid))) + EXPECT_CALL(WifiApHalInterface::GetInstance(), DelBlockByMac(Eq(staInfo.bssid), 0)) .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); EXPECT_TRUE(pApStartedState->ExecuteStateMsg(msg)); msg->SetMessageName(static_cast(ApStatemachineEvent::CMD_STOP_HOTSPOT)); @@ -481,7 +482,7 @@ HWTEST_F(ApStartedState_test, ExecuteStateMsg_SUCCESS2, TestSize.Level1) msg->AddStringMessageBody(staInfo.deviceName); msg->AddStringMessageBody(staInfo.bssid); msg->AddStringMessageBody(staInfo.ipAddr); - EXPECT_CALL(WifiApHalInterface::GetInstance(), DisconnectStaByMac(Eq(staInfo.bssid))) + EXPECT_CALL(WifiApHalInterface::GetInstance(), DisconnectStaByMac(Eq(staInfo.bssid), 0)) .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); EXPECT_TRUE(pApStartedState->ExecuteStateMsg(msg)); } diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine_test.cpp index 01e1802..546015f 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine_test.cpp +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -49,7 +49,7 @@ public: pApStateMachine->InitialStateMachine(); RegisterApServiceCallbacks(); - EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_)) + EXPECT_CALL(WifiApHalInterface::GetInstance(), RegisterApEvent(_, 0)) .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); usleep(SLEEP_TIME); } @@ -69,9 +69,11 @@ public: public: ErrCode RegisterApServiceCallbacks() { - std::function OnStationEvent = [&](const StationInfo &sta) { m_sta = sta; }; + std::function OnStationEvent = + [&](const StationInfo &sta, int id) { m_sta = sta; }; - IApServiceCallbacks callbacks = {[&](ApState state) { mBState = state; }, OnStationEvent, OnStationEvent}; + IApServiceCallbacks callbacks = {[&](ApState state, int id) { mBState = state; }, + OnStationEvent, OnStationEvent}; return pApStateMachine->RegisterApServiceCallbacks(callbacks); } ErrCode UnRegisterApServiceCallbacks() @@ -83,12 +85,12 @@ public: public: void WrapOnApStateChange(ApState state) { - EXPECT_CALL(WifiSettings::GetInstance(), SetHotspotState(Eq(static_cast(state)))).WillOnce(Return(0)); + EXPECT_CALL(WifiSettings::GetInstance(), SetHotspotState(Eq(static_cast(state)), 0)).WillOnce(Return(0)); pApStateMachine->OnApStateChange(state); } void WrapOnApStateChangeFail(ApState state) { - EXPECT_CALL(WifiSettings::GetInstance(), SetHotspotState(Eq(static_cast(state)))).WillOnce(Return(1)); + EXPECT_CALL(WifiSettings::GetInstance(), SetHotspotState(Eq(static_cast(state)), 0)).WillOnce(Return(1)); pApStateMachine->OnApStateChange(state); } diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager_test.cpp index d73a0a4..a60eed9 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager_test.cpp +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager_test.cpp @@ -79,14 +79,14 @@ public: /* AddBlockList */ HWTEST_F(ApStationsManager_test, AddBlockList_SUCCESS, TestSize.Level1) { - EXPECT_CALL(WifiApHalInterface::GetInstance(), AddBlockByMac(StrEq(staInfo.bssid))) + EXPECT_CALL(WifiApHalInterface::GetInstance(), AddBlockByMac(StrEq(staInfo.bssid), 0)) .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); EXPECT_TRUE(pApStaMgr->AddBlockList(staInfo)); } HWTEST_F(ApStationsManager_test, AddBlockList_FAILED, TestSize.Level1) { - EXPECT_CALL(WifiApHalInterface::GetInstance(), AddBlockByMac(StrEq(staInfo.bssid))) + EXPECT_CALL(WifiApHalInterface::GetInstance(), AddBlockByMac(StrEq(staInfo.bssid), 0)) .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_FAILED)); EXPECT_FALSE(pApStaMgr->AddBlockList(staInfo)); @@ -95,14 +95,14 @@ HWTEST_F(ApStationsManager_test, AddBlockList_FAILED, TestSize.Level1) /* DelBlockList */ HWTEST_F(ApStationsManager_test, DelBlockList_SUCCESS, TestSize.Level1) { - EXPECT_CALL(WifiApHalInterface::GetInstance(), DelBlockByMac(StrEq(staInfo.bssid))) + EXPECT_CALL(WifiApHalInterface::GetInstance(), DelBlockByMac(StrEq(staInfo.bssid), 0)) .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); EXPECT_TRUE(pApStaMgr->DelBlockList(staInfo)); } HWTEST_F(ApStationsManager_test, DelBlockList_FAILED, TestSize.Level1) { - EXPECT_CALL(WifiApHalInterface::GetInstance(), DelBlockByMac(StrEq(staInfo.bssid))) + EXPECT_CALL(WifiApHalInterface::GetInstance(), DelBlockByMac(StrEq(staInfo.bssid), 0)) .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_FAILED)); EXPECT_FALSE(pApStaMgr->DelBlockList(staInfo)); @@ -115,9 +115,9 @@ HWTEST_F(ApStationsManager_test, EnableAllBlockList_SUCCESS, TestSize.Level1) std::vector valueCom; value.push_back(value1); value.push_back(value2); - EXPECT_CALL(WifiSettings::GetInstance(), GetBlockList(Eq(valueCom))) + EXPECT_CALL(WifiSettings::GetInstance(), GetBlockList(Eq(valueCom), 0)) .WillOnce(DoAll(testing::SetArgReferee<0>(value), Return(0))); - EXPECT_CALL(WifiApHalInterface::GetInstance(), AddBlockByMac(An())) + EXPECT_CALL(WifiApHalInterface::GetInstance(), AddBlockByMac(An(), 0)) .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); EXPECT_TRUE(pApStaMgr->EnableAllBlockList()); } @@ -127,7 +127,7 @@ HWTEST_F(ApStationsManager_test, EnableAllBlockList_FAILED0, TestSize.Level1) std::vector valueCom; value.push_back(value1); value.push_back(value2); - EXPECT_CALL(WifiSettings::GetInstance(), GetBlockList(Eq(valueCom))) + EXPECT_CALL(WifiSettings::GetInstance(), GetBlockList(Eq(valueCom), 0)) .WillOnce(DoAll(testing::SetArgReferee<0>(value), Return(-1))); EXPECT_FALSE(pApStaMgr->EnableAllBlockList()); } @@ -137,9 +137,9 @@ HWTEST_F(ApStationsManager_test, EnableAllBlockList_FAILED1, TestSize.Level1) std::vector valueCom; value.push_back(value1); value.push_back(value2); - EXPECT_CALL(WifiSettings::GetInstance(), GetBlockList(valueCom)) + EXPECT_CALL(WifiSettings::GetInstance(), GetBlockList(valueCom, 0)) .WillOnce(DoAll(testing::SetArgReferee<0>(value), Return(0))); - EXPECT_CALL(WifiApHalInterface::GetInstance(), AddBlockByMac(An())) + EXPECT_CALL(WifiApHalInterface::GetInstance(), AddBlockByMac(An(), 0)) .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_FAILED)) .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_FAILED)); EXPECT_FALSE(pApStaMgr->EnableAllBlockList()); @@ -158,9 +158,9 @@ HWTEST_F(ApStationsManager_test, StationLeave, TestSize.Level1) valueList.push_back(value2); valueList.push_back(value1); valueList.push_back(value3); - EXPECT_CALL(WifiSettings::GetInstance(), GetStationList(Eq(valueCom))) + EXPECT_CALL(WifiSettings::GetInstance(), GetStationList(Eq(valueCom), 0)) .WillOnce(DoAll(testing::SetArgReferee<0>(valueList), Return(0))); - EXPECT_CALL(WifiSettings::GetInstance(), ManageStation(Eq(value2), Eq(1))).WillOnce(Return(0)); + EXPECT_CALL(WifiSettings::GetInstance(), ManageStation(Eq(value2), Eq(1), 0)).WillOnce(Return(0)); pApStaMgr->StationLeave(value1.bssid); } HWTEST_F(ApStationsManager_test, StationLeave1, TestSize.Level1) @@ -175,7 +175,7 @@ HWTEST_F(ApStationsManager_test, StationLeave1, TestSize.Level1) valueList.push_back(value2); valueList.push_back(value1); valueList.push_back(value3); - EXPECT_CALL(WifiSettings::GetInstance(), GetStationList(Eq(valueCom))) + EXPECT_CALL(WifiSettings::GetInstance(), GetStationList(Eq(valueCom), 0)) .WillOnce(DoAll(testing::SetArgReferee<0>(valueList), Return(1))); pApStaMgr->StationLeave(value1.bssid); EXPECT_STREQ("AA:BB:CC:DD:EE:FF", Mac.c_str()); @@ -192,9 +192,9 @@ HWTEST_F(ApStationsManager_test, StationLeave2, TestSize.Level1) valueList.push_back(value3); valueList.push_back(value1); valueList.push_back(value2); - EXPECT_CALL(WifiSettings::GetInstance(), GetStationList(Eq(valueCom))) + EXPECT_CALL(WifiSettings::GetInstance(), GetStationList(Eq(valueCom), 0)) .WillOnce(DoAll(testing::SetArgReferee<0>(valueList), Return(0))); - EXPECT_CALL(WifiSettings::GetInstance(), ManageStation(Eq(value1), Eq(1))).WillOnce(Return(1)); + EXPECT_CALL(WifiSettings::GetInstance(), ManageStation(Eq(value1), Eq(1), 0)).WillOnce(Return(1)); pApStaMgr->StationLeave(value1.bssid); EXPECT_STREQ("AA:BB:CC:DD:EE:FF", Mac.c_str()); } @@ -211,7 +211,7 @@ HWTEST_F(ApStationsManager_test, StationJoin1, TestSize.Level1) }; valueList.push_back(value2); valueList.push_back(value1); - EXPECT_CALL(WifiSettings::GetInstance(), GetStationList(Eq(valueCom))) + EXPECT_CALL(WifiSettings::GetInstance(), GetStationList(Eq(valueCom), 0)) .WillOnce(DoAll(testing::SetArgReferee<0>(valueList), Return(1))); pApStaMgr->StationJoin(value3); } @@ -226,9 +226,9 @@ HWTEST_F(ApStationsManager_test, StationJoin2, TestSize.Level1) }; valueList.push_back(value1); valueList.push_back(value2); - EXPECT_CALL(WifiSettings::GetInstance(), GetStationList(Eq(valueCom))) + EXPECT_CALL(WifiSettings::GetInstance(), GetStationList(Eq(valueCom), 0)) .WillOnce(DoAll(testing::SetArgReferee<0>(valueList), Return(0))); - EXPECT_CALL(WifiSettings::GetInstance(), ManageStation(Eq(value3), 0)).WillOnce(Return(0)); + EXPECT_CALL(WifiSettings::GetInstance(), ManageStation(Eq(value3), MODE_ADD, 0)).WillOnce(Return(0)); pApStaMgr->StationJoin(value3); } HWTEST_F(ApStationsManager_test, StationJoin3, TestSize.Level1) @@ -242,9 +242,9 @@ HWTEST_F(ApStationsManager_test, StationJoin3, TestSize.Level1) }; valueList.push_back(value2); valueList.push_back(value1); - EXPECT_CALL(WifiSettings::GetInstance(), GetStationList(Eq(valueCom))) + EXPECT_CALL(WifiSettings::GetInstance(), GetStationList(Eq(valueCom), 0)) .WillOnce(DoAll(testing::SetArgReferee<0>(valueList), Return(0))); - EXPECT_CALL(WifiSettings::GetInstance(), ManageStation(Eq(value3), 0)).WillOnce(Return(1)); + EXPECT_CALL(WifiSettings::GetInstance(), ManageStation(Eq(value3), MODE_ADD, 0)).WillOnce(Return(1)); pApStaMgr->StationJoin(value3); } HWTEST_F(ApStationsManager_test, StationJoin4, TestSize.Level1) @@ -258,9 +258,9 @@ HWTEST_F(ApStationsManager_test, StationJoin4, TestSize.Level1) }; valueList.push_back(value1); valueList.push_back(value2); - EXPECT_CALL(WifiSettings::GetInstance(), GetStationList(Eq(valueCom))) + EXPECT_CALL(WifiSettings::GetInstance(), GetStationList(Eq(valueCom), 0)) .WillOnce(DoAll(testing::SetArgReferee<0>(valueList), Return(0))); - EXPECT_CALL(WifiSettings::GetInstance(), ManageStation(Eq(value3), 0)).WillOnce(Return(0)); + EXPECT_CALL(WifiSettings::GetInstance(), ManageStation(Eq(value3), MODE_ADD, 0)).WillOnce(Return(0)); pApStaMgr->StationJoin(value3); } HWTEST_F(ApStationsManager_test, StationJoin5, TestSize.Level1) @@ -274,22 +274,22 @@ HWTEST_F(ApStationsManager_test, StationJoin5, TestSize.Level1) }; valueList.push_back(value1); valueList.push_back(value2); - EXPECT_CALL(WifiSettings::GetInstance(), GetStationList(Eq(valueCom))) + EXPECT_CALL(WifiSettings::GetInstance(), GetStationList(Eq(valueCom), 0)) .WillOnce(DoAll(testing::SetArgReferee<0>(valueList), Return(0))); - EXPECT_CALL(WifiSettings::GetInstance(), ManageStation(Eq(value1), 0)).WillOnce(Return(0)); + EXPECT_CALL(WifiSettings::GetInstance(), ManageStation(Eq(value1), MODE_ADD, 0)).WillOnce(Return(0)); pApStaMgr->StationJoin(value3); } /* DisConnectStation */ HWTEST_F(ApStationsManager_test, DisConnectStion_SUCCESS, TestSize.Level1) { - EXPECT_CALL(WifiApHalInterface::GetInstance(), DisconnectStaByMac(StrEq(Mac))) + EXPECT_CALL(WifiApHalInterface::GetInstance(), DisconnectStaByMac(StrEq(Mac), 0)) .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); EXPECT_TRUE(pApStaMgr->DisConnectStation(staInfo)); } HWTEST_F(ApStationsManager_test, DisConnectStion_FAILED, TestSize.Level1) { - EXPECT_CALL(WifiApHalInterface::GetInstance(), DisconnectStaByMac(StrEq(Mac))) + EXPECT_CALL(WifiApHalInterface::GetInstance(), DisconnectStaByMac(StrEq(Mac), 0)) .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_FAILED)); EXPECT_FALSE(pApStaMgr->DisConnectStation(staInfo)); @@ -304,7 +304,7 @@ HWTEST_F(ApStationsManager_test, GetAllConnectedStations_SUCCESS, TestSize.Level std::string staMacList2 = "test_deviceName2"; staMacList.push_back(staMacList1); staMacList.push_back(staMacList2); - EXPECT_CALL(WifiApHalInterface::GetInstance(), GetStationList(Eq(staMacListCom))) + EXPECT_CALL(WifiApHalInterface::GetInstance(), GetStationList(Eq(staMacListCom), 0)) .WillOnce(DoAll(testing::SetArgReferee<0>(staMacList), Return(WifiErrorNo::WIFI_IDL_OPT_OK))); EXPECT_EQ(staMacList, pApStaMgr->GetAllConnectedStations()); @@ -317,7 +317,7 @@ HWTEST_F(ApStationsManager_test, GetAllConnectedStations_FAILED, TestSize.Level1 std::string staMacList2 = "test_deviceName2"; staMacList.push_back(staMacList1); staMacList.push_back(staMacList2); - EXPECT_CALL(WifiApHalInterface::GetInstance(), GetStationList(Eq(staMacListCom))) + EXPECT_CALL(WifiApHalInterface::GetInstance(), GetStationList(Eq(staMacListCom), 0)) .WillOnce(DoAll(testing::SetArgReferee<0>(staMacList), Return(WifiErrorNo::WIFI_IDL_OPT_FAILED))); staMacList.erase(staMacList.begin()); EXPECT_NE(staMacList, pApStaMgr->GetAllConnectedStations()); @@ -326,24 +326,24 @@ HWTEST_F(ApStationsManager_test, GetAllConnectedStations_FAILED, TestSize.Level1 /* AddAssociationStation */ HWTEST_F(ApStationsManager_test, AddAssociationStation_SUCCESS, TestSize.Level1) { - EXPECT_CALL(WifiSettings::GetInstance(), ManageStation(Eq(staInfo), Eq(0))).WillOnce(Return(0)); + EXPECT_CALL(WifiSettings::GetInstance(), ManageStation(Eq(staInfo), Eq(0), 0)).WillOnce(Return(0)); EXPECT_TRUE(WrapAddAssociationStation(staInfo)); } HWTEST_F(ApStationsManager_test, AddAssociationStation_FAILED, TestSize.Level1) { - EXPECT_CALL(WifiSettings::GetInstance(), ManageStation(Eq(staInfo), Eq(0))).WillOnce(Return(-1)); + EXPECT_CALL(WifiSettings::GetInstance(), ManageStation(Eq(staInfo), Eq(0), 0)).WillOnce(Return(-1)); EXPECT_FALSE(WrapAddAssociationStation(staInfo)); } /* DelAssociationStation */ HWTEST_F(ApStationsManager_test, DelAssociationStation_SUCCESS, TestSize.Level1) { - EXPECT_CALL(WifiSettings::GetInstance(), ManageStation(Eq(staInfo), Eq(1))).WillOnce(Return(0)); + EXPECT_CALL(WifiSettings::GetInstance(), ManageStation(Eq(staInfo), Eq(1), 0)).WillOnce(Return(0)); EXPECT_TRUE(WrapDelAssociationStation(staInfo)); } HWTEST_F(ApStationsManager_test, DelAssociationStation_FAILED, TestSize.Level1) { - EXPECT_CALL(WifiSettings::GetInstance(), ManageStation(Eq(staInfo), Eq(1))).WillOnce(Return(-1)); + EXPECT_CALL(WifiSettings::GetInstance(), ManageStation(Eq(staInfo), Eq(1), 0)).WillOnce(Return(-1)); EXPECT_FALSE(WrapDelAssociationStation(staInfo)); } } // namespace Wifi diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager_test.cpp index 7b9bac6..08c1327 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager_test.cpp +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager_test.cpp @@ -64,7 +64,7 @@ HWTEST_F(WifiApNatManager_test, EnableInterfaceNat_SUCCESS, TestSize.Level1) { int fd = 10; MockSystemInterface::SetMockFlag(true); - EXPECT_CALL(MockSystemInterface::GetInstance(), system(_)).WillOnce(Return(-1)).WillRepeatedly(Return(fd)); + ON_CALL(MockSystemInterface::GetInstance(), system(_)).WillByDefault(Return(fd)); EXPECT_CALL(MockNetworkInterface::GetInstance(), IsValidInterfaceName(_)).WillRepeatedly(Return(true)); EXPECT_TRUE(mApNatManager.EnableInterfaceNat(true, ifc1, ifc2)); EXPECT_FALSE(mApNatManager.EnableInterfaceNat(true, ifc1, ifc1)); @@ -81,7 +81,7 @@ HWTEST_F(WifiApNatManager_test, DisableInterfaceNat_SUCCESS, TestSize.Level1) { int fd = 10; MockSystemInterface::SetMockFlag(true); - EXPECT_CALL(MockSystemInterface::GetInstance(), system(_)).WillOnce(Return(-1)).WillRepeatedly(Return(fd)); + ON_CALL(MockSystemInterface::GetInstance(), system(_)).WillByDefault(Return(fd)); EXPECT_CALL(MockNetworkInterface::GetInstance(), IsValidInterfaceName(_)).WillRepeatedly(Return(true)); EXPECT_TRUE(mApNatManager.EnableInterfaceNat(false, ifc1, ifc2)); EXPECT_FALSE(mApNatManager.EnableInterfaceNat(false, ifc1, ifc1)); @@ -105,7 +105,7 @@ HWTEST_F(WifiApNatManager_test, SetInterfaceRoute_SUCCESS, TestSize.Level1) { int fd = 10; MockSystemInterface::SetMockFlag(true); - EXPECT_CALL(MockSystemInterface::GetInstance(), system(_)).WillOnce(Return(-1)).WillRepeatedly(Return(fd)); + ON_CALL(MockSystemInterface::GetInstance(), system(_)).WillByDefault(Return(fd)); EXPECT_TRUE(WrapSetInterfaceRoute(true)); EXPECT_TRUE(WrapSetInterfaceRoute(false)); MockSystemInterface::SetMockFlag(false); @@ -115,7 +115,7 @@ HWTEST_F(WifiApNatManager_test, SetInterfaceNat_SUCCESS, TestSize.Level1) { int fd = 10; MockSystemInterface::SetMockFlag(true); - EXPECT_CALL(MockSystemInterface::GetInstance(), system(_)).WillOnce(Return(-1)).WillRepeatedly(Return(fd)); + ON_CALL(MockSystemInterface::GetInstance(), system(_)).WillByDefault(Return(fd)); EXPECT_TRUE(WrapSetInterfaceNat(true, ifc2)); EXPECT_TRUE(WrapSetInterfaceNat(false, ifc2)); MockSystemInterface::SetMockFlag(false); diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn index 3b5e01c..9a4e50c 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn @@ -22,10 +22,10 @@ config("module_private_config") { } ohos_unittest("wifi_p2p_test") { - module_out_path = "wifi_standard/p2p_test" + module_out_path = "wifi/p2p_test" sources = [ - "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hid2d_msg.cpp", - "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_msg.cpp", + "$WIFI_ROOT_DIR/frameworks/native/src/wifi_hid2d_msg.cpp", + "$WIFI_ROOT_DIR/frameworks/native/src/wifi_p2p_msg.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log/log_helper.c", @@ -120,7 +120,7 @@ ohos_unittest("wifi_p2p_test") { "./Mock", "//utils/native/base/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", - "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces", + "$WIFI_ROOT_DIR/frameworks/native/interfaces", "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", @@ -134,8 +134,8 @@ ohos_unittest("wifi_p2p_test") { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface", "$DHCP_ROOT_DIR/services/mgr_service/include", - "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/include", - "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/interfaces", + "$DHCP_ROOT_DIR/interfaces/inner_api/include", + "$DHCP_ROOT_DIR/interfaces/inner_api/interfaces", "//third_party/googletest/googlemock/include", "//third_party/googletest/googletest/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta", diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_enabled_state_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_enabled_state_test.cpp index 147479d..99639dc 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_enabled_state_test.cpp +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_enabled_state_test.cpp @@ -75,9 +75,8 @@ HWTEST_F(P2pEnabledStateTest, GoInState, TestSize.Level1) EXPECT_CALL(WifiP2PHalInterface::GetInstance(), SetP2pSsidPostfix(_)) .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_FAILED)) .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); - EXPECT_CALL(WifiP2PHalInterface::GetInstance(), SetP2pDeviceType(_)) - .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_FAILED)) - .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); + ON_CALL(WifiP2PHalInterface::GetInstance(), SetP2pDeviceType(_)) + .WillByDefault(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); EXPECT_CALL(WifiP2PHalInterface::GetInstance(), SetP2pConfigMethods(_)) .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_FAILED)) .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_state_machine_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_state_machine_test.cpp index c6a564e..1c0e085 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_state_machine_test.cpp +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_state_machine_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -692,10 +692,12 @@ HWTEST_F(P2pStateMachineTest, ReinvokePersistentGroup3, TestSize.Level1) config.SetNetId(2); AddGroupManager(); AddDeviceManagerInViteable(); - EXPECT_CALL(WifiP2PHalInterface::GetInstance(), Reinvoke(_, _)) - .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)) - .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_FAILED)); - EXPECT_CALL(WifiP2PHalInterface::GetInstance(), ListNetworks(_)).WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_FAILED)); + + ON_CALL(WifiP2PHalInterface::GetInstance(), Reinvoke(_, _)) + .WillByDefault(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); + + ON_CALL(WifiP2PHalInterface::GetInstance(), ListNetworks(_)) + .WillByDefault(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); EXPECT_TRUE(WarpReinvokePersistentGroup(config)); EXPECT_FALSE(WarpReinvokePersistentGroup(config)); } @@ -824,7 +826,8 @@ HWTEST_F(P2pStateMachineTest, DealCreateNewGroupWithConfig3, TestSize.Level1) EXPECT_CALL(WifiP2PHalInterface::GetInstance(), P2pSetGroupConfig(_, _)) .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); EXPECT_CALL(WifiP2PHalInterface::GetInstance(), GroupAdd(_, _, _)).WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); - EXPECT_CALL(WifiP2PHalInterface::GetInstance(), RemoveNetwork(_)).WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); + ON_CALL(WifiP2PHalInterface::GetInstance(), RemoveNetwork(_)) + .WillByDefault(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); EXPECT_TRUE(WarpDealCreateNewGroupWithConfig(config, freq)); } diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn index 9ea8d6b..8379c9d 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn @@ -13,13 +13,13 @@ import("//build/test.gni") import("//foundation/communication/wifi/wifi/wifi.gni") -module_output_path = "wifi_standard/scan_test" +module_output_path = "wifi/scan_test" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ "//utils/native/base/include", - "$WIFI_ROOT_DIR/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan", + "$WIFI_ROOT_DIR/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan", ] } @@ -57,7 +57,7 @@ ohos_unittest("wifi_scan_unittest") { include_dirs = [ "//utils/native/base/include", - "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces", + "$WIFI_ROOT_DIR/frameworks/native/interfaces", "$WIFI_ROOT_DIR/services/wifi_standard/sdk/include", "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", @@ -67,7 +67,7 @@ ohos_unittest("wifi_scan_unittest") { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan", - "$WIFI_ROOT_DIR/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock", + "$WIFI_ROOT_DIR/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface", diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_manager.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_manager.cpp index 4011e31..2a04619 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_manager.cpp +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_manager.cpp @@ -39,6 +39,7 @@ void WifiManager::InitScanCallback(void) mScanCallback.OnScanStopEvent = std::bind(&WifiManager::DealScanCloseRes, this); mScanCallback.OnScanFinishEvent = std::bind(&WifiManager::DealScanFinished, this, _1); mScanCallback.OnScanInfoEvent = std::bind(&WifiManager::DealScanInfoNotify, this, _1); + mScanCallback.OnStoreScanInfoEvent = std::bind(&WifiManager::DealStoreScanInfoEvent, this, _1); return; } } // namespace Wifi diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_manager.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_manager.h index bb8d74b..d13b4c0 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_manager.h +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_manager.h @@ -27,6 +27,7 @@ public: virtual void DealScanCloseRes() = 0; virtual void DealScanFinished(int state) = 0; virtual void DealScanInfoNotify(std::vector &results) = 0; + virtual void DealStoreScanInfoEvent(std::vector &results) = 0; }; class WifiManager : public MockWifiManager { @@ -40,6 +41,7 @@ public: MOCK_METHOD0(DealScanCloseRes, void()); MOCK_METHOD1(DealScanFinished, void(int state)); MOCK_METHOD1(DealScanInfoNotify, void(std::vector &results)); + MOCK_METHOD1(DealStoreScanInfoEvent, void(std::vector &results)); private: IScanSerivceCallbacks mScanCallback; diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_settings.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_settings.h index 8162760..8ffd3f9 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_settings.h +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_settings.h @@ -64,8 +64,8 @@ public: MOCK_METHOD0(GetMinRssi5Ghz, int()); MOCK_METHOD0(GetWhetherToAllowNetworkSwitchover, bool()); MOCK_METHOD1(GetDeviceConfig, int(std::vector &results)); - MOCK_METHOD0(ReloadTrustListPolicies, const std::vector&()); - MOCK_METHOD0(ReloadMovingFreezePolicy, const MovingFreezePolicy&()); + MOCK_METHOD0(ReloadTrustListPolicies, const std::vector&()); + MOCK_METHOD0(ReloadMovingFreezePolicy, const MovingFreezePolicy&()); }; } // namespace Wifi } // namespace OHOS diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface_test.cpp index 22d1f04..62cb0b1 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface_test.cpp +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -29,6 +29,7 @@ using ::testing::SetArgReferee; using ::testing::StrEq; using ::testing::TypedEq; using ::testing::ext::TestSize; +using ::testing::ReturnRef; namespace OHOS { namespace Wifi { @@ -55,6 +56,9 @@ public: extern "C" IScanService *Create(void); extern "C" void Destroy(IScanService *pservice); + +std::vector refVecTrustList; +MovingFreezePolicy defaultValue; HWTEST_F(ScanInterfaceTest, GCreateDestroy, TestSize.Level1) { auto p = Create(); @@ -67,11 +71,15 @@ HWTEST_F(ScanInterfaceTest, InitTest, TestSize.Level1) EXPECT_CALL(WifiSupplicantHalInterface::GetInstance(), RegisterSupplicantEventCallback(_)).Times(AtLeast(1)); EXPECT_CALL(WifiStaHalInterface::GetInstance(), GetSupportFrequencies(_, _)).Times(AtLeast(1)); EXPECT_CALL(WifiSettings::GetInstance(), GetScanControlInfo(_)).Times(AtLeast(1)); - EXPECT_CALL(WifiSettings::GetInstance(), GetScreenState()).Times(AtLeast(1)); EXPECT_CALL(WifiManager::GetInstance(), DealScanOpenRes()).Times(AtLeast(0)); EXPECT_CALL(WifiSupplicantHalInterface::GetInstance(), UnRegisterSupplicantEventCallback()).Times(AtLeast(1)); EXPECT_CALL(WifiSettings::GetInstance(), GetWhetherToAllowNetworkSwitchover()).Times(AtLeast(0)); EXPECT_CALL(WifiSettings::GetInstance(), GetDeviceConfig(_)).Times(AtLeast(0)); + EXPECT_CALL(WifiSettings::GetInstance(), GetAppPackageName()).WillRepeatedly(ReturnRef("")); + EXPECT_CALL(WifiSettings::GetInstance(), ReloadTrustListPolicies()) + .WillRepeatedly(ReturnRef(refVecTrustList)); + EXPECT_CALL(WifiSettings::GetInstance(), ReloadMovingFreezePolicy()) + .WillRepeatedly(ReturnRef(defaultValue)); pScanInterface->Init(); } diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service_test.cpp index 877122c..b79ead6 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service_test.cpp +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service_test.cpp @@ -25,6 +25,7 @@ using ::testing::AtLeast; using ::testing::DoAll; using ::testing::Eq; using ::testing::Return; +using ::testing::ReturnRef; using ::testing::SetArgReferee; using ::testing::StrEq; using ::testing::TypedEq; @@ -52,6 +53,8 @@ public: public: std::unique_ptr pScanService; + std::vector refVecTrustList; + MovingFreezePolicy defaultValue; void InitScanServiceSuccess1() { @@ -59,11 +62,12 @@ public: EXPECT_CALL(WifiSupplicantHalInterface::GetInstance(), RegisterSupplicantEventCallback(_)).Times(AtLeast(1)); EXPECT_CALL(WifiStaHalInterface::GetInstance(), GetSupportFrequencies(_, _)).Times(AtLeast(1)); EXPECT_CALL(WifiSettings::GetInstance(), GetScanControlInfo(_)).Times(AtLeast(1)); - EXPECT_CALL(WifiSettings::GetInstance(), GetScreenState()).Times(AtLeast(1)); EXPECT_CALL(WifiManager::GetInstance(), DealScanOpenRes()).Times(AtLeast(0)); EXPECT_CALL(WifiSupplicantHalInterface::GetInstance(), UnRegisterSupplicantEventCallback()).Times(AtLeast(1)); EXPECT_CALL(WifiSettings::GetInstance(), GetWhetherToAllowNetworkSwitchover()).Times(AtLeast(0)); EXPECT_CALL(WifiSettings::GetInstance(), GetDeviceConfig(_)).Times(AtLeast(0)); + EXPECT_CALL(WifiSettings::GetInstance(), ReloadMovingFreezePolicy()) + .WillRepeatedly(ReturnRef(defaultValue)); EXPECT_EQ(pScanService->InitScanService(WifiManager::GetInstance().GetScanCallback()), true); } @@ -79,6 +83,8 @@ public: EXPECT_CALL(WifiSupplicantHalInterface::GetInstance(), UnRegisterSupplicantEventCallback()).Times(AtLeast(1)); EXPECT_CALL(WifiSettings::GetInstance(), GetWhetherToAllowNetworkSwitchover()).Times(AtLeast(0)); EXPECT_CALL(WifiSettings::GetInstance(), GetDeviceConfig(_)).Times(AtLeast(0)); + EXPECT_CALL(WifiSettings::GetInstance(), ReloadTrustListPolicies()) + .WillRepeatedly(ReturnRef(refVecTrustList)); EXPECT_EQ(pScanService->InitScanService(WifiManager::GetInstance().GetScanCallback()), true); } @@ -90,9 +96,8 @@ public: void HandleScanStatusReportSuccess1() { - EXPECT_CALL(WifiSettings::GetInstance(), GetWhetherToAllowNetworkSwitchover()) - .Times(AtLeast(1)) - .WillRepeatedly(Return(true)); + ON_CALL(WifiSettings::GetInstance(), GetWhetherToAllowNetworkSwitchover()) + .WillByDefault(Return(true)); EXPECT_CALL(WifiManager::GetInstance(), DealScanOpenRes()).Times(AtLeast(1)); EXPECT_CALL(WifiSettings::GetInstance(), GetDeviceConfig(_)).Times(AtLeast(0)); EXPECT_CALL(WifiStaHalInterface::GetInstance(), StopPnoScan()).Times(AtLeast(0)); @@ -404,7 +409,7 @@ public: void HandleCommonScanInfoSuccess2() { - EXPECT_CALL(WifiSettings::GetInstance(), SaveScanInfoList(_)).Times(AtLeast(1)); + ON_CALL(WifiSettings::GetInstance(), SaveScanInfoList(_)).WillByDefault(Return(0)); StoreScanConfig storeScanConfig0; storeScanConfig0.fullScanFlag = true; StoreScanConfig storeScanConfig1; @@ -558,14 +563,12 @@ public: void HandleStaStatusChangedSuccess1() { - EXPECT_CALL(WifiSettings::GetInstance(), GetWhetherToAllowNetworkSwitchover()); int status = static_cast(OperateResState::DISCONNECT_DISCONNECTED); pScanService->HandleStaStatusChanged(status); } void HandleStaStatusChangedSuccess2() { - EXPECT_CALL(WifiSettings::GetInstance(), GetWhetherToAllowNetworkSwitchover()); int status = static_cast(OperateResState::CONNECT_AP_CONNECTED); pScanService->HandleStaStatusChanged(status); } @@ -594,7 +597,6 @@ public: void SystemScanProcessSuccess1() { - EXPECT_CALL(WifiSettings::GetInstance(), GetWhetherToAllowNetworkSwitchover()); ScanIntervalMode mode; mode.scanScene = SCAN_SCENE_ALL; mode.scanMode = ScanMode::SYSTEM_TIMER_SCAN; @@ -1434,7 +1436,6 @@ public: int lessThanIntervalCount = 0; const int countTest = 1; int count = countTest; - // lessThanIntervalCount = 0 branch. bool rlt = pScanService->AllowScanByIntervalContinue(continueScanTime, lessThanIntervalCount, interval, count); EXPECT_EQ(rlt, false); } diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn index 99a99c2..a6897d2 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn @@ -13,7 +13,7 @@ import("//build/test.gni") import("//foundation/communication/wifi/wifi/wifi.gni") -module_output_path = "wifi_standard/sta_test" +module_output_path = "wifi/sta_test" defines = [] defines += [ "OHOS_WIFI_STA_TEST" ] @@ -22,7 +22,7 @@ config("module_private_config") { visibility = [ ":*" ] include_dirs = [ "//utils/native/base/include", - "$WIFI_ROOT_DIR/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta", + "$WIFI_ROOT_DIR/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta", ] } @@ -70,8 +70,8 @@ ohos_unittest("wifi_sta_unittest") { "./", "./Mock", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/net_conf", - "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/include", - "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces", + "$WIFI_ROOT_DIR/frameworks/native/include", + "$WIFI_ROOT_DIR/frameworks/native/interfaces", "$WIFI_ROOT_DIR/services/wifi_standard/interface", "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", @@ -90,8 +90,8 @@ ohos_unittest("wifi_sta_unittest") { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta", "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", "$DHCP_ROOT_DIR/services/mgr_service/include", - "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/include", - "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/interfaces", + "$DHCP_ROOT_DIR/interfaces/inner_api/include", + "$DHCP_ROOT_DIR/interfaces/inner_api/interfaces", "//third_party/googletest/googlemock/include", "//third_party/googletest/googletest/include", "//base/notification/ces_standard/cesfwk/kits/native/include", @@ -118,7 +118,7 @@ ohos_unittest("wifi_sta_unittest") { "hiviewdfx_hilog_native:libhilog", "netmanager_base:net_conn_manager_if", ] - defines = [ "AP_INSTANCE_MAX_NUM=$wifi_feature_with_ap_num" ] + defines += [ "AP_INSTANCE_MAX_NUM=$wifi_feature_with_ap_num" ] part_name = "wifi" subsystem_name = "communication" } diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_settings.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_settings.h index d0fff62..c70b3a0 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_settings.h +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_settings.h @@ -65,6 +65,8 @@ public: virtual int GetScoretacticsSecurityScore() = 0; virtual std::string GetStrDnsBak() const = 0; virtual int GetScanInfoList(std::vector &results) = 0; + virtual std::string GetConnectTimeoutBssid() = 0; + virtual int SetConnectTimeoutBssid(std::string &bssid) = 0; }; class WifiSettings : public MockWifiSettings { @@ -114,6 +116,8 @@ public: MOCK_METHOD0(GetScoretacticsSecurityScore, int()); MOCK_CONST_METHOD0(GetStrDnsBak, std::string()); MOCK_METHOD1(GetScanInfoList, int(std::vector &results)); + MOCK_METHOD0(GetConnectTimeoutBssid, std::string()); + MOCK_METHOD1(SetConnectTimeoutBssid, int(std::string &bssid)); }; } // namespace OHOS } // namespace Wifi diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service_test.cpp index 41f953e..ed73da3 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service_test.cpp +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -439,7 +439,6 @@ void StaAutoConnectServiceTest::OnScanResultsReadyHandlerFail6() EXPECT_CALL(WifiSettings::GetInstance(), GetWhetherToAllowNetworkSwitchover()) .Times(AtLeast(1)) .WillOnce(Return(true)); - EXPECT_CALL(WifiSettings::GetInstance(), GetDeviceConfig(_)).Times(AtLeast(1)); EXPECT_CALL(*(pMockDeviceAppraisal), DeviceAppraisals(_, _, _)).WillOnce(Return(WIFI_OPT_FAILED)); pStaAutoConnectService->OnScanInfosReadyHandler(scanInfos); @@ -842,8 +841,10 @@ void StaAutoConnectServiceTest::ConnectElectedDeviceFail1() GetWifiLinkedInfo(info); GetWifiDeviceConfig(deviceConfig); info.detailedState = DetailedState::INVALID; - - EXPECT_CALL(WifiSettings::GetInstance(), GetLinkedInfo(_)).WillOnce(DoAll(SetArgReferee<0>(info), Return(0))); + EXPECT_CALL(WifiSettings::GetInstance(), GetLinkedInfo(_)) + .Times(AtLeast(0)) + .WillOnce(DoAll(SetArgReferee<0>(info), Return(0))) + .WillRepeatedly(DoAll(SetArgReferee<0>(info), Return(0))); pStaAutoConnectService->ConnectElectedDevice(deviceConfig); } diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal_test.cpp index d9d7453..d5660d2 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal_test.cpp +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal_test.cpp @@ -28,6 +28,7 @@ using ::testing::AtLeast; using ::testing::DoAll; using ::testing::Eq; using ::testing::Return; +using ::testing::ReturnRef; using ::testing::SetArgReferee; using ::testing::StrEq; using ::testing::TypedEq; @@ -129,6 +130,10 @@ void StaSavedDeviceAppraisalTest::SaveNetworkEvaluatorSuccess1() .WillOnce(DoAll(SetArgReferee<2>(deviceConfig), Return(0))); EXPECT_CALL(WifiSettings::GetInstance(), GetSignalLevel(_, _)).Times(AtLeast(0)); EXPECT_CALL(WifiSettings::GetInstance(), GetUserLastSelectedNetworkId()).Times(AtLeast(1)).WillOnce(Return(0)); + EXPECT_CALL(WifiSettings::GetInstance(), GetConnectTimeoutBssid()) + .Times(AtLeast(1)) + .WillOnce(Return("")) + .WillRepeatedly(Return("")); EXPECT_TRUE(pStaSavedDeviceAppraisal->DeviceAppraisals(deviceConfig, scanInfos, info) == WIFI_OPT_SUCCESS); } @@ -221,7 +226,7 @@ void StaSavedDeviceAppraisalTest::WhetherSkipDeviceSuccess1() deviceConfig.isEphemeral = false; deviceConfig.status = static_cast(WifiDeviceConfigStatus::ENABLED); - EXPECT_TRUE(pStaSavedDeviceAppraisal->WhetherSkipDevice(deviceConfig) == true); + EXPECT_TRUE(pStaSavedDeviceAppraisal->WhetherSkipDevice(deviceConfig) == false); } void StaSavedDeviceAppraisalTest::WhetherSkipDeviceFail1() @@ -231,7 +236,7 @@ void StaSavedDeviceAppraisalTest::WhetherSkipDeviceFail1() deviceConfig.isPasspoint = true; deviceConfig.isEphemeral = true; deviceConfig.status = static_cast(WifiDeviceConfigStatus::ENABLED); - EXPECT_TRUE(pStaSavedDeviceAppraisal->WhetherSkipDevice(deviceConfig) == false); + EXPECT_TRUE(pStaSavedDeviceAppraisal->WhetherSkipDevice(deviceConfig) == true); } HWTEST_F(StaSavedDeviceAppraisalTest, SaveNetworkEvaluatorSuccess1, TestSize.Level1) diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine_test.cpp index 30c5ad7..4e9daf6 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine_test.cpp +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine_test.cpp @@ -87,7 +87,7 @@ public: void DealConnectTimeOutCmd() { - EXPECT_CALL(WifiSettings::GetInstance(), SaveLinkedInfo(_)); + EXPECT_CALL(WifiSettings::GetInstance(), SaveLinkedInfo(_)).WillRepeatedly(Return(0)); EXPECT_CALL(WifiStaHalInterface::GetInstance(), DisableNetwork(_)).WillRepeatedly(Return(WIFI_IDL_OPT_FAILED)); EXPECT_CALL(WifiManager::GetInstance(), DealStaConnChanged(_, _)).Times(testing::AtLeast(1)); InternalMessage msg; @@ -466,7 +466,6 @@ public: void DealReassociateCmdSuccess() { - EXPECT_CALL(WifiSettings::GetInstance(), GetUserLastSelectedNetworkTimeVal()); EXPECT_CALL(WifiStaHalInterface::GetInstance(), Reassociate()).WillRepeatedly(Return(WIFI_IDL_OPT_OK)); EXPECT_CALL(WifiManager::GetInstance(), DealStaConnChanged(_, _)).Times(testing::AtLeast(0)); InternalMessage msg; @@ -475,7 +474,6 @@ public: void DealReassociateCmdFail1() { - EXPECT_CALL(WifiSettings::GetInstance(), GetUserLastSelectedNetworkTimeVal()); EXPECT_CALL(WifiStaHalInterface::GetInstance(), Reassociate()).WillRepeatedly(Return(WIFI_IDL_OPT_FAILED)); EXPECT_CALL(WifiManager::GetInstance(), DealStaConnChanged(_, _)).Times(testing::AtLeast(0)); pStaStateMachine->DealReassociateCmd(nullptr); @@ -483,7 +481,6 @@ public: void DealReassociateCmdFail2() { - EXPECT_CALL(WifiSettings::GetInstance(), GetUserLastSelectedNetworkTimeVal()); EXPECT_CALL(WifiStaHalInterface::GetInstance(), Reassociate()).WillRepeatedly(Return(WIFI_IDL_OPT_FAILED)); pStaStateMachine->DealReassociateCmd(nullptr); } @@ -918,7 +915,7 @@ public: void WpsStateExeMsgSuccess1() { EXPECT_CALL(WifiSettings::GetInstance(), SetWifiState(_)).Times(AtLeast(0)); - EXPECT_CALL(WifiSettings::GetInstance(), SaveLinkedInfo(_)); + EXPECT_CALL(WifiSettings::GetInstance(), SaveLinkedInfo(_)).Times(AtLeast(0)).WillRepeatedly(Return(0)); EXPECT_CALL(WifiSettings::GetInstance(), GetDeviceConfig(_)).Times(AtLeast(0)).WillRepeatedly(Return(0)); EXPECT_CALL(WifiSettings::GetInstance(), AddDeviceConfig(_)).Times(AtLeast(0)); EXPECT_CALL(WifiSettings::GetInstance(), SyncDeviceConfig()).Times(AtLeast(0)); diff --git a/wifi/test/wifi_standard/wifi_hal/unittest/BUILD.gn b/wifi/test/wifi_standard/wifi_hal/unittest/BUILD.gn index fb1a94f..0484207 100644 --- a/wifi/test/wifi_standard/wifi_hal/unittest/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_hal/unittest/BUILD.gn @@ -13,13 +13,13 @@ import("//build/test.gni") import("//foundation/communication/wifi/wifi/wifi.gni") -module_output_path = "wifi_standard/wifi_hal_test" +module_output_path = "wifi/wifi_hal_test" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ "//utils/native/base/include", - "$WIFI_ROOT_DIR/tests/wifi_standard/wifi_hal/unittest", + "$WIFI_ROOT_DIR/test/wifi_standard/wifi_hal/unittest", ] } @@ -27,6 +27,7 @@ ohos_unittest("wifi_hal_unittest") { module_out_path = module_output_path sources = [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/common/wifi_hal_common_func.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/hdi/wifi_hdi_ap_instance.c", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_adapter.c", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_base_interface.c", @@ -77,6 +78,7 @@ ohos_unittest("wifi_hal_unittest") { "//third_party/bounds_checking_function/include/", "//drivers/peripheral/wlan/interfaces/include/", "//drivers/peripheral/wlan/client/include/", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/hdi", ] deps = [ diff --git a/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_ap_interface_test.cpp b/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_ap_interface_test.cpp index eea026a..2a8ca03 100644 --- a/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_ap_interface_test.cpp +++ b/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_ap_interface_test.cpp @@ -30,31 +30,31 @@ void WifiHalApInterfaceTest::SetUpTestCase() HWTEST_F(WifiHalApInterfaceTest, StartSoftApTest, TestSize.Level1) { - EXPECT_TRUE(StartSoftAp() == WIFI_HAL_SUCCESS); + EXPECT_TRUE(StartSoftAp(0) == WIFI_HAL_SUCCESS); } HWTEST_F(WifiHalApInterfaceTest, GetStaInfosTest, TestSize.Level1) { char infos[4096] = {0}; int size = 4096; - EXPECT_TRUE(GetStaInfos(NULL, NULL) == WIFI_HAL_FAILED); - EXPECT_TRUE(GetStaInfos(infos, NULL) == WIFI_HAL_FAILED); - EXPECT_TRUE(GetStaInfos(NULL, &size) == WIFI_HAL_FAILED); - EXPECT_TRUE(GetStaInfos(infos, &size) == WIFI_HAL_SUCCESS); + EXPECT_TRUE(GetStaInfos(NULL, NULL, 0) == WIFI_HAL_FAILED); + EXPECT_TRUE(GetStaInfos(infos, NULL, 0) == WIFI_HAL_FAILED); + EXPECT_TRUE(GetStaInfos(NULL, &size, 0) == WIFI_HAL_FAILED); + EXPECT_TRUE(GetStaInfos(infos, &size, 0) == WIFI_HAL_SUCCESS); } HWTEST_F(WifiHalApInterfaceTest, SetCountryCodeTest, TestSize.Level1) { - EXPECT_TRUE(SetCountryCode(NULL) == WIFI_HAL_INVALID_PARAM); - EXPECT_TRUE(SetCountryCode("") == WIFI_HAL_INVALID_PARAM); - EXPECT_TRUE(SetCountryCode("C") == WIFI_HAL_INVALID_PARAM); - EXPECT_TRUE(SetCountryCode("CN") == WIFI_HAL_SUCCESS); - EXPECT_TRUE(SetCountryCode("CHINA") == WIFI_HAL_INVALID_PARAM); + EXPECT_TRUE(SetCountryCode(NULL, 0) == WIFI_HAL_INVALID_PARAM); + EXPECT_TRUE(SetCountryCode("", 0) == WIFI_HAL_INVALID_PARAM); + EXPECT_TRUE(SetCountryCode("C", 0) == WIFI_HAL_INVALID_PARAM); + EXPECT_TRUE(SetCountryCode("CN", 0) == WIFI_HAL_SUCCESS); + EXPECT_TRUE(SetCountryCode("CHINA", 0) == WIFI_HAL_INVALID_PARAM); } HWTEST_F(WifiHalApInterfaceTest, SetHostapdConfigTest, TestSize.Level1) { - EXPECT_TRUE(SetHostapdConfig(NULL) == WIFI_HAL_FAILED); + EXPECT_TRUE(SetHostapdConfig(NULL, 0) == WIFI_HAL_FAILED); HostapdConfig config; ASSERT_TRUE(memset_s(&config, sizeof(config), 0, sizeof(config)) == EOK); config.band = AP_2GHZ_BAND; @@ -65,40 +65,40 @@ HWTEST_F(WifiHalApInterfaceTest, SetHostapdConfigTest, TestSize.Level1) config.ssidLen = strlen(config.ssid); StrSafeCopy(config.preSharedKey, sizeof(config.preSharedKey), "adc123456"); config.preSharedKeyLen = strlen(config.preSharedKey); - EXPECT_TRUE(SetHostapdConfig(&config) == WIFI_HAL_SUCCESS); + EXPECT_TRUE(SetHostapdConfig(&config, 0) == WIFI_HAL_SUCCESS); } HWTEST_F(WifiHalApInterfaceTest, SetMacFilterTest, TestSize.Level1) { - EXPECT_TRUE(SetMacFilter(NULL, 0) == WIFI_HAL_FAILED); + EXPECT_TRUE(SetMacFilter(NULL, 0, 0) == WIFI_HAL_FAILED); unsigned char tmpMac[] = "00:00:00:00:00"; - EXPECT_TRUE(SetMacFilter(tmpMac, strlen((const char *)tmpMac)) == WIFI_HAL_FAILED); + EXPECT_TRUE(SetMacFilter(tmpMac, strlen((const char *)tmpMac), 0) == WIFI_HAL_FAILED); unsigned char tmpMac2[] = "00.00.00.00.00.00"; - EXPECT_TRUE(SetMacFilter(tmpMac2, strlen((const char *)tmpMac2)) == WIFI_HAL_INPUT_MAC_INVALID); + EXPECT_TRUE(SetMacFilter(tmpMac2, strlen((const char *)tmpMac2), 0) == WIFI_HAL_INPUT_MAC_INVALID); unsigned char mac[] = "00:00:00:00:00:00"; - EXPECT_TRUE(SetMacFilter(mac, strlen((const char *)mac)) == WIFI_HAL_SUCCESS); + EXPECT_TRUE(SetMacFilter(mac, strlen((const char *)mac), 0) == WIFI_HAL_SUCCESS); } HWTEST_F(WifiHalApInterfaceTest, DelMacFilterTest, TestSize.Level1) { - EXPECT_TRUE(DelMacFilter(NULL, 0) == WIFI_HAL_FAILED); + EXPECT_TRUE(DelMacFilter(NULL, 0, 0) == WIFI_HAL_FAILED); unsigned char tmpMac[] = "00:00:00:00:00"; - EXPECT_TRUE(DelMacFilter(tmpMac, strlen((const char *)tmpMac)) == WIFI_HAL_FAILED); + EXPECT_TRUE(DelMacFilter(tmpMac, strlen((const char *)tmpMac), 0) == WIFI_HAL_FAILED); unsigned char tmpMac2[] = "00.00.00.00.00.00"; - EXPECT_TRUE(DelMacFilter(tmpMac2, strlen((const char *)tmpMac2)) == WIFI_HAL_INPUT_MAC_INVALID); + EXPECT_TRUE(DelMacFilter(tmpMac2, strlen((const char *)tmpMac2), 0) == WIFI_HAL_INPUT_MAC_INVALID); unsigned char mac[] = "00:00:00:00:00:00"; - EXPECT_TRUE(DelMacFilter(mac, strlen((const char *)mac)) == WIFI_HAL_SUCCESS); + EXPECT_TRUE(DelMacFilter(mac, strlen((const char *)mac), 0) == WIFI_HAL_SUCCESS); } HWTEST_F(WifiHalApInterfaceTest, DisassociateStaTest, TestSize.Level1) { - EXPECT_TRUE(DisassociateSta(NULL, 0) == WIFI_HAL_FAILED); + EXPECT_TRUE(DisassociateSta(NULL, 0, 0) == WIFI_HAL_FAILED); unsigned char tmpMac[] = "00:00:00:00:00"; - EXPECT_TRUE(DisassociateSta(tmpMac, strlen((const char *)tmpMac)) == WIFI_HAL_FAILED); + EXPECT_TRUE(DisassociateSta(tmpMac, strlen((const char *)tmpMac), 0) == WIFI_HAL_FAILED); unsigned char tmpMac2[] = "00.00.00.00.00.00"; - EXPECT_TRUE(DisassociateSta(tmpMac2, strlen((const char *)tmpMac2)) == WIFI_HAL_INPUT_MAC_INVALID); + EXPECT_TRUE(DisassociateSta(tmpMac2, strlen((const char *)tmpMac2), 0) == WIFI_HAL_INPUT_MAC_INVALID); unsigned char mac[] = "00:00:00:00:00:00"; - EXPECT_TRUE(DisassociateSta(mac, strlen((const char *)mac)) == WIFI_HAL_SUCCESS); + EXPECT_TRUE(DisassociateSta(mac, strlen((const char *)mac), 0) == WIFI_HAL_SUCCESS); } HWTEST_F(WifiHalApInterfaceTest, GetValidFrequenciesForBandTest, TestSize.Level1) @@ -106,16 +106,16 @@ HWTEST_F(WifiHalApInterfaceTest, GetValidFrequenciesForBandTest, TestSize.Level1 int32_t band = AP_2GHZ_BAND; int frequencies[20] = {0}; int size = 20; - EXPECT_TRUE(GetValidFrequenciesForBand(band, NULL, NULL) == WIFI_HAL_FAILED); - EXPECT_TRUE(GetValidFrequenciesForBand(band, frequencies, NULL) == WIFI_HAL_FAILED); - EXPECT_TRUE(GetValidFrequenciesForBand(band, NULL, &size) == WIFI_HAL_FAILED); - WifiErrorNo err = GetValidFrequenciesForBand(band, frequencies, &size); + EXPECT_TRUE(GetValidFrequenciesForBand(band, NULL, NULL, 0) == WIFI_HAL_FAILED); + EXPECT_TRUE(GetValidFrequenciesForBand(band, frequencies, NULL, 0) == WIFI_HAL_FAILED); + EXPECT_TRUE(GetValidFrequenciesForBand(band, NULL, &size, 0) == WIFI_HAL_FAILED); + WifiErrorNo err = GetValidFrequenciesForBand(band, frequencies, &size, 0); EXPECT_TRUE(err == WIFI_HAL_SUCCESS || err == WIFI_HAL_NOT_SUPPORT); } HWTEST_F(WifiHalApInterfaceTest, StopSoftApTest, TestSize.Level1) { - EXPECT_TRUE(StopSoftAp() == WIFI_HAL_SUCCESS); + EXPECT_TRUE(StopSoftAp(0) == WIFI_HAL_SUCCESS); } } // namespace Wifi } // namespace OHOS \ No newline at end of file diff --git a/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_chip_interface_test.cpp b/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_chip_interface_test.cpp index 62bea0d..174f599 100644 --- a/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_chip_interface_test.cpp +++ b/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_chip_interface_test.cpp @@ -98,9 +98,9 @@ HWTEST_F(WifiHalChipInterfaceTest, RequestFirmwareDebugDumpTest, TestSize.Level1 EXPECT_TRUE(RequestFirmwareDebugDump(bytes, &size) == WIFI_HAL_NOT_SUPPORT); } -HWTEST_F(WifiHalChipInterfaceTest, SetPowerModeTest, TestSize.Level1) +HWTEST_F(WifiHalChipInterfaceTest, WifiServiceSetPowerModeTest, TestSize.Level1) { - EXPECT_TRUE(SetPowerMode(0) == WIFI_HAL_SUCCESS); + EXPECT_TRUE(WifiServiceSetPowerMode(0) == WIFI_HAL_SUCCESS); } } // namespace Wifi } // namespace OHOS \ No newline at end of file diff --git a/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_add_test.cpp b/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_add_test.cpp index 2d2f949..6ef6a36 100644 --- a/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_add_test.cpp +++ b/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_add_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -86,14 +86,14 @@ HWTEST_F(WifiHalCRpcServerAddTest, RpcP2pStopTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerAddTest, RpcP2pSetRandomMacTest, TestSize.Level1) { EXPECT_TRUE(RpcP2pSetRandomMac(nullptr, nullptr) < 0); - char buff[] = "N|P2pSetRandomMac|1"; + char buff[] = "N\tP2pSetRandomMac\t1"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|P2pSetRandomMac|"); + mContext->nPos = strlen("N\tP2pSetRandomMac\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcP2pSetRandomMac(mServer, mContext) < 0); - char buff1[] = "N|P2pSetRandomMac|1|"; + char buff1[] = "N\tP2pSetRandomMac\t1\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|P2pSetRandomMac|"); + mContext->nPos = strlen("N\tP2pSetRandomMac\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcP2pSetRandomMac(mServer, mContext) == 0); } @@ -101,14 +101,14 @@ HWTEST_F(WifiHalCRpcServerAddTest, RpcP2pSetRandomMacTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerAddTest, RpcP2pSetDeviceNameTest, TestSize.Level1) { EXPECT_TRUE(RpcP2pSetDeviceName(nullptr, nullptr) < 0); - char buff[] = "N|P2pSetDeviceName|p2p_device_name"; + char buff[] = "N\tP2pSetDeviceName\tp2p_device_name"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|P2pSetDeviceName|"); + mContext->nPos = strlen("N\tP2pSetDeviceName\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcP2pSetDeviceName(mServer, mContext) < 0); - char buff1[] = "N|P2pSetDeviceName|p2p_device_name|"; + char buff1[] = "N\tP2pSetDeviceName\tp2p_device_name\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|P2pSetDeviceName|"); + mContext->nPos = strlen("N\tP2pSetDeviceName\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcP2pSetDeviceName(mServer, mContext) == 0); } @@ -116,14 +116,14 @@ HWTEST_F(WifiHalCRpcServerAddTest, RpcP2pSetDeviceNameTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerAddTest, RpcP2pSetSsidPostfixNameTest, TestSize.Level1) { EXPECT_TRUE(RpcP2pSetSsidPostfixName(nullptr, nullptr) < 0); - char buff[] = "N|P2pSetSsidPostfixName|p2p_postfix_name"; + char buff[] = "N\tP2pSetSsidPostfixName\tp2p_postfix_name"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|P2pSetSsidPostfixName|"); + mContext->nPos = strlen("N\tP2pSetSsidPostfixName\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcP2pSetSsidPostfixName(mServer, mContext) < 0); - char buff1[] = "N|P2pSetSsidPostfixName|p2p_postfix_name|"; + char buff1[] = "N\tP2pSetSsidPostfixName\tp2p_postfix_name\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|P2pSetSsidPostfixName|"); + mContext->nPos = strlen("N\tP2pSetSsidPostfixName\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcP2pSetSsidPostfixName(mServer, mContext) == 0); } @@ -131,14 +131,14 @@ HWTEST_F(WifiHalCRpcServerAddTest, RpcP2pSetSsidPostfixNameTest, TestSize.Level1 HWTEST_F(WifiHalCRpcServerAddTest, RpcP2pSetWpsDeviceTypeTest, TestSize.Level1) { EXPECT_TRUE(RpcP2pSetWpsDeviceType(nullptr, nullptr) < 0); - char buff[] = "N|P2pSetWpsDeviceType|p2p_device_type"; + char buff[] = "N\tP2pSetWpsDeviceType\tp2p_device_type"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|P2pSetWpsDeviceType|"); + mContext->nPos = strlen("N\tP2pSetWpsDeviceType\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcP2pSetWpsDeviceType(mServer, mContext) < 0); - char buff1[] = "N|P2pSetWpsDeviceType|p2p_device_type|"; + char buff1[] = "N\tP2pSetWpsDeviceType\tp2p_device_type\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|P2pSetWpsDeviceType|"); + mContext->nPos = strlen("N\tP2pSetWpsDeviceType\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcP2pSetWpsDeviceType(mServer, mContext) == 0); } @@ -146,14 +146,14 @@ HWTEST_F(WifiHalCRpcServerAddTest, RpcP2pSetWpsDeviceTypeTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerAddTest, RpcP2pSetWpsConfigMethodsTest, TestSize.Level1) { EXPECT_TRUE(RpcP2pSetWpsConfigMethods(nullptr, nullptr) < 0); - char buff[] = "N|P2pSetWpsConfigMethods|p2p_config_methods"; + char buff[] = "N\tP2pSetWpsConfigMethods\tp2p_config_methods"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|P2pSetWpsConfigMethods|"); + mContext->nPos = strlen("N\tP2pSetWpsConfigMethods\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcP2pSetWpsConfigMethods(mServer, mContext) < 0); - char buff1[] = "N|P2pSetWpsConfigMethods|p2p_config_methods|"; + char buff1[] = "N\tP2pSetWpsConfigMethods\tp2p_config_methods\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|P2pSetWpsConfigMethods|"); + mContext->nPos = strlen("N\tP2pSetWpsConfigMethods\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcP2pSetWpsConfigMethods(mServer, mContext) == 0); } @@ -161,19 +161,19 @@ HWTEST_F(WifiHalCRpcServerAddTest, RpcP2pSetWpsConfigMethodsTest, TestSize.Level HWTEST_F(WifiHalCRpcServerAddTest, RpcP2pGetDeviceAddressTest, TestSize.Level1) { EXPECT_TRUE(RpcP2pGetDeviceAddress(nullptr, nullptr) < 0); - char buff[] = "N|P2pGetDeviceAddress|17"; + char buff[] = "N\tP2pGetDeviceAddress\t17"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|P2pGetDeviceAddress|"); + mContext->nPos = strlen("N\tP2pGetDeviceAddress\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcP2pGetDeviceAddress(mServer, mContext) < 0); - char buff1[] = "N|P2pGetDeviceAddress|17|"; + char buff1[] = "N\tP2pGetDeviceAddress\t17\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|P2pGetDeviceAddress|"); + mContext->nPos = strlen("N\tP2pGetDeviceAddress\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcP2pGetDeviceAddress(mServer, mContext) == 0); - char buff2[] = "N|P2pGetDeviceAddress|-1|"; + char buff2[] = "N\tP2pGetDeviceAddress\t-1\t"; mContext->oneProcess = buff2; - mContext->nPos = strlen("N|P2pGetDeviceAddress|"); + mContext->nPos = strlen("N\tP2pGetDeviceAddress\t"); mContext->nSize = strlen(buff2); EXPECT_TRUE(RpcP2pGetDeviceAddress(mServer, mContext) < 0); } @@ -199,14 +199,14 @@ HWTEST_F(WifiHalCRpcServerAddTest, RpcP2pSaveConfigTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerAddTest, RpcP2pSetupWpsPbcTest, TestSize.Level1) { EXPECT_TRUE(RpcP2pSetupWpsPbc(nullptr, nullptr) < 0); - char buff[] = "N|P2pSetupWpsPbc|p2p-dev-wlan0|00:00:00:00:00:00"; + char buff[] = "N\tP2pSetupWpsPbc\tp2p-dev-wlan0\t00:00:00:00:00:00"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|P2pSetupWpsPbc|"); + mContext->nPos = strlen("N\tP2pSetupWpsPbc\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcP2pSetupWpsPbc(mServer, mContext) < 0); - char buff1[] = "N|P2pSetupWpsPbc|p2p-dev-wlan0|00:00:00:00:00:00|"; + char buff1[] = "N\tP2pSetupWpsPbc\tp2p-dev-wlan0\t00:00:00:00:00:00\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|P2pSetupWpsPbc|"); + mContext->nPos = strlen("N\tP2pSetupWpsPbc\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcP2pSetupWpsPbc(mServer, mContext) == 0); } @@ -214,14 +214,14 @@ HWTEST_F(WifiHalCRpcServerAddTest, RpcP2pSetupWpsPbcTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerAddTest, RpcP2pSetupWpsPinTest, TestSize.Level1) { EXPECT_TRUE(RpcP2pSetupWpsPin(nullptr, nullptr) < 0); - char buff[] = "N|P2pSetupWpsPin|p2p-dev-wlan0|00:00:00:00:00:00|123456789|8|"; + char buff[] = "N\tP2pSetupWpsPiN\tp2p-dev-wlan0\t00:00:00:00:00:00\t123456789\t8\t"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|P2pSetupWpsPin|"); + mContext->nPos = strlen("N\tP2pSetupWpsPiN\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcP2pSetupWpsPin(mServer, mContext) < 0); - char buff1[] = "N|P2pSetupWpsPin|p2p-dev-wlan0|00:00:00:00:00:00|12345678|8|"; + char buff1[] = "N\tP2pSetupWpsPiN\tp2p-dev-wlan0\t00:00:00:00:00:00\t12345678\t8\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|P2pSetupWpsPin|"); + mContext->nPos = strlen("N\tP2pSetupWpsPiN\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcP2pSetupWpsPin(mServer, mContext) == 0); } @@ -229,14 +229,14 @@ HWTEST_F(WifiHalCRpcServerAddTest, RpcP2pSetupWpsPinTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerAddTest, RpcP2pRemoveNetworkTest, TestSize.Level1) { EXPECT_TRUE(RpcP2pRemoveNetwork(nullptr, nullptr) < 0); - char buff[] = "N|P2pRemoveNetwork|1"; + char buff[] = "N\tP2pRemoveNetwork\t1"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|P2pRemoveNetwork|"); + mContext->nPos = strlen("N\tP2pRemoveNetwork\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcP2pRemoveNetwork(mServer, mContext) < 0); - char buff1[] = "N|P2pRemoveNetwork|1|"; + char buff1[] = "N\tP2pRemoveNetwork\t1\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|P2pRemoveNetwork|"); + mContext->nPos = strlen("N\tP2pRemoveNetwork\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcP2pRemoveNetwork(mServer, mContext) == 0); } @@ -250,14 +250,14 @@ HWTEST_F(WifiHalCRpcServerAddTest, RpcP2pListNetworksTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerAddTest, RpcP2pSetGroupMaxIdleTest, TestSize.Level1) { EXPECT_TRUE(RpcP2pSetGroupMaxIdle(nullptr, nullptr) < 0); - char buff[] = "N|P2pSetGroupMaxIdle|p2p-dev-wlan0|1"; + char buff[] = "N\tP2pSetGroupMaxIdle\tp2p-dev-wlan0\t1"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|P2pSetGroupMaxIdle|"); + mContext->nPos = strlen("N\tP2pSetGroupMaxIdle\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcP2pSetGroupMaxIdle(mServer, mContext) < 0); - char buff1[] = "N|P2pSetGroupMaxIdle|p2p-dev-wlan0|1|"; + char buff1[] = "N\tP2pSetGroupMaxIdle\tp2p-dev-wlan0\t1\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|P2pSetGroupMaxIdle|"); + mContext->nPos = strlen("N\tP2pSetGroupMaxIdle\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcP2pSetGroupMaxIdle(mServer, mContext) == 0); } @@ -265,14 +265,14 @@ HWTEST_F(WifiHalCRpcServerAddTest, RpcP2pSetGroupMaxIdleTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerAddTest, RpcP2pSetPowerSaveTest, TestSize.Level1) { EXPECT_TRUE(RpcP2pSetPowerSave(nullptr, nullptr) < 0); - char buff[] = "N|P2pSetPowerSave|p2p-dev-wlan0|1"; + char buff[] = "N\tP2pSetPowerSave\tp2p-dev-wlan0\t1"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|P2pSetPowerSave|"); + mContext->nPos = strlen("N\tP2pSetPowerSave\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcP2pSetPowerSave(mServer, mContext) < 0); - char buff1[] = "N|P2pSetPowerSave|p2p-dev-wlan0|1|"; + char buff1[] = "N\tP2pSetPowerSave\tp2p-dev-wlan0\t1\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|P2pSetPowerSave|"); + mContext->nPos = strlen("N\tP2pSetPowerSave\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcP2pSetPowerSave(mServer, mContext) == 0); } @@ -280,14 +280,14 @@ HWTEST_F(WifiHalCRpcServerAddTest, RpcP2pSetPowerSaveTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerAddTest, RpcP2pSetWfdEnableTest, TestSize.Level1) { EXPECT_TRUE(RpcP2pSetWfdEnable(nullptr, nullptr) < 0); - char buff[] = "N|P2pSetWfdEnable|1"; + char buff[] = "N\tP2pSetWfdEnable\t1"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|P2pSetWfdEnable|"); + mContext->nPos = strlen("N\tP2pSetWfdEnable\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcP2pSetWfdEnable(mServer, mContext) < 0); - char buff1[] = "N|P2pSetWfdEnable|1|"; + char buff1[] = "N\tP2pSetWfdEnable\t1\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|P2pSetWfdEnable|"); + mContext->nPos = strlen("N\tP2pSetWfdEnable\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcP2pSetWfdEnable(mServer, mContext) == 0); } @@ -295,14 +295,14 @@ HWTEST_F(WifiHalCRpcServerAddTest, RpcP2pSetWfdEnableTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerAddTest, RpcP2pSetWfdDeviceConfigTest, TestSize.Level1) { EXPECT_TRUE(RpcP2pSetWfdDeviceConfig(nullptr, nullptr) < 0); - char buff[] = "N|P2pSetWfdDeviceConfig|p2p_device_config"; + char buff[] = "N\tP2pSetWfdDeviceConfig\tp2p_device_config"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|P2pSetWfdDeviceConfig|"); + mContext->nPos = strlen("N\tP2pSetWfdDeviceConfig\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcP2pSetWfdDeviceConfig(mServer, mContext) < 0); - char buff1[] = "N|P2pSetWfdDeviceConfig|p2p_device_config|"; + char buff1[] = "N\tP2pSetWfdDeviceConfig\tp2p_device_config\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|P2pSetWfdDeviceConfig|"); + mContext->nPos = strlen("N\tP2pSetWfdDeviceConfig\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcP2pSetWfdDeviceConfig(mServer, mContext) == 0); } @@ -310,14 +310,14 @@ HWTEST_F(WifiHalCRpcServerAddTest, RpcP2pSetWfdDeviceConfigTest, TestSize.Level1 HWTEST_F(WifiHalCRpcServerAddTest, RpcP2pStartFindTest, TestSize.Level1) { EXPECT_TRUE(RpcP2pStartFind(nullptr, nullptr) < 0); - char buff[] = "N|P2pStartFind|120"; + char buff[] = "N\tP2pStartFind\t120"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|P2pStartFind|"); + mContext->nPos = strlen("N\tP2pStartFind\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcP2pStartFind(mServer, mContext) < 0); - char buff1[] = "N|P2pStartFind|120|"; + char buff1[] = "N\tP2pStartFind\t120\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|P2pStartFind|"); + mContext->nPos = strlen("N\tP2pStartFind\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcP2pStartFind(mServer, mContext) == 0); } @@ -331,14 +331,14 @@ HWTEST_F(WifiHalCRpcServerAddTest, RpcP2pStopFindTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerAddTest, RpcP2pSetExtListenTest, TestSize.Level1) { EXPECT_TRUE(RpcP2pSetExtListen(nullptr, nullptr) < 0); - char buff[] = "N|P2pSetExtListen|0|0|0"; + char buff[] = "N\tP2pSetExtListeN\t0\t0\t0"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|P2pSetExtListen|"); + mContext->nPos = strlen("N\tP2pSetExtListeN\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcP2pSetExtListen(mServer, mContext) < 0); - char buff1[] = "N|P2pSetExtListen|0|0|0|"; + char buff1[] = "N\tP2pSetExtListeN\t0\t0\t0\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|P2pSetExtListen|"); + mContext->nPos = strlen("N\tP2pSetExtListeN\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcP2pSetExtListen(mServer, mContext) == 0); } @@ -346,14 +346,14 @@ HWTEST_F(WifiHalCRpcServerAddTest, RpcP2pSetExtListenTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerAddTest, RpcP2pSetListenChannelTest, TestSize.Level1) { EXPECT_TRUE(RpcP2pSetListenChannel(nullptr, nullptr) < 0); - char buff[] = "N|P2pSetListenChannel|0|0"; + char buff[] = "N\tP2pSetListenChannel\t0\t0"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|P2pSetListenChannel|"); + mContext->nPos = strlen("N\tP2pSetListenChannel\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcP2pSetListenChannel(mServer, mContext) < 0); - char buff1[] = "N|P2pSetListenChannel|0|0|"; + char buff1[] = "N\tP2pSetListenChannel\t0\t0\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|P2pSetListenChannel|"); + mContext->nPos = strlen("N\tP2pSetListenChannel\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcP2pSetListenChannel(mServer, mContext) == 0); } @@ -361,19 +361,19 @@ HWTEST_F(WifiHalCRpcServerAddTest, RpcP2pSetListenChannelTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerAddTest, RpcP2pConnectTest, TestSize.Level1) { EXPECT_TRUE(RpcP2pConnect(nullptr, nullptr) < 0); - char buff[] = "N|P2pConnect|0|0|0|0|00:00:00:00:00:00|12345678"; + char buff[] = "N\tP2pConnect\t0\t0\t0\t0\t00:00:00:00:00:00\t12345678"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|P2pConnect|"); + mContext->nPos = strlen("N\tP2pConnect\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcP2pConnect(mServer, mContext) < 0); - char buff1[] = "N|P2pConnect|0|0|0|0|00:00:00:00:00:00|12345678|"; + char buff1[] = "N\tP2pConnect\t0\t0\t0\t0\t00:00:00:00:00:00\t12345678\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|P2pConnect|"); + mContext->nPos = strlen("N\tP2pConnect\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcP2pConnect(mServer, mContext) == 0); - char buff2[] = "N|P2pConnect|0|1|0|0|00:00:00:00:00:00|pin|"; + char buff2[] = "N\tP2pConnect\t0\t1\t0\t0\t00:00:00:00:00:00\tpiN\t"; mContext->oneProcess = buff2; - mContext->nPos = strlen("N|P2pConnect|"); + mContext->nPos = strlen("N\tP2pConnect\t"); mContext->nSize = strlen(buff2); EXPECT_TRUE(RpcP2pConnect(mServer, mContext) == 0); } @@ -387,14 +387,14 @@ HWTEST_F(WifiHalCRpcServerAddTest, RpcP2pCancelConnectTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerAddTest, RpcP2pProvisionDiscoveryTest, TestSize.Level1) { EXPECT_TRUE(RpcP2pProvisionDiscovery(nullptr, nullptr) < 0); - char buff[] = "N|P2pProvisionDiscovery|00:00:00:00:00:00|1"; + char buff[] = "N\tP2pProvisionDiscovery\t00:00:00:00:00:00\t1"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|P2pProvisionDiscovery|"); + mContext->nPos = strlen("N\tP2pProvisionDiscovery\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcP2pProvisionDiscovery(mServer, mContext) < 0); - char buff1[] = "N|P2pProvisionDiscovery|00:00:00:00:00:00|1|"; + char buff1[] = "N\tP2pProvisionDiscovery\t00:00:00:00:00:00\t1\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|P2pProvisionDiscovery|"); + mContext->nPos = strlen("N\tP2pProvisionDiscovery\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcP2pProvisionDiscovery(mServer, mContext) == 0); } @@ -402,14 +402,14 @@ HWTEST_F(WifiHalCRpcServerAddTest, RpcP2pProvisionDiscoveryTest, TestSize.Level1 HWTEST_F(WifiHalCRpcServerAddTest, RpcP2pAddGroupTest, TestSize.Level1) { EXPECT_TRUE(RpcP2pAddGroup(nullptr, nullptr) < 0); - char buff[] = "N|P2pAddGroup|0|1|0"; + char buff[] = "N\tP2pAddGroup\t0\t1\t0"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|P2pAddGroup|"); + mContext->nPos = strlen("N\tP2pAddGroup\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcP2pAddGroup(mServer, mContext) < 0); - char buff1[] = "N|P2pAddGroup|0|1|0|"; + char buff1[] = "N\tP2pAddGroup\t0\t1\t0\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|P2pAddGroup|"); + mContext->nPos = strlen("N\tP2pAddGroup\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcP2pAddGroup(mServer, mContext) == 0); } @@ -417,14 +417,14 @@ HWTEST_F(WifiHalCRpcServerAddTest, RpcP2pAddGroupTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerAddTest, RpcP2pRemoveGroupTest, TestSize.Level1) { EXPECT_TRUE(RpcP2pRemoveGroup(nullptr, nullptr) < 0); - char buff[] = "N|P2pRemoveGroup|p2p-dev-wlan0"; + char buff[] = "N\tP2pRemoveGroup\tp2p-dev-wlan0"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|P2pRemoveGroup|"); + mContext->nPos = strlen("N\tP2pRemoveGroup\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcP2pRemoveGroup(mServer, mContext) < 0); - char buff1[] = "N|P2pRemoveGroup|p2p-dev-wlan0|"; + char buff1[] = "N\tP2pRemoveGroup\tp2p-dev-wlan0\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|P2pRemoveGroup|"); + mContext->nPos = strlen("N\tP2pRemoveGroup\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcP2pRemoveGroup(mServer, mContext) == 0); } @@ -432,29 +432,29 @@ HWTEST_F(WifiHalCRpcServerAddTest, RpcP2pRemoveGroupTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerAddTest, RpcP2pInviteTest, TestSize.Level1) { EXPECT_TRUE(RpcP2pInvite(nullptr, nullptr) < 0); - char buff[] = "N|P2pInvite|0|||p2p-dev-wlan0"; + char buff[] = "N\tP2pInvite\t0\tp2p-dev-wlan0"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|P2pInvite|"); + mContext->nPos = strlen("N\tP2pInvite\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcP2pInvite(mServer, mContext) < 0); - char buff1[] = "N|P2pInvite|0|||p2p-dev-wlan0|"; + char buff1[] = "N\tP2pInvite\t0\tp2p-dev-wlan0\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|P2pInvite|"); + mContext->nPos = strlen("N\tP2pInvite\t"); mContext->nSize = strlen(buff1); - EXPECT_TRUE(RpcP2pInvite(mServer, mContext) == 0); + EXPECT_TRUE(RpcP2pInvite(mServer, mContext) < 0); } HWTEST_F(WifiHalCRpcServerAddTest, RpcP2pReinvokeTest, TestSize.Level1) { EXPECT_TRUE(RpcP2pReinvoke(nullptr, nullptr) < 0); - char buff[] = "N|P2pReinvoke|0|00:00:00:00:00:00"; + char buff[] = "N\tP2pReinvoke\t0\t00:00:00:00:00:00"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|P2pReinvoke|"); + mContext->nPos = strlen("N\tP2pReinvoke\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcP2pReinvoke(mServer, mContext) < 0); - char buff1[] = "N|P2pReinvoke|0|00:00:00:00:00:00|"; + char buff1[] = "N\tP2pReinvoke\t0\t00:00:00:00:00:00\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|P2pReinvoke|"); + mContext->nPos = strlen("N\tP2pReinvoke\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcP2pReinvoke(mServer, mContext) == 0); } @@ -462,14 +462,14 @@ HWTEST_F(WifiHalCRpcServerAddTest, RpcP2pReinvokeTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerAddTest, RpcP2pGetGroupCapabilityTest, TestSize.Level1) { EXPECT_TRUE(RpcP2pGetGroupCapability(nullptr, nullptr) < 0); - char buff[] = "N|P2pGetGroupCapability|00:00:00:00:00:00"; + char buff[] = "N\tP2pGetGroupCapability\t00:00:00:00:00:00"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|P2pGetGroupCapability|"); + mContext->nPos = strlen("N\tP2pGetGroupCapability\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcP2pGetGroupCapability(mServer, mContext) < 0); - char buff1[] = "N|P2pGetGroupCapability|00:00:00:00:00:00|"; + char buff1[] = "N\tP2pGetGroupCapability\t00:00:00:00:00:00\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|P2pGetGroupCapability|"); + mContext->nPos = strlen("N\tP2pGetGroupCapability\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcP2pGetGroupCapability(mServer, mContext) == 0); } @@ -477,29 +477,29 @@ HWTEST_F(WifiHalCRpcServerAddTest, RpcP2pGetGroupCapabilityTest, TestSize.Level1 HWTEST_F(WifiHalCRpcServerAddTest, RpcP2pAddServiceTest, TestSize.Level1) { EXPECT_TRUE(RpcP2pAddService(nullptr, nullptr) < 0); - char buff[] = "N|P2pAddService|x|0|service_name"; + char buff[] = "N\tP2pAddService\tx\t0\tservice_name"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|P2pAddService|"); + mContext->nPos = strlen("N\tP2pAddService\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcP2pAddService(mServer, mContext) < 0); - char buff1[] = "N|P2pAddService|0|0|service_name"; + char buff1[] = "N\tP2pAddService\t0\t0\tservice_name"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|P2pAddService|"); + mContext->nPos = strlen("N\tP2pAddService\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcP2pAddService(mServer, mContext) < 0); - char buff2[] = "N|P2pAddService|0|0|service_name|"; + char buff2[] = "N\tP2pAddService\t0\t0\tservice_name\t"; mContext->oneProcess = buff2; - mContext->nPos = strlen("N|P2pAddService|"); + mContext->nPos = strlen("N\tP2pAddService\t"); mContext->nSize = strlen(buff2); EXPECT_TRUE(RpcP2pAddService(mServer, mContext) == 0); - char buff3[] = "N|P2pAddService|1|query_message|resp_message"; + char buff3[] = "N\tP2pAddService\t1\tquery_message\tresp_message"; mContext->oneProcess = buff3; - mContext->nPos = strlen("N|P2pAddService|"); + mContext->nPos = strlen("N\tP2pAddService\t"); mContext->nSize = strlen(buff3); EXPECT_TRUE(RpcP2pAddService(mServer, mContext) < 0); - char buff4[] = "N|P2pAddService|1|query_message|resp_message|"; + char buff4[] = "N\tP2pAddService\t1\tquery_message\tresp_message\t"; mContext->oneProcess = buff4; - mContext->nPos = strlen("N|P2pAddService|"); + mContext->nPos = strlen("N\tP2pAddService\t"); mContext->nSize = strlen(buff4); EXPECT_TRUE(RpcP2pAddService(mServer, mContext) == 0); } @@ -507,29 +507,29 @@ HWTEST_F(WifiHalCRpcServerAddTest, RpcP2pAddServiceTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerAddTest, RpcP2pRemoveServiceTest, TestSize.Level1) { EXPECT_TRUE(RpcP2pRemoveService(nullptr, nullptr) < 0); - char buff[] = "N|P2pRemoveService|x|0|service_name"; + char buff[] = "N\tP2pRemoveService\tx\t0\tservice_name"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|P2pRemoveService|"); + mContext->nPos = strlen("N\tP2pRemoveService\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcP2pRemoveService(mServer, mContext) < 0); - char buff1[] = "N|P2pRemoveService|0|0|service_name"; + char buff1[] = "N\tP2pRemoveService\t0\t0\tservice_name"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|P2pRemoveService|"); + mContext->nPos = strlen("N\tP2pRemoveService\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcP2pRemoveService(mServer, mContext) < 0); - char buff2[] = "N|P2pRemoveService|0|0|service_name|"; + char buff2[] = "N\tP2pRemoveService\t0\t0\tservice_name\t"; mContext->oneProcess = buff2; - mContext->nPos = strlen("N|P2pRemoveService|"); + mContext->nPos = strlen("N\tP2pRemoveService\t"); mContext->nSize = strlen(buff2); EXPECT_TRUE(RpcP2pRemoveService(mServer, mContext) == 0); - char buff3[] = "N|P2pRemoveService|1|query_message"; + char buff3[] = "N\tP2pRemoveService\t1\tquery_message"; mContext->oneProcess = buff3; - mContext->nPos = strlen("N|P2pRemoveService|"); + mContext->nPos = strlen("N\tP2pRemoveService\t"); mContext->nSize = strlen(buff3); EXPECT_TRUE(RpcP2pRemoveService(mServer, mContext) < 0); - char buff4[] = "N|P2pRemoveService|1|query_message|"; + char buff4[] = "N\tP2pRemoveService\t1\tquery_message\t"; mContext->oneProcess = buff4; - mContext->nPos = strlen("N|P2pRemoveService|"); + mContext->nPos = strlen("N\tP2pRemoveService\t"); mContext->nSize = strlen(buff4); EXPECT_TRUE(RpcP2pRemoveService(mServer, mContext) == 0); } @@ -537,14 +537,14 @@ HWTEST_F(WifiHalCRpcServerAddTest, RpcP2pRemoveServiceTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerAddTest, RpcP2pReqServiceDiscoveryTest, TestSize.Level1) { EXPECT_TRUE(RpcP2pReqServiceDiscovery(nullptr, nullptr) < 0); - char buff[] = "N|P2pReqServiceDiscovery|00:00:00:00:00:00|discover message"; + char buff[] = "N\tP2pReqServiceDiscovery\t00:00:00:00:00:00\tdiscover message"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|P2pReqServiceDiscovery|"); + mContext->nPos = strlen("N\tP2pReqServiceDiscovery\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcP2pReqServiceDiscovery(mServer, mContext) < 0); - char buff1[] = "N|P2pReqServiceDiscovery|00:00:00:00:00:00|discover message|32|"; + char buff1[] = "N\tP2pReqServiceDiscovery\t00:00:00:00:00:00\tdiscover message\t32\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|P2pReqServiceDiscovery|"); + mContext->nPos = strlen("N\tP2pReqServiceDiscovery\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcP2pReqServiceDiscovery(mServer, mContext) == 0); } @@ -552,14 +552,14 @@ HWTEST_F(WifiHalCRpcServerAddTest, RpcP2pReqServiceDiscoveryTest, TestSize.Level HWTEST_F(WifiHalCRpcServerAddTest, RpcP2pCancelServiceDiscoveryTest, TestSize.Level1) { EXPECT_TRUE(RpcP2pCancelServiceDiscovery(nullptr, nullptr) < 0); - char buff[] = "N|P2pCancelServiceDiscovery|discover message"; + char buff[] = "N\tP2pCancelServiceDiscovery\tdiscover message"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|P2pCancelServiceDiscovery|"); + mContext->nPos = strlen("N\tP2pCancelServiceDiscovery\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcP2pCancelServiceDiscovery(mServer, mContext) < 0); - char buff1[] = "N|P2pCancelServiceDiscovery|discover message|"; + char buff1[] = "N\tP2pCancelServiceDiscovery\tdiscover message\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|P2pCancelServiceDiscovery|"); + mContext->nPos = strlen("N\tP2pCancelServiceDiscovery\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcP2pCancelServiceDiscovery(mServer, mContext) == 0); } @@ -567,14 +567,14 @@ HWTEST_F(WifiHalCRpcServerAddTest, RpcP2pCancelServiceDiscoveryTest, TestSize.Le HWTEST_F(WifiHalCRpcServerAddTest, RpcP2pSetMiracastTypeTest, TestSize.Level1) { EXPECT_TRUE(RpcP2pSetMiracastType(nullptr, nullptr) < 0); - char buff[] = "N|P2pSetMiracastType|x|"; + char buff[] = "N\tP2pSetMiracastType\tx\t"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|P2pSetMiracastType|"); + mContext->nPos = strlen("N\tP2pSetMiracastType\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcP2pSetMiracastType(mServer, mContext) < 0); - char buff1[] = "N|P2pSetMiracastType|1|"; + char buff1[] = "N\tP2pSetMiracastType\t1\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|P2pSetMiracastType|"); + mContext->nPos = strlen("N\tP2pSetMiracastType\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcP2pSetMiracastType(mServer, mContext) == 0); } @@ -582,14 +582,14 @@ HWTEST_F(WifiHalCRpcServerAddTest, RpcP2pSetMiracastTypeTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerAddTest, RpcP2pRespServerDiscoveryTest, TestSize.Level1) { EXPECT_TRUE(RpcP2pRespServerDiscovery(nullptr, nullptr) < 0); - char buff[] = "N|P2pRespServerDiscovery|0|0|00:00:00:00:00:00|tlvs message"; + char buff[] = "N\tP2pRespServerDiscovery\t0\t0\t00:00:00:00:00:00\ttlvs message"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|P2pRespServerDiscovery|"); + mContext->nPos = strlen("N\tP2pRespServerDiscovery\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcP2pRespServerDiscovery(mServer, mContext) < 0); - char buff1[] = "N|P2pRespServerDiscovery|0|0|00:00:00:00:00:00|tlvs message|"; + char buff1[] = "N\tP2pRespServerDiscovery\t0\t0\t00:00:00:00:00:00\ttlvs message\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|P2pRespServerDiscovery|"); + mContext->nPos = strlen("N\tP2pRespServerDiscovery\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcP2pRespServerDiscovery(mServer, mContext) == 0); } @@ -597,14 +597,14 @@ HWTEST_F(WifiHalCRpcServerAddTest, RpcP2pRespServerDiscoveryTest, TestSize.Level HWTEST_F(WifiHalCRpcServerAddTest, RpcP2pSetServDiscExternalTest, TestSize.Level1) { EXPECT_TRUE(RpcP2pSetServDiscExternal(nullptr, nullptr) < 0); - char buff[] = "N|P2pSetServDiscExternal|x|"; + char buff[] = "N\tP2pSetServDiscExternal\tx\t"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|P2pSetServDiscExternal|"); + mContext->nPos = strlen("N\tP2pSetServDiscExternal\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcP2pSetServDiscExternal(mServer, mContext) < 0); - char buff1[] = "N|P2pSetServDiscExternal|1|"; + char buff1[] = "N\tP2pSetServDiscExternal\t1\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|P2pSetServDiscExternal|"); + mContext->nPos = strlen("N\tP2pSetServDiscExternal\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcP2pSetServDiscExternal(mServer, mContext) == 0); } @@ -612,14 +612,14 @@ HWTEST_F(WifiHalCRpcServerAddTest, RpcP2pSetServDiscExternalTest, TestSize.Level HWTEST_F(WifiHalCRpcServerAddTest, RpcP2pSetPersistentReconnectTest, TestSize.Level1) { EXPECT_TRUE(RpcP2pSetPersistentReconnect(nullptr, nullptr) < 0); - char buff[] = "N|P2pSetPersistentReconnect|x|"; + char buff[] = "N\tP2pSetPersistentReconnect\tx\t"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|P2pSetPersistentReconnect|"); + mContext->nPos = strlen("N\tP2pSetPersistentReconnect\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcP2pSetPersistentReconnect(mServer, mContext) < 0); - char buff1[] = "N|P2pSetPersistentReconnect|1|"; + char buff1[] = "N\tP2pSetPersistentReconnect\t1\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|P2pSetPersistentReconnect|"); + mContext->nPos = strlen("N\tP2pSetPersistentReconnect\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcP2pSetPersistentReconnect(mServer, mContext) == 0); } diff --git a/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_test.cpp b/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_test.cpp index 2e49ae5..ca33052 100644 --- a/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_test.cpp +++ b/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -94,18 +94,18 @@ HWTEST_F(WifiHalCRpcServerTest, GetRpcFuncTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerTest, OnTransactTest, TestSize.Level1) { - char buff[] = "N|IncorrectTypeInputMessage"; + char buff[] = "N\tIncorrectTypeInputMessage"; mContext->oneProcess = buff; mContext->nPos = 2; mContext->nSize = strlen(buff); EXPECT_TRUE(OnTransact(mServer, mContext) < 0); - char buff2[] = "N|UnsupportedCmd|"; + char buff2[] = "N\tUnsupportedCmd\t"; mContext->oneProcess = buff2; mContext->nPos = 2; mContext->nSize = strlen(buff2); EXPECT_TRUE(OnTransact(mServer, mContext) == 0); EXPECT_TRUE(strstr(mContext->szWrite, "unsupported function") != nullptr); - char buff3[] = "N|SetCountryCode|"; + char buff3[] = "N\tSetCountryCode\t"; mContext->oneProcess = buff3; mContext->nPos = 2; mContext->nSize = strlen(buff3); @@ -161,18 +161,19 @@ HWTEST_F(WifiHalCRpcServerTest, DealCommonCbkTest, TestSize.Level1) cbmsg->msg.scanStatus = 100; EXPECT_TRUE(PushBackCallbackMsg(WIFI_SCAN_INFO_NOTIFY_EVENT, cbmsg) == 0); EXPECT_TRUE(OnCallbackTransact(mServer, WIFI_SCAN_INFO_NOTIFY_EVENT, mContext) == 0); - EXPECT_TRUE(StrcmpMathRight(mContext->szWrite, "C|107|100|$$$$$$") == 0); + EXPECT_TRUE(StrcmpMathRight(mContext->szWrite, "C\t107\t100\t$$$$$$") == 0); EXPECT_TRUE(EndCallbackTransact(mServer, WIFI_SCAN_INFO_NOTIFY_EVENT) == 0); } HWTEST_F(WifiHalCRpcServerTest, DealIfaceCbkTest, TestSize.Level1) { WifiHalEventCallbackMsg *cbmsg = (WifiHalEventCallbackMsg *)calloc(1, sizeof(WifiHalEventCallbackMsg)); + cbmsg->msg.ifMsg.id = 0; cbmsg->msg.ifMsg.type = 100; StrSafeCopy(cbmsg->msg.ifMsg.ifname, sizeof(cbmsg->msg.ifMsg.ifname), "wlan0"); EXPECT_TRUE(PushBackCallbackMsg(WIFI_ADD_IFACE_EVENT, cbmsg) == 0); EXPECT_TRUE(OnCallbackTransact(mServer, WIFI_ADD_IFACE_EVENT, mContext) == 0); - EXPECT_TRUE(StrcmpMathRight(mContext->szWrite, "C|103|100|wlan0|$$$$$$") == 0); + EXPECT_TRUE(StrcmpMathRight(mContext->szWrite, "C\t103\t0\t100\twlan0\t$$$$$$") == 0); EXPECT_TRUE(EndCallbackTransact(mServer, WIFI_ADD_IFACE_EVENT) == 0); } @@ -184,7 +185,7 @@ HWTEST_F(WifiHalCRpcServerTest, DealConnectionChangedCbkTest, TestSize.Level1) StrSafeCopy(cbmsg->msg.connMsg.bssid, sizeof(cbmsg->msg.connMsg.bssid), "00:00:00:00:00:00"); EXPECT_TRUE(PushBackCallbackMsg(WIFI_CONNECT_CHANGED_NOTIFY_EVENT, cbmsg) == 0); EXPECT_TRUE(OnCallbackTransact(mServer, WIFI_CONNECT_CHANGED_NOTIFY_EVENT, mContext) == 0); - EXPECT_TRUE(StrcmpMathRight(mContext->szWrite, "C|108|100|1|00:00:00:00:00:00|$$$$$$") == 0); + EXPECT_TRUE(StrcmpMathRight(mContext->szWrite, "C\t108\t100\t1\t00:00:00:00:00:00\t$$$$$$") == 0); EXPECT_TRUE(EndCallbackTransact(mServer, WIFI_CONNECT_CHANGED_NOTIFY_EVENT) == 0); } @@ -194,7 +195,7 @@ HWTEST_F(WifiHalCRpcServerTest, DealP2pDeviceFoundCbkTest, TestSize.Level1) StrSafeCopy(cbmsg->msg.deviceInfo.srcAddress, sizeof(cbmsg->msg.deviceInfo.srcAddress), "00:00:00:00:00:00"); EXPECT_TRUE(PushBackCallbackMsg(P2P_DEVICE_FOUND_EVENT, cbmsg) == 0); EXPECT_TRUE(OnCallbackTransact(mServer, P2P_DEVICE_FOUND_EVENT, mContext) == 0); - EXPECT_TRUE(StrcmpMathRight(mContext->szWrite, "C|117|0|0|0|0|00:00:00:00:00:00|||||$$$$$$") == 0); + EXPECT_TRUE(StrcmpMathRight(mContext->szWrite, "C\t119\t0\t0\t0\t0\t00:00:00:00:00:00\t\t\t\t\t$$$$$$") == 0); EXPECT_TRUE(EndCallbackTransact(mServer, P2P_DEVICE_FOUND_EVENT) == 0); } @@ -204,7 +205,7 @@ HWTEST_F(WifiHalCRpcServerTest, DealP2pNegoriationCbkLostTest, TestSize.Level1) StrSafeCopy(cbmsg->msg.connMsg.bssid, sizeof(cbmsg->msg.connMsg.bssid), "00:00:00:00:00:00"); EXPECT_TRUE(PushBackCallbackMsg(P2P_DEVICE_LOST_EVENT, cbmsg) == 0); EXPECT_TRUE(OnCallbackTransact(mServer, P2P_DEVICE_LOST_EVENT, mContext) == 0); - EXPECT_TRUE(StrcmpMathRight(mContext->szWrite, "C|118|00:00:00:00:00:00|$$$$$$") == 0); + EXPECT_TRUE(StrcmpMathRight(mContext->szWrite, "C\t120\t00:00:00:00:00:00\t$$$$$$") == 0); EXPECT_TRUE(EndCallbackTransact(mServer, P2P_DEVICE_LOST_EVENT) == 0); } @@ -214,7 +215,7 @@ HWTEST_F(WifiHalCRpcServerTest, DealP2pNegoriationCbkTest, TestSize.Level1) StrSafeCopy(cbmsg->msg.connMsg.bssid, sizeof(cbmsg->msg.connMsg.bssid), "00:00:00:00:00:00"); EXPECT_TRUE(PushBackCallbackMsg(P2P_GO_NEGOTIATION_REQUEST_EVENT, cbmsg) == 0); EXPECT_TRUE(OnCallbackTransact(mServer, P2P_GO_NEGOTIATION_REQUEST_EVENT, mContext) == 0); - EXPECT_TRUE(StrcmpMathRight(mContext->szWrite, "C|119|0|00:00:00:00:00:00|$$$$$$") == 0); + EXPECT_TRUE(StrcmpMathRight(mContext->szWrite, "C\t121\t0\t00:00:00:00:00:00\t$$$$$$") == 0); EXPECT_TRUE(EndCallbackTransact(mServer, P2P_GO_NEGOTIATION_REQUEST_EVENT) == 0); } @@ -225,7 +226,8 @@ HWTEST_F(WifiHalCRpcServerTest, DealP2pInviationCbkReceiveTest, TestSize.Level1) StrSafeCopy(cbmsg->msg.invitaInfo.bssid, sizeof(cbmsg->msg.invitaInfo.bssid), "00:00:00:00:00:00"); EXPECT_TRUE(PushBackCallbackMsg(P2P_INVITATION_RECEIVED_EVENT, cbmsg) == 0); EXPECT_TRUE(OnCallbackTransact(mServer, P2P_INVITATION_RECEIVED_EVENT, mContext) == 0); - EXPECT_TRUE(StrcmpMathRight(mContext->szWrite, "C|122|0|0|0|00:00:00:00:00:00||00:00:00:00:00:00|$$$$$$") == 0); + EXPECT_TRUE(StrcmpMathRight(mContext->szWrite, + "C\t124\t0\t0\t0\t00:00:00:00:00:00\t\t00:00:00:00:00:00\t$$$$$$") == 0); EXPECT_TRUE(EndCallbackTransact(mServer, P2P_INVITATION_RECEIVED_EVENT) == 0); } @@ -235,7 +237,7 @@ HWTEST_F(WifiHalCRpcServerTest, DealP2pInviationCbkResultTest, TestSize.Level1) StrSafeCopy(cbmsg->msg.invitaInfo.bssid, sizeof(cbmsg->msg.invitaInfo.bssid), "00:00:00:00:00:00"); EXPECT_TRUE(PushBackCallbackMsg(P2P_INVITATION_RESULT_EVENT, cbmsg) == 0); EXPECT_TRUE(OnCallbackTransact(mServer, P2P_INVITATION_RESULT_EVENT, mContext) == 0); - EXPECT_TRUE(StrcmpMathRight(mContext->szWrite, "C|123|0|00:00:00:00:00:00|$$$$$$") == 0); + EXPECT_TRUE(StrcmpMathRight(mContext->szWrite, "C\t125\t0\t00:00:00:00:00:00\t$$$$$$") == 0); EXPECT_TRUE(EndCallbackTransact(mServer, P2P_INVITATION_RESULT_EVENT) == 0); } @@ -245,7 +247,7 @@ HWTEST_F(WifiHalCRpcServerTest, DealP2pInviationCbkFailureTest, TestSize.Level1) StrSafeCopy(cbmsg->msg.invitaInfo.bssid, sizeof(cbmsg->msg.invitaInfo.bssid), "00:00:00:00:00:00"); EXPECT_TRUE(PushBackCallbackMsg(P2P_GROUP_FORMATION_FAILURE_EVENT, cbmsg) == 0); EXPECT_TRUE(OnCallbackTransact(mServer, P2P_GROUP_FORMATION_FAILURE_EVENT, mContext) == 0); - EXPECT_TRUE(StrcmpMathRight(mContext->szWrite, "C|125|00:00:00:00:00:00|$$$$$$") == 0); + EXPECT_TRUE(StrcmpMathRight(mContext->szWrite, "C\t127\t00:00:00:00:00:00\t$$$$$$") == 0); EXPECT_TRUE(EndCallbackTransact(mServer, P2P_GROUP_FORMATION_FAILURE_EVENT) == 0); } @@ -258,8 +260,8 @@ HWTEST_F(WifiHalCRpcServerTest, DealP2pGroupInfoCbkStartTest, TestSize.Level1) cbmsg->msg.groupInfo.goDeviceAddress, sizeof(cbmsg->msg.groupInfo.goDeviceAddress), "00:00:00:00:00:00"); EXPECT_TRUE(PushBackCallbackMsg(P2P_GROUP_STARTED_EVENT, cbmsg) == 0); EXPECT_TRUE(OnCallbackTransact(mServer, P2P_GROUP_STARTED_EVENT, mContext) == 0); - EXPECT_TRUE( - StrcmpMathRight(mContext->szWrite, "C|126|0|0|0|p2p-dev-wlan0|test_p2p|||00:00:00:00:00:00|$$$$$$") == 0); + EXPECT_TRUE(StrcmpMathRight(mContext->szWrite, + "C\t128\t0\t0\t0\tp2p-dev-wlan0\ttest_p2p\t\t\t00:00:00:00:00:00\t$$$$$$") == 0); EXPECT_TRUE(EndCallbackTransact(mServer, P2P_GROUP_STARTED_EVENT) == 0); } @@ -269,7 +271,7 @@ HWTEST_F(WifiHalCRpcServerTest, DealP2pGroupInfoCbkRemoveTest, TestSize.Level1) StrSafeCopy(cbmsg->msg.groupInfo.groupIfName, sizeof(cbmsg->msg.groupInfo.groupIfName), "p2p-dev-wlan0"); EXPECT_TRUE(PushBackCallbackMsg(P2P_GROUP_REMOVED_EVENT, cbmsg) == 0); EXPECT_TRUE(OnCallbackTransact(mServer, P2P_GROUP_REMOVED_EVENT, mContext) == 0); - EXPECT_TRUE(StrcmpMathRight(mContext->szWrite, "C|127|0|p2p-dev-wlan0|$$$$$$") == 0); + EXPECT_TRUE(StrcmpMathRight(mContext->szWrite, "C\t129\t0\tp2p-dev-wlan0\t$$$$$$") == 0); EXPECT_TRUE(EndCallbackTransact(mServer, P2P_GROUP_REMOVED_EVENT) == 0); } @@ -279,7 +281,7 @@ HWTEST_F(WifiHalCRpcServerTest, DealP2pDeviceInfoCbkPbcTest, TestSize.Level1) StrSafeCopy(cbmsg->msg.deviceInfo.srcAddress, sizeof(cbmsg->msg.deviceInfo.srcAddress), "00:00:00:00:00:00"); EXPECT_TRUE(PushBackCallbackMsg(P2P_PROV_DISC_PBC_REQ_EVENT, cbmsg) == 0); EXPECT_TRUE(OnCallbackTransact(mServer, P2P_PROV_DISC_PBC_REQ_EVENT, mContext) == 0); - EXPECT_TRUE(StrcmpMathRight(mContext->szWrite, "C|128|00:00:00:00:00:00|$$$$$$") == 0); + EXPECT_TRUE(StrcmpMathRight(mContext->szWrite, "C\t130\t00:00:00:00:00:00\t$$$$$$") == 0); EXPECT_TRUE(EndCallbackTransact(mServer, P2P_PROV_DISC_PBC_REQ_EVENT) == 0); } @@ -290,7 +292,7 @@ HWTEST_F(WifiHalCRpcServerTest, DealP2pDeviceInfoCbkPinTest, TestSize.Level1) StrSafeCopy(cbmsg->msg.deviceInfo.deviceName, sizeof(cbmsg->msg.deviceInfo.deviceName), "test_p2p"); EXPECT_TRUE(PushBackCallbackMsg(P2P_PROV_DISC_SHOW_PIN_EVENT, cbmsg) == 0); EXPECT_TRUE(OnCallbackTransact(mServer, P2P_PROV_DISC_SHOW_PIN_EVENT, mContext) == 0); - EXPECT_TRUE(StrcmpMathRight(mContext->szWrite, "C|131|00:00:00:00:00:00|test_p2p|$$$$$$") == 0); + EXPECT_TRUE(StrcmpMathRight(mContext->szWrite, "C\t133\t00:00:00:00:00:00\ttest_p2p\t$$$$$$") == 0); EXPECT_TRUE(EndCallbackTransact(mServer, P2P_PROV_DISC_SHOW_PIN_EVENT) == 0); } @@ -301,7 +303,7 @@ HWTEST_F(WifiHalCRpcServerTest, DealP2pDeviceInfoCbkConnectionTest, TestSize.Lev cbmsg->msg.deviceInfo.p2pDeviceAddress, sizeof(cbmsg->msg.deviceInfo.p2pDeviceAddress), "00:00:00:00:00:00"); EXPECT_TRUE(PushBackCallbackMsg(AP_STA_DISCONNECTED_EVENT, cbmsg) == 0); EXPECT_TRUE(OnCallbackTransact(mServer, AP_STA_DISCONNECTED_EVENT, mContext) == 0); - EXPECT_TRUE(StrcmpMathRight(mContext->szWrite, "C|135|00:00:00:00:00:00|$$$$$$") == 0); + EXPECT_TRUE(StrcmpMathRight(mContext->szWrite, "C\t137\t00:00:00:00:00:00\t$$$$$$") == 0); EXPECT_TRUE(EndCallbackTransact(mServer, AP_STA_DISCONNECTED_EVENT) == 0); } @@ -311,7 +313,7 @@ HWTEST_F(WifiHalCRpcServerTest, DealP2pServerInfoCbkTest, TestSize.Level1) StrSafeCopy(cbmsg->msg.serverInfo.srcAddress, sizeof(cbmsg->msg.serverInfo.srcAddress), "00:00:00:00:00:00"); EXPECT_TRUE(PushBackCallbackMsg(P2P_SERV_DISC_RESP_EVENT, cbmsg) == 0); EXPECT_TRUE(OnCallbackTransact(mServer, P2P_SERV_DISC_RESP_EVENT, mContext) == 0); - EXPECT_TRUE(StrcmpMathRight(mContext->szWrite, "C|133|0|00:00:00:00:00:00|0|$$$$$$") == 0); + EXPECT_TRUE(StrcmpMathRight(mContext->szWrite, "C\t135\t0\t00:00:00:00:00:00\t0\t$$$$$$") == 0); EXPECT_TRUE(EndCallbackTransact(mServer, P2P_SERV_DISC_RESP_EVENT) == 0); } @@ -321,21 +323,21 @@ HWTEST_F(WifiHalCRpcServerTest, DealP2pServerDiscReqCbkTest, TestSize.Level1) StrSafeCopy(cbmsg->msg.serDiscReqInfo.mac, sizeof(cbmsg->msg.serDiscReqInfo.mac), "00:00:00:00:00:00"); EXPECT_TRUE(PushBackCallbackMsg(P2P_SERV_DISC_REQ_EVENT, cbmsg) == 0); EXPECT_TRUE(OnCallbackTransact(mServer, P2P_SERV_DISC_REQ_EVENT, mContext) == 0); - EXPECT_TRUE(StrcmpMathRight(mContext->szWrite, "C|137|0|0|0|00:00:00:00:00:00|0|$$$$$$") == 0); + EXPECT_TRUE(StrcmpMathRight(mContext->szWrite, "C\t139\t0\t0\t0\t00:00:00:00:00:00\t0\t$$$$$$") == 0); EXPECT_TRUE(EndCallbackTransact(mServer, P2P_SERV_DISC_REQ_EVENT) == 0); } HWTEST_F(WifiHalCRpcServerTest, RpcGetNameTest, TestSize.Level1) { EXPECT_TRUE(RpcGetName(nullptr, nullptr) < 0); - char buff[] = "N|GetName|x|"; + char buff[] = "N\tGetName\tx\t"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|GetName|"); + mContext->nPos = strlen("N\tGetName\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcGetName(mServer, mContext) < 0); - char buff2[] = "N|GetName|128|"; + char buff2[] = "N\tGetName\t128\t"; mContext->oneProcess = buff2; - mContext->nPos = strlen("N|GetName|"); + mContext->nPos = strlen("N\tGetName\t"); mContext->nSize = strlen(buff2); EXPECT_TRUE(RpcGetName(mServer, mContext) == 0); } @@ -349,19 +351,19 @@ HWTEST_F(WifiHalCRpcServerTest, RpcGetTypeTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerTest, RpcRegisterEventCallbackTest, TestSize.Level1) { EXPECT_TRUE(RpcRegisterEventCallback(nullptr, nullptr) < 0); - char buff[] = "N|RegisterEventCallback|asdgfd|"; + char buff[] = "N\tRegisterEventCallback\tasdgfd\t"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|RegisterEventCallback|"); + mContext->nPos = strlen("N\tRegisterEventCallback\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcRegisterEventCallback(mServer, mContext) < 0); - char buff2[] = "N|RegisterEventCallback|2|101|asdf|"; + char buff2[] = "N\tRegisterEventCallback\t2\t101\tasdf\t"; mContext->oneProcess = buff2; - mContext->nPos = strlen("N|RegisterEventCallback|"); + mContext->nPos = strlen("N\tRegisterEventCallback\t"); mContext->nSize = strlen(buff2); EXPECT_TRUE(RpcRegisterEventCallback(mServer, mContext) < 0); - char buff3[] = "N|RegisterEventCallback|2|101|108|"; + char buff3[] = "N\tRegisterEventCallback\t2\t101\t108\t"; mContext->oneProcess = buff3; - mContext->nPos = strlen("N|RegisterEventCallback|"); + mContext->nPos = strlen("N\tRegisterEventCallback\t"); mContext->nSize = strlen(buff3); EXPECT_TRUE(RpcRegisterEventCallback(mServer, mContext) == 0); } @@ -369,19 +371,19 @@ HWTEST_F(WifiHalCRpcServerTest, RpcRegisterEventCallbackTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerTest, RpcUnRegisterEventCallbackTest, TestSize.Level1) { EXPECT_TRUE(RpcUnRegisterEventCallback(nullptr, nullptr) < 0); - char buff[] = "N|UnRegisterEventCallback|asdgfd|"; + char buff[] = "N\tUnRegisterEventCallback\tasdgfd\t"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|UnRegisterEventCallback|"); + mContext->nPos = strlen("N\tUnRegisterEventCallback\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcUnRegisterEventCallback(mServer, mContext) < 0); - char buff2[] = "N|UnRegisterEventCallback|2|101|asdf|"; + char buff2[] = "N\tUnRegisterEventCallback\t2\t101\tasdf\t"; mContext->oneProcess = buff2; - mContext->nPos = strlen("N|UnRegisterEventCallback|"); + mContext->nPos = strlen("N\tUnRegisterEventCallback\t"); mContext->nSize = strlen(buff2); EXPECT_TRUE(RpcUnRegisterEventCallback(mServer, mContext) < 0); - char buff3[] = "N|UnRegisterEventCallback|2|101|108|"; + char buff3[] = "N\tUnRegisterEventCallback\t2\t101\t108\t"; mContext->oneProcess = buff3; - mContext->nPos = strlen("N|UnRegisterEventCallback|"); + mContext->nPos = strlen("N\tUnRegisterEventCallback\t"); mContext->nSize = strlen(buff3); EXPECT_TRUE(RpcUnRegisterEventCallback(mServer, mContext) == 0); } @@ -395,14 +397,14 @@ HWTEST_F(WifiHalCRpcServerTest, RpcNotifyClearTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerTest, RpcGetWifiChipTest, TestSize.Level1) { EXPECT_TRUE(RpcGetWifiChip(nullptr, nullptr) < 0); - char buff[] = "N|GetWifiChip|adsgfsd|"; + char buff[] = "N\tGetWifiChip\tadsgfsd\t"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|GetWifiChip|"); + mContext->nPos = strlen("N\tGetWifiChip\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcGetWifiChip(mServer, mContext) < 0); - char buff1[] = "N|GetWifiChip|8|"; + char buff1[] = "N\tGetWifiChip\t8\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|GetWifiChip|"); + mContext->nPos = strlen("N\tGetWifiChip\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcGetWifiChip(mServer, mContext) == 0); } @@ -410,14 +412,14 @@ HWTEST_F(WifiHalCRpcServerTest, RpcGetWifiChipTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerTest, RpcGetWifiChipIdsTest, TestSize.Level1) { EXPECT_TRUE(RpcGetWifiChipIds(nullptr, nullptr) < 0); - char buff[] = "N|GetWifiChipIds|x|"; + char buff[] = "N\tGetWifiChipIds\tx\t"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|GetWifiChipIds|"); + mContext->nPos = strlen("N\tGetWifiChipIds\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcGetWifiChipIds(mServer, mContext) < 0); - char buff1[] = "N|GetWifiChipIds|8|"; + char buff1[] = "N\tGetWifiChipIds\t8\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|GetWifiChipIds|"); + mContext->nPos = strlen("N\tGetWifiChipIds\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcGetWifiChipIds(mServer, mContext) == 0); } @@ -431,14 +433,14 @@ HWTEST_F(WifiHalCRpcServerTest, RpcGetChipIdTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerTest, RpcCreateIfaceTest, TestSize.Level1) { EXPECT_TRUE(RpcCreateIface(nullptr, nullptr) < 0); - char buff[] = "N|CreateIface|fdshajkdsghk|"; + char buff[] = "N\tCreateIface\tfdshajkdsghk\t"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|CreateIface|"); + mContext->nPos = strlen("N\tCreateIface\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcCreateIface(mServer, mContext) < 0); - char buff1[] = "N|CreateIface|8|"; + char buff1[] = "N\tCreateIface\t8\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|CreateIface|"); + mContext->nPos = strlen("N\tCreateIface\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcCreateIface(mServer, mContext) == 0); } @@ -446,19 +448,19 @@ HWTEST_F(WifiHalCRpcServerTest, RpcCreateIfaceTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerTest, RpcGetIfaceTest, TestSize.Level1) { EXPECT_TRUE(RpcGetIface(nullptr, nullptr) < 0); - char buff[] = "N|GetIface|wlan0"; + char buff[] = "N\tGetIface\twlan0"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|GetIface|"); + mContext->nPos = strlen("N\tGetIface\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcGetIface(mServer, mContext) < 0); - char buff1[] = "N|GetIface|wlan0|"; + char buff1[] = "N\tGetIface\twlan0\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|GetIface|"); + mContext->nPos = strlen("N\tGetIface\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcGetIface(mServer, mContext) == 0); - char buff2[] = "N|GetIface|01234567890123456789012345678901|"; + char buff2[] = "N\tGetIface\t01234567890123456789012345678901\t"; mContext->oneProcess = buff2; - mContext->nPos = strlen("N|GetIface|"); + mContext->nPos = strlen("N\tGetIface\t"); mContext->nSize = strlen(buff2); EXPECT_TRUE(RpcGetIface(mServer, mContext) == 0); } @@ -466,19 +468,19 @@ HWTEST_F(WifiHalCRpcServerTest, RpcGetIfaceTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerTest, RpcGetIfaceNamesTest, TestSize.Level1) { EXPECT_TRUE(RpcGetIfaceNames(nullptr, nullptr) < 0); - char buff[] = "N|GetIfaceNames|asdgf|asdgf|"; + char buff[] = "N\tGetIfaceNames\tasdgf\tasdgf\t"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|GetIfaceNames|"); + mContext->nPos = strlen("N\tGetIfaceNames\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcGetIfaceNames(mServer, mContext) < 0); - char buff1[] = "N|GetIfaceNames|12|asdgf|"; + char buff1[] = "N\tGetIfaceNames\t12\tasdgf\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|GetIfaceNames|"); + mContext->nPos = strlen("N\tGetIfaceNames\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcGetIfaceNames(mServer, mContext) < 0); - char buff2[] = "N|GetIfaceNames|12|128|"; + char buff2[] = "N\tGetIfaceNames\t12\t128\t"; mContext->oneProcess = buff2; - mContext->nPos = strlen("N|GetIfaceNames|"); + mContext->nPos = strlen("N\tGetIfaceNames\t"); mContext->nSize = strlen(buff2); EXPECT_TRUE(RpcGetIfaceNames(mServer, mContext) == 0); } @@ -486,19 +488,19 @@ HWTEST_F(WifiHalCRpcServerTest, RpcGetIfaceNamesTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerTest, RpcRemoveIfaceTest, TestSize.Level1) { EXPECT_TRUE(RpcRemoveIface(nullptr, nullptr) < 0); - char buff[] = "N|RemoveIface|wlan0"; + char buff[] = "N\tRemoveIface\twlan0"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|RemoveIface|"); + mContext->nPos = strlen("N\tRemoveIface\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcRemoveIface(mServer, mContext) < 0); - char buff1[] = "N|RemoveIface|wlan0|"; + char buff1[] = "N\tRemoveIface\twlan0\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|RemoveIface|"); + mContext->nPos = strlen("N\tRemoveIface\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcRemoveIface(mServer, mContext) == 0); - char buff2[] = "N|RemoveIface|01234567890123456789012345678901|"; + char buff2[] = "N\tRemoveIface\t01234567890123456789012345678901\t"; mContext->oneProcess = buff2; - mContext->nPos = strlen("N|RemoveIface|"); + mContext->nPos = strlen("N\tRemoveIface\t"); mContext->nSize = strlen(buff2); EXPECT_TRUE(RpcRemoveIface(mServer, mContext) == 0); } @@ -512,14 +514,14 @@ HWTEST_F(WifiHalCRpcServerTest, RpcGetCapabilitiesTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerTest, RpcGetSupportedComboModesTest, TestSize.Level1) { EXPECT_TRUE(RpcGetSupportedComboModes(nullptr, nullptr) < 0); - char buff[] = "N|GetSupportedComboModes|asdgds|"; + char buff[] = "N\tGetSupportedComboModes\tasdgds\t"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|GetSupportedComboModes|"); + mContext->nPos = strlen("N\tGetSupportedComboModes\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcGetSupportedComboModes(mServer, mContext) < 0); - char buff1[] = "N|GetSupportedComboModes|134|"; + char buff1[] = "N\tGetSupportedComboModes\t134\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|GetSupportedComboModes|"); + mContext->nPos = strlen("N\tGetSupportedComboModes\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcGetSupportedComboModes(mServer, mContext) == 0); } @@ -527,14 +529,14 @@ HWTEST_F(WifiHalCRpcServerTest, RpcGetSupportedComboModesTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerTest, RpcConfigComboModesTest, TestSize.Level1) { EXPECT_TRUE(RpcConfigComboModes(nullptr, nullptr) < 0); - char buff[] = "N|ConfigComboModes|asdgds|"; + char buff[] = "N\tConfigComboModes\tasdgds\t"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|ConfigComboModes|"); + mContext->nPos = strlen("N\tConfigComboModes\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcConfigComboModes(mServer, mContext) < 0); - char buff1[] = "N|ConfigComboModes|134|"; + char buff1[] = "N\tConfigComboModes\t134\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|ConfigComboModes|"); + mContext->nPos = strlen("N\tConfigComboModes\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcConfigComboModes(mServer, mContext) == 0); } @@ -548,14 +550,14 @@ HWTEST_F(WifiHalCRpcServerTest, RpcGetComboModesTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerTest, RpcRequestFirmwareDebugDumpTest, TestSize.Level1) { EXPECT_TRUE(RpcRequestFirmwareDebugDump(nullptr, nullptr) < 0); - char buff[] = "N|RequestFirmwareDebugDump|asdgds|"; + char buff[] = "N\tRequestFirmwareDebugDump\tasdgds\t"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|RequestFirmwareDebugDump|"); + mContext->nPos = strlen("N\tRequestFirmwareDebugDump\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcRequestFirmwareDebugDump(mServer, mContext) < 0); - char buff1[] = "N|RequestFirmwareDebugDump|134|"; + char buff1[] = "N\tRequestFirmwareDebugDump\t134\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|RequestFirmwareDebugDump|"); + mContext->nPos = strlen("N\tRequestFirmwareDebugDump\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcRequestFirmwareDebugDump(mServer, mContext) == 0); } @@ -563,14 +565,14 @@ HWTEST_F(WifiHalCRpcServerTest, RpcRequestFirmwareDebugDumpTest, TestSize.Level1 HWTEST_F(WifiHalCRpcServerTest, RpcSetPowerModeTest, TestSize.Level1) { EXPECT_TRUE(RpcSetPowerMode(nullptr, nullptr) < 0); - char buff[] = "N|SetPowerMode|asdgds|"; + char buff[] = "N\tSetPowerMode\tasdgds\t"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|SetPowerMode|"); + mContext->nPos = strlen("N\tSetPowerMode\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcSetPowerMode(mServer, mContext) < 0); - char buff1[] = "N|SetPowerMode|1|"; + char buff1[] = "N\tSetPowerMode\t1\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|SetPowerMode|"); + mContext->nPos = strlen("N\tSetPowerMode\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcSetPowerMode(mServer, mContext) == 0); } @@ -614,19 +616,19 @@ HWTEST_F(WifiHalCRpcServerTest, RpcDisconnectSupplicantTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerTest, RpcRequestToSupplicantTest, TestSize.Level1) { EXPECT_TRUE(RpcRequestToSupplicant(nullptr, nullptr) < 0); - char buff[] = "N|RequestToSupplicant|asdf|"; + char buff[] = "N\tRequestToSupplicant\tasdf\t"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|RequestToSupplicant|"); + mContext->nPos = strlen("N\tRequestToSupplicant\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcRequestToSupplicant(mServer, mContext) < 0); - char buff1[] = "N|RequestToSupplicant|4|8c677c8d5a|"; + char buff1[] = "N\tRequestToSupplicant\t4\t8c677c8d5a\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|RequestToSupplicant|"); + mContext->nPos = strlen("N\tRequestToSupplicant\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcRequestToSupplicant(mServer, mContext) < 0); - char buff2[] = "N|RequestToSupplicant|4|8c677c8a|"; + char buff2[] = "N\tRequestToSupplicant\t4\t8c677c8a\t"; mContext->oneProcess = buff2; - mContext->nPos = strlen("N|RequestToSupplicant|"); + mContext->nPos = strlen("N\tRequestToSupplicant\t"); mContext->nSize = strlen(buff2); EXPECT_TRUE(RpcRequestToSupplicant(mServer, mContext) == 0); } @@ -634,14 +636,14 @@ HWTEST_F(WifiHalCRpcServerTest, RpcRequestToSupplicantTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerTest, RpcSetPowerSaveTest, TestSize.Level1) { EXPECT_TRUE(RpcSetPowerSave(nullptr, nullptr) < 0); - char buff[] = "N|SetPowerSave|fds|"; + char buff[] = "N\tSetPowerSave\tfds\t"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|SetPowerSave|"); + mContext->nPos = strlen("N\tSetPowerSave\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcSetPowerSave(mServer, mContext) < 0); - char buff1[] = "N|SetPowerSave|1|"; + char buff1[] = "N\tSetPowerSave\t1\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|SetPowerSave|"); + mContext->nPos = strlen("N\tSetPowerSave\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcSetPowerSave(mServer, mContext) == 0); } @@ -649,14 +651,14 @@ HWTEST_F(WifiHalCRpcServerTest, RpcSetPowerSaveTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerTest, RpcWpaSetCountryCodeTest, TestSize.Level1) { EXPECT_TRUE(RpcWpaSetCountryCode(nullptr, nullptr) < 0); - char buff[] = "N|WpaSetCountryCode|CHINA|"; + char buff[] = "N\tWpaSetCountryCode\tCHINA\t"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|WpaSetCountryCode|"); + mContext->nPos = strlen("N\tWpaSetCountryCode\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcWpaSetCountryCode(mServer, mContext) < 0); - char buff1[] = "N|WpaSetCountryCode|CN|"; + char buff1[] = "N\tWpaSetCountryCode\tCN\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|WpaSetCountryCode|"); + mContext->nPos = strlen("N\tWpaSetCountryCode\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcWpaSetCountryCode(mServer, mContext) == 0); } @@ -670,34 +672,34 @@ HWTEST_F(WifiHalCRpcServerTest, RpcWpaGetCountryCodeTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerTest, RpcStartScanTest, TestSize.Level1) { EXPECT_TRUE(RpcStartScan(nullptr, nullptr) < 0); - char buff[] = "N|StartScan|x|10|scan_ssid1|10|scan_ssid2|2|2427|2442|2|"; + char buff[] = "N\tStartScan\tx\t10\tscan_ssid1\t10\tscan_ssid2\t2\t2427\t2442\t2\t"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|StartScan|"); + mContext->nPos = strlen("N\tStartScan\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcStartScan(mServer, mContext) < 0); - char buff1[] = "N|StartScan|2|10|scan_ssid1|10|scan_ssid2"; + char buff1[] = "N\tStartScan\t2\t10\tscan_ssid1\t10\tscan_ssid2"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|StartScan|"); + mContext->nPos = strlen("N\tStartScan\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcStartScan(mServer, mContext) < 0); - char buff2[] = "N|StartScan|2|10|scan_ssid1|10|scan_ssid2|x|"; + char buff2[] = "N\tStartScan\t2\t10\tscan_ssid1\t10\tscan_ssid2\tx\t"; mContext->oneProcess = buff2; - mContext->nPos = strlen("N|StartScan|"); + mContext->nPos = strlen("N\tStartScan\t"); mContext->nSize = strlen(buff2); EXPECT_TRUE(RpcStartScan(mServer, mContext) < 0); - char buff3[] = "N|StartScan|2|10|scan_ssid1|10|scan_ssid2|2|2427|x|x|"; + char buff3[] = "N\tStartScan\t2\t10\tscan_ssid1\t10\tscan_ssid2\t2\t2427\tx\tx\t"; mContext->oneProcess = buff3; - mContext->nPos = strlen("N|StartScan|"); + mContext->nPos = strlen("N\tStartScan\t"); mContext->nSize = strlen(buff3); EXPECT_TRUE(RpcStartScan(mServer, mContext) < 0); - char buff4[] = "N|StartScan|2|10|scan_ssid1|10|scan_ssid2|2|2427|2442|x|"; + char buff4[] = "N\tStartScan\t2\t10\tscan_ssid1\t10\tscan_ssid2\t2\t2427\t2442\tx\t"; mContext->oneProcess = buff4; - mContext->nPos = strlen("N|StartScan|"); + mContext->nPos = strlen("N\tStartScan\t"); mContext->nSize = strlen(buff4); EXPECT_TRUE(RpcStartScan(mServer, mContext) < 0); - char buff5[] = "N|StartScan|2|10|scan_ssid1|10|scan_ssid2|2|2427|2442|2|"; + char buff5[] = "N\tStartScan\t2\t10\tscan_ssid1\t10\tscan_ssid2\t2\t2427\t2442\t2\t"; mContext->oneProcess = buff5; - mContext->nPos = strlen("N|StartScan|"); + mContext->nPos = strlen("N\tStartScan\t"); mContext->nSize = strlen(buff5); EXPECT_TRUE(RpcStartScan(mServer, mContext) == 0); } @@ -705,14 +707,14 @@ HWTEST_F(WifiHalCRpcServerTest, RpcStartScanTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerTest, RpcGetScanInfosTest, TestSize.Level1) { EXPECT_TRUE(RpcGetScanInfos(nullptr, nullptr) < 0); - char buff[] = "N|GetScanInfos|x|"; + char buff[] = "N\tGetScanInfos\tx\t"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|GetScanInfos|"); + mContext->nPos = strlen("N\tGetScanInfos\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcGetScanInfos(mServer, mContext) < 0); - char buff1[] = "N|GetScanInfos|12|"; + char buff1[] = "N\tGetScanInfos\t12\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|GetScanInfos|"); + mContext->nPos = strlen("N\tGetScanInfos\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcGetScanInfos(mServer, mContext) == 0); } @@ -720,14 +722,14 @@ HWTEST_F(WifiHalCRpcServerTest, RpcGetScanInfosTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerTest, RpcGetNetworkListTest, TestSize.Level1) { EXPECT_TRUE(RpcGetNetworkList(nullptr, nullptr) < 0); - char buff[] = "N|GetNetworkList|x|"; + char buff[] = "N\tGetNetworkList\tx\t"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|GetNetworkList|"); + mContext->nPos = strlen("N\tGetNetworkList\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcGetNetworkList(mServer, mContext) < 0); - char buff1[] = "N|GetNetworkList|12|"; + char buff1[] = "N\tGetNetworkList\t12\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|GetNetworkList|"); + mContext->nPos = strlen("N\tGetNetworkList\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcGetNetworkList(mServer, mContext) == 0); } @@ -735,39 +737,42 @@ HWTEST_F(WifiHalCRpcServerTest, RpcGetNetworkListTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerTest, RpcStartPnoScanTest, TestSize.Level1) { EXPECT_TRUE(RpcStartPnoScan(nullptr, nullptr) < 0); - char buff[] = "N|StartPnoScan|1|x|1|2|3|asd|4|asdf|1|5|asdfg|2|5040|5080|"; + char buff[] = "N\tStartPnoScan\t1\tx\t1\t2\t3\tasd\t4\tasdf\t1\t5\tasdfg\t2\t5040\t5080\t"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|StartPnoScan|"); + mContext->nPos = strlen("N\tStartPnoScan\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcStartPnoScan(mServer, mContext) < 0); - char buff1[] = "N|StartPnoScan|1|2|1|2|10|scan_ssid1|10|scan_ssid2"; + char buff1[] = "N\tStartPnoScan\t1\t2\t1\t2\t10\tscan_ssid1\t10\tscan_ssid2"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|StartPnoScan|"); + mContext->nPos = strlen("N\tStartPnoScan\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcStartPnoScan(mServer, mContext) < 0); - char buff2[] = "N|StartPnoScan|1|2|1|2|10|scan_ssid1|10|scan_ssid2|x|"; + char buff2[] = "N\tStartPnoScan\t1\t2\t1\t2\t10\tscan_ssid1\t10\tscan_ssid2\tx\t"; mContext->oneProcess = buff2; - mContext->nPos = strlen("N|StartPnoScan|"); + mContext->nPos = strlen("N\tStartPnoScan\t"); mContext->nSize = strlen(buff2); EXPECT_TRUE(RpcStartPnoScan(mServer, mContext) < 0); - char buff3[] = "N|StartPnoScan|1|2|1|2|10|scan_ssid1|10|scan_ssid2|2|10|save_ssid1|10|save_ssid2"; + char buff3[] = "N\tStartPnoScan\t1\t2\t1\t2\t10\tscan_ssid1\t10\tscan_ssid2\t2\t10\tsave_ssid1\t10\tsave_ssid2"; mContext->oneProcess = buff3; - mContext->nPos = strlen("N|StartPnoScan|"); + mContext->nPos = strlen("N\tStartPnoScan\t"); mContext->nSize = strlen(buff3); EXPECT_TRUE(RpcStartPnoScan(mServer, mContext) < 0); - char buff4[] = "N|StartPnoScan|1|2|1|2|10|scan_ssid1|10|scan_ssid2|2|10|save_ssid1|10|save_ssid2|x|"; + char buff4[] = + "N\tStartPnoScan\t1\t2\t1\t2\t10\tscan_ssid1\t10\tscan_ssid2\t2\t10\tsave_ssid1\t10\tsave_ssid2\tx\t"; mContext->oneProcess = buff4; - mContext->nPos = strlen("N|StartPnoScan|"); + mContext->nPos = strlen("N\tStartPnoScan\t"); mContext->nSize = strlen(buff4); EXPECT_TRUE(RpcStartPnoScan(mServer, mContext) < 0); - char buff5[] = "N|StartPnoScan|1|2|1|2|10|scan_ssid1|10|scan_ssid2|2|10|save_ssid1|10|save_ssid2|2|5040|x|"; + char buff5[] = + "N\tStartPnoScan\t1\t2\t1\t2\t10\tscan_ssid1\t10\tscan_ssid2\t2\t10\tsave_ssid1\t10\tsave_ssid2\t2\t5040\tx\t"; mContext->oneProcess = buff5; - mContext->nPos = strlen("N|StartPnoScan|"); + mContext->nPos = strlen("N\tStartPnoScan\t"); mContext->nSize = strlen(buff5); EXPECT_TRUE(RpcStartPnoScan(mServer, mContext) < 0); - char buff6[] = "N|StartPnoScan|1|2|1|2|10|scan_ssid1|10|scan_ssid2|2|10|save_ssid1|10|save_ssid2|2|5040|5080|"; + char buff6[] = + "N\tStartPnoScan\t1\t2\t1\t2\t10\tscan_ssid1\t10\tscan_ssid2\t2\t10\tsave_ssid1\t10\tsave_ssid2\t2\t5040\t5080\t"; mContext->oneProcess = buff6; - mContext->nPos = strlen("N|StartPnoScan|"); + mContext->nPos = strlen("N\tStartPnoScan\t"); mContext->nSize = strlen(buff6); EXPECT_TRUE(RpcStartPnoScan(mServer, mContext) == 0); } @@ -781,14 +786,14 @@ HWTEST_F(WifiHalCRpcServerTest, RpcStopPnoScanTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerTest, RpcConnectTest, TestSize.Level1) { EXPECT_TRUE(RpcConnect(nullptr, nullptr) < 0); - char buff[] = "N|Connect|x|"; + char buff[] = "N\tConnect\tx\t"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|Connect|"); + mContext->nPos = strlen("N\tConnect\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcConnect(mServer, mContext) < 0); - char buff1[] = "N|Connect|1|"; + char buff1[] = "N\tConnect\t1\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|Connect|"); + mContext->nPos = strlen("N\tConnect\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcConnect(mServer, mContext) == 0); } @@ -796,14 +801,14 @@ HWTEST_F(WifiHalCRpcServerTest, RpcConnectTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerTest, RpcWpaAutoConnectTest, TestSize.Level1) { EXPECT_TRUE(RpcWpaAutoConnect(nullptr, nullptr) < 0); - char buff[] = "N|WpaAutoConnect|0ad|"; + char buff[] = "N\tWpaAutoConnect\t0ad\t"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|WpaAutoConnect|"); + mContext->nPos = strlen("N\tWpaAutoConnect\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcWpaAutoConnect(mServer, mContext) < 0); - char buff1[] = "N|WpaAutoConnect|1|"; + char buff1[] = "N\tWpaAutoConnect\t1\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|WpaAutoConnect|"); + mContext->nPos = strlen("N\tWpaAutoConnect\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcWpaAutoConnect(mServer, mContext) == 0); } @@ -835,14 +840,14 @@ HWTEST_F(WifiHalCRpcServerTest, RpcGetStaCapabilitiesTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerTest, RpcGetDeviceMacAddressTest, TestSize.Level1) { EXPECT_TRUE(RpcGetDeviceMacAddress(nullptr, nullptr) < 0); - char buff[] = "N|GetDeviceMacAddress|x|"; + char buff[] = "N\tGetDeviceMacAddress\tx\t"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|GetDeviceMacAddress|"); + mContext->nPos = strlen("N\tGetDeviceMacAddress\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcGetDeviceMacAddress(mServer, mContext) < 0); - char buff1[] = "N|GetDeviceMacAddress|17|"; + char buff1[] = "N\tGetDeviceMacAddress\t17\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|GetDeviceMacAddress|"); + mContext->nPos = strlen("N\tGetDeviceMacAddress\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcGetDeviceMacAddress(mServer, mContext) == 0); } @@ -850,14 +855,14 @@ HWTEST_F(WifiHalCRpcServerTest, RpcGetDeviceMacAddressTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerTest, RpcGetFrequenciesTest, TestSize.Level1) { EXPECT_TRUE(RpcGetFrequencies(nullptr, nullptr) < 0); - char buff[] = "N|GetFrequencies|1|"; + char buff[] = "N\tGetFrequencies\t1\t"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|GetFrequencies|"); + mContext->nPos = strlen("N\tGetFrequencies\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcGetFrequencies(mServer, mContext) < 0); - char buff1[] = "N|GetFrequencies|1|128|"; + char buff1[] = "N\tGetFrequencies\t1\t128\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|GetFrequencies|"); + mContext->nPos = strlen("N\tGetFrequencies\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcGetFrequencies(mServer, mContext) == 0); } @@ -865,19 +870,19 @@ HWTEST_F(WifiHalCRpcServerTest, RpcGetFrequenciesTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerTest, RpcSetAssocMacAddrTest, TestSize.Level1) { EXPECT_TRUE(RpcSetAssocMacAddr(nullptr, nullptr) < 0); - char buff[] = "N|SetAssocMacAddr|x|7d9c039dfeba46|"; + char buff[] = "N\tSetAssocMacAddr\tx\t7d9c039dfeba46\t"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|SetAssocMacAddr|"); + mContext->nPos = strlen("N\tSetAssocMacAddr\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcSetAssocMacAddr(mServer, mContext) < 0); - char buff1[] = "N|SetAssocMacAddr|6|7d9c039dfeba46|"; + char buff1[] = "N\tSetAssocMacAddr\t6\t7d9c039dfeba46\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|SetAssocMacAddr|"); + mContext->nPos = strlen("N\tSetAssocMacAddr\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcSetAssocMacAddr(mServer, mContext) < 0); - char buff2[] = "N|SetAssocMacAddr|7|7d9c039dfeba46|"; + char buff2[] = "N\tSetAssocMacAddr\t7\t7d9c039dfeba46\t"; mContext->oneProcess = buff2; - mContext->nPos = strlen("N|SetAssocMacAddr|"); + mContext->nPos = strlen("N\tSetAssocMacAddr\t"); mContext->nSize = strlen(buff2); EXPECT_TRUE(RpcSetAssocMacAddr(mServer, mContext) == 0); } @@ -885,19 +890,19 @@ HWTEST_F(WifiHalCRpcServerTest, RpcSetAssocMacAddrTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerTest, RpcSetScanningMacAddressTest, TestSize.Level1) { EXPECT_TRUE(RpcSetScanningMacAddress(nullptr, nullptr) < 0); - char buff[] = "N|SetScanningMacAddress|x|7d9c039dfeba46|"; + char buff[] = "N\tSetScanningMacAddress\tx\t7d9c039dfeba46\t"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|SetScanningMacAddress|"); + mContext->nPos = strlen("N\tSetScanningMacAddress\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcSetScanningMacAddress(mServer, mContext) < 0); - char buff1[] = "N|SetScanningMacAddress|6|7d9c039dfeba46|"; + char buff1[] = "N\tSetScanningMacAddress\t6\t7d9c039dfeba46\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|SetScanningMacAddress|"); + mContext->nPos = strlen("N\tSetScanningMacAddress\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcSetScanningMacAddress(mServer, mContext) < 0); - char buff2[] = "N|SetScanningMacAddress|7|7d9c039dfeba46|"; + char buff2[] = "N\tSetScanningMacAddress\t7\t7d9c039dfeba46\t"; mContext->oneProcess = buff2; - mContext->nPos = strlen("N|SetScanningMacAddress|"); + mContext->nPos = strlen("N\tSetScanningMacAddress\t"); mContext->nSize = strlen(buff2); EXPECT_TRUE(RpcSetScanningMacAddress(mServer, mContext) == 0); } @@ -905,19 +910,19 @@ HWTEST_F(WifiHalCRpcServerTest, RpcSetScanningMacAddressTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerTest, RpcDeauthLastRoamingBssidTest, TestSize.Level1) { EXPECT_TRUE(RpcDeauthLastRoamingBssid(nullptr, nullptr) < 0); - char buff[] = "N|DeauthLastRoamingBssid|x|7d9c039dfeba46|"; + char buff[] = "N\tDeauthLastRoamingBssid\tx\t7d9c039dfeba46\t"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|DeauthLastRoamingBssid|"); + mContext->nPos = strlen("N\tDeauthLastRoamingBssid\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcDeauthLastRoamingBssid(mServer, mContext) < 0); - char buff1[] = "N|DeauthLastRoamingBssid|6|7d9c039dfeba46|"; + char buff1[] = "N\tDeauthLastRoamingBssid\t6\t7d9c039dfeba46\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|DeauthLastRoamingBssid|"); + mContext->nPos = strlen("N\tDeauthLastRoamingBssid\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcDeauthLastRoamingBssid(mServer, mContext) < 0); - char buff2[] = "N|DeauthLastRoamingBssid|7|7d9c039dfeba46|"; + char buff2[] = "N\tDeauthLastRoamingBssid\t7\t7d9c039dfeba46\t"; mContext->oneProcess = buff2; - mContext->nPos = strlen("N|DeauthLastRoamingBssid|"); + mContext->nPos = strlen("N\tDeauthLastRoamingBssid\t"); mContext->nSize = strlen(buff2); EXPECT_TRUE(RpcDeauthLastRoamingBssid(mServer, mContext) == 0); } @@ -931,34 +936,34 @@ HWTEST_F(WifiHalCRpcServerTest, RpcGetSupportFeatureTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerTest, RpcRunCmdTest, TestSize.Level1) { EXPECT_TRUE(RpcRunCmd(nullptr, nullptr) < 0); - char buff[] = "N|RunCmd|wlan0"; + char buff[] = "N\tRunCmd\twlan0"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|RunCmd|"); + mContext->nPos = strlen("N\tRunCmd\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcRunCmd(mServer, mContext) < 0); - char buff1[] = "N|RunCmd|wlan0|x|"; + char buff1[] = "N\tRunCmd\twlan0\tx\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|RunCmd|"); + mContext->nPos = strlen("N\tRunCmd\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcRunCmd(mServer, mContext) < 0); - char buff2[] = "N|RunCmd|wlan0|1|x|"; + char buff2[] = "N\tRunCmd\twlan0\t1\tx\t"; mContext->oneProcess = buff2; - mContext->nPos = strlen("N|RunCmd|"); + mContext->nPos = strlen("N\tRunCmd\t"); mContext->nSize = strlen(buff2); EXPECT_TRUE(RpcRunCmd(mServer, mContext) < 0); - char buff3[] = "N|RunCmd|wlan0|1|6|7d9c039dfeba46|"; + char buff3[] = "N\tRunCmd\twlan0\t1\t6\t7d9c039dfeba46\t"; mContext->oneProcess = buff3; - mContext->nPos = strlen("N|RunCmd|"); + mContext->nPos = strlen("N\tRunCmd\t"); mContext->nSize = strlen(buff3); EXPECT_TRUE(RpcRunCmd(mServer, mContext) < 0); - char buff4[] = "N|RunCmd|wlan0|1|7|7d9c039dfeba46|"; + char buff4[] = "N\tRunCmd\twlan0\t1\t7\t7d9c039dfeba46\t"; mContext->oneProcess = buff4; - mContext->nPos = strlen("N|RunCmd|"); + mContext->nPos = strlen("N\tRunCmd\t"); mContext->nSize = strlen(buff4); EXPECT_TRUE(RpcRunCmd(mServer, mContext) == 0); - char buff5[] = "N|RunCmd|0123456789012345678901|1|7|7d9c039dfeba46|"; + char buff5[] = "N\tRunCmd\t0123456789012345678901\t1\t7\t7d9c039dfeba46\t"; mContext->oneProcess = buff5; - mContext->nPos = strlen("N|RunCmd|"); + mContext->nPos = strlen("N\tRunCmd\t"); mContext->nSize = strlen(buff5); EXPECT_TRUE(RpcRunCmd(mServer, mContext) == 0); } @@ -966,14 +971,14 @@ HWTEST_F(WifiHalCRpcServerTest, RpcRunCmdTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerTest, RpcSetWifiTxPowerTest, TestSize.Level1) { EXPECT_TRUE(RpcSetWifiTxPower(nullptr, nullptr) < 0); - char buff[] = "N|SetWifiTxPower|12"; + char buff[] = "N\tSetWifiTxPower\t12"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|SetWifiTxPower|"); + mContext->nPos = strlen("N\tSetWifiTxPower\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcSetWifiTxPower(mServer, mContext) < 0); - char buff1[] = "N|SetWifiTxPower|12|"; + char buff1[] = "N\tSetWifiTxPower\t12\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|SetWifiTxPower|"); + mContext->nPos = strlen("N\tSetWifiTxPower\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcSetWifiTxPower(mServer, mContext) == 0); } @@ -981,14 +986,14 @@ HWTEST_F(WifiHalCRpcServerTest, RpcSetWifiTxPowerTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerTest, RpcRemoveNetworkTest, TestSize.Level1) { EXPECT_TRUE(RpcRemoveNetwork(nullptr, nullptr) < 0); - char buff[] = "N|RemoveNetwork|12"; + char buff[] = "N\tRemoveNetwork\t12"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|RemoveNetwork|"); + mContext->nPos = strlen("N\tRemoveNetwork\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcRemoveNetwork(mServer, mContext) < 0); - char buff1[] = "N|RemoveNetwork|12|"; + char buff1[] = "N\tRemoveNetwork\t12\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|RemoveNetwork|"); + mContext->nPos = strlen("N\tRemoveNetwork\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcRemoveNetwork(mServer, mContext) == 0); } @@ -1002,14 +1007,14 @@ HWTEST_F(WifiHalCRpcServerTest, RpcAddNetworkTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerTest, RpcEnableNetworkTest, TestSize.Level1) { EXPECT_TRUE(RpcEnableNetwork(nullptr, nullptr) < 0); - char buff[] = "N|EnableNetwork|12"; + char buff[] = "N\tEnableNetwork\t12"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|EnableNetwork|"); + mContext->nPos = strlen("N\tEnableNetwork\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcEnableNetwork(mServer, mContext) < 0); - char buff1[] = "N|EnableNetwork|12|"; + char buff1[] = "N\tEnableNetwork\t12\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|EnableNetwork|"); + mContext->nPos = strlen("N\tEnableNetwork\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcEnableNetwork(mServer, mContext) == 0); } @@ -1017,14 +1022,14 @@ HWTEST_F(WifiHalCRpcServerTest, RpcEnableNetworkTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerTest, RpcDisableNetworkTest, TestSize.Level1) { EXPECT_TRUE(RpcDisableNetwork(nullptr, nullptr) < 0); - char buff[] = "N|DisableNetwork|12"; + char buff[] = "N\tDisableNetwork\t12"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|DisableNetwork|"); + mContext->nPos = strlen("N\tDisableNetwork\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcDisableNetwork(mServer, mContext) < 0); - char buff1[] = "N|DisableNetwork|12|"; + char buff1[] = "N\tDisableNetwork\t12\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|DisableNetwork|"); + mContext->nPos = strlen("N\tDisableNetwork\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcDisableNetwork(mServer, mContext) == 0); } @@ -1032,19 +1037,19 @@ HWTEST_F(WifiHalCRpcServerTest, RpcDisableNetworkTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerTest, RpcSetNetworkTest, TestSize.Level1) { EXPECT_TRUE(RpcSetNetwork(nullptr, nullptr) < 0); - char buff[] = "N|SetNetwork|0|1"; + char buff[] = "N\tSetNetwork\t0\t1"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|SetNetwork|"); + mContext->nPos = strlen("N\tSetNetwork\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcSetNetwork(mServer, mContext) < 0); - char buff1[] = "N|SetNetwork|0|1|12|afsdgljsd"; + char buff1[] = "N\tSetNetwork\t0\t1\t12\tafsdgljsd"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|SetNetwork|"); + mContext->nPos = strlen("N\tSetNetwork\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcSetNetwork(mServer, mContext) == 0); - char buff2[] = "N|SetNetwork|0|1|12|afsdgljsd|"; + char buff2[] = "N\tSetNetwork\t0\t1\t12\tafsdgljsd\t"; mContext->oneProcess = buff2; - mContext->nPos = strlen("N|SetNetwork|"); + mContext->nPos = strlen("N\tSetNetwork\t"); mContext->nSize = strlen(buff2); EXPECT_TRUE(RpcSetNetwork(mServer, mContext) == 0); } @@ -1052,14 +1057,14 @@ HWTEST_F(WifiHalCRpcServerTest, RpcSetNetworkTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerTest, RpcWpaGetNetworkTest, TestSize.Level1) { EXPECT_TRUE(RpcWpaGetNetwork(nullptr, nullptr) < 0); - char buff[] = "N|WpaGetNetwork|2|ssid"; + char buff[] = "N\tWpaGetNetwork\t2\tssid"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|WpaGetNetwork|"); + mContext->nPos = strlen("N\tWpaGetNetwork\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcWpaGetNetwork(mServer, mContext) < 0); - char buff1[] = "N|WpaGetNetwork|2|ssid|"; + char buff1[] = "N\tWpaGetNetwork\t2\tssid\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|WpaGetNetwork|"); + mContext->nPos = strlen("N\tWpaGetNetwork\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcWpaGetNetwork(mServer, mContext) == 0); } @@ -1073,14 +1078,14 @@ HWTEST_F(WifiHalCRpcServerTest, RpcSaveNetworkConfigTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerTest, RpcStartWpsPbcModeTest, TestSize.Level1) { EXPECT_TRUE(RpcStartWpsPbcMode(nullptr, nullptr) < 0); - char buff[] = "N|StartWpsPbcMode|1|2|adsgfkdsj"; + char buff[] = "N\tStartWpsPbcMode\t1\t2\tadsgfkdsj"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|StartWpsPbcMode|"); + mContext->nPos = strlen("N\tStartWpsPbcMode\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcStartWpsPbcMode(mServer, mContext) < 0); - char buff1[] = "N|StartWpsPbcMode|1|2|adsgfkdsj|"; + char buff1[] = "N\tStartWpsPbcMode\t1\t2\tadsgfkdsj\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|StartWpsPbcMode|"); + mContext->nPos = strlen("N\tStartWpsPbcMode\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcStartWpsPbcMode(mServer, mContext) == 0); } @@ -1088,14 +1093,14 @@ HWTEST_F(WifiHalCRpcServerTest, RpcStartWpsPbcModeTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerTest, RpcStartWpsPinModeTest, TestSize.Level1) { EXPECT_TRUE(RpcStartWpsPinMode(nullptr, nullptr) < 0); - char buff[] = "N|StartWpsPinMode|1|2|adsgfkdsj"; + char buff[] = "N\tStartWpsPinMode\t1\t2\tadsgfkdsj"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|StartWpsPinMode|"); + mContext->nPos = strlen("N\tStartWpsPinMode\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcStartWpsPinMode(mServer, mContext) < 0); - char buff1[] = "N|StartWpsPinMode|1|2|adsgfkdsj|"; + char buff1[] = "N\tStartWpsPinMode\t1\t2\tadsgfkdsj\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|StartWpsPinMode|"); + mContext->nPos = strlen("N\tStartWpsPinMode\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcStartWpsPinMode(mServer, mContext) == 0); } @@ -1121,29 +1126,29 @@ HWTEST_F(WifiHalCRpcServerTest, RpcGetRoamingCapabilitiesTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerTest, RpcSetRoamConfigTest, TestSize.Level1) { EXPECT_TRUE(RpcSetRoamConfig(nullptr, nullptr) < 0); - char buff[] = "N|SetRoamConfig|x|fdsagdsa|safdgfds|1|vcxzcbvx|"; + char buff[] = "N\tSetRoamConfig\tx\tfdsagdsa\tsafdgfds\t1\tvcxzcbvx\t"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|SetRoamConfig|"); + mContext->nPos = strlen("N\tSetRoamConfig\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcSetRoamConfig(mServer, mContext) < 0); - char buff1[] = "N|SetRoamConfig|2|fdsagdsa|safdgfds"; + char buff1[] = "N\tSetRoamConfig\t2\tfdsagdsa\tsafdgfds"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|SetRoamConfig|"); + mContext->nPos = strlen("N\tSetRoamConfig\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcSetRoamConfig(mServer, mContext) < 0); - char buff2[] = "N|SetRoamConfig|2|fdsagdsa|safdgfds|x|vcxzcbvx|"; + char buff2[] = "N\tSetRoamConfig\t2\tfdsagdsa\tsafdgfds\tx\tvcxzcbvx\t"; mContext->oneProcess = buff2; - mContext->nPos = strlen("N|SetRoamConfig|"); + mContext->nPos = strlen("N\tSetRoamConfig\t"); mContext->nSize = strlen(buff2); EXPECT_TRUE(RpcSetRoamConfig(mServer, mContext) < 0); - char buff3[] = "N|SetRoamConfig|2|fdsagdsa|safdgfds|1|vcxzcbvx"; + char buff3[] = "N\tSetRoamConfig\t2\tfdsagdsa\tsafdgfds\t1\tvcxzcbvx"; mContext->oneProcess = buff3; - mContext->nPos = strlen("N|SetRoamConfig|"); + mContext->nPos = strlen("N\tSetRoamConfig\t"); mContext->nSize = strlen(buff3); EXPECT_TRUE(RpcSetRoamConfig(mServer, mContext) < 0); - char buff4[] = "N|SetRoamConfig|2|fdsagdsa|safdgfds|1|vcxzcbvx|"; + char buff4[] = "N\tSetRoamConfig\t2\tfdsagdsa\tsafdgfds\t1\tvcxzcbvx\t"; mContext->oneProcess = buff4; - mContext->nPos = strlen("N|SetRoamConfig|"); + mContext->nPos = strlen("N\tSetRoamConfig\t"); mContext->nSize = strlen(buff4); EXPECT_TRUE(RpcSetRoamConfig(mServer, mContext) == 0); } @@ -1151,14 +1156,14 @@ HWTEST_F(WifiHalCRpcServerTest, RpcSetRoamConfigTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerTest, RpcGetConnectSignalInfoTest, TestSize.Level1) { EXPECT_TRUE(RpcGetConnectSignalInfo(nullptr, nullptr) < 0); - char buff[] = "N|GetConnectSignalInfo|ssid"; + char buff[] = "N\tGetConnectSignalInfo\tssid"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|GetConnectSignalInfo|"); + mContext->nPos = strlen("N\tGetConnectSignalInfo\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcGetConnectSignalInfo(mServer, mContext) < 0); - char buff1[] = "N|GetConnectSignalInfo|00:00:00:00:00:00|"; + char buff1[] = "N\tGetConnectSignalInfo\t00:00:00:00:00:00\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|GetConnectSignalInfo|"); + mContext->nPos = strlen("N\tGetConnectSignalInfo\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcGetConnectSignalInfo(mServer, mContext) == 0); } @@ -1166,26 +1171,34 @@ HWTEST_F(WifiHalCRpcServerTest, RpcGetConnectSignalInfoTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerTest, RpcStartSoftApTest, TestSize.Level1) { EXPECT_TRUE(RpcStartSoftAp(nullptr, nullptr) < 0); + char buff[] = "N\tStartSoftAp\t0\t"; + mContext->oneProcess = buff; + mContext->nPos = strlen("N\tStartSoftAp\t"); + mContext->nSize = strlen(buff); EXPECT_TRUE(RpcStartSoftAp(mServer, mContext) == 0); } HWTEST_F(WifiHalCRpcServerTest, RpcStopSoftApTest, TestSize.Level1) { EXPECT_TRUE(RpcStopSoftAp(nullptr, nullptr) < 0); + char buff[] = "N\tStopSoftAp\t0\t"; + mContext->oneProcess = buff; + mContext->nPos = strlen("N\tStopSoftAp\t"); + mContext->nSize = strlen(buff); EXPECT_TRUE(RpcStopSoftAp(mServer, mContext) == 0); } HWTEST_F(WifiHalCRpcServerTest, RpcSetHostapdConfigTest, TestSize.Level1) { EXPECT_TRUE(RpcSetHostapdConfig(nullptr, nullptr) < 0); - char buff[] = "N|SetHostapdConfig|tests|5|adc123456|9|1|0|6|20|"; + char buff[] = "N\tSetHostapdConfig\ttests\t5\tadc123456\t9\t1\t0\t6\t20\t0\t"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|SetHostapdConfig|"); + mContext->nPos = strlen("N\tSetHostapdConfig\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcSetHostapdConfig(mServer, mContext) == 0); - char buff1[] = "N|SetHostapdConfig|tests|5|adc123456|9|1|0|6|20"; + char buff1[] = "N\tSetHostapdConfig\ttests\t5\tadc123456\t9\t1\t0\t6\t20"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|SetHostapdConfig|"); + mContext->nPos = strlen("N\tSetHostapdConfig\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcSetHostapdConfig(mServer, mContext) < 0); } @@ -1193,14 +1206,14 @@ HWTEST_F(WifiHalCRpcServerTest, RpcSetHostapdConfigTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerTest, RpcGetStaInfosTest, TestSize.Level1) { EXPECT_TRUE(RpcGetStaInfos(nullptr, nullptr) < 0); - char buff[] = "N|GetStaInfos|128"; + char buff[] = "N\tGetStaInfos\t128"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|GetStaInfos|"); + mContext->nPos = strlen("N\tGetStaInfos\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcGetStaInfos(mServer, mContext) < 0); - char buff1[] = "N|GetStaInfos|128|"; + char buff1[] = "N\tGetStaInfos\t128\t0\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|GetStaInfos|"); + mContext->nPos = strlen("N\tGetStaInfos\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcGetStaInfos(mServer, mContext) == 0); } @@ -1208,14 +1221,14 @@ HWTEST_F(WifiHalCRpcServerTest, RpcGetStaInfosTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerTest, RpcSetCountryCodeTest, TestSize.Level1) { EXPECT_TRUE(RpcSetCountryCode(nullptr, nullptr) < 0); - char buff[] = "N|SetCountryCode|CN"; + char buff[] = "N\tSetCountryCode\tCN"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|SetCountryCode|"); + mContext->nPos = strlen("N\tSetCountryCode\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcSetCountryCode(mServer, mContext) < 0); - char buff1[] = "N|SetCountryCode|CN|"; + char buff1[] = "N\tSetCountryCode\tCN\t0\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|SetCountryCode|"); + mContext->nPos = strlen("N\tSetCountryCode\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcSetCountryCode(mServer, mContext) == 0); } @@ -1223,19 +1236,19 @@ HWTEST_F(WifiHalCRpcServerTest, RpcSetCountryCodeTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerTest, RpcSetMacFilterTest, TestSize.Level1) { EXPECT_TRUE(RpcSetMacFilter(nullptr, nullptr) < 0); - char buff[] = "N|SetMacFilter|x|345697dbf921d3|"; + char buff[] = "N\tSetMacFilter\tx\t345697dbf921d3\t"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|SetMacFilter|"); + mContext->nPos = strlen("N\tSetMacFilter\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcSetMacFilter(mServer, mContext) < 0); - char buff1[] = "N|SetMacFilter|6|345697dbf921d3|"; + char buff1[] = "N\tSetMacFilter\t6\t345697dbf921d3\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|SetMacFilter|"); + mContext->nPos = strlen("N\tSetMacFilter\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcSetMacFilter(mServer, mContext) < 0); - char buff2[] = "N|SetMacFilter|7|345697dbf921d3|"; + char buff2[] = "N\tSetMacFilter\t7\t345697dbf921d3\t0\t"; mContext->oneProcess = buff2; - mContext->nPos = strlen("N|SetMacFilter|"); + mContext->nPos = strlen("N\tSetMacFilter\t"); mContext->nSize = strlen(buff2); EXPECT_TRUE(RpcSetMacFilter(mServer, mContext) == 0); } @@ -1243,19 +1256,19 @@ HWTEST_F(WifiHalCRpcServerTest, RpcSetMacFilterTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerTest, RpcDelMacFilterTest, TestSize.Level1) { EXPECT_TRUE(RpcDelMacFilter(nullptr, nullptr) < 0); - char buff[] = "N|DelMacFilter|x|345697dbf921d3|"; + char buff[] = "N\tDelMacFilter\tx\t345697dbf921d3\t"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|DelMacFilter|"); + mContext->nPos = strlen("N\tDelMacFilter\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcDelMacFilter(mServer, mContext) < 0); - char buff1[] = "N|DelMacFilter|6|345697dbf921d3|"; + char buff1[] = "N\tDelMacFilter\t6\t345697dbf921d3\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|DelMacFilter|"); + mContext->nPos = strlen("N\tDelMacFilter\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcDelMacFilter(mServer, mContext) < 0); - char buff2[] = "N|DelMacFilter|7|345697dbf921d3|"; + char buff2[] = "N\tDelMacFilter\t7\t345697dbf921d3\t0\t"; mContext->oneProcess = buff2; - mContext->nPos = strlen("N|DelMacFilter|"); + mContext->nPos = strlen("N\tDelMacFilter\t"); mContext->nSize = strlen(buff2); EXPECT_TRUE(RpcDelMacFilter(mServer, mContext) == 0); } @@ -1263,19 +1276,19 @@ HWTEST_F(WifiHalCRpcServerTest, RpcDelMacFilterTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerTest, RpcDisassociateStaTest, TestSize.Level1) { EXPECT_TRUE(RpcDisassociateSta(nullptr, nullptr) < 0); - char buff[] = "N|DisassociateSta|x|345697dbf921d3|"; + char buff[] = "N\tDisassociateSta\tx\t345697dbf921d3\t"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|DisassociateSta|"); + mContext->nPos = strlen("N\tDisassociateSta\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcDisassociateSta(mServer, mContext) < 0); - char buff1[] = "N|DisassociateSta|6|345697dbf921d3|"; + char buff1[] = "N\tDisassociateSta\t6\t345697dbf921d3\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|DisassociateSta|"); + mContext->nPos = strlen("N\tDisassociateSta\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcDisassociateSta(mServer, mContext) < 0); - char buff2[] = "N|DisassociateSta|7|345697dbf921d3|"; + char buff2[] = "N\tDisassociateSta\t7\t345697dbf921d3\t0\t"; mContext->oneProcess = buff2; - mContext->nPos = strlen("N|DisassociateSta|"); + mContext->nPos = strlen("N\tDisassociateSta\t"); mContext->nSize = strlen(buff2); EXPECT_TRUE(RpcDisassociateSta(mServer, mContext) == 0); } @@ -1283,16 +1296,16 @@ HWTEST_F(WifiHalCRpcServerTest, RpcDisassociateStaTest, TestSize.Level1) HWTEST_F(WifiHalCRpcServerTest, RpcGetValidFrequenciesForBandTest, TestSize.Level1) { EXPECT_TRUE(RpcGetValidFrequenciesForBand(nullptr, nullptr) < 0); - char buff[] = "N|GetValidFrequenciesForBand|1|128"; + char buff[] = "N\tGetValidFrequenciesForBand\t1\t128"; mContext->oneProcess = buff; - mContext->nPos = strlen("N|GetValidFrequenciesForBand|"); + mContext->nPos = strlen("N\tGetValidFrequenciesForBand\t"); mContext->nSize = strlen(buff); EXPECT_TRUE(RpcGetValidFrequenciesForBand(mServer, mContext) < 0); - char buff1[] = "N|GetValidFrequenciesForBand|1|128|"; + char buff1[] = "N\tGetValidFrequenciesForBand\t1\t128\t0\t"; mContext->oneProcess = buff1; - mContext->nPos = strlen("N|GetValidFrequenciesForBand|"); + mContext->nPos = strlen("N\tGetValidFrequenciesForBand\t"); mContext->nSize = strlen(buff1); EXPECT_TRUE(RpcGetValidFrequenciesForBand(mServer, mContext) == 0); } } // namespace Wifi -} // namespace OHOS +} // namespace OHOS \ No newline at end of file diff --git a/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_hostapd_test.cpp b/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_hostapd_test.cpp index a0d7a79..9462b43 100644 --- a/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_hostapd_test.cpp +++ b/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_hostapd_test.cpp @@ -40,13 +40,13 @@ void WifiHalHostapdTest::SetUpTestCase() InitCallbackMsg(); SetRpcServerInited(mServer); MockInitApSupportedCmd(); - mInterface = GetWifiHostapdDev(); + mInterface = GetWifiHostapdDev(0); } void WifiHalHostapdTest::TearDownTestCase() { sleep(1); - ReleaseHostapdDev(); + ReleaseHostapdDev(0); if (mServer != nullptr) { ReleaseRpcServer(mServer); mServer = nullptr; @@ -58,129 +58,129 @@ void WifiHalHostapdTest::TearDownTestCase() HWTEST_F(WifiHalHostapdTest, EnableApTest, TestSize.Level1) { MockEraseSupportedCmd("ENABLE"); - int ret = mInterface->enableAp(); + int ret = mInterface->enableAp(0); EXPECT_TRUE(ret != 0); MockSetWpaExpectCmdResponse("ENABLE", "OK"); - ret = mInterface->enableAp(); + ret = mInterface->enableAp(0); EXPECT_TRUE(ret == 0); MockWpaCallback(mInterface->ctrlConn, "<3>AP-ENABLED \n"); } HWTEST_F(WifiHalHostapdTest, SetApInfoTest, TestSize.Level1) { - EXPECT_TRUE(mInterface->setApInfo(nullptr) < 0); + EXPECT_TRUE(mInterface->setApInfo(nullptr, 0) < 0); HostapdConfig conf; ASSERT_TRUE(memset_s(&conf, sizeof(conf), 0, sizeof(conf)) == EOK); conf.securityType = WPA_PSK; - EXPECT_TRUE(mInterface->setApInfo(&conf) < 0); + EXPECT_TRUE(mInterface->setApInfo(&conf, 0) < 0); StrSafeCopy(conf.preSharedKey, sizeof(conf.preSharedKey), "1234567"); - EXPECT_TRUE(mInterface->setApInfo(&conf) < 0); + EXPECT_TRUE(mInterface->setApInfo(&conf, 0) < 0); StrSafeCopy(conf.preSharedKey, sizeof(conf.preSharedKey), "12345678"); conf.preSharedKeyLen = strlen(conf.preSharedKey); - EXPECT_TRUE(mInterface->setApInfo(&conf) == 0); + EXPECT_TRUE(mInterface->setApInfo(&conf, 0) == 0); conf.securityType = WPA2_PSK; - EXPECT_TRUE(mInterface->setApInfo(&conf) == 0); + EXPECT_TRUE(mInterface->setApInfo(&conf, 0) == 0); conf.securityType = NONE; - EXPECT_TRUE(mInterface->setApInfo(&conf) == 0); + EXPECT_TRUE(mInterface->setApInfo(&conf, 0) == 0); conf.securityType = IEEE8021X; - EXPECT_TRUE(mInterface->setApInfo(&conf) < 0); + EXPECT_TRUE(mInterface->setApInfo(&conf, 0) < 0); conf.securityType = NONE; conf.band = AP_2GHZ_BAND; - EXPECT_TRUE(mInterface->setApInfo(&conf) == 0); + EXPECT_TRUE(mInterface->setApInfo(&conf, 0) == 0); conf.band = AP_5GHZ_BAND; - EXPECT_TRUE(mInterface->setApInfo(&conf) == 0); + EXPECT_TRUE(mInterface->setApInfo(&conf, 0) == 0); conf.band = -1; - EXPECT_TRUE(mInterface->setApInfo(&conf) < 0); + EXPECT_TRUE(mInterface->setApInfo(&conf, 0) < 0); conf.band = AP_DFS_BAND; - EXPECT_TRUE(mInterface->setApInfo(&conf) < 0); + EXPECT_TRUE(mInterface->setApInfo(&conf, 0) < 0); } HWTEST_F(WifiHalHostapdTest, DisableApTest, TestSize.Level1) { MockEraseSupportedCmd("DISABLE"); - int ret = mInterface->disableAp(); + int ret = mInterface->disableAp(0); EXPECT_TRUE(ret != 0); MockSetWpaExpectCmdResponse("DISABLE", "OK"); - ret = mInterface->disableAp(); + ret = mInterface->disableAp(0); EXPECT_TRUE(ret == 0); MockWpaCallback(mInterface->ctrlConn, "<3>AP-DISABLED \n"); } HWTEST_F(WifiHalHostapdTest, AddBlockListTest, TestSize.Level1) { - EXPECT_TRUE(mInterface->addBlocklist(nullptr) < 0); - EXPECT_TRUE(mInterface->addBlocklist("00:00:00:00:00:00") == 0); + EXPECT_TRUE(mInterface->addBlocklist(nullptr, 0) < 0); + EXPECT_TRUE(mInterface->addBlocklist("00:00:00:00:00:00", 0) == 0); MockSetWpaExpectCmdResponse("DENY_ACL", "UNKNOWN COMMAND"); - EXPECT_TRUE(mInterface->addBlocklist("00:00:00:00:00:00") == 0); + EXPECT_TRUE(mInterface->addBlocklist("00:00:00:00:00:00", 0) == 0); MockSetWpaExpectCmdResponse("DENY_ACL", "OK"); } HWTEST_F(WifiHalHostapdTest, DelBlockListTest, TestSize.Level1) { - EXPECT_TRUE(mInterface->delBlocklist(nullptr) < 0); - EXPECT_TRUE(mInterface->delBlocklist("00:00:00:00:00:00") == 0); + EXPECT_TRUE(mInterface->delBlocklist(nullptr, 0) < 0); + EXPECT_TRUE(mInterface->delBlocklist("00:00:00:00:00:00", 0) == 0); MockSetWpaExpectCmdResponse("DENY_ACL", "UNKNOWN COMMAND"); - EXPECT_TRUE(mInterface->delBlocklist("00:00:00:00:00:00") == 0); + EXPECT_TRUE(mInterface->delBlocklist("00:00:00:00:00:00", 0) == 0); MockSetWpaExpectCmdResponse("DENY_ACL", "OK"); } HWTEST_F(WifiHalHostapdTest, GetApStatusTest, TestSize.Level1) { - EXPECT_TRUE(mInterface->status(nullptr) < 0); + EXPECT_TRUE(mInterface->status(nullptr, 0) < 0); StatusInfo info; ASSERT_TRUE(memset_s(&info, sizeof(info), 0, sizeof(info)) == EOK); - EXPECT_TRUE(mInterface->status(&info) == 0); + EXPECT_TRUE(mInterface->status(&info, 0) == 0); char buf[BUFSIZE_REQUEST] = "test1=adsgdjks\nteset2=gflsdfis\ntest3=" "gfdklse\nstate=disable\ngfdsd=gdhjs\n"; MockSetWpaExpectCmdResponse("STATUS", buf); - EXPECT_TRUE(mInterface->status(&info) == 0); + EXPECT_TRUE(mInterface->status(&info, 0) == 0); EXPECT_TRUE(strcmp(info.state, "disable") == 0); } HWTEST_F(WifiHalHostapdTest, HostapdCliCmdListStaTest, TestSize.Level1) { - EXPECT_TRUE(mInterface->showConnectedDevList(nullptr, 0) < 0); + EXPECT_TRUE(mInterface->showConnectedDevList(nullptr, 0, 0) < 0); char buff[256] = {0}; int size = 256; MockEraseSupportedCmd("STA-FIRST"); - EXPECT_TRUE(mInterface->showConnectedDevList(buff, size) < 0); + EXPECT_TRUE(mInterface->showConnectedDevList(buff, size, 0) < 0); MockSetWpaExpectCmdResponse("STA-FIRST", "00:00:00:00:00:00"); MockSetWpaExpectCmdResponse("STA-NEXT", "FAIL"); - EXPECT_TRUE(mInterface->showConnectedDevList(buff, size) == 0); + EXPECT_TRUE(mInterface->showConnectedDevList(buff, size, 0) == 0); EXPECT_TRUE(strcmp(buff, ",00:00:00:00:00:00") == 0); } HWTEST_F(WifiHalHostapdTest, ReloadApConfigInfoTest, TestSize.Level1) { MockEraseSupportedCmd("RELOAD"); - int ret = mInterface->reloadApConfigInfo(); + int ret = mInterface->reloadApConfigInfo(0); EXPECT_TRUE(ret != 0); MockSetWpaExpectCmdResponse("RELOAD", "OK"); - ret = mInterface->reloadApConfigInfo(); + ret = mInterface->reloadApConfigInfo(0); EXPECT_TRUE(ret == 0); } HWTEST_F(WifiHalHostapdTest, DisConnectedDevTest, TestSize.Level1) { MockWpaCallback(mInterface->ctrlConn, "<3>AP-STA-CONNECTED 00:00:00:00:00:00\n"); - EXPECT_TRUE(mInterface->disConnectedDev(nullptr) < 0); + EXPECT_TRUE(mInterface->disConnectedDev(nullptr, 0) < 0); MockEraseSupportedCmd("DISASSOCIATE"); - int ret = mInterface->disConnectedDev("00:00:00:00:00:00"); + int ret = mInterface->disConnectedDev("00:00:00:00:00:00", 0); EXPECT_TRUE(ret != 0); MockSetWpaExpectCmdResponse("DISASSOCIATE", "OK"); - ret = mInterface->disConnectedDev("00:00:00:00:00:00"); + ret = mInterface->disConnectedDev("00:00:00:00:00:00", 0); EXPECT_TRUE(ret == 0); MockWpaCallback(mInterface->ctrlConn, "<3>AP-STA-DISCONNECTED 00:00:00:00:00:00\n"); } HWTEST_F(WifiHalHostapdTest, SetCountryCodeTest, TestSize.Level1) { - EXPECT_TRUE(mInterface->setCountryCode(nullptr) < 0); + EXPECT_TRUE(mInterface->setCountryCode(nullptr, 0) < 0); MockEraseSupportedCmd("SET"); - int ret = mInterface->setCountryCode("CN"); + int ret = mInterface->setCountryCode("CN", 0); EXPECT_TRUE(ret != 0); MockSetWpaExpectCmdResponse("SET", "OK"); - ret = mInterface->setCountryCode("CN"); + ret = mInterface->setCountryCode("CN", 0); EXPECT_TRUE(ret == 0); } } // namespace Wifi -- Gitee From ef2b103f9eb57587749890d2765bb02077cdaaaa Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Thu, 7 Jul 2022 09:02:50 +0800 Subject: [PATCH 220/491] bugfix for master 0707 Signed-off-by: yanxiaotao@huawei.com --- .../wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp index a34405a..60c29a8 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp @@ -1477,6 +1477,7 @@ void StaStateMachine::DisConnectProcess() SaveLinkstate(ConnState::DISCONNECTED, DetailedState::DISCONNECTED); DisableNetwork(linkedInfo.networkId); + getIpSucNum = 0; /* The current state of StaStateMachine transfers to SeparatedState. */ SwitchState(pSeparatedState); } else { -- Gitee From 93184f032ff5b328f482f1c20b1c560869a8f399 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Thu, 7 Jul 2022 10:24:46 +0800 Subject: [PATCH 221/491] bugfix for master 0707 Signed-off-by: yanxiaotao@huawei.com --- .../wifi_manage/wifi_sta/sta_state_machine.h | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h index 3502dd9..7c93d81 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h @@ -120,7 +120,7 @@ public: */ class WpaStartingState : public State { public: - explicit WpaStartingState(StaStateMachine *pStaStateMachine); + explicit WpaStartingState(StaStateMachine *staStateMachine); ~WpaStartingState() override; void InitWpsSettings(); void GoInState() override; @@ -136,7 +136,7 @@ public: */ class WpaStartedState : public State { public: - explicit WpaStartedState(StaStateMachine *pStaStateMachine); + explicit WpaStartedState(StaStateMachine *staStateMachine); ~WpaStartedState() override; void GoInState() override; void GoOutState() override; @@ -151,7 +151,7 @@ public: */ class WpaStoppingState : public State { public: - explicit WpaStoppingState(StaStateMachine *pStaStateMachine); + explicit WpaStoppingState(StaStateMachine *staStateMachine); ~WpaStoppingState() override; void GoInState() override; void GoOutState() override; @@ -166,7 +166,7 @@ public: */ class LinkState : public State { public: - explicit LinkState(StaStateMachine *pStaStateMachine); + explicit LinkState(StaStateMachine *staStateMachine); ~LinkState() override; void GoInState() override; void GoOutState() override; @@ -193,7 +193,7 @@ public: */ class SeparatedState : public State { public: - explicit SeparatedState(StaStateMachine *pStaStateMachine); + explicit SeparatedState(StaStateMachine *staStateMachine); ~SeparatedState() override; void GoInState() override; void GoOutState() override; @@ -208,7 +208,7 @@ public: */ class ApLinkedState : public State { public: - explicit ApLinkedState(StaStateMachine *pStaStateMachine); + explicit ApLinkedState(StaStateMachine *staStateMachine); ~ApLinkedState() override; void GoInState() override; void GoOutState() override; @@ -223,7 +223,7 @@ public: */ class StaWpsState : public State { public: - explicit StaWpsState(StaStateMachine *pStaStateMachine); + explicit StaWpsState(StaStateMachine *staStateMachine); ~StaWpsState() override; void GoInState() override; void GoOutState() override; @@ -238,7 +238,7 @@ public: */ class GetIpState : public State { public: - explicit GetIpState(StaStateMachine *pStaStateMachine); + explicit GetIpState(StaStateMachine *staStateMachine); ~GetIpState() override; void GoInState() override; void GoOutState() override; @@ -265,7 +265,7 @@ public: */ class ApRoamingState : public State { public: - explicit ApRoamingState(StaStateMachine *pStaStateMachine); + explicit ApRoamingState(StaStateMachine *staStateMachine); ~ApRoamingState() override; void GoInState() override; void GoOutState() override; @@ -281,7 +281,7 @@ public: * @Description : Construct a new dhcp result notify object * */ - explicit DhcpResultNotify(StaStateMachine *pStaStateMachine); + explicit DhcpResultNotify(StaStateMachine *staStateMachine); /** * @Description : Destroy the dhcp result notify object -- Gitee From 76e61b6af8e1f72dec82865b81e869eda50e04bc Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Fri, 8 Jul 2022 14:46:40 +0800 Subject: [PATCH 222/491] p2p code optimize Signed-off-by: zhangfeng --- .../js/napi/src/wifi_napi_event.cpp | 11 +- .../native/c_adapter/src/wifi_c_hid2d.cpp | 39 +- .../native/c_adapter/src/wifi_c_p2p.cpp | 34 +- wifi/frameworks/native/include/wifi_hid2d.h | 9 + wifi/frameworks/native/interfaces/define.h | 3 + .../frameworks/native/interfaces/i_wifi_p2p.h | 9 + .../native/interfaces/i_wifi_p2p_callback.h | 16 +- .../native/interfaces/wifi_hid2d_msg.h | 19 + .../native/interfaces/wifi_p2p_msg.h | 1 + .../native/src/wifi_p2p_callback_stub.cpp | 44 + .../native/src/wifi_p2p_callback_stub.h | 10 + wifi/frameworks/native/src/wifi_p2p_impl.cpp | 6 + wifi/frameworks/native/src/wifi_p2p_impl.h | 9 + wifi/frameworks/native/src/wifi_p2p_proxy.cpp | 31 + wifi/frameworks/native/src/wifi_p2p_proxy.h | 9 + wifi/interfaces/kits/c/wifi_hid2d.h | 50 +- wifi/interfaces/kits/c/wifi_p2p_config.h | 1 - .../wifi_standard/wifi_framework/BUILD.gn | 1 + .../common/include/wifi_internal_msg.h | 19 +- .../wifi_framework/wifi_manage/BUILD.gn | 3 +- .../idl_client/idl_interface/i_wifi_chip.c | 108 ++- .../idl_client/idl_interface/i_wifi_chip.h | 38 +- .../idl_client/wifi_chip_hal_interface.cpp | 28 +- .../idl_client/wifi_chip_hal_interface.h | 38 +- .../idl_client/wifi_idl_client.cpp | 29 +- .../wifi_manage/idl_client/wifi_idl_client.h | 38 +- .../wifi_manage/idl_client/wifi_idl_define.h | 3 +- .../wifi_manage/wifi_ap/BUILD.gn | 2 + .../wifi_manage/wifi_ap/ap_started_state.cpp | 5 +- .../wifi_manage/wifi_common/BUILD.gn | 42 + .../wifi_common/wifi_chip_capability.cpp | 121 +++ .../wifi_common/wifi_chip_capability.h | 49 ++ .../wifi_manage/wifi_hid2d_cfg.cpp | 793 ------------------ .../wifi_manage/wifi_hid2d_cfg.h | 256 ------ .../wifi_internal_event_dispatcher.cpp | 18 + .../wifi_internal_event_dispatcher.h | 1 + .../wifi_manage/wifi_manager.cpp | 48 +- .../wifi_framework/wifi_manage/wifi_manager.h | 9 + .../wifi_manage/wifi_p2p/BUILD.gn | 8 +- .../hid2d}/wifi_hid2d_service_utils.cpp | 2 +- .../hid2d}/wifi_hid2d_service_utils.h | 0 .../wifi_manage/wifi_p2p/ip2p_service.h | 73 ++ .../wifi_p2p/ip2p_service_callbacks.h | 3 + .../wifi_manage/wifi_p2p/p2p_interface.cpp | 47 ++ .../wifi_manage/wifi_p2p/p2p_interface.h | 73 ++ .../wifi_p2p/p2p_state_machine.cpp | 2 +- .../wifi_manage/wifi_p2p/wifi_p2p_service.cpp | 106 ++- .../wifi_manage/wifi_p2p/wifi_p2p_service.h | 73 ++ .../wifi_manage/wifi_p2p_callback_proxy.cpp | 26 + .../wifi_manage/wifi_p2p_callback_proxy.h | 9 + .../wifi_manage/wifi_p2p_service_impl.cpp | 134 ++- .../wifi_manage/wifi_p2p_service_impl.h | 16 + .../wifi_manage/wifi_p2p_stub.cpp | 18 + .../wifi_manage/wifi_p2p_stub.h | 4 + .../wifi_manage/wifi_sta/BUILD.gn | 2 + .../wifi_sta/sta_state_machine.cpp | 3 +- .../wifi_hal/wifi_hal_chip_interface.c | 50 +- .../wifi_hal/wifi_hal_chip_interface.h | 39 +- .../wifi_hal/wifi_hal_crpc_chip.c | 72 +- .../wifi_hal/wifi_hal_crpc_chip.h | 43 +- .../wifi_hal/wifi_hal_crpc_server.c | 6 +- .../wifi_standard/wifi_hal/wifi_hal_define.h | 2 + .../wifi_manage/wifi_ap/BUILD.gn | 3 + .../wifi_ap/Mock/mock_ap_started_state.h | 6 +- .../wifi_manage/wifi_p2p/test/BUILD.gn | 6 +- .../wifi_manage/wifi_sta/BUILD.gn | 2 + .../unittest/wifi_hal_chip_interface_test.cpp | 5 - .../unittest/wifi_hal_crpc_server_test.cpp | 15 - wifi/utils/inc/wifi_common_util.h | 14 + wifi/utils/src/wifi_common_util.cpp | 44 + 70 files changed, 1669 insertions(+), 1187 deletions(-) create mode 100755 wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_common/BUILD.gn create mode 100755 wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_common/wifi_chip_capability.cpp create mode 100755 wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_common/wifi_chip_capability.h delete mode 100644 wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_cfg.cpp delete mode 100644 wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_cfg.h rename wifi/services/wifi_standard/wifi_framework/wifi_manage/{ => wifi_p2p/hid2d}/wifi_hid2d_service_utils.cpp (100%) mode change 100644 => 100755 rename wifi/services/wifi_standard/wifi_framework/wifi_manage/{ => wifi_p2p/hid2d}/wifi_hid2d_service_utils.h (100%) mode change 100644 => 100755 diff --git a/wifi/frameworks/js/napi/src/wifi_napi_event.cpp b/wifi/frameworks/js/napi/src/wifi_napi_event.cpp index 1ad1ac2..0bdeb72 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_event.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_event.cpp @@ -15,12 +15,12 @@ #include "wifi_napi_event.h" #include -#include "wifi_napi_utils.h" +#include "accesstoken_kit.h" +#include "ipc_skeleton.h" #include "wifi_device.h" -#include "wifi_scan.h" #include "wifi_logger.h" -#include "ipc_skeleton.h" -#include "accesstoken_kit.h" +#include "wifi_napi_utils.h" +#include "wifi_scan.h" namespace OHOS { namespace Wifi { @@ -382,6 +382,9 @@ public: void OnP2pActionResult(P2pActionCallback action, ErrCode code) override { } + void OnConfigChanged(CfgType type, char* data, int dataLen) override { + } + OHOS::sptr AsObject() override { return nullptr; } diff --git a/wifi/frameworks/native/c_adapter/src/wifi_c_hid2d.cpp b/wifi/frameworks/native/c_adapter/src/wifi_c_hid2d.cpp index 20b5c4c..84d745c 100644 --- a/wifi/frameworks/native/c_adapter/src/wifi_c_hid2d.cpp +++ b/wifi/frameworks/native/c_adapter/src/wifi_c_hid2d.cpp @@ -39,13 +39,13 @@ WifiErrorCode Hid2dRequestGcIp(const unsigned char gcMac[MAC_LEN], unsigned int return OHOS::Wifi::IpStrToArray(strIpAddr, ipAddr); } -WifiErrorCode Hid2dSharedlinkIncrease() +WifiErrorCode Hid2dSharedlinkIncrease(void) { CHECK_PTR_RETURN(wifiHid2dPtr, ERROR_WIFI_NOT_AVAILABLE); return GetCErrorCode(wifiHid2dPtr->Hid2dSharedlinkIncrease()); } -WifiErrorCode Hid2dSharedlinkDecrease() +WifiErrorCode Hid2dSharedlinkDecrease(void) { CHECK_PTR_RETURN(wifiHid2dPtr, ERROR_WIFI_NOT_AVAILABLE); return GetCErrorCode(wifiHid2dPtr->Hid2dSharedlinkDecrease()); @@ -124,27 +124,6 @@ WifiErrorCode Hid2dGetRecommendChannel(const RecommendChannelRequest *request, R CHECK_PTR_RETURN(wifiHid2dPtr, ERROR_WIFI_NOT_AVAILABLE); CHECK_PTR_RETURN(request, ERROR_WIFI_INVALID_ARGS); CHECK_PTR_RETURN(response, ERROR_WIFI_INVALID_ARGS); - - WifiLinkedInfo linkedInfo; - WifiErrorCode ret = GetLinkedInfo(&linkedInfo); - if (ret == WIFI_SUCCESS && linkedInfo.connState == WIFI_CONNECTED) { - response->status = RS_SUCCESS; - response->index = 0; - - constexpr int FREQ_2G_MAX = 2472; - constexpr int CHANNEL_14_FREQ = 2484; - if (linkedInfo.frequency <= FREQ_2G_MAX || linkedInfo.frequency == CHANNEL_14_FREQ) { - response->centerFreq = linkedInfo.frequency; - response->centerFreq1 = 0; - } else { - response->centerFreq = 0; - response->centerFreq1 = linkedInfo.frequency; - } - response->centerFreq2 = 0; - response->bandwidth = linkedInfo.band; - return WIFI_SUCCESS; - } - OHOS::Wifi::RecommendChannelRequest req; OHOS::Wifi::RecommendChannelResponse rsp; ConvertRecommendChannelRequest(request, req); @@ -192,8 +171,20 @@ WifiErrorCode Hid2dSetPeerWifiCfgInfo(PeerCfgType cfgType, char cfgData[CFG_DATA OHOS::Wifi::PeerCfgType(static_cast(cfgType)), cfgData, setDataValidLen)); } -int Hid2dIsWideBandwidthSupported() +int Hid2dIsWideBandwidthSupported(void) { constexpr int NOT_SUPPORT = 0; // false return NOT_SUPPORT; } + +WifiErrorCode Hid2dSetUpperScene(const char ifName[IF_NAME_LEN], const Hid2dUpperScene *scene) +{ + CHECK_PTR_RETURN(wifiHid2dPtr, ERROR_WIFI_NOT_AVAILABLE); + CHECK_PTR_RETURN(scene, ERROR_WIFI_INVALID_ARGS); + OHOS::Wifi::Hid2dUpperScene upperScene; + upperScene.mac = OHOS::Wifi::MacArrayToStr(scene->mac); + upperScene.scene = scene->scene; + upperScene.fps = scene->fps; + upperScene.bw = scene->bw; + return GetCErrorCode(wifiHid2dPtr->Hid2dSetUpperScene(ifName, upperScene)); +} diff --git a/wifi/frameworks/native/c_adapter/src/wifi_c_p2p.cpp b/wifi/frameworks/native/c_adapter/src/wifi_c_p2p.cpp index ffc4c2b..d063f8e 100644 --- a/wifi/frameworks/native/c_adapter/src/wifi_c_p2p.cpp +++ b/wifi/frameworks/native/c_adapter/src/wifi_c_p2p.cpp @@ -14,6 +14,7 @@ */ #include "../../../interfaces/kits/c/wifi_p2p.h" +#include "../../../interfaces/kits/c/wifi_hid2d.h" #include "wifi_logger.h" #include "../../../frameworks/native/include/wifi_p2p.h" #include "wifi_c_utils.h" @@ -334,7 +335,8 @@ WifiErrorCode QueryP2pGroups(WifiP2pGroupInfo* groupInfo, int size) return WIFI_SUCCESS; } -class WifiP2pCEventCallback : public OHOS::Wifi::IWifiP2pCallback { +class WifiP2pCEventCallback : public OHOS::Wifi::IWifiP2pCallback +{ public: void OnP2pStateChanged(int state) override { WIFI_LOGI("received state changed event: %{public}d", state); @@ -396,6 +398,13 @@ public: void OnP2pActionResult(OHOS::Wifi::P2pActionCallback action, OHOS::Wifi::ErrCode code) override { } + void OnConfigChanged(OHOS::Wifi::CfgType type, char* data, int dataLen) override { + WIFI_LOGI("received config change event: %{public}d", static_cast(type)); + if (cfgChangeCallback != nullptr) { + cfgChangeCallback(CfgType(type), data, dataLen); + } + } + OHOS::sptr AsObject() override { return nullptr; } @@ -406,6 +415,7 @@ public: groupChangeCb = nullptr; connectionChangeCb = nullptr; peersChangeCb = nullptr; + cfgChangeCallback = nullptr; } virtual ~WifiP2pCEventCallback() { @@ -416,6 +426,7 @@ public: P2pPersistentGroupsChangedCallback groupChangeCb; P2pConnectionChangedCallback connectionChangeCb; P2pPeersChangedCallback peersChangeCb; + WifiCfgChangCallback cfgChangeCallback; private: WifiP2pLinkedInfo ConvertP2pLinkedInfo(const OHOS::Wifi::WifiP2pLinkedInfo& linkedInfo) { @@ -434,6 +445,7 @@ WifiErrorCode RegisterP2pStateChangedCallback(const P2pStateChangedCallback call { CHECK_PTR_RETURN(callback, ERROR_WIFI_INVALID_ARGS); CHECK_PTR_RETURN(wifiP2pPtr, ERROR_WIFI_NOT_AVAILABLE); + CHECK_PTR_RETURN(sptrCallback, ERROR_WIFI_NOT_AVAILABLE); sptrCallback->stateChangeCb = callback; wifiP2pPtr->RegisterCallBack(sptrCallback); return WIFI_SUCCESS; @@ -443,6 +455,7 @@ WifiErrorCode RegisterP2pPersistentGroupsChangedCallback(const P2pPersistentGrou { CHECK_PTR_RETURN(callback, ERROR_WIFI_INVALID_ARGS); CHECK_PTR_RETURN(wifiP2pPtr, ERROR_WIFI_NOT_AVAILABLE); + CHECK_PTR_RETURN(sptrCallback, ERROR_WIFI_NOT_AVAILABLE); sptrCallback->groupChangeCb = callback; wifiP2pPtr->RegisterCallBack(sptrCallback); return WIFI_SUCCESS; @@ -452,6 +465,7 @@ WifiErrorCode RegisterP2pConnectionChangedCallback(const P2pConnectionChangedCal { CHECK_PTR_RETURN(callback, ERROR_WIFI_INVALID_ARGS); CHECK_PTR_RETURN(wifiP2pPtr, ERROR_WIFI_NOT_AVAILABLE); + CHECK_PTR_RETURN(sptrCallback, ERROR_WIFI_NOT_AVAILABLE); sptrCallback->connectionChangeCb = callback; wifiP2pPtr->RegisterCallBack(sptrCallback); return WIFI_SUCCESS; @@ -461,7 +475,25 @@ WifiErrorCode RegisterP2pPeersChangedCallback(const P2pPeersChangedCallback call { CHECK_PTR_RETURN(callback, ERROR_WIFI_INVALID_ARGS); CHECK_PTR_RETURN(wifiP2pPtr, ERROR_WIFI_NOT_AVAILABLE); + CHECK_PTR_RETURN(sptrCallback, ERROR_WIFI_NOT_AVAILABLE); sptrCallback->peersChangeCb = callback; wifiP2pPtr->RegisterCallBack(sptrCallback); return WIFI_SUCCESS; } + +WifiErrorCode RegisterCfgChangCallback(const WifiCfgChangCallback callback) +{ + CHECK_PTR_RETURN(callback, ERROR_WIFI_INVALID_ARGS); + CHECK_PTR_RETURN(wifiP2pPtr, ERROR_WIFI_NOT_AVAILABLE); + CHECK_PTR_RETURN(sptrCallback, ERROR_WIFI_NOT_AVAILABLE); + sptrCallback->cfgChangeCallback = callback; + wifiP2pPtr->RegisterCallBack(sptrCallback); + return WIFI_SUCCESS; +} + +WifiErrorCode UnregisterCfgChangCallback(void) +{ + CHECK_PTR_RETURN(sptrCallback, ERROR_WIFI_NOT_AVAILABLE); + sptrCallback->cfgChangeCallback = nullptr; + return WIFI_SUCCESS; +} \ No newline at end of file diff --git a/wifi/frameworks/native/include/wifi_hid2d.h b/wifi/frameworks/native/include/wifi_hid2d.h index 9522c30..24d90f1 100644 --- a/wifi/frameworks/native/include/wifi_hid2d.h +++ b/wifi/frameworks/native/include/wifi_hid2d.h @@ -133,6 +133,15 @@ public: */ virtual ErrCode Hid2dSetPeerWifiCfgInfo(PeerCfgType cfgType, char cfgData[CFG_DATA_MAX_BYTES], int setDataValidLen) = 0; + + /** + * @Description Set the scene of upper layer + * + * @param ifName - interface name + * @param scene - scene + * @return ErrCode - operate result + */ + virtual ErrCode Hid2dSetUpperScene(const std::string& ifName, const Hid2dUpperScene& scene) = 0; }; } // namespace Wifi } // namespace OHOS diff --git a/wifi/frameworks/native/interfaces/define.h b/wifi/frameworks/native/interfaces/define.h index d31a94c..9b21fae 100644 --- a/wifi/frameworks/native/interfaces/define.h +++ b/wifi/frameworks/native/interfaces/define.h @@ -121,6 +121,7 @@ #define WIFI_SVR_CMD_GET_SELF_WIFI_CFG 0x2025 /* get self wifi configuration */ #define WIFI_SVR_CMD_SET_PEER_WIFI_CFG 0x2026 /* set peer wifi configuration */ #define WIFI_SVR_CMD_P2P_QUERY_LOCAL_DEVICE 0x2027 /* query the information about the local device */ +#define WIFI_SVR_CMD_SET_UPPER_SCENE 0x2028 /* set the scene of upper layer */ /* -----------register event type and message define-------------- */ #define WIFI_CBK_CMD_STATE_CHANGE 0x1001 /* STA state change event */ @@ -141,7 +142,9 @@ #define WIFI_CBK_CMD_CONNECT_CHANGE 0x1015 #define WIFI_CBK_CMD_DISCOVERY_CHANGE 0x1016 #define WIFI_CBK_CMD_P2P_ACTION_RESULT 0x1017 +#define WIFI_CBK_CMD_CFG_CHANGE 0x1018 +/* Duplicate message code, to be optimized */ #define WIFI_CBK_MSG_STATE_CHANGE 0x1001 #define WIFI_CBK_MSG_CONNECTION_CHANGE 0x1002 #define WIFI_CBK_MSG_RSSI_CHANGE 0x1003 diff --git a/wifi/frameworks/native/interfaces/i_wifi_p2p.h b/wifi/frameworks/native/interfaces/i_wifi_p2p.h index b919a27..b1a59d1 100644 --- a/wifi/frameworks/native/interfaces/i_wifi_p2p.h +++ b/wifi/frameworks/native/interfaces/i_wifi_p2p.h @@ -359,6 +359,15 @@ public: virtual ErrCode Hid2dSetPeerWifiCfgInfo(PeerCfgType cfgType, char cfgData[CFG_DATA_MAX_BYTES], int setDataValidLen) = 0; + /** + * @Description Set the scene of upper layer + * + * @param ifName - interface name + * @param scene - scene + * @return ErrCode - operate result + */ + virtual ErrCode Hid2dSetUpperScene(const std::string& ifName, const Hid2dUpperScene& scene) = 0; + public: DECLARE_INTERFACE_DESCRIPTOR(u"ohos.wifi.IWifiP2pService"); }; diff --git a/wifi/frameworks/native/interfaces/i_wifi_p2p_callback.h b/wifi/frameworks/native/interfaces/i_wifi_p2p_callback.h index 7ee235f..d50bd51 100644 --- a/wifi/frameworks/native/interfaces/i_wifi_p2p_callback.h +++ b/wifi/frameworks/native/interfaces/i_wifi_p2p_callback.h @@ -17,11 +17,12 @@ #include #include -#include "message_parcel.h" -#include "message_option.h" -#include "wifi_p2p_msg.h" #include "define.h" +#include "message_option.h" +#include "message_parcel.h" #include "wifi_errcode.h" +#include "wifi_hid2d_msg.h" +#include "wifi_p2p_msg.h" namespace OHOS { namespace Wifi { @@ -86,6 +87,15 @@ public: */ virtual void OnP2pActionResult(P2pActionCallback action, ErrCode code) = 0; + /** + * @Description Config changed callback. + * + * @param type - Config type + * @param data - Config data + * @param len - Config data length + */ + virtual void OnConfigChanged(CfgType type, char* data, int dataLen) = 0; + public: DECLARE_INTERFACE_DESCRIPTOR(u"ohos.wifi.IWifiP2pCallback"); }; diff --git a/wifi/frameworks/native/interfaces/wifi_hid2d_msg.h b/wifi/frameworks/native/interfaces/wifi_hid2d_msg.h index 803cb43..143ba12 100644 --- a/wifi/frameworks/native/interfaces/wifi_hid2d_msg.h +++ b/wifi/frameworks/native/interfaces/wifi_hid2d_msg.h @@ -68,6 +68,13 @@ enum class RecommendStatus { RS_FAILURE }; +#define CFG_CALLBACK_BYTE 4 + +enum class CfgType { + CFG_INVALID = -1, + GET_SELF_CONFIG = 1, +}; + class Hid2dConnectConfig { public: Hid2dConnectConfig() : m_ssid(""), m_bssid(""), m_preSharedKey(""), @@ -146,6 +153,18 @@ public: /* band width */ int bandwidth; }; + +class Hid2dUpperScene { +public: + /* The mac address of the device */ + std::string mac; + /* The scene of upper layer, hexadecimal digit, currently bit 0-2 is valid, 0: video, 1: audio, 2: file */ + unsigned int scene; + /* Frame rate, -1/30/60 is valid */ + int fps; + /* band width, valid only in video scenes, the default value is 0 */ + unsigned int bw; +}; } // namespace Wifi } // namespace OHOS #endif diff --git a/wifi/frameworks/native/interfaces/wifi_p2p_msg.h b/wifi/frameworks/native/interfaces/wifi_p2p_msg.h index afa18d0..7b47ed4 100644 --- a/wifi/frameworks/native/interfaces/wifi_p2p_msg.h +++ b/wifi/frameworks/native/interfaces/wifi_p2p_msg.h @@ -131,6 +131,7 @@ enum class P2pGroupCapability { }; enum class GroupOwnerBand { GO_BAND_AUTO, GO_BAND_2GHZ, GO_BAND_5GHZ }; + const int MAX_WFD_SUBELEMS = 12; const char DeviceInfoSubelemLenHex[] = {"0006"}; class WifiP2pWfdInfo { diff --git a/wifi/frameworks/native/src/wifi_p2p_callback_stub.cpp b/wifi/frameworks/native/src/wifi_p2p_callback_stub.cpp index 30413a2..5af404f 100644 --- a/wifi/frameworks/native/src/wifi_p2p_callback_stub.cpp +++ b/wifi/frameworks/native/src/wifi_p2p_callback_stub.cpp @@ -41,6 +41,7 @@ void WifiP2pCallbackStub::InitHandleMap() handleFuncMap[WIFI_CBK_CMD_CONNECT_CHANGE] = &WifiP2pCallbackStub::RemoteOnP2pConnectionChanged; handleFuncMap[WIFI_CBK_CMD_DISCOVERY_CHANGE] = &WifiP2pCallbackStub::RemoteOnP2pDiscoveryChanged; handleFuncMap[WIFI_CBK_CMD_P2P_ACTION_RESULT] = &WifiP2pCallbackStub::RemoteOnP2pActionResult; + handleFuncMap[WIFI_CBK_CMD_CFG_CHANGE] = &WifiP2pCallbackStub::RemoteOnConfigChanged; return; } @@ -163,6 +164,14 @@ void WifiP2pCallbackStub::OnP2pActionResult(P2pActionCallback action, ErrCode co } } +void WifiP2pCallbackStub::OnConfigChanged(CfgType type, char* data, int dataLen) +{ + WIFI_LOGD("WifiP2pCallbackStub::OnConfigChanged"); + if (userCallback_) { + userCallback_->OnConfigChanged(type, data, dataLen); + } +} + void WifiP2pCallbackStub::RemoteOnP2pStateChanged(uint32_t code, MessageParcel &data, MessageParcel &reply) { WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); @@ -280,5 +289,40 @@ void WifiP2pCallbackStub::RemoteOnP2pActionResult(uint32_t code, MessageParcel & OnP2pActionResult(action, errCode); reply.WriteInt32(0); } + +void WifiP2pCallbackStub::RemoteOnConfigChanged(uint32_t code, MessageParcel &data, MessageParcel &reply) +{ + WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); + + CfgType cfgType = static_cast(data.ReadInt32()); + int cfgLen = data.ReadInt32(); + if (cfgLen <= 0) { + WIFI_LOGE("Config change size error: %{public}d", cfgLen); + reply.WriteInt32(static_cast(WIFI_OPT_INVALID_PARAM)); + return; + } + + const char *dataBuffer = (const char *)reply.ReadBuffer(cfgLen); + if (dataBuffer == nullptr) { + WIFI_LOGE("read buffer error!"); + reply.WriteInt32(static_cast(WIFI_OPT_FAILED)); + return; + } + + char* cfgData = new (std::nothrow) char[cfgLen]; + if (cfgData == nullptr) { + WIFI_LOGE("new buffer error!"); + reply.WriteInt32(static_cast(WIFI_OPT_FAILED)); + return; + } + if (memcpy_s(cfgData, cfgLen, dataBuffer, cfgLen) != EOK) { + WIFI_LOGE("memcpy_s failed!"); + reply.WriteInt32(static_cast(WIFI_OPT_FAILED)); + return; + } + OnConfigChanged(cfgType, cfgData, cfgLen); + delete[] cfgData; + reply.WriteInt32(0); +} } // namespace Wifi } // namespace OHOS \ No newline at end of file diff --git a/wifi/frameworks/native/src/wifi_p2p_callback_stub.h b/wifi/frameworks/native/src/wifi_p2p_callback_stub.h index fd2307e..d76335d 100644 --- a/wifi/frameworks/native/src/wifi_p2p_callback_stub.h +++ b/wifi/frameworks/native/src/wifi_p2p_callback_stub.h @@ -91,6 +91,15 @@ public: */ void OnP2pActionResult(P2pActionCallback action, ErrCode code) override; + /** + * @Description Config changed callback. + * + * @param type - Config type + * @param data - Config data + * @param len - Config data length + */ + void OnConfigChanged(CfgType type, char* data, int dataLen) override; + void RegisterCallBack(const sptr &userCallback); bool IsRemoteDied() const; void SetRemoteDied(bool val); @@ -106,6 +115,7 @@ private: void RemoteOnP2pConnectionChanged(uint32_t code, MessageParcel &data, MessageParcel &reply); void RemoteOnP2pDiscoveryChanged(uint32_t code, MessageParcel &data, MessageParcel &reply); void RemoteOnP2pActionResult(uint32_t code, MessageParcel &data, MessageParcel &reply); + void RemoteOnConfigChanged(uint32_t code, MessageParcel &data, MessageParcel &reply); private: HandleFuncMap handleFuncMap; diff --git a/wifi/frameworks/native/src/wifi_p2p_impl.cpp b/wifi/frameworks/native/src/wifi_p2p_impl.cpp index 2ec46b9..1a42bfb 100644 --- a/wifi/frameworks/native/src/wifi_p2p_impl.cpp +++ b/wifi/frameworks/native/src/wifi_p2p_impl.cpp @@ -319,5 +319,11 @@ ErrCode WifiP2pImpl::Hid2dSetPeerWifiCfgInfo(PeerCfgType cfgType, char cfgData[C RETURN_IF_FAIL(client_); return client_->Hid2dSetPeerWifiCfgInfo(cfgType, cfgData, setDataValidLen); } + +ErrCode WifiP2pImpl::Hid2dSetUpperScene(const std::string& ifName, const Hid2dUpperScene& scene) +{ + RETURN_IF_FAIL(client_); + return client_->Hid2dSetUpperScene(ifName, scene); +} } // namespace Wifi } // namespace OHOS \ No newline at end of file diff --git a/wifi/frameworks/native/src/wifi_p2p_impl.h b/wifi/frameworks/native/src/wifi_p2p_impl.h index fec05e9..65d6d26 100644 --- a/wifi/frameworks/native/src/wifi_p2p_impl.h +++ b/wifi/frameworks/native/src/wifi_p2p_impl.h @@ -368,6 +368,15 @@ public: ErrCode Hid2dSetPeerWifiCfgInfo(PeerCfgType cfgType, char cfgData[CFG_DATA_MAX_BYTES], int setDataValidLen) override; + /** + * @Description Set the scene of upper layer + * + * @param ifName - interface name + * @param scene - scene + * @return ErrCode - operate result + */ + ErrCode Hid2dSetUpperScene(const std::string& ifName, const Hid2dUpperScene& scene) override; + private: int systemAbilityId_; sptr client_; diff --git a/wifi/frameworks/native/src/wifi_p2p_proxy.cpp b/wifi/frameworks/native/src/wifi_p2p_proxy.cpp index a71240f..6c1cf34 100644 --- a/wifi/frameworks/native/src/wifi_p2p_proxy.cpp +++ b/wifi/frameworks/native/src/wifi_p2p_proxy.cpp @@ -1485,6 +1485,37 @@ ErrCode WifiP2pProxy::Hid2dSetPeerWifiCfgInfo(PeerCfgType cfgType, return ErrCode(reply.ReadInt32()); } +ErrCode WifiP2pProxy::Hid2dSetUpperScene(const std::string& ifName, const Hid2dUpperScene& scene) +{ + if (mRemoteDied) { + WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + return WIFI_OPT_FAILED; + } + MessageOption option; + MessageParcel data; + MessageParcel reply; + if (!data.WriteInterfaceToken(GetDescriptor())) { + WIFI_LOGE("Write interface token error: %{public}s", __func__); + return WIFI_OPT_FAILED; + } + data.WriteInt32(0); + data.WriteCString(ifName.c_str()); + data.WriteCString(scene.mac.c_str()); + data.WriteUint32(scene.scene); + data.WriteInt32(scene.fps); + data.WriteUint32(scene.bw); + int error = Remote()->SendRequest(WIFI_SVR_CMD_SET_UPPER_SCENE, data, reply, option); + if (error != ERR_NONE) { + WIFI_LOGW("Set Attr(%{public}d) failed", WIFI_SVR_CMD_SET_UPPER_SCENE); + return WIFI_OPT_FAILED; + } + int exception = reply.ReadInt32(); + if (exception) { + return WIFI_OPT_FAILED; + } + return ErrCode(reply.ReadInt32()); +} + void WifiP2pProxy::OnRemoteDied(const wptr& remoteObject) { WIFI_LOGE("Remote service is died!"); diff --git a/wifi/frameworks/native/src/wifi_p2p_proxy.h b/wifi/frameworks/native/src/wifi_p2p_proxy.h index fd6044f..fc6c102 100644 --- a/wifi/frameworks/native/src/wifi_p2p_proxy.h +++ b/wifi/frameworks/native/src/wifi_p2p_proxy.h @@ -358,6 +358,15 @@ public: ErrCode Hid2dSetPeerWifiCfgInfo(PeerCfgType cfgType, char cfgData[CFG_DATA_MAX_BYTES], int setDataValidLen) override; + /** + * @Description Set the scene of upper layer + * + * @param ifName - interface name + * @param scene - scene + * @return ErrCode - operate result + */ + ErrCode Hid2dSetUpperScene(const std::string& ifName, const Hid2dUpperScene& scene) override; + /** * @Description Handle remote object died event. * @param remoteObject remote object. diff --git a/wifi/interfaces/kits/c/wifi_hid2d.h b/wifi/interfaces/kits/c/wifi_hid2d.h index fe792ce..926c54a 100644 --- a/wifi/interfaces/kits/c/wifi_hid2d.h +++ b/wifi/interfaces/kits/c/wifi_hid2d.h @@ -37,6 +37,15 @@ extern "C" { #define CFG_DATA_MAX_BYTES 255 +#define CFG_CALLBACK_BYTE 4 + +typedef enum CfgType { + CFG_INVALID = -1, + GET_SELF_CONFIG = 0, +} CfgType; + +typedef void (*WifiCfgChangCallback)(CfgType, char* data, int dataLen); + typedef enum DhcpMode { CONNECT_GO_NODHCP = 0, CONNECT_AP_DHCP = 1, @@ -137,6 +146,17 @@ typedef struct RecommendChannelResponse { int bandwidth; } RecommendChannelResponse; +typedef struct Hid2dUpperScene { + /* The mac address of the device */ + unsigned char mac[MAC_LEN]; + /* The scene of upper layer, hexadecimal digit, currently bit 0-2 is valid, 0: video, 1: audio, 2: file */ + unsigned int scene; + /* Frame rate, -1/30/60 is valid */ + int fps; + /* band width, valid only in video scenes, the default value is 0 */ + unsigned int bw; +} Hid2dUpperScene; + /** * @Description Request an IP address to the Gc from the IP address pool, used on the GO side. * @@ -152,14 +172,14 @@ WifiErrorCode Hid2dRequestGcIp(const unsigned char gcMac[MAC_LEN], unsigned int * * @return WifiErrorCode - operation result */ -WifiErrorCode Hid2dSharedlinkIncrease(); +WifiErrorCode Hid2dSharedlinkIncrease(void); /** * @Description Decrease(-1) shared link reference counting * * @return WifiErrorCode - operation result */ -WifiErrorCode Hid2dSharedlinkDecrease(); +WifiErrorCode Hid2dSharedlinkDecrease(void); /** * @Description Create hid2d group, used on the GO side. @@ -249,7 +269,31 @@ WifiErrorCode Hid2dSetPeerWifiCfgInfo(PeerCfgType cfgType, char cfgData[CFG_DATA * * @return int - 0: not supported, 1: supported */ -int Hid2dIsWideBandwidthSupported(); +int Hid2dIsWideBandwidthSupported(void); + +/** + * @Description Set the scene of upper layer + * + * @param ifName - interface name + * @param scene - scene + * @return WifiErrorCode - operate result + */ +WifiErrorCode Hid2dSetUpperScene(const char ifName[IF_NAME_LEN], const Hid2dUpperScene *scene); + +/** + * @Description Register config change callback + * + * @param callback - callback + * @return WifiErrorCode - operate result + */ +WifiErrorCode RegisterCfgChangCallback(const WifiCfgChangCallback callback); + +/** + * @Description Unregister config change callback + * + * @return WifiErrorCode - operate result + */ +WifiErrorCode UnregisterCfgChangCallback(void); #ifdef __cplusplus } #endif diff --git a/wifi/interfaces/kits/c/wifi_p2p_config.h b/wifi/interfaces/kits/c/wifi_p2p_config.h index 9a882cc..6dd5991 100644 --- a/wifi/interfaces/kits/c/wifi_p2p_config.h +++ b/wifi/interfaces/kits/c/wifi_p2p_config.h @@ -115,7 +115,6 @@ typedef struct WifiP2pLinkedInfo { int isP2pGroupOwner; unsigned char groupOwnerAddress[COMMON_MAC_LEN]; } WifiP2pLinkedInfo; - #ifdef __cplusplus } #endif diff --git a/wifi/services/wifi_standard/wifi_framework/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/BUILD.gn index 13ad499..b267f9b 100644 --- a/wifi/services/wifi_standard/wifi_framework/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/BUILD.gn @@ -43,6 +43,7 @@ group("wifi_manage") { if (!defined(ohos_lite)) { deps += [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap:wifi_ap_service", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_common:wifi_common_service", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p:wifi_p2p_service", ] } diff --git a/wifi/services/wifi_standard/wifi_framework/common/include/wifi_internal_msg.h b/wifi/services/wifi_standard/wifi_framework/common/include/wifi_internal_msg.h index 734e8ff..11387e4 100644 --- a/wifi/services/wifi_standard/wifi_framework/common/include/wifi_internal_msg.h +++ b/wifi/services/wifi_standard/wifi_framework/common/include/wifi_internal_msg.h @@ -16,10 +16,11 @@ #ifndef OHOS_WIFI_INTERNAL_MSG_H #define OHOS_WIFI_INTERNAL_MSG_H +#include "wifi_ap_msg.h" +#include "wifi_hid2d_msg.h" #include "wifi_msg.h" -#include "wifi_scan_msg.h" #include "wifi_p2p_msg.h" -#include "wifi_ap_msg.h" +#include "wifi_scan_msg.h" namespace OHOS { namespace Wifi { @@ -204,6 +205,18 @@ struct SingleAppForbid { } }; +struct CfgInfo { + CfgType type; + char* data; + int dataLen; + CfgInfo() + { + type = CfgType::CFG_INVALID; + data = nullptr; + dataLen = 0; + } +}; + struct WifiEventCallbackMsg { int msgCode; int msgData; @@ -216,12 +229,14 @@ struct WifiEventCallbackMsg { WifiP2pLinkedInfo p2pInfo; WifiP2pDevice p2pDevice; P2pActionCallback p2pAction; + CfgInfo* cfgInfo; WifiEventCallbackMsg() { msgCode = 0; msgData = 0; id = 0; p2pAction = P2pActionCallback::UNKNOWN; + cfgInfo = nullptr; } }; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn index 153f2da..7294dd9 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn @@ -180,6 +180,7 @@ if (defined(ohos_lite)) { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/hid2d", "$DHCP_ROOT_DIR/services/mgr_service/include", "$DHCP_ROOT_DIR/interfaces/inner_api/include", "$DHCP_ROOT_DIR/interfaces/inner_api/interfaces", @@ -291,8 +292,6 @@ if (defined(ohos_lite)) { "$WIFI_ROOT_DIR/frameworks/native/src/wifi_hid2d_msg.cpp", "$WIFI_ROOT_DIR/frameworks/native/src/wifi_p2p_msg.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp", - "wifi_hid2d_cfg.cpp", - "wifi_hid2d_service_utils.cpp", "wifi_p2p_callback_proxy.cpp", "wifi_p2p_death_recipient.cpp", "wifi_p2p_service_impl.cpp", diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_chip.c b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_chip.c index 38e166d..f7d2870 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_chip.c +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_chip.c @@ -320,21 +320,117 @@ WifiErrorNo RequestFirmwareDebugDump(unsigned char *bytes, int32_t *size) return result; } -WifiErrorNo SetPowerMode(uint8_t mode) +WifiErrorNo IsChipSupportDbdc(bool *isSupport) { RpcClient *client = GetChipRpcClient(); LockRpcClient(client); Context *context = client->context; WriteBegin(context, 0); - WriteFunc(context, "SetPowerMode"); - WriteInt(context, mode); + WriteFunc(context, "IsChipSupportDbdc"); WriteEnd(context); - if (RpcClientCall(client, "SetPowerMode") != WIFI_IDL_OPT_OK) { - return WIFI_IDL_OPT_FAILED; + if (RpcClientCall(client, "IsChipSupportDbdc") != WIFI_IDL_OPT_OK) { + return false; + } + int result = WIFI_IDL_OPT_FAILED; + ReadInt(context, &result); + int retValue = WIFI_IDL_FALSE; + if (result == WIFI_IDL_OPT_OK) { + ReadInt(context, &retValue); + *isSupport = (retValue == WIFI_IDL_TRUE); + } + ReadClientEnd(client); + UnlockRpcClient(client); + return result; +} + +WifiErrorNo IsChipSupportCsa(bool *isSupport) +{ + RpcClient *client = GetChipRpcClient(); + LockRpcClient(client); + Context *context = client->context; + WriteBegin(context, 0); + WriteFunc(context, "IsChipSupportCsa"); + WriteEnd(context); + if (RpcClientCall(client, "IsChipSupportCsa") != WIFI_IDL_OPT_OK) { + return false; + } + int result = WIFI_IDL_OPT_FAILED; + ReadInt(context, &result); + int retValue = WIFI_IDL_FALSE; + if (result == WIFI_IDL_OPT_OK) { + ReadInt(context, &retValue); + *isSupport = (retValue == WIFI_IDL_TRUE); + } + ReadClientEnd(client); + UnlockRpcClient(client); + return result; +} + +WifiErrorNo IsChipSupportRadarDetect(bool *isSupport) +{ + RpcClient *client = GetChipRpcClient(); + LockRpcClient(client); + Context *context = client->context; + WriteBegin(context, 0); + WriteFunc(context, "IsChipSupportRadarDetect"); + WriteEnd(context); + if (RpcClientCall(client, "IsChipSupportRadarDetect") != WIFI_IDL_OPT_OK) { + return false; } int result = WIFI_IDL_OPT_FAILED; ReadInt(context, &result); + int retValue = WIFI_IDL_FALSE; + if (result == WIFI_IDL_OPT_OK) { + ReadInt(context, &retValue); + *isSupport = (retValue == WIFI_IDL_TRUE); + } + ReadClientEnd(client); + UnlockRpcClient(client); + return result; +} + +WifiErrorNo IsChipSupportDfsChannel(bool *isSupport) +{ + RpcClient *client = GetChipRpcClient(); + LockRpcClient(client); + Context *context = client->context; + WriteBegin(context, 0); + WriteFunc(context, "IsChipSupportDfsChannel"); + WriteEnd(context); + if (RpcClientCall(client, "IsChipSupportDfsChannel") != WIFI_IDL_OPT_OK) { + return false; + } + int result = WIFI_IDL_OPT_FAILED; + ReadInt(context, &result); + int retValue = WIFI_IDL_FALSE; + if (result == WIFI_IDL_OPT_OK) { + ReadInt(context, &retValue); + *isSupport = (retValue == WIFI_IDL_TRUE); + } ReadClientEnd(client); UnlockRpcClient(client); return result; -} \ No newline at end of file +} + +WifiErrorNo IsChipSupportIndoorChannel(bool *isSupport) +{ + RpcClient *client = GetChipRpcClient(); + LockRpcClient(client); + Context *context = client->context; + WriteBegin(context, 0); + WriteFunc(context, "IsChipSupportIndoorChannel"); + WriteEnd(context); + if (RpcClientCall(client, "IsChipSupportIndoorChannel") != WIFI_IDL_OPT_OK) { + return false; + } + int result = WIFI_IDL_OPT_FAILED; + ReadInt(context, &result); + int retValue = WIFI_IDL_FALSE; + if (result == WIFI_IDL_OPT_OK) { + ReadInt(context, &retValue); + *isSupport = (retValue == WIFI_IDL_TRUE); + } + ReadClientEnd(client); + UnlockRpcClient(client); + return result; +} diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_chip.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_chip.h index c11d959..9583f10 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_chip.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_chip.h @@ -16,6 +16,7 @@ #ifndef OHOS_IDL_IWIFI_CHIP_H #define OHOS_IDL_IWIFI_CHIP_H +#include #include "wifi_error_no.h" #include "i_wifi_chip_event_callback.h" #include "i_wifi_struct.h" @@ -138,13 +139,44 @@ WifiErrorNo RegisterEventCallback(IWifiChipEventCallback callback); WifiErrorNo RequestFirmwareDebugDump(unsigned char *bytes, int32_t *size); /** - * @Description Setting the Low Latency Mode. + * @Description is support DBDC * - * @param mode + * @param isSupport - is support or not + * @return WifiErrorNo + */ +WifiErrorNo IsChipSupportDbdc(bool *isSupport); + +/** + * @Description is support CSA + * + * @param isSupport - is support or not + * @return WifiErrorNo + */ +WifiErrorNo IsChipSupportCsa(bool *isSupport); + +/** + * @Description is support radar detection + * + * @param isSupport - is support or not + * @return WifiErrorNo + */ +WifiErrorNo IsChipSupportRadarDetect(bool *isSupport); + +/** + * @Description is support DFS channel + * + * @param isSupport - is support or not * @return WifiErrorNo */ -WifiErrorNo SetPowerMode(uint8_t mode); +WifiErrorNo IsChipSupportDfsChannel(bool *isSupport); +/** + * @Description is support indoor channel + * + * @param isSupport - is support or not + * @return WifiErrorNo + */ +WifiErrorNo IsChipSupportIndoorChannel(bool *isSupport); #ifdef __cplusplus } #endif diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_chip_hal_interface.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_chip_hal_interface.cpp index 5752777..bae6284 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_chip_hal_interface.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_chip_hal_interface.cpp @@ -91,10 +91,34 @@ WifiErrorNo WifiChipHalInterface::RequestFirmwareDebugInfo(std::string &debugInf return mIdlClient->RequestFirmwareDebugInfo(debugInfo); } -WifiErrorNo WifiChipHalInterface::SetWifiPowerMode(int mode) +WifiErrorNo WifiChipHalInterface::IsSupportDbdc(bool &isSupport) const { CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); - return mIdlClient->SetWifiPowerMode(mode); + return mIdlClient->ReqIsSupportDbdc(isSupport); +} + +WifiErrorNo WifiChipHalInterface::IsSupportCsa(bool &isSupport) const +{ + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); + return mIdlClient->ReqIsSupportCsa(isSupport); +} + +WifiErrorNo WifiChipHalInterface::IsSupportRadarDetect(bool &isSupport) const +{ + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); + return mIdlClient->ReqIsSupportRadarDetect(isSupport); +} + +WifiErrorNo WifiChipHalInterface::IsSupportDfsChannel(bool &isSupport) const +{ + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); + return mIdlClient->ReqIsSupportDfsChannel(isSupport); +} + +WifiErrorNo WifiChipHalInterface::IsSupportIndoorChannel(bool &isSupport) const +{ + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); + return mIdlClient->ReqIsSupportIndoorChannel(isSupport); } } // namespace Wifi } // namespace OHOS \ No newline at end of file diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_chip_hal_interface.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_chip_hal_interface.h index 0da3666..a36e0f2 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_chip_hal_interface.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_chip_hal_interface.h @@ -109,12 +109,44 @@ public: WifiErrorNo RequestFirmwareDebugInfo(std::string &debugInfo); /** - * @Description Setting the Power Mode. + * @Description is support DBDC * - * @param mode + * @param isSupport + * @return WifiErrorNo + */ + WifiErrorNo IsSupportDbdc(bool &isSupport) const; + + /** + * @Description is support CSA + * + * @param isSupport + * @return WifiErrorNo + */ + WifiErrorNo IsSupportCsa(bool &isSupport) const; + + /** + * @Description is support radar detection + * + * @param isSupport + * @return WifiErrorNo + */ + WifiErrorNo IsSupportRadarDetect(bool &isSupport) const; + + /** + * @Description is support DFS channel + * + * @param isSupport + * @return WifiErrorNo + */ + WifiErrorNo IsSupportDfsChannel(bool &isSupport) const; + + /** + * @Description is support indoor channel + * + * @param isSupport * @return WifiErrorNo */ - WifiErrorNo SetWifiPowerMode(int mode); + WifiErrorNo IsSupportIndoorChannel(bool &isSupport) const; }; } // namespace Wifi } // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp index 694075b..c37babf 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp @@ -938,11 +938,34 @@ WifiErrorNo WifiIdlClient::RequestFirmwareDebugInfo(std::string &debugInfo) return WIFI_IDL_OPT_OK; } -WifiErrorNo WifiIdlClient::SetWifiPowerMode(int mode) +WifiErrorNo WifiIdlClient::ReqIsSupportDbdc(bool &isSupport) const { CHECK_CLIENT_NOT_NULL; - LOGD("start SetWifiPowerMode mode %{public}d", mode); - return WIFI_IDL_OPT_OK; + return IsChipSupportDbdc(&isSupport); +} + +WifiErrorNo WifiIdlClient::ReqIsSupportCsa(bool &isSupport) const +{ + CHECK_CLIENT_NOT_NULL; + return IsChipSupportCsa(&isSupport); +} + +WifiErrorNo WifiIdlClient::ReqIsSupportRadarDetect(bool &isSupport) const +{ + CHECK_CLIENT_NOT_NULL; + return IsChipSupportRadarDetect(&isSupport); +} + +WifiErrorNo WifiIdlClient::ReqIsSupportDfsChannel(bool &isSupport) const +{ + CHECK_CLIENT_NOT_NULL; + return IsChipSupportDfsChannel(&isSupport); +} + +WifiErrorNo WifiIdlClient::ReqIsSupportIndoorChannel(bool &isSupport) const +{ + CHECK_CLIENT_NOT_NULL; + return IsChipSupportIndoorChannel(&isSupport); } WifiErrorNo WifiIdlClient::ReqStartSupplicant(void) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.h index 82d862a..89481a5 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.h @@ -517,12 +517,44 @@ public: WifiErrorNo RequestFirmwareDebugInfo(std::string &debugInfo); /** - * @Description Setting the Power Mode. + * @Description is support DBDC * - * @param mode + * @param isSupport + * @return WifiErrorNo + */ + WifiErrorNo ReqIsSupportDbdc(bool &isSupport) const; + + /** + * @Description is support CSA + * + * @param isSupport + * @return WifiErrorNo + */ + WifiErrorNo ReqIsSupportCsa(bool &isSupport) const; + + /** + * @Description is support radar detection + * + * @param isSupport + * @return WifiErrorNo + */ + WifiErrorNo ReqIsSupportRadarDetect(bool &isSupport) const; + + /** + * @Description is support DFS channel + * + * @param isSupport + * @return WifiErrorNo + */ + WifiErrorNo ReqIsSupportDfsChannel(bool &isSupport) const; + + /** + * @Description is support indoor channel + * + * @param isSupport * @return WifiErrorNo */ - WifiErrorNo SetWifiPowerMode(int mode); + WifiErrorNo ReqIsSupportIndoorChannel(bool &isSupport) const; /* ******************************* Supplicant interface********************** */ diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_define.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_define.h index 760d668..2726163 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_define.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_define.h @@ -64,6 +64,8 @@ typedef enum WifiIdlEvent { WIFI_IDL_CBK_CMD_P2P_SERV_DISC_REQ_EVENT, /* Service discovery request event */ } WifiIdlEvent; +#define WIFI_IDL_FALSE 0 +#define WIFI_IDL_TRUE 1 #define SINGLE_SCAN_FAILED 1 /* Scan failure notification */ #define SINGLE_SCAN_OVER_OK 2 /* Scan success notification */ #define PNO_SCAN_OVER_OK 3 /* PNO Scan success notification */ @@ -87,5 +89,4 @@ typedef enum WifiIdlEvent { #define WIFI_IDL_P2P_TMP_BUFFER_SIZE_128 128 #define WIFI_IDL_P2P_SERVICE_TYPE_MIN_SIZE 3 #define WIFI_IDL_P2P_SERVICE_TYPE_2_POS 2 - #endif \ No newline at end of file diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn index 39706d5..e769c18 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn @@ -57,6 +57,7 @@ ohos_shared_library("wifi_ap_service") { "$DHCP_ROOT_DIR/interfaces/inner_api/include", "$DHCP_ROOT_DIR/interfaces/inner_api/interfaces", "$WIFI_ROOT_DIR/utils/inc", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_common", ] cflags_cc = [ @@ -75,6 +76,7 @@ ohos_shared_library("wifi_ap_service") { "$DHCP_ROOT_DIR/services/mgr_service:dhcp_manager_service", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_common:wifi_common_service", "$WIFI_ROOT_DIR/utils/src:wifi_utils", "//utils/native/base:utils", ] diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.cpp index bceeddc..6735d15 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "ap_started_state.h" #include #include @@ -23,10 +24,11 @@ #include "ap_monitor.h" #include "ap_service.h" #include "ap_state_machine.h" +#include "ap_stations_manager.h" #include "dhcpd_interface.h" #include "wifi_ap_hal_interface.h" #include "wifi_ap_nat_manager.h" -#include "ap_stations_manager.h" +#include "wifi_chip_capability.h" #include "wifi_settings.h" #include "wifi_logger.h" @@ -80,6 +82,7 @@ void ApStartedState::GoInState() } UpdatePowerMode(); m_ApStateMachine.OnApStateChange(ApState::AP_STATE_STARTED); + ChipCapability::GetInstance().InitializeChipCapability(); } void ApStartedState::GoOutState() diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_common/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_common/BUILD.gn new file mode 100755 index 0000000..d838a47 --- /dev/null +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_common/BUILD.gn @@ -0,0 +1,42 @@ +# Copyright (C) 2022 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import("//build/ohos.gni") +import("//foundation/communication/wifi/wifi/wifi.gni") + +ohos_shared_library("wifi_common_service") { + install_enable = true + include_dirs = [ + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface", + "$WIFI_ROOT_DIR/frameworks/native/interfaces", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", + "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", + ] + + sources = [ "wifi_chip_capability.cpp" ] + + deps = [ + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", + "//utils/native/base:utils", + ] + + external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + + part_name = "wifi" + subsystem_name = "communication" +} diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_common/wifi_chip_capability.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_common/wifi_chip_capability.cpp new file mode 100755 index 0000000..cb2db75 --- /dev/null +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_common/wifi_chip_capability.cpp @@ -0,0 +1,121 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "wifi_chip_capability.h" +#include +#include "wifi_chip_hal_interface.h" +#include "wifi_logger.h" + +namespace OHOS { +namespace Wifi { +DEFINE_WIFILOG_LABEL("ChipCapability"); +ChipCapability& ChipCapability::GetInstance() +{ + static ChipCapability inst; + return inst; +} + +ChipCapability::ChipCapability() +{ + m_isInitialized = false; + m_isSupportDbdc = false; + m_isSupportCsa = false; + m_isSupportRadarDetect = false; + m_isSupportDfsChannel = false; + m_isSupportIndoorChannel = false; +} + +ChipCapability::~ChipCapability() +{ +} + +bool ChipCapability::InitializeChipCapability() +{ + WIFI_LOGI("Enter InitializeChipCapability"); + if (m_isInitialized) { + WIFI_LOGI("ChipCapability has been initialized"); + return true; + } + + m_isInitialized = true; + WifiErrorNo ret = WIFI_IDL_OPT_FAILED; + ret = WifiChipHalInterface::GetInstance().IsSupportDbdc(m_isSupportDbdc); + if (ret != WIFI_IDL_OPT_OK) { + m_isInitialized = false; + WIFI_LOGE("Get IsSupportDbdc failed"); + } + ret = WifiChipHalInterface::GetInstance().IsSupportCsa(m_isSupportCsa); + if (ret != WIFI_IDL_OPT_OK) { + m_isInitialized = false; + WIFI_LOGE("Get IsSupportCsa failed"); + } + ret = WifiChipHalInterface::GetInstance().IsSupportRadarDetect(m_isSupportRadarDetect); + if (ret != WIFI_IDL_OPT_OK) { + m_isInitialized = false; + WIFI_LOGE("Get IsP2pSupportRadarDetect failed"); + } + ret = WifiChipHalInterface::GetInstance().IsSupportDfsChannel(m_isSupportDfsChannel); + if (ret != WIFI_IDL_OPT_OK) { + m_isInitialized = false; + WIFI_LOGE("Get IsP2pSupportDfsChannel failed"); + } + ret = WifiChipHalInterface::GetInstance().IsSupportIndoorChannel(m_isSupportIndoorChannel); + if (ret != WIFI_IDL_OPT_OK) { + m_isInitialized = false; + WIFI_LOGE("Get IsP2pSupportIndoorChannel failed"); + } + ToString(); + return m_isInitialized; +} + +bool ChipCapability::IsSupportDbdc(void) +{ + return m_isSupportDbdc; +} + +bool ChipCapability::IsSupportCsa(void) +{ + return m_isSupportCsa; +} + +bool ChipCapability::IsSupportRadarDetect(void) +{ + return m_isSupportRadarDetect; +} + +bool ChipCapability::IsSupportDfsChannel(void) +{ + return m_isSupportDfsChannel; +} + +bool ChipCapability::IsSupportIndoorChannel(void) +{ + return m_isSupportIndoorChannel; +} + +std::string ChipCapability::ToString(void) +{ + std::stringstream ss; + ss << "[WifiChipCap]:" << "\n"; + ss << "Dbdc = " << m_isSupportDbdc << "\n"; + ss << "Csa = " << m_isSupportCsa << "\n"; + ss << "RadarDetect = " << m_isSupportRadarDetect << "\n"; + ss << "DfsChannel = " << m_isSupportDfsChannel << "\n"; + ss << "IndoorChannel = " << m_isSupportIndoorChannel << "\n"; + WIFI_LOGI("%{public}s", ss.str().c_str()); + return ss.str(); +} +} // namespace Wifi +} // namespace OHOS \ No newline at end of file diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_common/wifi_chip_capability.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_common/wifi_chip_capability.h new file mode 100755 index 0000000..1635be5 --- /dev/null +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_common/wifi_chip_capability.h @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OHOS_WIFI_CHIP_CAPABILITY_H +#define OHOS_WIFI_CHIP_CAPABILITY_H + +#include + +namespace OHOS { +namespace Wifi { +class ChipCapability { +public: + ChipCapability(); + virtual ~ChipCapability(); + bool InitializeChipCapability(); + static ChipCapability& GetInstance(); + + bool IsSupportDbdc(void); + bool IsSupportCsa(void); + bool IsSupportRadarDetect(void); + bool IsSupportDfsChannel(void); + bool IsSupportIndoorChannel(void); + +private: + std::string ToString(void); + +private: + bool m_isInitialized; + bool m_isSupportDbdc; + bool m_isSupportCsa; + bool m_isSupportRadarDetect; + bool m_isSupportDfsChannel; + bool m_isSupportIndoorChannel; +}; +} // namespace Wifi +} // namespace OHOS +#endif \ No newline at end of file diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_cfg.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_cfg.cpp deleted file mode 100644 index 9ab497d..0000000 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_cfg.cpp +++ /dev/null @@ -1,793 +0,0 @@ -/* - * Copyright (C) 2022 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "wifi_hid2d_cfg.h" -#include -#include -#include "wifi_logger.h" - -DEFINE_WIFILOG_P2P_LABEL("WifiHid2dCfg"); -namespace OHOS { -namespace Wifi { -static constexpr int INVALID_VALUE_OR_TYPE = -1; -static constexpr int INDEX_START = 0; -static constexpr int INDEX_LENGTH = 1; -static constexpr int INDEX_VALUE = 2; -static constexpr int TYPE_VERSION = 1; -static constexpr int TYPE_P2P_CHANNEL_OPT = 2; -static constexpr int TYPE_DBDC = 3; -static constexpr int TYPE_CSA = 4; -static constexpr int TYPE_RADAR_DETECT = 5; -static constexpr int TYPE_CREATE_DFS_CHANNEL = 6; -static constexpr int TYPE_CREATE_INDOOR_CHANNEL = 7; -static constexpr int TYPE_CURRENT_STA_CHANNEL = 8; -static constexpr int TYPE_CURRENT_AP_IS_PORTAL = 9; -static constexpr int TYPE_CURRENT_AP_SSID = 10; -static constexpr int TYPE_CURRENT_AP_BSSID = 11; -static constexpr int TYPE_CURRENT_STA_HAS_INTERNET = 12; -static constexpr int TYPE_P2P_SUPPORT_CHANNEL = 13; -static constexpr int TYPE_CURRENT_AP_PASSWORD = 14; -static constexpr int TYPE_CURRENT_AP_SECURITY_TYPE = 15; -static constexpr int TYPE_CURRENT_AP_ROUTE_TYPE = 16; -static constexpr int TYPE_DEVICE_TYPE = 17; -static constexpr int TYPE_CURRENT_SESSION_ID_TYPE = 18; -static constexpr int TYPE_STA_STATE_FOR_CALLBACK = 1; -static constexpr int TYPE_STA_CHANNEL_FOR_CALLBACK = 2; -static constexpr int TYPE_AP_SSID_FOR_CALLBACK = 3; -static constexpr int TYPE_AP_BSSID_FOR_CALLBACK = 4; -static constexpr int LENGTH_OFFSET = 1; -static constexpr int VALUE_OFFSET = 2; -static constexpr int NORMAL_TYPE_LENGTH = 1; // Most scenes of length(length) in Tlv is 1 -static constexpr int TYPE_AND_LENGTH = 2; // Most scenes of length(type + length) is 2 -static constexpr int TYPICAL_TLV_LENGTH = 3; // Most scenes of length(tpye + length +value) is 3 -static constexpr int MAX_SSID_LENGTH = 32; -static constexpr int MAX_PASSWORD_LENGTH = 64; -static constexpr int BSSID_LENGTH = 6; -static constexpr int BYTE_MASK = 0xFF; -static constexpr int MAX_BYTES = 255; -static constexpr int THE_NUM_FROM_CH1_TO_CH11 = 11; -static constexpr int DBAC_VERSION = 2; -static constexpr int SESSION_ID_LENGTH = 20; -static constexpr int CHANNEL_12 = 12; - -DeviceWifiInfo::DeviceWifiInfo() -{ - m_version = DBAC_VERSION; - m_isChooseP2pChannelOpt = false; - m_isSupportDbdc = false; - m_isSupportCsa = false; - m_isP2pSupportRadarDetect = false; - m_isP2pSupportDfsChannel = false; - m_isP2pSupportIndoorChannel = false; - m_isPortalAp = false; - m_staChannel = 0; - m_currentApSsid = ""; - m_currentApBssid = ""; - m_isCurrentApHasInternet = false; - m_pwd = ""; - m_sessionId = ""; - m_securityType = INVALID_VALUE_OR_TYPE; - m_routerType = INVALID_VALUE_OR_TYPE; - m_deviceType = DeviceClass::Default; -} - -DeviceWifiInfo::~DeviceWifiInfo() -{ -} - -DeviceClass DeviceWifiInfo::GetDeviceClass() -{ - /* Read from configuration items */ - return DeviceClass::Default; -} - -void DeviceWifiInfo::UpdateDeviceCapability() -{ - m_isChooseP2pChannelOpt = false; - m_isSupportDbdc = false; - m_isSupportCsa = false; - m_isP2pSupportRadarDetect = false; - m_isP2pSupportDfsChannel = false; - m_isP2pSupportIndoorChannel = false; - m_deviceType = GetDeviceClass(); -} - -void DeviceWifiInfo::ResetWifiDeviceCfg() -{ - m_staChannel = 0; - m_currentApSsid = ""; - m_currentApBssid = ""; - m_isCurrentApHasInternet = false; - m_pwd = ""; - m_isPortalAp = false; - m_securityType = INVALID_VALUE_OR_TYPE; - m_routerType = INVALID_VALUE_OR_TYPE; -} - -int DeviceWifiInfo::GetVersion() -{ - WIFI_LOGI("GetVersion : %{public}d ", m_version); - return m_version; -} - -void DeviceWifiInfo::SetVerison(int version) -{ - if (version <= 0) { - return; - } - m_version = version; -} - -bool DeviceWifiInfo::GetCapsOfChooseP2pChannelOpt() -{ - return m_isChooseP2pChannelOpt; -} - -void DeviceWifiInfo::SetCapsOfChooseP2pChannelOpt(bool isEnabled) -{ - m_isChooseP2pChannelOpt = isEnabled; -} - -bool DeviceWifiInfo::GetCapsOfDbdc() -{ - return m_isSupportDbdc; -} - -void DeviceWifiInfo::SetCapsOfDbdc(bool isSupportDbdc) -{ - m_isSupportDbdc = isSupportDbdc; -} - -bool DeviceWifiInfo::GetCapsOfCsa() -{ - return m_isSupportCsa; -} - -void DeviceWifiInfo::SetCapsOfCsa(bool isSupportCsa) -{ - m_isSupportCsa = isSupportCsa; -} - -bool DeviceWifiInfo::GetCapsOfP2pRadarDetect() -{ - return m_isP2pSupportRadarDetect; -} - -void DeviceWifiInfo::SetCapsOfP2pRadarDetect(bool isP2pSupportRadarDetect) -{ - m_isP2pSupportRadarDetect = isP2pSupportRadarDetect; -} - -bool DeviceWifiInfo::GetCapsOfP2pDfsChannel() { - return m_isP2pSupportDfsChannel; -} - -void DeviceWifiInfo::SetCapsOfP2pDfsChannel(bool isP2pSupportDfsChannel) -{ - m_isP2pSupportDfsChannel = isP2pSupportDfsChannel; -} - -bool DeviceWifiInfo::GetCapsOfP2pIndoorChannel() -{ - return m_isP2pSupportIndoorChannel; -} - -void DeviceWifiInfo::SetCapsOfP2pIndoorChannel(bool isP2pSupportIndoorChannel) -{ - m_isP2pSupportIndoorChannel = isP2pSupportIndoorChannel; -} - -void DeviceWifiInfo::SetStaChannel(int channel) -{ - WIFI_LOGI("Set sta channel: %{public}d ", channel); - if (channel < 0) { - return; - } - m_staChannel = channel; -} - -int DeviceWifiInfo::GetStaChannel() -{ - return m_staChannel; -} - -bool DeviceWifiInfo::GetApType() -{ - return m_isPortalAp; -} - -void DeviceWifiInfo::SetApType(bool isPortalAp) -{ - m_isPortalAp = isPortalAp; -} - -std::string DeviceWifiInfo::GetCurrentApSsid() -{ - return m_currentApSsid; -} - -void DeviceWifiInfo::SetCurrentApSsid(const std::string& ssid) -{ - m_currentApSsid = ssid; -} - -std::string DeviceWifiInfo::GetCurrentApBssid() { - return m_currentApBssid; -} - -void DeviceWifiInfo::SetCurrentApBssid(const std::string& bssid) -{ - m_currentApBssid = bssid; -} - -void DeviceWifiInfo::SetCurrentApHasInternet(bool hasInternet) -{ - m_isCurrentApHasInternet = hasInternet; -} - -bool DeviceWifiInfo::GetCurrentApHasInternet() -{ - return m_isCurrentApHasInternet; -} - -std::vector DeviceWifiInfo::GetP2pSupportChannel() -{ - return m_P2pSupportChannelList; -} - -void DeviceWifiInfo::SetP2pSupportChannel(std::vector& channels) -{ - if (channels.empty()) { - return; - } - m_P2pSupportChannelList = channels; -} - -std::string DeviceWifiInfo::GetApPwd() -{ - return m_pwd; -} - -void DeviceWifiInfo::SetApPwd(const std::string& pwd) -{ - m_pwd = pwd; -} - -int DeviceWifiInfo::GetApSecurityType() -{ - return m_securityType; -} - -void DeviceWifiInfo::SetApSecurityType(int securityType) -{ - m_securityType = securityType; -} - -int DeviceWifiInfo::GetRouterType() -{ - return m_routerType; -} - -std::string DeviceWifiInfo::GenerateSessionId() -{ - constexpr int sessionIdSize = 20; - constexpr int hexMaxNum = 15; - std::random_device rd; - std::mt19937 gen(rd()); - std::uniform_int_distribution<> dis(0, hexMaxNum); - - std::stringstream ss; - ss << std::hex; - for (int i = 0; i != sessionIdSize; ++i) { - ss << dis(gen); - } - m_sessionId = ss.str(); - return m_sessionId; -} - -std::string DeviceWifiInfo::GetSessionId() -{ - return m_sessionId; -} - -void DeviceWifiInfo::SetSessionId(std::string sessionId) -{ - m_sessionId = sessionId; -} - -void DeviceWifiInfo::ClearSessionId() -{ - m_sessionId = ""; -} - -void DeviceWifiInfo::SetRouteType(int routerType) -{ - m_routerType = routerType; -} - -DeviceClass DeviceWifiInfo::GetDeviceType() -{ - return m_deviceType; -} - -void DeviceWifiInfo::SetDeviceType(DeviceClass deviceType) -{ - m_deviceType = deviceType; -} - -int DeviceWifiInfo::GetValueFromType(int type) -{ - int value = INVALID_VALUE_OR_TYPE; - switch (type) { - case TYPE_VERSION: - value = GetVersion(); - break; - case TYPE_P2P_CHANNEL_OPT: - value = GetCapsOfChooseP2pChannelOpt() ? 1 : 0; - break; - case TYPE_DBDC: - value = GetCapsOfDbdc() ? 1 : 0; - break; - case TYPE_CSA: - value = GetCapsOfCsa() ? 1 : 0; - break; - case TYPE_RADAR_DETECT: - value = GetCapsOfP2pRadarDetect() ? 1 : 0; - break; - case TYPE_CREATE_DFS_CHANNEL: - value = GetCapsOfP2pDfsChannel() ? 1 : 0; - break; - case TYPE_CREATE_INDOOR_CHANNEL: - value = GetCapsOfP2pIndoorChannel() ? 1 : 0; - break; - case TYPE_CURRENT_STA_CHANNEL: - value = GetStaChannel(); - break; - case TYPE_CURRENT_AP_IS_PORTAL: - value = GetApType() ? 1 : 0; - break; - default: - WIFI_LOGI("GetValueFromType invalid type = %{public}d", type); - break; - } - return value; -} - -void DeviceWifiInfo::SetDeviceCfg(int type, int inputValue) -{ - switch (type) { - case TYPE_VERSION: - SetVerison(inputValue); - break; - case TYPE_P2P_CHANNEL_OPT: - SetCapsOfChooseP2pChannelOpt(inputValue == 1); - break; - case TYPE_DBDC: - SetCapsOfDbdc(inputValue == 1); - break; - case TYPE_CSA: - SetCapsOfCsa(inputValue == 1); - break; - case TYPE_RADAR_DETECT: - SetCapsOfP2pRadarDetect(inputValue == 1); - break; - case TYPE_CREATE_DFS_CHANNEL: - SetCapsOfP2pDfsChannel(inputValue == 1); - break; - case TYPE_CREATE_INDOOR_CHANNEL: - SetCapsOfP2pIndoorChannel(inputValue == 1); - break; - case TYPE_CURRENT_STA_CHANNEL: - SetStaChannel(inputValue); - break; - case TYPE_CURRENT_AP_IS_PORTAL: - SetApType(inputValue == 1); - break; - default: - WIFI_LOGI("SetDeviceCfg invalid type = %{public}d", type); - break; - } -} - -WifiHid2dCfg::WifiHid2dCfg() -{ -} - -WifiHid2dCfg::~WifiHid2dCfg() -{ -} - -WifiHid2dCfg& WifiHid2dCfg::GetInstance() -{ - static WifiHid2dCfg inst; - return inst; -} - -DeviceWifiInfo WifiHid2dCfg::m_selfDeviceInfo; -DeviceWifiInfo WifiHid2dCfg::m_peerDeviceInfo; - -DeviceWifiInfo& WifiHid2dCfg::GetSelfDeviceCfgInfo() -{ - return m_selfDeviceInfo; -} - -DeviceWifiInfo& WifiHid2dCfg::GetPeerDeviceCfgInfo() -{ - return m_peerDeviceInfo; -} - -std::string WifiHid2dCfg::ParseStringFromByteArray(char* data, int dataLen, int index, int maxLength) -{ - if (data == nullptr || dataLen < index + INDEX_VALUE) { - return ""; - } - int length = data[index + INDEX_LENGTH] & BYTE_MASK; - if (length > maxLength + 1) { /* +1 for the end character '\0' of the C-style string */ - WIFI_LOGE("invalid length = %{public}d", length); - return ""; - } - - char* ssidArray = new char[maxLength + 1]; /* +1 for the end character '\0' of the C-style string */ - if (ssidArray == nullptr) { - return ""; - } - if (memcpy_s(ssidArray, maxLength + 1, data + index + INDEX_VALUE, length) != EOK) { - WIFI_LOGE("parse string from byte array memcpy_s failed!"); - delete[] ssidArray; - return ""; - } - - int needCopylen = FindIndexFromByteArray(ssidArray, maxLength + 1, 0); - std::string s(needCopylen + 1, '\0'); - for (int i = 0; i <= needCopylen && i < maxLength + 1; ++i) { - s[i] = ssidArray[i]; - } - delete[] ssidArray; - return s; -} - -/** 2.4g channel count from channel 1 to channel 11 */ -void WifiHid2dCfg::ParseP2pSupportChannelFromByteArray(char* data, int dataLen, - int index, std::vector& p2pSupportChannels) -{ - if (data == nullptr || dataLen < (index + INDEX_VALUE)) { - return; - } - - int length = data[index + LENGTH_OFFSET] & BYTE_MASK; - if (dataLen < (index + length)) { - return; - } - // To save space, channels 1 to 11 are not carried when the peer information is obtained. - // channels 1 to 11 are supported by all countries, p2pSupportChannels should include it - int i = 0; - for (i = 0; i < THE_NUM_FROM_CH1_TO_CH11; i++) { - p2pSupportChannels.emplace_back(i + 1); - } - for (int j = 0; j < data[index + LENGTH_OFFSET]; j++) { - p2pSupportChannels.emplace_back(data[index + VALUE_OFFSET + j] & BYTE_MASK); - } - std::sort(p2pSupportChannels.begin(), p2pSupportChannels.end()); -} - -void WifiHid2dCfg::HandlePeerApPassword() -{ -} - -void WifiHid2dCfg::HandleTlvData(int type, char* cfgData, int cfgDataLen, int index) -{ - std::vector p2pSupportChannels; - switch (type) { - case TYPE_CURRENT_AP_SSID: - m_peerDeviceInfo.SetCurrentApSsid(ParseStringFromByteArray(cfgData, cfgDataLen, index, MAX_SSID_LENGTH)); - break; - case TYPE_CURRENT_AP_BSSID: - unsigned char macAddr[BSSID_LENGTH]; - if (memcpy_s(macAddr, BSSID_LENGTH, cfgData + index + INDEX_VALUE, BSSID_LENGTH) != EOK) { - return; - } - m_peerDeviceInfo.SetCurrentApBssid(MacArrayToStr(macAddr)); - break; - case TYPE_CURRENT_STA_HAS_INTERNET: - m_peerDeviceInfo.SetCurrentApHasInternet((cfgData[index + VALUE_OFFSET] & BYTE_MASK) == 0x01); - break; - case TYPE_P2P_SUPPORT_CHANNEL: - ParseP2pSupportChannelFromByteArray(cfgData, cfgDataLen, index, p2pSupportChannels); - m_peerDeviceInfo.SetP2pSupportChannel(p2pSupportChannels); - break; - case TYPE_CURRENT_AP_PASSWORD: - m_peerDeviceInfo.SetApPwd(ParseStringFromByteArray(cfgData, cfgDataLen, index, MAX_PASSWORD_LENGTH)); - break; - case TYPE_CURRENT_AP_SECURITY_TYPE: - m_peerDeviceInfo.SetApSecurityType(cfgData[index + VALUE_OFFSET] & BYTE_MASK); - break; - case TYPE_CURRENT_AP_ROUTE_TYPE: - m_peerDeviceInfo.SetRouteType(cfgData[index + VALUE_OFFSET] & BYTE_MASK); - break; - case TYPE_DEVICE_TYPE: - m_peerDeviceInfo.SetDeviceType(DeviceClass(cfgData[index + VALUE_OFFSET] & BYTE_MASK)); - break; - case TYPE_CURRENT_SESSION_ID_TYPE: - m_peerDeviceInfo.SetSessionId(ParseStringFromByteArray(cfgData, cfgDataLen, index, SESSION_ID_LENGTH)); - break; - default: - WIFI_LOGE("handle tlv data invalid type = %{public}d", type); - return; - } -} - -int WifiHid2dCfg::ParsePeerDeviceCfgInfo(PeerCfgType cfgType, char* cfgData, int cfgDataLen) -{ - if (cfgData == nullptr || cfgDataLen == 0) { - return INVALID_VALUE_OR_TYPE; - } - if (cfgType != PeerCfgType::TYPE_OF_SET_PEER_CONFIG) { - return INVALID_VALUE_OR_TYPE; - } - m_peerDeviceInfo.ResetWifiDeviceCfg(); - int length = cfgData[INDEX_START] & BYTE_MASK; - if (cfgDataLen != length) { - return INVALID_VALUE_OR_TYPE; - } - - WIFI_LOGI("parse peer device cfg length = %{public}d", length); - for (int i = 1; i < length;) { - if ((i + LENGTH_OFFSET) >= length) { - break; - } - int valueLength = cfgData[i + LENGTH_OFFSET] & BYTE_MASK; - if ((i + valueLength + TYPE_AND_LENGTH) > length) { - break; - } - int type = cfgData[i]; - int valueIndex = i + VALUE_OFFSET; - if (type > 0 && type <= TYPE_CURRENT_AP_IS_PORTAL && valueIndex < length) { - m_peerDeviceInfo.SetDeviceCfg(type, cfgData[valueIndex] & BYTE_MASK); - i += valueLength + TYPE_AND_LENGTH; - continue; - } - HandleTlvData(type, cfgData, cfgDataLen, i); - i += valueLength + TYPE_AND_LENGTH; - } - - if (m_peerDeviceInfo.GetApSecurityType() != INVALID_VALUE_OR_TYPE) { - HandlePeerApPassword(); - } - return 0; -} - -int WifiHid2dCfg::ParsePeerDeviceStaChanngeInfo(PeerCfgType cfgType, char* cfgData, int cfgDataLen) -{ - if (cfgData == nullptr || cfgDataLen == 0) { - return INVALID_VALUE_OR_TYPE; - } - if (cfgType != PeerCfgType::TYPE_OF_SET_PEER_STATE_CHANGE) { - return INVALID_VALUE_OR_TYPE; - } - if (cfgDataLen != cfgData[0]) { - return INVALID_VALUE_OR_TYPE; - } - for (int i = 1; i < cfgDataLen;) { - int type = cfgData[i]; - switch (type) { - case TYPE_STA_STATE_FOR_CALLBACK: - case TYPE_STA_CHANNEL_FOR_CALLBACK: - case TYPE_AP_SSID_FOR_CALLBACK: - case TYPE_AP_BSSID_FOR_CALLBACK: - default: - break; - } - i += (cfgData[i + LENGTH_OFFSET] & BYTE_MASK) + TYPE_AND_LENGTH; - } - return 0; -} - -int WifiHid2dCfg::FindIndexFromByteArray(char* data, int dataLen, int value) -{ - if (data == nullptr) { - return 0; - } - int i = 0; - for (i = 0; i < dataLen; i++) { - if (data[i] == value) { - return i; - } - } - return i; -} - -int WifiHid2dCfg::SetBssidByte(int typeBssidValue, char* dataArray, int dataArrayLen, int offset) -{ - if (dataArray == nullptr) { - return 0; - } - int length = INDEX_VALUE + BSSID_LENGTH; - if (dataArrayLen < (offset + length)) { - return 0; - } - dataArray[offset] = (char)typeBssidValue; - std::string bssid = m_selfDeviceInfo.GetCurrentApBssid(); - dataArray[offset + INDEX_LENGTH] = BSSID_LENGTH; - - unsigned char macByteAddr[BSSID_LENGTH] = { 0 }; - if (!bssid.empty()) { - if (MacStrToArray(bssid, macByteAddr) != EOK) { - return 0; - } - } - - if (memcpy_s(dataArray + offset + INDEX_VALUE, dataArrayLen - (offset + INDEX_VALUE), - macByteAddr, BSSID_LENGTH) != EOK) { - return 0; - } - return length; -} - -int WifiHid2dCfg::SetP2pSupportChannelByte(char* dataArray, int dataArrayLen, int offset) -{ - if (dataArray == nullptr || dataArrayLen < (offset + INDEX_LENGTH)) { - return 0; - } - std::vector p2pSupportChannelList = m_selfDeviceInfo.GetP2pSupportChannel(); - if (p2pSupportChannelList.empty() || (p2pSupportChannelList.size() - THE_NUM_FROM_CH1_TO_CH11 <= 0)) { - WIFI_LOGI("Channel list is invalid."); - return 0; - } - dataArray[offset] = TYPE_P2P_SUPPORT_CHANNEL; - int length = p2pSupportChannelList.size() - THE_NUM_FROM_CH1_TO_CH11; - dataArray[offset + INDEX_LENGTH] = (char)length; - if (dataArrayLen < (offset + length + INDEX_VALUE)) { - return 0; - } - int index = 0; - for (int channel : p2pSupportChannelList) { - // To save space, channels 1 to 11 are not carried when exchanging information with the peer device for - // Channels 1 to 11 are supported by all countries and dataArray should not contains channel 1 to 11 - if (channel >= CHANNEL_12) { - dataArray[offset + INDEX_VALUE + index] = (char)channel; - index++; - } - } - return length + VALUE_OFFSET; -} - -int WifiHid2dCfg::BuildTlvForIntVal(int type, int Value, char* tlvData, int tlvDataLen, int offset) -{ - if (tlvData == nullptr) { - return 0; - } - if (tlvDataLen <= (offset + INDEX_VALUE)) { - return 0; - } - tlvData[offset] = (char)type; - tlvData[offset + INDEX_LENGTH] = NORMAL_TYPE_LENGTH; - tlvData[offset + INDEX_VALUE] = (char)Value; - return TYPICAL_TLV_LENGTH; -} - -int WifiHid2dCfg::BuildTlvForStrVal(int type, std::string value, char* tlvData, int tlvDataLen, int offset) -{ - if (tlvData == nullptr) { - return 0; - } - if (value.empty() || (type == TYPE_CURRENT_AP_PASSWORD && value.length() > MAX_PASSWORD_LENGTH) || - (type == TYPE_CURRENT_AP_SSID && value.length() > MAX_SSID_LENGTH)) { - tlvData[offset] = (char)type; - tlvData[offset + LENGTH_OFFSET] = (char)NORMAL_TYPE_LENGTH; - tlvData[offset + VALUE_OFFSET] = 0; - return TYPICAL_TLV_LENGTH; - } - - /* +1 for the end character '\0' of the C-style string */ - if (tlvDataLen < offset + value.length() + 1) { - return 0; - } - tlvData[offset] = (char)type; - /* +1 for the end character '\0' of the C-style string */ - tlvData[offset + LENGTH_OFFSET] = (char)value.length() + 1; - if (memcpy_s(tlvData + offset + VALUE_OFFSET, tlvDataLen - (offset + VALUE_OFFSET), - value.c_str(), value.length() + 1) != EOK) { - return 0; - } - return tlvData[offset + LENGTH_OFFSET] + TYPE_AND_LENGTH; -} - -void WifiHid2dCfg::HandlePeerStaStateChange(char* data, int dataLen, int index) -{ - if (data == nullptr || dataLen <= (index + INDEX_VALUE)) { - return; - } - if (data[index + INDEX_VALUE] == 0) { // 0 : disconnect - m_peerDeviceInfo.ResetWifiDeviceCfg(); - } -} - -void WifiHid2dCfg::GetSelfDeviceCfg(SelfCfgType cfgType, char cfgInfo[CFG_DATA_MAX_BYTES], int& getDatValidLen) -{ - getDatValidLen = 0; - if ((cfgType != SelfCfgType::TYPE_OF_GET_SELF_CONFIG && - cfgType != SelfCfgType::TYPE_OF_GET_SELF_CONFIG_WITH_PASSWORD)) { - return; - } - - char* totalCfgInfo = new char[MAX_BYTES]; - if (totalCfgInfo == nullptr) { - return; - } - if (memset_s(totalCfgInfo, MAX_BYTES, 0, MAX_BYTES) != EOK) { - delete[] totalCfgInfo; - return; - } - - int i = 1; - int position = 1; - for (i = 1; i <= TYPE_CURRENT_AP_IS_PORTAL; i++) { - position += BuildTlvForIntVal(i, m_selfDeviceInfo.GetValueFromType(i), totalCfgInfo, MAX_BYTES, position); - } - - std::string ssid = m_selfDeviceInfo.GetCurrentApSsid(); - position += BuildTlvForStrVal(TYPE_CURRENT_AP_SSID, ssid, totalCfgInfo, MAX_BYTES, position); - - position += SetBssidByte(TYPE_CURRENT_AP_BSSID, totalCfgInfo, MAX_BYTES, position); - - position += BuildTlvForIntVal(TYPE_CURRENT_STA_HAS_INTERNET, m_selfDeviceInfo.GetCurrentApHasInternet() ? 1 : 0, - totalCfgInfo, MAX_BYTES, position); - - position += SetP2pSupportChannelByte(totalCfgInfo, MAX_BYTES, position); - if (cfgType == SelfCfgType::TYPE_OF_GET_SELF_CONFIG_WITH_PASSWORD) { - std::string pwd = m_selfDeviceInfo.GetApPwd(); - position += BuildTlvForStrVal(TYPE_CURRENT_AP_PASSWORD, pwd, totalCfgInfo, MAX_BYTES, position); - position += BuildTlvForIntVal(TYPE_CURRENT_AP_SECURITY_TYPE, m_selfDeviceInfo.GetApSecurityType(), - totalCfgInfo, MAX_BYTES, position); - } - - position += BuildTlvForIntVal(TYPE_CURRENT_AP_ROUTE_TYPE, m_selfDeviceInfo.GetRouterType(), - totalCfgInfo, MAX_BYTES, position); - - position += BuildTlvForIntVal(TYPE_DEVICE_TYPE, static_cast(m_selfDeviceInfo.GetDeviceType()), - totalCfgInfo, MAX_BYTES, position); - - std::string sessionID = m_selfDeviceInfo.GenerateSessionId(); - position += BuildTlvForStrVal(TYPE_CURRENT_SESSION_ID_TYPE, sessionID, totalCfgInfo, MAX_BYTES, position); - - totalCfgInfo[INDEX_START] = (char)position; - getDatValidLen = totalCfgInfo[INDEX_START] & BYTE_MASK; - WIFI_LOGI("self device cfg length = %{public}d", getDatValidLen); - if (getDatValidLen <= 0) { - getDatValidLen = 0; - delete[] totalCfgInfo; - return; - } - if (memcpy_s(cfgInfo, CFG_DATA_MAX_BYTES, totalCfgInfo, getDatValidLen) != EOK) { - WIFI_LOGI("GetSelfDeviceCfg memcpy_s failed!"); - getDatValidLen = 0; - } - delete[] totalCfgInfo; -} - -int WifiHid2dCfg::Hid2dSetPeerWifiCfgInfo(PeerCfgType cfgType, char cfgInfo[CFG_DATA_MAX_BYTES], int setDataValidLen) -{ - WIFI_LOGI("Hid2dSetPeerWifiCfgInfo cfgType = %{public}d", cfgType); - if (cfgType == PeerCfgType::TYPE_OF_SET_PEER_CONFIG) { - return ParsePeerDeviceCfgInfo(cfgType, cfgInfo, setDataValidLen); - } - else if (cfgType == PeerCfgType::TYPE_OF_SET_PEER_STATE_CHANGE) { - return ParsePeerDeviceStaChanngeInfo(cfgType, cfgInfo, setDataValidLen); - } else { - return INVALID_VALUE_OR_TYPE; - } -} -} // namespace Wifi -} // namespace OHOS \ No newline at end of file diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_cfg.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_cfg.h deleted file mode 100644 index 709fcfd..0000000 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_cfg.h +++ /dev/null @@ -1,256 +0,0 @@ -/* - * Copyright (C) 2022 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef OHOS_WIFI_HID2D_CFG_H -#define OHOS_WIFI_HID2D_CFG_H - -#include -#include -#include "wifi_common_util.h" -#include "wifi_hid2d_msg.h" - -namespace OHOS { -namespace Wifi { -enum class DeviceType { - /** phone device type id */ - DEVICE_TYPE_PHONE_ID = 0, - /** pad device type id */ - DEVICE_TYPE_PAD_ID = 1, - /** pad tv type id */ - DEVICE_TYPE_TV_ID = 2, - /** pad pc type id */ - DEVICE_TYPE_PC_ID = 3, - /** pad display type id */ - DEVICE_TYPE_DISPLAY_ID = 4, - /** pad car type id */ - DEVICE_TYPE_CAR_ID = 5, -}; - -enum class DeviceClass { - Default, - TABLET, - TV, - CAR -}; - -class DeviceWifiInfo { -public: - DeviceWifiInfo(); - - ~DeviceWifiInfo(); - - DeviceClass GetDeviceClass(); - - void UpdateDeviceCapability(); - - void ResetWifiDeviceCfg(); - - int GetVersion(); - - void SetVerison(int version); - - bool GetCapsOfChooseP2pChannelOpt(); - - void SetCapsOfChooseP2pChannelOpt(bool isEnabled); - - bool GetCapsOfDbdc(); - - void SetCapsOfDbdc(bool isSupportDbdc); - - bool GetCapsOfCsa(); - - void SetCapsOfCsa(bool isSupportCsa); - - bool GetCapsOfP2pRadarDetect(); - - void SetCapsOfP2pRadarDetect(bool isP2pSupportRadarDetect); - - bool GetCapsOfP2pDfsChannel(); - - void SetCapsOfP2pDfsChannel(bool isP2pSupportDfsChannel); - - bool GetCapsOfP2pIndoorChannel(); - - void SetCapsOfP2pIndoorChannel(bool isP2pSupportIndoorChannel); - - void SetStaChannel(int channel); - - int GetStaChannel(); - - bool GetApType(); - - void SetApType(bool isPortalAp); - - std::string GetCurrentApSsid(); - - void SetCurrentApSsid(const std::string& ssid); - - std::string GetCurrentApBssid(); - - void SetCurrentApBssid(const std::string& bssid); - - void SetCurrentApHasInternet(bool hasInternet); - - bool GetCurrentApHasInternet(); - - std::vector GetP2pSupportChannel(); - - void SetP2pSupportChannel(std::vector& channels); - - std::string GetApPwd(); - - void SetApPwd(const std::string& pwd); - - int GetApSecurityType(); - - void SetApSecurityType(int securityType); - - int GetRouterType(); - - std::string GenerateSessionId(); - - std::string GetSessionId(); - - /** - * set SessionId of current cast service - * - * @param sessionId input sessionId generated by p2p go - */ - void SetSessionId(std::string sessionId); - - /** - * clear SessionId of current cast service - */ - void ClearSessionId(); - - void SetRouteType(int routerType); - - DeviceClass GetDeviceType(); - - /** - * set Go or Gc device type - * - * @param deviceType input Go or Gc device type - */ - void SetDeviceType(DeviceClass deviceType); - - /** - * get device config value from type - * - * @param type device wifi config type - * @return the type value - */ - int GetValueFromType(int type); - - /** - * set device config info according type - * - * @param type device wifi config type - * @param inputValue the value of type - */ - void SetDeviceCfg(int type, int inputValue); - -private: - int m_version; // dual band adaptive concurrent - bool m_isChooseP2pChannelOpt; - bool m_isSupportDbdc; - bool m_isSupportCsa; - bool m_isP2pSupportRadarDetect; - bool m_isP2pSupportDfsChannel; - bool m_isP2pSupportIndoorChannel; - bool m_isPortalAp; - int m_staChannel; - std::string m_currentApSsid; - std::string m_currentApBssid; - bool m_isCurrentApHasInternet; - std::vector m_P2pSupportChannelList; - std::string m_pwd; - std::string m_sessionId; - int m_securityType; - int m_routerType; - DeviceClass m_deviceType; -}; - -class WifiHid2dCfg { -public: - static WifiHid2dCfg& GetInstance(); - - DeviceWifiInfo& GetSelfDeviceCfgInfo(); - - DeviceWifiInfo& GetPeerDeviceCfgInfo(); - - /** - * get self device configuration in TLV format:type + length + value - * - * @param cfgType self wifi configuration type - * @param cfgInfo configuration information - * @param getDatValidLen configuration valid length - */ - void GetSelfDeviceCfg(SelfCfgType cfgType, char cfgInfo[CFG_DATA_MAX_BYTES], int& getDatValidLen); - - /** - * set peer wifi p2p config info - * - * @param cfgType self wifi configuration type - * @param cfgData byte array - * @param setDataValidLen the valid length of "cfgData" - * @return 0: success, -1: fail - */ - int Hid2dSetPeerWifiCfgInfo(PeerCfgType cfgType, char cfgInfo[CFG_DATA_MAX_BYTES], int setDataValidLen); - -private: - WifiHid2dCfg(); - - ~WifiHid2dCfg(); - - std::string ParseStringFromByteArray(char* data, int dataLen, int index, int maxLength); - - /** 2.4g channel count from channel 1 to channel 11 */ - void ParseP2pSupportChannelFromByteArray(char* data, int dataLen, int index, std::vector& p2pSupportChannels); - - void HandlePeerApPassword(); - - void HandleTlvData(int type, char* cfgData, int cfgDataLen, int index); - - int ParsePeerDeviceCfgInfo(PeerCfgType cfgType, char* cfgData, int cfgDataLen); - - int ParsePeerDeviceStaChanngeInfo(PeerCfgType cfgType, char* cfgData, int cfgDataLen); - - /** - * find the value of index in byte array - * - * @param data byte array - * @param value input the value to find index - * @return index in byte array - */ - int FindIndexFromByteArray(char* data, int dataLen, int value); - - int SetBssidByte(int typeBssidValue, char* dataArray, int dataArrayLen, int offset); - - int SetP2pSupportChannelByte(char* dataArray, int dataArrayLen, int offset); - - int BuildTlvForIntVal(int type, int Value, char* tlvData, int tlvDataLen, int offset); - - int BuildTlvForStrVal(int type, std::string value, char* tlvData, int tlvDataLen, int offset); - - void HandlePeerStaStateChange(char* data, int dataLen, int index); - -private: - static DeviceWifiInfo m_selfDeviceInfo; - static DeviceWifiInfo m_peerDeviceInfo; -}; -} // namespace Wifi -} // namespace OHOS -#endif diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher.cpp index 295d59e..054ff7b 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher.cpp @@ -476,6 +476,21 @@ void WifiInternalEventDispatcher::InvokeP2pCallbacks(const WifiEventCallbackMsg } } +void WifiInternalEventDispatcher::SendConfigChangeEvent(sptr &callback, CfgInfo* cfgInfo) +{ + if (cfgInfo == nullptr) { + WIFI_LOGE("cfgInfo is nullptr"); + return; + } + callback->OnConfigChanged(cfgInfo->type, cfgInfo->data, cfgInfo->dataLen); + if (cfgInfo->data != nullptr) { + delete[] cfgInfo->data; + cfgInfo->data = nullptr; + } + delete cfgInfo; + cfgInfo = nullptr; +} + void WifiInternalEventDispatcher::SendP2pCallbackMsg(sptr &callback, const WifiEventCallbackMsg &msg) { if (callback == nullptr) { @@ -507,6 +522,9 @@ void WifiInternalEventDispatcher::SendP2pCallbackMsg(sptr &cal case WIFI_CBK_MSG_P2P_ACTION_RESULT: callback->OnP2pActionResult(msg.p2pAction, static_cast(msg.msgData)); break; + case WIFI_CBK_CMD_CFG_CHANGE: + SendConfigChangeEvent(callback, msg.cfgInfo); + break; default: WIFI_LOGI("UnKnown msgcode %{public}d", msg.msgCode); break; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher.h index 5cb8b72..132324a 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher.h @@ -121,6 +121,7 @@ private: static void PublishConnStateChangedEvent(int state, const WifiLinkedInfo &info); static void PublishWifiStateChangedEvent(int state); static void PublishRssiValueChangedEvent(int state); + static void SendConfigChangeEvent(sptr &callback, CfgInfo* cfgInfo); private: std::thread mBroadcastThread; std::atomic mRunFlag; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp index 8237a22..fd437f4 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp @@ -129,6 +129,10 @@ void WifiManager::AutoStartStaServiceThread(void) #endif #ifdef FEATURE_P2P_SUPPORT +WifiCfgMonitorEventCallback WifiManager::cfgMonitorCallback = { + nullptr, +}; + void WifiManager::AutoStartP2pService(void) { WifiOprMidState p2pState = WifiConfigCenter::GetInstance().GetP2pMidState(); @@ -485,6 +489,11 @@ void WifiManager::DealStaConnChanged(OperateResState state, const WifiLinkedInfo } } } +#ifdef FEATURE_P2P_SUPPORT + if (cfgMonitorCallback.onStaConnectionChange != nullptr) { + cfgMonitorCallback.onStaConnectionChange(static_cast(state)); + } +#endif return; } @@ -716,6 +725,7 @@ void WifiManager::InitP2pCallback(void) mP2pCallback.OnP2pDiscoveryChangedEvent = DealP2pDiscoveryChanged; mP2pCallback.OnP2pGroupsChangedEvent = DealP2pGroupsChanged; mP2pCallback.OnP2pActionResultEvent = DealP2pActionResult; + mP2pCallback.OnConfigChangedEvent = DealConfigChanged; return; } @@ -807,7 +817,43 @@ void WifiManager::DealP2pActionResult(P2pActionCallback action, ErrCode code) WifiInternalEventDispatcher::GetInstance().AddBroadCastMsg(cbMsg); return; } -#endif +void WifiManager::DealConfigChanged(CfgType type, char* data, int dataLen) +{ + if (data == nullptr || dataLen <= 0) { + return; + } + WifiEventCallbackMsg cbMsg; + cbMsg.msgCode = WIFI_CBK_CMD_CFG_CHANGE; + CfgInfo* cfgInfoPtr = new (std::nothrow) CfgInfo(); + if (cfgInfoPtr == nullptr) { + WIFI_LOGE("DealConfigChanged: new CfgInfo failed"); + return; + } + cfgInfoPtr->type = type; + char* cfgData = new (std::nothrow) char[dataLen]; + if (cfgData == nullptr) { + WIFI_LOGE("DealConfigChanged: new data failed"); + delete cfgInfoPtr; + return; + } + if (memcpy_s(cfgData, dataLen, data, dataLen) != EOK) { + WIFI_LOGE("DealConfigChanged: memcpy_s failed"); + delete cfgInfoPtr; + delete[] cfgData; + return; + } + cfgInfoPtr->data = cfgData; + cfgInfoPtr->dataLen = dataLen; + cbMsg.cfgInfo = cfgInfoPtr; + WifiInternalEventDispatcher::GetInstance().AddBroadCastMsg(cbMsg); + return; +} + +void WifiManager::RegisterCfgMonitorCallback(WifiCfgMonitorEventCallback callback) +{ + cfgMonitorCallback = callback; +} +#endif } // namespace Wifi } // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.h index 863703b..3f52df8 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.h @@ -21,6 +21,7 @@ #include #include #include +#include #include "define.h" #include "wifi_internal_msg.h" @@ -54,6 +55,10 @@ enum class WifiCloseServiceCode { SERVICE_THREAD_EXIT, }; +struct WifiCfgMonitorEventCallback { + std::function onStaConnectionChange = nullptr; +}; + class WifiManager { public: WifiManager(); @@ -129,6 +134,8 @@ public: static WifiManager &GetInstance(); + void RegisterCfgMonitorCallback(WifiCfgMonitorEventCallback callback); + private: void PushServiceCloseMsg(WifiCloseServiceCode code); void InitStaCallback(void); @@ -176,6 +183,7 @@ private: static void DealP2pDiscoveryChanged(bool bState); static void DealP2pGroupsChanged(void); static void DealP2pActionResult(P2pActionCallback action, ErrCode code); + static void DealConfigChanged(CfgType type, char* data, int dataLen); #endif static void AutoStartStaService(void); #ifdef FEATURE_P2P_SUPPORT @@ -198,6 +206,7 @@ private: #endif #ifdef FEATURE_P2P_SUPPORT IP2pServiceCallbacks mP2pCallback; + static WifiCfgMonitorEventCallback cfgMonitorCallback; #endif InitStatus mInitStatus; long mSupportedFeatures; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/BUILD.gn index 18701f1..3b3124c 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/BUILD.gn @@ -26,7 +26,7 @@ ohos_shared_library("wifi_p2p_service") { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/state.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_broadcast_helper.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_service_utils.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/hid2d/wifi_hid2d_service_utils.cpp", "authorizing_negotiation_request_state.cpp", "group_formed_state.cpp", "group_negotiation_state.cpp", @@ -84,6 +84,10 @@ ohos_shared_library("wifi_p2p_service") { "$DHCP_ROOT_DIR/interfaces/inner_api/include", "$DHCP_ROOT_DIR/interfaces/inner_api/interfaces", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan", + "$WIFI_ROOT_DIR/utils/inc", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/hid2d", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_common", ] cflags_cc = [ @@ -111,6 +115,8 @@ ohos_shared_library("wifi_p2p_service") { "$DHCP_ROOT_DIR/services/mgr_service:dhcp_manager_service", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_common:wifi_common_service", + "$WIFI_ROOT_DIR/utils/src:wifi_utils", "//utils/native/base:utils", ] diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_service_utils.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/hid2d/wifi_hid2d_service_utils.cpp old mode 100644 new mode 100755 similarity index 100% rename from wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_service_utils.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/hid2d/wifi_hid2d_service_utils.cpp index e7d2af2..f1fa46e --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_service_utils.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/hid2d/wifi_hid2d_service_utils.cpp @@ -19,9 +19,9 @@ #include "dhcp_define.h" #include "wifi_logger.h" -DEFINE_WIFILOG_P2P_LABEL("Hid2dIpPool"); namespace OHOS { namespace Wifi { +DEFINE_WIFILOG_P2P_LABEL("Hid2dIpPool"); std::list IpPool::ipList; std::map IpPool::mapGcMacToAllocIp; const std::string PATTERN_IP = "^(([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.){3}([01]?\\d\\d?|2[0-4]\\d|25[0-5])$"; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_service_utils.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/hid2d/wifi_hid2d_service_utils.h old mode 100644 new mode 100755 similarity index 100% rename from wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_service_utils.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/hid2d/wifi_hid2d_service_utils.h diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/ip2p_service.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/ip2p_service.h index 12c90a5..1c9f254 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/ip2p_service.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/ip2p_service.h @@ -235,6 +235,79 @@ public: * @return ErrCode - operation result */ virtual ErrCode Hid2dConnect(const Hid2dConnectConfig& config) = 0; + + /** + * @Description Get self config info + * + * @param cfgType - config type + * @param cfgData - config data + * @param getDatValidLen - data length + * @return ErrCode - operate result + */ + virtual ErrCode Hid2dGetSelfWifiCfgInfo(SelfCfgType cfgType, + char cfgData[CFG_DATA_MAX_BYTES], int* getDatValidLen) = 0; + + /** + * @Description Set self config info + * + * @param cfgType - config type + * @param cfgData - config data + * @param setDataValidLen - data length + * @return ErrCode - operate result + */ + virtual ErrCode Hid2dSetPeerWifiCfgInfo(PeerCfgType cfgType, + char cfgData[CFG_DATA_MAX_BYTES], int setDataValidLen) = 0; + + /** + * @Description Set self config info + * + * @param gcMac - gc mac address + * @param ipAddr - allocated ip address + * @return ErrCode - operate result + */ + virtual ErrCode Hid2dRequestGcIp(const std::string& gcMac, std::string& ipAddr) = 0; + + /** + * @Description Increase the reference count of the hid2d service. + * + */ + virtual void IncreaseSharedLink(void) = 0; + + /** + * @Description Decrease the reference count of the hid2d service. + * + */ + virtual void DecreaseSharedLink(void) = 0; + + /** + * @Description Get the reference count of the hid2d service. + * + * @return int - reference count + */ + virtual int GetSharedLinkCount(void) = 0; + + /** + * @Description - Get P2P recommended channel. + * + * @return - int - Recommended channel + */ + virtual int GetP2pRecommendChannel(void) = 0; + + /** + * @Description Set the scene of upper layer + * + * @param ifName - interface name + * @param scene - scene + * @return ErrCode - operate result + */ + virtual ErrCode Hid2dSetUpperScene(const std::string& ifName, const Hid2dUpperScene& scene) = 0; + + /** + * @Description Monitor the wifi configuration change + * + * @return ErrCode - operate result + */ + virtual ErrCode MonitorCfgChange(void) = 0; }; } // namespace Wifi } // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/ip2p_service_callbacks.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/ip2p_service_callbacks.h index 8b0cc5e..cbdb53e 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/ip2p_service_callbacks.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/ip2p_service_callbacks.h @@ -18,6 +18,7 @@ #include #include "wifi_errcode.h" #include "wifi_p2p_msg.h" +#include "wifi_hid2d_msg.h" namespace OHOS { namespace Wifi { @@ -39,6 +40,8 @@ struct IP2pServiceCallbacks { std::function OnP2pGroupsChangedEvent; /* The result returned by the asynchronous interface */ std::function OnP2pActionResultEvent; + /* The event of config change */ + std::function OnConfigChangedEvent; std::function &, const WifiP2pDevice &)> OnP2pServiceAvailable; std::function OnP2pDnsSdServiceAvailable; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_interface.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_interface.cpp index edb5cf9..7740eca 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_interface.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_interface.cpp @@ -206,5 +206,52 @@ ErrCode P2pInterface::Hid2dConnect(const Hid2dConnectConfig& config) { return p2pService.Hid2dConnect(config); } + +ErrCode P2pInterface::Hid2dGetSelfWifiCfgInfo(SelfCfgType cfgType, + char cfgData[CFG_DATA_MAX_BYTES], int* getDatValidLen) +{ + return p2pService.Hid2dGetSelfWifiCfgInfo(cfgType, cfgData, getDatValidLen); +} + +ErrCode P2pInterface::Hid2dSetPeerWifiCfgInfo(PeerCfgType cfgType, + char cfgData[CFG_DATA_MAX_BYTES], int setDataValidLen) +{ + return p2pService.Hid2dSetPeerWifiCfgInfo(cfgType, cfgData, setDataValidLen); +} + +ErrCode P2pInterface::Hid2dRequestGcIp(const std::string& gcMac, std::string& ipAddr) +{ + return p2pService.Hid2dRequestGcIp(gcMac, ipAddr); +} + +void P2pInterface::IncreaseSharedLink(void) +{ + p2pService.IncreaseSharedLink(); +} + +void P2pInterface::DecreaseSharedLink(void) +{ + p2pService.DecreaseSharedLink(); +} + +int P2pInterface::GetSharedLinkCount(void) +{ + return p2pService.GetSharedLinkCount(); +} + +int P2pInterface::GetP2pRecommendChannel(void) +{ + return p2pService.GetP2pRecommendChannel(); +} + +ErrCode P2pInterface::Hid2dSetUpperScene(const std::string& ifName, const Hid2dUpperScene& scene) +{ + return p2pService.Hid2dSetUpperScene(ifName, scene); +} + +ErrCode P2pInterface::MonitorCfgChange(void) +{ + return p2pService.MonitorCfgChange(); +} } // namespace Wifi } // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_interface.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_interface.h index aa9ffce..455ffa6 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_interface.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_interface.h @@ -260,6 +260,79 @@ public: */ virtual ErrCode Hid2dConnect(const Hid2dConnectConfig& config) override; + /** + * @Description Get self config info + * + * @param cfgType - config type + * @param cfgData - config data + * @param getDatValidLen - data length + * @return ErrCode - operate result + */ + virtual ErrCode Hid2dGetSelfWifiCfgInfo(SelfCfgType cfgType, + char cfgData[CFG_DATA_MAX_BYTES], int* getDatValidLen) override; + + /** + * @Description Set self config info + * + * @param cfgType - config type + * @param cfgData - config data + * @param setDataValidLen - data length + * @return ErrCode - operate result + */ + virtual ErrCode Hid2dSetPeerWifiCfgInfo(PeerCfgType cfgType, + char cfgData[CFG_DATA_MAX_BYTES], int setDataValidLen) override; + + /** + * @Description Set self config info + * + * @param gcMac - gc mac address + * @param ipAddr - allocated ip address + * @return ErrCode - operate result + */ + virtual ErrCode Hid2dRequestGcIp(const std::string& gcMac, std::string& ipAddr) override; + + /** + * @Description Increase the reference count of the hid2d service. + * + */ + virtual void IncreaseSharedLink(void) override; + + /** + * @Description Decrease the reference count of the hid2d service. + * + */ + virtual void DecreaseSharedLink(void) override; + + /** + * @Description Get the reference count of the hid2d service. + * + * @return int - reference count + */ + virtual int GetSharedLinkCount(void) override; + + /** + * @Description - Get P2P recommended channel. + * + * @return - int - Recommended channel + */ + virtual int GetP2pRecommendChannel(void) override; + + /** + * @Description Set the scene of upper layer + * + * @param ifName - interface name + * @param scene - scene + * @return ErrCode - operate result + */ + virtual ErrCode Hid2dSetUpperScene(const std::string& ifName, const Hid2dUpperScene& scene) override; + + /** + * @Description Monitor the wifi configuration change + * + * @return ErrCode - operate result + */ + virtual ErrCode MonitorCfgChange(void) override; + private: WifiP2pGroupManager groupManager; /* group manager */ WifiP2pDeviceManager deviceMgr; /* device manager */ diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp index e73a7f9..66d9cac 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp @@ -155,8 +155,8 @@ void P2pStateMachine::UpdateOwnDevice(P2pDeviceStatus status) void P2pStateMachine::InitializeThisDevice() { - constexpr size_t randomLen = 4; std::string deviceName; + constexpr size_t randomLen = 4; P2pVendorConfig p2pVendorCfg; int ret = WifiSettings::GetInstance().GetP2pVendorConfig(p2pVendorCfg); if (ret < 0) { diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service.cpp index 3670912..67838d6 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service.cpp @@ -14,11 +14,12 @@ */ #include "wifi_p2p_service.h" -#include "wifi_settings.h" -#include "wifi_errcode.h" -#include "p2p_define.h" #include "abstract_ui.h" +#include "p2p_define.h" +#include "wifi_common_util.h" +#include "wifi_errcode.h" #include "wifi_logger.h" +#include "wifi_settings.h" DEFINE_WIFILOG_P2P_LABEL("WifiP2pService"); @@ -287,5 +288,104 @@ ErrCode WifiP2pService::Hid2dConnect(const Hid2dConnectConfig& config) p2pStateMachine.SendMessage(static_cast(P2P_STATE_MACHINE_CMD::CMD_HID2D_CONNECT), info); return ErrCode::WIFI_OPT_SUCCESS; } + +ErrCode WifiP2pService::Hid2dGetSelfWifiCfgInfo(SelfCfgType cfgType, + char cfgData[CFG_DATA_MAX_BYTES], int* getDatValidLen) +{ + WIFI_LOGI("Hid2dGetSelfWifiCfgInfo"); + *getDatValidLen = 0; + return WIFI_OPT_SUCCESS; +} + +ErrCode WifiP2pService::Hid2dSetPeerWifiCfgInfo(PeerCfgType cfgType, + char cfgData[CFG_DATA_MAX_BYTES], int setDataValidLen) +{ + WIFI_LOGI("Hid2dSetPeerWifiCfgInfo"); + return WIFI_OPT_SUCCESS; +} + +ErrCode WifiP2pService::Hid2dRequestGcIp(const std::string& gcMac, std::string& ipAddr) +{ + WIFI_LOGI("Hid2dRequestGcIp"); + + WifiP2pGroupInfo group; + ErrCode ret = GetCurrentGroup(group); + if (ret != WIFI_OPT_SUCCESS) { + WIFI_LOGI("Apply IP get current group failed!"); + } + IpPool::InitIpPool(group.GetGoIpAddress()); + ipAddr = IpPool::GetIp(gcMac); + return WIFI_OPT_SUCCESS; +} + +void WifiP2pService::IncreaseSharedLink(void) +{ + WIFI_LOGI("IncreaseSharedLink"); + SharedLinkManager::IncreaseSharedLink(); +} + +void WifiP2pService::DecreaseSharedLink(void) +{ + WIFI_LOGI("DecreaseSharedLink"); + SharedLinkManager::DecreaseSharedLink(); +} + +int WifiP2pService::GetSharedLinkCount(void) +{ + WIFI_LOGI("GetSharedLinkCount"); + return SharedLinkManager::GetSharedLinkCount(); +} + +int WifiP2pService::GetP2pRecommendChannel(void) +{ + WIFI_LOGI("GetP2pRecommendChannel"); + + int channel = 0; // 0 is invalid channel + + WifiLinkedInfo linkedInfo; + WifiSettings::GetInstance().GetLinkedInfo(linkedInfo); + if (linkedInfo.connState == CONNECTED) { + channel = FrequencyToChannel(linkedInfo.frequency); + WIFI_LOGI("Recommend linked channel: %{public}d", channel); + return channel; + } + + ChannelsTable channels; + std::vector vec5GChannels; + WifiSettings::GetInstance().GetValidChannels(channels); + if (channels.find(BandType::BAND_5GHZ) != channels.end()) { + vec5GChannels = channels[BandType::BAND_5GHZ]; + } + + const int COMMON_USING_5G_CHANNEL = 149; + const int COMMON_USING_2G_CHANNEL = 6; + if (!vec5GChannels.empty()) { + auto it = std::find(vec5GChannels.begin(), vec5GChannels.end(), COMMON_USING_5G_CHANNEL); + if (it != vec5GChannels.end()) { + channel = COMMON_USING_5G_CHANNEL; + } else { + channel = vec5GChannels[0]; + } + WIFI_LOGI("Recommend 5G channel: %{public}d", channel); + return channel; + } + WIFI_LOGI("Recommend 2G channel: %{public}d", COMMON_USING_2G_CHANNEL); + return COMMON_USING_2G_CHANNEL; +} + +ErrCode WifiP2pService::Hid2dSetUpperScene(const std::string& ifName, const Hid2dUpperScene& scene) +{ + WIFI_LOGI("Hid2dSetUpperScene"); + /* Not support currently */ + WIFI_LOGI("Set upper scene, ifName=%{public}s, scene=%{public}u, fps=%{public}d, bw=%{public}u", + ifName.c_str(), scene.scene, scene.fps, scene.bw); + return WIFI_OPT_SUCCESS; +} + +ErrCode WifiP2pService::MonitorCfgChange(void) +{ + WIFI_LOGI("MonitorCfgChange"); + return WIFI_OPT_SUCCESS; +} } // namespace Wifi } // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service.h index da6407f..98d6aa3 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service.h @@ -220,6 +220,79 @@ public: */ virtual ErrCode Hid2dConnect(const Hid2dConnectConfig& config) override; + /** + * @Description Get self config info + * + * @param cfgType - config type + * @param cfgData - config data + * @param getDatValidLen - data length + * @return ErrCode - operate result + */ + virtual ErrCode Hid2dGetSelfWifiCfgInfo(SelfCfgType cfgType, + char cfgData[CFG_DATA_MAX_BYTES], int* getDatValidLen) override; + + /** + * @Description Set self config info + * + * @param cfgType - config type + * @param cfgData - config data + * @param setDataValidLen - data length + * @return ErrCode - operate result + */ + virtual ErrCode Hid2dSetPeerWifiCfgInfo(PeerCfgType cfgType, + char cfgData[CFG_DATA_MAX_BYTES], int setDataValidLen) override; + + /** + * @Description Set self config info + * + * @param gcMac - gc mac address + * @param ipAddr - allocated ip address + * @return ErrCode - operate result + */ + virtual ErrCode Hid2dRequestGcIp(const std::string& gcMac, std::string& ipAddr) override; + + /** + * @Description Increase the reference count of the hid2d service. + * + */ + virtual void IncreaseSharedLink(void) override; + + /** + * @Description Decrease the reference count of the hid2d service. + * + */ + virtual void DecreaseSharedLink(void) override; + + /** + * @Description Get the reference count of the hid2d service. + * + * @return int - reference count + */ + virtual int GetSharedLinkCount(void) override; + + /** + * @Description - Get P2P recommended channel. + * + * @return - int - Recommended channel + */ + virtual int GetP2pRecommendChannel(void) override; + + /** + * @Description Set the scene of upper layer + * + * @param ifName - interface name + * @param scene - scene + * @return ErrCode - operate result + */ + virtual ErrCode Hid2dSetUpperScene(const std::string& ifName, const Hid2dUpperScene& scene) override; + + /** + * @Description Monitor the wifi configuration change + * + * @return ErrCode - operate result + */ + virtual ErrCode MonitorCfgChange(void) override; + private: /** * @Description - P2P state machine deregistration event callback. diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_callback_proxy.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_callback_proxy.cpp index e5a43e7..7183de4 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_callback_proxy.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_callback_proxy.cpp @@ -252,5 +252,31 @@ void WifiP2pCallbackProxy::OnP2pActionResult(P2pActionCallback action, ErrCode c } return; } + +void WifiP2pCallbackProxy::OnConfigChanged(CfgType type, char* cfgData, int dataLen) +{ + WIFI_LOGD("WifiP2pCallbackProxy::OnConfigChanged"); + MessageOption option; + MessageParcel data; + MessageParcel reply; + if (!data.WriteInterfaceToken(GetDescriptor())) { + WIFI_LOGE("Write interface token error: %{public}s", __func__); + return; + } + data.WriteInt32(0); + data.WriteInt32(static_cast(type)); + data.WriteInt32(dataLen); + data.WriteBuffer(cfgData, dataLen); + int error = Remote()->SendRequest(WIFI_CBK_CMD_CFG_CHANGE, data, reply, option); + if (error != ERR_NONE) { + WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", WIFI_CBK_CMD_CFG_CHANGE, error); + return; + } + int exception = reply.ReadInt32(); + if (exception) { + WIFI_LOGI("notify wifi p2p action callback result failed!"); + } + return; +} } // namespace Wifi } // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_callback_proxy.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_callback_proxy.h index 12d4bb0..e737ce3 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_callback_proxy.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_callback_proxy.h @@ -84,6 +84,15 @@ public: */ void OnP2pActionResult(P2pActionCallback action, ErrCode code) override; + /** + * @Description Config changed callback. + * + * @param type - Config type + * @param cfgData - Config data + * @param dataLen - Config data length + */ + void OnConfigChanged(CfgType type, char* cfgData, int dataLen) override; + private: void WriteWifiP2pDeviceData(MessageParcel &data, const WifiP2pDevice &device); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp index 8511596..0a73692 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp @@ -17,6 +17,7 @@ #include #include "wifi_permission_utils.h" #include "wifi_auth_center.h" +#include "wifi_common_util.h" #include "wifi_config_center.h" #include "wifi_manager.h" #include "wifi_service_manager.h" @@ -26,7 +27,6 @@ #include "wifi_dumper.h" #include "wifi_hid2d_service_utils.h" #include "if_config.h" -#include "wifi_hid2d_cfg.h" #include "wifi_net_agent.h" DEFINE_WIFILOG_P2P_LABEL("WifiP2pServiceImpl"); @@ -781,16 +781,16 @@ ErrCode WifiP2pServiceImpl::SetP2pWfdInfo(const WifiP2pWfdInfo &wfdInfo) ErrCode WifiP2pServiceImpl::Hid2dRequestGcIp(const std::string& gcMac, std::string& ipAddr) { WIFI_LOGI("Hid2dRequestGcIp"); - - WifiP2pGroupInfo group; - ErrCode ret = GetCurrentGroup(group); - if (ret != WIFI_OPT_SUCCESS) { - WIFI_LOGI("Apply IP get current group failed!"); + if (!IsP2pServiceRunning()) { + WIFI_LOGE("P2pService is not runing!"); + return WIFI_OPT_P2P_NOT_OPENED; } - - IpPool::InitIpPool(group.GetGoIpAddress()); - ipAddr = IpPool::GetIp(gcMac); - return WIFI_OPT_SUCCESS; + IP2pService *pService = WifiServiceManager::GetInstance().GetP2pServiceInst(); + if (pService == nullptr) { + WIFI_LOGE("Get P2P service failed!"); + return WIFI_OPT_P2P_NOT_OPENED; + } + return pService->Hid2dRequestGcIp(gcMac, ipAddr); } ErrCode WifiP2pServiceImpl::Hid2dSharedlinkIncrease() @@ -806,15 +806,29 @@ ErrCode WifiP2pServiceImpl::Hid2dSharedlinkIncrease() WIFI_LOGE("Hid2dSharedlinkIncrease P2P not in connected state!"); return WIFI_OPT_FAILED; } - SharedLinkManager::IncreaseSharedLink(); + IP2pService *pService = WifiServiceManager::GetInstance().GetP2pServiceInst(); + if (pService == nullptr) { + WIFI_LOGE("Get P2P service failed!"); + return WIFI_OPT_FAILED; + } + pService->IncreaseSharedLink(); return WIFI_OPT_SUCCESS; } ErrCode WifiP2pServiceImpl::Hid2dSharedlinkDecrease() { WIFI_LOGI("Hid2dSharedlinkDecrease"); - SharedLinkManager::DecreaseSharedLink(); - if (SharedLinkManager::GetSharedLinkCount() == 0) { + if (!IsP2pServiceRunning()) { + WIFI_LOGE("P2pService is not runing!"); + return WIFI_OPT_P2P_NOT_OPENED; + } + IP2pService *pService = WifiServiceManager::GetInstance().GetP2pServiceInst(); + if (pService == nullptr) { + WIFI_LOGE("Get P2P service failed!"); + return WIFI_OPT_P2P_NOT_OPENED; + } + pService->DecreaseSharedLink(); + if (pService->GetSharedLinkCount() == 0) { WIFI_LOGI("Shared link count == 0, remove group!"); RemoveGroup(); } @@ -889,24 +903,38 @@ ErrCode WifiP2pServiceImpl::Hid2dGetRecommendChannel(const RecommendChannelReque RecommendChannelResponse& response) { WIFI_LOGI("Hid2dGetRecommendChannel"); - - /* - * channel: 36, 40, 44, 48, 52, 56, 60, 64, 149, 153, 157, 161, 165 - * center frequency: 5180, 5200, 5220, 5240, 5260, 5280, 5300, 5320, 5745, 5765, 5785, 5805, 5825 - */ - constexpr int defaultRecommendFrequency = 5180; + if (!IsP2pServiceRunning()) { + WIFI_LOGE("P2pService is not runing!"); + return WIFI_OPT_P2P_NOT_OPENED; + } + IP2pService *pService = WifiServiceManager::GetInstance().GetP2pServiceInst(); + if (pService == nullptr) { + WIFI_LOGE("Get P2P service failed!"); + return WIFI_OPT_P2P_NOT_OPENED; + } + int channel = pService->GetP2pRecommendChannel(); + int freq = ChannelToFrequency(channel); + WIFI_LOGI("Get recommended channel: %{public}d, freq: %{public}d", channel, freq); + response.centerFreq = freq; response.status = RecommendStatus::RS_SUCCESS; - response.centerFreq2 = defaultRecommendFrequency; return WIFI_OPT_SUCCESS; } ErrCode WifiP2pServiceImpl::Hid2dGetChannelListFor5G(std::vector& vecChannelList) { WIFI_LOGI("Hid2dGetChannelListFor5G"); + ChannelsTable channels; + WifiSettings::GetInstance().GetValidChannels(channels); + if (channels.find(BandType::BAND_5GHZ) != channels.end()) { + vecChannelList = channels[BandType::BAND_5GHZ]; + } - std::vector temp5Glist = {36, 40, 44, 48, 52, 56, 60, 64, 149, 153, 157, 161, 165}; - vecChannelList.clear(); - std::swap(temp5Glist, vecChannelList); + std::string strChannel; + for (auto channel : vecChannelList) { + strChannel += std::to_string(channel) + ","; + } + WIFI_LOGI("5G channel list[%{public}d]: %{public}s", + (int)vecChannelList.size(), strChannel.c_str()); return WIFI_OPT_SUCCESS; } @@ -914,20 +942,66 @@ ErrCode WifiP2pServiceImpl::Hid2dGetSelfWifiCfgInfo(SelfCfgType cfgType, char cfgData[CFG_DATA_MAX_BYTES], int* getDatValidLen) { WIFI_LOGI("Hid2dGetSelfWifiCfgInfo"); - WifiHid2dCfg::GetInstance().GetSelfDeviceCfg(cfgType, cfgData, *getDatValidLen); - return (*getDatValidLen == 0) ? WIFI_OPT_FAILED : WIFI_OPT_SUCCESS; + if (!IsP2pServiceRunning()) { + WIFI_LOGE("P2pService is not runing!"); + return WIFI_OPT_P2P_NOT_OPENED; + } + + IP2pService *pService = WifiServiceManager::GetInstance().GetP2pServiceInst(); + if (pService == nullptr) { + WIFI_LOGE("Get P2P service failed!"); + return WIFI_OPT_P2P_NOT_OPENED; + } + return pService->Hid2dGetSelfWifiCfgInfo(cfgType, cfgData, getDatValidLen); } ErrCode WifiP2pServiceImpl::Hid2dSetPeerWifiCfgInfo(PeerCfgType cfgType, char cfgData[CFG_DATA_MAX_BYTES], int setDataValidLen) { WIFI_LOGI("Hid2dSetPeerWifiCfgInfo"); - int ret = WifiHid2dCfg::GetInstance().Hid2dSetPeerWifiCfgInfo(cfgType, cfgData, setDataValidLen); - if (ret != 0) { - WIFI_LOGE("set peer wifi cfg info failed: %{public}d", ret); - return WIFI_OPT_FAILED; + if (!IsP2pServiceRunning()) { + WIFI_LOGE("P2pService is not runing!"); + return WIFI_OPT_P2P_NOT_OPENED; } - return WIFI_OPT_SUCCESS; + + IP2pService *pService = WifiServiceManager::GetInstance().GetP2pServiceInst(); + if (pService == nullptr) { + WIFI_LOGE("Get P2P service failed!"); + return WIFI_OPT_P2P_NOT_OPENED; + } + return pService->Hid2dSetPeerWifiCfgInfo(cfgType, cfgData, setDataValidLen); +} + +ErrCode WifiP2pServiceImpl::Hid2dSetUpperScene(const std::string& ifName, const Hid2dUpperScene& scene) +{ + WIFI_LOGI("Hid2dSetUpperScene"); + if (!IsP2pServiceRunning()) { + WIFI_LOGE("P2pService is not runing!"); + return WIFI_OPT_P2P_NOT_OPENED; + } + + IP2pService *pService = WifiServiceManager::GetInstance().GetP2pServiceInst(); + if (pService == nullptr) { + WIFI_LOGE("Get P2P service failed!"); + return WIFI_OPT_P2P_NOT_OPENED; + } + return pService->Hid2dSetUpperScene(ifName, scene); +} + +ErrCode WifiP2pServiceImpl::MonitorCfgChange(void) +{ + WIFI_LOGI("MonitorCfgChange"); + if (!IsP2pServiceRunning()) { + WIFI_LOGE("P2pService is not runing!"); + return WIFI_OPT_P2P_NOT_OPENED; + } + + IP2pService *pService = WifiServiceManager::GetInstance().GetP2pServiceInst(); + if (pService == nullptr) { + WIFI_LOGE("Get P2P service failed!"); + return WIFI_OPT_P2P_NOT_OPENED; + } + return pService->MonitorCfgChange(); } void WifiP2pServiceImpl::SaBasicDump(std::string& result) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.h index a48c553..5bccdd2 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.h @@ -368,6 +368,22 @@ public: ErrCode Hid2dSetPeerWifiCfgInfo(PeerCfgType cfgType, char cfgData[CFG_DATA_MAX_BYTES], int setDataValidLen) override; + /** + * @Description Set the scene of upper layer + * + * @param ifName - interface name + * @param scene - scene + * @return ErrCode - operate result + */ + ErrCode Hid2dSetUpperScene(const std::string& ifName, const Hid2dUpperScene& scene) override; + + /** + * @Description Monitor the wifi configuration change + * + * @return ErrCode - operate result + */ + ErrCode MonitorCfgChange(void) override; + /** * @Description dump p2p information * diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.cpp index 75d0182..4d0c7d6 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.cpp @@ -74,6 +74,7 @@ void WifiP2pStub::InitHandleMap() handleFuncMap[WIFI_SVR_CMD_GET_SELF_WIFI_CFG] = &WifiP2pStub::OnHid2dGetSelfWifiCfgInfo; handleFuncMap[WIFI_SVR_CMD_SET_PEER_WIFI_CFG] = &WifiP2pStub::OnHid2dSetPeerWifiCfgInfo; handleFuncMap[WIFI_SVR_CMD_P2P_QUERY_LOCAL_DEVICE] = &WifiP2pStub::OnQueryP2pLocalDevice; + handleFuncMap[WIFI_SVR_CMD_SET_UPPER_SCENE] = &WifiP2pStub::OnHid2dSetUpperScene; return; } @@ -594,6 +595,7 @@ void WifiP2pStub::OnRegisterCallBack(uint32_t code, MessageParcel &data, Message } ret = WIFI_OPT_SUCCESS; } + MonitorCfgChange(); } while (0); reply.WriteInt32(0); @@ -828,6 +830,22 @@ void WifiP2pStub::OnHid2dSetPeerWifiCfgInfo( reply.WriteInt32(ret); } +void WifiP2pStub::OnHid2dSetUpperScene( + uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) +{ + WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); + + std::string ifName = data.ReadCString(); + Hid2dUpperScene scene; + scene.mac = data.ReadCString(); + scene.scene = data.ReadUint32(); + scene.fps = data.ReadInt32(); + scene.bw = data.ReadUint32(); + ErrCode ret = Hid2dSetUpperScene(ifName, scene); + reply.WriteInt32(0); + reply.WriteInt32(ret); +} + bool WifiP2pStub::IsSingleCallback() const { return mSingleCallback; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.h index 2421e27..5001dd1 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.h @@ -38,6 +38,9 @@ public: bool IsSingleCallback() const; void SetSingleCallback(const bool isSingleCallback); + + virtual ErrCode MonitorCfgChange(void) = 0; + protected: sptr GetCallback() const; @@ -83,6 +86,7 @@ private: void OnHid2dGetChannelListFor5G(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option); void OnHid2dGetSelfWifiCfgInfo(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option); void OnHid2dSetPeerWifiCfgInfo(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option); + void OnHid2dSetUpperScene(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option); bool ReadWifiP2pServiceInfo(MessageParcel &data, WifiP2pServiceInfo &info); bool ReadWifiP2pServiceRequest(MessageParcel &data, WifiP2pDevice &device, WifiP2pServiceRequest &request); void WriteWifiP2pServiceInfo(MessageParcel &reply, const WifiP2pServiceInfo &info); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn index 98f4321..fea7f84 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn @@ -59,6 +59,7 @@ local_base_include_dirs = [ "$DHCP_ROOT_DIR/interfaces/inner_api/interfaces", "$WIFI_ROOT_DIR/utils/inc", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_common", ] if (defined(ohos_lite)) { @@ -118,6 +119,7 @@ if (defined(ohos_lite)) { "$DHCP_ROOT_DIR/services/mgr_service:dhcp_manager_service", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_common:wifi_common_service", "$WIFI_ROOT_DIR/utils/src:wifi_utils", "//utils/native/base:utils", ] diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp index 60c29a8..9655309 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp @@ -24,6 +24,7 @@ #include "mac_address.h" #include "if_config.h" #include "wifi_common_util.h" +#include "wifi_chip_capability.h" #include "wifi_supplicant_hal_interface.h" #ifndef OHOS_WIFI_STA_TEST @@ -417,7 +418,7 @@ void StaStateMachine::StartWifiProcess() InitLastWifiLinkedInfo(); WifiSettings::GetInstance().SaveLinkedInfo(linkedInfo); SyncDeviceConfigToWpa(); - + ChipCapability::GetInstance().InitializeChipCapability(); /* The current state of StaStateMachine transfers to SeparatedState after * enable supplicant. */ diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_chip_interface.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_chip_interface.c index 7be5345..87b8a53 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_chip_interface.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_chip_interface.c @@ -150,8 +150,52 @@ WifiErrorNo RequestFirmwareDebugDump(unsigned char *bytes, int32_t *size) return ConvertErrorCode(err); } -WifiErrorNo WifiServiceSetPowerMode(uint8_t mode) +WifiErrorNo GetIsChipSupportDbdc(int *support) { - LOGD("WifiServiceSetPowerMode() %{public}u", mode); + LOGD("GetIsChipSupportDbdc"); + if (support == NULL) { + return WIFI_HAL_FAILED; + } + *support = WIFI_HAL_TRUE; + return WIFI_HAL_SUCCESS; +} + +WifiErrorNo GetIsChipSupportCsa(int *support) +{ + LOGD("GetIsChipSupportCsa"); + if (support == NULL) { + return WIFI_HAL_FAILED; + } + *support = WIFI_HAL_FALSE; + return WIFI_HAL_SUCCESS; +} + +WifiErrorNo GetIsChipSupportRadarDetect(int *support) +{ + LOGD("GetIsChipSupportRadarDetect"); + if (support == NULL) { + return WIFI_HAL_FAILED; + } + *support = WIFI_HAL_TRUE; return WIFI_HAL_SUCCESS; -} \ No newline at end of file +} + +WifiErrorNo GetIsChipSupportDfsChannel(int *support) +{ + LOGD("GetIsChipSupportDfsChannel"); + if (support == NULL) { + return WIFI_HAL_FAILED; + } + *support = WIFI_HAL_TRUE; + return WIFI_HAL_SUCCESS; +} + +WifiErrorNo GetIsChipSupportIndoorChannel(int *support) +{ + LOGD("GetIsChipSupportIndoorChannel"); + if (support == NULL) { + return WIFI_HAL_FAILED; + } + *support = WIFI_HAL_TRUE; + return WIFI_HAL_SUCCESS; +} diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_chip_interface.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_chip_interface.h index 51dd838..ff0fb5f 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_chip_interface.h +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_chip_interface.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -133,13 +133,44 @@ WifiErrorNo GetComboModes(int32_t *id); WifiErrorNo RequestFirmwareDebugDump(unsigned char *bytes, int32_t *size); /** - * @Description Setting the Low Latency Mode. + * @Description Get is chip support DBDC. * - * @param mode - Low-latency mode. + * @param support - Is support or not supported. * @return WifiErrorNo */ -WifiErrorNo WifiServiceSetPowerMode(uint8_t mode); +WifiErrorNo GetIsChipSupportDbdc(int *support); +/** + * @Description Get is chip support CSA. + * + * @param support - Is support or not supported. + * @return WifiErrorNo + */ +WifiErrorNo GetIsChipSupportCsa(int *support); + +/** + * @Description Get is chip support radar detection. + * + * @param support - Is support or not supported. + * @return WifiErrorNo + */ +WifiErrorNo GetIsChipSupportRadarDetect(int *support); + +/** + * @Description Get is chip support Dfs channel + * + * @param support - Is support or not supported. + * @return WifiErrorNo + */ +WifiErrorNo GetIsChipSupportDfsChannel(int *support); + +/** + * @Description Get is chip support indoor channel. + * + * @param support - Is support or not supported. + * @return WifiErrorNo + */ +WifiErrorNo GetIsChipSupportIndoorChannel(int *support); #ifdef __cplusplus } #endif diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_chip.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_chip.c index 6fd19cb..6fddda4 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_chip.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_chip.c @@ -311,18 +311,82 @@ int RpcRequestFirmwareDebugDump(RpcServer *server, Context *context) return HAL_SUCCESS; } -int RpcSetPowerMode(RpcServer *server, Context *context) +int RpcIsChipSupportDbdc(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { return HAL_FAILURE; } - int mode = 0; - if (ReadInt(context, &mode) < 0) { + int support = 0; + WifiErrorNo err = GetIsChipSupportDbdc(&support); + WriteBegin(context, 0); + WriteInt(context, err); + if (err == WIFI_HAL_SUCCESS) { + WriteInt(context, support); + } + WriteEnd(context); + return HAL_SUCCESS; +} + +int RpcIsChipSupportCsa(RpcServer *server, Context *context) +{ + if (server == NULL || context == NULL) { + return HAL_FAILURE; + } + int support = 0; + WifiErrorNo err = GetIsChipSupportCsa(&support); + WriteBegin(context, 0); + WriteInt(context, err); + if (err == WIFI_HAL_SUCCESS) { + WriteInt(context, support); + } + WriteEnd(context); + return HAL_SUCCESS; +} + +int RpcIsChipSupportRadarDetect(RpcServer *server, Context *context) +{ + if (server == NULL || context == NULL) { + return HAL_FAILURE; + } + int support = 0; + WifiErrorNo err = GetIsChipSupportRadarDetect(&support); + WriteBegin(context, 0); + WriteInt(context, err); + if (err == WIFI_HAL_SUCCESS) { + WriteInt(context, support); + } + WriteEnd(context); + return HAL_SUCCESS; +} + +int RpcIsChipSupportDfsChannel(RpcServer *server, Context *context) +{ + if (server == NULL || context == NULL) { return HAL_FAILURE; } - WifiErrorNo err = WifiServiceSetPowerMode(mode); + int support = 0; + WifiErrorNo err = GetIsChipSupportDfsChannel(&support); WriteBegin(context, 0); WriteInt(context, err); + if (err == WIFI_HAL_SUCCESS) { + WriteInt(context, support); + } + WriteEnd(context); + return HAL_SUCCESS; +} + +int RpcIsChipSupportIndoorChannel(RpcServer *server, Context *context) +{ + if (server == NULL || context == NULL) { + return HAL_FAILURE; + } + int support = 0; + WifiErrorNo err = GetIsChipSupportIndoorChannel(&support); + WriteBegin(context, 0); + WriteInt(context, err); + if (err == WIFI_HAL_SUCCESS) { + WriteInt(context, support); + } WriteEnd(context); return HAL_SUCCESS; } \ No newline at end of file diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_chip.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_chip.h index a8d4b28..4d3a417 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_chip.h +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_chip.h @@ -144,14 +144,53 @@ int RpcRequestFirmwareDebugDump(RpcServer *server, Context *context); /** * @Description Parse the context to obtain data. Call the corresponding function - * SetPowerMode and assemble the function to obtain data. + * RpcIsChipSupportDbdc and assemble the function to obtain data. * * @param server - Pointer to the global structure of the communication server. * @param context - Pointer to the global communication context structure of the server. * @return int - 0 Success, -1 Failed. */ -int RpcSetPowerMode(RpcServer *server, Context *context); +int RpcIsChipSupportDbdc(RpcServer *server, Context *context); +/** + * @Description Parse the context to obtain data. Call the corresponding function + * RpcIsChipSupportCsa and assemble the function to obtain data. + * + * @param server - Pointer to the global structure of the communication server. + * @param context - Pointer to the global communication context structure of the server. + * @return int - 0 Success, -1 Failed. + */ +int RpcIsChipSupportCsa(RpcServer *server, Context *context); + +/** + * @Description Parse the context to obtain data. Call the corresponding function + * RpcIsChipSupportRadarDetect and assemble the function to obtain data. + * + * @param server - Pointer to the global structure of the communication server. + * @param context - Pointer to the global communication context structure of the server. + * @return int - 0 Success, -1 Failed. + */ +int RpcIsChipSupportRadarDetect(RpcServer *server, Context *context); + +/** + * @Description Parse the context to obtain data. Call the corresponding function + * RpcIsChipSupportDfsChannel and assemble the function to obtain data. + * + * @param server - Pointer to the global structure of the communication server. + * @param context - Pointer to the global communication context structure of the server. + * @return int - 0 Success, -1 Failed. + */ +int RpcIsChipSupportDfsChannel(RpcServer *server, Context *context); + +/** + * @Description Parse the context to obtain data. Call the corresponding function + * RpcIsChipSupportIndoorChannel and assemble the function to obtain data. + * + * @param server - Pointer to the global structure of the communication server. + * @param context - Pointer to the global communication context structure of the server. + * @return int - 0 Success, -1 Failed. + */ +int RpcIsChipSupportIndoorChannel(RpcServer *server, Context *context); #ifdef __cplusplus } #endif diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.c index 8e51e4e..3120430 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.c @@ -105,7 +105,11 @@ static int InitRpcFuncMapChip(void) ret += PushRpcFunc("ConfigComboModes", RpcConfigComboModes); ret += PushRpcFunc("GetComboModes", RpcGetComboModes); ret += PushRpcFunc("RequestFirmwareDebugDump", RpcRequestFirmwareDebugDump); - ret += PushRpcFunc("SetPowerMode", RpcSetPowerMode); + ret += PushRpcFunc("IsChipSupportDbdc", RpcIsChipSupportDbdc); + ret += PushRpcFunc("IsChipSupportCsa", RpcIsChipSupportCsa); + ret += PushRpcFunc("IsChipSupportRadarDetect", RpcIsChipSupportRadarDetect); + ret += PushRpcFunc("IsChipSupportDfsChannel", RpcIsChipSupportDfsChannel); + ret += PushRpcFunc("IsChipSupportIndoorChannel", RpcIsChipSupportIndoorChannel); return ret; } diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_define.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_define.h index 270605d..d2c5c44 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_define.h +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_define.h @@ -38,6 +38,8 @@ extern "C" { #define HAL_SUCCESS 0 #define HAL_FAILURE (-1) +#define WIFI_HAL_FALSE 0 +#define WIFI_HAL_TRUE 1 typedef enum WifiErrorNo { WIFI_HAL_SUCCESS = 0, /* Success. */ diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn index aa22463..2582e8a 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn @@ -46,6 +46,7 @@ ohos_unittest("WifiApServiceTest") { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_common/wifi_chip_capability.cpp", "./Mock/mock_network_interface.cpp", "./Mock/mock_system_interface.cpp", "./Mock/mock_wifi_ap_hal_interface.cpp", @@ -78,6 +79,7 @@ ohos_unittest("WifiApServiceTest") { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_common", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client", @@ -97,6 +99,7 @@ ohos_unittest("WifiApServiceTest") { ] deps = [ "$DHCP_ROOT_DIR/services/mgr_service:dhcp_manager_service", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", "$WIFI_ROOT_DIR/utils/src:wifi_utils", "//third_party/googletest:gmock_main", "//utils/native/base:utils", diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_started_state.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_started_state.h index c129c0d..a8f20d8 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_started_state.h +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_started_state.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -17,8 +17,9 @@ #define OHOS_MOCK_AP_STARTED_STATE_H #include -#include "wifi_msg.h" #include "ap_started_state.h" +#include "wifi_chip_capability.h" +#include "wifi_msg.h" namespace OHOS { namespace Wifi { @@ -31,7 +32,6 @@ public: MOCK_METHOD0(GoOutState, void()); MOCK_METHOD1(ExecuteStateMsg, bool(InternalMessage *msg)); }; - } // namespace OHOS } // namespace OHOS #endif \ No newline at end of file diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn index 9a4e50c..9adc9d8 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn @@ -44,10 +44,10 @@ ohos_unittest("wifi_p2p_test") { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/state.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_broadcast_helper.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_service_utils.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/authorizing_negotiation_request_state.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/hid2d/wifi_hid2d_service_utils.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_received_state.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_request_state.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_default_state.cpp", @@ -139,11 +139,15 @@ ohos_unittest("wifi_p2p_test") { "//third_party/googletest/googlemock/include", "//third_party/googletest/googletest/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/hid2d", + "$WIFI_ROOT_DIR/utils/inc", ] deps = [ "$DHCP_ROOT_DIR/services/mgr_service:dhcp_manager_service", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_common:wifi_common_service", + "$WIFI_ROOT_DIR/utils/src:wifi_utils", "//third_party/googletest:gmock_main", "//utils/native/base:utils", ] diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn index a6897d2..df83804 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn @@ -103,12 +103,14 @@ ohos_unittest("wifi_sta_unittest") { "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk/", "//foundation/ability/ability_lite/interfaces/kits/want_lite/", "$WIFI_ROOT_DIR/utils/inc", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_common", ] deps = [ "$DHCP_ROOT_DIR/services/mgr_service:dhcp_manager_service", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_common:wifi_common_service", "$WIFI_ROOT_DIR/utils/src:wifi_utils", "//third_party/googletest:gmock_main", "//utils/native/base:utils", diff --git a/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_chip_interface_test.cpp b/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_chip_interface_test.cpp index 174f599..54d6252 100644 --- a/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_chip_interface_test.cpp +++ b/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_chip_interface_test.cpp @@ -97,10 +97,5 @@ HWTEST_F(WifiHalChipInterfaceTest, RequestFirmwareDebugDumpTest, TestSize.Level1 int size = 32; EXPECT_TRUE(RequestFirmwareDebugDump(bytes, &size) == WIFI_HAL_NOT_SUPPORT); } - -HWTEST_F(WifiHalChipInterfaceTest, WifiServiceSetPowerModeTest, TestSize.Level1) -{ - EXPECT_TRUE(WifiServiceSetPowerMode(0) == WIFI_HAL_SUCCESS); -} } // namespace Wifi } // namespace OHOS \ No newline at end of file diff --git a/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_test.cpp b/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_test.cpp index ca33052..7637edd 100644 --- a/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_test.cpp +++ b/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_test.cpp @@ -562,21 +562,6 @@ HWTEST_F(WifiHalCRpcServerTest, RpcRequestFirmwareDebugDumpTest, TestSize.Level1 EXPECT_TRUE(RpcRequestFirmwareDebugDump(mServer, mContext) == 0); } -HWTEST_F(WifiHalCRpcServerTest, RpcSetPowerModeTest, TestSize.Level1) -{ - EXPECT_TRUE(RpcSetPowerMode(nullptr, nullptr) < 0); - char buff[] = "N\tSetPowerMode\tasdgds\t"; - mContext->oneProcess = buff; - mContext->nPos = strlen("N\tSetPowerMode\t"); - mContext->nSize = strlen(buff); - EXPECT_TRUE(RpcSetPowerMode(mServer, mContext) < 0); - char buff1[] = "N\tSetPowerMode\t1\t"; - mContext->oneProcess = buff1; - mContext->nPos = strlen("N\tSetPowerMode\t"); - mContext->nSize = strlen(buff1); - EXPECT_TRUE(RpcSetPowerMode(mServer, mContext) == 0); -} - HWTEST_F(WifiHalCRpcServerTest, RpcStartTest, TestSize.Level1) { EXPECT_TRUE(RpcStart(nullptr, nullptr) < 0); diff --git a/wifi/utils/inc/wifi_common_util.h b/wifi/utils/inc/wifi_common_util.h index b23f67a..f6db0e2 100644 --- a/wifi/utils/inc/wifi_common_util.h +++ b/wifi/utils/inc/wifi_common_util.h @@ -127,6 +127,20 @@ int GetCallingUid(); */ bool IsForegroundApp(const int uid); +/** + * @Description Convert frequency to channel + * + * @return int - channel + */ +int FrequencyToChannel(int freq); + +/** + * @Description Convert channel to frequency + * + * @return int - frequency + */ +int ChannelToFrequency(int channel); + /** * @Description Time consuming statistics * diff --git a/wifi/utils/src/wifi_common_util.cpp b/wifi/utils/src/wifi_common_util.cpp index ffb7d92..175dc5c 100644 --- a/wifi/utils/src/wifi_common_util.cpp +++ b/wifi/utils/src/wifi_common_util.cpp @@ -30,6 +30,24 @@ namespace OHOS { namespace Wifi { DEFINE_WIFILOG_LABEL("WifiCommonUtil"); + +constexpr int INVALID_FREQ_OR_CHANNEL = -1; +constexpr int FREQ_2G_MIN = 2412; +constexpr int FREQ_2G_MAX = 2472; +constexpr int FREQ_5G_MIN = 5170; +constexpr int FREQ_5G_MAX = 5825; +constexpr int CHANNEL_14_FREQ = 2484; +constexpr int CHANNEL_14 = 14; +constexpr int CENTER_FREQ_DIFF = 5; +constexpr int CHANNEL_2G_MIN = 1; +constexpr int CHANNEL_5G_MIN = 34; +constexpr int MIN_24G_CHANNEL = 1; +constexpr int MAX_24G_CHANNEL = 13; +constexpr int MIN_5G_CHANNEL = 36; +constexpr int MAX_5G_CHANNEL = 165; +constexpr int FREQ_CHANNEL_1 = 2412; +constexpr int FREQ_CHANNEL_36 = 5180; + static std::string DataAnonymize(const std::string str, const char delim, const char hiddenCh, const int startIdx = 0) { @@ -261,6 +279,32 @@ bool IsForegroundApp(const int uid) return false; } +int FrequencyToChannel(int freq) +{ + WIFI_LOGI("FrequencyToChannel: %{public}d", freq); + int channel = INVALID_FREQ_OR_CHANNEL; + if (freq >= FREQ_2G_MIN && freq <= FREQ_2G_MAX) { + channel = (freq - FREQ_2G_MIN) / CENTER_FREQ_DIFF + CHANNEL_2G_MIN; + } else if (freq == CHANNEL_14_FREQ) { + channel = CHANNEL_14; + } else if (freq >= FREQ_5G_MIN && freq <= FREQ_5G_MAX) { + channel = (freq - FREQ_5G_MIN) / CENTER_FREQ_DIFF + CHANNEL_5G_MIN; + } + return channel; +} + +int ChannelToFrequency(int channel) +{ + WIFI_LOGI("ChannelToFrequency: %{public}d", channel); + if (channel >= MIN_24G_CHANNEL && channel <= MAX_24G_CHANNEL) { + return ((channel - MIN_24G_CHANNEL) * CENTER_FREQ_DIFF + FREQ_CHANNEL_1); + } + if (MIN_5G_CHANNEL <= channel && channel <= MAX_5G_CHANNEL) { + return ((channel - MIN_5G_CHANNEL) * CENTER_FREQ_DIFF + FREQ_CHANNEL_36); + } + return INVALID_FREQ_OR_CHANNEL; +} + TimeStats::TimeStats(const std::string desc): m_desc(desc) { m_startTime = std::chrono::steady_clock::now(); -- Gitee From 9dd8d10ef4a304ff0c9577f8192d114bff4b6c31 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Fri, 8 Jul 2022 19:38:27 +0800 Subject: [PATCH 223/491] bugfix for auto connect 0708 Signed-off-by: yanxiaotao@huawei.com --- .../wifi_manage/wifi_device_service_impl.cpp | 4 ++++ .../wifi_sta/sta_auto_connect_service.cpp | 5 ++++- .../wifi_manage/wifi_sta/sta_state_machine.cpp | 14 +++++++------- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp index 0d051eb..911479e 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp @@ -902,6 +902,10 @@ ErrCode WifiDeviceServiceImpl::GetLinkedInfo(WifiLinkedInfo &info) info.macAddress = ""; } + WIFI_LOGI("GetLinkedInfo, networkId=%{public}d, rssi=%{public}d, frequency=%{public}d", + info.networkId, info.rssi, info.frequency); + WIFI_LOGI("GetLinkedInfo, connState=%{public}d, supplicantState=%{public}d, detailedState=%{public}d", + info.connState, info.supplicantState, info.detailedState); return WIFI_OPT_SUCCESS; } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp index 4c79949..513baa4 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp @@ -415,7 +415,8 @@ bool StaAutoConnectService::RoamingEncryptionModeCheck( bool StaAutoConnectService::AllowAutoSelectDevice(const std::vector &scanInfos, WifiLinkedInfo &info) { - WIFI_LOGI("Allow auto select device, detailed status is %{public}d\n", info.detailedState); + WIFI_LOGI("Allow auto select device, connState=%{public}d, detailedState=%{public}d\n", + info.connState, info.detailedState); if (scanInfos.empty()) { WIFI_LOGE("No network,skip network selection.\n"); return false; @@ -446,6 +447,7 @@ bool StaAutoConnectService::AllowAutoSelectDevice(const std::vector INVALID_RSSI_VALUE && signalInfo.signal < MAX_RSSI_VALUE) { if (signalInfo.signal > 0) { linkedInfo.rssi = setRssi((signalInfo.signal - SIGNAL_INFO)); @@ -688,8 +687,9 @@ void StaStateMachine::DealSignalPollResult(InternalMessage *msg) linkedInfo.rssi = setRssi(signalInfo.signal); } int currentSignalLevel = WifiSettings::GetInstance().GetSignalLevel(linkedInfo.rssi, linkedInfo.band); - LOGI("DealSignalPollResult linkedInfo.rssi:%{public}d, linkedInfo.band:%{public}d.\n", - linkedInfo.rssi, linkedInfo.band); + LOGI("DealSignalPollResult, rssi:%{public}d, band:%{public}d, " + "connState:%{public}d, detailedState:%{public}d.\n", + linkedInfo.rssi, linkedInfo.band, linkedInfo.connState, linkedInfo.detailedState); LOGI("DealSignalPollResult currentSignalLevel:%{public}d, lastSignalLevel:%{public}d.\n", currentSignalLevel, lastSignalLevel); if (currentSignalLevel != lastSignalLevel) { -- Gitee From 0f82e004486327e57af761505acb6985d288ec99 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Sat, 9 Jul 2022 13:05:06 +0800 Subject: [PATCH 224/491] bugfix for auto connect 0709 Signed-off-by: yanxiaotao@huawei.com --- wifi/frameworks/js/napi/src/wifi_napi_utils.cpp | 4 ++-- .../wifi_manage/wifi_device_service_impl.cpp | 6 +++--- .../wifi_framework/wifi_manage/wifi_device_stub.cpp | 1 - .../wifi_manage/wifi_sta/sta_auto_connect_service.cpp | 8 ++++++-- .../wifi_manage/wifi_sta/sta_state_machine.cpp | 8 +++++--- 5 files changed, 16 insertions(+), 11 deletions(-) diff --git a/wifi/frameworks/js/napi/src/wifi_napi_utils.cpp b/wifi/frameworks/js/napi/src/wifi_napi_utils.cpp index 13f2b32..721a76f 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_utils.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_utils.cpp @@ -26,7 +26,7 @@ TraceFuncCall::TraceFuncCall(std::string funcName): m_funcName(funcName) { if (m_isTrace) { m_startTime = std::chrono::steady_clock::now(); - WIFI_LOGD("Call wifi func: %{public}s (start)", m_funcName.c_str()); + WIFI_LOGI("Call wifi func: %{public}s (start)", m_funcName.c_str()); } } @@ -36,7 +36,7 @@ TraceFuncCall::~TraceFuncCall() auto us = std::chrono::duration_cast (std::chrono::steady_clock::now() - m_startTime).count(); constexpr int usForPerMs = 1000; - WIFI_LOGD("Call wifi func: %{public}s (end), time cost:%{public}lldus, %{public}lldms", + WIFI_LOGI("Call wifi func: %{public}s (end), time cost:%{public}lldus, %{public}lldms", m_funcName.c_str(), us, us / usForPerMs); } } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp index 911479e..1acb233 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp @@ -350,7 +350,7 @@ bool WifiDeviceServiceImpl::CheckConfigPwd(const WifiDeviceConfig &config) int len = config.preSharedKey.length(); bool isAllHex = std::all_of(config.preSharedKey.begin(), config.preSharedKey.end(), isxdigit); - WIFI_LOGI("CheckConfigPwd, keyMgmt: %{private}s, len: %{private}d", config.keyMgmt.c_str(), len); + WIFI_LOGI("CheckConfigPwd, keyMgmt: %{public}s, len: %{public}d", config.keyMgmt.c_str(), len); if (config.keyMgmt == KEY_MGMT_NONE) { for (int i = 0; i != WEPKEYS_SIZE; ++i) { if (!config.wepKeys[i].empty()) { // wep @@ -902,8 +902,8 @@ ErrCode WifiDeviceServiceImpl::GetLinkedInfo(WifiLinkedInfo &info) info.macAddress = ""; } - WIFI_LOGI("GetLinkedInfo, networkId=%{public}d, rssi=%{public}d, frequency=%{public}d", - info.networkId, info.rssi, info.frequency); + WIFI_LOGI("GetLinkedInfo, networkId=%{public}d, ssid=%{private}s, rssi=%{public}d, frequency=%{public}d", + info.networkId, info.ssid.c_str(), info.rssi, info.frequency); WIFI_LOGI("GetLinkedInfo, connState=%{public}d, supplicantState=%{public}d, detailedState=%{public}d", info.connState, info.supplicantState, info.detailedState); return WIFI_OPT_SUCCESS; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp index d07cc47..18eee3b 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp @@ -592,7 +592,6 @@ void WifiDeviceStub::OnRegisterCallBack(uint32_t code, MessageParcel &data, Mess void WifiDeviceStub::OnGetSignalLevel(uint32_t code, MessageParcel &data, MessageParcel &reply) { - WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); int rssi = data.ReadInt32(); int band = data.ReadInt32(); int level = 0; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp index 513baa4..d83728d 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp @@ -210,7 +210,8 @@ void StaAutoConnectService::ConnectElectedDevice(WifiDeviceConfig &electedDevice } } else if (currentConnectedNetwork.detailedState == DetailedState::DISCONNECTED || currentConnectedNetwork.detailedState == DetailedState::CONNECTION_TIMEOUT || - currentConnectedNetwork.detailedState == DetailedState::FAILED) { + currentConnectedNetwork.detailedState == DetailedState::FAILED || + currentConnectedNetwork.detailedState == DetailedState::PASSWORD_ERROR) { pStaStateMachine->SendMessage(WIFI_SVR_CMD_STA_CONNECT_SAVED_NETWORK, electedDevice.networkId, NETWORK_SELECTED_FOR_CONNECTION_MANAGEMENT); @@ -447,8 +448,11 @@ bool StaAutoConnectService::AllowAutoSelectDevice(const std::vector 0) { linkedInfo.frequency = signalInfo.frequency; } + linkedInfo.snr = linkedInfo.rssi - signalInfo.noise; WifiSettings::GetInstance().SaveLinkedInfo(linkedInfo); ConvertFreqToChannel(); StartTimer(static_cast(CMD_SIGNAL_POLL), STA_SIGNAL_POLL_DELAY); -- Gitee From 3ebe0de4454891a012268ef9b362f15f35b03541 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Sat, 9 Jul 2022 14:24:54 +0800 Subject: [PATCH 225/491] bugfix for auto connect 0708 Signed-off-by: yanxiaotao@huawei.com --- .../wifi_manage/wifi_sta/sta_auto_connect_service.cpp | 2 +- .../wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp index d83728d..84b6b0e 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp @@ -451,7 +451,7 @@ bool StaAutoConnectService::AllowAutoSelectDevice(const std::vector Date: Sat, 9 Jul 2022 16:26:04 +0800 Subject: [PATCH 226/491] bugfix for auto connect 0708 Signed-off-by: yanxiaotao@huawei.com --- .../wifi_manage/wifi_sta/sta_state_machine.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp index dc830ca..ad44e6d 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp @@ -1828,10 +1828,10 @@ bool StaStateMachine::ApRoamingState::ExecuteStateMsg(InternalMessage *msg) OperateResState::CONNECT_ASSOCIATED, pStaStateMachine->linkedInfo); pStaStateMachine->ConnectToNetworkProcess(msg); /* Notify result to InterfaceService. */ - pStaStateMachine->staCallback.OnStaConnChanged( - OperateResState::CONNECT_ASSOCIATED, pStaStateMachine->linkedInfo); - pStaStateMachine->staCallback.OnStaConnChanged( - OperateResState::CONNECT_OBTAINING_IP, pStaStateMachine->linkedInfo); + pStaStateMachine->staCallback.OnStaConnChanged(OperateResState::CONNECT_ASSOCIATED, + pStaStateMachine->linkedInfo); + pStaStateMachine->staCallback.OnStaConnChanged(OperateResState::CONNECT_OBTAINING_IP, + pStaStateMachine->linkedInfo); /* The current state of StaStateMachine transfers to GetIpState. */ pStaStateMachine->SwitchState(pStaStateMachine->pGetIpState); -- Gitee From 569249fb6e564289af89d5e2b8b3289010f3270d Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Sat, 9 Jul 2022 17:01:06 +0800 Subject: [PATCH 227/491] bugfix for auto connect 0708 Signed-off-by: yanxiaotao@huawei.com --- .../wifi_standard/wifi_framework/wifi_manage/BUILD.gn | 4 ++++ .../wifi_framework/wifi_manage/wifi_device_service_impl.cpp | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn index 153f2da..31ae34a 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn @@ -247,6 +247,10 @@ if (defined(ohos_lite)) { defines = [ "FEATURE_P2P_SUPPORT" ] } + if (wifi_feature_with_ap_num > 0) { + defines += [ "FEATURE_AP_SUPPORT" ] + } + deps = [ ":wifi_p2p_service_impl", "//utils/native/base:utils", diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp index 1acb233..7d810de 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp @@ -181,7 +181,7 @@ ErrCode WifiDeviceServiceImpl::EnableWifi() } #ifdef FEATURE_AP_SUPPORT - WifiOprMidState curState = WifiConfigCenter::GetInstance().GetApMidState(0); + curState = WifiConfigCenter::GetInstance().GetApMidState(0); if (curState != WifiOprMidState::CLOSED) { WIFI_LOGW("current ap state is %{public}d, please close SoftAp first!", static_cast(curState)); -- Gitee From 9a5567a8be3c66ab206a87e83ea6634aceceb288 Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Sun, 10 Jul 2022 09:49:33 +0800 Subject: [PATCH 228/491] bugfix for enable ap 0710 Signed-off-by: yanxiaotao --- .../common/external_event_handler.cpp | 125 ++++++++++++++++++ .../common/external_event_handler.h | 44 ++++++ .../wifi_hal/wifi_hal_ap_interface.c | 22 +-- 3 files changed, 181 insertions(+), 10 deletions(-) create mode 100644 wifi/services/wifi_standard/wifi_framework/wifi_manage/common/external_event_handler.cpp create mode 100644 wifi/services/wifi_standard/wifi_framework/wifi_manage/common/external_event_handler.h diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/external_event_handler.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/external_event_handler.cpp new file mode 100644 index 0000000..f040001 --- /dev/null +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/external_event_handler.cpp @@ -0,0 +1,125 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#include "common_event_handler.h" +#include "common_event_support.h" + +namespace OHOS { +namespace Wifi { +class CommonEventHandler::ScreenChangedReceiver : public EventFwk::CommonEventSubscriber { +public: + ScreenChangedReceiver() + { + } + ~ScreenChangedReceiver() + { + } + void OnReceiveEvent(const EventFwk::CommonEventData& data) override; +}; + +CommonEventHandler::ScreenChangedReceiver::ScreenChangedReceiver(std::weak_ptr nfcService, + const EventFwk::CommonEventSubscribeInfo& subscribeInfo) + : EventFwk::CommonEventSubscriber(subscribeInfo), + nfcService_(nfcService), + eventHandler_(nfcService.lock()->eventHandler_) +{ +} + +void CommonEventHandler::ScreenChangedReceiver::OnReceiveEvent(const EventFwk::CommonEventData& data) +{ + std::string action = data.GetWant().GetAction(); + if (action.empty()) { + ErrorLog("action is empty"); + return; + } + + ScreenState screenState = ScreenState::SCREEN_STATE_UNKNOWN; + if (action.compare(EventFwk::CommonEventSupport::COMMON_EVENT_SCREEN_ON) == 0) { + screenState = ScreenState::SCREEN_STATE_ON_UNLOCKED; + } else if (action.compare(EventFwk::CommonEventSupport::COMMON_EVENT_SCREEN_OFF) == 0) { + screenState = ScreenState::SCREEN_STATE_OFF_UNLOCKED; + } else { + ErrorLog("Screen changed receiver event:unknown"); + return; + } + eventHandler_.lock()->SendEvent(static_cast(NfcCommonEvent::MSG_SCREEN_CHANGED), + static_cast(screenState), static_cast(0)); +} + +CommonEventHandler::CommonEventHandler(const std::shared_ptr& runner, + std::weak_ptr servcie) + : EventHandler(runner), nfcService_(servcie) +{ +} + +CommonEventHandler::~CommonEventHandler() +{ + EventFwk::CommonEventManager::UnSubscribeCommonEvent(screenSubscriber_); +} + +void CommonEventHandler::Intialize(std::weak_ptr tagDispatcher) +{ + DebugLog("CommonEventHandler::Intialize"); + tagDispatcher_ = tagDispatcher; + + SubscribeScreenChangedEvent(); +} + +void CommonEventHandler::SubscribeScreenChangedEvent() +{ + EventFwk::MatchingSkills matchingSkills; + matchingSkills.AddEvent(EventFwk::CommonEventSupport::COMMON_EVENT_SCREEN_ON); + matchingSkills.AddEvent(EventFwk::CommonEventSupport::COMMON_EVENT_SCREEN_OFF); + EventFwk::CommonEventSubscribeInfo subscribeInfo(matchingSkills); + screenSubscriber_ = std::make_shared(nfcService_, subscribeInfo); + if (screenSubscriber_ == nullptr) { + ErrorLog("Create screen changed subscriber failed"); + return; + } + + if (!EventFwk::CommonEventManager::SubscribeCommonEvent(screenSubscriber_)) { + ErrorLog("Subscribe screen changed event fail"); + } +} + +void CommonEventHandler::ProcessEvent(const AppExecFwk::InnerEvent::Pointer& event) +{ + if (event == nullptr) { + ErrorLog("event is nullptr"); + return; + } + NfcCommonEvent eventId = static_cast(event->GetInnerEventId()); + DebugLog("NFC common event handler receive a message of %{public}d", eventId); + switch (eventId) { + case NfcCommonEvent::MSG_TAG_FOUND: + tagDispatcher_.lock()->HandleTagFound(event->GetSharedObject()); + break; + case NfcCommonEvent::MSG_TAG_DEBOUNCE: + tagDispatcher_.lock()->HandleTagDebounce(); + break; + case NfcCommonEvent::MSG_SCREEN_CHANGED: { + nfcService_.lock()->HandleScreenChanged(event->GetParam()); + break; + } + case NfcCommonEvent::MSG_PACKAGE_UPDATED: { + nfcService_.lock()->HandlePackageUpdated(); + break; + } + default: + ErrorLog("Unknown message received: id %{public}d", eventId); + break; + } +} +} // namespace Wifi +} // namespace OHOS \ No newline at end of file diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/external_event_handler.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/external_event_handler.h new file mode 100644 index 0000000..a6ab65c --- /dev/null +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/external_event_handler.h @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#ifndef COMMON_EVENT_HANDLER_H +#define COMMON_EVENT_HANDLER_H + +#include "common_event_manager.h" +#include "event_handler.h" + +namespace OHOS { +namespace Wifi { +class CommonEventHandler final : public AppExecFwk::EventHandler { +public: + explicit CommonEventHandler(); + ~CommonEventHandler(); + CommonEventHandler& operator=(const CommonEventHandler&) = delete; + CommonEventHandler(const CommonEventHandler&) = delete; + + void Intialize(); + void ProcessEvent(const AppExecFwk::InnerEvent::Pointer& event) override; + +protected: + // Screen Changed Receiver + class ScreenChangedReceiver; + +private: + void SubscribeScreenChangedEvent(); + + std::shared_ptr screenSubscriber_ {}; +}; +} // namespace Wifi +} // namespace OHOS +#endif // COMMON_EVENT_HANDLER_H diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c index 0968c59..9a4927e 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c @@ -40,7 +40,7 @@ static const char *g_serviceName = "hostapd"; WifiErrorNo StartSoftAp(int id) { - LOGD("Ready to start hostapd"); + LOGI("Ready to start hostapd: %{public}d!", id); if (StartHostapd() != WIFI_HAL_SUCCESS) { LOGE("hostapd start failed!"); return WIFI_HAL_OPEN_HOSTAPD_FAILED; @@ -52,17 +52,19 @@ WifiErrorNo StartSoftAp(int id) } WifiHostapdHalDevice *hostapdHalDevice = GetWifiHostapdDev(id); - if (hostapdHalDevice != NULL) { - int ret = hostapdHalDevice->enableAp(id); - usleep(ABLE_AP_WAIT_MS); - if (ret != 0) { - LOGE("ableAp failed! ret=%{public}d", ret); - } - } else { - LOGE("cant not get hostapd dev"); + if (hostapdHalDevice == NULL) { + LOGE("hostapdHalDevice is NULL!"); + return WIFI_HAL_HOSTAPD_NOT_INIT; + } + + int ret = hostapdHalDevice->enableAp(id); + usleep(ABLE_AP_WAIT_MS); + if (ret != 0) { + LOGE("enableAp failed! ret=%{public}d", ret); + return WIFI_HAL_FAILED; } - LOGD("AP start successfully!"); + LOGI("AP start successfully, id:%{public}d!", id); return WIFI_HAL_SUCCESS; } -- Gitee From 0e6dff48bca3d677d359c44fd876f65ce7284839 Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Sun, 10 Jul 2022 10:01:47 +0800 Subject: [PATCH 229/491] bugfix for enable ap 0710 Signed-off-by: yanxiaotao --- .../common/external_event_handler.cpp | 125 ------------------ .../common/external_event_handler.h | 44 ------ 2 files changed, 169 deletions(-) delete mode 100644 wifi/services/wifi_standard/wifi_framework/wifi_manage/common/external_event_handler.cpp delete mode 100644 wifi/services/wifi_standard/wifi_framework/wifi_manage/common/external_event_handler.h diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/external_event_handler.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/external_event_handler.cpp deleted file mode 100644 index f040001..0000000 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/external_event_handler.cpp +++ /dev/null @@ -1,125 +0,0 @@ -/* - * Copyright (C) 2022 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "common_event_handler.h" -#include "common_event_support.h" - -namespace OHOS { -namespace Wifi { -class CommonEventHandler::ScreenChangedReceiver : public EventFwk::CommonEventSubscriber { -public: - ScreenChangedReceiver() - { - } - ~ScreenChangedReceiver() - { - } - void OnReceiveEvent(const EventFwk::CommonEventData& data) override; -}; - -CommonEventHandler::ScreenChangedReceiver::ScreenChangedReceiver(std::weak_ptr nfcService, - const EventFwk::CommonEventSubscribeInfo& subscribeInfo) - : EventFwk::CommonEventSubscriber(subscribeInfo), - nfcService_(nfcService), - eventHandler_(nfcService.lock()->eventHandler_) -{ -} - -void CommonEventHandler::ScreenChangedReceiver::OnReceiveEvent(const EventFwk::CommonEventData& data) -{ - std::string action = data.GetWant().GetAction(); - if (action.empty()) { - ErrorLog("action is empty"); - return; - } - - ScreenState screenState = ScreenState::SCREEN_STATE_UNKNOWN; - if (action.compare(EventFwk::CommonEventSupport::COMMON_EVENT_SCREEN_ON) == 0) { - screenState = ScreenState::SCREEN_STATE_ON_UNLOCKED; - } else if (action.compare(EventFwk::CommonEventSupport::COMMON_EVENT_SCREEN_OFF) == 0) { - screenState = ScreenState::SCREEN_STATE_OFF_UNLOCKED; - } else { - ErrorLog("Screen changed receiver event:unknown"); - return; - } - eventHandler_.lock()->SendEvent(static_cast(NfcCommonEvent::MSG_SCREEN_CHANGED), - static_cast(screenState), static_cast(0)); -} - -CommonEventHandler::CommonEventHandler(const std::shared_ptr& runner, - std::weak_ptr servcie) - : EventHandler(runner), nfcService_(servcie) -{ -} - -CommonEventHandler::~CommonEventHandler() -{ - EventFwk::CommonEventManager::UnSubscribeCommonEvent(screenSubscriber_); -} - -void CommonEventHandler::Intialize(std::weak_ptr tagDispatcher) -{ - DebugLog("CommonEventHandler::Intialize"); - tagDispatcher_ = tagDispatcher; - - SubscribeScreenChangedEvent(); -} - -void CommonEventHandler::SubscribeScreenChangedEvent() -{ - EventFwk::MatchingSkills matchingSkills; - matchingSkills.AddEvent(EventFwk::CommonEventSupport::COMMON_EVENT_SCREEN_ON); - matchingSkills.AddEvent(EventFwk::CommonEventSupport::COMMON_EVENT_SCREEN_OFF); - EventFwk::CommonEventSubscribeInfo subscribeInfo(matchingSkills); - screenSubscriber_ = std::make_shared(nfcService_, subscribeInfo); - if (screenSubscriber_ == nullptr) { - ErrorLog("Create screen changed subscriber failed"); - return; - } - - if (!EventFwk::CommonEventManager::SubscribeCommonEvent(screenSubscriber_)) { - ErrorLog("Subscribe screen changed event fail"); - } -} - -void CommonEventHandler::ProcessEvent(const AppExecFwk::InnerEvent::Pointer& event) -{ - if (event == nullptr) { - ErrorLog("event is nullptr"); - return; - } - NfcCommonEvent eventId = static_cast(event->GetInnerEventId()); - DebugLog("NFC common event handler receive a message of %{public}d", eventId); - switch (eventId) { - case NfcCommonEvent::MSG_TAG_FOUND: - tagDispatcher_.lock()->HandleTagFound(event->GetSharedObject()); - break; - case NfcCommonEvent::MSG_TAG_DEBOUNCE: - tagDispatcher_.lock()->HandleTagDebounce(); - break; - case NfcCommonEvent::MSG_SCREEN_CHANGED: { - nfcService_.lock()->HandleScreenChanged(event->GetParam()); - break; - } - case NfcCommonEvent::MSG_PACKAGE_UPDATED: { - nfcService_.lock()->HandlePackageUpdated(); - break; - } - default: - ErrorLog("Unknown message received: id %{public}d", eventId); - break; - } -} -} // namespace Wifi -} // namespace OHOS \ No newline at end of file diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/external_event_handler.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/external_event_handler.h deleted file mode 100644 index a6ab65c..0000000 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/external_event_handler.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (C) 2022 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#ifndef COMMON_EVENT_HANDLER_H -#define COMMON_EVENT_HANDLER_H - -#include "common_event_manager.h" -#include "event_handler.h" - -namespace OHOS { -namespace Wifi { -class CommonEventHandler final : public AppExecFwk::EventHandler { -public: - explicit CommonEventHandler(); - ~CommonEventHandler(); - CommonEventHandler& operator=(const CommonEventHandler&) = delete; - CommonEventHandler(const CommonEventHandler&) = delete; - - void Intialize(); - void ProcessEvent(const AppExecFwk::InnerEvent::Pointer& event) override; - -protected: - // Screen Changed Receiver - class ScreenChangedReceiver; - -private: - void SubscribeScreenChangedEvent(); - - std::shared_ptr screenSubscriber_ {}; -}; -} // namespace Wifi -} // namespace OHOS -#endif // COMMON_EVENT_HANDLER_H -- Gitee From 4426a9232a084ad401995b618208710d3302db69 Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Sun, 10 Jul 2022 16:10:24 +0800 Subject: [PATCH 230/491] send terminate cmd before kill supplicant 0710 Signed-off-by: yanxiaotao --- .../wpa_sta_hal/wifi_supplicant_hal.c | 17 +++++++++++++++++ .../wpa_sta_hal/wifi_supplicant_hal.h | 1 + .../wifi_hal/wifi_hal_sta_interface.c | 14 ++++++++++++-- 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c index 614a461..0c837d6 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c @@ -1200,6 +1200,22 @@ static int WpaCliCmdGetSignalInfo(WifiWpaStaInterface *this, WpaSignalInfo *info return 0; } +static int WpaCliCmdWpaTerminate(WifiWpaStaInterface *this) +{ + LOGI("Enter WpaCliCmdWpaTerminate"); + if (this == NULL) { + LOGE("WpaCliCmdWpaTerminate, this is NULL."); + return -1; + } + char cmd[CMD_BUFFER_SIZE] = {0}; + char buf[REPLY_BUF_SMALL_LENGTH] = {0}; + if (snprintf_s(cmd, sizeof(cmd), sizeof(cmd) - 1, "IFNAME=%s terminate", this->ifname) < 0) { + LOGE("WpaCliCmdWpaTerminate, snprintf err"); + return -1; + } + return WpaCliCmd(cmd, buf, sizeof(buf)); +} + WifiWpaStaInterface *GetWifiStaInterface(int staNo) { char *name; @@ -1245,6 +1261,7 @@ WifiWpaStaInterface *GetWifiStaInterface(int staNo) p->wpaCliCmdScan = WpaCliCmdScan; p->wpaCliCmdScanInfo = WpaCliCmdScanInfo; p->wpaCliCmdGetSignalInfo = WpaCliCmdGetSignalInfo; + p->wpaCliCmdWpaTerminate = WpaCliCmdWpaTerminate; p->next = g_wpaStaInterface; g_wpaStaInterface = p; diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.h index ed96a4a..39a2078 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.h +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.h @@ -100,6 +100,7 @@ struct WifiWpaStaInterface { int (*wpaCliCmdScan)(WifiWpaStaInterface *p, const ScanSettings *settings); int (*wpaCliCmdScanInfo)(WifiWpaStaInterface *p, ScanInfo *pcmd, int *size); int (*wpaCliCmdGetSignalInfo)(WifiWpaStaInterface *p, WpaSignalInfo *info); + int (*wpaCliCmdWpaTerminate)(WifiWpaStaInterface *p); }; /** diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c index 5ee50f9..c75c368 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c @@ -142,7 +142,7 @@ WifiErrorNo ForceStop(void) WifiErrorNo StartSupplicant(void) { - LOGD("Start supplicant"); + LOGI("Start supplicant"); if (CopyConfigFile("wpa_supplicant.conf") != 0) { return WIFI_HAL_FAILED; } @@ -156,7 +156,17 @@ WifiErrorNo StartSupplicant(void) WifiErrorNo StopSupplicant(void) { - LOGD("Stop supplicant"); + LOGI("Stop supplicant"); + WifiWpaStaInterface *pStaIfc = GetWifiStaInterface(0); + if (pStaIfc == NULL) { + LOGE("Supplicant is NOT inited!"); + return WIFI_HAL_SUPPLICANT_NOT_INIT; + } + int res = pStaIfc->wpaCliCmdWpaTerminate(pStaIfc); + if (res < 0) { + LOGE("wpaCliCmdWpaTerminate failed! ret=%{public}d", res); + return WIFI_HAL_FAILED; + } ModuleManageRetCode ret = StopModule(g_serviceName); if (ret == MM_FAILED) { LOGE("stop wpa_supplicant failed!"); -- Gitee From a4512dd209c1dae0455aa032ae36d0b9a8cfae17 Mon Sep 17 00:00:00 2001 From: maosiping Date: Mon, 11 Jul 2022 10:42:07 +0800 Subject: [PATCH 231/491] selinux for dhcp Signed-off-by: maosiping --- wifi/services/wifi_standard/etc/init/wifi_standard.cfg | 8 -------- 1 file changed, 8 deletions(-) diff --git a/wifi/services/wifi_standard/etc/init/wifi_standard.cfg b/wifi/services/wifi_standard/etc/init/wifi_standard.cfg index b8d9fad..9a835f9 100644 --- a/wifi/services/wifi_standard/etc/init/wifi_standard.cfg +++ b/wifi/services/wifi_standard/etc/init/wifi_standard.cfg @@ -1,12 +1,4 @@ { - "jobs" : [{ - "name" : "services:wifi_manager_service", - "cmds" : [ - "mkdir /data/dhcp", - "chown wifi wifi /data/dhcp" - ] - } - ], "services" : [{ "name" : "wifi_manager_service", "path" : ["/system/bin/sa_main", "/system/profile/wifi_manager_service.xml"], -- Gitee From 9603e3015dd53db530805dc8534d3039e7def337 Mon Sep 17 00:00:00 2001 From: guojing Date: Mon, 11 Jul 2022 18:38:59 +0800 Subject: [PATCH 232/491] bugfix for enable ap 0710 Signed-off-by: guojing --- .../wifi_manage/idl_client/idl_interface/i_wifi_hotspot_iface.c | 2 +- wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_hotspot_iface.c b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_hotspot_iface.c index ab0f96a..ccb54bc 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_hotspot_iface.c +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_hotspot_iface.c @@ -25,7 +25,7 @@ #define AP_EVENT_MAX_NUM 8 -static IWifiApEventCallback g_wifiApEventCallback[AP_INSTANCE_MAX_NUM] = {0}; +static IWifiApEventCallback g_wifiApEventCallback[AP_INSTANCE_MAX_NUM]; void SetWifiApEventCallback(IWifiApEventCallback callback, int id) { g_wifiApEventCallback[id] = callback; diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c index 9a4927e..171e812 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c @@ -58,7 +58,6 @@ WifiErrorNo StartSoftAp(int id) } int ret = hostapdHalDevice->enableAp(id); - usleep(ABLE_AP_WAIT_MS); if (ret != 0) { LOGE("enableAp failed! ret=%{public}d", ret); return WIFI_HAL_FAILED; @@ -122,7 +121,6 @@ WifiErrorNo StopSoftAp(int id) WifiHostapdHalDevice *hostapdHalDevice = GetWifiHostapdDev(id); if (hostapdHalDevice != NULL) { int ret = hostapdHalDevice->disableAp(id); - usleep(DISABLE_AP_WAIT_MS); if (ret != 0) { LOGE("disableAp failed! ret=%{public}d", ret); } -- Gitee From 482fc6ec07ed2daea60abb457b3e231db06ef3f5 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 11 Jul 2022 19:24:47 +0800 Subject: [PATCH 233/491] send terminate cmd before kill supplicant 0710 Signed-off-by: yanxiaotao@huawei.com --- wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c index c75c368..00321d7 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c @@ -25,7 +25,7 @@ #define LOG_TAG "WifiHalStaInterface" #define WPA_CMD_STOP_LENG 64 -#define WPA_TRY_CONNECT_SLEEP_TIME (100 * 1000) /* 100ms */ +#define WPA_TERMINATE_SLEEP_TIME (50 * 1000) /* 50ms */ static const char *g_serviceName = "wpa_supplicant"; static const char *g_startCmd = "wpa_supplicant -iglan0 -g/data/misc/wifi/sockets/wpa"; @@ -167,6 +167,7 @@ WifiErrorNo StopSupplicant(void) LOGE("wpaCliCmdWpaTerminate failed! ret=%{public}d", res); return WIFI_HAL_FAILED; } + usleep(WPA_TERMINATE_SLEEP_TIME); ModuleManageRetCode ret = StopModule(g_serviceName); if (ret == MM_FAILED) { LOGE("stop wpa_supplicant failed!"); -- Gitee From 04a0a82c5f642e89f29550092a92df674f998be4 Mon Sep 17 00:00:00 2001 From: lujunxin Date: Wed, 13 Jul 2022 19:02:55 +0800 Subject: [PATCH 234/491] adjust dhcp for selinux enabled Signed-off-by: lujunxin --- wifi/services/wifi_standard/etc/init/wifi_standard.cfg | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/etc/init/wifi_standard.cfg b/wifi/services/wifi_standard/etc/init/wifi_standard.cfg index 9a835f9..9a1e878 100644 --- a/wifi/services/wifi_standard/etc/init/wifi_standard.cfg +++ b/wifi/services/wifi_standard/etc/init/wifi_standard.cfg @@ -1,9 +1,16 @@ { + "jobs" : [{ + "name" : "services:wifi_manager_service", + "cmds" : [ + "mkdir /data/dhcp 0770 dhcp dhcp" + ] + } + ], "services" : [{ "name" : "wifi_manager_service", "path" : ["/system/bin/sa_main", "/system/profile/wifi_manager_service.xml"], "uid" : "wifi", - "gid" : ["wifi", "shell"], + "gid" : ["wifi", "shell", "dhcp"], "caps" : ["CAP_CHOWN", "CAP_NET_ADMIN", "CAP_NET_BIND_SERVICE", "CAP_NET_RAW"], "jobs" : { "on-start" : "services:wifi_manager_service" -- Gitee From 3c1543acbdf5acf12343abd58300531718994720 Mon Sep 17 00:00:00 2001 From: lujunxin Date: Thu, 14 Jul 2022 11:08:03 +0800 Subject: [PATCH 235/491] support arp checker Signed-off-by: lujunxin --- .../common/net_helper/arp_checker.cpp | 121 ++++++++++++ .../common/net_helper/arp_checker.h | 54 ++++++ .../common/net_helper/raw_socket.cpp | 178 ++++++++++++++++++ .../common/net_helper/raw_socket.h | 39 ++++ .../wifi_framework/wifi_manage/BUILD.gn | 2 + 5 files changed, 394 insertions(+) create mode 100644 wifi/services/wifi_standard/wifi_framework/common/net_helper/arp_checker.cpp create mode 100644 wifi/services/wifi_standard/wifi_framework/common/net_helper/arp_checker.h create mode 100644 wifi/services/wifi_standard/wifi_framework/common/net_helper/raw_socket.cpp create mode 100644 wifi/services/wifi_standard/wifi_framework/common/net_helper/raw_socket.h diff --git a/wifi/services/wifi_standard/wifi_framework/common/net_helper/arp_checker.cpp b/wifi/services/wifi_standard/wifi_framework/common/net_helper/arp_checker.cpp new file mode 100644 index 0000000..b137974 --- /dev/null +++ b/wifi/services/wifi_standard/wifi_framework/common/net_helper/arp_checker.cpp @@ -0,0 +1,121 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "arp_checker.h" +#include +#include +#include + +#include "securec.h" +#include "wifi_log.h" + +#ifdef LOG_TAG +#undef LOG_TAG +#endif +#define LOG_TAG "ohwifi_arp_checker" + +namespace OHOS { +namespace Wifi { +constexpr int MAX_LENGTH = 1500; + +ArpChecker::ArpChecker(std::string& ifname, std::string& hwAddr, std::string& ipAddr) +{ + uint8_t mac[ETH_ALEN + sizeof(uint32_t)]; + if (sscanf_s(hwAddr.c_str(), "%02x:%02x:%02x:%02x:%02x:%02x", + &mac[0], &mac[1], &mac[2], &mac[3], &mac[4], &mac[5]) != ETH_ALEN) { + LOGE("invalid hwAddr:%{public}s", hwAddr.c_str()); + if (memset_s(mac, sizeof(mac), 0, sizeof(mac)) != EOK) { + LOGE("ArpChecker memset fail"); + } + } + rawSocket_.CreateSocket(ifname.c_str(), ETH_P_ARP); + inet_aton(ipAddr.c_str(), &localIpAddr_); + if (memcpy_s(localHwAddr_, ETH_ALEN, mac, ETH_ALEN) != EOK) { + LOGE("ArpChecker memcpy fail"); + } + if (memset_s(l2Broadcast_, ETH_ALEN, 0xFF, ETH_ALEN) != EOK) { + LOGE("ArpChecker memset fail"); + } +} + +ArpChecker::~ArpChecker() +{ + rawSocket_.Close(); +} + +bool ArpChecker::DoArp(int& timeoutMillis, std::string& targetIp, bool& isFillSenderIp) +{ + struct in_addr destIp; + struct ArpPacket arpPacket; + + inet_aton(targetIp.c_str(), &destIp); + arpPacket.ar_hrd = htons(ARPHRD_ETHER); + arpPacket.ar_pro = htons(ETH_P_IP); + arpPacket.ar_hln = ETH_ALEN; + arpPacket.ar_pln = IPV4_ALEN; + arpPacket.ar_op = htons(ARPOP_REQUEST); + if (memcpy_s(arpPacket.ar_sha, ETH_ALEN, localHwAddr_, ETH_ALEN) != EOK) { + LOGE("DoArp memcpy fail"); + } + if (isFillSenderIp) { + if (memcpy_s(arpPacket.ar_spa, IPV4_ALEN, &localIpAddr_, sizeof(localIpAddr_)) != EOK) { + LOGE("DoArp memcpy fail"); + } + } else { + if (memset_s(arpPacket.ar_spa, IPV4_ALEN, 0, IPV4_ALEN) != EOK) { + LOGE("DoArp memset fail"); + } + } + if (memset_s(arpPacket.ar_tha, ETH_ALEN, 0, ETH_ALEN) != EOK) { + LOGE("DoArp memset fail"); + } + if (memcpy_s(arpPacket.ar_tpa, IPV4_ALEN, &destIp, sizeof(destIp)) != EOK) { + LOGE("DoArp memcpy fail"); + } + + if (rawSocket_.Send(reinterpret_cast(&arpPacket), sizeof(arpPacket), l2Broadcast_) != 0) { + LOGE("send arp fail"); + return false; + } + + int readLen = 0; + uint64_t elapsed = 0; + int leftMillis = timeoutMillis; + uint8_t recvBuff[MAX_LENGTH]; + std::chrono::steady_clock::time_point startTime = std::chrono::steady_clock::now(); + while (leftMillis > 0) { + readLen = rawSocket_.Recv(recvBuff, sizeof(recvBuff), leftMillis); + if (readLen >= static_cast(sizeof(struct ArpPacket))) { + struct ArpPacket *respPacket = reinterpret_cast(recvBuff); + if (ntohs(respPacket->ar_hrd) == ARPHRD_ETHER && + ntohs(respPacket->ar_pro) == ETH_P_IP && + respPacket->ar_hln == ETH_ALEN && + respPacket->ar_pln == IPV4_ALEN && + ntohs(respPacket->ar_op) == ARPOP_REPLY && + memcmp(respPacket->ar_sha, localHwAddr_, ETH_ALEN) != 0 && + memcmp(respPacket->ar_spa, &destIp, IPV4_ALEN) == 0) { + LOGE("doArp() return true"); + return true; + } + } + std::chrono::steady_clock::time_point current = std::chrono::steady_clock::now(); + elapsed = std::chrono::duration_cast(current - startTime).count(); + leftMillis -= static_cast(elapsed); + } + LOGE("doArp() return false"); + return false; +} +} +} diff --git a/wifi/services/wifi_standard/wifi_framework/common/net_helper/arp_checker.h b/wifi/services/wifi_standard/wifi_framework/common/net_helper/arp_checker.h new file mode 100644 index 0000000..c6f4176 --- /dev/null +++ b/wifi/services/wifi_standard/wifi_framework/common/net_helper/arp_checker.h @@ -0,0 +1,54 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OHOS_WIFI_ARP_CHECKER_H +#define OHOS_WIFI_ARP_CHECKER_H +#include +#include +#include + +#include "raw_socket.h" + +namespace OHOS { +namespace Wifi { +constexpr int IPV4_ALEN = 4; + +/* defined in RFC 826 */ +struct ArpPacket { + uint16_t ar_hrd; // hardware type + uint16_t ar_pro; // protocol type + uint8_t ar_hln; // length of hardware address + uint8_t ar_pln; // length of protocol address + uint16_t ar_op; // opcode + uint8_t ar_sha[ETH_ALEN]; // sender hardware address + uint8_t ar_spa[IPV4_ALEN]; // sender protocol address + uint8_t ar_tha[ETH_ALEN]; // target hardware address + uint8_t ar_tpa[IPV4_ALEN]; // target protocol address +} __attribute__ ((__packed__)); + +class ArpChecker { +public: + ArpChecker(std::string& ifname, std::string& hwAddr, std::string& ipAddr); + ~ArpChecker(); + bool DoArp(int& timeoutMillis, std::string& targetIp, bool& isFillSenderIp); +private: + RawSocket rawSocket_; + struct in_addr localIpAddr_; + uint8_t localHwAddr_[ETH_ALEN]; + uint8_t l2Broadcast_[ETH_ALEN]; +}; +} +} +#endif diff --git a/wifi/services/wifi_standard/wifi_framework/common/net_helper/raw_socket.cpp b/wifi/services/wifi_standard/wifi_framework/common/net_helper/raw_socket.cpp new file mode 100644 index 0000000..91a23fd --- /dev/null +++ b/wifi/services/wifi_standard/wifi_framework/common/net_helper/raw_socket.cpp @@ -0,0 +1,178 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "raw_socket.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "securec.h" +#include "wifi_log.h" + +#ifdef LOG_TAG +#undef LOG_TAG +#endif +#define LOG_TAG "ohwifi_raw_socket" + +namespace OHOS { +namespace Wifi { +constexpr int OPT_SUCC = 0; +constexpr int OPT_FAIL = -1; + +RawSocket::RawSocket() : socketFd_(-1), ifaceIndex_(0), protocol_(0) +{ +} + +RawSocket::~RawSocket() +{ + Close(); +} + +bool RawSocket::SetNonBlock(int fd) +{ + int ret = fcntl(fd, F_GETFL); + if (ret < 0) { + return false; + } + + uint32_t flags = (static_cast(ret) | O_NONBLOCK); + return fcntl(fd, F_SETFL, flags); +} + +int RawSocket::CreateSocket(const char *iface, uint16_t protocol) +{ + if (iface == nullptr) { + LOGW("iface is null"); + return OPT_FAIL; + } + + unsigned int ifaceIndex = if_nametoindex(iface); + if (ifaceIndex == 0) { + LOGE("get iface index fail: %{public}s", iface); + return OPT_FAIL; + } + + int socketFd = socket(PF_PACKET, SOCK_DGRAM, htons(protocol)); + if (socketFd < 0) { + LOGE("create socket fail"); + return OPT_FAIL; + } + + if (SetNonBlock(socketFd)) { + LOGE("set non block fail"); + (void)close(socketFd); + return OPT_FAIL; + } + + struct sockaddr_ll rawAddr; + rawAddr.sll_ifindex = ifaceIndex; + rawAddr.sll_protocol = htons(protocol); + rawAddr.sll_family = AF_PACKET; + + int ret = bind(socketFd, reinterpret_cast(&rawAddr), sizeof(rawAddr)); + if (ret != 0) { + LOGE("bind fail"); + (void)close(socketFd); + return OPT_FAIL; + } + socketFd_ = socketFd; + ifaceIndex_ = ifaceIndex; + protocol_ = protocol; + return OPT_SUCC; +} + +int RawSocket::Send(uint8_t *buff, int count, uint8_t *destHwaddr) +{ + if (buff == nullptr || destHwaddr == nullptr) { + LOGE("buff or dest hwaddr is null"); + return OPT_FAIL; + } + + if (socketFd_ < 0 || ifaceIndex_ == 0) { + LOGE("invalid socket fd"); + return OPT_FAIL; + } + + struct sockaddr_ll rawAddr; + (void)memset_s(&rawAddr, sizeof(rawAddr), 0, sizeof(rawAddr)); + rawAddr.sll_ifindex = ifaceIndex_; + rawAddr.sll_protocol = htons(protocol_); + rawAddr.sll_family = AF_PACKET; + if (memcpy_s(rawAddr.sll_addr, sizeof(rawAddr.sll_addr), destHwaddr, ETH_ALEN) != EOK) { + LOGE("Send: memcpy fail"); + return OPT_FAIL; + } + + int ret; + do { + ret = sendto(socketFd_, buff, count, 0, reinterpret_cast(&rawAddr), sizeof(rawAddr)); + if (ret == -1) { + LOGE("Send: sendto fail"); + if (errno != EINTR) { + break; + } + } + } while (ret == -1); + return ret > 0 ? OPT_SUCC : OPT_FAIL; +} + +int RawSocket::Recv(uint8_t *buff, int count, int timeoutMillis) +{ + if (socketFd_ < 0) { + LOGE("invalid socket fd"); + return 0; + } + + pollfd fds[1]; + fds[0].fd = socketFd_; + fds[0].events = POLLIN; + if (poll(fds, 1, timeoutMillis) <= 0) { + return 0; + } + + int nBytes; + do { + nBytes = read(socketFd_, buff, count); + if (nBytes == -1) { + if (errno != EINTR) { + break; + } + } + } while (nBytes == -1); + + return nBytes < 0 ? 0 : nBytes; +} + +int RawSocket::Close(void) +{ + int ret = OPT_FAIL; + + if (socketFd_ >= 0) { + ret = close(socketFd_); + } + socketFd_ = -1; + ifaceIndex_ = 0; + protocol_ = 0; + return OPT_FAIL; +} +} +} diff --git a/wifi/services/wifi_standard/wifi_framework/common/net_helper/raw_socket.h b/wifi/services/wifi_standard/wifi_framework/common/net_helper/raw_socket.h new file mode 100644 index 0000000..edb5555 --- /dev/null +++ b/wifi/services/wifi_standard/wifi_framework/common/net_helper/raw_socket.h @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OHOS_WIFI_RAW_SOCKET_H +#define OHOS_WIFI_RAW_SOCKET_H +#include + +namespace OHOS { +namespace Wifi { +class RawSocket { +public: + RawSocket(); + ~RawSocket(); + int CreateSocket(const char *iface, uint16_t protocol); + int Send(uint8_t *buff, int count, uint8_t *destHwaddr); + int Recv(uint8_t *buff, int count, int timeoutMillis); + int Close(void); +private: + bool SetNonBlock(int fd); + int socketFd_; + uint16_t ifaceIndex_; + uint16_t protocol_; +}; +} +} + +#endif diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn index d8970c3..5cb9732 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn @@ -324,12 +324,14 @@ if (defined(ohos_lite)) { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log/log_helper.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/arp_checker.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/base_address.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/network_interface.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/raw_socket.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils/wifi_common_event_helper.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_helper.cpp", -- Gitee From 04c513c6880ddb468f6c9df3b206687fd0b7350c Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Sat, 16 Jul 2022 18:19:53 +0800 Subject: [PATCH 236/491] bugfix for roaming 0716 Signed-off-by: yanxiaotao@huawei.com --- .../idl_client/idl_interface/i_wifi.c | 19 ++++++ .../idl_interface/i_wifi_event_callback.h | 1 + .../idl_interface/i_wifi_sta_iface.c | 1 + .../idl_client/idl_interface/i_wifi_struct.h | 1 + .../idl_client/wifi_event_callback.h | 1 + .../idl_client/wifi_idl_client.cpp | 3 +- .../wifi_manage/idl_client/wifi_idl_define.h | 1 + .../idl_client/wifi_idl_inner_interface.cpp | 11 ++++ .../idl_client/wifi_idl_inner_interface.h | 1 + .../wifi_manage/wifi_sta/sta_define.h | 1 + .../wifi_manage/wifi_sta/sta_monitor.cpp | 25 +++++++ .../wifi_sta/sta_state_machine.cpp | 66 +++++++++++++++++-- .../wifi_manage/wifi_sta/sta_state_machine.h | 5 +- .../wifi_hal/wifi_hal_callback.c | 25 +++++++ .../wifi_hal/wifi_hal_callback.h | 10 ++- .../wifi_hal/wifi_hal_crpc_server.c | 14 ++++ .../wifi_hal/wifi_hal_crpc_server.h | 6 ++ .../wifi_standard/wifi_hal/wifi_hal_define.h | 2 + .../wpa_supplicant_hal/wifi_wpa_hal.c | 16 +++++ .../wpa_sta_hal/wifi_supplicant_hal.c | 15 +++++ .../wpa_sta_hal/wifi_supplicant_hal.h | 1 + .../wifi_hal/wifi_hal_sta_interface.c | 20 +++++- 22 files changed, 232 insertions(+), 13 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi.c b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi.c index 4d2601f..d20fc6a 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi.c +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi.c @@ -239,6 +239,22 @@ static void IdlCbkConnectChanged(Context *context) return; } +static void IdlCbkBssidChanged(Context *context) +{ + int reason[WIFI_REASON_LENGTH] = {0}; + char bssid[WIFI_BSSID_LENGTH] = {0}; + if (ReadStr(context, reason, sizeof(reason)) != 0 || + ReadStr(context, bssid, sizeof(bssid)) != 0) { + LOGE("Read event info error!"); + return; + } + IWifiEventCallback *callback = GetWifiEventCallback(); + if (callback != NULL && callback->onBssidChanged != NULL) { + callback->onBssidChanged(reason, bssid); + } + return; +} + static void IdlCbkApStateChange(Context *context, int event) { int id = 0; @@ -305,6 +321,9 @@ static int IdlDealStaApEvent(Context *context, int event) case WIFI_IDL_CBK_CMD_CONNECT_CHANGED: IdlCbkConnectChanged(context); break; + case WIFI_IDL_CBK_CMD_BSSID_CHANGED: + IdlCbkBssidChanged(context); + break; case WIFI_IDL_CBK_CMD_AP_ENABLE: case WIFI_IDL_CBK_CMD_AP_DISABLE: IdlCbkApStateChange(context, event); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_event_callback.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_event_callback.h index 8eb496c..4166b1b 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_event_callback.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_event_callback.h @@ -27,6 +27,7 @@ typedef struct IWifiEventCallback { void (*onStopped)(void); void (*onFailure)(WifiErrorNo errCode); void (*onConnectChanged)(int status, int networkId, const char *bssid); + void (*onBssidChanged)(const char *reason, const char *bssid); void (*onWpaStateChanged)(int status); void (*onSsidWrongkey)(int status); void (*onWpsOverlap)(int status); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.c b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.c index f298a29..49df2eb 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.c +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.c @@ -579,6 +579,7 @@ static int CheckRegisterEvent(int *events, int size) WIFI_IDL_CBK_CMD_STARTED, WIFI_IDL_CBK_CMD_STOPED, WIFI_IDL_CBK_CMD_CONNECT_CHANGED, + WIFI_IDL_CBK_CMD_BSSID_CHANGED, WIFI_IDL_CBK_CMD_WPA_STATE_CHANGEM, WIFI_IDL_CBK_CMD_SSID_WRONG_KEY, WIFI_IDL_CBK_CMD_WPS_OVERLAP, diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_struct.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_struct.h index bb8474f..4416f47 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_struct.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_struct.h @@ -22,6 +22,7 @@ extern "C" { #endif #define WIFI_SSID_LENGTH 132 #define WIFI_BSSID_LENGTH 18 +#define WIFI_REASON_LENGTH 32 #define WIFI_NETWORK_FLAGS_LENGTH 64 #define WIFI_SCAN_INFO_CAPABILITIES_LENGTH 256 #define WIFI_NETWORK_CONFIG_NAME_LENGTH 64 diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_event_callback.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_event_callback.h index 213fe48..935dadf 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_event_callback.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_event_callback.h @@ -22,6 +22,7 @@ namespace OHOS { namespace Wifi { struct WifiEventCallback { std::function onConnectChanged; + std::function onBssidChanged; std::function onWpaStateChanged; std::function onWpaSsidWrongKey; std::function onWpsOverlap; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp index c37babf..3adb561 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp @@ -470,7 +470,7 @@ int WifiIdlClient::PushDeviceConfigAuthAlgorithm( } } if (alg & 0x2) { - if (strcat_s(pConfig->cfgValue, sizeof(pConfig->cfgValue), "SHARED ") != EOK) { + if (strcat_s(pConfig->cfgValue, sizeof(pConfig->cfgValue), "OPEN SHARED ") != EOK) { return 0; } } @@ -557,6 +557,7 @@ WifiErrorNo WifiIdlClient::ReqRegisterStaEventCallback(const WifiEventCallback & } if (callback.onConnectChanged != nullptr) { cEventCallback.onConnectChanged = OnConnectChanged; + cEventCallback.onBssidChanged = OnBssidChanged; cEventCallback.onWpaStateChanged = OnWpaStateChanged; cEventCallback.onSsidWrongkey = OnWpaSsidWrongKey; cEventCallback.onWpsOverlap = OnWpsOverlap; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_define.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_define.h index 2726163..bba8361 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_define.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_define.h @@ -30,6 +30,7 @@ typedef enum WifiIdlEvent { /* SupplicantEventCallback */ WIFI_IDL_CBK_CMD_SCAN_INFO_NOTIFY, /* SCAN Scan Result Notification */ WIFI_IDL_CBK_CMD_CONNECT_CHANGED, /* Connection status change notification */ + WIFI_IDL_CBK_CMD_BSSID_CHANGED, /* bssid change notification */ WIFI_IDL_CBK_CMD_AP_ENABLE, /* AP enabling notification */ WIFI_IDL_CBK_CMD_AP_DISABLE, /* AP closure notification */ WIFI_IDL_CBK_CMD_WPA_STATE_CHANGEM, /* WPA status change notification */ diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.cpp index c61c33d..d728349 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.cpp @@ -70,6 +70,17 @@ void OnConnectChanged(int status, int networkId, const char *mac) } } +void OnBssidChanged(const char *reason, const char *bssid) +{ + if (reason == nullptr || bssid == nullptr) { + return; + } + const OHOS::Wifi::WifiEventCallback &cbk = OHOS::Wifi::WifiStaHalInterface::GetInstance().GetCallbackInst(); + if (cbk.onBssidChanged) { + cbk.onBssidChanged(reason, bssid); + } +} + void OnWpaStateChanged(int status) { const OHOS::Wifi::WifiEventCallback &cbk = OHOS::Wifi::WifiStaHalInterface::GetInstance().GetCallbackInst(); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.h index b066123..e319e29 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.h @@ -48,6 +48,7 @@ RpcClient *GetChipRpcClient(void); RpcClient *GetStaRpcClient(void); void OnConnectChanged(int status, int networkId, const char *mac); +void OnBssidChanged(const char *reason, const char *bssid); void OnWpaStateChanged(int status); void OnWpaSsidWrongKey(int status); void OnWpsOverlap(int status); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_define.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_define.h index 73cf0f6..2a17042 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_define.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_define.h @@ -60,6 +60,7 @@ namespace Wifi { #define WIFI_SVR_CMD_STA_WPA_PASSWD_WRONG_EVENT 0x3017 #define WIFI_SVR_CMD_STA_WPA_FULL_CONNECT_EVENT 0x3018 #define WIFI_SVR_CMD_STA_WPA_ASSOC_REJECT_EVENT 0x3019 +#define WIFI_SVR_CMD_STA_BSSID_CHANGED_EVENT 0x301A #define WPA_BLOCK_LIST_CLEAR_EVENT 0x4001 diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp index 70f2204..0af029e 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp @@ -37,6 +37,7 @@ ErrCode StaMonitor::InitStaMonitor() using namespace std::placeholders; WifiEventCallback callBack = { std::bind(&StaMonitor::OnConnectChangedCallBack, this, _1, _2, _3), + std::bind(&StaMonitor::OnBssidChangedCallBack, this, _1, _2), std::bind(&StaMonitor::OnWpaStateChangedCallBack, this, _1), std::bind(&StaMonitor::OnWpaSsidWrongKeyCallBack, this, _1), std::bind(&StaMonitor::OnWpsPbcOverlapCallBack, this, _1), @@ -105,6 +106,30 @@ void StaMonitor::OnConnectChangedCallBack(int status, int networkId, const std:: } } +void StaMonitor::OnBssidChangedCallBack(const std::string &reason, const std::string &bssid) +{ + WIFI_LOGI("OnBssidChangedCallBack() reason:%{public}s,bssid=%{private}s", + reason.c_str(), + bssid.c_str()); + if (pStaStateMachine == nullptr) { + WIFI_LOGE("The statemachine pointer is null."); + return; + } + + WifiLinkedInfo linkedInfo = {0}; + pStaStateMachine->GetLinkedInfo(linkedInfo); + if (linkedInfo.connState != ConnState::CONNECTED) { + WIFI_LOGW("Sta ignored the event for NOT in connected status!, connState: %d", + linkedInfo.connState); + return; + } + if (linkedInfo.bssid == bssid) { + WIFI_LOGW("Sta ignored the event for bssid is the same."); + return; + } + pStaStateMachine->OnNetworkConnectionEvent(linkedInfo->networkId, bssid); +} + void StaMonitor::OnWpaStateChangedCallBack(int status) { WIFI_LOGI("OnWpaStateChangedCallBack() status:%{public}d\n", status); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp index 28d4e1d..54fa227 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp @@ -165,7 +165,7 @@ ErrCode StaStateMachine::InitStaStates() tmpErrNumber += JudgmentEmpty(pWpsState); pGetIpState = new (std::nothrow)GetIpState(this); tmpErrNumber += JudgmentEmpty(pGetIpState); - pLinkedState = new (std::nothrow)LinkedState(); + pLinkedState = new (std::nothrow)LinkedState(this); tmpErrNumber += JudgmentEmpty(pLinkedState); pApRoamingState = new (std::nothrow)ApRoamingState(this); tmpErrNumber += JudgmentEmpty(pApRoamingState); @@ -339,6 +339,12 @@ ErrCode StaStateMachine::ConvertDeviceCfg(const WifiDeviceConfig &config) const idlConfig.privateKey = config.wifiEapConfig.privateKey; idlConfig.phase2Method = static_cast(config.wifiEapConfig.phase2Method); idlConfig.wepKeyIdx = config.wepTxKeyIndex; + idlConfig.authAlgorithms = config.keyMgmt; + if (strcmp(config.keyMgmt, "WEP") == 0) { + /* for wep */ + idlConfig.authAlgorithms = 0x02; + } + for (int i = 0; i < MAX_WEPKEYS_SIZE; i++) { idlConfig.wepKeys[i] = config.wepKeys[i]; } @@ -1333,6 +1339,19 @@ void StaStateMachine::OnNetworkConnectionEvent(int networkId, std::string bssid) SendMessage(msg); } +void StaStateMachine::OnBssidChangedEvent(std::string reason, std::string bssid) +{ + InternalMessage *msg = CreateMessage(); + if (msg == nullptr) { + return; + } + + msg->SetMessageName(WIFI_SVR_CMD_STA_BSSID_CHANGED_EVENT); + msg->AddStringMessageBody(reason); + msg->AddStringMessageBody(bssid); + SendMessage(msg); +} + /* --------------------------- state machine Separating State ------------------------------ */ StaStateMachine::SeparatingState::SeparatingState() : State("SeparatingState") {} @@ -1617,13 +1636,14 @@ StaStateMachine::GetIpState::~GetIpState() void StaStateMachine::GetIpState::GoInState() { + WIFI_LOGI("GetIpState GoInState function."); #ifdef WIFI_DHCP_DISABLED SaveLinkstate(ConnState::CONNECTED, DetailedState::WORKING); staCallback.OnStaConnChanged(OperateResState::CONNECT_NETWORK_ENABLED, linkedInfo); SwitchState(pLinkedState); return; #endif - WIFI_LOGI("GetIpState GoInState function."); + pStaStateMachine->getIpSucNum = 0; WifiDeviceConfig config; AssignIpMethod assignMethod = AssignIpMethod::DHCP; int ret = WifiSettings::GetInstance().GetDeviceConfig(pStaStateMachine->linkedInfo.networkId, config); @@ -1768,8 +1788,8 @@ void StaStateMachine::HandleNetCheckResult(StaNetState netState, const std::stri } /* --------------------------- state machine Connected State ------------------------------ */ -StaStateMachine::LinkedState::LinkedState() - : State("LinkedState") +StaStateMachine::LinkedState::LinkedState(StaStateMachine *staStateMachine) + : State("LinkedState"), pStaStateMachine(staStateMachine) {} StaStateMachine::LinkedState::~LinkedState() @@ -1793,8 +1813,42 @@ bool StaStateMachine::LinkedState::ExecuteStateMsg(InternalMessage *msg) return false; } - WIFI_LOGI("LinkedState-msgCode=%{public}d not handled.\n", msg->GetMessageName()); - return NOT_EXECUTED; + WIFI_LOGI("LinkedState, reveived msgCode=%{public}d msg.\n", msg->GetMessageName()); + bool ret = NOT_EXECUTED; + switch (msg->GetMessageName()) { + case WIFI_SVR_CMD_STA_BSSID_CHANGED_EVENT: { + ret = EXECUTED; + WifiIdlRoamConfig config = {0}; + std::string reason = msg->GetStringFromMessage(); + pStaStateMachine->linkedInfo.bssid = msg->GetStringFromMessage(); + WIFI_LOGI("reveived bssid changed msg, reason:%{public}s,bssid:%{private}s.\n", + reason.c_str(), pStaStateMachine->linkedInfo.bssid.c_str()); + WifiSettings::GetInstance().SaveLinkedInfo(pStaStateMachine->linkedInfo); + config.trustlistBssids.push_back(pStaStateMachine->linkedInfo.bssid); + if (WifiStaHalInterface::GetInstance().SetRoamConfig(config) != WIFI_IDL_OPT_OK) { + WIFI_LOGI("SetRoamConfig return fail."); + return false; + } + pStaStateMachine->isRoam = true; + pStaStateMachine->StopTimer(static_cast(CMD_NETWORK_CONNECT_TIMEOUT)); + pStaStateMachine->staCallback.OnStaConnChanged( + OperateResState::CONNECT_ASSOCIATED, pStaStateMachine->linkedInfo); + pStaStateMachine->ConnectToNetworkProcess(msg); + /* Notify result to InterfaceService. */ + pStaStateMachine->staCallback.OnStaConnChanged(OperateResState::CONNECT_ASSOCIATED, + pStaStateMachine->linkedInfo); + pStaStateMachine->staCallback.OnStaConnChanged(OperateResState::CONNECT_OBTAINING_IP, + pStaStateMachine->linkedInfo); + /* The current state of StaStateMachine transfers to GetIpState. */ + pStaStateMachine->SwitchState(pStaStateMachine->pGetIpState); + break; + } + default: + WIFI_LOGE("Invalid mesage!"); + break; + } + + return EXECUTED; } /* --------------------------- state machine Roaming State ------------------------------ */ diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h index 7c93d81..3d15f70 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h @@ -253,11 +253,14 @@ public: */ class LinkedState : public State { public: - explicit LinkedState(); + explicit LinkedState(StaStateMachine *staStateMachine); ~LinkedState() override; void GoInState() override; void GoOutState() override; bool ExecuteStateMsg(InternalMessage *msg) override; + + private: + StaStateMachine *pStaStateMachine; }; /** * @Description Definition of member function of ApRoamingState class in StaStateMachine. diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_callback.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_callback.c index c18fb39..c07b47f 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_callback.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_callback.c @@ -79,6 +79,31 @@ void WifiHalCbNotifyConnectChanged(int status, int networkId, const char *pos) return; } +void WifiHalCbNotifyBssidChanged(const char *reasonPos, const char *bssidPos) +{ + char reason[WIFI_REASON_LENGTH] = {0}; + if (reasonPos == NULL || bssidPos == NULL) { + LOGE("reasonPos or bssidPos is NULL"); + return; + } + char *reasonEnd = strchar(reasonPos, ' '); + if (reasonEnd != NULL) { + int reasonLen = reasonEnd - reasonPos; + reasonLen = reasonLen > WIFI_REASON_LENGTH ? WIFI_REASON_LENGTH : reasonLen; + (void)memcpy_s(reason, sizeof(reason), reasonPos, reasonLen); + } + + LOGI("bssid changed event, reason: %{public}s, bssid = %{private}s", reason, bssidPos); + WifiHalEventCallbackMsg *pCbkMsg = (WifiHalEventCallbackMsg *)calloc(1, sizeof(WifiHalEventCallbackMsg)); + if (pCbkMsg == NULL) { + LOGE("create callback message failed!"); + return; + } + (void)memcpy_s(pCbkMsg->msg.bssidChangedMsg.reason, WIFI_REASON_LENGTH, reason, WIFI_REASON_LENGTH); + (void)memcpy_s(pCbkMsg->msg.bssidChangedMsg.bssid, WIFI_MAC_LENGTH + 1, bssidPos, WIFI_MAC_LENGTH + 1); + EmitEventCallbackMsg(pCbkMsg, WIFI_BSSID_CHANGED_NOTIFY_EVENT); +} + void WifiHalCbNotifyWpaStateChange(int status) { LOGI("wpa state changed, state: %{public}d, and begin push notify message", status); diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_callback.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_callback.h index 9cff116..0dc4331 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_callback.h +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_callback.h @@ -27,7 +27,6 @@ extern "C" { * @param status */ void WifiHalCbNotifyScanEnd(int status); - /** * @Description Wi-Fi Hal callback notification of the connection change. * @@ -37,11 +36,18 @@ void WifiHalCbNotifyScanEnd(int status); */ void WifiHalCbNotifyConnectChanged(int status, int networkId, const char *pos); /** - * @Description The Wi-Fi Hal module notifies the WPA module of the status change. + * @Description Wi-Fi Hal module notifies the WPA module of the status change. * * @param status */ void WifiHalCbNotifyWpaStateChange(int status); +/** + * @Description Wi-Fi Hal module notifies the bssid change. + * + * @param reasonPos: reason in the return string + * @param bssidPos: bssid in the return string + */ +void WifiHalCbNotifyBssidChanged(const char *reasonPos, const char *bssidPos); /** * @Description Wi-Fi Hal callback notification error key. * diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.c index 3120430..bb92a46 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.c @@ -483,6 +483,16 @@ static void DealConnectionChangedCbk(int event, Context *context) return; } +static void DealBssidChangedCbk(int event, Context *context) +{ + WifiHalEventCallbackMsg *cbmsg = FrontCallbackMsg(event); + if (cbmsg != NULL) { + WriteStr(context, cbmsg->msg.bssidChangedMsg.reason); + WriteStr(context, cbmsg->msg.bssidChangedMsg.bssid); + } + return; +} + static void DealConnectWpsResultCbk(int event, Context *context) { WifiHalEventCallbackMsg *cbmsg = FrontCallbackMsg(event); @@ -516,7 +526,11 @@ static void DealStaApCallback(int event, Context *context) case WIFI_CONNECT_CHANGED_NOTIFY_EVENT: DealConnectionChangedCbk(event, context); break; + case WIFI_BSSID_CHANGED_NOTIFY_EVENT: + DealBssidChangedCbk(event, context); + break; default: + LOGE("DealStaApCallback, Invalid event: %{public}d", event); break; } return; diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.h index 606b934..b88814f 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.h +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.h @@ -81,6 +81,11 @@ typedef struct WifiHalConnectMsg { char bssid[WIFI_MAC_LENGTH + 1]; } WifiHalConnectMsg; +typedef struct WifiHalConnectMsg { + char reason[WIFI_REASON_LENGTH]; + char bssid[WIFI_MAC_LENGTH + 1]; +} WifiHalBssidChangedMsg; + typedef union WifiHalCallbackMsg { int scanStatus; WifiHalConnectMsg connMsg; @@ -90,6 +95,7 @@ typedef union WifiHalCallbackMsg { P2pInvitationInfo invitaInfo; P2pServDiscRespInfo serverInfo; P2pServDiscReqInfo serDiscReqInfo; + WifiHalBssidChangedMsg bssidChangedMsg; } WifiHalCallbackMsg; typedef struct WifiHalEventCallbackMsg { diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_define.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_define.h index d2c5c44..177b086 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_define.h +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_define.h @@ -81,6 +81,7 @@ typedef enum WifiHalEvent { WIFI_STA_LEAVE_EVENT, /* STA disconnection notification in AP mode. */ WIFI_SCAN_INFO_NOTIFY_EVENT, /* Scan info notification. */ WIFI_CONNECT_CHANGED_NOTIFY_EVENT, /* Connection status change notification. */ + WIFI_BSSID_CHANGED_NOTIFY_EVENT, /* Bssid change notification. */ WIFI_AP_ENABLE_EVENT, /* AP enabling notification. */ WIFI_AP_DISABLE_EVENT, /* AP closure notification. */ WIFI_WPA_STATE_EVENT, /* WPA status change. */ @@ -123,6 +124,7 @@ typedef enum WifiHalEvent { #define WIFI_NETWORK_CONFIG_VALUE_LENGTH 256 #define WIFI_P2P_GROUP_CONFIG_VALUE_LENGTH 256 #define WIFI_MAC_LENGTH 17 +#define WIFI_REASON_LENGTH 32 #define WIFI_AP_PASSWORD_LENGTH 64 #define WIFI_PIN_CODE_LENGTH 8 diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c index 773caaf..dcb0091 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c @@ -606,6 +606,22 @@ static void WpaCallBackFunc(const char *p) } pBssid += strlen("bssid="); WifiHalCbNotifyConnectChanged(WPA_CB_DISCONNECTED, -1, pBssid); + /* bssid changed event */ + } else if (strncmp(p, WPA_EVENT_BSSID_CHANGED, strlen(WPA_EVENT_BSSID_CHANGED)) == 0) { + LOGI("Reveive WPA_EVENT_BSSID_CHANGED notify event"); + char *pBssid = strstr(p, "BSSID="); + if (pBssid == NULL) { + LOGE("NO bssid find!"); + return; + } + pBssid += strlen("BSSID="); + char *pReason = strstr(p, "REASON="); + if (pReason == NULL) { + LOGE("NO reason find!"); + return; + } + pReason += strlen("REASON="); + WifiHalCbNotifyBssidChanged(pReason, pBssid); } else { WpaCallBackFuncTwo(p); } diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c index 0c837d6..07ec383 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c @@ -481,6 +481,20 @@ static int WpaCliCmdPowerSave(WifiWpaStaInterface *this, int enable) return WpaCliCmd(cmd, buf, sizeof(buf)); } +static int WpaCliCmdSetRoamConfig(WifiWpaStaInterface *this, const char *bssid) +{ + if (this == NULL || bssid == NULL) { + return -1; + } + char buf[REPLY_BUF_SMALL_LENGTH] = {0}; + char cmd[CMD_BUFFER_SIZE] = {0}; + if (snprintf_s(cmd, sizeof(cmd), sizeof(cmd) - 1, "IFNAME=%s SET bssid %s", this->ifname, bssid) < 0) { + LOGE("snprintf err"); + return -1; + } + return WpaCliCmd(cmd, buf, sizeof(buf)); +} + static int WpaCliCmdSetCountryCode(WifiWpaStaInterface *this, const char *countryCode) { if (this == NULL || countryCode == NULL) { @@ -1253,6 +1267,7 @@ WifiWpaStaInterface *GetWifiStaInterface(int staNo) p->wpaCliCmdWpsPin = WpaCliCmdWpsPin; p->wpaCliCmdWpsCancel = WpaCliCmdWpsCancel; p->wpaCliCmdPowerSave = WpaCliCmdPowerSave; + p->wpaCliCmdSetRoamConfig = WpaCliCmdSetRoamConfig; p->wpaCliCmdSetCountryCode = WpaCliCmdSetCountryCode; p->wpaCliCmdGetCountryCode = WpaCliCmdGetCountryCode; p->wpaCliCmdSetAutoConnect = WpaCliCmdSetAutoConnect; diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.h index 39a2078..ef55003 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.h +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.h @@ -92,6 +92,7 @@ struct WifiWpaStaInterface { int (*wpaCliCmdWpsPin)(WifiWpaStaInterface *p, const struct WpaWpsPinArgv *wpspin, int *pincode); int (*wpaCliCmdWpsCancel)(WifiWpaStaInterface *p); int (*wpaCliCmdPowerSave)(WifiWpaStaInterface *p, int enable); + int (*wpaCliCmdSetRoamConfig)(WifiWpaStaInterface *p, const char *bssid); int (*wpaCliCmdSetCountryCode)(WifiWpaStaInterface *p, const char *countryCode); int (*wpaCliCmdGetCountryCode)(WifiWpaStaInterface *p, char *countryCode, int codeSize); int (*wpaCliCmdSetAutoConnect)(WifiWpaStaInterface *p, int enable); diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c index 00321d7..39ff4ce 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c @@ -686,7 +686,7 @@ WifiErrorNo StopWps(void) WifiErrorNo GetRoamingCapabilities(WifiRoamCapability *capability) { - LOGD("GetRoamingCapabilities"); + LOGI("GetRoamingCapabilities"); if (capability == NULL) { return WIFI_HAL_FAILED; } @@ -695,8 +695,22 @@ WifiErrorNo GetRoamingCapabilities(WifiRoamCapability *capability) WifiErrorNo SetRoamConfig(char **blocklist, int blocksize, char **trustlist, int trustsize) { - LOGD("SetRoamConfig block size %{public}d, trust size %{public}d", blocksize, trustsize); - if (blocklist == NULL || trustlist == NULL) { + LOGI("SetRoamConfig block size %{public}d, trust size %{public}d", blocksize, trustsize);. + if (trustlist != NULL && trustsize > 0) { + WifiWpaStaInterface *pStaIfc = GetWifiStaInterface(0); + if (pStaIfc == NULL) { + return WIFI_HAL_SUPPLICANT_NOT_INIT; + } + for (int i = 0; i < trustsize; i++) { + int ret = pStaIfc->wpaCliCmdSetRoamConfig(pStaIfc, trustlist[i]); + if (ret < 0) { + LOGE("wpaCliCmdSetRoamConfig failed! ret=%{public}d", ret); + return WIFI_HAL_FAILED; + } + } + } + + if (blocklist == NULL || blocksize <= 0) { return WIFI_HAL_SUCCESS; } return WIFI_HAL_SUCCESS; -- Gitee From 66fe85693f66740d47f947b6ca200c769d2861f7 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Sat, 16 Jul 2022 18:23:59 +0800 Subject: [PATCH 237/491] bugfix for roaming 0716 Signed-off-by: yanxiaotao@huawei.com --- .../wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp index 54fa227..bbef28a 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp @@ -1831,9 +1831,6 @@ bool StaStateMachine::LinkedState::ExecuteStateMsg(InternalMessage *msg) } pStaStateMachine->isRoam = true; pStaStateMachine->StopTimer(static_cast(CMD_NETWORK_CONNECT_TIMEOUT)); - pStaStateMachine->staCallback.OnStaConnChanged( - OperateResState::CONNECT_ASSOCIATED, pStaStateMachine->linkedInfo); - pStaStateMachine->ConnectToNetworkProcess(msg); /* Notify result to InterfaceService. */ pStaStateMachine->staCallback.OnStaConnChanged(OperateResState::CONNECT_ASSOCIATED, pStaStateMachine->linkedInfo); -- Gitee From cacde537c236a04e3bfdd2ee400cb8da94c5439a Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Sat, 16 Jul 2022 20:07:09 +0800 Subject: [PATCH 238/491] bugfix for roaming 0716 Signed-off-by: yanxiaotao@huawei.com --- .../wifi_manage/idl_client/idl_interface/i_wifi.c | 2 +- .../wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp | 4 ++-- .../wifi_framework/wifi_manage/wifi_sta/sta_monitor.h | 8 ++++++++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi.c b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi.c index d20fc6a..f81e5d8 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi.c +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi.c @@ -241,7 +241,7 @@ static void IdlCbkConnectChanged(Context *context) static void IdlCbkBssidChanged(Context *context) { - int reason[WIFI_REASON_LENGTH] = {0}; + char reason[WIFI_REASON_LENGTH] = {0}; char bssid[WIFI_BSSID_LENGTH] = {0}; if (ReadStr(context, reason, sizeof(reason)) != 0 || ReadStr(context, bssid, sizeof(bssid)) != 0) { diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp index 0af029e..11005cf 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp @@ -116,7 +116,7 @@ void StaMonitor::OnBssidChangedCallBack(const std::string &reason, const std::st return; } - WifiLinkedInfo linkedInfo = {0}; + WifiLinkedInfo linkedInfo; pStaStateMachine->GetLinkedInfo(linkedInfo); if (linkedInfo.connState != ConnState::CONNECTED) { WIFI_LOGW("Sta ignored the event for NOT in connected status!, connState: %d", @@ -127,7 +127,7 @@ void StaMonitor::OnBssidChangedCallBack(const std::string &reason, const std::st WIFI_LOGW("Sta ignored the event for bssid is the same."); return; } - pStaStateMachine->OnNetworkConnectionEvent(linkedInfo->networkId, bssid); + pStaStateMachine->OnNetworkConnectionEvent(linkedInfo.networkId, bssid); } void StaMonitor::OnWpaStateChangedCallBack(int status) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.h index d6b0667..e011bd2 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.h @@ -62,6 +62,14 @@ public: */ void OnConnectChangedCallBack(int status, int networkId,const std::string &bssid); + /** + * @Description : Callback of the connection state change event. + * + * @param reason : reason for bssid change [in] + * @param bssid: bssid of the network [in] + */ + void OnBssidChangedCallBack(const std::string &reason, const std::string &bssid); + /** * @Description : Callback of the wpa state change event. * -- Gitee From e9cae147e4e65f42fa0f1b4c4e3d972b2caa6f41 Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Sun, 17 Jul 2022 08:55:04 +0800 Subject: [PATCH 239/491] bugfix for roaming 0717 Signed-off-by: yanxiaotao --- .../wifi_manage/wifi_sta/sta_state_machine.cpp | 6 +++--- .../wifi_manage/wifi_sta/sta_state_machine.h | 8 +++++++- .../wifi_standard/wifi_hal/wifi_hal_crpc_server.h | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp index bbef28a..7e51504 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp @@ -339,8 +339,7 @@ ErrCode StaStateMachine::ConvertDeviceCfg(const WifiDeviceConfig &config) const idlConfig.privateKey = config.wifiEapConfig.privateKey; idlConfig.phase2Method = static_cast(config.wifiEapConfig.phase2Method); idlConfig.wepKeyIdx = config.wepTxKeyIndex; - idlConfig.authAlgorithms = config.keyMgmt; - if (strcmp(config.keyMgmt, "WEP") == 0) { + if (strcmp(config.keyMgmt.c_str(), "WEP") == 0) { /* for wep */ idlConfig.authAlgorithms = 0x02; } @@ -1818,7 +1817,8 @@ bool StaStateMachine::LinkedState::ExecuteStateMsg(InternalMessage *msg) switch (msg->GetMessageName()) { case WIFI_SVR_CMD_STA_BSSID_CHANGED_EVENT: { ret = EXECUTED; - WifiIdlRoamConfig config = {0}; + WifiIdlRoamConfig config; + memset_s(&config, sizeof(config), 0, sizeof(config)); std::string reason = msg->GetStringFromMessage(); pStaStateMachine->linkedInfo.bssid = msg->GetStringFromMessage(); WIFI_LOGI("reveived bssid changed msg, reason:%{public}s,bssid:%{private}s.\n", diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h index 3d15f70..c8a16e2 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h @@ -340,7 +340,13 @@ public: * @param bssid - bssid - the mac address of wifi(in) */ void OnNetworkConnectionEvent(int networkId, std::string bssid); - + /** + * @Description Bssid change events + * + * @param reason: the reason of bssid changed(in) + * @param bssid: the mac address of wifi(in) + */ + void StaStateMachine::OnBssidChangedEvent(std::string reason, std::string bssid); /** * @Description Register sta callback function * diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.h index b88814f..ce95cc4 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.h +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.h @@ -81,7 +81,7 @@ typedef struct WifiHalConnectMsg { char bssid[WIFI_MAC_LENGTH + 1]; } WifiHalConnectMsg; -typedef struct WifiHalConnectMsg { +typedef struct WifiHalBssidChangedMsg { char reason[WIFI_REASON_LENGTH]; char bssid[WIFI_MAC_LENGTH + 1]; } WifiHalBssidChangedMsg; -- Gitee From 3510b24701855aeae1f9936c8bc2c371fa2d7612 Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Sun, 17 Jul 2022 19:18:47 +0800 Subject: [PATCH 240/491] bugfix for roaming 0717 Signed-off-by: yanxiaotao --- .../wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h | 2 +- wifi/services/wifi_standard/wifi_hal/wifi_hal_callback.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h index c8a16e2..bba1766 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h @@ -346,7 +346,7 @@ public: * @param reason: the reason of bssid changed(in) * @param bssid: the mac address of wifi(in) */ - void StaStateMachine::OnBssidChangedEvent(std::string reason, std::string bssid); + void OnBssidChangedEvent(std::string reason, std::string bssid); /** * @Description Register sta callback function * diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_callback.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_callback.c index c07b47f..5c63794 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_callback.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_callback.c @@ -86,7 +86,7 @@ void WifiHalCbNotifyBssidChanged(const char *reasonPos, const char *bssidPos) LOGE("reasonPos or bssidPos is NULL"); return; } - char *reasonEnd = strchar(reasonPos, ' '); + char *reasonEnd = strchr(reasonPos, ' '); if (reasonEnd != NULL) { int reasonLen = reasonEnd - reasonPos; reasonLen = reasonLen > WIFI_REASON_LENGTH ? WIFI_REASON_LENGTH : reasonLen; -- Gitee From 4a8e7400643f90f6ab02ce9fcc6cfe2a03c9ee63 Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Sun, 17 Jul 2022 19:31:20 +0800 Subject: [PATCH 241/491] bugfix for roaming 0717 Signed-off-by: yanxiaotao --- .../wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h index bba1766..bcf6b86 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h @@ -105,7 +105,7 @@ public: */ class InitState : public State { public: - explicit InitState(StaStateMachine *pStaStateMachine); + explicit InitState(StaStateMachine *staStateMachine); ~InitState() override; void GoInState() override; void GoOutState() override; -- Gitee From 10ab8acc10a44e07cdca92217802ead662e1e44b Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Sun, 17 Jul 2022 19:42:07 +0800 Subject: [PATCH 242/491] bugfix for roaming 0717 Signed-off-by: yanxiaotao --- .../wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c | 1 + wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c index dcb0091..6e1ad72 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c @@ -19,6 +19,7 @@ #include "securec.h" #include "wifi_wpa_common.h" #include "utils/common.h" /* request for printf_decode to decode wpa's returned ssid info */ +#include "common/wpa_ctrl.h" #include "wifi_hal_common_func.h" #include "wifi_hal_callback.h" #include "wifi_hal_struct.h" diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c index 39ff4ce..d2cc437 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c @@ -695,7 +695,7 @@ WifiErrorNo GetRoamingCapabilities(WifiRoamCapability *capability) WifiErrorNo SetRoamConfig(char **blocklist, int blocksize, char **trustlist, int trustsize) { - LOGI("SetRoamConfig block size %{public}d, trust size %{public}d", blocksize, trustsize);. + LOGI("SetRoamConfig, blocksize:%{public}d, trustsize:%{public}d", blocksize, trustsize);. if (trustlist != NULL && trustsize > 0) { WifiWpaStaInterface *pStaIfc = GetWifiStaInterface(0); if (pStaIfc == NULL) { -- Gitee From 27288501aaa2a878da8bcc4c88f5864d905f39b5 Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Sun, 17 Jul 2022 20:07:07 +0800 Subject: [PATCH 243/491] bugfix for roaming 0717 Signed-off-by: yanxiaotao --- .../wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c index 6e1ad72..0e5fc2a 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c @@ -19,7 +19,6 @@ #include "securec.h" #include "wifi_wpa_common.h" #include "utils/common.h" /* request for printf_decode to decode wpa's returned ssid info */ -#include "common/wpa_ctrl.h" #include "wifi_hal_common_func.h" #include "wifi_hal_callback.h" #include "wifi_hal_struct.h" @@ -47,6 +46,7 @@ #define WPA_CB_CONNECTED 1 #define WPA_CB_DISCONNECTED 2 #define WPS_EVENT_PBC_OVERLAP "WPS-OVERLAP-DETECTED PBC session overlap" +#define WPA_EVENT_BSSID_CHANGED "WPA-EVENT-BSSID-CHANGED " #define REPLY_BUF_LENGTH 4096 #define CONNECTION_FULL_STATUS 17 #define CONNECTION_REJECT_STATUS 37 -- Gitee From 74ea20616bad8ac026bb5e78ed066a05b515402a Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Sun, 17 Jul 2022 20:27:16 +0800 Subject: [PATCH 244/491] bugfix for roaming 0717 Signed-off-by: yanxiaotao --- wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c index d2cc437..a0952ce 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c @@ -695,7 +695,7 @@ WifiErrorNo GetRoamingCapabilities(WifiRoamCapability *capability) WifiErrorNo SetRoamConfig(char **blocklist, int blocksize, char **trustlist, int trustsize) { - LOGI("SetRoamConfig, blocksize:%{public}d, trustsize:%{public}d", blocksize, trustsize);. + LOGI("SetRoamConfig, blocksize:%{public}d, trustsize:%{public}d", blocksize, trustsize); if (trustlist != NULL && trustsize > 0) { WifiWpaStaInterface *pStaIfc = GetWifiStaInterface(0); if (pStaIfc == NULL) { -- Gitee From 8bee0448bbe82e2f364aa305054db033fd676de4 Mon Sep 17 00:00:00 2001 From: lujunxin Date: Mon, 18 Jul 2022 15:35:05 +0800 Subject: [PATCH 245/491] softap cannot connected by stations Signed-off-by: lujunxin --- wifi/services/wifi_standard/wifi_hal/BUILD.gn | 1 + .../wifi_hal/common/wifi_hal_common_func.c | 31 +++++++++++++++++++ .../wifi_hal/common/wifi_hal_common_func.h | 9 +++++- .../wifi_hal/wifi_hal_ap_interface.c | 13 ++++---- .../hostapd_hal/wifi_hostapd_hal.c | 4 ++- 5 files changed, 50 insertions(+), 8 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_hal/BUILD.gn b/wifi/services/wifi_standard/wifi_hal/BUILD.gn index 0a4585b..35b8b56 100644 --- a/wifi/services/wifi_standard/wifi_hal/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_hal/BUILD.gn @@ -80,6 +80,7 @@ if (defined(ohos_lite)) { cflags_cc = [ "-fno-rtti" ] defines = [ + "_GNU_SOURCE", "OHOS_ARCH_LITE", "AP_INTF=\"$wifi_feature_with_ap_intf\"", "AP_NUM=$wifi_feature_with_ap_num", diff --git a/wifi/services/wifi_standard/wifi_hal/common/wifi_hal_common_func.c b/wifi/services/wifi_standard/wifi_hal/common/wifi_hal_common_func.c index 180d133..8d43302 100644 --- a/wifi/services/wifi_standard/wifi_hal/common/wifi_hal_common_func.c +++ b/wifi/services/wifi_standard/wifi_hal/common/wifi_hal_common_func.c @@ -14,9 +14,14 @@ */ #include "wifi_hal_common_func.h" +#include #include #include +#include +#include +#include #include "securec.h" +#include "wifi_log.h" #define MAC_UINT_SIZE 6 #define MAC_STRING_SIZE 17 @@ -122,3 +127,29 @@ int CheckMacIsValid(const char *macStr) } return 0; } + +int GetIfaceState(const char *ifaceName) +{ + int state = 0; + int sock = socket(AF_INET, SOCK_DGRAM, 0); + if (sock < 0) { + LOGE("GetIfaceState: create socket fail"); + return state; + } + + struct ifreq ifr; + (void)memset_s(&ifr, sizeof(ifr), 0, sizeof(ifr)); + if (strcpy_s(ifr.ifr_name, IFNAMSIZ, ifaceName) != EOK) { + LOGE("GetIfaceState: strcpy_s fail"); + close(sock); + return state; + } + if (ioctl(sock, SIOCGIFFLAGS, &ifr) < 0) { + LOGE("GetIfaceState: can not get interface state: %{public}s", ifaceName); + close(sock); + return state; + } + state = ((ifr.ifr_flags & IFF_UP) > 0 ? 1 : 0); + LOGD("GetIfaceState: current interface state: %{public}d", state); + return state; +} diff --git a/wifi/services/wifi_standard/wifi_hal/common/wifi_hal_common_func.h b/wifi/services/wifi_standard/wifi_hal/common/wifi_hal_common_func.h index e41293d..cd2cac3 100644 --- a/wifi/services/wifi_standard/wifi_hal/common/wifi_hal_common_func.h +++ b/wifi/services/wifi_standard/wifi_hal/common/wifi_hal_common_func.h @@ -58,7 +58,14 @@ int ConvertMacToArray(const char *macStr, unsigned char *mac, int macSize); */ int CheckMacIsValid(const char *macStr); +/** + * @Description Get the state of interface + * @param ifaceName - the name of interface + * @return int - 0: down 1: up + */ +int GetIfaceState(const char *ifaceName); + #ifdef __cplusplus } #endif -#endif \ No newline at end of file +#endif diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c index efbc83e..aaaabce 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c @@ -56,11 +56,12 @@ WifiErrorNo StartSoftAp(int id) LOGE("hostapdHalDevice is NULL!"); return WIFI_HAL_HOSTAPD_NOT_INIT; } - - int ret = hostapdHalDevice->enableAp(id); - if (ret != 0) { - LOGE("enableAp failed! ret=%{public}d", ret); - return WIFI_HAL_FAILED; + if (GetIfaceState(AP_INTF) == 0 || id > 0) { + int ret = hostapdHalDevice->enableAp(id); + if (ret != 0) { + LOGE("enableAp failed! ret=%{public}d", ret); + return WIFI_HAL_FAILED; + } } LOGI("AP start successfully, id:%{public}d!", id); @@ -380,4 +381,4 @@ WifiErrorNo WifiGetPowerModel(int* mode, int id) HdiReleaseAp(wifi, apFeature); return (ret == 0) ? WIFI_HAL_SUCCESS : WIFI_HAL_FAILED; #endif -} \ No newline at end of file +} diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.c index 598c076..5512dfd 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.c @@ -113,12 +113,14 @@ static void DelCallbackMessage(const char *msg, int id) static void *HostapdReceiveCallback(void *arg) { if (arg == NULL) { + LOGE("%{public}s arg is null", __func__); return NULL; } WifiHostapdHalDeviceInfo *halDeviceInfo = arg; int id = halDeviceInfo->id; if (halDeviceInfo->hostapdHalDev == NULL || - halDeviceInfo->hostapdHalDev->ctrlRecv) { + halDeviceInfo->hostapdHalDev->ctrlRecv == NULL) { + LOGE("%{public}s invalid HalDev or ctrlRecv", __func__); return NULL; } struct wpa_ctrl *ctrl = halDeviceInfo->hostapdHalDev->ctrlRecv; -- Gitee From 90e79c98a621e55f6d8e04ab7321cf304e1e65a7 Mon Sep 17 00:00:00 2001 From: Neil Chen Date: Mon, 18 Jul 2022 23:03:07 +0800 Subject: [PATCH 246/491] remove file executable permission Signed-off-by: Neil Chen --- README.md | 0 README_zh.md | 0 .../wifi_standard/wifi_framework/wifi_manage/wifi_common/BUILD.gn | 0 .../wifi_manage/wifi_common/wifi_chip_capability.cpp | 0 .../wifi_framework/wifi_manage/wifi_common/wifi_chip_capability.h | 0 .../wifi_manage/wifi_p2p/hid2d/wifi_hid2d_service_utils.cpp | 0 .../wifi_manage/wifi_p2p/hid2d/wifi_hid2d_service_utils.h | 0 wifi/test/fuzztest/fuzz_common_func/wifi_fuzz_common_func.h | 0 wifi/test/fuzztest/wifi_sta/BUILD.gn | 0 9 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 README.md mode change 100755 => 100644 README_zh.md mode change 100755 => 100644 wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_common/BUILD.gn mode change 100755 => 100644 wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_common/wifi_chip_capability.cpp mode change 100755 => 100644 wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_common/wifi_chip_capability.h mode change 100755 => 100644 wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/hid2d/wifi_hid2d_service_utils.cpp mode change 100755 => 100644 wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/hid2d/wifi_hid2d_service_utils.h mode change 100755 => 100644 wifi/test/fuzztest/fuzz_common_func/wifi_fuzz_common_func.h mode change 100755 => 100644 wifi/test/fuzztest/wifi_sta/BUILD.gn diff --git a/README.md b/README.md old mode 100755 new mode 100644 diff --git a/README_zh.md b/README_zh.md old mode 100755 new mode 100644 diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_common/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_common/BUILD.gn old mode 100755 new mode 100644 diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_common/wifi_chip_capability.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_common/wifi_chip_capability.cpp old mode 100755 new mode 100644 diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_common/wifi_chip_capability.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_common/wifi_chip_capability.h old mode 100755 new mode 100644 diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/hid2d/wifi_hid2d_service_utils.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/hid2d/wifi_hid2d_service_utils.cpp old mode 100755 new mode 100644 diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/hid2d/wifi_hid2d_service_utils.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/hid2d/wifi_hid2d_service_utils.h old mode 100755 new mode 100644 diff --git a/wifi/test/fuzztest/fuzz_common_func/wifi_fuzz_common_func.h b/wifi/test/fuzztest/fuzz_common_func/wifi_fuzz_common_func.h old mode 100755 new mode 100644 diff --git a/wifi/test/fuzztest/wifi_sta/BUILD.gn b/wifi/test/fuzztest/wifi_sta/BUILD.gn old mode 100755 new mode 100644 -- Gitee From 3006d97ceb6b4dbb5331f83521f5f5eddc4fe5df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Czhangyx=E2=80=9D?= <15927364833@163.com> Date: Tue, 19 Jul 2022 16:55:55 +0800 Subject: [PATCH 247/491] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=9Aap=E5=AE=9E?= =?UTF-8?q?=E4=BE=8B=E7=9A=84=E8=AE=BE=E5=A4=87=E7=AB=AF=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: “zhangyx” <15927364833@163.com> --- .../wifi_framework/wifi_manage/wifi_ap/ap_define.h | 2 +- .../services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c | 6 +++++- wifi/wifi.gni | 2 +- wifi/wifi_lite.gni | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_define.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_define.h index e8506de..8fc2b50 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_define.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_define.h @@ -22,7 +22,7 @@ namespace OHOS { namespace Wifi { -const std::string IN_INTERFACE = AP_INTF; +const std::string IN_INTERFACE = "wlan0"; const std::string OUT_INTERFACE = "wlan0"; const int MAX_SSID_LENGTH = 32; const int MAX_PSK_LENGTH = 63; diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c index aaaabce..7f57b83 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c @@ -36,11 +36,13 @@ #define DISABLE_AP_WAIT_MS 50000 #define ABLE_AP_WAIT_MS 50000 #define WIFI_MULTI_CMD_MAX_LEN 1024 +#define IFCAE_NAME_LEN 256 static const char *g_serviceName = "hostapd"; WifiErrorNo StartSoftAp(int id) { LOGI("Ready to start hostapd: %{public}d!", id); + char ifaceName[IFCAE_NAME_LEN] = {0}; if (StartHostapd() != WIFI_HAL_SUCCESS) { LOGE("hostapd start failed!"); return WIFI_HAL_OPEN_HOSTAPD_FAILED; @@ -56,7 +58,9 @@ WifiErrorNo StartSoftAp(int id) LOGE("hostapdHalDevice is NULL!"); return WIFI_HAL_HOSTAPD_NOT_INIT; } - if (GetIfaceState(AP_INTF) == 0 || id > 0) { + + sprintf_s(ifaceName, IFCAE_NAME_LEN, AP_INTF"%d", id); + if (GetIfaceState(ifaceName) == 0 || id > 0) { int ret = hostapdHalDevice->enableAp(id); if (ret != 0) { LOGE("enableAp failed! ret=%{public}d", ret); diff --git a/wifi/wifi.gni b/wifi/wifi.gni index 9305426..6675f3f 100644 --- a/wifi/wifi.gni +++ b/wifi/wifi.gni @@ -18,7 +18,7 @@ DHCP_ROOT_DIR = "$SUBSYSTEM_DIR/wifi/dhcp" declare_args() { wifi_feature_with_p2p = true - wifi_feature_with_ap_intf = "wlan0" + wifi_feature_with_ap_intf = "wlan" wifi_feature_with_ap_num = 1 wifi_feature_with_auth_disable = false wifi_feature_with_dhcp_disable = false diff --git a/wifi/wifi_lite.gni b/wifi/wifi_lite.gni index 05a202d..d7a8a77 100644 --- a/wifi/wifi_lite.gni +++ b/wifi/wifi_lite.gni @@ -21,7 +21,7 @@ DHCP_ROOT_DIR = "$SUBSYSTEM_DIR/wifi/dhcp" declare_args() { wifi_feature_with_p2p = false - wifi_feature_with_ap_intf = "wlan0" + wifi_feature_with_ap_intf = "wlan" wifi_feature_with_ap_num = 1 wifi_feature_with_auth_disable = false wifi_feature_with_dhcp_disable = false -- Gitee From 76f76522b6d0f37e7575ceda2fbb3bd7c2d4f0ec Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Tue, 19 Jul 2022 21:17:54 +0800 Subject: [PATCH 248/491] bugfix for roaming 0719 Signed-off-by: yanxiaotao@huawei.com --- .../idl_client/wifi_idl_client.cpp | 13 ++++ .../wifi_manage/idl_client/wifi_idl_client.h | 9 +++ .../idl_client/wifi_sta_hal_interface.cpp | 6 ++ .../idl_client/wifi_sta_hal_interface.h | 9 +++ .../wifi_sta/sta_auto_connect_service.cpp | 2 +- .../wifi_manage/wifi_sta/sta_monitor.cpp | 8 ++- .../wifi_sta/sta_state_machine.cpp | 59 ++++++++++++------- .../wifi_manage/wifi_sta/sta_state_machine.h | 4 ++ 8 files changed, 86 insertions(+), 24 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp index 3adb561..ca86e74 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp @@ -542,6 +542,19 @@ WifiErrorNo WifiIdlClient::SetDeviceConfig(int networkId, const WifiIdlDeviceCon return SetNetwork(networkId, conf, num); } +WifiErrorNo WifiIdlClient::SetWpsBssid(int networkId, const std::string &bssid) +{ + CHECK_CLIENT_NOT_NULL; + SetNetworkConfig conf; + int num = PushDeviceConfigString(&conf, DEVICE_CONFIG_BSSID, bssid); + if (num == 0) { + LOGE("SetWpsBssid, PushDeviceConfigString return error!"); + return WIFI_IDL_OPT_OK; + } + + return SetNetwork(networkId, &conf, num); +} + WifiErrorNo WifiIdlClient::SaveDeviceConfig(void) { CHECK_CLIENT_NOT_NULL; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.h index 89481a5..5787752 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.h @@ -268,6 +268,15 @@ public: */ WifiErrorNo SetDeviceConfig(int networkId, const WifiIdlDeviceConfig &config); + /** + * @Description Set bssid to supplicant. + * + * @param networkId + * @param bssid + * @return WifiErrorNo + */ + WifiErrorNo SetWpsBssid(int networkId, const std::string &bssid); + /** * @Description Save the network. * diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_sta_hal_interface.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_sta_hal_interface.cpp index ee0b4eb..0a82f06 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_sta_hal_interface.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_sta_hal_interface.cpp @@ -242,6 +242,12 @@ WifiErrorNo WifiStaHalInterface::GetRoamingCapabilities(WifiIdlRoamCapability &c return mIdlClient->ReqGetRoamingCapabilities(capability); } +WifiErrorNo WifiStaHalInterface::SetWpsBssid(int networkId, const std::string &bssid) +{ + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); + return mIdlClient->SetWpsBssid(networkId, bssid); +} + WifiErrorNo WifiStaHalInterface::SetRoamConfig(const WifiIdlRoamConfig &config) { CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_sta_hal_interface.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_sta_hal_interface.h index 9d035d3..e66cc9a 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_sta_hal_interface.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_sta_hal_interface.h @@ -286,6 +286,15 @@ public: */ WifiErrorNo GetRoamingCapabilities(WifiIdlRoamCapability &capability); + /** + * @Description Set bssid to supplicant. + * + * @param networkId + * @param bssid + * @return WifiErrorNo + */ + WifiErrorNo SetWpsBssid(int networkId, const std::string &bssid); + /** * @Description Setting Roaming Configurations. * diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp index 84b6b0e..2828a26 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp @@ -24,7 +24,7 @@ namespace Wifi { StaAutoConnectService::StaAutoConnectService(StaStateMachine *staStateMachine) : pStaStateMachine(staStateMachine), pSavedDeviceAppraisal(nullptr), - firmwareRoamFlag(false), + firmwareRoamFlag(true), maxBlockedBssidNum(BLOCKLIST_INVALID_SIZE), selectDeviceLastTime(0), pAppraisals {nullptr, nullptr, nullptr, nullptr, nullptr, nullptr} diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp index 11005cf..d640d3f 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp @@ -88,8 +88,10 @@ void StaMonitor::OnConnectChangedCallBack(int status, int networkId, const std:: WifiLinkedInfo linkedInfo; pStaStateMachine->GetLinkedInfo(linkedInfo); /* P2P affects STA, causing problems or incorrect data updates */ - if ((linkedInfo.connState == ConnState::CONNECTED) && (linkedInfo.bssid != bssid)) { - WIFI_LOGI("Sta ignored the event for bssid is mismatch!"); + if ((linkedInfo.connState == ConnState::CONNECTED) && + (linkedInfo.bssid != bssid) && (!pStaStateMachine->isRoaming())) { + WIFI_LOGI("Sta ignored the event for bssid is mismatch, isRoam:%{public}d.", + pStaStateMachine->isRoaming()); return; } switch (status) { @@ -127,7 +129,7 @@ void StaMonitor::OnBssidChangedCallBack(const std::string &reason, const std::st WIFI_LOGW("Sta ignored the event for bssid is the same."); return; } - pStaStateMachine->OnNetworkConnectionEvent(linkedInfo.networkId, bssid); + pStaStateMachine->OnBssidChangedEvent(reason, bssid); } void StaMonitor::OnWpaStateChangedCallBack(int status) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp index 7e51504..2e195b0 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp @@ -510,9 +510,11 @@ void StaStateMachine::WpaStartedState::GoOutState() bool StaStateMachine::WpaStartedState::ExecuteStateMsg(InternalMessage *msg) { if (msg == nullptr) { + LOGI("msg is nullptr"); return false; } + WIFI_LOGI("WpaStartedState ExecuteStateMsg-msgCode:%{public}d.\n", msg->GetMessageName()); bool ret = NOT_EXECUTED; switch (msg->GetMessageName()) { case WIFI_SVR_CMD_STA_DISABLE_WIFI: { @@ -1325,6 +1327,11 @@ void StaStateMachine::StartRoamToNetwork(std::string bssid) SendMessage(msg); } +bool StaStateMachine::IsRoaming(void) +{ + return isRoam; +} + void StaStateMachine::OnNetworkConnectionEvent(int networkId, std::string bssid) { InternalMessage *msg = CreateMessage(); @@ -1809,6 +1816,7 @@ void StaStateMachine::LinkedState::GoOutState() bool StaStateMachine::LinkedState::ExecuteStateMsg(InternalMessage *msg) { if (msg == nullptr) { + WIFI_LOGI("msg is nullptr."); return false; } @@ -1817,35 +1825,30 @@ bool StaStateMachine::LinkedState::ExecuteStateMsg(InternalMessage *msg) switch (msg->GetMessageName()) { case WIFI_SVR_CMD_STA_BSSID_CHANGED_EVENT: { ret = EXECUTED; - WifiIdlRoamConfig config; - memset_s(&config, sizeof(config), 0, sizeof(config)); std::string reason = msg->GetStringFromMessage(); - pStaStateMachine->linkedInfo.bssid = msg->GetStringFromMessage(); - WIFI_LOGI("reveived bssid changed msg, reason:%{public}s,bssid:%{private}s.\n", - reason.c_str(), pStaStateMachine->linkedInfo.bssid.c_str()); - WifiSettings::GetInstance().SaveLinkedInfo(pStaStateMachine->linkedInfo); - config.trustlistBssids.push_back(pStaStateMachine->linkedInfo.bssid); - if (WifiStaHalInterface::GetInstance().SetRoamConfig(config) != WIFI_IDL_OPT_OK) { - WIFI_LOGI("SetRoamConfig return fail."); + std::string bssid = msg->GetStringFromMessage(); + WIFI_LOGI("reveived bssid changed event, reason:%{public}s,bssid:%{private}s.\n", + reason.c_str(), bssid.c_str()); + if (strcmp(reason.c_str(), "ASSOC_COMPLETE") != 0) { + WIFI_LOGE("Bssid change not for ASSOC_COMPLETE, do nothing."); + return false; + } + if (WifiStaHalInterface::GetInstance().SetWpsBssid(pStaStateMachine->linkedInfo.networkId, + bssid) != WIFI_IDL_OPT_OK) { + WIFI_LOGE("SetWpsBssid return fail."); return false; } pStaStateMachine->isRoam = true; - pStaStateMachine->StopTimer(static_cast(CMD_NETWORK_CONNECT_TIMEOUT)); - /* Notify result to InterfaceService. */ - pStaStateMachine->staCallback.OnStaConnChanged(OperateResState::CONNECT_ASSOCIATED, - pStaStateMachine->linkedInfo); - pStaStateMachine->staCallback.OnStaConnChanged(OperateResState::CONNECT_OBTAINING_IP, - pStaStateMachine->linkedInfo); - /* The current state of StaStateMachine transfers to GetIpState. */ - pStaStateMachine->SwitchState(pStaStateMachine->pGetIpState); + /* The current state of StaStateMachine transfers to pApRoamingState. */ + pStaStateMachine->SwitchState(pStaStateMachine->pApRoamingState); break; } default: - WIFI_LOGE("Invalid mesage!"); + WIFI_LOGE("NOT handle this event!"); break; } - return EXECUTED; + return ret; } /* --------------------------- state machine Roaming State ------------------------------ */ @@ -1876,6 +1879,12 @@ bool StaStateMachine::ApRoamingState::ExecuteStateMsg(InternalMessage *msg) ret = EXECUTED; pStaStateMachine->isRoam = true; pStaStateMachine->StopTimer(static_cast(CMD_NETWORK_CONNECT_TIMEOUT)); + /* Save linkedInfo */ + pStaStateMachine->linkedInfo.networkId = msg->GetParam1(); + pStaStateMachine->linkedInfo.bssid = msg->GetStringFromMessage(); + WIFI_LOGI("ApRoamingState, receive connection event, networkId:%{public}d, bssid:%{public}s.", + pStaStateMachine->linkedInfo.networkId, pStaStateMachine->linkedInfo.bssid.c_str()); + WifiSettings::GetInstance().SaveLinkedInfo(pStaStateMachine->linkedInfo); pStaStateMachine->staCallback.OnStaConnChanged( OperateResState::CONNECT_ASSOCIATED, pStaStateMachine->linkedInfo); pStaStateMachine->ConnectToNetworkProcess(msg); @@ -2020,7 +2029,7 @@ void StaStateMachine::DhcpResultNotify::OnSuccess(int status, const std::string return; } WIFI_LOGD("iptype=%{public}d, ip=%{private}s, gateway=%{private}s, \ - subnet=%{private}s, serverAddress=%{private}s, leaseDuration=%d", + subnet=%{private}s, serverAddress=%{private}s, leaseDuration=%publicd", result.iptype, result.strYourCli.c_str(), result.strRouter1.c_str(), @@ -2068,6 +2077,7 @@ void StaStateMachine::DhcpResultNotify::OnSuccess(int status, const std::string WIFI_LOGI("DhcpResultNotify::OnSuccess, getIpSucNum=%{public}d, isRoam=%{public}d", pStaStateMachine->getIpSucNum, pStaStateMachine->isRoam); + pStaStateMachine->SwitchState(pStaStateMachine->pLinkedState); if (pStaStateMachine->getIpSucNum == 0 || pStaStateMachine->isRoam) { pStaStateMachine->SaveLinkstate(ConnState::CONNECTED, DetailedState::CONNECTED); pStaStateMachine->staCallback.OnStaConnChanged( @@ -2078,6 +2088,15 @@ void StaStateMachine::DhcpResultNotify::OnSuccess(int status, const std::string pStaStateMachine->pNetcheck->SignalNetCheckThread(); } pStaStateMachine->getIpSucNum++; + + WIFI_LOGI("DhcpResultNotify::OnSuccess, stop dhcp client"); + if (pStaStateMachine->pDhcpService != nullptr) { + if (pStaStateMachine->currentTpType == IPTYPE_IPV4) { + pStaStateMachine->pDhcpService->StopDhcpClient(IF_NAME, false); + } else { + pStaStateMachine->pDhcpService->StopDhcpClient(IF_NAME, true); + } + } return; } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h index bcf6b86..670cd06 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h @@ -333,6 +333,10 @@ public: * @param bssid - the mac address of network(in) */ void StartRoamToNetwork(std::string bssid); + /** + * @Description if it is roaming now. + */ + bool StaStateMachine::IsRoaming(void); /** * @Description Connecting events * -- Gitee From 42f5da9a54b6c8434aa5362c90f35674fda77fc5 Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Tue, 19 Jul 2022 22:21:54 +0800 Subject: [PATCH 249/491] bugfix for roaming 0719 Signed-off-by: yanxiaotao --- .../wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp | 4 ++-- .../wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp index d640d3f..380d468 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp @@ -89,9 +89,9 @@ void StaMonitor::OnConnectChangedCallBack(int status, int networkId, const std:: pStaStateMachine->GetLinkedInfo(linkedInfo); /* P2P affects STA, causing problems or incorrect data updates */ if ((linkedInfo.connState == ConnState::CONNECTED) && - (linkedInfo.bssid != bssid) && (!pStaStateMachine->isRoaming())) { + (linkedInfo.bssid != bssid) && (!pStaStateMachine->IsRoaming())) { WIFI_LOGI("Sta ignored the event for bssid is mismatch, isRoam:%{public}d.", - pStaStateMachine->isRoaming()); + pStaStateMachine->IsRoaming()); return; } switch (status) { diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h index 670cd06..6e9bc06 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h @@ -336,7 +336,7 @@ public: /** * @Description if it is roaming now. */ - bool StaStateMachine::IsRoaming(void); + bool IsRoaming(void); /** * @Description Connecting events * -- Gitee From e8197270ec77c4f031999495c8be65ab0062c8bd Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Tue, 19 Jul 2022 22:46:23 +0800 Subject: [PATCH 250/491] bugfix for roaming 0719 Signed-off-by: yanxiaotao --- wifi/frameworks/js/napi/inc/wifi_napi_device.h | 9 +++++++++ wifi/frameworks/js/napi/src/wifi_napi_device.cpp | 14 ++++++++++---- .../wifi_manage/wifi_sta/sta_state_machine.cpp | 2 +- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/wifi/frameworks/js/napi/inc/wifi_napi_device.h b/wifi/frameworks/js/napi/inc/wifi_napi_device.h index 6113302..97712d1 100644 --- a/wifi/frameworks/js/napi/inc/wifi_napi_device.h +++ b/wifi/frameworks/js/napi/inc/wifi_napi_device.h @@ -65,6 +65,15 @@ enum class ConnStateJs { UNKNOWN /* Failed to set up the Wi-Fi connection */ }; + enum class IpTypeJs { + /** Use statically configured IP settings */ + IP_TYPE_STATIC, + /** Use dynamically configured IP settings */ + IP_TYPE_DHCP, + /** No IP details are assigned */ + IP_TYPE_UNKNOWN, +} + class ScanInfoAsyncContext : public AsyncContext { public: std::vector vecScanInfos; diff --git a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp index ea72435..9fb1082 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp @@ -311,9 +311,10 @@ static void JsObjToDeviceConfig(const napi_env& env, const napi_value& object, W /* "randomMacAddr" is not supported currently */ int ipType = static_cast(AssignIpMethod::UNASSIGNED); JsObjectToInt(env, object, "ipType", ipType); - if (AssignIpMethod(ipType) == AssignIpMethod::DHCP) { + WIFI_LOGI("JsObjToDeviceConfig, ipType: %{public}d.", ipType); + if (ipType == IP_TYPE_DHCP) { cppConfig.wifiIpConfig.assignMethod = AssignIpMethod::DHCP; - } else if (AssignIpMethod(ipType) == AssignIpMethod::STATIC) { + } else if (ipType == IP_TYPE_STATIC) { cppConfig.wifiIpConfig.assignMethod = AssignIpMethod::STATIC; ConfigStaticIp(env, object, cppConfig); } @@ -966,8 +967,13 @@ static void DeviceConfigToJsArray(const napi_env& env, std::vector(AssignIpMethod::DHCP), result); + if (vecDeviceConfigs[idx].wifiIpConfig.assignMethod == AssignIpMethod::STATIC) { + SetValueInt32(env, "ipType", IP_TYPE_STATIC, result); + } else { + SetValueInt32(env, "ipType", IP_TYPE_DHCP, result); + } + WIFI_LOGI("DeviceConfigToJsArray, idx:%{public}d, assignMethod:%{public}d!", + vecDeviceConfigs[idx].wifiIpConfig.assignMethod); napi_value ipCfgObj; napi_create_object(env, &ipCfgObj); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp index 2e195b0..d71d563 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp @@ -2029,7 +2029,7 @@ void StaStateMachine::DhcpResultNotify::OnSuccess(int status, const std::string return; } WIFI_LOGD("iptype=%{public}d, ip=%{private}s, gateway=%{private}s, \ - subnet=%{private}s, serverAddress=%{private}s, leaseDuration=%publicd", + subnet=%{private}s, serverAddress=%{private}s, leaseDuration=%{public}d", result.iptype, result.strYourCli.c_str(), result.strRouter1.c_str(), -- Gitee From bfeecca120491daf20d729474473fe4109c225b1 Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Tue, 19 Jul 2022 22:57:45 +0800 Subject: [PATCH 251/491] bugfix for roaming 0719 Signed-off-by: yanxiaotao --- wifi/frameworks/js/napi/inc/wifi_napi_device.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/frameworks/js/napi/inc/wifi_napi_device.h b/wifi/frameworks/js/napi/inc/wifi_napi_device.h index 97712d1..bfa757d 100644 --- a/wifi/frameworks/js/napi/inc/wifi_napi_device.h +++ b/wifi/frameworks/js/napi/inc/wifi_napi_device.h @@ -65,7 +65,7 @@ enum class ConnStateJs { UNKNOWN /* Failed to set up the Wi-Fi connection */ }; - enum class IpTypeJs { +enum class IpTypeJs { /** Use statically configured IP settings */ IP_TYPE_STATIC, /** Use dynamically configured IP settings */ -- Gitee From d343b7cbbb8ccd847ddc343c52fdd269704d1dc8 Mon Sep 17 00:00:00 2001 From: lujunxin Date: Wed, 20 Jul 2022 06:15:38 +0000 Subject: [PATCH 252/491] fix cppcrash issue when close wifi Signed-off-by: lujunxin --- .../wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp index 28d4e1d..dafca97 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp @@ -526,9 +526,7 @@ void StaStateMachine::StopWifiProcess() { WIFI_LOGI("Enter StaStateMachine::StopWifiProcess.\n"); #ifndef OHOS_ARCH_LITE - std::thread([this]() { - WifiNetAgent::GetInstance().UnregisterNetSupplier(); - }).detach(); + WifiNetAgent::GetInstance().UnregisterNetSupplier(); #endif WIFI_LOGI("Stop wifi is in process...\n"); WifiSettings::GetInstance().SetWifiState(static_cast(WifiState::DISABLING)); -- Gitee From d86ed178b1b054cf55ea73593109771d6fbabbca Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Wed, 20 Jul 2022 19:15:52 +0800 Subject: [PATCH 253/491] bugfix for roaming 0720 Signed-off-by: yanxiaotao@huawei.com --- wifi/frameworks/js/napi/inc/wifi_napi_device.h | 2 +- .../wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/wifi/frameworks/js/napi/inc/wifi_napi_device.h b/wifi/frameworks/js/napi/inc/wifi_napi_device.h index bfa757d..5938608 100644 --- a/wifi/frameworks/js/napi/inc/wifi_napi_device.h +++ b/wifi/frameworks/js/napi/inc/wifi_napi_device.h @@ -72,7 +72,7 @@ enum class IpTypeJs { IP_TYPE_DHCP, /** No IP details are assigned */ IP_TYPE_UNKNOWN, -} +}; class ScanInfoAsyncContext : public AsyncContext { public: diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp index d71d563..b6ee120 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp @@ -1769,7 +1769,7 @@ bool StaStateMachine::ConfigStaticIpAddress(StaticIpAddress &staticIpAddress) void StaStateMachine::HandleNetCheckResult(StaNetState netState, const std::string portalUrl) { - WIFI_LOGI("Enter HandleNetCheckResult"); + WIFI_LOGI("Enter HandleNetCheckResult, netState:%{public}d."); if (linkedInfo.connState == ConnState::DISCONNECTED) { WIFI_LOGE("Network disconnected\n"); return; @@ -1780,8 +1780,6 @@ void StaStateMachine::HandleNetCheckResult(StaNetState netState, const std::stri /* Save connection information to WifiSettings. */ SaveLinkstate(ConnState::CONNECTED, DetailedState::WORKING); staCallback.OnStaConnChanged(OperateResState::CONNECT_NETWORK_ENABLED, linkedInfo); - /* The current state of StaStateMachine transfers to LinkedState. */ - SwitchState(pLinkedState); } else if (netState == StaNetState::NETWORK_CHECK_PORTAL) { linkedInfo.portalUrl = portalUrl; SaveLinkstate(ConnState::CONNECTED, DetailedState::CAPTIVE_PORTAL_CHECK); -- Gitee From bbdab97aef772acbe01e0a170c713f6e532dd0e2 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Wed, 20 Jul 2022 19:59:19 +0800 Subject: [PATCH 254/491] bugfix for roaming 0720 Signed-off-by: yanxiaotao@huawei.com --- .../wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp index b6ee120..83cfcd7 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp @@ -1769,7 +1769,7 @@ bool StaStateMachine::ConfigStaticIpAddress(StaticIpAddress &staticIpAddress) void StaStateMachine::HandleNetCheckResult(StaNetState netState, const std::string portalUrl) { - WIFI_LOGI("Enter HandleNetCheckResult, netState:%{public}d."); + WIFI_LOGI("Enter HandleNetCheckResult, netState:%{public}d.", netState); if (linkedInfo.connState == ConnState::DISCONNECTED) { WIFI_LOGE("Network disconnected\n"); return; -- Gitee From 6ff6c8cc4e11b00586a72ec519b9d503659db573 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Wed, 20 Jul 2022 20:18:22 +0800 Subject: [PATCH 255/491] bugfix for roaming 0720 Signed-off-by: yanxiaotao@huawei.com --- wifi/frameworks/js/napi/src/wifi_napi_device.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp index 9fb1082..b399fde 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp @@ -312,9 +312,9 @@ static void JsObjToDeviceConfig(const napi_env& env, const napi_value& object, W int ipType = static_cast(AssignIpMethod::UNASSIGNED); JsObjectToInt(env, object, "ipType", ipType); WIFI_LOGI("JsObjToDeviceConfig, ipType: %{public}d.", ipType); - if (ipType == IP_TYPE_DHCP) { + if (ipType == IpTypeJs::IP_TYPE_DHCP) { cppConfig.wifiIpConfig.assignMethod = AssignIpMethod::DHCP; - } else if (ipType == IP_TYPE_STATIC) { + } else if (ipType == IpTypeJs::IP_TYPE_STATIC) { cppConfig.wifiIpConfig.assignMethod = AssignIpMethod::STATIC; ConfigStaticIp(env, object, cppConfig); } @@ -968,9 +968,9 @@ static void DeviceConfigToJsArray(const napi_env& env, std::vector Date: Wed, 20 Jul 2022 20:23:23 +0800 Subject: [PATCH 256/491] bugfix for roaming 0720 Signed-off-by: yanxiaotao@huawei.com --- wifi/frameworks/js/napi/src/wifi_napi_device.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp index b399fde..2a65fe6 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp @@ -312,9 +312,9 @@ static void JsObjToDeviceConfig(const napi_env& env, const napi_value& object, W int ipType = static_cast(AssignIpMethod::UNASSIGNED); JsObjectToInt(env, object, "ipType", ipType); WIFI_LOGI("JsObjToDeviceConfig, ipType: %{public}d.", ipType); - if (ipType == IpTypeJs::IP_TYPE_DHCP) { + if (IpTypeJs(ipType) == IpTypeJs::IP_TYPE_DHCP) { cppConfig.wifiIpConfig.assignMethod = AssignIpMethod::DHCP; - } else if (ipType == IpTypeJs::IP_TYPE_STATIC) { + } else if (IpTypeJs(ipType) == IpTypeJs::IP_TYPE_STATIC) { cppConfig.wifiIpConfig.assignMethod = AssignIpMethod::STATIC; ConfigStaticIp(env, object, cppConfig); } @@ -968,9 +968,9 @@ static void DeviceConfigToJsArray(const napi_env& env, std::vector(IpTypeJs::IP_TYPE_STATIC), result); } else { - SetValueInt32(env, "ipType", IpTypeJs::IP_TYPE_DHCP, result); + SetValueInt32(env, "ipType", static_cast(IpTypeJs::IP_TYPE_DHCP), result); } WIFI_LOGI("DeviceConfigToJsArray, idx:%{public}d, assignMethod:%{public}d!", vecDeviceConfigs[idx].wifiIpConfig.assignMethod); -- Gitee From 27e15edc277a30c8a09c5f949ead29f69370bb08 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Wed, 20 Jul 2022 20:47:57 +0800 Subject: [PATCH 257/491] bugfix for roaming 0720 Signed-off-by: yanxiaotao@huawei.com --- wifi/frameworks/js/napi/src/wifi_napi_device.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp index 2a65fe6..0424635 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp @@ -973,7 +973,7 @@ static void DeviceConfigToJsArray(const napi_env& env, std::vector(IpTypeJs::IP_TYPE_DHCP), result); } WIFI_LOGI("DeviceConfigToJsArray, idx:%{public}d, assignMethod:%{public}d!", - vecDeviceConfigs[idx].wifiIpConfig.assignMethod); + idx, static_cast(vecDeviceConfigs[idx].wifiIpConfig.assignMethod)); napi_value ipCfgObj; napi_create_object(env, &ipCfgObj); -- Gitee From b3c886a831cd21c39d05dc0e49da9800163fa201 Mon Sep 17 00:00:00 2001 From: YOUR_NAME Date: Fri, 15 Jul 2022 09:16:30 +0800 Subject: [PATCH 258/491] =?UTF-8?q?Feat=EF=BC=9AModify=20the=20GetScanInfo?= =?UTF-8?q?List=20API=20to=20get=20more=20scan=20data?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: YOUR_NAME --- .../native/c_adapter/src/wifi_c_device.cpp | 4 ++++ wifi/interfaces/kits/c/wifi_device_config.h | 18 ++++++++++++++---- wifi/interfaces/kits/c/wifi_scan_info.h | 18 ++++++++++++++++++ 3 files changed, 36 insertions(+), 4 deletions(-) diff --git a/wifi/frameworks/native/c_adapter/src/wifi_c_device.cpp b/wifi/frameworks/native/c_adapter/src/wifi_c_device.cpp index 8629e72..07857bd 100644 --- a/wifi/frameworks/native/c_adapter/src/wifi_c_device.cpp +++ b/wifi/frameworks/native/c_adapter/src/wifi_c_device.cpp @@ -86,6 +86,10 @@ WifiErrorCode GetScanInfoList(WifiScanInfo *result, unsigned int *size) result->rssi = each.rssi; result->band = each.band; result->frequency = each.frequency; + result->channelWidth = WifiChannelWidth(static_cast(each.channelWidth)); + result->centerFrequency0 = each.centerFrequency0; + result->centerFrequency1 = each.centerFrequency1; + result->timestamp = each.timestamp; ++result; } return GetCErrorCode(ret); diff --git a/wifi/interfaces/kits/c/wifi_device_config.h b/wifi/interfaces/kits/c/wifi_device_config.h index 1a0805d..537f519 100644 --- a/wifi/interfaces/kits/c/wifi_device_config.h +++ b/wifi/interfaces/kits/c/wifi_device_config.h @@ -98,13 +98,23 @@ typedef enum { /** Invalid security type */ WIFI_SEC_TYPE_INVALID = -1, /** Open */ - WIFI_SEC_TYPE_OPEN, + WIFI_SEC_TYPE_OPEN = 0, /** Wired Equivalent Privacy (WEP) */ - WIFI_SEC_TYPE_WEP, + WIFI_SEC_TYPE_WEP = 1, /** Pre-shared key (PSK) */ - WIFI_SEC_TYPE_PSK, + WIFI_SEC_TYPE_PSK = 2, + /** Ethernet Automatic Protection (EAP) */ + WIFI_SEC_TYPE_EAP = 3, /** Simultaneous Authentication of Equals (SAE) */ - WIFI_SEC_TYPE_SAE, + WIFI_SEC_TYPE_SAE = 4, + /** EAP suite B */ + WIFI_SEC_TYPE_EAP_SUITE_B = 5, + /** Opportunistic Wireless Encryption (OWE) */ + WIFI_SEC_TYPE_OWE = 6, + /** WAPI cert */ + WIFI_SEC_TYPE_WAPI_CERT = 7, + /** WAPI PSK */ + WIFI_SEC_TYPE_WAPI_PSK = 8, } WifiSecurityType; /** diff --git a/wifi/interfaces/kits/c/wifi_scan_info.h b/wifi/interfaces/kits/c/wifi_scan_info.h index bad573c..1fa15a4 100644 --- a/wifi/interfaces/kits/c/wifi_scan_info.h +++ b/wifi/interfaces/kits/c/wifi_scan_info.h @@ -36,6 +36,7 @@ #ifndef WIFI_SCAN_INFO_C_H #define WIFI_SCAN_INFO_C_H +#include #include "wifi_device_config.h" /** @@ -43,6 +44,15 @@ */ #define WIFI_SCAN_HOTSPOT_LIMIT 64 +typedef enum { + WIDTH_20MHZ = 0, + WIDTH_40MHZ = 1, + WIDTH_80MHZ = 2, + WIDTH_160MHZ = 3, + WIDTH_80MHZ_PLUS = 4, + WIDTH_INVALID +} WifiChannelWidth; + /** * @brief Represents the Wi-Fi scan result information. * @@ -61,6 +71,14 @@ typedef struct { int band; /** Frequency in MHz */ int frequency; + /** Wifi channel width. For details, see {@link WifiChannelWidth}. */ + WifiChannelWidth channelWidth; + /** Center frequency in MHz */ + int centerFrequency0; + /** Center frequency in MHz */ + int centerFrequency1; + /** Time stamp */ + int64_t timestamp; } WifiScanInfo; #endif // WIFI_SCAN_INFO_C_H -- Gitee From 6cdeb96c90e9921f690160ec652ebaf39ed5ecb4 Mon Sep 17 00:00:00 2001 From: z00588131 Date: Thu, 21 Jul 2022 05:26:37 +0000 Subject: [PATCH 259/491] fix crash problem Signed-off-by: z00588131 --- wifi/frameworks/js/napi/inc/wifi_napi_event.h | 64 ++++++++++++------- .../js/napi/src/wifi_napi_event.cpp | 33 ++++++++-- 2 files changed, 67 insertions(+), 30 deletions(-) diff --git a/wifi/frameworks/js/napi/inc/wifi_napi_event.h b/wifi/frameworks/js/napi/inc/wifi_napi_event.h index c3357ee..7aa35e3 100644 --- a/wifi/frameworks/js/napi/inc/wifi_napi_event.h +++ b/wifi/frameworks/js/napi/inc/wifi_napi_event.h @@ -27,16 +27,46 @@ namespace OHOS { namespace Wifi { +class RegObj { +public: + RegObj() : m_regEnv(0), m_regHanderRef(nullptr) { + } + explicit RegObj(const napi_env& env, const napi_ref& ref) { + m_regEnv = env; + m_regHanderRef = ref; + } + + ~RegObj() { + } + + bool operator == (const RegObj& other) const { + return m_regEnv == other.m_regEnv && m_regHanderRef == other.m_regHanderRef; + } + + bool operator != (const RegObj& other) const { + return !(*this == other); + } + + bool operator < (const RegObj& other) const { + return m_regEnv < other.m_regEnv || (m_regEnv == other.m_regEnv && m_regHanderRef < other.m_regHanderRef); + } + + napi_env m_regEnv; + napi_ref m_regHanderRef; +}; + class AsyncEventData { public: napi_env env; napi_ref callbackRef; std::function packResult; + std::function isObjExist; - explicit AsyncEventData(napi_env e, napi_ref r, std::function p) { + explicit AsyncEventData(napi_env e, napi_ref r, std::function p, std::function checkFunc) { env = e; callbackRef = r; packResult = p; + isObjExist = checkFunc; } AsyncEventData() = delete; @@ -45,28 +75,11 @@ public: } }; -class RegObj { -public: - RegObj() : m_regEnv(0), m_regHanderRef(nullptr) { - } - explicit RegObj(const napi_env& env, const napi_ref& ref) { - m_regEnv = env; - m_regHanderRef = ref; - } - - ~RegObj() { - } - - napi_env m_regEnv; - napi_ref m_regHanderRef; -}; - static std::shared_mutex g_regInfoMutex; static std::map> g_eventRegisterInfo; class NapiEvent { public: - bool CheckIsRegister(const std::string& type); napi_value CreateResult(const napi_env& env, int value); napi_value CreateResult(const napi_env& env, const StationInfo& info); napi_value CreateResult(const napi_env& env, napi_value placehoders); @@ -74,18 +87,21 @@ public: napi_value CreateResult(const napi_env& env, const std::vector& devices); napi_value CreateResult(const napi_env& env, const WifiP2pLinkedInfo& info); void EventNotify(AsyncEventData *asyncEvent); + bool IsRegisterObjectExist(const RegObj& regObj, const std::string& type); + std::vector GetRegisterObjects(const std::string& type); template void CheckAndNotify(const std::string& type, const T& obj) { - std::shared_lock guard(g_regInfoMutex); - if (!CheckIsRegister(type)) { + std::vector vecObj = GetRegisterObjects(type); + if (vecObj.empty()) { return; } - - std::vector& vecObj = g_eventRegisterInfo[type]; for (auto& each : vecObj) { - auto func = [this, env = each.m_regEnv, obj] () -> napi_value { return CreateResult(env, obj); }; - AsyncEventData *asyncEvent = new (std::nothrow)AsyncEventData(each.m_regEnv, each.m_regHanderRef, func); + auto resultFunc = [this, env = each.m_regEnv, obj] () -> napi_value { return CreateResult(env, obj); }; + auto isObjExistFunc = [this, eventObj = each, type] () -> bool + { return IsRegisterObjectExist(eventObj, type); }; + AsyncEventData *asyncEvent = + new (std::nothrow)AsyncEventData(each.m_regEnv, each.m_regHanderRef, resultFunc, isObjExistFunc); if (asyncEvent == nullptr) { return; } diff --git a/wifi/frameworks/js/napi/src/wifi_napi_event.cpp b/wifi/frameworks/js/napi/src/wifi_napi_event.cpp index 0bdeb72..4dbe5d7 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_event.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_event.cpp @@ -128,9 +128,14 @@ void NapiEvent::EventNotify(AsyncEventData *asyncEvent) napi_get_undefined(asyncData->env, &undefine); napi_get_reference_value(asyncData->env, asyncData->callbackRef, &handler); jsEvent = asyncData->packResult(); - WIFI_LOGI("Push event to js, env: %{private}p, ref : %{private}p", asyncData->env, &asyncData->callbackRef); - if (napi_call_function(asyncData->env, nullptr, handler, 1, &jsEvent, &undefine) != napi_ok) { - WIFI_LOGE("Report event to Js failed"); + { + std::shared_lock guard(g_regInfoMutex); + WIFI_LOGI("Push event to js, env: %{private}p, ref : %{private}p", + asyncData->env, &asyncData->callbackRef); + if (asyncData->isObjExist() && + (napi_call_function(asyncData->env, nullptr, handler, 1, &jsEvent, &undefine) != napi_ok)) { + WIFI_LOGE("Report event to Js failed"); + } } napi_close_handle_scope(asyncData->env, scope); @@ -143,12 +148,28 @@ void NapiEvent::EventNotify(AsyncEventData *asyncEvent) ); } -bool NapiEvent::CheckIsRegister(const std::string& type) +bool NapiEvent::IsRegisterObjectExist(const RegObj& regObj, const std::string& type) { - return g_eventRegisterInfo.find(type) != g_eventRegisterInfo.end(); + /* The caller has lock protect, don't need to lock again */ + auto iter = g_eventRegisterInfo.find(type); + if (iter == g_eventRegisterInfo.end()) { + return false; + } + return (std::find(iter->second.begin(), iter->second.end(), regObj) != iter->second.end()); +} + +std::vector NapiEvent::GetRegisterObjects(const std::string& type) +{ + std::shared_lock guard(g_regInfoMutex); + auto iter = g_eventRegisterInfo.find(type); + if (iter == g_eventRegisterInfo.end()) { + return std::vector(); + } + return g_eventRegisterInfo[type]; } -napi_value NapiEvent::CreateResult(const napi_env& env, int value) { +napi_value NapiEvent::CreateResult(const napi_env& env, int value) +{ napi_value result; napi_create_int32(env, value, &result); return result; -- Gitee From 995ae3aae08ea4d6a34c3faaf3ecda01ffaa3032 Mon Sep 17 00:00:00 2001 From: chen Date: Thu, 21 Jul 2022 19:18:17 +0800 Subject: [PATCH 260/491] modify samgr partname Signed-off-by: chen Change-Id: I4d3aa323f7ecedd5df7696084c9fdc4ad993d8f4 --- wifi/frameworks/native/BUILD.gn | 12 ++++----- .../wifi_framework/wifi_manage/BUILD.gn | 26 +++++++++---------- .../wifi_manage/unittest/BUILD.gn | 2 +- .../wifi_manage/wifi_sta/BUILD.gn | 2 +- wifi/utils/src/BUILD.gn | 2 +- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/wifi/frameworks/native/BUILD.gn b/wifi/frameworks/native/BUILD.gn index 99a5cbf..50b6c99 100644 --- a/wifi/frameworks/native/BUILD.gn +++ b/wifi/frameworks/native/BUILD.gn @@ -42,8 +42,8 @@ if (defined(ohos_lite)) { "$WIFI_ROOT_DIR/utils/inc", "//base/hiviewdfx/hilog_lite/interfaces/native/innerkits", "//foundation/communication/ipc/interfaces/innerkits/c/ipc/include", - "//foundation/distributedschedule/samgr_lite/interfaces/innerkits/registry", - "//foundation/distributedschedule/samgr_lite/interfaces/innerkits/samgr", + "//foundation/systemabilitymgr/samgr_lite/interfaces/innerkits/registry", + "//foundation/systemabilitymgr/samgr_lite/interfaces/innerkits/samgr", "//third_party/bounds_checking_function/include", "//utils/native/lite/include", ] @@ -53,7 +53,7 @@ if (defined(ohos_lite)) { "$WIFI_ROOT_DIR/utils/src:wifi_utils", "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", "//foundation/communication/ipc/interfaces/innerkits/c/ipc:ipc_single", - "//foundation/distributedschedule/samgr_lite/samgr:samgr", + "//foundation/systemabilitymgr/samgr_lite/samgr:samgr", "//third_party/bounds_checking_function:libsec_shared", ] @@ -81,13 +81,13 @@ if (defined(ohos_lite)) { "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", "//foundation/arkui/ace_engine/frameworks/base/utils", "//foundation/arkui/ace_engine/frameworks", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", + "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include", "$WIFI_ROOT_DIR/frameworks/native/include", "$WIFI_ROOT_DIR/frameworks/native/interfaces", "$WIFI_ROOT_DIR/frameworks/native/c_adapter/inc", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log/", - "//foundation/distributedschedule/samgr/adapter/interfaces/innerkits/include", + "//foundation/systemabilitymgr/samgr/adapter/interfaces/innerkits/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", "$DHCP_ROOT_DIR/interfaces/inner_api/include", "$DHCP_ROOT_DIR/services/mgr_service/include", @@ -202,7 +202,7 @@ if (defined(ohos_lite)) { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", "$WIFI_ROOT_DIR/utils/src:wifi_utils", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/bounds_checking_function:libsec_static", "//utils/native/base:utils", ] diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn index 5cb9732..92dd77e 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn @@ -76,8 +76,8 @@ if (defined(ohos_lite)) { "$WIFI_ROOT_DIR/utils/inc", "//base/hiviewdfx/hilog_lite/interfaces/native/innerkits", "//foundation/communication/ipc/interfaces/innerkits/c/ipc/include", - "//foundation/distributedschedule/samgr_lite/interfaces/innerkits/registry", - "//foundation/distributedschedule/samgr_lite/interfaces/innerkits/samgr", + "//foundation/systemabilitymgr/samgr_lite/interfaces/innerkits/registry", + "//foundation/systemabilitymgr/samgr_lite/interfaces/innerkits/samgr", "//third_party/bounds_checking_function/include", "//utils/native/lite/include", ] @@ -87,7 +87,7 @@ if (defined(ohos_lite)) { "$WIFI_ROOT_DIR/utils/src:wifi_utils", "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", "//foundation/communication/ipc/interfaces/innerkits/c/ipc:ipc_single", - "//foundation/distributedschedule/samgr_lite/samgr:samgr", + "//foundation/systemabilitymgr/samgr_lite/samgr:samgr", "//third_party/bounds_checking_function:libsec_shared", ] @@ -135,8 +135,8 @@ if (defined(ohos_lite)) { "$WIFI_ROOT_DIR/utils/inc", "//base/hiviewdfx/hilog_lite/interfaces/native/innerkits", "//foundation/communication/ipc/interfaces/innerkits/c/ipc/include", - "//foundation/distributedschedule/samgr_lite/interfaces/innerkits/registry", - "//foundation/distributedschedule/samgr_lite/interfaces/innerkits/samgr", + "//foundation/systemabilitymgr/samgr_lite/interfaces/innerkits/registry", + "//foundation/systemabilitymgr/samgr_lite/interfaces/innerkits/samgr", "//third_party/bounds_checking_function/include", "//utils/native/lite/include", ] @@ -147,7 +147,7 @@ if (defined(ohos_lite)) { "$WIFI_ROOT_DIR/utils/src:wifi_utils", "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", "//foundation/communication/ipc/interfaces/innerkits/c/ipc:ipc_single", - "//foundation/distributedschedule/samgr_lite/samgr:samgr", + "//foundation/systemabilitymgr/samgr_lite/samgr:samgr", "//third_party/bounds_checking_function:libsec_shared", ] @@ -164,7 +164,7 @@ if (defined(ohos_lite)) { "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", "//foundation/arkui/ace_engine/frameworks/base/utils", "//foundation/arkui/ace_engine/frameworks", - "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk/", + "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk/", "$WIFI_ROOT_DIR/frameworks/native/interfaces", "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", @@ -351,7 +351,7 @@ if (defined(ohos_lite)) { "$WIFI_ROOT_DIR/utils/src:wifi_utils", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//foundation/communication/netmanager_base/services/netmanagernative:netsys_native_manager", - "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", + "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//utils/native/base:utils", ] @@ -366,7 +366,7 @@ if (defined(ohos_lite)) { "ipc:ipc_core", "netmanager_base:net_conn_manager_if", "safwk:system_ability_fwk", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", ] defines = [ "FEATURE_AP_SUPPORT", @@ -389,7 +389,7 @@ if (defined(ohos_lite)) { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", "$WIFI_ROOT_DIR/utils/src:wifi_utils", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", + "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//utils/native/base:utils", ] @@ -404,7 +404,7 @@ if (defined(ohos_lite)) { ":wifi_scan_service_impl", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", + "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//utils/native/base:utils", ] @@ -419,7 +419,7 @@ if (defined(ohos_lite)) { ":wifi_manager_service", "$WIFI_ROOT_DIR/utils/src:wifi_utils", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", + "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//utils/native/base:utils", ] @@ -434,7 +434,7 @@ if (defined(ohos_lite)) { ":wifi_p2p_service_impl", "$WIFI_ROOT_DIR/utils/src:wifi_utils", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", + "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//utils/native/base:utils", ] diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn index 7a0e53c..bdd6c96 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn @@ -74,7 +74,7 @@ ohos_unittest("manager_unittest") { "//base/security/access_token/interfaces/innerkits/accesstoken/include", "//foundation/communication/netmanager_base/services/netmanagernative/include/netsys", "$WIFI_ROOT_DIR/utils/inc", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", + "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include", "//foundation/communication/netmanager_base/frameworks/native/netmanagernative", "//foundation/communication/netmanager_base/interfaces/innerkits/netmanagernative/include", ] diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn index df83804..1762507 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn @@ -100,7 +100,7 @@ ohos_unittest("wifi_sta_unittest") { "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", "//foundation/arkui/ace_engine/frameworks/base/utils", "//foundation/arkui/ace_engine/frameworks", - "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk/", + "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk/", "//foundation/ability/ability_lite/interfaces/kits/want_lite/", "$WIFI_ROOT_DIR/utils/inc", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_common", diff --git a/wifi/utils/src/BUILD.gn b/wifi/utils/src/BUILD.gn index b1e45f1..5140838 100644 --- a/wifi/utils/src/BUILD.gn +++ b/wifi/utils/src/BUILD.gn @@ -59,7 +59,7 @@ if (defined(ohos_lite)) { deps = [ "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//utils/native/base:utils", ] -- Gitee From f5cce601dff90d9ba951b12b94a414a122be6ab7 Mon Sep 17 00:00:00 2001 From: lujunxin Date: Thu, 21 Jul 2022 11:34:27 +0000 Subject: [PATCH 261/491] update peer info in FetchNewDeviceInfo Signed-off-by: lujunxin --- .../wifi_manage/wifi_p2p/p2p_state_machine.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp index 66d9cac..57012d7 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp @@ -224,11 +224,7 @@ bool P2pStateMachine::ReawakenPersistentGroup(WifiP2pConfigInternal &config) con if (isJoin && !device.IsGroupLimit()) { if (groupName.empty()) { - WifiP2pDevice peerInfo; - if (WifiP2PHalInterface::GetInstance().GetP2pPeer(config.GetDeviceAddress(), peerInfo) == - WifiErrorNo::WIFI_IDL_OPT_OK) { - groupName = peerInfo.GetNetworkName(); - } + groupName = device.GetNetworkName(); } int networkId = groupManager.GetGroupNetworkId(device, groupName); if (networkId >= 0) { @@ -298,7 +294,15 @@ WifiP2pDevice P2pStateMachine::FetchNewerDeviceInfo(const std::string &deviceAdd WIFI_LOGE("Invalid device address."); return device; } - return deviceManager.GetDevices(device.GetDeviceAddress()); + WifiP2pDevice newDevice = deviceManager.GetDevices(deviceAddr); + if (WifiP2PHalInterface::GetInstance().GetP2pPeer(deviceAddr, device) == + WifiErrorNo::WIFI_IDL_OPT_OK) { + int groupCap = device.GetGroupCapabilitys(); + deviceManager.UpdateDeviceGroupCap(deviceAddr, groupCap); + newDevice.SetGroupCapabilitys(groupCap); + newDevice.SetNetworkName(device.GetNetworkName()); + } + return newDevice; } void P2pStateMachine::DealGroupCreationFailed() -- Gitee From 8f524565f041de7ffd31c6144b582a9197b54320 Mon Sep 17 00:00:00 2001 From: lujunxin Date: Thu, 21 Jul 2022 13:59:06 +0000 Subject: [PATCH 262/491] dont update group info when sta and p2p use same interface Signed-off-by: lujunxin --- .../wifi_manage/wifi_p2p/p2p_state_machine.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp index 57012d7..fd332ad 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp @@ -904,11 +904,14 @@ bool P2pStateMachine::IsInterfaceReuse() const void P2pStateMachine::UpdateGroupInfoToWpa() const { WIFI_LOGI("Start update group info to wpa"); - std::vector grpInfo = groupManager.GetGroups(); /* 1) In the scenario of interface reuse, the configuration of sta may be deleted * 2) Dont remove p2p networks of wpa_s in initial phase after device reboot */ - if (!IsInterfaceReuse() && grpInfo.size() > 0) { + if (IsInterfaceReuse()) { + return; + } + std::vector grpInfo = groupManager.GetGroups(); + if (grpInfo.size() > 0) { if (WifiP2PHalInterface::GetInstance().RemoveNetwork(-1) != WIFI_IDL_OPT_OK) { WIFI_LOGE("Failed to delete all group info before update group info to wpa! Stop update!"); return; -- Gitee From 47d54bb0c18840b64c98c9aecc3b1b1cbfb310b3 Mon Sep 17 00:00:00 2001 From: z00588131 Date: Fri, 22 Jul 2022 04:59:22 +0000 Subject: [PATCH 263/491] fix code check warnings Signed-off-by: z00588131 --- dhcp/services/dhcp_server/src/dhcp_address_pool.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dhcp/services/dhcp_server/src/dhcp_address_pool.c b/dhcp/services/dhcp_server/src/dhcp_address_pool.c index 2a4ddd5..80b6887 100644 --- a/dhcp/services/dhcp_server/src/dhcp_address_pool.c +++ b/dhcp/services/dhcp_server/src/dhcp_address_pool.c @@ -192,14 +192,14 @@ uint32_t AddressDistribute(DhcpAddressPool *pool, uint8_t macAddr[DHCP_HWADDR_LE if (pool->distribution == 0) { pool->distribution = pool->addressRange.beginAddress; } - int total = HostTotal(pool->netmask); + uint32_t total = HostTotal(pool->netmask); uint32_t distIp = pool->distribution; if (!distIp || distIp < pool->addressRange.beginAddress) { distIp = pool->addressRange.beginAddress; } int distSucess = 0; int outOfRange = 0; - for (int i = 0; i < total; i++) { + for (uint32_t i = 0; i < total; i++) { int offset = 0; if (i == 0) { offset = NextIpOffset(pool->netmask); -- Gitee From 531e32c3f9939312a0a9dafd3e5ae11265e72626 Mon Sep 17 00:00:00 2001 From: lujunxin Date: Fri, 22 Jul 2022 08:19:31 +0000 Subject: [PATCH 264/491] adjust permission of wifi process Signed-off-by: lujunxin --- wifi/services/wifi_standard/etc/init/wifi_standard.cfg | 2 +- .../wifi_standard/wifi_hal/etc/init/wifi_hal_service.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wifi/services/wifi_standard/etc/init/wifi_standard.cfg b/wifi/services/wifi_standard/etc/init/wifi_standard.cfg index 9a1e878..e931f7c 100644 --- a/wifi/services/wifi_standard/etc/init/wifi_standard.cfg +++ b/wifi/services/wifi_standard/etc/init/wifi_standard.cfg @@ -11,7 +11,7 @@ "path" : ["/system/bin/sa_main", "/system/profile/wifi_manager_service.xml"], "uid" : "wifi", "gid" : ["wifi", "shell", "dhcp"], - "caps" : ["CAP_CHOWN", "CAP_NET_ADMIN", "CAP_NET_BIND_SERVICE", "CAP_NET_RAW"], + "caps" : ["CAP_NET_ADMIN", "CAP_NET_BIND_SERVICE", "CAP_NET_RAW"], "jobs" : { "on-start" : "services:wifi_manager_service" }, diff --git a/wifi/services/wifi_standard/wifi_hal/etc/init/wifi_hal_service.cfg b/wifi/services/wifi_standard/wifi_hal/etc/init/wifi_hal_service.cfg index 22db872..758e2de 100644 --- a/wifi/services/wifi_standard/wifi_hal/etc/init/wifi_hal_service.cfg +++ b/wifi/services/wifi_standard/wifi_hal/etc/init/wifi_hal_service.cfg @@ -2,7 +2,7 @@ "services" : [{ "name" : "wifi_hal_service", "path" : ["/system/bin/wifi_hal_service"], - "caps" : ["CAP_CHOWN", "CAP_NET_ADMIN", "CAP_NET_BIND_SERVICE", "CAP_NET_RAW"], + "caps" : ["CAP_NET_ADMIN", "CAP_NET_RAW"], "uid" : "wifi", "gid" : ["wifi", "shell"], "secon" : "u:r:wifi_hal_service:s0" -- Gitee From 9ac5a7cfe53628d937167810749059a6ae471aec Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Fri, 22 Jul 2022 20:06:11 +0800 Subject: [PATCH 265/491] bugfix for roaming 0722 Signed-off-by: yanxiaotao@huawei.com --- .../js/napi/src/wifi_napi_device.cpp | 2 +- .../wifi_manage/common/state_machine.cpp | 11 ++++- .../wifi_manage/wifi_manager.cpp | 4 +- .../wifi_manage/wifi_sta/sta_define.h | 1 + .../wifi_manage/wifi_sta/sta_monitor.cpp | 2 +- .../wifi_sta/sta_state_machine.cpp | 48 +++++++++++++++---- .../wifi_manage/wifi_sta/sta_state_machine.h | 6 +++ 7 files changed, 60 insertions(+), 14 deletions(-) diff --git a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp index 0424635..83d782a 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp @@ -972,7 +972,7 @@ static void DeviceConfigToJsArray(const napi_env& env, std::vector(IpTypeJs::IP_TYPE_DHCP), result); } - WIFI_LOGI("DeviceConfigToJsArray, idx:%{public}d, assignMethod:%{public}d!", + WIFI_LOGI("DeviceConfigToJsArray, idx:%{public}d, assignMethod:%{public}x!", idx, static_cast(vecDeviceConfigs[idx].wifiIpConfig.assignMethod)); napi_value ipCfgObj; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp index 32fd33f..5fc474d 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp @@ -503,6 +503,11 @@ int StateMachineHandler::MoveSequenceToStateVector() void StateMachineHandler::SwitchState(State *targetState) { + if (targetState != nullptr) { + LOGE("targetState is null."); + return; + } + LOGE("SwitchState, Switch to targetState: %{public}s.", targetState->GetStateName().c_str()); pTargetState = static_cast(targetState); } @@ -535,8 +540,10 @@ void StateMachineHandler::PerformSwitchState(State *msgProcessedState, InternalM State *targetState = pTargetState; if (targetState != nullptr) { - LOGD("StateMachineHandler::PerformSwitchState targetState name is: %{public}s", - targetState->GetStateName().c_str()); + if (pFirstState != nullptr) { + LOGI("StateMachineHandler::PerformSwitchState, Switch %{public}s -->> %{public}s", + pFirstState->GetStateName().c_str(), targetState->GetStateName().c_str()); + } while (true) { StateInfo *commonStateInfo = BuildSequenceStateVector(targetState); mSwitchingStateFlag = true; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp index fd437f4..5f97b17 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp @@ -303,7 +303,7 @@ InitStatus WifiManager::GetInitStatus() void WifiManager::CloseStaService(void) { - WIFI_LOGD("close sta service"); + WIFI_LOGI("close sta service"); WifiServiceManager::GetInstance().UnloadService(WIFI_SERVICE_STA); WifiConfigCenter::GetInstance().SetWifiMidState(WifiOprMidState::CLOSED); WifiConfigCenter::GetInstance().SetWifiStaCloseTime(); @@ -313,7 +313,7 @@ void WifiManager::CloseStaService(void) #ifdef FEATURE_AP_SUPPORT void WifiManager::CloseApService(int id) { - WIFI_LOGD("close %{public}d ap service", id); + WIFI_LOGI("close %{public}d ap service", id); WifiServiceManager::GetInstance().UnloadService(WIFI_SERVICE_AP, id); WifiConfigCenter::GetInstance().SetApMidState(WifiOprMidState::CLOSED, id); WifiSettings::GetInstance().SetHotspotState(static_cast(ApState::AP_STATE_CLOSED), id); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_define.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_define.h index 2a17042..f1b90c9 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_define.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_define.h @@ -61,6 +61,7 @@ namespace Wifi { #define WIFI_SVR_CMD_STA_WPA_FULL_CONNECT_EVENT 0x3018 #define WIFI_SVR_CMD_STA_WPA_ASSOC_REJECT_EVENT 0x3019 #define WIFI_SVR_CMD_STA_BSSID_CHANGED_EVENT 0x301A +#define WIFI_SVR_CMD_STA_DHCP_RESULT_NOTIFY_EVENT 0x301B #define WPA_BLOCK_LIST_CLEAR_EVENT 0x4001 diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp index 380d468..8ad1dc4 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp @@ -121,7 +121,7 @@ void StaMonitor::OnBssidChangedCallBack(const std::string &reason, const std::st WifiLinkedInfo linkedInfo; pStaStateMachine->GetLinkedInfo(linkedInfo); if (linkedInfo.connState != ConnState::CONNECTED) { - WIFI_LOGW("Sta ignored the event for NOT in connected status!, connState: %d", + WIFI_LOGW("Sta ignored the event for NOT in connected status!, connState: %{public}d", linkedInfo.connState); return; } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp index 83cfcd7..0c12f32 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp @@ -863,11 +863,12 @@ void StaStateMachine::DealConnectionEvent(InternalMessage *msg) void StaStateMachine::DealDisconnectEvent(InternalMessage *msg) { - LOGD("Enter DealDisconnectEvent.\n"); + LOGI("Enter DealDisconnectEvent.\n"); if (msg == nullptr) { WIFI_LOGE("msg is null\n"); } if (wpsState != SetupMethod::INVALID) { + WIFI_LOGE("wpsState is INVALID\n"); return; } #ifndef OHOS_ARCH_LITE @@ -1336,6 +1337,7 @@ void StaStateMachine::OnNetworkConnectionEvent(int networkId, std::string bssid) { InternalMessage *msg = CreateMessage(); if (msg == nullptr) { + LOGE("msg is nullptr.\n"); return; } @@ -1349,6 +1351,7 @@ void StaStateMachine::OnBssidChangedEvent(std::string reason, std::string bssid) { InternalMessage *msg = CreateMessage(); if (msg == nullptr) { + LOGE("msg is nullptr.\n"); return; } @@ -1358,6 +1361,19 @@ void StaStateMachine::OnBssidChangedEvent(std::string reason, std::string bssid) SendMessage(msg); } +void StaStateMachine::OnDhcpResultNotifyEvent(bool result) +{ + InternalMessage *msg = CreateMessage(); + if (msg == nullptr) { + LOGE("msg is nullptr.\n"); + return; + } + + msg->SetMessageName(WIFI_SVR_CMD_STA_DHCP_RESULT_NOTIFY_EVENT); + msg->SetParam1(result); + SendMessage(msg); +} + /* --------------------------- state machine Separating State ------------------------------ */ StaStateMachine::SeparatingState::SeparatingState() : State("SeparatingState") {} @@ -1413,6 +1429,7 @@ bool StaStateMachine::SeparatedState::ExecuteStateMsg(InternalMessage *msg) return false; } + WIFI_LOGI("SeparatedState-msgCode=%{public}d received.\n", msg->GetMessageName()); bool ret = NOT_EXECUTED; switch (msg->GetMessageName()) { case WIFI_SVR_CMD_STA_NETWORK_DISCONNECTION_EVENT: @@ -1459,6 +1476,7 @@ bool StaStateMachine::ApLinkedState::ExecuteStateMsg(InternalMessage *msg) return false; } + WIFI_LOGI("ApLinkedState-msgCode=%{public}d received.\n", msg->GetMessageName()); bool ret = NOT_EXECUTED; switch (msg->GetMessageName()) { /* The current state of StaStateMachine transfers to SeparatingState when @@ -1488,6 +1506,7 @@ bool StaStateMachine::ApLinkedState::ExecuteStateMsg(InternalMessage *msg) void StaStateMachine::DisConnectProcess() { + WIFI_LOGI("Enter DisConnectProcess!"); staCallback.OnStaConnChanged(OperateResState::DISCONNECT_DISCONNECTING, linkedInfo); if (WifiStaHalInterface::GetInstance().Disconnect() == WIFI_IDL_OPT_OK) { WIFI_LOGI("Disconnect() succeed!"); @@ -1712,7 +1731,20 @@ bool StaStateMachine::GetIpState::ExecuteStateMsg(InternalMessage *msg) } bool ret = NOT_EXECUTED; - WIFI_LOGI("GetIpState-msgCode=%{public}d not handled.\n", msg->GetMessageName()); + bool result = false; + WIFI_LOGI("GetIpState-msgCode=%{public}d received.\n", msg->GetMessageName()); + switch (msg->GetMessageName()) { + case WIFI_SVR_CMD_STA_DHCP_RESULT_NOTIFY_EVENT: { + ret = EXECUTED; + result = msg->GetParam1(); + WIFI_LOGI("GetIpState, get ip result:%{public}d.\n", result); + pStaStateMachine->SwitchState(pStaStateMachine->pLinkedState); + break; + } + default: + break; + } + return ret; } @@ -1770,8 +1802,8 @@ bool StaStateMachine::ConfigStaticIpAddress(StaticIpAddress &staticIpAddress) void StaStateMachine::HandleNetCheckResult(StaNetState netState, const std::string portalUrl) { WIFI_LOGI("Enter HandleNetCheckResult, netState:%{public}d.", netState); - if (linkedInfo.connState == ConnState::DISCONNECTED) { - WIFI_LOGE("Network disconnected\n"); + if (linkedInfo.connState != ConnState::CONNECTED) { + WIFI_LOGE("connState is NOT in connected state, connState:%{public}d\n", linkedInfo.connState); return; } @@ -2075,7 +2107,7 @@ void StaStateMachine::DhcpResultNotify::OnSuccess(int status, const std::string WIFI_LOGI("DhcpResultNotify::OnSuccess, getIpSucNum=%{public}d, isRoam=%{public}d", pStaStateMachine->getIpSucNum, pStaStateMachine->isRoam); - pStaStateMachine->SwitchState(pStaStateMachine->pLinkedState); + pStaStateMachine->OnDhcpResultNotifyEvent(true); if (pStaStateMachine->getIpSucNum == 0 || pStaStateMachine->isRoam) { pStaStateMachine->SaveLinkstate(ConnState::CONNECTED, DetailedState::CONNECTED); pStaStateMachine->staCallback.OnStaConnChanged( @@ -2089,10 +2121,10 @@ void StaStateMachine::DhcpResultNotify::OnSuccess(int status, const std::string WIFI_LOGI("DhcpResultNotify::OnSuccess, stop dhcp client"); if (pStaStateMachine->pDhcpService != nullptr) { - if (pStaStateMachine->currentTpType == IPTYPE_IPV4) { - pStaStateMachine->pDhcpService->StopDhcpClient(IF_NAME, false); - } else { + if (pStaStateMachine->currentTpType == IPTYPE_IPV6) { pStaStateMachine->pDhcpService->StopDhcpClient(IF_NAME, true); + } else { + pStaStateMachine->pDhcpService->StopDhcpClient(IF_NAME, false); } } return; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h index 6e9bc06..449610d 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h @@ -351,6 +351,12 @@ public: * @param bssid: the mac address of wifi(in) */ void OnBssidChangedEvent(std::string reason, std::string bssid); + /** + * @Description dhcp result notify events + * + * @param result: true-success, false-fail(in) + */ + void OnDhcpResultNotifyEvent(bool result); /** * @Description Register sta callback function * -- Gitee From d7cf2964f33a13530d8a3089a44990abfd7039dc Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Sat, 23 Jul 2022 10:14:58 +0000 Subject: [PATCH 266/491] code error fix Signed-off-by: zhangfeng --- .../wifi_framework/wifi_manage/common/state_machine.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp index 5fc474d..359fd37 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp @@ -503,7 +503,7 @@ int StateMachineHandler::MoveSequenceToStateVector() void StateMachineHandler::SwitchState(State *targetState) { - if (targetState != nullptr) { + if (targetState == nullptr) { LOGE("targetState is null."); return; } -- Gitee From 16b6078f7c4063836ac1ed16ff271e4964b2ecc9 Mon Sep 17 00:00:00 2001 From: lujunxin Date: Sat, 23 Jul 2022 11:30:41 +0000 Subject: [PATCH 267/491] fix security issue Signed-off-by: lujunxin --- .../mgr_service/include/dhcp_service.h | 5 +-- .../services/mgr_service/src/dhcp_service.cpp | 32 ++++++++++++++++++- .../common/net_helper/if_config.cpp | 23 +++++++++++++ .../common/net_helper/if_config.h | 7 +++- 4 files changed, 63 insertions(+), 4 deletions(-) diff --git a/dhcp/services/mgr_service/include/dhcp_service.h b/dhcp/services/mgr_service/include/dhcp_service.h index d7d0b04..bcbfb45 100644 --- a/dhcp/services/mgr_service/include/dhcp_service.h +++ b/dhcp/services/mgr_service/include/dhcp_service.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -178,6 +178,7 @@ public: private: int InitServerService(void); + bool CheckIfaceValid(const std::string& ifname); private: std::unique_ptr m_pClientService; @@ -185,4 +186,4 @@ private: }; } // namespace Wifi } // namespace OHOS -#endif \ No newline at end of file +#endif diff --git a/dhcp/services/mgr_service/src/dhcp_service.cpp b/dhcp/services/mgr_service/src/dhcp_service.cpp index ad667f9..de57843 100644 --- a/dhcp/services/mgr_service/src/dhcp_service.cpp +++ b/dhcp/services/mgr_service/src/dhcp_service.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -14,6 +14,7 @@ */ #include "dhcp_service.h" +#include #include "wifi_logger.h" DEFINE_WIFILOG_DHCP_LABEL("DhcpService"); @@ -36,6 +37,9 @@ DhcpService::~DhcpService() int DhcpService::StartDhcpClient(const std::string& ifname, bool bIpv6) { + if (!CheckIfaceValid(ifname)) { + return DHCP_OPT_FAILED; + } if (m_pClientService == nullptr) { m_pClientService = std::make_unique(); if (m_pClientService == nullptr) { @@ -49,6 +53,9 @@ int DhcpService::StartDhcpClient(const std::string& ifname, bool bIpv6) int DhcpService::StopDhcpClient(const std::string& ifname, bool bIpv6) { + if (!CheckIfaceValid(ifname)) { + return DHCP_OPT_FAILED; + } if (m_pClientService == nullptr) { m_pClientService = std::make_unique(); if (m_pClientService == nullptr) { @@ -102,6 +109,9 @@ int DhcpService::ReleaseDhcpClient(const std::string& ifname) int DhcpService::StartDhcpServer(const std::string& ifname) { + if (!CheckIfaceValid(ifname)) { + return DHCP_OPT_FAILED; + } if (InitServerService() != DHCP_OPT_SUCCESS) { WIFI_LOGE("DhcpService::StartDhcpServer() InitServerService failed!"); return DHCP_OPT_FAILED; @@ -211,5 +221,25 @@ int DhcpService::InitServerService() } return DHCP_OPT_SUCCESS; } + +bool DhcpService::CheckIfaceValid(const std::string& ifname) +{ + struct if_nameindex *ifidxs, *ifni; + + ifidxs = if_nameindex(); + if (ifidxs == nullptr) { + WIFI_LOGE("can not get interfaces"); + return false; + } + for (ifni = ifidxs; !(ifni->if_index == 0 && ifni->if_name == nullptr); ifni++) { + if (strncmp(ifni->if_name, ifname.c_str(), strlen(ifni->if_name)) == 0) { + if_freenameindex(ifidxs); + return true; + } + } + if_freenameindex(ifidxs); + WIFI_LOGE("invalid interface: %{public}s", ifname.c_str()); + return false; +} } // namespace Wifi } // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp b/wifi/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp index e84065c..a3d2589 100644 --- a/wifi/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp +++ b/wifi/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp @@ -148,6 +148,9 @@ void IfConfig::AddIpAddr( { LOGI("Add ip address, ifName = %{public}s", ifName.c_str()); + if (!CheckIfaceValid(ifName)) { + return; + } if (ipType == static_cast(IpType::IPTYPE_IPV4)) { struct ifreq ifr; if (memset_s(&ifr, sizeof(ifr), 0, sizeof(ifr)) != EOK || @@ -264,6 +267,26 @@ bool IfConfig::GetIpAddr(const std::string& ifName, std::string& ipAddr) return true; } +bool IfConfig::CheckIfaceValid(const std::string& ifname) +{ + struct if_nameindex *ifidxs, *ifni; + + ifidxs = if_nameindex(); + if (ifidxs == nullptr) { + LOGE("can not get interfaces"); + return false; + } + for (ifni = ifidxs; !(ifni->if_index == 0 && ifni->if_name == nullptr); ifni++) { + if (strncmp(ifni->if_name, ifname.c_str(), strlen(ifni->if_name)) == 0) { + if_freenameindex(ifidxs); + return true; + } + } + if_freenameindex(ifidxs); + LOGE("invalid interface: %{public}s", ifname.c_str()); + return false; +} + #ifdef OHOS_ARCH_LITE /** * @Description : Set the network card routing, DNS diff --git a/wifi/services/wifi_standard/wifi_framework/common/net_helper/if_config.h b/wifi/services/wifi_standard/wifi_framework/common/net_helper/if_config.h index 854d62d..d14861e 100644 --- a/wifi/services/wifi_standard/wifi_framework/common/net_helper/if_config.h +++ b/wifi/services/wifi_standard/wifi_framework/common/net_helper/if_config.h @@ -85,7 +85,12 @@ private: * @return bool - true: success, false: failed */ bool AsyncExecuteCommand(const std::string& cmd); + + /** + * @Description : Check if the interface name is valid + */ + bool CheckIfaceValid(const std::string& ifname); }; } // namespace Wifi } // namespace OHOS -#endif \ No newline at end of file +#endif -- Gitee From 205403abb9125e9ce57a05de657618127599dcc2 Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Sun, 24 Jul 2022 23:05:19 +0800 Subject: [PATCH 268/491] bugfix for untrusted configs 0724 Signed-off-by: yanxiaotao --- .../js/napi/src/wifi_napi_device.cpp | 19 +----- .../native/src/wifi_device_impl.cpp | 6 ++ wifi/frameworks/native/src/wifi_device_impl.h | 8 +++ .../native/src/wifi_device_proxy.cpp | 35 +++++++++++ .../frameworks/native/src/wifi_device_proxy.h | 8 +++ .../wifi_manage/wifi_device_service_impl.cpp | 60 ++++++++++++++++--- .../wifi_manage/wifi_device_service_impl.h | 4 ++ .../wifi_manage/wifi_device_stub.cpp | 16 ++++- 8 files changed, 128 insertions(+), 28 deletions(-) diff --git a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp index 83d782a..ae9db90 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp @@ -401,7 +401,7 @@ napi_value AddUntrustedConfig(napi_env env, napi_callback_info info) asyncContext->executeFunc = [&](void* data) -> void { DeviceConfigContext *context = static_cast(data); TRACE_FUNC_CALL_NAME("wifiDevicePtr->AddUntrustedConfig"); - ErrCode ret = wifiDevicePtr->AddDeviceConfig(*context->config, context->networkId); + ErrCode ret = wifiDevicePtr->AddCandidateConfig(*context->config, context->networkId); if (context->networkId < 0 || ret != WIFI_OPT_SUCCESS) { context->networkId = -1; } @@ -466,21 +466,8 @@ napi_value RemoveUntrustedConfig(napi_env env, napi_callback_info info) asyncContext->executeFunc = [&](void* data) -> void { DeviceConfigContext *context = static_cast(data); - if (context->config == nullptr) { - return; - } - TRACE_FUNC_CALL_NAME("wifiDevicePtr->RemoveUntrustedConfig"); - int networkId = context->config->networkId; - if (networkId < 0) { - networkId = GetDeviceConfigId(context->config); - } - if (networkId < 0) { - WIFI_LOGE("RemoveUntrustedConfig parameter is invalid."); - context->errorCode = WIFI_OPT_INVALID_PARAM; - return; - } - WIFI_LOGI("RemoveUntrustedConfig: %{public}d", networkId); - context->errorCode = wifiDevicePtr->RemoveDevice(networkId); + TRACE_FUNC_CALL_NAME("wifiDevicePtr->RemoveCandidateConfig"); + context->errorCode = wifiDevicePtr->RemoveCandidateConfig(*context->config); }; asyncContext->completeFunc = [&](void* data) -> void { diff --git a/wifi/frameworks/native/src/wifi_device_impl.cpp b/wifi/frameworks/native/src/wifi_device_impl.cpp index 29b80ef..bb6c134 100644 --- a/wifi/frameworks/native/src/wifi_device_impl.cpp +++ b/wifi/frameworks/native/src/wifi_device_impl.cpp @@ -109,6 +109,12 @@ ErrCode WifiDeviceImpl::PutWifiProtectRef(const std::string &protectName) return client_->PutWifiProtectRef(protectName); } +ErrCode WifiDeviceImpl::RemoveCandidateConfig(const WifiDeviceConfig &config) +{ + RETURN_IF_FAIL(client_); + return client_->RemoveUntrustedConfig(config); +} + ErrCode WifiDeviceImpl::AddCandidateConfig(const WifiDeviceConfig &config, int &networkId) { RETURN_IF_FAIL(client_); diff --git a/wifi/frameworks/native/src/wifi_device_impl.h b/wifi/frameworks/native/src/wifi_device_impl.h index 781a096..dd53202 100644 --- a/wifi/frameworks/native/src/wifi_device_impl.h +++ b/wifi/frameworks/native/src/wifi_device_impl.h @@ -84,6 +84,14 @@ public: */ virtual ErrCode RemoveCandidateConfig(int networkId) override; + /** + * @Description Remove a specified candidate hotspot configuration. + * + * @param config - WifiDeviceConfig object + * @return ErrCode - operation result + */ + virtual ErrCode RemoveCandidateConfig(const WifiDeviceConfig &config) override; + /** * @Description Connect to a candidate specified network. * diff --git a/wifi/frameworks/native/src/wifi_device_proxy.cpp b/wifi/frameworks/native/src/wifi_device_proxy.cpp index 3841bae..78c5d7a 100644 --- a/wifi/frameworks/native/src/wifi_device_proxy.cpp +++ b/wifi/frameworks/native/src/wifi_device_proxy.cpp @@ -277,6 +277,39 @@ ErrCode WifiDeviceProxy::AddCandidateConfig(const WifiDeviceConfig &config, int return WIFI_OPT_SUCCESS; } +ErrCode WifiDeviceProxy::RemoveCandidateConfig(const WifiDeviceConfig &config) +{ + if (mRemoteDied) { + WIFI_LOGE("failed to `%{public}s`,remote service is died!", __func__); + return WIFI_OPT_FAILED; + } + MessageOption option; + MessageParcel data, reply; + if (!data.WriteInterfaceToken(GetDescriptor())) { + WIFI_LOGE("Write interface token error: %{public}s", __func__); + return WIFI_OPT_FAILED; + } + data.WriteInt32(0); + /* Write a flag: 1-remove config by networkId, 2-remove config by WifiDeviceConfig */ + data.WriteInt32(2); + WriteDeviceConfig(config, data); + int error = Remote()->SendRequest(WIFI_SVR_CMD_REMOVE_CANDIDATE_CONFIG, data, reply, option); + if (error != ERR_NONE) { + WIFI_LOGE("Set Attr(%{public}d) failed,error=%{public}d", WIFI_SVR_CMD_REMOVE_CANDIDATE_CONFIG, error); + return WIFI_OPT_FAILED; + } + int exception = reply.ReadInt32(); + if (exception) { + return WIFI_OPT_FAILED; + } + int ret = reply.ReadInt32(); + if (ret != WIFI_OPT_SUCCESS) { + return ErrCode(ret); + } + + return WIFI_OPT_SUCCESS; +} + ErrCode WifiDeviceProxy::RemoveCandidateConfig(int networkId) { if (mRemoteDied) { @@ -290,6 +323,8 @@ ErrCode WifiDeviceProxy::RemoveCandidateConfig(int networkId) return WIFI_OPT_FAILED; } data.WriteInt32(0); + /* Write a flag: 1-remove config by networkId, 2-remove config by WifiDeviceConfig */ + data.WriteInt32(1); data.WriteInt32(networkId); int error = Remote()->SendRequest(WIFI_SVR_CMD_REMOVE_CANDIDATE_CONFIG, data, reply, option); if (error != ERR_NONE) { diff --git a/wifi/frameworks/native/src/wifi_device_proxy.h b/wifi/frameworks/native/src/wifi_device_proxy.h index d0f8dde..98dc27c 100644 --- a/wifi/frameworks/native/src/wifi_device_proxy.h +++ b/wifi/frameworks/native/src/wifi_device_proxy.h @@ -81,6 +81,14 @@ public: */ ErrCode PutWifiProtectRef(const std::string &protectName) override; + /** + * @Description Remove a specified untrusted hotspot configuration. + * + * @param config - WifiDeviceConfig object + * @return ErrCode - operation result + */ + ErrCode RemoveCandidateConfig(const WifiDeviceConfig &config) override; + /** * @Description Adds a specified untrusted hotspot configuration. * diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp index 7d810de..1c999ed 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp @@ -455,34 +455,76 @@ ErrCode WifiDeviceServiceImpl::ConnectToCandidateConfig(int networkId) return pService->ConnectToCandidateConfig(uid, networkId); } -ErrCode WifiDeviceServiceImpl::RemoveCandidateConfig(int networkId) +ErrCode WifiDeviceServiceImpl::CheckRemoveCandidateConfig(void) { if (WifiPermissionUtils::VerifySetWifiInfoPermission() == PERMISSION_DENIED) { - WIFI_LOGE("RemoveCandidateConfig:VerifySetWifiInfoPermission PERMISSION_DENIED!"); + WIFI_LOGE("CheckRemoveCandidateConfig:VerifySetWifiInfoPermission PERMISSION_DENIED!"); return WIFI_OPT_PERMISSION_DENIED; } - if (networkId < INVALID_NETWORK_ID) { - WIFI_LOGE("RemoveCandidateConfig networkId invalid param!"); - return WIFI_OPT_INVALID_PARAM; - } - if (!IsStaServiceRunning()) { - WIFI_LOGE("RemoveCandidateConfig:IsStaServiceRunning not running!"); + WIFI_LOGE("CheckRemoveCandidateConfig:IsStaServiceRunning not running!"); return WIFI_OPT_STA_NOT_OPENED; } + return WIFI_SUCCESS; +} + +ErrCode WifiDeviceServiceImpl::RemoveCandidateConfig(const WifiDeviceConfig &config) +{ + ErrCode ret = CheckRemoveCandidateConfig(); + if (ret != WIFI_SUCCESS) { + return ret; + } + /* check the caller's uid */ int uid = 0; if (CheckCallingUid(uid) != WIFI_OPT_SUCCESS) { WIFI_LOGE("CheckCallingUid failed!"); return WIFI_OPT_INVALID_PARAM; } - IStaService *pService = WifiServiceManager::GetInstance().GetStaServiceInst(); if (pService == nullptr) { + WIFI_LOGE("pService is nullptr!"); return WIFI_OPT_STA_NOT_OPENED; } + /* get all candidate configs */ + std::vector configs; + if (WifiConfigCenter::GetInstance().GetCandidateConfigs(uid, configs) != 0) { + WIFI_LOGE("NOT find the caller's configs!"); + return WIFI_OPT_INVALID_CONFIG; + } + /* find the networkId of the removed config */ + int networkId == INVALID_NETWORK_ID + for (size_t i = 0; i < configs.size(); i++) { + if (configs[i].ssid == config.ssid) { + networkId = configs[i].networkId; + WIFI_LOGI("find the removed config, networkId:%{public}d!"); + break; + } + } + /* removed the config */ + if (networkId != INVALID_NETWORK_ID) { + return pService->RemoveCandidateConfig(uid, networkId); + } + return WIFI_OPT_INVALID_CONFIG; +} +ErrCode WifiDeviceServiceImpl::RemoveCandidateConfig(int networkId) +{ + ErrCode ret = CheckRemoveCandidateConfig(); + if (ret != WIFI_SUCCESS) { + return ret; + } + int uid = 0; + if (CheckCallingUid(uid) != WIFI_OPT_SUCCESS) { + WIFI_LOGE("CheckCallingUid failed!"); + return WIFI_OPT_INVALID_PARAM; + } + IStaService *pService = WifiServiceManager::GetInstance().GetStaServiceInst(); + if (pService == nullptr) { + WIFI_LOGE("pService is nullptr!"); + return WIFI_OPT_STA_NOT_OPENED; + } if (networkId == INVALID_NETWORK_ID) { return pService->RemoveAllCandidateConfig(uid); } else { diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h index db8fa47..99b45a7 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h @@ -141,8 +141,12 @@ public: ErrCode ConnectToCandidateConfig(int networkId) override; + ErrCode CheckRemoveCandidateConfig(void) override; + ErrCode RemoveCandidateConfig(int networkId) override; + ErrCode RemoveCandidateConfig(const WifiDeviceConfig &config) override; + ErrCode GetCandidateConfigs(std::vector &result) override; #ifndef OHOS_ARCH_LITE diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp index 18eee3b..a2e0e7d 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp @@ -673,9 +673,19 @@ void WifiDeviceStub::OnConnectToCandidateConfig(uint32_t code, MessageParcel &da void WifiDeviceStub::OnRemoveCandidateConfig(uint32_t code, MessageParcel &data, MessageParcel &reply) { WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); - int networkId = data.ReadInt32(); - ErrCode ret = RemoveCandidateConfig(networkId); - + ErrCode ret = WIFI_OPT_FAILED; + int flag = data.ReadInt32(); + /* Read a flag: 1-remove config by networkId, 2-remove config by WifiDeviceConfig */ + if (flag == 1) { + int networkId = data.ReadInt32(); + WIFI_LOGI("Remove candidate config by networkId: %{public}d", networkId); + ret = RemoveCandidateConfig(networkId); + } else { + WifiDeviceConfig config; + ReadWifiDeviceConfig(data, config); + WIFI_LOGD("Remove candidate config by config: %{private}s", config.ssid.c_str()); + ret = RemoveCandidateConfig(config); + } reply.WriteInt32(0); reply.WriteInt32(ret); return; -- Gitee From 4844fea657a840906e373ee72d86991b6aef0fde Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Sun, 24 Jul 2022 23:31:47 +0800 Subject: [PATCH 269/491] bugfix for untrusted configs 0724 Signed-off-by: yanxiaotao --- .../wifi_manage/wifi_device_service_impl.cpp | 11 ++++++----- .../wifi_manage/wifi_device_service_impl.h | 3 +-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp index 1c999ed..7a4c0d6 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp @@ -467,13 +467,13 @@ ErrCode WifiDeviceServiceImpl::CheckRemoveCandidateConfig(void) return WIFI_OPT_STA_NOT_OPENED; } - return WIFI_SUCCESS; + return WIFI_OPT_SUCCESS; } ErrCode WifiDeviceServiceImpl::RemoveCandidateConfig(const WifiDeviceConfig &config) { ErrCode ret = CheckRemoveCandidateConfig(); - if (ret != WIFI_SUCCESS) { + if (ret != WIFI_OPT_SUCCESS) { return ret; } /* check the caller's uid */ @@ -494,8 +494,9 @@ ErrCode WifiDeviceServiceImpl::RemoveCandidateConfig(const WifiDeviceConfig &con return WIFI_OPT_INVALID_CONFIG; } /* find the networkId of the removed config */ - int networkId == INVALID_NETWORK_ID - for (size_t i = 0; i < configs.size(); i++) { + int networkId = INVALID_NETWORK_ID; + size_t size = configs.size() + for (size_t i = 0; i < size; i++) { if (configs[i].ssid == config.ssid) { networkId = configs[i].networkId; WIFI_LOGI("find the removed config, networkId:%{public}d!"); @@ -512,7 +513,7 @@ ErrCode WifiDeviceServiceImpl::RemoveCandidateConfig(const WifiDeviceConfig &con ErrCode WifiDeviceServiceImpl::RemoveCandidateConfig(int networkId) { ErrCode ret = CheckRemoveCandidateConfig(); - if (ret != WIFI_SUCCESS) { + if (ret != WIFI_OPT_SUCCESS) { return ret; } int uid = 0; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h index 99b45a7..a3c4bde 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h @@ -141,8 +141,6 @@ public: ErrCode ConnectToCandidateConfig(int networkId) override; - ErrCode CheckRemoveCandidateConfig(void) override; - ErrCode RemoveCandidateConfig(int networkId) override; ErrCode RemoveCandidateConfig(const WifiDeviceConfig &config) override; @@ -164,6 +162,7 @@ private: static void SaBasicDump(std::string& result); static void SigHandler(int sig); static bool IsProcessNeedToRestart(); + ErrCode CheckRemoveCandidateConfig(void); #ifndef OHOS_ARCH_LITE void RegisterAppRemoved(); void UnRegisterAppRemoved(); -- Gitee From ecc509a5dd0583daa737505085525d96875f7c39 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 25 Jul 2022 08:30:24 +0800 Subject: [PATCH 270/491] bugfix for untrusted config 0725 Signed-off-by: yanxiaotao@huawei.com --- wifi/frameworks/native/interfaces/i_wifi_device.h | 8 ++++++++ .../wifi_manage/wifi_device_service_impl.cpp | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/wifi/frameworks/native/interfaces/i_wifi_device.h b/wifi/frameworks/native/interfaces/i_wifi_device.h index 19d81d9..4f52646 100644 --- a/wifi/frameworks/native/interfaces/i_wifi_device.h +++ b/wifi/frameworks/native/interfaces/i_wifi_device.h @@ -92,6 +92,14 @@ public: */ virtual ErrCode RemoveCandidateConfig(int networkId) = 0; + /** + * @Description Remove the wifi candidate device config by WifiDeviceConfig + * + * @param config - the candidate config to be removed + * @return ErrCode - operation result + */ + virtual ErrCode RemoveCandidateConfig(const WifiDeviceConfig &config) = 0; + /** * @Description Connect to a candidate specified network. * diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp index 7a4c0d6..d8d6d31 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp @@ -495,7 +495,7 @@ ErrCode WifiDeviceServiceImpl::RemoveCandidateConfig(const WifiDeviceConfig &con } /* find the networkId of the removed config */ int networkId = INVALID_NETWORK_ID; - size_t size = configs.size() + size_t size = configs.size(); for (size_t i = 0; i < size; i++) { if (configs[i].ssid == config.ssid) { networkId = configs[i].networkId; -- Gitee From 7112db12e65ed9e2782ec56ade356d46ea2e3855 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 25 Jul 2022 09:19:46 +0800 Subject: [PATCH 271/491] bugfix for untrusted config 0725 Signed-off-by: yanxiaotao@huawei.com --- .../wifi_framework/wifi_manage/wifi_device_service_impl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp index d8d6d31..632f97d 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp @@ -499,7 +499,7 @@ ErrCode WifiDeviceServiceImpl::RemoveCandidateConfig(const WifiDeviceConfig &con for (size_t i = 0; i < size; i++) { if (configs[i].ssid == config.ssid) { networkId = configs[i].networkId; - WIFI_LOGI("find the removed config, networkId:%{public}d!"); + WIFI_LOGI("find the removed config, networkId:%{public}d!", networkId); break; } } -- Gitee From 3afe211bee240369f3611e82a07b894404a8e9ed Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 25 Jul 2022 11:04:09 +0800 Subject: [PATCH 272/491] bugfix for untrusted config 0725 Signed-off-by: yanxiaotao@huawei.com --- wifi/frameworks/native/src/wifi_device_impl.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/wifi/frameworks/native/src/wifi_device_impl.cpp b/wifi/frameworks/native/src/wifi_device_impl.cpp index bb6c134..5818036 100644 --- a/wifi/frameworks/native/src/wifi_device_impl.cpp +++ b/wifi/frameworks/native/src/wifi_device_impl.cpp @@ -109,12 +109,6 @@ ErrCode WifiDeviceImpl::PutWifiProtectRef(const std::string &protectName) return client_->PutWifiProtectRef(protectName); } -ErrCode WifiDeviceImpl::RemoveCandidateConfig(const WifiDeviceConfig &config) -{ - RETURN_IF_FAIL(client_); - return client_->RemoveUntrustedConfig(config); -} - ErrCode WifiDeviceImpl::AddCandidateConfig(const WifiDeviceConfig &config, int &networkId) { RETURN_IF_FAIL(client_); @@ -127,6 +121,12 @@ ErrCode WifiDeviceImpl::RemoveCandidateConfig(int networkId) return client_->RemoveCandidateConfig(networkId); } +ErrCode WifiDeviceImpl::RemoveCandidateConfig(const WifiDeviceConfig &config) +{ + RETURN_IF_FAIL(client_); + return client_->RemoveCandidateConfig(config); +} + ErrCode WifiDeviceImpl::ConnectToCandidateConfig(int networkId) { RETURN_IF_FAIL(client_); -- Gitee From 3d4e3b642c10b324254519da26d18b98c7948ae3 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 25 Jul 2022 15:11:58 +0800 Subject: [PATCH 273/491] bugfix for untrusted config 0725 Signed-off-by: yanxiaotao@huawei.com --- wifi/frameworks/native/include/wifi_device.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/wifi/frameworks/native/include/wifi_device.h b/wifi/frameworks/native/include/wifi_device.h index 3205d2d..5b18abd 100644 --- a/wifi/frameworks/native/include/wifi_device.h +++ b/wifi/frameworks/native/include/wifi_device.h @@ -85,6 +85,14 @@ public: */ virtual ErrCode RemoveCandidateConfig(int networkId) = 0; + /** + * @Description Remove a specified candidate hotspot configuration. + * + * @param config - WifiDeviceConfig object + * @return ErrCode - operation result + */ + virtual ErrCode RemoveCandidateConfig(const WifiDeviceConfig &config) = 0; + /** * @Description Connect to a candidate specified network. * -- Gitee From 856a1c87860f807d41bf8a10471dc5f814737dd4 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 25 Jul 2022 18:59:31 +0800 Subject: [PATCH 274/491] bugfix for untrusted config 0725 Signed-off-by: yanxiaotao@huawei.com --- wifi/frameworks/js/napi/src/wifi_napi_device.cpp | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp index ae9db90..25bef69 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp @@ -422,21 +422,6 @@ napi_value AddUntrustedConfig(napi_env env, napi_callback_info info) return DoAsyncWork(env, asyncContext, argc, argv, nonCallbackArgNum); } -static int GetDeviceConfigId(WifiDeviceConfig *config) -{ - std::vector vecConfigs; - ErrCode ret = wifiDevicePtr->GetDeviceConfigs(vecConfigs); - if (ret != WIFI_OPT_SUCCESS) { - return INVALID_NETWORK_ID; - } - for (auto& each : vecConfigs) { - if (each.ssid == config->ssid) { - return each.networkId; - } - } - return INVALID_NETWORK_ID; -} - napi_value RemoveUntrustedConfig(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; -- Gitee From 8fc0b8a970f5d384ab655955fd512e8851893af0 Mon Sep 17 00:00:00 2001 From: lujunxin Date: Tue, 26 Jul 2022 01:39:58 +0000 Subject: [PATCH 275/491] cannot terminate wpa_s Signed-off-by: lujunxin --- .../wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c index 0c837d6..6fd773e 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c @@ -1209,7 +1209,7 @@ static int WpaCliCmdWpaTerminate(WifiWpaStaInterface *this) } char cmd[CMD_BUFFER_SIZE] = {0}; char buf[REPLY_BUF_SMALL_LENGTH] = {0}; - if (snprintf_s(cmd, sizeof(cmd), sizeof(cmd) - 1, "IFNAME=%s terminate", this->ifname) < 0) { + if (snprintf_s(cmd, sizeof(cmd), sizeof(cmd) - 1, "IFNAME=%s TERMINATE", this->ifname) < 0) { LOGE("WpaCliCmdWpaTerminate, snprintf err"); return -1; } -- Gitee From e9daf9419732702acc9ef613bc5c87669e7ad07b Mon Sep 17 00:00:00 2001 From: hongtao Date: Thu, 21 Jul 2022 10:47:35 +0800 Subject: [PATCH 276/491] change utils path Signed-off-by: hongtao Change-Id: Ic4aee02641a6134ab927b7d2926dd79765c497c7 --- dhcp/services/dhcp_client/BUILD.gn | 8 ++--- dhcp/services/dhcp_server/BUILD.gn | 6 ++-- dhcp/services/mgr_service/BUILD.gn | 5 ++- dhcp/test/services/dhcp_client/BUILD.gn | 6 ++-- .../services/dhcp_server/unittest/BUILD.gn | 9 ++--- dhcp/test/services/mgr_service/BUILD.gn | 10 +++--- wifi/frameworks/js/napi/BUILD.gn | 12 +++---- wifi/frameworks/native/BUILD.gn | 4 +-- .../wifi_standard/ipc_framework/cRPC/BUILD.gn | 16 ++++----- .../wifi_framework/wifi_manage/BUILD.gn | 34 +++++++++++-------- .../wifi_manage/idl_client/BUILD.gn | 8 +++-- .../wifi_manage/wifi_ap/BUILD.gn | 8 +++-- .../wifi_manage/wifi_common/BUILD.gn | 10 +++--- .../wifi_manage/wifi_p2p/BUILD.gn | 4 +-- .../wifi_manage/wifi_scan/BUILD.gn | 8 +++-- .../wifi_manage/wifi_sta/BUILD.gn | 4 +-- wifi/services/wifi_standard/wifi_hal/BUILD.gn | 5 +-- .../wifi_sta/adddeviceconfig_fuzzer/BUILD.gn | 10 +++--- .../wifi_sta/connecttodevice_fuzzer/BUILD.gn | 10 +++--- wifi/test/wifi_client/BUILD.gn | 10 +++--- .../ipc_framework/cRPC/unittest/BUILD.gn | 9 ++--- .../wifi_framework/common/unittest/BUILD.gn | 9 ++--- .../wifi_manage/idl_client/unittest/BUILD.gn | 20 ++++++----- .../wifi_manage/unittest/BUILD.gn | 6 ++-- .../wifi_manage/wifi_ap/BUILD.gn | 10 +++--- .../wifi_manage/wifi_p2p/test/BUILD.gn | 6 ++-- .../wifi_manage/wifi_scan/BUILD.gn | 10 +++--- .../wifi_manage/wifi_sta/BUILD.gn | 6 ++-- .../wifi_standard/wifi_hal/unittest/BUILD.gn | 20 ++++++----- wifi/utils/src/BUILD.gn | 2 +- 30 files changed, 150 insertions(+), 135 deletions(-) diff --git a/dhcp/services/dhcp_client/BUILD.gn b/dhcp/services/dhcp_client/BUILD.gn index 54c6ce3..fc82144 100644 --- a/dhcp/services/dhcp_client/BUILD.gn +++ b/dhcp/services/dhcp_client/BUILD.gn @@ -62,21 +62,19 @@ if (defined(ohos_lite)) { include_dirs = local_base_include_dirs include_dirs += [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", "//third_party/openssl/include", ] - deps = [ - "//third_party/openssl:libcrypto_static", - "//utils/native/base:utils", - ] + deps = [ "//third_party/openssl:libcrypto_static" ] cflags_cc = [ "-fno-rtti" ] external_deps = [ "ability_base:want", "bundle_framework:appexecfwk_base", + "c_utils:utils", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", diff --git a/dhcp/services/dhcp_server/BUILD.gn b/dhcp/services/dhcp_server/BUILD.gn index 184fa93..936a0c2 100644 --- a/dhcp/services/dhcp_server/BUILD.gn +++ b/dhcp/services/dhcp_server/BUILD.gn @@ -70,15 +70,15 @@ if (defined(ohos_lite)) { sources = local_base_sources include_dirs = local_base_include_dirs - include_dirs += [ "//utils/native/base/include" ] + include_dirs += [ "//commonlibrary/c_utils/base/include" ] - deps = [ "//utils/native/base:utils" ] + external_deps = [ "c_utils:utils" ] cflags_cc = [ "-fno-rtti" ] defines = [ "__OHOS__" ] if (dhcp_hilog_enable) { - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + external_deps += [ "hiviewdfx_hilog_native:libhilog" ] defines += [ "DHCP_HILOG_ENABLE" ] } diff --git a/dhcp/services/mgr_service/BUILD.gn b/dhcp/services/mgr_service/BUILD.gn index 62e7597..605e8c6 100644 --- a/dhcp/services/mgr_service/BUILD.gn +++ b/dhcp/services/mgr_service/BUILD.gn @@ -74,12 +74,10 @@ if (defined(ohos_lite)) { include_dirs = local_base_include_dirs include_dirs += [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", ] - deps = [ "//utils/native/base:utils" ] - cflags_cc = [ "-std=c++17", "-Wall", @@ -88,6 +86,7 @@ if (defined(ohos_lite)) { external_deps = [ "ability_base:want", "bundle_framework:appexecfwk_base", + "c_utils:utils", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", diff --git a/dhcp/test/services/dhcp_client/BUILD.gn b/dhcp/test/services/dhcp_client/BUILD.gn index deeec69..cbf7c1a 100644 --- a/dhcp/test/services/dhcp_client/BUILD.gn +++ b/dhcp/test/services/dhcp_client/BUILD.gn @@ -21,7 +21,7 @@ module_output_path = "dhcp/dhcp_client_test" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "$DHCP_ROOT_DIR/services/dhcp_client/include", ] } @@ -51,7 +51,7 @@ ohos_unittest("dhcp_client_unittest") { "$DHCP_ROOT_DIR/services/dhcp_client/test", "$DHCP_ROOT_DIR/services/dhcp_client/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", "//third_party/openssl/include", ] @@ -59,7 +59,6 @@ ohos_unittest("dhcp_client_unittest") { deps = [ "//third_party/googletest:gmock_main", "//third_party/openssl:libcrypto_static", - "//utils/native/base:utils", ] ldflags = [ @@ -87,6 +86,7 @@ ohos_unittest("dhcp_client_unittest") { external_deps = [ "ability_base:want", "bundle_framework:appexecfwk_base", + "c_utils:utils", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", diff --git a/dhcp/test/services/dhcp_server/unittest/BUILD.gn b/dhcp/test/services/dhcp_server/unittest/BUILD.gn index 0f07e80..e8be341 100644 --- a/dhcp/test/services/dhcp_server/unittest/BUILD.gn +++ b/dhcp/test/services/dhcp_server/unittest/BUILD.gn @@ -19,7 +19,7 @@ module_output_path = "dhcp/dhcp_server_test" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "$DHCP_ROOT_DIR/services/dhcp_server/include", ] } @@ -51,7 +51,7 @@ ohos_unittest("dhcp_server_unittest") { ] include_dirs = [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//third_party/googletest/googlemock/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", "$DHCP_ROOT_DIR/services/dhcp_server/include", @@ -64,9 +64,10 @@ ohos_unittest("dhcp_server_unittest") { deps = [ "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", - "//utils/native/base:utils", ] + external_deps = [ "c_utils:utils" ] + ldflags = [ "-fPIC", "-Wl,-E", @@ -81,7 +82,7 @@ ohos_unittest("dhcp_server_unittest") { configs = [ ":module_private_config" ] if (dhcp_hilog_enable) { - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + external_deps += [ "hiviewdfx_hilog_native:libhilog" ] defines += [ "DHCP_HILOG_ENABLE" ] } diff --git a/dhcp/test/services/mgr_service/BUILD.gn b/dhcp/test/services/mgr_service/BUILD.gn index 9ff544a..0d6c7f9 100644 --- a/dhcp/test/services/mgr_service/BUILD.gn +++ b/dhcp/test/services/mgr_service/BUILD.gn @@ -22,7 +22,7 @@ even_path = "//base/notification/common_event_service" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "$DHCP_ROOT_DIR/services/mgr_service/include", ] } @@ -52,17 +52,14 @@ ohos_unittest("dhcp_manage_unittest") { "$DHCP_ROOT_DIR/interfaces/inner_api/include", "$DHCP_ROOT_DIR/interfaces/inner_api/interfaces", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", "${even_path}/cesfwk/kits/native/include", "${even_path}/cesfwk/innerkits/include", "//base/notification/common_event_service/frameworks/core/include", ] - deps = [ - "//third_party/googletest:gmock_main", - "//utils/native/base:utils", - ] + deps = [ "//third_party/googletest:gmock_main" ] ldflags = [ "-fPIC", @@ -91,6 +88,7 @@ ohos_unittest("dhcp_manage_unittest") { external_deps = [ "ability_base:want", "bundle_framework:appexecfwk_base", + "c_utils:utils", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", diff --git a/wifi/frameworks/js/napi/BUILD.gn b/wifi/frameworks/js/napi/BUILD.gn index 171295a..98ba927 100644 --- a/wifi/frameworks/js/napi/BUILD.gn +++ b/wifi/frameworks/js/napi/BUILD.gn @@ -19,7 +19,7 @@ ohos_shared_library("wifi") { include_dirs = [ "//third_party/node/src", "//native_engine", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", "$WIFI_ROOT_DIR/frameworks/native/interfaces", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", @@ -45,12 +45,12 @@ ohos_shared_library("wifi") { "${ability_runtime_path}/frameworks/native/appkit:app_context", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//foundation/arkui/napi:ace_napi", - "//utils/native/base:utils", ] external_deps = [ "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", + "c_utils:utils", "ipc:ipc_core", ] @@ -64,7 +64,7 @@ ohos_shared_library("wifiext") { include_dirs = [ "//third_party/node/src", "//native_engine", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", "$WIFI_ROOT_DIR/frameworks/native/include", @@ -83,11 +83,11 @@ ohos_shared_library("wifiext") { "${ability_runtime_path}/frameworks/native/appkit:app_context", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//foundation/arkui/napi:ace_napi", - "//utils/native/base:utils", ] external_deps = [ "bundle_framework:appexecfwk_base", + "c_utils:utils", "ipc:ipc_core", ] @@ -101,7 +101,7 @@ ohos_shared_library("wifi_native_js") { include_dirs = [ "//third_party/node/src", "//native_engine", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", "$WIFI_ROOT_DIR/frameworks/js/napi/inc", "$WIFI_ROOT_DIR/frameworks/native/include", @@ -127,7 +127,6 @@ ohos_shared_library("wifi_native_js") { "${ability_runtime_path}/frameworks/native/appkit:app_context", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//foundation/arkui/napi:ace_napi", - "//utils/native/base:utils", ] defines = [ "ENABLE_NAPI_COMPATIBLE" ] @@ -135,6 +134,7 @@ ohos_shared_library("wifi_native_js") { external_deps = [ "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", + "c_utils:utils", "ipc:ipc_core", ] diff --git a/wifi/frameworks/native/BUILD.gn b/wifi/frameworks/native/BUILD.gn index 99a5cbf..08e3fa1 100644 --- a/wifi/frameworks/native/BUILD.gn +++ b/wifi/frameworks/native/BUILD.gn @@ -76,7 +76,7 @@ if (defined(ohos_lite)) { config("wifi_sdk_header") { include_dirs = [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", "//foundation/arkui/ace_engine/frameworks/base/utils", @@ -204,11 +204,11 @@ if (defined(ohos_lite)) { "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/bounds_checking_function:libsec_static", - "//utils/native/base:utils", ] external_deps = [ "ability_base:want", + "c_utils:utils", "common_event_service:cesfwk_innerkits", "ipc:ipc_core", ] diff --git a/wifi/services/wifi_standard/ipc_framework/cRPC/BUILD.gn b/wifi/services/wifi_standard/ipc_framework/cRPC/BUILD.gn index 66ebd0d..5998535 100644 --- a/wifi/services/wifi_standard/ipc_framework/cRPC/BUILD.gn +++ b/wifi/services/wifi_standard/ipc_framework/cRPC/BUILD.gn @@ -80,14 +80,12 @@ if (defined(ohos_lite)) { include_dirs = [ "include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", ] cflags_cc = [ "-fno-rtti" ] - deps = [ - "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//utils/native/base:utils", - ] + deps = [ "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog" ] + external_deps = [ "c_utils:utils" ] subsystem_name = "communication" part_name = "wifi" } @@ -96,15 +94,13 @@ if (defined(ohos_lite)) { sources = crpc_client_sources include_dirs = [ "include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", ] cflags_cc = [ "-fno-rtti" ] - deps = [ - "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//utils/native/base:utils", - ] + deps = [ "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog" ] + external_deps = [ "c_utils:utils" ] subsystem_name = "communication" part_name = "wifi" } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn index 5cb9732..3d7152d 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn @@ -160,7 +160,7 @@ if (defined(ohos_lite)) { } else { config("wifi_manager_service_header") { include_dirs = [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", "//foundation/arkui/ace_engine/frameworks/base/utils", "//foundation/arkui/ace_engine/frameworks", @@ -252,13 +252,11 @@ if (defined(ohos_lite)) { defines += [ "FEATURE_AP_SUPPORT" ] } - deps = [ - ":wifi_p2p_service_impl", - "//utils/native/base:utils", - ] + deps = [ ":wifi_p2p_service_impl" ] external_deps = [ "ability_base:want", "bundle_framework:appexecfwk_base", + "c_utils:utils", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", "ipc:ipc_core", @@ -352,7 +350,6 @@ if (defined(ohos_lite)) { "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//foundation/communication/netmanager_base/services/netmanagernative:netsys_native_manager", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", - "//utils/native/base:utils", ] configs = [ ":wifi_manager_service_header" ] @@ -361,6 +358,7 @@ if (defined(ohos_lite)) { "ability_base:want", "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", + "c_utils:utils", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", "ipc:ipc_core", @@ -390,10 +388,12 @@ if (defined(ohos_lite)) { "$WIFI_ROOT_DIR/utils/src:wifi_utils", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", - "//utils/native/base:utils", ] - external_deps = [ "ipc:ipc_core" ] + external_deps = [ + "c_utils:utils", + "ipc:ipc_core", + ] part_name = "wifi" subsystem_name = "communication" } @@ -405,10 +405,12 @@ if (defined(ohos_lite)) { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", - "//utils/native/base:utils", ] - external_deps = [ "ipc:ipc_core" ] + external_deps = [ + "c_utils:utils", + "ipc:ipc_core", + ] part_name = "wifi" subsystem_name = "communication" } @@ -420,10 +422,12 @@ if (defined(ohos_lite)) { "$WIFI_ROOT_DIR/utils/src:wifi_utils", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", - "//utils/native/base:utils", ] - external_deps = [ "ipc:ipc_core" ] + external_deps = [ + "c_utils:utils", + "ipc:ipc_core", + ] part_name = "wifi" subsystem_name = "communication" } @@ -435,10 +439,12 @@ if (defined(ohos_lite)) { "$WIFI_ROOT_DIR/utils/src:wifi_utils", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", - "//utils/native/base:utils", ] - external_deps = [ "ipc:ipc_core" ] + external_deps = [ + "c_utils:utils", + "ipc:ipc_core", + ] part_name = "wifi" subsystem_name = "communication" } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/BUILD.gn index 9cf4725..ffa7ba7 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/BUILD.gn @@ -40,7 +40,7 @@ config("wifi_fw_common_header") { ] } else { include_dirs += [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", ] } @@ -175,10 +175,12 @@ if (defined(ohos_lite)) { ":net_helper", ":wifi_utils", "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC:crpc_client", - "//utils/native/base:utils", ] - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + external_deps = [ + "c_utils:utils", + "hiviewdfx_hilog_native:libhilog", + ] cflags_cc = [ "-std=c++17", "-fno-rtti", diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn index e769c18..05e30f7 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn @@ -38,7 +38,7 @@ ohos_shared_library("wifi_ap_service") { include_dirs = [ "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/interface", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", "$WIFI_ROOT_DIR/frameworks/native/interfaces", "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", @@ -70,7 +70,10 @@ ohos_shared_library("wifi_ap_service") { "-Wl,-E", ] - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + external_deps = [ + "c_utils:utils", + "hiviewdfx_hilog_native:libhilog", + ] deps = [ "$DHCP_ROOT_DIR/services/mgr_service:dhcp_manager_service", @@ -78,7 +81,6 @@ ohos_shared_library("wifi_ap_service") { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_common:wifi_common_service", "$WIFI_ROOT_DIR/utils/src:wifi_utils", - "//utils/native/base:utils", ] defines = [ "AP_INTF=\"$wifi_feature_with_ap_intf\"" ] diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_common/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_common/BUILD.gn index d838a47..363a969 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_common/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_common/BUILD.gn @@ -30,12 +30,12 @@ ohos_shared_library("wifi_common_service") { sources = [ "wifi_chip_capability.cpp" ] - deps = [ - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", - "//utils/native/base:utils", - ] + deps = [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client" ] - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + external_deps = [ + "c_utils:utils", + "hiviewdfx_hilog_native:libhilog", + ] part_name = "wifi" subsystem_name = "communication" diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/BUILD.gn index 3b3124c..7863096 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/BUILD.gn @@ -65,7 +65,7 @@ ohos_shared_library("wifi_p2p_service") { include_dirs = [ "./", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", "$WIFI_ROOT_DIR/frameworks/native/interfaces", "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", @@ -106,6 +106,7 @@ ohos_shared_library("wifi_p2p_service") { } external_deps = [ + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "netmanager_base:net_conn_manager_if", @@ -117,7 +118,6 @@ ohos_shared_library("wifi_p2p_service") { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_common:wifi_common_service", "$WIFI_ROOT_DIR/utils/src:wifi_utils", - "//utils/native/base:utils", ] part_name = "wifi" diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn index 4cf3673..6c10ff6 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn @@ -84,17 +84,19 @@ if (defined(ohos_lite)) { include_dirs = local_base_include_dirs include_dirs += [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", ] deps = [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", - "//utils/native/base:utils", ] - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + external_deps = [ + "c_utils:utils", + "hiviewdfx_hilog_native:libhilog", + ] cflags_cc = [ "-std=c++17", "-fno-rtti", diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn index fea7f84..c11e20e 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn @@ -102,7 +102,7 @@ if (defined(ohos_lite)) { include_dirs += [ "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", ] cflags_cc = [ @@ -121,10 +121,10 @@ if (defined(ohos_lite)) { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_common:wifi_common_service", "$WIFI_ROOT_DIR/utils/src:wifi_utils", - "//utils/native/base:utils", ] external_deps = [ + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "netmanager_base:net_conn_manager_if", ] diff --git a/wifi/services/wifi_standard/wifi_hal/BUILD.gn b/wifi/services/wifi_standard/wifi_hal/BUILD.gn index 35b8b56..b988ca9 100644 --- a/wifi/services/wifi_standard/wifi_hal/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_hal/BUILD.gn @@ -94,7 +94,7 @@ if (defined(ohos_lite)) { include_dirs = local_base_include_dirs include_dirs += [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", "//third_party/wpa_supplicant/wpa_supplicant-2.9_standard/src/", "//third_party/bounds_checking_function/include/", @@ -108,9 +108,10 @@ if (defined(ohos_lite)) { "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//drivers/peripheral/wlan/hal:wifi_hal", "//third_party/wpa_supplicant/wpa_supplicant-2.9_standard:wpa_client", - "//utils/native/base:utils", ] + external_deps = [ "c_utils:utils" ] + cflags_cc = [ "-fno-rtti" ] defines = [ "AP_INTF=\"$wifi_feature_with_ap_intf\"", diff --git a/wifi/test/fuzztest/wifi_sta/adddeviceconfig_fuzzer/BUILD.gn b/wifi/test/fuzztest/wifi_sta/adddeviceconfig_fuzzer/BUILD.gn index 265a8f4..2f76a02 100644 --- a/wifi/test/fuzztest/wifi_sta/adddeviceconfig_fuzzer/BUILD.gn +++ b/wifi/test/fuzztest/wifi_sta/adddeviceconfig_fuzzer/BUILD.gn @@ -38,12 +38,12 @@ ohos_fuzztest("AddDeviceConfigFuzzTest") { ] sources = [ "adddeviceconfig_fuzzer.cpp" ] - deps = [ - "$WIFI_ROOT_DIR/frameworks/native:wifi_sdk", - "//utils/native/base:utils", - ] + deps = [ "$WIFI_ROOT_DIR/frameworks/native:wifi_sdk" ] - external_deps = [ "ipc:ipc_core" ] + external_deps = [ + "c_utils:utils", + "ipc:ipc_core", + ] part_name = "wifi" subsystem_name = "communication" diff --git a/wifi/test/fuzztest/wifi_sta/connecttodevice_fuzzer/BUILD.gn b/wifi/test/fuzztest/wifi_sta/connecttodevice_fuzzer/BUILD.gn index 3ecfdce..79b276d 100644 --- a/wifi/test/fuzztest/wifi_sta/connecttodevice_fuzzer/BUILD.gn +++ b/wifi/test/fuzztest/wifi_sta/connecttodevice_fuzzer/BUILD.gn @@ -38,12 +38,12 @@ ohos_fuzztest("ConnectToDeviceFuzzTest") { ] sources = [ "connecttodevice_fuzzer.cpp" ] - deps = [ - "$WIFI_ROOT_DIR/frameworks/native:wifi_sdk", - "//utils/native/base:utils", - ] + deps = [ "$WIFI_ROOT_DIR/frameworks/native:wifi_sdk" ] - external_deps = [ "ipc:ipc_core" ] + external_deps = [ + "c_utils:utils", + "ipc:ipc_core", + ] part_name = "wifi" subsystem_name = "communication" diff --git a/wifi/test/wifi_client/BUILD.gn b/wifi/test/wifi_client/BUILD.gn index 51de659..0b78d59 100644 --- a/wifi/test/wifi_client/BUILD.gn +++ b/wifi/test/wifi_client/BUILD.gn @@ -45,12 +45,12 @@ if (defined(ohos_lite)) { include_dirs = local_base_include_dirs include_dirs += [ "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", - "//utils/native/base/include", - ] - deps = [ - "$WIFI_ROOT_DIR/frameworks/native:wifi_sdk", - "//utils/native/base:utils", + "//commonlibrary/c_utils/base/include", ] + deps = [ "$WIFI_ROOT_DIR/frameworks/native:wifi_sdk" ] + + external_deps = [ "c_utils:utils" ] + part_name = "wifi" subsystem_name = "communication" } diff --git a/wifi/test/wifi_standard/ipc_framework/cRPC/unittest/BUILD.gn b/wifi/test/wifi_standard/ipc_framework/cRPC/unittest/BUILD.gn index 2aa3261..6d8b7ad 100644 --- a/wifi/test/wifi_standard/ipc_framework/cRPC/unittest/BUILD.gn +++ b/wifi/test/wifi_standard/ipc_framework/cRPC/unittest/BUILD.gn @@ -18,7 +18,7 @@ module_output_path = "wifi/crpc_test" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "$WIFI_ROOT_DIR/test/wifi_standard/ipc_framework/cRPC/unittest", ] } @@ -42,8 +42,6 @@ ohos_unittest("crpc_unittest") { "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", ] - deps = [ "//utils/native/base:utils" ] - ldflags = [ "-fPIC", "-Wl,--wrap=write", @@ -51,7 +49,10 @@ ohos_unittest("crpc_unittest") { "--coverage", ] - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + external_deps = [ + "c_utils:utils", + "hiviewdfx_hilog_native:libhilog", + ] configs = [ ":module_private_config" ] part_name = "wifi" diff --git a/wifi/test/wifi_standard/wifi_framework/common/unittest/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/common/unittest/BUILD.gn index cd87940..50d17bf 100644 --- a/wifi/test/wifi_standard/wifi_framework/common/unittest/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_framework/common/unittest/BUILD.gn @@ -18,7 +18,7 @@ module_output_path = "wifi/common_test" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "$WIFI_ROOT_DIR/test/wifi_standard/wifi_framework/common/unittest", ] } @@ -54,14 +54,15 @@ ohos_unittest("common_unittest") { "$WIFI_ROOT_DIR/frameworks/native/interfaces", ] - deps = [ "//utils/native/base:utils" ] - ldflags = [ "-fPIC", "--coverage", ] - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + external_deps = [ + "c_utils:utils", + "hiviewdfx_hilog_native:libhilog", + ] configs = [ ":module_private_config" ] part_name = "wifi" diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/BUILD.gn index 1a72811..f47d5e4 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/BUILD.gn @@ -18,7 +18,7 @@ module_output_path = "wifi/idl_client_test" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "$WIFI_ROOT_DIR/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest", ] } @@ -66,22 +66,23 @@ ohos_unittest("idl_client_unittest") { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", ] - deps = [ - "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC:crpc_client", - "//utils/native/base:utils", - ] + deps = + [ "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC:crpc_client" ] ldflags = [ "-fPIC", "--coverage", ] - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + external_deps = [ + "c_utils:utils", + "hiviewdfx_hilog_native:libhilog", + ] configs = [ ":module_private_config" ] part_name = "wifi" @@ -109,7 +110,7 @@ ohos_unittest("mock_wifi_hal_service") { ] include_dirs = [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", "$WIFI_ROOT_DIR/frameworks/native/interfaces", "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", @@ -121,9 +122,10 @@ ohos_unittest("mock_wifi_hal_service") { deps = [ "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC:crpc_server", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//utils/native/base:utils", ] + external_deps = [ "c_utils:utils" ] + cflags_cc = [ "-fno-rtti" ] defines = [] diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn index 7a0e53c..3735952 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn @@ -21,7 +21,7 @@ module_output_path = "wifi/manager_test" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "$WIFI_ROOT_DIR/test/wifi_standard/wifi_framework/wifi_manage/unittest", ] } @@ -65,7 +65,7 @@ ohos_unittest("manager_unittest") { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface", "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", "//base/notification/common_event_service/cesfwk/innerkits/include", @@ -84,7 +84,6 @@ ohos_unittest("manager_unittest") { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", "$WIFI_ROOT_DIR/utils/src:wifi_utils", "//foundation/communication/netmanager_base/services/netmanagernative:netsys_native_manager", - "//utils/native/base:utils", ] ldflags = [ @@ -96,6 +95,7 @@ ohos_unittest("manager_unittest") { "ability_base:want", "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", + "c_utils:utils", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn index 2582e8a..a917789 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn @@ -16,7 +16,7 @@ import("//foundation/communication/wifi/wifi/wifi.gni") config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap", ] } @@ -68,7 +68,7 @@ ohos_unittest("WifiApServiceTest") { "./", "../", "./Mock/", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", "$WIFI_ROOT_DIR/frameworks/native/interfaces", "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", @@ -102,9 +102,11 @@ ohos_unittest("WifiApServiceTest") { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", "$WIFI_ROOT_DIR/utils/src:wifi_utils", "//third_party/googletest:gmock_main", - "//utils/native/base:utils", ] - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + external_deps = [ + "c_utils:utils", + "hiviewdfx_hilog_native:libhilog", + ] defines = [ "AP_INTF=\"$wifi_feature_with_ap_intf\"", "AP_INSTANCE_MAX_NUM=$wifi_feature_with_ap_num", diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn index 9adc9d8..95ec574 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn @@ -16,7 +16,7 @@ import("//foundation/communication/wifi/wifi/wifi.gni") config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test", ] } @@ -118,7 +118,7 @@ ohos_unittest("wifi_p2p_test") { "./", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p", "./Mock", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", "$WIFI_ROOT_DIR/frameworks/native/interfaces", "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", @@ -149,9 +149,9 @@ ohos_unittest("wifi_p2p_test") { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_common:wifi_common_service", "$WIFI_ROOT_DIR/utils/src:wifi_utils", "//third_party/googletest:gmock_main", - "//utils/native/base:utils", ] external_deps = [ + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "netmanager_base:net_conn_manager_if", diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn index 8379c9d..2c27186 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn @@ -18,7 +18,7 @@ module_output_path = "wifi/scan_test" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "$WIFI_ROOT_DIR/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan", ] } @@ -56,7 +56,7 @@ ohos_unittest("wifi_scan_unittest") { ] include_dirs = [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "$WIFI_ROOT_DIR/frameworks/native/interfaces", "$WIFI_ROOT_DIR/services/wifi_standard/sdk/include", "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", @@ -88,10 +88,12 @@ ohos_unittest("wifi_scan_unittest") { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", "//third_party/googletest:gmock_main", - "//utils/native/base:utils", ] defines = [ "AP_INSTANCE_MAX_NUM=$wifi_feature_with_ap_num" ] - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + external_deps = [ + "c_utils:utils", + "hiviewdfx_hilog_native:libhilog", + ] part_name = "wifi" subsystem_name = "communication" } diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn index df83804..67a5abb 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn @@ -21,7 +21,7 @@ defines += [ "OHOS_WIFI_STA_TEST" ] config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "$WIFI_ROOT_DIR/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta", ] } @@ -95,7 +95,7 @@ ohos_unittest("wifi_sta_unittest") { "//third_party/googletest/googlemock/include", "//third_party/googletest/googletest/include", "//base/notification/ces_standard/cesfwk/kits/native/include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", "//foundation/arkui/ace_engine/frameworks/base/utils", @@ -113,10 +113,10 @@ ohos_unittest("wifi_sta_unittest") { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_common:wifi_common_service", "$WIFI_ROOT_DIR/utils/src:wifi_utils", "//third_party/googletest:gmock_main", - "//utils/native/base:utils", ] external_deps = [ "ability_base:want", + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "netmanager_base:net_conn_manager_if", ] diff --git a/wifi/test/wifi_standard/wifi_hal/unittest/BUILD.gn b/wifi/test/wifi_standard/wifi_hal/unittest/BUILD.gn index 0484207..b5517a8 100644 --- a/wifi/test/wifi_standard/wifi_hal/unittest/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_hal/unittest/BUILD.gn @@ -18,7 +18,7 @@ module_output_path = "wifi/wifi_hal_test" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "$WIFI_ROOT_DIR/test/wifi_standard/wifi_hal/unittest", ] } @@ -65,7 +65,7 @@ ohos_unittest("wifi_hal_unittest") { ] include_dirs = [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/common", @@ -85,7 +85,6 @@ ohos_unittest("wifi_hal_unittest") { "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC:crpc_server", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//drivers/peripheral/wlan/hal:wifi_hal", - "//utils/native/base:utils", ] ldflags = [ @@ -93,7 +92,10 @@ ohos_unittest("wifi_hal_unittest") { "--coverage", ] - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + external_deps = [ + "c_utils:utils", + "hiviewdfx_hilog_native:libhilog", + ] configs = [ ":module_private_config" ] defines = [ "AP_INTF=\"$wifi_feature_with_ap_intf\"" ] @@ -110,15 +112,15 @@ group("unittest") { ohos_shared_library("WifiHalVendorTest") { sources = [ "wifi_hal_vendor_interface_test.c" ] include_dirs = [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/common", ] - deps = [ - "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//utils/native/base:utils", - ] + deps = [ "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog" ] + + external_deps = [ "c_utils:utils" ] + part_name = "wifi" subsystem_name = "communication" } diff --git a/wifi/utils/src/BUILD.gn b/wifi/utils/src/BUILD.gn index b1e45f1..fe1b68d 100644 --- a/wifi/utils/src/BUILD.gn +++ b/wifi/utils/src/BUILD.gn @@ -60,7 +60,6 @@ if (defined(ohos_lite)) { deps = [ "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", - "//utils/native/base:utils", ] external_deps = [ @@ -68,6 +67,7 @@ if (defined(ohos_lite)) { "ability_runtime:app_manager", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", + "c_utils:utils", "hisysevent_native:libhisysevent", "ipc:ipc_core", ] -- Gitee From 85ab946e2f64020040426499383972185d522682 Mon Sep 17 00:00:00 2001 From: YOUR_NAME Date: Tue, 26 Jul 2022 17:37:23 +0800 Subject: [PATCH 277/491] WifiErrorCode GetScanInfoList(WifiScanInfo *result, unsigned int *size) { CHECK_PTR_RETURN(wifiScanPtr, ERROR_WIFI_NOT_AVAILABLE); if (result == nullptr || size == nullptr) { WIFI_LOGE("Scan info input parameter is nullptr!"); return ERROR_WIFI_UNKNOWN; } std::vector vecScanInfos; OHOS::Wifi::ErrCode ret = wifiScanPtr->GetScanInfoList(vecScanInfos); int vecSize = (int)vecScanInfos.size(); for (int i = 0; i < vecSize && i < WIFI_SCAN_HOTSPOT_LIMIT; ++i) { if (memcpy_s(result->ssid, WIFI_MAX_SSID_LEN, vecScanInfos[i].ssid.c_str(), vecScanInfos[i].ssid.size() + 1) != EOK) { return ERROR_WIFI_UNKNOWN; } if (OHOS::Wifi::MacStrToArray(vecScanInfos[i].bssid, result->bssid) != EOK) { WIFI_LOGE("Scan info convert bssid error!"); return ERROR_WIFI_UNKNOWN; } result->securityType = static_cast(vecScanInfos[i].securityType); result->rssi = vecScanInfos[i].rssi; feat:Modify the GetScanInfoList API to limit the size of scan result Signed-off-by: YOUR_NAME --- .../native/c_adapter/src/wifi_c_device.cpp | 30 ++++++++++--------- wifi/interfaces/kits/c/wifi_scan_info.h | 2 +- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/wifi/frameworks/native/c_adapter/src/wifi_c_device.cpp b/wifi/frameworks/native/c_adapter/src/wifi_c_device.cpp index 07857bd..9e2ab0f 100644 --- a/wifi/frameworks/native/c_adapter/src/wifi_c_device.cpp +++ b/wifi/frameworks/native/c_adapter/src/wifi_c_device.cpp @@ -71,27 +71,29 @@ WifiErrorCode GetScanInfoList(WifiScanInfo *result, unsigned int *size) return ERROR_WIFI_UNKNOWN; } - std::vector vecScnIanfos; - OHOS::Wifi::ErrCode ret = wifiScanPtr->GetScanInfoList(vecScnIanfos); - *size = (int)vecScnIanfos.size(); - for (auto& each : vecScnIanfos) { - if (memcpy_s(result->ssid, WIFI_MAX_SSID_LEN, each.ssid.c_str(), each.ssid.size() + 1) != EOK) { + std::vector vecScanInfos; + OHOS::Wifi::ErrCode ret = wifiScanPtr->GetScanInfoList(vecScanInfos); + int vecSize = (int)vecScanInfos.size(); + for (int i = 0; i < vecSize && i < WIFI_SCAN_HOTSPOT_LIMIT; ++i) { + if (memcpy_s(result->ssid, WIFI_MAX_SSID_LEN, + vecScanInfos[i].ssid.c_str(), vecScanInfos[i].ssid.size() + 1) != EOK) { return ERROR_WIFI_UNKNOWN; } - if (OHOS::Wifi::MacStrToArray(each.bssid, result->bssid) != EOK) { + if (OHOS::Wifi::MacStrToArray(vecScanInfos[i].bssid, result->bssid) != EOK) { WIFI_LOGE("Scan info convert bssid error!"); return ERROR_WIFI_UNKNOWN; } - result->securityType = static_cast(each.securityType); - result->rssi = each.rssi; - result->band = each.band; - result->frequency = each.frequency; - result->channelWidth = WifiChannelWidth(static_cast(each.channelWidth)); - result->centerFrequency0 = each.centerFrequency0; - result->centerFrequency1 = each.centerFrequency1; - result->timestamp = each.timestamp; + result->securityType = static_cast(vecScanInfos[i].securityType); + result->rssi = vecScanInfos[i].rssi; + result->band = vecScanInfos[i].band; + result->frequency = vecScanInfos[i].frequency; + result->channelWidth = WifiChannelWidth(static_cast(vecScanInfos[i].channelWidth)); + result->centerFrequency0 = vecScanInfos[i].centerFrequency0; + result->centerFrequency1 = vecScanInfos[i].centerFrequency1; + result->timestamp = vecScanInfos[i].timestamp; ++result; } + *size = (vecSize < WIFI_SCAN_HOTSPOT_LIMIT) ? vecSize : WIFI_SCAN_HOTSPOT_LIMIT; return GetCErrorCode(ret); } diff --git a/wifi/interfaces/kits/c/wifi_scan_info.h b/wifi/interfaces/kits/c/wifi_scan_info.h index 1fa15a4..04af5c3 100644 --- a/wifi/interfaces/kits/c/wifi_scan_info.h +++ b/wifi/interfaces/kits/c/wifi_scan_info.h @@ -42,7 +42,7 @@ /** * @brief Indicates the maximum number of hotspots that can be detected in a Wi-Fi scan. */ -#define WIFI_SCAN_HOTSPOT_LIMIT 64 +#define WIFI_SCAN_HOTSPOT_LIMIT 128 typedef enum { WIDTH_20MHZ = 0, -- Gitee From 71baa07d135be20af6ba6501280d31a4ca7fb40a Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Thu, 28 Jul 2022 04:48:56 +0000 Subject: [PATCH 278/491] fix issues of js api Signed-off-by: zhangfeng Change-Id: I561b21fac380da87848867422b77490ec7583d20 --- wifi/frameworks/js/napi/src/wifi_napi_device.cpp | 12 +++++++----- wifi/frameworks/js/napi/src/wifi_napi_p2p.cpp | 2 +- .../wifi_manage/wifi_device_service_impl.cpp | 7 +------ .../wifi_manage/wifi_sta/ista_service.h | 3 ++- .../wifi_manage/wifi_sta/sta_interface.cpp | 4 ++-- .../wifi_manage/wifi_sta/sta_interface.h | 3 ++- .../wifi_manage/wifi_sta/sta_service.cpp | 12 +++++++----- .../wifi_manage/wifi_sta/sta_service.h | 3 ++- 8 files changed, 24 insertions(+), 22 deletions(-) diff --git a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp index ea72435..9ed0b63 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp @@ -215,12 +215,13 @@ napi_value GetScanResults(napi_env env, napi_callback_info info) } WIFI_LOGI("GetScanInfoList, size: %{public}zu", scanInfos.size()); - napi_value result; - ret = NativeScanInfosToJsObj(env, scanInfos, result); + napi_value arrayResult; + napi_create_array_with_length(env, scanInfos.size(), &arrayResult); + ret = NativeScanInfosToJsObj(env, scanInfos, arrayResult); if (ret != WIFI_OPT_SUCCESS) { WIFI_LOGE("NativeScanInfosToJsObj return fail: %{public}d", ret); } - return result; + return arrayResult; } static void ConvertEncryptionMode(const SecTypeJs& securityType, std::string& keyMgmt) @@ -528,6 +529,7 @@ napi_value AddCandidateConfig(napi_env env, napi_callback_info info) TRACE_FUNC_CALL_NAME("wifiDevicePtr->AddCandidateConfig"); ErrCode ret = wifiDevicePtr->AddCandidateConfig(*context->config, context->networkId); if (context->networkId < 0 || ret != WIFI_OPT_SUCCESS) { + WIFI_LOGE("Add candidate device config failed: %{public}d", static_cast(ret)); context->networkId = -1; } context->errorCode = ret; @@ -540,7 +542,7 @@ napi_value AddCandidateConfig(napi_env env, napi_callback_info info) delete context->config; context->config = nullptr; } - WIFI_LOGI("Push add untrusted device config result to client"); + WIFI_LOGI("Push add candidate device config result to client"); }; size_t nonCallbackArgNum = 1; @@ -579,7 +581,7 @@ napi_value RemoveCandidateConfig(napi_env env, napi_callback_info info) delete context->config; context->config = nullptr; } - WIFI_LOGI("Push remove untrusted device config result to client"); + WIFI_LOGI("Push remove candidate device config result to client"); }; size_t nonCallbackArgNum = 1; diff --git a/wifi/frameworks/js/napi/src/wifi_napi_p2p.cpp b/wifi/frameworks/js/napi/src/wifi_napi_p2p.cpp index 746d15c..c9059ed 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_p2p.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_p2p.cpp @@ -155,7 +155,7 @@ napi_value GetP2pGroups(napi_env env, napi_callback_info info) asyncContext->completeFunc = [&](void* data) -> void { P2pGroupInfoListAsyncContext *context = static_cast(data); - napi_create_object(context->env, &context->result); + napi_create_array_with_length(context->env, context->vecGroupInfoList.size(), &context->result); context->errorCode = GroupsToJsArray(context->env, context->vecGroupInfoList, context->result); WIFI_LOGI("Push get group info list to client"); }; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp index 7d810de..c141bfd 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp @@ -417,12 +417,7 @@ ErrCode WifiDeviceServiceImpl::AddCandidateConfig(const WifiDeviceConfig &config if (pService == nullptr) { return WIFI_OPT_STA_NOT_OPENED; } - int retNetworkId = pService->AddCandidateConfig(uid, config); - if (retNetworkId < 0) { - return WIFI_OPT_FAILED; - } - networkId = retNetworkId; - return WIFI_OPT_SUCCESS; + return pService->AddCandidateConfig(uid, config, networkId); } ErrCode WifiDeviceServiceImpl::ConnectToCandidateConfig(int networkId) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/ista_service.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/ista_service.h index 97f786a..ca9a067 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/ista_service.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/ista_service.h @@ -90,9 +90,10 @@ public: * * @param uid - call app uid * @param config - WifiDeviceConfig object + * @param netWorkId - the network id of the hotspot configuration.(out) * @Return success: WIFI_OPT_SUCCESS fail: WIFI_OPT_FAILED */ - virtual int AddCandidateConfig(const int uid, const WifiDeviceConfig &config) = 0; + virtual ErrCode AddCandidateConfig(const int uid, const WifiDeviceConfig &config, int& netWorkId) = 0; /** * @Description Connect to a candidate specified network. diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.cpp index bd10af5..e5f2f4c 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.cpp @@ -136,11 +136,11 @@ ErrCode StaInterface::Disconnect() return WIFI_OPT_SUCCESS; } -int StaInterface::AddCandidateConfig(const int uid, const WifiDeviceConfig &config) +ErrCode StaInterface::AddCandidateConfig(const int uid, const WifiDeviceConfig &config, int& netWorkId) { LOGD("Enter StaInterface::AddCandidateConfig.\n"); CHECK_NULL_AND_RETURN(pStaService, WIFI_OPT_FAILED); - return pStaService->AddCandidateConfig(uid, config); + return pStaService->AddCandidateConfig(uid, config, netWorkId); } ErrCode StaInterface::ConnectToCandidateConfig(const int uid, const int networkId) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.h index a8f61e3..4a9a11d 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.h @@ -93,9 +93,10 @@ public: * * @param uid - call app uid * @param config - WifiDeviceConfig object + * @param netWorkId - the network id of the hotspot configuration.(out) * @Return success: WIFI_OPT_SUCCESS fail: WIFI_OPT_FAILED */ - int AddCandidateConfig(const int uid, const WifiDeviceConfig &config) override; + ErrCode AddCandidateConfig(const int uid, const WifiDeviceConfig &config, int& netWorkId) override; /** * @Description Connecting to a candidate specified network. * diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp index 7adc714..b79be73 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp @@ -106,25 +106,27 @@ ErrCode StaService::DisableWifi() const return WIFI_OPT_SUCCESS; } -int StaService::AddCandidateConfig(const int uid, const WifiDeviceConfig &config) const +ErrCode StaService::AddCandidateConfig(const int uid, const WifiDeviceConfig &config, int& netWorkId) const { LOGI("Enter StaService::AddCandidateConfig.\n"); + + netWorkId = INVALID_NETWORK_ID; constexpr int UID_UNTRUSTED_CONFIG_LEN = 16; std::vector tempConfigs; WifiSettings::GetInstance().GetAllCandidateConfig(uid, tempConfigs); if (tempConfigs.size() >= UID_UNTRUSTED_CONFIG_LEN) { - LOGE("StaService::AddCandidateConfig failed, max num is 16!"); - return INVALID_NETWORK_ID; + LOGE("AddCandidateConfig failed, exceed max num: %{public}d\n", UID_UNTRUSTED_CONFIG_LEN); + return WIFI_OPT_FAILED; } if (config.keyMgmt == KEY_MGMT_NONE) { LOGE("StaService::AddCandidateConfig unsupport open or wep key!"); return WIFI_OPT_NOT_SUPPORTED; } - WifiDeviceConfig tempDeviceConfig = config; tempDeviceConfig.uid = uid; - return AddDeviceConfig(tempDeviceConfig); + netWorkId = AddDeviceConfig(tempDeviceConfig); + return (netWorkId == INVALID_NETWORK_ID) ? WIFI_OPT_FAILED : WIFI_OPT_SUCCESS; } ErrCode StaService::RemoveCandidateConfig(const int uid, const int networkId) const diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.h index 0927a38..62bad91 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.h @@ -92,9 +92,10 @@ public: * * @param uid - call app uid * @param config - WifiDeviceConfig object + * @param netWorkId - the network id of the hotspot configuration.(out) * @Return success: WIFI_OPT_SUCCESS fail: WIFI_OPT_FAILED */ - virtual int AddCandidateConfig(const int uid, const WifiDeviceConfig &config) const; + virtual ErrCode AddCandidateConfig(const int uid, const WifiDeviceConfig &config, int& netWorkId) const; /** * @Description Connect to a candidate specified network. * -- Gitee From 849b075d8ab46d6a62b387ac2e70f88f32caaf50 Mon Sep 17 00:00:00 2001 From: lujunxin Date: Fri, 29 Jul 2022 01:23:48 +0000 Subject: [PATCH 279/491] non-seperate p2p optimization Signed-off-by: lujunxin --- .../wifi_framework/wifi_manage/BUILD.gn | 2 +- .../wifi_manage/wifi_device_service_impl.cpp | 16 ++++++++-------- .../wifi_manage/wifi_manager.cpp | 6 +++--- .../wifi_manage/wifi_p2p/BUILD.gn | 2 +- .../wifi_manage/wifi_p2p/p2p_define.h | 4 ++-- wifi/services/wifi_standard/wifi_hal/BUILD.gn | 2 +- .../wpa_supplicant_hal/wifi_wpa_hal.c | 6 +++--- .../wpa_supplicant_hal/wifi_wpa_hal.h | 5 +++-- .../wpa_p2p_hal/wifi_p2p_hal.c | 4 ++-- .../wifi_hal/wifi_hal_p2p_interface.c | 19 ++++++++++++++----- .../wifi_hal/wifi_hal_sta_interface.c | 12 +++++++++++- 11 files changed, 49 insertions(+), 29 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn index 3d7152d..99ea738 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn @@ -205,7 +205,7 @@ if (defined(ohos_lite)) { } if (product_name == "rk3568") { - defines = [ "PRODUCT_RK" ] + defines = [ "NON_SEPERATE_P2P" ] } } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp index 457dd99..0327414 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp @@ -189,14 +189,6 @@ ErrCode WifiDeviceServiceImpl::EnableWifi() } #endif -#ifdef FEATURE_P2P_SUPPORT - sptr p2pService = WifiP2pServiceImpl::GetInstance(); - if (p2pService != nullptr && p2pService->EnableP2p() != WIFI_OPT_SUCCESS) { - WIFI_LOGE("Enable P2p failed!"); - return WIFI_OPT_FAILED; - } -#endif - if (!WifiConfigCenter::GetInstance().SetWifiMidState(curState, WifiOprMidState::OPENING)) { WIFI_LOGI("set wifi mid state opening failed!"); return WIFI_OPT_OPEN_SUCC_WHEN_OPENED; @@ -230,6 +222,14 @@ ErrCode WifiDeviceServiceImpl::EnableWifi() WifiServiceManager::GetInstance().UnloadService(WIFI_SERVICE_STA); return errCode; } +#ifdef FEATURE_P2P_SUPPORT + sptr p2pService = WifiP2pServiceImpl::GetInstance(); + if (p2pService != nullptr && p2pService->EnableP2p() != WIFI_OPT_SUCCESS) { + // only record to log + WIFI_LOGE("Enable P2p failed!"); + } +#endif + WifiSettings::GetInstance().SyncWifiConfig(); return WIFI_OPT_SUCCESS; } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp index 5f97b17..17c62df 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp @@ -232,14 +232,14 @@ int WifiManager::Init() } if (WifiConfigCenter::GetInstance().GetStaLastRunState()) { /* Automatic startup upon startup */ WIFI_LOGE("AutoStartStaApService"); -#ifdef FEATURE_P2P_SUPPORT - AutoStartP2pService(); -#endif #ifdef OHOS_ARCH_LITE std::thread startStaSrvThread(WifiManager::AutoStartStaServiceThread); startStaSrvThread.detach(); #else AutoStartStaService(); +#ifdef FEATURE_P2P_SUPPORT + AutoStartP2pService(); +#endif #endif } else { /** diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/BUILD.gn index 7863096..a1a7300 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/BUILD.gn @@ -102,7 +102,7 @@ ohos_shared_library("wifi_p2p_service") { defines = [ "AP_NOT_DIRECT_USE_DHCP" ] if (product_name == "rk3568") { - defines += [ "PRODUCT_RK" ] + defines += [ "NON_SEPERATE_P2P" ] } external_deps = [ diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_define.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_define.h index 0ee1210..64dd318 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_define.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_define.h @@ -22,8 +22,8 @@ namespace OHOS { namespace Wifi { -#ifdef PRODUCT_RK -const std::string P2P_INTERFACE("wlan0"); +#ifdef NON_SEPERATE_P2P +const std::string P2P_INTERFACE("p2p-dev-wlan0"); #else const std::string P2P_INTERFACE("p2p0"); #endif diff --git a/wifi/services/wifi_standard/wifi_hal/BUILD.gn b/wifi/services/wifi_standard/wifi_hal/BUILD.gn index b988ca9..4e22638 100644 --- a/wifi/services/wifi_standard/wifi_hal/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_hal/BUILD.gn @@ -118,7 +118,7 @@ if (defined(ohos_lite)) { "AP_NUM=$wifi_feature_with_ap_num", ] if (product_name == "rk3568") { - defines += [ "PRODUCT_RK" ] + defines += [ "NON_SEPERATE_P2P" ] } part_name = "wifi" diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c index 0e5fc2a..fc46a16 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c @@ -747,7 +747,7 @@ static void WpaCliClose(WifiWpaInterface *p) return; } -static int WpaCliAddIface(WifiWpaInterface *p, const AddInterfaceArgv *argv) +static int WpaCliAddIface(WifiWpaInterface *p, const AddInterfaceArgv *argv, bool isWpaAdd) { if (p == NULL || argv == NULL) { return -1; @@ -768,8 +768,8 @@ static int WpaCliAddIface(WifiWpaInterface *p, const AddInterfaceArgv *argv) char cmd[WPA_CMD_BUF_LEN] = {0}; char buf[WPA_CMD_REPLY_BUF_SMALL_LEN] = {0}; LOGI("WpaCliAddIface CMD: %{public}s", cmd); - if (snprintf_s(cmd, sizeof(cmd), sizeof(cmd) - 1, "INTERFACE_ADD %s\t%s", argv->name, argv->confName) < 0 || - WpaCliCmd(cmd, buf, sizeof(buf)) != 0) { + if (isWpaAdd && (snprintf_s(cmd, sizeof(cmd), sizeof(cmd) - 1, "INTERFACE_ADD %s\t%s", + argv->name, argv->confName) < 0 || WpaCliCmd(cmd, buf, sizeof(buf)) != 0)) { free(info); info = NULL; LOGI("WpaCliAddIface buf: %{public}s", buf); diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.h index 451f871..36620fd 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.h +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.h @@ -16,6 +16,7 @@ #ifndef WIFI_WPA_HAL_H #define WIFI_WPA_HAL_H +#include #include #include #include @@ -50,7 +51,7 @@ struct stWifiWpaInterface { int (*wpaCliConnect)(WifiWpaInterface *p); void (*wpaCliClose)(WifiWpaInterface *p); - int (*wpaCliAddIface)(WifiWpaInterface *p, const AddInterfaceArgv *argv); + int (*wpaCliAddIface)(WifiWpaInterface *p, const AddInterfaceArgv *argv, bool isWpaAdd); int (*wpaCliRemoveIface)(WifiWpaInterface *p, const char *name); }; @@ -60,4 +61,4 @@ WpaCtrl *GetWpaCtrl(void); #ifdef __cplusplus } #endif -#endif \ No newline at end of file +#endif diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal/wifi_p2p_hal.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal/wifi_p2p_hal.c index d76c4be..eabf934 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal/wifi_p2p_hal.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal/wifi_p2p_hal.c @@ -1307,8 +1307,8 @@ WifiWpaP2pInterface *GetWifiWapP2pInterface() LOGE("alloc memory for p2p interface failed!"); return NULL; } -#ifdef PRODUCT_RK - StrSafeCopy(g_wpaP2pInterface->ifName, sizeof(g_wpaP2pInterface->ifName), "wlan0"); +#ifdef NON_SEPERATE_P2P + StrSafeCopy(g_wpaP2pInterface->ifName, sizeof(g_wpaP2pInterface->ifName), "p2p-dev-wlan0"); #else StrSafeCopy(g_wpaP2pInterface->ifName, sizeof(g_wpaP2pInterface->ifName), "p2p0"); #endif diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_p2p_interface.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_p2p_interface.c index f968bae..56b9f40 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_p2p_interface.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_p2p_interface.c @@ -28,7 +28,12 @@ const int P2P_CONNECT_DELAY_TIME = 100000; const char *g_wpaSupplicantP2p = "wpa_supplicant"; +#ifdef NON_SEPERATE_P2P +const char *g_systemCmdWpaP2pStart = "wpa_supplicant -iglan0 -g/data/misc/wifi/sockets/wpa" + " -m /data/misc/wifi/wpa_supplicant/p2p_supplicant.conf"; +#else const char *g_systemCmdWpaP2pStart = "wpa_supplicant -iglan0 -g/data/misc/wifi/sockets/wpa"; +#endif static int g_p2pSupplicantConnectEvent = 0; static WifiErrorNo P2pStartSupplicant(void) @@ -86,8 +91,8 @@ static WifiErrorNo StopP2pWpaAndWpaHal(void) } WifiWpaInterface *pWpaInterface = GetWifiWapGlobalInterface(); if (pWpaInterface != NULL) { -#ifdef PRODUCT_RK - pWpaInterface->wpaCliRemoveIface(pWpaInterface, "p2p-wlan0-0"); +#ifdef NON_SEPERATE_P2P + pWpaInterface->wpaCliRemoveIface(pWpaInterface, "p2p-dev-wlan0"); #else pWpaInterface->wpaCliRemoveIface(pWpaInterface, "p2p0"); #endif @@ -113,15 +118,19 @@ static WifiErrorNo AddP2pIface(void) return WIFI_HAL_FAILED; } AddInterfaceArgv argv; -#ifdef PRODUCT_RK - if (strcpy_s(argv.name, sizeof(argv.name), "wlan0") != EOK || +#ifdef NON_SEPERATE_P2P + if (strcpy_s(argv.name, sizeof(argv.name), "p2p-dev-wlan0") != EOK || #else if (strcpy_s(argv.name, sizeof(argv.name), "p2p0") != EOK || #endif strcpy_s(argv.confName, sizeof(argv.confName), "/data/misc/wifi/wpa_supplicant/p2p_supplicant.conf") != EOK) { return WIFI_HAL_FAILED; } - if (pWpaInterface->wpaCliAddIface(pWpaInterface, &argv) < 0) { +#ifdef NON_SEPERATE_P2P + if (pWpaInterface->wpaCliAddIface(pWpaInterface, &argv, false) < 0) { +#else + if (pWpaInterface->wpaCliAddIface(pWpaInterface, &argv, true) < 0) { +#endif LOGE("Failed to add wpa iface!"); return WIFI_HAL_FAILED; } diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c index a0952ce..f2e6289 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c @@ -28,7 +28,12 @@ #define WPA_TERMINATE_SLEEP_TIME (50 * 1000) /* 50ms */ static const char *g_serviceName = "wpa_supplicant"; +#ifdef NON_SEPERATE_P2P +static const char *g_startCmd = "wpa_supplicant -iglan0 -g/data/misc/wifi/sockets/wpa" + " -m/data/misc/wifi/wpa_supplicant/p2p_supplicant.conf"; +#else static const char *g_startCmd = "wpa_supplicant -iglan0 -g/data/misc/wifi/sockets/wpa"; +#endif static WifiErrorNo AddWpaIface(int staNo) { @@ -53,7 +58,7 @@ static WifiErrorNo AddWpaIface(int staNo) return WIFI_HAL_FAILED; } } - if (pWpaInterface->wpaCliAddIface(pWpaInterface, &argv) < 0) { + if (pWpaInterface->wpaCliAddIface(pWpaInterface, &argv, true) < 0) { LOGE("Failed to add wpa iface!"); return WIFI_HAL_FAILED; } @@ -146,6 +151,11 @@ WifiErrorNo StartSupplicant(void) if (CopyConfigFile("wpa_supplicant.conf") != 0) { return WIFI_HAL_FAILED; } +#ifdef NON_SEPERATE_P2P + if (CopyConfigFile("p2p_supplicant.conf") != 0) { + return WIFI_HAL_FAILED; + } +#endif ModuleManageRetCode ret = StartModule(g_serviceName, g_startCmd); if (ret != MM_SUCCESS) { LOGE("start wpa_supplicant failed!"); -- Gitee From e09d4854c4f9f40bfd9c9613b356db40664ffe7a Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Fri, 29 Jul 2022 05:31:43 +0000 Subject: [PATCH 280/491] solve TianShu setting freeze Signed-off-by: zhangfeng Change-Id: I43d2821a3bbb0635befeed706d88b61b279cf9b4 --- wifi/frameworks/js/napi/inc/wifi_napi_event.h | 8 ++------ .../js/napi/src/wifi_napi_event.cpp | 20 +++++++++---------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/wifi/frameworks/js/napi/inc/wifi_napi_event.h b/wifi/frameworks/js/napi/inc/wifi_napi_event.h index 7aa35e3..4330909 100644 --- a/wifi/frameworks/js/napi/inc/wifi_napi_event.h +++ b/wifi/frameworks/js/napi/inc/wifi_napi_event.h @@ -60,13 +60,11 @@ public: napi_env env; napi_ref callbackRef; std::function packResult; - std::function isObjExist; - explicit AsyncEventData(napi_env e, napi_ref r, std::function p, std::function checkFunc) { + explicit AsyncEventData(napi_env e, napi_ref r, std::function p) { env = e; callbackRef = r; packResult = p; - isObjExist = checkFunc; } AsyncEventData() = delete; @@ -98,10 +96,8 @@ public: } for (auto& each : vecObj) { auto resultFunc = [this, env = each.m_regEnv, obj] () -> napi_value { return CreateResult(env, obj); }; - auto isObjExistFunc = [this, eventObj = each, type] () -> bool - { return IsRegisterObjectExist(eventObj, type); }; AsyncEventData *asyncEvent = - new (std::nothrow)AsyncEventData(each.m_regEnv, each.m_regHanderRef, resultFunc, isObjExistFunc); + new (std::nothrow)AsyncEventData(each.m_regEnv, each.m_regHanderRef, resultFunc); if (asyncEvent == nullptr) { return; } diff --git a/wifi/frameworks/js/napi/src/wifi_napi_event.cpp b/wifi/frameworks/js/napi/src/wifi_napi_event.cpp index 4dbe5d7..94ebd72 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_event.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_event.cpp @@ -121,25 +121,23 @@ void NapiEvent::EventNotify(AsyncEventData *asyncEvent) napi_open_handle_scope(asyncData->env, &scope); if (scope == nullptr) { WIFI_LOGE("scope is nullptr"); - napi_close_handle_scope(asyncData->env, scope); goto EXIT; } napi_value undefine; napi_get_undefined(asyncData->env, &undefine); napi_get_reference_value(asyncData->env, asyncData->callbackRef, &handler); + if (handler == nullptr) { + WIFI_LOGE("handler is nullptr"); + goto EXIT; + } jsEvent = asyncData->packResult(); - { - std::shared_lock guard(g_regInfoMutex); - WIFI_LOGI("Push event to js, env: %{private}p, ref : %{private}p", - asyncData->env, &asyncData->callbackRef); - if (asyncData->isObjExist() && - (napi_call_function(asyncData->env, nullptr, handler, 1, &jsEvent, &undefine) != napi_ok)) { - WIFI_LOGE("Report event to Js failed"); - } + WIFI_LOGI("Push event to js, env: %{private}p, ref : %{private}p", asyncData->env, &asyncData->callbackRef); + if (napi_call_function(asyncData->env, nullptr, handler, 1, &jsEvent, &undefine) != napi_ok) { + WIFI_LOGE("Report event to Js failed"); } - napi_close_handle_scope(asyncData->env, scope); EXIT: + napi_close_handle_scope(asyncData->env, scope); delete asyncData; asyncData = nullptr; delete work; @@ -625,6 +623,7 @@ void EventRegister::DeleteRegisterObj(const napi_env& env, std::vector& napi_strict_equals(iter->m_regEnv, handlerTemp, handler, &isEqual); if (isEqual) { napi_delete_reference(iter->m_regEnv, iter->m_regHanderRef); + napi_reference_unref(iter->m_regEnv, iter->m_regHanderRef, nullptr); WIFI_LOGI("Delete register object ref."); iter = vecRegObjs.erase(iter); } else { @@ -643,6 +642,7 @@ void EventRegister::DeleteAllRegisterObj(const napi_env& env, std::vectorm_regEnv) { napi_delete_reference(iter->m_regEnv, iter->m_regHanderRef); + napi_reference_unref(iter->m_regEnv, iter->m_regHanderRef, nullptr); iter = vecRegObjs.erase(iter); } else { WIFI_LOGI("Unregister all event, env is not equal %{private}p, : %{private}p", env, iter->m_regEnv); -- Gitee From aa7dd16f9b8e0de98d3e46f42df95b456982ea3e Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Sun, 31 Jul 2022 12:42:38 +0800 Subject: [PATCH 281/491] add suspend feature 0731 Signed-off-by: yanxiaotao --- .../idl_interface/i_wifi_sta_iface.c | 20 ++++ .../idl_interface/i_wifi_sta_iface.h | 7 ++ .../idl_client/wifi_idl_client.cpp | 6 ++ .../wifi_manage/idl_client/wifi_idl_client.h | 7 ++ .../wifi_supplicant_hal_interface.cpp | 8 +- .../wifi_supplicant_hal_interface.h | 8 ++ .../wifi_manage/wifi_device_service_impl.cpp | 96 +++++++++++++++---- .../wifi_manage/wifi_device_service_impl.h | 12 +++ .../wifi_manage/wifi_sta/ista_service.h | 9 ++ .../wifi_manage/wifi_sta/sta_service.cpp | 12 ++- .../wifi_manage/wifi_sta/sta_service.h | 9 ++ .../wifi_hal/wifi_hal_crpc_server.c | 1 + .../wifi_hal/wifi_hal_crpc_sta.c | 18 +++- .../wpa_sta_hal/wifi_supplicant_hal.c | 24 +++++ .../wpa_sta_hal/wifi_supplicant_hal.h | 1 + .../wifi_hal/wifi_hal_sta_interface.c | 17 ++++ 16 files changed, 232 insertions(+), 23 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.c b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.c index 49df2eb..983b642 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.c +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.c @@ -825,3 +825,23 @@ WifiErrorNo GetConnectSignalInfo(const char *endBssid, WpaSignalInfo *info) UnlockRpcClient(client); return result; } + +WifiErrorNo SetSuspendMode(bool mode) +{ + RpcClient *client = GetStaRpcClient(); + LockRpcClient(client); + Context *context = client->context; + WriteBegin(context, 0); + WriteFunc(context, "SetSuspendMode"); + WriteInt(context, mode); + WriteEnd(context); + if (RpcClientCall(client, "SetSuspendMode") != WIFI_IDL_OPT_OK) { + return WIFI_IDL_OPT_FAILED; + } + int result = WIFI_IDL_OPT_FAILED; + ReadInt(context, &result); + ReadClientEnd(client); + UnlockRpcClient(client); + return result; +} + diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.h index d7c8b2b..c30f7ec 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.h @@ -295,6 +295,13 @@ WifiErrorNo GetNetworkList(WifiNetworkInfo *infos, int *size); */ WifiErrorNo GetConnectSignalInfo(const char *endBssid, WpaSignalInfo *info); +/** + * @Description send suspend mode for wpa. + * + * @param mode: true for suspend, false for resume. + * @return WifiErrorNo + */ +WifiErrorNo SetSuspendMode(bool mode); #ifdef __cplusplus } #endif diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp index ca86e74..5dc2896 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp @@ -1702,5 +1702,11 @@ WifiErrorNo WifiIdlClient::ReqP2pHid2dConnect(const Hid2dConnectConfig &config) WifiErrorNo ret = Hid2dConnect(&info); return ret; } + +WifiErrorNo WifiIdlClient::ReqWpaSetSuspendMode(bool mode) +{ + CHECK_CLIENT_NOT_NULL; + return WpaSetSuspendMode(mode); +} } // namespace Wifi } // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.h index 5787752..4520eb0 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.h @@ -1060,6 +1060,13 @@ public: */ WifiErrorNo ReqP2pHid2dConnect(const Hid2dConnectConfig &config) const; + /** + * @Description Send suspend mode to wpa + * + * @param mode: true for suspend, false for resume + * @return WifiErrorNo + */ + WifiErrorNo ReqWpaSetSuspendMode(bool mode) const; public: RpcClient *pRpcClient; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_supplicant_hal_interface.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_supplicant_hal_interface.cpp index 288fbc0..74056aa 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_supplicant_hal_interface.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_supplicant_hal_interface.cpp @@ -107,5 +107,11 @@ const SupplicantEventCallback &WifiSupplicantHalInterface::GetCallbackInst(void) { return mCallback; } + +WifiErrorNo WifiSupplicantHalInterface::WpaSetSuspendMode(bool enable) const +{ + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); + return mIdlClient->ReqWpaSetSuspendMode(enable); +} } // namespace Wifi -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_supplicant_hal_interface.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_supplicant_hal_interface.h index f5d13cb..a355960 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_supplicant_hal_interface.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_supplicant_hal_interface.h @@ -115,6 +115,14 @@ public: */ const SupplicantEventCallback &GetCallbackInst(void) const; + /** + * @Description Set suspend mode to wpa + * + * @param mode - true for suspend mode, false for resume mode + * + * @Return success: WIFI_OPT_SUCCESS, fail: WIFI_OPT_FAILED + */ + virtual ErrCode WpaSetSuspendMode(bool mode) const; private: SupplicantEventCallback mCallback; }; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp index 632f97d..72e173a 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp @@ -47,6 +47,7 @@ std::shared_ptr WifiDeviceServiceImpl::g_instance; std::shared_ptr WifiDeviceServiceImpl::GetInstance() #else const uint32_t TIMEOUT_APP_EVENT = 3000; +const uint32_t TIMEOUT_SCREEN_EVENT = 3000; using TimeOutCallback = std::function; sptr WifiDeviceServiceImpl::g_instance; const bool REGISTER_RESULT = SystemAbility::MakeAndRegisterAbility(WifiDeviceServiceImpl::GetInstance().GetRefPtr()); @@ -108,7 +109,7 @@ void WifiDeviceServiceImpl::SigHandler(int sig) void WifiDeviceServiceImpl::OnStart() { if (mState == ServiceRunningState::STATE_RUNNING) { - WIFI_LOGD("Service has already started."); + WIFI_LOGW("Service has already started."); return; } (void)signal(SIGUSR1, SigHandler); @@ -127,6 +128,13 @@ void WifiDeviceServiceImpl::OnStart() lpTimer_->Setup(); lpTimer_->Register(timeOutcallback, TIMEOUT_APP_EVENT, true); } + + if (screenEventSubscriber_ == nullptr) { + lpScreenTimer_ = std::make_unique("WifiDeviceServiceImpl"); + TimeOutCallback timeOutcallback = std::bind(&WifiDeviceServiceImpl::RegisterScreenEvent, this); + lpScreenTimer_->Setup(); + lpScreenTimer_->Register(timeOutcallback, TIMEOUT_SCREEN_EVENT, true); + } #endif } @@ -1201,6 +1209,52 @@ int32_t WifiDeviceServiceImpl::Dump(int32_t fd, const std::vector(subscriberInfo); + if (!EventFwk::CommonEventManager::SubscribeCommonEvent(eventSubscriber_)) { + WIFI_LOGE("AppEvent SubscribeCommonEvent() failed"); + } else { + WIFI_LOGI("AppEvent SubscribeCommonEvent() OK"); + } +} + +void WifiDeviceServiceImpl::UnRegisterAppRemoved() +{ + if (!EventFwk::CommonEventManager::UnSubscribeCommonEvent(eventSubscriber_)) { + WIFI_LOGE("AppEvent UnSubscribeCommonEvent() failed"); + } else { + WIFI_LOGI("AppEvent UnSubscribeCommonEvent() OK"); + } + eventSubscriber_ = nullptr; +} + +void WifiDeviceServiceImpl::RegisterScreenEvent() +{ + OHOS::EventFwk::MatchingSkills matchingSkills; + matchingSkills.AddEvent(OHOS::EventFwk::CommonEventSupport::COMMON_EVENT_SCREEN_ON); + matchingSkills.AddEvent(OHOS::EventFwk::CommonEventSupport::COMMON_EVENT_SCREEN_OFF); + EventFwk::CommonEventSubscribeInfo subscriberInfo(matchingSkills); + screenEventSubscriber_ = std::make_shared(subscriberInfo); + if (!EventFwk::CommonEventManager::SubscribeCommonEvent(screenEventSubscriber_)) { + WIFI_LOGE("ScreenEvent SubscribeCommonEvent() failed"); + } else { + WIFI_LOGI("ScreenEvent SubscribeCommonEvent() OK"); + } +} + +void WifiDeviceServiceImpl::UnRegisterScreenEvent() +{ + if (!EventFwk::CommonEventManager::UnSubscribeCommonEvent(screenEventSubscriber_)) { + WIFI_LOGE("ScreenEvent UnSubscribeCommonEvent() failed"); + } else { + WIFI_LOGI("ScreenEvent UnSubscribeCommonEvent() OK"); + } + screenEventSubscriber_ = nullptr; +} void AppEventSubscriber::OnReceiveEvent(const OHOS::EventFwk::CommonEventData &data) { @@ -1227,29 +1281,31 @@ void AppEventSubscriber::OnReceiveEvent(const OHOS::EventFwk::CommonEventData &d } } -void WifiDeviceServiceImpl::RegisterAppRemoved() +void ScreenEventSubscriber::OnReceiveEvent(const OHOS::EventFwk::CommonEventData &data) { - WIFI_LOGI("RegisterAppRemoved"); - OHOS::EventFwk::MatchingSkills matchingSkills; - matchingSkills.AddEvent(OHOS::EventFwk::CommonEventSupport::COMMON_EVENT_PACKAGE_REMOVED); - EventFwk::CommonEventSubscribeInfo subscriberInfo(matchingSkills); - eventSubscriber_ = std::make_shared(subscriberInfo); - if (!EventFwk::CommonEventManager::SubscribeCommonEvent(eventSubscriber_)) { - WIFI_LOGE("SubscribeCommonEvent() failed"); - } else { - WIFI_LOGE("SubscribeCommonEvent() OK"); + std::string action = data.GetWant().GetAction(); + WIFI_LOGI("ScreenEventSubscriber::OnReceiveEvent: %{public}s.", action.c_str()); + IStaService *pService = WifiServiceManager::GetInstance().GetStaServiceInst(); + if (pService == nullptr) { + WIFI_LOGE("sta service is NOT start!"); + return; } -} -void WifiDeviceServiceImpl::UnRegisterAppRemoved() -{ - WIFI_LOGI("UnRegisterAppRemoved"); - if (!EventFwk::CommonEventManager::UnSubscribeCommonEvent(eventSubscriber_)) { - WIFI_LOGE("UnSubscribeCommonEvent() failed"); - } else { - WIFI_LOGE("UnSubscribeCommonEvent() OK"); + if (action == OHOS::EventFwk::CommonEventSupport::COMMON_EVENT_SCREEN_OFF) { + /* Send suspend to wpa */ + if (pService->SetSuspendMode(true) != WIFI_OPT_SUCCESS) { + WIFI_LOGE("RemoveAllCandidateConfig failed"); + } + return; + } + + if (action == OHOS::EventFwk::CommonEventSupport::COMMON_EVENT_SCREEN_ON) { + /* Send resume to wpa */ + if (pService->SetSuspendMode(false) != WIFI_OPT_SUCCESS) { + WIFI_LOGE("RemoveAllCandidateConfig failed"); + } + return; } - eventSubscriber_ = nullptr; } #endif } // namespace Wifi diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h index a3c4bde..bcc0844 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h @@ -42,6 +42,14 @@ public: virtual ~AppEventSubscriber() {}; virtual void OnReceiveEvent(const OHOS::EventFwk::CommonEventData &data) override; }; + +class ScreenEventSubscriber : public OHOS::EventFwk::CommonEventSubscriber { +public: + explicit ScreenEventSubscriber(const OHOS::EventFwk::CommonEventSubscribeInfo &subscriberInfo) + : CommonEventSubscriber(subscriberInfo) {} + virtual ~ScreenEventSubscriber() {}; + virtual void OnReceiveEvent(const OHOS::EventFwk::CommonEventData &data) override; +}; #endif #ifdef OHOS_ARCH_LITE enum ServiceRunningState { @@ -166,6 +174,8 @@ private: #ifndef OHOS_ARCH_LITE void RegisterAppRemoved(); void UnRegisterAppRemoved(); + void RegisterScreenEvent(); + void UnRegisterScreenEvent(); #endif private: @@ -182,7 +192,9 @@ private: #else static sptr g_instance; std::shared_ptr eventSubscriber_ = nullptr; + std::shared_ptr screenEventSubscriber_ = nullptr; std::unique_ptr lpTimer_ = nullptr; + std::unique_ptr lpScreenTimer_ = nullptr; #endif static std::mutex g_instanceLock; bool mPublishFlag; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/ista_service.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/ista_service.h index 97f786a..dcaed2b 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/ista_service.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/ista_service.h @@ -202,6 +202,15 @@ public: * @return ErrCode - success: WIFI_OPT_SUCCESS fail: WIFI_OPT_FAILED */ virtual ErrCode RegisterStaServiceCallback(const StaServiceCallback &callbacks) = 0; + + /** + * @Description Set suspend mode to wpa + * + * @param mode - true for suspend mode, false for resume mode + * + * @Return success: WIFI_OPT_SUCCESS, fail: WIFI_OPT_FAILED + */ + virtual ErrCode SetSuspendMode(bool mode) = 0; }; } // namespace Wifi } // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp index 7adc714..6d9380f 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp @@ -360,7 +360,7 @@ ErrCode StaService::CancelWps() const ErrCode StaService::SetCountryCode(const std::string &countryCode) const { - LOGI("Enter StaService::SetCountryCode, countryCode=[%s]!", countryCode.c_str()); + LOGI("Enter StaService::SetCountryCode, countryCode=[%{public}s]!", countryCode.c_str()); if (WifiSupplicantHalInterface::GetInstance().WpaSetCountryCode(countryCode) != WIFI_IDL_OPT_OK) { LOGE("WpaSetCountryCode() failed!"); return WIFI_OPT_FAILED; @@ -395,5 +395,15 @@ ErrCode StaService::ReConnect() const pStaStateMachine->SendMessage(WIFI_SVR_CMD_STA_RECONNECT_NETWORK); return WIFI_OPT_SUCCESS; } + +ErrCode StaService::SetSuspendMode(bool mode) const +{ + LOGI("Enter StaService::SetSuspendMode, mode=[%{public}d]!", mode); + if (WifiSupplicantHalInterface::GetInstance().WpaSetCountryCode(mode) != WIFI_IDL_OPT_OK) { + LOGE("WpaSetCountryCode() failed!"); + return WIFI_OPT_FAILED; + } + return WIFI_OPT_SUCCESS; +} } // namespace Wifi } // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.h index 0927a38..fa14b6f 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.h @@ -207,6 +207,15 @@ public: */ virtual ErrCode ReConnect() const; + /** + * @Description Set suspend mode to wpa + * + * @param mode - true for suspend mode, false for resume mode + * + * @Return success: WIFI_OPT_SUCCESS, fail: WIFI_OPT_FAILED + */ + virtual ErrCode SetSuspendMode(bool mode) const; + private: StaStateMachine *pStaStateMachine; StaMonitor *pStaMonitor; diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.c index bb92a46..26d0919 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.c @@ -165,6 +165,7 @@ static int InitRpcFuncMapSta(void) ret += PushRpcFunc("WpaBlocklistClear", RpcWpaBlocklistClear); ret += PushRpcFunc("GetNetworkList", RpcGetNetworkList); ret += PushRpcFunc("GetConnectSignalInfo", RpcGetConnectSignalInfo); + ret += PushRpcFunc("SetSuspendMode", RpcSetSuspendMode); return ret; } diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_sta.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_sta.c index 9aa4c3c..3d87478 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_sta.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_sta.c @@ -910,4 +910,20 @@ int RpcGetConnectSignalInfo(RpcServer *server, Context *context) } WriteEnd(context); return HAL_SUCCESS; -} \ No newline at end of file +} + +int RpcSetSuspendMode(RpcServer *server, Context *context) +{ + if (server == NULL || context == NULL) { + return HAL_FAILURE; + } + bool mode = 0; + if (ReadInt(context, &mode) < 0) { + return HAL_FAILURE; + } + WifiErrorNo err = SetWifiTxPower(mode); + WriteBegin(context, 0); + WriteInt(context, err); + WriteEnd(context); + return HAL_SUCCESS; +} diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c index 07ec383..61d4ba7 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c @@ -1230,6 +1230,29 @@ static int WpaCliCmdWpaTerminate(WifiWpaStaInterface *this) return WpaCliCmd(cmd, buf, sizeof(buf)); } +static int WpaCliCmdWpaSetSuspendMode(WifiWpaStaInterface *this, bool mode) +{ + LOGI("Enter WpaCliCmdWpaSetSuspendMode"); + if (this == NULL) { + LOGE("WpaCliCmdWpaSetSuspendMode, this is NULL."); + return -1; + } + char cmd[CMD_BUFFER_SIZE] = {0}; + char buf[REPLY_BUF_SMALL_LENGTH] = {0}; + if (mode == true) { + if (snprintf_s(cmd, sizeof(cmd), sizeof(cmd) - 1, "IFNAME=%s SUSPEND", this->ifname) < 0) { + LOGE("WpaCliCmdWpaSetSuspendMode, SUSPEND, snprintf_s err"); + return -1; + } + } else { + if (snprintf_s(cmd, sizeof(cmd), sizeof(cmd) - 1, "IFNAME=%s RESUME", this->ifname) < 0) { + LOGE("WpaCliCmdWpaSetSuspendMode, RESUME, snprintf_s err"); + return -1; + } + } + return WpaCliCmd(cmd, buf, sizeof(buf)); +} + WifiWpaStaInterface *GetWifiStaInterface(int staNo) { char *name; @@ -1277,6 +1300,7 @@ WifiWpaStaInterface *GetWifiStaInterface(int staNo) p->wpaCliCmdScanInfo = WpaCliCmdScanInfo; p->wpaCliCmdGetSignalInfo = WpaCliCmdGetSignalInfo; p->wpaCliCmdWpaTerminate = WpaCliCmdWpaTerminate; + p->wpaCliCmdWpaSetSuspendMode = WpaCliCmdWpaSetSuspendMode; p->next = g_wpaStaInterface; g_wpaStaInterface = p; diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.h index ef55003..d35acc3 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.h +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.h @@ -102,6 +102,7 @@ struct WifiWpaStaInterface { int (*wpaCliCmdScanInfo)(WifiWpaStaInterface *p, ScanInfo *pcmd, int *size); int (*wpaCliCmdGetSignalInfo)(WifiWpaStaInterface *p, WpaSignalInfo *info); int (*wpaCliCmdWpaTerminate)(WifiWpaStaInterface *p); + int (*wpaCliCmdWpaSetSuspendMode)(WifiWpaStaInterface *p, bool mode); }; /** diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c index a0952ce..d2c561c 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c @@ -809,3 +809,20 @@ WifiErrorNo GetConnectSignalInfo(const char *endBssid, WpaSignalInfo *info) } return WIFI_HAL_SUCCESS; } + +WifiErrorNo SetSuspendMode(bool mode) +{ + LOGI("SetSuspendMode() mode: %{public}d", mode); + WifiWpaStaInterface *pStaIfc = GetWifiStaInterface(0); + if (pStaIfc == NULL) { + LOGE("GetWifiStaInterface return failed"); + return WIFI_HAL_SUPPLICANT_NOT_INIT; + } + int ret = pStaIfc->wpaCliCmdWpaSetSuspendMode(pStaIfc, mode); + if (ret != WIFI_HAL_SUCCESS) { + LOGE("wpaCliCmdWpaSetSuspendMode return failed! ret = %{public}d", ret); + return WIFI_HAL_FAILED; + } + return WIFI_HAL_SUCCESS; +} + -- Gitee From aeb982ab34c13fb49d5f12f387d7223d13e29c29 Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Sun, 31 Jul 2022 21:41:42 +0800 Subject: [PATCH 282/491] add suspend feature 0731 Signed-off-by: yanxiaotao --- .../wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.h | 1 + .../wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.h index c30f7ec..35f71f3 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.h @@ -17,6 +17,7 @@ #define OHOS_IDL_IWIFI_STA_IFACE_H #include "wifi_error_no.h" +#include #include "i_wifi_event_callback.h" #include "i_wifi_struct.h" diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp index 5dc2896..28ffc71 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp @@ -1706,7 +1706,7 @@ WifiErrorNo WifiIdlClient::ReqP2pHid2dConnect(const Hid2dConnectConfig &config) WifiErrorNo WifiIdlClient::ReqWpaSetSuspendMode(bool mode) { CHECK_CLIENT_NOT_NULL; - return WpaSetSuspendMode(mode); + return SetSuspendMode(mode); } } // namespace Wifi } // namespace OHOS -- Gitee From 51b788d17517cd03b425b2926099411550ce82fa Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Sun, 31 Jul 2022 21:45:25 +0800 Subject: [PATCH 283/491] add suspend feature 0731 Signed-off-by: yanxiaotao --- .../wifi_framework/wifi_manage/wifi_device_service_impl.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp index 72e173a..6839b4a 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp @@ -1294,7 +1294,7 @@ void ScreenEventSubscriber::OnReceiveEvent(const OHOS::EventFwk::CommonEventData if (action == OHOS::EventFwk::CommonEventSupport::COMMON_EVENT_SCREEN_OFF) { /* Send suspend to wpa */ if (pService->SetSuspendMode(true) != WIFI_OPT_SUCCESS) { - WIFI_LOGE("RemoveAllCandidateConfig failed"); + WIFI_LOGE("SetSuspendMode failed"); } return; } @@ -1302,7 +1302,7 @@ void ScreenEventSubscriber::OnReceiveEvent(const OHOS::EventFwk::CommonEventData if (action == OHOS::EventFwk::CommonEventSupport::COMMON_EVENT_SCREEN_ON) { /* Send resume to wpa */ if (pService->SetSuspendMode(false) != WIFI_OPT_SUCCESS) { - WIFI_LOGE("RemoveAllCandidateConfig failed"); + WIFI_LOGE("SetSuspendMode failed"); } return; } -- Gitee From 00a219532297b51d52af8bbb9792e128387410c8 Mon Sep 17 00:00:00 2001 From: y00316381 Date: Mon, 1 Aug 2022 08:40:47 +0800 Subject: [PATCH 284/491] send suspend mode to wpa 0801 Signed-off-by: y00316381 --- .../wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp | 2 +- .../wifi_manage/idl_client/wifi_supplicant_hal_interface.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp index 28ffc71..5d2b4f5 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp @@ -1703,7 +1703,7 @@ WifiErrorNo WifiIdlClient::ReqP2pHid2dConnect(const Hid2dConnectConfig &config) return ret; } -WifiErrorNo WifiIdlClient::ReqWpaSetSuspendMode(bool mode) +WifiErrorNo WifiIdlClient::ReqWpaSetSuspendMode(bool mode) const { CHECK_CLIENT_NOT_NULL; return SetSuspendMode(mode); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_supplicant_hal_interface.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_supplicant_hal_interface.h index a355960..c3909b9 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_supplicant_hal_interface.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_supplicant_hal_interface.h @@ -122,7 +122,7 @@ public: * * @Return success: WIFI_OPT_SUCCESS, fail: WIFI_OPT_FAILED */ - virtual ErrCode WpaSetSuspendMode(bool mode) const; + WifiErrorNo WpaSetSuspendMode(bool mode) const; private: SupplicantEventCallback mCallback; }; -- Gitee From 3f821420ebe282b08c6a56eec156f034cd1af7d0 Mon Sep 17 00:00:00 2001 From: legendtau Date: Mon, 1 Aug 2022 09:09:37 +0800 Subject: [PATCH 285/491] send suspend mode to wpa 0801 Signed-off-by: legendtau --- .../wifi_framework/wifi_manage/wifi_device_service_impl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp index 6839b4a..0805460 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp @@ -1238,7 +1238,7 @@ void WifiDeviceServiceImpl::RegisterScreenEvent() matchingSkills.AddEvent(OHOS::EventFwk::CommonEventSupport::COMMON_EVENT_SCREEN_ON); matchingSkills.AddEvent(OHOS::EventFwk::CommonEventSupport::COMMON_EVENT_SCREEN_OFF); EventFwk::CommonEventSubscribeInfo subscriberInfo(matchingSkills); - screenEventSubscriber_ = std::make_shared(subscriberInfo); + screenEventSubscriber_ = std::make_shared(subscriberInfo); if (!EventFwk::CommonEventManager::SubscribeCommonEvent(screenEventSubscriber_)) { WIFI_LOGE("ScreenEvent SubscribeCommonEvent() failed"); } else { -- Gitee From d0995fc5fd64078a7535574158e7c6658eef9376 Mon Sep 17 00:00:00 2001 From: legendtau Date: Mon, 1 Aug 2022 09:42:26 +0800 Subject: [PATCH 286/491] send suspend mode to wpa 0801 Signed-off-by: legendtau --- wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_sta.c | 2 +- wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_sta.h | 7 +++++++ .../wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.h | 1 + .../wifi_standard/wifi_hal/wifi_hal_sta_interface.h | 9 +++++++++ 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_sta.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_sta.c index 3d87478..d3ad328 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_sta.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_sta.c @@ -921,7 +921,7 @@ int RpcSetSuspendMode(RpcServer *server, Context *context) if (ReadInt(context, &mode) < 0) { return HAL_FAILURE; } - WifiErrorNo err = SetWifiTxPower(mode); + WifiErrorNo err = SetSuspendMode(mode); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_sta.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_sta.h index 31ad2ae..632e2bf 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_sta.h +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_sta.h @@ -372,6 +372,13 @@ int RpcGetNetworkList(RpcServer *server, Context *context); */ int RpcGetConnectSignalInfo(RpcServer *server, Context *context); +/** + * @Description Send suspend mode to wpa + * + * @param mode - true for suspend mode, false for resume mode. + * @return int - 0 Success, -1 Failed. + */ +int RpcSetSuspendMode(RpcServer *server, Context *context); #ifdef __cplusplus } #endif diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.h index d35acc3..8c65940 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.h +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.h @@ -20,6 +20,7 @@ #include #include #include +#include #include "wifi_hal_struct.h" #include "wifi_hal_define.h" diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.h index 5fed691..4577c5c 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.h +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.h @@ -21,6 +21,7 @@ #include #include #include +#include #include #include "wifi_hal_define.h" #include "wifi_hal_struct.h" @@ -389,6 +390,14 @@ WifiErrorNo GetNetworkList(WifiNetworkInfo *infos, int *size); * @return WifiErrorNo */ WifiErrorNo GetConnectSignalInfo(const char *endBssid, WpaSignalInfo *info); + +/** + * @Description Send suspend mode to wpa + * + * @param mode - true for suspend mode, false for resume mode. + * @return WifiErrorNo + */ +WifiErrorNo SetSuspendMode(bool mode); #ifdef __cplusplus } #endif -- Gitee From 1ac3ae3c81d1761149e52b5ac8b0b6aa6b6ec36f Mon Sep 17 00:00:00 2001 From: legendtau Date: Mon, 1 Aug 2022 10:08:57 +0800 Subject: [PATCH 287/491] send suspend mode to wpa 0801 Signed-off-by: legendtau --- wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_sta.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_sta.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_sta.c index d3ad328..c3ab70c 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_sta.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_sta.c @@ -917,10 +917,11 @@ int RpcSetSuspendMode(RpcServer *server, Context *context) if (server == NULL || context == NULL) { return HAL_FAILURE; } - bool mode = 0; - if (ReadInt(context, &mode) < 0) { + int tmpMode = 0; + if (ReadInt(context, &tmpMode) < 0) { return HAL_FAILURE; } + bool mode = (tmpMode == 0) ? false : true; WifiErrorNo err = SetSuspendMode(mode); WriteBegin(context, 0); WriteInt(context, err); -- Gitee From 6295ba0313cadc131a6382ec025cfe5fc270fbcf Mon Sep 17 00:00:00 2001 From: legendtau Date: Mon, 1 Aug 2022 10:11:33 +0800 Subject: [PATCH 288/491] send suspend mode to wpa 0801 Signed-off-by: legendtau --- .../wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.h | 2 +- .../wifi_manage/idl_client/wifi_supplicant_hal_interface.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.h index 35f71f3..b6e0f47 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.h @@ -16,8 +16,8 @@ #ifndef OHOS_IDL_IWIFI_STA_IFACE_H #define OHOS_IDL_IWIFI_STA_IFACE_H -#include "wifi_error_no.h" #include +#include "wifi_error_no.h" #include "i_wifi_event_callback.h" #include "i_wifi_struct.h" diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_supplicant_hal_interface.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_supplicant_hal_interface.cpp index 74056aa..03ff718 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_supplicant_hal_interface.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_supplicant_hal_interface.cpp @@ -108,10 +108,10 @@ const SupplicantEventCallback &WifiSupplicantHalInterface::GetCallbackInst(void) return mCallback; } -WifiErrorNo WifiSupplicantHalInterface::WpaSetSuspendMode(bool enable) const +WifiErrorNo WifiSupplicantHalInterface::WpaSetSuspendMode(bool mode) const { CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); - return mIdlClient->ReqWpaSetSuspendMode(enable); + return mIdlClient->ReqWpaSetSuspendMode(mode); } } // namespace Wifi } // namespace OHOS -- Gitee From 68c2278dd497c63d944fa0f3d27946120ad28ba0 Mon Sep 17 00:00:00 2001 From: legendtau Date: Mon, 1 Aug 2022 11:48:17 +0800 Subject: [PATCH 289/491] send suspend mode to wpa 0801 Signed-off-by: legendtau --- .../wifi_framework/wifi_manage/wifi_sta/ista_service.h | 9 --------- .../wifi_manage/wifi_sta/sta_interface.cpp | 9 +++++++++ .../wifi_framework/wifi_manage/wifi_sta/sta_interface.h | 8 +++++++- .../wifi_framework/wifi_manage/wifi_sta/sta_service.cpp | 4 ++-- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/ista_service.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/ista_service.h index dcaed2b..97f786a 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/ista_service.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/ista_service.h @@ -202,15 +202,6 @@ public: * @return ErrCode - success: WIFI_OPT_SUCCESS fail: WIFI_OPT_FAILED */ virtual ErrCode RegisterStaServiceCallback(const StaServiceCallback &callbacks) = 0; - - /** - * @Description Set suspend mode to wpa - * - * @param mode - true for suspend mode, false for resume mode - * - * @Return success: WIFI_OPT_SUCCESS, fail: WIFI_OPT_FAILED - */ - virtual ErrCode SetSuspendMode(bool mode) = 0; }; } // namespace Wifi } // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.cpp index bd10af5..95c7671 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.cpp @@ -275,5 +275,14 @@ ErrCode StaInterface::RegisterStaServiceCallback(const StaServiceCallback &callb return WIFI_OPT_SUCCESS; } +ErrCode StaInterface::SetSuspendMode(bool mode) +{ + LOGI("Enter StaInterface::SetSuspendMode, mode=[%{public}d]!", mode); + if (pStaService->SetSuspendMode(mode) != WIFI_IDL_OPT_OK) { + LOGE("SetSuspendMode() failed!"); + return WIFI_OPT_FAILED; + } + return WIFI_OPT_SUCCESS; +} } // namespace Wifi } // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.h index a8f61e3..457d99e 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.h @@ -201,7 +201,13 @@ public: * @return ErrCode - success: WIFI_OPT_SUCCESS fail: WIFI_OPT_FAILED */ virtual ErrCode RegisterStaServiceCallback(const StaServiceCallback &callbacks) override; - + /** + * @Description send suspend mode for wpa. + * + * @param mode: true for suspend, false for resume. + * @return WifiErrorNo + */ + virtual ErrCode SetSuspendMode(bool mode) override; private: StaServiceCallback staCallback; StaService *pStaService; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp index 6d9380f..498962a 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp @@ -399,8 +399,8 @@ ErrCode StaService::ReConnect() const ErrCode StaService::SetSuspendMode(bool mode) const { LOGI("Enter StaService::SetSuspendMode, mode=[%{public}d]!", mode); - if (WifiSupplicantHalInterface::GetInstance().WpaSetCountryCode(mode) != WIFI_IDL_OPT_OK) { - LOGE("WpaSetCountryCode() failed!"); + if (WifiSupplicantHalInterface::GetInstance().WpaSetSuspendMode(mode) != WIFI_IDL_OPT_OK) { + LOGE("WpaSetSuspendMode() failed!"); return WIFI_OPT_FAILED; } return WIFI_OPT_SUCCESS; -- Gitee From 83eb48fb03ae8e2c938f25d62b84a8f0c20f4377 Mon Sep 17 00:00:00 2001 From: legendtau Date: Mon, 1 Aug 2022 14:14:12 +0800 Subject: [PATCH 290/491] send suspend mode to wpa 0801 Signed-off-by: legendtau --- .../wifi_framework/wifi_manage/wifi_sta/ista_service.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/ista_service.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/ista_service.h index 97f786a..844874f 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/ista_service.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/ista_service.h @@ -202,6 +202,13 @@ public: * @return ErrCode - success: WIFI_OPT_SUCCESS fail: WIFI_OPT_FAILED */ virtual ErrCode RegisterStaServiceCallback(const StaServiceCallback &callbacks) = 0; + /** + * @Description send suspend mode for wpa. + * + * @param mode: true for suspend, false for resume. + * @return WifiErrorNo + */ + virtual ErrCode SetSuspendMode(bool mode) = 0; }; } // namespace Wifi } // namespace OHOS -- Gitee From ec8be063056b1b7c6431f75d6c38463393234e93 Mon Sep 17 00:00:00 2001 From: legendtau Date: Mon, 1 Aug 2022 15:32:27 +0800 Subject: [PATCH 291/491] send suspend mode to wpa 0801 Signed-off-by: legendtau --- .../wifi_framework/wifi_manage/wifi_sta/sta_interface.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.cpp index 95c7671..2099ff3 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.cpp @@ -278,7 +278,7 @@ ErrCode StaInterface::RegisterStaServiceCallback(const StaServiceCallback &callb ErrCode StaInterface::SetSuspendMode(bool mode) { LOGI("Enter StaInterface::SetSuspendMode, mode=[%{public}d]!", mode); - if (pStaService->SetSuspendMode(mode) != WIFI_IDL_OPT_OK) { + if (pStaService->SetSuspendMode(mode) != WIFI_OPT_SUCCESS) { LOGE("SetSuspendMode() failed!"); return WIFI_OPT_FAILED; } -- Gitee From e78a70fdc3ae096be68ccd43ebf86841e1e2d2ef Mon Sep 17 00:00:00 2001 From: fanchao Date: Mon, 1 Aug 2022 01:40:08 -0700 Subject: [PATCH 292/491] DHCP does not receive the discovery message and it does not reply. Signed-off-by: fanchao --- dhcp/services/dhcp_server/src/dhcp_server.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dhcp/services/dhcp_server/src/dhcp_server.c b/dhcp/services/dhcp_server/src/dhcp_server.c index 3aba56f..7797400 100644 --- a/dhcp/services/dhcp_server/src/dhcp_server.c +++ b/dhcp/services/dhcp_server/src/dhcp_server.c @@ -1107,7 +1107,7 @@ static int HasNobindgRequest(PDhcpServerContext ctx, PDhcpMsgInfo received, PDhc } return NotBindingRequest(&srvIns->addressPool, received, reply); } - return REPLY_ACK; + return REPLY_NONE; } static int OnReceivedRequest(PDhcpServerContext ctx, PDhcpMsgInfo received, PDhcpMsgInfo reply) @@ -1121,10 +1121,7 @@ static int OnReceivedRequest(PDhcpServerContext ctx, PDhcpMsgInfo received, PDhc AddressBinding *binding = srvIns->addressPool.binding(received->packet.chaddr, &received->options); if (binding == NULL) { LOGE("OnReceivedRequest, binding is null"); - return REPLY_NONE; - } - if ((ret = HasNobindgRequest(ctx, received, reply)) != REPLY_ACK) { - return ret; + return HasNobindgRequest(ctx, received, reply); } Rebinding(&srvIns->addressPool, binding); AddressBinding *lease = GetLease(&srvIns->addressPool, yourIpAddr); -- Gitee From e9809fd50040045a4746b9788750542e528dfac3 Mon Sep 17 00:00:00 2001 From: legendtau Date: Tue, 2 Aug 2022 16:03:53 +0800 Subject: [PATCH 293/491] bugfix for handle wpa callback event 0802 Signed-off-by: legendtau --- .../wpa_supplicant_hal/wifi_wpa_hal.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c index fc46a16..8405b8c 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c @@ -656,6 +656,8 @@ static void *WpaReceiveCallback(void *arg) if (arg == NULL) { return NULL; } + char staIface[] = "IFACE=wlan"; + char p2pIface[] = "IFACE=p2p"; WifiWpaInterface *pWpa = arg; char *buf = (char *)calloc(REPLY_BUF_LENGTH, sizeof(char)); if (buf == NULL) { @@ -693,10 +695,23 @@ static void *WpaReceiveCallback(void *arg) if (strncmp(p, WPA_EVENT_TERMINATING, strlen(WPA_EVENT_TERMINATING)) == 0) { break; } - if (WpaP2pCallBackFunc(p) == 0) { + char *iface = strstr(buf, "IFACE="); + if (iface == NULL) { + /* if 'IFACE=' is not reported */ + if (WpaP2pCallBackFunc(p) == 0) { + continue; + } + WpaCallBackFunc(p); continue; } - WpaCallBackFunc(p); + if (strncmp(iface, p2pIface, strlen(p2pIface)) == 0) { + if (WpaP2pCallBackFunc(p) == 0) { + continue; + } + } + if (strncmp(iface, staIface, strlen(staIface)) == 0) { + WpaCallBackFunc(p); + } } free(buf); buf = NULL; -- Gitee From 02aa8c84f7ec6eb75f360b778dbecba407e0dfb9 Mon Sep 17 00:00:00 2001 From: y00316381 Date: Wed, 3 Aug 2022 11:27:34 +0800 Subject: [PATCH 294/491] send suspend mode to wpa 0801 Signed-off-by: y00316381 --- .../wifi_manage/wifi_device_service_impl.cpp | 16 ++++++++++++++-- .../wpa_supplicant_hal/wifi_wpa_hal.c | 19 +++++++++++++++++-- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp index 0805460..1203783 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp @@ -132,8 +132,12 @@ void WifiDeviceServiceImpl::OnStart() if (screenEventSubscriber_ == nullptr) { lpScreenTimer_ = std::make_unique("WifiDeviceServiceImpl"); TimeOutCallback timeOutcallback = std::bind(&WifiDeviceServiceImpl::RegisterScreenEvent, this); - lpScreenTimer_->Setup(); - lpScreenTimer_->Register(timeOutcallback, TIMEOUT_SCREEN_EVENT, true); + if (lpScreenTimer_ != nullptr) { + lpScreenTimer_->Setup(); + lpScreenTimer_->Register(timeOutcallback, TIMEOUT_SCREEN_EVENT, true); + } else { + WIFI_LOGE("lpScreenTimer_ is nullptr"); + } } #endif } @@ -150,6 +154,14 @@ void WifiDeviceServiceImpl::OnStop() lpTimer_->Shutdown(false); lpTimer_ = nullptr; } + if (screenEventSubscriber_ != nullptr) { + UnRegisterScreenEvent(); + screenEventSubscriber_ = nullptr; + } + if (lpScreenTimer_ != nullptr) { + lpScreenTimer_->Shutdown(false); + lpScreenTimer_ = nullptr; + } #endif WIFI_LOGI("Stop sta service!"); } diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c index 0e5fc2a..bfc9aa6 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c @@ -656,6 +656,8 @@ static void *WpaReceiveCallback(void *arg) if (arg == NULL) { return NULL; } + char staIface[] = "IFACE=wlan"; + char p2pIface[] = "IFACE=p2p"; WifiWpaInterface *pWpa = arg; char *buf = (char *)calloc(REPLY_BUF_LENGTH, sizeof(char)); if (buf == NULL) { @@ -693,10 +695,23 @@ static void *WpaReceiveCallback(void *arg) if (strncmp(p, WPA_EVENT_TERMINATING, strlen(WPA_EVENT_TERMINATING)) == 0) { break; } - if (WpaP2pCallBackFunc(p) == 0) { + char *iface = strstr(buf, "IFACE="); + if (iface == NULL) { + /* if 'IFACE=' is not reported */ + if (WpaP2pCallBackFunc(p) == 0) { + continue; + } + WpaCallBackFunc(p); continue; } - WpaCallBackFunc(p); + if (strncmp(iface, p2pIface, strlen(p2pIface)) == 0) { + if (WpaP2pCallBackFunc(p) == 0) { + continue; + } + } + if (strncmp(iface, staIface, strlen(staIface)) == 0) { + WpaCallBackFunc(p); + } } free(buf); buf = NULL; -- Gitee From 2c43810316e3766b8d6d6481dc3ce8820225f0f5 Mon Sep 17 00:00:00 2001 From: y00316381 Date: Wed, 3 Aug 2022 14:09:06 +0800 Subject: [PATCH 295/491] send suspend mode to wpa 0801 Signed-off-by: y00316381 --- .../wifi_framework/wifi_manage/BUILD.gn | 3 ++- .../wifi_manage/wifi_device_service_impl.cpp | 1 - .../wpa_supplicant_hal/wifi_wpa_hal.c | 19 ++----------------- 3 files changed, 4 insertions(+), 19 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn index 5cb9732..fc02d71 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn @@ -244,8 +244,9 @@ if (defined(ohos_lite)) { ":wifi_manager_service_header", ] + defines = [] if (wifi_feature_with_p2p) { - defines = [ "FEATURE_P2P_SUPPORT" ] + defines += [ "FEATURE_P2P_SUPPORT" ] } if (wifi_feature_with_ap_num > 0) { diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp index 1203783..45b1126 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp @@ -156,7 +156,6 @@ void WifiDeviceServiceImpl::OnStop() } if (screenEventSubscriber_ != nullptr) { UnRegisterScreenEvent(); - screenEventSubscriber_ = nullptr; } if (lpScreenTimer_ != nullptr) { lpScreenTimer_->Shutdown(false); diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c index bfc9aa6..0e5fc2a 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c @@ -656,8 +656,6 @@ static void *WpaReceiveCallback(void *arg) if (arg == NULL) { return NULL; } - char staIface[] = "IFACE=wlan"; - char p2pIface[] = "IFACE=p2p"; WifiWpaInterface *pWpa = arg; char *buf = (char *)calloc(REPLY_BUF_LENGTH, sizeof(char)); if (buf == NULL) { @@ -695,23 +693,10 @@ static void *WpaReceiveCallback(void *arg) if (strncmp(p, WPA_EVENT_TERMINATING, strlen(WPA_EVENT_TERMINATING)) == 0) { break; } - char *iface = strstr(buf, "IFACE="); - if (iface == NULL) { - /* if 'IFACE=' is not reported */ - if (WpaP2pCallBackFunc(p) == 0) { - continue; - } - WpaCallBackFunc(p); + if (WpaP2pCallBackFunc(p) == 0) { continue; } - if (strncmp(iface, p2pIface, strlen(p2pIface)) == 0) { - if (WpaP2pCallBackFunc(p) == 0) { - continue; - } - } - if (strncmp(iface, staIface, strlen(staIface)) == 0) { - WpaCallBackFunc(p); - } + WpaCallBackFunc(p); } free(buf); buf = NULL; -- Gitee From 389302fc6a74be04f2b75037284c6d88a435e720 Mon Sep 17 00:00:00 2001 From: y00316381 Date: Wed, 3 Aug 2022 14:17:12 +0800 Subject: [PATCH 296/491] send suspend mode to wpa 0801 Signed-off-by: y00316381 --- wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn index fc02d71..2eefd97 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn @@ -244,7 +244,7 @@ if (defined(ohos_lite)) { ":wifi_manager_service_header", ] - defines = [] + defines = [] if (wifi_feature_with_p2p) { defines += [ "FEATURE_P2P_SUPPORT" ] } -- Gitee From 72c37eed8034e78a52e235952d3950369b6f09a9 Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Tue, 2 Aug 2022 00:54:09 +0000 Subject: [PATCH 297/491] =?UTF-8?q?WiFi=20IWYU=20=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangfeng Change-Id: I445612f403b9a667d2b7224bdf6b56875e4fe8a6 --- .../dhcp_server/include/dhcp_address_pool.h | 7 ++-- .../dhcp_server/include/dhcp_argument.h | 7 +--- .../dhcp_server/include/dhcp_binding.h | 6 +-- .../dhcp_server/include/dhcp_config.h | 11 ++---- .../dhcp_server/include/dhcp_option.h | 7 ++-- .../dhcp_server/include/dhcp_server.h | 7 ++-- dhcp/services/dhcp_server/src/address_utils.c | 10 +++-- dhcp/services/dhcp_server/src/common_util.c | 24 +++++------- .../dhcp_server/src/dhcp_address_pool.c | 6 +-- dhcp/services/dhcp_server/src/dhcp_argument.c | 13 +++++-- dhcp/services/dhcp_server/src/dhcp_binding.c | 10 +++-- dhcp/services/dhcp_server/src/dhcp_config.c | 17 +++++---- dhcp/services/dhcp_server/src/dhcp_dhcpd.c | 29 ++++++--------- dhcp/services/dhcp_server/src/dhcp_option.c | 3 +- dhcp/services/dhcp_server/src/dhcp_server.c | 37 +++++++++++-------- dhcp/services/dhcp_server/src/hash_table.c | 7 ++-- .../mgr_service/include/dhcp_service.h | 11 ++++-- .../services/mgr_service/src/dhcp_service.cpp | 4 ++ .../mgr_service/src/dhcp_service_api.cpp | 2 + .../unittest/dhcp_argument_test.cpp | 3 +- .../unittest/dhcp_binding_test.cpp | 3 +- wifi/frameworks/native/BUILD.gn | 1 + .../native/src/wifi_device_impl.cpp | 7 +++- wifi/frameworks/native/src/wifi_device_impl.h | 10 ++++- wifi/frameworks/native/src/wifi_hid2d_msg.cpp | 3 +- .../native/src/wifi_hotspot_impl.cpp | 12 ++++-- .../frameworks/native/src/wifi_hotspot_impl.h | 14 +++++-- .../native/src/wifi_hotspot_mgr_proxy.cpp | 5 ++- .../native/src/wifi_hotspot_mgr_proxy.h | 8 ++-- wifi/frameworks/native/src/wifi_msg.cpp | 1 + .../frameworks/native/src/wifi_scan_proxy.cpp | 8 ++++ wifi/frameworks/native/src/wifi_scan_proxy.h | 9 ++++- .../ipc_framework/cRPC/include/client.h | 6 +-- .../ipc_framework/cRPC/include/context.h | 7 +--- .../ipc_framework/cRPC/include/evloop.h | 6 +-- .../ipc_framework/cRPC/include/hash_table.h | 5 +-- .../ipc_framework/cRPC/include/net.h | 6 +-- .../ipc_framework/cRPC/include/serial.h | 5 +-- .../ipc_framework/cRPC/include/server.h | 9 ++--- .../ipc_framework/cRPC/src/client.c | 10 ++++- .../ipc_framework/cRPC/src/context.c | 8 +++- .../ipc_framework/cRPC/src/evloop.c | 6 ++- .../ipc_framework/cRPC/src/hash_table.c | 4 +- .../ipc_framework/cRPC/src/net.c | 14 ++++++- .../ipc_framework/cRPC/src/serial.c | 7 +++- .../ipc_framework/cRPC/src/server.c | 11 ++++++ .../wifi_framework/common/log/log_helper.c | 8 ++-- .../wifi_framework/common/log/log_helper.h | 8 +--- .../common/net_helper/base_address.cpp | 6 +-- .../common/net_helper/base_address.h | 7 ++-- .../common/net_helper/ipv4_address.cpp | 9 +++-- .../common/net_helper/ipv4_address.h | 7 +++- .../common/net_helper/mac_address.cpp | 12 +++--- .../common/net_helper/mac_address.h | 6 +-- .../idl_client/idl_interface/i_wifi.c | 19 ++++++---- .../idl_client/idl_interface/i_wifi.h | 7 ++-- .../idl_client/idl_interface/i_wifi_chip.c | 9 +++-- .../idl_client/idl_interface/i_wifi_chip.h | 7 ++-- .../idl_interface/i_wifi_hotspot_iface.c | 7 +++- .../idl_client/idl_interface/i_wifi_iface.c | 8 ++-- .../idl_interface/i_wifi_p2p_iface.c | 9 +++-- .../idl_interface/i_wifi_p2p_iface.h | 3 +- .../idl_interface/i_wifi_public_func.c | 5 ++- .../idl_interface/i_wifi_sta_iface.c | 10 +++-- .../idl_interface/i_wifi_sta_iface.h | 7 ++-- .../idl_interface/i_wifi_supplicant_iface.c | 10 +++-- wifi/services/wifi_standard/wifi_hal/main.c | 1 + .../wifi_hal/wifi_hal_callback.c | 1 + .../wifi_standard/wifi_hal/wifi_hal_crpc_ap.c | 2 + .../wifi_hal/wifi_hal_crpc_base.c | 1 + .../wifi_hal/wifi_hal_crpc_chip.c | 2 + .../wifi_hal/wifi_hal_crpc_common.c | 1 + .../wifi_hal/wifi_hal_crpc_p2p.c | 3 +- .../wifi_hal/wifi_hal_crpc_server.c | 3 +- .../wifi_hal/wifi_hal_crpc_sta.c | 1 + .../wifi_hal/wifi_hal_crpc_supplicant.c | 1 + .../cRPC/unittest/context_test.cpp | 7 ++-- .../ipc_framework/cRPC/unittest/net_test.cpp | 7 +++- 78 files changed, 369 insertions(+), 231 deletions(-) diff --git a/dhcp/services/dhcp_server/include/dhcp_address_pool.h b/dhcp/services/dhcp_server/include/dhcp_address_pool.h index 4ec6d6e..f13514e 100644 --- a/dhcp/services/dhcp_server/include/dhcp_address_pool.h +++ b/dhcp/services/dhcp_server/include/dhcp_address_pool.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -17,14 +17,15 @@ #define OHOS_DHCP_ADDRESS_POOL_H #include +#include "dhcp_binding.h" #include "dhcp_define.h" #include "dhcp_option.h" #include "hash_table.h" -#include "dhcp_binding.h" #ifdef __cplusplus extern "C" { #endif + typedef struct DhcpAddressPool DhcpAddressPool; typedef AddressBinding *(*QueryBind)(uint8_t macAddr[DHCP_HWADDR_LENGTH], PDhcpOptionList cliOptins); typedef AddressBinding *(*AddBind)(uint8_t macAddr[DHCP_HWADDR_LENGTH], PDhcpOptionList cliOptins); @@ -77,4 +78,4 @@ int GetDistributeMode(void); #ifdef __cplusplus } #endif -#endif \ No newline at end of file +#endif diff --git a/dhcp/services/dhcp_server/include/dhcp_argument.h b/dhcp/services/dhcp_server/include/dhcp_argument.h index cb90770..20c215d 100644 --- a/dhcp/services/dhcp_server/include/dhcp_argument.h +++ b/dhcp/services/dhcp_server/include/dhcp_argument.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -17,9 +17,6 @@ #ifndef OHOS_DHCP_ARGUMENT_H #define OHOS_DHCP_ARGUMENT_H -#include "hash_table.h" -#include "dhcp_define.h" - #define ARGUMENT_NAME_SIZE 32 #define ARGUMENT_VALUE_SIZE 256 #define INIT_ARGS_SIZE 4 @@ -69,4 +66,4 @@ void PrintRequiredArguments(void); } #endif -#endif // OHOS_DHCP_ARGUMENT_H \ No newline at end of file +#endif // OHOS_DHCP_ARGUMENT_H diff --git a/dhcp/services/dhcp_server/include/dhcp_binding.h b/dhcp/services/dhcp_server/include/dhcp_binding.h index 5ef3bcb..ad3b82b 100644 --- a/dhcp/services/dhcp_server/include/dhcp_binding.h +++ b/dhcp/services/dhcp_server/include/dhcp_binding.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,14 +16,12 @@ #ifndef OHOS_DHCP_BINDING_H #define OHOS_DHCP_BINDING_H -#include "dhcp_define.h" -#include -#include #include #ifdef __cplusplus extern "C" { #endif + enum BindingMode { BIND_MODE_STATIC = 0, BIND_MODE_DYNAMIC, BIND_MODE_RESERVED }; enum BindingState { BIND_NONE = 0, BIND_PENDING, BIND_ASSOCIATED, BIND_EXPIRED, BIND_RELEASED }; diff --git a/dhcp/services/dhcp_server/include/dhcp_config.h b/dhcp/services/dhcp_server/include/dhcp_config.h index c3544fb..fe3dfd0 100644 --- a/dhcp/services/dhcp_server/include/dhcp_config.h +++ b/dhcp/services/dhcp_server/include/dhcp_config.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,18 +16,15 @@ #ifndef OHOS_DHCP_CONFIG_H #define OHOS_DHCP_CONFIG_H - -#include #include -#include +#include "dhcp_address_pool.h" #include "dhcp_define.h" #include "dhcp_option.h" -#include "dhcp_address_pool.h" -#include "dhcp_binding.h" #ifdef __cplusplus extern "C" { #endif + typedef struct DhcpConfig DhcpConfig; struct DhcpConfig { char ifname[IFACE_NAME_SIZE]; /* Network interface name. */ @@ -63,4 +60,4 @@ int LoadConfig(const char *configFile, const char *ifname, DhcpConfig *config); #ifdef __cplusplus } #endif -#endif \ No newline at end of file +#endif diff --git a/dhcp/services/dhcp_server/include/dhcp_option.h b/dhcp/services/dhcp_server/include/dhcp_option.h index cf0af1a..ec05d6e 100644 --- a/dhcp/services/dhcp_server/include/dhcp_option.h +++ b/dhcp/services/dhcp_server/include/dhcp_option.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,9 +16,8 @@ #ifndef OHOS_DHCP_OPTION_H #define OHOS_DHCP_OPTION_H -#include -#include #include +#include #define DHCP_OPTION_SIZE 256 #define DHCP_END_OPTION_CODE 255 @@ -68,4 +67,4 @@ int AppendAddressOption(PDhcpOption pOption, uint32_t address); #ifdef __cplusplus } #endif -#endif \ No newline at end of file +#endif diff --git a/dhcp/services/dhcp_server/include/dhcp_server.h b/dhcp/services/dhcp_server/include/dhcp_server.h index 4647137..8bef877 100644 --- a/dhcp/services/dhcp_server/include/dhcp_server.h +++ b/dhcp/services/dhcp_server/include/dhcp_server.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -15,8 +15,9 @@ #ifndef OHOS_DHCP_SERVER_H #define OHOS_DHCP_SERVER_H + #include "dhcp_config.h" -#include "dhcp_address_pool.h" +#include "dhcp_define.h" enum DhcpServerState { ST_IDEL = 0, ST_STARTING, ST_RUNNING, ST_RELOADNG, ST_STOPING, ST_STOPED }; typedef int (*DhcpServerCallback)(int, int, const char *ifname); @@ -42,4 +43,4 @@ int SaveLease(PDhcpServerContext ctx); #ifdef __cplusplus } #endif -#endif \ No newline at end of file +#endif diff --git a/dhcp/services/dhcp_server/src/address_utils.c b/dhcp/services/dhcp_server/src/address_utils.c index 939f7f8..e0e0a21 100644 --- a/dhcp/services/dhcp_server/src/address_utils.c +++ b/dhcp/services/dhcp_server/src/address_utils.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -14,10 +14,12 @@ */ #include "address_utils.h" -#include -#include #include +#include #include +#include +#include +#include "dhcp_define.h" #include "dhcp_logger.h" #undef LOG_TAG @@ -311,4 +313,4 @@ int AddrEquels(uint8_t firstAddr[DHCP_HWADDR_LENGTH], uint8_t secondAddr[DHCP_HW } } return DHCP_TRUE; -} \ No newline at end of file +} diff --git a/dhcp/services/dhcp_server/src/common_util.c b/dhcp/services/dhcp_server/src/common_util.c index a350ad6..c2a3221 100644 --- a/dhcp/services/dhcp_server/src/common_util.c +++ b/dhcp/services/dhcp_server/src/common_util.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,23 +12,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "common_util.h" -#include -#include #include -#include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include #include -#include -#include -#include "dhcp_logger.h" +#include +#include +#include #include "dhcp_define.h" +#include "dhcp_logger.h" #define NEW_FILEPATH_MODE 0755 #define TIME_BASE_YEAR 1900 @@ -202,4 +198,4 @@ int RemoveSpaceCharacters(char *buf, size_t bufSize) buf[j] = '\0'; return DHCP_TRUE; -} \ No newline at end of file +} diff --git a/dhcp/services/dhcp_server/src/dhcp_address_pool.c b/dhcp/services/dhcp_server/src/dhcp_address_pool.c index 80b6887..2f9895a 100644 --- a/dhcp/services/dhcp_server/src/dhcp_address_pool.c +++ b/dhcp/services/dhcp_server/src/dhcp_address_pool.c @@ -14,12 +14,10 @@ */ #include "dhcp_address_pool.h" +#include #include +#include #include -#include -#include -#include -#include "securec.h" #include "address_utils.h" #include "common_util.h" #include "dhcp_logger.h" diff --git a/dhcp/services/dhcp_server/src/dhcp_argument.c b/dhcp/services/dhcp_server/src/dhcp_argument.c index 75f8a4d..e295951 100644 --- a/dhcp/services/dhcp_server/src/dhcp_argument.c +++ b/dhcp/services/dhcp_server/src/dhcp_argument.c @@ -14,12 +14,17 @@ */ #include "dhcp_argument.h" -#include "dhcp_option.h" -#include "dhcp_config.h" +#include +#include +#include +#include +#include +#include #include "address_utils.h" -#include "securec.h" +#include "dhcp_define.h" #include "dhcp_logger.h" -#include +#include "hash_table.h" + #undef LOG_TAG #define LOG_TAG "DhcpArgument" diff --git a/dhcp/services/dhcp_server/src/dhcp_binding.c b/dhcp/services/dhcp_server/src/dhcp_binding.c index ae63572..e09e345 100644 --- a/dhcp/services/dhcp_server/src/dhcp_binding.c +++ b/dhcp/services/dhcp_server/src/dhcp_binding.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -14,12 +14,15 @@ */ #include "dhcp_binding.h" +#include #include #include -#include "dhcp_logger.h" +#include +#include #include "address_utils.h" #include "common_util.h" -#include "securec.h" +#include "dhcp_define.h" +#include "dhcp_logger.h" #undef LOG_TAG #define LOG_TAG "DhcpServerBinding" @@ -31,7 +34,6 @@ #define PENDING_INTERVAL_LEVEL1_TIMES 2 #define PENDING_INTERVAL_LEVEL2_TIMES 5 - uint64_t NextPendingInterval(uint64_t pendingInterval) { uint64_t next = pendingInterval; diff --git a/dhcp/services/dhcp_server/src/dhcp_config.c b/dhcp/services/dhcp_server/src/dhcp_config.c index 677701e..bd42972 100644 --- a/dhcp/services/dhcp_server/src/dhcp_config.c +++ b/dhcp/services/dhcp_server/src/dhcp_config.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,17 +12,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "dhcp_config.h" -#include +#include +#include #include -#include -#include -#include -#include "dhcp_logger.h" -#include "common_util.h" +#include +#include +#include #include "address_utils.h" +#include "common_util.h" #include "dhcp_ipv4.h" -#include "securec.h" +#include "dhcp_logger.h" #undef LOG_TAG #define LOG_TAG "DhcpServerConfig" diff --git a/dhcp/services/dhcp_server/src/dhcp_dhcpd.c b/dhcp/services/dhcp_server/src/dhcp_dhcpd.c index 250bc53..6c80d69 100644 --- a/dhcp/services/dhcp_server/src/dhcp_dhcpd.c +++ b/dhcp/services/dhcp_server/src/dhcp_dhcpd.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -13,28 +13,21 @@ * limitations under the License. */ +#include +#include #include -#include -#include #include -#include -#include -#include -#include -#include +#include #include -#include -#include -#include -#include "dhcp_server.h" -#include "dhcp_define.h" -#include "dhcp_logger.h" -#include "dhcp_ipv4.h" -#include "hash_table.h" #include "address_utils.h" -#include "securec.h" -#include "dhcp_config.h" +#include "dhcp_address_pool.h" #include "dhcp_argument.h" +#include "dhcp_config.h" +#include "dhcp_define.h" +#include "dhcp_ipv4.h" +#include "dhcp_logger.h" +#include "dhcp_option.h" +#include "dhcp_server.h" #undef LOG_TAG #define LOG_TAG "DhcpServerMain" diff --git a/dhcp/services/dhcp_server/src/dhcp_option.c b/dhcp/services/dhcp_server/src/dhcp_option.c index e180688..1c43d58 100644 --- a/dhcp/services/dhcp_server/src/dhcp_option.c +++ b/dhcp/services/dhcp_server/src/dhcp_option.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,7 +16,6 @@ #include "dhcp_option.h" #include #include -#include #include "dhcp_define.h" #include "dhcp_logger.h" #include "securec.h" diff --git a/dhcp/services/dhcp_server/src/dhcp_server.c b/dhcp/services/dhcp_server/src/dhcp_server.c index 3aba56f..7725471 100644 --- a/dhcp/services/dhcp_server/src/dhcp_server.c +++ b/dhcp/services/dhcp_server/src/dhcp_server.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -14,27 +14,32 @@ */ #include "dhcp_server.h" -#include -#include -#include -#include #include -#include -#include +#include +#include #include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include -#include -#include "dhcp_ipv4.h" -#include "dhcp_message.h" -#include "dhcp_option.h" -#include "dhcp_ipv4.h" -#include "securec.h" -#include "dhcp_logger.h" +#include +#include +#include #include "address_utils.h" +#include "common_util.h" #include "dhcp_address_pool.h" +#include "dhcp_binding.h" #include "dhcp_config.h" -#include "common_util.h" +#include "dhcp_ipv4.h" +#include "dhcp_logger.h" +#include "dhcp_message.h" +#include "dhcp_option.h" +#include "hash_table.h" #undef LOG_TAG #define LOG_TAG "DhcpServer" diff --git a/dhcp/services/dhcp_server/src/hash_table.c b/dhcp/services/dhcp_server/src/hash_table.c index 815d506..daa88f6 100644 --- a/dhcp/services/dhcp_server/src/hash_table.c +++ b/dhcp/services/dhcp_server/src/hash_table.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -14,10 +14,9 @@ */ #include "hash_table.h" -#include +#include #include #include -#include "securec.h" #define HASH_TRUE 1 #define HASH_FALSE 0 @@ -385,4 +384,4 @@ void HashRehash(HashTable *table, HashNode **old, size_t oldCapacity) node = next; } } -} \ No newline at end of file +} diff --git a/dhcp/services/mgr_service/include/dhcp_service.h b/dhcp/services/mgr_service/include/dhcp_service.h index bcbfb45..bd74212 100644 --- a/dhcp/services/mgr_service/include/dhcp_service.h +++ b/dhcp/services/mgr_service/include/dhcp_service.h @@ -16,11 +16,14 @@ #ifndef OHOS_DHCP_SERVICE_H #define OHOS_DHCP_SERVICE_H -#include "i_dhcp_service.h" +#include +#include +#include #include "dhcp_define.h" -#include "dhcp_client_service_impl.h" -#include "dhcp_server_service.h" - +#include "i_dhcp_client_service.h" +#include "i_dhcp_result_notify.h" +#include "i_dhcp_server_service.h" +#include "i_dhcp_service.h" namespace OHOS { namespace Wifi { diff --git a/dhcp/services/mgr_service/src/dhcp_service.cpp b/dhcp/services/mgr_service/src/dhcp_service.cpp index de57843..61727fc 100644 --- a/dhcp/services/mgr_service/src/dhcp_service.cpp +++ b/dhcp/services/mgr_service/src/dhcp_service.cpp @@ -14,7 +14,11 @@ */ #include "dhcp_service.h" +#include +#include #include +#include "dhcp_client_service_impl.h" +#include "dhcp_server_service.h" #include "wifi_logger.h" DEFINE_WIFILOG_DHCP_LABEL("DhcpService"); diff --git a/dhcp/services/mgr_service/src/dhcp_service_api.cpp b/dhcp/services/mgr_service/src/dhcp_service_api.cpp index 7177089..cb0f107 100644 --- a/dhcp/services/mgr_service/src/dhcp_service_api.cpp +++ b/dhcp/services/mgr_service/src/dhcp_service_api.cpp @@ -14,7 +14,9 @@ */ #include "dhcp_service_api.h" +#include #include "dhcp_service.h" +#include "i_dhcp_service.h" #include "wifi_logger.h" DEFINE_WIFILOG_DHCP_LABEL("DhcpServiceApi"); diff --git a/dhcp/test/services/dhcp_server/unittest/dhcp_argument_test.cpp b/dhcp/test/services/dhcp_server/unittest/dhcp_argument_test.cpp index 8a1e963..9f406c3 100644 --- a/dhcp/test/services/dhcp_server/unittest/dhcp_argument_test.cpp +++ b/dhcp/test/services/dhcp_server/unittest/dhcp_argument_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -20,6 +20,7 @@ #include #include #include "dhcp_argument.h" +#include "dhcp_define.h" using namespace testing::ext; diff --git a/dhcp/test/services/dhcp_server/unittest/dhcp_binding_test.cpp b/dhcp/test/services/dhcp_server/unittest/dhcp_binding_test.cpp index 3a1db43..5a1827d 100644 --- a/dhcp/test/services/dhcp_server/unittest/dhcp_binding_test.cpp +++ b/dhcp/test/services/dhcp_server/unittest/dhcp_binding_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -17,6 +17,7 @@ #include #include #include "dhcp_binding.h" +#include "dhcp_define.h" #include "common_util.h" using namespace testing::ext; diff --git a/wifi/frameworks/native/BUILD.gn b/wifi/frameworks/native/BUILD.gn index 08e3fa1..c9efdd4 100644 --- a/wifi/frameworks/native/BUILD.gn +++ b/wifi/frameworks/native/BUILD.gn @@ -46,6 +46,7 @@ if (defined(ohos_lite)) { "//foundation/distributedschedule/samgr_lite/interfaces/innerkits/samgr", "//third_party/bounds_checking_function/include", "//utils/native/lite/include", + "//commonlibrary/c_utils/base/include", ] deps = [ diff --git a/wifi/frameworks/native/src/wifi_device_impl.cpp b/wifi/frameworks/native/src/wifi_device_impl.cpp index 5818036..2d0977d 100644 --- a/wifi/frameworks/native/src/wifi_device_impl.cpp +++ b/wifi/frameworks/native/src/wifi_device_impl.cpp @@ -12,10 +12,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "wifi_device_impl.h" +#include #ifndef OHOS_ARCH_LITE +#include "iremote_broker.h" +#include "iremote_object.h" #include "iservice_registry.h" #endif +#include "wifi_device_proxy.h" #include "wifi_logger.h" DEFINE_WIFILOG_LABEL("WifiDeviceImpl"); @@ -309,4 +314,4 @@ bool WifiDeviceImpl::SetLowLatencyMode(bool enabled) return client_->SetLowLatencyMode(enabled); } } // namespace Wifi -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/wifi/frameworks/native/src/wifi_device_impl.h b/wifi/frameworks/native/src/wifi_device_impl.h index dd53202..1173351 100644 --- a/wifi/frameworks/native/src/wifi_device_impl.h +++ b/wifi/frameworks/native/src/wifi_device_impl.h @@ -15,8 +15,14 @@ #ifndef OHOS_WIFI_DEVICE_IMPL_H #define OHOS_WIFI_DEVICE_IMPL_H +#include +#include +#include "i_wifi_device.h" +#include "i_wifi_device_callback.h" +#include "refbase.h" #include "wifi_device.h" -#include "wifi_device_proxy.h" +#include "wifi_errcode.h" +#include "wifi_msg.h" namespace OHOS { namespace Wifi { @@ -338,4 +344,4 @@ private: }; } // namespace Wifi } // namespace OHOS -#endif \ No newline at end of file +#endif diff --git a/wifi/frameworks/native/src/wifi_hid2d_msg.cpp b/wifi/frameworks/native/src/wifi_hid2d_msg.cpp index ffdc594..31021dc 100644 --- a/wifi/frameworks/native/src/wifi_hid2d_msg.cpp +++ b/wifi/frameworks/native/src/wifi_hid2d_msg.cpp @@ -14,6 +14,7 @@ */ #include "wifi_hid2d_msg.h" +#include namespace OHOS { namespace Wifi { @@ -57,4 +58,4 @@ namespace Wifi { return m_dhcpMode; } } // namespace Wifi -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/wifi/frameworks/native/src/wifi_hotspot_impl.cpp b/wifi/frameworks/native/src/wifi_hotspot_impl.cpp index 4eea72e..e53842f 100644 --- a/wifi/frameworks/native/src/wifi_hotspot_impl.cpp +++ b/wifi/frameworks/native/src/wifi_hotspot_impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,9 +12,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "wifi_hotspot_impl.h" -#include "wifi_hotspot_mgr_proxy.h" +#include +#include "wifi_hotspot_proxy.h" +#include "i_wifi_hotspot_mgr.h" +#include "iremote_broker.h" +#include "iremote_object.h" #include "iservice_registry.h" +#include "wifi_hotspot_mgr_proxy.h" #include "wifi_logger.h" DEFINE_WIFILOG_HOTSPOT_LABEL("WifiHotspotImpl"); @@ -203,4 +209,4 @@ ErrCode WifiHotspotImpl::SetPowerModel(const PowerModel& model) return client_->SetPowerModel(model); } } // namespace Wifi -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/wifi/frameworks/native/src/wifi_hotspot_impl.h b/wifi/frameworks/native/src/wifi_hotspot_impl.h index 0a39cfe..bea341c 100644 --- a/wifi/frameworks/native/src/wifi_hotspot_impl.h +++ b/wifi/frameworks/native/src/wifi_hotspot_impl.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,8 +16,16 @@ #ifndef OHOS_WIFI_HOTSPOT_IMPL_H #define OHOS_WIFI_HOTSPOT_IMPL_H +#include +#include +#include +#include "i_wifi_hotspot.h" +#include "i_wifi_hotspot_callback.h" +#include "refbase.h" +#include "wifi_ap_msg.h" +#include "wifi_common_msg.h" +#include "wifi_errcode.h" #include "wifi_hotspot.h" -#include "wifi_hotspot_proxy.h" namespace OHOS { namespace Wifi { @@ -198,4 +206,4 @@ private: }; } // namespace Wifi } // namespace OHOS -#endif \ No newline at end of file +#endif diff --git a/wifi/frameworks/native/src/wifi_hotspot_mgr_proxy.cpp b/wifi/frameworks/native/src/wifi_hotspot_mgr_proxy.cpp index 5d3a0ad..db48d5a 100644 --- a/wifi/frameworks/native/src/wifi_hotspot_mgr_proxy.cpp +++ b/wifi/frameworks/native/src/wifi_hotspot_mgr_proxy.cpp @@ -14,6 +14,9 @@ */ #include "wifi_hotspot_mgr_proxy.h" +#include "ipc_types.h" +#include "message_option.h" +#include "message_parcel.h" #include "wifi_logger.h" DEFINE_WIFILOG_HOTSPOT_LABEL("WifiHotspotMgrProxy"); @@ -38,4 +41,4 @@ sptr WifiHotspotMgrProxy::GetWifiRemote(int id) return reply.ReadRemoteObject(); } } // namespace Wifi -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/wifi/frameworks/native/src/wifi_hotspot_mgr_proxy.h b/wifi/frameworks/native/src/wifi_hotspot_mgr_proxy.h index fd311df..ec3db0e 100644 --- a/wifi/frameworks/native/src/wifi_hotspot_mgr_proxy.h +++ b/wifi/frameworks/native/src/wifi_hotspot_mgr_proxy.h @@ -16,9 +16,11 @@ #ifndef OHOS_WIFI_HOTSPOT_MGR_PROXY_H #define OHOS_WIFI_HOTSPOT_MGR_PROXY_H -#include "iremote_proxy.h" #include "i_wifi_hotspot_mgr.h" -#include "wifi_errcode.h" +#include "iremote_broker.h" +#include "iremote_object.h" +#include "iremote_proxy.h" +#include "refbase.h" namespace OHOS { namespace Wifi { @@ -35,4 +37,4 @@ private: }; } // namespace Wifi } // namespace OHOS -#endif \ No newline at end of file +#endif diff --git a/wifi/frameworks/native/src/wifi_msg.cpp b/wifi/frameworks/native/src/wifi_msg.cpp index afbb20b..cae9e2f 100644 --- a/wifi/frameworks/native/src/wifi_msg.cpp +++ b/wifi/frameworks/native/src/wifi_msg.cpp @@ -14,6 +14,7 @@ */ #include "wifi_msg.h" +#include namespace OHOS { namespace Wifi { diff --git a/wifi/frameworks/native/src/wifi_scan_proxy.cpp b/wifi/frameworks/native/src/wifi_scan_proxy.cpp index 96afef5..7d73383 100644 --- a/wifi/frameworks/native/src/wifi_scan_proxy.cpp +++ b/wifi/frameworks/native/src/wifi_scan_proxy.cpp @@ -14,7 +14,15 @@ */ #include "wifi_scan_proxy.h" +#include +#include +#include +#include #include "define.h" +#include "ipc_types.h" +#include "iremote_proxy.h" +#include "message_option.h" +#include "message_parcel.h" #include "wifi_common_util.h" #include "wifi_hisysevent.h" #include "wifi_logger.h" diff --git a/wifi/frameworks/native/src/wifi_scan_proxy.h b/wifi/frameworks/native/src/wifi_scan_proxy.h index 8d3d206..1bc16e3 100644 --- a/wifi/frameworks/native/src/wifi_scan_proxy.h +++ b/wifi/frameworks/native/src/wifi_scan_proxy.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,12 +16,17 @@ #ifndef WIFI_SCAN_PROXY #define WIFI_SCAN_PROXY +#include #ifdef OHOS_ARCH_LITE #include "iproxy_client.h" #else -#include +#include "iremote_broker.h" +#include "iremote_object.h" +#include "iremote_proxy.h" #endif #include "i_wifi_scan.h" +#include "i_wifi_scan_callback.h" +#include "refbase.h" #include "wifi_errcode.h" #include "wifi_scan_msg.h" diff --git a/wifi/services/wifi_standard/ipc_framework/cRPC/include/client.h b/wifi/services/wifi_standard/ipc_framework/cRPC/include/client.h index 0cf6597..ff7d86c 100644 --- a/wifi/services/wifi_standard/ipc_framework/cRPC/include/client.h +++ b/wifi/services/wifi_standard/ipc_framework/cRPC/include/client.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,8 +16,8 @@ #ifndef CRPC_CLIENT_H #define CRPC_CLIENT_H +#include #include "context.h" -#include "net.h" #ifdef __cplusplus extern "C" { @@ -105,4 +105,4 @@ int OnTransact(Context *context); #ifdef __cplusplus } #endif -#endif \ No newline at end of file +#endif diff --git a/wifi/services/wifi_standard/ipc_framework/cRPC/include/context.h b/wifi/services/wifi_standard/ipc_framework/cRPC/include/context.h index 9e5ec13..1407c06 100644 --- a/wifi/services/wifi_standard/ipc_framework/cRPC/include/context.h +++ b/wifi/services/wifi_standard/ipc_framework/cRPC/include/context.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,9 +16,6 @@ #ifndef CRPC_CONTEXT_H #define CRPC_CONTEXT_H -#include "common.h" -#include "net.h" - #ifdef __cplusplus extern "C" { #endif @@ -98,4 +95,4 @@ char *ContextGetReadRecord(Context *context); #ifdef __cplusplus } #endif -#endif \ No newline at end of file +#endif diff --git a/wifi/services/wifi_standard/ipc_framework/cRPC/include/evloop.h b/wifi/services/wifi_standard/ipc_framework/cRPC/include/evloop.h index 0e60cab..a329596 100644 --- a/wifi/services/wifi_standard/ipc_framework/cRPC/include/evloop.h +++ b/wifi/services/wifi_standard/ipc_framework/cRPC/include/evloop.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,8 +16,6 @@ #ifndef CRPC_EVENT_LOOP_H #define CRPC_EVENT_LOOP_H -#include "common.h" - #ifdef __cplusplus extern "C" { #endif @@ -83,4 +81,4 @@ int DelFdEvent(EventLoop *loop, int fd, unsigned int delMask); #ifdef __cplusplus } #endif -#endif \ No newline at end of file +#endif diff --git a/wifi/services/wifi_standard/ipc_framework/cRPC/include/hash_table.h b/wifi/services/wifi_standard/ipc_framework/cRPC/include/hash_table.h index e525365..f0a079e 100644 --- a/wifi/services/wifi_standard/ipc_framework/cRPC/include/hash_table.h +++ b/wifi/services/wifi_standard/ipc_framework/cRPC/include/hash_table.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,7 +16,6 @@ #ifndef CRPC_HASH_TABLE_H #define CRPC_HASH_TABLE_H -#include "common.h" #include "context.h" #ifdef __cplusplus @@ -97,4 +96,4 @@ void DeleteHashTable(HashTable *p, const Context *context); #ifdef __cplusplus } #endif -#endif \ No newline at end of file +#endif diff --git a/wifi/services/wifi_standard/ipc_framework/cRPC/include/net.h b/wifi/services/wifi_standard/ipc_framework/cRPC/include/net.h index 1cf6965..243ab6b 100644 --- a/wifi/services/wifi_standard/ipc_framework/cRPC/include/net.h +++ b/wifi/services/wifi_standard/ipc_framework/cRPC/include/net.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,8 +16,6 @@ #ifndef CRPC_NET_H #define CRPC_NET_H -#include "common.h" - #ifdef __cplusplus extern "C" { #endif @@ -81,4 +79,4 @@ int WaitFdEvent(int fd, unsigned int mask, int milliseconds); #ifdef __cplusplus } #endif -#endif \ No newline at end of file +#endif diff --git a/wifi/services/wifi_standard/ipc_framework/cRPC/include/serial.h b/wifi/services/wifi_standard/ipc_framework/cRPC/include/serial.h index 6ae2ce6..fb725f0 100644 --- a/wifi/services/wifi_standard/ipc_framework/cRPC/include/serial.h +++ b/wifi/services/wifi_standard/ipc_framework/cRPC/include/serial.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -17,7 +17,6 @@ #define CRPC_SERIAL_H #include -#include "common.h" #include "context.h" #ifdef __cplusplus @@ -192,4 +191,4 @@ int ReadUStr(Context *context, unsigned char *uStr, int count); #ifdef __cplusplus } #endif -#endif \ No newline at end of file +#endif diff --git a/wifi/services/wifi_standard/ipc_framework/cRPC/include/server.h b/wifi/services/wifi_standard/ipc_framework/cRPC/include/server.h index c47f4de..d82bb8e 100644 --- a/wifi/services/wifi_standard/ipc_framework/cRPC/include/server.h +++ b/wifi/services/wifi_standard/ipc_framework/cRPC/include/server.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -15,12 +15,11 @@ #ifndef CRPC_SERVER_H #define CRPC_SERVER_H -#include "common.h" +#include +#include #include "context.h" #include "evloop.h" #include "hash_table.h" -#include "net.h" -#include "serial.h" #ifdef __cplusplus extern "C" { @@ -134,4 +133,4 @@ int EndCallbackTransact(const RpcServer *server, int event); #ifdef __cplusplus } #endif -#endif \ No newline at end of file +#endif diff --git a/wifi/services/wifi_standard/ipc_framework/cRPC/src/client.c b/wifi/services/wifi_standard/ipc_framework/cRPC/src/client.c index ee10fec..7a7cf62 100644 --- a/wifi/services/wifi_standard/ipc_framework/cRPC/src/client.c +++ b/wifi/services/wifi_standard/ipc_framework/cRPC/src/client.c @@ -12,10 +12,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "client.h" +#include +#include #include -#include +#include +#include +#include +#include +#include "common.h" #include "log.h" +#include "net.h" #undef LOG_TAG #define LOG_TAG "WifiRpcClient" diff --git a/wifi/services/wifi_standard/ipc_framework/cRPC/src/context.c b/wifi/services/wifi_standard/ipc_framework/cRPC/src/context.c index 9e626df..dcac478 100644 --- a/wifi/services/wifi_standard/ipc_framework/cRPC/src/context.c +++ b/wifi/services/wifi_standard/ipc_framework/cRPC/src/context.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -14,6 +14,12 @@ */ #include "context.h" +#include +#include +#include +#include +#include "common.h" +#include "net.h" Context *CreateContext(int capacity) { diff --git a/wifi/services/wifi_standard/ipc_framework/cRPC/src/evloop.c b/wifi/services/wifi_standard/ipc_framework/cRPC/src/evloop.c index 3628112..6cf12a6 100644 --- a/wifi/services/wifi_standard/ipc_framework/cRPC/src/evloop.c +++ b/wifi/services/wifi_standard/ipc_framework/cRPC/src/evloop.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -14,6 +14,10 @@ */ #include "evloop.h" +#include +#include +#include +#include "common.h" #include "log.h" #undef LOG_TAG diff --git a/wifi/services/wifi_standard/ipc_framework/cRPC/src/hash_table.c b/wifi/services/wifi_standard/ipc_framework/cRPC/src/hash_table.c index c7d3bd4..e7014d9 100644 --- a/wifi/services/wifi_standard/ipc_framework/cRPC/src/hash_table.c +++ b/wifi/services/wifi_standard/ipc_framework/cRPC/src/hash_table.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -14,6 +14,8 @@ */ #include "hash_table.h" +#include +#include "common.h" #include "log.h" #undef LOG_TAG diff --git a/wifi/services/wifi_standard/ipc_framework/cRPC/src/net.c b/wifi/services/wifi_standard/ipc_framework/cRPC/src/net.c index 9b17301..39bfa71 100644 --- a/wifi/services/wifi_standard/ipc_framework/cRPC/src/net.c +++ b/wifi/services/wifi_standard/ipc_framework/cRPC/src/net.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,8 +12,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "net.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include "common.h" +#include "errno.h" #include "log.h" + #undef LOG_TAG #define LOG_TAG "WifiRpcNet" diff --git a/wifi/services/wifi_standard/ipc_framework/cRPC/src/serial.c b/wifi/services/wifi_standard/ipc_framework/cRPC/src/serial.c index 32f212c..923b50e 100644 --- a/wifi/services/wifi_standard/ipc_framework/cRPC/src/serial.c +++ b/wifi/services/wifi_standard/ipc_framework/cRPC/src/serial.c @@ -12,8 +12,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include + #include "serial.h" +#include +#include +#include +#include +#include "common.h" #define TMP_CHAR_LEN 64 diff --git a/wifi/services/wifi_standard/ipc_framework/cRPC/src/server.c b/wifi/services/wifi_standard/ipc_framework/cRPC/src/server.c index 48c2e86..33223dc 100644 --- a/wifi/services/wifi_standard/ipc_framework/cRPC/src/server.c +++ b/wifi/services/wifi_standard/ipc_framework/cRPC/src/server.c @@ -12,8 +12,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "server.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include "common.h" #include "log.h" +#include "net.h" #undef LOG_TAG #define LOG_TAG "WifiRpcServer" diff --git a/wifi/services/wifi_standard/wifi_framework/common/log/log_helper.c b/wifi/services/wifi_standard/wifi_framework/common/log/log_helper.c index 045ee17..1cfb841 100644 --- a/wifi/services/wifi_standard/wifi_framework/common/log/log_helper.c +++ b/wifi/services/wifi_standard/wifi_framework/common/log/log_helper.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -13,8 +13,10 @@ * limitations under the License. */ -#include "securec.h" #include "log_helper.h" +#include +#include +#include const int MAX_REMAIN_CHARACTER_NUM = 3; @@ -60,4 +62,4 @@ void EncryptLogMsg(const char *srcMsg, char *desMsg, int desLen) } } return; -} \ No newline at end of file +} diff --git a/wifi/services/wifi_standard/wifi_framework/common/log/log_helper.h b/wifi/services/wifi_standard/wifi_framework/common/log/log_helper.h index 7a2b191..0a34c68 100644 --- a/wifi/services/wifi_standard/wifi_framework/common/log/log_helper.h +++ b/wifi/services/wifi_standard/wifi_framework/common/log/log_helper.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,10 +16,6 @@ #ifndef LOG_HELPER_H #define LOG_HELPER_H -#include -#include -#include - #ifdef __cplusplus extern "C" { #endif @@ -35,4 +31,4 @@ void EncryptLogMsg(const char *srcMsg, char *desMsg, int desLen); #ifdef __cplusplus } #endif -#endif /* log_helper end */ \ No newline at end of file +#endif /* log_helper end */ diff --git a/wifi/services/wifi_standard/wifi_framework/common/net_helper/base_address.cpp b/wifi/services/wifi_standard/wifi_framework/common/net_helper/base_address.cpp index f7cb1e5..469eca2 100644 --- a/wifi/services/wifi_standard/wifi_framework/common/net_helper/base_address.cpp +++ b/wifi/services/wifi_standard/wifi_framework/common/net_helper/base_address.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -14,7 +14,7 @@ */ #include "base_address.h" -#include "log_helper.h" +#include #include "wifi_log.h" #undef LOG_TAG @@ -55,4 +55,4 @@ void BaseAddress::Dump() const LOGI("TYPE: [%{public}s] address [%s/%zu]", ipType.c_str(), ipAddress_.c_str(), prefixLength_); } } // namespace Wifi -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/common/net_helper/base_address.h b/wifi/services/wifi_standard/wifi_framework/common/net_helper/base_address.h index 7fb44ee..b30f235 100644 --- a/wifi/services/wifi_standard/wifi_framework/common/net_helper/base_address.h +++ b/wifi/services/wifi_standard/wifi_framework/common/net_helper/base_address.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,8 +16,9 @@ #ifndef OHOS_BASE_ADDRESS_H #define OHOS_BASE_ADDRESS_H -#include +#include #include +#include namespace OHOS { namespace Wifi { @@ -128,4 +129,4 @@ private: } // namespace Wifi } // namespace OHOS -#endif /* OHOS_BASE_ADDRESS_H */ \ No newline at end of file +#endif /* OHOS_BASE_ADDRESS_H */ diff --git a/wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.cpp b/wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.cpp index 61baa39..5d5d982 100644 --- a/wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.cpp +++ b/wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,9 +12,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "ipv4_address.h" -#include #include +#include +#include +#include #include "wifi_log.h" #undef LOG_TAG @@ -155,4 +158,4 @@ std::string Ipv4Address::GetNetwork() const return network; } } // namespace Wifi -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.h b/wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.h index ab90c70..2c313a2 100644 --- a/wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.h +++ b/wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -15,6 +15,9 @@ #ifndef OHOS_ADDRESS_IPV4_H #define OHOS_ADDRESS_IPV4_H +#include +#include +#include #include "base_address.h" constexpr int MAX_MASK_LENGTH = 32; @@ -164,4 +167,4 @@ private: } // namespace Wifi } // namespace OHOS -#endif /* OHOS_ADDRESS_IPV4_H */ \ No newline at end of file +#endif /* OHOS_ADDRESS_IPV4_H */ diff --git a/wifi/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp b/wifi/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp index 3032c5e..6c70480 100644 --- a/wifi/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp +++ b/wifi/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp @@ -15,13 +15,15 @@ #include "mac_address.h" #include -#include #include +#include +#include +#include #include -#include +#include #include -#include "securec.h" -#include "log_helper.h" +#include +#include #include "wifi_log.h" #undef LOG_TAG @@ -165,4 +167,4 @@ bool MacAddress::GetMacAddr(const std::string& ifName, unsigned char macAddr[MAC return true; } } // namespace WiFi -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/common/net_helper/mac_address.h b/wifi/services/wifi_standard/wifi_framework/common/net_helper/mac_address.h index be5b4f9..ad3fd56 100644 --- a/wifi/services/wifi_standard/wifi_framework/common/net_helper/mac_address.h +++ b/wifi/services/wifi_standard/wifi_framework/common/net_helper/mac_address.h @@ -16,9 +16,9 @@ #ifndef OHOS_MAC_ADDRESS_H #define OHOS_MAC_ADDRESS_H -#include -#include +#include #include +#include constexpr int ZERO = 0; constexpr int ONE = 1; @@ -158,4 +158,4 @@ private: } // namespace Wifi } // namespace OHOS -#endif /* OHOS_MAC_ADDRESS_H */ \ No newline at end of file +#endif /* OHOS_MAC_ADDRESS_H */ diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi.c b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi.c index f81e5d8..bf08d02 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi.c +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi.c @@ -14,20 +14,23 @@ */ #include "i_wifi.h" -#include "client.h" /* RPC client.h */ -#include "serial.h" -#include "wifi_log.h" -#include "wifi_idl_define.h" -#include "wifi_idl_inner_interface.h" +#include +#include +#include "client.h" +#include "context.h" #include "i_wifi_chip.h" #include "i_wifi_chip_event_callback.h" #include "i_wifi_event_callback.h" -#include "i_wifi_hotspot_iface.h" -#include "i_wifi_sta_iface.h" -#include "i_wifi_supplicant_iface.h" #include "i_wifi_event_p2p_callback.h" +#include "i_wifi_hotspot_iface.h" #include "i_wifi_p2p_iface.h" #include "i_wifi_public_func.h" +#include "i_wifi_sta_iface.h" +#include "i_wifi_supplicant_iface.h" +#include "serial.h" +#include "wifi_idl_define.h" +#include "wifi_idl_inner_interface.h" +#include "wifi_log.h" #undef LOG_TAG #define LOG_TAG "WifiIdlIWifi" diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi.h index 6b501fe..d7b0ab8 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,8 +16,9 @@ #ifndef OHOS_IDL_IWIFI_H #define OHOS_IDL_IWIFI_H -#include "wifi_error_no.h" +#include #include "i_wifi_struct.h" +#include "wifi_error_no.h" #ifdef __cplusplus extern "C" { @@ -66,4 +67,4 @@ WifiErrorNo NotifyClear(void); #ifdef __cplusplus } #endif -#endif \ No newline at end of file +#endif diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_chip.c b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_chip.c index f7d2870..1bb8429 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_chip.c +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_chip.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,13 +12,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "i_wifi_chip.h" +#include #include "client.h" +#include "context.h" +#include "i_wifi_public_func.h" #include "serial.h" -#include "wifi_log.h" #include "wifi_idl_define.h" #include "wifi_idl_inner_interface.h" -#include "i_wifi_public_func.h" +#include "wifi_log.h" #undef LOG_TAG #define LOG_TAG "WifiIdlWifiChip" diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_chip.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_chip.h index 9583f10..70660e2 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_chip.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_chip.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -17,9 +17,10 @@ #define OHOS_IDL_IWIFI_CHIP_H #include -#include "wifi_error_no.h" +#include #include "i_wifi_chip_event_callback.h" #include "i_wifi_struct.h" +#include "wifi_error_no.h" #ifdef __cplusplus extern "C" { @@ -180,4 +181,4 @@ WifiErrorNo IsChipSupportIndoorChannel(bool *isSupport); #ifdef __cplusplus } #endif -#endif \ No newline at end of file +#endif diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_hotspot_iface.c b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_hotspot_iface.c index ccb54bc..3deb12b 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_hotspot_iface.c +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_hotspot_iface.c @@ -12,13 +12,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "i_wifi_hotspot_iface.h" +#include #include "client.h" +#include "context.h" +#include "i_wifi_public_func.h" #include "serial.h" -#include "wifi_log.h" #include "wifi_idl_define.h" #include "wifi_idl_inner_interface.h" -#include "i_wifi_public_func.h" +#include "wifi_log.h" #undef LOG_TAG #define LOG_TAG "WifiIdlHotspotIface" diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_iface.c b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_iface.c index 5dbd38e..ac898b7 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_iface.c +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_iface.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,12 +12,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "i_wifi_iface.h" #include "client.h" +#include "context.h" +#include "i_wifi_public_func.h" #include "serial.h" -#include "wifi_log.h" #include "wifi_idl_inner_interface.h" -#include "i_wifi_public_func.h" +#include "wifi_log.h" #undef LOG_TAG #define LOG_TAG "WifiIdlIface" diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_p2p_iface.c b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_p2p_iface.c index abb159c..626b897 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_p2p_iface.c +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_p2p_iface.c @@ -14,14 +14,15 @@ */ #include "i_wifi_p2p_iface.h" +#include +#include #include "client.h" +#include "context.h" +#include "i_wifi_public_func.h" #include "serial.h" - -#include "wifi_log.h" #include "wifi_idl_define.h" #include "wifi_idl_inner_interface.h" -#include "i_wifi_public_func.h" -#include +#include "wifi_log.h" #undef LOG_TAG #define LOG_TAG "WifiIdlP2pIface" diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_p2p_iface.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_p2p_iface.h index 8c79045..c47526b 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_p2p_iface.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_p2p_iface.h @@ -16,9 +16,10 @@ #ifndef OHOS_IDL_IWIFI_P2P_IFACE_H #define OHOS_IDL_IWIFI_P2P_IFACE_H -#include "wifi_error_no.h" +#include #include "i_wifi_event_p2p_callback.h" #include "i_wifi_struct.h" +#include "wifi_error_no.h" #ifdef __cplusplus extern "C" { diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_public_func.c b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_public_func.c index 3b1b0a8..3b40636 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_public_func.c +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_public_func.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,8 +12,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "i_wifi_public_func.h" +#include #include "wifi_log.h" + #undef LOG_TAG #define LOG_TAG "OHWIFI_IDLCLIENT_I_WIFI_PUBLIC_FUNC" diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.c b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.c index 49df2eb..70a8abb 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.c +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,13 +12,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "i_wifi_sta_iface.h" +#include +#include #include "client.h" +#include "context.h" +#include "i_wifi_public_func.h" #include "serial.h" -#include "wifi_log.h" #include "wifi_idl_define.h" #include "wifi_idl_inner_interface.h" -#include "i_wifi_public_func.h" +#include "wifi_log.h" #undef LOG_TAG #define LOG_TAG "WifiIdlStaIface" diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.h index d7c8b2b..fcaf3a9 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,9 +16,10 @@ #ifndef OHOS_IDL_IWIFI_STA_IFACE_H #define OHOS_IDL_IWIFI_STA_IFACE_H -#include "wifi_error_no.h" +#include #include "i_wifi_event_callback.h" #include "i_wifi_struct.h" +#include "wifi_error_no.h" #ifdef __cplusplus extern "C" { @@ -298,4 +299,4 @@ WifiErrorNo GetConnectSignalInfo(const char *endBssid, WpaSignalInfo *info); #ifdef __cplusplus } #endif -#endif \ No newline at end of file +#endif diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_supplicant_iface.c b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_supplicant_iface.c index b3eb042..d09d7b7 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_supplicant_iface.c +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_supplicant_iface.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,13 +12,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "i_wifi_supplicant_iface.h" +#include +#include #include "client.h" +#include "context.h" +#include "i_wifi_public_func.h" #include "serial.h" -#include "wifi_log.h" #include "wifi_idl_define.h" #include "wifi_idl_inner_interface.h" -#include "i_wifi_public_func.h" +#include "wifi_log.h" #undef LOG_TAG #define LOG_TAG "WifiIdlSupplicantIface" diff --git a/wifi/services/wifi_standard/wifi_hal/main.c b/wifi/services/wifi_standard/wifi_hal/main.c index dacaada..fe37513 100644 --- a/wifi/services/wifi_standard/wifi_hal/main.c +++ b/wifi/services/wifi_standard/wifi_hal/main.c @@ -13,6 +13,7 @@ * limitations under the License. */ +#include #include #include #include diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_callback.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_callback.c index 5c63794..02fd361 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_callback.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_callback.c @@ -14,6 +14,7 @@ */ #include "wifi_hal_callback.h" +#include #include "wifi_log.h" #include "wifi_hal_crpc_server.h" #include "wifi_hal_define.h" diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_ap.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_ap.c index 258a032..45298fd 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_ap.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_ap.c @@ -14,6 +14,8 @@ */ #include "wifi_hal_crpc_ap.h" +#include +#include "serial.h" #include "wifi_hal_ap_interface.h" #include "wifi_hal_define.h" diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_base.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_base.c index fd1f22f..a2d0dd2 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_base.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_base.c @@ -14,6 +14,7 @@ */ #include "wifi_hal_crpc_base.h" +#include "serial.h" #include "wifi_hal_base_interface.h" #include "wifi_hal_define.h" diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_chip.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_chip.c index 6fddda4..358b4e1 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_chip.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_chip.c @@ -14,6 +14,8 @@ */ #include "wifi_hal_crpc_chip.h" +#include +#include "serial.h" #include "wifi_hal_chip_interface.h" #include "wifi_hal_define.h" diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_common.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_common.c index 7f4238e..c427c8e 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_common.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_common.c @@ -14,6 +14,7 @@ */ #include "wifi_hal_crpc_common.h" +#include "serial.h" #include "wifi_hal_crpc_base.h" #include "wifi_hal_sta_interface.h" #include "wifi_hal_ap_interface.h" diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_p2p.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_p2p.c index 32f19c5..e8b8962 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_p2p.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_p2p.c @@ -14,9 +14,10 @@ */ #include "wifi_hal_crpc_p2p.h" +#include +#include "serial.h" #include "wifi_hal_p2p_interface.h" #include "wifi_hal_define.h" -#include "securec.h" int RpcP2pStart(RpcServer *server, Context *context) { diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.c index bb92a46..cf774c2 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.c @@ -14,6 +14,8 @@ */ #include "wifi_hal_crpc_server.h" +#include +#include "serial.h" #include "wifi_hal_crpc_base.h" #include "wifi_hal_crpc_chip.h" #include "wifi_hal_crpc_supplicant.h" @@ -21,7 +23,6 @@ #include "wifi_hal_crpc_ap.h" #include "wifi_hal_crpc_common.h" #include "wifi_hal_crpc_p2p.h" -#include "securec.h" #include "wifi_log.h" #include "wifi_hal_common_func.h" diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_sta.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_sta.c index 9aa4c3c..7dbfe51 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_sta.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_sta.c @@ -14,6 +14,7 @@ */ #include "wifi_hal_crpc_sta.h" +#include "serial.h" #include "wifi_hal_crpc_base.h" #include "wifi_hal_sta_interface.h" #include "wifi_hal_define.h" diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_supplicant.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_supplicant.c index 113011e..baaa24b 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_supplicant.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_supplicant.c @@ -14,6 +14,7 @@ */ #include "wifi_hal_crpc_supplicant.h" +#include "serial.h" #include "wifi_hal_sta_interface.h" #include "wifi_hal_define.h" diff --git a/wifi/test/wifi_standard/ipc_framework/cRPC/unittest/context_test.cpp b/wifi/test/wifi_standard/ipc_framework/cRPC/unittest/context_test.cpp index d7be628..1f17179 100644 --- a/wifi/test/wifi_standard/ipc_framework/cRPC/unittest/context_test.cpp +++ b/wifi/test/wifi_standard/ipc_framework/cRPC/unittest/context_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -14,7 +14,8 @@ */ #include "context_test.h" -#include "securec.h" +#include +#include "common.h" using namespace testing::ext; @@ -197,4 +198,4 @@ HWTEST_F(ContextTest, ContextWriteNetTest, TestSize.Level1) EXPECT_TRUE(ret == size - 1); } } // namespace Wifi -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/wifi/test/wifi_standard/ipc_framework/cRPC/unittest/net_test.cpp b/wifi/test/wifi_standard/ipc_framework/cRPC/unittest/net_test.cpp index 7b818f3..211bd6c 100644 --- a/wifi/test/wifi_standard/ipc_framework/cRPC/unittest/net_test.cpp +++ b/wifi/test/wifi_standard/ipc_framework/cRPC/unittest/net_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,7 +12,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "net_test.h" +#include +#include "common.h" #include "net.h" using namespace testing::ext; @@ -92,4 +95,4 @@ HWTEST_F(RpcNetTest, WaitFdEventTest, TestSize.Level1) } } } // namespace Wifi -} // namespace OHOS \ No newline at end of file +} // namespace OHOS -- Gitee From 840cad5dd9de46248b09820e9d15a9dd08a257f7 Mon Sep 17 00:00:00 2001 From: y00316381 Date: Fri, 5 Aug 2022 14:25:21 +0800 Subject: [PATCH 298/491] send suspend mode to wpa 0805 Signed-off-by: y00316381 --- .../wifi_framework/common/config/wifi_settings.h | 2 +- .../wifi_manage/wifi_device_service_impl.cpp | 10 ++++++++-- .../wpa_sta_hal/wifi_supplicant_hal.c | 16 +++++----------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.h b/wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.h index 5ea8aa2..3d0ff27 100644 --- a/wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.h +++ b/wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.h @@ -1104,7 +1104,7 @@ private: int mApMaxConnNum; /* ap support max sta numbers */ int mLastSelectedNetworkId; /* last selected networkid */ time_t mLastSelectedTimeVal; /* last selected time */ - int mScreenState; /* 1 on 2 off */ + int mScreenState; /* 1 MODE_STATE_OPEN, 2 MODE_STATE_CLOSE */ int mAirplaneModeState; /* 1 on 2 off */ ScanMode mAppRunningModeState; /* 0 app for 1 app back 2 sys for 3 sys back */ int mPowerSavingModeState; /* 1 on 2 off */ diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp index 45b1126..9b1b4fc 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp @@ -1302,7 +1302,10 @@ void ScreenEventSubscriber::OnReceiveEvent(const OHOS::EventFwk::CommonEventData return; } - if (action == OHOS::EventFwk::CommonEventSupport::COMMON_EVENT_SCREEN_OFF) { + int screenState = WifiSettings::GetInstance().GetScreenState(); + if (action == OHOS::EventFwk::CommonEventSupport::COMMON_EVENT_SCREEN_OFF && + screenState = MODE_STATE_OPEN) { + WifiSettings::GetInstance().SetScreenState(MODE_STATE_CLOSE); /* Send suspend to wpa */ if (pService->SetSuspendMode(true) != WIFI_OPT_SUCCESS) { WIFI_LOGE("SetSuspendMode failed"); @@ -1310,13 +1313,16 @@ void ScreenEventSubscriber::OnReceiveEvent(const OHOS::EventFwk::CommonEventData return; } - if (action == OHOS::EventFwk::CommonEventSupport::COMMON_EVENT_SCREEN_ON) { + if (action == OHOS::EventFwk::CommonEventSupport::COMMON_EVENT_SCREEN_ON && + screenState == MODE_STATE_CLOSE) { + WifiSettings::GetInstance().SetScreenState(MODE_STATE_OPEN); /* Send resume to wpa */ if (pService->SetSuspendMode(false) != WIFI_OPT_SUCCESS) { WIFI_LOGE("SetSuspendMode failed"); } return; } + WIFI_LOGW("ScreenEventSubscriber::OnReceiveEvent, screen state: %{public}d.", screenState); } #endif } // namespace Wifi diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c index 61d4ba7..591f25f 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c @@ -1232,23 +1232,17 @@ static int WpaCliCmdWpaTerminate(WifiWpaStaInterface *this) static int WpaCliCmdWpaSetSuspendMode(WifiWpaStaInterface *this, bool mode) { - LOGI("Enter WpaCliCmdWpaSetSuspendMode"); + LOGI("Enter WpaCliCmdWpaSetSuspendMode, mode:%{public}d."); if (this == NULL) { LOGE("WpaCliCmdWpaSetSuspendMode, this is NULL."); return -1; } char cmd[CMD_BUFFER_SIZE] = {0}; char buf[REPLY_BUF_SMALL_LENGTH] = {0}; - if (mode == true) { - if (snprintf_s(cmd, sizeof(cmd), sizeof(cmd) - 1, "IFNAME=%s SUSPEND", this->ifname) < 0) { - LOGE("WpaCliCmdWpaSetSuspendMode, SUSPEND, snprintf_s err"); - return -1; - } - } else { - if (snprintf_s(cmd, sizeof(cmd), sizeof(cmd) - 1, "IFNAME=%s RESUME", this->ifname) < 0) { - LOGE("WpaCliCmdWpaSetSuspendMode, RESUME, snprintf_s err"); - return -1; - } + if (snprintf_s(cmd, sizeof(cmd), sizeof(cmd) - 1, "IFNAME=%s DRIVER SETSUSPENDMODE %d", + this->ifname, mode) < 0) { + LOGE("WpaCliCmdWpaSetSuspendMode, snprintf_s err"); + return -1; } return WpaCliCmd(cmd, buf, sizeof(buf)); } -- Gitee From 96cd48b36299d3193797c1de5b582e6255eaaa14 Mon Sep 17 00:00:00 2001 From: y00316381 Date: Sat, 6 Aug 2022 10:21:51 +0800 Subject: [PATCH 299/491] send suspend mode to wpa 0806 Signed-off-by: y00316381 --- .../wifi_framework/wifi_manage/wifi_device_service_impl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp index 9b1b4fc..833126b 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp @@ -1304,7 +1304,7 @@ void ScreenEventSubscriber::OnReceiveEvent(const OHOS::EventFwk::CommonEventData int screenState = WifiSettings::GetInstance().GetScreenState(); if (action == OHOS::EventFwk::CommonEventSupport::COMMON_EVENT_SCREEN_OFF && - screenState = MODE_STATE_OPEN) { + screenState == MODE_STATE_OPEN) { WifiSettings::GetInstance().SetScreenState(MODE_STATE_CLOSE); /* Send suspend to wpa */ if (pService->SetSuspendMode(true) != WIFI_OPT_SUCCESS) { -- Gitee From 5dbeb684a1836d4b5e070b88bc558498e2c1dbad Mon Sep 17 00:00:00 2001 From: y00316381 Date: Sat, 6 Aug 2022 17:30:51 +0800 Subject: [PATCH 300/491] send suspend mode to wpa 0806 Signed-off-by: y00316381 --- .../wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c index 591f25f..6537fcf 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c @@ -1232,7 +1232,7 @@ static int WpaCliCmdWpaTerminate(WifiWpaStaInterface *this) static int WpaCliCmdWpaSetSuspendMode(WifiWpaStaInterface *this, bool mode) { - LOGI("Enter WpaCliCmdWpaSetSuspendMode, mode:%{public}d."); + LOGI("Enter WpaCliCmdWpaSetSuspendMode, mode:%{public}d.", mode); if (this == NULL) { LOGE("WpaCliCmdWpaSetSuspendMode, this is NULL."); return -1; -- Gitee From 8a1e756b3355b262d1d277ed8f6de948313e3c1d Mon Sep 17 00:00:00 2001 From: Zhangfeng Date: Mon, 8 Aug 2022 06:32:45 +0000 Subject: [PATCH 301/491] fix compile problem Signed-off-by: zhangfeng --- dhcp/services/dhcp_server/src/dhcp_server.c | 1 - wifi/services/wifi_standard/ipc_framework/cRPC/include/server.h | 1 - wifi/services/wifi_standard/ipc_framework/cRPC/src/net.c | 2 -- wifi/services/wifi_standard/ipc_framework/cRPC/src/server.c | 1 - wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_base.c | 1 + 5 files changed, 1 insertion(+), 5 deletions(-) diff --git a/dhcp/services/dhcp_server/src/dhcp_server.c b/dhcp/services/dhcp_server/src/dhcp_server.c index 7725471..7ea0370 100644 --- a/dhcp/services/dhcp_server/src/dhcp_server.c +++ b/dhcp/services/dhcp_server/src/dhcp_server.c @@ -15,7 +15,6 @@ #include "dhcp_server.h" #include -#include #include #include #include diff --git a/wifi/services/wifi_standard/ipc_framework/cRPC/include/server.h b/wifi/services/wifi_standard/ipc_framework/cRPC/include/server.h index d82bb8e..273cbbe 100644 --- a/wifi/services/wifi_standard/ipc_framework/cRPC/include/server.h +++ b/wifi/services/wifi_standard/ipc_framework/cRPC/include/server.h @@ -16,7 +16,6 @@ #define CRPC_SERVER_H #include -#include #include "context.h" #include "evloop.h" #include "hash_table.h" diff --git a/wifi/services/wifi_standard/ipc_framework/cRPC/src/net.c b/wifi/services/wifi_standard/ipc_framework/cRPC/src/net.c index 39bfa71..99f86d9 100644 --- a/wifi/services/wifi_standard/ipc_framework/cRPC/src/net.c +++ b/wifi/services/wifi_standard/ipc_framework/cRPC/src/net.c @@ -14,8 +14,6 @@ */ #include "net.h" -#include -#include #include #include #include diff --git a/wifi/services/wifi_standard/ipc_framework/cRPC/src/server.c b/wifi/services/wifi_standard/ipc_framework/cRPC/src/server.c index 33223dc..f9e3555 100644 --- a/wifi/services/wifi_standard/ipc_framework/cRPC/src/server.c +++ b/wifi/services/wifi_standard/ipc_framework/cRPC/src/server.c @@ -18,7 +18,6 @@ #include #include #include -#include #include #include #include diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_base.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_base.c index a2d0dd2..d6e4025 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_base.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_base.c @@ -14,6 +14,7 @@ */ #include "wifi_hal_crpc_base.h" +#include #include "serial.h" #include "wifi_hal_base_interface.h" #include "wifi_hal_define.h" -- Gitee From 23531eaaceb8b2a5dc9a5e82af94536add4ed454 Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Tue, 9 Aug 2022 13:41:00 +0000 Subject: [PATCH 302/491] support device config change notify Signed-off-by: zhangfeng --- .../js/napi/src/wifi_napi_event.cpp | 8 + .../native/c_adapter/src/wifi_c_event.cpp | 362 ++++++++---------- wifi/frameworks/native/interfaces/define.h | 35 +- .../interfaces/i_wifi_device_callback.h | 7 + .../interfaces/i_wifi_hotspot_callback.h | 2 +- wifi/frameworks/native/interfaces/wifi_msg.h | 6 + .../native/src/wifi_device_callback_stub.cpp | 21 + .../native/src/wifi_device_callback_stub.h | 2 + .../src/wifi_device_callback_stub_lite.cpp | 21 + .../src/wifi_device_callback_stub_lite.h | 2 + wifi/interfaces/kits/c/wifi_device.h | 3 +- wifi/interfaces/kits/c/wifi_event.h | 30 +- .../wifi_device_callback_proxy.cpp | 24 ++ .../wifi_manage/wifi_device_callback_proxy.h | 7 + .../wifi_device_callback_proxy_lite.cpp | 19 + .../wifi_internal_event_dispatcher.cpp | 14 +- .../wifi_internal_event_dispatcher.h | 2 + .../wifi_manage/wifi_manager.cpp | 2 +- .../wifi_manage/wifi_sta/sta_service.cpp | 20 + .../wifi_manage/wifi_sta/sta_service.h | 3 + wifi/test/wifi_client/wifi_client.cpp | 5 + 21 files changed, 352 insertions(+), 243 deletions(-) diff --git a/wifi/frameworks/js/napi/src/wifi_napi_event.cpp b/wifi/frameworks/js/napi/src/wifi_napi_event.cpp index 94ebd72..11242aa 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_event.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_event.cpp @@ -30,6 +30,7 @@ const std::string EVENT_STA_POWER_STATE_CHANGE = "wifiStateChange"; const std::string EVENT_STA_CONN_STATE_CHANGE = "wifiConnectionChange"; const std::string EVENT_STA_SCAN_STATE_CHANGE = "wifiScanStateChange"; const std::string EVENT_STA_RSSI_STATE_CHANGE = "wifiRssiChange"; +const std::string EVENT_STA_DEVICE_CONFIG_CHANGE = "deviceConfigChange"; const std::string EVENT_HOTSPOT_STATE_CHANGE = "hotspotStateChange"; const std::string EVENT_HOTSPOT_STA_JOIN = "hotspotStaJoin"; const std::string EVENT_HOTSPOT_STA_LEAVE = "hotspotStaLeave"; @@ -46,6 +47,7 @@ static std::set g_supportEventList = { EVENT_STA_CONN_STATE_CHANGE, EVENT_STA_SCAN_STATE_CHANGE, EVENT_STA_RSSI_STATE_CHANGE, + EVENT_STA_DEVICE_CONFIG_CHANGE, EVENT_HOTSPOT_STATE_CHANGE, EVENT_HOTSPOT_STA_JOIN, EVENT_HOTSPOT_STA_LEAVE, @@ -76,6 +78,7 @@ std::multimap g_EventPermissionMap = { { EVENT_STA_CONN_STATE_CHANGE, WIFI_PERMISSION_GET_WIFI_INFO }, { EVENT_STA_SCAN_STATE_CHANGE, WIFI_PERMISSION_GET_WIFI_INFO }, { EVENT_STA_RSSI_STATE_CHANGE, WIFI_PERMISSION_GET_WIFI_INFO }, + { EVENT_STA_DEVICE_CONFIG_CHANGE, WIFI_PERMISSION_GET_WIFI_INFO }, { EVENT_HOTSPOT_STATE_CHANGE, WIFI_PERMISSION_GET_WIFI_INFO }, { EVENT_HOTSPOT_STA_JOIN, WIFI_PERMISSION_MANAGE_WIFI_HOTSPOT }, { EVENT_HOTSPOT_STA_LEAVE, WIFI_PERMISSION_MANAGE_WIFI_HOTSPOT }, @@ -259,6 +262,11 @@ public: void OnStreamChanged(int direction) override { } + void OnDeviceConfigChanged(ConfigChange value) override { + WIFI_LOGI("sta received device config changed event: %{public}d", static_cast(value)); + CheckAndNotify(EVENT_STA_DEVICE_CONFIG_CHANGE, static_cast(value)); + } + OHOS::sptr AsObject() override { return nullptr; } diff --git a/wifi/frameworks/native/c_adapter/src/wifi_c_event.cpp b/wifi/frameworks/native/c_adapter/src/wifi_c_event.cpp index 3482df4..9b208ac 100644 --- a/wifi/frameworks/native/c_adapter/src/wifi_c_event.cpp +++ b/wifi/frameworks/native/c_adapter/src/wifi_c_event.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -14,280 +14,230 @@ */ #include "../../../interfaces/kits/c/wifi_event.h" +#include #include "../../../interfaces/kits/c/wifi_device.h" #include "../../../interfaces/kits/c/wifi_scan_info.h" +#include "i_wifi_device_callback.h" +#include "i_wifi_hotspot_callback.h" +#include "i_wifi_scan_callback.h" +#include "wifi_device.h" +#include "wifi_hotspot.h" #include "wifi_logger.h" -#include "common_event_manager.h" -#include +#include "wifi_scan.h" DEFINE_WIFILOG_LABEL("WifiCEvent"); +std::set GetEventCallBacks(); -const std::string WIFI_USUAL_EVENT_CONN_STATE = "usual.event.wifi.CONN_STATE"; -const std::string WIFI_USUAL_EVENT_SCAN_STATE = "usual.event.wifi.SCAN_FINISHED"; -const std::string WIFI_USUAL_EVENT_HOTSPOT_STATE = "usual.event.wifi.HOTSPOT_STATE"; -const std::string WIFI_USUAL_EVENT_STA_JOIN = "usual.event.wifi.WIFI_HS_STA_JOIN"; -const std::string WIFI_USUAL_EVENT_STA_LEAVE = "usual.event.wifi.WIFI_HS_STA_LEAVE"; - -using ConnectionChangeCb = void (*)(int, WifiLinkedInfo*); -using ScanStateChangeCb = void (*)(int, int); -using HotspotStateChangeCb = void (*)(int); -using HotspotJoinCb = void (*)(StationInfo*); -using HotspotLeaveCb = void (*)(StationInfo*); - -using namespace OHOS::EventFwk; -class EventManager { +class WifiCDeviceEventCallback : public OHOS::Wifi::IWifiDeviceCallBack { public: - EventManager() { + WifiCDeviceEventCallback() { } - virtual ~EventManager() { + virtual ~WifiCDeviceEventCallback() { } - bool AddConnectionChangeCb(const ConnectionChangeCb cb) { - if (m_setConnectionChangeCb.empty()) { - if (!SubscribeServiceEvent(WIFI_USUAL_EVENT_CONN_STATE)) { - return false; +public: + void OnWifiStateChanged(int state) override { + WIFI_LOGI("sta received state changed event: %{public}d", state); + } + + void OnWifiConnectionChanged(int state, const OHOS::Wifi::WifiLinkedInfo &info) override { + WIFI_LOGI("sta received connection changed event: %{public}d", state); + WifiLinkedInfo linkInfo; + WifiErrorCode ret = GetLinkedInfo(&linkInfo); + if (ret != WIFI_SUCCESS) { + WIFI_LOGE("Received event get linked info failed"); + return; + } + std::set setCallbacks = GetEventCallBacks(); + for (auto& callback : setCallbacks) { + if (callback && callback->OnWifiConnectionChanged) { + callback->OnWifiConnectionChanged(state, &linkInfo); } } - return m_setConnectionChangeCb.insert(cb).second; } - void RemoveConnectionChangeCb(const ConnectionChangeCb cb) { - m_setConnectionChangeCb.erase(cb); - if (m_setConnectionChangeCb.empty()) { - UnsubscribeServiceEvent(WIFI_USUAL_EVENT_CONN_STATE); - } + void OnWifiRssiChanged(int rssi) override { + WIFI_LOGI("sta received rssi changed event: %{public}d", rssi); } - static std::set GetConnectionChangeCb() { - return m_setConnectionChangeCb; + void OnWifiWpsStateChanged(int state, const std::string &pinCode) override { } - bool AddScanStateChangeCb(const ScanStateChangeCb cb) { - if (m_setScanStateChangeCb.empty()) { - if (!SubscribeServiceEvent(WIFI_USUAL_EVENT_SCAN_STATE)) { - return false; + void OnStreamChanged(int direction) override { + } + + void OnDeviceConfigChanged(OHOS::Wifi::ConfigChange value) override { + std::set setCallbacks = GetEventCallBacks(); + for (auto& callback : setCallbacks) { + if (callback && callback->OnDeviceConfigChange) { + callback->OnDeviceConfigChange(ConfigChange(static_cast(value))); } } - return m_setScanStateChangeCb.insert(cb).second; } - void RemoveScanStateChangeCb(const ScanStateChangeCb cb) { - m_setScanStateChangeCb.erase(cb); - if (m_setScanStateChangeCb.empty()) { - UnsubscribeServiceEvent(WIFI_USUAL_EVENT_SCAN_STATE); - } + OHOS::sptr AsObject() override { + return nullptr; } +}; - static std::set GetScanStateChangeCb() { - return m_setScanStateChangeCb; +class WifiCScanEventCallback : public OHOS::Wifi::IWifiScanCallback { +public: + WifiCScanEventCallback() { } - bool AddHotspotChangeCb(const HotspotStateChangeCb cb) { - if (m_setHotspotChangeCb.empty()) { - if (!SubscribeServiceEvent(WIFI_USUAL_EVENT_HOTSPOT_STATE)) { - return false; + virtual ~WifiCScanEventCallback() { + } + +public: + void OnWifiScanStateChanged(int state) override { + WIFI_LOGI("scan received state changed event: %{public}d", state); + std::set setCallbacks = GetEventCallBacks(); + for (auto& callback : setCallbacks) { + if (callback && callback->OnWifiScanStateChanged) { + callback->OnWifiScanStateChanged(state, WIFI_SCAN_HOTSPOT_LIMIT); } } - return m_setHotspotChangeCb.insert(cb).second; } - void RemoveHotspotChangeCb(const HotspotStateChangeCb cb) { - m_setHotspotChangeCb.erase(cb); - if (m_setHotspotChangeCb.empty()) { - UnsubscribeServiceEvent(WIFI_USUAL_EVENT_HOTSPOT_STATE); - } + OHOS::sptr AsObject() override { + return nullptr; } +}; - static std::set GetHotspotChangeCb() { - return m_setHotspotChangeCb; +class WifiCHotspotEventCallback : public OHOS::Wifi::IWifiHotspotCallback { +public: + WifiCHotspotEventCallback() { } - bool AddHotspotJoinCb(const HotspotJoinCb cb) { - if (m_setHotspotJoinCb.empty()) { - if (!SubscribeServiceEvent(WIFI_USUAL_EVENT_STA_JOIN)) { - return false; - } - } - return m_setHotspotJoinCb.insert(cb).second; + virtual ~WifiCHotspotEventCallback() { } - void RemoveHotspotJoinCb(const HotspotJoinCb cb) { - m_setHotspotJoinCb.erase(cb); - if (m_setHotspotJoinCb.empty()) { - UnsubscribeServiceEvent(WIFI_USUAL_EVENT_STA_JOIN); +public: + void OnHotspotStateChanged(int state) override { + WIFI_LOGI("Hotspot received state changed event: %{public}d", state); + std::set setCallbacks = GetEventCallBacks(); + for (auto& callback : setCallbacks) { + if (callback && callback->OnHotspotStateChanged) { + callback->OnHotspotStateChanged(state); + } } } - static std::set GetHotspotJoinCb() { - return m_setHotspotJoinCb; + void OnHotspotStaJoin(const OHOS::Wifi::StationInfo &info) override { + WIFI_LOGI("Hotspot received sta join event"); } - bool AddHotspotLeaveCb(const HotspotLeaveCb cb) { - if (m_setHotspotLeaveCb.empty()) { - if (!SubscribeServiceEvent(WIFI_USUAL_EVENT_STA_LEAVE)) { - return false; - } - } - return m_setHotspotLeaveCb.insert(cb).second; + void OnHotspotStaLeave(const OHOS::Wifi::StationInfo &info) override { + WIFI_LOGI("Hotspot received sta leave event"); } - void RemoveHotspotLeaveCb(const HotspotLeaveCb cb) { - m_setHotspotLeaveCb.erase(cb); - if (m_setHotspotLeaveCb.empty()) { - UnsubscribeServiceEvent(WIFI_USUAL_EVENT_STA_LEAVE); - } + OHOS::sptr AsObject() override { + return nullptr; } +}; - static std::set GetHotspotLeaveCb() { - return m_setHotspotLeaveCb; +OHOS::sptr wifiCDeviceCallback = + OHOS::sptr(new (std::nothrow) WifiCDeviceEventCallback()); +OHOS::sptr wifiCScanCallback = + OHOS::sptr(new (std::nothrow) WifiCScanEventCallback()); +OHOS::sptr wifiCHotspotCallback = + OHOS::sptr(new (std::nothrow) WifiCHotspotEventCallback()); + +class EventManager { +public: + EventManager() { } - class WifiEventSubscriber : public OHOS::EventFwk::CommonEventSubscriber { - public: - explicit WifiEventSubscriber(const OHOS::EventFwk::CommonEventSubscribeInfo &subscribeInfo) - : CommonEventSubscriber(subscribeInfo) { - } + virtual ~EventManager() { + } - virtual ~WifiEventSubscriber() { + bool AddEventCallback(WifiEvent *cb) { + if (cb == NULL) { + return false; } + return m_setEventCallback.insert(cb).second; + } - virtual void OnReceiveEvent(const OHOS::EventFwk::CommonEventData &data) override { - std::string event = data.GetWant().GetAction(); - int code = data.GetCode(); - WIFI_LOGI("Received event: %{public}s, value: %{public}d", event.c_str(), code); - if (event == WIFI_USUAL_EVENT_CONN_STATE && !GetConnectionChangeCb().empty()) { - WifiLinkedInfo linkInfo; - WifiErrorCode ret = GetLinkedInfo(&linkInfo); - if (ret != WIFI_SUCCESS) { - WIFI_LOGE("Received event get linked info failed"); - return; - } - for (auto& cb : GetConnectionChangeCb()) { - cb(code, &linkInfo); - } - } - - if (event == WIFI_USUAL_EVENT_SCAN_STATE && !EventManager::m_setScanStateChangeCb.empty()) { - for (auto& cb : EventManager::m_setScanStateChangeCb) { - cb(code, WIFI_SCAN_HOTSPOT_LIMIT); - } - } - - if (event == WIFI_USUAL_EVENT_HOTSPOT_STATE && !EventManager::m_setHotspotChangeCb.empty()) { - for (auto& cb : EventManager::m_setHotspotChangeCb) { - cb(code); - } - } + void RemoveEventCallback(WifiEvent *cb) { + m_setEventCallback.erase(cb); + } - if (event == WIFI_USUAL_EVENT_STA_JOIN && !EventManager::m_setHotspotJoinCb.empty()) { - } + WifiErrorCode RegisterWifiEvents() { + using namespace OHOS::Wifi; + std::unique_ptr wifiStaPtr = WifiDevice::GetInstance(WIFI_DEVICE_ABILITY_ID); + if (wifiStaPtr == nullptr) { + WIFI_LOGE("Register sta event get instance failed!"); + return ERROR_WIFI_UNKNOWN; + } + ErrCode ret = wifiStaPtr->RegisterCallBack(wifiCDeviceCallback); + if (ret != WIFI_OPT_SUCCESS) { + WIFI_LOGE("Register sta event failed!"); + return ERROR_WIFI_UNKNOWN; + } - if (event == WIFI_USUAL_EVENT_STA_LEAVE && !EventManager::m_setHotspotLeaveCb.empty()) { - } + std::unique_ptr wifiScanPtr = WifiScan::GetInstance(WIFI_SCAN_ABILITY_ID); + if (wifiScanPtr == nullptr) { + WIFI_LOGE("Register scan event get instance failed!"); + return ERROR_WIFI_UNKNOWN; } - }; - - bool SubscribeServiceEvent(const std::string& event) { - MatchingSkills matchingSkills; - matchingSkills.AddEvent(event); - CommonEventSubscribeInfo subscriberInfo(matchingSkills); - std::shared_ptr subscriber = std::make_shared(subscriberInfo); - if (subscriber == nullptr) { - WIFI_LOGE("Create subscriber failed"); - return false; + ret = wifiScanPtr->RegisterCallBack(wifiCScanCallback); + if (ret != WIFI_OPT_SUCCESS) { + WIFI_LOGE("Register scan event failed!"); + return ERROR_WIFI_UNKNOWN; } - WIFI_LOGI("Subscribe event: %{public}s", event.c_str()); - bool subscribeResult = CommonEventManager::SubscribeCommonEvent(subscriber); - if (subscribeResult) { - m_mapEventSubscriber[event] = subscriber; - } else { - WIFI_LOGE("Subscribe service event fail: %{public}s", event.c_str()); + + std::unique_ptr wifiHotspotPtr = WifiHotspot::GetInstance(WIFI_HOTSPOT_ABILITY_ID); + if (wifiHotspotPtr == nullptr) { + WIFI_LOGE("Register hotspot event get instance failed!"); + return ERROR_WIFI_UNKNOWN; } - return subscribeResult; + ret = wifiHotspotPtr->RegisterCallBack(wifiCHotspotCallback); + if (ret != WIFI_OPT_SUCCESS) { + WIFI_LOGE("Register hotspot event failed!"); + return ERROR_WIFI_UNKNOWN; + } + return WIFI_SUCCESS; } - bool UnsubscribeServiceEvent(const std::string& event) { - std::map>::iterator iter; - iter = m_mapEventSubscriber.find(event); - if (iter == m_mapEventSubscriber.end()) { - return false; - } + bool IsEventRegistered() { + return m_isEventRegistered; + } - bool unsubscribeResult = CommonEventManager::SubscribeCommonEvent(iter->second); - if (!unsubscribeResult) { - WIFI_LOGE("Unsubscribe event fail: %{public}s", event.c_str()); - } - return unsubscribeResult; + void SetIsEventRegistrated(bool isEventRegistered) { + m_isEventRegistered = isEventRegistered; + } + + std::set GetEventCallBacks() { + return m_setEventCallback; } private: - static std::set m_setConnectionChangeCb; - static std::set m_setScanStateChangeCb; - static std::set m_setHotspotChangeCb; - static std::set m_setHotspotJoinCb; - static std::set m_setHotspotLeaveCb; - std::map > m_mapEventSubscriber; + static std::set m_setEventCallback; + static bool m_isEventRegistered; }; -std::set EventManager::m_setConnectionChangeCb; -std::set EventManager::m_setScanStateChangeCb; -std::set EventManager::m_setHotspotChangeCb; -std::set EventManager::m_setHotspotJoinCb; -std::set EventManager::m_setHotspotLeaveCb; - +std::set EventManager::m_setEventCallback; +bool EventManager::m_isEventRegistered = false; static EventManager g_eventManager; -WifiErrorCode RegisterWifiEvent(WifiEvent *event) -{ - WIFI_LOGI("Register wifi event"); - if (event == nullptr) { - return ERROR_WIFI_INVALID_ARGS; - } +std::set GetEventCallBacks() { + return g_eventManager.GetEventCallBacks(); +} - if (event->OnWifiConnectionChanged != nullptr) { - return g_eventManager.AddConnectionChangeCb(event->OnWifiConnectionChanged) - ? WIFI_SUCCESS : ERROR_WIFI_INVALID_ARGS; - } - if (event->OnWifiScanStateChanged != nullptr) { - return g_eventManager.AddScanStateChangeCb(event->OnWifiScanStateChanged) - ? WIFI_SUCCESS : ERROR_WIFI_INVALID_ARGS; - } - if (event->OnHotspotStateChanged != nullptr) { - return g_eventManager.AddHotspotChangeCb(event->OnHotspotStateChanged) - ? WIFI_SUCCESS : ERROR_WIFI_INVALID_ARGS; - } - if (event->OnHotspotStaJoin != nullptr) { - return g_eventManager.AddHotspotJoinCb(event->OnHotspotStaJoin) - ? WIFI_SUCCESS : ERROR_WIFI_INVALID_ARGS; - } - if (event->OnHotspotStaLeave != nullptr) { - return g_eventManager.AddHotspotLeaveCb(event->OnHotspotStaLeave) - ? WIFI_SUCCESS : ERROR_WIFI_INVALID_ARGS; +WifiErrorCode RegisterWifiEvent(WifiEvent *event) { + WIFI_LOGI("Register wifi event"); + if (!g_eventManager.IsEventRegistered()) { + if (g_eventManager.RegisterWifiEvents() != WIFI_SUCCESS) { + WIFI_LOGE("Wifi event register failed!"); + return ERROR_WIFI_UNKNOWN; + } + g_eventManager.SetIsEventRegistrated(true); } - return ERROR_WIFI_INVALID_ARGS; + return g_eventManager.AddEventCallback(event) ? WIFI_SUCCESS : ERROR_WIFI_INVALID_ARGS; } -WifiErrorCode UnRegisterWifiEvent(const WifiEvent *event) -{ +WifiErrorCode UnRegisterWifiEvent(WifiEvent *event) { WIFI_LOGI("Unregister wifi event"); - if (event == nullptr) { - return ERROR_WIFI_INVALID_ARGS; - } - - if (event->OnWifiConnectionChanged != nullptr) { - g_eventManager.RemoveConnectionChangeCb(event->OnWifiConnectionChanged); - } - if (event->OnWifiScanStateChanged != nullptr) { - g_eventManager.RemoveScanStateChangeCb(event->OnWifiScanStateChanged); - } - if (event->OnHotspotStateChanged != nullptr) { - g_eventManager.RemoveHotspotChangeCb(event->OnHotspotStateChanged); - } - if (event->OnHotspotStaJoin != nullptr) { - g_eventManager.RemoveHotspotJoinCb(event->OnHotspotStaJoin); - } - if (event->OnHotspotStaLeave != nullptr) { - g_eventManager.RemoveHotspotLeaveCb(event->OnHotspotStaLeave); - } + g_eventManager.RemoveEventCallback(event); return WIFI_SUCCESS; } diff --git a/wifi/frameworks/native/interfaces/define.h b/wifi/frameworks/native/interfaces/define.h index 9b21fae..c062441 100644 --- a/wifi/frameworks/native/interfaces/define.h +++ b/wifi/frameworks/native/interfaces/define.h @@ -133,6 +133,7 @@ #define WIFI_CBK_CMD_HOTSPOT_STATE_LEAVE 0x1007 /* AP leave a sta event */ #define WIFI_CBK_CMD_STREAM_DIRECTION 0x1008 /* traffic up/down state event */ #define WIFI_CBK_CMD_WPS_STATE_CHANGE 0x1009 /* wps state change event */ +#define WIFI_CBK_CMD_DEVICE_CONFIG_CHANGE 0x100A /* device config change event */ #define WIFI_CBK_CMD_P2P_STATE_CHANGE 0x1010 /* p2p state change event */ #define WIFI_CBK_CMD_PERSISTENT_GROUPS_CHANGE 0x1011 /* Persistent Group Updated */ @@ -144,24 +145,32 @@ #define WIFI_CBK_CMD_P2P_ACTION_RESULT 0x1017 #define WIFI_CBK_CMD_CFG_CHANGE 0x1018 -/* Duplicate message code, to be optimized */ +/* The response message ID of callback */ #define WIFI_CBK_MSG_STATE_CHANGE 0x1001 #define WIFI_CBK_MSG_CONNECTION_CHANGE 0x1002 #define WIFI_CBK_MSG_RSSI_CHANGE 0x1003 #define WIFI_CBK_MSG_STREAM_DIRECTION 0x1004 #define WIFI_CBK_MSG_WPS_STATE_CHANGE 0x1005 -#define WIFI_CBK_MSG_SCAN_STATE_CHANGE 0x1006 -#define WIFI_CBK_MSG_HOTSPOT_STATE_CHANGE 0x1007 -#define WIFI_CBK_MSG_HOTSPOT_STATE_JOIN 0x1008 -#define WIFI_CBK_MSG_HOTSPOT_STATE_LEAVE 0x1009 -#define WIFI_CBK_MSG_P2P_STATE_CHANGE 0x1010 -#define WIFI_CBK_MSG_PERSISTENT_GROUPS_CHANGE 0x1011 /* Persistent Group Updated */ -#define WIFI_CBK_MSG_THIS_DEVICE_CHANGE 0x1012 -#define WIFI_CBK_MSG_PEER_CHANGE 0x1013 -#define WIFI_CBK_MSG_SERVICE_CHANGE 0x1014 -#define WIFI_CBK_MSG_CONNECT_CHANGE 0x1015 -#define WIFI_CBK_MSG_DISCOVERY_CHANGE 0x1016 -#define WIFI_CBK_MSG_P2P_ACTION_RESULT 0x1017 +#define WIFI_CBK_MSG_DEVICE_CONFIG_CHANGE 0x1006 +#define WIFI_CBK_MSG_MAX_INVALID_STA 0x1FFF /* STA invalid value */ + +#define WIFI_CBK_MSG_SCAN_STATE_CHANGE 0x2001 + +#define WIFI_CBK_MSG_HOTSPOT_STATE_CHANGE 0x3001 +#define WIFI_CBK_MSG_HOTSPOT_STATE_JOIN 0x3002 +#define WIFI_CBK_MSG_HOTSPOT_STATE_LEAVE 0x3003 +#define WIFI_CBK_MSG_MAX_INVALID_HOTSPOT 0x3FFF /* HOTSPOT invalid value */ + +#define WIFI_CBK_MSG_P2P_STATE_CHANGE 0x4001 +#define WIFI_CBK_MSG_PERSISTENT_GROUPS_CHANGE 0x4002 /* Persistent Group Updated */ +#define WIFI_CBK_MSG_THIS_DEVICE_CHANGE 0x4003 +#define WIFI_CBK_MSG_PEER_CHANGE 0x4004 +#define WIFI_CBK_MSG_SERVICE_CHANGE 0x4005 +#define WIFI_CBK_MSG_CONNECT_CHANGE 0x4006 +#define WIFI_CBK_MSG_DISCOVERY_CHANGE 0x4007 +#define WIFI_CBK_MSG_P2P_ACTION_RESULT 0x4008 +#define WIFI_CBK_MSG_CFG_CHANGE 0x4009 +#define WIFI_CBK_MSG_MAX_INVALID_P2P 0x4FFF /* P2P invalid value */ /* -----------Feature service name-------------- */ #define WIFI_SERVICE_STA "StaService" /* STA */ diff --git a/wifi/frameworks/native/interfaces/i_wifi_device_callback.h b/wifi/frameworks/native/interfaces/i_wifi_device_callback.h index 58ce9e2..5b438e8 100644 --- a/wifi/frameworks/native/interfaces/i_wifi_device_callback.h +++ b/wifi/frameworks/native/interfaces/i_wifi_device_callback.h @@ -71,6 +71,13 @@ public: */ virtual void OnStreamChanged(int direction) = 0; + /** + * @Description Deal device config change message + * + * @param ConfigChange - change type of config + */ + virtual void OnDeviceConfigChanged(ConfigChange value) = 0; + #ifndef OHOS_ARCH_LITE public: DECLARE_INTERFACE_DESCRIPTOR(u"ohos.wifi.IWifiDeviceCallBack"); diff --git a/wifi/frameworks/native/interfaces/i_wifi_hotspot_callback.h b/wifi/frameworks/native/interfaces/i_wifi_hotspot_callback.h index 5c3244e..ff5c5c1 100644 --- a/wifi/frameworks/native/interfaces/i_wifi_hotspot_callback.h +++ b/wifi/frameworks/native/interfaces/i_wifi_hotspot_callback.h @@ -54,4 +54,4 @@ public: }; } // namespace Wifi } // namespace OHOS -#endif \ No newline at end of file +#endif diff --git a/wifi/frameworks/native/interfaces/wifi_msg.h b/wifi/frameworks/native/interfaces/wifi_msg.h index 57a98d7..2773082 100644 --- a/wifi/frameworks/native/interfaces/wifi_msg.h +++ b/wifi/frameworks/native/interfaces/wifi_msg.h @@ -179,6 +179,12 @@ enum class WifiDeviceConfigStatus { enum class AssignIpMethod { DHCP, STATIC, UNASSIGNED }; +enum class ConfigChange { + CONFIG_ADD = 0, + CONFIG_UPDATE = 1, + CONFIG_REMOVE = 2, +}; + class WifiIpAddress { public: int family; /* ip type */ diff --git a/wifi/frameworks/native/src/wifi_device_callback_stub.cpp b/wifi/frameworks/native/src/wifi_device_callback_stub.cpp index 3ddc7eb..4fd93de 100644 --- a/wifi/frameworks/native/src/wifi_device_callback_stub.cpp +++ b/wifi/frameworks/native/src/wifi_device_callback_stub.cpp @@ -69,6 +69,10 @@ int WifiDeviceCallBackStub::OnRemoteRequest( ret = RemoteOnStreamChanged(code, data, reply); break; } + case WIFI_CBK_CMD_DEVICE_CONFIG_CHANGE: { + ret = RemoteOnDeviceConfigChanged(code, data, reply); + break; + } default: { ret = IPCObjectStub::OnRemoteRequest(code, data, reply, option); break; @@ -140,6 +144,14 @@ void WifiDeviceCallBackStub::OnStreamChanged(int direction) } } +void WifiDeviceCallBackStub::OnDeviceConfigChanged(ConfigChange value) +{ + WIFI_LOGD("WifiDeviceCallBackStub::OnDeviceConfigChanged"); + if (callback_) { + callback_->OnDeviceConfigChanged(value); + } +} + int WifiDeviceCallBackStub::RemoteOnWifiStateChanged(uint32_t code, MessageParcel &data, MessageParcel &reply) { WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); @@ -221,5 +233,14 @@ int WifiDeviceCallBackStub::RemoteOnStreamChanged(uint32_t code, MessageParcel & reply.WriteInt32(0); /* Reply 0 to indicate that no exception occurs. */ return 0; } + +int WifiDeviceCallBackStub::RemoteOnDeviceConfigChanged(uint32_t code, MessageParcel &data, MessageParcel &reply) +{ + WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); + int value = data.ReadInt32(); + OnDeviceConfigChanged(ConfigChange(value)); + reply.WriteInt32(0); /* Reply 0 to indicate that no exception occurs. */ + return 0; +} } // namespace Wifi } // namespace OHOS \ No newline at end of file diff --git a/wifi/frameworks/native/src/wifi_device_callback_stub.h b/wifi/frameworks/native/src/wifi_device_callback_stub.h index aa89a49..7af7aa7 100644 --- a/wifi/frameworks/native/src/wifi_device_callback_stub.h +++ b/wifi/frameworks/native/src/wifi_device_callback_stub.h @@ -35,6 +35,7 @@ public: void OnWifiRssiChanged(int rssi) override; void OnWifiWpsStateChanged(int state, const std::string &pinCode) override; void OnStreamChanged(int direction) override; + void OnDeviceConfigChanged(ConfigChange value) override; void RegisterUserCallBack(const sptr &callBack); bool IsRemoteDied() const; void SetRemoteDied(bool val); @@ -45,6 +46,7 @@ private: int RemoteOnWifiRssiChanged(uint32_t code, MessageParcel &data, MessageParcel &reply); int RemoteOnWifiWpsStateChanged(uint32_t code, MessageParcel &data, MessageParcel &reply); int RemoteOnStreamChanged(uint32_t code, MessageParcel &data, MessageParcel &reply); + int RemoteOnDeviceConfigChanged(uint32_t code, MessageParcel &data, MessageParcel &reply); sptr callback_; diff --git a/wifi/frameworks/native/src/wifi_device_callback_stub_lite.cpp b/wifi/frameworks/native/src/wifi_device_callback_stub_lite.cpp index 8eff52e..687da4e 100644 --- a/wifi/frameworks/native/src/wifi_device_callback_stub_lite.cpp +++ b/wifi/frameworks/native/src/wifi_device_callback_stub_lite.cpp @@ -64,6 +64,10 @@ int WifiDeviceCallBackStub::OnRemoteRequest(uint32_t code, IpcIo *data) ret = RemoteOnStreamChanged(code, data); break; } + case WIFI_CBK_CMD_DEVICE_CONFIG_CHANGE: { + ret = RemoteOnDeviceConfigChanged(code, data); + break; + } default: { ret = WIFI_OPT_FAILED; } @@ -131,6 +135,14 @@ void WifiDeviceCallBackStub::OnStreamChanged(int direction) } } +void WifiDeviceCallBackStub::OnDeviceConfigChanged(ConfigChange state) +{ + WIFI_LOGD("WifiDeviceCallBackStub::OnDeviceConfigChanged"); + if (callback_) { + callback_->OnDeviceConfigChanged(state); + } +} + int WifiDeviceCallBackStub::RemoteOnWifiStateChanged(uint32_t code, IpcIo *data) { WIFI_LOGD("run %{public}s code %{public}u", __func__, code); @@ -217,5 +229,14 @@ int WifiDeviceCallBackStub::RemoteOnStreamChanged(uint32_t code, IpcIo *data) OnStreamChanged(direction); return 0; } + +int WifiDeviceCallBackStub::RemoteOnDeviceConfigChanged(uint32_t code, IpcIo *data) +{ + WIFI_LOGD("run %{public}s code %{public}u", __func__, code); + int state = 0; + (void)ReadInt32(data, &state); + OnDeviceConfigChanged(ConfigChange(state)); + return 0; +} } // namespace Wifi } // namespace OHOS diff --git a/wifi/frameworks/native/src/wifi_device_callback_stub_lite.h b/wifi/frameworks/native/src/wifi_device_callback_stub_lite.h index fdb35b6..406175f 100644 --- a/wifi/frameworks/native/src/wifi_device_callback_stub_lite.h +++ b/wifi/frameworks/native/src/wifi_device_callback_stub_lite.h @@ -32,6 +32,7 @@ public: void OnWifiRssiChanged(int rssi) override; void OnWifiWpsStateChanged(int state, const std::string &pinCode) override; void OnStreamChanged(int direction) override; + void OnDeviceConfigChanged(ConfigChange state) override; void RegisterUserCallBack(const std::shared_ptr &callBack); bool IsRemoteDied() const; void SetRemoteDied(bool val); @@ -42,6 +43,7 @@ private: int RemoteOnWifiRssiChanged(uint32_t code, IpcIo *data); int RemoteOnWifiWpsStateChanged(uint32_t code, IpcIo *data); int RemoteOnStreamChanged(uint32_t code, IpcIo *data); + int RemoteOnDeviceConfigChanged(uint32_t code, IpcIo *data); std::shared_ptr callback_; diff --git a/wifi/interfaces/kits/c/wifi_device.h b/wifi/interfaces/kits/c/wifi_device.h index 579729b..406302b 100644 --- a/wifi/interfaces/kits/c/wifi_device.h +++ b/wifi/interfaces/kits/c/wifi_device.h @@ -273,8 +273,7 @@ WifiErrorCode RegisterWifiEvent(WifiEvent *event); * in {@link WifiErrorCode} otherwise. * @since 7 */ -WifiErrorCode UnRegisterWifiEvent(const WifiEvent *event); - +WifiErrorCode UnRegisterWifiEvent(WifiEvent *event); #ifdef __cplusplus } #endif diff --git a/wifi/interfaces/kits/c/wifi_event.h b/wifi/interfaces/kits/c/wifi_event.h index be37f75..0bc11c3 100644 --- a/wifi/interfaces/kits/c/wifi_event.h +++ b/wifi/interfaces/kits/c/wifi_event.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -74,6 +74,17 @@ extern "C" { */ #define WIFI_MAX_EVENT_SIZE 10 +/** + * @brief Enumerates of device configuration change. + * + * @since 9 + */ +typedef enum { + CONFIG_ADD = 0, + CONFIG_UPDATE = 1, + CONFIG_REMOVE = 2, +} ConfigChange; + /** * @brief Represents the pointer to a Wi-Fi event callback for station and hotspot connection, disconnection, or scan. * @@ -93,22 +104,9 @@ typedef struct { void (*OnHotspotStaJoin)(StationInfo *info); /** Station disconnected */ void (*OnHotspotStaLeave)(StationInfo *info); + /** Device config change */ + void (*OnDeviceConfigChange)(ConfigChange state); } WifiEvent; - -/** - * @brief Enumerates states in Wi-Fi events. - * - * - * - * @since 7 - */ -typedef enum { - /** Unavailable state */ - WIFI_STATE_NOT_AVAILABLE = 0, - /** Available state */ - WIFI_STATE_AVAILABLE -} WifiEventState; - #ifdef __cplusplus } #endif diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_callback_proxy.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_callback_proxy.cpp index 50a08d8..e7baf7e 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_callback_proxy.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_callback_proxy.cpp @@ -165,5 +165,29 @@ void WifiDeviceCallBackProxy::OnStreamChanged(int direction) } return; } + +void WifiDeviceCallBackProxy::OnDeviceConfigChanged(ConfigChange value) +{ + WIFI_LOGD("WifiDeviceCallBackProxy::OnDeviceConfigChanged"); + MessageOption option; + MessageParcel data; + MessageParcel reply; + if (!data.WriteInterfaceToken(GetDescriptor())) { + WIFI_LOGE("Write interface token error: %{public}s", __func__); + return; + } + data.WriteInt32(0); + data.WriteInt32((int)value); + int error = Remote()->SendRequest(WIFI_CBK_CMD_DEVICE_CONFIG_CHANGE, data, reply, option); + if (error != ERR_NONE) { + WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", WIFI_CBK_CMD_DEVICE_CONFIG_CHANGE, error); + return; + } + int exception = reply.ReadInt32(); + if (exception) { + WIFI_LOGE("notify wifi device config changed failed!"); + } + return; +} } // namespace Wifi } // namespace OHOS \ No newline at end of file diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_callback_proxy.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_callback_proxy.h index 348bff4..0949672 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_callback_proxy.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_callback_proxy.h @@ -75,6 +75,13 @@ public: */ void OnStreamChanged(int direction) override; + /** + * @Description Deal device config change message + * + * @param ConfigChange - change type of config + */ + void OnDeviceConfigChanged(ConfigChange value) override; + private: #ifdef OHOS_ARCH_LITE SvcIdentity sid_; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_callback_proxy_lite.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_callback_proxy_lite.cpp index cef9622..113afa3 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_callback_proxy_lite.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_callback_proxy_lite.cpp @@ -146,5 +146,24 @@ void WifiDeviceCallBackProxy::OnStreamChanged(int direction) WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", WIFI_CBK_CMD_STREAM_DIRECTION, ret); } } + +void WifiDeviceCallBackProxy::OnDeviceConfigChanged(ConfigChange state) +{ + WIFI_LOGD("WifiDeviceCallBackProxy::OnDeviceConfigChanged"); + IpcIo data; + uint8_t buff[DEFAULT_IPC_SIZE]; + IpcIoInit(&data, buff, DEFAULT_IPC_SIZE, 0); + (void)WriteInt32(&data, 0); + (void)WriteInt32(&data, static_cast(state)); + + IpcIo reply; + MessageOption option; + MessageOptionInit(&option); + option.flags = TF_OP_ASYNC; + int ret = SendRequest(sid_, WIFI_CBK_CMD_DEVICE_CONFIG_CHANGE, &data, &reply, option, nullptr); + if (ret != ERR_NONE) { + WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", WIFI_CBK_CMD_DEVICE_CONFIG_CHANGE, ret); + } +} } // namespace Wifi } // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher.cpp index 054ff7b..eeb08c4 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher.cpp @@ -321,6 +321,9 @@ void WifiInternalEventDispatcher::DealStaCallbackMsg( case WIFI_CBK_MSG_WPS_STATE_CHANGE: callback->OnWifiWpsStateChanged(msg.msgData, msg.pinCode); break; + case WIFI_CBK_MSG_DEVICE_CONFIG_CHANGE: + callback->OnDeviceConfigChanged(ConfigChange(msg.msgData)); + break; default: WIFI_LOGI("UnKnown msgcode %{public}d", msg.msgCode); break; @@ -403,6 +406,9 @@ void WifiInternalEventDispatcher::InvokeDeviceCallbacks(const WifiEventCallbackM case WIFI_CBK_MSG_WPS_STATE_CHANGE: callback->OnWifiWpsStateChanged(msg.msgData, msg.pinCode); break; + case WIFI_CBK_MSG_DEVICE_CONFIG_CHANGE: + callback->OnDeviceConfigChanged(ConfigChange(msg.msgData)); + break; default: WIFI_LOGI("UnKnown msgcode %{public}d", msg.msgCode); break; @@ -522,7 +528,7 @@ void WifiInternalEventDispatcher::SendP2pCallbackMsg(sptr &cal case WIFI_CBK_MSG_P2P_ACTION_RESULT: callback->OnP2pActionResult(msg.p2pAction, static_cast(msg.msgData)); break; - case WIFI_CBK_CMD_CFG_CHANGE: + case WIFI_CBK_MSG_CFG_CHANGE: SendConfigChangeEvent(callback, msg.cfgInfo); break; default: @@ -605,14 +611,14 @@ void WifiInternalEventDispatcher::Run(WifiInternalEventDispatcher &instance) instance.mEventQue.pop_front(); lock.unlock(); WIFI_LOGD("WifiInternalEventDispatcher::Run broad cast a msg %{public}d", msg.msgCode); - if (msg.msgCode >= WIFI_CBK_MSG_STATE_CHANGE && msg.msgCode <= WIFI_CBK_MSG_WPS_STATE_CHANGE) { + if (msg.msgCode >= WIFI_CBK_MSG_STATE_CHANGE && msg.msgCode <= WIFI_CBK_MSG_MAX_INVALID_STA) { DealStaCallbackMsg(instance, msg); } else if (msg.msgCode == WIFI_CBK_MSG_SCAN_STATE_CHANGE) { DealScanCallbackMsg(instance, msg); } else if (msg.msgCode >= WIFI_CBK_MSG_HOTSPOT_STATE_CHANGE && - msg.msgCode <= WIFI_CBK_MSG_HOTSPOT_STATE_LEAVE) { + msg.msgCode <= WIFI_CBK_MSG_MAX_INVALID_HOTSPOT) { DealHotspotCallbackMsg(instance, msg); - } else if (msg.msgCode >= WIFI_CBK_MSG_P2P_STATE_CHANGE && msg.msgCode <= WIFI_CBK_MSG_P2P_ACTION_RESULT) { + } else if (msg.msgCode >= WIFI_CBK_MSG_P2P_STATE_CHANGE && msg.msgCode <= WIFI_CBK_MSG_MAX_INVALID_P2P) { DealP2pCallbackMsg(instance, msg); } else { WIFI_LOGI("UnKnown msgcode %{public}d", msg.msgCode); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher.h index 132324a..8990014 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher.h @@ -27,8 +27,10 @@ #include #include "wifi_internal_msg.h" +#ifndef OHOS_ARCH_LITE #include "parcel.h" #include "iremote_object.h" +#endif #include "i_wifi_device_callback.h" #include "i_wifi_scan_callback.h" #include "i_wifi_hotspot_callback.h" diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp index 17c62df..57b579e 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp @@ -824,7 +824,7 @@ void WifiManager::DealConfigChanged(CfgType type, char* data, int dataLen) return; } WifiEventCallbackMsg cbMsg; - cbMsg.msgCode = WIFI_CBK_CMD_CFG_CHANGE; + cbMsg.msgCode = WIFI_CBK_MSG_CFG_CHANGE; CfgInfo* cfgInfoPtr = new (std::nothrow) CfgInfo(); if (cfgInfoPtr == nullptr) { WIFI_LOGE("DealConfigChanged: new CfgInfo failed"); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp index 512892c..087d1c4 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp @@ -16,6 +16,9 @@ #include "sta_service.h" #include "sta_define.h" #include "sta_service_callback.h" +#ifndef OHOS_ARCH_LITE +#include "wifi_internal_event_dispatcher.h" +#endif #include "wifi_logger.h" #include "wifi_settings.h" #include "wifi_sta_hal_interface.h" @@ -179,6 +182,7 @@ int StaService::AddDeviceConfig(const WifiDeviceConfig &config) const LOGI("Enter StaService::AddDeviceConfig.\n"); CHECK_NULL_AND_RETURN(pStaStateMachine, WIFI_OPT_FAILED); int netWorkId = INVALID_NETWORK_ID; + bool isUpdate = false; std::string bssid; WifiDeviceConfig tempDeviceConfig; if (WifiSettings::GetInstance().GetDeviceConfig(config.ssid, config.keyMgmt, tempDeviceConfig) == 0) { @@ -187,6 +191,7 @@ int StaService::AddDeviceConfig(const WifiDeviceConfig &config) const CHECK_NULL_AND_RETURN(pStaAutoConnectService, WIFI_OPT_FAILED); bssid = config.bssid.empty() ? tempDeviceConfig.bssid : config.bssid; pStaAutoConnectService->EnableOrDisableBssid(bssid, true, 0); + isUpdate = true; } else { if (WifiStaHalInterface::GetInstance().GetNextNetworkId(netWorkId) != WIFI_IDL_OPT_OK) { LOGE("StaService::AddDeviceConfig GetNextNetworkId failed!"); @@ -209,6 +214,8 @@ int StaService::AddDeviceConfig(const WifiDeviceConfig &config) const /* Add the new network to WifiSettings. */ WifiSettings::GetInstance().AddDeviceConfig(tempDeviceConfig); WifiSettings::GetInstance().SyncDeviceConfig(); + ConfigChange changeType = isUpdate ? ConfigChange::CONFIG_UPDATE : ConfigChange::CONFIG_ADD; + NotifyDeviceConfigChange(changeType); return netWorkId; } @@ -238,6 +245,7 @@ ErrCode StaService::RemoveDevice(int networkId) const /* Remove network configuration directly without notification to InterfaceService. */ WifiSettings::GetInstance().RemoveDevice(networkId); WifiSettings::GetInstance().SyncDeviceConfig(); + NotifyDeviceConfigChange(ConfigChange::CONFIG_REMOVE); return WIFI_OPT_SUCCESS; } @@ -259,6 +267,7 @@ ErrCode StaService::RemoveAllDevice() const LOGE("RemoveAllDevice-SyncDeviceConfig() failed!"); return WIFI_OPT_FAILED; } + NotifyDeviceConfigChange(ConfigChange::CONFIG_REMOVE); return WIFI_OPT_SUCCESS; } @@ -407,5 +416,16 @@ ErrCode StaService::SetSuspendMode(bool mode) const } return WIFI_OPT_SUCCESS; } + +void StaService::NotifyDeviceConfigChange(ConfigChange value) const +{ + WIFI_LOGI("Notify device config change: %{public}d\n", static_cast(value)); +#ifndef OHOS_ARCH_LITE + WifiEventCallbackMsg cbMsg; + cbMsg.msgCode = WIFI_CBK_MSG_DEVICE_CONFIG_CHANGE; + cbMsg.msgData = static_cast(value); + WifiInternalEventDispatcher::GetInstance().AddBroadCastMsg(cbMsg); +#endif +} } // namespace Wifi } // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.h index ea206fb..c797dca 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.h @@ -217,6 +217,9 @@ public: */ virtual ErrCode SetSuspendMode(bool mode) const; +private: + void NotifyDeviceConfigChange(ConfigChange value) const; + private: StaStateMachine *pStaStateMachine; StaMonitor *pStaMonitor; diff --git a/wifi/test/wifi_client/wifi_client.cpp b/wifi/test/wifi_client/wifi_client.cpp index fd9b1c7..c54557f 100644 --- a/wifi/test/wifi_client/wifi_client.cpp +++ b/wifi/test/wifi_client/wifi_client.cpp @@ -152,6 +152,11 @@ public: Logd("receive %s event, direction:%d", __func__, direction); } + void OnDeviceConfigChanged(ConfigChange value) override + { + Logd("receive %s event:%d", __func__, static_cast(value)); + } + #ifndef OHOS_ARCH_LITE OHOS::sptr AsObject() override { -- Gitee From f319ff33d5d58047a7e0c120407a1668273d88d6 Mon Sep 17 00:00:00 2001 From: aqxyjay Date: Wed, 10 Aug 2022 09:35:29 +0800 Subject: [PATCH 303/491] feat: add thermal control for wifi scan Signed-off-by: aqxyjay --- .../common/config/wifi_settings.cpp | 10 ++++ .../common/config/wifi_settings.h | 15 +++++ .../wifi_manage/wifi_device_service_impl.cpp | 58 +++++++++++++++++-- .../wifi_manage/wifi_device_service_impl.h | 12 ++++ .../wifi_manage/wifi_scan/scan_service.cpp | 18 ++++++ .../wifi_manage/wifi_scan/scan_service.h | 11 +++- .../wifi_scan/scan_service_test.cpp | 12 +++- 7 files changed, 130 insertions(+), 6 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp b/wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp index d5e976e..ee96a8e 100644 --- a/wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp +++ b/wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp @@ -1436,5 +1436,15 @@ bool WifiSettings::IsExplicitGroup(void) { return explicitGroup; } + +void WifiSettings::SetThermalLevel(const int &level) +{ + mThermalLevel = level; +} + +int WifiSettings::GetThermalLevel() const +{ + return mThermalLevel; +} } // namespace Wifi } // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.h b/wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.h index 3d0ff27..a119643 100644 --- a/wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.h +++ b/wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.h @@ -1066,6 +1066,20 @@ public: */ bool IsExplicitGroup(void); + /** + * @Description Set the thermal level + * + * @param level 0 COOL, 1 NORMAL, 2 WARM, 3 HOT, 4 OVERHEATED, 5 WARNING, 6 EMERGENCY + */ + void SetThermalLevel(const int &level); + + /** + * @Description Get the thermal level + * + * @return int 0 COOL, 1 NORMAL, 2 WARM, 3 HOT, 4 OVERHEATED, 5 WARNING, 6 EMERGENCY + */ + int GetThermalLevel() const; + private: WifiSettings(); void InitWifiConfig(); @@ -1105,6 +1119,7 @@ private: int mLastSelectedNetworkId; /* last selected networkid */ time_t mLastSelectedTimeVal; /* last selected time */ int mScreenState; /* 1 MODE_STATE_OPEN, 2 MODE_STATE_CLOSE */ + int mThermalLevel; /* 1 COOL, 2 NORMAL, 3 WARM, 4 HOT, 5 OVERHEATED, 6 WARNING, 7 EMERGENCY */ int mAirplaneModeState; /* 1 on 2 off */ ScanMode mAppRunningModeState; /* 0 app for 1 app back 2 sys for 3 sys back */ int mPowerSavingModeState; /* 1 on 2 off */ diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp index a8ff033..f1e81d1 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp @@ -48,6 +48,7 @@ std::shared_ptr WifiDeviceServiceImpl::GetInstance() #else const uint32_t TIMEOUT_APP_EVENT = 3000; const uint32_t TIMEOUT_SCREEN_EVENT = 3000; +const uint32_t TIMEOUT_THERMAL_EVENT = 3000; using TimeOutCallback = std::function; sptr WifiDeviceServiceImpl::g_instance; const bool REGISTER_RESULT = SystemAbility::MakeAndRegisterAbility(WifiDeviceServiceImpl::GetInstance().GetRefPtr()); @@ -124,21 +125,28 @@ void WifiDeviceServiceImpl::OnStart() #ifndef OHOS_ARCH_LITE if (eventSubscriber_ == nullptr) { lpTimer_ = std::make_unique("WifiDeviceServiceImpl"); - TimeOutCallback timeOutcallback = std::bind(&WifiDeviceServiceImpl::RegisterAppRemoved, this); + TimeOutCallback timeoutCallback = std::bind(&WifiDeviceServiceImpl::RegisterAppRemoved, this); lpTimer_->Setup(); - lpTimer_->Register(timeOutcallback, TIMEOUT_APP_EVENT, true); + lpTimer_->Register(timeoutCallback, TIMEOUT_APP_EVENT, true); } if (screenEventSubscriber_ == nullptr) { lpScreenTimer_ = std::make_unique("WifiDeviceServiceImpl"); - TimeOutCallback timeOutcallback = std::bind(&WifiDeviceServiceImpl::RegisterScreenEvent, this); + TimeOutCallback timeoutCallback = std::bind(&WifiDeviceServiceImpl::RegisterScreenEvent, this); if (lpScreenTimer_ != nullptr) { lpScreenTimer_->Setup(); - lpScreenTimer_->Register(timeOutcallback, TIMEOUT_SCREEN_EVENT, true); + lpScreenTimer_->Register(timeoutCallback, TIMEOUT_SCREEN_EVENT, true); } else { WIFI_LOGE("lpScreenTimer_ is nullptr"); } } + + if (thermalLevelSubscriber_ == nullptr) { + lpThermalTimer_ = std::make_unique("WifiDeviceServiceImpl"); + TimeOutCallback timeoutCallback = std::bind(&WifiDeviceServiceImpl::RegisterThermalLevel, this); + lpThermalTimer_->Setup(); + lpThermalTimer_->Register(timeoutCallback, TIMEOUT_THERMAL_EVENT, true); + } #endif } @@ -161,6 +169,13 @@ void WifiDeviceServiceImpl::OnStop() lpScreenTimer_->Shutdown(false); lpScreenTimer_ = nullptr; } + if (thermalLevelSubscriber_ != nullptr) { + UnRegisterThermalLevel(); + } + if (lpThermalTimer_ != nullptr) { + lpThermalTimer_->Shutdown(false); + lpThermalTimer_ = nullptr; + } #endif WIFI_LOGI("Stop sta service!"); } @@ -1262,6 +1277,29 @@ void WifiDeviceServiceImpl::UnRegisterScreenEvent() screenEventSubscriber_ = nullptr; } +void WifiDeviceServiceImpl::RegisterThermalLevel() +{ + OHOS::EventFwk::MatchingSkills matchingSkills; + matchingSkills.AddEvent(OHOS::EventFwk::CommonEventSupport::COMMON_EVENT_THERMAL_LEVEL_CHANGED); + EventFwk::CommonEventSubscribeInfo subscriberInfo(matchingSkills); + thermalLevelSubscriber_ = std::make_shared(subscriberInfo); + if (!EventFwk::CommonEventManager::SubscribeCommonEvent(thermalLevelSubscriber_)) { + WIFI_LOGE("THERMAL_LEVEL_CHANGED SubscribeCommonEvent() failed"); + } else { + WIFI_LOGI("THERMAL_LEVEL_CHANGED SubscribeCommonEvent() OK"); + } +} + +void WifiDeviceServiceImpl::UnRegisterThermalLevel() +{ + if (!EventFwk::CommonEventManager::UnSubscribeCommonEvent(thermalLevelSubscriber_)) { + WIFI_LOGE("THERMAL_LEVEL_CHANGED UnSubscribeCommonEvent() failed"); + } else { + WIFI_LOGI("THERMAL_LEVEL_CHANGED UnSubscribeCommonEvent() OK"); + } + thermalLevelSubscriber_ = nullptr; +} + void AppEventSubscriber::OnReceiveEvent(const OHOS::EventFwk::CommonEventData &data) { std::string action = data.GetWant().GetAction(); @@ -1319,6 +1357,18 @@ void ScreenEventSubscriber::OnReceiveEvent(const OHOS::EventFwk::CommonEventData } WIFI_LOGW("ScreenEventSubscriber::OnReceiveEvent, screen state: %{public}d.", screenState); } + +void ThermalLevelSubscriber::OnReceiveEvent(const OHOS::EventFwk::CommonEventData &data) +{ + std::string action = data.GetWant().GetAction(); + WIFI_LOGI("ThermalLevelSubscriber::OnReceiveEvent: %{public}s.", action.c_str()); + if (action == OHOS::EventFwk::CommonEventSupport::COMMON_EVENT_THERMAL_LEVEL_CHANGED) { + static const std::string THERMAL_EVENT_ID = "0"; + int level = data.GetWant().GetIntParam(THERMAL_EVENT_ID, 0); + WifiSettings::GetInstance().SetThermalLevel(level); + WIFI_LOGI("ThermalLevelSubscriber SetThermalLevel: %{public}d.", level); + } +} #endif } // namespace Wifi } // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h index bcc0844..0b3473b 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h @@ -50,6 +50,14 @@ public: virtual ~ScreenEventSubscriber() {}; virtual void OnReceiveEvent(const OHOS::EventFwk::CommonEventData &data) override; }; + +class ThermalLevelSubscriber : public OHOS::EventFwk::CommonEventSubscriber { +public: + explicit ThermalLevelSubscriber(const OHOS::EventFwk::CommonEventSubscribeInfo &subscriberInfo) + : CommonEventSubscriber(subscriberInfo) {} + virtual ~ThermalLevelSubscriber() {}; + virtual void OnReceiveEvent(const OHOS::EventFwk::CommonEventData &data) override; +}; #endif #ifdef OHOS_ARCH_LITE enum ServiceRunningState { @@ -176,6 +184,8 @@ private: void UnRegisterAppRemoved(); void RegisterScreenEvent(); void UnRegisterScreenEvent(); + void RegisterThermalLevel(); + void UnRegisterThermalLevel(); #endif private: @@ -193,8 +203,10 @@ private: static sptr g_instance; std::shared_ptr eventSubscriber_ = nullptr; std::shared_ptr screenEventSubscriber_ = nullptr; + std::shared_ptr thermalLevelSubscriber_ = nullptr; std::unique_ptr lpTimer_ = nullptr; std::unique_ptr lpScreenTimer_ = nullptr; + std::unique_ptr lpThermalTimer_ = nullptr; #endif static std::mutex g_instanceLock; bool mPublishFlag; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp index 171be36..738afab 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp @@ -1101,6 +1101,11 @@ ErrCode ScanService::AllowExternScan() ScanMode scanMode = WifiSettings::GetInstance().GetAppRunningState(); WIFI_LOGI("staScene is %{public}d, scanMode is %{public}d", staScene, (int)scanMode); + if (!AllowExternScanByThermal()) { + WIFI_LOGW("extern scan not allow by thermal level"); + return WIFI_OPT_FAILED; + } + if (!AllowExternScanByForbid(staScene, scanMode)) { WIFI_LOGW("extern scan not allow by forbid mode"); return WIFI_OPT_FAILED; @@ -1377,6 +1382,19 @@ ErrCode ScanService::ApplyScanPolices(ScanType type) return WIFI_OPT_SUCCESS; } +bool ScanService::AllowExternScanByThermal() +{ + WIFI_LOGI("Enter ScanService::AllowExternScanByThermal.\n"); + + auto level = WifiSettings::GetInstance().GetThermalLevel(); + static const int THERMAL_LEVEL_HOT = 3; + if (level >= THERMAL_LEVEL_HOT) { + WIFI_LOGW("ScanService::AllowExternScanByThermal, level=%{public}d is higher than hot\n", level); + return false; + } + return true; +} + bool ScanService::AllowExternScanByForbid(int staScene, ScanMode scanMode) { WIFI_LOGI("Enter ScanService::AllowExternScanByForbid.\n"); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.h index 9f22cdc..7a02b67 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.h @@ -451,6 +451,15 @@ private: * @return success: ScanScene, failed: SCAN_SCENE_MAX */ int GetStaScene(); + + /** + * @Description Determine whether scanning is allowed and scan the control policy through thermal level. + * + * @return true - allow extern scan + * @return false - not allow extern scan + */ + bool AllowExternScanByThermal(); + /** * @Description Determine whether scanning is allowed and scan the control policy through forbidMap. * @@ -728,4 +737,4 @@ private: } // namespace Wifi } // namespace OHOS -#endif \ No newline at end of file +#endif diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service_test.cpp index b79ead6..abd714d 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service_test.cpp +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service_test.cpp @@ -702,6 +702,11 @@ public: pScanService->AllowPnoScan(); } + void AllowExternScanByThermal() + { + pScanService->AllowExternScanByThermal(); + } + void AllowExternScanByForbidSuccess1() { int staScene = 0; @@ -1900,6 +1905,11 @@ HWTEST_F(ScanServiceTest, AllowPnoScanSuccess, TestSize.Level1) AllowPnoScanSuccess(); } +HWTEST_F(ScanServiceTest, AllowExternScanByThermal, TestSize.Level1) +{ + AllowExternScanByThermal(); +} + HWTEST_F(ScanServiceTest, AllowExternScanByForbidSuccess1, TestSize.Level1) { AllowExternScanByForbidSuccess1(); @@ -2300,4 +2310,4 @@ HWTEST_F(ScanServiceTest, AllowScanByIntervalBlocklistFail2, TestSize.Level1) AllowScanByIntervalBlocklistFail2(); } } // namespace Wifi -} // namespace OHOS \ No newline at end of file +} // namespace OHOS -- Gitee From 60666afb6a3ae1b5c22a532e032dd451299b7881 Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Thu, 11 Aug 2022 06:54:44 +0000 Subject: [PATCH 304/491] add ssid anonymize func Signed-off-by: zhangfeng --- wifi/bundle.json | 4 ++-- wifi/utils/inc/wifi_common_util.h | 24 ++++++++++++++++++++++++ wifi/utils/src/wifi_common_util.cpp | 28 ++++++++++++++++++++++++++++ 3 files changed, 54 insertions(+), 2 deletions(-) diff --git a/wifi/bundle.json b/wifi/bundle.json index 6a53132..73c958b 100644 --- a/wifi/bundle.json +++ b/wifi/bundle.json @@ -39,10 +39,10 @@ "subsystem": "communication", "syscap": [ "SystemCapability.Communication.WiFi.STA", - "SystemCapability.Communication.WiFi.AP", + "SystemCapability.Communication.WiFi.AP.Core", "SystemCapability.Communication.WiFi.P2P", "SystemCapability.Communication.WiFi.Core", - "SystemCapability.Communication.WiFi.HotspotExt" + "SystemCapability.Communication.WiFi.AP.Extension" ], "features": [ "wifi_feature_with_p2p", diff --git a/wifi/utils/inc/wifi_common_util.h b/wifi/utils/inc/wifi_common_util.h index f6db0e2..71d3cd5 100644 --- a/wifi/utils/inc/wifi_common_util.h +++ b/wifi/utils/inc/wifi_common_util.h @@ -47,6 +47,30 @@ std::string MacAnonymize(const std::string str); */ std::string IpAnonymize(const std::string str); +/** + * @Description Ssid anonymization + * + *

a) Length less than or equal to 2, all bits are hidden; + * b) Length less than or equal to 4, hiding the middle bit; + * c) Length less than or equal to 8, hiding 3 bits from the second bit; + * d) Length greater than or equal to 9, showing the first and last three bits, the middle bits are hidden + *

eg: + * 1 -> * + * 12 -> ** + * 123 -> 1*3 + * 1234 -> 1**4 + * 12345 -> 1***5 + * 123456 -> 1***56 + * 1234567 -> 1***567 + * 12345678 -> 1***5678 + * 123456789 -> 123***789 + * 12345678910 -> 123*****910 + * + * @param str - Input ssid + * @return std::string - Processed ssid + */ +std::string SsidAnonymize(const std::string str); + /** * @Description Converting string MAC to a C-style MAC address * diff --git a/wifi/utils/src/wifi_common_util.cpp b/wifi/utils/src/wifi_common_util.cpp index 175dc5c..78a44e6 100644 --- a/wifi/utils/src/wifi_common_util.cpp +++ b/wifi/utils/src/wifi_common_util.cpp @@ -90,6 +90,34 @@ std::string IpAnonymize(const std::string str) return DataAnonymize(str, '.', '*'); } +std::string SsidAnonymize(const std::string str) +{ + if (str.empty()) { + return str; + } + + std::string s = str; + constexpr char hiddenChar = '*'; + constexpr size_t minHiddenSize = 3; + constexpr size_t headKeepSize = 3; + constexpr size_t tailKeepSize = 3; + auto func = [hiddenChar](char& c) { c = hiddenChar; }; + if (s.size() < minHiddenSize) { + std::for_each(s.begin(), s.end(), func); + return s; + } + + if (s.size() < (minHiddenSize + headKeepSize + tailKeepSize)) { + size_t beginIndex = 1; + size_t hiddenSize = s.size() - minHiddenSize + 1; + hiddenSize = hiddenSize > minHiddenSize ? minHiddenSize : hiddenSize; + std::for_each(s.begin() + beginIndex, s.begin() + beginIndex + hiddenSize, func); + return s; + } + std::for_each(s.begin() + headKeepSize, s.begin() + s.size() - tailKeepSize, func); + return s; +} + static unsigned char ConvertStrChar(char ch) { constexpr int numDiffForHexAlphabet = 10; -- Gitee From bf14424ea584abb9a232ddd2cf2139db181eaba2 Mon Sep 17 00:00:00 2001 From: liwei01 Date: Wed, 27 Jul 2022 11:36:19 +0800 Subject: [PATCH 305/491] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BB=BA=E8=AE=AE?= =?UTF-8?q?=E7=BD=91=E7=BB=9C=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: liwei01 --- .../frameworks/js/napi/inc/wifi_napi_device.h | 2 + .../js/napi/src/wifi_napi_device.cpp | 21 ++- .../native/c_adapter/src/wifi_c_device.cpp | 9 +- wifi/frameworks/native/include/wifi_device.h | 34 +--- wifi/frameworks/native/interfaces/define.h | 5 +- .../native/interfaces/i_wifi_device.h | 34 +--- .../native/src/wifi_device_impl.cpp | 30 +--- wifi/frameworks/native/src/wifi_device_impl.h | 34 +--- .../native/src/wifi_device_proxy.cpp | 102 +---------- .../frameworks/native/src/wifi_device_proxy.h | 34 +--- .../native/src/wifi_device_proxy_lite.cpp | 28 +--- .../common/config/wifi_settings.h | 2 +- .../wifi_manage/wifi_device_service_impl.cpp | 158 +++++++----------- .../wifi_manage/wifi_device_service_impl.h | 12 +- .../wifi_manage/wifi_device_stub.cpp | 58 +------ .../wifi_manage/wifi_device_stub.h | 3 - .../wifi_manage/wifi_device_stub_lite.cpp | 12 +- .../adddeviceconfig_fuzzer.cpp | 3 +- wifi/test/wifi_client/wifi_client.cpp | 9 +- 19 files changed, 155 insertions(+), 435 deletions(-) diff --git a/wifi/frameworks/js/napi/inc/wifi_napi_device.h b/wifi/frameworks/js/napi/inc/wifi_napi_device.h index 5938608..7fa04fd 100644 --- a/wifi/frameworks/js/napi/inc/wifi_napi_device.h +++ b/wifi/frameworks/js/napi/inc/wifi_napi_device.h @@ -90,11 +90,13 @@ class DeviceConfigContext : public AsyncContext { public: WifiDeviceConfig *config; int networkId; + bool isCandidate; DeviceConfigContext(napi_env env, napi_async_work work = nullptr, napi_deferred deferred = nullptr) : AsyncContext(env, work, deferred) { config = nullptr; networkId = -1; + isCandidate = false; } DeviceConfigContext() = delete; diff --git a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp index 7eb116a..3c25868 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp @@ -347,11 +347,12 @@ napi_value AddDeviceConfig(napi_env env, napi_callback_info info) } JsObjToDeviceConfig(env, argv[0], *config); asyncContext->config = config; + asyncContext->isCandidate = false; asyncContext->executeFunc = [&](void* data) -> void { DeviceConfigContext *context = static_cast(data); TRACE_FUNC_CALL_NAME("wifiDevicePtr->AddDeviceConfig"); - ErrCode ret = wifiDevicePtr->AddDeviceConfig(*context->config, context->networkId); + ErrCode ret = wifiDevicePtr->AddDeviceConfig(*context->config, context->networkId, context->isCandidate); if (context->networkId < 0 || ret != WIFI_OPT_SUCCESS) { context->networkId = -1; } @@ -398,11 +399,12 @@ napi_value AddUntrustedConfig(napi_env env, napi_callback_info info) } JsObjToDeviceConfig(env, argv[0], *config); asyncContext->config = config; + asyncContext->isCandidate = true; asyncContext->executeFunc = [&](void* data) -> void { DeviceConfigContext *context = static_cast(data); TRACE_FUNC_CALL_NAME("wifiDevicePtr->AddUntrustedConfig"); - ErrCode ret = wifiDevicePtr->AddCandidateConfig(*context->config, context->networkId); + ErrCode ret = wifiDevicePtr->AddDeviceConfig(*context->config, context->networkId, context->isCandidate); if (context->networkId < 0 || ret != WIFI_OPT_SUCCESS) { context->networkId = -1; } @@ -496,11 +498,12 @@ napi_value AddCandidateConfig(napi_env env, napi_callback_info info) } JsObjToDeviceConfig(env, argv[0], *config); asyncContext->config = config; + asyncContext->isCandidate = true; asyncContext->executeFunc = [&](void* data) -> void { DeviceConfigContext *context = static_cast(data); TRACE_FUNC_CALL_NAME("wifiDevicePtr->AddCandidateConfig"); - ErrCode ret = wifiDevicePtr->AddCandidateConfig(*context->config, context->networkId); + ErrCode ret = wifiDevicePtr->AddDeviceConfig(*context->config, context->networkId, context->isCandidate); if (context->networkId < 0 || ret != WIFI_OPT_SUCCESS) { WIFI_LOGE("Add candidate device config failed: %{public}d", static_cast(ret)); context->networkId = -1; @@ -576,9 +579,10 @@ napi_value ConnectToCandidateConfig(napi_env env, napi_callback_info info) int networkId = -1; napi_get_value_int32(env, argv[0], &networkId); + bool isCandidate = true; NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); - ErrCode ret = wifiDevicePtr->ConnectToCandidateConfig(networkId); + ErrCode ret = wifiDevicePtr->ConnectToNetwork(networkId, isCandidate); napi_value result; napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); return result; @@ -599,9 +603,10 @@ napi_value ConnectToNetwork(napi_env env, napi_callback_info info) int networkId = -1; napi_get_value_int32(env, argv[0], &networkId); + bool isCandidate = false; NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); - ErrCode ret = wifiDevicePtr->ConnectToNetwork(networkId); + ErrCode ret = wifiDevicePtr->ConnectToNetwork(networkId, isCandidate); napi_value result; napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); return result; @@ -967,7 +972,8 @@ napi_value GetDeviceConfigs(napi_env env, napi_callback_info info) TRACE_FUNC_CALL; NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); std::vector vecDeviceConfigs; - ErrCode ret = wifiDevicePtr->GetDeviceConfigs(vecDeviceConfigs); + bool isCandidate = false; + ErrCode ret = wifiDevicePtr->GetDeviceConfigs(vecDeviceConfigs, isCandidate); if (ret != WIFI_OPT_SUCCESS) { WIFI_LOGE("Get device configs fail: %{public}d", ret); } @@ -986,7 +992,8 @@ napi_value GetCandidateConfigs(napi_env env, napi_callback_info info) TRACE_FUNC_CALL; NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); std::vector vecDeviceConfigs; - ErrCode ret = wifiDevicePtr->GetCandidateConfigs(vecDeviceConfigs); + bool isCandidate = true; + ErrCode ret = wifiDevicePtr->GetDeviceConfigs(vecDeviceConfigs, isCandidate); if (ret != WIFI_OPT_SUCCESS) { WIFI_LOGE("Get candidate device configs fail: %{public}d", ret); } diff --git a/wifi/frameworks/native/c_adapter/src/wifi_c_device.cpp b/wifi/frameworks/native/c_adapter/src/wifi_c_device.cpp index 9e2ab0f..e6df333 100644 --- a/wifi/frameworks/native/c_adapter/src/wifi_c_device.cpp +++ b/wifi/frameworks/native/c_adapter/src/wifi_c_device.cpp @@ -207,7 +207,8 @@ WifiErrorCode AddDeviceConfig(const WifiDeviceConfig *config, int *result) OHOS::Wifi::WifiDeviceConfig deviceConfig; ConvertDeviceConfigFromC(config, deviceConfig); int addResult = -1; - OHOS::Wifi::ErrCode ret = wifiDevicePtr->AddDeviceConfig(deviceConfig, addResult); + bool isCandidate = false; + OHOS::Wifi::ErrCode ret = wifiDevicePtr->AddDeviceConfig(deviceConfig, addResult, isCandidate); *result = addResult; return GetCErrorCode(ret); } @@ -218,7 +219,8 @@ WifiErrorCode GetDeviceConfigs(WifiDeviceConfig *result, unsigned int *size) CHECK_PTR_RETURN(result, ERROR_WIFI_INVALID_ARGS); CHECK_PTR_RETURN(size, ERROR_WIFI_INVALID_ARGS); std::vector vecDeviceConfigs; - OHOS::Wifi::ErrCode ret = wifiDevicePtr->GetDeviceConfigs(vecDeviceConfigs); + bool isCandidate = false; + OHOS::Wifi::ErrCode ret = wifiDevicePtr->GetDeviceConfigs(vecDeviceConfigs, isCandidate); if (ret != OHOS::Wifi::WIFI_OPT_SUCCESS) { WIFI_LOGE("Get device configs error!"); return GetCErrorCode(ret); @@ -253,7 +255,8 @@ WifiErrorCode EnableDeviceConfig(int networkId) WifiErrorCode ConnectTo(int networkId) { CHECK_PTR_RETURN(wifiDevicePtr, ERROR_WIFI_NOT_AVAILABLE); - return GetCErrorCode(wifiDevicePtr->ConnectToNetwork(networkId)); + bool isCandidate = false; + return GetCErrorCode(wifiDevicePtr->ConnectToNetwork(networkId, isCandidate)); } WifiErrorCode ConnectToDevice(const WifiDeviceConfig *config) diff --git a/wifi/frameworks/native/include/wifi_device.h b/wifi/frameworks/native/include/wifi_device.h index 5b18abd..c6b5126 100644 --- a/wifi/frameworks/native/include/wifi_device.h +++ b/wifi/frameworks/native/include/wifi_device.h @@ -68,15 +68,6 @@ public: */ virtual ErrCode PutWifiProtectRef(const std::string &protectName) = 0; - /** - * @Description Add a specified candidate hotspot configuration. - * - * @param config - WifiDeviceConfig object - * @param networkId - the device configuration's network id - * @return ErrCode - operation result - */ - virtual ErrCode AddCandidateConfig(const WifiDeviceConfig &config, int &networkId) = 0; - /** * @Description Remove the wifi candidate device config equals to input network id * @@ -93,30 +84,15 @@ public: */ virtual ErrCode RemoveCandidateConfig(const WifiDeviceConfig &config) = 0; - /** - * @Description Connect to a candidate specified network. - * - * @param networkId - the candidate device network id - * @return ErrCode - operation result - */ - virtual ErrCode ConnectToCandidateConfig(int networkId) = 0; - - /** - * @Description Get all candidate device configs. - * - * @param result - Get result vector of WifiDeviceConfig - * @return ErrCode - operation result - */ - virtual ErrCode GetCandidateConfigs(std::vector &result) = 0; - /** * @Description Add a wifi device configuration. * * @param config - WifiDeviceConfig object * @param result - the device configuration's network id + * @param isCandidate - Whether is candidate * @return ErrCode - operation result */ - virtual ErrCode AddDeviceConfig(const WifiDeviceConfig &config, int &result) = 0; + virtual ErrCode AddDeviceConfig(const WifiDeviceConfig &config, int &result, bool isCandidate) = 0; /** * @Description Update a wifi device configuration. @@ -146,17 +122,19 @@ public: * @Description Get all the device configs. * * @param result - Get result vector of WifiDeviceConfig + * @param isCandidate - Whether is candidate * @return ErrCode - operation result */ - virtual ErrCode GetDeviceConfigs(std::vector &result) = 0; + virtual ErrCode GetDeviceConfigs(std::vector &result, bool isCandidate) = 0; /** * @Description Connecting to a Specified Network. * * @param networkId - network id + * @param isCandidate - Whether is candidate * @return ErrCode - operation result */ - virtual ErrCode ConnectToNetwork(int networkId) = 0; + virtual ErrCode ConnectToNetwork(int networkId, bool isCandidate) = 0; /** * @Description Connect To a network base WifiDeviceConfig object. diff --git a/wifi/frameworks/native/interfaces/define.h b/wifi/frameworks/native/interfaces/define.h index c062441..e5f816a 100644 --- a/wifi/frameworks/native/interfaces/define.h +++ b/wifi/frameworks/native/interfaces/define.h @@ -54,10 +54,7 @@ #define WIFI_SVR_CMD_PUT_WIFI_PROTECT 0x1025 /* put the Wi-Fi protect. */ #define WIFI_SVR_CMD_IS_WIFI_CONNECTED 0x1026 /* is Wi-Fi connected */ #define WIFI_SVR_CMD_SET_LOW_LATENCY_MODE 0x1027 /* set low latency mode */ -#define WIFI_SVR_CMD_ADD_CANDIDATE_DEVICE_CONFIG 0x1028 /* add an candidate network config */ -#define WIFI_SVR_CMD_CONNECT_TO_CANDIDATE_CONFIG 0x1029 /* connect to an candidate network config */ -#define WIFI_SVR_CMD_REMOVE_CANDIDATE_CONFIG 0x102A /* remove an candidate network config */ -#define WIFI_SVR_CMD_GET_CANDIDATE_CONFIGS 0x102B /* get current saved candidate network configs */ +#define WIFI_SVR_CMD_REMOVE_CANDIDATE_CONFIG 0x1028 /* remove an candidate network config */ /* -------------ap module message define----------------- */ #define WIFI_SVR_CMD_ENABLE_WIFI_AP 0x1100 /* open ap */ #define WIFI_SVR_CMD_DISABLE_WIFI_AP 0x1101 /* close ap */ diff --git a/wifi/frameworks/native/interfaces/i_wifi_device.h b/wifi/frameworks/native/interfaces/i_wifi_device.h index 4f52646..b6a96f1 100644 --- a/wifi/frameworks/native/interfaces/i_wifi_device.h +++ b/wifi/frameworks/native/interfaces/i_wifi_device.h @@ -75,15 +75,6 @@ public: */ virtual ErrCode PutWifiProtectRef(const std::string &protectName) = 0; - /** - * @Description Add a specified candidate hotspot configuration. - * - * @param config - WifiDeviceConfig object - * @param networkId - the device configuration's network id - * @return ErrCode - operation result - */ - virtual ErrCode AddCandidateConfig(const WifiDeviceConfig &config, int &networkId) = 0; - /** * @Description Remove the wifi candidate device config equals to input network id * @@ -100,30 +91,15 @@ public: */ virtual ErrCode RemoveCandidateConfig(const WifiDeviceConfig &config) = 0; - /** - * @Description Connect to a candidate specified network. - * - * @param networkId - the candidate device network id - * @return ErrCode - operation result - */ - virtual ErrCode ConnectToCandidateConfig(int networkId) = 0; - - /** - * @Description Get all candidate device configs - * - * @param result - Get result vector of WifiDeviceConfig - * @return ErrCode - operation result - */ - virtual ErrCode GetCandidateConfigs(std::vector &result) = 0; - /** * @Description Add a wifi device configuration. * * @param config - WifiDeviceConfig object * @param result - the device configuration's network id + * @param isCandidate - Whether is candidate * @return ErrCode - operation result */ - virtual ErrCode AddDeviceConfig(const WifiDeviceConfig &config, int &result) = 0; + virtual ErrCode AddDeviceConfig(const WifiDeviceConfig &config, int &result, bool isCandidate) = 0; /** * @Description Update a wifi device configuration. @@ -153,9 +129,10 @@ public: * @Description Get all the device configs * * @param result - Get result vector of WifiDeviceConfig + * @param isCandidate - Whether is candidate * @return ErrCode - operation result */ - virtual ErrCode GetDeviceConfigs(std::vector &result) = 0; + virtual ErrCode GetDeviceConfigs(std::vector &result, bool isCandidate) = 0; /** * @Description Enable device config, when set attemptEnable, disable other device config @@ -178,9 +155,10 @@ public: * @Description Connecting to a Specified Network * * @param networkId - network id + * @param isCandidate - Whether is candidate * @return ErrCode - operation result */ - virtual ErrCode ConnectToNetwork(int networkId) = 0; + virtual ErrCode ConnectToNetwork(int networkId, bool isCandidate) = 0; /** * @Description Connect To a network base WifiDeviceConfig object diff --git a/wifi/frameworks/native/src/wifi_device_impl.cpp b/wifi/frameworks/native/src/wifi_device_impl.cpp index 2d0977d..e8aa1be 100644 --- a/wifi/frameworks/native/src/wifi_device_impl.cpp +++ b/wifi/frameworks/native/src/wifi_device_impl.cpp @@ -114,12 +114,6 @@ ErrCode WifiDeviceImpl::PutWifiProtectRef(const std::string &protectName) return client_->PutWifiProtectRef(protectName); } -ErrCode WifiDeviceImpl::AddCandidateConfig(const WifiDeviceConfig &config, int &networkId) -{ - RETURN_IF_FAIL(client_); - return client_->AddCandidateConfig(config, networkId); -} - ErrCode WifiDeviceImpl::RemoveCandidateConfig(int networkId) { RETURN_IF_FAIL(client_); @@ -132,22 +126,10 @@ ErrCode WifiDeviceImpl::RemoveCandidateConfig(const WifiDeviceConfig &config) return client_->RemoveCandidateConfig(config); } -ErrCode WifiDeviceImpl::ConnectToCandidateConfig(int networkId) -{ - RETURN_IF_FAIL(client_); - return client_->ConnectToCandidateConfig(networkId); -} - -ErrCode WifiDeviceImpl::GetCandidateConfigs(std::vector &result) -{ - RETURN_IF_FAIL(client_); - return client_->GetCandidateConfigs(result); -} - -ErrCode WifiDeviceImpl::AddDeviceConfig(const WifiDeviceConfig &config, int &result) +ErrCode WifiDeviceImpl::AddDeviceConfig(const WifiDeviceConfig &config, int &result, bool isCandidate) { RETURN_IF_FAIL(client_); - return client_->AddDeviceConfig(config, result); + return client_->AddDeviceConfig(config, result, isCandidate); } ErrCode WifiDeviceImpl::UpdateDeviceConfig(const WifiDeviceConfig &config, int &result) @@ -168,10 +150,10 @@ ErrCode WifiDeviceImpl::RemoveAllDevice() return client_->RemoveAllDevice(); } -ErrCode WifiDeviceImpl::GetDeviceConfigs(std::vector &result) +ErrCode WifiDeviceImpl::GetDeviceConfigs(std::vector &result, bool isCandidate) { RETURN_IF_FAIL(client_); - return client_->GetDeviceConfigs(result); + return client_->GetDeviceConfigs(result, isCandidate); } ErrCode WifiDeviceImpl::EnableDeviceConfig(int networkId, bool attemptEnable) @@ -186,10 +168,10 @@ ErrCode WifiDeviceImpl::DisableDeviceConfig(int networkId) return client_->DisableDeviceConfig(networkId); } -ErrCode WifiDeviceImpl::ConnectToNetwork(int networkId) +ErrCode WifiDeviceImpl::ConnectToNetwork(int networkId, bool isCandidate) { RETURN_IF_FAIL(client_); - return client_->ConnectToNetwork(networkId); + return client_->ConnectToNetwork(networkId, isCandidate); } ErrCode WifiDeviceImpl::ConnectToDevice(const WifiDeviceConfig &config) diff --git a/wifi/frameworks/native/src/wifi_device_impl.h b/wifi/frameworks/native/src/wifi_device_impl.h index 1173351..546fd31 100644 --- a/wifi/frameworks/native/src/wifi_device_impl.h +++ b/wifi/frameworks/native/src/wifi_device_impl.h @@ -73,15 +73,6 @@ public: */ ErrCode PutWifiProtectRef(const std::string &protectName) override; - /** - * @Description Add a specified candidate hotspot configuration. - * - * @param config - WifiDeviceConfig object - * @param networkId - the device configuration's network id - * @return ErrCode - operation result - */ - virtual ErrCode AddCandidateConfig(const WifiDeviceConfig &config, int &networkId) override; - /** * @Description Remove the wifi candidate device config equals to input network id * @@ -98,30 +89,15 @@ public: */ virtual ErrCode RemoveCandidateConfig(const WifiDeviceConfig &config) override; - /** - * @Description Connect to a candidate specified network. - * - * @param networkId - the candidate device network id - * @return ErrCode - operation result - */ - virtual ErrCode ConnectToCandidateConfig(int networkId) override; - - /** - * @Description Get all candidate device configs - * - * @param result - Get result vector of WifiDeviceConfig - * @return ErrCode - operation result - */ - ErrCode GetCandidateConfigs(std::vector &result) override; - /** * @Description Add a wifi device configuration. * * @param config - WifiDeviceConfig object * @param result - the device configuration's network id + * @param isCandidate - Whether is candidate * @return ErrCode - operation result */ - ErrCode AddDeviceConfig(const WifiDeviceConfig &config, int &result) override; + ErrCode AddDeviceConfig(const WifiDeviceConfig &config, int &result, bool isCandidate) override; /** * @Description Update a wifi device configuration. @@ -151,17 +127,19 @@ public: * @Description Get all the device configs * * @param result - Get result vector of WifiDeviceConfig + * @param isCandidate - Whether is candidate * @return ErrCode - operation result */ - ErrCode GetDeviceConfigs(std::vector &result) override; + ErrCode GetDeviceConfigs(std::vector &result, bool isCandidate) override; /** * @Description Connecting to a Specified Network * * @param networkId - network id + * @param isCandidate - Whether is candidate * @return ErrCode - operation result */ - ErrCode ConnectToNetwork(int networkId) override; + ErrCode ConnectToNetwork(int networkId, bool isCandidate) override; /** * @Description Connect To a network base WifiDeviceConfig object diff --git a/wifi/frameworks/native/src/wifi_device_proxy.cpp b/wifi/frameworks/native/src/wifi_device_proxy.cpp index 78c5d7a..5abbce6 100644 --- a/wifi/frameworks/native/src/wifi_device_proxy.cpp +++ b/wifi/frameworks/native/src/wifi_device_proxy.cpp @@ -245,38 +245,6 @@ void WifiDeviceProxy::WriteDeviceConfig(const WifiDeviceConfig &config, MessageP data.WriteInt32((int)config.wifiPrivacySetting); } -ErrCode WifiDeviceProxy::AddCandidateConfig(const WifiDeviceConfig &config, int &networkId) -{ - if (mRemoteDied) { - WIFI_LOGE("failed to `%{public}s`,remote service is died!", __func__); - return WIFI_OPT_FAILED; - } - MessageOption option; - MessageParcel data, reply; - if (!data.WriteInterfaceToken(GetDescriptor())) { - WIFI_LOGE("Write interface token error: %{public}s", __func__); - return WIFI_OPT_FAILED; - } - data.WriteInt32(0); - WriteDeviceConfig(config, data); - int error = Remote()->SendRequest(WIFI_SVR_CMD_ADD_CANDIDATE_DEVICE_CONFIG, data, reply, option); - if (error != ERR_NONE) { - WIFI_LOGE("Set Attr(%{public}d) failed,error=%{public}d", WIFI_SVR_CMD_ADD_CANDIDATE_DEVICE_CONFIG, error); - return WIFI_OPT_FAILED; - } - int exception = reply.ReadInt32(); - if (exception) { - return WIFI_OPT_FAILED; - } - int ret = reply.ReadInt32(); - if (ret != WIFI_OPT_SUCCESS) { - return ErrCode(ret); - } - networkId = reply.ReadInt32(); - - return WIFI_OPT_SUCCESS; -} - ErrCode WifiDeviceProxy::RemoveCandidateConfig(const WifiDeviceConfig &config) { if (mRemoteDied) { @@ -338,65 +306,7 @@ ErrCode WifiDeviceProxy::RemoveCandidateConfig(int networkId) return ErrCode(reply.ReadInt32()); } -ErrCode WifiDeviceProxy::ConnectToCandidateConfig(int networkId) -{ - if (mRemoteDied) { - WIFI_LOGE("failed to `%{public}s`,remote service is died!", __func__); - return WIFI_OPT_FAILED; - } - MessageOption option; - MessageParcel data, reply; - if (!data.WriteInterfaceToken(GetDescriptor())) { - WIFI_LOGE("Write interface token error: %{public}s", __func__); - return WIFI_OPT_FAILED; - } - data.WriteInt32(0); - data.WriteInt32(networkId); - int error = Remote()->SendRequest(WIFI_SVR_CMD_CONNECT_TO_CANDIDATE_CONFIG, data, reply, option); - if (error != ERR_NONE) { - WIFI_LOGE("Set Attr(%{public}d) failed,error=%{public}d", WIFI_SVR_CMD_CONNECT_TO_CANDIDATE_CONFIG, error); - return WIFI_OPT_FAILED; - } - int exception = reply.ReadInt32(); - if (exception) { - return WIFI_OPT_FAILED; - } - return ErrCode(reply.ReadInt32()); -} - -ErrCode WifiDeviceProxy::GetCandidateConfigs(std::vector &result) -{ - if (mRemoteDied) { - WIFI_LOGE("failed to `%{public}s`,remote service is died!", __func__); - return WIFI_OPT_FAILED; - } - MessageOption option; - MessageParcel data; - MessageParcel reply; - if (!data.WriteInterfaceToken(GetDescriptor())) { - WIFI_LOGE("Write interface token error: %{public}s", __func__); - return WIFI_OPT_FAILED; - } - data.WriteInt32(0); - int error = Remote()->SendRequest(WIFI_SVR_CMD_GET_CANDIDATE_CONFIGS, data, reply, option); - if (error != ERR_NONE) { - WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", WIFI_SVR_CMD_GET_CANDIDATE_CONFIGS, error); - return WIFI_OPT_FAILED; - } - int exception = reply.ReadInt32(); - if (exception) { - return WIFI_OPT_FAILED; - } - int ret = reply.ReadInt32(); - if (ret != WIFI_OPT_SUCCESS) { - return ErrCode(ret); - } - - ParseDeviceConfigs(reply, result); - return WIFI_OPT_SUCCESS; -} - -ErrCode WifiDeviceProxy::AddDeviceConfig(const WifiDeviceConfig &config, int &result) +ErrCode WifiDeviceProxy::AddDeviceConfig(const WifiDeviceConfig &config, int &result, bool isCandidate) { if (mRemoteDied) { WIFI_LOGE("failed to `%{public}s`,remote service is died!", __func__); @@ -409,6 +319,8 @@ ErrCode WifiDeviceProxy::AddDeviceConfig(const WifiDeviceConfig &config, int &re return WIFI_OPT_FAILED; } data.WriteInt32(0); + /* true-candidate config, false-normal config */ + data.WriteBool(isCandidate); WriteDeviceConfig(config, data); int error = Remote()->SendRequest(WIFI_SVR_CMD_ADD_DEVICE_CONFIG, data, reply, option); if (error != ERR_NONE) { @@ -584,7 +496,7 @@ void WifiDeviceProxy::ParseDeviceConfigs(MessageParcel &reply, std::vector &result) +ErrCode WifiDeviceProxy::GetDeviceConfigs(std::vector &result, bool isCandidate) { if (mRemoteDied) { WIFI_LOGE("failed to `%{public}s`,remote service is died!", __func__); @@ -598,6 +510,8 @@ ErrCode WifiDeviceProxy::GetDeviceConfigs(std::vector &result) return WIFI_OPT_FAILED; } data.WriteInt32(0); + /* true-candidate config, false-normal config */ + data.WriteBool(isCandidate); int error = Remote()->SendRequest(WIFI_SVR_CMD_GET_DEVICE_CONFIGS, data, reply, option); if (error != ERR_NONE) { WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", WIFI_SVR_CMD_GET_DEVICE_CONFIGS, error); @@ -669,7 +583,7 @@ ErrCode WifiDeviceProxy::DisableDeviceConfig(int networkId) return ErrCode(reply.ReadInt32()); } -ErrCode WifiDeviceProxy::ConnectToNetwork(int networkId) +ErrCode WifiDeviceProxy::ConnectToNetwork(int networkId, bool isCandidate) { if (mRemoteDied) { WIFI_LOGE("failed to `%{public}s`,remote service is died!", __func__); @@ -682,6 +596,8 @@ ErrCode WifiDeviceProxy::ConnectToNetwork(int networkId) return WIFI_OPT_FAILED; } data.WriteInt32(0); + /* true-candidate config, false-normal config */ + data.WriteBool(isCandidate); data.WriteInt32(networkId); int error = Remote()->SendRequest(WIFI_SVR_CMD_CONNECT_TO, data, reply, option); if (error != ERR_NONE) { diff --git a/wifi/frameworks/native/src/wifi_device_proxy.h b/wifi/frameworks/native/src/wifi_device_proxy.h index 98dc27c..cfb630d 100644 --- a/wifi/frameworks/native/src/wifi_device_proxy.h +++ b/wifi/frameworks/native/src/wifi_device_proxy.h @@ -89,15 +89,6 @@ public: */ ErrCode RemoveCandidateConfig(const WifiDeviceConfig &config) override; - /** - * @Description Adds a specified untrusted hotspot configuration. - * - * @param config - WifiDeviceConfig object - * @param networkId - the device configuration's network id - * @return ErrCode - operation result - */ - ErrCode AddCandidateConfig(const WifiDeviceConfig &config, int &networkId) override; - /** * @Description Remove the wifi Untrusted device config equals to input network id * @@ -106,30 +97,15 @@ public: */ ErrCode RemoveCandidateConfig(int networkId) override; - /** - * @Description Connect to a untrusted specified network. - * - * @param networkId - the untrusted device network id - * @return ErrCode - operation result - */ - ErrCode ConnectToCandidateConfig(int networkId) override; - - /** - * @Description Get all candidate device configs - * - * @param result - Get result vector of WifiDeviceConfig - * @return ErrCode - operation result - */ - ErrCode GetCandidateConfigs(std::vector &result) override; - /** * @Description Add a wifi device configuration. * * @param config - WifiDeviceConfig object * @param result - the device configuration's network id + * @param isCandidate - Whether is candidate * @return ErrCode - operation result */ - ErrCode AddDeviceConfig(const WifiDeviceConfig &config, int &result) override; + ErrCode AddDeviceConfig(const WifiDeviceConfig &config, int &result, bool isCandidate) override; /** * @Description Update a wifi device configuration. @@ -159,9 +135,10 @@ public: * @Description Get all the device configs * * @param result - Get result vector of WifiDeviceConfig + * @param isCandidate - Whether is candidate * @return ErrCode - operation result */ - ErrCode GetDeviceConfigs(std::vector &result) override; + ErrCode GetDeviceConfigs(std::vector &result, bool isCandidate) override; /** * @Description Enable device config, when set attemptEnable, disable other device config @@ -184,9 +161,10 @@ public: * @Description Connecting to a Specified Network * * @param networkId - network id + * @param isCandidate - Whether is candidate * @return ErrCode - operation result */ - ErrCode ConnectToNetwork(int networkId) override; + ErrCode ConnectToNetwork(int networkId, bool isCandidate) override; /** * @Description Connect To a network base WifiDeviceConfig object diff --git a/wifi/frameworks/native/src/wifi_device_proxy_lite.cpp b/wifi/frameworks/native/src/wifi_device_proxy_lite.cpp index 746f489..d0b9cc5 100644 --- a/wifi/frameworks/native/src/wifi_device_proxy_lite.cpp +++ b/wifi/frameworks/native/src/wifi_device_proxy_lite.cpp @@ -434,31 +434,12 @@ ErrCode WifiDeviceProxy::PutWifiProtectRef(const std::string &protectName) return ErrCode(owner.retCode); } -ErrCode WifiDeviceProxy::AddCandidateConfig(const WifiDeviceConfig &config, int &networkId) -{ - (void)config; - (void)networkId; - return WIFI_OPT_NOT_SUPPORTED; -} - ErrCode WifiDeviceProxy::RemoveCandidateConfig(int networkId) { (void)networkId; return WIFI_OPT_NOT_SUPPORTED; } -ErrCode WifiDeviceProxy::ConnectToCandidateConfig(int networkId) -{ - (void)networkId; - return WIFI_OPT_NOT_SUPPORTED; -} - -ErrCode WifiDeviceProxy::GetCandidateConfigs(std::vector &result) -{ - (void)result; - return WIFI_OPT_NOT_SUPPORTED; -} - void WifiDeviceProxy::WriteIpAddress(IpcIo &req, const WifiIpAddress &address) { (void)WriteInt32(&req, address.family); @@ -511,7 +492,7 @@ void WifiDeviceProxy::WriteDeviceConfig(const WifiDeviceConfig &config, IpcIo &r (void)WriteInt32(&req, (int)config.wifiPrivacySetting); } -ErrCode WifiDeviceProxy::AddDeviceConfig(const WifiDeviceConfig &config, int &result) +ErrCode WifiDeviceProxy::AddDeviceConfig(const WifiDeviceConfig &config, int &result, bool isCandidate) { if (remoteDied_ || remote_ == nullptr) { WIFI_LOGE("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", @@ -525,6 +506,7 @@ ErrCode WifiDeviceProxy::AddDeviceConfig(const WifiDeviceConfig &config, int &re IpcIoInit(&req, data, IPC_DATA_SIZE_BIG, MAX_IPC_OBJ_COUNT); (void)WriteInt32(&req, 0); + (void)WriteBool(&req, isCandidate); WriteDeviceConfig(config, req); owner.variable = &result; owner.funcId = WIFI_SVR_CMD_ADD_DEVICE_CONFIG; @@ -624,7 +606,7 @@ ErrCode WifiDeviceProxy::RemoveAllDevice() return ErrCode(owner.retCode); } -ErrCode WifiDeviceProxy::GetDeviceConfigs(std::vector &result) +ErrCode WifiDeviceProxy::GetDeviceConfigs(std::vector &result, bool isCandidate) { if (remoteDied_ || remote_ == nullptr) { WIFI_LOGE("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", @@ -638,6 +620,7 @@ ErrCode WifiDeviceProxy::GetDeviceConfigs(std::vector &result) IpcIoInit(&req, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); (void)WriteInt32(&req, 0); + (void)WriteBool(&req, isCandidate); owner.variable = &result; owner.funcId = WIFI_SVR_CMD_GET_DEVICE_CONFIGS; int error = remote_->Invoke(remote_, WIFI_SVR_CMD_GET_DEVICE_CONFIGS, &req, &owner, IpcCallback); @@ -710,7 +693,7 @@ ErrCode WifiDeviceProxy::DisableDeviceConfig(int networkId) return ErrCode(owner.retCode); } -ErrCode WifiDeviceProxy::ConnectToNetwork(int networkId) +ErrCode WifiDeviceProxy::ConnectToNetwork(int networkId, bool isCandidate) { if (remoteDied_ || remote_ == nullptr) { WIFI_LOGE("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", @@ -724,6 +707,7 @@ ErrCode WifiDeviceProxy::ConnectToNetwork(int networkId) IpcIoInit(&req, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); (void)WriteInt32(&req, 0); + (void)WriteBool(&req, isCandidate); (void)WriteInt32(&req, networkId); owner.funcId = WIFI_SVR_CMD_CONNECT_TO; int error = remote_->Invoke(remote_, WIFI_SVR_CMD_CONNECT_TO, &req, &owner, IpcCallback); diff --git a/wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.h b/wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.h index a119643..f152e78 100644 --- a/wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.h +++ b/wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.h @@ -942,7 +942,7 @@ public: /** * @Description Get the Score Policy Candidate Score * - * @return int - priority + * @return int - score */ int GetScoretacticsNormalScore(); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp index f1e81d1..f84d35d 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp @@ -126,8 +126,12 @@ void WifiDeviceServiceImpl::OnStart() if (eventSubscriber_ == nullptr) { lpTimer_ = std::make_unique("WifiDeviceServiceImpl"); TimeOutCallback timeoutCallback = std::bind(&WifiDeviceServiceImpl::RegisterAppRemoved, this); - lpTimer_->Setup(); - lpTimer_->Register(timeoutCallback, TIMEOUT_APP_EVENT, true); + if (lpTimer_ != nullptr) { + lpTimer_->Setup(); + lpTimer_->Register(timeoutCallback, TIMEOUT_APP_EVENT, true); + } else { + WIFI_LOGE("lpTimer_ is nullptr!"); + } } if (screenEventSubscriber_ == nullptr) { @@ -425,65 +429,6 @@ ErrCode WifiDeviceServiceImpl::CheckCallingUid(int &uid) #endif } -ErrCode WifiDeviceServiceImpl::AddCandidateConfig(const WifiDeviceConfig &config, int &networkId) -{ - if (WifiPermissionUtils::VerifySetWifiInfoPermission() == PERMISSION_DENIED) { - WIFI_LOGE("AddCandidateConfig:VerifySetWifiInfoPermission PERMISSION_DENIED!"); - return WIFI_OPT_PERMISSION_DENIED; - } - - if (!CheckConfigPwd(config)) { - WIFI_LOGE("CheckConfigPwd failed!"); - return WIFI_OPT_INVALID_PARAM; - } - - int uid = 0; - if (CheckCallingUid(uid) != WIFI_OPT_SUCCESS) { - WIFI_LOGE("CheckCallingUid failed!"); - return WIFI_OPT_INVALID_PARAM; - } - - if (!IsStaServiceRunning()) { - return WIFI_OPT_STA_NOT_OPENED; - } - - IStaService *pService = WifiServiceManager::GetInstance().GetStaServiceInst(); - if (pService == nullptr) { - return WIFI_OPT_STA_NOT_OPENED; - } - return pService->AddCandidateConfig(uid, config, networkId); -} - -ErrCode WifiDeviceServiceImpl::ConnectToCandidateConfig(int networkId) -{ - if (WifiPermissionUtils::VerifySetWifiInfoPermission() == PERMISSION_DENIED) { - WIFI_LOGE("ConnectToCandidateConfig:VerifySetWifiInfoPermission PERMISSION_DENIED!"); - return WIFI_OPT_PERMISSION_DENIED; - } - - if (networkId < 0) { - WIFI_LOGE("ConnectToCandidateConfig networkId invalid param!"); - return WIFI_OPT_INVALID_PARAM; - } - - if (!IsStaServiceRunning()) { - WIFI_LOGE("ConnectToCandidateConfig:IsStaServiceRunning not running!"); - return WIFI_OPT_STA_NOT_OPENED; - } - - int uid = 0; - if (CheckCallingUid(uid) != WIFI_OPT_SUCCESS) { - WIFI_LOGE("CheckCallingUid failed!"); - return WIFI_OPT_INVALID_PARAM; - } - - IStaService *pService = WifiServiceManager::GetInstance().GetStaServiceInst(); - if (pService == nullptr) { - return WIFI_OPT_STA_NOT_OPENED; - } - return pService->ConnectToCandidateConfig(uid, networkId); -} - ErrCode WifiDeviceServiceImpl::CheckRemoveCandidateConfig(void) { if (WifiPermissionUtils::VerifySetWifiInfoPermission() == PERMISSION_DENIED) { @@ -562,40 +507,18 @@ ErrCode WifiDeviceServiceImpl::RemoveCandidateConfig(int networkId) } } -ErrCode WifiDeviceServiceImpl::GetCandidateConfigs(std::vector &result) -{ - if (WifiPermissionUtils::VerifyGetWifiInfoInternalPermission() == PERMISSION_DENIED) { - WIFI_LOGE("GetCandidateConfigs:VerifyGetWifiInfoPermission() PERMISSION_DENIED!"); - - if (WifiPermissionUtils::VerifyGetWifiInfoPermission() == PERMISSION_DENIED) { - WIFI_LOGE("GetCandidateConfigs:VerifyGetWifiInfoPermission() PERMISSION_DENIED!"); - return WIFI_OPT_PERMISSION_DENIED; - } - - if (WifiPermissionUtils::VerifyGetScanInfosPermission() == PERMISSION_DENIED) { - WIFI_LOGE("GetCandidateConfigs:VerifyGetWifiInfoPermission() PERMISSION_DENIED!"); - return WIFI_OPT_PERMISSION_DENIED; - } - } - int uid = 0; - if (CheckCallingUid(uid) != WIFI_OPT_SUCCESS) { - WIFI_LOGE("CheckCallingUid failed!"); - return WIFI_OPT_INVALID_PARAM; - } - WifiConfigCenter::GetInstance().GetCandidateConfigs(uid, result); - return WIFI_OPT_SUCCESS; -} - -ErrCode WifiDeviceServiceImpl::AddDeviceConfig(const WifiDeviceConfig &config, int &result) +ErrCode WifiDeviceServiceImpl::AddDeviceConfig(const WifiDeviceConfig &config, int &result, bool isCandidate) { if (WifiPermissionUtils::VerifySetWifiInfoPermission() == PERMISSION_DENIED) { WIFI_LOGE("AddDeviceConfig:VerifySetWifiInfoPermission PERMISSION_DENIED!"); return WIFI_OPT_PERMISSION_DENIED; } - if (WifiPermissionUtils::VerifySetWifiConfigPermission() == PERMISSION_DENIED) { - WIFI_LOGE("AddDeviceConfig:VerifySetWifiConfigPermission PERMISSION_DENIED!"); - return WIFI_OPT_PERMISSION_DENIED; + if (!isCandidate) { + if (WifiPermissionUtils::VerifySetWifiConfigPermission() == PERMISSION_DENIED) { + WIFI_LOGE("AddDeviceConfig:VerifySetWifiConfigPermission PERMISSION_DENIED!"); + return WIFI_OPT_PERMISSION_DENIED; + } } if (!CheckConfigPwd(config)) { @@ -611,6 +534,16 @@ ErrCode WifiDeviceServiceImpl::AddDeviceConfig(const WifiDeviceConfig &config, i if (pService == nullptr) { return WIFI_OPT_STA_NOT_OPENED; } + + if (isCandidate) { + int uid = 0; + if (CheckCallingUid(uid) != WIFI_OPT_SUCCESS) { + WIFI_LOGE("CheckCallingUid failed!"); + return WIFI_OPT_INVALID_PARAM; + } + return pService->AddCandidateConfig(uid, config, result); + } + int retNetworkId = pService->AddDeviceConfig(config); if (retNetworkId < 0) { return WIFI_OPT_FAILED; @@ -698,7 +631,7 @@ ErrCode WifiDeviceServiceImpl::RemoveAllDevice() return pService->RemoveAllDevice(); } -ErrCode WifiDeviceServiceImpl::GetDeviceConfigs(std::vector &result) +ErrCode WifiDeviceServiceImpl::GetDeviceConfigs(std::vector &result, bool isCandidate) { if (WifiPermissionUtils::VerifyGetWifiInfoInternalPermission() == PERMISSION_DENIED) { WIFI_LOGE("GetDeviceConfigs:VerifyGetWifiInfoPermission() PERMISSION_DENIED!"); @@ -713,13 +646,24 @@ ErrCode WifiDeviceServiceImpl::GetDeviceConfigs(std::vector &r return WIFI_OPT_PERMISSION_DENIED; } - if (WifiPermissionUtils::VerifyGetWifiConfigPermission() == PERMISSION_DENIED) { - WIFI_LOGE("GetDeviceConfigs:VerifyGetWifiInfoPermission() PERMISSION_DENIED!"); - return WIFI_OPT_PERMISSION_DENIED; + if (!isCandidate) { + if (WifiPermissionUtils::VerifyGetWifiConfigPermission() == PERMISSION_DENIED) { + WIFI_LOGE("GetDeviceConfigs:VerifyGetWifiInfoPermission() PERMISSION_DENIED!"); + return WIFI_OPT_PERMISSION_DENIED; + } } } - WifiConfigCenter::GetInstance().GetDeviceConfig(result); + if (isCandidate) { + int uid = 0; + if (CheckCallingUid(uid) != WIFI_OPT_SUCCESS) { + WIFI_LOGE("CheckCallingUid failed!"); + return WIFI_OPT_INVALID_PARAM; + } + WifiConfigCenter::GetInstance().GetCandidateConfigs(uid, result); + } else { + WifiConfigCenter::GetInstance().GetDeviceConfig(result); + } return WIFI_OPT_SUCCESS; } @@ -772,11 +716,18 @@ ErrCode WifiDeviceServiceImpl::DisableDeviceConfig(int networkId) return pService->DisableDeviceConfig(networkId); } -ErrCode WifiDeviceServiceImpl::ConnectToNetwork(int networkId) +ErrCode WifiDeviceServiceImpl::ConnectToNetwork(int networkId, bool isCandidate) { - if (WifiPermissionUtils::VerifyWifiConnectionPermission() == PERMISSION_DENIED) { - WIFI_LOGE("ConnectToNetwork:VerifyWifiConnectionPermission PERMISSION_DENIED!"); - return WIFI_OPT_PERMISSION_DENIED; + if (isCandidate) { + if (WifiPermissionUtils::VerifySetWifiInfoPermission() == PERMISSION_DENIED) { + WIFI_LOGE("ConnectToCandidateConfig:VerifySetWifiInfoPermission PERMISSION_DENIED!"); + return WIFI_OPT_PERMISSION_DENIED; + } + } else { + if (WifiPermissionUtils::VerifyWifiConnectionPermission() == PERMISSION_DENIED) { + WIFI_LOGE("ConnectToNetwork:VerifyWifiConnectionPermission PERMISSION_DENIED!"); + return WIFI_OPT_PERMISSION_DENIED; + } } if (!IsStaServiceRunning()) { @@ -791,6 +742,15 @@ ErrCode WifiDeviceServiceImpl::ConnectToNetwork(int networkId) if (pService == nullptr) { return WIFI_OPT_STA_NOT_OPENED; } + + if (isCandidate) { + int uid = 0; + if (CheckCallingUid(uid) != WIFI_OPT_SUCCESS) { + WIFI_LOGE("CheckCallingUid failed!"); + return WIFI_OPT_INVALID_PARAM; + } + return pService->ConnectToCandidateConfig(uid, networkId); + } return pService->ConnectToNetwork(networkId); } @@ -1307,8 +1267,10 @@ void AppEventSubscriber::OnReceiveEvent(const OHOS::EventFwk::CommonEventData &d if (action == OHOS::EventFwk::CommonEventSupport::COMMON_EVENT_PACKAGE_REMOVED) { auto wantTemp = data.GetWant(); auto uid = wantTemp.GetIntParam(AppExecFwk::Constants::UID, -1); + WIFI_LOGI("Package removed of uid %{public}d.", uid); IStaService *pService = WifiServiceManager::GetInstance().GetStaServiceInst(); if (pService == nullptr) { + WIFI_LOGI("Sta service not opend!"); std::vector tempConfigs; WifiSettings::GetInstance().GetAllCandidateConfig(uid, tempConfigs); for (const auto &config : tempConfigs) { diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h index 0b3473b..55fc00d 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h @@ -97,7 +97,7 @@ public: ErrCode PutWifiProtectRef(const std::string &protectName) override; - ErrCode AddDeviceConfig(const WifiDeviceConfig &config, int &result) override; + ErrCode AddDeviceConfig(const WifiDeviceConfig &config, int &result, bool isCandidate) override; ErrCode UpdateDeviceConfig(const WifiDeviceConfig &config, int &result) override; @@ -105,13 +105,13 @@ public: ErrCode RemoveAllDevice() override; - ErrCode GetDeviceConfigs(std::vector &result) override; + ErrCode GetDeviceConfigs(std::vector &result, bool isCandidate) override; ErrCode EnableDeviceConfig(int networkId, bool attemptEnable) override; ErrCode DisableDeviceConfig(int networkId) override; - ErrCode ConnectToNetwork(int networkId) override; + ErrCode ConnectToNetwork(int networkId, bool isCandidate) override; ErrCode ConnectToDevice(const WifiDeviceConfig &config) override; @@ -153,16 +153,10 @@ public: bool SetLowLatencyMode(bool enabled) override; - ErrCode AddCandidateConfig(const WifiDeviceConfig &config, int &networkId) override; - - ErrCode ConnectToCandidateConfig(int networkId) override; - ErrCode RemoveCandidateConfig(int networkId) override; ErrCode RemoveCandidateConfig(const WifiDeviceConfig &config) override; - ErrCode GetCandidateConfigs(std::vector &result) override; - #ifndef OHOS_ARCH_LITE int32_t Dump(int32_t fd, const std::vector& args) override; #endif diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp index a2e0e7d..6f202e0 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp @@ -66,10 +66,7 @@ void WifiDeviceStub::InitHandleMap() handleFuncMap[WIFI_SVR_CMD_GET_DERVICE_MAC_ADD] = &WifiDeviceStub::OnGetDeviceMacAdd; handleFuncMap[WIFI_SVR_CMD_IS_WIFI_CONNECTED] = &WifiDeviceStub::OnIsWifiConnected; handleFuncMap[WIFI_SVR_CMD_SET_LOW_LATENCY_MODE] = &WifiDeviceStub::OnSetLowLatencyMode; - handleFuncMap[WIFI_SVR_CMD_ADD_CANDIDATE_DEVICE_CONFIG] = &WifiDeviceStub::OnAddCandidateConfig; - handleFuncMap[WIFI_SVR_CMD_CONNECT_TO_CANDIDATE_CONFIG] = &WifiDeviceStub::OnConnectToCandidateConfig; handleFuncMap[WIFI_SVR_CMD_REMOVE_CANDIDATE_CONFIG] = &WifiDeviceStub::OnRemoveCandidateConfig; - handleFuncMap[WIFI_SVR_CMD_GET_CANDIDATE_CONFIGS] = &WifiDeviceStub::OnGetCandidateConfigs; return; } @@ -151,11 +148,12 @@ void WifiDeviceStub::OnPutWifiProtectRef(uint32_t code, MessageParcel &data, Mes void WifiDeviceStub::OnAddDeviceConfig(uint32_t code, MessageParcel &data, MessageParcel &reply) { WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); + bool isCandidate = data.ReadBool(); WifiDeviceConfig config; ReadWifiDeviceConfig(data, config); int result = INVALID_NETWORK_ID; - ErrCode ret = AddDeviceConfig(config, result); + ErrCode ret = AddDeviceConfig(config, result, isCandidate); reply.WriteInt32(0); reply.WriteInt32(ret); @@ -323,8 +321,9 @@ void WifiDeviceStub::OnRemoveAllDevice(uint32_t code, MessageParcel &data, Messa void WifiDeviceStub::OnGetDeviceConfigs(uint32_t code, MessageParcel &data, MessageParcel &reply) { WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); + bool isCandidate = data.ReadBool(); std::vector result; - ErrCode ret = GetDeviceConfigs(result); + ErrCode ret = GetDeviceConfigs(result, isCandidate); reply.WriteInt32(0); reply.WriteInt32(ret); @@ -364,8 +363,9 @@ void WifiDeviceStub::OnDisableDeviceConfig(uint32_t code, MessageParcel &data, M void WifiDeviceStub::OnConnectTo(uint32_t code, MessageParcel &data, MessageParcel &reply) { WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); + bool isCandidate = data.ReadBool(); int networkId = data.ReadInt32(); - ErrCode ret = ConnectToNetwork(networkId); + ErrCode ret = ConnectToNetwork(networkId, isCandidate); reply.WriteInt32(0); reply.WriteInt32(ret); @@ -642,34 +642,6 @@ void WifiDeviceStub::OnSetLowLatencyMode(uint32_t code, MessageParcel &data, Mes reply.WriteBool(SetLowLatencyMode(enabled)); } -void WifiDeviceStub::OnAddCandidateConfig(uint32_t code, MessageParcel &data, MessageParcel &reply) -{ - WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); - WifiDeviceConfig config; - ReadWifiDeviceConfig(data, config); - - int networkId = INVALID_NETWORK_ID; - ErrCode ret = AddCandidateConfig(config, networkId); - - reply.WriteInt32(0); - reply.WriteInt32(ret); - if (ret == WIFI_OPT_SUCCESS) { - reply.WriteInt32(networkId); - } - return; -} - -void WifiDeviceStub::OnConnectToCandidateConfig(uint32_t code, MessageParcel &data, MessageParcel &reply) -{ - WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); - int networkId = data.ReadInt32(); - ErrCode ret = ConnectToCandidateConfig(networkId); - - reply.WriteInt32(0); - reply.WriteInt32(ret); - return; -} - void WifiDeviceStub::OnRemoveCandidateConfig(uint32_t code, MessageParcel &data, MessageParcel &reply) { WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); @@ -690,23 +662,5 @@ void WifiDeviceStub::OnRemoveCandidateConfig(uint32_t code, MessageParcel &data, reply.WriteInt32(ret); return; } - -void WifiDeviceStub::OnGetCandidateConfigs(uint32_t code, MessageParcel &data, MessageParcel &reply) -{ - WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); - std::vector result; - ErrCode ret = GetCandidateConfigs(result); - reply.WriteInt32(0); - reply.WriteInt32(ret); - - if (ret == WIFI_OPT_SUCCESS) { - unsigned int size = result.size(); - reply.WriteInt32(size); - for (unsigned int i = 0; i < size; ++i) { - WriteWifiDeviceConfig(reply, result[i]); - } - } - return; -} } // namespace Wifi } // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.h index b8dc94f..9b0e2bf 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.h @@ -67,10 +67,7 @@ private: void OnGetDeviceMacAdd(uint32_t code, MessageParcel &data, MessageParcel &reply); void OnIsWifiConnected(uint32_t code, MessageParcel &data, MessageParcel &reply); void OnSetLowLatencyMode(uint32_t code, MessageParcel &data, MessageParcel &reply); - void OnAddCandidateConfig(uint32_t code, MessageParcel &data, MessageParcel &reply); - void OnConnectToCandidateConfig(uint32_t code, MessageParcel &data, MessageParcel &reply); void OnRemoveCandidateConfig(uint32_t code, MessageParcel &data, MessageParcel &reply); - void OnGetCandidateConfigs(uint32_t code, MessageParcel &data, MessageParcel &reply); private: void ReadWifiDeviceConfig(MessageParcel &data, WifiDeviceConfig &config); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub_lite.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub_lite.cpp index 236aae2..3837fc2 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub_lite.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub_lite.cpp @@ -203,11 +203,13 @@ void WifiDeviceStub::OnPutWifiProtectRef(uint32_t code, IpcIo *req, IpcIo *reply void WifiDeviceStub::OnAddDeviceConfig(uint32_t code, IpcIo *req, IpcIo *reply) { WIFI_LOGD("run %{public}s code %{public}u", __func__, code); + bool isCandidate = false; WifiDeviceConfig config; + (void)ReadBool(req, &isCandidate); ReadWifiDeviceConfig(req, config); int result = INVALID_NETWORK_ID; - ErrCode ret = AddDeviceConfig(config, result); + ErrCode ret = AddDeviceConfig(config, result, isCandidate); (void)WriteInt32(reply, 0); (void)WriteInt32(reply, ret); @@ -251,8 +253,10 @@ void WifiDeviceStub::OnRemoveAllDevice(uint32_t code, IpcIo *req, IpcIo *reply) void WifiDeviceStub::OnGetDeviceConfigs(uint32_t code, IpcIo *req, IpcIo *reply) { WIFI_LOGD("run %{public}s code %{public}u", __func__, code); + bool isCandidate = false; std::vector result; - ErrCode ret = GetDeviceConfigs(result); + (void)ReadBool(req, &isCandidate); + ErrCode ret = GetDeviceConfigs(result, isCandidate); (void)WriteInt32(reply, 0); (void)WriteInt32(reply, ret); @@ -291,8 +295,10 @@ void WifiDeviceStub::OnConnectTo(uint32_t code, IpcIo *req, IpcIo *reply) { WIFI_LOGD("run %{public}s code %{public}u", __func__, code); int networkId = 0; + bool isCandidate = false; + (void)ReadBool(req, &isCandidate); (void)ReadInt32(req, &networkId); - ErrCode ret = ConnectToNetwork(networkId); + ErrCode ret = ConnectToNetwork(networkId, isCandidate); (void)WriteInt32(reply, 0); (void)WriteInt32(reply, ret); } diff --git a/wifi/test/fuzztest/wifi_sta/adddeviceconfig_fuzzer/adddeviceconfig_fuzzer.cpp b/wifi/test/fuzztest/wifi_sta/adddeviceconfig_fuzzer/adddeviceconfig_fuzzer.cpp index 9a2bd34..5ab9f08 100644 --- a/wifi/test/fuzztest/wifi_sta/adddeviceconfig_fuzzer/adddeviceconfig_fuzzer.cpp +++ b/wifi/test/fuzztest/wifi_sta/adddeviceconfig_fuzzer/adddeviceconfig_fuzzer.cpp @@ -27,11 +27,12 @@ namespace Wifi { WifiDeviceConfig config; int addResult; + bool isCandidate = false; config.ssid = std::string(reinterpret_cast(data), size); config.bssid = std::string(reinterpret_cast(data), size); config.preSharedKey = std::string(reinterpret_cast(data), size); config.keyMgmt = std::string(reinterpret_cast(data), size); - devicePtr->AddDeviceConfig(config, addResult); + devicePtr->AddDeviceConfig(config, addResult, isCandidate); return true; } } // namespace Wifi diff --git a/wifi/test/wifi_client/wifi_client.cpp b/wifi/test/wifi_client/wifi_client.cpp index c54557f..2edb2a0 100644 --- a/wifi/test/wifi_client/wifi_client.cpp +++ b/wifi/test/wifi_client/wifi_client.cpp @@ -376,7 +376,8 @@ static void HandleGetConfigList(int argc, const char* argv[]) Logd("enter command handler:%s", argv[CMD_IDX]); if (ptrWifiDevice != nullptr) { vector configs; - ErrCode ret = ptrWifiDevice->GetDeviceConfigs(configs); + bool isCandidate = false; + ErrCode ret = ptrWifiDevice->GetDeviceConfigs(configs, isCandidate); if (ret == WIFI_OPT_SUCCESS) { Logd("%s success", __func__); PrintfDeviceConfigs(configs); @@ -429,7 +430,8 @@ static void HandleAddConfig(int argc, const char* argv[]) } if (ptrWifiDevice != nullptr) { int nid; - ErrCode ret = ptrWifiDevice->AddDeviceConfig(config, nid); + bool isCandidate = false; + ErrCode ret = ptrWifiDevice->AddDeviceConfig(config, nid, isCandidate); if (ret == WIFI_OPT_SUCCESS) { Logd("%s success, nid=%d", __func__, nid); } else { @@ -476,7 +478,8 @@ static void HandleConnectNetwork(int argc, const char* argv[]) return; } if (ptrWifiDevice != nullptr) { - ErrCode ret = ptrWifiDevice->ConnectToNetwork(nid); + bool isCandidate = false; + ErrCode ret = ptrWifiDevice->ConnectToNetwork(nid, isCandidate); if (ret == WIFI_OPT_SUCCESS) { Logd("%s success, nid=%d", __func__, nid); } else { -- Gitee From 04a0755280af6dae8cd9ef1523bd80c66fd0a70c Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Thu, 11 Aug 2022 09:46:45 +0000 Subject: [PATCH 306/491] fix ap dll close issue Signed-off-by: zhangfeng Change-Id: I7c25df69370f2e3511a8d9f833c3bda3bee61e76 --- .../wifi_manage/wifi_service_manager.cpp | 41 ++++++++++++------- 1 file changed, 26 insertions(+), 15 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.cpp index 9e2f5b3..8dfb0eb 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.cpp @@ -248,25 +248,32 @@ IScanService *WifiServiceManager::GetScanServiceInst() #ifdef FEATURE_AP_SUPPORT IApService *WifiServiceManager::GetApServiceInst(int id) { - if (mApServiceHandle.handle == nullptr) { + auto findInstance = [this, id]() -> IApService* { + auto it = mApServiceHandle.pService.find(id); + return (it != mApServiceHandle.pService.end()) ? it->second : nullptr; + }; + + auto apInstance = findInstance(); + if (apInstance != nullptr) { + WIFI_LOGI("Ap service instance is exist %{public}d", id); + return apInstance; + } + WIFI_LOGI("[Get] create a new ap service instance: %{public}d", id); + std::string dlname; + if (GetServiceDll(WIFI_SERVICE_AP, dlname) < 0) { + WIFI_LOGE("Get ap dll name failed."); return nullptr; } - - IApService *service = nullptr; - auto iter = mApServiceHandle.pService.find(id); - if (iter != mApServiceHandle.pService.end()) { - service = iter->second; + bool bPreLoad = WifiSettings::GetInstance().IsModulePreLoad(WIFI_SERVICE_AP); + if (LoadApService(dlname, bPreLoad) != 0) { + WIFI_LOGE("Reload ap service instance %{public}d failed!", id); + return nullptr; } - - if (service == nullptr) { - service = mApServiceHandle.create(id); - auto ret = mApServiceHandle.pService.emplace(id, service); - if (!ret.second) { - mApServiceHandle.pService[id] = service; - } + auto reloadApInstance = findInstance(); + if (reloadApInstance == nullptr) { + WIFI_LOGE("Get ap service instance %{public}d error!", id); } - - return service; + return reloadApInstance; } #endif @@ -340,6 +347,10 @@ int WifiServiceManager::UnloadApService(bool bPreLoad, int id) mApServiceHandle.pService.erase(id); } } + if (!bPreLoad && mApServiceHandle.pService.empty()) { + dlclose(mApServiceHandle.handle); + mApServiceHandle.Clear(); + } return 0; } #endif -- Gitee From f45b8784ea9cab00e6212aadd9fb088669844051 Mon Sep 17 00:00:00 2001 From: lujunxin Date: Sat, 13 Aug 2022 09:16:35 +0000 Subject: [PATCH 307/491] cannot remove p2p interface when hid2d connect failed Signed-off-by: lujunxin --- .../idl_client/idl_interface/i_wifi.c | 19 ++++++++++++++ .../idl_interface/i_wifi_event_p2p_callback.h | 3 ++- .../idl_interface/i_wifi_p2p_iface.c | 3 ++- .../idl_client/wifi_idl_client.cpp | 1 + .../wifi_manage/idl_client/wifi_idl_define.h | 3 ++- .../idl_client/wifi_idl_inner_interface.cpp | 11 ++++++++ .../idl_client/wifi_idl_inner_interface.h | 3 ++- .../idl_client/wifi_p2p_event_callback.h | 3 ++- .../wifi_p2p/group_negotiation_state.cpp | 22 ++++++++++++++++ .../wifi_p2p/group_negotiation_state.h | 7 +++++ .../wifi_manage/wifi_p2p/p2p_define.h | 1 + .../wifi_p2p/p2p_group_operating_state.cpp | 6 +++++ .../wifi_manage/wifi_p2p/p2p_idle_state.cpp | 23 ++++++++++++++++ .../wifi_manage/wifi_p2p/p2p_idle_state.h | 7 +++++ .../wifi_manage/wifi_p2p/p2p_monitor.cpp | 18 +++++++++++++ .../wifi_manage/wifi_p2p/p2p_monitor.h | 18 ++++++++++++- .../wifi_p2p/p2p_state_machine.cpp | 6 ++++- .../wifi_manage/wifi_p2p/p2p_state_machine.h | 1 + .../wifi_hal/wifi_hal_callback.c | 22 ++++++++++++++++ .../wifi_hal/wifi_hal_callback.h | 10 ++++++- .../wifi_hal/wifi_hal_crpc_server.c | 2 ++ .../wifi_standard/wifi_hal/wifi_hal_define.h | 1 + .../wpa_supplicant_hal/wifi_wpa_hal.c | 26 +++++++++++++++++++ .../wpa_p2p_hal/wifi_p2p_hal.h | 3 ++- 24 files changed, 210 insertions(+), 9 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi.c b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi.c index bf08d02..d41cccf 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi.c +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi.c @@ -707,6 +707,22 @@ static void IdlCbP2pServDiscReqEvent(Context *context) return; } +static void IdlCbP2pIfaceCreatedEvent(Context *context) +{ + int id; + int isGo = 0; + char ifName[WIFI_INTERFACE_NAME_SIZE] = {0}; + if (ReadInt(context, &id) < 0 || ReadInt(context, &isGo) < 0 || + ReadStr(context, ifName, sizeof(ifName)) != 0) { + LOGE("Failed to read P2pIfaceCreatedEvent id:%{public}d", id); + return; + } + IWifiEventP2pCallback *callback = GetWifiP2pEventCallback(); + if (callback != NULL && callback->onP2pIfaceCreated != NULL) { + callback->onP2pIfaceCreated(ifName, isGo); + } +} + static int IdlDealP2pEventFirst(Context *context, int event) { switch (event) { @@ -782,6 +798,9 @@ static int IdlDealP2pEventSecond(Context *context, int event) case WIFI_IDL_CBK_CMD_P2P_SERV_DISC_REQ_EVENT: IdlCbP2pServDiscReqEvent(context); break; + case WIFI_IDL_CBK_CMD_P2P_IFACE_CREATED_EVENT: + IdlCbP2pIfaceCreatedEvent(context); + break; default: return -1; } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_event_p2p_callback.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_event_p2p_callback.h index 22580d3..3cd0478 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_event_p2p_callback.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_event_p2p_callback.h @@ -48,9 +48,10 @@ typedef struct IWifiEventP2pCallback { void (*onStaAuthorized)(const char *p2pDeviceAddress); void (*connectSupplicantFailed)(void); void (*onP2pServDiscReq)(const P2pServDiscReqInfo *info); + void (*onP2pIfaceCreated)(const char *ifName, int isGo); } IWifiEventP2pCallback; #ifdef __cplusplus } #endif -#endif \ No newline at end of file +#endif diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_p2p_iface.c b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_p2p_iface.c index 626b897..17ca764 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_p2p_iface.c +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_p2p_iface.c @@ -293,7 +293,8 @@ static int GetP2pCallbackEvents(int *events, int size) WIFI_IDL_CBK_CMD_AP_STA_DISCONNECTED_EVENT, WIFI_IDL_CBK_CMD_AP_STA_CONNECTED_EVENT, WIFI_IDL_CBK_CMD_SUP_CONN_FAILED_EVENT, - WIFI_IDL_CBK_CMD_P2P_SERV_DISC_REQ_EVENT + WIFI_IDL_CBK_CMD_P2P_SERV_DISC_REQ_EVENT, + WIFI_IDL_CBK_CMD_P2P_IFACE_CREATED_EVENT }; int max = sizeof(p2pEvents) / sizeof(p2pEvents[0]); int num = 0; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp index 5d2b4f5..cf64226 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp @@ -1183,6 +1183,7 @@ WifiErrorNo WifiIdlClient::ReqP2pRegisterCallback(const P2pHalCallback &callback cEventCallback.onStaAuthorized = OnP2pStaAuthorized; cEventCallback.connectSupplicantFailed = OnP2pConnectSupplicantFailed; cEventCallback.onP2pServDiscReq = OnP2pServDiscReq; + cEventCallback.onP2pIfaceCreated = OnP2pIfaceCreated; } return RegisterP2pEventCallback(cEventCallback); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_define.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_define.h index bba8361..8693398 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_define.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_define.h @@ -63,6 +63,7 @@ typedef enum WifiIdlEvent { WIFI_IDL_CBK_CMD_AP_STA_DISCONNECTED_EVENT, /* STA Disconnected from AP */ WIFI_IDL_CBK_CMD_AP_STA_CONNECTED_EVENT, /* STA and AP connected event */ WIFI_IDL_CBK_CMD_P2P_SERV_DISC_REQ_EVENT, /* Service discovery request event */ + WIFI_IDL_CBK_CMD_P2P_IFACE_CREATED_EVENT, /* P2P interface created event */ } WifiIdlEvent; #define WIFI_IDL_FALSE 0 @@ -90,4 +91,4 @@ typedef enum WifiIdlEvent { #define WIFI_IDL_P2P_TMP_BUFFER_SIZE_128 128 #define WIFI_IDL_P2P_SERVICE_TYPE_MIN_SIZE 3 #define WIFI_IDL_P2P_SERVICE_TYPE_2_POS 2 -#endif \ No newline at end of file +#endif diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.cpp index d728349..48ab46f 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.cpp @@ -421,3 +421,14 @@ void OnP2pServDiscReq(const P2pServDiscReqInfo *info) cbk.onP2pServDiscReq(cbInfo); } } + +void OnP2pIfaceCreated(const char *ifName, int isGo) +{ + if (ifName == nullptr) { + return; + } + const OHOS::Wifi::P2pHalCallback &cbk = OHOS::Wifi::WifiP2PHalInterface::GetInstance().GetP2pCallbackInst(); + if (cbk.onP2pIfaceCreated) { + cbk.onP2pIfaceCreated(ifName, isGo); + } +} diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.h index e319e29..4a9d9c7 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.h @@ -96,7 +96,8 @@ void OnP2pStaDeauthorized(const char *p2pDeviceAddress); void OnP2pStaAuthorized(const char *p2pDeviceAddress); void OnP2pConnectSupplicantFailed(void); void OnP2pServDiscReq(const P2pServDiscReqInfo *info); +void OnP2pIfaceCreated(const char *ifName, int isGo); #ifdef __cplusplus } #endif -#endif \ No newline at end of file +#endif diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_p2p_event_callback.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_p2p_event_callback.h index 4893f59..2229fac 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_p2p_event_callback.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_p2p_event_callback.h @@ -46,8 +46,9 @@ struct P2pHalCallback { std::function onStaAuthorized; std::function connectSupplicantFailed; std::function onP2pServDiscReq; + std::function onP2pIfaceCreated; }; } // namespace Wifi } // namespace OHOS -#endif \ No newline at end of file +#endif diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.cpp index 684eb22..d14f965 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.cpp @@ -53,6 +53,8 @@ void GroupNegotiationState::Init() P2P_STATE_MACHINE_CMD::P2P_EVENT_INVITATION_RESULT, &GroupNegotiationState::ProcessInvitationResultEvt)); mProcessFunMap.insert( std::make_pair(P2P_STATE_MACHINE_CMD::P2P_EVENT_GROUP_REMOVED, &GroupNegotiationState::ProcessGroupRemovedEvt)); + mProcessFunMap.insert( + std::make_pair(P2P_STATE_MACHINE_CMD::CMD_REMOVE_GROUP, &GroupNegotiationState::ProcessCmdRemoveGroup)); } bool GroupNegotiationState::ProcessNegotSucessEvt(InternalMessage &msg) const @@ -188,6 +190,26 @@ bool GroupNegotiationState::ProcessGroupRemovedEvt(InternalMessage &msg) const return EXECUTED; } +bool GroupNegotiationState::ProcessCmdRemoveGroup(InternalMessage &msg) const +{ + std::string ifName = p2pStateMachine.p2pDevIface; + if (ifName.empty()) { + WIFI_LOGE("invalid ifname on ProcessCmdRemoveGroup"); + return EXECUTED; + } + p2pStateMachine.p2pDevIface = ""; + WifiErrorNo ret = WifiP2PHalInterface::GetInstance().GroupRemove(ifName); + if (ret) { + WIFI_LOGE("P2P group (%{public}s) removal failed.", ifName.c_str()); + p2pStateMachine.BroadcastActionResult(P2pActionCallback::RemoveGroup, WIFI_OPT_FAILED); + } else { + WIFI_LOGI("The P2P group (%{public}s) is successfully removed.", ifName.c_str()); + p2pStateMachine.BroadcastActionResult(P2pActionCallback::RemoveGroup, WIFI_OPT_SUCCESS); + } + p2pStateMachine.SwitchState(&p2pStateMachine.p2pIdleState); + return EXECUTED; +} + bool GroupNegotiationState::ExecuteStateMsg(InternalMessage *msg) { if (msg == nullptr) { diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.h index 655d713..f90326a 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.h @@ -114,6 +114,13 @@ private: */ virtual bool ProcessGroupRemovedEvt(InternalMessage &msg) const; + /** + * @Description Process remvoe group message received by the state machine + * @param msg - Message body sent by the state machine + * @return - bool true:handle false:not handle + */ + virtual bool ProcessCmdRemoveGroup(InternalMessage &msg) const; + /** * @Description Initialization * @param None diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_define.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_define.h index 64dd318..cbce583 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_define.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_define.h @@ -139,6 +139,7 @@ enum class P2P_STATE_MACHINE_CMD { P2P_EVENT_PROV_DISC_FAILURE, AP_STA_DISCONNECTED, AP_STA_CONNECTED, + P2P_EVENT_IFACE_CREATED, /* if the requests to WPA is not synchronization need protected by a timeout mechanism */ ENABLE_P2P_TIMED_OUT = 200, diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.cpp index 3cb8e10..4494994 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.cpp @@ -192,6 +192,9 @@ bool P2pGroupOperatingState::ProcessGroupRemovedEvt(const InternalMessage &msg) groupManager.SetCurrentGroup(copy); groupManager.StashGroups(); } + if (groupManager.GetCurrentGroup().GetInterface() == p2pStateMachine.p2pDevIface) { + p2pStateMachine.p2pDevIface = ""; + } p2pStateMachine.ChangeConnectedStatus(P2pConnectedState::P2P_DISCONNECTED); IpPool::ReleaseIpPool(); IfConfig::GetInstance().FlushIpAddr(groupManager.GetCurrentGroup().GetInterface(), IpType::IPTYPE_IPV4); @@ -248,6 +251,9 @@ bool P2pGroupOperatingState::ProcessCmdRemoveGroup(const InternalMessage &msg) c * Only started groups can be removed. */ WIFI_LOGI("now remove : %{private}s.", group.GetInterface().c_str()); + if (p2pStateMachine.p2pDevIface == group.GetInterface()) { + p2pStateMachine.p2pDevIface = ""; + } ret = WifiP2PHalInterface::GetInstance().GroupRemove(group.GetInterface()); if (ret) { WIFI_LOGE("P2P group removal failed."); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.cpp index ab68904..dd1ec3d 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.cpp @@ -69,6 +69,8 @@ void P2pIdleState::Init() &P2pIdleState::ProcessCmdHid2dCreateGroup)); mProcessFunMap.insert( std::make_pair(P2P_STATE_MACHINE_CMD::CMD_HID2D_CONNECT, &P2pIdleState::ProcessCmdHid2dConnect)); + mProcessFunMap.insert( + std::make_pair(P2P_STATE_MACHINE_CMD::P2P_EVENT_IFACE_CREATED, &P2pIdleState::ProcessP2pIfaceCreatedEvt)); } bool P2pIdleState::ProcessCmdStopDiscPeer(InternalMessage &msg) const @@ -145,6 +147,10 @@ bool P2pIdleState::ProcessCmdHid2dConnect(InternalMessage &msg) const WIFI_LOGE("Hid2d connect:Failed to obtain config info."); return EXECUTED; } + + if (!p2pStateMachine.p2pDevIface.empty()) { + WIFI_LOGE("Hid2d connect:exists dev iface %{public}s", p2pStateMachine.p2pDevIface.c_str()); + } if (WifiErrorNo::WIFI_IDL_OPT_OK != WifiP2PHalInterface::GetInstance().Hid2dConnect(config)) { WIFI_LOGE("Hid2d Connection failed."); @@ -340,6 +346,23 @@ bool P2pIdleState::ProcessCmdHid2dCreateGroup(InternalMessage &msg) const return EXECUTED; } +bool P2pIdleState::ProcessP2pIfaceCreatedEvt(InternalMessage &msg) const +{ + if (msg.GetParam1() != 0) { + WIFI_LOGE("p2p interface created event receive: type error."); + return EXECUTED; + } + + std::string ifName; + if (!msg.GetMessageObj(ifName)) { + WIFI_LOGE("p2p interface created event receive: Parameter error."); + return EXECUTED; + } + p2pStateMachine.p2pDevIface = ifName; + p2pStateMachine.SwitchState(&p2pStateMachine.p2pGroupNegotiationState); + return EXECUTED; +} + bool P2pIdleState::ExecuteStateMsg(InternalMessage *msg) { if (msg == nullptr) { diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.h index 4edde5c..eda046f 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.h @@ -162,6 +162,13 @@ private: */ virtual bool ProcessCmdHid2dConnect(InternalMessage &msg) const; + /** + * @Description Process p2p interface created event received by the state machine + * @param msg - Message body sent by the state machine + * @param @return - bool true:handle false:not handle + */ + virtual bool ProcessP2pIfaceCreatedEvt(InternalMessage &msg) const; + private: using ProcessFun = bool (P2pIdleState::*)(InternalMessage &msg) const; std::map mProcessFunMap; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_monitor.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_monitor.cpp index 0399bcd..c4c48e2 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_monitor.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_monitor.cpp @@ -65,6 +65,7 @@ void P2pMonitor::MonitorBegins(const std::string &iface) std::bind(&P2pMonitor::WpaEventApStaConnected, this, _1), std::bind(&P2pMonitor::OnConnectSupplicantFailed, this), std::bind(&P2pMonitor::WpaEventServDiscReq, this, _1), + std::bind(&P2pMonitor::WpaEventP2pIfaceCreated, this, _1, _2), }; WifiP2PHalInterface::GetInstance().RegisterP2pCallback(callback); @@ -286,6 +287,12 @@ void P2pMonitor::Broadcast2SmConnectSupplicantFailed(const std::string &iface) c MessageToStateMachine(iface, P2P_STATE_MACHINE_CMD::WPA_CONN_FAILED_EVENT, 0, 0, anyNone); } +void P2pMonitor::Broadcast2SmP2pIfaceCreated(const std::string &iface, int type, const std::string &event) const +{ + std::any anyEvent = event; + MessageToStateMachine(iface, P2P_STATE_MACHINE_CMD::P2P_EVENT_IFACE_CREATED, type, 0, anyEvent); +} + void P2pMonitor::OnConnectSupplicant(int status) const { WIFI_LOGD("OnConnectSupplicant callback"); @@ -584,5 +591,16 @@ void P2pMonitor::OnConnectSupplicantFailed(void) const WIFI_LOGD("OnConnectSupplicantFailed callback"); Broadcast2SmConnectSupplicantFailed(selectIfacName); } + +void P2pMonitor::WpaEventP2pIfaceCreated(const std::string &ifName, int isGo) const +{ + WIFI_LOGI("onP2pIfaceCreated callback, ifname:%{private}s, isGo:%{public}s", ifName.c_str(), + (isGo == 0) ? "false" : "true"); + if (ifName.empty()) { + WIFI_LOGE("ERROR! No ifname!"); + return; + } + Broadcast2SmP2pIfaceCreated(selectIfacName, isGo, ifName); +} } // namespace Wifi } // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_monitor.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_monitor.h index 49c9f3b..f7017ea 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_monitor.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_monitor.h @@ -243,6 +243,15 @@ private: */ virtual void Broadcast2SmConnectSupplicantFailed(const std::string &iface) const; + /** + * @Description Broadcast p2p interface created event. + * + * @param iface - network interface for event processing + * @param type - 0: GC, 1: GO + * @param event - the name of interface created + */ + virtual void Broadcast2SmP2pIfaceCreated(const std::string &iface, int type, const std::string &event) const; + private: /** * @Description - Register the connection supplicant result callback function. @@ -385,6 +394,13 @@ private: */ void OnConnectSupplicantFailed(void) const; + /** + * @Description Register the callback function for p2p interface created + * @param ifName - the name of interface created + * @param isGo - 0: GC, 1: GO + */ + void WpaEventP2pIfaceCreated(const std::string &ifName, int isGo) const; + private: /** * The current implementation cannot obtain abundant HAL instances like Andoird and cannot distinguish which @@ -397,4 +413,4 @@ private: }; } // namespace Wifi } // namespace OHOS -#endif \ No newline at end of file +#endif diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp index fd332ad..2f2f9e8 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp @@ -64,7 +64,8 @@ P2pStateMachine::P2pStateMachine(P2pMonitor &monitor, WifiP2pGroupManager &group p2pGroupOperatingState(groupOperatingState), p2pIdleState(idleState), p2pInvitingState(invitingState), - p2pProvisionDiscoveryState(provisionDiscoveryState) + p2pProvisionDiscoveryState(provisionDiscoveryState), + p2pDevIface() { Initialize(); } @@ -726,6 +727,9 @@ void P2pStateMachine::DhcpResultNotify::OnFailed(int status, const std::string & status, reason.c_str(), ifname.c_str()); + if (pP2pStateMachine->p2pDevIface == ifname) { + pP2pStateMachine->p2pDevIface = ""; + } WifiP2PHalInterface::GetInstance().GroupRemove(ifname); } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.h index 769796d..1918cab 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.h @@ -413,6 +413,7 @@ private: P2pInvitingState &p2pInvitingState; ProvisionDiscoveryState &p2pProvisionDiscoveryState; static bool m_isNeedDhcp; + std::string p2pDevIface; }; } // namespace Wifi } // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_callback.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_callback.c index 02fd361..a7cbf79 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_callback.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_callback.c @@ -665,3 +665,25 @@ void P2pHalCbServDiscReq(const P2pServDiscReqInfo *info) EmitEventCallbackMsg(pCbkMsg, P2P_SERV_DISC_REQ_EVENT); return; } + +void P2pHalCbP2pIfaceCreated(const char *ifName, int isGo) +{ + if (ifName == NULL) { + LOGE("P2p interface created event ifName is NULL"); + return; + } + LOGI("P2p interface created event ifName: %{public}s, isGo: %{public}d", ifName, isGo); + WifiHalEventCallbackMsg *pCbkMsg = (WifiHalEventCallbackMsg *)calloc(1, sizeof(WifiHalEventCallbackMsg)); + if (pCbkMsg == NULL) { + LOGE("create callback message failed!"); + return; + } + pCbkMsg->msg.ifMsg.type = isGo; + if (strncpy_s(pCbkMsg->msg.ifMsg.ifname, sizeof(pCbkMsg->msg.ifMsg.ifname), ifName, + sizeof(pCbkMsg->msg.ifMsg.ifname) - 1) != EOK) { + free(pCbkMsg); + pCbkMsg = NULL; + return; + } + EmitEventCallbackMsg(pCbkMsg, P2P_IFACE_CREATED_EVENT); +} diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_callback.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_callback.h index 0dc4331..bb7a99c 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_callback.h +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_callback.h @@ -254,7 +254,15 @@ void P2pHalCbConnectSupplicantFailed(); * @param info */ void P2pHalCbServDiscReq(const P2pServDiscReqInfo *info); + +/** + * @Description Indicates that a P2P interface is created + * + * @param ifName + * @param isGo + */ +void P2pHalCbP2pIfaceCreated(const char *ifName, int isGo); #ifdef __cplusplus } #endif -#endif \ No newline at end of file +#endif diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.c index f221688..bb481d9 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.c @@ -709,6 +709,8 @@ static void DealP2pCallback(int event, Context *context) case P2P_SERV_DISC_REQ_EVENT: DealP2pServerDiscReqCbk(event, context); break; + case P2P_IFACE_CREATED_EVENT: + DealIfaceCbk(event, context); default: break; } diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_define.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_define.h index 177b086..525bdc4 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_define.h +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_define.h @@ -113,6 +113,7 @@ typedef enum WifiHalEvent { AP_STA_DISCONNECTED_EVENT, /* STA Disconnected from AP */ AP_STA_CONNECTED_EVENT, /* STA and AP connected event */ P2P_SERV_DISC_REQ_EVENT, /* Service discovery request event */ + P2P_IFACE_CREATED_EVENT, /* P2P interface created event */ WIFI_HAL_MAX_EVENT, } WifiHalEvent; diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c index 8405b8c..1b09395 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c @@ -473,6 +473,30 @@ static void DealP2pServDiscReqEvent(char *buf) return; } +static void DealP2pInterfaceCreated(const char *buf) +{ + int type; + char ifName[WIFI_IFACE_NAME_MAXLEN] = {0}; + if (strncmp(buf, "GO ", strlen("GO ")) == 0) { + type = 1; + } else if (strncmp(buf, "GC ", strlen("GC ")) == 0) { + type = 0; + } else { + LOGE("p2p interface created invalid msg %{public}s", buf); + return; + } + + const char *pos = buf + strlen("GO "); // GO and GC have same length + if (strlen(pos) >= WIFI_IFACE_NAME_MAXLEN || strlen(pos) == 0) { + LOGE("p2p interface created invalid ifname len %{public}zu", strlen(pos)); + return; + } + if (strncpy_s(ifName, sizeof(ifName), pos, strlen(pos)) != EOK) { + return; + } + P2pHalCbP2pIfaceCreated(ifName, type); +} + static int DealWpaP2pCallBackSubFun(char *p) { if (p == NULL) { @@ -502,6 +526,8 @@ static int DealWpaP2pCallBackSubFun(char *p) DealGroupStartInfo(p); } else if (strncmp(p, P2P_EVENT_GROUP_REMOVED, strlen(P2P_EVENT_GROUP_REMOVED)) == 0) { DealP2pGroupRemove(p + strlen(P2P_EVENT_GROUP_REMOVED)); + } else if (strncmp(p, P2P_INTERFACE_CREATED, strlen(P2P_INTERFACE_CREATED)) == 0) { + DealP2pInterfaceCreated(p + strlen(P2P_INTERFACE_CREATED)); } else { return 1; } diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal/wifi_p2p_hal.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal/wifi_p2p_hal.h index 13fb8eb..aca94f1 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal/wifi_p2p_hal.h +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal/wifi_p2p_hal.h @@ -32,6 +32,7 @@ extern "C" { #define P2P_PIN_KEYPAD 1 #define P2P_PIN_DISPLAY 2 #define P2P_GROUP_IFACE_MAX_LENGTH 128 +#define P2P_INTERFACE_CREATED "P2P-INTERFACE-CREATED " typedef struct stWifiWpaP2pInterface WifiWpaP2pInterface; struct stWifiWpaP2pInterface { @@ -98,4 +99,4 @@ void ReleaseWpaP2pGroupInterface(const char *groupIfc); #ifdef __cplusplus } #endif -#endif \ No newline at end of file +#endif -- Gitee From 24891cc449e4c988a3f5174207b24487e0cac71d Mon Sep 17 00:00:00 2001 From: y00316381 Date: Mon, 15 Aug 2022 09:18:42 +0800 Subject: [PATCH 308/491] bugfix for raoming 0815 Signed-off-by: y00316381 --- .../wifi_sta/sta_state_machine.cpp | 71 ++++++++++--------- 1 file changed, 38 insertions(+), 33 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp index 605a25d..542ae73 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp @@ -105,7 +105,7 @@ StaStateMachine::~StaStateMachine() /* ---------------------------Initialization functions------------------------------ */ ErrCode StaStateMachine::InitStaStateMachine() { - WIFI_LOGD("Enter StaStateMachine::InitStaStateMachine.\n"); + WIFI_LOGI("Enter StaStateMachine::InitStaStateMachine.\n"); if (!InitialStateMachine()) { WIFI_LOGE("Initial StateMachine failed.\n"); return WIFI_OPT_FAILED; @@ -243,7 +243,7 @@ void StaStateMachine::BuildStateTree() void StaStateMachine::RegisterStaServiceCallback(const StaServiceCallback &callbacks) { - LOGI("RegisterStaServiceCallback."); + WIFI_LOGI("RegisterStaServiceCallback."); staCallback = callbacks; } @@ -292,7 +292,7 @@ void StaStateMachine::InitState::GoInState() void StaStateMachine::InitState::GoOutState() { - LOGI("InitState GoOutState function."); + WIFI_LOGI("InitState GoOutState function."); return; } @@ -302,6 +302,7 @@ bool StaStateMachine::InitState::ExecuteStateMsg(InternalMessage *msg) return false; } + WIFI_LOGI("InitState-msgCode=%{public}d is received.\n", msg->GetMessageName()); bool ret = NOT_EXECUTED; switch (msg->GetMessageName()) { case WIFI_SVR_CMD_STA_ENABLE_WIFI: { @@ -315,7 +316,7 @@ bool StaStateMachine::InitState::ExecuteStateMsg(InternalMessage *msg) break; default: - LOGI("InitState-msgCode=%d not handled.\n", msg->GetMessageName()); + WIFI_LOGI("InitState-msgCode=%d not handled.\n", msg->GetMessageName()); break; } return ret; @@ -396,7 +397,7 @@ void StaStateMachine::StartWifiProcess() staCallback.OnStaOpenRes(OperateResState::OPEN_WIFI_OPENING); int res = WifiStaHalInterface::GetInstance().StartWifi(); if (res == static_cast(WIFI_IDL_OPT_OK)) { - WIFI_LOGD("Start wifi successfully!"); + WIFI_LOGI("Start wifi successfully!"); if (WifiStaHalInterface::GetInstance().WpaAutoConnect(false) != WIFI_IDL_OPT_OK) { WIFI_LOGI("The automatic Wpa connection is disabled failed."); } @@ -503,7 +504,7 @@ void StaStateMachine::WpaStartedState::GoInState() } void StaStateMachine::WpaStartedState::GoOutState() { - LOGI("WpaStartedState GoOutState function."); + WIFI_LOGI("WpaStartedState GoOutState function."); return; } @@ -566,7 +567,7 @@ void StaStateMachine::StopWifiProcess() /* The current state of StaStateMachine transfers to InitState. */ SwitchState(pInitState); } else { - LOGE("StopWifiProcess failed."); + WIFI_LOGE("StopWifiProcess failed."); WifiSettings::GetInstance().SetWifiState(static_cast(WifiState::UNKNOWN)); staCallback.OnStaCloseRes(OperateResState::CLOSE_WIFI_FAILED); } @@ -583,14 +584,14 @@ StaStateMachine::WpaStoppingState::~WpaStoppingState() void StaStateMachine::WpaStoppingState::GoInState() { - LOGI("WpaStoppingState GoInState function."); + WIFI_LOGI("WpaStoppingState GoInState function."); pStaStateMachine->SwitchState(pStaStateMachine->pInitState); return; } void StaStateMachine::WpaStoppingState::GoOutState() { - LOGI("WpaStoppingState GoOutState function."); + WIFI_LOGI("WpaStoppingState GoOutState function."); return; } @@ -621,7 +622,7 @@ void StaStateMachine::LinkState::GoInState() void StaStateMachine::LinkState::GoOutState() { - LOGI("LinkState GoOutState function."); + WIFI_LOGI("LinkState GoOutState function."); return; } @@ -1387,7 +1388,7 @@ void StaStateMachine::SeparatingState::GoInState() void StaStateMachine::SeparatingState::GoOutState() { - LOGI("SeparatingState GoOutState function."); + WIFI_LOGI("SeparatingState GoOutState function."); } bool StaStateMachine::SeparatingState::ExecuteStateMsg(InternalMessage *msg) @@ -1547,7 +1548,9 @@ void StaStateMachine::StaWpsState::GoInState() } void StaStateMachine::StaWpsState::GoOutState() -{} +{ + WIFI_LOGI("WpsState GoOutState function."); +} bool StaStateMachine::StaWpsState::ExecuteStateMsg(InternalMessage *msg) { @@ -1720,7 +1723,9 @@ void StaStateMachine::GetIpState::GoInState() } void StaStateMachine::GetIpState::GoOutState() -{} +{ + WIFI_LOGI("GetIpState GoOutState function."); +} bool StaStateMachine::GetIpState::ExecuteStateMsg(InternalMessage *msg) { @@ -1893,7 +1898,9 @@ void StaStateMachine::ApRoamingState::GoInState() } void StaStateMachine::ApRoamingState::GoOutState() -{} +{ + WIFI_LOGI("ApRoamingState GoOutState function."); +} bool StaStateMachine::ApRoamingState::ExecuteStateMsg(InternalMessage *msg) { @@ -1901,20 +1908,14 @@ bool StaStateMachine::ApRoamingState::ExecuteStateMsg(InternalMessage *msg) return false; } + WIFI_LOGI("ApRoamingState, reveived msgCode=%{public}d msg.", msg->GetMessageName()); bool ret = NOT_EXECUTED; switch (msg->GetMessageName()) { case WIFI_SVR_CMD_STA_NETWORK_CONNECTION_EVENT: { + WIFI_LOGI("ApRoamingState, receive WIFI_SVR_CMD_STA_NETWORK_CONNECTION_EVENT event."); ret = EXECUTED; pStaStateMachine->isRoam = true; pStaStateMachine->StopTimer(static_cast(CMD_NETWORK_CONNECT_TIMEOUT)); - /* Save linkedInfo */ - pStaStateMachine->linkedInfo.networkId = msg->GetParam1(); - pStaStateMachine->linkedInfo.bssid = msg->GetStringFromMessage(); - WIFI_LOGI("ApRoamingState, receive connection event, networkId:%{public}d, bssid:%{public}s.", - pStaStateMachine->linkedInfo.networkId, pStaStateMachine->linkedInfo.bssid.c_str()); - WifiSettings::GetInstance().SaveLinkedInfo(pStaStateMachine->linkedInfo); - pStaStateMachine->staCallback.OnStaConnChanged( - OperateResState::CONNECT_ASSOCIATED, pStaStateMachine->linkedInfo); pStaStateMachine->ConnectToNetworkProcess(msg); /* Notify result to InterfaceService. */ pStaStateMachine->staCallback.OnStaConnChanged(OperateResState::CONNECT_ASSOCIATED, @@ -1927,10 +1928,11 @@ bool StaStateMachine::ApRoamingState::ExecuteStateMsg(InternalMessage *msg) break; } default: + WIFI_LOGI("ApRoamingState-msgCode=%d not handled.", msg->GetMessageName()); break; } - return EXECUTED; + return ret; } void StaStateMachine::ConnectToNetworkProcess(InternalMessage *msg) @@ -1941,7 +1943,8 @@ void StaStateMachine::ConnectToNetworkProcess(InternalMessage *msg) lastNetworkId = msg->GetParam1(); std::string bssid = msg->GetStringFromMessage(); - + WIFI_LOGI("ConnectToNetworkProcess, Receive msg: lastNetworkId=%{public}d, bssid=%{public}s", + lastNetworkId, MacAnonymize(bssid)); WifiDeviceConfig deviceConfig; int result = WifiSettings::GetInstance().GetDeviceConfig(lastNetworkId, deviceConfig); WIFI_LOGI("Device config networkId = %{public}d", deviceConfig.networkId); @@ -1990,6 +1993,8 @@ void StaStateMachine::ConnectToNetworkProcess(InternalMessage *msg) void StaStateMachine::SetWifiLinkedInfo(int networkId) { + WIFI_LOGI("SetWifiLinkedInfo, linkedInfo.networkId=%{public}d, lastLinkedInfo.networkId=%{public}d", + linkedInfo.networkId, lastLinkedInfo.networkId); if (linkedInfo.networkId == INVALID_NETWORK_ID) { if (lastLinkedInfo.networkId != INVALID_NETWORK_ID) { /* Update connection information according to the last connecting information. */ @@ -2056,16 +2061,16 @@ void StaStateMachine::DhcpResultNotify::OnSuccess(int status, const std::string (pStaStateMachine->linkedInfo.detailedState == DetailedState::DISCONNECTED)) { return; } - WIFI_LOGD("iptype=%{public}d, ip=%{private}s, gateway=%{private}s, \ - subnet=%{private}s, serverAddress=%{private}s, leaseDuration=%{public}d", + WIFI_LOGI("iptype=%{public}d, ip=%{public}s, gateway=%{public}s, \ + subnet=%{public}s, serverAddress=%{public}s, leaseDuration=%{public}d.", result.iptype, - result.strYourCli.c_str(), - result.strRouter1.c_str(), - result.strSubnet.c_str(), - result.strServer.c_str(), + IpAnonymize(result.strYourCli).c_str(), + IpAnonymize(result.strRouter1).c_str(), + IpAnonymize(result.strSubnet).c_str(), + IpAnonymize(result.strServer).c_str(), result.uLeaseTime); - - WIFI_LOGD("strDns1=%{private}s, strDns2=%{private}s", result.strDns1.c_str(), result.strDns2.c_str()); + WIFI_LOGI("strDns1=%{public}s, strDns2=%{public}s", IpAnonymize(result.strDns1).c_str(), + IpAnonymize(result.strDns2).c_str()); IpInfo ipInfo; WifiSettings::GetInstance().GetIpInfo(ipInfo); @@ -2137,7 +2142,7 @@ void StaStateMachine::DhcpResultNotify::OnFailed(int status, const std::string & return; } - LOGD("currentTpType: %{public}d, getIpSucNum: %{public}d, getIpFailNum: %{public}d, isRoam: %{public}d", + LOGI("currentTpType: %{public}d, getIpSucNum: %{public}d, getIpFailNum: %{public}d, isRoam: %{public}d", pStaStateMachine->currentTpType, pStaStateMachine->getIpSucNum, pStaStateMachine->getIpFailNum, pStaStateMachine->isRoam); -- Gitee From 3a9c571e1e54155c2e9a1c0b2d80221055255896 Mon Sep 17 00:00:00 2001 From: y00316381 Date: Mon, 15 Aug 2022 09:59:00 +0800 Subject: [PATCH 309/491] bugfix for raoming 0815 Signed-off-by: y00316381 --- .../wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp index 542ae73..dc4f3d2 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp @@ -1944,7 +1944,7 @@ void StaStateMachine::ConnectToNetworkProcess(InternalMessage *msg) lastNetworkId = msg->GetParam1(); std::string bssid = msg->GetStringFromMessage(); WIFI_LOGI("ConnectToNetworkProcess, Receive msg: lastNetworkId=%{public}d, bssid=%{public}s", - lastNetworkId, MacAnonymize(bssid)); + lastNetworkId, MacAnonymize(bssid).c_str()); WifiDeviceConfig deviceConfig; int result = WifiSettings::GetInstance().GetDeviceConfig(lastNetworkId, deviceConfig); WIFI_LOGI("Device config networkId = %{public}d", deviceConfig.networkId); -- Gitee From 865f79f796668a6ab3b86ba2d3e1a6afd3a44744 Mon Sep 17 00:00:00 2001 From: y00316381 Date: Tue, 16 Aug 2022 21:36:50 +0800 Subject: [PATCH 310/491] bugfix for wep 0816 Signed-off-by: y00316381 --- wifi/frameworks/js/napi/src/wifi_napi_device.cpp | 5 ++++- .../wifi_manage/idl_client/wifi_idl_client.cpp | 8 +++++++- .../wifi_manage/wifi_device_service_impl.cpp | 11 ++++++++--- .../wifi_manage/wifi_sta/sta_service.cpp | 2 +- 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp index 3c25868..eeddd4e 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp @@ -228,10 +228,13 @@ static void ConvertEncryptionMode(const SecTypeJs& securityType, std::string& ke { switch (securityType) { case SecTypeJs::SEC_TYPE_OPEN: - case SecTypeJs::SEC_TYPE_WEP: keyMgmt = KEY_MGMT_NONE; break; + case SecTypeJs::SEC_TYPE_WEP: + keyMgmt = KEY_MGMT_WEP; + break; + case SecTypeJs::SEC_TYPE_PSK: keyMgmt = KEY_MGMT_WPA_PSK; break; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp index cf64226..b1c4002 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp @@ -499,16 +499,22 @@ WifiErrorNo WifiIdlClient::SetDeviceConfig(int networkId, const WifiIdlDeviceCon { CHECK_CLIENT_NOT_NULL; if (CheckValidDeviceConfig(config) != WIFI_IDL_OPT_OK) { + LOGE("SetDeviceConfig, CheckValidDeviceConfig return error!"); return WIFI_IDL_OPT_FAILED; } SetNetworkConfig conf[DEVICE_CONFIG_END_POS]; if (memset_s(conf, sizeof(conf), 0, sizeof(conf)) != EOK) { + LOGE("SetDeviceConfig, memset_s return error!"); return WIFI_IDL_OPT_FAILED; } int num = 0; num += PushDeviceConfigString(conf + num, DEVICE_CONFIG_SSID, config.ssid); num += PushDeviceConfigString(conf + num, DEVICE_CONFIG_PSK, config.psk); - num += PushDeviceConfigString(conf + num, DEVICE_CONFIG_KEYMGMT, config.keyMgmt); + if (config.keyMgmt == KEY_MGMT_NONE || config.keyMgmt == KEY_MGMT_WEP) { + num += PushDeviceConfigString(conf + num, DEVICE_CONFIG_KEYMGMT, KEY_MGMT_NONE); + } else { + num += PushDeviceConfigString(conf + num, DEVICE_CONFIG_KEYMGMT, config.keyMgmt); + } num += PushDeviceConfigString(conf + num, DEVICE_CONFIG_EAP, config.eap); num += PushDeviceConfigString(conf + num, DEVICE_CONFIG_IDENTITY, config.identity); num += PushDeviceConfigString(conf + num, DEVICE_CONFIG_PASSWORD, config.password); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp index f84d35d..048d7c5 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp @@ -381,7 +381,8 @@ bool WifiDeviceServiceImpl::CheckConfigPwd(const WifiDeviceConfig &config) return CheckConfigEap(config); } - if (config.keyMgmt != KEY_MGMT_NONE && config.preSharedKey.empty()) { + if ((config.keyMgmt != KEY_MGMT_NONE && config.keyMgmt != KEY_MGMT_NONE) && + config.preSharedKey.empty()) { WIFI_LOGE("CheckConfigPwd: preSharedKey is empty!"); return false; } @@ -389,7 +390,7 @@ bool WifiDeviceServiceImpl::CheckConfigPwd(const WifiDeviceConfig &config) int len = config.preSharedKey.length(); bool isAllHex = std::all_of(config.preSharedKey.begin(), config.preSharedKey.end(), isxdigit); WIFI_LOGI("CheckConfigPwd, keyMgmt: %{public}s, len: %{public}d", config.keyMgmt.c_str(), len); - if (config.keyMgmt == KEY_MGMT_NONE) { + if (config.keyMgmt == KEY_MGMT_WEP) { for (int i = 0; i != WEPKEYS_SIZE; ++i) { if (!config.wepKeys[i].empty()) { // wep int wepLen = config.wepKeys[i].size(); @@ -402,10 +403,14 @@ bool WifiDeviceServiceImpl::CheckConfigPwd(const WifiDeviceConfig &config) wepLen == (WEP_KEY_LEN3 * MULTIPLE_HEXT_TO_ASCII)) { return isAllHex; } + WIFI_LOGE("CheckConfigPwd: invalid wepLen: %{public}d!", wepLen); return false; } } - return config.preSharedKey.empty(); // open + return true; + } + if (config.keyMgmt == KEY_MGMT_NONE) { + return config.preSharedKey.empty(); } int minLen = config.keyMgmt == KEY_MGMT_SAE ? MIN_SAE_LEN : MIN_PSK_LEN; int maxLen = isAllHex ? MAX_HEX_LEN : MAX_PRESHAREDKEY_LEN; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp index 087d1c4..269aba3 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp @@ -197,7 +197,7 @@ int StaService::AddDeviceConfig(const WifiDeviceConfig &config) const LOGE("StaService::AddDeviceConfig GetNextNetworkId failed!"); return INVALID_NETWORK_ID; } - LOGD("StaService::AddDeviceConfig alloc new id[%{public}d] succeed!", netWorkId); + LOGI("StaService::AddDeviceConfig alloc new id[%{public}d] succeed!", netWorkId); } tempDeviceConfig = config; tempDeviceConfig.networkId = netWorkId; -- Gitee From 23bb6104f812f8a944667a510f44955f50e338bb Mon Sep 17 00:00:00 2001 From: Zhangfeng Date: Wed, 17 Aug 2022 03:54:31 +0000 Subject: [PATCH 311/491] Solve the frequency problem of p2p 5g group create Signed-off-by: zhangfeng --- .../wifi_manage/wifi_p2p/p2p_state_machine.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp index fd332ad..f190874 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp @@ -808,6 +808,11 @@ int P2pStateMachine::GetAvailableFreqByBand(GroupOwnerBand band) const } if (WifiP2PHalInterface::GetInstance().P2pGetSupportFrequenciesByBand(static_cast(band), freqList) == WifiErrorNo::WIFI_IDL_OPT_FAILED) { + constexpr int DEFAULT_5G_FREQUENCY = 5745; // channal:149, frequency:5745 + if (band == GroupOwnerBand::GO_BAND_5GHZ) { + WIFI_LOGE("Get support frequencies failed, use default 5g frequency!"); + return DEFAULT_5G_FREQUENCY; + } WIFI_LOGE("Cannot get support frequencies according to band, choose random frequency"); return 0; } -- Gitee From 52c756869cf21785e357dc01459fe5789d5863b5 Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Wed, 17 Aug 2022 22:21:33 +0800 Subject: [PATCH 312/491] bugfix for wep 0817 Signed-off-by: yanxiaotao --- .../wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c | 2 +- wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c index 05c3032..b123466 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c @@ -1223,7 +1223,7 @@ static int WpaCliCmdWpaTerminate(WifiWpaStaInterface *this) } char cmd[CMD_BUFFER_SIZE] = {0}; char buf[REPLY_BUF_SMALL_LENGTH] = {0}; - if (snprintf_s(cmd, sizeof(cmd), sizeof(cmd) - 1, "IFNAME=%s TERMINATE", this->ifname) < 0) { + if (snprintf_s(cmd, sizeof(cmd), sizeof(cmd) - 1, "TERMINATE") < 0) { LOGE("WpaCliCmdWpaTerminate, snprintf err"); return -1; } diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c index 7f22760..652ec95 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c @@ -175,7 +175,6 @@ WifiErrorNo StopSupplicant(void) int res = pStaIfc->wpaCliCmdWpaTerminate(pStaIfc); if (res < 0) { LOGE("wpaCliCmdWpaTerminate failed! ret=%{public}d", res); - return WIFI_HAL_FAILED; } usleep(WPA_TERMINATE_SLEEP_TIME); ModuleManageRetCode ret = StopModule(g_serviceName); -- Gitee From b0c6d625f5fb13d765991425d9c194a409efd6d5 Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Wed, 17 Aug 2022 22:34:20 +0800 Subject: [PATCH 313/491] bugfix for wep 0817 Signed-off-by: yanxiaotao --- .../wifi_hal/wifi_hal_sta_interface.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c index 652ec95..3739c5d 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c @@ -67,17 +67,18 @@ static WifiErrorNo AddWpaIface(int staNo) static WifiErrorNo RemoveWpaIface(int staNo) { + int ret = -1; WifiWpaInterface *pWpaInterface = GetWifiWapGlobalInterface(); if (pWpaInterface == NULL) { LOGE("Get wpa interface failed!"); return WIFI_HAL_FAILED; } if (staNo == 0) { - pWpaInterface->wpaCliRemoveIface(pWpaInterface, "wlan0"); + ret = pWpaInterface->wpaCliRemoveIface(pWpaInterface, "wlan0"); } else { - pWpaInterface->wpaCliRemoveIface(pWpaInterface, "wlan2"); + ret = pWpaInterface->wpaCliRemoveIface(pWpaInterface, "wlan2"); } - return WIFI_HAL_SUCCESS; + return (ret == 0 ? WIFI_HAL_SUCCESS : WIFI_HAL_FAILED); } static WifiErrorNo StopWpaAndWpaHal(int staNo) @@ -85,13 +86,17 @@ static WifiErrorNo StopWpaAndWpaHal(int staNo) if (DisconnectSupplicant() != WIFI_HAL_SUCCESS) { LOGE("wpa_s hal already stop!"); } - RemoveWpaIface(staNo); + + if (RemoveWpaIface(staNo) != WIFI_HAL_SUCCESS) { + LOGE("RemoveWpaIface return fail!"); + } if (StopSupplicant() != WIFI_HAL_SUCCESS) { LOGE("wpa_supplicant stop failed!"); return WIFI_HAL_FAILED; } - LOGD("wpa_supplicant stop successfully"); + + LOGI("wpa_supplicant stop successfully"); ReleaseWifiStaInterface(staNo); return WIFI_HAL_SUCCESS; } @@ -99,7 +104,7 @@ static WifiErrorNo StopWpaAndWpaHal(int staNo) WifiErrorNo Start(void) { - LOGD("Ready to start wifi"); + LOGI("Ready to start wifi"); if (StartSupplicant() != WIFI_HAL_SUCCESS) { LOGE("wpa_supplicant start failed!"); return WIFI_HAL_OPEN_SUPPLICANT_FAILED; @@ -118,7 +123,7 @@ WifiErrorNo Start(void) return WIFI_HAL_CONN_SUPPLICANT_FAILED; } LOGD("SupplicantHal connect wpa_supplicant successfully!"); - LOGD("Start wifi successfully"); + LOGI("Start wifi successfully"); return WIFI_HAL_SUCCESS; } -- Gitee From 8da98e5e1cf29721165187870c8c7ff470f1ca1b Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Thu, 11 Aug 2022 14:16:02 +0000 Subject: [PATCH 314/491] event process optimize Signed-off-by: zhangfeng Change-Id: I8994527fe6759091e4e8a2a298754a0352f3ea94 --- wifi/frameworks/js/napi/inc/wifi_napi_event.h | 14 ++- .../js/napi/src/wifi_napi_event.cpp | 90 ++++++++++--------- 2 files changed, 53 insertions(+), 51 deletions(-) diff --git a/wifi/frameworks/js/napi/inc/wifi_napi_event.h b/wifi/frameworks/js/napi/inc/wifi_napi_event.h index 4330909..9597e07 100644 --- a/wifi/frameworks/js/napi/inc/wifi_napi_event.h +++ b/wifi/frameworks/js/napi/inc/wifi_napi_event.h @@ -85,19 +85,17 @@ public: napi_value CreateResult(const napi_env& env, const std::vector& devices); napi_value CreateResult(const napi_env& env, const WifiP2pLinkedInfo& info); void EventNotify(AsyncEventData *asyncEvent); - bool IsRegisterObjectExist(const RegObj& regObj, const std::string& type); - std::vector GetRegisterObjects(const std::string& type); template void CheckAndNotify(const std::string& type, const T& obj) { - std::vector vecObj = GetRegisterObjects(type); - if (vecObj.empty()) { + std::shared_lock guard(g_regInfoMutex); + auto it = g_eventRegisterInfo.find(type); + if (it == g_eventRegisterInfo.end()) { return; } - for (auto& each : vecObj) { - auto resultFunc = [this, env = each.m_regEnv, obj] () -> napi_value { return CreateResult(env, obj); }; - AsyncEventData *asyncEvent = - new (std::nothrow)AsyncEventData(each.m_regEnv, each.m_regHanderRef, resultFunc); + for (auto& each : it->second) { + auto func = [this, env = each.m_regEnv, obj] () -> napi_value { return CreateResult(env, obj); }; + AsyncEventData *asyncEvent = new (std::nothrow)AsyncEventData(each.m_regEnv, each.m_regHanderRef, func); if (asyncEvent == nullptr) { return; } diff --git a/wifi/frameworks/js/napi/src/wifi_napi_event.cpp b/wifi/frameworks/js/napi/src/wifi_napi_event.cpp index 94ebd72..39e0269 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_event.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_event.cpp @@ -26,6 +26,7 @@ namespace OHOS { namespace Wifi { DEFINE_WIFILOG_LABEL("WifiNAPIEvent"); +/* Events definition */ const std::string EVENT_STA_POWER_STATE_CHANGE = "wifiStateChange"; const std::string EVENT_STA_CONN_STATE_CHANGE = "wifiConnectionChange"; const std::string EVENT_STA_SCAN_STATE_CHANGE = "wifiScanStateChange"; @@ -41,6 +42,23 @@ const std::string EVENT_P2P_PEER_DEVICE_CHANGE = "p2pPeerDeviceChange"; const std::string EVENT_P2P_DISCOVERY_CHANGE = "p2pDiscoveryChange"; const std::string EVENT_STREAM_CHANGE = "streamChange"; +/* Permissions definition */ +const std::string WIFI_PERMISSION_NULL = "ohos.permission.NULL"; +const std::string WIFI_PERMISSION_GET_WIFI_INFO = "ohos.permission.GET_WIFI_INFO"; +const std::string WIFI_PERMISSION_SET_WIFI_INFO = "ohos.permission.SET_WIFI_INFO"; +const std::string WIFI_PERMISSION_GET_WIFI_CONFIG = "ohos.permission.GET_WIFI_CONFIG"; +const std::string WIFI_PERMISSION_MANAGE_WIFI_CONNECTION = "ohos.permission.MANAGE_WIFI_CONNECTION"; +const std::string WIFI_PERMISSION_MANAGE_WIFI_HOTSPOT = "ohos.permission.MANAGE_WIFI_HOTSPOT"; +const std::string WIFI_PERMISSION_MANAGE_ENHANCER_WIFI = "ohos.permission.MANAGE_ENHANCER_WIFI"; +const std::string WIFI_PERMISSION_GET_WIFI_LOCAL_MAC = "ohos.permission.GET_WIFI_LOCAL_MAC"; +const std::string WIFI_PERMISSION_LOCATION = "ohos.permission.LOCATION"; +const std::string WIFI_PERMISSION_GET_P2P_DEVICE_LOCATION = "ohos.permission.GET_P2P_DEVICE_LOCATION"; +const std::string WIFI_PERMISSION_GET_WIFI_INFO_INTERNAL = "ohos.permission.GET_WIFI_INFO_INTERNAL"; +const int WIFI_NAPI_PERMISSION_DENIED = 0; +const int WIFI_NAPI_PERMISSION_GRANTED = 1; + +constexpr uint32_t INVALID_REF_COUNT = 0xff; + static std::set g_supportEventList = { EVENT_STA_POWER_STATE_CHANGE, EVENT_STA_CONN_STATE_CHANGE, @@ -57,20 +75,6 @@ static std::set g_supportEventList = { EVENT_P2P_DISCOVERY_CHANGE, }; -const std::string WIFI_PERMISSION_NULL = "ohos.permission.NULL"; -const std::string WIFI_PERMISSION_GET_WIFI_INFO = "ohos.permission.GET_WIFI_INFO"; -const std::string WIFI_PERMISSION_SET_WIFI_INFO = "ohos.permission.SET_WIFI_INFO"; -const std::string WIFI_PERMISSION_GET_WIFI_CONFIG = "ohos.permission.GET_WIFI_CONFIG"; -const std::string WIFI_PERMISSION_MANAGE_WIFI_CONNECTION = "ohos.permission.MANAGE_WIFI_CONNECTION"; -const std::string WIFI_PERMISSION_MANAGE_WIFI_HOTSPOT = "ohos.permission.MANAGE_WIFI_HOTSPOT"; -const std::string WIFI_PERMISSION_MANAGE_ENHANCER_WIFI = "ohos.permission.MANAGE_ENHANCER_WIFI"; -const std::string WIFI_PERMISSION_GET_WIFI_LOCAL_MAC = "ohos.permission.GET_WIFI_LOCAL_MAC"; -const std::string WIFI_PERMISSION_LOCATION = "ohos.permission.LOCATION"; -const std::string WIFI_PERMISSION_GET_P2P_DEVICE_LOCATION = "ohos.permission.GET_P2P_DEVICE_LOCATION"; -const std::string WIFI_PERMISSION_GET_WIFI_INFO_INTERNAL = "ohos.permission.GET_WIFI_INFO_INTERNAL"; -const int WIFI_NAPI_PERMISSION_DENIED = 0; -const int WIFI_NAPI_PERMISSION_GRANTED = 1; - std::multimap g_EventPermissionMap = { { EVENT_STA_POWER_STATE_CHANGE, WIFI_PERMISSION_GET_WIFI_INFO }, { EVENT_STA_CONN_STATE_CHANGE, WIFI_PERMISSION_GET_WIFI_INFO }, @@ -106,30 +110,34 @@ void NapiEvent::EventNotify(AsyncEventData *asyncEvent) return; } - WIFI_LOGI("Get the event loop, napi_env: %{private}p", asyncEvent->env); + uint32_t refCount = INVALID_REF_COUNT; + napi_reference_ref(asyncEvent->env, asyncEvent->callbackRef, &refCount); work->data = asyncEvent; + WIFI_LOGI("event notify, env: %{private}p, callbackRef: %{private}p, refCount: %{public}d", + asyncEvent->env, asyncEvent->callbackRef, refCount); uv_queue_work( loop, work, [](uv_work_t* work) {}, [](uv_work_t* work, int status) { AsyncEventData *asyncData = static_cast(work->data); - WIFI_LOGI("Napi event uv_queue_work, env: %{private}p, status: %{public}d", asyncData->env, status); + WIFI_LOGI("uv_queue_work, env: %{private}p, status: %{public}d", asyncData->env, status); napi_value handler = nullptr; napi_handle_scope scope = nullptr; napi_value jsEvent = nullptr; + uint32_t refCount = INVALID_REF_COUNT; napi_open_handle_scope(asyncData->env, &scope); if (scope == nullptr) { WIFI_LOGE("scope is nullptr"); goto EXIT; } - napi_value undefine; - napi_get_undefined(asyncData->env, &undefine); napi_get_reference_value(asyncData->env, asyncData->callbackRef, &handler); if (handler == nullptr) { WIFI_LOGE("handler is nullptr"); goto EXIT; } + napi_value undefine; + napi_get_undefined(asyncData->env, &undefine); jsEvent = asyncData->packResult(); WIFI_LOGI("Push event to js, env: %{private}p, ref : %{private}p", asyncData->env, &asyncData->callbackRef); if (napi_call_function(asyncData->env, nullptr, handler, 1, &jsEvent, &undefine) != napi_ok) { @@ -138,34 +146,20 @@ void NapiEvent::EventNotify(AsyncEventData *asyncEvent) EXIT: napi_close_handle_scope(asyncData->env, scope); + napi_reference_unref(asyncData->env, asyncData->callbackRef, &refCount); + WIFI_LOGI("uv_queue_work unref, env: %{private}p, callbackRef: %{private}p, refCount: %{public}d", + asyncData->env, asyncData->callbackRef, refCount); + if (refCount == 0) { + napi_delete_reference(asyncData->env, asyncData->callbackRef); + } delete asyncData; - asyncData = nullptr; delete work; + asyncData = nullptr; work = nullptr; } ); } -bool NapiEvent::IsRegisterObjectExist(const RegObj& regObj, const std::string& type) -{ - /* The caller has lock protect, don't need to lock again */ - auto iter = g_eventRegisterInfo.find(type); - if (iter == g_eventRegisterInfo.end()) { - return false; - } - return (std::find(iter->second.begin(), iter->second.end(), regObj) != iter->second.end()); -} - -std::vector NapiEvent::GetRegisterObjects(const std::string& type) -{ - std::shared_lock guard(g_regInfoMutex); - auto iter = g_eventRegisterInfo.find(type); - if (iter == g_eventRegisterInfo.end()) { - return std::vector(); - } - return g_eventRegisterInfo[type]; -} - napi_value NapiEvent::CreateResult(const napi_env& env, int value) { napi_value result; @@ -622,8 +616,13 @@ void EventRegister::DeleteRegisterObj(const napi_env& env, std::vector& bool isEqual = false; napi_strict_equals(iter->m_regEnv, handlerTemp, handler, &isEqual); if (isEqual) { - napi_delete_reference(iter->m_regEnv, iter->m_regHanderRef); - napi_reference_unref(iter->m_regEnv, iter->m_regHanderRef, nullptr); + uint32_t refCount = INVALID_REF_COUNT; + napi_reference_unref(iter->m_regEnv, iter->m_regHanderRef, &refCount); + WIFI_LOGI("delete ref, m_regEnv: %{private}p, m_regHanderRef: %{private}p, refCount: %{public}d", + iter->m_regEnv, iter->m_regHanderRef, refCount); + if (refCount == 0) { + napi_delete_reference(iter->m_regEnv, iter->m_regHanderRef); + } WIFI_LOGI("Delete register object ref."); iter = vecRegObjs.erase(iter); } else { @@ -641,8 +640,13 @@ void EventRegister::DeleteAllRegisterObj(const napi_env& env, std::vectorm_regEnv) { - napi_delete_reference(iter->m_regEnv, iter->m_regHanderRef); - napi_reference_unref(iter->m_regEnv, iter->m_regHanderRef, nullptr); + uint32_t refCount = INVALID_REF_COUNT; + napi_reference_unref(iter->m_regEnv, iter->m_regHanderRef, &refCount); + WIFI_LOGI("delete all ref, m_regEnv: %{private}p, m_regHanderRef: %{private}p, refCount: %{public}d", + iter->m_regEnv, iter->m_regHanderRef, refCount); + if (refCount == 0) { + napi_delete_reference(iter->m_regEnv, iter->m_regHanderRef); + } iter = vecRegObjs.erase(iter); } else { WIFI_LOGI("Unregister all event, env is not equal %{private}p, : %{private}p", env, iter->m_regEnv); -- Gitee From eb5f0a750a7c496f198802c6eb612e2671459964 Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Wed, 17 Aug 2022 23:39:50 +0800 Subject: [PATCH 315/491] bugfix for wep 0817 Signed-off-by: yanxiaotao --- .../wifi_framework/wifi_manage/wifi_sta/sta_service.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp index 269aba3..d0efb8d 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp @@ -122,7 +122,7 @@ ErrCode StaService::AddCandidateConfig(const int uid, const WifiDeviceConfig &co return WIFI_OPT_FAILED; } - if (config.keyMgmt == KEY_MGMT_NONE) { + if (config.keyMgmt == KEY_MGMT_NONE || config.keyMgmt == KEY_MGMT_WEP) { LOGE("StaService::AddCandidateConfig unsupport open or wep key!"); return WIFI_OPT_NOT_SUPPORTED; } -- Gitee From 93f4fb80a4984c084e935a47aa215e344f971e82 Mon Sep 17 00:00:00 2001 From: lujunxin Date: Thu, 18 Aug 2022 08:06:49 +0000 Subject: [PATCH 316/491] notify p2p disconnected status when remove gourp Signed-off-by: lujunxin --- .../wifi_manage/wifi_p2p/group_negotiation_state.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.cpp index d14f965..0268d23 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.cpp @@ -201,9 +201,11 @@ bool GroupNegotiationState::ProcessCmdRemoveGroup(InternalMessage &msg) const WifiErrorNo ret = WifiP2PHalInterface::GetInstance().GroupRemove(ifName); if (ret) { WIFI_LOGE("P2P group (%{public}s) removal failed.", ifName.c_str()); + p2pStateMachine.ChangeConnectedStatus(P2pConnectedState::P2P_DISCONNECTED); p2pStateMachine.BroadcastActionResult(P2pActionCallback::RemoveGroup, WIFI_OPT_FAILED); } else { WIFI_LOGI("The P2P group (%{public}s) is successfully removed.", ifName.c_str()); + p2pStateMachine.ChangeConnectedStatus(P2pConnectedState::P2P_DISCONNECTED); p2pStateMachine.BroadcastActionResult(P2pActionCallback::RemoveGroup, WIFI_OPT_SUCCESS); } p2pStateMachine.SwitchState(&p2pStateMachine.p2pIdleState); -- Gitee From c0291a363181a312d935178f6205ac4fd1aa0471 Mon Sep 17 00:00:00 2001 From: z00588131 Date: Thu, 18 Aug 2022 09:36:25 +0000 Subject: [PATCH 317/491] optimization of wifi enable and disable process Signed-off-by: z00588131 --- .../wifi_manage/wifi_manager.cpp | 71 ++++++++++++------- .../wifi_framework/wifi_manage/wifi_manager.h | 1 + .../wifi_sta/sta_state_machine.cpp | 1 - 3 files changed, 47 insertions(+), 26 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp index 17c62df..6fa3559 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp @@ -95,6 +95,21 @@ void WifiManager::AutoStartStaService(void) return; } +void WifiManager::ForceStopWifi(void) +{ + WIFI_LOGI("Enter ForceStopWifi"); + IStaService *pService = WifiServiceManager::GetInstance().GetStaServiceInst(); + if (pService == nullptr || (pService->DisableWifi() != WIFI_OPT_SUCCESS)) { + WIFI_LOGE("service is null or disable wifi failed."); + WifiConfigCenter::GetInstance().SetWifiMidState(WifiOprMidState::CLOSED); + WifiServiceManager::GetInstance().UnloadService(WIFI_SERVICE_STA); + return; + } + WifiOprMidState curState = WifiConfigCenter::GetInstance().GetWifiMidState(); + WIFI_LOGI("In force stop wifi, state: %{public}d", static_cast(curState)); + WifiConfigCenter::GetInstance().SetWifiMidState(curState, WifiOprMidState::CLOSED); +} + #ifdef OHOS_ARCH_LITE void WifiManager::AutoStartStaServiceThread(void) { @@ -408,38 +423,35 @@ StaServiceCallback WifiManager::GetStaCallback() void WifiManager::DealStaOpenRes(OperateResState state) { + WIFI_LOGI("Enter DealStaOpenRes: %{public}d", static_cast(state)); WifiEventCallbackMsg cbMsg; cbMsg.msgCode = WIFI_CBK_MSG_STATE_CHANGE; - if (state == OperateResState::OPEN_WIFI_FAILED) { - WIFI_LOGD("DealStaOpenRes:upload wifi open failed event!"); - cbMsg.msgData = static_cast(WifiState::UNKNOWN); - WifiInternalEventDispatcher::GetInstance().AddBroadCastMsg(cbMsg); - } else if (state == OperateResState::OPEN_WIFI_OPENING) { + if (state == OperateResState::OPEN_WIFI_OPENING) { cbMsg.msgData = static_cast(WifiState::ENABLING); WifiInternalEventDispatcher::GetInstance().AddBroadCastMsg(cbMsg); - } else if (state == OperateResState::OPEN_WIFI_DISABLED) { - WIFI_LOGD("DealStaOpenRes:wifi open failed,close wifi sta service!"); + return; + } + if ((state == OperateResState::OPEN_WIFI_FAILED) || (state == OperateResState::OPEN_WIFI_DISABLED)) { + WIFI_LOGE("DealStaOpenRes:wifi open failed!"); + WifiConfigCenter::GetInstance().SetWifiMidState(WifiOprMidState::OPENING, WifiOprMidState::CLOSED); DealStaCloseRes(state); - } else { - WIFI_LOGD("DealStaOpenRes:wifi open successfully!"); - WifiConfigCenter::GetInstance().SetWifiMidState(WifiOprMidState::OPENING, WifiOprMidState::RUNNING); - WifiConfigCenter::GetInstance().SetStaLastRunState(true); - if (WifiConfigCenter::GetInstance().GetAirplaneModeState() == 1) { - WifiConfigCenter::GetInstance().SetWifiStateWhenAirplaneMode(true); - } - - cbMsg.msgData = static_cast(WifiState::ENABLED); - WifiInternalEventDispatcher::GetInstance().AddBroadCastMsg(cbMsg); - - CheckAndStartScanService(); + return; } - return; + WIFI_LOGI("DealStaOpenRes:wifi open successfully!"); + WifiConfigCenter::GetInstance().SetWifiMidState(WifiOprMidState::OPENING, WifiOprMidState::RUNNING); + WifiConfigCenter::GetInstance().SetStaLastRunState(true); + if (WifiConfigCenter::GetInstance().GetAirplaneModeState() == 1) { + WifiConfigCenter::GetInstance().SetWifiStateWhenAirplaneMode(true); + } + cbMsg.msgData = static_cast(WifiState::ENABLED); + WifiInternalEventDispatcher::GetInstance().AddBroadCastMsg(cbMsg); + CheckAndStartScanService(); } void WifiManager::DealStaCloseRes(OperateResState state) { - WIFI_LOGI("Enter DealStaCloseRes"); + WIFI_LOGI("Enter DealStaCloseRes: %{public}d", static_cast(state)); WifiEventCallbackMsg cbMsg; cbMsg.msgCode = WIFI_CBK_MSG_STATE_CHANGE; if (state == OperateResState::CLOSE_WIFI_CLOSING) { @@ -448,18 +460,16 @@ void WifiManager::DealStaCloseRes(OperateResState state) return; } if (state == OperateResState::CLOSE_WIFI_FAILED) { - WIFI_LOGI("DealStaCloseRes:upload wifi close failed event!"); + WIFI_LOGI("DealStaCloseRes: broadcast wifi close failed event!"); cbMsg.msgData = static_cast(WifiState::UNKNOWN); WifiInternalEventDispatcher::GetInstance().AddBroadCastMsg(cbMsg); + ForceStopWifi(); } - if (WifiConfigCenter::GetInstance().GetAirplaneModeState() == 1) { WifiConfigCenter::GetInstance().SetWifiStateWhenAirplaneMode(false); } - cbMsg.msgData = static_cast(WifiState::DISABLED); WifiInternalEventDispatcher::GetInstance().AddBroadCastMsg(cbMsg); - CheckAndStopScanService(); WifiManager::GetInstance().PushServiceCloseMsg(WifiCloseServiceCode::STA_SERVICE_CLOSE); return; @@ -736,6 +746,7 @@ IP2pServiceCallbacks WifiManager::GetP2pCallback(void) void WifiManager::DealP2pStateChanged(P2pState state) { + WIFI_LOGI("DealP2pStateChanged, state: %{public}d", static_cast(state)); WifiEventCallbackMsg cbMsg; cbMsg.msgCode = WIFI_CBK_MSG_P2P_STATE_CHANGE; cbMsg.msgData = static_cast(state); @@ -746,6 +757,16 @@ void WifiManager::DealP2pStateChanged(P2pState state) if (state == P2pState::P2P_STATE_STARTED) { WifiConfigCenter::GetInstance().SetP2pMidState(WifiOprMidState::OPENING, WifiOprMidState::RUNNING); } + if (state == P2pState::P2P_STATE_CLOSED) { + bool ret = WifiConfigCenter::GetInstance().SetP2pMidState(WifiOprMidState::OPENING, WifiOprMidState::CLOSED); + if (ret) { + WIFI_LOGE("P2p start failed, stop wifi!"); + ForceStopWifi(); + cbMsg.msgCode = WIFI_CBK_MSG_STATE_CHANGE; + cbMsg.msgData = static_cast(WifiState::DISABLED); + WifiInternalEventDispatcher::GetInstance().AddBroadCastMsg(cbMsg); + } + } WifiCommonEventHelper::PublishP2pStateChangedEvent((int)state, "OnP2pStateChanged"); return; } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.h index 3f52df8..9a5892a 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.h @@ -186,6 +186,7 @@ private: static void DealConfigChanged(CfgType type, char* data, int dataLen); #endif static void AutoStartStaService(void); + static void ForceStopWifi(void); #ifdef FEATURE_P2P_SUPPORT static void AutoStartP2pService(void); #endif diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp index 605a25d..2f988fc 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp @@ -434,7 +434,6 @@ void StaStateMachine::StartWifiProcess() WifiSettings::GetInstance().SetWifiState(static_cast(WifiState::DISABLED)); WifiSettings::GetInstance().SetUserLastSelectedNetworkId(INVALID_NETWORK_ID); staCallback.OnStaOpenRes(OperateResState::OPEN_WIFI_FAILED); - staCallback.OnStaOpenRes(OperateResState::OPEN_WIFI_DISABLED); } } -- Gitee From d646dee5c02f75d898db2e9fa91a1e39c2f1a70e Mon Sep 17 00:00:00 2001 From: y00316381 Date: Thu, 18 Aug 2022 20:15:51 +0800 Subject: [PATCH 318/491] bugfix for enableWifi 0818 Signed-off-by: y00316381 --- wifi/frameworks/js/napi/src/wifi_napi_device.cpp | 3 --- .../wpa_supplicant_hal/wifi_wpa_common.c | 10 +++++++--- .../wpa_sta_hal/wifi_supplicant_hal.c | 2 ++ .../wifi_standard/wifi_hal/wifi_hal_sta_interface.c | 4 ++-- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp index eeddd4e..5e04885 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp @@ -954,9 +954,6 @@ static void DeviceConfigToJsArray(const napi_env& env, std::vector(IpTypeJs::IP_TYPE_DHCP), result); } - WIFI_LOGI("DeviceConfigToJsArray, idx:%{public}d, assignMethod:%{public}x!", - idx, static_cast(vecDeviceConfigs[idx].wifiIpConfig.assignMethod)); - napi_value ipCfgObj; napi_create_object(env, &ipCfgObj); IpConfigToJs(env, vecDeviceConfigs[idx].wifiIpConfig, ipCfgObj); diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_common.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_common.c index fe02282..33c81d6 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_common.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_common.c @@ -110,16 +110,20 @@ int InitWpaCtrl(WpaCtrl *pCtrl, const char *ifname) } int flag = 0; do { - pCtrl->pSend = wpa_ctrl_open("global"); pCtrl->pRecv = wpa_ctrl_open("global"); - if (pCtrl->pSend == NULL || pCtrl->pRecv == NULL) { - LOGE("open wpa control interface failed!"); + if (pCtrl->pRecv == NULL) { + LOGE("open wpa control recv interface failed!"); break; } if (wpa_ctrl_attach(pCtrl->pRecv) != 0) { LOGE("attach monitor interface failed!"); break; } + pCtrl->pSend = wpa_ctrl_open("global"); + if (pCtrl->pSend == NULL) { + LOGE("open wpa control send interface failed!"); + break; + } flag += 1; } while (0); if (!flag) { diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c index b123466..4c83fdf 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c @@ -714,6 +714,8 @@ static int WpaCliCmdScan(WifiWpaStaInterface *this, const ScanSettings *settings unsigned len = CMD_BUFFER_SIZE; if (settings != NULL) { unsigned expectLen = strlen("IFNAME=") + strlen(this->ifname) + 1 + strlen("SCAN"); + LOGE("WpaCliCmdScan, freqSize=%{public}d, hiddenSsidSize=%{public}d", + settings->freqSize, settings->hiddenSsidSize); if (settings->freqSize > 0) { expectLen += strlen(" freq=") + (CMD_FREQ_MAX_LEN + 1) * settings->freqSize; } diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c index 3739c5d..df6203c 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c @@ -129,7 +129,7 @@ WifiErrorNo Start(void) WifiErrorNo Stop(void) { - LOGD("Ready to Stop wifi"); + LOGI("Ready to Stop wifi"); WifiErrorNo err = StopWpaAndWpaHal(0); if (err == WIFI_HAL_FAILED) { LOGD("Wifi stop failed!"); @@ -141,7 +141,7 @@ WifiErrorNo Stop(void) WifiErrorNo ForceStop(void) { - LOGD("Ready force Stop wifi"); + LOGI("Ready force Stop wifi"); WifiWpaStaInterface *p = TraversalWifiStaInterface(); while (p != NULL) { StopWpaAndWpaHal(p->staNo); -- Gitee From 98b5ce8294e242f17543ef97f0301d33751dac2a Mon Sep 17 00:00:00 2001 From: y00316381 Date: Thu, 18 Aug 2022 20:20:14 +0800 Subject: [PATCH 319/491] bugfix for enableWifi 0818 Signed-off-by: y00316381 --- .../wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c index 4c83fdf..421c23b 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c @@ -714,7 +714,7 @@ static int WpaCliCmdScan(WifiWpaStaInterface *this, const ScanSettings *settings unsigned len = CMD_BUFFER_SIZE; if (settings != NULL) { unsigned expectLen = strlen("IFNAME=") + strlen(this->ifname) + 1 + strlen("SCAN"); - LOGE("WpaCliCmdScan, freqSize=%{public}d, hiddenSsidSize=%{public}d", + LOGI("WpaCliCmdScan, freqSize=%{public}d, hiddenSsidSize=%{public}d", settings->freqSize, settings->hiddenSsidSize); if (settings->freqSize > 0) { expectLen += strlen(" freq=") + (CMD_FREQ_MAX_LEN + 1) * settings->freqSize; -- Gitee From 98cb2e344bdd4aefdf42ab054cb193af2fff3e60 Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Mon, 22 Aug 2022 02:37:00 +0000 Subject: [PATCH 320/491] Optimize code compilation and dependency Signed-off-by: zhangfeng --- dhcp/services/dhcp_client/BUILD.gn | 2 +- dhcp/services/mgr_service/BUILD.gn | 2 +- dhcp/test/services/dhcp_client/BUILD.gn | 2 +- dhcp/test/services/mgr_service/BUILD.gn | 2 +- wifi/BUILD.gn | 2 +- wifi/bundle.json | 4 +- wifi/frameworks/js/napi/BUILD.gn | 14 +-- wifi/frameworks/native/BUILD.gn | 18 ++- .../native/c_adapter/src/wifi_c_hotspot.cpp | 4 +- .../wifi_standard/ipc_framework/cRPC/BUILD.gn | 4 +- .../wifi_standard/wifi_framework/BUILD.gn | 1 + .../wifi_framework/wifi_manage/BUILD.gn | 84 +++++-------- .../wifi_manage/idl_client/BUILD.gn | 51 ++------ .../wifi_manage/wifi_ap/BUILD.gn | 15 ++- .../wifi_manage/wifi_common/BUILD.gn | 10 +- .../wifi_manage/wifi_net_agent.cpp | 1 + .../wifi_manage/wifi_p2p/BUILD.gn | 16 ++- .../wifi_p2p/p2p_state_machine.cpp | 15 ++- .../wifi_manage/wifi_p2p_service_impl.cpp | 15 +-- .../wifi_manage/wifi_scan/BUILD.gn | 13 +- .../wifi_manage/wifi_sta/BUILD.gn | 20 ++- .../wifi_sta/sta_state_machine.cpp | 11 +- .../wifi_framework/wifi_toolkit/BUILD.gn | 118 ++++++++++++++++++ .../config/wifi_config_country_freqs.h | 0 .../config/wifi_config_file_impl.h | 0 .../config/wifi_config_file_spec.cpp | 0 .../config/wifi_config_file_spec.h | 0 .../config/wifi_settings.cpp | 0 .../config/wifi_settings.h | 0 .../include/permission_def.h | 0 .../include/wifi_internal_msg.h | 0 .../{common => wifi_toolkit}/log/log_helper.c | 0 .../{common => wifi_toolkit}/log/log_helper.h | 0 .../{common => wifi_toolkit}/log/wifi_log.h | 0 .../log/wifi_log_tags.h | 0 .../log/wifi_logger.h | 0 .../net_helper/arp_checker.cpp | 0 .../net_helper/arp_checker.h | 0 .../net_helper/base_address.cpp | 0 .../net_helper/base_address.h | 0 .../net_helper/dhcpd_interface.cpp | 8 +- .../net_helper/dhcpd_interface.h | 0 .../net_helper/http_request.cpp | 0 .../net_helper/http_request.h | 0 .../net_helper/if_config.cpp | 0 .../net_helper/if_config.h | 3 + .../net_helper/ip_tools.cpp | 0 .../net_helper/ip_tools.h | 0 .../net_helper/ipv4_address.cpp | 0 .../net_helper/ipv4_address.h | 0 .../net_helper/ipv6_address.cpp | 0 .../net_helper/ipv6_address.h | 0 .../net_helper/mac_address.cpp | 0 .../net_helper/mac_address.h | 0 .../net_helper/network_interface.cpp | 0 .../net_helper/network_interface.h | 0 .../net_helper/raw_socket.cpp | 0 .../net_helper/raw_socket.h | 0 .../utils/wifi_common_event_helper.cpp | 3 +- .../utils/wifi_common_event_helper.h | 5 +- .../utils/wifi_global_func.cpp | 0 .../utils/wifi_global_func.h | 0 .../wifi_sta/adddeviceconfig_fuzzer/BUILD.gn | 2 +- .../wifi_sta/connecttodevice_fuzzer/BUILD.gn | 2 +- wifi/test/wifi_client/BUILD.gn | 2 +- .../wifi_manage/idl_client/unittest/BUILD.gn | 22 ++-- .../wifi_manage/unittest/BUILD.gn | 16 ++- .../wifi_manage/wifi_ap/BUILD.gn | 21 ++-- .../wifi_manage/wifi_p2p/test/BUILD.gn | 25 ++-- .../wifi_manage/wifi_scan/BUILD.gn | 17 +-- .../wifi_manage/wifi_sta/BUILD.gn | 16 ++- .../unittest/BUILD.gn | 34 ++--- .../unittest/common_test.cpp | 0 .../unittest/wifi_config_file_test.cpp | 0 .../unittest/wifi_config_file_test.h | 0 .../unittest/wifi_global_func_test.cpp | 0 .../unittest/wifi_global_func_test.h | 0 .../unittest/wifi_ip_tools_test.cpp | 0 .../unittest/wifi_ip_tools_test.h | 0 .../unittest/wifi_log_helper_test.cpp | 0 .../unittest/wifi_log_helper_test.h | 0 .../unittest/wifi_network_interface_test.cpp | 0 .../unittest/wifi_network_interface_test.h | 0 wifi/utils/{src => }/BUILD.gn | 10 +- wifi/utils/inc/wifi_common_util.h | 6 +- wifi/utils/src/wifi_common_util.cpp | 10 +- 86 files changed, 333 insertions(+), 293 deletions(-) create mode 100644 wifi/services/wifi_standard/wifi_framework/wifi_toolkit/BUILD.gn rename wifi/services/wifi_standard/wifi_framework/{common => wifi_toolkit}/config/wifi_config_country_freqs.h (100%) rename wifi/services/wifi_standard/wifi_framework/{common => wifi_toolkit}/config/wifi_config_file_impl.h (100%) rename wifi/services/wifi_standard/wifi_framework/{common => wifi_toolkit}/config/wifi_config_file_spec.cpp (100%) rename wifi/services/wifi_standard/wifi_framework/{common => wifi_toolkit}/config/wifi_config_file_spec.h (100%) rename wifi/services/wifi_standard/wifi_framework/{common => wifi_toolkit}/config/wifi_settings.cpp (100%) rename wifi/services/wifi_standard/wifi_framework/{common => wifi_toolkit}/config/wifi_settings.h (100%) rename wifi/services/wifi_standard/wifi_framework/{common => wifi_toolkit}/include/permission_def.h (100%) rename wifi/services/wifi_standard/wifi_framework/{common => wifi_toolkit}/include/wifi_internal_msg.h (100%) rename wifi/services/wifi_standard/wifi_framework/{common => wifi_toolkit}/log/log_helper.c (100%) rename wifi/services/wifi_standard/wifi_framework/{common => wifi_toolkit}/log/log_helper.h (100%) rename wifi/services/wifi_standard/wifi_framework/{common => wifi_toolkit}/log/wifi_log.h (100%) rename wifi/services/wifi_standard/wifi_framework/{common => wifi_toolkit}/log/wifi_log_tags.h (100%) rename wifi/services/wifi_standard/wifi_framework/{common => wifi_toolkit}/log/wifi_logger.h (100%) rename wifi/services/wifi_standard/wifi_framework/{common => wifi_toolkit}/net_helper/arp_checker.cpp (100%) rename wifi/services/wifi_standard/wifi_framework/{common => wifi_toolkit}/net_helper/arp_checker.h (100%) rename wifi/services/wifi_standard/wifi_framework/{common => wifi_toolkit}/net_helper/base_address.cpp (100%) rename wifi/services/wifi_standard/wifi_framework/{common => wifi_toolkit}/net_helper/base_address.h (100%) rename wifi/services/wifi_standard/wifi_framework/{common => wifi_toolkit}/net_helper/dhcpd_interface.cpp (99%) rename wifi/services/wifi_standard/wifi_framework/{common => wifi_toolkit}/net_helper/dhcpd_interface.h (100%) rename wifi/services/wifi_standard/wifi_framework/{common => wifi_toolkit}/net_helper/http_request.cpp (100%) rename wifi/services/wifi_standard/wifi_framework/{common => wifi_toolkit}/net_helper/http_request.h (100%) rename wifi/services/wifi_standard/wifi_framework/{common => wifi_toolkit}/net_helper/if_config.cpp (100%) rename wifi/services/wifi_standard/wifi_framework/{common => wifi_toolkit}/net_helper/if_config.h (99%) rename wifi/services/wifi_standard/wifi_framework/{common => wifi_toolkit}/net_helper/ip_tools.cpp (100%) rename wifi/services/wifi_standard/wifi_framework/{common => wifi_toolkit}/net_helper/ip_tools.h (100%) rename wifi/services/wifi_standard/wifi_framework/{common => wifi_toolkit}/net_helper/ipv4_address.cpp (100%) rename wifi/services/wifi_standard/wifi_framework/{common => wifi_toolkit}/net_helper/ipv4_address.h (100%) rename wifi/services/wifi_standard/wifi_framework/{common => wifi_toolkit}/net_helper/ipv6_address.cpp (100%) rename wifi/services/wifi_standard/wifi_framework/{common => wifi_toolkit}/net_helper/ipv6_address.h (100%) rename wifi/services/wifi_standard/wifi_framework/{common => wifi_toolkit}/net_helper/mac_address.cpp (100%) rename wifi/services/wifi_standard/wifi_framework/{common => wifi_toolkit}/net_helper/mac_address.h (100%) rename wifi/services/wifi_standard/wifi_framework/{common => wifi_toolkit}/net_helper/network_interface.cpp (100%) rename wifi/services/wifi_standard/wifi_framework/{common => wifi_toolkit}/net_helper/network_interface.h (100%) rename wifi/services/wifi_standard/wifi_framework/{common => wifi_toolkit}/net_helper/raw_socket.cpp (100%) rename wifi/services/wifi_standard/wifi_framework/{common => wifi_toolkit}/net_helper/raw_socket.h (100%) rename wifi/services/wifi_standard/wifi_framework/{common => wifi_toolkit}/utils/wifi_common_event_helper.cpp (98%) rename wifi/services/wifi_standard/wifi_framework/{common => wifi_toolkit}/utils/wifi_common_event_helper.h (97%) rename wifi/services/wifi_standard/wifi_framework/{common => wifi_toolkit}/utils/wifi_global_func.cpp (100%) rename wifi/services/wifi_standard/wifi_framework/{common => wifi_toolkit}/utils/wifi_global_func.h (100%) rename wifi/test/wifi_standard/wifi_framework/{common => wifi_toolkit}/unittest/BUILD.gn (52%) rename wifi/test/wifi_standard/wifi_framework/{common => wifi_toolkit}/unittest/common_test.cpp (100%) rename wifi/test/wifi_standard/wifi_framework/{common => wifi_toolkit}/unittest/wifi_config_file_test.cpp (100%) rename wifi/test/wifi_standard/wifi_framework/{common => wifi_toolkit}/unittest/wifi_config_file_test.h (100%) rename wifi/test/wifi_standard/wifi_framework/{common => wifi_toolkit}/unittest/wifi_global_func_test.cpp (100%) rename wifi/test/wifi_standard/wifi_framework/{common => wifi_toolkit}/unittest/wifi_global_func_test.h (100%) rename wifi/test/wifi_standard/wifi_framework/{common => wifi_toolkit}/unittest/wifi_ip_tools_test.cpp (100%) rename wifi/test/wifi_standard/wifi_framework/{common => wifi_toolkit}/unittest/wifi_ip_tools_test.h (100%) rename wifi/test/wifi_standard/wifi_framework/{common => wifi_toolkit}/unittest/wifi_log_helper_test.cpp (100%) rename wifi/test/wifi_standard/wifi_framework/{common => wifi_toolkit}/unittest/wifi_log_helper_test.h (100%) rename wifi/test/wifi_standard/wifi_framework/{common => wifi_toolkit}/unittest/wifi_network_interface_test.cpp (100%) rename wifi/test/wifi_standard/wifi_framework/{common => wifi_toolkit}/unittest/wifi_network_interface_test.h (100%) rename wifi/utils/{src => }/BUILD.gn (89%) diff --git a/dhcp/services/dhcp_client/BUILD.gn b/dhcp/services/dhcp_client/BUILD.gn index fc82144..78d9711 100644 --- a/dhcp/services/dhcp_client/BUILD.gn +++ b/dhcp/services/dhcp_client/BUILD.gn @@ -33,7 +33,7 @@ local_base_sources = [ local_base_include_dirs = [ "$DHCP_ROOT_DIR/services/dhcp_client/include", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/log", ] if (defined(ohos_lite)) { diff --git a/dhcp/services/mgr_service/BUILD.gn b/dhcp/services/mgr_service/BUILD.gn index 605e8c6..b982395 100644 --- a/dhcp/services/mgr_service/BUILD.gn +++ b/dhcp/services/mgr_service/BUILD.gn @@ -31,7 +31,7 @@ local_base_sources = [ ] local_base_include_dirs = [ - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/log", "$DHCP_ROOT_DIR/services/mgr_service/include", "$DHCP_ROOT_DIR/interfaces/inner_api/interfaces", "$DHCP_ROOT_DIR/interfaces/inner_api/include", diff --git a/dhcp/test/services/dhcp_client/BUILD.gn b/dhcp/test/services/dhcp_client/BUILD.gn index cbf7c1a..1728f97 100644 --- a/dhcp/test/services/dhcp_client/BUILD.gn +++ b/dhcp/test/services/dhcp_client/BUILD.gn @@ -50,7 +50,7 @@ ohos_unittest("dhcp_client_unittest") { "//third_party/googletest/googlemock/include", "$DHCP_ROOT_DIR/services/dhcp_client/test", "$DHCP_ROOT_DIR/services/dhcp_client/include", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/log", "//commonlibrary/c_utils/base/include", "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", "//third_party/openssl/include", diff --git a/dhcp/test/services/mgr_service/BUILD.gn b/dhcp/test/services/mgr_service/BUILD.gn index 0d6c7f9..10e44e0 100644 --- a/dhcp/test/services/mgr_service/BUILD.gn +++ b/dhcp/test/services/mgr_service/BUILD.gn @@ -51,7 +51,7 @@ ohos_unittest("dhcp_manage_unittest") { "$DHCP_ROOT_DIR/services/mgr_service/include", "$DHCP_ROOT_DIR/interfaces/inner_api/include", "$DHCP_ROOT_DIR/interfaces/inner_api/interfaces", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/log", "//commonlibrary/c_utils/base/include", "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", "${even_path}/cesfwk/kits/native/include", diff --git a/wifi/BUILD.gn b/wifi/BUILD.gn index 77f5a1d..f99a0a8 100644 --- a/wifi/BUILD.gn +++ b/wifi/BUILD.gn @@ -22,7 +22,7 @@ if (defined(ohos_lite)) { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework:wifi_system_ability", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal:wifi_hal", "$WIFI_ROOT_DIR/test/wifi_client:wifi_client", - "$WIFI_ROOT_DIR/utils/src:wifi_utils", + "$WIFI_ROOT_DIR/utils:wifi_utils", ] features = [] } diff --git a/wifi/bundle.json b/wifi/bundle.json index 73c958b..2be4cbc 100644 --- a/wifi/bundle.json +++ b/wifi/bundle.json @@ -78,7 +78,7 @@ "//foundation/communication/wifi/wifi/services/wifi_standard/wifi_framework:wifi_manage", "//foundation/communication/wifi/wifi/services/wifi_standard/wifi_framework:wifi_system_ability", "//foundation/communication/wifi/wifi/services/wifi_standard/wifi_hal:wifi_hal", - "//foundation/communication/wifi/wifi/utils/src:wifi_utils" + "//foundation/communication/wifi/wifi/utils:wifi_utils" ], "inner_kits": [ { @@ -114,7 +114,7 @@ "//foundation/communication/wifi/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap:unittest", "//foundation/communication/wifi/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test:unittest", "//foundation/communication/wifi/wifi/test/wifi_standard/ipc_framework/cRPC/unittest:unittest", - "//foundation/communication/wifi/wifi/test/wifi_standard/wifi_framework/common/unittest:unittest", + "//foundation/communication/wifi/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest:unittest", "//foundation/communication/wifi/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest:unittest", "//foundation/communication/wifi/wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest:unittest", "//foundation/communication/wifi/wifi/test/wifi_standard/wifi_hal/unittest:unittest" diff --git a/wifi/frameworks/js/napi/BUILD.gn b/wifi/frameworks/js/napi/BUILD.gn index 98ba927..a5ac4ba 100644 --- a/wifi/frameworks/js/napi/BUILD.gn +++ b/wifi/frameworks/js/napi/BUILD.gn @@ -20,12 +20,12 @@ ohos_shared_library("wifi") { "//third_party/node/src", "//native_engine", "//commonlibrary/c_utils/base/include", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/log", "$WIFI_ROOT_DIR/frameworks/native/interfaces", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", "//base/security/access_token/interfaces/innerkits/accesstoken/include", "$WIFI_ROOT_DIR/frameworks/native/include", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper", "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/context", "$WIFI_ROOT_DIR/utils/inc", "$WIFI_ROOT_DIR/frameworks/js/napi/inc", @@ -41,7 +41,7 @@ ohos_shared_library("wifi") { ] deps = [ "$WIFI_ROOT_DIR/frameworks/native:wifi_sdk", - "$WIFI_ROOT_DIR/utils/src:wifi_utils", + "$WIFI_ROOT_DIR/utils:wifi_utils", "${ability_runtime_path}/frameworks/native/appkit:app_context", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//foundation/arkui/napi:ace_napi", @@ -65,7 +65,7 @@ ohos_shared_library("wifiext") { "//third_party/node/src", "//native_engine", "//commonlibrary/c_utils/base/include", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/log", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", "$WIFI_ROOT_DIR/frameworks/native/include", "$WIFI_ROOT_DIR/frameworks/native/interfaces", @@ -102,13 +102,13 @@ ohos_shared_library("wifi_native_js") { "//third_party/node/src", "//native_engine", "//commonlibrary/c_utils/base/include", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/log", "$WIFI_ROOT_DIR/frameworks/js/napi/inc", "$WIFI_ROOT_DIR/frameworks/native/include", "$WIFI_ROOT_DIR/frameworks/native/interfaces", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", "//base/security/access_token/interfaces/innerkits/accesstoken/include", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper", "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/context", "$WIFI_ROOT_DIR/utils/inc", ] @@ -123,7 +123,7 @@ ohos_shared_library("wifi_native_js") { ] deps = [ "$WIFI_ROOT_DIR/frameworks/native:wifi_sdk", - "$WIFI_ROOT_DIR/utils/src:wifi_utils", + "$WIFI_ROOT_DIR/utils:wifi_utils", "${ability_runtime_path}/frameworks/native/appkit:app_context", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//foundation/arkui/napi:ace_napi", diff --git a/wifi/frameworks/native/BUILD.gn b/wifi/frameworks/native/BUILD.gn index bc984b8..b77454a 100644 --- a/wifi/frameworks/native/BUILD.gn +++ b/wifi/frameworks/native/BUILD.gn @@ -34,9 +34,9 @@ if (defined(ohos_lite)) { "$WIFI_ROOT_DIR/frameworks/native/include", "$WIFI_ROOT_DIR/frameworks/native/interfaces", "$WIFI_ROOT_DIR/frameworks/native/c_adapter/inc", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log/", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/log/", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper", "$DHCP_ROOT_DIR/interfaces/inner_api/include", "$DHCP_ROOT_DIR/services/mgr_service/include", "$WIFI_ROOT_DIR/utils/inc", @@ -50,8 +50,7 @@ if (defined(ohos_lite)) { ] deps = [ - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", - "$WIFI_ROOT_DIR/utils/src:wifi_utils", + "$WIFI_ROOT_DIR/utils:wifi_utils", "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", "//foundation/communication/ipc/interfaces/innerkits/c/ipc:ipc_single", "//foundation/systemabilitymgr/samgr_lite/samgr:samgr", @@ -86,10 +85,10 @@ if (defined(ohos_lite)) { "$WIFI_ROOT_DIR/frameworks/native/include", "$WIFI_ROOT_DIR/frameworks/native/interfaces", "$WIFI_ROOT_DIR/frameworks/native/c_adapter/inc", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log/", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/log/", "//foundation/systemabilitymgr/samgr/adapter/interfaces/innerkits/include", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/include", "$DHCP_ROOT_DIR/interfaces/inner_api/include", "$DHCP_ROOT_DIR/services/mgr_service/include", "$WIFI_ROOT_DIR/interfaces/innerkits", @@ -200,8 +199,7 @@ if (defined(ohos_lite)) { ":wifi_hotspot_proxy_impl", ":wifi_p2p_proxy_impl", ":wifi_scan_proxy_impl", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", - "$WIFI_ROOT_DIR/utils/src:wifi_utils", + "$WIFI_ROOT_DIR/utils:wifi_utils", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/bounds_checking_function:libsec_static", diff --git a/wifi/frameworks/native/c_adapter/src/wifi_c_hotspot.cpp b/wifi/frameworks/native/c_adapter/src/wifi_c_hotspot.cpp index 66bb1e8..680224d 100644 --- a/wifi/frameworks/native/c_adapter/src/wifi_c_hotspot.cpp +++ b/wifi/frameworks/native/c_adapter/src/wifi_c_hotspot.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -156,7 +156,7 @@ static WifiErrorCode GetStaListFromCpp(const std::vectoripAddress = OHOS::Wifi::IpTools::ConvertIpv4Address(each.ipAddr); + result->ipAddress = OHOS::Wifi::Ip2Number(each.ipAddr); } return WIFI_SUCCESS; } diff --git a/wifi/services/wifi_standard/ipc_framework/cRPC/BUILD.gn b/wifi/services/wifi_standard/ipc_framework/cRPC/BUILD.gn index 5998535..3d8c68e 100644 --- a/wifi/services/wifi_standard/ipc_framework/cRPC/BUILD.gn +++ b/wifi/services/wifi_standard/ipc_framework/cRPC/BUILD.gn @@ -55,7 +55,7 @@ if (defined(ohos_lite)) { sources = crpc_client_sources include_dirs = [ "include", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/log", "//base/hiviewdfx/hilog_lite/interfaces/native/innerkits", "//third_party/bounds_checking_function/include", ] @@ -96,7 +96,7 @@ if (defined(ohos_lite)) { "include", "//commonlibrary/c_utils/base/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/log", ] cflags_cc = [ "-fno-rtti" ] deps = [ "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog" ] diff --git a/wifi/services/wifi_standard/wifi_framework/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/BUILD.gn index b267f9b..eac1007 100644 --- a/wifi/services/wifi_standard/wifi_framework/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/BUILD.gn @@ -39,6 +39,7 @@ group("wifi_manage") { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan:wifi_scan_service", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta:wifi_sta_service", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit", ] if (!defined(ohos_lite)) { deps += [ diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn index d2d8ae1..72a7b8e 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn @@ -26,17 +26,6 @@ if (defined(ohos_lite)) { if (defined(ohos_lite)) { shared_library("wifi_service_base") { sources = [ - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log/log_helper.c", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/base_address.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/network_interface.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils/wifi_common_event_helper.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_helper.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_utils.cpp", "wifi_auth_center.cpp", @@ -59,11 +48,11 @@ if (defined(ohos_lite)) { "$WIFI_ROOT_DIR/frameworks/native/include", "$WIFI_ROOT_DIR/frameworks/native/interfaces", "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/log", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/utils", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/config", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client", @@ -84,7 +73,8 @@ if (defined(ohos_lite)) { deps = [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", - "$WIFI_ROOT_DIR/utils/src:wifi_utils", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit", + "$WIFI_ROOT_DIR/utils:wifi_utils", "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", "//foundation/communication/ipc/interfaces/innerkits/c/ipc:ipc_single", "//foundation/systemabilitymgr/samgr_lite/samgr:samgr", @@ -118,11 +108,11 @@ if (defined(ohos_lite)) { "$WIFI_ROOT_DIR/frameworks/native/include", "$WIFI_ROOT_DIR/frameworks/native/interfaces", "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/log", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/utils", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/config", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client", @@ -144,7 +134,7 @@ if (defined(ohos_lite)) { deps = [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_service_base", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", - "$WIFI_ROOT_DIR/utils/src:wifi_utils", + "$WIFI_ROOT_DIR/utils:wifi_utils", "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", "//foundation/communication/ipc/interfaces/innerkits/c/ipc:ipc_single", "//foundation/systemabilitymgr/samgr_lite/samgr:samgr", @@ -167,11 +157,11 @@ if (defined(ohos_lite)) { "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk/", "$WIFI_ROOT_DIR/frameworks/native/interfaces", "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/log", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/utils", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/config", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client", @@ -278,6 +268,8 @@ if (defined(ohos_lite)) { ":wifi_manager_service_header", ] + deps = [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit" ] + external_deps = [ "ability_base:want", "bundle_framework:appexecfwk_base", @@ -294,7 +286,6 @@ if (defined(ohos_lite)) { sources = [ "$WIFI_ROOT_DIR/frameworks/native/src/wifi_hid2d_msg.cpp", "$WIFI_ROOT_DIR/frameworks/native/src/wifi_p2p_msg.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp", "wifi_p2p_callback_proxy.cpp", "wifi_p2p_death_recipient.cpp", "wifi_p2p_service_impl.cpp", @@ -305,7 +296,10 @@ if (defined(ohos_lite)) { ":wifi_manager_service_header", ] - deps = [ "//foundation/communication/netmanager_base/services/netmanagernative:netsys_native_manager" ] + deps = [ + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit", + "//foundation/communication/netmanager_base/services/netmanagernative:netsys_native_manager", + ] external_deps = [ "ability_base:want", @@ -320,19 +314,6 @@ if (defined(ohos_lite)) { ohos_shared_library("wifi_manager_service") { install_enable = true sources = [ - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log/log_helper.c", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/arp_checker.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/base_address.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/network_interface.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/raw_socket.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils/wifi_common_event_helper.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_helper.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_utils.cpp", "wifi_auth_center.cpp", @@ -347,7 +328,8 @@ if (defined(ohos_lite)) { deps = [ "$WIFI_ROOT_DIR/services/wifi_standard/etc/init:etc", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", - "$WIFI_ROOT_DIR/utils/src:wifi_utils", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit", + "$WIFI_ROOT_DIR/utils:wifi_utils", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//foundation/communication/netmanager_base/services/netmanagernative:netsys_native_manager", "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk:system_ability_fwk", @@ -356,12 +338,9 @@ if (defined(ohos_lite)) { configs = [ ":wifi_manager_service_header" ] external_deps = [ - "ability_base:want", "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", "c_utils:utils", - "common_event_service:cesfwk_innerkits", - "eventhandler:libeventhandler", "ipc:ipc_core", "netmanager_base:net_conn_manager_if", "safwk:system_ability_fwk", @@ -380,13 +359,14 @@ if (defined(ohos_lite)) { part_name = "wifi" subsystem_name = "communication" } + ohos_shared_library("wifi_device_ability") { install_enable = true deps = [ ":wifi_device_service_impl", ":wifi_manager_service", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", - "$WIFI_ROOT_DIR/utils/src:wifi_utils", + "$WIFI_ROOT_DIR/utils:wifi_utils", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk:system_ability_fwk", ] @@ -398,6 +378,7 @@ if (defined(ohos_lite)) { part_name = "wifi" subsystem_name = "communication" } + ohos_shared_library("wifi_scan_ability") { install_enable = true deps = [ @@ -415,12 +396,13 @@ if (defined(ohos_lite)) { part_name = "wifi" subsystem_name = "communication" } + ohos_shared_library("wifi_hotspot_ability") { install_enable = true deps = [ ":wifi_hotspot_service_impl", ":wifi_manager_service", - "$WIFI_ROOT_DIR/utils/src:wifi_utils", + "$WIFI_ROOT_DIR/utils:wifi_utils", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk:system_ability_fwk", ] @@ -429,15 +411,17 @@ if (defined(ohos_lite)) { "c_utils:utils", "ipc:ipc_core", ] + part_name = "wifi" subsystem_name = "communication" } + ohos_shared_library("wifi_p2p_ability") { install_enable = true deps = [ ":wifi_manager_service", ":wifi_p2p_service_impl", - "$WIFI_ROOT_DIR/utils/src:wifi_utils", + "$WIFI_ROOT_DIR/utils:wifi_utils", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk:system_ability_fwk", ] diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/BUILD.gn index ffa7ba7..687b6ac 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/BUILD.gn @@ -25,11 +25,11 @@ config("wifi_fw_common_header") { "$WIFI_ROOT_DIR/frameworks/native/interfaces", "$WIFI_ROOT_DIR/services/wifi_standard/sdk/include", "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/log", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/config", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/utils", "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/interface", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client", ] @@ -60,20 +60,9 @@ config("wifi_idl_cxx_config") { } } -net_helper_sources = [ - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/base_address.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/http_request.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/network_interface.cpp", -] - idl_client_sources = [ "$WIFI_ROOT_DIR/frameworks/native/src/wifi_hid2d_msg.cpp", "$WIFI_ROOT_DIR/frameworks/native/src/wifi_msg.cpp", - "$WIFI_ROOT_DIR/frameworks/native/src/wifi_p2p_msg.cpp", "idl_interface/i_wifi.c", "idl_interface/i_wifi_chip.c", "idl_interface/i_wifi_hotspot_iface.c", @@ -94,12 +83,7 @@ idl_client_sources = [ if (defined(ohos_lite)) { shared_library("wifi_idl_client") { - sources = net_helper_sources - sources += idl_client_sources - sources += [ - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log/log_helper.c", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp", - ] + sources = idl_client_sources configs += [ ":wifi_idl_cxx_config", @@ -108,6 +92,7 @@ if (defined(ohos_lite)) { deps = [ "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC:crpc_client", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit", "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", "//third_party/bounds_checking_function:libsec_shared", ] @@ -137,7 +122,7 @@ if (defined(ohos_lite)) { } else { ohos_source_set("wifi_utils") { part_name = "wifi" - sources = [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp" ] + sources = [] configs = [ ":wifi_idl_cxx_config", @@ -145,23 +130,6 @@ if (defined(ohos_lite)) { ] } - ohos_source_set("net_helper") { - part_name = "wifi" - sources = net_helper_sources - - configs = [ - ":wifi_idl_cxx_config", - ":wifi_fw_common_header", - ] - } - - ohos_source_set("log_helper") { - part_name = "wifi" - sources = [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log/log_helper.c" ] - - configs = [ ":wifi_fw_common_header" ] - } - ohos_shared_library("wifi_idl_client") { install_enable = true sources = idl_client_sources @@ -171,10 +139,9 @@ if (defined(ohos_lite)) { configs = [ ":wifi_fw_common_header" ] deps = [ - ":log_helper", - ":net_helper", ":wifi_utils", "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC:crpc_client", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit", ] external_deps = [ diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn index 05e30f7..68d3356 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn @@ -17,8 +17,6 @@ import("//foundation/communication/wifi/wifi/wifi.gni") ohos_shared_library("wifi_ap_service") { install_enable = true sources = [ - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/dhcpd_interface.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp", "../common/handler.cpp", "../common/internal_message.cpp", "../common/message_queue.cpp", @@ -42,11 +40,11 @@ ohos_shared_library("wifi_ap_service") { "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", "$WIFI_ROOT_DIR/frameworks/native/interfaces", "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/config", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/log", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/utils", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage", @@ -80,7 +78,8 @@ ohos_shared_library("wifi_ap_service") { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_common:wifi_common_service", - "$WIFI_ROOT_DIR/utils/src:wifi_utils", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit", + "$WIFI_ROOT_DIR/utils:wifi_utils", ] defines = [ "AP_INTF=\"$wifi_feature_with_ap_intf\"" ] diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_common/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_common/BUILD.gn index 363a969..f15b49e 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_common/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_common/BUILD.gn @@ -20,11 +20,11 @@ ohos_shared_library("wifi_common_service") { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface", "$WIFI_ROOT_DIR/frameworks/native/interfaces", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/utils", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/config", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/log", "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", ] diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_net_agent.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_net_agent.cpp index 12450bd..01931e1 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_net_agent.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_net_agent.cpp @@ -16,6 +16,7 @@ #include "wifi_net_agent.h" #include #include "inet_addr.h" +#include "ip_tools.h" #include "iservice_registry.h" #include "netsys_native_service_proxy.h" #include "net_conn_client.h" diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/BUILD.gn index a1a7300..e403528 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/BUILD.gn @@ -17,9 +17,6 @@ import("//foundation/communication/wifi/wifi/wifi.gni") ohos_shared_library("wifi_p2p_service") { install_enable = true sources = [ - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/dhcpd_interface.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/handler.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/internal_message.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.cpp", @@ -69,11 +66,11 @@ ohos_shared_library("wifi_p2p_service") { "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", "$WIFI_ROOT_DIR/frameworks/native/interfaces", "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/config", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/log", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/utils", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage", @@ -117,7 +114,8 @@ ohos_shared_library("wifi_p2p_service") { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_common:wifi_common_service", - "$WIFI_ROOT_DIR/utils/src:wifi_utils", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit", + "$WIFI_ROOT_DIR/utils:wifi_utils", ] part_name = "wifi" diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp index ad23bb9..23eecab 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp @@ -14,19 +14,18 @@ */ #include "p2p_state_machine.h" - -#include #include - -#include "wifi_p2p_hal_interface.h" +#include #include "dhcpd_interface.h" -#include "wifi_global_func.h" +#include "ip_tools.h" #include "wifi_broadcast_helper.h" -#include "wifi_p2p_upnp_service_response.h" -#include "wifi_p2p_dns_sd_service_response.h" -#include "wifi_p2p_dns_sd_service_info.h" +#include "wifi_global_func.h" #include "wifi_logger.h" #include "wifi_net_agent.h" +#include "wifi_p2p_dns_sd_service_info.h" +#include "wifi_p2p_dns_sd_service_response.h" +#include "wifi_p2p_hal_interface.h" +#include "wifi_p2p_upnp_service_response.h" DEFINE_WIFILOG_P2P_LABEL("P2pStateMachine"); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp index 0a73692..1521e80 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp @@ -15,19 +15,20 @@ #include "wifi_p2p_service_impl.h" #include -#include "wifi_permission_utils.h" +#include "define.h" +#include "if_config.h" +#include "ip_tools.h" #include "wifi_auth_center.h" #include "wifi_common_util.h" #include "wifi_config_center.h" -#include "wifi_manager.h" -#include "wifi_service_manager.h" -#include "wifi_internal_event_dispatcher.h" -#include "wifi_logger.h" -#include "define.h" #include "wifi_dumper.h" #include "wifi_hid2d_service_utils.h" -#include "if_config.h" +#include "wifi_internal_event_dispatcher.h" +#include "wifi_logger.h" +#include "wifi_manager.h" #include "wifi_net_agent.h" +#include "wifi_permission_utils.h" +#include "wifi_service_manager.h" DEFINE_WIFILOG_P2P_LABEL("WifiP2pServiceImpl"); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn index 6c10ff6..0c66f32 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn @@ -20,7 +20,6 @@ if (defined(ohos_lite)) { } local_base_sources = [ - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log/log_helper.c", "../common/handler.cpp", "../common/internal_message.cpp", "../common/message_queue.cpp", @@ -36,11 +35,11 @@ local_base_include_dirs = [ "$WIFI_ROOT_DIR/frameworks/native/interfaces", "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/interface", "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/config", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/log", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/utils", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/", @@ -62,6 +61,7 @@ if (defined(ohos_lite)) { deps = [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_service_base", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit", "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", "//third_party/bounds_checking_function:libsec_shared", ] @@ -91,6 +91,7 @@ if (defined(ohos_lite)) { deps = [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit", ] external_deps = [ diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn index c11e20e..f78042b 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn @@ -20,10 +20,6 @@ if (defined(ohos_lite)) { } local_base_sources = [ - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log/log_helper.c", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/http_request.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp", "../common/handler.cpp", "../common/internal_message.cpp", "../common/message_queue.cpp", @@ -43,11 +39,11 @@ local_base_include_dirs = [ "$WIFI_ROOT_DIR/frameworks/native/interfaces", "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/interface", "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/log", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/utils", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/config", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client", @@ -76,7 +72,8 @@ if (defined(ohos_lite)) { "$DHCP_ROOT_DIR/services/mgr_service:dhcp_manager_service", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_service_base", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", - "$WIFI_ROOT_DIR/utils/src:wifi_utils", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit", + "$WIFI_ROOT_DIR/utils:wifi_utils", "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", "//third_party/bounds_checking_function:libsec_shared", ] @@ -120,7 +117,8 @@ if (defined(ohos_lite)) { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_common:wifi_common_service", - "$WIFI_ROOT_DIR/utils/src:wifi_utils", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit", + "$WIFI_ROOT_DIR/utils:wifi_utils", ] external_deps = [ diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp index c8f2641..61ad370 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp @@ -16,15 +16,16 @@ #include "sta_state_machine.h" #include #include +#include "if_config.h" +#include "ip_tools.h" #include "log_helper.h" +#include "mac_address.h" #include "sta_monitor.h" +#include "wifi_chip_capability.h" +#include "wifi_common_util.h" #include "wifi_logger.h" -#include "wifi_sta_hal_interface.h" #include "wifi_settings.h" -#include "mac_address.h" -#include "if_config.h" -#include "wifi_common_util.h" -#include "wifi_chip_capability.h" +#include "wifi_sta_hal_interface.h" #include "wifi_supplicant_hal_interface.h" #ifndef OHOS_WIFI_STA_TEST diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/BUILD.gn new file mode 100644 index 0000000..766f5f3 --- /dev/null +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/BUILD.gn @@ -0,0 +1,118 @@ +# Copyright (C) 2022 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if (defined(ohos_lite)) { + import("//build/lite/config/component/lite_component.gni") + import("//foundation/communication/wifi/dhcp/dhcp_lite.gni") + import("//foundation/communication/wifi/wifi/wifi_lite.gni") +} else { + import("//build/ohos.gni") + import("//foundation/communication/wifi/dhcp/dhcp.gni") + import("//foundation/communication/wifi/wifi/wifi.gni") +} + +local_base_sources = [ + "$WIFI_ROOT_DIR/frameworks/native/src/wifi_p2p_msg.cpp", + "config/wifi_config_file_spec.cpp", + "config/wifi_settings.cpp", + "log/log_helper.c", + "net_helper/arp_checker.cpp", + "net_helper/base_address.cpp", + "net_helper/dhcpd_interface.cpp", + "net_helper/http_request.cpp", + "net_helper/if_config.cpp", + "net_helper/ip_tools.cpp", + "net_helper/ipv4_address.cpp", + "net_helper/ipv6_address.cpp", + "net_helper/mac_address.cpp", + "net_helper/network_interface.cpp", + "net_helper/raw_socket.cpp", + "utils/wifi_common_event_helper.cpp", + "utils/wifi_global_func.cpp", +] + +local_base_include_dirs = [ + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/log", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/utils", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/config", + "//commonlibrary/c_utils/base/include", + "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", + "$WIFI_ROOT_DIR/frameworks/native/interfaces", + "$DHCP_ROOT_DIR/interfaces/inner_api/interfaces", + "$DHCP_ROOT_DIR/interfaces/inner_api/include", + "$DHCP_ROOT_DIR/services/mgr_service/include", + "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", +] + +if (defined(ohos_lite)) { + shared_library("wifi_toolkit") { + sources = local_base_sources + include_dirs = local_base_include_dirs + + deps = [ + "$DHCP_ROOT_DIR/services/mgr_service:dhcp_manager_service", + "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", + ] + + defines = [ + "OHOS_ARCH_LITE", + "AP_INSTANCE_MAX_NUM=$wifi_feature_with_ap_num", + ] + + configs -= [ "//build/lite/config:language_cpp" ] + cflags_cc = [ + "-std=c++17", + "-fno-rtti", + ] + ldflags = [ + "-fPIC", + "-Wl,-E", + ] + } +} else { + ohos_shared_library("wifi_toolkit") { + install_enable = true + sources = local_base_sources + + include_dirs = local_base_include_dirs + + deps = [ + "$DHCP_ROOT_DIR/services/mgr_service:dhcp_manager_service", + "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", + ] + + defines = [ "AP_INSTANCE_MAX_NUM=$wifi_feature_with_ap_num" ] + + external_deps = [ + "ability_base:want", + "c_utils:utils", + "common_event_service:cesfwk_innerkits", + "eventhandler:libeventhandler", + ] + + cflags_cc = [ + "-std=c++17", + "-fno-rtti", + ] + + ldflags = [ + "-fPIC", + "-Wl,-E", + ] + + part_name = "wifi" + subsystem_name = "communication" + } +} diff --git a/wifi/services/wifi_standard/wifi_framework/common/config/wifi_config_country_freqs.h b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_country_freqs.h similarity index 100% rename from wifi/services/wifi_standard/wifi_framework/common/config/wifi_config_country_freqs.h rename to wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_country_freqs.h diff --git a/wifi/services/wifi_standard/wifi_framework/common/config/wifi_config_file_impl.h b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_impl.h similarity index 100% rename from wifi/services/wifi_standard/wifi_framework/common/config/wifi_config_file_impl.h rename to wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_impl.h diff --git a/wifi/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.cpp similarity index 100% rename from wifi/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.cpp diff --git a/wifi/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.h b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.h similarity index 100% rename from wifi/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.h rename to wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.h diff --git a/wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp similarity index 100% rename from wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp diff --git a/wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.h b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.h similarity index 100% rename from wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.h rename to wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.h diff --git a/wifi/services/wifi_standard/wifi_framework/common/include/permission_def.h b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/include/permission_def.h similarity index 100% rename from wifi/services/wifi_standard/wifi_framework/common/include/permission_def.h rename to wifi/services/wifi_standard/wifi_framework/wifi_toolkit/include/permission_def.h diff --git a/wifi/services/wifi_standard/wifi_framework/common/include/wifi_internal_msg.h b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/include/wifi_internal_msg.h similarity index 100% rename from wifi/services/wifi_standard/wifi_framework/common/include/wifi_internal_msg.h rename to wifi/services/wifi_standard/wifi_framework/wifi_toolkit/include/wifi_internal_msg.h diff --git a/wifi/services/wifi_standard/wifi_framework/common/log/log_helper.c b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/log/log_helper.c similarity index 100% rename from wifi/services/wifi_standard/wifi_framework/common/log/log_helper.c rename to wifi/services/wifi_standard/wifi_framework/wifi_toolkit/log/log_helper.c diff --git a/wifi/services/wifi_standard/wifi_framework/common/log/log_helper.h b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/log/log_helper.h similarity index 100% rename from wifi/services/wifi_standard/wifi_framework/common/log/log_helper.h rename to wifi/services/wifi_standard/wifi_framework/wifi_toolkit/log/log_helper.h diff --git a/wifi/services/wifi_standard/wifi_framework/common/log/wifi_log.h b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/log/wifi_log.h similarity index 100% rename from wifi/services/wifi_standard/wifi_framework/common/log/wifi_log.h rename to wifi/services/wifi_standard/wifi_framework/wifi_toolkit/log/wifi_log.h diff --git a/wifi/services/wifi_standard/wifi_framework/common/log/wifi_log_tags.h b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/log/wifi_log_tags.h similarity index 100% rename from wifi/services/wifi_standard/wifi_framework/common/log/wifi_log_tags.h rename to wifi/services/wifi_standard/wifi_framework/wifi_toolkit/log/wifi_log_tags.h diff --git a/wifi/services/wifi_standard/wifi_framework/common/log/wifi_logger.h b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/log/wifi_logger.h similarity index 100% rename from wifi/services/wifi_standard/wifi_framework/common/log/wifi_logger.h rename to wifi/services/wifi_standard/wifi_framework/wifi_toolkit/log/wifi_logger.h diff --git a/wifi/services/wifi_standard/wifi_framework/common/net_helper/arp_checker.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/arp_checker.cpp similarity index 100% rename from wifi/services/wifi_standard/wifi_framework/common/net_helper/arp_checker.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/arp_checker.cpp diff --git a/wifi/services/wifi_standard/wifi_framework/common/net_helper/arp_checker.h b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/arp_checker.h similarity index 100% rename from wifi/services/wifi_standard/wifi_framework/common/net_helper/arp_checker.h rename to wifi/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/arp_checker.h diff --git a/wifi/services/wifi_standard/wifi_framework/common/net_helper/base_address.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/base_address.cpp similarity index 100% rename from wifi/services/wifi_standard/wifi_framework/common/net_helper/base_address.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/base_address.cpp diff --git a/wifi/services/wifi_standard/wifi_framework/common/net_helper/base_address.h b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/base_address.h similarity index 100% rename from wifi/services/wifi_standard/wifi_framework/common/net_helper/base_address.h rename to wifi/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/base_address.h diff --git a/wifi/services/wifi_standard/wifi_framework/common/net_helper/dhcpd_interface.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/dhcpd_interface.cpp similarity index 99% rename from wifi/services/wifi_standard/wifi_framework/common/net_helper/dhcpd_interface.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/dhcpd_interface.cpp index b44d150..e4aa223 100644 --- a/wifi/services/wifi_standard/wifi_framework/common/net_helper/dhcpd_interface.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/dhcpd_interface.cpp @@ -12,15 +12,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "dhcpd_interface.h" -#include #include - +#include +#include "dhcp_define.h" +#include "dhcp_service.h" #include "network_interface.h" #include "wifi_global_func.h" -#include "dhcpd_interface.h" #include "wifi_logger.h" -#include "dhcp_service.h" DEFINE_WIFILOG_DHCP_LABEL("WifiDhcpdInterface"); diff --git a/wifi/services/wifi_standard/wifi_framework/common/net_helper/dhcpd_interface.h b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/dhcpd_interface.h similarity index 100% rename from wifi/services/wifi_standard/wifi_framework/common/net_helper/dhcpd_interface.h rename to wifi/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/dhcpd_interface.h diff --git a/wifi/services/wifi_standard/wifi_framework/common/net_helper/http_request.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/http_request.cpp similarity index 100% rename from wifi/services/wifi_standard/wifi_framework/common/net_helper/http_request.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/http_request.cpp diff --git a/wifi/services/wifi_standard/wifi_framework/common/net_helper/http_request.h b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/http_request.h similarity index 100% rename from wifi/services/wifi_standard/wifi_framework/common/net_helper/http_request.h rename to wifi/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/http_request.h diff --git a/wifi/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/if_config.cpp similarity index 100% rename from wifi/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/if_config.cpp diff --git a/wifi/services/wifi_standard/wifi_framework/common/net_helper/if_config.h b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/if_config.h similarity index 99% rename from wifi/services/wifi_standard/wifi_framework/common/net_helper/if_config.h rename to wifi/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/if_config.h index d14861e..bcfd277 100644 --- a/wifi/services/wifi_standard/wifi_framework/common/net_helper/if_config.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/if_config.h @@ -17,7 +17,10 @@ #include #include "wifi_log.h" + +#ifdef OHOS_ARCH_LITE #include "dhcp_define.h" +#endif namespace OHOS { namespace Wifi { diff --git a/wifi/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/ip_tools.cpp similarity index 100% rename from wifi/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/ip_tools.cpp diff --git a/wifi/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.h b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/ip_tools.h similarity index 100% rename from wifi/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.h rename to wifi/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/ip_tools.h diff --git a/wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/ipv4_address.cpp similarity index 100% rename from wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/ipv4_address.cpp diff --git a/wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.h b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/ipv4_address.h similarity index 100% rename from wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.h rename to wifi/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/ipv4_address.h diff --git a/wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/ipv6_address.cpp similarity index 100% rename from wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/ipv6_address.cpp diff --git a/wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.h b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/ipv6_address.h similarity index 100% rename from wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.h rename to wifi/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/ipv6_address.h diff --git a/wifi/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/mac_address.cpp similarity index 100% rename from wifi/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/mac_address.cpp diff --git a/wifi/services/wifi_standard/wifi_framework/common/net_helper/mac_address.h b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/mac_address.h similarity index 100% rename from wifi/services/wifi_standard/wifi_framework/common/net_helper/mac_address.h rename to wifi/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/mac_address.h diff --git a/wifi/services/wifi_standard/wifi_framework/common/net_helper/network_interface.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/network_interface.cpp similarity index 100% rename from wifi/services/wifi_standard/wifi_framework/common/net_helper/network_interface.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/network_interface.cpp diff --git a/wifi/services/wifi_standard/wifi_framework/common/net_helper/network_interface.h b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/network_interface.h similarity index 100% rename from wifi/services/wifi_standard/wifi_framework/common/net_helper/network_interface.h rename to wifi/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/network_interface.h diff --git a/wifi/services/wifi_standard/wifi_framework/common/net_helper/raw_socket.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/raw_socket.cpp similarity index 100% rename from wifi/services/wifi_standard/wifi_framework/common/net_helper/raw_socket.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/raw_socket.cpp diff --git a/wifi/services/wifi_standard/wifi_framework/common/net_helper/raw_socket.h b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/raw_socket.h similarity index 100% rename from wifi/services/wifi_standard/wifi_framework/common/net_helper/raw_socket.h rename to wifi/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/raw_socket.h diff --git a/wifi/services/wifi_standard/wifi_framework/common/utils/wifi_common_event_helper.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_common_event_helper.cpp similarity index 98% rename from wifi/services/wifi_standard/wifi_framework/common/utils/wifi_common_event_helper.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_common_event_helper.cpp index e8a83e1..34dfa68 100644 --- a/wifi/services/wifi_standard/wifi_framework/common/utils/wifi_common_event_helper.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_common_event_helper.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -18,6 +18,7 @@ #include "common_event_manager.h" #include "common_event.h" #include "common_event_data.h" +#include "common_event_subscriber.h" #endif #include "wifi_logger.h" diff --git a/wifi/services/wifi_standard/wifi_framework/common/utils/wifi_common_event_helper.h b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_common_event_helper.h similarity index 97% rename from wifi/services/wifi_standard/wifi_framework/common/utils/wifi_common_event_helper.h rename to wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_common_event_helper.h index 4709cd3..e93a59f 100644 --- a/wifi/services/wifi_standard/wifi_framework/common/utils/wifi_common_event_helper.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_common_event_helper.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -17,9 +17,6 @@ #define OHOS_WIFI_COMMON_EVENT_HELPER_H #include -#ifndef OHOS_ARCH_LITE -#include "common_event_subscriber.h" -#endif namespace OHOS { namespace Wifi { diff --git a/wifi/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_global_func.cpp similarity index 100% rename from wifi/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_global_func.cpp diff --git a/wifi/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.h b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_global_func.h similarity index 100% rename from wifi/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.h rename to wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_global_func.h diff --git a/wifi/test/fuzztest/wifi_sta/adddeviceconfig_fuzzer/BUILD.gn b/wifi/test/fuzztest/wifi_sta/adddeviceconfig_fuzzer/BUILD.gn index 2f76a02..d2892ca 100644 --- a/wifi/test/fuzztest/wifi_sta/adddeviceconfig_fuzzer/BUILD.gn +++ b/wifi/test/fuzztest/wifi_sta/adddeviceconfig_fuzzer/BUILD.gn @@ -26,7 +26,7 @@ ohos_fuzztest("AddDeviceConfigFuzzTest") { include_dirs = [ "$WIFI_ROOT_DIR/frameworks/native/include", "$WIFI_ROOT_DIR/frameworks/native/interfaces", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper", "$WIFI_ROOT_DIR/test/fuzztest/fuzz_common_func", ] diff --git a/wifi/test/fuzztest/wifi_sta/connecttodevice_fuzzer/BUILD.gn b/wifi/test/fuzztest/wifi_sta/connecttodevice_fuzzer/BUILD.gn index 79b276d..8ba30e6 100644 --- a/wifi/test/fuzztest/wifi_sta/connecttodevice_fuzzer/BUILD.gn +++ b/wifi/test/fuzztest/wifi_sta/connecttodevice_fuzzer/BUILD.gn @@ -26,7 +26,7 @@ ohos_fuzztest("ConnectToDeviceFuzzTest") { include_dirs = [ "$WIFI_ROOT_DIR/frameworks/native/include", "$WIFI_ROOT_DIR/frameworks/native/interfaces", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper", "$WIFI_ROOT_DIR/test/fuzztest/fuzz_common_func", ] diff --git a/wifi/test/wifi_client/BUILD.gn b/wifi/test/wifi_client/BUILD.gn index 0b78d59..1146c2c 100644 --- a/wifi/test/wifi_client/BUILD.gn +++ b/wifi/test/wifi_client/BUILD.gn @@ -24,7 +24,7 @@ local_base_sources = [ "$WIFI_ROOT_DIR/test/wifi_client/wifi_client.cpp" ] local_base_include_dirs = [ "$WIFI_ROOT_DIR/frameworks/native/include", "$WIFI_ROOT_DIR/frameworks/native/interfaces", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper", ] if (defined(ohos_lite)) { diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/BUILD.gn index f47d5e4..18bb9ac 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/BUILD.gn @@ -27,8 +27,6 @@ ohos_unittest("idl_client_unittest") { module_out_path = module_output_path sources = [ "$WIFI_ROOT_DIR/frameworks/native/src/wifi_p2p_msg.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi.c", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_chip.c", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_hotspot_iface.c", @@ -59,11 +57,11 @@ ohos_unittest("idl_client_unittest") { include_dirs = [ "$WIFI_ROOT_DIR/frameworks/native/interfaces", "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/config", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/utils", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/log", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface", "//commonlibrary/c_utils/base/include", @@ -71,8 +69,10 @@ ohos_unittest("idl_client_unittest") { "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", ] - deps = - [ "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC:crpc_client" ] + deps = [ + "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC:crpc_client", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit", + ] ldflags = [ "-fPIC", @@ -93,7 +93,6 @@ ohos_unittest("idl_client_unittest") { ohos_unittest("mock_wifi_hal_service") { module_out_path = module_output_path sources = [ - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log/log_helper.c", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/common/wifi_hal_common_func.c", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/main.c", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_adapter.c", @@ -116,11 +115,12 @@ ohos_unittest("mock_wifi_hal_service") { "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/common", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/log", ] deps = [ "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC:crpc_server", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", ] diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn index 3996b2a..459f3c2 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn @@ -29,9 +29,6 @@ config("module_private_config") { ohos_unittest("manager_unittest") { module_out_path = module_output_path sources = [ - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils/wifi_common_event_helper.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_helper.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_utils.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_auth_center.cpp", @@ -51,11 +48,11 @@ ohos_unittest("manager_unittest") { include_dirs = [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/utils", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/log", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/config", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap", @@ -82,7 +79,8 @@ ohos_unittest("manager_unittest") { deps = [ "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC:crpc_client", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", - "$WIFI_ROOT_DIR/utils/src:wifi_utils", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit", + "$WIFI_ROOT_DIR/utils:wifi_utils", "//foundation/communication/netmanager_base/services/netmanagernative:netsys_native_manager", ] diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn index a917789..f77c105 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn @@ -24,14 +24,6 @@ ohos_unittest("WifiApServiceTest") { module_out_path = "wifi/ap_test" sources = [ "$WIFI_ROOT_DIR/frameworks/native/src/wifi_p2p_msg.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log/log_helper.c", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/base_address.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/dhcpd_interface.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/handler.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/internal_message.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.cpp", @@ -72,11 +64,11 @@ ohos_unittest("WifiApServiceTest") { "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", "$WIFI_ROOT_DIR/frameworks/native/interfaces", "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/config", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/log", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/utils", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_common", @@ -100,7 +92,8 @@ ohos_unittest("WifiApServiceTest") { deps = [ "$DHCP_ROOT_DIR/services/mgr_service:dhcp_manager_service", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", - "$WIFI_ROOT_DIR/utils/src:wifi_utils", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit", + "$WIFI_ROOT_DIR/utils:wifi_utils", "//third_party/googletest:gmock_main", ] external_deps = [ diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn index 95ec574..7de390d 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn @@ -26,18 +26,6 @@ ohos_unittest("wifi_p2p_test") { sources = [ "$WIFI_ROOT_DIR/frameworks/native/src/wifi_hid2d_msg.cpp", "$WIFI_ROOT_DIR/frameworks/native/src/wifi_p2p_msg.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log/log_helper.c", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/base_address.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/dhcpd_interface.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/network_interface.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/handler.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/internal_message.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.cpp", @@ -122,11 +110,11 @@ ohos_unittest("wifi_p2p_test") { "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", "$WIFI_ROOT_DIR/frameworks/native/interfaces", "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/config", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/log", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/utils", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage", @@ -147,7 +135,8 @@ ohos_unittest("wifi_p2p_test") { "$DHCP_ROOT_DIR/services/mgr_service:dhcp_manager_service", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_common:wifi_common_service", - "$WIFI_ROOT_DIR/utils/src:wifi_utils", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit", + "$WIFI_ROOT_DIR/utils:wifi_utils", "//third_party/googletest:gmock_main", ] external_deps = [ diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn index 2c27186..f88b5ce 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn @@ -26,12 +26,6 @@ config("module_private_config") { ohos_unittest("wifi_scan_unittest") { module_out_path = module_output_path sources = [ - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log/log_helper.c", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/base_address.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/network_interface.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/handler.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/internal_message.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.cpp", @@ -60,11 +54,11 @@ ohos_unittest("wifi_scan_unittest") { "$WIFI_ROOT_DIR/frameworks/native/interfaces", "$WIFI_ROOT_DIR/services/wifi_standard/sdk/include", "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/log", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/config", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/utils", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan", "$WIFI_ROOT_DIR/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock", @@ -87,6 +81,7 @@ ohos_unittest("wifi_scan_unittest") { deps = [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit", "//third_party/googletest:gmock_main", ] defines = [ "AP_INSTANCE_MAX_NUM=$wifi_feature_with_ap_num" ] diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn index c5298b7..02cd53a 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn @@ -29,9 +29,6 @@ config("module_private_config") { ohos_unittest("wifi_sta_unittest") { module_out_path = module_output_path sources = [ - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log/log_helper.c", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/http_request.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/handler.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/internal_message.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.cpp", @@ -74,11 +71,11 @@ ohos_unittest("wifi_sta_unittest") { "$WIFI_ROOT_DIR/frameworks/native/interfaces", "$WIFI_ROOT_DIR/services/wifi_standard/interface", "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/log", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/config", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/utils", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client", @@ -111,7 +108,8 @@ ohos_unittest("wifi_sta_unittest") { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_common:wifi_common_service", - "$WIFI_ROOT_DIR/utils/src:wifi_utils", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit", + "$WIFI_ROOT_DIR/utils:wifi_utils", "//third_party/googletest:gmock_main", ] external_deps = [ diff --git a/wifi/test/wifi_standard/wifi_framework/common/unittest/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/BUILD.gn similarity index 52% rename from wifi/test/wifi_standard/wifi_framework/common/unittest/BUILD.gn rename to wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/BUILD.gn index 50d17bf..4d82a7b 100644 --- a/wifi/test/wifi_standard/wifi_framework/common/unittest/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/BUILD.gn @@ -19,23 +19,23 @@ config("module_private_config") { visibility = [ ":*" ] include_dirs = [ "//commonlibrary/c_utils/base/include", - "$WIFI_ROOT_DIR/test/wifi_standard/wifi_framework/common/unittest", + "$WIFI_ROOT_DIR/test/wifi_standard/wifi_framework/wifi_toolkit/unittest", ] } -ohos_unittest("common_unittest") { +ohos_unittest("toolkit_unittest") { module_out_path = module_output_path sources = [ "$WIFI_ROOT_DIR/frameworks/native/src/wifi_p2p_msg.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log/log_helper.c", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/base_address.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/network_interface.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/log/log_helper.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/base_address.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/ip_tools.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/ipv4_address.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/ipv6_address.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/mac_address.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/network_interface.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_global_func.cpp", "common_test.cpp", "wifi_config_file_test.cpp", "wifi_global_func_test.cpp", @@ -46,11 +46,11 @@ ohos_unittest("common_unittest") { include_dirs = [ "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/utils", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/log", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/config", "$WIFI_ROOT_DIR/frameworks/native/interfaces", ] @@ -72,5 +72,5 @@ ohos_unittest("common_unittest") { group("unittest") { testonly = true - deps = [ ":common_unittest" ] + deps = [ ":toolkit_unittest" ] } diff --git a/wifi/test/wifi_standard/wifi_framework/common/unittest/common_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/common_test.cpp similarity index 100% rename from wifi/test/wifi_standard/wifi_framework/common/unittest/common_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/common_test.cpp diff --git a/wifi/test/wifi_standard/wifi_framework/common/unittest/wifi_config_file_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/wifi_config_file_test.cpp similarity index 100% rename from wifi/test/wifi_standard/wifi_framework/common/unittest/wifi_config_file_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/wifi_config_file_test.cpp diff --git a/wifi/test/wifi_standard/wifi_framework/common/unittest/wifi_config_file_test.h b/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/wifi_config_file_test.h similarity index 100% rename from wifi/test/wifi_standard/wifi_framework/common/unittest/wifi_config_file_test.h rename to wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/wifi_config_file_test.h diff --git a/wifi/test/wifi_standard/wifi_framework/common/unittest/wifi_global_func_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/wifi_global_func_test.cpp similarity index 100% rename from wifi/test/wifi_standard/wifi_framework/common/unittest/wifi_global_func_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/wifi_global_func_test.cpp diff --git a/wifi/test/wifi_standard/wifi_framework/common/unittest/wifi_global_func_test.h b/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/wifi_global_func_test.h similarity index 100% rename from wifi/test/wifi_standard/wifi_framework/common/unittest/wifi_global_func_test.h rename to wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/wifi_global_func_test.h diff --git a/wifi/test/wifi_standard/wifi_framework/common/unittest/wifi_ip_tools_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/wifi_ip_tools_test.cpp similarity index 100% rename from wifi/test/wifi_standard/wifi_framework/common/unittest/wifi_ip_tools_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/wifi_ip_tools_test.cpp diff --git a/wifi/test/wifi_standard/wifi_framework/common/unittest/wifi_ip_tools_test.h b/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/wifi_ip_tools_test.h similarity index 100% rename from wifi/test/wifi_standard/wifi_framework/common/unittest/wifi_ip_tools_test.h rename to wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/wifi_ip_tools_test.h diff --git a/wifi/test/wifi_standard/wifi_framework/common/unittest/wifi_log_helper_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/wifi_log_helper_test.cpp similarity index 100% rename from wifi/test/wifi_standard/wifi_framework/common/unittest/wifi_log_helper_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/wifi_log_helper_test.cpp diff --git a/wifi/test/wifi_standard/wifi_framework/common/unittest/wifi_log_helper_test.h b/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/wifi_log_helper_test.h similarity index 100% rename from wifi/test/wifi_standard/wifi_framework/common/unittest/wifi_log_helper_test.h rename to wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/wifi_log_helper_test.h diff --git a/wifi/test/wifi_standard/wifi_framework/common/unittest/wifi_network_interface_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/wifi_network_interface_test.cpp similarity index 100% rename from wifi/test/wifi_standard/wifi_framework/common/unittest/wifi_network_interface_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/wifi_network_interface_test.cpp diff --git a/wifi/test/wifi_standard/wifi_framework/common/unittest/wifi_network_interface_test.h b/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/wifi_network_interface_test.h similarity index 100% rename from wifi/test/wifi_standard/wifi_framework/common/unittest/wifi_network_interface_test.h rename to wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/wifi_network_interface_test.h diff --git a/wifi/utils/src/BUILD.gn b/wifi/utils/BUILD.gn similarity index 89% rename from wifi/utils/src/BUILD.gn rename to wifi/utils/BUILD.gn index a4b9109..f60cfee 100644 --- a/wifi/utils/src/BUILD.gn +++ b/wifi/utils/BUILD.gn @@ -17,13 +17,13 @@ if (defined(ohos_lite)) { shared_library("wifi_utils") { include_dirs = [ - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/log", "$WIFI_ROOT_DIR/utils/inc", "//base/hiviewdfx/hilog_lite/interfaces/native/innerkits", "//third_party/bounds_checking_function/include", ] - sources = [ "wifi_common_util.cpp" ] + sources = [ "src/wifi_common_util.cpp" ] deps = [ "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", @@ -49,12 +49,12 @@ if (defined(ohos_lite)) { include_dirs = [ "$WIFI_ROOT_DIR/utils/inc", "//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/log", ] sources = [ - "wifi_common_util.cpp", - "wifi_hisysevent.cpp", + "src/wifi_common_util.cpp", + "src/wifi_hisysevent.cpp", ] deps = [ diff --git a/wifi/utils/inc/wifi_common_util.h b/wifi/utils/inc/wifi_common_util.h index 71d3cd5..2afc162 100644 --- a/wifi/utils/inc/wifi_common_util.h +++ b/wifi/utils/inc/wifi_common_util.h @@ -100,9 +100,9 @@ bool IsMacArrayEmpty(const unsigned char mac[WIFI_MAC_LEN]); * @Description Converting a string IP Address to an integer IP address * * @param strIp - Input string IP address - * @return int - integer IP address + * @return unsigned int - integer IP address */ -int Ip2Number(const std::string& strIp); +unsigned int Ip2Number(const std::string& strIp); /** * @Description Converting an integer IP address to a string IP Address @@ -110,7 +110,7 @@ int Ip2Number(const std::string& strIp); * @param intIp - Input integer IP address * @return string - string IP address */ -std::string Number2Ip(int intIp); +std::string Number2Ip(unsigned int intIp); /** * @Description Splitting strings by delimiter diff --git a/wifi/utils/src/wifi_common_util.cpp b/wifi/utils/src/wifi_common_util.cpp index 78a44e6..34f76dc 100644 --- a/wifi/utils/src/wifi_common_util.cpp +++ b/wifi/utils/src/wifi_common_util.cpp @@ -190,30 +190,30 @@ bool IsMacArrayEmpty(const unsigned char mac[WIFI_MAC_LEN]) return true; } -int Ip2Number(const std::string& strIp) +unsigned int Ip2Number(const std::string& strIp) { std::string::size_type front = 0; std::string::size_type back = 0; - int number = 0; + unsigned int number = 0; int size = 32; constexpr int sectionSize = 8; std::string ip(strIp + '.'); while ((back = ip.find_first_of('.', back)) != (std::string::size_type)std::string::npos) { - number |= atoi(ip.substr(front, back - front).c_str()) << (size -= sectionSize); + number |= std::stol(ip.substr(front, back - front).c_str()) << (size -= sectionSize); front = ++back; } return number; } -std::string Number2Ip(int intIp) +std::string Number2Ip(unsigned int intIp) { constexpr int fourthPartMoveLen = 24; constexpr int thirdPartMoveLen = 16; constexpr int secondPartMoveLen = 8; std::string ip; - ip.append(std::to_string(((unsigned int)intIp & 0xff000000) >> fourthPartMoveLen)); + ip.append(std::to_string((intIp & 0xff000000) >> fourthPartMoveLen)); ip.push_back('.'); ip.append(std::to_string((intIp & 0x00ff0000) >> thirdPartMoveLen)); ip.push_back('.'); -- Gitee From bb840c7e403b884ef7cc8cef6206065b61447724 Mon Sep 17 00:00:00 2001 From: y00316381 Date: Wed, 24 Aug 2022 09:58:00 +0800 Subject: [PATCH 321/491] modify log level for wifi 0823 Signed-off-by: y00316381 --- .../native/src/wifi_device_callback_stub.cpp | 18 ++-- .../src/wifi_device_callback_stub_lite.cpp | 2 +- .../native/src/wifi_device_proxy.cpp | 2 +- .../native/src/wifi_device_proxy_lite.cpp | 2 +- .../native/src/wifi_hotspot_callback_stub.cpp | 8 +- .../native/src/wifi_hotspot_proxy.cpp | 32 +++---- .../native/src/wifi_p2p_callback_stub.cpp | 18 ++-- wifi/frameworks/native/src/wifi_p2p_proxy.cpp | 86 +++++++++---------- .../native/src/wifi_scan_callback_stub.cpp | 8 +- .../frameworks/native/src/wifi_scan_proxy.cpp | 16 ++-- .../native/src/wifi_scan_proxy_lite.cpp | 2 +- .../wifi_manage/wifi_ap/ap_service.cpp | 4 +- .../wifi_device_death_recipient.cpp | 2 +- .../wifi_manage/wifi_device_service_impl.cpp | 4 +- .../wifi_manage/wifi_device_stub.cpp | 4 +- .../wifi_hotspot_death_recipient.cpp | 2 +- .../wifi_hotspot_mgr_service_impl.cpp | 2 +- .../wifi_manage/wifi_hotspot_service_impl.cpp | 2 +- .../wifi_manage/wifi_hotspot_stub.cpp | 6 +- .../wifi_manage/wifi_manager.cpp | 14 +-- .../authorizing_negotiation_request_state.cpp | 2 +- .../wifi_p2p/group_formed_state.cpp | 2 +- .../wifi_p2p/group_negotiation_state.cpp | 6 +- .../wifi_p2p/invitation_received_state.cpp | 2 +- .../wifi_p2p/invitation_request_state.cpp | 4 +- .../wifi_p2p/p2p_enabled_state.cpp | 14 +-- .../wifi_p2p/p2p_group_join_state.cpp | 2 +- .../wifi_manage/wifi_p2p/p2p_idle_state.cpp | 12 +-- .../wifi_manage/wifi_p2p/p2p_monitor.cpp | 12 +-- .../wifi_manage/wifi_p2p_service_impl.cpp | 12 +-- .../wifi_manage/wifi_p2p_stub.cpp | 4 +- .../wifi_manage/wifi_scan/scan_service.cpp | 55 ++++++------ .../wifi_manage/wifi_scan_service_impl.cpp | 4 +- .../wifi_manage/wifi_scan_stub.cpp | 4 +- .../wifi_manage/wifi_scan_stub_lite.cpp | 2 +- .../wifi_manage/wifi_service_manager.cpp | 4 +- .../wifi_manage/wifi_sta/sta_interface.cpp | 4 +- .../wifi_manage/wifi_sta/sta_service.cpp | 4 +- .../wifi_sta/sta_state_machine.cpp | 6 +- 39 files changed, 195 insertions(+), 194 deletions(-) diff --git a/wifi/frameworks/native/src/wifi_device_callback_stub.cpp b/wifi/frameworks/native/src/wifi_device_callback_stub.cpp index 4fd93de..db43d2a 100644 --- a/wifi/frameworks/native/src/wifi_device_callback_stub.cpp +++ b/wifi/frameworks/native/src/wifi_device_callback_stub.cpp @@ -31,9 +31,9 @@ WifiDeviceCallBackStub::~WifiDeviceCallBackStub() int WifiDeviceCallBackStub::OnRemoteRequest( uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) { - WIFI_LOGD("WifiDeviceCallBackStub::OnRemoteRequest!"); + WIFI_LOGI("WifiDeviceCallBackStub::OnRemoteRequest, code:%{public}zu!", code); if (mRemoteDied) { - WIFI_LOGD("Failed to `%{public}s`,Remote service is died!", __func__); + WIFI_LOGE("Failed to `%{public}s`,Remote service is died!", __func__); return -1; } @@ -84,7 +84,7 @@ int WifiDeviceCallBackStub::OnRemoteRequest( void WifiDeviceCallBackStub::RegisterUserCallBack(const sptr &callBack) { if (callBack == nullptr) { - WIFI_LOGD("RegisterUserCallBack:callBack is nullptr!"); + WIFI_LOGE("RegisterUserCallBack:callBack is nullptr!"); return; } callback_ = callBack; @@ -102,7 +102,7 @@ void WifiDeviceCallBackStub::SetRemoteDied(bool val) void WifiDeviceCallBackStub::OnWifiStateChanged(int state) { - WIFI_LOGD("WifiDeviceCallBackStub::OnWifiStateChanged"); + WIFI_LOGI("WifiDeviceCallBackStub::OnWifiStateChanged, state:%{public}d!", state); if (callback_) { callback_->OnWifiStateChanged(state); @@ -112,7 +112,7 @@ void WifiDeviceCallBackStub::OnWifiStateChanged(int state) void WifiDeviceCallBackStub::OnWifiConnectionChanged(int state, const WifiLinkedInfo &info) { - WIFI_LOGD("WifiDeviceCallBackStub::OnWifiConnectionChanged"); + WIFI_LOGI("WifiDeviceCallBackStub::OnWifiConnectionChanged, state:%{public}d!", state); if (callback_) { callback_->OnWifiConnectionChanged(state, info); } @@ -121,7 +121,7 @@ void WifiDeviceCallBackStub::OnWifiConnectionChanged(int state, const WifiLinked void WifiDeviceCallBackStub::OnWifiRssiChanged(int rssi) { - WIFI_LOGD("WifiDeviceCallBackStub::OnWifiRssiChanged"); + WIFI_LOGI("WifiDeviceCallBackStub::OnWifiRssiChanged, rssi:%{public}d!", rssi); if (callback_) { callback_->OnWifiRssiChanged(rssi); } @@ -130,7 +130,7 @@ void WifiDeviceCallBackStub::OnWifiRssiChanged(int rssi) void WifiDeviceCallBackStub::OnWifiWpsStateChanged(int state, const std::string &pinCode) { - WIFI_LOGD("WifiDeviceCallBackStub::OnWifiWpsStateChanged"); + WIFI_LOGI("WifiDeviceCallBackStub::OnWifiWpsStateChanged, state:%{public}d!", state); if (callback_) { callback_->OnWifiWpsStateChanged(state, pinCode); } @@ -138,7 +138,7 @@ void WifiDeviceCallBackStub::OnWifiWpsStateChanged(int state, const std::string void WifiDeviceCallBackStub::OnStreamChanged(int direction) { - WIFI_LOGD("WifiDeviceCallBackStub::OnStreamChanged"); + WIFI_LOGI("WifiDeviceCallBackStub::OnStreamChanged, direction:%{public}d!", direction); if (callback_) { callback_->OnStreamChanged(direction); } @@ -146,7 +146,7 @@ void WifiDeviceCallBackStub::OnStreamChanged(int direction) void WifiDeviceCallBackStub::OnDeviceConfigChanged(ConfigChange value) { - WIFI_LOGD("WifiDeviceCallBackStub::OnDeviceConfigChanged"); + WIFI_LOGI("WifiDeviceCallBackStub::OnDeviceConfigChanged, value:%{public}d!", value); if (callback_) { callback_->OnDeviceConfigChanged(value); } diff --git a/wifi/frameworks/native/src/wifi_device_callback_stub_lite.cpp b/wifi/frameworks/native/src/wifi_device_callback_stub_lite.cpp index 687da4e..bf38b83 100644 --- a/wifi/frameworks/native/src/wifi_device_callback_stub_lite.cpp +++ b/wifi/frameworks/native/src/wifi_device_callback_stub_lite.cpp @@ -78,7 +78,7 @@ int WifiDeviceCallBackStub::OnRemoteRequest(uint32_t code, IpcIo *data) void WifiDeviceCallBackStub::RegisterUserCallBack(const std::shared_ptr &callBack) { if (callBack == nullptr) { - WIFI_LOGD("RegisterUserCallBack:callBack is nullptr!"); + WIFI_LOGE("RegisterUserCallBack:callBack is nullptr!"); return; } callback_ = callBack; diff --git a/wifi/frameworks/native/src/wifi_device_proxy.cpp b/wifi/frameworks/native/src/wifi_device_proxy.cpp index 5abbce6..2ea1e3f 100644 --- a/wifi/frameworks/native/src/wifi_device_proxy.cpp +++ b/wifi/frameworks/native/src/wifi_device_proxy.cpp @@ -1186,7 +1186,7 @@ bool WifiDeviceProxy::SetLowLatencyMode(bool enabled) void WifiDeviceProxy::OnRemoteDied(const wptr &remoteObject) { - WIFI_LOGD("Remote service is died!"); + WIFI_LOGW("Remote service is died!"); mRemoteDied = true; if (g_deviceCallBackStub == nullptr) { WIFI_LOGE("g_deviceCallBackStub is nullptr"); diff --git a/wifi/frameworks/native/src/wifi_device_proxy_lite.cpp b/wifi/frameworks/native/src/wifi_device_proxy_lite.cpp index d0b9cc5..3ace17c 100644 --- a/wifi/frameworks/native/src/wifi_device_proxy_lite.cpp +++ b/wifi/frameworks/native/src/wifi_device_proxy_lite.cpp @@ -1245,7 +1245,7 @@ bool WifiDeviceProxy::SetLowLatencyMode(bool enabled) void WifiDeviceProxy::OnRemoteDied(void) { - WIFI_LOGD("Remote service is died!"); + WIFI_LOGW("Remote service is died!"); remoteDied_ = true; g_deviceCallBackStub.SetRemoteDied(true); } diff --git a/wifi/frameworks/native/src/wifi_hotspot_callback_stub.cpp b/wifi/frameworks/native/src/wifi_hotspot_callback_stub.cpp index 648607e..5a18637 100644 --- a/wifi/frameworks/native/src/wifi_hotspot_callback_stub.cpp +++ b/wifi/frameworks/native/src/wifi_hotspot_callback_stub.cpp @@ -34,7 +34,7 @@ int WifiHotspotCallbackStub::OnRemoteRequest( { WIFI_LOGD("WifiHotspotCallbackStub::OnRemoteRequest!"); if (mRemoteDied) { - WIFI_LOGD("Failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGE("Failed to `%{public}s`,remote service is died!", __func__); return -1; } @@ -113,7 +113,7 @@ void WifiHotspotCallbackStub::RegisterCallBack(const sptr void WifiHotspotCallbackStub::OnHotspotStateChanged(int state) { - WIFI_LOGD("WifiHotspotCallbackStub::OnHotspotStateChanged"); + WIFI_LOGI("WifiHotspotCallbackStub::OnHotspotStateChanged, state:%{public}d.", state); if (userCallback_) { userCallback_->OnHotspotStateChanged(state); } @@ -122,7 +122,7 @@ void WifiHotspotCallbackStub::OnHotspotStateChanged(int state) void WifiHotspotCallbackStub::OnHotspotStaJoin(const StationInfo &info) { - WIFI_LOGD("WifiHotspotCallbackStub::OnHotspotStaJoin"); + WIFI_LOGI("WifiHotspotCallbackStub::OnHotspotStaJoin"); if (userCallback_) { userCallback_->OnHotspotStaJoin(info); } @@ -131,7 +131,7 @@ void WifiHotspotCallbackStub::OnHotspotStaJoin(const StationInfo &info) void WifiHotspotCallbackStub::OnHotspotStaLeave(const StationInfo &info) { - WIFI_LOGD("WifiHotspotCallbackStub::OnHotspotStaLeave"); + WIFI_LOGI("WifiHotspotCallbackStub::OnHotspotStaLeave"); if (userCallback_) { userCallback_->OnHotspotStaLeave(info); } diff --git a/wifi/frameworks/native/src/wifi_hotspot_proxy.cpp b/wifi/frameworks/native/src/wifi_hotspot_proxy.cpp index b1462cc..8d09663 100644 --- a/wifi/frameworks/native/src/wifi_hotspot_proxy.cpp +++ b/wifi/frameworks/native/src/wifi_hotspot_proxy.cpp @@ -108,7 +108,7 @@ ErrCode WifiHotspotProxy::IsHotspotDualBandSupported(bool &isSupported) ErrCode WifiHotspotProxy::GetHotspotState(int &state) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -140,7 +140,7 @@ ErrCode WifiHotspotProxy::GetHotspotState(int &state) ErrCode WifiHotspotProxy::GetHotspotConfig(HotspotConfig &result) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -179,7 +179,7 @@ ErrCode WifiHotspotProxy::GetHotspotConfig(HotspotConfig &result) ErrCode WifiHotspotProxy::SetHotspotConfig(const HotspotConfig &config) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -212,7 +212,7 @@ ErrCode WifiHotspotProxy::SetHotspotConfig(const HotspotConfig &config) ErrCode WifiHotspotProxy::GetStationList(std::vector &result) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -257,7 +257,7 @@ ErrCode WifiHotspotProxy::GetStationList(std::vector &result) ErrCode WifiHotspotProxy::DisassociateSta(const StationInfo &info) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -312,7 +312,7 @@ ErrCode WifiHotspotProxy::EnableHotspot(const ServiceType type) ErrCode WifiHotspotProxy::DisableHotspot(const ServiceType type) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -341,7 +341,7 @@ ErrCode WifiHotspotProxy::DisableHotspot(const ServiceType type) ErrCode WifiHotspotProxy::GetBlockLists(std::vector &infos) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -387,7 +387,7 @@ ErrCode WifiHotspotProxy::GetBlockLists(std::vector &infos) ErrCode WifiHotspotProxy::AddBlockList(const StationInfo &info) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -417,7 +417,7 @@ ErrCode WifiHotspotProxy::AddBlockList(const StationInfo &info) ErrCode WifiHotspotProxy::DelBlockList(const StationInfo &info) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -447,7 +447,7 @@ ErrCode WifiHotspotProxy::DelBlockList(const StationInfo &info) ErrCode WifiHotspotProxy::GetValidBands(std::vector &bands) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -489,7 +489,7 @@ ErrCode WifiHotspotProxy::GetValidBands(std::vector &bands) ErrCode WifiHotspotProxy::GetValidChannels(BandType band, std::vector &validchannels) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -563,7 +563,7 @@ ErrCode WifiHotspotProxy::RegisterCallBack(const sptr &cal ErrCode WifiHotspotProxy::GetSupportedFeatures(long &features) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -594,7 +594,7 @@ ErrCode WifiHotspotProxy::GetSupportedFeatures(long &features) ErrCode WifiHotspotProxy::GetSupportedPowerModel(std::set& setPowerModelList) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -636,7 +636,7 @@ ErrCode WifiHotspotProxy::GetSupportedPowerModel(std::set& setPowerM ErrCode WifiHotspotProxy::GetPowerModel(PowerModel& model) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -668,7 +668,7 @@ ErrCode WifiHotspotProxy::GetPowerModel(PowerModel& model) ErrCode WifiHotspotProxy::SetPowerModel(const PowerModel& model) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -695,7 +695,7 @@ ErrCode WifiHotspotProxy::SetPowerModel(const PowerModel& model) void WifiHotspotProxy::OnRemoteDied(const wptr& remoteObject) { - WIFI_LOGD("Remote service is died!"); + WIFI_LOGW("Remote service is died!"); mRemoteDied = true; if (g_wifiHotspotCallbackStub != nullptr) { g_wifiHotspotCallbackStub->SetRemoteDied(true); diff --git a/wifi/frameworks/native/src/wifi_p2p_callback_stub.cpp b/wifi/frameworks/native/src/wifi_p2p_callback_stub.cpp index 5af404f..12d13ff 100644 --- a/wifi/frameworks/native/src/wifi_p2p_callback_stub.cpp +++ b/wifi/frameworks/native/src/wifi_p2p_callback_stub.cpp @@ -96,7 +96,7 @@ void WifiP2pCallbackStub::SetRemoteDied(bool val) void WifiP2pCallbackStub::OnP2pStateChanged(int state) { - WIFI_LOGD("WifiP2pCallbackStub::OnP2pStateChanged: %{public}d", state); + WIFI_LOGI("WifiP2pCallbackStub::OnP2pStateChanged: %{public}d", state); if (userCallback_) { userCallback_->OnP2pStateChanged(state); } @@ -105,7 +105,7 @@ void WifiP2pCallbackStub::OnP2pStateChanged(int state) void WifiP2pCallbackStub::OnP2pPersistentGroupsChanged(void) { - WIFI_LOGD("WifiP2pCallbackStub::OnP2pPersistentGroupsChanged"); + WIFI_LOGI("WifiP2pCallbackStub::OnP2pPersistentGroupsChanged"); if (userCallback_) { userCallback_->OnP2pPersistentGroupsChanged(); } @@ -114,7 +114,7 @@ void WifiP2pCallbackStub::OnP2pPersistentGroupsChanged(void) void WifiP2pCallbackStub::OnP2pThisDeviceChanged(const WifiP2pDevice &device) { - WIFI_LOGD("WifiP2pCallbackStub::OnP2pThisDeviceChanged"); + WIFI_LOGI("WifiP2pCallbackStub::OnP2pThisDeviceChanged"); if (userCallback_) { userCallback_->OnP2pThisDeviceChanged(device); } @@ -123,7 +123,7 @@ void WifiP2pCallbackStub::OnP2pThisDeviceChanged(const WifiP2pDevice &device) void WifiP2pCallbackStub::OnP2pPeersChanged(const std::vector &device) { - WIFI_LOGD("WifiP2pCallbackStub::OnP2pPeersChanged"); + WIFI_LOGI("WifiP2pCallbackStub::OnP2pPeersChanged"); if (userCallback_) { userCallback_->OnP2pPeersChanged(device); } @@ -132,7 +132,7 @@ void WifiP2pCallbackStub::OnP2pPeersChanged(const std::vector &de void WifiP2pCallbackStub::OnP2pServicesChanged(const std::vector &srvInfo) { - WIFI_LOGD("WifiP2pCallbackStub::OnP2pServicesChanged"); + WIFI_LOGI("WifiP2pCallbackStub::OnP2pServicesChanged"); if (userCallback_) { userCallback_->OnP2pServicesChanged(srvInfo); } @@ -140,7 +140,7 @@ void WifiP2pCallbackStub::OnP2pServicesChanged(const std::vector(info.GetConnectState())); + WIFI_LOGI("WifiP2pCallbackStub::OnP2pConnectionChanged: %{public}d", static_cast(info.GetConnectState())); if (userCallback_) { userCallback_->OnP2pConnectionChanged(info); } @@ -149,7 +149,7 @@ void WifiP2pCallbackStub::OnP2pConnectionChanged(const WifiP2pLinkedInfo &info) void WifiP2pCallbackStub::OnP2pDiscoveryChanged(bool isChange) { - WIFI_LOGD("WifiP2pCallbackStub::OnP2pDiscoveryChanged"); + WIFI_LOGI("WifiP2pCallbackStub::OnP2pDiscoveryChanged, isChange:%{public}d", isChange); if (userCallback_) { userCallback_->OnP2pDiscoveryChanged(isChange); } @@ -158,7 +158,7 @@ void WifiP2pCallbackStub::OnP2pDiscoveryChanged(bool isChange) void WifiP2pCallbackStub::OnP2pActionResult(P2pActionCallback action, ErrCode code) { - WIFI_LOGD("WifiP2pCallbackStub::OnP2pActionResult"); + WIFI_LOGI("WifiP2pCallbackStub::OnP2pActionResult"); if (userCallback_) { userCallback_->OnP2pActionResult(action, code); } @@ -166,7 +166,7 @@ void WifiP2pCallbackStub::OnP2pActionResult(P2pActionCallback action, ErrCode co void WifiP2pCallbackStub::OnConfigChanged(CfgType type, char* data, int dataLen) { - WIFI_LOGD("WifiP2pCallbackStub::OnConfigChanged"); + WIFI_LOGI("WifiP2pCallbackStub::OnConfigChanged"); if (userCallback_) { userCallback_->OnConfigChanged(type, data, dataLen); } diff --git a/wifi/frameworks/native/src/wifi_p2p_proxy.cpp b/wifi/frameworks/native/src/wifi_p2p_proxy.cpp index 6c1cf34..7ec88ad 100644 --- a/wifi/frameworks/native/src/wifi_p2p_proxy.cpp +++ b/wifi/frameworks/native/src/wifi_p2p_proxy.cpp @@ -40,7 +40,7 @@ WifiP2pProxy::~WifiP2pProxy() ErrCode WifiP2pProxy::EnableP2p(void) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -66,7 +66,7 @@ ErrCode WifiP2pProxy::EnableP2p(void) ErrCode WifiP2pProxy::DisableP2p(void) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -93,7 +93,7 @@ ErrCode WifiP2pProxy::DisableP2p(void) ErrCode WifiP2pProxy::DiscoverDevices(void) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -120,7 +120,7 @@ ErrCode WifiP2pProxy::DiscoverDevices(void) ErrCode WifiP2pProxy::StopDiscoverDevices(void) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -148,7 +148,7 @@ ErrCode WifiP2pProxy::StopDiscoverDevices(void) ErrCode WifiP2pProxy::DiscoverServices(void) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -175,7 +175,7 @@ ErrCode WifiP2pProxy::DiscoverServices(void) ErrCode WifiP2pProxy::StopDiscoverServices(void) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -203,7 +203,7 @@ ErrCode WifiP2pProxy::StopDiscoverServices(void) ErrCode WifiP2pProxy::RequestService(const WifiP2pDevice &device, const WifiP2pServiceRequest &request) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -231,7 +231,7 @@ ErrCode WifiP2pProxy::RequestService(const WifiP2pDevice &device, const WifiP2pS ErrCode WifiP2pProxy::PutLocalP2pService(const WifiP2pServiceInfo &srvInfo) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -259,7 +259,7 @@ ErrCode WifiP2pProxy::PutLocalP2pService(const WifiP2pServiceInfo &srvInfo) ErrCode WifiP2pProxy::DeleteLocalP2pService(const WifiP2pServiceInfo &srvInfo) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -288,7 +288,7 @@ ErrCode WifiP2pProxy::DeleteLocalP2pService(const WifiP2pServiceInfo &srvInfo) ErrCode WifiP2pProxy::StartP2pListen(int period, int interval) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -317,7 +317,7 @@ ErrCode WifiP2pProxy::StartP2pListen(int period, int interval) ErrCode WifiP2pProxy::StopP2pListen(void) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -344,7 +344,7 @@ ErrCode WifiP2pProxy::StopP2pListen(void) ErrCode WifiP2pProxy::CreateGroup(const WifiP2pConfig &config) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -372,7 +372,7 @@ ErrCode WifiP2pProxy::CreateGroup(const WifiP2pConfig &config) ErrCode WifiP2pProxy::RemoveGroup() { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -398,7 +398,7 @@ ErrCode WifiP2pProxy::RemoveGroup() ErrCode WifiP2pProxy::DeleteGroup(const WifiP2pGroupInfo &group) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -565,7 +565,7 @@ void WifiP2pProxy::WriteWifiP2pConfigData(MessageParcel &data, const WifiP2pConf ErrCode WifiP2pProxy::P2pConnect(const WifiP2pConfig &config) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -593,7 +593,7 @@ ErrCode WifiP2pProxy::P2pConnect(const WifiP2pConfig &config) ErrCode WifiP2pProxy::P2pCancelConnect() { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -620,7 +620,7 @@ ErrCode WifiP2pProxy::P2pCancelConnect() ErrCode WifiP2pProxy::QueryP2pLinkedInfo(WifiP2pLinkedInfo &linkedInfo) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -655,7 +655,7 @@ ErrCode WifiP2pProxy::QueryP2pLinkedInfo(WifiP2pLinkedInfo &linkedInfo) ErrCode WifiP2pProxy::GetCurrentGroup(WifiP2pGroupInfo &group) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -687,7 +687,7 @@ ErrCode WifiP2pProxy::GetCurrentGroup(WifiP2pGroupInfo &group) ErrCode WifiP2pProxy::GetP2pEnableStatus(int &status) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -719,7 +719,7 @@ ErrCode WifiP2pProxy::GetP2pEnableStatus(int &status) ErrCode WifiP2pProxy::GetP2pDiscoverStatus(int &status) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -751,7 +751,7 @@ ErrCode WifiP2pProxy::GetP2pDiscoverStatus(int &status) ErrCode WifiP2pProxy::GetP2pConnectedStatus(int &status) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -783,7 +783,7 @@ ErrCode WifiP2pProxy::GetP2pConnectedStatus(int &status) ErrCode WifiP2pProxy::QueryP2pDevices(std::vector &devices) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -858,7 +858,7 @@ ErrCode WifiP2pProxy::QueryP2pLocalDevice(WifiP2pDevice &device) ErrCode WifiP2pProxy::QueryP2pGroups(std::vector &groups) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -901,7 +901,7 @@ ErrCode WifiP2pProxy::QueryP2pGroups(std::vector &groups) ErrCode WifiP2pProxy::QueryP2pServices(std::vector &services) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -944,7 +944,7 @@ ErrCode WifiP2pProxy::QueryP2pServices(std::vector &services ErrCode WifiP2pProxy::SetP2pDeviceName(const std::string &deviceName) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -975,7 +975,7 @@ ErrCode WifiP2pProxy::SetP2pDeviceName(const std::string &deviceName) ErrCode WifiP2pProxy::SetP2pWfdInfo(const WifiP2pWfdInfo &wfdInfo) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -1011,7 +1011,7 @@ ErrCode WifiP2pProxy::SetP2pWfdInfo(const WifiP2pWfdInfo &wfdInfo) ErrCode WifiP2pProxy::RegisterCallBack(const sptr &callback) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageParcel data; @@ -1050,7 +1050,7 @@ ErrCode WifiP2pProxy::RegisterCallBack(const sptr &callback) ErrCode WifiP2pProxy::GetSupportedFeatures(long &features) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -1081,7 +1081,7 @@ ErrCode WifiP2pProxy::GetSupportedFeatures(long &features) ErrCode WifiP2pProxy::Hid2dRequestGcIp(const std::string& gcMac, std::string& ipAddr) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -1113,7 +1113,7 @@ ErrCode WifiP2pProxy::Hid2dRequestGcIp(const std::string& gcMac, std::string& ip ErrCode WifiP2pProxy::Hid2dSharedlinkIncrease() { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -1140,7 +1140,7 @@ ErrCode WifiP2pProxy::Hid2dSharedlinkIncrease() ErrCode WifiP2pProxy::Hid2dSharedlinkDecrease() { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -1169,7 +1169,7 @@ ErrCode WifiP2pProxy::Hid2dCreateGroup(const int frequency, FreqType type) WIFI_LOGI("Request hid2d create group"); if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -1200,7 +1200,7 @@ ErrCode WifiP2pProxy::Hid2dRemoveGcGroup(const std::string& gcIfName) WIFI_LOGI("Request hid2d remove group"); if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -1230,7 +1230,7 @@ ErrCode WifiP2pProxy::Hid2dConnect(const Hid2dConnectConfig& config) WIFI_LOGI("Request hid2d connect"); if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -1262,7 +1262,7 @@ ErrCode WifiP2pProxy::Hid2dConnect(const Hid2dConnectConfig& config) ErrCode WifiP2pProxy::Hid2dConfigIPAddr(const std::string& ifName, const IpAddrInfo& ipInfo) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -1293,7 +1293,7 @@ ErrCode WifiP2pProxy::Hid2dConfigIPAddr(const std::string& ifName, const IpAddrI ErrCode WifiP2pProxy::Hid2dReleaseIPAddr(const std::string& ifName) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -1322,7 +1322,7 @@ ErrCode WifiP2pProxy::Hid2dGetRecommendChannel(const RecommendChannelRequest& re RecommendChannelResponse& response) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -1364,7 +1364,7 @@ ErrCode WifiP2pProxy::Hid2dGetRecommendChannel(const RecommendChannelRequest& re ErrCode WifiP2pProxy::Hid2dGetChannelListFor5G(std::vector& vecChannelList) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -1405,12 +1405,12 @@ ErrCode WifiP2pProxy::Hid2dGetSelfWifiCfgInfo(SelfCfgType cfgType, char cfgData[CFG_DATA_MAX_BYTES], int* getDatValidLen) { if (getDatValidLen == nullptr) { - WIFI_LOGD("getDatValidLen is nullptr!"); + WIFI_LOGE("getDatValidLen is nullptr!"); return WIFI_OPT_FAILED; } if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -1444,7 +1444,7 @@ ErrCode WifiP2pProxy::Hid2dGetSelfWifiCfgInfo(SelfCfgType cfgType, return WIFI_OPT_FAILED; } if (memcpy_s(cfgData, CFG_DATA_MAX_BYTES, dataBuffer, *getDatValidLen) != EOK) { - WIFI_LOGD("`%{public}s` memcpy_s failed!", __func__); + WIFI_LOGE("`%{public}s` memcpy_s failed!", __func__); return WIFI_OPT_FAILED; } } @@ -1459,7 +1459,7 @@ ErrCode WifiP2pProxy::Hid2dSetPeerWifiCfgInfo(PeerCfgType cfgType, return WIFI_OPT_INVALID_PARAM; } if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -1488,7 +1488,7 @@ ErrCode WifiP2pProxy::Hid2dSetPeerWifiCfgInfo(PeerCfgType cfgType, ErrCode WifiP2pProxy::Hid2dSetUpperScene(const std::string& ifName, const Hid2dUpperScene& scene) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; diff --git a/wifi/frameworks/native/src/wifi_scan_callback_stub.cpp b/wifi/frameworks/native/src/wifi_scan_callback_stub.cpp index 325dbf0..b12092c 100644 --- a/wifi/frameworks/native/src/wifi_scan_callback_stub.cpp +++ b/wifi/frameworks/native/src/wifi_scan_callback_stub.cpp @@ -33,7 +33,7 @@ int WifiScanCallbackStub::OnRemoteRequest( { WIFI_LOGD("WifiScanCallbackStub::OnRemoteRequest code:%{public}u!", code); if (mRemoteDied) { - WIFI_LOGD("Failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGE("Failed to `%{public}s`,remote service is died!", __func__); return -1; } @@ -44,7 +44,7 @@ int WifiScanCallbackStub::OnRemoteRequest( int exception = data.ReadInt32(); if (exception) { - WIFI_LOGD("WifiScanCallbackStub::OnRemoteRequest exception! %{public}d!", exception); + WIFI_LOGE("WifiScanCallbackStub::OnRemoteRequest exception! %{public}d!", exception); return WIFI_OPT_FAILED; } int ret = -1; @@ -64,7 +64,7 @@ int WifiScanCallbackStub::OnRemoteRequest( void WifiScanCallbackStub::RegisterCallBack(const sptr &userCallback) { if (userCallback_ != nullptr) { - WIFI_LOGD("Callback has registered!"); + WIFI_LOGE("Callback has registered!"); return; } userCallback_ = userCallback; @@ -82,7 +82,7 @@ void WifiScanCallbackStub::SetRemoteDied(bool val) void WifiScanCallbackStub::OnWifiScanStateChanged(int state) { - WIFI_LOGD("WifiScanCallbackStub::OnWifiScanStateChanged,state:%{public}d", state); + WIFI_LOGI("WifiScanCallbackStub::OnWifiScanStateChanged,state:%{public}d", state); if (userCallback_) { userCallback_->OnWifiScanStateChanged(state); diff --git a/wifi/frameworks/native/src/wifi_scan_proxy.cpp b/wifi/frameworks/native/src/wifi_scan_proxy.cpp index 7d73383..ef2b5fd 100644 --- a/wifi/frameworks/native/src/wifi_scan_proxy.cpp +++ b/wifi/frameworks/native/src/wifi_scan_proxy.cpp @@ -51,7 +51,7 @@ WifiScanProxy::~WifiScanProxy() ErrCode WifiScanProxy::SetScanControlInfo(const ScanControlInfo &info) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -100,7 +100,7 @@ ErrCode WifiScanProxy::SetScanControlInfo(const ScanControlInfo &info) ErrCode WifiScanProxy::Scan() { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -132,7 +132,7 @@ ErrCode WifiScanProxy::Scan() ErrCode WifiScanProxy::AdvanceScan(const WifiScanParams ¶ms) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -172,7 +172,7 @@ ErrCode WifiScanProxy::AdvanceScan(const WifiScanParams ¶ms) ErrCode WifiScanProxy::IsWifiClosedScan(bool &bOpen) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -203,7 +203,7 @@ ErrCode WifiScanProxy::IsWifiClosedScan(bool &bOpen) ErrCode WifiScanProxy::GetScanInfoList(std::vector &result) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -273,7 +273,7 @@ ErrCode WifiScanProxy::GetScanInfoList(std::vector &result) ErrCode WifiScanProxy::RegisterCallBack(const sptr &callback) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } WIFI_LOGD("RegisterCallBack start!"); @@ -309,7 +309,7 @@ ErrCode WifiScanProxy::RegisterCallBack(const sptr &callback) ErrCode WifiScanProxy::GetSupportedFeatures(long &features) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -339,7 +339,7 @@ ErrCode WifiScanProxy::GetSupportedFeatures(long &features) void WifiScanProxy::OnRemoteDied(const wptr& remoteObject) { - WIFI_LOGD("Remote service is died!"); + WIFI_LOGW("Remote service is died!"); mRemoteDied = true; if (g_wifiScanCallbackStub == nullptr) { WIFI_LOGE("g_wifiScanCallbackStub is nullptr!"); diff --git a/wifi/frameworks/native/src/wifi_scan_proxy_lite.cpp b/wifi/frameworks/native/src/wifi_scan_proxy_lite.cpp index 0553709..637565d 100644 --- a/wifi/frameworks/native/src/wifi_scan_proxy_lite.cpp +++ b/wifi/frameworks/native/src/wifi_scan_proxy_lite.cpp @@ -428,7 +428,7 @@ ErrCode WifiScanProxy::GetSupportedFeatures(long &features) void WifiScanProxy::OnRemoteDied(void) { - WIFI_LOGD("Remote service is died!"); + WIFI_LOGW("Remote service is died!"); remoteDied_ = true; g_wifiScanCallbackStub.SetRemoteDied(true); } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.cpp index 6fda7cc..75f7cd6 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.cpp @@ -112,13 +112,13 @@ ErrCode ApService::GetStationList(std::vector &result) const WIFI_LOGI("Instance %{public}d %{public}s", m_id, __func__); WifiSettings::GetInstance().GetStationList(result); if (result.empty()) { - WIFI_LOGD("GetStationList is empty."); + WIFI_LOGW("GetStationList is empty."); return ErrCode::WIFI_OPT_SUCCESS; } // get dhcp lease info, return full connected station info std::map tmp; if (!m_ApStateMachine.GetConnectedStationInfo(tmp)) { - WIFI_LOGD("Get connected station info failed!"); + WIFI_LOGW("Get connected station info failed!"); return ErrCode::WIFI_OPT_FAILED; } for (auto iter = result.begin(); iter != result.end(); ++iter) { diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_death_recipient.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_death_recipient.cpp index 15400dc..d013552 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_death_recipient.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_death_recipient.cpp @@ -21,7 +21,7 @@ namespace OHOS { namespace Wifi { void WifiDeviceDeathRecipient::OnRemoteDied(const wptr& remoteObject) { - WIFI_LOGD("WifiDeviceDeathRecipient::OnRemoteDied!"); + WIFI_LOGW("WifiDeviceDeathRecipient::OnRemoteDied!"); WifiInternalEventDispatcher::GetInstance().RemoveStaCallback(remoteObject.promote()); } } // namespace Wifi diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp index 048d7c5..3b9f38f 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp @@ -1105,7 +1105,7 @@ bool WifiDeviceServiceImpl::IsStaServiceRunning() { WifiOprMidState curState = WifiConfigCenter::GetInstance().GetWifiMidState(); if (curState != WifiOprMidState::RUNNING) { - WIFI_LOGD("current wifi state is %{public}d", static_cast(curState)); + WIFI_LOGW("current wifi state is %{public}d", static_cast(curState)); return false; } return true; @@ -1115,7 +1115,7 @@ bool WifiDeviceServiceImpl::IsScanServiceRunning() { WifiOprMidState curState = WifiConfigCenter::GetInstance().GetScanMidState(); if (curState != WifiOprMidState::RUNNING) { - WIFI_LOGD("scan service does not started!"); + WIFI_LOGW("scan service does not started!"); return false; } return true; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp index 6f202e0..56cdd72 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp @@ -561,13 +561,13 @@ void WifiDeviceStub::OnRegisterCallBack(uint32_t code, MessageParcel &data, Mess do { sptr remote = data.ReadRemoteObject(); if (remote == nullptr) { - WIFI_LOGD("Failed to ReadRemoteObject!"); + WIFI_LOGW("Failed to ReadRemoteObject!"); break; } callback_ = iface_cast(remote); if (callback_ == nullptr) { callback_ = new (std::nothrow) WifiDeviceCallBackProxy(remote); - WIFI_LOGD("create new WifiDeviceCallBackProxy!"); + WIFI_LOGI("create new WifiDeviceCallBackProxy!"); } if (mSingleCallback) { diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_death_recipient.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_death_recipient.cpp index f8de933..e24ef8f 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_death_recipient.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_death_recipient.cpp @@ -21,7 +21,7 @@ namespace OHOS { namespace Wifi { void WifiHotspotDeathRecipient::OnRemoteDied(const wptr& remoteObject) { - WIFI_LOGD("WifiHotspotDeathRecipient::OnRemoteDied!"); + WIFI_LOGI("WifiHotspotDeathRecipient::OnRemoteDied!"); WifiInternalEventDispatcher::GetInstance().RemoveHotspotCallback(remoteObject.promote()); } } // namespace Wifi diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_mgr_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_mgr_service_impl.cpp index d12d446..29cb1ad 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_mgr_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_mgr_service_impl.cpp @@ -90,7 +90,7 @@ void SigHandler(int sig) void WifiHotspotMgrServiceImpl::OnStart() { if (mState == ServiceRunningState::STATE_RUNNING) { - WIFI_LOGD("Service has already started."); + WIFI_LOGW("Service has already started."); return; } if (!Init()) { diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp index 2d0e202..3f89c2e 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp @@ -163,7 +163,7 @@ ErrCode WifiHotspotServiceImpl::SetHotspotConfig(const HotspotConfig &config) WifiConfigCenter::GetInstance().GetLinkedInfo(linkInfo); if (!linkInfo.ssid.empty() && linkInfo.ssid == config.GetSsid()) { - WIFI_LOGD("set ssid equal current linked ap ssid, no permission!"); + WIFI_LOGE("set ssid equal current linked ap ssid, no permission!"); return WIFI_OPT_INVALID_PARAM; } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.cpp index a725001..26c5527 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.cpp @@ -75,7 +75,7 @@ int WifiHotspotStub::OnRemoteRequest(uint32_t code, MessageParcel &data, Message HandleFuncMap::iterator iter = handleFuncMap.find(code); if (iter == handleFuncMap.end()) { - WIFI_LOGD("not find function to deal, code %{public}u", code); + WIFI_LOGW("not find function to deal, code %{public}u", code); reply.WriteInt32(0); reply.WriteInt32(WIFI_OPT_NOT_SUPPORTED); } else { @@ -312,13 +312,13 @@ void WifiHotspotStub::OnRegisterCallBack( do { sptr remote = data.ReadRemoteObject(); if (remote == nullptr) { - WIFI_LOGD("Failed to ReadRemoteObject!"); + WIFI_LOGE("Failed to ReadRemoteObject!"); break; } sptr callback_ = iface_cast(remote); if (callback_ == nullptr) { callback_ = new (std::nothrow) WifiHotspotCallbackProxy(remote); - WIFI_LOGD("create new WifiHotspotCallbackProxy!"); + WIFI_LOGI("create new WifiHotspotCallbackProxy!"); } if (mSingleCallback) { diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp index 65c68f6..88feb28 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp @@ -62,7 +62,7 @@ void WifiManager::AutoStartStaService(void) WifiOprMidState staState = WifiConfigCenter::GetInstance().GetWifiMidState(); if (staState == WifiOprMidState::CLOSED) { if (!WifiConfigCenter::GetInstance().SetWifiMidState(staState, WifiOprMidState::OPENING)) { - WIFI_LOGD("set sta mid state opening failed! may be other activity has been operated"); + WIFI_LOGW("set sta mid state opening failed! may be other activity has been operated"); return; } ErrCode errCode = WIFI_OPT_FAILED; @@ -153,7 +153,7 @@ void WifiManager::AutoStartP2pService(void) WifiOprMidState p2pState = WifiConfigCenter::GetInstance().GetP2pMidState(); if (p2pState == WifiOprMidState::CLOSED) { if (!WifiConfigCenter::GetInstance().SetP2pMidState(p2pState, WifiOprMidState::OPENING)) { - WIFI_LOGD("set p2p mid state opening failed!"); + WIFI_LOGW("set p2p mid state opening failed!"); return; } } @@ -190,13 +190,13 @@ void WifiManager::AutoStartP2pService(void) void WifiManager::AutoStartScanService(void) { if (!WifiConfigCenter::GetInstance().IsScanAlwaysActive()) { - WIFI_LOGD("Scan always is not open, not open scan service."); + WIFI_LOGW("Scan always is not open, not open scan service."); return; } ScanControlInfo info; WifiConfigCenter::GetInstance().GetScanControlInfo(info); if (!IsAllowScanAnyTime(info)) { - WIFI_LOGD("Scan control does not support scan always, not open scan service here."); + WIFI_LOGW("Scan control does not support scan always, not open scan service here."); return; } CheckAndStartScanService(); @@ -394,10 +394,10 @@ void WifiManager::DealCloseServiceMsg(WifiManager &manager) break; #endif case WifiCloseServiceCode::SERVICE_THREAD_EXIT: - WIFI_LOGD("DealCloseServiceMsg thread exit!"); + WIFI_LOGI("DealCloseServiceMsg thread exit!"); return; default: - WIFI_LOGD("Unknown message code, %{public}d", static_cast(msg)); + WIFI_LOGW("Unknown message code, %{public}d", static_cast(msg)); break; } } @@ -553,7 +553,7 @@ void WifiManager::CheckAndStartScanService(void) return; } if (!WifiConfigCenter::GetInstance().SetScanMidState(scanState, WifiOprMidState::OPENING)) { - WIFI_LOGD("Failed to set scan mid state opening! may be other activity has been operated"); + WIFI_LOGW("Failed to set scan mid state opening! may be other activity has been operated"); return; } ErrCode errCode = WIFI_OPT_FAILED; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/authorizing_negotiation_request_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/authorizing_negotiation_request_state.cpp index a940949..a382886 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/authorizing_negotiation_request_state.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/authorizing_negotiation_request_state.cpp @@ -51,7 +51,7 @@ bool AuthorizingNegotiationRequestState::ExecuteStateMsg(InternalMessage *msg) if (wps.GetWpsMethod() == WpsMethod::WPS_METHOD_KEYPAD) { std::string inputPin; if (!msg->GetMessageObj(inputPin)) { - WIFI_LOGD("Failed to obtain the pin code."); + WIFI_LOGW("Failed to obtain the pin code."); break; } WpsInfo wpsPin = wps; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.cpp index 9f67976..a7eb003 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.cpp @@ -284,7 +284,7 @@ bool GroupFormedState::ProcessCmdDiscServices(const InternalMessage &msg) const return EXECUTED; } - WIFI_LOGD("CMD_DISCOVER_SERVICES successful."); + WIFI_LOGI("CMD_DISCOVER_SERVICES successful."); p2pStateMachine.BroadcastActionResult(P2pActionCallback::DiscoverServices, ErrCode::WIFI_OPT_SUCCESS); p2pStateMachine.BroadcastP2pDiscoveryChanged(true); return EXECUTED; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.cpp index 0268d23..6e5908c 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.cpp @@ -128,7 +128,7 @@ bool GroupNegotiationState::ProcessGroupStartedEvt(InternalMessage &msg) const p2pStateMachine.BroadcastP2pPeersChanged(); } else { - WIFI_LOGD("fail:No GO device information is found."); + WIFI_LOGE("fail:No GO device information is found."); } } SharedLinkManager::SetSharedLinkCount(SHARED_LINKE_COUNT_ON_CONNECTED); @@ -140,14 +140,14 @@ bool GroupNegotiationState::ProcessGroupStartedEvt(InternalMessage &msg) const bool GroupNegotiationState::ProcessGroupFormationFailEvt(InternalMessage &msg) const { int status = msg.GetParam1(); - WIFI_LOGD("Group formation failure. Error code: %{public}d", status); + WIFI_LOGW("Group formation failure. Error code: %{public}d", status); return EXECUTED; } bool GroupNegotiationState::ProcessNegotFailEvt(InternalMessage &msg) const { int status = msg.GetParam1(); - WIFI_LOGD("Negotiation failure. Error code: %{public}d", status); + WIFI_LOGE("Negotiation failure. Error code: %{public}d", status); p2pStateMachine.SwitchState(&p2pStateMachine.p2pIdleState); return EXECUTED; } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_received_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_received_state.cpp index 3c3169a..30b7a22 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_received_state.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_received_state.cpp @@ -47,7 +47,7 @@ bool InvitationReceivedState::ExecuteStateMsg(InternalMessage *msg) if (wps.GetWpsMethod() == WpsMethod::WPS_METHOD_KEYPAD) { std::string inputPin; if (!msg->GetMessageObj(inputPin)) { - WIFI_LOGD("Failed to obtain the pin code."); + WIFI_LOGW("Failed to obtain the pin code."); break; } WpsInfo wpsPin = wps; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_request_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_request_state.cpp index 6fd74cb..1745fbc 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_request_state.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_request_state.cpp @@ -56,7 +56,7 @@ bool InvitationRequestState::ExecuteStateMsg(InternalMessage *msg) if (status == P2pStatus::UNKNOWN_P2P_GROUP) { int netId = groupManager.GetCurrentGroup().GetNetworkId(); if (netId >= 0) { - WIFI_LOGD("Remove unknown client from currentGroup"); + WIFI_LOGW("Remove unknown client from currentGroup"); p2pStateMachine.groupManager.RemoveClientFromGroup( netId, p2pStateMachine.savedP2pConfig.GetDeviceAddress()); p2pStateMachine.SwitchState(&p2pStateMachine.p2pGroupFormedState); @@ -68,7 +68,7 @@ bool InvitationRequestState::ExecuteStateMsg(InternalMessage *msg) if (status == P2pStatus::SUCCESS) { WIFI_LOGI("Invitation succeeded."); } else { - WIFI_LOGD("Invitation failed."); + WIFI_LOGW("Invitation failed."); } p2pStateMachine.SwitchState(&p2pStateMachine.p2pGroupFormedState); break; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabled_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabled_state.cpp index 43e832b..ba2ecac 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabled_state.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabled_state.cpp @@ -173,7 +173,7 @@ bool P2pEnabledState::ProcessCmdStopDiscPeer(InternalMessage &msg) const } bool P2pEnabledState::ProcessDeviceFoundEvt(InternalMessage &msg) const { - WIFI_LOGD("p2p_enabled_state recv P2P_EVENT_DEVICE_FOUND"); + WIFI_LOGI("p2p_enabled_state recv P2P_EVENT_DEVICE_FOUND"); WifiP2pDevice device; if (!msg.GetMessageObj(device)) { WIFI_LOGE("Failed to obtain device information."); @@ -189,7 +189,7 @@ bool P2pEnabledState::ProcessDeviceFoundEvt(InternalMessage &msg) const } bool P2pEnabledState::ProcessDeviceLostEvt(InternalMessage &msg) const { - WIFI_LOGD("p2p_enabled_state recv P2P_EVENT_DEVICE_LOST"); + WIFI_LOGI("p2p_enabled_state recv P2P_EVENT_DEVICE_LOST"); WifiP2pDevice device; if (!msg.GetMessageObj(device)) { WIFI_LOGE("Failed to obtain device information."); @@ -341,7 +341,7 @@ bool P2pEnabledState::P2pSettingsInitialization() bool P2pEnabledState::ProcessCmdAddLocalService(InternalMessage &msg) const { - WIFI_LOGD("p2p_enabled_state recv CMD_PUT_LOCAL_SERVICE"); + WIFI_LOGI("p2p_enabled_state recv CMD_PUT_LOCAL_SERVICE"); WifiP2pServiceInfo service; if (!msg.GetMessageObj(service)) { WIFI_LOGE("Failed to obtain WifiP2pServiceInfo information."); @@ -406,7 +406,7 @@ bool P2pEnabledState::ProcessCmdDiscServices(InternalMessage &msg) const return EXECUTED; } - WIFI_LOGD("CMD_DISCOVER_SERVICES successful."); + WIFI_LOGI("CMD_DISCOVER_SERVICES successful."); p2pStateMachine.BroadcastActionResult(P2pActionCallback::DiscoverServices, ErrCode::WIFI_OPT_SUCCESS); p2pStateMachine.BroadcastP2pDiscoveryChanged(true); return EXECUTED; @@ -459,7 +459,7 @@ bool P2pEnabledState::ProcessCmdRequestService(InternalMessage &msg) const bool P2pEnabledState::ProcessServiceDiscReqEvt(InternalMessage &msg) const { - WIFI_LOGD("p2p_enabled_state recv P2P_EVENT_SERV_DISC_REQ"); + WIFI_LOGI("p2p_enabled_state recv P2P_EVENT_SERV_DISC_REQ"); WifiP2pServiceRequestList reqList; if (!msg.GetMessageObj(reqList)) { WIFI_LOGE("Failed to obtain WifiP2pServiceRequestList information."); @@ -498,7 +498,7 @@ bool P2pEnabledState::ProcessServiceDiscReqEvt(InternalMessage &msg) const bool P2pEnabledState::ProcessServiceDiscRspEvt(InternalMessage &msg) const { - WIFI_LOGD("p2p_enabled_state recv P2P_EVENT_SERV_DISC_RESP"); + WIFI_LOGI("p2p_enabled_state recv P2P_EVENT_SERV_DISC_RESP"); WifiP2pServiceResponseList respList; if (!msg.GetMessageObj(respList)) { WIFI_LOGE("Failed to obtain WifiP2pServiceResponseList information."); @@ -522,7 +522,7 @@ bool P2pEnabledState::ProcessExceptionTimeOut(InternalMessage &msg) const bool P2pEnabledState::ProcessCmdSetDeviceName(InternalMessage &msg) const { - WIFI_LOGD("p2p_enabled_state CMD: set device name."); + WIFI_LOGI("p2p_enabled_state CMD: set device name."); std::string deviceName; if (!msg.GetMessageObj(deviceName)) { LOGE("Failed to obtain string information."); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_join_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_join_state.cpp index 81d4429..17790cb 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_join_state.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_join_state.cpp @@ -49,7 +49,7 @@ bool P2pGroupJoinState::ExecuteStateMsg(InternalMessage *msg) if (wps.GetWpsMethod() == WpsMethod::WPS_METHOD_KEYPAD) { std::string inputPin; if (!msg->GetMessageObj(inputPin)) { - WIFI_LOGD("Failed to obtain the pin code."); + WIFI_LOGW("Failed to obtain the pin code."); break; } WpsInfo wpsPin = wps; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.cpp index dd1ec3d..0e7daf6 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.cpp @@ -94,7 +94,7 @@ bool P2pIdleState::ProcessCmdConnect(InternalMessage &msg) const { WifiP2pConfigInternal config; if (!msg.GetMessageObj(config)) { - WIFI_LOGD("p2p connect Parameter error."); + WIFI_LOGW("p2p connect Parameter error."); p2pStateMachine.BroadcastActionResult(P2pActionCallback::P2pConnect, ErrCode::WIFI_OPT_INVALID_PARAM); return EXECUTED; } @@ -102,7 +102,7 @@ bool P2pIdleState::ProcessCmdConnect(InternalMessage &msg) const P2pConfigErrCode ret = p2pStateMachine.IsConfigUnusable(p2pStateMachine.savedP2pConfig); if (ret != P2pConfigErrCode::SUCCESS) { - WIFI_LOGD("Invalid device information."); + WIFI_LOGW("Invalid device information."); if (ret == P2pConfigErrCode::MAC_EMPTY) { p2pStateMachine.BroadcastActionResult(P2pActionCallback::P2pConnect, ErrCode::WIFI_OPT_INVALID_PARAM); } else if (ret == P2pConfigErrCode::MAC_NOT_FOUND) { @@ -175,7 +175,7 @@ bool P2pIdleState::ProcessNegotReqEvt(InternalMessage &msg) const { WifiP2pConfigInternal conf; if (!msg.GetMessageObj(conf)) { - WIFI_LOGD("Failed to obtain conf."); + WIFI_LOGW("Failed to obtain conf."); return EXECUTED; } p2pStateMachine.savedP2pConfig = conf; @@ -187,7 +187,7 @@ bool P2pIdleState::ProcessProvDiscShowPinEvt(InternalMessage &msg) const { WifiP2pTempDiscEvent provDisc; if (!msg.GetMessageObj(provDisc)) { - WIFI_LOGD("Failed to obtain provDisc."); + WIFI_LOGW("Failed to obtain provDisc."); return EXECUTED; } WifiP2pConfigInternal config; @@ -260,7 +260,7 @@ bool P2pIdleState::ProcessGroupStartedEvt(InternalMessage &msg) const p2pStateMachine.BroadcastP2pPeersChanged(); } else { - WIFI_LOGD("fail:No GO device information is found."); + WIFI_LOGW("fail:No GO device information is found."); } } else { WifiP2pGroupInfo currGrp = p2pStateMachine.groupManager.GetCurrentGroup(); @@ -284,7 +284,7 @@ bool P2pIdleState::ProcessInvitationReceivedEvt(InternalMessage &msg) const { WifiP2pGroupInfo group; if (!msg.GetMessageObj(group)) { - WIFI_LOGD("p2p invitation received: Parameter error."); + WIFI_LOGW("p2p invitation received: Parameter error."); return EXECUTED; } const WifiP2pDevice &owner = group.GetOwner(); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_monitor.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_monitor.cpp index c4c48e2..ebd720b 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_monitor.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_monitor.cpp @@ -302,7 +302,7 @@ void P2pMonitor::OnConnectSupplicant(int status) const void P2pMonitor::WpaEventDeviceFound(const IdlP2pDeviceFound &deviceInfo) const { const int minWfdLength = 6; - WIFI_LOGD("onDeviceFound callback"); + WIFI_LOGI("onDeviceFound callback"); WifiP2pDevice device; device.SetDeviceName(deviceInfo.deviceName); if (device.GetDeviceName().empty()) { @@ -333,7 +333,7 @@ void P2pMonitor::WpaEventDeviceFound(const IdlP2pDeviceFound &deviceInfo) const void P2pMonitor::WpaEventDeviceLost(const std::string &p2pDeviceAddress) const { - WIFI_LOGD("onDeviceLost callback, p2pDeviceAddress:%{private}s", p2pDeviceAddress.c_str()); + WIFI_LOGI("onDeviceLost callback, p2pDeviceAddress:%{private}s", p2pDeviceAddress.c_str()); WifiP2pDevice device; device.SetDeviceAddress(p2pDeviceAddress); if (device.GetDeviceAddress().empty()) { @@ -347,7 +347,7 @@ void P2pMonitor::WpaEventDeviceLost(const std::string &p2pDeviceAddress) const void P2pMonitor::WpaEventGoNegRequest(const std::string &srcAddress, short passwordId) const { - WIFI_LOGD("WpaEventGoNegRequest srcAddress:%{private}s, passwordId:%{private}hd", srcAddress.c_str(), passwordId); + WIFI_LOGI("WpaEventGoNegRequest srcAddress:%{private}s, passwordId:%{private}hd", srcAddress.c_str(), passwordId); WifiP2pConfigInternal config; config.SetDeviceAddress(srcAddress); if (config.GetDeviceAddress().empty()) { @@ -380,20 +380,20 @@ void P2pMonitor::WpaEventGoNegRequest(const std::string &srcAddress, short passw void P2pMonitor::WpaEventGoNegSuccess(void) const { - WIFI_LOGD("onGoNegotiationSuccess callback"); + WIFI_LOGI("onGoNegotiationSuccess callback"); Broadcast2SmGoNegSuccess(selectIfacName); } void P2pMonitor::WpaEventGoNegFailure(int status) const { - WIFI_LOGD("onGoNegotiationFailure callback status:%{public}d", status); + WIFI_LOGI("onGoNegotiationFailure callback status:%{public}d", status); P2pStatus p2pStatus = IntStatusToP2pStatus(status); Broadcast2SmGoNegFailure(selectIfacName, p2pStatus); } void P2pMonitor::WpaEventInvitationReceived(const IdlP2pInvitationInfo &recvInfo) const { - WIFI_LOGD("onInvitationReceived callback"); + WIFI_LOGI("onInvitationReceived callback"); WifiP2pGroupInfo group; group.SetNetworkId(recvInfo.persistentNetworkId); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp index 1521e80..e66ea45 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp @@ -60,7 +60,7 @@ WifiP2pServiceImpl::~WifiP2pServiceImpl() void WifiP2pServiceImpl::OnStart() { if (mState == ServiceRunningState::STATE_RUNNING) { - WIFI_LOGD("P2p service has already started."); + WIFI_LOGI("P2p service has already started."); return; } if (!Init()) { @@ -100,11 +100,11 @@ ErrCode WifiP2pServiceImpl::CheckCanEnableP2p(void) return WIFI_OPT_PERMISSION_DENIED; } if (WifiConfigCenter::GetInstance().GetAirplaneModeState() == 1) { - WIFI_LOGD("current airplane mode and can not use p2p, open failed!"); + WIFI_LOGW("current airplane mode and can not use p2p, open failed!"); return WIFI_OPT_FORBID_AIRPLANE; } if (WifiConfigCenter::GetInstance().GetPowerSavingModeState() == 1) { - WIFI_LOGD("current power saving mode and can not use p2p, open failed!"); + WIFI_LOGW("current power saving mode and can not use p2p, open failed!"); return WIFI_OPT_FORBID_POWSAVING; } return WIFI_OPT_SUCCESS; @@ -120,7 +120,7 @@ ErrCode WifiP2pServiceImpl::EnableP2p(void) WifiOprMidState curState = WifiConfigCenter::GetInstance().GetP2pMidState(); if (curState != WifiOprMidState::CLOSED) { - WIFI_LOGD("current p2p state is %{public}d", static_cast(curState)); + WIFI_LOGW("current p2p state is %{public}d", static_cast(curState)); if (curState == WifiOprMidState::CLOSING) { return WIFI_OPT_OPEN_FAIL_WHEN_CLOSING; } else { @@ -170,7 +170,7 @@ ErrCode WifiP2pServiceImpl::DisableP2p(void) WifiOprMidState curState = WifiConfigCenter::GetInstance().GetP2pMidState(); if (curState != WifiOprMidState::RUNNING) { - WIFI_LOGD("current p2p state is %{public}d", static_cast(curState)); + WIFI_LOGI("current p2p state is %{public}d", static_cast(curState)); if (curState == WifiOprMidState::OPENING) { return WIFI_OPT_CLOSE_FAIL_WHEN_OPENING; } else { @@ -728,7 +728,7 @@ bool WifiP2pServiceImpl::IsP2pServiceRunning() { WifiOprMidState curState = WifiConfigCenter::GetInstance().GetP2pMidState(); if (curState != WifiOprMidState::RUNNING) { - WIFI_LOGD("p2p service does not started!"); + WIFI_LOGW("p2p service does not started!"); return false; } return true; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.cpp index 4d0c7d6..264c56f 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.cpp @@ -571,14 +571,14 @@ void WifiP2pStub::OnRegisterCallBack(uint32_t code, MessageParcel &data, Message do { sptr remote = data.ReadRemoteObject(); if (remote == nullptr) { - WIFI_LOGD("Failed to readRemoteObject!"); + WIFI_LOGE("Failed to readRemoteObject!"); break; } callback_ = iface_cast(remote); if (callback_ == nullptr) { callback_ = new (std::nothrow) WifiP2pCallbackProxy(remote); - WIFI_LOGD("create new `WifiP2pCallbackProxy`!"); + WIFI_LOGI("create new `WifiP2pCallbackProxy`!"); } if (mSingleCallback) { diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp index 738afab..dc0d426 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp @@ -902,7 +902,7 @@ void ScanService::HandleMovingFreezeChanged() movingFreezeBakup); /* Moving -> Freeze, set the scanned flag to false. */ if (!movingFreezeBakup && movingFreeze) { - WIFI_LOGD("set movingFreeze scanned false."); + WIFI_LOGW("set movingFreeze scanned false."); SetMovingFreezeScaned(false); } } @@ -913,7 +913,7 @@ void ScanService::HandleCustomStatusChanged(int customScene, int customSceneStat WIFI_LOGD("sizeof(time_t):%{public}d", int(sizeof(time_t))); time_t now = time(nullptr); - WIFI_LOGD("customScene:%{public}d, status:%{public}d", customScene, customSceneStatus); + WIFI_LOGI("customScene:%{public}d, status:%{public}d", customScene, customSceneStatus); if (customSceneStatus == MODE_STATE_OPEN) { customSceneTimeMap.insert(std::pair(customScene, now)); } @@ -933,16 +933,11 @@ void ScanService::HandleGetCustomSceneState(std::map& sceneMap) con void ScanService::SystemScanProcess(bool scanAtOnce) { - WIFI_LOGI("Enter ScanService::SystemScanProcess."); + WIFI_LOGI("Enter ScanService::SystemScanProcess, scanAtOnce:%{public}d.", scanAtOnce); StopSystemScan(); int state = WifiSettings::GetInstance().GetScreenState(); - if (state == MODE_STATE_OPEN) { - WIFI_LOGD("Screen is on."); - } else { - WIFI_LOGD("ScreenOn is off."); - } - + WIFI_LOGI("Screen state(1:OPEN, 2:CLOSE): %{public}d.", state); if (state == MODE_STATE_OPEN) { { std::unique_lock lock(scanControlInfoMutex); @@ -1021,7 +1016,7 @@ void ScanService::StartSystemTimerScan(bool scanAtOnce) } else { scanTime = systemScanIntervalMode.scanIntervalMode.interval - sinceLastScan; } - WIFI_LOGD("scanTime: %{public}d, interval:%{public}d, count:%{public}d", + WIFI_LOGI("scanTime: %{public}d, interval:%{public}d, count:%{public}d", scanTime, systemScanIntervalMode.scanIntervalMode.interval, systemScanIntervalMode.scanIntervalMode.count); @@ -1151,12 +1146,12 @@ ErrCode ScanService::AllowSystemTimerScan() } if (!AllowScanDuringStaScene(staScene, ScanMode::SYSTEM_TIMER_SCAN)) { - WIFI_LOGD("system timer scan not allowed, staScene is %{public}d", staScene); + WIFI_LOGW("system timer scan not allowed, staScene is %{public}d", staScene); return WIFI_OPT_FAILED; } if (!AllowScanDuringCustomScene(ScanMode::SYSTEM_TIMER_SCAN)) { - WIFI_LOGD("system timer scan not allowed"); + WIFI_LOGW("system timer scan not allowed"); return WIFI_OPT_FAILED; } @@ -1183,7 +1178,7 @@ ErrCode ScanService::AllowSystemTimerScan() return WIFI_OPT_FAILED; } - WIFI_LOGD("allow system timer scan"); + WIFI_LOGI("allow system timer scan"); return WIFI_OPT_SUCCESS; } @@ -1192,15 +1187,17 @@ ErrCode ScanService::AllowPnoScan() WIFI_LOGI("Enter ScanService::AllowPnoScan.\n"); if (staStatus != static_cast(OperateResState::DISCONNECT_DISCONNECTED)) { + WIFI_LOGE("NOT allow PNO scan for staStatus: %{public}d", staStatus); return WIFI_OPT_FAILED; } int staScene = GetStaScene(); if (staScene == SCAN_SCENE_MAX) { + WIFI_LOGE("NOT allow PNO scan for staScene: %{public}d", staScene); return WIFI_OPT_FAILED; } if (!AllowScanDuringStaScene(staScene, ScanMode::PNO_SCAN)) { - WIFI_LOGD("pnoScan is not allowed for forbid map, staScene is %{public}d", staScene); + WIFI_LOGW("pnoScan is not allowed for forbid map, staScene is %{public}d", staScene); return WIFI_OPT_FAILED; } if (!AllowScanDuringCustomScene(ScanMode::PNO_SCAN)) { @@ -1221,7 +1218,7 @@ ErrCode ScanService::AllowPnoScan() pnoScanIntervalMode.scanIntervalMode.count = iter->count; if (!PnoScanByInterval(pnoScanIntervalMode.fixedScanCount, pnoScanIntervalMode.fixedCurrentTime, pnoScanIntervalMode.scanIntervalMode.interval, pnoScanIntervalMode.scanIntervalMode.count)) { - WIFI_LOGD("pnoScan is not allowed for interval mode"); + WIFI_LOGW("pnoScan is not allowed for interval mode"); return WIFI_OPT_FAILED; } } @@ -1229,11 +1226,11 @@ ErrCode ScanService::AllowPnoScan() } if (!AllowScanByDisableScanCtrl()) { - WIFI_LOGD("extern scan not allow by disable scan control."); + WIFI_LOGW("extern scan not allow by disable scan control."); return WIFI_OPT_FAILED; } - WIFI_LOGD("pno scan is allowed"); + WIFI_LOGI("pno scan is allowed"); return WIFI_OPT_SUCCESS; } @@ -1333,7 +1330,7 @@ ErrCode ScanService::ApplyTrustListPolicy(ScanType scanType) SetScanTrustMode(); policyResult = AllowScanByType(scanType); if (policyResult != WIFI_OPT_SUCCESS) { - WIFI_LOGD("AllowScanByType failed."); + WIFI_LOGW("AllowScanByType failed."); } ResetToNonTrustMode(); WIFI_LOGI("apply trust list policy, ErrCode=%{public}d", static_cast(policyResult)); @@ -1727,7 +1724,7 @@ bool ScanService::AllowScanDuringScanning(ScanMode scanMode) const std::unique_lock lock(scanControlInfoMutex); for (auto iter = scanControlInfo.scanForbidList.begin(); iter != scanControlInfo.scanForbidList.end(); ++iter) { if (iter->scanScene == SCAN_SCENE_SCANNING && iter->scanMode == scanMode) { - WIFI_LOGD("scan not allow by scanning scene."); + WIFI_LOGW("scan not allow by scanning scene."); return false; } } @@ -1741,14 +1738,14 @@ bool ScanService::AllowScanDuringScreenOff(ScanMode scanMode) const bool isTrustListMode = IsScanTrustMode(); bool isInList = IsInScanTrust(SCAN_SCENE_SCREEN_OFF); if (isTrustListMode && isInList) { - WIFI_LOGD("Trust list mode,sceneId(SCAN_SCENE_SCREEN_OFF) in the list,return true."); + WIFI_LOGI("Trust list mode,sceneId(SCAN_SCENE_SCREEN_OFF) in the list,return true."); return true; } std::unique_lock lock(scanControlInfoMutex); for (auto iter = scanControlInfo.scanForbidList.begin(); iter != scanControlInfo.scanForbidList.end(); ++iter) { if (iter->scanScene == SCAN_SCENE_SCREEN_OFF && iter->scanMode == scanMode) { - WIFI_LOGD("scan not allow by screen off scene."); + WIFI_LOGW("scan not allow by screen off scene."); return false; } } @@ -1766,7 +1763,7 @@ bool ScanService::AllowScanDuringStaScene(int staScene, ScanMode scanMode) } std::unique_lock lock(scanControlInfoMutex); for (auto iter = scanControlInfo.scanForbidList.begin(); iter != scanControlInfo.scanForbidList.end(); ++iter) { - WIFI_LOGD("now - staCurrentTime:%{public}d, iter->forbidTime:%{public}d", int(now - staCurrentTime), + WIFI_LOGI("now - staCurrentTime:%{public}d, iter->forbidTime:%{public}d", int(now - staCurrentTime), iter->forbidTime); /* forbid scan mode found in scan scene. */ if (iter->scanScene == staScene && iter->scanMode == scanMode) { @@ -1817,17 +1814,21 @@ bool ScanService::AllowCustomSceneCheck(const std::map::const_itera if (iter->scanScene == customIter->first && iter->scanMode == scanMode) { /* forbidCount=0 and forbidTime=0, directly forbid scan. */ if ((iter->forbidTime == 0) && (iter->forbidCount == 0)) { - WIFI_LOGD("Scan is forbidden by staScene."); + WIFI_LOGW("Scan is forbidden by staScene."); return false; } /* Unconditional scan control for forbidCount times. */ if (iter->forbidCount > 0 && iter->forbidCount - customSceneForbidCount > 0) { customSceneForbidCount++; + WIFI_LOGW("Unconditional scan control for forbidCount times, customSceneForbidCount:%{public}d.", + customSceneForbidCount); return false; } /* Scan interval less than forbidTime, forbid scan. */ time_t now = time(nullptr); if (iter->forbidTime > 0 && iter->forbidTime > now - customIter->second) { + WIFI_LOGW("Scan interval less than forbidTime, forbid scan, forbidTime:%{public}d.", + iter->forbidTime); return false; } } @@ -2136,13 +2137,13 @@ bool ScanService::AllowScanByIntervalBlocklist( } /* If the app ID is in the blocklist, extern scan is forbidden. */ if (std::find(scanBlocklist.begin(), scanBlocklist.end(), appId) != scanBlocklist.end()) { - WIFI_LOGD("extern scan not allowed by blocklist"); + WIFI_LOGW("extern scan not allowed by blocklist"); return false; } /* First scan */ if (blockListScanTime == 0) { blockListScanTime = now; - WIFI_LOGD("blockListScanTime, first scan."); + WIFI_LOGW("blockListScanTime, first scan."); return true; } /** @@ -2161,7 +2162,7 @@ bool ScanService::AllowScanByIntervalBlocklist( * is greater than count, the user is blocklisted forbidding scanning. */ scanBlocklist.push_back(appId); - WIFI_LOGD("scanBlocklist.push_back(appId), return false."); + WIFI_LOGI("scanBlocklist.push_back(appId), return false."); return false; } blockListScanTime = now; @@ -2195,7 +2196,7 @@ bool ScanService::AllowScanByMovingFreeze() WIFI_LOGD("In movingfreeze mode, return true for the first scan."); return true; } else { - WIFI_LOGD("In movingfreeze mode, return false for the already scanned."); + WIFI_LOGW("In movingfreeze mode, return false for the already scanned."); return false; } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_service_impl.cpp index 2954dd1..e77cadd 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_service_impl.cpp @@ -76,7 +76,7 @@ WifiScanServiceImpl::~WifiScanServiceImpl() void WifiScanServiceImpl::OnStart() { if (mState == ServiceRunningState::STATE_RUNNING) { - WIFI_LOGD("Service has already started."); + WIFI_LOGW("Service has already started."); return; } if (!Init()) { @@ -256,7 +256,7 @@ bool WifiScanServiceImpl::IsScanServiceRunning() { WifiOprMidState curState = WifiConfigCenter::GetInstance().GetScanMidState(); if (curState != WifiOprMidState::RUNNING) { - WIFI_LOGD("scan service does not started!"); + WIFI_LOGW("scan service does not started!"); return false; } return true; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_stub.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_stub.cpp index 585cd95..d364568 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_stub.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_stub.cpp @@ -225,14 +225,14 @@ int WifiScanStub::OnRegisterCallBack(uint32_t code, MessageParcel &data, Message do { sptr remote = data.ReadRemoteObject(); if (remote == nullptr) { - WIFI_LOGD("Failed to readRemoteObject!"); + WIFI_LOGE("Failed to readRemoteObject!"); break; } callback_ = iface_cast(remote); if (callback_ == nullptr) { callback_ = new (std::nothrow) WifiScanCallbackProxy(remote); - WIFI_LOGD("create new `WifiScanCallbackProxy`!"); + WIFI_LOGI("create new `WifiScanCallbackProxy`!"); } if (mSingleCallback) { diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_stub_lite.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_stub_lite.cpp index bc5f1df..1afb2b0 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_stub_lite.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_stub_lite.cpp @@ -35,7 +35,7 @@ int WifiScanStub::OnRemoteRequest(uint32_t code, IpcIo *req, IpcIo *reply) { WIFI_LOGD("WifiScanStub::OnRemoteRequest,code:%{public}u", code); if (req == nullptr || reply == nullptr) { - WIFI_LOGD("req:%{public}d, reply:%{public}d", req == nullptr, reply == nullptr); + WIFI_LOGE("req:%{public}d, reply:%{public}d", req == nullptr, reply == nullptr); return ERR_FAILED; } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.cpp index 8dfb0eb..be8aa6c 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.cpp @@ -376,7 +376,7 @@ int WifiServiceManager::UnloadP2pService(bool bPreLoad) int WifiServiceManager::UnloadService(const std::string &name, int id) { bool bPreLoad = WifiSettings::GetInstance().IsModulePreLoad(name); - WIFI_LOGD("WifiServiceManager::UnloadService name: %{public}s", name.c_str()); + WIFI_LOGI("WifiServiceManager::UnloadService name: %{public}s", name.c_str()); std::unique_lock lock(mMutex); if (name == WIFI_SERVICE_STA) { return UnloadStaService(bPreLoad); @@ -399,7 +399,7 @@ int WifiServiceManager::UnloadService(const std::string &name, int id) void WifiServiceManager::UninstallAllService() { - WIFI_LOGD("WifiServiceManager::UninstallAllService"); + WIFI_LOGI("WifiServiceManager::UninstallAllService"); UnloadStaService(false); UnloadScanService(false); #ifdef FEATURE_AP_SUPPORT diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.cpp index b5f92be..4e7a969 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.cpp @@ -46,7 +46,7 @@ extern "C" void Destroy(IStaService *pservice) ErrCode StaInterface::EnableWifi() { - WIFI_LOGD("Enter StaInterface::EnableWifi.\n"); + WIFI_LOGI("Enter StaInterface::EnableWifi.\n"); if(pStaService == nullptr) { pStaService = new (std::nothrow) StaService(); if (pStaService == nullptr) { @@ -205,7 +205,7 @@ ErrCode StaInterface::RemoveAllDevice() WIFI_LOGD("Enter StaInterface::RemoveAllDevice.\n"); CHECK_NULL_AND_RETURN(pStaService, WIFI_OPT_FAILED); if (pStaService->RemoveAllDevice() != WIFI_OPT_SUCCESS) { - WIFI_LOGD("RemoveAllDevice failed.\n"); + WIFI_LOGW("RemoveAllDevice failed.\n"); return WIFI_OPT_FAILED; } return WIFI_OPT_SUCCESS; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp index d0efb8d..40ce713 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp @@ -310,7 +310,7 @@ ErrCode StaService::ReAssociate() const ErrCode StaService::EnableDeviceConfig(int networkId, bool attemptEnable) const { - WIFI_LOGD("Enter StaService::EnableDeviceConfig! networkid is %{public}d", networkId); + WIFI_LOGI("Enter StaService::EnableDeviceConfig! networkid is %{public}d", networkId); /* Update wifi status. */ if (WifiSettings::GetInstance().SetDeviceState(networkId, (int)WifiDeviceConfigStatus::ENABLED, attemptEnable) < @@ -324,7 +324,7 @@ ErrCode StaService::EnableDeviceConfig(int networkId, bool attemptEnable) const ErrCode StaService::DisableDeviceConfig(int networkId) const { - WIFI_LOGD("Enter StaService::DisableDeviceConfig.networkid is %{public}d", networkId); + WIFI_LOGI("Enter StaService::DisableDeviceConfig.networkid is %{public}d", networkId); if (WifiSettings::GetInstance().SetDeviceState(networkId, (int)WifiDeviceConfigStatus::DISABLED) < 0) { WIFI_LOGE("Disable device config failed!"); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp index 61ad370..1266871 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp @@ -562,7 +562,7 @@ void StaStateMachine::StopWifiProcess() /* Callback result to InterfaceService. */ WifiSettings::GetInstance().SetWifiState(static_cast(WifiState::DISABLED)); staCallback.OnStaCloseRes(OperateResState::CLOSE_WIFI_SUCCEED); - WIFI_LOGD("Stop WifiProcess successfully!"); + WIFI_LOGI("Stop WifiProcess successfully!"); /* The current state of StaStateMachine transfers to InitState. */ SwitchState(pInitState); @@ -951,7 +951,7 @@ void StaStateMachine::DealReConnectCmd(InternalMessage *msg) } if (WifiStaHalInterface::GetInstance().Reconnect() == WIFI_IDL_OPT_OK) { - WIFI_LOGD("StaStateMachine ReConnect successfully!"); + WIFI_LOGI("StaStateMachine ReConnect successfully!"); /* Callback result to InterfaceService */ staCallback.OnStaConnChanged(OperateResState::CONNECT_CONNECTING, linkedInfo); StopTimer(static_cast(CMD_NETWORK_CONNECT_TIMEOUT)); @@ -993,7 +993,7 @@ void StaStateMachine::DealStartWpsCmd(InternalMessage *msg) StartWpsMode(msg); if ((wpsState == SetupMethod::DISPLAY) || (wpsState == SetupMethod::KEYPAD)) { - WIFI_LOGD("Clear WPA block list every ten second!"); + WIFI_LOGW("Clear WPA block list every ten second!"); SendMessage(WPA_BLOCK_LIST_CLEAR_EVENT); } } -- Gitee From 75e739c4bdb1d97230385834a6bc845ef0aeeb8b Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Tue, 23 Aug 2022 11:44:48 +0000 Subject: [PATCH 322/491] add testcase and testecase code optimize Signed-off-by: zhangfeng --- .../dhcp_server/src/dhcp_address_pool.c | 5 +- .../dhcp_client/dhcp_function_test.cpp | 8 +-- .../dhcp_server/unittest/dhcp_server_test.cpp | 64 ++++++++++++------- .../native/interfaces/wifi_p2p_msg.h | 1 - wifi/frameworks/native/src/wifi_p2p_msg.cpp | 5 -- .../wifi_manage/wifi_service_manager.cpp | 26 +++----- .../wifi_toolkit/config/wifi_settings.cpp | 1 + .../wifi_toolkit/config/wifi_settings.h | 10 +++ .../unittest/wifi_config_center_test.cpp | 13 +++- .../wifi_common/Mock/mock_chip_capability.cpp | 26 ++++++++ .../wifi_common/Mock/mock_chip_capability.h | 50 +++++++++++++++ .../wifi_p2p/test/p2p_idle_state_test.cpp | 4 +- .../wifi_p2p/test/p2p_state_machine_test.cpp | 13 ++-- .../wifi_scan/Mock/mock_wifi_settings.h | 2 + .../wifi_scan/scan_service_test.cpp | 1 + .../wifi_manage/wifi_sta/BUILD.gn | 2 + .../sta_auto_connect_service_test.cpp | 2 +- .../wifi_sta/sta_state_machine_test.cpp | 21 +++--- .../wifi_toolkit/unittest/BUILD.gn | 4 +- .../{common_test.cpp => toolkit_test.cpp} | 0 .../unittest/wifi_hal_crpc_server_test.cpp | 26 ++++---- 21 files changed, 198 insertions(+), 86 deletions(-) create mode 100755 wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_common/Mock/mock_chip_capability.cpp create mode 100755 wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_common/Mock/mock_chip_capability.h rename wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/{common_test.cpp => toolkit_test.cpp} (100%) diff --git a/dhcp/services/dhcp_server/src/dhcp_address_pool.c b/dhcp/services/dhcp_server/src/dhcp_address_pool.c index 2f9895a..474d17e 100644 --- a/dhcp/services/dhcp_server/src/dhcp_address_pool.c +++ b/dhcp/services/dhcp_server/src/dhcp_address_pool.c @@ -559,11 +559,13 @@ int LoadBindingRecoders(DhcpAddressPool *pool) int SaveBindingRecoders(const DhcpAddressPool *pool, int force) { if (pool == NULL) { + LOGE("Save binding record, pool is null"); return RET_FAILED; } static uint64_t lastTime = 0; uint64_t currTime = Tmspsec(); if (force == 0 && currTime < lastTime + DHCP_REFRESH_LEASE_FILE_INTERVAL) { + LOGE("Save binding record, time interval is not satisfied."); return RET_WAIT_SAVE; } char filePath[DHCP_LEASE_FILE_LENGTH] = {0}; @@ -574,6 +576,7 @@ int SaveBindingRecoders(const DhcpAddressPool *pool, int force) char line[DHCP_FILE_LINE_LENGTH] = {0}; FILE *fp = fopen(filePath, "w"); if (fp == NULL) { + LOGE("Save binding records %{private}s failed: %{public}d", filePath, errno); return RET_FAILED; } for (size_t index = 0; index < pool->leaseTable.capacity; ++index) { @@ -581,7 +584,7 @@ int SaveBindingRecoders(const DhcpAddressPool *pool, int force) while (node != NULL) { AddressBinding *binding = (AddressBinding *)node->value; if (WriteAddressBinding(binding, line, sizeof(line)) != RET_SUCCESS) { - LOGW("Failed to convert binding info to string"); + LOGE("Failed to convert binding info to string"); } else { fprintf(fp, "%s\n", line); } diff --git a/dhcp/test/services/dhcp_client/dhcp_function_test.cpp b/dhcp/test/services/dhcp_client/dhcp_function_test.cpp index c0a4a9d..60039e4 100644 --- a/dhcp/test/services/dhcp_client/dhcp_function_test.cpp +++ b/dhcp/test/services/dhcp_client/dhcp_function_test.cpp @@ -134,8 +134,8 @@ HWTEST_F(DhcpFunctionTest, GetLocalIp_FAILED, TestSize.Level1) HWTEST_F(DhcpFunctionTest, SetLocalInterface_SUCCESS, TestSize.Level1) { char interface[INFNAME_SIZE] = "wlan0"; - uint32_t ipaddr4 = 3226272231; - uint32_t netMask = 4294967040; + uint32_t ipaddr4 = 2981805322; + uint32_t netMask = 16318463; EXPECT_EQ(DHCP_OPT_SUCCESS, SetLocalInterface(interface, ipaddr4, netMask)); } @@ -164,9 +164,9 @@ HWTEST_F(DhcpFunctionTest, InitPidfile_FAILED, TestSize.Level1) char pidFile[DIR_MAX_LEN] = {0}; EXPECT_EQ(DHCP_OPT_FAILED, InitPidfile(workDir, pidFile, getpid())); - EXPECT_EQ(DHCP_OPT_SUCCESS, InitPidfile("./", "./test/wlan0.pid", getpid())); + EXPECT_EQ(DHCP_OPT_FAILED, InitPidfile("./", "./test/wlan0.pid", getpid())); - EXPECT_EQ(DHCP_OPT_SUCCESS, InitPidfile("./test/", "./wlan0.pid", getpid())); + EXPECT_EQ(DHCP_OPT_FAILED, InitPidfile("./test/", "./wlan0.pid", getpid())); } HWTEST_F(DhcpFunctionTest, GetPID_SUCCESS, TestSize.Level1) diff --git a/dhcp/test/services/dhcp_server/unittest/dhcp_server_test.cpp b/dhcp/test/services/dhcp_server/unittest/dhcp_server_test.cpp index c580f75..fd13356 100644 --- a/dhcp/test/services/dhcp_server/unittest/dhcp_server_test.cpp +++ b/dhcp/test/services/dhcp_server/unittest/dhcp_server_test.cpp @@ -137,7 +137,7 @@ bool DhcpServerTest::InitBindingRecodersTest() bind.chaddr[i] = testMac1[i]; } if (AddLease(&srvIns->addressPool, &bind) != RET_SUCCESS) { - LOGD("failed to add lease recoder."); + LOGE("failed to add lease recoder."); return false; } @@ -151,7 +151,7 @@ bool DhcpServerTest::InitBindingRecodersTest() bind.expireIn = Tmspsec(); bind.bindingTime = bind.expireIn - DHCP_LEASE_TIME; if (AddLease(&srvIns->addressPool, &bind) != RET_SUCCESS) { - LOGD("failed to add lease recoder."); + LOGE("failed to add lease recoder."); return false; } @@ -165,7 +165,7 @@ bool DhcpServerTest::InitBindingRecodersTest() bind.expireIn = Tmspsec(); bind.bindingTime = bind.expireIn - DHCP_LEASE_TIME; if (AddLease(&srvIns->addressPool, &bind) != RET_SUCCESS) { - LOGD("failed to add lease recoder."); + LOGE("failed to add lease recoder."); return false; } srvIns->addressPool.leaseTime = DHCP_LEASE_TIME; @@ -246,23 +246,23 @@ bool DhcpServerTest::ServerRun(void) } RegisterDhcpCallback(m_pServerCtx, TestServerCallback); if (StartDhcpServer(nullptr) != RET_FAILED) { - printf("failed to start dhcp server. \n"); + LOGE("failed to start dhcp server. \n"); retval = false; } DhcpServerContext tempCtx; memset_s(&tempCtx, sizeof(DhcpServerContext), 0, sizeof(DhcpServerContext)); memset_s(tempCtx.ifname, sizeof(tempCtx.ifname), '\0', sizeof(tempCtx.ifname)); if (StartDhcpServer(&tempCtx) != RET_FAILED) { - printf("failed to start dhcp server. \n"); + LOGE("failed to start dhcp server. \n"); retval = false; } strcpy_s(tempCtx.ifname, sizeof(tempCtx.ifname), "test_if1"); if (StartDhcpServer(&tempCtx) != RET_FAILED) { - printf("failed to start dhcp server. \n"); + LOGE("failed to start dhcp server. \n"); retval = false; } if (m_pServerCtx && StartDhcpServer(m_pServerCtx) != RET_SUCCESS) { - printf("failed to start dhcp server. \n"); + LOGE("failed to start dhcp server. \n"); retval = false; } if (SaveLease(m_pServerCtx) != RET_SUCCESS) { @@ -278,8 +278,9 @@ bool DhcpServerTest::ServerRun(void) bool DhcpServerTest::StartServerTest() { bool retval = true; + LOGI("start dhcp server test..."); if (InitServerConfig(&m_serverConfg) != RET_SUCCESS) { - LOGD("failed to initialized dhcp server config."); + LOGE("failed to initialized dhcp server config."); retval = false; } if (!FixedOptionsTest()) { @@ -291,7 +292,7 @@ bool DhcpServerTest::StartServerTest() if (InitDhcpClient() != RET_SUCCESS) { retval = false; } - LOGD("wait for test completed..."); + LOGI("wait for test completed..."); retval = ServerRun(); return retval; } @@ -301,8 +302,8 @@ void DhcpServerTest::DelayStopServer() const int SLEEP_TIME = 3; const int SLEEP_TIME1 = 1; const int SLEEP_TIME2 = 1; - LOGD("wait for dhcp server stopped..."); - LOGD("wait %d seconds...\n", SERVER_RUNING_TIME); + LOGI("wait for dhcp server stopped..."); + LOGI("wait %d seconds...\n", SERVER_RUNING_TIME); SystemFuncMock::GetInstance().SetMockFlag(true); EXPECT_CALL(SystemFuncMock::GetInstance(), close(_)).WillRepeatedly(Return(0)); std::this_thread::sleep_for(std::chrono::seconds(SLEEP_TIME)); @@ -312,13 +313,13 @@ void DhcpServerTest::DelayStopServer() } std::this_thread::sleep_for(std::chrono::seconds(SERVER_RUNING_TIME)); if (StopDhcpServer(m_pServerCtx) != RET_SUCCESS) { - LOGD("failed to stop dhcp server."); + LOGE("failed to stop dhcp server."); return; } int waitSesc = 0; while (waitSesc < SERVER_RUNING_TIME) { if (GetServerStatus(m_pServerCtx) == ST_STOPED) { - LOGD("dhcp server stopped."); + LOGI("dhcp server stopped."); break; } else { std::this_thread::sleep_for(std::chrono::seconds(SLEEP_TIME1)); @@ -339,7 +340,7 @@ int DhcpServerTest::TestDhcpRequestByMac(uint32_t testIp, uint32_t srvId, uint8_ DhcpMsgInfo msgInfo = {{0}, 0, {0}}; InitOptionList(&msgInfo.options); if (!InitMessage(m_pMockClient, &msgInfo, DHCPREQUEST)) { - LOGD("failed to init dhcp message."); + LOGE("failed to init dhcp message."); FreeOptionList(&msgInfo.options); return RET_FAILED; } @@ -361,7 +362,7 @@ int DhcpServerTest::TestDhcpRequestByMac(uint32_t testIp, uint32_t srvId, uint8_ } } if (SendDhcpMessage(m_pMockClient, &msgInfo) != RET_SUCCESS) { - LOGD("failed to send dhcp message."); + LOGE("failed to send dhcp message."); FreeOptionList(&msgInfo.options); return RET_FAILED; } @@ -374,7 +375,7 @@ int DhcpServerTest::TestDhcpRelease(uint32_t testIp, uint32_t srvId) DhcpMsgInfo msgInfo = {{0}, 0, {0}}; InitOptionList(&msgInfo.options); if (!InitMessage(m_pMockClient, &msgInfo, DHCPRELEASE)) { - LOGD("failed to init dhcp message."); + LOGE("failed to init dhcp message."); FreeOptionList(&msgInfo.options); return RET_FAILED; } @@ -392,7 +393,7 @@ int DhcpServerTest::TestDhcpRelease(uint32_t testIp, uint32_t srvId) DhcpOption endOpt = {END_OPTION, 0, {0}}; PushBackOption(&msgInfo.options, &endOpt); if (SendDhcpMessage(m_pMockClient, &msgInfo) != RET_SUCCESS) { - LOGD("failed to send dhcp message."); + LOGE("failed to send dhcp message."); FreeOptionList(&msgInfo.options); return RET_FAILED; } @@ -406,14 +407,17 @@ int DhcpServerTest::InitDhcpRequests() uint32_t srvId = ParseIpAddr("192.168.189.254"); DhcpMsgManager::GetInstance().SetClientIp(testIp); if (DhcpRequest(m_pMockClient) != RET_SUCCESS) { + LOGE("[InitDhcpRequests] DhcpRequest failed"); return RET_FAILED; } DhcpMsgManager::GetInstance().SetClientIp(0); if (TestDhcpRequest(testIp, srvId) != RET_SUCCESS) { + LOGE("[InitDhcpRequests] TestDhcpRequest1 failed"); return RET_FAILED; } testIp = ParseIpAddr("192.168.189.102"); if (TestDhcpRequest(testIp, 0) != RET_SUCCESS) { + LOGE("[InitDhcpRequests] TestDhcpRequest2 failed"); return RET_FAILED; } testIp = ParseIpAddr("192.168.189.120"); @@ -421,31 +425,37 @@ int DhcpServerTest::InitDhcpRequests() uint8_t testMac2[DHCP_HWADDR_LENGTH] = {0x00, 0x0e, 0x3c, 0x65, 0x3a, 0x0b, 0}; uint8_t testMac3[DHCP_HWADDR_LENGTH] = {0x00, 0x0e, 0x3c, 0x65, 0x3a, 0x0c, 0}; if (TestDhcpRequestByMac(testIp, srvId, testMac1) != RET_SUCCESS) { + LOGE("[InitDhcpRequests] TestDhcpRequestByMac1 failed"); return RET_FAILED; } DhcpMsgManager::GetInstance().SetClientIp(testIp); if (TestDhcpRequest(testIp, srvId) != RET_SUCCESS) { + LOGE("[InitDhcpRequests] TestDhcpRequest3 failed"); return RET_FAILED; } testIp = ParseIpAddr("192.168.189.101"); if (TestDhcpRequestByMac(testIp, srvId, testMac2) != RET_SUCCESS) { + LOGE("[InitDhcpRequests] TestDhcpRequestByMac2 failed"); return RET_FAILED; } testIp = ParseIpAddr("192.168.189.120"); DhcpMsgManager::GetInstance().SetClientIp(testIp); if (TestDhcpRequestByMac(testIp, srvId, testMac3) != RET_SUCCESS) { + LOGE("[InitDhcpRequests] TestDhcpRequestByMac3 failed"); return RET_FAILED; } DhcpMsgManager::GetInstance().SetClientIp(0); uint8_t testMac4[DHCP_HWADDR_LENGTH] = {0x00, 0x0e, 0x3c, 0x65, 0x3a, 0x0d, 0}; testIp = ParseIpAddr("192.168.190.210"); if (TestDhcpRequestByMac(testIp, srvId, testMac4) != RET_SUCCESS) { + LOGE("[InitDhcpRequests] TestDhcpRequestByMac4 failed"); return RET_FAILED; } uint8_t testMac5[DHCP_HWADDR_LENGTH] = {0x0a, 0x0e, 0x3c, 0x65, 0x3a, 0x0e, 0}; testIp = ParseIpAddr("192.168.189.130"); DhcpMsgManager::GetInstance().SetClientIp(testIp); if (TestDhcpRequestByMac(testIp, srvId, testMac5) != RET_SUCCESS) { + LOGE("[InitDhcpRequests] TestDhcpRequestByMac5 failed"); return RET_FAILED; } DhcpMsgManager::GetInstance().SetClientIp(0); @@ -459,7 +469,7 @@ int DhcpServerTest::InitDhcpErrorRequests() DhcpMsgInfo msgInfo = {{0}, 0, {0}}; InitOptionList(&msgInfo.options); if (!InitMessage(m_pMockClient, &msgInfo, DHCPREQUEST)) { - LOGD("failed to init dhcp message."); + LOGE("failed to init dhcp message."); FreeOptionList(&msgInfo.options); return RET_FAILED; } @@ -471,14 +481,14 @@ int DhcpServerTest::InitDhcpErrorRequests() AppendAddressOption(&optSrvId, srvId); PushFrontOption(&msgInfo.options, &optSrvId); if (SendDhcpMessage(m_pMockClient, &msgInfo) != RET_SUCCESS) { - LOGD("failed to send dhcp message."); + LOGE("failed to send dhcp message."); FreeOptionList(&msgInfo.options); return RET_FAILED; } RemoveOption(&msgInfo.options, DHCP_MESSAGE_TYPE_OPTION); if (SendDhcpMessage(m_pMockClient, &msgInfo) != RET_SUCCESS) { - LOGD("failed to send dhcp message."); + LOGE("failed to send dhcp message."); FreeOptionList(&msgInfo.options); return RET_FAILED; } @@ -486,7 +496,7 @@ int DhcpServerTest::InitDhcpErrorRequests() RemoveOption(&msgInfo.options, END_OPTION); RemoveOption(&msgInfo.options, SERVER_IDENTIFIER_OPTION); if (SendDhcpMessage(m_pMockClient, &msgInfo) != RET_SUCCESS) { - LOGD("failed to send dhcp message."); + LOGE("failed to send dhcp message."); FreeOptionList(&msgInfo.options); return RET_FAILED; } @@ -497,13 +507,14 @@ int DhcpServerTest::InitDhcpClient() { uint8_t testMacAddr[DHCP_HWADDR_LENGTH] = {0x00, 0x0e, 0x3c, 0x65, 0x3a, 0x09, 0}; - LOGD("init mock dhcp client."); + LOGI("init mock dhcp client."); const char* testIfname = "test_if0"; if (memset_s(&m_clientConfg, sizeof(DhcpClientConfig), 0, sizeof(DhcpClientConfig)) != EOK) { return RET_FAILED; } if (!FillHwAddr(m_clientConfg.chaddr, DHCP_HWADDR_LENGTH, testMacAddr, MAC_ADDR_LENGTH)) { + LOGE("FillHwAddr failed"); return RET_FAILED; } if (memset_s(m_clientConfg.ifname, IFACE_NAME_SIZE, '\0', IFACE_NAME_SIZE) != EOK) { @@ -515,41 +526,50 @@ int DhcpServerTest::InitDhcpClient() m_pMockClient = InitialDhcpClient(&m_clientConfg); if (!m_pMockClient) { + LOGE("[InitDhcpClient] InitialDhcpClient failed"); return RET_FAILED; } if (DhcpDiscover(m_pMockClient) != RET_SUCCESS) { + LOGE("[InitDhcpClient] DhcpDiscover1 failed"); return RET_FAILED; } uint32_t testIp = ParseIpAddr("192.168.189.102"); uint32_t srvId = ParseIpAddr("192.168.189.254"); DhcpMsgManager::GetInstance().SetClientIp(testIp); if (DhcpDiscover(m_pMockClient) != RET_SUCCESS) { + LOGE("[InitDhcpClient] DhcpDiscover2 failed"); return RET_FAILED; } InitDhcpRequests(); InitDhcpErrorRequests(); if (DhcpInform(m_pMockClient) != RET_SUCCESS) { + LOGE("[InitDhcpClient] DhcpInform1 failed"); return RET_FAILED; } DhcpMsgManager::GetInstance().SetClientIp(testIp); if (DhcpInform(m_pMockClient) != RET_SUCCESS) { + LOGE("[InitDhcpClient] DhcpInform2 failed"); return RET_FAILED; } DhcpMsgManager::GetInstance().SetClientIp(0); if (DhcpDecline(m_pMockClient) != RET_SUCCESS) { + LOGE("[InitDhcpClient] DhcpDecline1 failed"); return RET_FAILED; } testIp = ParseIpAddr("192.168.189.118"); DhcpMsgManager::GetInstance().SetClientIp(testIp); if (DhcpDecline(m_pMockClient) != RET_SUCCESS) { + LOGE("[InitDhcpClient] DhcpDecline2 failed"); return RET_FAILED; } DhcpMsgManager::GetInstance().SetClientIp(0); if (DhcpRelease(m_pMockClient) != RET_SUCCESS) { + LOGE("[InitDhcpClient] DhcpRelease failed"); return RET_FAILED; } testIp = ParseIpAddr("192.168.189.102"); if (TestDhcpRelease(testIp, srvId)) { + LOGE("[InitDhcpClient] TestDhcpRelease failed"); return RET_FAILED; } return RET_SUCCESS; diff --git a/wifi/frameworks/native/interfaces/wifi_p2p_msg.h b/wifi/frameworks/native/interfaces/wifi_p2p_msg.h index 7b47ed4..0a9dc3d 100644 --- a/wifi/frameworks/native/interfaces/wifi_p2p_msg.h +++ b/wifi/frameworks/native/interfaces/wifi_p2p_msg.h @@ -207,7 +207,6 @@ public: bool WpsPbcSupported() const; bool WpsDisplaySupported() const; bool WpKeypadSupported() const; - bool isGroupOwner() const; private: std::string deviceName; /* the value range is 0 to 32 characters. */ diff --git a/wifi/frameworks/native/src/wifi_p2p_msg.cpp b/wifi/frameworks/native/src/wifi_p2p_msg.cpp index 1e2a458..9fffd23 100644 --- a/wifi/frameworks/native/src/wifi_p2p_msg.cpp +++ b/wifi/frameworks/native/src/wifi_p2p_msg.cpp @@ -236,11 +236,6 @@ bool WifiP2pDevice::WpKeypadSupported() const return (supportWpsConfigMethods & static_cast(WpsConfigMethod::WPS_CFG_KEYPAD)) != 0; } -bool WifiP2pDevice::isGroupOwner() const -{ - return (groupCapabilitys & static_cast(P2pGroupCapability::PGC_GROUP_OWNER)) != 0; -} - bool WifiP2pGroupInfo::operator==(const WifiP2pGroupInfo &group) const { return networkId == group.GetNetworkId(); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.cpp index 8dfb0eb..d7a2040 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.cpp @@ -248,32 +248,26 @@ IScanService *WifiServiceManager::GetScanServiceInst() #ifdef FEATURE_AP_SUPPORT IApService *WifiServiceManager::GetApServiceInst(int id) { + if (mApServiceHandle.handle == nullptr) { + WIFI_LOGE("Get ap service instance handle is null."); + return nullptr; + } + auto findInstance = [this, id]() -> IApService* { auto it = mApServiceHandle.pService.find(id); return (it != mApServiceHandle.pService.end()) ? it->second : nullptr; }; - auto apInstance = findInstance(); if (apInstance != nullptr) { WIFI_LOGI("Ap service instance is exist %{public}d", id); return apInstance; } + WIFI_LOGI("[Get] create a new ap service instance: %{public}d", id); - std::string dlname; - if (GetServiceDll(WIFI_SERVICE_AP, dlname) < 0) { - WIFI_LOGE("Get ap dll name failed."); - return nullptr; - } - bool bPreLoad = WifiSettings::GetInstance().IsModulePreLoad(WIFI_SERVICE_AP); - if (LoadApService(dlname, bPreLoad) != 0) { - WIFI_LOGE("Reload ap service instance %{public}d failed!", id); - return nullptr; - } - auto reloadApInstance = findInstance(); - if (reloadApInstance == nullptr) { - WIFI_LOGE("Get ap service instance %{public}d error!", id); - } - return reloadApInstance; + std::unique_lock lock(mMutex); + IApService *service = mApServiceHandle.create(id); + mApServiceHandle.pService[id] = service; + return service; } #endif diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp index ee96a8e..fbdefd9 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp @@ -46,6 +46,7 @@ WifiSettings::WifiSettings() { mHotspotState[0] = static_cast(ApState::AP_STATE_CLOSED); powerModel[0] = PowerModel::GENERAL; + mThermalLevel = static_cast(ThermalLevel::NORMAL); } WifiSettings::~WifiSettings() diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.h b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.h index f152e78..4c47bdd 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.h @@ -54,6 +54,16 @@ namespace OHOS { namespace Wifi { using ChannelsTable = std::map>; +enum class ThermalLevel { + COOL = 0, + NORMAL = 1, + WARM = 2, + HOT = 3, + OVERHEATED = 4, + WARNING = 5, + EMERGENCY = 6, +}; + class WifiSettings { public: ~WifiSettings(); diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_config_center_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_config_center_test.cpp index f244688..3b76986 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_config_center_test.cpp +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_config_center_test.cpp @@ -90,6 +90,11 @@ HWTEST_F(WifiConfigCenterTest, GetScanInfoList_SUCCESS, TestSize.Level1) WifiScanInfo info1, info2; info1.bssid = "asdfg"; info2.bssid = "adsgds"; + struct timespec clkTime = {0, 0}; + clock_gettime(CLOCK_MONOTONIC, &clkTime); + int64_t curr = static_cast(clkTime.tv_sec) * MSEC * MSEC + clkTime.tv_nsec / MSEC; /* us */ + info1.timestamp = curr; + info2.timestamp = curr; setInfo.push_back(info1); setInfo.push_back(info2); WifiSettings::GetInstance().SaveScanInfoList(setInfo); @@ -103,13 +108,17 @@ HWTEST_F(WifiConfigCenterTest, GetScanInfoList_FAILED, TestSize.Level1) { std::vector setInfo; std::vector getInfo; - WifiScanInfo info1, info2; + WifiScanInfo info1; + struct timespec clkTime = {0, 0}; + clock_gettime(CLOCK_MONOTONIC, &clkTime); + int64_t curr = static_cast(clkTime.tv_sec) * MSEC * MSEC + clkTime.tv_nsec / MSEC; /* us */ + info1.timestamp = curr; info1.bssid = "asdfg"; - info2.bssid = "adsgds"; setInfo.push_back(info1); WifiSettings::GetInstance().SaveScanInfoList(setInfo); WifiConfigCenter::GetInstance().GetScanInfoList(getInfo); EXPECT_EQ(setInfo.size(), getInfo.size()); + setInfo.at(0).bssid = "adsgds"; EXPECT_NE(setInfo.at(0).bssid, getInfo.at(0).bssid); } diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_common/Mock/mock_chip_capability.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_common/Mock/mock_chip_capability.cpp new file mode 100755 index 0000000..b7e73a6 --- /dev/null +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_common/Mock/mock_chip_capability.cpp @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "mock_chip_capability.h" + +namespace OHOS { +namespace Wifi { +ChipCapability &ChipCapability::GetInstance() +{ + static ChipCapability cp; + return cp; +} +} // namespace Wifi +} // namespace OHOS diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_common/Mock/mock_chip_capability.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_common/Mock/mock_chip_capability.h new file mode 100755 index 0000000..d704635 --- /dev/null +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_common/Mock/mock_chip_capability.h @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OHOS_MOCK_CHIP_CAPABILITY_H +#define OHOS_MOCK_CHIP_CAPABILITY_H + +#include + +namespace OHOS { +namespace Wifi { +class MockChipCapability { +public: + MockChipCapability() = default; + virtual ~MockChipCapability() = default; + + virtual bool InitializeChipCapability() = 0; + virtual bool IsSupportDbdc(void) = 0; + virtual bool IsSupportCsa(void) = 0; + virtual bool IsSupportRadarDetect(void) = 0; + virtual bool IsSupportDfsChannel(void) = 0; + virtual bool IsSupportIndoorChannel(void) = 0; +}; + +class ChipCapability : public MockChipCapability { +public: + ChipCapability() = default; + ~ChipCapability() = default; + static ChipCapability &GetInstance(void); + MOCK_METHOD0(InitializeChipCapability, bool()); + MOCK_METHOD0(IsSupportDbdc, bool()); + MOCK_METHOD0(IsSupportCsa, bool()); + MOCK_METHOD0(IsSupportRadarDetect, bool()); + MOCK_METHOD0(IsSupportDfsChannel, bool()); + MOCK_METHOD0(IsSupportIndoorChannel, bool()); +}; +} // namespace Wifi +} // namespace OHOS +#endif \ No newline at end of file diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_idle_state_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_idle_state_test.cpp index d17dcf3..3d0fbd4 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_idle_state_test.cpp +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_idle_state_test.cpp @@ -306,9 +306,7 @@ HWTEST_F(P2pIdleStateTest, ProcessInvitationReceivedEvt4, TestSize.Level1) AddGroupManager(); msg.SetMessageObj(group); EXPECT_CALL(WifiP2PHalInterface::GetInstance(), GetP2pPeer(_, _)) - .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)) - .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_FAILED)) - .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); + .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); AddDeviceManager1(); EXPECT_TRUE(pP2pIdleState->ExecuteStateMsg(&msg)); diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_state_machine_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_state_machine_test.cpp index 1c0e085..efa4b14 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_state_machine_test.cpp +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_state_machine_test.cpp @@ -668,9 +668,8 @@ HWTEST_F(P2pStateMachineTest, ReinvokePersistentGroup1, TestSize.Level1) AddGroupManager(); AddDeviceManager(); EXPECT_CALL(WifiP2PHalInterface::GetInstance(), GroupAdd(_, _, _)) - .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)) - .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_FAILED)); - EXPECT_TRUE(WarpReinvokePersistentGroup(config)); + .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); + EXPECT_FALSE(WarpReinvokePersistentGroup(config)); EXPECT_FALSE(WarpReinvokePersistentGroup(config)); } @@ -698,7 +697,7 @@ HWTEST_F(P2pStateMachineTest, ReinvokePersistentGroup3, TestSize.Level1) ON_CALL(WifiP2PHalInterface::GetInstance(), ListNetworks(_)) .WillByDefault(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); - EXPECT_TRUE(WarpReinvokePersistentGroup(config)); + EXPECT_FALSE(WarpReinvokePersistentGroup(config)); EXPECT_FALSE(WarpReinvokePersistentGroup(config)); } @@ -826,13 +825,15 @@ HWTEST_F(P2pStateMachineTest, DealCreateNewGroupWithConfig3, TestSize.Level1) EXPECT_CALL(WifiP2PHalInterface::GetInstance(), P2pSetGroupConfig(_, _)) .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); EXPECT_CALL(WifiP2PHalInterface::GetInstance(), GroupAdd(_, _, _)).WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); - ON_CALL(WifiP2PHalInterface::GetInstance(), RemoveNetwork(_)) - .WillByDefault(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); + EXPECT_CALL(WifiP2PHalInterface::GetInstance(), RemoveNetwork(_)) + .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_OK)) + .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); EXPECT_TRUE(WarpDealCreateNewGroupWithConfig(config, freq)); } HWTEST_F(P2pStateMachineTest, UpdateGroupInfoToWpa1, TestSize.Level1) { + AddGroupManager(); EXPECT_CALL(WifiP2PHalInterface::GetInstance(), RemoveNetwork(_)) .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_FAILED)); WarpUpdateGroupInfoToWpa(); diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_settings.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_settings.h index 8ffd3f9..6753a8f 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_settings.h +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_settings.h @@ -42,6 +42,7 @@ public: virtual int GetDeviceConfig(std::vector &results) = 0; virtual const std::vector& ReloadTrustListPolicies() = 0; virtual const MovingFreezePolicy& ReloadMovingFreezePolicy() = 0; + virtual int GetThermalLevel() const = 0; }; class WifiSettings : public MockWifiSettings { @@ -66,6 +67,7 @@ public: MOCK_METHOD1(GetDeviceConfig, int(std::vector &results)); MOCK_METHOD0(ReloadTrustListPolicies, const std::vector&()); MOCK_METHOD0(ReloadMovingFreezePolicy, const MovingFreezePolicy&()); + MOCK_CONST_METHOD0(GetThermalLevel, int()); }; } // namespace Wifi } // namespace OHOS diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service_test.cpp index abd714d..6ed1e4c 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service_test.cpp +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service_test.cpp @@ -211,6 +211,7 @@ public: void ScanWithParamSuccess() { EXPECT_CALL(WifiSettings::GetInstance(), GetDeviceConfig(_)).WillRepeatedly(Return(true)); + EXPECT_CALL(WifiSettings::GetInstance(), GetThermalLevel()).WillRepeatedly(Return(1)); pScanService->scanStartedFlag = true; WifiScanParams params; params.band = SCAN_BAND_BOTH_WITH_DFS; diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn index 02cd53a..0a919ea 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn @@ -41,6 +41,7 @@ ohos_unittest("wifi_sta_unittest") { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp", + "$WIFI_ROOT_DIR/test/wifi_standard/wifi_framework/wifi_manage/wifi_common/Mock/mock_chip_capability.cpp", "Mock/mock_dhcp_service.cpp", "Mock/mock_if_config.cpp", "Mock/mock_mac_address.cpp", @@ -81,6 +82,7 @@ ohos_unittest("wifi_sta_unittest") { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap", + "$WIFI_ROOT_DIR/test/wifi_standard/wifi_framework/wifi_manage/wifi_common/Mock", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_aware", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan", diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service_test.cpp index ed73da3..5f1e401 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service_test.cpp +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service_test.cpp @@ -772,7 +772,7 @@ void StaAutoConnectServiceTest::SetRoamBlockedBssidFirmwareFail1() std::string bssid = "2a:76:93:47:e2:8a"; blockedBssids.push_back(bssid); - EXPECT_CALL(WifiStaHalInterface::GetInstance(), SetRoamConfig(_)).WillOnce(Return(WIFI_IDL_OPT_FAILED)); + ON_CALL(WifiStaHalInterface::GetInstance(), SetRoamConfig(_)).WillByDefault(Return(WIFI_IDL_OPT_FAILED)); EXPECT_TRUE(pStaAutoConnectService->SetRoamBlockedBssidFirmware(blockedBssids) == false); } diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine_test.cpp index 4e9daf6..7db65eb 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine_test.cpp +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine_test.cpp @@ -12,19 +12,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "sta_state_machine.h" -#include "sta_define.h" -#include "mock_wifi_settings.h" -#include "mock_wifi_supplicant_hal_interface.h" -#include "mock_wifi_sta_hal_interface.h" -#include "mock_wifi_manager.h" -#include "mock_dhcp_service.h" -#include "mock_wifi_chip_hal_interface.h" -#include "mock_sta_network_check.h" -#include "mock_if_config.h" + #include #include "internal_message.h" +#include "mock_chip_capability.h" +#include "mock_dhcp_service.h" #include "mock_if_config.h" +#include "mock_sta_network_check.h" +#include "mock_wifi_chip_hal_interface.h" +#include "mock_wifi_manager.h" +#include "mock_wifi_settings.h" +#include "mock_wifi_sta_hal_interface.h" +#include "mock_wifi_supplicant_hal_interface.h" +#include "sta_define.h" +#include "sta_state_machine.h" using ::testing::_; using ::testing::AtLeast; diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/BUILD.gn index 4d82a7b..ed2a44f 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/BUILD.gn @@ -13,7 +13,7 @@ import("//build/test.gni") import("//foundation/communication/wifi/wifi/wifi.gni") -module_output_path = "wifi/common_test" +module_output_path = "wifi/toolkit_test" config("module_private_config") { visibility = [ ":*" ] @@ -36,7 +36,7 @@ ohos_unittest("toolkit_unittest") { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/mac_address.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/network_interface.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_global_func.cpp", - "common_test.cpp", + "toolkit_test.cpp", "wifi_config_file_test.cpp", "wifi_global_func_test.cpp", "wifi_ip_tools_test.cpp", diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/common_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/toolkit_test.cpp similarity index 100% rename from wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/common_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/toolkit_test.cpp diff --git a/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_test.cpp b/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_test.cpp index 7637edd..357dbb6 100644 --- a/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_test.cpp +++ b/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_test.cpp @@ -195,7 +195,7 @@ HWTEST_F(WifiHalCRpcServerTest, DealP2pDeviceFoundCbkTest, TestSize.Level1) StrSafeCopy(cbmsg->msg.deviceInfo.srcAddress, sizeof(cbmsg->msg.deviceInfo.srcAddress), "00:00:00:00:00:00"); EXPECT_TRUE(PushBackCallbackMsg(P2P_DEVICE_FOUND_EVENT, cbmsg) == 0); EXPECT_TRUE(OnCallbackTransact(mServer, P2P_DEVICE_FOUND_EVENT, mContext) == 0); - EXPECT_TRUE(StrcmpMathRight(mContext->szWrite, "C\t119\t0\t0\t0\t0\t00:00:00:00:00:00\t\t\t\t\t$$$$$$") == 0); + EXPECT_TRUE(StrcmpMathRight(mContext->szWrite, "C\t120\t0\t0\t0\t0\t00:00:00:00:00:00\t\t\t\t\t$$$$$$") == 0); EXPECT_TRUE(EndCallbackTransact(mServer, P2P_DEVICE_FOUND_EVENT) == 0); } @@ -205,7 +205,7 @@ HWTEST_F(WifiHalCRpcServerTest, DealP2pNegoriationCbkLostTest, TestSize.Level1) StrSafeCopy(cbmsg->msg.connMsg.bssid, sizeof(cbmsg->msg.connMsg.bssid), "00:00:00:00:00:00"); EXPECT_TRUE(PushBackCallbackMsg(P2P_DEVICE_LOST_EVENT, cbmsg) == 0); EXPECT_TRUE(OnCallbackTransact(mServer, P2P_DEVICE_LOST_EVENT, mContext) == 0); - EXPECT_TRUE(StrcmpMathRight(mContext->szWrite, "C\t120\t00:00:00:00:00:00\t$$$$$$") == 0); + EXPECT_TRUE(StrcmpMathRight(mContext->szWrite, "C\t121\t00:00:00:00:00:00\t$$$$$$") == 0); EXPECT_TRUE(EndCallbackTransact(mServer, P2P_DEVICE_LOST_EVENT) == 0); } @@ -215,7 +215,7 @@ HWTEST_F(WifiHalCRpcServerTest, DealP2pNegoriationCbkTest, TestSize.Level1) StrSafeCopy(cbmsg->msg.connMsg.bssid, sizeof(cbmsg->msg.connMsg.bssid), "00:00:00:00:00:00"); EXPECT_TRUE(PushBackCallbackMsg(P2P_GO_NEGOTIATION_REQUEST_EVENT, cbmsg) == 0); EXPECT_TRUE(OnCallbackTransact(mServer, P2P_GO_NEGOTIATION_REQUEST_EVENT, mContext) == 0); - EXPECT_TRUE(StrcmpMathRight(mContext->szWrite, "C\t121\t0\t00:00:00:00:00:00\t$$$$$$") == 0); + EXPECT_TRUE(StrcmpMathRight(mContext->szWrite, "C\t122\t0\t00:00:00:00:00:00\t$$$$$$") == 0); EXPECT_TRUE(EndCallbackTransact(mServer, P2P_GO_NEGOTIATION_REQUEST_EVENT) == 0); } @@ -227,7 +227,7 @@ HWTEST_F(WifiHalCRpcServerTest, DealP2pInviationCbkReceiveTest, TestSize.Level1) EXPECT_TRUE(PushBackCallbackMsg(P2P_INVITATION_RECEIVED_EVENT, cbmsg) == 0); EXPECT_TRUE(OnCallbackTransact(mServer, P2P_INVITATION_RECEIVED_EVENT, mContext) == 0); EXPECT_TRUE(StrcmpMathRight(mContext->szWrite, - "C\t124\t0\t0\t0\t00:00:00:00:00:00\t\t00:00:00:00:00:00\t$$$$$$") == 0); + "C\t125\t0\t0\t0\t00:00:00:00:00:00\t\t00:00:00:00:00:00\t$$$$$$") == 0); EXPECT_TRUE(EndCallbackTransact(mServer, P2P_INVITATION_RECEIVED_EVENT) == 0); } @@ -237,7 +237,7 @@ HWTEST_F(WifiHalCRpcServerTest, DealP2pInviationCbkResultTest, TestSize.Level1) StrSafeCopy(cbmsg->msg.invitaInfo.bssid, sizeof(cbmsg->msg.invitaInfo.bssid), "00:00:00:00:00:00"); EXPECT_TRUE(PushBackCallbackMsg(P2P_INVITATION_RESULT_EVENT, cbmsg) == 0); EXPECT_TRUE(OnCallbackTransact(mServer, P2P_INVITATION_RESULT_EVENT, mContext) == 0); - EXPECT_TRUE(StrcmpMathRight(mContext->szWrite, "C\t125\t0\t00:00:00:00:00:00\t$$$$$$") == 0); + EXPECT_TRUE(StrcmpMathRight(mContext->szWrite, "C\t126\t0\t00:00:00:00:00:00\t$$$$$$") == 0); EXPECT_TRUE(EndCallbackTransact(mServer, P2P_INVITATION_RESULT_EVENT) == 0); } @@ -247,7 +247,7 @@ HWTEST_F(WifiHalCRpcServerTest, DealP2pInviationCbkFailureTest, TestSize.Level1) StrSafeCopy(cbmsg->msg.invitaInfo.bssid, sizeof(cbmsg->msg.invitaInfo.bssid), "00:00:00:00:00:00"); EXPECT_TRUE(PushBackCallbackMsg(P2P_GROUP_FORMATION_FAILURE_EVENT, cbmsg) == 0); EXPECT_TRUE(OnCallbackTransact(mServer, P2P_GROUP_FORMATION_FAILURE_EVENT, mContext) == 0); - EXPECT_TRUE(StrcmpMathRight(mContext->szWrite, "C\t127\t00:00:00:00:00:00\t$$$$$$") == 0); + EXPECT_TRUE(StrcmpMathRight(mContext->szWrite, "C\t128\t00:00:00:00:00:00\t$$$$$$") == 0); EXPECT_TRUE(EndCallbackTransact(mServer, P2P_GROUP_FORMATION_FAILURE_EVENT) == 0); } @@ -261,7 +261,7 @@ HWTEST_F(WifiHalCRpcServerTest, DealP2pGroupInfoCbkStartTest, TestSize.Level1) EXPECT_TRUE(PushBackCallbackMsg(P2P_GROUP_STARTED_EVENT, cbmsg) == 0); EXPECT_TRUE(OnCallbackTransact(mServer, P2P_GROUP_STARTED_EVENT, mContext) == 0); EXPECT_TRUE(StrcmpMathRight(mContext->szWrite, - "C\t128\t0\t0\t0\tp2p-dev-wlan0\ttest_p2p\t\t\t00:00:00:00:00:00\t$$$$$$") == 0); + "C\t129\t0\t0\t0\tp2p-dev-wlan0\ttest_p2p\t\t\t00:00:00:00:00:00\t$$$$$$") == 0); EXPECT_TRUE(EndCallbackTransact(mServer, P2P_GROUP_STARTED_EVENT) == 0); } @@ -271,7 +271,7 @@ HWTEST_F(WifiHalCRpcServerTest, DealP2pGroupInfoCbkRemoveTest, TestSize.Level1) StrSafeCopy(cbmsg->msg.groupInfo.groupIfName, sizeof(cbmsg->msg.groupInfo.groupIfName), "p2p-dev-wlan0"); EXPECT_TRUE(PushBackCallbackMsg(P2P_GROUP_REMOVED_EVENT, cbmsg) == 0); EXPECT_TRUE(OnCallbackTransact(mServer, P2P_GROUP_REMOVED_EVENT, mContext) == 0); - EXPECT_TRUE(StrcmpMathRight(mContext->szWrite, "C\t129\t0\tp2p-dev-wlan0\t$$$$$$") == 0); + EXPECT_TRUE(StrcmpMathRight(mContext->szWrite, "C\t130\t0\tp2p-dev-wlan0\t$$$$$$") == 0); EXPECT_TRUE(EndCallbackTransact(mServer, P2P_GROUP_REMOVED_EVENT) == 0); } @@ -281,7 +281,7 @@ HWTEST_F(WifiHalCRpcServerTest, DealP2pDeviceInfoCbkPbcTest, TestSize.Level1) StrSafeCopy(cbmsg->msg.deviceInfo.srcAddress, sizeof(cbmsg->msg.deviceInfo.srcAddress), "00:00:00:00:00:00"); EXPECT_TRUE(PushBackCallbackMsg(P2P_PROV_DISC_PBC_REQ_EVENT, cbmsg) == 0); EXPECT_TRUE(OnCallbackTransact(mServer, P2P_PROV_DISC_PBC_REQ_EVENT, mContext) == 0); - EXPECT_TRUE(StrcmpMathRight(mContext->szWrite, "C\t130\t00:00:00:00:00:00\t$$$$$$") == 0); + EXPECT_TRUE(StrcmpMathRight(mContext->szWrite, "C\t131\t00:00:00:00:00:00\t$$$$$$") == 0); EXPECT_TRUE(EndCallbackTransact(mServer, P2P_PROV_DISC_PBC_REQ_EVENT) == 0); } @@ -292,7 +292,7 @@ HWTEST_F(WifiHalCRpcServerTest, DealP2pDeviceInfoCbkPinTest, TestSize.Level1) StrSafeCopy(cbmsg->msg.deviceInfo.deviceName, sizeof(cbmsg->msg.deviceInfo.deviceName), "test_p2p"); EXPECT_TRUE(PushBackCallbackMsg(P2P_PROV_DISC_SHOW_PIN_EVENT, cbmsg) == 0); EXPECT_TRUE(OnCallbackTransact(mServer, P2P_PROV_DISC_SHOW_PIN_EVENT, mContext) == 0); - EXPECT_TRUE(StrcmpMathRight(mContext->szWrite, "C\t133\t00:00:00:00:00:00\ttest_p2p\t$$$$$$") == 0); + EXPECT_TRUE(StrcmpMathRight(mContext->szWrite, "C\t134\t00:00:00:00:00:00\ttest_p2p\t$$$$$$") == 0); EXPECT_TRUE(EndCallbackTransact(mServer, P2P_PROV_DISC_SHOW_PIN_EVENT) == 0); } @@ -303,7 +303,7 @@ HWTEST_F(WifiHalCRpcServerTest, DealP2pDeviceInfoCbkConnectionTest, TestSize.Lev cbmsg->msg.deviceInfo.p2pDeviceAddress, sizeof(cbmsg->msg.deviceInfo.p2pDeviceAddress), "00:00:00:00:00:00"); EXPECT_TRUE(PushBackCallbackMsg(AP_STA_DISCONNECTED_EVENT, cbmsg) == 0); EXPECT_TRUE(OnCallbackTransact(mServer, AP_STA_DISCONNECTED_EVENT, mContext) == 0); - EXPECT_TRUE(StrcmpMathRight(mContext->szWrite, "C\t137\t00:00:00:00:00:00\t$$$$$$") == 0); + EXPECT_TRUE(StrcmpMathRight(mContext->szWrite, "C\t138\t00:00:00:00:00:00\t$$$$$$") == 0); EXPECT_TRUE(EndCallbackTransact(mServer, AP_STA_DISCONNECTED_EVENT) == 0); } @@ -313,7 +313,7 @@ HWTEST_F(WifiHalCRpcServerTest, DealP2pServerInfoCbkTest, TestSize.Level1) StrSafeCopy(cbmsg->msg.serverInfo.srcAddress, sizeof(cbmsg->msg.serverInfo.srcAddress), "00:00:00:00:00:00"); EXPECT_TRUE(PushBackCallbackMsg(P2P_SERV_DISC_RESP_EVENT, cbmsg) == 0); EXPECT_TRUE(OnCallbackTransact(mServer, P2P_SERV_DISC_RESP_EVENT, mContext) == 0); - EXPECT_TRUE(StrcmpMathRight(mContext->szWrite, "C\t135\t0\t00:00:00:00:00:00\t0\t$$$$$$") == 0); + EXPECT_TRUE(StrcmpMathRight(mContext->szWrite, "C\t136\t0\t00:00:00:00:00:00\t0\t$$$$$$") == 0); EXPECT_TRUE(EndCallbackTransact(mServer, P2P_SERV_DISC_RESP_EVENT) == 0); } @@ -323,7 +323,7 @@ HWTEST_F(WifiHalCRpcServerTest, DealP2pServerDiscReqCbkTest, TestSize.Level1) StrSafeCopy(cbmsg->msg.serDiscReqInfo.mac, sizeof(cbmsg->msg.serDiscReqInfo.mac), "00:00:00:00:00:00"); EXPECT_TRUE(PushBackCallbackMsg(P2P_SERV_DISC_REQ_EVENT, cbmsg) == 0); EXPECT_TRUE(OnCallbackTransact(mServer, P2P_SERV_DISC_REQ_EVENT, mContext) == 0); - EXPECT_TRUE(StrcmpMathRight(mContext->szWrite, "C\t139\t0\t0\t0\t00:00:00:00:00:00\t0\t$$$$$$") == 0); + EXPECT_TRUE(StrcmpMathRight(mContext->szWrite, "C\t140\t0\t0\t0\t00:00:00:00:00:00\t0\t$$$$$$") == 0); EXPECT_TRUE(EndCallbackTransact(mServer, P2P_SERV_DISC_REQ_EVENT) == 0); } -- Gitee From 9ce28a3d0b067ae8965872f893a2f640b2b50189 Mon Sep 17 00:00:00 2001 From: y00316381 Date: Wed, 24 Aug 2022 16:38:07 +0800 Subject: [PATCH 323/491] modify log level for wifi 0824 Signed-off-by: y00316381 --- wifi/frameworks/native/src/wifi_device_callback_stub.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/frameworks/native/src/wifi_device_callback_stub.cpp b/wifi/frameworks/native/src/wifi_device_callback_stub.cpp index db43d2a..d449ce8 100644 --- a/wifi/frameworks/native/src/wifi_device_callback_stub.cpp +++ b/wifi/frameworks/native/src/wifi_device_callback_stub.cpp @@ -31,7 +31,7 @@ WifiDeviceCallBackStub::~WifiDeviceCallBackStub() int WifiDeviceCallBackStub::OnRemoteRequest( uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) { - WIFI_LOGI("WifiDeviceCallBackStub::OnRemoteRequest, code:%{public}zu!", code); + WIFI_LOGI("WifiDeviceCallBackStub::OnRemoteRequest, code:%{public}u!", code); if (mRemoteDied) { WIFI_LOGE("Failed to `%{public}s`,Remote service is died!", __func__); return -1; -- Gitee From 69bef25e02578b193c469ebd6e180e1345457098 Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Wed, 24 Aug 2022 12:22:12 +0000 Subject: [PATCH 324/491] Add test cases and associate test cases to issue Signed-off-by: zhangfeng --- .../unittest/wifi_p2p_hal_interface_test.cpp | 6 ++ .../wifi_internal_event_dispatcher_test.cpp | 9 +++ .../wifi_p2p/test/wifi_p2p_service_test.cpp | 60 +++++++++++++++++-- .../Mock/mock_wifi_supplicant_hal_interface.h | 5 +- .../wifi_manage/wifi_sta/sta_service_test.cpp | 32 +++++++++- 5 files changed, 104 insertions(+), 8 deletions(-) diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_p2p_hal_interface_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_p2p_hal_interface_test.cpp index 5f024dc..cb3ca15 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_p2p_hal_interface_test.cpp +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_p2p_hal_interface_test.cpp @@ -456,6 +456,12 @@ HWTEST_F(WifiP2pHalInterfaceTest, CancalReqServiceDiscovery_SUCCESS, TestSize.Le EXPECT_EQ(WifiErrorNo::WIFI_IDL_OPT_OK, WifiP2PHalInterface::GetInstance().CancelReqServiceDiscovery(id)); } +/** + * @tc.name: Save p2p config test + * @tc.desc: Save config of persistent group test function. + * @tc.type: FUNC + * @tc.require: issueI5EDUG + */ HWTEST_F(WifiP2pHalInterfaceTest, StoreConfig_SUCCESS, TestSize.Level1) { EXPECT_EQ(WifiErrorNo::WIFI_IDL_OPT_OK, WifiP2PHalInterface::GetInstance().SaveConfig()); diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_internal_event_dispatcher_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_internal_event_dispatcher_test.cpp index 77fa8d0..765e0f7 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_internal_event_dispatcher_test.cpp +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_internal_event_dispatcher_test.cpp @@ -20,6 +20,12 @@ using namespace testing::ext; namespace OHOS { namespace Wifi { +/** + * @tc.name: Events notify test + * @tc.desc: Events notify test function. + * @tc.type: FUNC + * @tc.require: issueI5LC60 + */ HWTEST_F(WifiInternalEventDispatcherTest, ThreadTest, TestSize.Level1) { WifiEventCallbackMsg msg; @@ -35,6 +41,9 @@ HWTEST_F(WifiInternalEventDispatcherTest, ThreadTest, TestSize.Level1) msg.msgCode = WIFI_CBK_MSG_RSSI_CHANGE; EXPECT_EQ(0, WifiInternalEventDispatcher::GetInstance().AddBroadCastMsg(msg)); sleep(1); + msg.msgCode = WIFI_CBK_MSG_DEVICE_CONFIG_CHANGE; + EXPECT_EQ(0, WifiInternalEventDispatcher::GetInstance().AddBroadCastMsg(msg)); + sleep(1); msg.msgCode = WIFI_CBK_MSG_HOTSPOT_STATE_CHANGE; EXPECT_EQ(0, WifiInternalEventDispatcher::GetInstance().AddBroadCastMsg(msg)); sleep(1); diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_test.cpp index 9fa84c8..7207626 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_test.cpp +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,13 +12,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include -#include "wifi_p2p_service.h" -#include "wifi_p2p_msg.h" -#include "wifi_settings.h" +#include #include "mock_p2p_pendant.h" #include "mock_wifi_p2p_hal_interface.h" +#include "wifi_hid2d_msg.h" +#include "wifi_p2p_msg.h" +#include "wifi_p2p_service.h" +#include "wifi_settings.h" using ::testing::Return; using ::testing::ext::TestSize; @@ -197,5 +198,54 @@ HWTEST_F(WifiP2pServiceTest, SetP2pWfdInfo, TestSize.Level1) WifiP2pWfdInfo wfd; EXPECT_EQ(pWifiP2pService->SetP2pWfdInfo(wfd), ErrCode::WIFI_OPT_SUCCESS); } + +/** + * @tc.name: Set upper scene test + * @tc.desc: Set upper scene test function. + * @tc.type: FUNC + * @tc.require: issueI5LC5N + */ +HWTEST_F(WifiP2pServiceTest, SetUpperScene, TestSize.Level1) +{ + Hid2dUpperScene upperScene; + upperScene.scene = 0; // 0: video, 1: audio, 2: file + EXPECT_EQ(pWifiP2pService->Hid2dSetUpperScene("p2p0", upperScene), ErrCode::WIFI_OPT_SUCCESS); + upperScene.scene = 1; + EXPECT_EQ(pWifiP2pService->Hid2dSetUpperScene("p2p0", upperScene), ErrCode::WIFI_OPT_SUCCESS); + upperScene.scene = 2; + EXPECT_EQ(pWifiP2pService->Hid2dSetUpperScene("p2p0", upperScene), ErrCode::WIFI_OPT_SUCCESS); +} + +/** + * @tc.name: Recommend channel test + * @tc.desc: Recommend channel test function. + * @tc.type: FUNC + * @tc.require: issueI5LC5N + */ +HWTEST_F(WifiP2pServiceTest, GetP2pRecommendChannel, TestSize.Level1) +{ + // recommendd channel is greater than 0 + EXPECT_GT(pWifiP2pService->GetP2pRecommendChannel(), 0); +} + +/** + * @tc.name: Hid2d shared link test + * @tc.desc: Hid2d shared link test function. + * @tc.type: FUNC + * @tc.require: issueI5LC5N + */ +HWTEST_F(WifiP2pServiceTest, HiD2dSharedLinkTest, TestSize.Level1) +{ + int count = pWifiP2pService->GetSharedLinkCount(); + pWifiP2pService->IncreaseSharedLink(); + EXPECT_EQ(pWifiP2pService->GetSharedLinkCount(), count + 1); + pWifiP2pService->IncreaseSharedLink(); + EXPECT_EQ(pWifiP2pService->GetSharedLinkCount(), count + 2); + + pWifiP2pService->DecreaseSharedLink(); + EXPECT_EQ(pWifiP2pService->GetSharedLinkCount(), count + 1); + pWifiP2pService->DecreaseSharedLink(); + EXPECT_EQ(pWifiP2pService->GetSharedLinkCount(), count); +} } // namespace Wifi } // namespace OHOS \ No newline at end of file diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_supplicant_hal_interface.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_supplicant_hal_interface.h index 8b2f9ab..35a9ab1 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_supplicant_hal_interface.h +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_supplicant_hal_interface.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -27,7 +27,7 @@ public: virtual ~MockWifiSupplicantHalInterface() = default; virtual WifiErrorNo StartSupplicant(void) = 0; virtual WifiErrorNo WpaSetCountryCode(const std::string &countryCode) const = 0; - + virtual WifiErrorNo WpaSetSuspendMode(bool mode) const = 0; }; class WifiSupplicantHalInterface : public MockWifiSupplicantHalInterface { @@ -37,6 +37,7 @@ public: public: MOCK_METHOD0(StartSupplicant, WifiErrorNo()); MOCK_CONST_METHOD1(WpaSetCountryCode, WifiErrorNo(const std::string &countryCode)); + MOCK_CONST_METHOD1(WpaSetSuspendMode, WifiErrorNo(bool mode)); }; } // namespace OHOS } // namespace OHOS diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service_test.cpp index aaa3da5..56df15f 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service_test.cpp +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -90,6 +90,8 @@ public: void StaServiceAutoConnectServiceSuccess(); void StaServiceRegisterStaServiceCallbackSuccess(); void StaServiceRegisterStaServiceCallbackFail(); + void StaServiceSetSuspendModeTest(); + public: std::unique_ptr pStaService; }; @@ -515,6 +517,23 @@ void StaServiceTest::StaServiceRegisterStaServiceCallbackFail() pStaService->RegisterStaServiceCallback(instance.GetStaCallback()); } +/** + * @tc.name: Set suspend mode test + * @tc.desc: Set suspend mode test function. + * @tc.type: FUNC + * @tc.require: issueI5JRBB + */ +void StaServiceTest::StaServiceSetSuspendModeTest() +{ + EXPECT_CALL(WifiSupplicantHalInterface::GetInstance(), WpaSetSuspendMode(_)) + .WillOnce(Return(WifiErrorNo::WIFI_IDL_OPT_FAILED)) + .WillRepeatedly(Return(WifiErrorNo::WIFI_IDL_OPT_OK)); + + EXPECT_TRUE(pStaService->SetSuspendMode(false) == WIFI_OPT_FAILED); + EXPECT_TRUE(pStaService->SetSuspendMode(false) == WIFI_OPT_SUCCESS); + EXPECT_TRUE(pStaService->SetSuspendMode(true) == WIFI_OPT_SUCCESS); +} + HWTEST_F(StaServiceTest, StaServiceInitStaServiceSuccess, TestSize.Level1) { StaServiceInitStaServiceSuccess(); @@ -674,5 +693,16 @@ HWTEST_F(StaServiceTest, StaServiceRegisterStaServiceCallbackFail, TestSize.Leve { StaServiceRegisterStaServiceCallbackFail(); } + +/** + * @tc.name: Set suspend mode test + * @tc.desc: Set suspend mode test function. + * @tc.type: FUNC + * @tc.require: issueI5JRBB + */ +HWTEST_F(StaServiceTest, StaServiceSetSuspendMode, TestSize.Level1) +{ + StaServiceSetSuspendModeTest(); +} } // namespace Wifi } // namespace OHOS \ No newline at end of file -- Gitee From 9690b20f5c9a4dd487d6c192a500a0a15a3711bc Mon Sep 17 00:00:00 2001 From: lujunxin Date: Thu, 25 Aug 2022 09:17:47 +0000 Subject: [PATCH 325/491] notify p2p disconnect when p2p interface remove Signed-off-by: lujunxin --- .../wifi_manage/wifi_p2p/p2p_group_operating_state.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.cpp index 4494994..81f29c8 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.cpp @@ -264,6 +264,7 @@ bool P2pGroupOperatingState::ProcessCmdRemoveGroup(const InternalMessage &msg) c p2pStateMachine.SwitchState(&p2pStateMachine.p2pIdleState); p2pStateMachine.BroadcastActionResult(P2pActionCallback::RemoveGroup, WIFI_OPT_FAILED); } else { + p2pStateMachine.ChangeConnectedStatus(P2pConnectedState::P2P_DISCONNECTED); WIFI_LOGI("The P2P group is successfully removed."); p2pStateMachine.BroadcastActionResult(P2pActionCallback::RemoveGroup, WIFI_OPT_SUCCESS); } -- Gitee From 17337c228829318d26ba19d74f8fd6770fde39bd Mon Sep 17 00:00:00 2001 From: lujunxin Date: Fri, 26 Aug 2022 02:22:53 +0000 Subject: [PATCH 326/491] fix wifi_client crash issue for L1 Signed-off-by: lujunxin --- wifi/frameworks/native/src/wifi_device_proxy_lite.cpp | 6 ++++++ .../wifi_manage/wifi_sta/sta_state_machine.cpp | 2 ++ 2 files changed, 8 insertions(+) diff --git a/wifi/frameworks/native/src/wifi_device_proxy_lite.cpp b/wifi/frameworks/native/src/wifi_device_proxy_lite.cpp index 3ace17c..c6cdd48 100644 --- a/wifi/frameworks/native/src/wifi_device_proxy_lite.cpp +++ b/wifi/frameworks/native/src/wifi_device_proxy_lite.cpp @@ -440,6 +440,12 @@ ErrCode WifiDeviceProxy::RemoveCandidateConfig(int networkId) return WIFI_OPT_NOT_SUPPORTED; } +ErrCode WifiDeviceProxy::RemoveCandidateConfig(const WifiDeviceConfig &config) +{ + (void)config; + return WIFI_OPT_NOT_SUPPORTED; +} + void WifiDeviceProxy::WriteIpAddress(IpcIo &req, const WifiIpAddress &address) { (void)WriteInt32(&req, address.family); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp index 1266871..828ca35 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp @@ -425,7 +425,9 @@ void StaStateMachine::StartWifiProcess() InitLastWifiLinkedInfo(); WifiSettings::GetInstance().SaveLinkedInfo(linkedInfo); SyncDeviceConfigToWpa(); +#ifndef OHOS_ARCH_LITE ChipCapability::GetInstance().InitializeChipCapability(); +#endif /* The current state of StaStateMachine transfers to SeparatedState after * enable supplicant. */ -- Gitee From 16ff8ee65e705ef6bfdcc4b92619a0af11573f70 Mon Sep 17 00:00:00 2001 From: z00588131 Date: Fri, 26 Aug 2022 07:27:52 +0000 Subject: [PATCH 327/491] Set syscap false for AP.Extension by default Signed-off-by: z00588131 --- wifi/bundle.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/bundle.json b/wifi/bundle.json index 2be4cbc..88119f8 100644 --- a/wifi/bundle.json +++ b/wifi/bundle.json @@ -42,7 +42,7 @@ "SystemCapability.Communication.WiFi.AP.Core", "SystemCapability.Communication.WiFi.P2P", "SystemCapability.Communication.WiFi.Core", - "SystemCapability.Communication.WiFi.AP.Extension" + "SystemCapability.Communication.WiFi.AP.Extension = false" ], "features": [ "wifi_feature_with_p2p", -- Gitee From 6dd25307b5da40a85dc12e2acdfdb8a751544c46 Mon Sep 17 00:00:00 2001 From: Zhangfeng Date: Sat, 27 Aug 2022 07:12:03 +0000 Subject: [PATCH 328/491] Fix the issue of scanning service occasionally fails to be started Signed-off-by: Zhangfeng --- .../wifi_framework/wifi_manage/common/handler.cpp | 1 + .../wifi_manage/common/state_machine.cpp | 4 +++- .../wifi_framework/wifi_manage/wifi_manager.cpp | 8 ++++++-- .../wpa_supplicant_hal/wifi_wpa_hal.c | 13 +++++++++---- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/handler.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/handler.cpp index b391be0..4d7c8af 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/handler.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/handler.cpp @@ -78,6 +78,7 @@ void *Handler::RunHandleThreadFunc(void *pInstance) return nullptr; } + LOGI("Run handler func."); Handler *pHandler = (Handler *)pInstance; pHandler->GetAndDistributeMessage(); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp index 359fd37..4aa8186 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp @@ -37,6 +37,7 @@ StateMachine::~StateMachine() bool StateMachine::InitialStateMachine() { + LOGI("InitialStateMachine\n"); pStateMachineHandler = new (std::nothrow) StateMachineHandler(this); if (pStateMachineHandler == nullptr) { LOGE("pStateMachineHandler alloc failed.\n"); @@ -282,7 +283,7 @@ StateMachineHandler::StateMachineHandler(StateMachine *pStateMgr) StateMachineHandler::~StateMachineHandler() { - LOGD("StateMachineHandler::~StateMachineHandler"); + LOGI("StateMachineHandler::~StateMachineHandler"); StopHandlerThread(); ReleaseDelayedMessages(); ClearWhenQuit(); @@ -292,6 +293,7 @@ StateMachineHandler::~StateMachineHandler() bool StateMachineHandler::InitialSmHandler() { if (!InitialHandler()) { + LOGE("InitialHandler failed."); return false; } return true; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp index 88feb28..34c3a3b 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp @@ -594,6 +594,7 @@ void WifiManager::CheckAndStopScanService(void) * service. Otherwise, disable the SCAN service. */ WifiOprMidState scanState = WifiConfigCenter::GetInstance().GetScanMidState(); + WIFI_LOGI("[CheckAndStopScanService] scanState %{public}d!", static_cast(scanState)); if (scanState != WifiOprMidState::OPENING && scanState != WifiOprMidState::RUNNING) { return; } @@ -608,13 +609,16 @@ void WifiManager::CheckAndStopScanService(void) if (WifiConfigCenter::GetInstance().SetScanMidState(scanState, WifiOprMidState::CLOSING)) { IScanService *pService = WifiServiceManager::GetInstance().GetScanServiceInst(); if (pService == nullptr) { + WIFI_LOGE("[CheckAndStopScanService] scan service is null."); WifiManager::GetInstance().PushServiceCloseMsg(WifiCloseServiceCode::SCAN_SERVICE_CLOSE); + WifiConfigCenter::GetInstance().SetScanMidState(scanState, WifiOprMidState::CLOSED); return; } ErrCode ret = pService->UnInit(); - if (ret != WIFI_OPT_SUCCESS) { - WifiConfigCenter::GetInstance().SetScanMidState(WifiOprMidState::CLOSING, scanState); + if (ret != WIFI_OPT_SUCCESS) { // scan service is not exist + WIFI_LOGE("[CheckAndStopScanService] UnInit service failed!"); } + WifiConfigCenter::GetInstance().SetScanMidState(scanState, WifiOprMidState::CLOSED); } } diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c index 1b09395..d5e690e 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c @@ -747,20 +747,23 @@ static void *WpaReceiveCallback(void *arg) static int WpaCliConnect(WifiWpaInterface *p) { + LOGI("Wpa connect start."); if (p == NULL) { + LOGE("Wpa connect parameter error."); return -1; } if (p->wpaCtrl.pSend != NULL) { + LOGE("Wpa is already connected."); return 0; } int count = WPA_TRY_CONNECT_TIMES; while (count-- > 0) { int ret = InitWpaCtrl(&p->wpaCtrl, "/data/misc/wifi/sockets/wpa"); if (ret == 0) { - LOGD("Global wpa interface connect successfully!"); + LOGI("Global wpa interface connect successfully!"); break; } else { - LOGD("Init wpaCtrl failed: %{public}d", ret); + LOGE("Init wpaCtrl failed: %{public}d", ret); } usleep(WPA_TRY_CONNECT_SLEEP_TIME); } @@ -774,6 +777,7 @@ static int WpaCliConnect(WifiWpaInterface *p) LOGE("Create monitor thread failed!"); return -1; } + LOGI("Wpa connect finish."); return 0; } @@ -808,14 +812,15 @@ static int WpaCliAddIface(WifiWpaInterface *p, const AddInterfaceArgv *argv, boo StrSafeCopy(info->name, sizeof(info->name), argv->name); char cmd[WPA_CMD_BUF_LEN] = {0}; char buf[WPA_CMD_REPLY_BUF_SMALL_LEN] = {0}; - LOGI("WpaCliAddIface CMD: %{public}s", cmd); + LOGI("Add interface start."); if (isWpaAdd && (snprintf_s(cmd, sizeof(cmd), sizeof(cmd) - 1, "INTERFACE_ADD %s\t%s", argv->name, argv->confName) < 0 || WpaCliCmd(cmd, buf, sizeof(buf)) != 0)) { free(info); info = NULL; - LOGI("WpaCliAddIface buf: %{public}s", buf); + LOGI("WpaCliAddIface failed, cmd: %{public}s, buf: %{public}s", cmd, buf); return -1; } + LOGI("Add interface finish, cmd: %{public}s, buf: %{public}s", cmd, buf); info->num += 1; info->next = p->ifaces; p->ifaces = info; -- Gitee From f6fd04485ebda2e7b6e63f5692b2d97bb055833d Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 29 Aug 2022 18:39:49 +0800 Subject: [PATCH 329/491] bugfix for wep 0829 Signed-off-by: yanxiaotao@huawei.com --- .../wifi_manage/wifi_device_service_impl.cpp | 11 ++++++++-- .../wifi_manage/wifi_sta/sta_service.cpp | 20 ++++++++++--------- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp index 3b9f38f..2cba309 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp @@ -374,14 +374,16 @@ bool WifiDeviceServiceImpl::CheckConfigEap(const WifiDeviceConfig &config) bool WifiDeviceServiceImpl::CheckConfigPwd(const WifiDeviceConfig &config) { if ((config.ssid.length() <= 0) || (config.keyMgmt.length()) <= 0) { + WIFI_LOGE("CheckConfigPwd: invalid ssid or keyMgmt!"); return false; } + WIFI_LOGE("CheckConfigPwd: keyMgmt = %{public}s!", config.keyMgmt.c_str()); if (config.keyMgmt == KEY_MGMT_EAP) { return CheckConfigEap(config); } - if ((config.keyMgmt != KEY_MGMT_NONE && config.keyMgmt != KEY_MGMT_NONE) && + if ((config.keyMgmt != KEY_MGMT_NONE && config.keyMgmt != KEY_MGMT_WEP) && config.preSharedKey.empty()) { WIFI_LOGE("CheckConfigPwd: preSharedKey is empty!"); return false; @@ -389,7 +391,7 @@ bool WifiDeviceServiceImpl::CheckConfigPwd(const WifiDeviceConfig &config) int len = config.preSharedKey.length(); bool isAllHex = std::all_of(config.preSharedKey.begin(), config.preSharedKey.end(), isxdigit); - WIFI_LOGI("CheckConfigPwd, keyMgmt: %{public}s, len: %{public}d", config.keyMgmt.c_str(), len); + WIFI_LOGI("CheckConfigPwd, ssid: %{public}s, psk len: %{public}d", SsidAnonymize(config.ssid), len); if (config.keyMgmt == KEY_MGMT_WEP) { for (int i = 0; i != WEPKEYS_SIZE; ++i) { if (!config.wepKeys[i].empty()) { // wep @@ -736,15 +738,18 @@ ErrCode WifiDeviceServiceImpl::ConnectToNetwork(int networkId, bool isCandidate) } if (!IsStaServiceRunning()) { + WIFI_LOGE("ConnectToNetwork: sta service is not running!"); return WIFI_OPT_STA_NOT_OPENED; } if (networkId < 0) { + WIFI_LOGE("ConnectToNetwork: invalid networkId = %{public}d!"); return WIFI_OPT_INVALID_PARAM; } IStaService *pService = WifiServiceManager::GetInstance().GetStaServiceInst(); if (pService == nullptr) { + WIFI_LOGE("ConnectToNetwork: pService is nullptr!"); return WIFI_OPT_STA_NOT_OPENED; } @@ -781,10 +786,12 @@ ErrCode WifiDeviceServiceImpl::ConnectToDevice(const WifiDeviceConfig &config) return WIFI_OPT_INVALID_PARAM; } if (!IsStaServiceRunning()) { + WIFI_LOGE("ConnectToDevice: sta service is not running!"); return WIFI_OPT_STA_NOT_OPENED; } IStaService *pService = WifiServiceManager::GetInstance().GetStaServiceInst(); if (pService == nullptr) { + WIFI_LOGE("ConnectToNetwork: pService is nullptr!"); return WIFI_OPT_STA_NOT_OPENED; } return pService->ConnectToDevice(config); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp index 40ce713..6cd8759 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp @@ -186,8 +186,9 @@ int StaService::AddDeviceConfig(const WifiDeviceConfig &config) const std::string bssid; WifiDeviceConfig tempDeviceConfig; if (WifiSettings::GetInstance().GetDeviceConfig(config.ssid, config.keyMgmt, tempDeviceConfig) == 0) { - LOGI("A network with the same name already exists in the configuration center!\n"); netWorkId = tempDeviceConfig.networkId; + LOGI("The same network name already exists in settings! netWorkId:%{public}d, ssid:%{public}s." + netWorkId, SsidAnonymize(config.ssid)); CHECK_NULL_AND_RETURN(pStaAutoConnectService, WIFI_OPT_FAILED); bssid = config.bssid.empty() ? tempDeviceConfig.bssid : config.bssid; pStaAutoConnectService->EnableOrDisableBssid(bssid, true, 0); @@ -226,7 +227,7 @@ int StaService::UpdateDeviceConfig(const WifiDeviceConfig &config) const ErrCode StaService::RemoveDevice(int networkId) const { - LOGD("Enter StaService::RemoveDevice.\n"); + LOGI("Enter StaService::RemoveDevice, networkId = %{public}d.\n", networkId); /* Remove network configuration. */ if (WifiStaHalInterface::GetInstance().RemoveDevice(networkId) != WIFI_IDL_OPT_OK) { LOGE("RemoveDeviceConfig() failed!"); @@ -251,7 +252,7 @@ ErrCode StaService::RemoveDevice(int networkId) const ErrCode StaService::RemoveAllDevice() const { - LOGD("Enter StaService::RemoveAllDevice.\n"); + LOGI("Enter StaService::RemoveAllDevice.\n"); if (WifiStaHalInterface::GetInstance().ClearDeviceConfig() == WIFI_IDL_OPT_OK) { LOGD("Remove all device config successfully!"); if (WifiStaHalInterface::GetInstance().SaveDeviceConfig() != WIFI_IDL_OPT_OK) { @@ -273,21 +274,21 @@ ErrCode StaService::RemoveAllDevice() const ErrCode StaService::ConnectToDevice(const WifiDeviceConfig &config) const { - LOGI("Enter StaService::ConnectToDevice.\n"); + LOGI("Enter StaService::ConnectToDevice, ssid = %{public}s.\n", SsidAnonymize(config.ssid)); CHECK_NULL_AND_RETURN(pStaStateMachine, WIFI_OPT_FAILED); int netWorkId = AddDeviceConfig(config); if(netWorkId == INVALID_NETWORK_ID) { - LOGD("StaService::ConnectTo AddDeviceConfig failed!"); + LOGD("StaService::ConnectToDevice, AddDeviceConfig failed!"); return WIFI_OPT_FAILED; } - LOGD("StaService::ConnectTo: %{public}d", netWorkId); + LOGI("StaService::ConnectToDevice, netWorkId: %{public}d", netWorkId); pStaStateMachine->SendMessage(WIFI_SVR_CMD_STA_CONNECT_NETWORK, netWorkId, NETWORK_SELECTED_BY_THE_USER); return WIFI_OPT_SUCCESS; } ErrCode StaService::ConnectToNetwork(int networkId) const { - LOGI("Enter StaService::ConnectToNetwork, networkId is %{public}d.\n", networkId); + LOGI("Enter StaService::ConnectToNetwork, networkId is %{public}d.", networkId); WifiDeviceConfig config; if (WifiSettings::GetInstance().GetDeviceConfig(networkId, config) != 0) { LOGE("WifiDeviceConfig is null!"); @@ -295,6 +296,7 @@ ErrCode StaService::ConnectToNetwork(int networkId) const } CHECK_NULL_AND_RETURN(pStaAutoConnectService, WIFI_OPT_FAILED); CHECK_NULL_AND_RETURN(pStaStateMachine, WIFI_OPT_FAILED); + LOGI("StaService::ConnectToNetwork, ssid = %{public}s.", SsidAnonymize(config.ssid)); pStaAutoConnectService->EnableOrDisableBssid(config.bssid, true, 0); pStaStateMachine->SendMessage(WIFI_SVR_CMD_STA_CONNECT_SAVED_NETWORK, networkId, NETWORK_SELECTED_BY_THE_USER); return WIFI_OPT_SUCCESS; @@ -310,7 +312,7 @@ ErrCode StaService::ReAssociate() const ErrCode StaService::EnableDeviceConfig(int networkId, bool attemptEnable) const { - WIFI_LOGI("Enter StaService::EnableDeviceConfig! networkid is %{public}d", networkId); + WIFI_LOGI("Enter StaService::EnableDeviceConfig, networkid is %{public}d", networkId); /* Update wifi status. */ if (WifiSettings::GetInstance().SetDeviceState(networkId, (int)WifiDeviceConfigStatus::ENABLED, attemptEnable) < @@ -324,7 +326,7 @@ ErrCode StaService::EnableDeviceConfig(int networkId, bool attemptEnable) const ErrCode StaService::DisableDeviceConfig(int networkId) const { - WIFI_LOGI("Enter StaService::DisableDeviceConfig.networkid is %{public}d", networkId); + WIFI_LOGI("Enter StaService::DisableDeviceConfig, networkid is %{public}d", networkId); if (WifiSettings::GetInstance().SetDeviceState(networkId, (int)WifiDeviceConfigStatus::DISABLED) < 0) { WIFI_LOGE("Disable device config failed!"); -- Gitee From 9b074ec2472989564e82abb5bc9503adc4bdf8cd Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 29 Aug 2022 18:47:23 +0800 Subject: [PATCH 330/491] bugfix for wep 0829 Signed-off-by: yanxiaotao@huawei.com --- .../wifi_framework/wifi_manage/wifi_device_service_impl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp index 2cba309..7c01c5f 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp @@ -378,7 +378,7 @@ bool WifiDeviceServiceImpl::CheckConfigPwd(const WifiDeviceConfig &config) return false; } - WIFI_LOGE("CheckConfigPwd: keyMgmt = %{public}s!", config.keyMgmt.c_str()); + WIFI_LOGI("CheckConfigPwd: keyMgmt = %{public}s!", config.keyMgmt.c_str()); if (config.keyMgmt == KEY_MGMT_EAP) { return CheckConfigEap(config); } -- Gitee From d559f3ac280bff44045a8e13aae31899aee25e00 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 29 Aug 2022 19:14:58 +0800 Subject: [PATCH 331/491] bugfix for wep 0829 Signed-off-by: yanxiaotao@huawei.com --- .../wifi_framework/wifi_manage/wifi_device_service_impl.cpp | 2 +- .../wifi_framework/wifi_manage/wifi_sta/sta_service.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp index 7c01c5f..a88ef62 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp @@ -391,7 +391,7 @@ bool WifiDeviceServiceImpl::CheckConfigPwd(const WifiDeviceConfig &config) int len = config.preSharedKey.length(); bool isAllHex = std::all_of(config.preSharedKey.begin(), config.preSharedKey.end(), isxdigit); - WIFI_LOGI("CheckConfigPwd, ssid: %{public}s, psk len: %{public}d", SsidAnonymize(config.ssid), len); + WIFI_LOGI("CheckConfigPwd, ssid: %{public}s, psk len: %{public}d", SsidAnonymize(config.ssid).c_str(), len); if (config.keyMgmt == KEY_MGMT_WEP) { for (int i = 0; i != WEPKEYS_SIZE; ++i) { if (!config.wepKeys[i].empty()) { // wep diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp index 6cd8759..ba54ed8 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp @@ -188,7 +188,7 @@ int StaService::AddDeviceConfig(const WifiDeviceConfig &config) const if (WifiSettings::GetInstance().GetDeviceConfig(config.ssid, config.keyMgmt, tempDeviceConfig) == 0) { netWorkId = tempDeviceConfig.networkId; LOGI("The same network name already exists in settings! netWorkId:%{public}d, ssid:%{public}s." - netWorkId, SsidAnonymize(config.ssid)); + netWorkId, SsidAnonymize(config.ssid).c_str()); CHECK_NULL_AND_RETURN(pStaAutoConnectService, WIFI_OPT_FAILED); bssid = config.bssid.empty() ? tempDeviceConfig.bssid : config.bssid; pStaAutoConnectService->EnableOrDisableBssid(bssid, true, 0); @@ -274,7 +274,7 @@ ErrCode StaService::RemoveAllDevice() const ErrCode StaService::ConnectToDevice(const WifiDeviceConfig &config) const { - LOGI("Enter StaService::ConnectToDevice, ssid = %{public}s.\n", SsidAnonymize(config.ssid)); + LOGI("Enter StaService::ConnectToDevice, ssid = %{public}s.\n", SsidAnonymize(config.ssid).c_str()); CHECK_NULL_AND_RETURN(pStaStateMachine, WIFI_OPT_FAILED); int netWorkId = AddDeviceConfig(config); if(netWorkId == INVALID_NETWORK_ID) { @@ -296,7 +296,7 @@ ErrCode StaService::ConnectToNetwork(int networkId) const } CHECK_NULL_AND_RETURN(pStaAutoConnectService, WIFI_OPT_FAILED); CHECK_NULL_AND_RETURN(pStaStateMachine, WIFI_OPT_FAILED); - LOGI("StaService::ConnectToNetwork, ssid = %{public}s.", SsidAnonymize(config.ssid)); + LOGI("StaService::ConnectToNetwork, ssid = %{public}s.", SsidAnonymize(config.ssid).c_str()); pStaAutoConnectService->EnableOrDisableBssid(config.bssid, true, 0); pStaStateMachine->SendMessage(WIFI_SVR_CMD_STA_CONNECT_SAVED_NETWORK, networkId, NETWORK_SELECTED_BY_THE_USER); return WIFI_OPT_SUCCESS; -- Gitee From 5b94a5466f5f258fe66a9991f3c67a0c189bd4a7 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 29 Aug 2022 19:36:36 +0800 Subject: [PATCH 332/491] bugfix for wep 0829 Signed-off-by: yanxiaotao@huawei.com --- .../wifi_framework/wifi_manage/wifi_sta/sta_service.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp index ba54ed8..7028cf9 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp @@ -23,6 +23,7 @@ #include "wifi_settings.h" #include "wifi_sta_hal_interface.h" #include "wifi_supplicant_hal_interface.h" +#inlcude "wifi_common_util.h" DEFINE_WIFILOG_LABEL("StaService"); namespace OHOS { @@ -187,7 +188,7 @@ int StaService::AddDeviceConfig(const WifiDeviceConfig &config) const WifiDeviceConfig tempDeviceConfig; if (WifiSettings::GetInstance().GetDeviceConfig(config.ssid, config.keyMgmt, tempDeviceConfig) == 0) { netWorkId = tempDeviceConfig.networkId; - LOGI("The same network name already exists in settings! netWorkId:%{public}d, ssid:%{public}s." + LOGI("The same network name already exists in settings! netWorkId:%{public}d, ssid:%{public}s.", netWorkId, SsidAnonymize(config.ssid).c_str()); CHECK_NULL_AND_RETURN(pStaAutoConnectService, WIFI_OPT_FAILED); bssid = config.bssid.empty() ? tempDeviceConfig.bssid : config.bssid; -- Gitee From 413f703d6cbd034aa244dbebfcafe8679795d95d Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 29 Aug 2022 19:43:33 +0800 Subject: [PATCH 333/491] bugfix for wep 0829 Signed-off-by: yanxiaotao@huawei.com --- .../wifi_framework/wifi_manage/wifi_device_service_impl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp index a88ef62..0baf7b6 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp @@ -743,7 +743,7 @@ ErrCode WifiDeviceServiceImpl::ConnectToNetwork(int networkId, bool isCandidate) } if (networkId < 0) { - WIFI_LOGE("ConnectToNetwork: invalid networkId = %{public}d!"); + WIFI_LOGE("ConnectToNetwork: invalid networkId = %{public}d!", networkId); return WIFI_OPT_INVALID_PARAM; } -- Gitee From 710cb60a7a172adff4089ee63690529f65453af1 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 29 Aug 2022 19:53:36 +0800 Subject: [PATCH 334/491] bugfix for wep 0829 Signed-off-by: yanxiaotao@huawei.com --- .../wifi_framework/wifi_manage/wifi_sta/sta_service.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp index 7028cf9..51ae164 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp @@ -23,7 +23,7 @@ #include "wifi_settings.h" #include "wifi_sta_hal_interface.h" #include "wifi_supplicant_hal_interface.h" -#inlcude "wifi_common_util.h" +#include "wifi_common_util.h" DEFINE_WIFILOG_LABEL("StaService"); namespace OHOS { -- Gitee From c399b0f62e13aed022f8376f90f27746f09adb35 Mon Sep 17 00:00:00 2001 From: lujunxin Date: Tue, 30 Aug 2022 01:41:56 +0000 Subject: [PATCH 335/491] fix cannot connect synology AP Signed-off-by: lujunxin --- dhcp/services/dhcp_client/src/dhcp_ipv4.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dhcp/services/dhcp_client/src/dhcp_ipv4.c b/dhcp/services/dhcp_client/src/dhcp_ipv4.c index 03e39b8..a2168eb 100644 --- a/dhcp/services/dhcp_client/src/dhcp_ipv4.c +++ b/dhcp/services/dhcp_client/src/dhcp_ipv4.c @@ -309,7 +309,7 @@ static struct DhcpPacket *ReadLease(void) return dhcp; } -static ssize_t WriteLease(struct DhcpPacket *pkt) +static ssize_t WriteLease(const struct DhcpPacket *pkt) { if (pkt == NULL) { return -1; @@ -404,7 +404,9 @@ void SendReboot(struct DhcpPacket *p, time_t timestamp) g_transID = GetTransId(); g_dhcp4State = DHCP_STATE_INITREBOOT; g_sentPacketNum = 0; - g_timeoutTimestamp = timestamp + g_renewalSec; + + uint32_t uTimeoutSec = TIMEOUT_WAIT_SEC << g_sentPacketNum; + g_timeoutTimestamp = timestamp + uTimeoutSec; DhcpReboot(g_transID, g_requestedIp4); } @@ -437,9 +439,6 @@ static void Reboot(time_t timestamp) rebindTime = leaseTime * REBIND_SEC_MULTIPLE; LOGI("Reboot read lease file leaseTime:%{public}u, renewalTime:%{public}u, rebindTime:%{public}u", leaseTime, renewalTime, rebindTime); - free(pkt); - pkt = NULL; - return; } } else { LOGI("Reboot read lease file leaseTime option not found"); @@ -611,6 +610,7 @@ static void DhcpOfferPacketHandle(uint8_t type, const struct DhcpPacket *packet, } /* Receive dhcp offer packet finished, next send dhcp request packet. */ + WriteLease(packet); g_dhcp4State = DHCP_STATE_REQUESTING; g_sentPacketNum = 0; g_timeoutTimestamp = timestamp; -- Gitee From 96f74692c7a99e9f803aa5985f6184c2b680f804 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 5 Sep 2022 14:09:27 +0800 Subject: [PATCH 336/491] set dns & gateway to serverId for default 0905 Signed-off-by: yanxiaotao@huawei.com --- .../dhcp_server/include/dhcp_logger.h | 2 +- dhcp/services/dhcp_server/src/dhcp_dhcpd.c | 25 +++++++++++++------ .../mgr_service/src/dhcp_server_service.cpp | 1 + .../wifi_sta/sta_saved_device_appraisal.cpp | 7 ++++-- 4 files changed, 24 insertions(+), 11 deletions(-) diff --git a/dhcp/services/dhcp_server/include/dhcp_logger.h b/dhcp/services/dhcp_server/include/dhcp_logger.h index 1aa8820..9176e98 100644 --- a/dhcp/services/dhcp_server/include/dhcp_logger.h +++ b/dhcp/services/dhcp_server/include/dhcp_logger.h @@ -27,7 +27,7 @@ #define LOG_TAG "DhcpServer" #undef LOG_DOMAIN -#define LOG_DOMAIN 0x0000000 +#define LOG_DOMAIN 0xD001560 #define LOGD(...) ((void)HiLogPrint(LOG_CORE, LOG_DEBUG, LOG_DOMAIN, LOG_TAG, __VA_ARGS__)) diff --git a/dhcp/services/dhcp_server/src/dhcp_dhcpd.c b/dhcp/services/dhcp_server/src/dhcp_dhcpd.c index 6c80d69..a99950b 100644 --- a/dhcp/services/dhcp_server/src/dhcp_dhcpd.c +++ b/dhcp/services/dhcp_server/src/dhcp_dhcpd.c @@ -92,6 +92,10 @@ static int InitNetworkAbout(DhcpConfig *config) LOGE("error gateway argument."); return RET_FAILED; } + } else { + config->gateway = config->serverId; + LOGW("InitNetworkAbout, set gateway to serverId:%{public}x as default.", + config->serverId); } return RET_SUCCESS; } @@ -146,10 +150,9 @@ static int InitAddressRange(DhcpConfig *config) static int InitDomainNameServer(DhcpConfig *config) { + DhcpOption argOpt = {DOMAIN_NAME_SERVER_OPTION, 0, {0}}; ArgumentInfo *arg = GetArgument("dns"); if (arg) { - DhcpOption argOpt = {DOMAIN_NAME_SERVER_OPTION, 0, {0}}; - char *pSave = NULL; char *pTok = strtok_r(arg->value, ",", &pSave); if ((pTok == NULL) || (strlen(pTok) == 0)) { @@ -164,15 +167,21 @@ static int InitDomainNameServer(DhcpConfig *config) } if (AppendAddressOption(&argOpt, dnsAddress) != RET_SUCCESS) { LOGW("failed to append dns option."); - }; + } pTok = strtok_r(NULL, ",", &pSave); } - - if (GetOption(&config->options, argOpt.code) != NULL) { - RemoveOption(&config->options, DOMAIN_NAME_SERVER_OPTION); + } else { + LOGW("%{public}s, set dns to serverId:0x%{public}x for default.", __func__, config->serverId); + uint32_t dnsAddress = config->serverId; + if (AppendAddressOption(&argOpt, dnsAddress) != RET_SUCCESS) { + LOGW("failed to append dns option."); } - PushBackOption(&config->options, &argOpt); } + + if (GetOption(&config->options, argOpt.code) != NULL) { + RemoveOption(&config->options, DOMAIN_NAME_SERVER_OPTION); + } + PushBackOption(&config->options, &argOpt); return RET_SUCCESS; } @@ -343,7 +352,7 @@ static int InitializeDhcpConfig(const char *ifname, DhcpConfig *config) return RET_FAILED; } } - LOGD("load local config file:%s", configFile); + LOGI("load local dhcp config file:%s", configFile); if (LoadConfig(configFile, ifname, config) != RET_SUCCESS) { LOGE("failed to load configure file."); return RET_FAILED; diff --git a/dhcp/services/mgr_service/src/dhcp_server_service.cpp b/dhcp/services/mgr_service/src/dhcp_server_service.cpp index 743f0b4..4d85f42 100644 --- a/dhcp/services/mgr_service/src/dhcp_server_service.cpp +++ b/dhcp/services/mgr_service/src/dhcp_server_service.cpp @@ -314,6 +314,7 @@ int DhcpServerService::SetDhcpRange(const std::string &ifname, const std::string WIFI_LOGE("SetDhcpRange tag m_mapTagDhcpRange no find tagName:%{public}s.", tagName.c_str()); return DHCP_OPT_FAILED; } + int nSize = (int)iterTag->second.size(); if (nSize != 1) { WIFI_LOGE("SetDhcpRange tag %{public}s range size:%{public}d error.", tagName.c_str(), nSize); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp index 2f81222..5107e18 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp @@ -65,8 +65,8 @@ ErrCode StaSavedDeviceAppraisal::DeviceAppraisals( int score = 0; AppraiseDeviceQuality(score, scanInfo, device, info); - WIFI_LOGI("The device %{public}s score is %{public}d.rssi is %{public}d.\n", - scanInfo.ssid.c_str(), score, scanInfo.rssi); + WIFI_LOGI("The device networkId:%{public}d ssid:%{public}s score is %{public}d, rssi is %{public}d.", + device.networkId, SsidAnonymize(scanInfo.ssid).c_str(), score, scanInfo.rssi); if (score > highestScore || (score == highestScore && scanInfo.rssi > scanInfoElected.rssi)) { highestScore = score; @@ -78,6 +78,9 @@ ErrCode StaSavedDeviceAppraisal::DeviceAppraisals( } } if (sign == 1) { + WIFI_LOGI("DeviceAppraisals, Selected device, networkId:%{public}s, ssid:%{public}s, bssid:%{public}d.", + electedDevice.networkId, SsidAnonymize(electedDevice.ssid).c_str(), + MacAnonymize(electedDevice.bssid).c_str()); if (info.connState == ConnState::CONNECTED && electedDevice.networkId == info.networkId) { WifiDeviceConfig networkInfo; electedDevice = networkInfo; -- Gitee From dded3f47da135910717524ab5ef15b9b6a2cc41e Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 5 Sep 2022 16:16:17 +0800 Subject: [PATCH 337/491] set dns & gateway to serverId for default 0905 Signed-off-by: yanxiaotao@huawei.com --- dhcp/services/dhcp_server/src/dhcp_dhcpd.c | 2 +- .../wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dhcp/services/dhcp_server/src/dhcp_dhcpd.c b/dhcp/services/dhcp_server/src/dhcp_dhcpd.c index a99950b..1ccb629 100644 --- a/dhcp/services/dhcp_server/src/dhcp_dhcpd.c +++ b/dhcp/services/dhcp_server/src/dhcp_dhcpd.c @@ -352,7 +352,7 @@ static int InitializeDhcpConfig(const char *ifname, DhcpConfig *config) return RET_FAILED; } } - LOGI("load local dhcp config file:%s", configFile); + LOGD("load local dhcp config file:%s", configFile); if (LoadConfig(configFile, ifname, config) != RET_SUCCESS) { LOGE("failed to load configure file."); return RET_FAILED; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp index 5107e18..a4e6c04 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp @@ -15,6 +15,7 @@ #include "sta_saved_device_appraisal.h" #include "wifi_logger.h" #include "wifi_settings.h" +#include "wifi_common_util.h" DEFINE_WIFILOG_LABEL("StaSavedDeviceAppraisal"); -- Gitee From 9c0630697a0ed0c87fe91e5d2da757e61d411f1a Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 5 Sep 2022 17:27:59 +0800 Subject: [PATCH 338/491] set dns & gateway to serverId for default 0905 Signed-off-by: yanxiaotao@huawei.com --- dhcp/services/dhcp_server/src/dhcp_dhcpd.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dhcp/services/dhcp_server/src/dhcp_dhcpd.c b/dhcp/services/dhcp_server/src/dhcp_dhcpd.c index 1ccb629..3aaac43 100644 --- a/dhcp/services/dhcp_server/src/dhcp_dhcpd.c +++ b/dhcp/services/dhcp_server/src/dhcp_dhcpd.c @@ -94,8 +94,7 @@ static int InitNetworkAbout(DhcpConfig *config) } } else { config->gateway = config->serverId; - LOGW("InitNetworkAbout, set gateway to serverId:%{public}x as default.", - config->serverId); + LOGW("InitNetworkAbout, set gateway to serverId as default."); } return RET_SUCCESS; } @@ -171,7 +170,7 @@ static int InitDomainNameServer(DhcpConfig *config) pTok = strtok_r(NULL, ",", &pSave); } } else { - LOGW("%{public}s, set dns to serverId:0x%{public}x for default.", __func__, config->serverId); + LOGW("%{public}s, set dns to serverId as default.", __func__); uint32_t dnsAddress = config->serverId; if (AppendAddressOption(&argOpt, dnsAddress) != RET_SUCCESS) { LOGW("failed to append dns option."); -- Gitee From da2d53925d52207d2c13c1f414cc5e2f5882d826 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 5 Sep 2022 17:29:47 +0800 Subject: [PATCH 339/491] set dns & gateway to serverId for default 0905 Signed-off-by: yanxiaotao@huawei.com --- .../wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp index a4e6c04..ce21201 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp @@ -79,7 +79,7 @@ ErrCode StaSavedDeviceAppraisal::DeviceAppraisals( } } if (sign == 1) { - WIFI_LOGI("DeviceAppraisals, Selected device, networkId:%{public}s, ssid:%{public}s, bssid:%{public}d.", + WIFI_LOGI("DeviceAppraisals, Selected device, networkId:%{public}d, ssid:%{public}s, bssid:%{public}d.", electedDevice.networkId, SsidAnonymize(electedDevice.ssid).c_str(), MacAnonymize(electedDevice.bssid).c_str()); if (info.connState == ConnState::CONNECTED && electedDevice.networkId == info.networkId) { -- Gitee From ec6cdd1e1499b3ee72a41f92a3f9f8bb4b0e6ee3 Mon Sep 17 00:00:00 2001 From: "william.huang" Date: Thu, 1 Sep 2022 21:13:03 +0800 Subject: [PATCH 340/491] Add return value check and warning prompt of sprintf_s use Signed-off-by: william.huang --- .../wifi_manage/wifi_sta/sta_state_machine.cpp | 8 ++++++-- .../wifi_standard/wifi_hal/wifi_hal_ap_interface.c | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp index 828ca35..7131446 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp @@ -1227,13 +1227,17 @@ void StaStateMachine::MacAddressGenerate(std::string &strMac) constexpr int two = 2; constexpr int hexBase = 16; constexpr int octBase = 8; + int ret = 0; char strMacTmp[arraySize] = {0}; srand(static_cast(time(nullptr))); for (int i = 0; i < macBitSize; i++) { if (i != firstBit) { - sprintf_s(strMacTmp, arraySize, "%x", rand() % hexBase); + ret = sprintf_s(strMacTmp, arraySize, "%x", rand() % hexBase); } else { - sprintf_s(strMacTmp, arraySize, "%x", two * (rand() % octBase)); + ret = sprintf_s(strMacTmp, arraySize, "%x", two * (rand() % octBase)); + } + if (ret == -1) { + LOGE("StaStateMachine::MacAddressGenerate failed, sprintf_s return -1!\n"); } strMac += strMacTmp; if ((i % two) != 0 && (i != lastBit)) { diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c index 7f57b83..b3e4b12 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c @@ -59,9 +59,13 @@ WifiErrorNo StartSoftAp(int id) return WIFI_HAL_HOSTAPD_NOT_INIT; } - sprintf_s(ifaceName, IFCAE_NAME_LEN, AP_INTF"%d", id); + int ret = sprintf_s(ifaceName, IFCAE_NAME_LEN, AP_INTF"%d", id); + if (ret == -1) { + LOGE("StartSoftAp failed! ret=%{public}d", ret); + return WIFI_HAL_FAILED; + } if (GetIfaceState(ifaceName) == 0 || id > 0) { - int ret = hostapdHalDevice->enableAp(id); + ret = hostapdHalDevice->enableAp(id); if (ret != 0) { LOGE("enableAp failed! ret=%{public}d", ret); return WIFI_HAL_FAILED; -- Gitee From 96e0709427dbfe6092d78b04369612efb3d2aea5 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 5 Sep 2022 20:04:13 +0800 Subject: [PATCH 341/491] set dns & gateway to serverId for default 0905 Signed-off-by: yanxiaotao@huawei.com --- .../wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp index ce21201..ca79bfd 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp @@ -79,7 +79,7 @@ ErrCode StaSavedDeviceAppraisal::DeviceAppraisals( } } if (sign == 1) { - WIFI_LOGI("DeviceAppraisals, Selected device, networkId:%{public}d, ssid:%{public}s, bssid:%{public}d.", + WIFI_LOGI("DeviceAppraisals, Selected device, networkId:%{public}d, ssid:%{public}s, bssid:%{public}s.", electedDevice.networkId, SsidAnonymize(electedDevice.ssid).c_str(), MacAnonymize(electedDevice.bssid).c_str()); if (info.connState == ConnState::CONNECTED && electedDevice.networkId == info.networkId) { -- Gitee From af03d998d102676cdfd26e45c1d73035c2a417a6 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Tue, 6 Sep 2022 19:39:57 +0800 Subject: [PATCH 342/491] bugfix for static IP 0906 Signed-off-by: yanxiaotao@huawei.com --- wifi/frameworks/native/interfaces/wifi_msg.h | 8 ++++++-- .../wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp | 3 ++- .../wifi_manage/wifi_sta/sta_state_machine.cpp | 1 + .../wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c | 5 +++++ 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/wifi/frameworks/native/interfaces/wifi_msg.h b/wifi/frameworks/native/interfaces/wifi_msg.h index 2773082..7ce3a5c 100644 --- a/wifi/frameworks/native/interfaces/wifi_msg.h +++ b/wifi/frameworks/native/interfaces/wifi_msg.h @@ -207,8 +207,10 @@ public: void SetIpv4Address(const std::string &address) { - family = IPV4_ADDRESS_TYPE; addressIpv4 = IpTools::ConvertIpv4Address(address); + if (addressIpv4 != 0) { + family = IPV4_ADDRESS_TYPE; + } return; } @@ -219,8 +221,10 @@ public: void SetIpv6Address(const std::string &address) { - family = IPV6_ADDRESS_TYPE; IpTools::ConvertIpv6Address(address, addressIpv6); + if (addressIpv6.size() != 0) { + family = IPV6_ADDRESS_TYPE; + } return; } }; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp index ca79bfd..b0e3031 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp @@ -66,7 +66,7 @@ ErrCode StaSavedDeviceAppraisal::DeviceAppraisals( int score = 0; AppraiseDeviceQuality(score, scanInfo, device, info); - WIFI_LOGI("The device networkId:%{public}d ssid:%{public}s score is %{public}d, rssi is %{public}d.", + WIFI_LOGI("The device networkId:%{public}d ssid:%{public}s score:%{public}d rssi:%{public}d.", device.networkId, SsidAnonymize(scanInfo.ssid).c_str(), score, scanInfo.rssi); if (score > highestScore || (score == highestScore && scanInfo.rssi > scanInfoElected.rssi)) { @@ -74,6 +74,7 @@ ErrCode StaSavedDeviceAppraisal::DeviceAppraisals( scanInfoElected.rssi = scanInfo.rssi; electedDevice = device; sign = 1; + WIFI_LOGI("set highestScore: %{public}d, ssid: %{public}s", highestScore, SsidAnonymize(device.ssid).c_str()); } else { WIFI_LOGI("The config %{public}s is ignored!\n", scanInfo.ssid.c_str()); } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp index 828ca35..19d3506 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp @@ -1799,6 +1799,7 @@ bool StaStateMachine::ConfigStaticIpAddress(StaticIpAddress &staticIpAddress) } default: + WIFI_LOGE("Invalid currentTpType: %{public}d", currentTpType); return false; } return true; diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c index 421c23b..8d8065d 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c @@ -23,6 +23,7 @@ #include "wifi_wpa_common.h" #include "utils/common.h" /* request for printf_decode to decode wpa's returned ssid info */ #include "wifi_hal_common_func.h" +#include "wifi_common_util.h" #undef LOG_TAG #define LOG_TAG "WifiWpaStaHal" @@ -1166,6 +1167,10 @@ static int WpaCliCmdScanInfo(WifiWpaStaInterface *this, ScanInfo *pcmd, int *siz LOGE("parse scan result line failed!"); break; } + LOGI("%{public}2d %{public}s %{public}s %{public}d %{public}d %{public}d %{public}d %{public}d", + j, SsidAnonymize(pcmd[j].ssid).c_str(), MacAnonymize(pcmd[j].bssid).c_str(), + pcmd[j].freq, pcmd[j].siglv, pcmd[j].centerFrequency0, pcmd[j].centerFrequency1, + pcmd[j].channelWidth); token = strtok_r(NULL, "\n", &savedPtr); j++; } -- Gitee From 5d2e0159bd7484ac931fd31a7311a3c12853185c Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Wed, 7 Sep 2022 08:43:51 +0800 Subject: [PATCH 343/491] bugfix for static IP 0906 Signed-off-by: yanxiaotao@huawei.com --- .../wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c index 8d8065d..19b4321 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c @@ -23,7 +23,6 @@ #include "wifi_wpa_common.h" #include "utils/common.h" /* request for printf_decode to decode wpa's returned ssid info */ #include "wifi_hal_common_func.h" -#include "wifi_common_util.h" #undef LOG_TAG #define LOG_TAG "WifiWpaStaHal" @@ -1167,10 +1166,9 @@ static int WpaCliCmdScanInfo(WifiWpaStaInterface *this, ScanInfo *pcmd, int *siz LOGE("parse scan result line failed!"); break; } - LOGI("%{public}2d %{public}s %{public}s %{public}d %{public}d %{public}d %{public}d %{public}d", - j, SsidAnonymize(pcmd[j].ssid).c_str(), MacAnonymize(pcmd[j].bssid).c_str(), - pcmd[j].freq, pcmd[j].siglv, pcmd[j].centerFrequency0, pcmd[j].centerFrequency1, - pcmd[j].channelWidth); + LOGD("%{public}2d %{public}s %{public}s %{public}d %{public}d %{public}d %{public}d %{public}d", + j, pcmd[j].ssid.c_str(), pcmd[j].bssid.c_str(), pcmd[j].freq, pcmd[j].siglv, + pcmd[j].centerFrequency0, pcmd[j].centerFrequency1, pcmd[j].channelWidth); token = strtok_r(NULL, "\n", &savedPtr); j++; } -- Gitee From 140c866b904f579d0b4aa2c3bfa2fe503418f747 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Wed, 7 Sep 2022 09:04:13 +0800 Subject: [PATCH 344/491] bugfix for static IP 0906 Signed-off-by: yanxiaotao@huawei.com --- .../hostapd_hal/wifi_hostapd_hal.c | 19 +++++++++++++------ .../wpa_sta_hal/wifi_supplicant_hal.c | 4 ++-- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.c index 5512dfd..d663345 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.c @@ -186,17 +186,20 @@ int InitHostapdCtrl(const char *ifname, int id) } int flag = 0; do { - g_hostapdHalDevInfo[id].hostapdHalDev->ctrlConn = wpa_ctrl_open(ifname); g_hostapdHalDevInfo[id].hostapdHalDev->ctrlRecv = wpa_ctrl_open(ifname); - if (g_hostapdHalDevInfo[id].hostapdHalDev->ctrlConn == NULL || - g_hostapdHalDevInfo[id].hostapdHalDev->ctrlRecv == NULL) { - LOGE("open hostapd control interface failed!"); + if (g_hostapdHalDevInfo[id].hostapdHalDev->ctrlRecv == NULL) { + LOGE("open hostapd control interface ctrlRecv failed!"); break; } if (wpa_ctrl_attach(g_hostapdHalDevInfo[id].hostapdHalDev->ctrlRecv) != 0) { LOGE("attach hostapd monitor interface failed!"); break; } + g_hostapdHalDevInfo[id].hostapdHalDev->ctrlConn = wpa_ctrl_open(ifname); + if (g_hostapdHalDevInfo[id].hostapdHalDev->ctrlConn == NULL) { + LOGE("open hostapd control interface ctrlConn failed!"); + break; + } flag += 1; } while (0); if (!flag) { @@ -214,6 +217,7 @@ void GetDestPort(char *destPort, size_t len, int id) static int HostapdCliConnect(int id) { if (g_hostapdHalDevInfo[id].hostapdHalDev == NULL) { + LOGE("hostapdHalDev is NULL!"); return -1; } if (g_hostapdHalDevInfo[id].hostapdHalDev->ctrlConn != NULL) { @@ -226,10 +230,10 @@ static int HostapdCliConnect(int id) while (retryCount-- > 0) { int ret = InitHostapdCtrl(ifname, id); if (ret == 0) { - LOGD("Global hostapd interface connect successfully!"); + LOGI("Global hostapd interface connect successfully!"); break; } else { - LOGD("Init hostapd ctrl failed: %{public}d", ret); + LOGE("Init hostapd ctrl failed: %{public}d", ret); } usleep(SLEEP_TIME_100_MS); } @@ -710,6 +714,7 @@ static int InitHostapdHal(int id) WifiHostapdHalDevice *GetWifiHostapdDev(int id) { if (id < 0 || id >= AP_MAX_INSTANCE) { + LOGE("Invalid id: %{public}d!", id); return NULL; } @@ -719,6 +724,7 @@ WifiHostapdHalDevice *GetWifiHostapdDev(int id) g_hostapdHalDevInfo[id].hostapdHalDev = (WifiHostapdHalDevice *)calloc(1, sizeof(WifiHostapdHalDevice)); if (g_hostapdHalDevInfo[id].hostapdHalDev == NULL) { + LOGE("hostapdHalDev is NULL"); return NULL; } @@ -735,6 +741,7 @@ WifiHostapdHalDevice *GetWifiHostapdDev(int id) g_hostapdHalDevInfo[id].hostapdHalDev->setCountryCode = SetCountryCode; if (InitHostapdHal(id) != 0) { + LOGE("InitHostapdHal return failed!!"); free(g_hostapdHalDevInfo[id].hostapdHalDev); g_hostapdHalDevInfo[id].hostapdHalDev = NULL; return NULL; diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c index 19b4321..61f457a 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c @@ -1166,8 +1166,8 @@ static int WpaCliCmdScanInfo(WifiWpaStaInterface *this, ScanInfo *pcmd, int *siz LOGE("parse scan result line failed!"); break; } - LOGD("%{public}2d %{public}s %{public}s %{public}d %{public}d %{public}d %{public}d %{public}d", - j, pcmd[j].ssid.c_str(), pcmd[j].bssid.c_str(), pcmd[j].freq, pcmd[j].siglv, + LOGD("-->>%{public}2d %{public}s %{public}s %{public}d %{public}d %{public}d %{public}d %{public}d", + j, pcmd[j].ssid, pcmd[j].bssid, pcmd[j].freq, pcmd[j].siglv, pcmd[j].centerFrequency0, pcmd[j].centerFrequency1, pcmd[j].channelWidth); token = strtok_r(NULL, "\n", &savedPtr); j++; -- Gitee From f23c366530a96a19747e161d1185f9a420f7a038 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Wed, 7 Sep 2022 09:06:32 +0800 Subject: [PATCH 345/491] bugfix for static IP 0906 Signed-off-by: yanxiaotao@huawei.com --- .../wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.c index d663345..863dbaf 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.c @@ -233,11 +233,12 @@ static int HostapdCliConnect(int id) LOGI("Global hostapd interface connect successfully!"); break; } else { - LOGE("Init hostapd ctrl failed: %{public}d", ret); + LOGD("Init hostapd ctrl failed: %{public}d", ret); } usleep(SLEEP_TIME_100_MS); } if (retryCount <= 0) { + LOGD("Retry init hostapd ctrl failed, retryCount: %{public}d", retryCount); return -1; } g_hostapdHalDevInfo[id].hostapdHalDev->threadRunFlag = 1; -- Gitee From 85702d78fdd74de7fb6a1bf39814067b5e93513b Mon Sep 17 00:00:00 2001 From: fanchao Date: Tue, 6 Sep 2022 19:24:44 -0700 Subject: [PATCH 346/491] get wifi ap getStations ip address. Signed-off-by: fanchao --- .../wifi_toolkit/net_helper/dhcpd_interface.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/dhcpd_interface.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/dhcpd_interface.cpp index e4aa223..f7fa8f2 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/dhcpd_interface.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/dhcpd_interface.cpp @@ -31,9 +31,9 @@ const int GENE_V6_ADDR_LEN = 64; /* Generally, the prefix length cannot exceed 6 const int IP_V6_ADDR_LEN = 128; const int MAC_ADDR_MAX_LEN = 17; const int DHCP_LEASE_FORMAT_SIZE = 5; -const int DHCP_LEASE_MAC_ADDR_POS = 1; -const int DHCP_LEASE_IP_ADDR_POS = 2; -const int DHCP_LEASE_HOSTNAME_POS = 3; +const int DHCP_LEASE_MAC_ADDR_POS = 0; +const int DHCP_LEASE_IP_ADDR_POS = 1; +const int DHCP_LEASE_HOSTNAME_POS = 2; DhcpdInterface::DhcpdInterface() : mBindIpv4(Ipv4Address::INVALID_INET_ADDRESS), mBindIpv6(Ipv6Address::INVALID_INET6_ADDRESS) -- Gitee From ce5e2c083c423988e8ebde9c0092ca46a059c067 Mon Sep 17 00:00:00 2001 From: fengye Date: Fri, 9 Sep 2022 09:57:39 +0000 Subject: [PATCH 347/491] wifi configuration formation and password encryption Signed-off-by: fengye --- wifi/bundle.json | 3 +- .../wifi_framework/wifi_manage/BUILD.gn | 10 + .../wifi_p2p/group_negotiation_state.cpp | 8 +- .../wifi_p2p/p2p_enabled_state.cpp | 8 +- .../wifi_p2p/p2p_group_operating_state.cpp | 15 +- .../wifi_manage/wifi_p2p/p2p_idle_state.cpp | 7 +- .../wifi_p2p/p2p_state_machine.cpp | 56 +- .../wifi_manage/wifi_p2p/p2p_state_machine.h | 8 +- .../wifi_p2p/wifi_p2p_group_manager.cpp | 17 +- .../wifi_p2p/wifi_p2p_group_manager.h | 11 +- .../wifi_sta/sta_state_machine.cpp | 9 +- .../wifi_framework/wifi_toolkit/BUILD.gn | 6 + .../config/wifi_config_file_impl.h | 106 ++- .../config/wifi_config_file_spec.cpp | 718 +++++++++++++----- .../config/wifi_config_file_spec.h | 89 ++- .../wifi_toolkit/config/wifi_settings.cpp | 8 +- .../wifi_toolkit/config/wifi_settings.h | 5 +- .../utils/wifi_encryption_util.cpp | 156 ++++ .../wifi_toolkit/utils/wifi_encryption_util.h | 87 +++ .../wifi_toolkit/utils/wifi_global_func.cpp | 64 ++ .../wifi_toolkit/utils/wifi_global_func.h | 27 + wifi/wifi.gni | 1 + 22 files changed, 1131 insertions(+), 288 deletions(-) create mode 100755 wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.cpp create mode 100755 wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.h diff --git a/wifi/bundle.json b/wifi/bundle.json index 88119f8..f992021 100644 --- a/wifi/bundle.json +++ b/wifi/bundle.json @@ -49,7 +49,8 @@ "wifi_feature_with_ap_intf", "wifi_feature_with_ap_num", "wifi_feature_with_auth_disable", - "wifi_feature_with_dhcp_disable" + "wifi_feature_with_dhcp_disable", + "wifi_feature_with_encryption" ], "adapted_system_type": [ "standard" diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn index 72a7b8e..2beb7a5 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn @@ -152,6 +152,7 @@ if (defined(ohos_lite)) { include_dirs = [ "//commonlibrary/c_utils/base/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", + "//base/security/huks/interfaces/innerkits/huks_standard/main/include", "//foundation/arkui/ace_engine/frameworks/base/utils", "//foundation/arkui/ace_engine/frameworks", "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk/", @@ -243,6 +244,10 @@ if (defined(ohos_lite)) { defines += [ "FEATURE_AP_SUPPORT" ] } + if (wifi_feature_with_encryption) { + defines += [ "FEATURE_ENCRYPTION_SUPPORT" ] + } + deps = [ ":wifi_p2p_service_impl" ] external_deps = [ "ability_base:want", @@ -345,6 +350,7 @@ if (defined(ohos_lite)) { "netmanager_base:net_conn_manager_if", "safwk:system_ability_fwk", "samgr:samgr_proxy", + "huks:libhukssdk" ] defines = [ "FEATURE_AP_SUPPORT", @@ -356,6 +362,10 @@ if (defined(ohos_lite)) { defines += [ "PERMISSION_ALWAYS_GRANT" ] } + if (wifi_feature_with_encryption) { + defines += [ "FEATURE_ENCRYPTION_SUPPORT" ] + } + part_name = "wifi" subsystem_name = "communication" } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.cpp index 6e5908c..f0650c9 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.cpp @@ -87,11 +87,13 @@ bool GroupNegotiationState::ProcessGroupStartedEvt(InternalMessage &msg) const } if (groupManager.GetCurrentGroup().IsPersistent()) { - p2pStateMachine.UpdatePersistentGroups(); + p2pStateMachine.UpdateGroupManager(); const WifiP2pDevice &owner = groupManager.GetCurrentGroup().GetOwner(); WifiP2pGroupInfo copy = groupManager.GetCurrentGroup(); copy.SetNetworkId(groupManager.GetGroupNetworkId(owner, groupManager.GetCurrentGroup().GetGroupName())); groupManager.SetCurrentGroup(copy); + groupManager.AddOrUpdateGroup(groupManager.GetCurrentGroup()); + p2pStateMachine.UpdatePersistentGroups(); } else { WifiP2pGroupInfo copy = groupManager.GetCurrentGroup(); copy.SetNetworkId(TEMPORARY_NET_ID); @@ -229,5 +231,5 @@ bool GroupNegotiationState::ExecuteStateMsg(InternalMessage *msg) return NOT_EXECUTED; } } -} // namespace Wifi -} // namespace OHOS +} // namespace Wifi +} // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabled_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabled_state.cpp index ba2ecac..95d4124 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabled_state.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabled_state.cpp @@ -328,13 +328,7 @@ bool P2pEnabledState::P2pSettingsInitialization() result = false; } - std::map wpaGroups; - retCode = WifiP2PHalInterface::GetInstance().ListNetworks(wpaGroups); - if (retCode == WifiErrorNo::WIFI_IDL_OPT_FAILED) { - WIFI_LOGE("Failed to get listNetworks."); - result = false; - } - groupManager.UpdateGroupsNetwork(wpaGroups); + p2pStateMachine.UpdateGroupManager(); p2pStateMachine.UpdatePersistentGroups(); return result; } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.cpp index 81f29c8..666940c 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.cpp @@ -85,7 +85,8 @@ bool P2pGroupOperatingState::ProcessCmdCreateGroup(const InternalMessage &msg) c WIFI_LOGW("Some configuration settings failed!"); } ret = WifiP2PHalInterface::GetInstance().GroupAdd(true, netId, freq); - (void)WifiP2PHalInterface::GetInstance().SaveConfig(); + p2pStateMachine.UpdateGroupManager(); + p2pStateMachine.UpdatePersistentGroups(); } } else if (netId == PERSISTENT_NET_ID || netId == TEMPORARY_NET_ID) { /** @@ -95,7 +96,8 @@ bool P2pGroupOperatingState::ProcessCmdCreateGroup(const InternalMessage &msg) c if (config.GetPassphrase().empty() && config.GetGroupName().empty()) { WifiSettings::GetInstance().SetExplicitGroup(true); ret = WifiP2PHalInterface::GetInstance().GroupAdd((netId == PERSISTENT_NET_ID) ? true : false, netId, freq); - (void)WifiP2PHalInterface::GetInstance().SaveConfig(); + p2pStateMachine.UpdateGroupManager(); + p2pStateMachine.UpdatePersistentGroups(); } else if (!config.GetPassphrase().empty() && !config.GetGroupName().empty() && config.GetPassphrase().length() >= MIN_PSK_LEN && config.GetPassphrase().length() <= MAX_PSK_LEN) { WifiSettings::GetInstance().SetExplicitGroup(true); @@ -133,11 +135,12 @@ bool P2pGroupOperatingState::ProcessGroupStartedEvt(const InternalMessage &msg) /** * Update groups. */ - p2pStateMachine.UpdatePersistentGroups(); + p2pStateMachine.UpdateGroupManager(); group.SetNetworkId(groupManager.GetGroupNetworkId(group.GetOwner(), group.GetGroupName())); WIFI_LOGI("the group network id is %{public}d set id is %{public}d", group.GetNetworkId(), p2pStateMachine.groupManager.GetGroupNetworkId(group.GetOwner(), group.GetGroupName())); + p2pStateMachine.UpdatePersistentGroups(); } else { group.SetNetworkId(TEMPORARY_NET_ID); WIFI_LOGI("This is a temporary group."); @@ -301,13 +304,13 @@ bool P2pGroupOperatingState::ProcessCmdDeleteGroup(const InternalMessage &msg) c } ret = WifiP2PHalInterface::GetInstance().RemoveNetwork(networkId); - (void)WifiP2PHalInterface::GetInstance().SaveConfig(); groupManager.RemoveGroup(group); if (ret) { WIFI_LOGE("P2P group deletion failed."); p2pStateMachine.BroadcastActionResult(P2pActionCallback::DeleteGroup, WIFI_OPT_FAILED); } else { WIFI_LOGI("The P2P group is deleted successfully."); + p2pStateMachine.UpdateGroupManager(); p2pStateMachine.UpdatePersistentGroups(); p2pStateMachine.BroadcastActionResult(P2pActionCallback::DeleteGroup, WIFI_OPT_SUCCESS); } @@ -352,5 +355,5 @@ bool P2pGroupOperatingState::ExecuteStateMsg(InternalMessage *msg) return NOT_EXECUTED; } } -} // namespace Wifi -} // namespace OHOS +} // namespace Wifi +} // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.cpp index 0e7daf6..5d521c8 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.cpp @@ -237,11 +237,12 @@ bool P2pIdleState::ProcessGroupStartedEvt(InternalMessage &msg) const /** * Update groups. */ - p2pStateMachine.UpdatePersistentGroups(); + p2pStateMachine.UpdateGroupManager(); group.SetNetworkId(groupManager.GetGroupNetworkId(group.GetOwner(), group.GetGroupName())); WIFI_LOGI("the group network id is %{public}d set id is %{public}d", group.GetNetworkId(), p2pStateMachine.groupManager.GetGroupNetworkId(group.GetOwner(), group.GetGroupName())); + p2pStateMachine.UpdatePersistentGroups(); } group.SetP2pGroupStatus(P2pGroupStatus::GS_STARTED); p2pStateMachine.groupManager.SetCurrentGroup(group); @@ -380,5 +381,5 @@ bool P2pIdleState::ExecuteStateMsg(InternalMessage *msg) return NOT_EXECUTED; } } -} // namespace Wifi -} // namespace OHOS +} // namespace Wifi +} // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp index 23eecab..1fe2e82 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp @@ -178,37 +178,28 @@ void P2pStateMachine::InitializeThisDevice() deviceManager.GetThisDevice().SetSecondaryDeviceType(p2pVendorCfg.GetSecondaryDeviceType()); } -void P2pStateMachine::UpdatePersistentGroups() const +void P2pStateMachine::UpdateGroupManager() const { - std::map mapGroups; - WifiErrorNo retCode = WifiP2PHalInterface::GetInstance().ListNetworks(mapGroups); - if (retCode != WifiErrorNo::WIFI_IDL_OPT_OK) { - WIFI_LOGE("Failed to get p2p networks."); + std::map wpaGroups; + WifiErrorNo retCode = WifiP2PHalInterface::GetInstance().ListNetworks(wpaGroups); + if (retCode == WifiErrorNo::WIFI_IDL_OPT_FAILED) { + WIFI_LOGE("Failed to get listNetworks"); return; } - - for (auto iter : mapGroups) { - WifiP2pGroupInfo &p2pGroupInfo = iter.second; - if (deviceManager.GetThisDevice() == p2pGroupInfo.GetOwner()) { - p2pGroupInfo.SetOwner(deviceManager.GetThisDevice()); - } - groupManager.UpdateWpaGroup(p2pGroupInfo); + for (auto wpaGroup = wpaGroups.begin(); wpaGroup != wpaGroups.end(); ++wpaGroup) { + groupManager.UpdateWpaGroup(wpaGroup->second); } + groupManager.UpdateGroupsNetwork(wpaGroups); +} +void P2pStateMachine::UpdatePersistentGroups() const +{ + WIFI_LOGI("UpdatePersistentGroups"); std::vector groups; groups = groupManager.GetGroups(); - for (auto it : groups) { - if (mapGroups.find(it.GetNetworkId()) == mapGroups.end()) { - WifiP2pGroupInfo removeGroup; - removeGroup.SetNetworkId(it.GetNetworkId()); - groupManager.RemoveGroup(removeGroup); - } - } WifiSettings::GetInstance().SetWifiP2pGroupInfo(groups); - - if (retCode == WifiErrorNo::WIFI_IDL_OPT_OK) { - BroadcastPersistentGroupsChanged(); - } + WifiSettings::GetInstance().SyncWifiP2pGroupInfoConfig(); + BroadcastPersistentGroupsChanged(); } bool P2pStateMachine::ReawakenPersistentGroup(WifiP2pConfigInternal &config) const @@ -274,6 +265,7 @@ bool P2pStateMachine::ReawakenPersistentGroup(WifiP2pConfigInternal &config) con if (WifiErrorNo::WIFI_IDL_OPT_OK != WifiP2PHalInterface::GetInstance().Reinvoke(networkId, device.GetDeviceAddress())) { WIFI_LOGE("Failed to reinvoke."); + UpdateGroupManager(); UpdatePersistentGroups(); return false; } else { @@ -324,6 +316,7 @@ void P2pStateMachine::RemoveGroupByNetworkId(int networkId) const if (WifiP2PHalInterface::GetInstance().RemoveNetwork(networkId) != WifiErrorNo::WIFI_IDL_OPT_OK) { WIFI_LOGE("failed to remove networkId, networkId is %{public}d.", networkId); } + UpdateGroupManager(); UpdatePersistentGroups(); BroadcastPersistentGroupsChanged(); } @@ -829,6 +822,7 @@ bool P2pStateMachine::SetGroupConfig(const WifiP2pConfigInternal &config, bool n { WifiErrorNo ret; IdlP2pGroupConfig wpaConfig; + WifiP2pGroupInfo group; if (newGroup) { WIFI_LOGI("SetGroupConfig, new group"); wpaConfig.ssid = config.GetGroupName(); @@ -864,6 +858,10 @@ bool P2pStateMachine::SetGroupConfig(const WifiP2pConfigInternal &config, bool n wpaConfig.disabled = knownConfig.disabled; wpaConfig.mode = knownConfig.mode; } + group.SetGroupName(config.GetGroupName()); + group.SetPassphrase(config.GetPassphrase()); + group.SetNetworkId(config.GetNetId()); + groupManager.AddOrUpdateGroup(group); ret = WifiP2PHalInterface::GetInstance().P2pSetGroupConfig(config.GetNetId(), wpaConfig); if (ret == WifiErrorNo::WIFI_IDL_OPT_FAILED) { return false; @@ -896,12 +894,16 @@ bool P2pStateMachine::DealCreateNewGroupWithConfig(const WifiP2pConfigInternal & } if (ret == WIFI_IDL_OPT_FAILED || netId == TEMPORARY_NET_ID) { - WIFI_LOGD("Remove network %{public}d!", createdNetId); - WifiP2PHalInterface::GetInstance().RemoveNetwork(createdNetId); + WIFI_LOGD("Remove network %{public}d!", createdNetId); + WifiP2PHalInterface::GetInstance().RemoveNetwork(createdNetId); + WifiP2pGroupInfo removedInfo; + removedInfo.SetNetworkId(createdNetId); + groupManager.RemoveGroup(removedInfo); } - (void)WifiP2PHalInterface::GetInstance().SaveConfig(); - return (ret == WIFI_IDL_OPT_FAILED) ? false : true ; + UpdateGroupManager(); + UpdatePersistentGroups(); + return (ret == WIFI_IDL_OPT_FAILED) ? false : true; } bool P2pStateMachine::IsInterfaceReuse() const diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.h index 1918cab..d23f1c1 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.h @@ -158,6 +158,10 @@ private: * @param status - new device status */ virtual void UpdateOwnDevice(P2pDeviceStatus status); + /** + * @Description - Update groupManager from wpa_supplicant. + */ + virtual void UpdateGroupManager() const; /** * @Description - Update persistent groups and broadcast persistent groups status update event. */ @@ -415,7 +419,7 @@ private: static bool m_isNeedDhcp; std::string p2pDevIface; }; -} // namespace Wifi -} // namespace OHOS +} // namespace Wifi +} // namespace OHOS #endif // OHOS_P2P_STATE_MACHINE_H diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_manager.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_manager.cpp index 7eba194..b18e880 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_manager.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_manager.cpp @@ -49,6 +49,19 @@ bool WifiP2pGroupManager::AddGroup(const WifiP2pGroupInfo &group) groupsInfo.push_back(group); return true; } + +bool WifiP2pGroupManager::AddOrUpdateGroup(const WifiP2pGroupInfo &group) +{ + std::unique_lock lock(groupMutex); + for (auto it = groupsInfo.begin(); it != groupsInfo.end(); ++it) { + if (*it == group) { + groupsInfo.erase(it); + break; + } + } + groupsInfo.push_back(group); + return true; +} bool WifiP2pGroupManager::RemoveGroup(const WifiP2pGroupInfo &group) { std::unique_lock lock(groupMutex); @@ -242,5 +255,5 @@ void WifiP2pGroupManager::UpdateGroupsNetwork(std::map wp } } } -} // namespace Wifi -} // namespace OHOS +} // namespace Wifi +} // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_manager.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_manager.h index 35b2444..4887a73 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_manager.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_manager.h @@ -62,6 +62,13 @@ public: */ virtual bool AddGroup(const WifiP2pGroupInfo &group); + /** + * @Description - Adding or Updating a P2P group. + * @param group - P2P group to be modified or add + * @return true: adding or Updating succeeded false: adding or Updating failed + */ + virtual bool AddOrUpdateGroup(const WifiP2pGroupInfo &group); + /** * @Description - Remove a P2P group. * @param group - P2P group to be removed @@ -204,7 +211,7 @@ private: std::mutex groupMutex; WifiP2pLinkedInfo p2pConnInfo; /* group connection information */ }; -} // namespace Wifi -} // namespace OHOS +} // namespace Wifi +} // namespace OHOS #endif // OHOS_P2P_GROUP_MANAGER_H diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp index 526c867..b0f3702 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp @@ -753,6 +753,8 @@ void StaStateMachine::ConvertFreqToChannel() LOGE("GetDeviceConfig failed!"); return; } + int tempBand = config.band; + int tempChannel = config.channel; if (linkedInfo.frequency >= FREQ_2G_MIN && linkedInfo.frequency <= FREQ_2G_MAX) { config.band = linkedInfo.band = static_cast(BandType::BAND_2GHZ); config.channel = (linkedInfo.frequency - FREQ_2G_MIN) / CENTER_FREQ_DIFF + CHANNEL_2G_MIN; @@ -762,9 +764,10 @@ void StaStateMachine::ConvertFreqToChannel() config.band = linkedInfo.band = static_cast(BandType::BAND_5GHZ); config.channel = (linkedInfo.frequency - FREQ_5G_MIN) / CENTER_FREQ_DIFF + CHANNEL_5G_MIN; } - - WifiSettings::GetInstance().AddDeviceConfig(config); - WifiSettings::GetInstance().SyncDeviceConfig(); + if (tempBand != config.band || tempChannel != config.channel) { + WifiSettings::GetInstance().AddDeviceConfig(config); + WifiSettings::GetInstance().SyncDeviceConfig(); + } return; } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/BUILD.gn index 766f5f3..ddf53ef 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/BUILD.gn @@ -39,6 +39,7 @@ local_base_sources = [ "net_helper/raw_socket.cpp", "utils/wifi_common_event_helper.cpp", "utils/wifi_global_func.cpp", + "utils/wifi_encryption_util.cpp", ] local_base_include_dirs = [ @@ -49,6 +50,7 @@ local_base_include_dirs = [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/config", "//commonlibrary/c_utils/base/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", + "//base/security/huks/interfaces/innerkits/huks_standard/main/include", "$WIFI_ROOT_DIR/frameworks/native/interfaces", "$DHCP_ROOT_DIR/interfaces/inner_api/interfaces", "$DHCP_ROOT_DIR/interfaces/inner_api/include", @@ -94,12 +96,16 @@ if (defined(ohos_lite)) { ] defines = [ "AP_INSTANCE_MAX_NUM=$wifi_feature_with_ap_num" ] + if (wifi_feature_with_encryption) { + defines += [ "FEATURE_ENCRYPTION_SUPPORT" ] + } external_deps = [ "ability_base:want", "c_utils:utils", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", + "huks:libhukssdk" ] cflags_cc = [ diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_impl.h b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_impl.h index 47b7c6a..4890cb6 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_impl.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_impl.h @@ -71,6 +71,20 @@ public: */ int SetConfigFilePath(const std::string &fileName); + /** + * @Description read and parses the network section of ini config file, need call SetConfigFilePath first + * + * @return int - 0 Success; >0 parse failed + */ + int ReadNetworkSection(T &item, std::ifstream &fs, std::string &line, const std::string &mFileName); + + /** + * @Description read and parses the networks of ini config file, need call SetConfigFilePath first + * + * @return int - 0 Success; >0 parse failed + */ + int ReadNetwork(T &item, std::ifstream &fs, std::string &line, const std::string &mFileName); + /** * @Description read and parses the ini config file, need call SetConfigFilePath first * @@ -120,6 +134,59 @@ int WifiConfigFileImpl::SetConfigFilePath(const std::string &fileName) return 0; } +template +int WifiConfigFileImpl::ReadNetworkSection(T &item, std::ifstream &fs, std::string &line, const std::string &mFileName) +{ + int sectionError = 0; + while (std::getline(fs, line)) { + TrimString(line); + if (line.empty()) { + continue; + } + if (line[0] == '<' && line[line.length()-1] == '>') { + return sectionError; + } + std::string::size_type npos = line.find("="); + if (npos == std::string::npos) { + LOGE("Invalid config line"); + sectionError++; + continue; + } + std::string key = line.substr(0, npos); + std::string value = line.substr(npos + 1); + TrimString(key); + TrimString(value); + /* template function, needing specialization */ + sectionError +=SetTClassKeyValue(item, key, value, mFileName); + } + LOGE("Section config not end correctly"); + sectionError++; + return sectionError; +} + +template +int WifiConfigFileImpl::ReadNetwork(T &item, std::ifstream &fs, std::string &line, const std::string &mFileName) +{ + int networkError = 0; + while (std::getline(fs, line)) { + TrimString(line); + if (line.empty()) { + continue; + } + if (line[0] == '<' && line[line.length()-1] == '>') { + networkError += ReadNetworkSection(item, fs, line, mFileName); + } else if (line.compare("}") == 0) { + return networkError; + } else { + LOGE("Invalid config line"); + networkError++; + } + } + LOGE("Network config not end correctly"); + networkError++; + return networkError; +} + template int WifiConfigFileImpl::LoadConfig() { @@ -133,35 +200,23 @@ int WifiConfigFileImpl::LoadConfig() return -1; } mValues.clear(); - bool bSection = false; T item; std::string line; + int ConfigError; while (std::getline(fs, line)) { TrimString(line); if (line.empty()) { continue; } - if (line[0] == '[' && line[line.length() - 1] == ']') { - if (bSection) { - mValues.push_back(item); - } - bSection = true; + if (line[0] == '[' && line[line.length() - 1] == '{') { ClearTClass(item); /* template function, needing specialization */ - continue; - } - std::string::size_type npos = line.find("="); - if (npos == std::string::npos) { - continue; - } - std::string key = line.substr(0, npos); - std::string value = line.substr(npos + 1); - TrimString(key); - TrimString(value); - /* template function, needing specialization */ - SetTClassKeyValue(item, key, value); - } - if (bSection) { - mValues.push_back(item); + ConfigError = ReadNetwork(item, fs, line, mFileName); + if (ConfigError > 0) { + LOGE("Parse network failed."); + continue; + } + mValues.push_back(item); + } } fs.close(); return 0; @@ -186,8 +241,9 @@ int WifiConfigFileImpl::SaveConfig() * here use template function GetTClassName OutTClassString, needing * specialization. */ - ss << "[" << GetTClassName() << "_" << (i + 1) << "]" << std::endl; - ss << OutTClassString(item) << std::endl; + ss << "[" << GetTClassName() << "_" << (i + 1) << "] {" << std::endl; + ss << OutTClassString(item, mFileName) << std::endl; + ss << "}" << std::endl; } std::string content = ss.str(); int ret = fwrite(content.c_str(), 1, content.length(), fp); @@ -223,6 +279,6 @@ int WifiConfigFileImpl::SetValue(const std::vector &results) mValues = results; return 0; } -} // namespace Wifi -} // namespace OHOS +} // namespace Wifi +} // namespace OHOS #endif \ No newline at end of file diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.cpp index 7bac14b..bb7dbe4 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.cpp @@ -14,7 +14,10 @@ */ #include "wifi_config_file_spec.h" - +#include "wifi_global_func.h" +#ifdef FEATURE_ENCRYPTION_SUPPORT +#include "wifi_encryption_util.h" +#endif namespace OHOS { namespace Wifi { static void ClearWifiDeviceConfig(WifiDeviceConfig &item) @@ -100,7 +103,8 @@ void ClearTClass(WifiDeviceConfig &item) return; } -static int SetWifiDeviceConfigFirst(WifiDeviceConfig &item, const std::string &key, const std::string &value) +static int SetWifiDeviceConfigFirst(WifiDeviceConfig &item, const std::string &key, const std::string &value, + const std::string &fileName) { if (key == "networkId") { item.networkId = std::stoi(value); @@ -110,6 +114,15 @@ static int SetWifiDeviceConfigFirst(WifiDeviceConfig &item, const std::string &k item.bssid = value; } else if (key == "ssid") { item.ssid = value; + } else if (key == "HexSsid") { + std::vector vec; + vec.clear(); + if (HexStringToVec(value, vec) == 0) { + std::string strSsid(vec.begin(), vec.end()); + item.ssid = strSsid; + } else { + return -1; + } } else if (key == "band") { item.band = std::stoi(value); } else if (key == "channel") { @@ -138,11 +151,67 @@ static int SetWifiDeviceConfigFirst(WifiDeviceConfig &item, const std::string &k return 0; } -static void SetWifiDeviceConfig(WifiDeviceConfig &item, const std::string &key, const std::string &value) +#ifdef FEATURE_ENCRYPTION_SUPPORT +static int SetWifiDeviceConfigEncrypt(WifiDeviceConfig &item, const std::string &key, const std::string &value, + const std::string &fileName) { - if (SetWifiDeviceConfigFirst(item, key, value) == 0) { - return; + int errorKeyValue = 0; + WifiEncryptionInfo mWifiEncryptionInfo; + mWifiEncryptionInfo.SetFile(fileName); + if (key == "encryptedData") { + item.preSharedKey = value; + } else if (key == "IV") { + WifiEncryptionInfo mWifiEncryptionInfo; + mWifiEncryptionInfo.SetFile(fileName); + EncryptedData *encry = new EncryptedData(item.preSharedKey, value); + std::string decry = ""; + if (WifiDecryption(mWifiEncryptionInfo, *encry, decry) == HKS_SUCCESS) { + item.preSharedKey = decry; + } else { + item.preSharedKey = ""; + errorKeyValue++; + } + delete encry; + } else if (key.compare(0, strlen("encryWepKeys"), "encryWepKeys") == 0) { + int pos = std::stoi(key.substr(strlen("encryWepKeys") + 1)); + if (pos >= 0 && pos < WEPKEYS_SIZE) { + item.wepKeys[pos] = value; + } + } else if (key == "IVWep") { + if (item.wepTxKeyIndex < 0 || item.wepTxKeyIndex >= WEPKEYS_SIZE) { + item.wepTxKeyIndex = 0; + } + EncryptedData *encryWep = new EncryptedData(item.wepKeys[item.wepTxKeyIndex], value); + std::string decryWep = ""; + if (WifiDecryption(mWifiEncryptionInfo, *encryWep, decryWep) == HKS_SUCCESS) { + item.wepKeys[item.wepTxKeyIndex] = decryWep; + } else { + item.wepKeys[item.wepTxKeyIndex] = ""; + errorKeyValue++; + } + delete encryWep; + } else { + return -1; } + return errorKeyValue; +} +#endif + +static int SetWifiDeviceConfig(WifiDeviceConfig &item, const std::string &key, const std::string &value, + const std::string &fileName) +{ + int errorKeyValue = 0; + if (SetWifiDeviceConfigFirst(item, key, value, fileName) == 0) { + return errorKeyValue; + } +#ifdef FEATURE_ENCRYPTION_SUPPORT + errorKeyValue = SetWifiDeviceConfigEncrypt(item, key, value, fileName); + if (errorKeyValue != -1) { + return errorKeyValue; + } else { + errorKeyValue = 0; + } +#endif if (key == "hiddenSSID") { item.hiddenSSID = std::stoi(value); } else if (key.compare(0, strlen("wepKeys"), "wepKeys") == 0) { @@ -150,12 +219,17 @@ static void SetWifiDeviceConfig(WifiDeviceConfig &item, const std::string &key, if (pos >= 0 && pos < WEPKEYS_SIZE) { item.wepKeys[pos] = value; } + } else { + LOGE("Invalid config key value"); + errorKeyValue++; } - return; + return errorKeyValue; } -static void SetWifiDeviceConfigIp(WifiDeviceConfig &item, const std::string &key, const std::string &value) +static int SetWifiDeviceConfigIp(WifiDeviceConfig &item, const std::string &key, const std::string &value, + const std::string &fileName) { + int errorKeyValue = 0; if (key == "wifiIpConfig.assignMethod") { item.wifiIpConfig.assignMethod = AssignIpMethod(std::stoi(value)); } else if (key == "wifiIpConfig.staticIpAddress.ipAddress.address.family") { @@ -190,12 +264,52 @@ static void SetWifiDeviceConfigIp(WifiDeviceConfig &item, const std::string &key item.wifiIpConfig.staticIpAddress.dnsServer2.SetIpv6Address(value); } else if (key == "wifiIpConfig.staticIpAddress.domains") { item.wifiIpConfig.staticIpAddress.domains = value; + } else { + LOGE("Invalid config key value"); + errorKeyValue++; } - return; + return errorKeyValue; +} + + +#ifdef FEATURE_ENCRYPTION_SUPPORT +static int SetWifiDeviceConfigEncryptEap(WifiDeviceConfig &item, const std::string &key, const std::string &value, + const std::string &fileName) +{ + int errorKeyValue = 0; + WifiEncryptionInfo mWifiEncryptionInfo; + mWifiEncryptionInfo.SetFile(fileName); + if (key == "wifiEapConfig.encryptedData") { + item.wifiEapConfig.password = value; + } else if (key == "wifiEapConfig.IV") { + EncryptedData *encry = new EncryptedData(item.wifiEapConfig.password, value); + std::string decry = ""; + if (WifiDecryption(mWifiEncryptionInfo, *encry, decry) == HKS_SUCCESS) { + item.wifiEapConfig.password = decry; + } else { + item.wifiEapConfig.password = ""; + errorKeyValue ++; + } + delete encry; + } else { + return -1; + } + return errorKeyValue; } +#endif -static void SetWifiDeviceConfigEap(WifiDeviceConfig &item, const std::string &key, const std::string &value) +static int SetWifiDeviceConfigEap(WifiDeviceConfig &item, const std::string &key, const std::string &value, + const std::string &fileName) { + int errorKeyValue = 0; +#ifdef FEATURE_ENCRYPTION_SUPPORT + errorKeyValue = SetWifiDeviceConfigEncryptEap(item, key, value, fileName); + if (errorKeyValue != -1) { + return errorKeyValue; + } else { + errorKeyValue = 0; + } +#endif if (key == "wifiEapConfig.eap") { item.wifiEapConfig.eap = value; } else if (key == "wifiEapConfig.identity") { @@ -208,12 +322,17 @@ static void SetWifiDeviceConfigEap(WifiDeviceConfig &item, const std::string &ke item.wifiEapConfig.privateKey = value; } else if (key == "wifiEapConfig.phase2method") { item.wifiEapConfig.phase2Method = Phase2Method(std::stoi(value)); + } else { + LOGE("Invalid config key value"); + errorKeyValue++; } - return; + return errorKeyValue; } -static void SetWifiDeviceConfigProxy(WifiDeviceConfig &item, const std::string &key, const std::string &value) +static int SetWifiDeviceConfigProxy(WifiDeviceConfig &item, const std::string &key, const std::string &value, + const std::string &fileName) { + int errorKeyValue = 0; if (key == "wifiProxyconfig.configureMethod") { item.wifiProxyconfig.configureMethod = ConfigureProxyMethod(std::stoi(value)); } else if (key == "wifiProxyconfig.autoProxyConfig.pacWebAddress") { @@ -224,32 +343,43 @@ static void SetWifiDeviceConfigProxy(WifiDeviceConfig &item, const std::string & item.wifiProxyconfig.manualProxyConfig.serverPort = std::stoi(value); } else if (key == "wifiProxyconfig.ManualProxyConfig.exclusionObjectList") { item.wifiProxyconfig.manualProxyConfig.exclusionObjectList = value; + } else { + LOGE("Invalid config key value"); + errorKeyValue++; } - return; + return errorKeyValue; } -static void SetWifiDeviceconfigPrivacy(WifiDeviceConfig &item, const std::string &key, const std::string &value) +static int SetWifiDeviceconfigPrivacy(WifiDeviceConfig &item, const std::string &key, const std::string &value, + const std::string &fileName) { + int errorKeyValue = 0; if (key == "wifiPrivacySetting") { item.wifiPrivacySetting = WifiPrivacyConfig(std::stoi(value)); + } else { + LOGE("Invalid config key value"); + errorKeyValue++; } + return errorKeyValue; } template<> -void SetTClassKeyValue(WifiDeviceConfig &item, const std::string &key, const std::string &value) +int SetTClassKeyValue(WifiDeviceConfig &item, const std::string &key, const std::string &value, + const std::string &fileName) { + int errorKeyValue = 0; if (key.compare(0, strlen("wifiIpConfig"), "wifiIpConfig") == 0) { - SetWifiDeviceConfigIp(item, key, value); + errorKeyValue += SetWifiDeviceConfigIp(item, key, value, fileName); } else if (key.compare(0, strlen("wifiEapConfig"), "wifiEapConfig") == 0) { - SetWifiDeviceConfigEap(item, key, value); + errorKeyValue += SetWifiDeviceConfigEap(item, key, value, fileName); } else if (key.compare(0, strlen("wifiProxyconfig"), "wifiProxyconfig") == 0) { - SetWifiDeviceConfigProxy(item, key, value); + errorKeyValue += SetWifiDeviceConfigProxy(item, key, value, fileName); } else if (key.compare(0, strlen("wifiPrivacySetting"), "wifiPrivacySetting") == 0) { - SetWifiDeviceconfigPrivacy(item, key, value); + errorKeyValue += SetWifiDeviceconfigPrivacy(item, key, value, fileName); } else { - SetWifiDeviceConfig(item, key, value); + errorKeyValue += SetWifiDeviceConfig(item, key, value, fileName); } - return; + return errorKeyValue; } template<> @@ -258,108 +388,172 @@ std::string GetTClassName() return "WifiDeviceConfig"; } -static std::string OutPutWifiDeviceConfig(WifiDeviceConfig &item) +#ifdef FEATURE_ENCRYPTION_SUPPORT +static std::string OutPutEncryptionDeviceConfig(WifiDeviceConfig &item, const std::string &fileName) +{ + std::ostringstream ss; + WifiEncryptionInfo mWifiEncryptionInfo; + mWifiEncryptionInfo.SetFile(fileName); + EncryptedData encry; + if (WifiEncryption(mWifiEncryptionInfo, item.preSharedKey, encry) == HKS_SUCCESS) { + ss << " " <<"encryptedData=" << encry.encryptedPassword << std::endl; + ss << " " <<"IV=" << encry.IV << std::endl; + } else { + ss << " " <<"preSharedKey=" << item.preSharedKey << std::endl; + } + ss << " " <<"wepTxKeyIndex=" << item.wepTxKeyIndex << std::endl; + if (item.wepTxKeyIndex < 0 || item.wepTxKeyIndex >= WEPKEYS_SIZE) { + item.wepTxKeyIndex = 0; + } + EncryptedData encryWep; + if (WifiEncryption(mWifiEncryptionInfo, item.wepKeys[item.wepTxKeyIndex], encryWep) == HKS_SUCCESS) { + item.wepKeys[item.wepTxKeyIndex] = encryWep.encryptedPassword; + for (int i = 0; i < WEPKEYS_SIZE; ++i) { + ss << " " <<"encryWepKeys_" << i << "=" << item.wepKeys[i] << std::endl; + } + ss << " " <<"IVWep=" << encryWep.IV << std::endl; + } else { + for (int i = 0; i < WEPKEYS_SIZE; ++i) { + ss << " " <<"wepKeys_" << i << "=" << item.wepKeys[i] << std::endl; + } + } + return ss.str(); +} +#endif + +static std::string OutPutWifiDeviceConfig(WifiDeviceConfig &item, const std::string &fileName) { std::ostringstream ss; - ss << "uid=" << item.uid << std::endl; - ss << "status=" << item.status << std::endl; - ss << "bssid=" << item.bssid << std::endl; - ss << "ssid=" << item.ssid << std::endl; - ss << "band=" << item.band << std::endl; - ss << "channel=" << item.channel << std::endl; - ss << "frequency=" << item.frequency << std::endl; - ss << "level=" << item.level << std::endl; - ss << "isPasspoint=" << item.isPasspoint << std::endl; - ss << "isEphemeral=" << item.isEphemeral << std::endl; - ss << "preSharedKey=" << item.preSharedKey << std::endl; - ss << "keyMgmt=" << item.keyMgmt << std::endl; - ss << "wepTxKeyIndex=" << item.wepTxKeyIndex << std::endl; - ss << "priority=" << item.priority << std::endl; - ss << "hiddenSSID=" << (int)item.hiddenSSID << std::endl; + ss << " " <<"" << std::endl; + ss << " " <<"uid=" << item.uid << std::endl; + ss << " " <<"status=" << item.status << std::endl; + ss << " " <<"bssid=" << item.bssid << std::endl; + ss << " " <<"ssid=" << ValidateString(item.ssid) << std::endl; + ss << " " <<"HexSsid=" << ConvertArrayToHex((uint8_t*)&item.ssid[0], item.ssid.length()) << std::endl; + ss << " " <<"band=" << item.band << std::endl; + ss << " " <<"channel=" << item.channel << std::endl; + ss << " " <<"frequency=" << item.frequency << std::endl; + ss << " " <<"level=" << item.level << std::endl; + ss << " " <<"isPasspoint=" << item.isPasspoint << std::endl; + ss << " " <<"isEphemeral=" << item.isEphemeral << std::endl; + ss << " " <<"priority=" << item.priority << std::endl; + ss << " " <<"hiddenSSID=" << (int)item.hiddenSSID << std::endl; + ss << " " <<"keyMgmt=" << item.keyMgmt << std::endl; +#ifdef FEATURE_ENCRYPTION_SUPPORT + ss <" << std::endl; return ss.str(); } -static std::string OutPutWifiDeviceConfigIp(WifiDeviceConfig &item) +static std::string OutPutWifiDeviceConfigIp(WifiDeviceConfig &item, const std::string &fileName) { std::ostringstream ss; - ss << "wifiIpConfig.assignMethod=" << (int)item.wifiIpConfig.assignMethod << std::endl; - ss << "wifiIpConfig.staticIpAddress.ipAddress.address.family=" + ss << " " <<"" << std::endl; + ss << " " <<"wifiIpConfig.assignMethod=" << (int)item.wifiIpConfig.assignMethod << std::endl; + ss << " " <<"wifiIpConfig.staticIpAddress.ipAddress.address.family=" << item.wifiIpConfig.staticIpAddress.ipAddress.address.family << std::endl; - ss << "wifiIpConfig.staticIpAddress.ipAddress.address.addressIpv4=" + ss << " " <<"wifiIpConfig.staticIpAddress.ipAddress.address.addressIpv4=" << item.wifiIpConfig.staticIpAddress.ipAddress.address.GetIpv4Address() << std::endl; - ss << "wifiIpConfig.staticIpAddress.ipAddress.address.addressIpv6=" + ss << " " <<"wifiIpConfig.staticIpAddress.ipAddress.address.addressIpv6=" << item.wifiIpConfig.staticIpAddress.ipAddress.address.GetIpv6Address() << std::endl; - ss << "wifiIpConfig.staticIpAddress.ipAddress.prefixLength=" + ss << " " <<"wifiIpConfig.staticIpAddress.ipAddress.prefixLength=" << item.wifiIpConfig.staticIpAddress.ipAddress.prefixLength << std::endl; - ss << "wifiIpConfig.staticIpAddress.ipAddress.flags=" << item.wifiIpConfig.staticIpAddress.ipAddress.flags + ss << " " <<"wifiIpConfig.staticIpAddress.ipAddress.flags=" << item.wifiIpConfig.staticIpAddress.ipAddress.flags << std::endl; - ss << "wifiIpConfig.staticIpAddress.ipAddress.scope=" << item.wifiIpConfig.staticIpAddress.ipAddress.scope + ss << " " <<"wifiIpConfig.staticIpAddress.ipAddress.scope=" << item.wifiIpConfig.staticIpAddress.ipAddress.scope << std::endl; - ss << "wifiIpConfig.staticIpAddress.gateway.family=" << item.wifiIpConfig.staticIpAddress.gateway.family + ss << " " <<"wifiIpConfig.staticIpAddress.gateway.family=" << item.wifiIpConfig.staticIpAddress.gateway.family << std::endl; - ss << "wifiIpConfig.staticIpAddress.gateway.addressIpv4=" + ss << " " <<"wifiIpConfig.staticIpAddress.gateway.addressIpv4=" << item.wifiIpConfig.staticIpAddress.gateway.GetIpv4Address() << std::endl; - ss << "wifiIpConfig.staticIpAddress.gateway.addressIpv6=" + ss << " " <<"wifiIpConfig.staticIpAddress.gateway.addressIpv6=" << item.wifiIpConfig.staticIpAddress.gateway.GetIpv6Address() << std::endl; - ss << "wifiIpConfig.staticIpAddress.dnsServer1.family=" << item.wifiIpConfig.staticIpAddress.dnsServer1.family + ss << " " <<"wifiIpConfig.staticIpAddress.dnsServer1.family=" << item.wifiIpConfig.staticIpAddress.dnsServer1.family << std::endl; - ss << "wifiIpConfig.staticIpAddress.dnsServer1.addressIpv4=" + ss << " " <<"wifiIpConfig.staticIpAddress.dnsServer1.addressIpv4=" << item.wifiIpConfig.staticIpAddress.dnsServer1.GetIpv4Address() << std::endl; - ss << "wifiIpConfig.staticIpAddress.dnsServer1.addressIpv6=" + ss << " " <<"wifiIpConfig.staticIpAddress.dnsServer1.addressIpv6=" << item.wifiIpConfig.staticIpAddress.dnsServer1.GetIpv6Address() << std::endl; - ss << "wifiIpConfig.staticIpAddress.dnsServer2.family=" << item.wifiIpConfig.staticIpAddress.dnsServer2.family + ss << " " <<"wifiIpConfig.staticIpAddress.dnsServer2.family=" << item.wifiIpConfig.staticIpAddress.dnsServer2.family << std::endl; - ss << "wifiIpConfig.staticIpAddress.dnsServer2.addressIpv4=" + ss << " " <<"wifiIpConfig.staticIpAddress.dnsServer2.addressIpv4=" << item.wifiIpConfig.staticIpAddress.dnsServer2.GetIpv4Address() << std::endl; - ss << "wifiIpConfig.staticIpAddress.dnsServer2.addressIpv6=" + ss << " " <<"wifiIpConfig.staticIpAddress.dnsServer2.addressIpv6=" << item.wifiIpConfig.staticIpAddress.dnsServer2.GetIpv6Address() << std::endl; - ss << "wifiIpConfig.staticIpAddress.domains=" << item.wifiIpConfig.staticIpAddress.domains << std::endl; + ss << " " <<"wifiIpConfig.staticIpAddress.domains=" << item.wifiIpConfig.staticIpAddress.domains << std::endl; + ss << " " <<"" << std::endl; return ss.str(); } -static std::string OutPutWifiDeviceConfigEap(WifiDeviceConfig &item) +static std::string OutPutWifiDeviceConfigEap(WifiDeviceConfig &item, const std::string &fileName) { std::ostringstream ss; - ss << "wifiEapConfig.eap=" << item.wifiEapConfig.eap << std::endl; - ss << "wifiEapConfig.identity=" << item.wifiEapConfig.identity << std::endl; - ss << "wifiEapConfig.password=" << item.wifiEapConfig.password << std::endl; - ss << "wifiEapConfig.clientCert=" << item.wifiEapConfig.clientCert << std::endl; - ss << "wifiEapConfig.privateKey=" << item.wifiEapConfig.privateKey << std::endl; - ss << "wifiEapConfig.phase2method=" << static_cast(item.wifiEapConfig.phase2Method) << std::endl; + if (item.wifiEapConfig.eap.length() == 0) { + return ss.str(); + } + ss << " " <<"" << std::endl; + ss << " " <<"wifiEapConfig.eap=" << item.wifiEapConfig.eap << std::endl; + ss << " " <<"wifiEapConfig.identity=" << item.wifiEapConfig.identity << std::endl; +#ifdef FEATURE_ENCRYPTION_SUPPORT + WifiEncryptionInfo mWifiEncryptionInfo; + mWifiEncryptionInfo.SetFile(fileName); + EncryptedData encry; + if (WifiEncryption(mWifiEncryptionInfo, item.wifiEapConfig.password, encry) == HKS_SUCCESS) { + ss << " " <<"wifiEapConfig.encryptedData=" << encry.encryptedPassword << std::endl; + ss << " " <<"wifiEapConfig.IV=" << encry.IV << std::endl; + } else { + ss << " " <<"wifiEapConfig.password=" << item.wifiEapConfig.password << std::endl; + } +#else + ss << " " <<"wifiEapConfig.password=" << item.wifiEapConfig.password << std::endl; +#endif + ss << " " <<"wifiEapConfig.clientCert=" << item.wifiEapConfig.clientCert << std::endl; + ss << " " <<"wifiEapConfig.privateKey=" << item.wifiEapConfig.privateKey << std::endl; + ss << " " <<"wifiEapConfig.phase2method=" << static_cast(item.wifiEapConfig.phase2Method) << std::endl; + ss << " " <<"" << std::endl; return ss.str(); } -static std::string OutPutWifiDeviceConfigProxy(WifiDeviceConfig &item) +static std::string OutPutWifiDeviceConfigProxy(WifiDeviceConfig &item, const std::string &fileName) { std::ostringstream ss; - ss << "wifiProxyconfig.configureMethod=" << (int)item.wifiProxyconfig.configureMethod << std::endl; - ss << "wifiProxyconfig.autoProxyConfig.pacWebAddress=" << item.wifiProxyconfig.autoProxyConfig.pacWebAddress + ss << " " <<"" << std::endl; + ss << " " <<"wifiProxyconfig.configureMethod=" << (int)item.wifiProxyconfig.configureMethod << std::endl; + ss << " " <<"wifiProxyconfig.autoProxyConfig.pacWebAddress=" << item.wifiProxyconfig.autoProxyConfig.pacWebAddress << std::endl; - ss << "wifiProxyconfig.ManualProxyConfig.serverHostName=" << item.wifiProxyconfig.manualProxyConfig.serverHostName + ss << " " <<"wifiProxyconfig.ManualProxyConfig.serverHostName=" << item.wifiProxyconfig.manualProxyConfig.serverHostName << std::endl; - ss << "wifiProxyconfig.ManualProxyConfig.serverPort=" << item.wifiProxyconfig.manualProxyConfig.serverPort + ss << " " <<"wifiProxyconfig.ManualProxyConfig.serverPort=" << item.wifiProxyconfig.manualProxyConfig.serverPort << std::endl; - ss << "wifiProxyconfig.ManualProxyConfig.exclusionObjectList=" + ss << " " <<"wifiProxyconfig.ManualProxyConfig.exclusionObjectList=" << item.wifiProxyconfig.manualProxyConfig.exclusionObjectList << std::endl; + ss << " " <<"" << std::endl; return ss.str(); } -static std::string OutPutWifiDeviceConfigPrivacy(WifiDeviceConfig &item) +static std::string OutPutWifiDeviceConfigPrivacy(WifiDeviceConfig &item, const std::string &fileName) { std::ostringstream ss; - ss << "wifiPrivacySetting=" << (int)item.wifiPrivacySetting << std::endl; + ss << " " <<"" << std::endl; + ss << " " <<"wifiPrivacySetting=" << (int)item.wifiPrivacySetting << std::endl; + ss << " " <<"" << std::endl; return ss.str(); } template<> -std::string OutTClassString(WifiDeviceConfig &item) +std::string OutTClassString(WifiDeviceConfig &item, const std::string &fileName) { std::ostringstream ss; - ss << OutPutWifiDeviceConfig(item) << OutPutWifiDeviceConfigIp(item) << OutPutWifiDeviceConfigEap(item) - << OutPutWifiDeviceConfigProxy(item) << OutPutWifiDeviceConfigPrivacy(item); + ss << OutPutWifiDeviceConfig(item, fileName) << OutPutWifiDeviceConfigIp(item, fileName) + << OutPutWifiDeviceConfigEap(item, fileName) << OutPutWifiDeviceConfigProxy(item, fileName) + << OutPutWifiDeviceConfigPrivacy(item, fileName); return ss.str(); } @@ -375,11 +569,56 @@ void ClearTClass(HotspotConfig &item) return; } +#ifdef FEATURE_ENCRYPTION_SUPPORT +static int SetWifiHotspotConfigEncrypt(HotspotConfig &item, const std::string &key, const std::string &value, + const std::string &fileName) +{ + int errorKeyValue = 0; + WifiEncryptionInfo mWifiEncryptionInfo; + mWifiEncryptionInfo.SetFile(fileName); + if (key == "encryptedData") { + item.SetPreSharedKey(value); + } else if (key == "IV") { + EncryptedData *encry = new EncryptedData(item.GetPreSharedKey(), value); + std::string decry = ""; + if (WifiDecryption(mWifiEncryptionInfo, *encry, decry) == HKS_SUCCESS) { + item.SetPreSharedKey(decry); + } else { + item.SetPreSharedKey(""); + errorKeyValue++; + } + delete encry; + } else { + return -1; + } + return errorKeyValue; +} +#endif + template<> -void SetTClassKeyValue(HotspotConfig &item, const std::string &key, const std::string &value) +int SetTClassKeyValue(HotspotConfig &item, const std::string &key, const std::string &value, + const std::string &fileName) { + int errorKeyValue = 0; +#ifdef FEATURE_ENCRYPTION_SUPPORT + errorKeyValue = SetWifiHotspotConfigEncrypt(item, key, value, fileName); + if (errorKeyValue != -1) { + return errorKeyValue; + } else { + errorKeyValue = 0; + } +#endif if (key == "ssid") { item.SetSsid(value); + } else if (key == "HexSsid") { + std::vector vec; + vec.clear(); + if (HexStringToVec(value, vec) == 0) { + std::string strSsid(vec.begin(), vec.end()); + item.SetSsid(strSsid); + } else { + return -1; + } } else if (key == "preSharedKey") { item.SetPreSharedKey(value); } else if (key == "securityType") { @@ -390,8 +629,11 @@ void SetTClassKeyValue(HotspotConfig &item, const std::string &ke item.SetChannel(std::stoi(value)); } else if (key == "maxConn") { item.SetMaxConn(std::stoi(value)); + } else { + LOGE("Invalid config key value"); + errorKeyValue++; } - return; + return errorKeyValue; } template<> @@ -401,15 +643,28 @@ std::string GetTClassName() } template<> -std::string OutTClassString(HotspotConfig &item) +std::string OutTClassString(HotspotConfig &item, const std::string &fileName) { std::ostringstream ss; - ss << "ssid=" << item.GetSsid() << std::endl; - ss << "preSharedKey=" << item.GetPreSharedKey() << std::endl; - ss << "securityType=" << static_cast(item.GetSecurityType()) << std::endl; - ss << "band=" << static_cast(item.GetBand()) << std::endl; - ss << "channel=" << item.GetChannel() << std::endl; - ss << "maxConn=" << item.GetMaxConn() << std::endl; + ss << " " <<"ssid=" << ValidateString(item.GetSsid()) << std::endl; + ss << " " <<"HexSsid=" << ConvertArrayToHex((uint8_t*)&item.GetSsid()[0], item.GetSsid().length()) << std::endl; +#ifdef FEATURE_ENCRYPTION_SUPPORT + WifiEncryptionInfo mWifiEncryptionInfo; + mWifiEncryptionInfo.SetFile(fileName); + EncryptedData encry; + if (WifiEncryption(mWifiEncryptionInfo, item.GetPreSharedKey(), encry) == HKS_SUCCESS) { + ss << " " <<"encryptedData=" << encry.encryptedPassword << std::endl; + ss << " " <<"IV=" << encry.IV << std::endl; + } else { + ss << " " <<"preSharedKey=" << item.GetPreSharedKey() << std::endl; + } +#else + ss << " " <<"preSharedKey=" << item.GetPreSharedKey() << std::endl; +#endif + ss << " " <<"securityType=" << static_cast(item.GetSecurityType()) << std::endl; + ss << " " <<"band=" << static_cast(item.GetBand()) << std::endl; + ss << " " <<"channel=" << item.GetChannel() << std::endl; + ss << " " <<"maxConn=" << item.GetMaxConn() << std::endl; return ss.str(); } @@ -425,8 +680,10 @@ void ClearTClass(P2pVendorConfig &item) } template<> -void SetTClassKeyValue(P2pVendorConfig &item, const std::string &key, const std::string &value) +int SetTClassKeyValue(P2pVendorConfig &item, const std::string &key, const std::string &value, + const std::string &fileName) { + int errorKeyValue = 0; if (key == "randomMacSupport") { item.SetRandomMacSupport(std::stoi(value) != 0); } else if (key == "autoListen") { @@ -437,8 +694,11 @@ void SetTClassKeyValue(P2pVendorConfig &item, const std::string item.SetPrimaryDeviceType(value); } else if (key == "secondaryDeviceType") { item.SetSecondaryDeviceType(value); + } else { + LOGE("Invalid config key value"); + errorKeyValue++; } - return; + return errorKeyValue; } template<> @@ -448,14 +708,14 @@ std::string GetTClassName() } template<> -std::string OutTClassString(P2pVendorConfig &item) +std::string OutTClassString(P2pVendorConfig &item, const std::string &fileName) { std::ostringstream ss; - ss << "randomMacSupport=" << item.GetRandomMacSupport() << std::endl; - ss << "autoListen=" << item.GetIsAutoListen() << std::endl; - ss << "deviceName=" << item.GetDeviceName() << std::endl; - ss << "primaryDeviceType=" << item.GetPrimaryDeviceType() << std::endl; - ss << "secondaryDeviceType=" << item.GetSecondaryDeviceType() << std::endl; + ss << " " <<"randomMacSupport=" << item.GetRandomMacSupport() << std::endl; + ss << " " <<"autoListen=" << item.GetIsAutoListen() << std::endl; + ss << " " <<"deviceName=" << item.GetDeviceName() << std::endl; + ss << " " <<"primaryDeviceType=" << item.GetPrimaryDeviceType() << std::endl; + ss << " " <<"secondaryDeviceType=" << item.GetSecondaryDeviceType() << std::endl; return ss.str(); } @@ -469,16 +729,21 @@ void ClearTClass(StationInfo &item) } template<> -void SetTClassKeyValue(StationInfo &item, const std::string &key, const std::string &value) +int SetTClassKeyValue(StationInfo &item, const std::string &key, const std::string &value, + const std::string &fileName) { + int errorKeyValue = 0; if (key == "deviceName") { item.deviceName = value; } else if (key == "bssid") { item.bssid = value; } else if (key == "ipAddr") { item.ipAddr = value; + } else { + LOGE("Invalid config key value"); + errorKeyValue++; } - return; + return errorKeyValue; } template<> @@ -488,12 +753,12 @@ std::string GetTClassName() } template<> -std::string OutTClassString(StationInfo &item) +std::string OutTClassString(StationInfo &item, const std::string &fileName) { std::ostringstream ss; - ss << "deviceName=" << item.deviceName << std::endl; - ss << "bssid=" << item.bssid << std::endl; - ss << "ipAddr=" << item.ipAddr << std::endl; + ss << " " <<"deviceName=" << item.deviceName << std::endl; + ss << " " <<"bssid=" << item.bssid << std::endl; + ss << " " <<"ipAddr=" << item.ipAddr << std::endl; return ss.str(); } @@ -537,7 +802,8 @@ void ClearTClass(WifiConfig &item) return; } -static int SetWifiConfigValueFirst(WifiConfig &item, const std::string &key, const std::string &value) +static int SetWifiConfigValueFirst(WifiConfig &item, const std::string &key, const std::string &value, + const std::string &fileName) { if (key == "scanAlwaysSwitch") { item.scanAlwaysSwitch = (std::stoi(value) != 0); /* 0 -> false 1 -> true */ @@ -578,10 +844,12 @@ static int SetWifiConfigValueFirst(WifiConfig &item, const std::string &key, con } template<> -void SetTClassKeyValue(WifiConfig &item, const std::string &key, const std::string &value) +int SetTClassKeyValue(WifiConfig &item, const std::string &key, const std::string &value, + const std::string &fileName) { - if (SetWifiConfigValueFirst(item, key, value) == 0) { - return; + int errorKeyValue = 0; + if (SetWifiConfigValueFirst(item, key, value, fileName) == 0) { + return errorKeyValue; } if (key == "preLoadSta") { item.preLoadSta = (std::stoi(value) != 0); /* 0 -> false 1 -> true */ @@ -619,8 +887,11 @@ void SetTClassKeyValue(WifiConfig &item, const std::string &key, con item.strDnsBak = value; } else if (key == "isLoadStabak") { item.isLoadStabak = (std::stoi(value) != 0); + } else { + LOGE("Invalid config key value"); + errorKeyValue++; } - return; + return errorKeyValue; } template<> @@ -630,43 +901,43 @@ std::string GetTClassName() } template<> -std::string OutTClassString(WifiConfig &item) +std::string OutTClassString(WifiConfig &item, const std::string &fileName) { std::ostringstream ss; - ss << "scanAlwaysSwitch=" << item.scanAlwaysSwitch << std::endl; /* bool false->0 true->1 */ - ss << "staAirplaneMode=" << item.staAirplaneMode << std::endl; - ss << "canOpenStaWhenAirplane=" << item.canOpenStaWhenAirplane << std::endl; - ss << "staLastState=" << item.staLastState << std::endl; - ss << "savedDeviceAppraisalPriority=" << item.savedDeviceAppraisalPriority << std::endl; - ss << "scoretacticsScoreSlope=" << item.scoretacticsScoreSlope << std::endl; - ss << "scoretacticsInitScore=" << item.scoretacticsInitScore << std::endl; - ss << "scoretacticsSameBssidScore=" << item.scoretacticsSameBssidScore << std::endl; - ss << "scoretacticsSameNetworkScore=" << item.scoretacticsSameNetworkScore << std::endl; - ss << "scoretacticsFrequency5GHzScore=" << item.scoretacticsFrequency5GHzScore << std::endl; - ss << "scoretacticsLastSelectionScore=" << item.scoretacticsLastSelectionScore << std::endl; - ss << "scoretacticsSecurityScore=" << item.scoretacticsSecurityScore << std::endl; - ss << "scoretacticsNormalScore=" << item.scoretacticsNormalScore << std::endl; - ss << "whetherToAllowNetworkSwitchover=" << item.whetherToAllowNetworkSwitchover << std::endl; - ss << "dhcpIpType=" << item.dhcpIpType << std::endl; - ss << "defaultWifiInterface=" << item.defaultWifiInterface << std::endl; - ss << "preLoadSta=" << item.preLoadSta << std::endl; - ss << "preLoadScan=" << item.preLoadScan << std::endl; - ss << "preLoadAp=" << item.preLoadAp << std::endl; - ss << "preLoadP2p=" << item.preLoadP2p << std::endl; - ss << "preLoadAware=" << item.preLoadAware << std::endl; - ss << "supportHwPnoFlag=" << item.supportHwPnoFlag << std::endl; - ss << "minRssi2Dot4Ghz=" << item.minRssi2Dot4Ghz << std::endl; - ss << "minRssi5Ghz=" << item.minRssi5Ghz << std::endl; - ss << "firstRssiLevel2G=" << item.firstRssiLevel2G << std::endl; - ss << "secondRssiLevel2G=" << item.secondRssiLevel2G << std::endl; - ss << "thirdRssiLevel2G=" << item.thirdRssiLevel2G << std::endl; - ss << "fourthRssiLevel2G=" << item.fourthRssiLevel2G << std::endl; - ss << "firstRssiLevel5G=" << item.firstRssiLevel5G << std::endl; - ss << "secondRssiLevel5G=" << item.secondRssiLevel5G << std::endl; - ss << "thirdRssiLevel5G=" << item.thirdRssiLevel5G << std::endl; - ss << "fourthRssiLevel5G=" << item.fourthRssiLevel5G << std::endl; - ss << "strDnsBak=" << item.strDnsBak << std::endl; - ss << "isLoadStabak=" << item.isLoadStabak << std::endl; + ss << " " <<"scanAlwaysSwitch=" << item.scanAlwaysSwitch << std::endl; /* bool false->0 true->1 */ + ss << " " <<"staAirplaneMode=" << item.staAirplaneMode << std::endl; + ss << " " <<"canOpenStaWhenAirplane=" << item.canOpenStaWhenAirplane << std::endl; + ss << " " <<"staLastState=" << item.staLastState << std::endl; + ss << " " <<"savedDeviceAppraisalPriority=" << item.savedDeviceAppraisalPriority << std::endl; + ss << " " <<"scoretacticsScoreSlope=" << item.scoretacticsScoreSlope << std::endl; + ss << " " <<"scoretacticsInitScore=" << item.scoretacticsInitScore << std::endl; + ss << " " <<"scoretacticsSameBssidScore=" << item.scoretacticsSameBssidScore << std::endl; + ss << " " <<"scoretacticsSameNetworkScore=" << item.scoretacticsSameNetworkScore << std::endl; + ss << " " <<"scoretacticsFrequency5GHzScore=" << item.scoretacticsFrequency5GHzScore << std::endl; + ss << " " <<"scoretacticsLastSelectionScore=" << item.scoretacticsLastSelectionScore << std::endl; + ss << " " <<"scoretacticsSecurityScore=" << item.scoretacticsSecurityScore << std::endl; + ss << " " <<"scoretacticsNormalScore=" << item.scoretacticsNormalScore << std::endl; + ss << " " <<"whetherToAllowNetworkSwitchover=" << item.whetherToAllowNetworkSwitchover << std::endl; + ss << " " <<"dhcpIpType=" << item.dhcpIpType << std::endl; + ss << " " <<"defaultWifiInterface=" << item.defaultWifiInterface << std::endl; + ss << " " <<"preLoadSta=" << item.preLoadSta << std::endl; + ss << " " <<"preLoadScan=" << item.preLoadScan << std::endl; + ss << " " <<"preLoadAp=" << item.preLoadAp << std::endl; + ss << " " <<"preLoadP2p=" << item.preLoadP2p << std::endl; + ss << " " <<"preLoadAware=" << item.preLoadAware << std::endl; + ss << " " <<"supportHwPnoFlag=" << item.supportHwPnoFlag << std::endl; + ss << " " <<"minRssi2Dot4Ghz=" << item.minRssi2Dot4Ghz << std::endl; + ss << " " <<"minRssi5Ghz=" << item.minRssi5Ghz << std::endl; + ss << " " <<"firstRssiLevel2G=" << item.firstRssiLevel2G << std::endl; + ss << " " <<"secondRssiLevel2G=" << item.secondRssiLevel2G << std::endl; + ss << " " <<"thirdRssiLevel2G=" << item.thirdRssiLevel2G << std::endl; + ss << " " <<"fourthRssiLevel2G=" << item.fourthRssiLevel2G << std::endl; + ss << " " <<"firstRssiLevel5G=" << item.firstRssiLevel5G << std::endl; + ss << " " <<"secondRssiLevel5G=" << item.secondRssiLevel5G << std::endl; + ss << " " <<"thirdRssiLevel5G=" << item.thirdRssiLevel5G << std::endl; + ss << " " <<"fourthRssiLevel5G=" << item.fourthRssiLevel5G << std::endl; + ss << " " <<"strDnsBak=" << item.strDnsBak << std::endl; + ss << " " <<"isLoadStabak=" << item.isLoadStabak << std::endl; return ss.str(); } @@ -687,8 +958,10 @@ void ClearTClass(WifiP2pGroupInfo &item) item.ClearClientDevices(); } -static void SetWifiP2pDevicClassKeyValue(WifiP2pDevice &item, const std::string &key, const std::string &value) +static int SetWifiP2pDevicClassKeyValue(WifiP2pDevice &item, const std::string &key, const std::string &value, + const std::string &fileName) { + int errorKeyValue = 0; if (key == "deviceName") { item.SetDeviceName(value); } else if (key == "deviceAddress") { @@ -703,12 +976,52 @@ static void SetWifiP2pDevicClassKeyValue(WifiP2pDevice &item, const std::string item.SetDeviceCapabilitys(std::stoi(value)); } else if (key == "groupCapabilitys") { item.SetGroupCapabilitys(std::stoi(value)); + } else { + LOGE("Invalid config key value"); + errorKeyValue++; } + return errorKeyValue; } +#ifdef FEATURE_ENCRYPTION_SUPPORT +static int SetWifiP2pGroupInfoEncrypt(WifiP2pGroupInfo &item, const std::string &key, const std::string &value, + const std::string &fileName) +{ + int errorKeyValue = 0; + WifiEncryptionInfo mWifiEncryptionInfo; + mWifiEncryptionInfo.SetFile(fileName); + if (key == "encryptedData") { + item.SetPassphrase(value); + } else if (key == "IV") { + EncryptedData *encry = new EncryptedData(item.GetPassphrase(), value); + std::string decry = ""; + if (WifiDecryption(mWifiEncryptionInfo, *encry, decry) == HKS_SUCCESS) { + item.SetPassphrase(decry); + } else { + item.SetPassphrase(""); + errorKeyValue++; + } + delete encry; + } else { + return -1; + } + return errorKeyValue; +} +#endif + template<> -void SetTClassKeyValue(WifiP2pGroupInfo &item, const std::string &key, const std::string &value) +int SetTClassKeyValue(WifiP2pGroupInfo &item, const std::string &key, const std::string &value, + const std::string &fileName) { + int errorKeyValue = 0; +#ifdef FEATURE_ENCRYPTION_SUPPORT + errorKeyValue = SetWifiP2pGroupInfoEncrypt(item, key, value, fileName); + if (errorKeyValue != -1) { + return errorKeyValue; + } else { + errorKeyValue = 0; + } +#endif if (key == "isGroupOwner") { item.SetIsGroupOwner(std::stoi(value) != 0); } else if (key == "passphrase") { @@ -717,6 +1030,15 @@ void SetTClassKeyValue(WifiP2pGroupInfo &item, const std::stri item.SetInterface(value); } else if (key == "groupName") { item.SetGroupName(value); + } else if (key == "groupNameHex") { + std::vector vec; + vec.clear(); + if (HexStringToVec(value, vec) == 0) { + std::string strSsid(vec.begin(), vec.end()); + item.SetGroupName(strSsid); + } else { + return -1; + } } else if (key == "networkId") { item.SetNetworkId(std::stoi(value)); } else if (key == "frequency") { @@ -729,7 +1051,7 @@ void SetTClassKeyValue(WifiP2pGroupInfo &item, const std::stri item.SetGoIpAddress(value); } else if (key.compare(0, strlen("ownerDev."), "ownerDev.") == 0) { WifiP2pDevice owner = item.GetOwner(); - SetWifiP2pDevicClassKeyValue(owner, key.substr(strlen("ownerDev.")), value); + SetWifiP2pDevicClassKeyValue(owner, key.substr(strlen("ownerDev.")), value, fileName); item.SetOwner(owner); } else if (key.compare(0, strlen("vecDev_"), "vecDev_") == 0) { std::string::size_type pos = key.find("."); @@ -740,11 +1062,15 @@ void SetTClassKeyValue(WifiP2pGroupInfo &item, const std::stri unsigned long index = std::stoi(key.substr(strlen("vecDev_"), pos)); if (index < item.GetClientDevices().size()) { std::vector clients = item.GetClientDevices(); - SetWifiP2pDevicClassKeyValue(clients[index], key.substr(pos + 1), value); + SetWifiP2pDevicClassKeyValue(clients[index], key.substr(pos + 1), value, fileName); item.SetClientDevices(clients); } } + } else { + LOGE("Invalid config key value"); + errorKeyValue++; } + return errorKeyValue; } template<> @@ -757,35 +1083,48 @@ static std::string OutWifiP2pDevicClassString(const WifiP2pDevice &item, std::st { std::ostringstream ss; - ss << prefix << "deviceName=" << item.GetDeviceName() << std::endl; - ss << prefix << "deviceAddress=" << item.GetDeviceAddress() << std::endl; - ss << prefix << "primaryDeviceType=" << item.GetPrimaryDeviceType() << std::endl; - ss << prefix << "status=" << static_cast(item.GetP2pDeviceStatus()) << std::endl; - ss << prefix << "supportWpsConfigMethods=" << item.GetWpsConfigMethod() << std::endl; - ss << prefix << "deviceCapabilitys=" << item.GetDeviceCapabilitys() << std::endl; - ss << prefix << "groupCapabilitys=" << item.GetGroupCapabilitys() << std::endl; + ss << " " < @@ -820,12 +1164,12 @@ std::string GetTClassName() return "TrustListPolicy"; } -template <> std::string OutTClassString(TrustListPolicy &item) +template <> std::string OutTClassString(TrustListPolicy &item, const std::string &fileName) { std::ostringstream ss; - ss << "sceneId=" << item.sceneId << std::endl; - ss << "sceneName=" << item.sceneName << std::endl; - ss << "trustList=" << item.trustList << std::endl; + ss << " " <<"sceneId=" << item.sceneId << std::endl; + ss << " " <<"sceneName=" << item.sceneName << std::endl; + ss << " " <<"trustList=" << item.trustList << std::endl; return ss.str(); } @@ -836,13 +1180,17 @@ template <> void ClearTClass(MovingFreezePolicy &item) } template <> -void SetTClassKeyValue(MovingFreezePolicy &item, const std::string &key, const std::string &value) +int SetTClassKeyValue(MovingFreezePolicy &item, const std::string &key, const std::string &value, + const std::string &fileName) { + int errorKeyValue = 0; if (key == "trustList") { item.trustList = value; + } else { + LOGE("Invalid config key value"); + errorKeyValue++; } - - return; + return errorKeyValue; } template <> std::string GetTClassName() @@ -850,10 +1198,10 @@ template <> std::string GetTClassName() return "MovingFreezePolicy"; } -template <> std::string OutTClassString(MovingFreezePolicy &item) +template <> std::string OutTClassString(MovingFreezePolicy &item, const std::string &fileName) { std::ostringstream ss; - ss << "trustList=" << item.trustList << std::endl; + ss << " " <<"trustList=" << item.trustList << std::endl; return ss.str(); } @@ -867,18 +1215,32 @@ template <> void ClearTClass(WifiStoreRandomMac &item) } template <> -void SetTClassKeyValue(WifiStoreRandomMac &item, const std::string &key, const std::string &value) +int SetTClassKeyValue(WifiStoreRandomMac &item, const std::string &key, const std::string &value, + const std::string &fileName) { + int errorKeyValue = 0; if (key == "ssid") { item.ssid = value; + } else if (key == "HexSsid") { + std::vector vec; + vec.clear(); + if (HexStringToVec(value, vec) == 0) { + std::string strSsid(vec.begin(), vec.end()); + item.ssid = strSsid; + } else { + return -1; + } } else if (key == "keyMgmt") { item.keyMgmt = value; } else if (key == "peerBssid") { item.peerBssid = value; } else if (key == "randomMac") { item.randomMac = value; + } else { + LOGE("Invalid config key value"); + errorKeyValue++; } - return; + return errorKeyValue; } template <> std::string GetTClassName() @@ -886,15 +1248,15 @@ template <> std::string GetTClassName() return "WifiStoreRandomMac"; } -template <> std::string OutTClassString(WifiStoreRandomMac &item) +template <> std::string OutTClassString(WifiStoreRandomMac &item, const std::string &fileName) { std::ostringstream ss; - ss << "ssid=" << item.ssid << std::endl; - ss << "keyMgmt=" << item.keyMgmt << std::endl; - ss << "peerBssid=" << item.peerBssid << std::endl; - ss << "randomMac=" << item.randomMac << std::endl; + ss << " " <<"ssid=" << ValidateString(item.ssid) << std::endl; + ss << " " <<"HexSsid=" << ConvertArrayToHex((uint8_t*)&item.ssid[0], item.ssid.length()) << std::endl; + ss << " " <<"keyMgmt=" << item.keyMgmt << std::endl; + ss << " " <<"peerBssid=" << item.peerBssid << std::endl; + ss << " " <<"randomMac=" << item.randomMac << std::endl; return ss.str(); } } // namespace Wifi -} // namespace OHOS - +} // namespace OHOS \ No newline at end of file diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.h b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.h index 87dcdba..dea11c0 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.h @@ -21,6 +21,7 @@ #include #include "wifi_internal_msg.h" #include "wifi_p2p_msg.h" + namespace OHOS { namespace Wifi { /* ----------------- template function begin ----------------------- */ @@ -38,6 +39,7 @@ void ClearTClass(T &item) return; } + /** * @Description Set item's data, input key is the item's member and input value is the * member's value @@ -46,15 +48,17 @@ void ClearTClass(T &item) * @param item - T &item * @param key - Item key * @param value - Item value + * @param fileName - fileName + * @return int - parse error: 0 Success, >0 parse failed */ template -void SetTClassKeyValue(T &item, const std::string &key, const std::string &value) +int SetTClassKeyValue(T &item, const std::string &key, const std::string &value, const std::string &fileName) { /* fixed compile warning, -Werror,-Wunused-parameter */ item; std::ostringstream ss; ss << key << value << std::endl; - return; + return 0; } /** @@ -75,10 +79,11 @@ std::string GetTClassName() * * @tparam T - typename * @param item - item + * @param fileName - fileName * @return std::string - output item's total member=value string */ template -std::string OutTClassString(T &item) +std::string OutTClassString(T &item, const std::string &fileName) { /* fixed compile warning, -Werror,-Wunused-parameter */ item; @@ -105,9 +110,12 @@ void ClearTClass(WifiDeviceConfig &item); * @param item - WifiDeviceConfig &item * @param key - WifiDeviceConfig struct member name * @param value - the WifiDeviceConfig item member value + * @param fileName - fileName + * @return int - parse error: 0 Success, >0 parse failed */ template <> -void SetTClassKeyValue(WifiDeviceConfig &item, const std::string &key, const std::string &value); +int SetTClassKeyValue(WifiDeviceConfig &item, const std::string &key, const std::string &value, + const std::string &fileName); /** * @Description Output WifiDeviceConfig class name @@ -124,10 +132,11 @@ std::string GetTClassName(); * * @tparam * @param item - WifiDeviceConfig &item + * @param fileName - fileName * @return std::string - output total member=value string about the WifiDeviceConfig item */ template <> -std::string OutTClassString(WifiDeviceConfig &item); +std::string OutTClassString(WifiDeviceConfig &item, const std::string &fileName); /** * @Description Clear and init HotspotConfig @@ -145,9 +154,12 @@ void ClearTClass(HotspotConfig &item); * @param item - HotspotConfig &item * @param key - HotspotConfig struct member name * @param value - the HotspotConfig item member value + * @param fileName - fileName + * @return int - parse error: 0 Success, >0 parse failed */ template <> -void SetTClassKeyValue(HotspotConfig &item, const std::string &key, const std::string &value); +int SetTClassKeyValue(HotspotConfig &item, const std::string &key, const std::string &value, + const std::string &fileName); /** * @Description Output HotspotConfig class name @@ -164,10 +176,11 @@ std::string GetTClassName(); * * @tparam * @param item - HotspotConfig &item + * @param fileName - fileName * @return std::string - output total member=value string about the HotspotConfig item */ template <> -std::string OutTClassString(HotspotConfig &item); +std::string OutTClassString(HotspotConfig &item, const std::string &fileName); /** * @Description Clear and init P2pVendorConfig @@ -185,9 +198,12 @@ void ClearTClass(P2pVendorConfig &item); * @param item - P2pVendorConfig &item * @param key - P2pVendorConfig struct member name * @param value - the P2pVendorConfig item member value + * @param fileName - fileName + * @return int - parse error: 0 Success, >0 parse failed */ template<> -void SetTClassKeyValue(P2pVendorConfig &item, const std::string &key, const std::string &value); +int SetTClassKeyValue(P2pVendorConfig &item, const std::string &key, const std::string &value, + const std::string &fileName); /** * @Description Output P2pVendorConfig class name @@ -204,10 +220,11 @@ std::string GetTClassName(); * * @tparam * @param item - P2pVendorConfig &item + * @param fileName - fileName * @return std::string - output total member=value string about the P2pVendorConfig item */ template<> -std::string OutTClassString(P2pVendorConfig &item); +std::string OutTClassString(P2pVendorConfig &item, const std::string &fileName); /** * @Description Clear and init StationInfo @@ -225,9 +242,12 @@ void ClearTClass(StationInfo &item); * @param item - StationInfo &item * @param key - StationInfo struct member name * @param value - the StationInfo item member value + * @param fileName - fileName + * @return int - parse error: 0 Success, >0 parse failed */ template <> -void SetTClassKeyValue(StationInfo &item, const std::string &key, const std::string &value); +int SetTClassKeyValue(StationInfo &item, const std::string &key, const std::string &value, + const std::string &fileName); /** * @Description Output StationInfo class name @@ -244,10 +264,11 @@ std::string GetTClassName(); * * @tparam * @param item - StationInfo &item + * @param fileName - fileName * @return std::string - output total member=value string about the StationInfo item */ template <> -std::string OutTClassString(StationInfo &item); +std::string OutTClassString(StationInfo &item, const std::string &fileName); /** * @Description Clear and init WifiConfig @@ -265,9 +286,12 @@ void ClearTClass(WifiConfig &item); * @param item - WifiConfig &item * @param key - WifiConfig struct member name * @param value - the WifiConfig item member value + * @param fileName - fileName + * @return int - parse error: 0 Success, >0 parse failed */ template <> -void SetTClassKeyValue(WifiConfig &item, const std::string &key, const std::string &value); +int SetTClassKeyValue(WifiConfig &item, const std::string &key, const std::string &value, + const std::string &fileName); /** * @Description Output WifiConfig class name @@ -284,10 +308,11 @@ std::string GetTClassName(); * * @tparam * @param item - WifiConfig &item + * @param fileName - fileName * @return std::string - output total member=value string about the WifiConfig item */ template <> -std::string OutTClassString(WifiConfig &item); +std::string OutTClassString(WifiConfig &item, const std::string &fileName); /** * @Description Clear and init WifiP2pGroupInfo @@ -305,9 +330,12 @@ void ClearTClass(WifiP2pGroupInfo &item); * @param item - WifiP2pGroupInfo &item * @param key - WifiP2pGroupInfo struct member name * @param value - the WifiP2pGroupInfo item member value + * @param fileName - fileName + * @return int - parse error: 0 Success, >0 parse failed */ template<> -void SetTClassKeyValue(WifiP2pGroupInfo &item, const std::string &key, const std::string &value); +int SetTClassKeyValue(WifiP2pGroupInfo &item, const std::string &key, const std::string &value, + const std::string &fileName); /** * @Description Output WifiP2pGroupInfo class name @@ -324,10 +352,11 @@ std::string GetTClassName(); * * @tparam * @param item - WifiP2pGroupInfo &item + * @param fileName - fileName * @return std::string - output total member=value string about the WifiP2pGroupInfo item */ template<> -std::string OutTClassString(WifiP2pGroupInfo &item); +std::string OutTClassString(WifiP2pGroupInfo &item, const std::string &fileName); /** * @Description Clear and init TrustListPolicy @@ -345,9 +374,12 @@ void ClearTClass(TrustListPolicy &item); * @param item - TrustListPolicy &item * @param key - TrustListPolicy struct member name * @param value - the TrustListPolicy item member value + * @param fileName - fileName + * @return int - parse error: 0 Success, >0 parse failed */ template <> -void SetTClassKeyValue(TrustListPolicy &item, const std::string &key, const std::string &value); +int SetTClassKeyValue(TrustListPolicy &item, const std::string &key, const std::string &value, + const std::string &fileName); /** * @Description Output TrustListPolicy class name @@ -364,10 +396,11 @@ std::string GetTClassName(); * * @tparam * @param item - TrustListPolicy &item + * @param fileName - fileName * @return std::string - output total member=value string about the TrustListPolicy item */ template <> -std::string OutTClassString(TrustListPolicy &item); +std::string OutTClassString(TrustListPolicy &item, const std::string &fileName); /** * @Description Clear and init MovingFreezePolicy @@ -385,9 +418,12 @@ void ClearTClass(MovingFreezePolicy &item); * @param item - MovingFreezePolicy &item * @param key - MovingFreezePolicy struct member name * @param value - the MovingFreezePolicy item member value + * @param fileName - fileName + * @return int - parse error: 0 Success, >0 parse failed */ template <> -void SetTClassKeyValue(MovingFreezePolicy &item, const std::string &key, const std::string &value); +int SetTClassKeyValue(MovingFreezePolicy &item, const std::string &key, const std::string &value, + const std::string &fileName); /** * @Description Output MovingFreezePolicy class name @@ -404,10 +440,11 @@ std::string GetTClassName(); * * @tparam * @param item - MovingFreezePolicy &item + * @param fileName - fileName * @return std::string - output total member=value string about the MovingFreezePolicy item */ template <> -std::string OutTClassString(MovingFreezePolicy &item); +std::string OutTClassString(MovingFreezePolicy &item, const std::string &fileName); /** * @Description Clear and init WifiStoreRandomMac @@ -425,9 +462,12 @@ void ClearTClass(WifiStoreRandomMac &item); * @param item - WifiStoreRandomMac &item * @param key - WifiStoreRandomMac struct member name * @param value - the WifiStoreRandomMac item member value + * @param fileName - fileName + * @return int - parse error: 0 Success, >0 parse failed */ template <> -void SetTClassKeyValue(WifiStoreRandomMac &item, const std::string &key, const std::string &value); +int SetTClassKeyValue(WifiStoreRandomMac &item, const std::string &key, const std::string &value, + const std::string &fileName); /** * @Description Output WifiStoreRandomMac class name @@ -444,11 +484,12 @@ std::string GetTClassName(); * * @tparam * @param item - WifiStoreRandomMac &item + * @param fileName - fileName * @return std::string - output total member=value string about the WifiStoreRandomMac item */ template <> -std::string OutTClassString(WifiStoreRandomMac &item); +std::string OutTClassString(WifiStoreRandomMac &item, const std::string &fileName); /* ----------template function specialization declare end----------- */ -} // namespace Wifi -} // namespace OHOS -#endif \ No newline at end of file +} // namespace Wifi +} // namespace OHOS +#endif diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp index fbdefd9..b8d1b57 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp @@ -18,7 +18,9 @@ #include "wifi_global_func.h" #include "wifi_log.h" #include "wifi_config_country_freqs.h" - +#ifdef FEATURE_ENCRYPTION_SUPPORT +#include "wifi_encryption_util.h" +#endif namespace OHOS { namespace Wifi { WifiSettings &WifiSettings::GetInstance() @@ -140,7 +142,9 @@ int WifiSettings::Init() InitScanControlInfo(); ReloadTrustListPolicies(); ReloadMovingFreezePolicy(); - +#ifdef FEATURE_ENCRYPTION_SUPPORT + SetUpHks(); +#endif return 0; } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.h b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.h index 4c47bdd..f50a5c4 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.h @@ -23,7 +23,6 @@ #include #include #include "wifi_config_file_impl.h" - constexpr int RANDOM_STR_LEN = 6; constexpr int MSEC = 1000; constexpr int FOREGROUND_SCAN_CONTROL_TIMES = 4; @@ -1160,6 +1159,6 @@ private: WifiConfigFileImpl mSavedWifiStoreRandomMac; bool explicitGroup; }; -} // namespace Wifi -} // namespace OHOS +} // namespace Wifi +} // namespace OHOS #endif diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.cpp new file mode 100755 index 0000000..9a17c40 --- /dev/null +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.cpp @@ -0,0 +1,156 @@ +/* + * Copyright (C) 2022-2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#include "wifi_encryption_util.h" +#include +#include +#include "wifi_logger.h" +#include "wifi_global_func.h" +DEFINE_WIFILOG_LABEL("WifiConfigEncryption"); +namespace OHOS { +namespace Wifi { +int32_t SetUpHks() +{ + int32_t ret = HksInitialize(); + if (ret != HKS_SUCCESS) { + WIFI_LOGE("wifi encryption init failed"); + } + return ret; +} + +int32_t GetKey(const WifiEncryptionInfo &wifiEncryptionInfo, const struct HksParamSet *genParamSet) +{ + struct HksBlob authId = wifiEncryptionInfo.keyAlias; + int32_t keyExist = HksKeyExist(&authId, nullptr); + if (keyExist == HKS_ERROR_NOT_EXIST) { + int32_t ret = HksGenerateKey(&authId, genParamSet, nullptr); + if (ret != HKS_SUCCESS) { + WIFI_LOGE("generate key failed"); + return ret; + } else { + return ret; + } + }else if (keyExist != HKS_SUCCESS) { + WIFI_LOGE("search key failed"); + return keyExist; + } + return keyExist; +} + +int32_t WifiEncryption(const WifiEncryptionInfo &wifiEncryptionInfo, const std::string &inputString, + EncryptedData &encryptedData) +{ + if (inputString.length() == 0) { + return HKS_SUCCESS; + } + struct HksBlob authId = wifiEncryptionInfo.keyAlias; + struct HksBlob plainText = { inputString.length(), (uint8_t *)&inputString[0] }; + + uint8_t nonce[NONCE_SIZE] = {0}; + struct HksBlob randomIV = {NONCE_SIZE, nonce}; + int32_t ret =HksGenerateRandom(NULL, &randomIV); + if (ret != HKS_SUCCESS) { + WIFI_LOGE("wifi encryption generate IV failed"); + return ret; + } + struct HksParam IVParam[] = { + { .tag = HKS_TAG_NONCE, .blob = { .size = NONCE_SIZE, .data = nonce } }, + }; + + struct HksParamSet *encryParamSet = nullptr; + HksInitParamSet(&encryParamSet); + HksAddParams(encryParamSet, g_genParam, sizeof(g_genParam) / sizeof(HksParam)); + HksAddParams(encryParamSet, IVParam, sizeof(IVParam) / sizeof(HksParam)); + HksBuildParamSet(&encryParamSet); + + ret = GetKey(wifiEncryptionInfo, encryParamSet); + if (ret != HKS_SUCCESS) { + WIFI_LOGE("wifi encryption failed"); + return ret; + } + + uint8_t cipherBuf[AES_COMMON_SIZE] = {0}; + HksBlob cipherData = { + .size = AES_COMMON_SIZE, + .data = cipherBuf + }; + + ret = HksEncrypt(&authId, encryParamSet, &plainText, &cipherData); + if (ret != HKS_SUCCESS) { + WIFI_LOGE("Hks encryption failed"); + return ret; + } + + encryptedData.encryptedPassword = ConvertArrayToHex(cipherBuf, cipherData.size); + encryptedData.IV = ConvertArrayToHex(nonce, NONCE_SIZE); + HksFreeParamSet(&encryParamSet); + return ret; +} + +int32_t WifiDecryption(const WifiEncryptionInfo &wifiEncryptionInfo, const EncryptedData &encryptedData, + std::string &decryptedData) +{ + if (encryptedData.encryptedPassword.size() == 0) { + return HKS_SUCCESS; + } + struct HksBlob authId = wifiEncryptionInfo.keyAlias; + uint8_t cipherBuf[AES_COMMON_SIZE] = {0}; + int length = AES_COMMON_SIZE; + int retStrToArrat = HexStringToVec(encryptedData.encryptedPassword, cipherBuf, AES_COMMON_SIZE, length); + if (retStrToArrat != 0) { + return HKS_FAILURE; + } + + uint8_t nonce[NONCE_SIZE] = {0}; + int lengthIV = NONCE_SIZE; + retStrToArrat = HexStringToVec(encryptedData.IV, nonce, NONCE_SIZE, lengthIV); + if (retStrToArrat != 0) { + return HKS_FAILURE; + } + struct HksParam IVParam[] = { + { .tag = HKS_TAG_NONCE, .blob = { .size = NONCE_SIZE, .data = nonce } }, + }; + + struct HksBlob cipherData = { length, cipherBuf }; + struct HksParamSet *decryParamSet = nullptr; + + HksInitParamSet(&decryParamSet); + HksAddParams(decryParamSet, g_genParam, sizeof(g_genParam) / sizeof(HksParam)); + HksAddParams(decryParamSet, IVParam, sizeof(IVParam) / sizeof(HksParam)); + HksBuildParamSet(&decryParamSet); + + int ret = HksKeyExist(&authId, nullptr); + if (ret != HKS_SUCCESS) { + WIFI_LOGE("wifi decryption key not exist"); + return ret; + } + uint8_t plainBuff[AES_COMMON_SIZE] = {0}; + HksBlob plainText = { + .size = AES_COMMON_SIZE, + .data = plainBuff + }; + + ret = HksDecrypt(&authId, decryParamSet, &cipherData, &plainText); + if (ret != HKS_SUCCESS) { + WIFI_LOGE("Hks decryption failed"); + return ret; + } + + std::string temp(plainText.data, plainText.data + plainText.size); + decryptedData = temp; + HksFreeParamSet(&decryParamSet); + return ret; +} +} // namespace Wifi +} // namespace OHOS \ No newline at end of file diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.h b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.h new file mode 100755 index 0000000..bf2b97b --- /dev/null +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.h @@ -0,0 +1,87 @@ +/* + * Copyright (C) 2022-2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OHOS_WIFI_CONFIG_HKS_H +#define OHOS_WIFI_CONFIG_HKS_H +#include +#include +#include "hks_api.h" +#include "hks_type.h" +#include "hks_param.h" + +namespace OHOS { +namespace Wifi { +static constexpr uint32_t AES_COMMON_SIZE = 256; +static constexpr uint32_t AAD_SIZE = 16; +static constexpr uint32_t NONCE_SIZE = 16; + +const uint8_t AAD[AAD_SIZE] = {0}; + +static struct HksParam g_genParam[] = { + { .tag = HKS_TAG_KEY_STORAGE_FLAG, .uint32Param = HKS_STORAGE_PERSISTENT }, + { .tag = HKS_TAG_ALGORITHM, .uint32Param = HKS_ALG_AES }, + { .tag = HKS_TAG_KEY_SIZE, .uint32Param = HKS_AES_KEY_SIZE_256 }, + { .tag = HKS_TAG_PURPOSE, .uint32Param = HKS_KEY_PURPOSE_ENCRYPT | HKS_KEY_PURPOSE_DECRYPT }, + { .tag = HKS_TAG_DIGEST, .uint32Param = HKS_DIGEST_NONE }, + { .tag = HKS_TAG_PADDING, .uint32Param = HKS_PADDING_NONE }, + { .tag = HKS_TAG_IS_KEY_ALIAS, .boolParam = true }, + { .tag = HKS_TAG_KEY_GENERATE_TYPE, .uint32Param = HKS_KEY_GENERATE_TYPE_DEFAULT }, + { .tag = HKS_TAG_BLOCK_MODE, .uint32Param = HKS_MODE_GCM }, + { .tag = HKS_TAG_ASSOCIATED_DATA, .blob = { .size = AAD_SIZE, .data = (uint8_t *)AAD } }, +}; + +class EncryptedData final { +public: + std::string encryptedPassword = ""; + std::string IV = ""; + EncryptedData(const std::string password, const std::string inputIV) + { + encryptedPassword = password; + IV = inputIV; + } + EncryptedData() {} + ~EncryptedData() {} +}; + +class WifiEncryptionInfo { +public: + std::string fileName; + static constexpr char WIFI_ENCRY_KEY[] = "WifiEncryHksAes"; + struct HksBlob keyAlias; + void SetFile(const std::string file) + { + fileName = WIFI_ENCRY_KEY + file; + keyAlias = { fileName.length(), (uint8_t *)&fileName[0] }; + } + WifiEncryptionInfo(const std::string file) + { + SetFile(file); + } + WifiEncryptionInfo() {} + ~WifiEncryptionInfo() {} +}; + +int32_t SetUpHks(); + +int32_t GetKey(const WifiEncryptionInfo &wifiEncryptionInfo, const struct HksParamSet *genParamSet); + +int32_t WifiEncryption(const WifiEncryptionInfo &wifiEncryptionInfo, const std::string &inputString, + EncryptedData &encryptedData); + +int32_t WifiDecryption(const WifiEncryptionInfo &wifiEncryptionInfo, const EncryptedData &encryptedData, + std::string &decryptedData); +} +} +#endif \ No newline at end of file diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_global_func.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_global_func.cpp index 08dafa9..53bd864 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_global_func.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_global_func.cpp @@ -288,6 +288,70 @@ int HexStringToVec(const std::string &str, std::vector &vec) return 0; } +int HexStringToVec(const std::string &str, uint8_t plainText[], int plainLength, int &resultLength) +{ + if (plainLength < 0) { + return false; + } + + std::vector result; + result.clear(); + int ret = HexStringToVec(str, result); + if (ret == -1 || static_cast(result.size()) > plainLength) { + return -1; + } + for(std::vector::size_type i = 0; i < result.size(); ++i) { + plainText[i] = result[i]; + } + resultLength = static_cast(result.size()); + return 0; +} + +static char ConvertArrayChar(uint8_t ch) +{ + constexpr int maxDecNum = 9; + constexpr int numDiffForHexAlphabet = 10; + if (ch >= 0 && ch <= maxDecNum) { + return '0' + ch; + } + if (ch >= 0xa && ch <= 0xf) { + return ch + 'a' - numDiffForHexAlphabet; + } + return '0'; +} + +std::string ConvertArrayToHex(const uint8_t plainText[], int size) +{ + constexpr int bitWidth = 4; + std::stringstream ss; + for (int i = 0; i < size; i++) { + ss << ConvertArrayChar(plainText[i] >> bitWidth) << ConvertArrayChar (plainText[i] & 0xf); + } + return ss.str(); +} + +static bool ValidateChar(const char ch) +{ + if (ch > '~' || ch < ' ') { + return false; + } + return true; +} + +std::string ValidateString(const std::string &str) +{ + std::stringstream ss; + ss << "\""; + for(char ch : str) + { + if (ValidateChar(ch)) { + ss << ch; + } + } + ss << "\""; + return ss.str(); +} + void TransformFrequencyIntoChannel(const std::vector &freqVector, std::vector &chanVector) { int channel; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_global_func.h b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_global_func.h index 50e6aa9..50ecf25 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_global_func.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_global_func.h @@ -225,6 +225,33 @@ std::string Vec2Stream(const std::string &prefix, const std::vector &vecCh */ int HexStringToVec(const std::string &str, std::vector &vec); +/** + * @Description Convert a hex type string to uint8_t*. + * + * @param str - input hex string, eg: 010203... + * @param plainText - output uint8_t* result, eg: [1,2,3,...] + * @param plainLength - input maxLength of uint8_t* result, eg: 256 + * @param resultLength - output Length of uint8_t* result, eg: 16 + * @return int - convert result, 0 success, -1 failed + */ +int HexStringToVec(const std::string &str, uint8_t plainText[], int plainLength, int &resultLength); + +/** + * @Description Convert a uint8_t* to Hex string. + * + * @param plainText - input uint8_t*, eg: [1,2,3,...] + * @param size - input uint8_t* size, eg: 16 + * @return string - convert Hex string, eg: 010203... + */ +std::string ConvertArrayToHex(const uint8_t plainText[], int size); + +/** + * @Description Convert a string to validate string for write. + * + * @param str - input string + * @return string - validate string wrapped by "" + */ +std::string ValidateString(const std::string &str); /** * @Description Check is a valid 5G frequency. * diff --git a/wifi/wifi.gni b/wifi/wifi.gni index 6675f3f..ea27f5c 100644 --- a/wifi/wifi.gni +++ b/wifi/wifi.gni @@ -22,4 +22,5 @@ declare_args() { wifi_feature_with_ap_num = 1 wifi_feature_with_auth_disable = false wifi_feature_with_dhcp_disable = false + wifi_feature_with_encryption = true } -- Gitee From 6ffe247e7e4dbae16ccd6f0d053cd7618a1e4ed6 Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Fri, 9 Sep 2022 04:17:53 +0000 Subject: [PATCH 348/491] Solve stability problems and fix failure test cases Signed-off-by: zhangfeng --- .../inner_api/include/dhcp_define.h | 2 +- .../dhcp_server/include/dhcp_logger.h | 4 +- .../dhcp_server/include/dhcp_server.h | 4 +- dhcp/services/dhcp_server/src/dhcp_dhcpd.c | 6 +- dhcp/services/dhcp_server/src/dhcp_server.c | 35 ++-- .../dhcp_client/dhcp_function_test.cpp | 11 -- .../services/dhcp_client/dhcp_ipv4_test.cpp | 4 +- .../services/dhcp_client/dhcp_socket_test.cpp | 2 +- .../services/dhcp_server/unittest/BUILD.gn | 4 +- .../dhcp_server/unittest/dhcp_option_test.cpp | 2 +- .../dhcp_server/unittest/dhcp_server_test.cpp | 51 +++--- .../dhcp_server/unittest/system_func_mock.cpp | 20 ++- .../services/mgr_service/dhcp_func_test.cpp | 2 - wifi/frameworks/js/napi/src/wifi_napi_p2p.cpp | 12 +- .../native/interfaces/wifi_p2p_msg.h | 2 +- .../wifi_manage/common/handler.cpp | 9 +- .../wifi_manage/common/message_queue.cpp | 37 ++-- .../wifi_manage/common/message_queue.h | 7 +- .../wifi_manage/common/state_machine.cpp | 1 - .../idl_client/wifi_base_hal_interface.cpp | 1 + .../idl_client/wifi_idl_client.cpp | 1 + .../wifi_manage/wifi_config_center.cpp | 2 +- .../wifi_manage/wifi_config_center.h | 2 +- .../wifi_manage/wifi_manager.cpp | 5 +- .../wifi_manage/wifi_net_agent.cpp | 2 +- .../wifi_manage/wifi_net_agent.h | 2 +- .../wifi_manage/wifi_scan/scan_service.cpp | 6 +- .../wifi_scan/scan_state_machine.cpp | 169 +++++++----------- .../wifi_scan/scan_state_machine.h | 16 +- .../wifi_manage/wifi_service_manager.cpp | 74 +++++--- .../wifi_manage/wifi_service_manager.h | 5 +- .../wifi_sta/sta_network_check.cpp | 36 ++-- .../wifi_manage/wifi_sta/sta_network_check.h | 31 ++-- .../wifi_sta/sta_state_machine.cpp | 17 +- .../wifi_toolkit/config/wifi_settings.cpp | 6 +- .../wifi_toolkit/config/wifi_settings.h | 12 +- .../wifi_manage/idl_client/unittest/BUILD.gn | 2 - .../wifi_manage/unittest/BUILD.gn | 6 +- .../unittest/wifi_auth_center_test.cpp | 2 +- .../unittest/wifi_manager_service_test.cpp | 1 - .../unittest/wifi_manager_service_test.h | 4 +- .../wifi_scan/Mock/mock_wifi_settings.h | 12 +- .../wifi_scan/scan_interface_test.cpp | 7 +- .../wifi_scan/scan_service_test.cpp | 5 +- .../wifi_scan/scan_state_machine_test.cpp | 5 +- .../wifi_manage/wifi_sta/BUILD.gn | 1 - .../wifi_sta/Mock/mock_sta_network_check.cpp | 6 +- .../wifi_sta/Mock/mock_sta_network_check.h | 4 +- .../sta_auto_connect_service_test.cpp | 7 +- .../unittest/wifi_hal_ap_interface_test.cpp | 3 +- 50 files changed, 331 insertions(+), 336 deletions(-) diff --git a/dhcp/interfaces/inner_api/include/dhcp_define.h b/dhcp/interfaces/inner_api/include/dhcp_define.h index f419f05..e91a393 100644 --- a/dhcp/interfaces/inner_api/include/dhcp_define.h +++ b/dhcp/interfaces/inner_api/include/dhcp_define.h @@ -108,7 +108,7 @@ typedef enum EnumServiceStatus { SERVICE_STATUS_INVALID = 0, SERVICE_STATUS_START = 1, SERVICE_STATUS_STOP = 2 -} DhcpmServiceStatus; +} DhcpServiceStatus; struct DhcpResult { int iptype; /* 0-ipv4,1-ipv6 */ diff --git a/dhcp/services/dhcp_server/include/dhcp_logger.h b/dhcp/services/dhcp_server/include/dhcp_logger.h index 9176e98..16ee747 100644 --- a/dhcp/services/dhcp_server/include/dhcp_logger.h +++ b/dhcp/services/dhcp_server/include/dhcp_logger.h @@ -45,9 +45,9 @@ #define LOG_DEBUG "Debug" #define LOG_TRACE "Trace" -#define LOG_WARN " Warn" +#define LOG_WARN "Warn" #define LOG_ERROR "Error" -#define LOG_INFO " Info" +#define LOG_INFO "Info" #define DEBUG_MODE 1 diff --git a/dhcp/services/dhcp_server/include/dhcp_server.h b/dhcp/services/dhcp_server/include/dhcp_server.h index 8bef877..d6a66fe 100644 --- a/dhcp/services/dhcp_server/include/dhcp_server.h +++ b/dhcp/services/dhcp_server/include/dhcp_server.h @@ -18,6 +18,7 @@ #include "dhcp_config.h" #include "dhcp_define.h" +#include "dhcp_message.h" enum DhcpServerState { ST_IDEL = 0, ST_STARTING, ST_RUNNING, ST_RELOADNG, ST_STOPING, ST_STOPED }; typedef int (*DhcpServerCallback)(int, int, const char *ifname); @@ -37,8 +38,9 @@ int StartDhcpServer(PDhcpServerContext ctx); int StopDhcpServer(PDhcpServerContext ctx); int GetServerStatus(PDhcpServerContext ctx); void RegisterDhcpCallback(PDhcpServerContext ctx, DhcpServerCallback callback); -int FreeServerContext(PDhcpServerContext ctx); +int FreeServerContext(PDhcpServerContext *ctx); int SaveLease(PDhcpServerContext ctx); +int ReceiveDhcpMessage(int sock, PDhcpMsgInfo msgInfo); #ifdef __cplusplus } diff --git a/dhcp/services/dhcp_server/src/dhcp_dhcpd.c b/dhcp/services/dhcp_server/src/dhcp_dhcpd.c index 3aaac43..98bbcf5 100644 --- a/dhcp/services/dhcp_server/src/dhcp_dhcpd.c +++ b/dhcp/services/dhcp_server/src/dhcp_dhcpd.c @@ -38,7 +38,6 @@ static DhcpConfig g_dhcpConfig; static PDhcpServerContext g_dhcpServer = 0; - enum SignalEvent { EXIT = 0, RELOAD, @@ -373,7 +372,10 @@ void FreeSeverResources(void) { FreeArguments(); FreeLocalConfig(); - FreeServerContext(g_dhcpServer); + if (FreeServerContext(&g_dhcpServer) != RET_SUCCESS) { + LOGE("Free server context failed!"); + return; + } } static void BeforeExit(void) diff --git a/dhcp/services/dhcp_server/src/dhcp_server.c b/dhcp/services/dhcp_server/src/dhcp_server.c index 5690c9b..094121d 100644 --- a/dhcp/services/dhcp_server/src/dhcp_server.c +++ b/dhcp/services/dhcp_server/src/dhcp_server.c @@ -36,14 +36,15 @@ #include "dhcp_config.h" #include "dhcp_ipv4.h" #include "dhcp_logger.h" -#include "dhcp_message.h" #include "dhcp_option.h" #include "hash_table.h" #undef LOG_TAG #define LOG_TAG "DhcpServer" +#ifndef DHCP_SEL_WAIT_TIMEOUTS #define DHCP_SEL_WAIT_TIMEOUTS 1000 +#endif #define OPT_MESSAGE_TYPE_LEGTH 1 #define OPT_HEADER_LENGTH 2 #define OPT_TIME_LENGTH 4 @@ -254,8 +255,8 @@ int ReceiveDhcpMessage(int sock, PDhcpMsgInfo msgInfo) fd_set recvFd; FD_ZERO(&recvFd); FD_SET(sock, &recvFd); - time_t tms = DHCP_SEL_WAIT_TIMEOUTS; - tmt.tv_sec = tms; + time_t seconds = DHCP_SEL_WAIT_TIMEOUTS; + tmt.tv_sec = seconds; tmt.tv_usec = 0; if (select(sock + 1, &recvFd, NULL, NULL, &tmt) < 0) { LOGE("select error, %d", errno); @@ -270,7 +271,7 @@ int ReceiveDhcpMessage(int sock, PDhcpMsgInfo msgInfo) srcAddrIn->sin_addr.s_addr = INADDR_ANY; int rsize = recvfrom(sock, recvBuffer, RECV_BUFFER_SIZE, 0, (struct sockaddr *)srcAddrIn, (socklen_t *)&ssize); if (!rsize) { - LOGE("receive error, %d", errno); + LOGE("receive error, %d", errno); return RET_FAILED; } if (rsize > (int)sizeof(DhcpMessage) || rsize < DHCP_MSG_HEADER_SIZE) { @@ -280,7 +281,7 @@ int ReceiveDhcpMessage(int sock, PDhcpMsgInfo msgInfo) msgInfo->length = rsize; if (memcpy_s(&msgInfo->packet, sizeof(DhcpMessage), recvBuffer, rsize) != EOK) { return RET_FAILED; - }; + } if (msgInfo->packet.op != BOOTREQUEST) { LOGW("dhcp message type error!"); return RET_FAILED; @@ -536,7 +537,7 @@ static int BeginLooper(PDhcpServerContext ctx) int saveRet = SaveBindingRecoders(&srvIns->addressPool, 0); if (saveRet != RET_SUCCESS && saveRet != RET_WAIT_SAVE) { LOGW("failed to save lease recoders."); - }; + } } } FreeOptionList(&from.options); @@ -1667,17 +1668,17 @@ PDhcpServerContext InitializeServer(DhcpConfig *config) } if ((context->instance = calloc(1, sizeof(ServerContext))) == NULL) { LOGE("failed to calloc server instance."); - FreeServerContext(context); + FreeServerContext(&context); return NULL; } if (InitServerContext(config, context) != RET_SUCCESS) { LOGE("failed initialize dhcp server context."); - FreeServerContext(context); + FreeServerContext(&context); return NULL; } if (InitServerFixedOptions(config, context) != RET_SUCCESS) { LOGE("failed initialize dhcp server fixed options."); - FreeServerContext(context); + FreeServerContext(&context); return NULL; } LOGD("server id: %s", ParseStrIp(config->serverId)); @@ -1691,23 +1692,23 @@ PDhcpServerContext InitializeServer(DhcpConfig *config) return context; } -int FreeServerContext(PDhcpServerContext ctx) +int FreeServerContext(PDhcpServerContext *ctx) { - if (!ctx) { + if (ctx == NULL || *ctx == NULL) { LOGE("dhcp server context pointer is null."); return RET_FAILED; } - ServerContext *srvIns = GetServerInstance(ctx); + ServerContext *srvIns = GetServerInstance(*ctx); if (!srvIns) { LOGE("dhcp server instance pointer is null."); return RET_FAILED; } FreeAddressPool(&srvIns->addressPool); - if (ctx->instance != NULL) { - free(ctx->instance); - ctx->instance = NULL; - free(ctx); - ctx = NULL; + if ((*ctx)->instance != NULL) { + free((*ctx)->instance); + (*ctx)->instance = NULL; + free(*ctx); + *ctx = NULL; } return RET_SUCCESS; } diff --git a/dhcp/test/services/dhcp_client/dhcp_function_test.cpp b/dhcp/test/services/dhcp_client/dhcp_function_test.cpp index 60039e4..4865e91 100644 --- a/dhcp/test/services/dhcp_client/dhcp_function_test.cpp +++ b/dhcp/test/services/dhcp_client/dhcp_function_test.cpp @@ -158,17 +158,6 @@ HWTEST_F(DhcpFunctionTest, InitPidfile_SUCCESS, TestSize.Level1) usleep(SLEEP_TIME_200_MS); } -HWTEST_F(DhcpFunctionTest, InitPidfile_FAILED, TestSize.Level1) -{ - char workDir[DIR_MAX_LEN] = {0}; - char pidFile[DIR_MAX_LEN] = {0}; - EXPECT_EQ(DHCP_OPT_FAILED, InitPidfile(workDir, pidFile, getpid())); - - EXPECT_EQ(DHCP_OPT_FAILED, InitPidfile("./", "./test/wlan0.pid", getpid())); - - EXPECT_EQ(DHCP_OPT_FAILED, InitPidfile("./test/", "./wlan0.pid", getpid())); -} - HWTEST_F(DhcpFunctionTest, GetPID_SUCCESS, TestSize.Level1) { char workDir[DIR_MAX_LEN] = "./"; diff --git a/dhcp/test/services/dhcp_client/dhcp_ipv4_test.cpp b/dhcp/test/services/dhcp_client/dhcp_ipv4_test.cpp index 4826af0..bb6e5ae 100644 --- a/dhcp/test/services/dhcp_client/dhcp_ipv4_test.cpp +++ b/dhcp/test/services/dhcp_client/dhcp_ipv4_test.cpp @@ -93,8 +93,8 @@ HWTEST_F(DhcpIpv4Test, TEST_SUCCESS, TestSize.Level1) .WillRepeatedly(Return(1)); EXPECT_CALL(MockSystemFunc::GetInstance(), close(_)).WillRepeatedly(Return(0)); - EXPECT_EQ(-1, DhcpDiscover(0, 1)); - EXPECT_EQ(-1, DhcpRenew(0, 0, 0)); + EXPECT_EQ(0, DhcpDiscover(0, 1)); + EXPECT_EQ(0, DhcpRenew(0, 0, 0)); MockSystemFunc::SetMockFlag(false); } diff --git a/dhcp/test/services/dhcp_client/dhcp_socket_test.cpp b/dhcp/test/services/dhcp_client/dhcp_socket_test.cpp index ae6882c..1e67f41 100644 --- a/dhcp/test/services/dhcp_client/dhcp_socket_test.cpp +++ b/dhcp/test/services/dhcp_client/dhcp_socket_test.cpp @@ -117,7 +117,7 @@ HWTEST_F(DhcpSocketTest, SendToDhcpPacket_SUCCESS, TestSize.Level1) EXPECT_EQ(SendToDhcpPacket(NULL, 0, 0, ifindex, (uint8_t *)MAC_BCAST_ADDR), SOCKET_OPT_FAILED); struct DhcpPacket packet; packet.xid = 123456; - EXPECT_EQ(SendToDhcpPacket(&packet, 0, 0, ifindex, (uint8_t *)MAC_BCAST_ADDR), SOCKET_OPT_FAILED); + EXPECT_EQ(SendToDhcpPacket(&packet, 0, 0, ifindex, (uint8_t *)MAC_BCAST_ADDR), SOCKET_OPT_SUCCESS); MockSystemFunc::SetMockFlag(false); } diff --git a/dhcp/test/services/dhcp_server/unittest/BUILD.gn b/dhcp/test/services/dhcp_server/unittest/BUILD.gn index e8be341..bf9eb28 100644 --- a/dhcp/test/services/dhcp_server/unittest/BUILD.gn +++ b/dhcp/test/services/dhcp_server/unittest/BUILD.gn @@ -57,8 +57,6 @@ ohos_unittest("dhcp_server_unittest") { "$DHCP_ROOT_DIR/services/dhcp_server/include", ] - defines = [] - cflags = [] deps = [ @@ -81,6 +79,8 @@ ohos_unittest("dhcp_server_unittest") { configs = [ ":module_private_config" ] + defines = [ "DHCP_SEL_WAIT_TIMEOUTS=1" ] + if (dhcp_hilog_enable) { external_deps += [ "hiviewdfx_hilog_native:libhilog" ] defines += [ "DHCP_HILOG_ENABLE" ] diff --git a/dhcp/test/services/dhcp_server/unittest/dhcp_option_test.cpp b/dhcp/test/services/dhcp_server/unittest/dhcp_option_test.cpp index bb0aec7..43073da 100644 --- a/dhcp/test/services/dhcp_server/unittest/dhcp_option_test.cpp +++ b/dhcp/test/services/dhcp_server/unittest/dhcp_option_test.cpp @@ -41,7 +41,7 @@ public: FreeOptionList(&options); } public: - DhcpOptionList options; + DhcpOptionList options = {0}; }; HWTEST_F(DhcpOptionTest, InitOptionListTest, TestSize.Level1) diff --git a/dhcp/test/services/dhcp_server/unittest/dhcp_server_test.cpp b/dhcp/test/services/dhcp_server/unittest/dhcp_server_test.cpp index fd13356..d2417be 100644 --- a/dhcp/test/services/dhcp_server/unittest/dhcp_server_test.cpp +++ b/dhcp/test/services/dhcp_server/unittest/dhcp_server_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -226,7 +226,6 @@ bool DhcpServerTest::ServerRun(void) { LOGD("begin test start dhcp server."); int retval = true; - SystemFuncMock::GetInstance().SetMockFlag(true); EXPECT_CALL(SystemFuncMock::GetInstance(), socket(_, _, _)).WillRepeatedly(Return(1)); EXPECT_CALL(SystemFuncMock::GetInstance(), setsockopt(_, _, _, _, _)).WillRepeatedly(Return(0)); EXPECT_CALL(SystemFuncMock::GetInstance(), select(_, _, _, _, _)).WillRepeatedly(Return(0)); @@ -269,9 +268,8 @@ bool DhcpServerTest::ServerRun(void) retval = false; } if (m_pServerCtx) { - FreeServerContext(m_pServerCtx); + FreeServerContext(&m_pServerCtx); } - SystemFuncMock::GetInstance().SetMockFlag(false); return retval; } @@ -304,7 +302,6 @@ void DhcpServerTest::DelayStopServer() const int SLEEP_TIME2 = 1; LOGI("wait for dhcp server stopped..."); LOGI("wait %d seconds...\n", SERVER_RUNING_TIME); - SystemFuncMock::GetInstance().SetMockFlag(true); EXPECT_CALL(SystemFuncMock::GetInstance(), close(_)).WillRepeatedly(Return(0)); std::this_thread::sleep_for(std::chrono::seconds(SLEEP_TIME)); if (m_pServerCtx && m_pServerCtx->instance) { @@ -326,7 +323,6 @@ void DhcpServerTest::DelayStopServer() waitSesc++; } } - SystemFuncMock::GetInstance().SetMockFlag(false); std::this_thread::sleep_for(std::chrono::seconds(SLEEP_TIME2)); } @@ -608,7 +604,7 @@ HWTEST_F(DhcpServerTest, InitializeServerTest, TestSize.Level1) ASSERT_TRUE(ctx != nullptr); EXPECT_EQ(RET_SUCCESS, FreeServerConfig(&config)); - EXPECT_EQ(RET_SUCCESS, FreeServerContext(ctx)); + EXPECT_EQ(RET_SUCCESS, FreeServerContext(&ctx)); } extern "C" int InitServer(const char *ifname); @@ -644,37 +640,39 @@ HWTEST_F(DhcpServerTest, StartServerTest, TestSize.Level1) { SystemFuncMock::GetInstance().SetMockFlag(true); EXPECT_TRUE(StartServerTest()); - SystemFuncMock::GetInstance().SetMockFlag(false); } -extern "C" int ReceiveDhcpMessage(int sock, PDhcpMsgInfo msgInfo); HWTEST_F(DhcpServerTest, ReceiveDhcpMessageFailedTest, TestSize.Level1) { SystemFuncMock::GetInstance().SetMockFlag(true); - SystemFuncMock::GetInstance().SetMockFlag(true); - EXPECT_CALL(SystemFuncMock::GetInstance(), select(_, _, _, _, _)) - .WillOnce(Return(-1)) - .WillRepeatedly(Return(0)); - EXPECT_CALL(SystemFuncMock::GetInstance(), recvfrom(_, _, _, _, _, _)) - .WillOnce(Return((int)(sizeof(DhcpMsgInfo) + 1))) - .WillRepeatedly(Return((int)sizeof(DhcpMsgInfo))); - + ON_CALL(SystemFuncMock::GetInstance(), select(_, _, _, _, _)) + .WillByDefault(Return(0)); + ON_CALL(SystemFuncMock::GetInstance(), recvfrom(_, _, _, _, _, _)) + .WillByDefault(Return((int)sizeof(DhcpMsgInfo))); DhcpMsgInfo msgInfo = {{0}, 0, {0}}; uint8_t testMac1[DHCP_HWADDR_LENGTH] = {0x00, 0x0e, 0x3c, 0x65, 0x3a, 0x09, 0}; - EXPECT_EQ(ERR_SELECT, ReceiveDhcpMessage(1, &msgInfo)); // failed to select isset. - EXPECT_EQ(RET_FAILED, ReceiveDhcpMessage(1, &msgInfo)); // message length error - EXPECT_EQ(RET_FAILED, ReceiveDhcpMessage(1, &msgInfo)); // dhcp message type error + + int ret = ReceiveDhcpMessage(1, &msgInfo); // failed to select isset. + EXPECT_TRUE(ret == RET_FAILED || ret == RET_ERROR); + ret = ReceiveDhcpMessage(1, &msgInfo); // message length error + EXPECT_TRUE(ret == RET_FAILED || ret == RET_ERROR); + ret = ReceiveDhcpMessage(1, &msgInfo); // dhcp message type error + EXPECT_TRUE(ret == RET_FAILED || ret == RET_ERROR); msgInfo.packet.hlen = 128; - EXPECT_EQ(RET_FAILED, ReceiveDhcpMessage(1, &msgInfo)); // hlen error + ret = ReceiveDhcpMessage(1, &msgInfo); // hlen error + EXPECT_TRUE(ret == RET_FAILED || ret == RET_ERROR); msgInfo.packet.hlen = 16; msgInfo.packet.op = BOOTREPLY; - EXPECT_EQ(RET_FAILED, ReceiveDhcpMessage(1, &msgInfo)); // client op type error! + ret = ReceiveDhcpMessage(1, &msgInfo); // client op type error + EXPECT_TRUE(ret == RET_FAILED || ret == RET_ERROR); msgInfo.packet.op = BOOTREQUEST; - EXPECT_EQ(RET_FAILED, ReceiveDhcpMessage(1, &msgInfo)); // client hardware address error! + ret = ReceiveDhcpMessage(1, &msgInfo); // client hardware address error + EXPECT_TRUE(ret == RET_FAILED || ret == RET_ERROR); for (int i = 0; i < MAC_ADDR_LENGTH; ++i) { msgInfo.packet.chaddr[i] = testMac1[i]; } - EXPECT_EQ(RET_FAILED, ReceiveDhcpMessage(1, &msgInfo)); + ret = ReceiveDhcpMessage(1, &msgInfo); + EXPECT_TRUE(ret == RET_FAILED || ret == RET_ERROR); } extern "C" int FillReply(PDhcpServerContext ctx, PDhcpMsgInfo received, PDhcpMsgInfo reply); @@ -759,12 +757,7 @@ HWTEST_F(DhcpServerTest, AppendReplyTimeOptionsFailedTest, TestSize.Level1) HWTEST_F(DhcpServerTest, FreeServerContextFailedTest, TestSize.Level1) { - DhcpServerContext tempCtx; - tempCtx.instance = nullptr; - ASSERT_TRUE(memset_s(&tempCtx, sizeof(DhcpServerContext), 0, sizeof(DhcpServerContext)) == EOK); - ASSERT_TRUE(memset_s(tempCtx.ifname, sizeof(tempCtx.ifname), '\0', sizeof(tempCtx.ifname)) == EOK); EXPECT_EQ(RET_FAILED, FreeServerContext(nullptr)); - EXPECT_EQ(RET_FAILED, FreeServerContext(&tempCtx)); } extern "C" AddressBinding *GetBinding(DhcpAddressPool *pool, PDhcpMsgInfo received); diff --git a/dhcp/test/services/dhcp_server/unittest/system_func_mock.cpp b/dhcp/test/services/dhcp_server/unittest/system_func_mock.cpp index 7dbe3a3..1871dbc 100644 --- a/dhcp/test/services/dhcp_server/unittest/system_func_mock.cpp +++ b/dhcp/test/services/dhcp_server/unittest/system_func_mock.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -27,13 +27,11 @@ #include #include - using namespace OHOS::Wifi; #define MAGIC_COOKIE_LENGTH 4 #define OPT_HEADER_LENGTH 2 #define TIME_SEC_TO_USEC (1000 * 1000) -#define DHCP_SEL_WAIT_TIMEOUTS 1500 #undef LOG_TAG #define LOG_TAG "DhcpServerSystemFuncMock" @@ -79,6 +77,8 @@ int __wrap_socket(int __domain, int __type, int __protocol) if (g_mockTag) { LOGD(" ==>mock enable."); return SystemFuncMock::GetInstance().socket(__domain, __type, __protocol); + } else { + LOGD(" ==>mock disable."); } return __real_socket(__domain, __type, __protocol); } @@ -90,9 +90,12 @@ int __wrap_setsockopt(int __fd, int __level, int __optname, const void *__optval if (g_mockTag) { LOGD(" ==>mock enable."); return SystemFuncMock::GetInstance().setsockopt(__fd, __level, __optname, __optval, __optlen); + } else { + LOGD(" ==>mock disable."); } return __real_setsockopt(__fd, __level, __optname, __optval, __optlen); } + int __real_select(int __nfds, fd_set *__readfds, fd_set *__writefds, fd_set *__exceptfds, struct timeval *__timeout); int __wrap_select(int __nfds, fd_set *__readfds, fd_set *__writefds, fd_set *__exceptfds, struct timeval *__timeout) { @@ -114,6 +117,8 @@ int __wrap_select(int __nfds, fd_set *__readfds, fd_set *__writefds, fd_set *__e } } return retval; + } else { + LOGD(" ==>mock disable."); } return __real_select(__nfds, __readfds, __writefds, __exceptfds, __timeout); } @@ -125,6 +130,8 @@ int __wrap_bind(int __fd, struct sockaddr *__addr, socklen_t __len) if (g_mockTag) { LOGD(" ==>mock enable."); return SystemFuncMock::GetInstance().bind(__fd, __addr, __len); + } else { + LOGD(" ==>mock disable."); } return __real_bind(__fd, __addr, __len); } @@ -136,6 +143,8 @@ int __wrap_close(int _fileno) if (g_mockTag) { LOGD(" ==>mock enable."); return SystemFuncMock::GetInstance().close(_fileno); + } else { + LOGD(" ==>mock disable."); } return __real_close(_fileno); } @@ -160,6 +169,8 @@ ssize_t recvfrom(int __fd, void *__buf, size_t __n, int __flags, struct sockaddr return sizeof(DhcpMessage); } } + } else { + LOGD(" ==>mock disable."); } return SystemFuncMock::GetInstance().recvfrom(__fd, __buf, __n, __flags, __addr, __addr_len); } @@ -188,6 +199,7 @@ int ParseMockOptions(DhcpMessage *packet) FreeOptionList(&reply.options); return retval; } + ssize_t sendto(int __fd, const void *__buf, size_t __n, int __flags, struct sockaddr *__addr, socklen_t __addr_len) { LOGD("==>sendto."); @@ -196,6 +208,8 @@ ssize_t sendto(int __fd, const void *__buf, size_t __n, int __flags, struct sock if (__buf == nullptr) { return SystemFuncMock::GetInstance().sendto(__fd, __buf, __n, __flags, __addr, __addr_len); } + } else { + LOGD(" ==>mock disable."); } return SystemFuncMock::GetInstance().sendto(__fd, __buf, __n, __flags, __addr, __addr_len); } diff --git a/dhcp/test/services/mgr_service/dhcp_func_test.cpp b/dhcp/test/services/mgr_service/dhcp_func_test.cpp index 2f40dae..ec9e5e0 100644 --- a/dhcp/test/services/mgr_service/dhcp_func_test.cpp +++ b/dhcp/test/services/mgr_service/dhcp_func_test.cpp @@ -226,8 +226,6 @@ HWTEST_F(DhcpFuncTest, InitPidfile_TEST, TestSize.Level1) pidDir = "./"; pidFile = "./wlan.pid"; EXPECT_EQ(DHCP_OPT_FAILED, DhcpFunc::InitPidfile(pidDir, pidFile)); - EXPECT_EQ(DHCP_OPT_SUCCESS, DhcpFunc::InitPidfile(pidDir, pidFile)); - EXPECT_EQ(DHCP_OPT_SUCCESS, DhcpFunc::InitPidfile(pidDir, pidFile)); MockSystemFunc::SetMockFlag(false); } diff --git a/wifi/frameworks/js/napi/src/wifi_napi_p2p.cpp b/wifi/frameworks/js/napi/src/wifi_napi_p2p.cpp index c9059ed..4c7af52 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_p2p.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_p2p.cpp @@ -112,6 +112,7 @@ napi_value GetCurrentGroup(napi_env env, napi_callback_info info) napi_value thisVar = nullptr; void *data = nullptr; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data)); + NAPI_ASSERT(env, wifiP2pPtr != nullptr, "Wifi p2p instance is null."); P2pGroupInfoAsyncContext *asyncContext = new P2pGroupInfoAsyncContext(env); NAPI_ASSERT(env, asyncContext != nullptr, "asyncContext is null."); @@ -142,6 +143,7 @@ napi_value GetP2pGroups(napi_env env, napi_callback_info info) napi_value thisVar = nullptr; void *data = nullptr; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data)); + NAPI_ASSERT(env, wifiP2pPtr != nullptr, "Wifi p2p instance is null."); P2pGroupInfoListAsyncContext *asyncContext = new P2pGroupInfoListAsyncContext(env); NAPI_ASSERT(env, asyncContext != nullptr, "asyncContext is null."); @@ -172,12 +174,12 @@ napi_value DeletePersistentGroup(napi_env env, napi_callback_info info) napi_value argv[argc]; napi_value thisVar; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); + NAPI_ASSERT(env, wifiP2pPtr != nullptr, "Wifi p2p instance is null."); napi_valuetype valueType; napi_typeof(env, argv[0], &valueType); NAPI_ASSERT(env, valueType == napi_number, "Wrong argument type. napi_number expected."); - NAPI_ASSERT(env, wifiP2pPtr != nullptr, "Wifi p2p instance is null."); WifiP2pGroupInfo groupInfo; int netId = -999; napi_get_value_int32(env, argv[0], &netId); @@ -248,6 +250,7 @@ napi_value GetP2pLocalDevice(napi_env env, napi_callback_info info) napi_value thisVar = nullptr; void *data = nullptr; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data)); + NAPI_ASSERT(env, wifiP2pPtr != nullptr, "Wifi p2p instance is null."); P2pLocalDeviceAsyncContext *asyncContext = new P2pLocalDeviceAsyncContext(env); NAPI_ASSERT(env, asyncContext != nullptr, "asyncContext is null."); @@ -279,13 +282,12 @@ napi_value SetDeviceName(napi_env env, napi_callback_info info) napi_value thisVar; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); NAPI_ASSERT(env, argc == 1, "Wrong number of arguments"); + NAPI_ASSERT(env, wifiP2pPtr != nullptr, "Wifi p2p instance is null."); napi_valuetype valueType; napi_typeof(env, argv[0], &valueType); NAPI_ASSERT(env, valueType == napi_string, "Wrong argument type. napi_number expected."); - NAPI_ASSERT(env, wifiP2pPtr != nullptr, "Wifi p2p instance is null."); - char name[64] = {0}; size_t typeLen = 0; napi_get_value_string_utf8(env, argv[0], name, sizeof(name), &typeLen); @@ -321,12 +323,12 @@ napi_value P2pConnect(napi_env env, napi_callback_info info) napi_value argv[argc]; napi_value thisVar; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); + NAPI_ASSERT(env, wifiP2pPtr != nullptr, "Wifi p2p instance is null."); napi_valuetype valueType; napi_typeof(env, argv[0], &valueType); NAPI_ASSERT(env, valueType == napi_object, "Wrong argument type. Object expected."); - NAPI_ASSERT(env, wifiP2pPtr != nullptr, "Wifi p2p instance is null."); WifiP2pConfig config; JsObjToP2pConfig(env, argv[0], config); ErrCode ret = wifiP2pPtr->P2pConnect(config); @@ -356,12 +358,12 @@ napi_value CreateGroup(napi_env env, napi_callback_info info) napi_value argv[1]; napi_value thisVar; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); + NAPI_ASSERT(env, wifiP2pPtr != nullptr, "Wifi p2p instance is null."); napi_valuetype valueType; napi_typeof(env, argv[0], &valueType); NAPI_ASSERT(env, valueType == napi_object, "Wrong argument type. Object expected."); - NAPI_ASSERT(env, wifiP2pPtr != nullptr, "Wifi p2p instance is null."); WifiP2pConfig config; JsObjToP2pConfig(env, argv[0], config); ErrCode ret = wifiP2pPtr->CreateGroup(config); diff --git a/wifi/frameworks/native/interfaces/wifi_p2p_msg.h b/wifi/frameworks/native/interfaces/wifi_p2p_msg.h index 0a9dc3d..357d493 100644 --- a/wifi/frameworks/native/interfaces/wifi_p2p_msg.h +++ b/wifi/frameworks/native/interfaces/wifi_p2p_msg.h @@ -24,7 +24,7 @@ namespace OHOS { namespace Wifi { constexpr int WIFI_STR_MAC_LENGTH = 17; -constexpr int MAX_PASSPHRASE_LENGTH = 63; +constexpr int MAX_PASSPHRASE_LENGTH = 127; constexpr int DEVICE_NAME_LENGTH = 32; enum class P2pGroupStatus { GS_CREATING, GS_CREATED, GS_STARTED, GS_REMOVING, GS_INVALID }; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/handler.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/handler.cpp index 4d7c8af..ef1a2d7 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/handler.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/handler.cpp @@ -46,28 +46,27 @@ bool Handler::InitialHandler() } int ret = pthread_create(&handleThread, nullptr, RunHandleThreadFunc, this); - if (ret < 0) { + if (ret != 0) { LOGE("pthread_create failed.\n"); return false; } - + LOGI("pthread_create ret: %{public}d\n", ret); return true; } void Handler::StopHandlerThread() { - LOGI("Handler::StopHandlerThread"); + LOGI("Enter StopHandlerThread"); if (isRunning) { isRunning = false; if (pMyQueue != nullptr) { pMyQueue->StopQueueLoop(); } - if (handleThread != 0) { pthread_join(handleThread, nullptr); } } - + LOGI("Leave StopHandlerThread"); return; } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.cpp index df87fc3..61ea680 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,10 +12,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "message_queue.h" #include -#include "wifi_log.h" +#include #include "wifi_errcode.h" +#include "wifi_log.h" #undef LOG_TAG #define LOG_TAG "OHWIFI_MESSAGE_QUEUE" @@ -37,20 +39,19 @@ MessageQueue::~MessageQueue() delete current; current = next; } - return; } bool MessageQueue::AddMessageToQueue(InternalMessage *message, int64_t handleTime) { if (message == nullptr) { - LOGE("message is null.\n"); + LOGE("message is null."); return false; } if (mNeedQuit) { MessageManage::GetInstance().ReclaimMsg(message); - LOGE("Already quit the message queue.\n"); + LOGE("Already quit the message queue."); return false; } @@ -87,18 +88,15 @@ bool MessageQueue::AddMessageToQueue(InternalMessage *message, int64_t handleTim /* Wake up the process. */ if (needWake) { - std::unique_lock lck(mMtxBlock); mCvQueue.notify_all(); mIsBlocked = false; } - return true; } bool MessageQueue::DeleteMessageFromQueue(int messageName) { std::unique_lock lck(mMtxQueue); - InternalMessage *pTop = pMessageQueue; if (pTop == nullptr) { return true; @@ -120,7 +118,6 @@ bool MessageQueue::DeleteMessageFromQueue(int messageName) pMessageQueue = pTop->GetNextMsg(); MessageManage::GetInstance().ReclaimMsg(pTop); } - return true; } @@ -133,11 +130,10 @@ InternalMessage *MessageQueue::GetNextMessage() /* Obtains the current time, accurate to milliseconds. */ struct timeval curTime = {0, 0}; if (gettimeofday(&curTime, nullptr) != 0) { - LOGE("gettimeofday failed.\n"); + LOGE("gettimeofday failed."); return nullptr; } int64_t nowTime = static_cast(curTime.tv_sec) * TIME_USEC_1000 + curTime.tv_usec / TIME_USEC_1000; - { std::unique_lock lck(mMtxQueue); InternalMessage *curMsg = pMessageQueue; @@ -152,6 +148,7 @@ InternalMessage *MessageQueue::GetNextMessage() mIsBlocked = false; pMessageQueue = curMsg->GetNextMsg(); curMsg->SetNextMsg(nullptr); + LOGD("Return first message."); return curMsg; } } else { @@ -163,28 +160,26 @@ InternalMessage *MessageQueue::GetNextMessage() std::unique_lock lck(mMtxBlock); if (mIsBlocked && (!mNeedQuit)) { if (mCvQueue.wait_for(lck, std::chrono::milliseconds(nextBlockTime)) == std::cv_status::timeout) { - LOGD("mCvQueue timeout.\n"); + LOGD("mCvQueue timeout."); } else { - LOGD("Wake up.\n"); + LOGD("Wake up."); } } mIsBlocked = false; } - - LOGE("Already quit the message queue.\n"); + LOGE("Already quit the message queue."); return nullptr; } void MessageQueue::StopQueueLoop() { - mNeedQuit = true; - if (mIsBlocked) { - std::unique_lock lck(mMtxBlock); + LOGI("Start stop queue loop."); + while (mIsBlocked) { + mNeedQuit = true; mCvQueue.notify_all(); - mIsBlocked = false; + std::this_thread::sleep_for(std::chrono::milliseconds(1)); // sleep 1 ms } - - return; + LOGI("Queue loop has stopped."); } } // namespace Wifi } // namespace OHOS \ No newline at end of file diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.h index a31371f..c957789 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,6 +16,7 @@ #ifndef OHOS_MESSAGE_QUEUE_H #define OHOS_MESSAGE_QUEUE_H +#include #include #include #include @@ -73,9 +74,9 @@ private: /* Message Queuing */ InternalMessage *pMessageQueue; /* No messages to be executed, blocking */ - bool mIsBlocked; + std::atomic mIsBlocked; /* Exit Loop */ - bool mNeedQuit; + std::atomic mNeedQuit; /* Thread lock of operation queue */ std::mutex mMtxQueue; /* Blocked thread lock */ diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp index 4aa8186..51cd75e 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp @@ -132,7 +132,6 @@ void StateMachine::StopHandlerThread() LOGE("Start StateMachine failed, pStateMachineHandler is nullptr!"); return; } - pStateMachineHandler->StopHandlerThread(); } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_base_hal_interface.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_base_hal_interface.cpp index 0398daf..1f4b5d0 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_base_hal_interface.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_base_hal_interface.cpp @@ -52,6 +52,7 @@ bool WifiBaseHalInterface::InitIdlClient(void) void WifiBaseHalInterface::ExitAllIdlClient(void) { + LOGI("Exit all idl client!"); if (mIdlClient != nullptr) { mIdlClient->ExitAllClient(); } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp index b1c4002..9dc16c9 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp @@ -67,6 +67,7 @@ int WifiIdlClient::InitClient(void) void WifiIdlClient::ExitAllClient(void) { + LOGI("Exit all client!"); if (pRpcClient == nullptr) { return; } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.cpp index 21fb10f..51bf129 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.cpp @@ -378,7 +378,7 @@ void WifiConfigCenter::SetAppPackageName(const std::string &appPackageName) WifiSettings::GetInstance().SetAppPackageName(appPackageName); } -const std::string& WifiConfigCenter::GetAppPackageName() const +const std::string WifiConfigCenter::GetAppPackageName() const { return WifiSettings::GetInstance().GetAppPackageName(); } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.h index 09960fe..8bbd03c 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.h @@ -504,7 +504,7 @@ public: * * @return const std::string& - app package name. */ - const std::string& GetAppPackageName() const; + const std::string GetAppPackageName() const; /** * @Description Set freeze mode state. diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp index 34c3a3b..c0a0b8b 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp @@ -246,7 +246,7 @@ int WifiManager::Init() return -1; } if (WifiConfigCenter::GetInstance().GetStaLastRunState()) { /* Automatic startup upon startup */ - WIFI_LOGE("AutoStartStaApService"); + WIFI_LOGI("AutoStartSta/P2pService"); #ifdef OHOS_ARCH_LITE std::thread startStaSrvThread(WifiManager::AutoStartStaServiceThread); startStaSrvThread.detach(); @@ -261,7 +261,7 @@ int WifiManager::Init() * The sta service automatically starts upon startup. After the sta * service is started, the scanning is directly started. */ - WIFI_LOGE("AutoStartScanService"); + WIFI_LOGI("AutoStartScanService"); AutoStartScanService(); } return 0; @@ -269,6 +269,7 @@ int WifiManager::Init() void WifiManager::Exit() { + WIFI_LOGI("[WifiManager] Exit."); WifiServiceManager::GetInstance().UninstallAllService(); WifiStaHalInterface::GetInstance().ExitAllIdlClient(); WifiInternalEventDispatcher::GetInstance().Exit(); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_net_agent.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_net_agent.cpp index 01931e1..4d37788 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_net_agent.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_net_agent.cpp @@ -93,7 +93,7 @@ void WifiNetAgent::UnregisterNetSupplier() WIFI_LOGI("Unregister network result:%{public}d", result); } -void WifiNetAgent::UpdateNetSupplierInfo(sptr &netSupplierInfo) +void WifiNetAgent::UpdateNetSupplierInfo(const sptr &netSupplierInfo) { TimeStats timeStats(__func__); WIFI_LOGI("Enter UpdateNetSupplierInfo."); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_net_agent.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_net_agent.h index 44f1f78..00b6b77 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_net_agent.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_net_agent.h @@ -60,7 +60,7 @@ public: * @param supplierId network unique identity id returned after network registration * @param netSupplierInfo network data information */ - void UpdateNetSupplierInfo(sptr &netSupplierInfo); + void UpdateNetSupplierInfo(const sptr &netSupplierInfo); /** * Update link information diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp index dc0d426..e878058 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp @@ -1342,9 +1342,9 @@ ErrCode ScanService::ApplyScanPolices(ScanType type) { LOGI("Enter ScanService::ApplyScanPolices."); /* Obtains app parameters and scenario status parameters. */ - auto &appPackageName = WifiSettings::GetInstance().GetAppPackageName(); - auto &trustListPolicies = WifiSettings::GetInstance().ReloadTrustListPolicies(); - auto &movingFreezePolicy = WifiSettings::GetInstance().ReloadMovingFreezePolicy(); + auto appPackageName = WifiSettings::GetInstance().GetAppPackageName(); + auto trustListPolicies = WifiSettings::GetInstance().ReloadTrustListPolicies(); + auto movingFreezePolicy = WifiSettings::GetInstance().ReloadMovingFreezePolicy(); ErrCode rlt = WIFI_OPT_SUCCESS; if (appPackageName.empty()) { rlt = AllowScanByType(type); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine.cpp index 30e7b9b..a89f85d 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,15 +12,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "scan_state_machine.h" +#include "wifi_error_no.h" #include "wifi_logger.h" #include "wifi_settings.h" #include "wifi_sta_hal_interface.h" -DEFINE_WIFILOG_SCAN_LABEL("ScanStateMachine"); - namespace OHOS { namespace Wifi { +DEFINE_WIFILOG_SCAN_LABEL("ScanStateMachine"); +std::shared_mutex ScanStateMachine::lock; + ScanStateMachine::ScanStateMachine() : StateMachine("ScanStateMachine"), quitFlag(false), @@ -121,11 +124,11 @@ bool ScanStateMachine::InitScanStateMachine() if (InitCommonScanState() != true) { return false; - }; + } if (InitPnoScanState() != true) { return false; - }; + } BuildScanStateTree(); SetFirstState(initState); @@ -157,8 +160,11 @@ ScanStateMachine::InitState::~InitState() void ScanStateMachine::InitState::GoInState() { WIFI_LOGI("Enter ScanStateMachine::InitState::GoInState.\n"); - pScanStateMachine->runningScans.clear(); - pScanStateMachine->waitingScans.clear(); + { + std::unique_lock guard(lock); + pScanStateMachine->runningScans.clear(); + pScanStateMachine->waitingScans.clear(); + } if (pScanStateMachine->quitFlag) { WIFI_LOGI("Notify finish ScanStateMachine.\n"); @@ -475,13 +481,11 @@ void ScanStateMachine::PnoScanHardware::GoInState() WIFI_LOGE("StartPnoScanHardware failed."); return; } - return; } void ScanStateMachine::PnoScanHardware::GoOutState() { WIFI_LOGI("Enter ScanStateMachine::PnoScanHardware::GoOutState.\n"); - return; } bool ScanStateMachine::PnoScanHardware::ExecuteStateMsg(InternalMessage *msg) @@ -525,7 +529,6 @@ ScanStateMachine::CommonScanAfterPno::CommonScanAfterPno(ScanStateMachine *paraS : State("CommonScanAfterPno") { pScanStateMachine = paraScanStateMachine; - return; } ScanStateMachine::CommonScanAfterPno::~CommonScanAfterPno() @@ -535,7 +538,6 @@ void ScanStateMachine::CommonScanAfterPno::GoInState() { WIFI_LOGI("Enter ScanStateMachine::CommonScanAfterPno::GoInState.\n"); pScanStateMachine->CommonScanAfterPnoProcess(); - return; } void ScanStateMachine::CommonScanAfterPno::GoOutState() @@ -545,8 +547,6 @@ void ScanStateMachine::CommonScanAfterPno::GoOutState() pScanStateMachine->StopTimer(static_cast(WAIT_SCAN_RESULT_TIMER)); } pScanStateMachine->remainWaitResultTimer = false; - - return; } bool ScanStateMachine::CommonScanAfterPno::ExecuteStateMsg(InternalMessage *msg) @@ -609,14 +609,12 @@ void ScanStateMachine::PnoScanSoftware::GoInState() if (!pScanStateMachine->StartNewSoftwareScan()) { WIFI_LOGE("failed to start new softwareScan"); } - return; } void ScanStateMachine::PnoScanSoftware::GoOutState() { WIFI_LOGI("Enter ScanStateMachine::PnoScanSoftware::GoOutState.\n"); pScanStateMachine->StopTimer(static_cast(SOFTWARE_PNO_SCAN_TIMER)); - return; } bool ScanStateMachine::PnoScanSoftware::ExecuteStateMsg(InternalMessage *msg) @@ -649,13 +647,11 @@ ScanStateMachine::PnoSwScanFree::~PnoSwScanFree() void ScanStateMachine::PnoSwScanFree::GoInState() { WIFI_LOGI("Enter ScanStateMachine::PnoSwScanFree::GoInState.\n"); - return; } void ScanStateMachine::PnoSwScanFree::GoOutState() { WIFI_LOGI("Enter ScanStateMachine::PnoSwScanFree::GoOutState.\n"); - return; } bool ScanStateMachine::PnoSwScanFree::ExecuteStateMsg(InternalMessage *msg) @@ -706,14 +702,12 @@ ScanStateMachine::PnoSwScanning::~PnoSwScanning() void ScanStateMachine::PnoSwScanning::GoInState() { WIFI_LOGI("Enter ScanStateMachine::PnoSwScanning::GoInState.\n"); - return; } void ScanStateMachine::PnoSwScanning::GoOutState() { WIFI_LOGI("Enter ScanStateMachine::PnoSwScanning::GoOutState.\n"); pScanStateMachine->StopTimer(static_cast(WAIT_SCAN_RESULT_TIMER)); - return; } bool ScanStateMachine::PnoSwScanning::ExecuteStateMsg(InternalMessage *msg) @@ -773,10 +767,11 @@ void ScanStateMachine::CommonScanRequestProcess(InternalMessage *interMessage) WIFI_LOGE("invalid scan type"); return; } - waitingScans.insert(std::pair(requestIndex, scanConfig)); + { + std::unique_lock guard(lock); + waitingScans.insert(std::pair(requestIndex, scanConfig)); + } StartNewCommonScan(); - - return; } bool ScanStateMachine::GetCommonScanRequestInfo( @@ -794,7 +789,6 @@ bool ScanStateMachine::GetCommonScanRequestInfo( WIFI_LOGE("GetCommonScanConfig failed."); return false; } - return true; } @@ -835,7 +829,6 @@ bool ScanStateMachine::GetCommonScanConfig(InternalMessage *interMessage, InterS scanConfig.maxScansCache = interMessage->GetIntFromMessage(); scanConfig.maxBackScanPeriod = interMessage->GetIntFromMessage(); scanConfig.scanStyle = interMessage->GetIntFromMessage(); - return true; } @@ -843,45 +836,46 @@ void ScanStateMachine::StartNewCommonScan() { WIFI_LOGI("Enter ScanStateMachine::StartNewCommonScan.\n"); - if (waitingScans.size() == 0) { - ContinuePnoScanProcess(); - return; - } - - ClearRunningScanSettings(); - bool hasFullScan = false; - /* Traverse the request list and combine parameters */ - std::map::iterator configIter = waitingScans.begin(); - for (; configIter != waitingScans.end(); ++configIter) { - runningScanSettings.scanStyle = MergeScanStyle(runningScanSettings.scanStyle, configIter->second.scanStyle); - - std::vector::iterator hiddenIter = configIter->second.hiddenNetworkSsid.begin(); - /* Remove duplicate hidden list */ - for (; hiddenIter != configIter->second.hiddenNetworkSsid.end(); ++hiddenIter) { - if (std::find(runningScanSettings.hiddenNetworkSsid.begin(), - runningScanSettings.hiddenNetworkSsid.end(), - *hiddenIter) != runningScanSettings.hiddenNetworkSsid.end()) { - continue; - } - runningScanSettings.hiddenNetworkSsid.push_back(*hiddenIter); + { + std::shared_lock guard(lock); + if (waitingScans.size() == 0) { + ContinuePnoScanProcess(); + return; } + ClearRunningScanSettings(); + bool hasFullScan = false; + /* Traverse the request list and combine parameters */ + std::map::iterator configIter = waitingScans.begin(); + for (; configIter != waitingScans.end(); ++configIter) { + runningScanSettings.scanStyle = MergeScanStyle(runningScanSettings.scanStyle, configIter->second.scanStyle); + std::vector::iterator hiddenIter = configIter->second.hiddenNetworkSsid.begin(); + /* Remove duplicate hidden list */ + for (; hiddenIter != configIter->second.hiddenNetworkSsid.end(); ++hiddenIter) { + if (std::find(runningScanSettings.hiddenNetworkSsid.begin(), + runningScanSettings.hiddenNetworkSsid.end(), + *hiddenIter) != runningScanSettings.hiddenNetworkSsid.end()) { + continue; + } + runningScanSettings.hiddenNetworkSsid.push_back(*hiddenIter); + } - if (!hasFullScan) { - /* When scanFreqs is empty, it means that scan all frequenties */ - if (configIter->second.scanFreqs.empty()) { - runningScanSettings.scanFreqs.clear(); - runningFullScanFlag = true; - hasFullScan = true; - } else { - std::vector::iterator freqIter = configIter->second.scanFreqs.begin(); - /* Repetitions are eliminated */ - for (; freqIter != configIter->second.scanFreqs.end(); ++freqIter) { - if (std::find(runningScanSettings.scanFreqs.begin(), - runningScanSettings.scanFreqs.end(), - *freqIter) != runningScanSettings.scanFreqs.end()) { - continue; + if (!hasFullScan) { + /* When scanFreqs is empty, it means that scan all frequenties */ + if (configIter->second.scanFreqs.empty()) { + runningScanSettings.scanFreqs.clear(); + runningFullScanFlag = true; + hasFullScan = true; + } else { + std::vector::iterator freqIter = configIter->second.scanFreqs.begin(); + /* Repetitions are eliminated */ + for (; freqIter != configIter->second.scanFreqs.end(); ++freqIter) { + if (std::find(runningScanSettings.scanFreqs.begin(), + runningScanSettings.scanFreqs.end(), + *freqIter) != runningScanSettings.scanFreqs.end()) { + continue; + } + runningScanSettings.scanFreqs.push_back(*freqIter); } - runningScanSettings.scanFreqs.push_back(*freqIter); } } } @@ -893,12 +887,11 @@ void ScanStateMachine::StartNewCommonScan() return; } + std::unique_lock guard(lock); runningScans.swap(waitingScans); waitingScans.clear(); SwitchState(commonScanningState); WIFI_LOGI("StartNewCommonScan success.\n"); - - return; } void ScanStateMachine::ClearRunningScanSettings() @@ -935,7 +928,6 @@ bool ScanStateMachine::StartSingleCommonScan(WifiScanParam &scanParam) * fails */ StartTimer(static_cast(WAIT_SCAN_RESULT_TIMER), MAX_WAIT_SCAN_RESULT_TIME); - return true; } @@ -951,12 +943,12 @@ void ScanStateMachine::CommonScanWhenRunning(InternalMessage *interMessage) } if (ActiveCoverNewScan(scanConfig)) { + std::unique_lock guard(lock); runningScans.insert(std::pair(requestIndex, scanConfig)); } else { + std::unique_lock guard(lock); waitingScans.insert(std::pair(requestIndex, scanConfig)); } - - return; } bool ScanStateMachine::ActiveCoverNewScan(InterScanConfig &interScanConfig) @@ -1003,7 +995,6 @@ bool ScanStateMachine::ActiveCoverNewScan(InterScanConfig &interScanConfig) return false; } } - return true; } @@ -1023,9 +1014,8 @@ void ScanStateMachine::CommonScanInfoProcess() if (scanStatusReportHandler) { scanStatusReportHandler(scanStatusReport); } + std::unique_lock guard(lock); runningScans.clear(); - - return; } void ScanStateMachine::GetSecurityTypeAndBand(std::vector &scanInfos) @@ -1088,8 +1078,6 @@ void ScanStateMachine::ReportStatusChange(ScanStatus status) if (scanStatusReportHandler) { scanStatusReportHandler(scanStatusReport); } - - return; } void ScanStateMachine::ReportScanInnerEvent(ScanInnerEventType innerEvent) @@ -1102,8 +1090,6 @@ void ScanStateMachine::ReportScanInnerEvent(ScanInnerEventType innerEvent) if (scanStatusReportHandler) { scanStatusReportHandler(scanStatusReport); } - - return; } void ScanStateMachine::ReportCommonScanFailed(int requestIndex) @@ -1120,8 +1106,6 @@ void ScanStateMachine::ReportCommonScanFailed(int requestIndex) if (scanStatusReportHandler) { scanStatusReportHandler(scanStatusReport); } - - return; } void ScanStateMachine::ReportCommonScanFailedAndClear(bool runningFlag) @@ -1131,9 +1115,11 @@ void ScanStateMachine::ReportCommonScanFailedAndClear(bool runningFlag) ScanStatusReport scanStatusReport; if (runningFlag) { GetRunningIndexList(scanStatusReport.requestIndexList); + std::unique_lock guard(lock); runningScans.clear(); } else { GetWaitingIndexList(scanStatusReport.requestIndexList); + std::unique_lock guard(lock); waitingScans.clear(); } @@ -1145,28 +1131,24 @@ void ScanStateMachine::ReportCommonScanFailedAndClear(bool runningFlag) if (scanStatusReportHandler) { scanStatusReportHandler(scanStatusReport); } - - return; } void ScanStateMachine::GetRunningIndexList(std::vector &runningIndexList) { + std::shared_lock guard(lock); std::map::iterator iter = runningScans.begin(); for (; iter != runningScans.end(); ++iter) { runningIndexList.push_back(iter->first); } - - return; } void ScanStateMachine::GetWaitingIndexList(std::vector &waitingIndexList) { + std::shared_lock guard(lock); std::map::iterator iter = waitingScans.begin(); for (; iter != waitingScans.end(); ++iter) { waitingIndexList.push_back(iter->first); } - - return; } bool ScanStateMachine::VerifyScanStyle(int scanStyle) @@ -1206,7 +1188,7 @@ int ScanStateMachine::MergeScanStyle(int currentScanStyle, int newScanStyle) void ScanStateMachine::RemoveCommonScanRequest(int requestIndex) { WIFI_LOGI("Enter ScanStateMachine::RemoveCommonScanRequest.\n"); - + std::unique_lock guard(lock); if (runningScans.count(requestIndex) == 1) { runningScans.erase(requestIndex); } @@ -1214,8 +1196,6 @@ void ScanStateMachine::RemoveCommonScanRequest(int requestIndex) if (waitingScans.count(requestIndex) == 1) { waitingScans.erase(requestIndex); } - - return; } void ScanStateMachine::PnoScanRequestProcess(InternalMessage *interMessage) @@ -1232,8 +1212,6 @@ void ScanStateMachine::PnoScanRequestProcess(InternalMessage *interMessage) } else { SwitchState(pnoScanSoftwareState); } - - return; } void ScanStateMachine::ContinuePnoScanProcess() @@ -1270,8 +1248,6 @@ void ScanStateMachine::PnoScanHardwareProcess(InternalMessage *interMessage) WIFI_LOGE("StartPnoScanHardware failed."); return; } - - return; } bool ScanStateMachine::StartPnoScanHardware() @@ -1305,7 +1281,6 @@ bool ScanStateMachine::StartPnoScanHardware() return false; } runningHwPnoFlag = true; - return true; } @@ -1326,7 +1301,6 @@ void ScanStateMachine::StopPnoScanHardware() } runningHwPnoFlag = false; - return; } void ScanStateMachine::UpdatePnoScanRequest(InternalMessage *interMessage) @@ -1337,8 +1311,6 @@ void ScanStateMachine::UpdatePnoScanRequest(InternalMessage *interMessage) WIFI_LOGE("GetPnoScanRequestInfo failed."); return; } - - return; } bool ScanStateMachine::GetPnoScanRequestInfo(InternalMessage *interMessage) @@ -1418,7 +1390,6 @@ bool ScanStateMachine::GetPnoScanConfig(InternalMessage *interMessage, PnoScanCo } pnoScanConfig.freqs.push_back(freqs); } - return true; } @@ -1482,8 +1453,6 @@ void ScanStateMachine::CommonScanAfterPnoProcess() SwitchState(pnoScanHardwareState); return; } - - return; } void ScanStateMachine::CommonScanAfterPnoResult() @@ -1497,7 +1466,6 @@ void ScanStateMachine::CommonScanAfterPnoResult() } ReportPnoScanInfos(scanInfos); - return; } void ScanStateMachine::PnoScanFailedProcess() @@ -1508,8 +1476,6 @@ void ScanStateMachine::PnoScanFailedProcess() runningSwPnoFlag = false; ClearPnoScanConfig(); ReportStatusChange(PNO_SCAN_FAILED); - - return; } void ScanStateMachine::ClearPnoScanConfig() @@ -1544,7 +1510,6 @@ bool ScanStateMachine::GetScanInfos(std::vector &scanInfos) } WIFI_LOGI("End: QueryScanInfos."); GetSecurityTypeAndBand(scanInfos); - return true; } @@ -1557,7 +1522,6 @@ bool ScanStateMachine::StartNewSoftwareScan() return false; } StartTimer(int(SOFTWARE_PNO_SCAN_TIMER), (runningPnoScanConfig.scanInterval) * SECOND_TO_MILLI_SECOND); - return true; } @@ -1582,7 +1546,6 @@ bool ScanStateMachine::RepeatStartCommonScan() runningSwPnoFlag = true; SwitchState(pnoSwScanningState); - return true; } @@ -1598,7 +1561,6 @@ void ScanStateMachine::StopPnoScanSoftware() StopTimer(int(WAIT_SCAN_RESULT_TIMER)); /* Stop the PNO software scanning timer. */ StopTimer(int(SOFTWARE_PNO_SCAN_TIMER)); - runningSwPnoFlag = false; return; } @@ -1621,8 +1583,6 @@ void ScanStateMachine::PnoScanSoftwareProcess(InternalMessage *interMessage) WIFI_LOGE("StartPnoScanSoftware failed."); return; } - - return; } void ScanStateMachine::SoftwareScanInfoProcess() @@ -1635,7 +1595,6 @@ void ScanStateMachine::SoftwareScanInfoProcess() } ReportPnoScanInfos(scanInfos); - return; } bool ScanStateMachine::InitCommonScanState() @@ -1671,7 +1630,6 @@ bool ScanStateMachine::InitCommonScanState() WIFI_LOGE("Alloc commonScanningState failed.\n"); return false; } - return true; } @@ -1714,7 +1672,6 @@ bool ScanStateMachine::InitPnoScanState() WIFI_LOGE("Alloc pnoSwScanningState failed.\n"); return false; } - return true; } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine.h index 9c12e00..8ff917c 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,21 +12,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #ifndef OHOS_SCAN_STATE_MACHINE_H #define OHOS_SCAN_STATE_MACHINE_H #include +#include #include +#include #include #include #include -#include "wifi_log.h" -#include "wifi_error_no.h" -#include "wifi_scan_param.h" #include "scan_common.h" #include "state_machine.h" -#include "wifi_msg.h" #include "wifi_errcode.h" +#include "wifi_log.h" +#include "wifi_msg.h" +#include "wifi_scan_param.h" namespace OHOS { namespace Wifi { @@ -248,7 +250,7 @@ public: }; private: - bool quitFlag; /* Scanning state machine exit flag */ + std::atomic quitFlag; /* Scanning state machine exit flag */ InitState *initState; /* Scanning initial status pointer */ HardwareReady *hardwareReadyState; /* Pointer to the hardware startup completion status */ CommonScan *commonScanState; /* Pointer to the common scanning status */ @@ -287,6 +289,8 @@ private: */ bool runningSwPnoFlag; /* Software PNO scanning is in progress. */ + static std::shared_mutex lock; /* data lock */ + /** * @Description Processing of Scan Requests Received in Idle State. * diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.cpp index 378e6a0..7eb1e0d 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,16 +12,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "wifi_service_manager.h" #include #include "wifi_logger.h" #include "define.h" #include "wifi_settings.h" -DEFINE_WIFILOG_LABEL("WifiServiceManager"); - namespace OHOS { namespace Wifi { +DEFINE_WIFILOG_LABEL("WifiServiceManager"); WifiServiceManager &WifiServiceManager::GetInstance() { static WifiServiceManager gWifiServiceManager; @@ -86,7 +86,10 @@ int WifiServiceManager::CheckPreLoadService(void) int WifiServiceManager::LoadStaService(const std::string &dlname, bool bCreate) { + WIFI_LOGI("WifiServiceManager::LoadStaService"); + std::unique_lock lock(mStaMutex); if (mStaServiceHandle.handle != nullptr) { + WIFI_LOGE("WifiServiceManager::handle is not null: %{public}s", dlname.c_str()); return 0; } mStaServiceHandle.handle = dlopen(dlname.c_str(), RTLD_LAZY); @@ -110,7 +113,10 @@ int WifiServiceManager::LoadStaService(const std::string &dlname, bool bCreate) int WifiServiceManager::LoadScanService(const std::string &dlname, bool bCreate) { + WIFI_LOGI("WifiServiceManager::LoadScanService"); + std::unique_lock lock(mScanMutex); if (mScanServiceHandle.handle != nullptr) { + WIFI_LOGE("WifiServiceManager::handle is not null: %{public}s", dlname.c_str()); return 0; } mScanServiceHandle.handle = dlopen(dlname.c_str(), RTLD_LAZY); @@ -135,7 +141,10 @@ int WifiServiceManager::LoadScanService(const std::string &dlname, bool bCreate) #ifdef FEATURE_AP_SUPPORT int WifiServiceManager::LoadApService(const std::string &dlname, bool bCreate) { + WIFI_LOGI("WifiServiceManager::LoadApService"); + std::unique_lock lock(mApMutex); if (mApServiceHandle.handle != nullptr) { + WIFI_LOGE("WifiServiceManager::handle is not null: %{public}s", dlname.c_str()); return 0; } mApServiceHandle.handle = dlopen(dlname.c_str(), RTLD_LAZY); @@ -165,7 +174,10 @@ int WifiServiceManager::LoadApService(const std::string &dlname, bool bCreate) #ifdef FEATURE_P2P_SUPPORT int WifiServiceManager::LoadP2pService(const std::string &dlname, bool bCreate) { + WIFI_LOGI("WifiServiceManager::LoadP2pService"); + std::unique_lock lock(mP2pMutex); if (mP2pServiceHandle.handle != nullptr) { + WIFI_LOGE("WifiServiceManager::handle is not null: %{public}s", dlname.c_str()); return 0; } mP2pServiceHandle.handle = dlopen(dlname.c_str(), RTLD_LAZY); @@ -197,7 +209,6 @@ int WifiServiceManager::CheckAndEnforceService(const std::string &name, bool bCr return -1; } WIFI_LOGD("WifiServiceManager::CheckAndEnforceService get dllname: %{public}s", dlname.c_str()); - std::unique_lock lock(mMutex); if (name == WIFI_SERVICE_STA) { return LoadStaService(dlname, bCreate); } @@ -219,28 +230,28 @@ int WifiServiceManager::CheckAndEnforceService(const std::string &name, bool bCr IStaService *WifiServiceManager::GetStaServiceInst() { + WIFI_LOGI("WifiServiceManager::GetStaServiceInst"); + std::unique_lock lock(mStaMutex); if (mStaServiceHandle.handle == nullptr) { + WIFI_LOGE("WifiServiceManager, Sta handle is null"); return nullptr; } if (mStaServiceHandle.pService == nullptr) { - std::unique_lock lock(mMutex); - if (mStaServiceHandle.pService == nullptr) { - mStaServiceHandle.pService = mStaServiceHandle.create(); - } + mStaServiceHandle.pService = mStaServiceHandle.create(); } return mStaServiceHandle.pService; } IScanService *WifiServiceManager::GetScanServiceInst() { + WIFI_LOGI("WifiServiceManager::GetScanServiceInst"); + std::unique_lock lock(mScanMutex); if (mScanServiceHandle.handle == nullptr) { + WIFI_LOGE("WifiServiceManager, Scan handle is null"); return nullptr; } if (mScanServiceHandle.pService == nullptr) { - std::unique_lock lock(mMutex); - if (mScanServiceHandle.pService == nullptr) { - mScanServiceHandle.pService = mScanServiceHandle.create(); - } + mScanServiceHandle.pService = mScanServiceHandle.create(); } return mScanServiceHandle.pService; } @@ -248,6 +259,8 @@ IScanService *WifiServiceManager::GetScanServiceInst() #ifdef FEATURE_AP_SUPPORT IApService *WifiServiceManager::GetApServiceInst(int id) { + WIFI_LOGI("WifiServiceManager::GetApServiceInst"); + std::unique_lock lock(mApMutex); if (mApServiceHandle.handle == nullptr) { WIFI_LOGE("Get ap service instance handle is null."); return nullptr; @@ -264,7 +277,6 @@ IApService *WifiServiceManager::GetApServiceInst(int id) } WIFI_LOGI("[Get] create a new ap service instance: %{public}d", id); - std::unique_lock lock(mMutex); IApService *service = mApServiceHandle.create(id); mApServiceHandle.pService[id] = service; return service; @@ -274,14 +286,14 @@ IApService *WifiServiceManager::GetApServiceInst(int id) #ifdef FEATURE_P2P_SUPPORT IP2pService *WifiServiceManager::GetP2pServiceInst() { + WIFI_LOGI("WifiServiceManager::GetP2pServiceInst"); + std::unique_lock lock(mP2pMutex); if (mP2pServiceHandle.handle == nullptr) { + WIFI_LOGE("WifiServiceManager, P2p handle is null"); return nullptr; } if (mP2pServiceHandle.pService == nullptr) { - std::unique_lock lock(mMutex); - if (mP2pServiceHandle.pService == nullptr) { - mP2pServiceHandle.pService = mP2pServiceHandle.create(); - } + mP2pServiceHandle.pService = mP2pServiceHandle.create(); } return mP2pServiceHandle.pService; } @@ -289,7 +301,10 @@ IP2pService *WifiServiceManager::GetP2pServiceInst() int WifiServiceManager::UnloadStaService(bool bPreLoad) { + WIFI_LOGI("WifiServiceManager::UnloadStaService"); + std::unique_lock lock(mStaMutex); if (mStaServiceHandle.handle == nullptr) { + WIFI_LOGE("WifiServiceManager::UnloadStaService handle is null"); return 0; } if (mStaServiceHandle.pService != nullptr) { @@ -305,7 +320,10 @@ int WifiServiceManager::UnloadStaService(bool bPreLoad) int WifiServiceManager::UnloadScanService(bool bPreLoad) { + WIFI_LOGI("WifiServiceManager::UnloadScanService"); + std::unique_lock lock(mScanMutex); if (mScanServiceHandle.handle == nullptr) { + WIFI_LOGE("WifiServiceManager::UnloadScanService handle is null"); return 0; } if (mScanServiceHandle.pService != nullptr) { @@ -322,8 +340,13 @@ int WifiServiceManager::UnloadScanService(bool bPreLoad) #ifdef FEATURE_AP_SUPPORT int WifiServiceManager::UnloadApService(bool bPreLoad, int id) { - if (mApServiceHandle.handle == nullptr) { - return 0; + WIFI_LOGI("WifiServiceManager::UnloadApService id=%{public}d, max_id=%{public}d", id, AP_INSTANCE_MAX_NUM); + { + std::unique_lock lock(mApMutex); + if (mApServiceHandle.handle == nullptr) { + WIFI_LOGE("WifiServiceManager::UnloadApService handle is null"); + return 0; + } } /* Unload all ap service */ @@ -332,6 +355,7 @@ int WifiServiceManager::UnloadApService(bool bPreLoad, int id) UnloadApService(bPreLoad, i); } } else { + std::unique_lock lock(mApMutex); auto iter = mApServiceHandle.pService.find(id); if (iter != mApServiceHandle.pService.end()) { if (iter->second != nullptr) { @@ -340,10 +364,10 @@ int WifiServiceManager::UnloadApService(bool bPreLoad, int id) } mApServiceHandle.pService.erase(id); } - } - if (!bPreLoad && mApServiceHandle.pService.empty()) { - dlclose(mApServiceHandle.handle); - mApServiceHandle.Clear(); + if (!bPreLoad && mApServiceHandle.pService.empty()) { + dlclose(mApServiceHandle.handle); + mApServiceHandle.Clear(); + } } return 0; } @@ -352,7 +376,10 @@ int WifiServiceManager::UnloadApService(bool bPreLoad, int id) #ifdef FEATURE_P2P_SUPPORT int WifiServiceManager::UnloadP2pService(bool bPreLoad) { + WIFI_LOGI("WifiServiceManager::UnloadP2pService"); + std::unique_lock lock(mP2pMutex); if (mP2pServiceHandle.handle == nullptr) { + WIFI_LOGE("WifiServiceManager::UnloadP2pService handle is null"); return 0; } if (mP2pServiceHandle.pService != nullptr) { @@ -371,7 +398,6 @@ int WifiServiceManager::UnloadService(const std::string &name, int id) { bool bPreLoad = WifiSettings::GetInstance().IsModulePreLoad(name); WIFI_LOGI("WifiServiceManager::UnloadService name: %{public}s", name.c_str()); - std::unique_lock lock(mMutex); if (name == WIFI_SERVICE_STA) { return UnloadStaService(bPreLoad); } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.h index 789008a..6f59df0 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.h @@ -199,7 +199,10 @@ private: #endif private: - std::mutex mMutex; + std::mutex mStaMutex; + std::mutex mScanMutex; + std::mutex mP2pMutex; + std::mutex mApMutex; std::unordered_map mServiceDllMap; StaServiceHandle mStaServiceHandle; ScanServiceHandle mScanServiceHandle; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check.cpp index 1e111f0..6b17c5d 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,8 +12,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "sta_network_check.h" -#include "if_config.h" #include "wifi_logger.h" DEFINE_WIFILOG_LABEL("StaNetworkCheck"); @@ -35,6 +35,7 @@ StaNetworkCheck::StaNetworkCheck(NetStateHandler handle) lastNetState = NETWORK_STATE_UNKNOWN; isStopNetCheck = true; isExitNetCheckThread = false; + isExited = true; } StaNetworkCheck::~StaNetworkCheck() @@ -73,7 +74,7 @@ bool StaNetworkCheck::HttpDetection() constexpr int PORTAL_CONTENT_LENGTH_MIN = 4; if (codeNum == NET_ERR_NO_CONTENT) { WIFI_LOGE("This network is normal!"); - if ((lastNetState != NETWORK_STATE_WORKING) && (isExitNetCheckThread == false) && + if ((lastNetState.load() != NETWORK_STATE_WORKING) && (isExitNetCheckThread == false) && (isStopNetCheck == false)) { netStateHandler(StaNetState::NETWORK_STATE_WORKING, ""); } @@ -120,7 +121,7 @@ bool StaNetworkCheck::HttpDetection() } } WIFI_LOGE("This network can't online!"); - if ((lastNetState != NETWORK_STATE_NOWORKING) && (isExitNetCheckThread == false) && (isStopNetCheck == false)) { + if ((lastNetState.load() != NETWORK_STATE_NOWORKING) && (isExitNetCheckThread == false) && (isStopNetCheck == false)) { netStateHandler(StaNetState::NETWORK_STATE_NOWORKING, ""); } lastNetState = NETWORK_STATE_NOWORKING; @@ -131,28 +132,28 @@ void StaNetworkCheck::RunNetCheckThreadFunc() { WIFI_LOGI("enter RunNetCheckThreadFunc!\n"); int timeoutMs = 3000; + isExited = false; for (;;) { while (isStopNetCheck && !isExitNetCheckThread) { LOGI("waiting for signal.\n"); std::unique_lock lck(mMutex); mCondition.wait(lck); } - if (isExitNetCheckThread) { WIFI_LOGI("break the loop\n"); + isExited = true; break; } - if (!HttpDetection()) { isStopNetCheck = true; } - if (!isExitNetCheckThread) { std::unique_lock lck(mMutex); if (mCondition_timeout.wait_for(lck, std::chrono::milliseconds(timeoutMs)) == std::cv_status::timeout) { - LOGD("mCondition_timeout timeout.\n"); + LOGI("mCondition_timeout timeout.\n"); } else { - LOGD("Wake up, break the loop.\n"); + LOGI("Wake up, break the loop.\n"); + isExited = true; break; } } @@ -172,14 +173,12 @@ ErrCode StaNetworkCheck::InitNetCheckThread() void StaNetworkCheck::StopNetCheckThread() { WIFI_LOGI("enter StopNetCheckThread!\n"); - std::unique_lock lck(mMutex); isStopNetCheck = true; } void StaNetworkCheck::SignalNetCheckThread() { WIFI_LOGI("enter SignalNetCheckThread!\n"); - std::unique_lock lck(mMutex); lastNetState = NETWORK_STATE_UNKNOWN; isStopNetCheck = false; mCondition.notify_one(); @@ -187,20 +186,21 @@ void StaNetworkCheck::SignalNetCheckThread() void StaNetworkCheck::ExitNetCheckThread() { - { - std::unique_lock lck(mMutex); - isStopNetCheck = false; + isStopNetCheck = false; + while (!isExited) { isExitNetCheckThread = true; mCondition.notify_one(); mCondition_timeout.notify_one(); + std::this_thread::sleep_for(std::chrono::milliseconds(1)); // sleep 1 ms } - if (pDealNetCheckThread != nullptr) { - LOGD("pDealNetCheckThread->join();"); - pDealNetCheckThread->join(); + if (pDealNetCheckThread->joinable()) { + LOGI("Exit net check join()"); + pDealNetCheckThread->join(); + } delete pDealNetCheckThread; pDealNetCheckThread = nullptr; - LOGD("pDealNetCheckThread = nullptr; done"); + LOGI("Exit net check done"); } } } // namespace Wifi diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check.h index 2950171..b355200 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,17 +16,18 @@ #ifndef OHOS_WIFI_NET_CHECK_H #define OHOS_WIFI_NET_CHECK_H -#include +#include +#include #include #include -#include -#include #include #include -#include "wifi_log.h" -#include "sta_define.h" +#include +#include #include "http_request.h" +#include "sta_define.h" #include "wifi_errcode.h" +#include "wifi_log.h" #define DEFAULT_PORTAL_HTTPS_URL "" @@ -55,10 +56,16 @@ public: */ virtual void StopNetCheckThread(); + /** + * @Description : Exit the NetCheck thread. + * + */ + virtual void ExitNetCheckThread(); + private: std::thread *pDealNetCheckThread; NetStateHandler netStateHandler; - StaNetState lastNetState; + std::atomic lastNetState; /** * @Description : Detect Internet ability @@ -70,18 +77,14 @@ private: * */ void RunNetCheckThreadFunc(); - /** - * @Description : Exit the NetCheck thread. - * - */ - void ExitNetCheckThread(); private: std::mutex mMutex; std::condition_variable mCondition; std::condition_variable mCondition_timeout; - bool isStopNetCheck; - bool isExitNetCheckThread; + std::atomic isStopNetCheck; + std::atomic isExitNetCheckThread; + std::atomic isExited; }; } // namespace Wifi } // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp index 526c867..737ac31 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp @@ -90,7 +90,6 @@ StaStateMachine::~StaStateMachine() ParsePointer(pGetIpState); ParsePointer(pLinkedState); ParsePointer(pApRoamingState); - if (pDhcpService != nullptr) { if (currentTpType == IPTYPE_IPV4) { pDhcpService->StopDhcpClient(IF_NAME, false); @@ -415,9 +414,9 @@ void StaStateMachine::StartWifiProcess() } #ifndef OHOS_ARCH_LITE WIFI_LOGI("Register netsupplier"); - std::thread([this]() { + std::thread([cb = staCallback]() { WifiNetAgent::GetInstance().RegisterNetSupplier(); - WifiNetAgent::GetInstance().RegisterNetSupplierCallback(staCallback); + WifiNetAgent::GetInstance().RegisterNetSupplierCallback(cb); }).detach(); #endif /* Initialize Connection Information. */ @@ -848,9 +847,9 @@ void StaStateMachine::DealConnectionEvent(InternalMessage *msg) if (NetSupplierInfo != nullptr) { NetSupplierInfo->isAvailable_ = true; NetSupplierInfo->isRoaming_ = isRoam; - std::thread([this]() { + std::thread([netInfo = NetSupplierInfo]() { WIFI_LOGI("On connect update net supplier info\n"); - WifiNetAgent::GetInstance().UpdateNetSupplierInfo(NetSupplierInfo); + WifiNetAgent::GetInstance().UpdateNetSupplierInfo(netInfo); }).detach(); } #endif @@ -875,9 +874,9 @@ void StaStateMachine::DealDisconnectEvent(InternalMessage *msg) #ifndef OHOS_ARCH_LITE if (NetSupplierInfo != nullptr) { NetSupplierInfo->isAvailable_ = false; - std::thread([this]() { + std::thread([netInfo = NetSupplierInfo]() { WIFI_LOGI("On disconnect update net supplier info\n"); - WifiNetAgent::GetInstance().UpdateNetSupplierInfo(NetSupplierInfo); + WifiNetAgent::GetInstance().UpdateNetSupplierInfo(netInfo); }).detach(); } #endif @@ -1518,9 +1517,9 @@ void StaStateMachine::DisConnectProcess() #ifndef OHOS_ARCH_LITE if (NetSupplierInfo != nullptr) { NetSupplierInfo->isAvailable_ = false; - std::thread([this]() { + std::thread([netInfo = NetSupplierInfo]() { WIFI_LOGI("Disconnect process update netsupplierinfo"); - WifiNetAgent::GetInstance().UpdateNetSupplierInfo(NetSupplierInfo); + WifiNetAgent::GetInstance().UpdateNetSupplierInfo(netInfo); }).detach(); } #endif diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp index fbdefd9..0da0ed2 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp @@ -1176,7 +1176,7 @@ void WifiSettings::SetAppPackageName(const std::string &appPackageName) mAppPackageName = appPackageName; } -const std::string& WifiSettings::GetAppPackageName() const +const std::string WifiSettings::GetAppPackageName() const { return mAppPackageName; } @@ -1360,7 +1360,7 @@ int WifiSettings::SetP2pDeviceName(const std::string &deviceName) return mSavedWifiP2pVendorConfig.SaveConfig(); } -const std::vector& WifiSettings::ReloadTrustListPolicies() +const std::vector WifiSettings::ReloadTrustListPolicies() { std::unique_lock lock(mStaMutex); mTrustListPolicies.LoadConfig(); @@ -1376,7 +1376,7 @@ const std::vector& WifiSettings::ReloadTrustListPolicies() return mTrustListPolicies.GetValue(); } -const MovingFreezePolicy &WifiSettings::ReloadMovingFreezePolicy() +const MovingFreezePolicy WifiSettings::ReloadMovingFreezePolicy() { std::unique_lock lock(mStaMutex); mMovingFreezePolicy.LoadConfig(); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.h b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.h index 4c47bdd..ab736ba 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.h @@ -788,9 +788,9 @@ public: /** * @Description Get app package name. * - * @return const std::string& - app package name. + * @return const std::string - app package name. */ - const std::string& GetAppPackageName() const; + const std::string GetAppPackageName() const; /** * @Description Set freeze mode state. @@ -1031,16 +1031,16 @@ public: /** * @Description get trustlist policies. * - * @return const std::vector& - trustlist policies. + * @return const std::vector - trustlist policies. */ - const std::vector& ReloadTrustListPolicies(); + const std::vector ReloadTrustListPolicies(); /** * @Description get moving freeze state trustlist. * - * @return const MovingFreezePolicy& - moving freeze policy. + * @return const MovingFreezePolicy - moving freeze policy. */ - const MovingFreezePolicy& ReloadMovingFreezePolicy(); + const MovingFreezePolicy ReloadMovingFreezePolicy(); /** * @Description get bssid of connection timeout for last time. diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/BUILD.gn index 18bb9ac..ae33f10 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/BUILD.gn @@ -36,7 +36,6 @@ ohos_unittest("idl_client_unittest") { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.c", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_supplicant_iface.c", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_ap_hal_interface.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_base_hal_interface.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_chip_hal_interface.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.cpp", @@ -45,7 +44,6 @@ ohos_unittest("idl_client_unittest") { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_supplicant_hal_interface.cpp", "idl_client_test_main.cpp", "wifi_ap_hal_interface_test.cpp", - "wifi_base_hal_interface_test.cpp", "wifi_chip_hal_interface_test.cpp", "wifi_idl_client_test.cpp", "wifi_idl_interface_test.cpp", diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn index 459f3c2..0cc64b8 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn @@ -57,7 +57,6 @@ ohos_unittest("manager_unittest") { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_aware", "$WIFI_ROOT_DIR/frameworks/native/interfaces", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface", @@ -112,9 +111,8 @@ ohos_unittest("manager_unittest") { ] configs = [ ":module_private_config" ] - if (wifi_feature_with_auth_disable) { - defines += [ "PERMISSION_ALWAYS_GRANT" ] - } + # Do not modify the permission configuration of the unit test + defines += [ "PERMISSION_ALWAYS_GRANT" ] part_name = "wifi" subsystem_name = "communication" diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_auth_center_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_auth_center_test.cpp index d9f8075..241e5c0 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_auth_center_test.cpp +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_auth_center_test.cpp @@ -43,7 +43,7 @@ HWTEST_F(WifiAuthCenterTest, ChangePermission_SUCCESS, TestSize.Level1) for (int i = 0; i < ARRAY_PERMISSION; i++) { permissions[g_wifiPermissions[i].name] = num[i]; } - EXPECT_EQ(0, WifiAuthCenter::GetInstance().ChangePermission(permissions, pid, uid)); + EXPECT_EQ(PERMISSION_GRANTED, WifiAuthCenter::GetInstance().ChangePermission(permissions, pid, uid)); } HWTEST_F(WifiAuthCenterTest, CheckChangePermission_GRANTED, TestSize.Level1) diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manager_service_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manager_service_test.cpp index 15298a9..06b7ed8 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manager_service_test.cpp +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manager_service_test.cpp @@ -38,7 +38,6 @@ HWTEST_F(WifiManagerServiceTest, StaCloseResTest, TestSize.Level1) ASSERT_TRUE(cbk.OnStaOpenRes != nullptr); ASSERT_TRUE(cbk.OnStaCloseRes != nullptr); cbk.OnStaOpenRes(OperateResState::OPEN_WIFI_SUCCEED); - cbk.OnStaCloseRes(OperateResState::CLOSE_WIFI_FAILED); cbk.OnStaCloseRes(OperateResState::CLOSE_WIFI_CLOSING); cbk.OnStaCloseRes(OperateResState::CLOSE_WIFI_SUCCEED); WifiSettings::GetInstance().SetAirplaneModeState(1); diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manager_service_test.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manager_service_test.h index 295bae0..3f51876 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manager_service_test.h +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manager_service_test.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #ifndef OHOS_WIFI_MANAGER_SERVICE_TEST_H #define OHOS_WIFI_MANAGER_SERVICE_TEST_H @@ -28,7 +29,6 @@ public: } static void TearDownTestCase() { - WifiManager::GetInstance().Exit(); } virtual void SetUp() {} diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_settings.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_settings.h index 6753a8f..6884447 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_settings.h +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_settings.h @@ -31,7 +31,7 @@ public: virtual void SetScreenState(const int &state) = 0; virtual int GetScreenState() const = 0; virtual ScanMode GetAppRunningState() const = 0; - virtual const std::string& GetAppPackageName() const = 0; + virtual const std::string GetAppPackageName() const = 0; virtual int GetFreezeModeState() const = 0; virtual int GetNoChargerPlugModeState() const = 0; virtual void SetSupportHwPnoFlag(bool supportHwPnoFlag) = 0; @@ -40,8 +40,8 @@ public: virtual int GetMinRssi5Ghz() = 0; virtual bool GetWhetherToAllowNetworkSwitchover() = 0; virtual int GetDeviceConfig(std::vector &results) = 0; - virtual const std::vector& ReloadTrustListPolicies() = 0; - virtual const MovingFreezePolicy& ReloadMovingFreezePolicy() = 0; + virtual const std::vector ReloadTrustListPolicies() = 0; + virtual const MovingFreezePolicy ReloadMovingFreezePolicy() = 0; virtual int GetThermalLevel() const = 0; }; @@ -56,7 +56,7 @@ public: MOCK_METHOD1(SetScreenState, void(const int &state)); MOCK_CONST_METHOD0(GetScreenState, int()); MOCK_CONST_METHOD0(GetAppRunningState, ScanMode()); - MOCK_CONST_METHOD0(GetAppPackageName, const std::string&()); + MOCK_CONST_METHOD0(GetAppPackageName, const std::string()); MOCK_CONST_METHOD0(GetFreezeModeState, int()); MOCK_CONST_METHOD0(GetNoChargerPlugModeState, int()); MOCK_METHOD1(SetSupportHwPnoFlag, void(bool supportHwPnoFlag)); @@ -65,8 +65,8 @@ public: MOCK_METHOD0(GetMinRssi5Ghz, int()); MOCK_METHOD0(GetWhetherToAllowNetworkSwitchover, bool()); MOCK_METHOD1(GetDeviceConfig, int(std::vector &results)); - MOCK_METHOD0(ReloadTrustListPolicies, const std::vector&()); - MOCK_METHOD0(ReloadMovingFreezePolicy, const MovingFreezePolicy&()); + MOCK_METHOD0(ReloadTrustListPolicies, const std::vector()); + MOCK_METHOD0(ReloadMovingFreezePolicy, const MovingFreezePolicy()); MOCK_CONST_METHOD0(GetThermalLevel, int()); }; } // namespace Wifi diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface_test.cpp index 62cb0b1..04bdc42 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface_test.cpp +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface_test.cpp @@ -29,7 +29,6 @@ using ::testing::SetArgReferee; using ::testing::StrEq; using ::testing::TypedEq; using ::testing::ext::TestSize; -using ::testing::ReturnRef; namespace OHOS { namespace Wifi { @@ -75,11 +74,11 @@ HWTEST_F(ScanInterfaceTest, InitTest, TestSize.Level1) EXPECT_CALL(WifiSupplicantHalInterface::GetInstance(), UnRegisterSupplicantEventCallback()).Times(AtLeast(1)); EXPECT_CALL(WifiSettings::GetInstance(), GetWhetherToAllowNetworkSwitchover()).Times(AtLeast(0)); EXPECT_CALL(WifiSettings::GetInstance(), GetDeviceConfig(_)).Times(AtLeast(0)); - EXPECT_CALL(WifiSettings::GetInstance(), GetAppPackageName()).WillRepeatedly(ReturnRef("")); + EXPECT_CALL(WifiSettings::GetInstance(), GetAppPackageName()).WillRepeatedly(Return("")); EXPECT_CALL(WifiSettings::GetInstance(), ReloadTrustListPolicies()) - .WillRepeatedly(ReturnRef(refVecTrustList)); + .WillRepeatedly(Return(refVecTrustList)); EXPECT_CALL(WifiSettings::GetInstance(), ReloadMovingFreezePolicy()) - .WillRepeatedly(ReturnRef(defaultValue)); + .WillRepeatedly(Return(defaultValue)); pScanInterface->Init(); } diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service_test.cpp index 6ed1e4c..ae26a9e 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service_test.cpp +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service_test.cpp @@ -25,7 +25,6 @@ using ::testing::AtLeast; using ::testing::DoAll; using ::testing::Eq; using ::testing::Return; -using ::testing::ReturnRef; using ::testing::SetArgReferee; using ::testing::StrEq; using ::testing::TypedEq; @@ -67,7 +66,7 @@ public: EXPECT_CALL(WifiSettings::GetInstance(), GetWhetherToAllowNetworkSwitchover()).Times(AtLeast(0)); EXPECT_CALL(WifiSettings::GetInstance(), GetDeviceConfig(_)).Times(AtLeast(0)); EXPECT_CALL(WifiSettings::GetInstance(), ReloadMovingFreezePolicy()) - .WillRepeatedly(ReturnRef(defaultValue)); + .WillRepeatedly(Return(defaultValue)); EXPECT_EQ(pScanService->InitScanService(WifiManager::GetInstance().GetScanCallback()), true); } @@ -84,7 +83,7 @@ public: EXPECT_CALL(WifiSettings::GetInstance(), GetWhetherToAllowNetworkSwitchover()).Times(AtLeast(0)); EXPECT_CALL(WifiSettings::GetInstance(), GetDeviceConfig(_)).Times(AtLeast(0)); EXPECT_CALL(WifiSettings::GetInstance(), ReloadTrustListPolicies()) - .WillRepeatedly(ReturnRef(refVecTrustList)); + .WillRepeatedly(Return(refVecTrustList)); EXPECT_EQ(pScanService->InitScanService(WifiManager::GetInstance().GetScanCallback()), true); } diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine_test.cpp index bdaced7..ee9e3ad 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine_test.cpp +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine_test.cpp @@ -655,7 +655,10 @@ public: { EXPECT_CALL(WifiStaHalInterface::GetInstance(), Scan(_)).WillRepeatedly(Return(WIFI_IDL_OPT_OK)); InterScanConfig interScanConfig; - pScanStateMachine->waitingScans.emplace(0, interScanConfig); + { + std::unique_lock guard(ScanStateMachine::lock); + pScanStateMachine->waitingScans.emplace(0, interScanConfig); + } pScanStateMachine->StartNewCommonScan(); } diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn index 0a919ea..1c3154c 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn @@ -83,7 +83,6 @@ ohos_unittest("wifi_sta_unittest") { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap", "$WIFI_ROOT_DIR/test/wifi_standard/wifi_framework/wifi_manage/wifi_common/Mock", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_aware", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta", diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_network_check.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_network_check.cpp index 621dd0b..fbc155b 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_network_check.cpp +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_network_check.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -32,5 +32,9 @@ void MockStaNetworkCheck::StopNetCheckThread() { WIFI_LOGD("Enter MockDhcpService::[%{public}s].", __FUNCTION__); } +void MockStaNetworkCheck::ExitNetCheckThread() +{ + WIFI_LOGD("Enter ExitNetCheckThread::[%{public}s].", __FUNCTION__); +} } // namespace Wifi } // namespace OHOS \ No newline at end of file diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_network_check.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_network_check.h index 81c1607..dbd290d 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_network_check.h +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_network_check.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #ifndef OHOS_MOCK_STANETWORKCHECK_H #define OHOS_MOCK_STANETWORKCHECK_H #include @@ -27,6 +28,7 @@ public: ErrCode InitNetCheckThread() override; void SignalNetCheckThread() override; void StopNetCheckThread() override; + void ExitNetCheckThread() override; }; } // namespace OHOS } // namespace OHOS diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service_test.cpp index 5f1e401..b90aca4 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service_test.cpp +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service_test.cpp @@ -762,7 +762,9 @@ void StaAutoConnectServiceTest::SetRoamBlockedBssidFirmwareSuccess() std::string bssid = "2a:76:93:47:e2:8a"; blockedBssids.push_back(bssid); - EXPECT_CALL(WifiStaHalInterface::GetInstance(), SetRoamConfig(_)).WillOnce(Return(WIFI_IDL_OPT_OK)); + EXPECT_CALL(WifiStaHalInterface::GetInstance(), SetRoamConfig(_)) + .WillOnce(Return(WIFI_IDL_OPT_OK)) + .WillRepeatedly(Return(WIFI_IDL_OPT_OK)); EXPECT_TRUE(pStaAutoConnectService->SetRoamBlockedBssidFirmware(blockedBssids) == true); } @@ -772,7 +774,8 @@ void StaAutoConnectServiceTest::SetRoamBlockedBssidFirmwareFail1() std::string bssid = "2a:76:93:47:e2:8a"; blockedBssids.push_back(bssid); - ON_CALL(WifiStaHalInterface::GetInstance(), SetRoamConfig(_)).WillByDefault(Return(WIFI_IDL_OPT_FAILED)); + ON_CALL(WifiStaHalInterface::GetInstance(), SetRoamConfig(_)) + .WillByDefault(Return(WIFI_IDL_OPT_FAILED)); EXPECT_TRUE(pStaAutoConnectService->SetRoamBlockedBssidFirmware(blockedBssids) == false); } diff --git a/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_ap_interface_test.cpp b/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_ap_interface_test.cpp index 2a8ca03..4735f3b 100644 --- a/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_ap_interface_test.cpp +++ b/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_ap_interface_test.cpp @@ -110,7 +110,8 @@ HWTEST_F(WifiHalApInterfaceTest, GetValidFrequenciesForBandTest, TestSize.Level1 EXPECT_TRUE(GetValidFrequenciesForBand(band, frequencies, NULL, 0) == WIFI_HAL_FAILED); EXPECT_TRUE(GetValidFrequenciesForBand(band, NULL, &size, 0) == WIFI_HAL_FAILED); WifiErrorNo err = GetValidFrequenciesForBand(band, frequencies, &size, 0); - EXPECT_TRUE(err == WIFI_HAL_SUCCESS || err == WIFI_HAL_NOT_SUPPORT); + // WIFI_HAL_FAILED: Some devices do not support + EXPECT_TRUE(err == WIFI_HAL_SUCCESS || err == WIFI_HAL_NOT_SUPPORT || err == WIFI_HAL_FAILED); } HWTEST_F(WifiHalApInterfaceTest, StopSoftApTest, TestSize.Level1) -- Gitee From fb6cb1118a4cdd608df31a25c82eb8754679bf8d Mon Sep 17 00:00:00 2001 From: fengye Date: Tue, 13 Sep 2022 01:49:23 +0000 Subject: [PATCH 349/491] wifi config formation and password encryption Signed-off-by: fengye --- .../config/wifi_config_file_impl.h | 20 ++++++------ .../config/wifi_config_file_spec.cpp | 31 ++++++++++--------- .../utils/wifi_encryption_util.cpp | 6 ++-- .../wifi_toolkit/utils/wifi_encryption_util.h | 10 +++--- .../wifi_toolkit/utils/wifi_global_func.cpp | 5 ++- 5 files changed, 36 insertions(+), 36 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_impl.h b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_impl.h index 4890cb6..65a6740 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_impl.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_impl.h @@ -74,16 +74,16 @@ public: /** * @Description read and parses the network section of ini config file, need call SetConfigFilePath first * - * @return int - 0 Success; >0 parse failed + * @return int - 0 Success; >0 parse failed */ - int ReadNetworkSection(T &item, std::ifstream &fs, std::string &line, const std::string &mFileName); + int ReadNetworkSection(T &item, std::ifstream &fs, std::string &line); /** * @Description read and parses the networks of ini config file, need call SetConfigFilePath first * * @return int - 0 Success; >0 parse failed */ - int ReadNetwork(T &item, std::ifstream &fs, std::string &line, const std::string &mFileName); + int ReadNetwork(T &item, std::ifstream &fs, std::string &line); /** * @Description read and parses the ini config file, need call SetConfigFilePath first @@ -135,7 +135,7 @@ int WifiConfigFileImpl::SetConfigFilePath(const std::string &fileName) } template -int WifiConfigFileImpl::ReadNetworkSection(T &item, std::ifstream &fs, std::string &line, const std::string &mFileName) +int WifiConfigFileImpl::ReadNetworkSection(T &item, std::ifstream &fs, std::string &line) { int sectionError = 0; while (std::getline(fs, line)) { @@ -143,7 +143,7 @@ int WifiConfigFileImpl::ReadNetworkSection(T &item, std::ifstream &fs, std::s if (line.empty()) { continue; } - if (line[0] == '<' && line[line.length()-1] == '>') { + if (line[0] == '<' && line[line.length() - 1] == '>') { return sectionError; } std::string::size_type npos = line.find("="); @@ -157,7 +157,7 @@ int WifiConfigFileImpl::ReadNetworkSection(T &item, std::ifstream &fs, std::s TrimString(key); TrimString(value); /* template function, needing specialization */ - sectionError +=SetTClassKeyValue(item, key, value, mFileName); + sectionError += SetTClassKeyValue(item, key, value, mFileName); } LOGE("Section config not end correctly"); sectionError++; @@ -165,7 +165,7 @@ int WifiConfigFileImpl::ReadNetworkSection(T &item, std::ifstream &fs, std::s } template -int WifiConfigFileImpl::ReadNetwork(T &item, std::ifstream &fs, std::string &line, const std::string &mFileName) +int WifiConfigFileImpl::ReadNetwork(T &item, std::ifstream &fs, std::string &line) { int networkError = 0; while (std::getline(fs, line)) { @@ -173,7 +173,7 @@ int WifiConfigFileImpl::ReadNetwork(T &item, std::ifstream &fs, std::string & if (line.empty()) { continue; } - if (line[0] == '<' && line[line.length()-1] == '>') { + if (line[0] == '<' && line[line.length() - 1] == '>') { networkError += ReadNetworkSection(item, fs, line, mFileName); } else if (line.compare("}") == 0) { return networkError; @@ -210,13 +210,13 @@ int WifiConfigFileImpl::LoadConfig() } if (line[0] == '[' && line[line.length() - 1] == '{') { ClearTClass(item); /* template function, needing specialization */ - ConfigError = ReadNetwork(item, fs, line, mFileName); + ConfigError = ReadNetwork(item, fs, line); if (ConfigError > 0) { LOGE("Parse network failed."); continue; } mValues.push_back(item); - } + } } fs.close(); return 0; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.cpp index bb7dbe4..e90dff1 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.cpp @@ -206,7 +206,7 @@ static int SetWifiDeviceConfig(WifiDeviceConfig &item, const std::string &key, c } #ifdef FEATURE_ENCRYPTION_SUPPORT errorKeyValue = SetWifiDeviceConfigEncrypt(item, key, value, fileName); - if (errorKeyValue != -1) { + if (errorKeyValue != -1) { return errorKeyValue; } else { errorKeyValue = 0; @@ -304,7 +304,7 @@ static int SetWifiDeviceConfigEap(WifiDeviceConfig &item, const std::string &key int errorKeyValue = 0; #ifdef FEATURE_ENCRYPTION_SUPPORT errorKeyValue = SetWifiDeviceConfigEncryptEap(item, key, value, fileName); - if (errorKeyValue != -1) { + if (errorKeyValue != -1) { return errorKeyValue; } else { errorKeyValue = 0; @@ -475,14 +475,14 @@ static std::string OutPutWifiDeviceConfigIp(WifiDeviceConfig &item, const std::s << item.wifiIpConfig.staticIpAddress.gateway.GetIpv4Address() << std::endl; ss << " " <<"wifiIpConfig.staticIpAddress.gateway.addressIpv6=" << item.wifiIpConfig.staticIpAddress.gateway.GetIpv6Address() << std::endl; - ss << " " <<"wifiIpConfig.staticIpAddress.dnsServer1.family=" << item.wifiIpConfig.staticIpAddress.dnsServer1.family - << std::endl; + ss << " " <<"wifiIpConfig.staticIpAddress.dnsServer1.family=" + << item.wifiIpConfig.staticIpAddress.dnsServer1.family << std::endl; ss << " " <<"wifiIpConfig.staticIpAddress.dnsServer1.addressIpv4=" << item.wifiIpConfig.staticIpAddress.dnsServer1.GetIpv4Address() << std::endl; ss << " " <<"wifiIpConfig.staticIpAddress.dnsServer1.addressIpv6=" << item.wifiIpConfig.staticIpAddress.dnsServer1.GetIpv6Address() << std::endl; - ss << " " <<"wifiIpConfig.staticIpAddress.dnsServer2.family=" << item.wifiIpConfig.staticIpAddress.dnsServer2.family - << std::endl; + ss << " " <<"wifiIpConfig.staticIpAddress.dnsServer2.family=" + << item.wifiIpConfig.staticIpAddress.dnsServer2.family << std::endl; ss << " " <<"wifiIpConfig.staticIpAddress.dnsServer2.addressIpv4=" << item.wifiIpConfig.staticIpAddress.dnsServer2.GetIpv4Address() << std::endl; ss << " " <<"wifiIpConfig.staticIpAddress.dnsServer2.addressIpv6=" @@ -526,12 +526,12 @@ static std::string OutPutWifiDeviceConfigProxy(WifiDeviceConfig &item, const std std::ostringstream ss; ss << " " <<"" << std::endl; ss << " " <<"wifiProxyconfig.configureMethod=" << (int)item.wifiProxyconfig.configureMethod << std::endl; - ss << " " <<"wifiProxyconfig.autoProxyConfig.pacWebAddress=" << item.wifiProxyconfig.autoProxyConfig.pacWebAddress - << std::endl; - ss << " " <<"wifiProxyconfig.ManualProxyConfig.serverHostName=" << item.wifiProxyconfig.manualProxyConfig.serverHostName - << std::endl; - ss << " " <<"wifiProxyconfig.ManualProxyConfig.serverPort=" << item.wifiProxyconfig.manualProxyConfig.serverPort - << std::endl; + ss << " " <<"wifiProxyconfig.autoProxyConfig.pacWebAddress=" + << item.wifiProxyconfig.autoProxyConfig.pacWebAddress << std::endl; + ss << " " <<"wifiProxyconfig.ManualProxyConfig.serverHostName=" + << item.wifiProxyconfig.manualProxyConfig.serverHostName << std::endl; + ss << " " <<"wifiProxyconfig.ManualProxyConfig.serverPort=" + << item.wifiProxyconfig.manualProxyConfig.serverPort << std::endl; ss << " " <<"wifiProxyconfig.ManualProxyConfig.exclusionObjectList=" << item.wifiProxyconfig.manualProxyConfig.exclusionObjectList << std::endl; ss << " " <<"" << std::endl; @@ -602,7 +602,7 @@ int SetTClassKeyValue(HotspotConfig &item, const std::string &key int errorKeyValue = 0; #ifdef FEATURE_ENCRYPTION_SUPPORT errorKeyValue = SetWifiHotspotConfigEncrypt(item, key, value, fileName); - if (errorKeyValue != -1) { + if (errorKeyValue != -1) { return errorKeyValue; } else { errorKeyValue = 0; @@ -1016,7 +1016,7 @@ int SetTClassKeyValue(WifiP2pGroupInfo &item, const std::strin int errorKeyValue = 0; #ifdef FEATURE_ENCRYPTION_SUPPORT errorKeyValue = SetWifiP2pGroupInfoEncrypt(item, key, value, fileName); - if (errorKeyValue != -1) { + if (errorKeyValue != -1) { return errorKeyValue; } else { errorKeyValue = 0; @@ -1099,7 +1099,8 @@ std::string OutTClassString(WifiP2pGroupInfo &item, const std: { std::ostringstream ss; ss << " " <<"groupName=" << ValidateString(item.GetGroupName()) << std::endl; - ss << " " <<"groupNameHex=" << ConvertArrayToHex((uint8_t*)&item.GetGroupName()[0], item.GetGroupName().length()) << std::endl; + ss << " " <<"groupNameHex=" + << ConvertArrayToHex((uint8_t*)&item.GetGroupName()[0], item.GetGroupName().length()) << std::endl; ss << " " <<"networkId=" << item.GetNetworkId() << std::endl; ss << " " <<"isGroupOwner=" << item.IsGroupOwner() << std::endl; ss << " " <<"interface=" << item.GetInterface() << std::endl; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.cpp index 9a17c40..a73ed45 100755 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.cpp @@ -41,7 +41,7 @@ int32_t GetKey(const WifiEncryptionInfo &wifiEncryptionInfo, const struct HksPar } else { return ret; } - }else if (keyExist != HKS_SUCCESS) { + } else if (keyExist != HKS_SUCCESS) { WIFI_LOGE("search key failed"); return keyExist; } @@ -59,7 +59,7 @@ int32_t WifiEncryption(const WifiEncryptionInfo &wifiEncryptionInfo, const std:: uint8_t nonce[NONCE_SIZE] = {0}; struct HksBlob randomIV = {NONCE_SIZE, nonce}; - int32_t ret =HksGenerateRandom(NULL, &randomIV); + int32_t ret = HksGenerateRandom(NULL, &randomIV); if (ret != HKS_SUCCESS) { WIFI_LOGE("wifi encryption generate IV failed"); return ret; @@ -106,7 +106,7 @@ int32_t WifiDecryption(const WifiEncryptionInfo &wifiEncryptionInfo, const Encry } struct HksBlob authId = wifiEncryptionInfo.keyAlias; uint8_t cipherBuf[AES_COMMON_SIZE] = {0}; - int length = AES_COMMON_SIZE; + uint32_t length = AES_COMMON_SIZE; int retStrToArrat = HexStringToVec(encryptedData.encryptedPassword, cipherBuf, AES_COMMON_SIZE, length); if (retStrToArrat != 0) { return HKS_FAILURE; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.h b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.h index bf2b97b..70aeefc 100755 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.h @@ -23,13 +23,13 @@ namespace OHOS { namespace Wifi { -static constexpr uint32_t AES_COMMON_SIZE = 256; -static constexpr uint32_t AAD_SIZE = 16; -static constexpr uint32_t NONCE_SIZE = 16; +constexpr uint32_t AES_COMMON_SIZE = 256; +constexpr uint32_t AAD_SIZE = 16; +constexpr uint32_t NONCE_SIZE = 16; const uint8_t AAD[AAD_SIZE] = {0}; -static struct HksParam g_genParam[] = { +struct HksParam g_genParam[] = { { .tag = HKS_TAG_KEY_STORAGE_FLAG, .uint32Param = HKS_STORAGE_PERSISTENT }, { .tag = HKS_TAG_ALGORITHM, .uint32Param = HKS_ALG_AES }, { .tag = HKS_TAG_KEY_SIZE, .uint32Param = HKS_AES_KEY_SIZE_256 }, @@ -65,7 +65,7 @@ public: fileName = WIFI_ENCRY_KEY + file; keyAlias = { fileName.length(), (uint8_t *)&fileName[0] }; } - WifiEncryptionInfo(const std::string file) + WifiEncryptionInfo(const std::string file) explicit { SetFile(file); } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_global_func.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_global_func.cpp index 53bd864..15e6f43 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_global_func.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_global_func.cpp @@ -300,7 +300,7 @@ int HexStringToVec(const std::string &str, uint8_t plainText[], int plainLength, if (ret == -1 || static_cast(result.size()) > plainLength) { return -1; } - for(std::vector::size_type i = 0; i < result.size(); ++i) { + for (std::vector::size_type i = 0; i < result.size(); ++i) { plainText[i] = result[i]; } resultLength = static_cast(result.size()); @@ -342,8 +342,7 @@ std::string ValidateString(const std::string &str) { std::stringstream ss; ss << "\""; - for(char ch : str) - { + for (char ch : str) { if (ValidateChar(ch)) { ss << ch; } -- Gitee From 4a84c2d274ce4b025fb0f2336b48b6425bac8713 Mon Sep 17 00:00:00 2001 From: fengye Date: Tue, 13 Sep 2022 02:03:06 +0000 Subject: [PATCH 350/491] wifi config formation and password encryption Signed-off-by: fengye --- .../wifi_framework/wifi_toolkit/config/wifi_config_file_impl.h | 2 +- .../wifi_framework/wifi_toolkit/utils/wifi_encryption_util.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_impl.h b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_impl.h index 65a6740..af89351 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_impl.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_impl.h @@ -174,7 +174,7 @@ int WifiConfigFileImpl::ReadNetwork(T &item, std::ifstream &fs, std::string & continue; } if (line[0] == '<' && line[line.length() - 1] == '>') { - networkError += ReadNetworkSection(item, fs, line, mFileName); + networkError += ReadNetworkSection(item, fs, line); } else if (line.compare("}") == 0) { return networkError; } else { diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.h b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.h index 70aeefc..076d0ec 100755 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.h @@ -65,7 +65,7 @@ public: fileName = WIFI_ENCRY_KEY + file; keyAlias = { fileName.length(), (uint8_t *)&fileName[0] }; } - WifiEncryptionInfo(const std::string file) explicit + explicit WifiEncryptionInfo(const std::string file) { SetFile(file); } -- Gitee From c51f4f26f1689a9d9fa9e09e0197bb678d145cd1 Mon Sep 17 00:00:00 2001 From: fengye Date: Tue, 13 Sep 2022 02:33:56 +0000 Subject: [PATCH 351/491] wifi config formation and password encryption Signed-off-by: fengye --- .../wifi_framework/wifi_manage/BUILD.gn | 2 +- .../utils/wifi_encryption_util.cpp | 20 ++++++++++++++++--- .../wifi_toolkit/utils/wifi_encryption_util.h | 13 ------------ .../wifi_toolkit/utils/wifi_global_func.cpp | 10 +++++----- .../wifi_toolkit/utils/wifi_global_func.h | 4 ++-- 5 files changed, 25 insertions(+), 24 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn index 2beb7a5..51a46c3 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn @@ -346,11 +346,11 @@ if (defined(ohos_lite)) { "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", "c_utils:utils", + "huks:libhukssdk", "ipc:ipc_core", "netmanager_base:net_conn_manager_if", "safwk:system_ability_fwk", "samgr:samgr_proxy", - "huks:libhukssdk" ] defines = [ "FEATURE_AP_SUPPORT", diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.cpp index a73ed45..c7530a5 100755 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.cpp @@ -20,6 +20,20 @@ DEFINE_WIFILOG_LABEL("WifiConfigEncryption"); namespace OHOS { namespace Wifi { + +struct HksParam g_genParam[] = { + { .tag = HKS_TAG_KEY_STORAGE_FLAG, .uint32Param = HKS_STORAGE_PERSISTENT }, + { .tag = HKS_TAG_ALGORITHM, .uint32Param = HKS_ALG_AES }, + { .tag = HKS_TAG_KEY_SIZE, .uint32Param = HKS_AES_KEY_SIZE_256 }, + { .tag = HKS_TAG_PURPOSE, .uint32Param = HKS_KEY_PURPOSE_ENCRYPT | HKS_KEY_PURPOSE_DECRYPT }, + { .tag = HKS_TAG_DIGEST, .uint32Param = HKS_DIGEST_NONE }, + { .tag = HKS_TAG_PADDING, .uint32Param = HKS_PADDING_NONE }, + { .tag = HKS_TAG_IS_KEY_ALIAS, .boolParam = true }, + { .tag = HKS_TAG_KEY_GENERATE_TYPE, .uint32Param = HKS_KEY_GENERATE_TYPE_DEFAULT }, + { .tag = HKS_TAG_BLOCK_MODE, .uint32Param = HKS_MODE_GCM }, + { .tag = HKS_TAG_ASSOCIATED_DATA, .blob = { .size = AAD_SIZE, .data = (uint8_t *)AAD } }, +}; + int32_t SetUpHks() { int32_t ret = HksInitialize(); @@ -107,13 +121,13 @@ int32_t WifiDecryption(const WifiEncryptionInfo &wifiEncryptionInfo, const Encry struct HksBlob authId = wifiEncryptionInfo.keyAlias; uint8_t cipherBuf[AES_COMMON_SIZE] = {0}; uint32_t length = AES_COMMON_SIZE; - int retStrToArrat = HexStringToVec(encryptedData.encryptedPassword, cipherBuf, AES_COMMON_SIZE, length); + int32_t retStrToArrat = HexStringToVec(encryptedData.encryptedPassword, cipherBuf, AES_COMMON_SIZE, length); if (retStrToArrat != 0) { return HKS_FAILURE; } uint8_t nonce[NONCE_SIZE] = {0}; - int lengthIV = NONCE_SIZE; + uint32_t lengthIV = NONCE_SIZE; retStrToArrat = HexStringToVec(encryptedData.IV, nonce, NONCE_SIZE, lengthIV); if (retStrToArrat != 0) { return HKS_FAILURE; @@ -130,7 +144,7 @@ int32_t WifiDecryption(const WifiEncryptionInfo &wifiEncryptionInfo, const Encry HksAddParams(decryParamSet, IVParam, sizeof(IVParam) / sizeof(HksParam)); HksBuildParamSet(&decryParamSet); - int ret = HksKeyExist(&authId, nullptr); + int32_t ret = HksKeyExist(&authId, nullptr); if (ret != HKS_SUCCESS) { WIFI_LOGE("wifi decryption key not exist"); return ret; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.h b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.h index 076d0ec..87fb1ba 100755 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.h @@ -29,19 +29,6 @@ constexpr uint32_t NONCE_SIZE = 16; const uint8_t AAD[AAD_SIZE] = {0}; -struct HksParam g_genParam[] = { - { .tag = HKS_TAG_KEY_STORAGE_FLAG, .uint32Param = HKS_STORAGE_PERSISTENT }, - { .tag = HKS_TAG_ALGORITHM, .uint32Param = HKS_ALG_AES }, - { .tag = HKS_TAG_KEY_SIZE, .uint32Param = HKS_AES_KEY_SIZE_256 }, - { .tag = HKS_TAG_PURPOSE, .uint32Param = HKS_KEY_PURPOSE_ENCRYPT | HKS_KEY_PURPOSE_DECRYPT }, - { .tag = HKS_TAG_DIGEST, .uint32Param = HKS_DIGEST_NONE }, - { .tag = HKS_TAG_PADDING, .uint32Param = HKS_PADDING_NONE }, - { .tag = HKS_TAG_IS_KEY_ALIAS, .boolParam = true }, - { .tag = HKS_TAG_KEY_GENERATE_TYPE, .uint32Param = HKS_KEY_GENERATE_TYPE_DEFAULT }, - { .tag = HKS_TAG_BLOCK_MODE, .uint32Param = HKS_MODE_GCM }, - { .tag = HKS_TAG_ASSOCIATED_DATA, .blob = { .size = AAD_SIZE, .data = (uint8_t *)AAD } }, -}; - class EncryptedData final { public: std::string encryptedPassword = ""; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_global_func.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_global_func.cpp index 15e6f43..45a3a01 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_global_func.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_global_func.cpp @@ -288,7 +288,7 @@ int HexStringToVec(const std::string &str, std::vector &vec) return 0; } -int HexStringToVec(const std::string &str, uint8_t plainText[], int plainLength, int &resultLength) +int HexStringToVec(const std::string &str, uint8_t plainText[], uint32_t plainLength, uint32_t &resultLength) { if (plainLength < 0) { return false; @@ -297,13 +297,13 @@ int HexStringToVec(const std::string &str, uint8_t plainText[], int plainLength, std::vector result; result.clear(); int ret = HexStringToVec(str, result); - if (ret == -1 || static_cast(result.size()) > plainLength) { + if (ret == -1 || result.size() > plainLength) { return -1; } for (std::vector::size_type i = 0; i < result.size(); ++i) { plainText[i] = result[i]; } - resultLength = static_cast(result.size()); + resultLength = result.size(); return 0; } @@ -320,11 +320,11 @@ static char ConvertArrayChar(uint8_t ch) return '0'; } -std::string ConvertArrayToHex(const uint8_t plainText[], int size) +std::string ConvertArrayToHex(const uint8_t plainText[], uint32_t size) { constexpr int bitWidth = 4; std::stringstream ss; - for (int i = 0; i < size; i++) { + for (uint32_t i = 0; i < size; i++) { ss << ConvertArrayChar(plainText[i] >> bitWidth) << ConvertArrayChar (plainText[i] & 0xf); } return ss.str(); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_global_func.h b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_global_func.h index 50ecf25..ae03baa 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_global_func.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_global_func.h @@ -234,7 +234,7 @@ int HexStringToVec(const std::string &str, std::vector &vec); * @param resultLength - output Length of uint8_t* result, eg: 16 * @return int - convert result, 0 success, -1 failed */ -int HexStringToVec(const std::string &str, uint8_t plainText[], int plainLength, int &resultLength); +int HexStringToVec(const std::string &str, uint8_t plainText[], uint32_t plainLength, uint32_t &resultLength); /** * @Description Convert a uint8_t* to Hex string. @@ -243,7 +243,7 @@ int HexStringToVec(const std::string &str, uint8_t plainText[], int plainLength, * @param size - input uint8_t* size, eg: 16 * @return string - convert Hex string, eg: 010203... */ -std::string ConvertArrayToHex(const uint8_t plainText[], int size); +std::string ConvertArrayToHex(const uint8_t plainText[], uint32_t size); /** * @Description Convert a string to validate string for write. -- Gitee From d09ebb925ef5fc2c34c5ca0cd9ba1d2451352da4 Mon Sep 17 00:00:00 2001 From: Zhangfeng Date: Tue, 13 Sep 2022 03:26:37 +0000 Subject: [PATCH 352/491] OH-core clipping for halfcontainer Signed-off-by: zhangfeng --- dhcp/bundle.json | 14 +++++++++----- wifi/bundle.json | 20 +++++++++++++------- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/dhcp/bundle.json b/dhcp/bundle.json index dbdcf6a..308b063 100644 --- a/dhcp/bundle.json +++ b/dhcp/bundle.json @@ -62,11 +62,15 @@ ] }, "build": { - "sub_component": [ - "//foundation/communication/wifi/dhcp/services/mgr_service:dhcp_manager_service", - "//foundation/communication/wifi/dhcp/services/dhcp_client:dhcp_client_service", - "//foundation/communication/wifi/dhcp/services/dhcp_server:dhcp_server" - ], + "group_type": { + "base_group": [ + "//foundation/communication/wifi/dhcp/services/mgr_service:dhcp_manager_service", + "//foundation/communication/wifi/dhcp/services/dhcp_client:dhcp_client_service", + "//foundation/communication/wifi/dhcp/services/dhcp_server:dhcp_server" + ], + "fwk_group": [], + "service_group": [] + }, "inner_kits": [ ], "test": [ diff --git a/wifi/bundle.json b/wifi/bundle.json index 88119f8..045e281 100644 --- a/wifi/bundle.json +++ b/wifi/bundle.json @@ -73,13 +73,19 @@ ] }, "build": { - "sub_component": [ - "//foundation/communication/wifi/wifi/frameworks:wifi_kits", - "//foundation/communication/wifi/wifi/services/wifi_standard/wifi_framework:wifi_manage", - "//foundation/communication/wifi/wifi/services/wifi_standard/wifi_framework:wifi_system_ability", - "//foundation/communication/wifi/wifi/services/wifi_standard/wifi_hal:wifi_hal", - "//foundation/communication/wifi/wifi/utils:wifi_utils" - ], + "group_type": { + "base_group": [ + "//foundation/communication/wifi/wifi/utils:wifi_utils" + ], + "fwk_group": [ + "//foundation/communication/wifi/wifi/frameworks:wifi_kits" + ], + "service_group": [ + "//foundation/communication/wifi/wifi/services/wifi_standard/wifi_framework:wifi_manage", + "//foundation/communication/wifi/wifi/services/wifi_standard/wifi_framework:wifi_system_ability", + "//foundation/communication/wifi/wifi/services/wifi_standard/wifi_hal:wifi_hal" + ] + }, "inner_kits": [ { "header" : { -- Gitee From 095d3a07cad61b01d2905166aa7dae62ed09f315 Mon Sep 17 00:00:00 2001 From: fengye Date: Tue, 13 Sep 2022 03:30:56 +0000 Subject: [PATCH 353/491] wifi config formation and password encryption Signed-off-by: fengye --- .../wifi_framework/wifi_toolkit/BUILD.gn | 6 +- .../config/wifi_config_file_impl.h | 6 +- .../config/wifi_config_file_spec.cpp | 71 ++++++++++++------- 3 files changed, 51 insertions(+), 32 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/BUILD.gn index ddf53ef..8a63d01 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/BUILD.gn @@ -38,8 +38,8 @@ local_base_sources = [ "net_helper/network_interface.cpp", "net_helper/raw_socket.cpp", "utils/wifi_common_event_helper.cpp", - "utils/wifi_global_func.cpp", "utils/wifi_encryption_util.cpp", + "utils/wifi_global_func.cpp", ] local_base_include_dirs = [ @@ -97,7 +97,7 @@ if (defined(ohos_lite)) { defines = [ "AP_INSTANCE_MAX_NUM=$wifi_feature_with_ap_num" ] if (wifi_feature_with_encryption) { - defines += [ "FEATURE_ENCRYPTION_SUPPORT" ] + defines += [ "FEATURE_ENCRYPTION_SUPPORT" ] } external_deps = [ @@ -105,7 +105,7 @@ if (defined(ohos_lite)) { "c_utils:utils", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", - "huks:libhukssdk" + "huks:libhukssdk", ] cflags_cc = [ diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_impl.h b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_impl.h index af89351..c676190 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_impl.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_impl.h @@ -202,7 +202,7 @@ int WifiConfigFileImpl::LoadConfig() mValues.clear(); T item; std::string line; - int ConfigError; + int configError; while (std::getline(fs, line)) { TrimString(line); if (line.empty()) { @@ -210,8 +210,8 @@ int WifiConfigFileImpl::LoadConfig() } if (line[0] == '[' && line[line.length() - 1] == '{') { ClearTClass(item); /* template function, needing specialization */ - ConfigError = ReadNetwork(item, fs, line); - if (ConfigError > 0) { + configError = ReadNetwork(item, fs, line); + if (configError > 0) { LOGE("Parse network failed."); continue; } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.cpp index e90dff1..34d878a 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.cpp @@ -843,14 +843,9 @@ static int SetWifiConfigValueFirst(WifiConfig &item, const std::string &key, con return 0; } -template<> -int SetTClassKeyValue(WifiConfig &item, const std::string &key, const std::string &value, +static int SetWifiConfigValueSecond(WifiConfig &item, const std::string &key, const std::string &value, const std::string &fileName) { - int errorKeyValue = 0; - if (SetWifiConfigValueFirst(item, key, value, fileName) == 0) { - return errorKeyValue; - } if (key == "preLoadSta") { item.preLoadSta = (std::stoi(value) != 0); /* 0 -> false 1 -> true */ } else if (key == "preLoadScan") { @@ -888,9 +883,23 @@ int SetTClassKeyValue(WifiConfig &item, const std::string &key, cons } else if (key == "isLoadStabak") { item.isLoadStabak = (std::stoi(value) != 0); } else { - LOGE("Invalid config key value"); - errorKeyValue++; + return -1; } + return 0; +} +template<> +int SetTClassKeyValue(WifiConfig &item, const std::string &key, const std::string &value, + const std::string &fileName) +{ + int errorKeyValue = 0; + if (SetWifiConfigValueFirst(item, key, value, fileName) == 0) { + return errorKeyValue; + } + if (SetWifiConfigValueSecond(item, key, value, fileName) == 0)) { + return errorKeyValue; + } + LOGE("Invalid config key value"); + errorKeyValue++; return errorKeyValue; } @@ -1009,6 +1018,31 @@ static int SetWifiP2pGroupInfoEncrypt(WifiP2pGroupInfo &item, const std::string } #endif +static int SetWifiP2pGroupInfoDev(WifiP2pGroupInfo &item, const std::string &key, const std::string &value, + const std::string &fileName) +{ + if (key.compare(0, strlen("ownerDev."), "ownerDev.") == 0) { + WifiP2pDevice owner = item.GetOwner(); + SetWifiP2pDevicClassKeyValue(owner, key.substr(strlen("ownerDev.")), value, fileName); + item.SetOwner(owner); + } else if (key.compare(0, strlen("vecDev_"), "vecDev_") == 0) { + std::string::size_type pos = key.find("."); + if (pos == std::string::npos) { + WifiP2pDevice device; + item.AddClientDevice(device); + } else { + unsigned long index = std::stoi(key.substr(strlen("vecDev_"), pos)); + if (index < item.GetClientDevices().size()) { + std::vector clients = item.GetClientDevices(); + SetWifiP2pDevicClassKeyValue(clients[index], key.substr(pos + 1), value, fileName); + item.SetClientDevices(clients); + } + } + } else { + return -1; + } + return 0; +} template<> int SetTClassKeyValue(WifiP2pGroupInfo &item, const std::string &key, const std::string &value, const std::string &fileName) @@ -1049,23 +1083,8 @@ int SetTClassKeyValue(WifiP2pGroupInfo &item, const std::strin item.SetP2pGroupStatus(static_cast(std::stoi(value))); } else if (key == "goIpAddress") { item.SetGoIpAddress(value); - } else if (key.compare(0, strlen("ownerDev."), "ownerDev.") == 0) { - WifiP2pDevice owner = item.GetOwner(); - SetWifiP2pDevicClassKeyValue(owner, key.substr(strlen("ownerDev.")), value, fileName); - item.SetOwner(owner); - } else if (key.compare(0, strlen("vecDev_"), "vecDev_") == 0) { - std::string::size_type pos = key.find("."); - if (pos == std::string::npos) { - WifiP2pDevice device; - item.AddClientDevice(device); - } else { - unsigned long index = std::stoi(key.substr(strlen("vecDev_"), pos)); - if (index < item.GetClientDevices().size()) { - std::vector clients = item.GetClientDevices(); - SetWifiP2pDevicClassKeyValue(clients[index], key.substr(pos + 1), value, fileName); - item.SetClientDevices(clients); - } - } + } else if (SetWifiP2pGroupInfoDev(item, key, value, fileName) == 0) { + return errorKeyValue; } else { LOGE("Invalid config key value"); errorKeyValue++; @@ -1099,7 +1118,7 @@ std::string OutTClassString(WifiP2pGroupInfo &item, const std: { std::ostringstream ss; ss << " " <<"groupName=" << ValidateString(item.GetGroupName()) << std::endl; - ss << " " <<"groupNameHex=" + ss << " " <<"groupNameHex=" << ConvertArrayToHex((uint8_t*)&item.GetGroupName()[0], item.GetGroupName().length()) << std::endl; ss << " " <<"networkId=" << item.GetNetworkId() << std::endl; ss << " " <<"isGroupOwner=" << item.IsGroupOwner() << std::endl; -- Gitee From ec85ba8131c448ade960173a6573e347a36910bc Mon Sep 17 00:00:00 2001 From: fengye Date: Tue, 13 Sep 2022 03:32:52 +0000 Subject: [PATCH 354/491] wifi config formation and password encryption Signed-off-by: fengye --- .../wifi_framework/wifi_toolkit/config/wifi_config_file_spec.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.cpp index 34d878a..51ea2db 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.cpp @@ -1043,6 +1043,7 @@ static int SetWifiP2pGroupInfoDev(WifiP2pGroupInfo &item, const std::string &key } return 0; } + template<> int SetTClassKeyValue(WifiP2pGroupInfo &item, const std::string &key, const std::string &value, const std::string &fileName) -- Gitee From af48339cd24f0ed34d4f3eab1949bf5101cfcfe1 Mon Sep 17 00:00:00 2001 From: fengye Date: Tue, 13 Sep 2022 03:44:47 +0000 Subject: [PATCH 355/491] wifi config formation and password encryption Signed-off-by: fengye --- .../wifi_toolkit/config/wifi_config_file_spec.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.cpp index 51ea2db..c2dbfee 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.cpp @@ -887,6 +887,7 @@ static int SetWifiConfigValueSecond(WifiConfig &item, const std::string &key, co } return 0; } + template<> int SetTClassKeyValue(WifiConfig &item, const std::string &key, const std::string &value, const std::string &fileName) @@ -895,7 +896,7 @@ int SetTClassKeyValue(WifiConfig &item, const std::string &key, cons if (SetWifiConfigValueFirst(item, key, value, fileName) == 0) { return errorKeyValue; } - if (SetWifiConfigValueSecond(item, key, value, fileName) == 0)) { + if (SetWifiConfigValueSecond(item, key, value, fileName) == 0) { return errorKeyValue; } LOGE("Invalid config key value"); -- Gitee From 177a714606bd8a11c3a73cffebddaf79bfc4d555 Mon Sep 17 00:00:00 2001 From: fengye Date: Tue, 13 Sep 2022 06:53:20 +0000 Subject: [PATCH 356/491] wifi config formation and password encryption Signed-off-by: fengye --- .../config/wifi_config_file_spec.cpp | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.cpp index c2dbfee..246b601 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.cpp @@ -646,6 +646,7 @@ template<> std::string OutTClassString(HotspotConfig &item, const std::string &fileName) { std::ostringstream ss; + ss << " " <<"" << std::endl; ss << " " <<"ssid=" << ValidateString(item.GetSsid()) << std::endl; ss << " " <<"HexSsid=" << ConvertArrayToHex((uint8_t*)&item.GetSsid()[0], item.GetSsid().length()) << std::endl; #ifdef FEATURE_ENCRYPTION_SUPPORT @@ -665,6 +666,7 @@ std::string OutTClassString(HotspotConfig &item, const std::strin ss << " " <<"band=" << static_cast(item.GetBand()) << std::endl; ss << " " <<"channel=" << item.GetChannel() << std::endl; ss << " " <<"maxConn=" << item.GetMaxConn() << std::endl; + ss << " " <<"" << std::endl; return ss.str(); } @@ -711,11 +713,13 @@ template<> std::string OutTClassString(P2pVendorConfig &item, const std::string &fileName) { std::ostringstream ss; + ss << " " <<"" << std::endl; ss << " " <<"randomMacSupport=" << item.GetRandomMacSupport() << std::endl; ss << " " <<"autoListen=" << item.GetIsAutoListen() << std::endl; ss << " " <<"deviceName=" << item.GetDeviceName() << std::endl; ss << " " <<"primaryDeviceType=" << item.GetPrimaryDeviceType() << std::endl; ss << " " <<"secondaryDeviceType=" << item.GetSecondaryDeviceType() << std::endl; + ss << " " <<"" << std::endl; return ss.str(); } @@ -756,9 +760,11 @@ template<> std::string OutTClassString(StationInfo &item, const std::string &fileName) { std::ostringstream ss; + ss << " " <<"" << std::endl; ss << " " <<"deviceName=" << item.deviceName << std::endl; ss << " " <<"bssid=" << item.bssid << std::endl; ss << " " <<"ipAddr=" << item.ipAddr << std::endl; + ss << " " <<"" << std::endl; return ss.str(); } @@ -914,6 +920,7 @@ template<> std::string OutTClassString(WifiConfig &item, const std::string &fileName) { std::ostringstream ss; + ss << " " <<"" << std::endl; ss << " " <<"scanAlwaysSwitch=" << item.scanAlwaysSwitch << std::endl; /* bool false->0 true->1 */ ss << " " <<"staAirplaneMode=" << item.staAirplaneMode << std::endl; ss << " " <<"canOpenStaWhenAirplane=" << item.canOpenStaWhenAirplane << std::endl; @@ -948,6 +955,7 @@ std::string OutTClassString(WifiConfig &item, const std::string &fil ss << " " <<"fourthRssiLevel5G=" << item.fourthRssiLevel5G << std::endl; ss << " " <<"strDnsBak=" << item.strDnsBak << std::endl; ss << " " <<"isLoadStabak=" << item.isLoadStabak << std::endl; + ss << " " <<"" << std::endl; return ss.str(); } @@ -1100,7 +1108,7 @@ std::string GetTClassName() return "WifiP2pGroupInfo"; } -static std::string OutWifiP2pDevicClassString(const WifiP2pDevice &item, std::string prefix = "") +static std::string OutWifiP2pDeviceClassString(const WifiP2pDevice &item, std::string prefix = "") { std::ostringstream ss; @@ -1119,6 +1127,7 @@ template<> std::string OutTClassString(WifiP2pGroupInfo &item, const std::string &fileName) { std::ostringstream ss; + ss << " " <<"" << std::endl; ss << " " <<"groupName=" << ValidateString(item.GetGroupName()) << std::endl; ss << " " <<"groupNameHex=" << ConvertArrayToHex((uint8_t*)&item.GetGroupName()[0], item.GetGroupName().length()) << std::endl; @@ -1142,7 +1151,7 @@ std::string OutTClassString(WifiP2pGroupInfo &item, const std: ss << " " <<"isPersistent=" << item.IsPersistent() << std::endl; ss << " " <<"groupStatus=" << static_cast(item.GetP2pGroupStatus()) << std::endl; ss << " " <<"goIpAddress=" << item.GetGoIpAddress() << std::endl; - ss << OutWifiP2pDevicClassString(item.GetOwner(), "ownerDev."); + ss << OutWifiP2pDeviceClassString(item.GetOwner(), "ownerDev."); int size = item.GetClientDevices().size(); for (int i = 0; i < size; i++) { std::string prefix = "vecDev_" + std::to_string(i) + "."; @@ -1150,6 +1159,7 @@ std::string OutTClassString(WifiP2pGroupInfo &item, const std: const WifiP2pDevice &tmp = item.GetClientDevices().at(i); ss << OutWifiP2pDevicClassString(tmp, prefix); } + ss << " " <<"" << std::endl; return ss.str(); } @@ -1189,9 +1199,11 @@ std::string GetTClassName() template <> std::string OutTClassString(TrustListPolicy &item, const std::string &fileName) { std::ostringstream ss; + ss << " " <<"" << std::endl; ss << " " <<"sceneId=" << item.sceneId << std::endl; ss << " " <<"sceneName=" << item.sceneName << std::endl; ss << " " <<"trustList=" << item.trustList << std::endl; + ss << " " <<"" << std::endl; return ss.str(); } @@ -1223,7 +1235,9 @@ template <> std::string GetTClassName() template <> std::string OutTClassString(MovingFreezePolicy &item, const std::string &fileName) { std::ostringstream ss; + ss << " " <<"" << std::endl; ss << " " <<"trustList=" << item.trustList << std::endl; + ss << " " <<"" << std::endl; return ss.str(); } @@ -1273,11 +1287,13 @@ template <> std::string GetTClassName() template <> std::string OutTClassString(WifiStoreRandomMac &item, const std::string &fileName) { std::ostringstream ss; + ss << " " <<"" << std::endl; ss << " " <<"ssid=" << ValidateString(item.ssid) << std::endl; ss << " " <<"HexSsid=" << ConvertArrayToHex((uint8_t*)&item.ssid[0], item.ssid.length()) << std::endl; ss << " " <<"keyMgmt=" << item.keyMgmt << std::endl; ss << " " <<"peerBssid=" << item.peerBssid << std::endl; ss << " " <<"randomMac=" << item.randomMac << std::endl; + ss << " " <<"" << std::endl; return ss.str(); } } // namespace Wifi -- Gitee From b901cf26c925afc9d77b6d2fd350bb2c8db7fc5b Mon Sep 17 00:00:00 2001 From: fengye Date: Tue, 13 Sep 2022 07:44:00 +0000 Subject: [PATCH 357/491] wifi config formation and password encryption Signed-off-by: fengye --- .../wifi_toolkit/config/wifi_config_file_spec.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.cpp index 246b601..b12f4bd 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.cpp @@ -1157,7 +1157,7 @@ std::string OutTClassString(WifiP2pGroupInfo &item, const std: std::string prefix = "vecDev_" + std::to_string(i) + "."; ss << " " <<"vecDev_=" << i << std::endl; const WifiP2pDevice &tmp = item.GetClientDevices().at(i); - ss << OutWifiP2pDevicClassString(tmp, prefix); + ss << OutWifiP2pDeviceClassString(tmp, prefix); } ss << " " <<"" << std::endl; return ss.str(); -- Gitee From 8acec71570fc5f5dc7da7d0dc1aa0e1ee2f77b5d Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Wed, 14 Sep 2022 08:34:53 +0000 Subject: [PATCH 358/491] Fix hotspot can't dump issue Signed-off-by: zhangfeng --- .../native/src/wifi_device_callback_stub.cpp | 2 +- .../native/src/wifi_hotspot_callback_stub.cpp | 2 +- .../native/src/wifi_p2p_callback_stub.cpp | 2 +- .../native/src/wifi_scan_callback_stub.cpp | 2 +- .../wifi_manage/wifi_device_service_impl.cpp | 1 + .../wifi_manage/wifi_device_stub.cpp | 2 +- .../wifi_hotspot_mgr_service_impl.cpp | 19 +++++++++++++++++++ .../wifi_hotspot_mgr_service_impl.h | 17 ++++++++++++++--- .../wifi_manage/wifi_hotspot_mgr_stub.cpp | 2 +- .../wifi_manage/wifi_hotspot_service_impl.cpp | 19 ------------------- .../wifi_manage/wifi_hotspot_service_impl.h | 9 +++------ .../wifi_manage/wifi_hotspot_stub.cpp | 2 +- .../wifi_manage/wifi_p2p_service_impl.cpp | 1 + .../wifi_manage/wifi_p2p_stub.cpp | 2 +- .../wifi_manage/wifi_scan_service_impl.cpp | 1 + .../wifi_manage/wifi_scan_stub.cpp | 2 +- 16 files changed, 48 insertions(+), 37 deletions(-) diff --git a/wifi/frameworks/native/src/wifi_device_callback_stub.cpp b/wifi/frameworks/native/src/wifi_device_callback_stub.cpp index d449ce8..bc08d17 100644 --- a/wifi/frameworks/native/src/wifi_device_callback_stub.cpp +++ b/wifi/frameworks/native/src/wifi_device_callback_stub.cpp @@ -38,7 +38,7 @@ int WifiDeviceCallBackStub::OnRemoteRequest( } if (data.ReadInterfaceToken() != GetDescriptor()) { - WIFI_LOGE("Sta callback stub token verification error"); + WIFI_LOGE("Sta callback stub token verification error: %{public}d", code); return WIFI_OPT_FAILED; } diff --git a/wifi/frameworks/native/src/wifi_hotspot_callback_stub.cpp b/wifi/frameworks/native/src/wifi_hotspot_callback_stub.cpp index 5a18637..5ea421e 100644 --- a/wifi/frameworks/native/src/wifi_hotspot_callback_stub.cpp +++ b/wifi/frameworks/native/src/wifi_hotspot_callback_stub.cpp @@ -39,7 +39,7 @@ int WifiHotspotCallbackStub::OnRemoteRequest( } if (data.ReadInterfaceToken() != GetDescriptor()) { - WIFI_LOGE("Hotspot callback stub token verification error"); + WIFI_LOGE("Hotspot callback stub token verification error: %{public}d", code); return WIFI_OPT_FAILED; } diff --git a/wifi/frameworks/native/src/wifi_p2p_callback_stub.cpp b/wifi/frameworks/native/src/wifi_p2p_callback_stub.cpp index 12d13ff..630fe7e 100644 --- a/wifi/frameworks/native/src/wifi_p2p_callback_stub.cpp +++ b/wifi/frameworks/native/src/wifi_p2p_callback_stub.cpp @@ -55,7 +55,7 @@ int WifiP2pCallbackStub::OnRemoteRequest( } if (data.ReadInterfaceToken() != GetDescriptor()) { - WIFI_LOGE("P2p callback stub token verification error"); + WIFI_LOGE("P2p callback stub token verification error: %{public}d", code); return WIFI_OPT_FAILED; } diff --git a/wifi/frameworks/native/src/wifi_scan_callback_stub.cpp b/wifi/frameworks/native/src/wifi_scan_callback_stub.cpp index b12092c..a19cf3d 100644 --- a/wifi/frameworks/native/src/wifi_scan_callback_stub.cpp +++ b/wifi/frameworks/native/src/wifi_scan_callback_stub.cpp @@ -38,7 +38,7 @@ int WifiScanCallbackStub::OnRemoteRequest( } if (data.ReadInterfaceToken() != GetDescriptor()) { - WIFI_LOGE("Scan callback stub token verification error"); + WIFI_LOGE("Scan callback stub token verification error: %{public}d", code); return WIFI_OPT_FAILED; } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp index 0baf7b6..dbd7808 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp @@ -1187,6 +1187,7 @@ void WifiDeviceServiceImpl::SaBasicDump(std::string& result) #ifndef OHOS_ARCH_LITE int32_t WifiDeviceServiceImpl::Dump(int32_t fd, const std::vector& args) { + WIFI_LOGI("Enter sta dump func."); std::vector vecArgs; std::transform(args.begin(), args.end(), std::back_inserter(vecArgs), [](const std::u16string &arg) { return Str16ToStr8(arg); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp index 56cdd72..4b273de 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp @@ -73,7 +73,7 @@ void WifiDeviceStub::InitHandleMap() int WifiDeviceStub::OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) { if (data.ReadInterfaceToken() != GetDescriptor()) { - WIFI_LOGE("Sta stub token verification error"); + WIFI_LOGE("Sta stub token verification error: %{public}d", code); return WIFI_OPT_FAILED; } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_mgr_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_mgr_service_impl.cpp index 29cb1ad..dffd84e 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_mgr_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_mgr_service_impl.cpp @@ -16,6 +16,7 @@ #include #include "wifi_logger.h" #include "wifi_config_center.h" +#include "wifi_dumper.h" #include "wifi_manager.h" #include "wifi_hotspot_mgr_service_impl.h" #include "wifi_hotspot_service_impl.h" @@ -141,5 +142,23 @@ sptr WifiHotspotMgrServiceImpl::GetWifiRemote(int id) } return nullptr; } + +int32_t WifiHotspotMgrServiceImpl::Dump(int32_t fd, const std::vector& args) +{ + WIFI_LOGI("Enter hotspot dump func."); + std::vector vecArgs; + std::transform(args.begin(), args.end(), std::back_inserter(vecArgs), [](const std::u16string &arg) { + return Str16ToStr8(arg); + }); + + WifiDumper dumper; + std::string result; + dumper.HotspotDump(WifiHotspotServiceImpl::SaBasicDump, vecArgs, result); + if (!SaveStringToFd(fd, result)) { + WIFI_LOGE("WiFi hotspot save string to fd failed."); + return ERR_OK; + } + return ERR_OK; +} } // namespace Wifi } // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_mgr_service_impl.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_mgr_service_impl.h index 4304de1..5c180a0 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_mgr_service_impl.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_mgr_service_impl.h @@ -16,11 +16,12 @@ #ifndef OHOS_WIFI_HOTSPOT_MGR_SERVICE_IMPL_H #define OHOS_WIFI_HOTSPOT_MGR_SERVICE_IMPL_H -#include "wifi_errcode.h" +#include +#include "iremote_object.h" #include "system_ability.h" -#include "wifi_hotspot_stub.h" +#include "wifi_errcode.h" #include "wifi_hotspot_mgr_stub.h" -#include "iremote_object.h" +#include "wifi_hotspot_stub.h" namespace OHOS { namespace Wifi { @@ -38,6 +39,16 @@ public: void OnStart() override; void OnStop() override; sptr GetWifiRemote(int id) override; + + /** + * @Description dump hotspot information + * + * @param fd - file descriptor + * @param args - dump arguments + * @return ErrCode - operation result + */ + int32_t Dump(int32_t fd, const std::vector& args) override; + private: bool Init(); friend void SigHandler(int sig); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_mgr_stub.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_mgr_stub.cpp index 08f7921..250f5e0 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_mgr_stub.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_mgr_stub.cpp @@ -43,7 +43,7 @@ int WifiHotspotMgrStub::OnRemoteRequest( uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) { if (data.ReadInterfaceToken() != GetDescriptor()) { - WIFI_LOGE("Hotspot stub token verification error"); + WIFI_LOGE("Hotspot stub token verification error: %{public}d", code); return WIFI_OPT_FAILED; } FuncHandleMap::iterator iter = funcHandleMap_.find(code); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp index 3f89c2e..3afe59d 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp @@ -14,7 +14,6 @@ */ #include "wifi_hotspot_service_impl.h" -#include #include #include "wifi_permission_utils.h" #include "wifi_global_func.h" @@ -26,7 +25,6 @@ #include "wifi_logger.h" #include "define.h" #include "wifi_logger.h" -#include "wifi_dumper.h" #include "wifi_common_util.h" DEFINE_WIFILOG_HOTSPOT_LABEL("WifiHotspotServiceImpl"); @@ -669,22 +667,5 @@ void WifiHotspotServiceImpl::SaBasicDump(std::string& result) StationsInfoDump(result); } } - -int32_t WifiHotspotServiceImpl::Dump(int32_t fd, const std::vector& args) -{ - std::vector vecArgs; - std::transform(args.begin(), args.end(), std::back_inserter(vecArgs), [](const std::u16string &arg) { - return Str16ToStr8(arg); - }); - - WifiDumper dumper; - std::string result; - dumper.HotspotDump(SaBasicDump, vecArgs, result); - if (!SaveStringToFd(fd, result)) { - WIFI_LOGE("WiFi hotspot save string to fd failed."); - return ERR_OK; - } - return ERR_OK; -} } // namespace Wifi } // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.h index 0e0e12d..55050ff 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.h @@ -179,19 +179,16 @@ public: ErrCode SetPowerModel(const PowerModel& model) override; /** - * @Description dump p2p information + * @Description Dump sa basic information * - * @param fd - file descriptor - * @param args - dump arguments - * @return ErrCode - operation result + * @param result[out] - dump result */ - int32_t Dump(int32_t fd, const std::vector& args) override; + static void SaBasicDump(std::string& result); private: ErrCode CheckCanEnableHotspot(const ServiceType type); int CheckOperHotspotSwitchPermission(const ServiceType type); bool IsApServiceRunning(); - static void SaBasicDump(std::string& result); static void ConfigInfoDump(std::string& result); static void StationsInfoDump(std::string& result); static void SigHandler(int sig); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.cpp index 26c5527..74f0b64 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.cpp @@ -64,7 +64,7 @@ void WifiHotspotStub::InitHandleMap() int WifiHotspotStub::OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) { if (data.ReadInterfaceToken() != GetDescriptor()) { - WIFI_LOGE("Hotspot stub token verification error"); + WIFI_LOGE("Hotspot stub token verification error: %{public}d", code); return WIFI_OPT_FAILED; } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp index e66ea45..f6e781d 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp @@ -1016,6 +1016,7 @@ void WifiP2pServiceImpl::SaBasicDump(std::string& result) int32_t WifiP2pServiceImpl::Dump(int32_t fd, const std::vector& args) { + WIFI_LOGI("Enter p2p dump func."); std::vector vecArgs; std::transform(args.begin(), args.end(), std::back_inserter(vecArgs), [](const std::u16string &arg) { return Str16ToStr8(arg); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.cpp index 264c56f..fa01fa9 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.cpp @@ -81,7 +81,7 @@ void WifiP2pStub::InitHandleMap() int WifiP2pStub::OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) { if (data.ReadInterfaceToken() != GetDescriptor()) { - WIFI_LOGE("P2p stub token verification error"); + WIFI_LOGE("P2p stub token verification error: %{public}d", code); return WIFI_OPT_FAILED; } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_service_impl.cpp index e77cadd..2aa11ee 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_service_impl.cpp @@ -274,6 +274,7 @@ void WifiScanServiceImpl::SaBasicDump(std::string& result) #ifndef OHOS_ARCH_LITE int32_t WifiScanServiceImpl::Dump(int32_t fd, const std::vector& args) { + WIFI_LOGI("Enter scan dump func."); std::vector vecArgs; std::transform(args.begin(), args.end(), std::back_inserter(vecArgs), [](const std::u16string &arg) { return Str16ToStr8(arg); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_stub.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_stub.cpp index d364568..5c711e7 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_stub.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_stub.cpp @@ -36,7 +36,7 @@ int WifiScanStub::OnRemoteRequest(uint32_t code, MessageParcel &data, MessagePar WIFI_LOGD("WifiScanStub::OnRemoteRequest,code:%{public}u", code); if (data.ReadInterfaceToken() != GetDescriptor()) { - WIFI_LOGE("Scan stub token verification error"); + WIFI_LOGE("Scan stub token verification error: %{public}d", code); return WIFI_OPT_FAILED; } -- Gitee From fc7152ed080b1ea650b0bc4b549da4a77569bd9a Mon Sep 17 00:00:00 2001 From: z00588131 Date: Fri, 16 Sep 2022 06:58:38 +0000 Subject: [PATCH 359/491] Remove unused path dependency in gn file Signed-off-by: z00588131 Change-Id: Id52804ada67796c784f8249b87b3b6a74ac5da67 --- wifi/frameworks/native/BUILD.gn | 1 - wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn | 2 -- 2 files changed, 3 deletions(-) diff --git a/wifi/frameworks/native/BUILD.gn b/wifi/frameworks/native/BUILD.gn index b77454a..2d21b94 100644 --- a/wifi/frameworks/native/BUILD.gn +++ b/wifi/frameworks/native/BUILD.gn @@ -45,7 +45,6 @@ if (defined(ohos_lite)) { "//foundation/systemabilitymgr/samgr_lite/interfaces/innerkits/registry", "//foundation/systemabilitymgr/samgr_lite/interfaces/innerkits/samgr", "//third_party/bounds_checking_function/include", - "//utils/native/lite/include", "//commonlibrary/c_utils/base/include", ] diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn index 72a7b8e..74ae189 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn @@ -68,7 +68,6 @@ if (defined(ohos_lite)) { "//foundation/systemabilitymgr/samgr_lite/interfaces/innerkits/registry", "//foundation/systemabilitymgr/samgr_lite/interfaces/innerkits/samgr", "//third_party/bounds_checking_function/include", - "//utils/native/lite/include", ] deps = [ @@ -128,7 +127,6 @@ if (defined(ohos_lite)) { "//foundation/systemabilitymgr/samgr_lite/interfaces/innerkits/registry", "//foundation/systemabilitymgr/samgr_lite/interfaces/innerkits/samgr", "//third_party/bounds_checking_function/include", - "//utils/native/lite/include", ] deps = [ -- Gitee From 9299d691a8297f5f6dd64bbf3e15bb8a2025f142 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Sat, 17 Sep 2022 13:25:01 +0800 Subject: [PATCH 360/491] remove redundant deps for wifi 0917 Signed-off-by: yanxiaotao@huawei.com --- wifi/frameworks/js/napi/BUILD.gn | 5 ----- wifi/frameworks/native/BUILD.gn | 2 -- .../wifi_framework/wifi_manage/BUILD.gn | 16 +--------------- .../wifi_framework/wifi_manage/wifi_ap/BUILD.gn | 3 --- .../wifi_framework/wifi_manage/wifi_p2p/BUILD.gn | 2 -- .../wifi_manage/wifi_scan/BUILD.gn | 1 - wifi/utils/BUILD.gn | 1 - 7 files changed, 1 insertion(+), 29 deletions(-) diff --git a/wifi/frameworks/js/napi/BUILD.gn b/wifi/frameworks/js/napi/BUILD.gn index a5ac4ba..ff5f81a 100644 --- a/wifi/frameworks/js/napi/BUILD.gn +++ b/wifi/frameworks/js/napi/BUILD.gn @@ -41,7 +41,6 @@ ohos_shared_library("wifi") { ] deps = [ "$WIFI_ROOT_DIR/frameworks/native:wifi_sdk", - "$WIFI_ROOT_DIR/utils:wifi_utils", "${ability_runtime_path}/frameworks/native/appkit:app_context", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//foundation/arkui/napi:ace_napi", @@ -86,7 +85,6 @@ ohos_shared_library("wifiext") { ] external_deps = [ - "bundle_framework:appexecfwk_base", "c_utils:utils", "ipc:ipc_core", ] @@ -123,7 +121,6 @@ ohos_shared_library("wifi_native_js") { ] deps = [ "$WIFI_ROOT_DIR/frameworks/native:wifi_sdk", - "$WIFI_ROOT_DIR/utils:wifi_utils", "${ability_runtime_path}/frameworks/native/appkit:app_context", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//foundation/arkui/napi:ace_napi", @@ -133,9 +130,7 @@ ohos_shared_library("wifi_native_js") { external_deps = [ "access_token:libaccesstoken_sdk", - "bundle_framework:appexecfwk_base", "c_utils:utils", - "ipc:ipc_core", ] relative_install_dir = "module" diff --git a/wifi/frameworks/native/BUILD.gn b/wifi/frameworks/native/BUILD.gn index 2d21b94..4687ead 100644 --- a/wifi/frameworks/native/BUILD.gn +++ b/wifi/frameworks/native/BUILD.gn @@ -205,9 +205,7 @@ if (defined(ohos_lite)) { ] external_deps = [ - "ability_base:want", "c_utils:utils", - "common_event_service:cesfwk_innerkits", "ipc:ipc_core", ] diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn index 74ae189..dc26f2c 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn @@ -177,6 +177,7 @@ if (defined(ohos_lite)) { "//base/security/access_token/interfaces/innerkits/accesstoken/include", "//foundation/communication/netmanager_base/frameworks/native/netmanagernative", "//foundation/communication/netmanager_base/interfaces/innerkits/netmanagernative/include", + "//foundation/communication/netmanager_base/interfaces/innerkits/netconnclient/include/proxy", ] } @@ -211,9 +212,6 @@ if (defined(ohos_lite)) { ] external_deps = [ - "ability_base:want", - "bundle_framework:appexecfwk_base", - "eventhandler:libeventhandler", "ipc:ipc_core", ] } @@ -244,10 +242,8 @@ if (defined(ohos_lite)) { deps = [ ":wifi_p2p_service_impl" ] external_deps = [ "ability_base:want", - "bundle_framework:appexecfwk_base", "c_utils:utils", "common_event_service:cesfwk_innerkits", - "eventhandler:libeventhandler", "ipc:ipc_core", ] } @@ -269,9 +265,6 @@ if (defined(ohos_lite)) { deps = [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit" ] external_deps = [ - "ability_base:want", - "bundle_framework:appexecfwk_base", - "eventhandler:libeventhandler", "ipc:ipc_core", ] defines = [ @@ -296,13 +289,9 @@ if (defined(ohos_lite)) { deps = [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit", - "//foundation/communication/netmanager_base/services/netmanagernative:netsys_native_manager", ] external_deps = [ - "ability_base:want", - "bundle_framework:appexecfwk_base", - "eventhandler:libeventhandler", "ipc:ipc_core", "netmanager_base:net_conn_manager_if", ] @@ -337,11 +326,9 @@ if (defined(ohos_lite)) { external_deps = [ "access_token:libaccesstoken_sdk", - "bundle_framework:appexecfwk_base", "c_utils:utils", "ipc:ipc_core", "netmanager_base:net_conn_manager_if", - "safwk:system_ability_fwk", "samgr:samgr_proxy", ] defines = [ @@ -382,7 +369,6 @@ if (defined(ohos_lite)) { deps = [ ":wifi_manager_service", ":wifi_scan_service_impl", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk:system_ability_fwk", ] diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn index 68d3356..e808bca 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn @@ -74,12 +74,9 @@ ohos_shared_library("wifi_ap_service") { ] deps = [ - "$DHCP_ROOT_DIR/services/mgr_service:dhcp_manager_service", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_common:wifi_common_service", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit", - "$WIFI_ROOT_DIR/utils:wifi_utils", ] defines = [ "AP_INTF=\"$wifi_feature_with_ap_intf\"" ] diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/BUILD.gn index e403528..742068e 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/BUILD.gn @@ -105,7 +105,6 @@ ohos_shared_library("wifi_p2p_service") { external_deps = [ "c_utils:utils", "hiviewdfx_hilog_native:libhilog", - "ipc:ipc_core", "netmanager_base:net_conn_manager_if", ] @@ -113,7 +112,6 @@ ohos_shared_library("wifi_p2p_service") { "$DHCP_ROOT_DIR/services/mgr_service:dhcp_manager_service", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_common:wifi_common_service", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit", "$WIFI_ROOT_DIR/utils:wifi_utils", ] diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn index 0c66f32..5577271 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn @@ -89,7 +89,6 @@ if (defined(ohos_lite)) { ] deps = [ - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit", ] diff --git a/wifi/utils/BUILD.gn b/wifi/utils/BUILD.gn index f60cfee..f3dc45b 100644 --- a/wifi/utils/BUILD.gn +++ b/wifi/utils/BUILD.gn @@ -65,7 +65,6 @@ if (defined(ohos_lite)) { external_deps = [ "ability_base:want", "ability_runtime:app_manager", - "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", "hisysevent_native:libhisysevent", -- Gitee From 67a878c7a8e3a946e1b5392699d79a14e81058e9 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Sat, 17 Sep 2022 14:13:49 +0800 Subject: [PATCH 361/491] remove redundant deps for wifi 0917 Signed-off-by: yanxiaotao@huawei.com --- wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn | 1 + 1 file changed, 1 insertion(+) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn index dc26f2c..8824ba1 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn @@ -242,6 +242,7 @@ if (defined(ohos_lite)) { deps = [ ":wifi_p2p_service_impl" ] external_deps = [ "ability_base:want", + "bundle_framework:appexecfwk_base", "c_utils:utils", "common_event_service:cesfwk_innerkits", "ipc:ipc_core", -- Gitee From 64cb2dbfd0ba416d30b664a57ed095b5366b10b4 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Sat, 17 Sep 2022 14:59:27 +0800 Subject: [PATCH 362/491] remove redundant deps for wifi 0917 Signed-off-by: yanxiaotao@huawei.com --- wifi/frameworks/js/napi/BUILD.gn | 3 +++ 1 file changed, 3 insertions(+) diff --git a/wifi/frameworks/js/napi/BUILD.gn b/wifi/frameworks/js/napi/BUILD.gn index ff5f81a..78e10ac 100644 --- a/wifi/frameworks/js/napi/BUILD.gn +++ b/wifi/frameworks/js/napi/BUILD.gn @@ -85,6 +85,7 @@ ohos_shared_library("wifiext") { ] external_deps = [ + "bundle_framework:appexecfwk_base", "c_utils:utils", "ipc:ipc_core", ] @@ -130,7 +131,9 @@ ohos_shared_library("wifi_native_js") { external_deps = [ "access_token:libaccesstoken_sdk", + "bundle_framework:appexecfwk_base", "c_utils:utils", + "ipc:ipc_core", ] relative_install_dir = "module" -- Gitee From bd3bf4e5728292d7d6f8e342b1247d3a33848795 Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Thu, 15 Sep 2022 11:11:55 +0000 Subject: [PATCH 363/491] Support hdi interface Signed-off-by: zhangfeng --- wifi/bundle.json | 3 +- wifi/services/wifi_standard/wifi_hal/BUILD.gn | 18 +- .../wifi_hdi_ap_impl.h} | 14 +- .../wifi_hal/hdi/inc/wifi_hdi_p2p_impl.h | 27 +++ .../wifi_hal/hdi/inc/wifi_hdi_proxy.h | 81 +++++++ .../wifi_hal/hdi/inc/wifi_hdi_sta_impl.h | 27 +++ .../wifi_hal/hdi/src/wifi_hdi_ap_impl.c | 78 ++++++ .../wifi_hdi_p2p_impl.c} | 53 +---- .../wifi_hal/hdi/src/wifi_hdi_proxy.c | 224 ++++++++++++++++++ .../wifi_hal/hdi/src/wifi_hdi_sta_impl.c | 26 ++ .../wifi_hal/wifi_hal_ap_interface.c | 92 ++----- .../wifi_hal/wifi_hal_ap_interface.h | 6 +- .../wifi_standard/wifi_hal/wifi_hal_crpc_ap.c | 1 + .../wifi_standard/wifi_hal/wifi_hal_define.h | 2 + .../wifi_hal/wifi_hal_sta_interface.c | 30 ++- .../wifi_common/Mock/mock_chip_capability.cpp | 0 .../wifi_common/Mock/mock_chip_capability.h | 0 .../wifi_standard/wifi_hal/unittest/BUILD.gn | 21 +- wifi/wifi.gni | 1 + wifi/wifi_lite.gni | 1 + 20 files changed, 553 insertions(+), 152 deletions(-) rename wifi/services/wifi_standard/wifi_hal/hdi/{wifi_hdi_ap_instance.h => inc/wifi_hdi_ap_impl.h} (73%) create mode 100644 wifi/services/wifi_standard/wifi_hal/hdi/inc/wifi_hdi_p2p_impl.h create mode 100644 wifi/services/wifi_standard/wifi_hal/hdi/inc/wifi_hdi_proxy.h create mode 100644 wifi/services/wifi_standard/wifi_hal/hdi/inc/wifi_hdi_sta_impl.h create mode 100644 wifi/services/wifi_standard/wifi_hal/hdi/src/wifi_hdi_ap_impl.c rename wifi/services/wifi_standard/wifi_hal/hdi/{wifi_hdi_ap_instance.c => src/wifi_hdi_p2p_impl.c} (32%) create mode 100644 wifi/services/wifi_standard/wifi_hal/hdi/src/wifi_hdi_proxy.c create mode 100644 wifi/services/wifi_standard/wifi_hal/hdi/src/wifi_hdi_sta_impl.c mode change 100755 => 100644 wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_common/Mock/mock_chip_capability.cpp mode change 100755 => 100644 wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_common/Mock/mock_chip_capability.h diff --git a/wifi/bundle.json b/wifi/bundle.json index 88119f8..134474e 100644 --- a/wifi/bundle.json +++ b/wifi/bundle.json @@ -49,7 +49,8 @@ "wifi_feature_with_ap_intf", "wifi_feature_with_ap_num", "wifi_feature_with_auth_disable", - "wifi_feature_with_dhcp_disable" + "wifi_feature_with_dhcp_disable", + "wifi_feature_is_hdi_supported" ], "adapted_system_type": [ "standard" diff --git a/wifi/services/wifi_standard/wifi_hal/BUILD.gn b/wifi/services/wifi_standard/wifi_hal/BUILD.gn index 4e22638..e3a5138 100644 --- a/wifi/services/wifi_standard/wifi_hal/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_hal/BUILD.gn @@ -21,7 +21,10 @@ if (defined(ohos_lite)) { local_base_sources = [ "common/wifi_hal_common_func.c", - "hdi/wifi_hdi_ap_instance.c", + "hdi/src/wifi_hdi_ap_impl.c", + "hdi/src/wifi_hdi_p2p_impl.c", + "hdi/src/wifi_hdi_proxy.c", + "hdi/src/wifi_hdi_sta_impl.c", "main.c", "wifi_hal_adapter.c", "wifi_hal_ap_interface.c", @@ -56,7 +59,7 @@ local_base_include_dirs = [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/hdi", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/hdi/inc", ] if (defined(ohos_lite)) { @@ -99,28 +102,33 @@ if (defined(ohos_lite)) { "//third_party/wpa_supplicant/wpa_supplicant-2.9_standard/src/", "//third_party/bounds_checking_function/include/", "//drivers/peripheral/wlan/interfaces/include/", - "//drivers/peripheral/wlan/client/include/", ] deps = [ "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC:crpc_server", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/etc/init:etc", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//drivers/peripheral/wlan/hal:wifi_hal", "//third_party/wpa_supplicant/wpa_supplicant-2.9_standard:wpa_client", ] external_deps = [ "c_utils:utils" ] - cflags_cc = [ "-fno-rtti" ] defines = [ "AP_INTF=\"$wifi_feature_with_ap_intf\"", "AP_NUM=$wifi_feature_with_ap_num", ] + + if (wifi_feature_is_hdi_supported) { + defines += [ "HDI_INTERFACE_SUPPORT" ] + external_deps += [ "drivers_interface_wlanlibwlan_proxy_1.0" ] + } + if (product_name == "rk3568") { defines += [ "NON_SEPERATE_P2P" ] } + cflags_cc = [ "-fno-rtti" ] + part_name = "wifi" subsystem_name = "communication" } diff --git a/wifi/services/wifi_standard/wifi_hal/hdi/wifi_hdi_ap_instance.h b/wifi/services/wifi_standard/wifi_hal/hdi/inc/wifi_hdi_ap_impl.h similarity index 73% rename from wifi/services/wifi_standard/wifi_hal/hdi/wifi_hdi_ap_instance.h rename to wifi/services/wifi_standard/wifi_hal/hdi/inc/wifi_hdi_ap_impl.h index 5c63697..67783ef 100644 --- a/wifi/services/wifi_standard/wifi_hal/hdi/wifi_hdi_ap_instance.h +++ b/wifi/services/wifi_standard/wifi_hal/hdi/inc/wifi_hdi_ap_impl.h @@ -13,21 +13,17 @@ * limitations under the License. */ -#ifndef OHOS_HDI_INSTANCE_H -#define OHOS_HDI_INSTANCE_H +#ifndef OHOS_HDI_AP_IMPL_H +#define OHOS_HDI_AP_IMPL_H -#include "wifi_hal.h" -#include "wifi_hal_ap_feature.h" #include "wifi_hal_define.h" #ifdef __cplusplus extern "C" { #endif - -WifiErrorNo HdiGetAp(struct IWiFi **wifi, struct IWiFiAp **apFeature); - -WifiErrorNo HdiReleaseAp(struct IWiFi *wifi, struct IWiFiAp *apFeature); - +WifiErrorNo GetValidFrequenciesForBand(int32_t band, int *frequencies, int32_t *size, int id); +WifiErrorNo WifiSetPowerModel(const int mode, int id); +WifiErrorNo WifiGetPowerModel(int* mode, int id); #ifdef __cplusplus } #endif diff --git a/wifi/services/wifi_standard/wifi_hal/hdi/inc/wifi_hdi_p2p_impl.h b/wifi/services/wifi_standard/wifi_hal/hdi/inc/wifi_hdi_p2p_impl.h new file mode 100644 index 0000000..df84dd6 --- /dev/null +++ b/wifi/services/wifi_standard/wifi_hal/hdi/inc/wifi_hdi_p2p_impl.h @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OHOS_HDI_P2P_IMPL_H +#define OHOS_HDI_P2P_IMPL_H + +#ifdef __cplusplus +extern "C" { +#endif + + +#ifdef __cplusplus +} +#endif +#endif \ No newline at end of file diff --git a/wifi/services/wifi_standard/wifi_hal/hdi/inc/wifi_hdi_proxy.h b/wifi/services/wifi_standard/wifi_hal/hdi/inc/wifi_hdi_proxy.h new file mode 100644 index 0000000..4dfda8a --- /dev/null +++ b/wifi/services/wifi_standard/wifi_hal/hdi/inc/wifi_hdi_proxy.h @@ -0,0 +1,81 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OHOS_HDI_PROXY_H +#define OHOS_HDI_PROXY_H + +#include "wifi_hal_define.h" +#include "v1_0/iwlan_interface.h" +#include "wifi_hal_base_feature.h" + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct WifiHdiProxy { + struct IWlanInterface* wlanObj; + struct HdfFeatureInfo* feature; +} WifiHdiProxy; + +#ifndef CHECK_HDI_PROXY_AND_RETURN +#define CHECK_HDI_PROXY_AND_RETURN(proxy, retValue) \ +if (proxy.wlanObj == NULL || proxy.feature == NULL) { \ + LOGE("Hdi proxy: %{public}s in %{public}s is NULL!", #proxy, __func__); \ + return retValue; \ +} +#endif + +/** + * @Description Create a channel between the HAL and the driver. + * + * @return WifiErrorNo - operation result + */ +WifiErrorNo HdiStart(); + +/** + * @Description Stop the created channel. + * + * @return WifiErrorNo - operation result + */ +WifiErrorNo HdiStop(); + +/** + * @Description Create the WiFi object. + * + * @return WifiErrorNo - operation result + */ +struct IWlanInterface* GetWlanInterface(); + +/** + * @Description Get the hdi proxy by wlan type. + * + * @param wlanType - wlan type + * @return WifiHdiProxy - interface proxy object + */ +WifiHdiProxy GetHdiProxy(const int32_t wlanType); + +/** + * @Description Release hdi proxy by wlan type. + * This interface will be automatic called in the hid stop function, + * So you can use it without releasing. + * + * @param wlanType - wlan type + * @return WifiErrorNo - operation result + */ +WifiErrorNo ReleaseHdiProxy(const int32_t wlanType); +#ifdef __cplusplus +} +#endif +#endif \ No newline at end of file diff --git a/wifi/services/wifi_standard/wifi_hal/hdi/inc/wifi_hdi_sta_impl.h b/wifi/services/wifi_standard/wifi_hal/hdi/inc/wifi_hdi_sta_impl.h new file mode 100644 index 0000000..aee1953 --- /dev/null +++ b/wifi/services/wifi_standard/wifi_hal/hdi/inc/wifi_hdi_sta_impl.h @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OHOS_HDI_STA_IMPL_H +#define OHOS_HDI_STA_IMPL_H + +#ifdef __cplusplus +extern "C" { +#endif + + +#ifdef __cplusplus +} +#endif +#endif \ No newline at end of file diff --git a/wifi/services/wifi_standard/wifi_hal/hdi/src/wifi_hdi_ap_impl.c b/wifi/services/wifi_standard/wifi_hal/hdi/src/wifi_hdi_ap_impl.c new file mode 100644 index 0000000..b7061b9 --- /dev/null +++ b/wifi/services/wifi_standard/wifi_hal/hdi/src/wifi_hdi_ap_impl.c @@ -0,0 +1,78 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifdef HDI_INTERFACE_SUPPORT + +#include "wifi_hdi_ap_impl.h" +#include "wifi_hdi_proxy.h" +#include "wifi_log.h" + +#undef LOG_TAG +#define LOG_TAG "WifiHdiApImpl" + +#define NUMS_BAND 2 + +static int32_t ConvertToNl80211Band(int32_t band) +{ + return (band > 0 && band <= NUMS_BAND) ? (band - 1) : band; +} + +WifiErrorNo GetValidFrequenciesForBand(int32_t band, int *frequencies, int32_t *size, int id) +{ + if (frequencies == NULL || size == NULL) { + LOGE("%{public}s frequencies or size is null.", __func__); + return WIFI_HAL_FAILED; + } + WifiHdiProxy proxy = GetHdiProxy(PROTOCOL_80211_IFTYPE_AP); + CHECK_HDI_PROXY_AND_RETURN(proxy, WIFI_HAL_FAILED); + struct HdfWifiInfo wifiInfo; + wifiInfo.band = ConvertToNl80211Band(band); + wifiInfo.size = *size; + uint32_t count = 0xff; + LOGI("Get freqs parameters [band: %{public}d, alloc size: %{public}d]", wifiInfo.band, wifiInfo.size); + int32_t ret = proxy.wlanObj->GetFreqsWithBand(proxy.wlanObj, proxy.feature, &wifiInfo, frequencies, &count); + LOGI("Get freqs result, actual size: %{public}d", count); + *size = count; + if (ret != 0) { + LOGE("Get freqs with band failed: %{public}d", ret); + } + return (ret == 0) ? WIFI_HAL_SUCCESS : WIFI_HAL_FAILED; +} + +WifiErrorNo WifiSetPowerModel(const int mode, int id) +{ + LOGI("Instance %{public}d WifiSetPowerModel: %{public}d", id, mode); + WifiHdiProxy proxy = GetHdiProxy(PROTOCOL_80211_IFTYPE_AP); + CHECK_HDI_PROXY_AND_RETURN(proxy, WIFI_HAL_FAILED); + int32_t ret = proxy.wlanObj->SetPowerMode(proxy.wlanObj, proxy.feature, mode); + if (ret != 0) { + LOGE("Set power mode failed: %{public}d", ret); + } + return (ret == 0) ? WIFI_HAL_SUCCESS : WIFI_HAL_FAILED; +} + +WifiErrorNo WifiGetPowerModel(int* mode, int id) +{ + LOGI("Instance %{public}d WifiGetPowerModel", id); + WifiHdiProxy proxy = GetHdiProxy(PROTOCOL_80211_IFTYPE_AP); + CHECK_HDI_PROXY_AND_RETURN(proxy, WIFI_HAL_FAILED); + int32_t ret = proxy.wlanObj->GetPowerMode(proxy.wlanObj, proxy.feature, (uint8_t *)mode); + if (ret != 0) { + LOGE("Get power mode failed: %{public}d", ret); + } + LOGI("Get power mode: %{public}d", *mode); + return (ret == 0) ? WIFI_HAL_SUCCESS : WIFI_HAL_FAILED; +} +#endif diff --git a/wifi/services/wifi_standard/wifi_hal/hdi/wifi_hdi_ap_instance.c b/wifi/services/wifi_standard/wifi_hal/hdi/src/wifi_hdi_p2p_impl.c similarity index 32% rename from wifi/services/wifi_standard/wifi_hal/hdi/wifi_hdi_ap_instance.c rename to wifi/services/wifi_standard/wifi_hal/hdi/src/wifi_hdi_p2p_impl.c index f9523ef..152fffa 100644 --- a/wifi/services/wifi_standard/wifi_hal/hdi/wifi_hdi_ap_instance.c +++ b/wifi/services/wifi_standard/wifi_hal/hdi/src/wifi_hdi_p2p_impl.c @@ -13,57 +13,14 @@ * limitations under the License. */ -#ifndef OHOS_ARCH_LITE -#include "wifi_hdi_ap_instance.h" -#include "wifi_hal_define.h" +#ifdef HDI_INTERFACE_SUPPORT + +#include "wifi_hdi_p2p_impl.h" +#include "wifi_hdi_proxy.h" #include "wifi_log.h" #undef LOG_TAG -#define LOG_TAG "WifiHdiInstance" - -WifiErrorNo HdiGetAp(struct IWiFi **wifi, struct IWiFiAp **apFeature) -{ - if (wifi == NULL || apFeature == NULL) { - return WIFI_HAL_FAILED; - } - - LOGD("HdiGetAp"); - int32_t ret; - ret = WifiConstruct(wifi); - if (ret != 0 || *wifi == NULL) { - LOGE("%{public}s WifiConstruct failed", __func__); - return WIFI_HAL_FAILED; - } - - ret = (*wifi)->start(*wifi); - if (ret != 0) { - (void)WifiDestruct(wifi); - LOGE("%{public}s start failed", __func__); - return WIFI_HAL_FAILED; - } - - ret = (*wifi)->createFeature(PROTOCOL_80211_IFTYPE_AP, (struct IWiFiBaseFeature **)apFeature); - if (ret != 0 || *apFeature == NULL) { - (void)(*wifi)->stop(*wifi); - (void)WifiDestruct(wifi); - LOGE("%{public}s createFeature failed", __func__); - return WIFI_HAL_FAILED; - } - return WIFI_HAL_SUCCESS; -} +#define LOG_TAG "WifiHdiP2pImpl" -WifiErrorNo HdiReleaseAp(struct IWiFi *wifi, struct IWiFiAp *apFeature) -{ - if (wifi == NULL) { - return WIFI_HAL_FAILED; - } - LOGD("HdiReleaseAp"); - if (apFeature != NULL) { - (void)wifi->destroyFeature((struct IWiFiBaseFeature *)apFeature); - } - (void)wifi->stop(wifi); - (void)WifiDestruct(&wifi); - return WIFI_HAL_SUCCESS; -} #endif diff --git a/wifi/services/wifi_standard/wifi_hal/hdi/src/wifi_hdi_proxy.c b/wifi/services/wifi_standard/wifi_hal/hdi/src/wifi_hdi_proxy.c new file mode 100644 index 0000000..26af697 --- /dev/null +++ b/wifi/services/wifi_standard/wifi_hal/hdi/src/wifi_hdi_proxy.c @@ -0,0 +1,224 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifdef HDI_INTERFACE_SUPPORT +#include "wifi_hdi_proxy.h" +#include +#include +#include "wifi_log.h" + +#undef LOG_TAG +#define LOG_TAG "WifiHdiProxy" + +#define MAX_FEATURE_NUMBER 16 + +const char *WLAN_SERVICE_NAME = "wlan_interface_service"; // Move the define to HDF module + +static pthread_mutex_t g_mutex; +static unsigned int g_wlanRefCount = 0; +static struct IWlanInterface *g_wlanObj = NULL; +static struct HdfFeatureInfo* g_featureArray[MAX_FEATURE_NUMBER] = {NULL}; + +static WifiErrorNo ReleaseFeatureInner(const int32_t wlanType) +{ + WifiErrorNo ret = WIFI_HAL_SUCCESS; + if (g_wlanObj == NULL) { + LOGE("%{public}s g_wlanObj is null", __func__); + return WIFI_HAL_FAILED; + } + for (int i = 0; i != MAX_FEATURE_NUMBER; ++i) { + if (g_featureArray[i] == NULL || g_featureArray[i]->type != wlanType) { + continue; + } + LOGI("%{public}s destory feature begin.", __func__); + ret = g_wlanObj->DestroyFeature(g_wlanObj, g_featureArray[i]); + if (ret != HDF_SUCCESS) { + LOGE("Destroy feature %{public}d failed: %{public}d", g_featureArray[i]->type, ret); + } + LOGI("%{public}s destory feature end.", __func__); + free(g_featureArray[i]); + g_featureArray[i] = NULL; + break; + } + return ret; +} + +static struct HdfFeatureInfo* GetFeatureInner(const int32_t wlanType) +{ + struct HdfFeatureInfo *feature = NULL; + if (g_wlanObj == NULL) { + LOGE("%{public}s g_wlanObj is null!", __func__); + return NULL; + } + for (int i = 0; i != MAX_FEATURE_NUMBER; ++i) { + if (g_featureArray[i] == NULL) { + continue; + } + if (g_featureArray[i]->type == wlanType) { + LOGI("%{public}s get an exist feature.", __func__); + feature = g_featureArray[i]; + return feature; + } + } + + /* allocate 1 struct */ + feature = (struct HdfFeatureInfo *)calloc(1, sizeof(struct HdfFeatureInfo)); + if (feature == NULL) { + LOGE("%{public}s calloc failed!", __func__); + return NULL; + } + LOGI("Create feature type: %{public}d", wlanType); + int32_t ret = g_wlanObj->CreateFeature(g_wlanObj, wlanType, feature); + if (ret != HDF_SUCCESS) { + LOGE("CreateFeature %{public}d failed: %{public}d", wlanType, ret); + goto FAILURE; + } + LOGI("Create feature end, ifname: %{public}s", feature->ifName); + bool isAdd = false; + for (int i = 0; i != MAX_FEATURE_NUMBER; ++i) { + if (g_featureArray[i] == NULL) { + g_featureArray[i] = feature; + isAdd = true; + break; + } + } + if (!isAdd) { + LOGE("%{public}s g_featureArray is full!", __func__); + goto FAILURE; + } + return feature; + +FAILURE: + if (feature != NULL) { + free(feature); + } + return NULL; +} + +static void ReleaseAllFeatures() +{ + if (g_wlanObj == NULL) { + return; + } + WifiErrorNo ret = WIFI_HAL_SUCCESS; + for (int i = 0; i != MAX_FEATURE_NUMBER; ++i) { + if (g_featureArray[i] == NULL) { + continue; + } + LOGI("%{public}s destory feature[all] begin.", __func__); + ret = g_wlanObj->DestroyFeature(g_wlanObj, g_featureArray[i]); + if (ret != HDF_SUCCESS) { + LOGE("Destroy feature %{public}d failed: %{public}d", g_featureArray[i]->type, ret); + } + LOGI("%{public}s destory feature[all] end.", __func__); + free(g_featureArray[i]); + g_featureArray[i] = NULL; + } +} + +WifiErrorNo HdiStart() +{ + LOGI("%{public}s start...", __func__); + pthread_mutex_lock(&g_mutex); + if (g_wlanRefCount != 0) { + ++g_wlanRefCount; + pthread_mutex_unlock(&g_mutex); + LOGI("%{public}s wlan ref count: %d", __func__, g_wlanRefCount); + return WIFI_HAL_SUCCESS; + } + g_wlanObj = IWlanInterfaceGetInstance(WLAN_SERVICE_NAME, false); + if (g_wlanObj == NULL) { + pthread_mutex_unlock(&g_mutex); + LOGE("%{public}s WlanInterfaceGetInstance failed", __func__); + return WIFI_HAL_FAILED; + } + int32_t ret = g_wlanObj->Start(g_wlanObj); + if (ret != HDF_SUCCESS) { + LOGE("%{public}s Start failed: %{public}d", __func__, ret); + IWlanInterfaceReleaseInstance(WLAN_SERVICE_NAME, g_wlanObj, false); + g_wlanObj = NULL; + pthread_mutex_unlock(&g_mutex); + return WIFI_HAL_FAILED; + } + ++g_wlanRefCount; + pthread_mutex_unlock(&g_mutex); + LOGI("%{public}s is started", __func__); + return WIFI_HAL_SUCCESS; +} + +WifiErrorNo HdiStop() +{ + LOGI("%{public}s stop...", __func__); + pthread_mutex_lock(&g_mutex); + if (g_wlanObj == NULL || g_wlanRefCount == 0) { + pthread_mutex_unlock(&g_mutex); + LOGE("%{public}s g_wlanObj is NULL or ref count is 0", __func__); + return WIFI_HAL_FAILED; + } + + const unsigned int ONE_REF_COUNT = 1; + if (g_wlanRefCount > ONE_REF_COUNT) { + --g_wlanRefCount; + pthread_mutex_unlock(&g_mutex); + LOGI("%{public}s wlan ref count: %d", __func__, g_wlanRefCount); + return WIFI_HAL_SUCCESS; + } + ReleaseAllFeatures(); + int32_t ret = g_wlanObj->Stop(g_wlanObj); + if (ret != HDF_SUCCESS) { + LOGE("%{public}s Stop failed: %{public}d", __func__, ret); + } + IWlanInterfaceReleaseInstance(WLAN_SERVICE_NAME, g_wlanObj, false); + --g_wlanRefCount; + g_wlanObj = NULL; + pthread_mutex_unlock(&g_mutex); + LOGI("%{public}s is stopped", __func__); + return (ret == HDF_SUCCESS) ? WIFI_HAL_SUCCESS : WIFI_HAL_FAILED; +} + +struct IWlanInterface* GetWlanInterface() +{ + struct IWlanInterface *wlanObj = NULL; + pthread_mutex_lock(&g_mutex); + wlanObj = g_wlanObj; + pthread_mutex_unlock(&g_mutex); + return wlanObj; +} + +WifiHdiProxy GetHdiProxy(const int32_t wlanType) +{ + WifiHdiProxy proxy = {.wlanObj = NULL, .feature = NULL}; + pthread_mutex_lock(&g_mutex); + struct HdfFeatureInfo* feature = GetFeatureInner(wlanType); + if (feature == NULL) { + pthread_mutex_unlock(&g_mutex); + LOGE("%{public}s GetFeature failed!", __func__); + return proxy; + } + proxy.wlanObj = g_wlanObj; + proxy.feature = feature; + pthread_mutex_unlock(&g_mutex); + return proxy; +} + +WifiErrorNo ReleaseHdiProxy(const int32_t wlanType) +{ + WifiErrorNo ret = WIFI_HAL_FAILED; + pthread_mutex_lock(&g_mutex); + ret = ReleaseFeatureInner(wlanType); + pthread_mutex_unlock(&g_mutex); + return ret; +} +#endif diff --git a/wifi/services/wifi_standard/wifi_hal/hdi/src/wifi_hdi_sta_impl.c b/wifi/services/wifi_standard/wifi_hal/hdi/src/wifi_hdi_sta_impl.c new file mode 100644 index 0000000..3c1f218 --- /dev/null +++ b/wifi/services/wifi_standard/wifi_hal/hdi/src/wifi_hdi_sta_impl.c @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifdef HDI_INTERFACE_SUPPORT + +#include "wifi_hdi_sta_impl.h" +#include "wifi_hdi_proxy.h" +#include "wifi_log.h" + +#undef LOG_TAG +#define LOG_TAG "WifiHdiStaImpl" + + +#endif diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c index b3e4b12..25684c7 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c @@ -16,15 +16,12 @@ #include "wifi_hal_ap_interface.h" #include #include -#ifdef OHOS_ARCH_LITE #include "wifi_hal_adapter.h" -#else -#include "wifi_hal.h" -#include "wifi_hal_adapter.h" -#include "wifi_hdi_ap_instance.h" -#endif #include "wifi_hal_module_manage.h" #include "wifi_hal_common_func.h" +#ifdef HDI_INTERFACE_SUPPORT +#include "wifi_hdi_proxy.h" +#endif #include "wifi_log.h" #include "wifi_wpa_hal.h" #include "wifi_hostapd_hal.h" @@ -32,7 +29,6 @@ #undef LOG_TAG #define LOG_TAG "WifiHalApInterface" -#define NUMS_BAND 2 #define DISABLE_AP_WAIT_MS 50000 #define ABLE_AP_WAIT_MS 50000 #define WIFI_MULTI_CMD_MAX_LEN 1024 @@ -47,18 +43,15 @@ WifiErrorNo StartSoftAp(int id) LOGE("hostapd start failed!"); return WIFI_HAL_OPEN_HOSTAPD_FAILED; } - if (StartHostapdHal(id) != WIFI_HAL_SUCCESS) { LOGE("hostapd init failed!"); return WIFI_HAL_HOSTAPD_NOT_INIT; } - WifiHostapdHalDevice *hostapdHalDevice = GetWifiHostapdDev(id); if (hostapdHalDevice == NULL) { LOGE("hostapdHalDevice is NULL!"); return WIFI_HAL_HOSTAPD_NOT_INIT; } - int ret = sprintf_s(ifaceName, IFCAE_NAME_LEN, AP_INTF"%d", id); if (ret == -1) { LOGE("StartSoftAp failed! ret=%{public}d", ret); @@ -71,7 +64,12 @@ WifiErrorNo StartSoftAp(int id) return WIFI_HAL_FAILED; } } - +#ifdef HDI_INTERFACE_SUPPORT + if (HdiStart() != WIFI_HAL_SUCCESS) { + LOGE("[Ap] Start hdi failed!"); + return WIFI_HAL_FAILED; + } +#endif LOGI("AP start successfully, id:%{public}d!", id); return WIFI_HAL_SUCCESS; } @@ -127,6 +125,12 @@ WifiErrorNo StartHostapdHal(int id) WifiErrorNo StopSoftAp(int id) { +#ifdef HDI_INTERFACE_SUPPORT + if (HdiStop() != WIFI_HAL_SUCCESS) { + LOGE("[Ap] Stop hdi failed!"); + return WIFI_HAL_FAILED; + } +#endif WifiHostapdHalDevice *hostapdHalDevice = GetWifiHostapdDev(id); if (hostapdHalDevice != NULL) { int ret = hostapdHalDevice->disableAp(id); @@ -136,18 +140,15 @@ WifiErrorNo StopSoftAp(int id) } else { LOGE("cant not get hostapd dev"); } - if (StopHostapd() != WIFI_HAL_SUCCESS) { LOGE("hostapd stop failed!"); return WIFI_HAL_FAILED; } - if (StopHostapdHal(id) != WIFI_HAL_SUCCESS) { LOGE("hostapd_hal stop failed!"); return WIFI_HAL_FAILED; } - - LOGD("AP stop successfully!"); + LOGI("AP stop successfully!"); return WIFI_HAL_SUCCESS; } @@ -314,79 +315,24 @@ WifiErrorNo DisassociateSta(const unsigned char *mac, int lenMac, int id) return WIFI_HAL_SUCCESS; } -static int32_t ConvertToNl80211Band(int32_t band) -{ - return (band > 0 && band <= NUMS_BAND) ? (band - 1) : band; -} - WifiErrorNo GetValidFrequenciesForBand(int32_t band, int *frequencies, int32_t *size, int id) { if (frequencies == NULL || size == NULL) { LOGE("%{public}s frequencies or size is null.", __func__); return WIFI_HAL_FAILED; } -#ifdef OHOS_ARCH_LITE + LOGE("%{public}s func is not support!", __func__); return WIFI_HAL_FAILED; -#else - uint32_t count = 0; - struct IWiFi *wifi = NULL; - struct IWiFiAp *apFeature = NULL; - WifiErrorNo ret = HdiGetAp(&wifi, &apFeature); - if (ret != WIFI_HAL_SUCCESS) { - return WIFI_HAL_FAILED; - } - ret = apFeature->baseFeature.getValidFreqsWithBand((struct IWiFiBaseFeature *)apFeature, - ConvertToNl80211Band(band), frequencies, *size, &count); - *size = count; - if (ret != 0) { - LOGE("%{public}s failed", __func__); - } - HdiReleaseAp(wifi, apFeature); - return (ret == 0) ? WIFI_HAL_SUCCESS : WIFI_HAL_FAILED; -#endif } WifiErrorNo WifiSetPowerModel(const int mode, int id) { -#ifdef OHOS_ARCH_LITE + LOGE("%{public}s func is not support!", __func__); return WIFI_HAL_FAILED; -#else - LOGD("Instance %{public}d WifiSetPowerModel: %{public}d", id, mode); - - struct IWiFi *wifi = NULL; - struct IWiFiAp *apFeature = NULL; - WifiErrorNo ret = HdiGetAp(&wifi, &apFeature); - if (ret != WIFI_HAL_SUCCESS) { - return WIFI_HAL_FAILED; - } - ret = wifi->setPowerMode(apFeature->baseFeature.ifName, mode); - if (ret != 0) { - LOGE("%{public}s failed", __func__); - } - HdiReleaseAp(wifi, apFeature); - return (ret == 0) ? WIFI_HAL_SUCCESS : WIFI_HAL_FAILED; -#endif } WifiErrorNo WifiGetPowerModel(int* mode, int id) { -#ifdef OHOS_ARCH_LITE + LOGE("%{public}s func is not support!", __func__); return WIFI_HAL_FAILED; -#else - LOGD("Instance %{public}d WifiGetPowerModel", id); - - struct IWiFi *wifi = NULL; - struct IWiFiAp *apFeature = NULL; - WifiErrorNo ret = HdiGetAp(&wifi, &apFeature); - if (ret != WIFI_HAL_SUCCESS) { - return WIFI_HAL_FAILED; - } - ret = wifi->getPowerMode(apFeature->baseFeature.ifName, (uint8_t *)mode); - if (ret != 0) { - LOGE("%{public}s failed", __func__); - } - LOGD("getPowerModel: %{public}d", *mode); - HdiReleaseAp(wifi, apFeature); - return (ret == 0) ? WIFI_HAL_SUCCESS : WIFI_HAL_FAILED; -#endif } diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.h index 34cee16..5613563 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.h +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.h @@ -144,7 +144,7 @@ WifiErrorNo DisassociateSta(const unsigned char *mac, int lenMac, int id); * @param id - ap id * @return WifiErrorNo */ -WifiErrorNo GetValidFrequenciesForBand(int32_t band, int *frequencies, int32_t *size, int id); +WifiErrorNo WEAK_FUNC GetValidFrequenciesForBand(int32_t band, int *frequencies, int32_t *size, int id); /** * @Description Set the power mode. @@ -153,7 +153,7 @@ WifiErrorNo GetValidFrequenciesForBand(int32_t band, int *frequencies, int32_t * * @param id - ap id * @return WifiErrorNo */ -WifiErrorNo WifiSetPowerModel(const int mode, int id); +WifiErrorNo WEAK_FUNC WifiSetPowerModel(const int mode, int id); /** * @Description Get the power mode. @@ -162,7 +162,7 @@ WifiErrorNo WifiSetPowerModel(const int mode, int id); * @param id - ap id * @return WifiErrorNo */ -WifiErrorNo WifiGetPowerModel(int* mode, int id); +WifiErrorNo WEAK_FUNC WifiGetPowerModel(int* mode, int id); #ifdef __cplusplus } #endif diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_ap.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_ap.c index 45298fd..4896602 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_ap.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_ap.c @@ -16,6 +16,7 @@ #include "wifi_hal_crpc_ap.h" #include #include "serial.h" +#include "wifi_hdi_ap_impl.h" #include "wifi_hal_ap_interface.h" #include "wifi_hal_define.h" diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_define.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_define.h index 525bdc4..d5fc765 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_define.h +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_define.h @@ -41,6 +41,8 @@ extern "C" { #define WIFI_HAL_FALSE 0 #define WIFI_HAL_TRUE 1 +#define WEAK_FUNC __attribute__((weak)) + typedef enum WifiErrorNo { WIFI_HAL_SUCCESS = 0, /* Success. */ WIFI_HAL_FAILED = 1, /* Failed. */ diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c index df6203c..ac161d2 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c @@ -17,9 +17,12 @@ #include "securec.h" #include "wifi_hal_adapter.h" #include "wifi_hal_module_manage.h" +#ifdef HDI_INTERFACE_SUPPORT +#include "wifi_hdi_proxy.h" +#endif #include "wifi_log.h" -#include "wifi_wpa_hal.h" #include "wifi_supplicant_hal.h" +#include "wifi_wpa_hal.h" #undef LOG_TAG #define LOG_TAG "WifiHalStaInterface" @@ -109,7 +112,7 @@ WifiErrorNo Start(void) LOGE("wpa_supplicant start failed!"); return WIFI_HAL_OPEN_SUPPLICANT_FAILED; } - LOGD("wpa_supplicant start successfully!"); + LOGI("wpa_supplicant start successfully!"); if (AddWpaIface(0) != WIFI_HAL_SUCCESS) { LOGE("Failed to add wpa interface!"); @@ -122,7 +125,12 @@ WifiErrorNo Start(void) StopWpaAndWpaHal(0); return WIFI_HAL_CONN_SUPPLICANT_FAILED; } - LOGD("SupplicantHal connect wpa_supplicant successfully!"); +#ifdef HDI_INTERFACE_SUPPORT + if (HdiStart() != WIFI_HAL_SUCCESS) { + LOGE("[STA] Start hdi failed!"); + return WIFI_HAL_FAILED; + } +#endif LOGI("Start wifi successfully"); return WIFI_HAL_SUCCESS; } @@ -130,18 +138,30 @@ WifiErrorNo Start(void) WifiErrorNo Stop(void) { LOGI("Ready to Stop wifi"); +#ifdef HDI_INTERFACE_SUPPORT + if (HdiStop() != WIFI_HAL_SUCCESS) { + LOGE("[Ap] Stop hdi failed!"); + return WIFI_HAL_FAILED; + } +#endif WifiErrorNo err = StopWpaAndWpaHal(0); if (err == WIFI_HAL_FAILED) { - LOGD("Wifi stop failed!"); + LOGE("Wifi stop failed!"); return WIFI_HAL_FAILED; } - LOGD("Wifi stop successfully!"); + LOGI("Wifi stop successfully!"); return WIFI_HAL_SUCCESS; } WifiErrorNo ForceStop(void) { LOGI("Ready force Stop wifi"); +#ifdef HDI_INTERFACE_SUPPORT + if (HdiStop() != WIFI_HAL_SUCCESS) { + LOGE("[Ap] Stop hdi failed!"); + return WIFI_HAL_FAILED; + } +#endif WifiWpaStaInterface *p = TraversalWifiStaInterface(); while (p != NULL) { StopWpaAndWpaHal(p->staNo); diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_common/Mock/mock_chip_capability.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_common/Mock/mock_chip_capability.cpp old mode 100755 new mode 100644 diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_common/Mock/mock_chip_capability.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_common/Mock/mock_chip_capability.h old mode 100755 new mode 100644 diff --git a/wifi/test/wifi_standard/wifi_hal/unittest/BUILD.gn b/wifi/test/wifi_standard/wifi_hal/unittest/BUILD.gn index b5517a8..3244571 100644 --- a/wifi/test/wifi_standard/wifi_hal/unittest/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_hal/unittest/BUILD.gn @@ -27,7 +27,6 @@ ohos_unittest("wifi_hal_unittest") { module_out_path = module_output_path sources = [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/common/wifi_hal_common_func.c", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/hdi/wifi_hdi_ap_instance.c", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_adapter.c", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_base_interface.c", @@ -74,17 +73,16 @@ ohos_unittest("wifi_hal_unittest") { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", - "//third_party/wpa_supplicant/wpa_supplicant-2.9_standard/src/", - "//third_party/bounds_checking_function/include/", - "//drivers/peripheral/wlan/interfaces/include/", - "//drivers/peripheral/wlan/client/include/", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/hdi", + "//third_party/wpa_supplicant/wpa_supplicant-2.9_standard/src", + "//third_party/bounds_checking_function/include", + "//drivers/peripheral/wlan/interfaces/include", + "//drivers/peripheral/wlan/client/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/hdi/inc", ] deps = [ "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC:crpc_server", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//drivers/peripheral/wlan/hal:wifi_hal", ] ldflags = [ @@ -96,9 +94,16 @@ ohos_unittest("wifi_hal_unittest") { "c_utils:utils", "hiviewdfx_hilog_native:libhilog", ] - configs = [ ":module_private_config" ] + defines = [ "AP_INTF=\"$wifi_feature_with_ap_intf\"" ] + if (wifi_feature_is_hdi_supported) { + defines += [ "HDI_INTERFACE_SUPPORT" ] + external_deps += [ "drivers_interface_wlan:libwlan_proxy_1.0" ] + } + + configs = [ ":module_private_config" ] + part_name = "wifi" subsystem_name = "communication" testonly = true diff --git a/wifi/wifi.gni b/wifi/wifi.gni index 6675f3f..5ffdbcf 100644 --- a/wifi/wifi.gni +++ b/wifi/wifi.gni @@ -22,4 +22,5 @@ declare_args() { wifi_feature_with_ap_num = 1 wifi_feature_with_auth_disable = false wifi_feature_with_dhcp_disable = false + wifi_feature_is_hdi_supported = false } diff --git a/wifi/wifi_lite.gni b/wifi/wifi_lite.gni index d7a8a77..3dd8510 100644 --- a/wifi/wifi_lite.gni +++ b/wifi/wifi_lite.gni @@ -25,4 +25,5 @@ declare_args() { wifi_feature_with_ap_num = 1 wifi_feature_with_auth_disable = false wifi_feature_with_dhcp_disable = false + wifi_feature_is_hdi_supported = false } -- Gitee From c1ebeb6589b10c4bf423a74163db73e28f4d9658 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Sat, 17 Sep 2022 15:02:55 +0800 Subject: [PATCH 364/491] remove redundant deps for wifi 0917 Signed-off-by: yanxiaotao@huawei.com --- wifi/frameworks/js/napi/BUILD.gn | 1 - 1 file changed, 1 deletion(-) diff --git a/wifi/frameworks/js/napi/BUILD.gn b/wifi/frameworks/js/napi/BUILD.gn index 78e10ac..8fadc28 100644 --- a/wifi/frameworks/js/napi/BUILD.gn +++ b/wifi/frameworks/js/napi/BUILD.gn @@ -87,7 +87,6 @@ ohos_shared_library("wifiext") { external_deps = [ "bundle_framework:appexecfwk_base", "c_utils:utils", - "ipc:ipc_core", ] relative_install_dir = "module" -- Gitee From bbca9d2b26ca95a53aba9a568aeb18f70936ffe8 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 19 Sep 2022 10:30:47 +0800 Subject: [PATCH 365/491] remove redundant deps for wifi 0917 Signed-off-by: yanxiaotao@huawei.com --- wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn | 1 - 1 file changed, 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn index 8824ba1..cf078b4 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn @@ -177,7 +177,6 @@ if (defined(ohos_lite)) { "//base/security/access_token/interfaces/innerkits/accesstoken/include", "//foundation/communication/netmanager_base/frameworks/native/netmanagernative", "//foundation/communication/netmanager_base/interfaces/innerkits/netmanagernative/include", - "//foundation/communication/netmanager_base/interfaces/innerkits/netconnclient/include/proxy", ] } -- Gitee From d5f6f54965b4579eaa1236970090072565bba39c Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 19 Sep 2022 10:46:37 +0800 Subject: [PATCH 366/491] remove redundant deps for wifi 0917 Signed-off-by: yanxiaotao@huawei.com --- .../wifi_framework/wifi_manage/BUILD.gn | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn index cf078b4..62f97cb 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn @@ -210,9 +210,7 @@ if (defined(ohos_lite)) { ":wifi_manager_service_header", ] - external_deps = [ - "ipc:ipc_core", - ] + external_deps = [ "ipc:ipc_core" ] } ohos_source_set("wifi_device_service_impl") { part_name = "wifi" @@ -264,9 +262,7 @@ if (defined(ohos_lite)) { deps = [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit" ] - external_deps = [ - "ipc:ipc_core", - ] + external_deps = [ "ipc:ipc_core" ] defines = [ "FEATURE_AP_SUPPORT", "AP_INSTANCE_MAX_NUM=$wifi_feature_with_ap_num", @@ -287,9 +283,7 @@ if (defined(ohos_lite)) { ":wifi_manager_service_header", ] - deps = [ - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit", - ] + deps = [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit" ] external_deps = [ "ipc:ipc_core", -- Gitee From 76701c6e28c7ebdba30abab3037db67aeb78bc23 Mon Sep 17 00:00:00 2001 From: fanchao Date: Mon, 19 Sep 2022 01:19:17 -0700 Subject: [PATCH 367/491] wifi ap block list napi interface. Signed-off-by: fanchao --- .../js/napi/inc/wifi_napi_hotspot.h | 2 + .../js/napi/src/wifi_napi_entry.cpp | 2 + .../js/napi/src/wifi_napi_hotspot.cpp | 54 +++++++++++++++++++ .../native/interfaces/wifi_ap_msg.h | 1 + 4 files changed, 59 insertions(+) diff --git a/wifi/frameworks/js/napi/inc/wifi_napi_hotspot.h b/wifi/frameworks/js/napi/inc/wifi_napi_hotspot.h index f1bf7e2..a04ed5c 100644 --- a/wifi/frameworks/js/napi/inc/wifi_napi_hotspot.h +++ b/wifi/frameworks/js/napi/inc/wifi_napi_hotspot.h @@ -27,6 +27,8 @@ napi_value IsHotspotDualBandSupported(napi_env env, napi_callback_info info); napi_value SetHotspotConfig(napi_env env, napi_callback_info info); napi_value GetHotspotConfig(napi_env env, napi_callback_info info); napi_value GetStations(napi_env env, napi_callback_info info); +napi_value AddBlockList(napi_env env, napi_callback_info info); +napi_value DelBlockList(napi_env env, napi_callback_info info); } // namespace Wifi } // namespace OHOS diff --git a/wifi/frameworks/js/napi/src/wifi_napi_entry.cpp b/wifi/frameworks/js/napi/src/wifi_napi_entry.cpp index 93f97d3..2cd3cf6 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_entry.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_entry.cpp @@ -65,6 +65,8 @@ static napi_value Init(napi_env env, napi_value exports) { DECLARE_NAPI_FUNCTION("setHotspotConfig", SetHotspotConfig), DECLARE_NAPI_FUNCTION("getHotspotConfig", GetHotspotConfig), DECLARE_NAPI_FUNCTION("getStations", GetStations), + DECLARE_NAPI_FUNCTION("addBlockList", AddBlockList), + DECLARE_NAPI_FUNCTION("delBlockList", DelBlockList), DECLARE_NAPI_FUNCTION("getP2pLinkedInfo", GetP2pLinkedInfo), DECLARE_NAPI_FUNCTION("getCurrentGroup", GetCurrentGroup), DECLARE_NAPI_FUNCTION("getP2pPeerDevices", GetP2pDevices), diff --git a/wifi/frameworks/js/napi/src/wifi_napi_hotspot.cpp b/wifi/frameworks/js/napi/src/wifi_napi_hotspot.cpp index dbfa1af..d2f3718 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_hotspot.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_hotspot.cpp @@ -203,5 +203,59 @@ napi_value GetStations(napi_env env, napi_callback_info info) } return arrayResult; } + +napi_value AddBlockList(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + size_t argc = 1; + napi_value argv[argc]; + napi_value thisVar; + NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); + + napi_valuetype valueType; + napi_typeof(env, argv[0], &valueType); + NAPI_ASSERT(env, valueType == napi_string, "Wrong argument type. Object expected."); + NAPI_ASSERT(env, wifiHotspotPtr != nullptr, "Wifi hotspot instance is null."); + + StationInfo stationInfo; + char bssid[WIFI_BSSID_LENGTH] = {0}; + size_t len = 0; + napi_get_value_string_utf8(env, argv[0], bssid, sizeof(bssid), &len); + stationInfo.bssid = bssid; + ErrCode ret = wifiHotspotPtr->AddBlockList(stationInfo); + if (ret != WIFI_OPT_SUCCESS) { + WIFI_LOGE("Add block list fail: %{public}d", ret); + } + napi_value result; + napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); + return result; +} + +napi_value DelBlockList(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + size_t argc = 1; + napi_value argv[argc]; + napi_value thisVar; + NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); + + napi_valuetype valueType; + napi_typeof(env, argv[0], &valueType); + NAPI_ASSERT(env, valueType == napi_string, "Wrong argument type. Object expected."); + NAPI_ASSERT(env, wifiHotspotPtr != nullptr, "Wifi hotspot instance is null."); + + StationInfo stationInfo; + char bssid[WIFI_BSSID_LENGTH] = {0}; + size_t len = 0; + napi_get_value_string_utf8(env, argv[0], bssid, sizeof(bssid), &len); + stationInfo.bssid = bssid; + ErrCode ret = wifiHotspotPtr->DelBlockList(stationInfo); + if (ret != WIFI_OPT_SUCCESS) { + WIFI_LOGE("Del block list fail: %{public}d", ret); + } + napi_value result; + napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); + return result; +} } // namespace Wifi } // namespace OHOS diff --git a/wifi/frameworks/native/interfaces/wifi_ap_msg.h b/wifi/frameworks/native/interfaces/wifi_ap_msg.h index 4bc093e..68b4b3a 100644 --- a/wifi/frameworks/native/interfaces/wifi_ap_msg.h +++ b/wifi/frameworks/native/interfaces/wifi_ap_msg.h @@ -24,6 +24,7 @@ namespace OHOS { namespace Wifi { #define AP_CHANNEL_DEFAULT 6 #define AP_CHANNEL_5G_DEFAULT 149 +#define WIFI_BSSID_LENGTH 18 enum class ApState { AP_STATE_NONE = 0, AP_STATE_IDLE, -- Gitee From ea350592d5a824696414c27c239bf21a4b757a55 Mon Sep 17 00:00:00 2001 From: z00588131 Date: Tue, 20 Sep 2022 07:37:38 +0000 Subject: [PATCH 368/491] Fix writing errors Signed-off-by: z00588131 --- wifi/frameworks/js/napi/src/wifi_napi_hotspot.cpp | 4 ++-- wifi/services/wifi_standard/wifi_hal/BUILD.gn | 2 +- wifi/test/wifi_standard/wifi_hal/unittest/BUILD.gn | 4 ++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/wifi/frameworks/js/napi/src/wifi_napi_hotspot.cpp b/wifi/frameworks/js/napi/src/wifi_napi_hotspot.cpp index d2f3718..ed71132 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_hotspot.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_hotspot.cpp @@ -214,7 +214,7 @@ napi_value AddBlockList(napi_env env, napi_callback_info info) napi_valuetype valueType; napi_typeof(env, argv[0], &valueType); - NAPI_ASSERT(env, valueType == napi_string, "Wrong argument type. Object expected."); + NAPI_ASSERT(env, valueType == napi_string, "Wrong argument type. String expected."); NAPI_ASSERT(env, wifiHotspotPtr != nullptr, "Wifi hotspot instance is null."); StationInfo stationInfo; @@ -241,7 +241,7 @@ napi_value DelBlockList(napi_env env, napi_callback_info info) napi_valuetype valueType; napi_typeof(env, argv[0], &valueType); - NAPI_ASSERT(env, valueType == napi_string, "Wrong argument type. Object expected."); + NAPI_ASSERT(env, valueType == napi_string, "Wrong argument type. String expected."); NAPI_ASSERT(env, wifiHotspotPtr != nullptr, "Wifi hotspot instance is null."); StationInfo stationInfo; diff --git a/wifi/services/wifi_standard/wifi_hal/BUILD.gn b/wifi/services/wifi_standard/wifi_hal/BUILD.gn index e3a5138..a800d24 100644 --- a/wifi/services/wifi_standard/wifi_hal/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_hal/BUILD.gn @@ -120,7 +120,7 @@ if (defined(ohos_lite)) { if (wifi_feature_is_hdi_supported) { defines += [ "HDI_INTERFACE_SUPPORT" ] - external_deps += [ "drivers_interface_wlanlibwlan_proxy_1.0" ] + external_deps += [ "drivers_interface_wlan:libwlan_proxy_1.0" ] } if (product_name == "rk3568") { diff --git a/wifi/test/wifi_standard/wifi_hal/unittest/BUILD.gn b/wifi/test/wifi_standard/wifi_hal/unittest/BUILD.gn index 3244571..76eb78e 100644 --- a/wifi/test/wifi_standard/wifi_hal/unittest/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_hal/unittest/BUILD.gn @@ -27,6 +27,10 @@ ohos_unittest("wifi_hal_unittest") { module_out_path = module_output_path sources = [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/common/wifi_hal_common_func.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/hdi/src/wifi_hdi_ap_impl.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/hdi/src/wifi_hdi_p2p_impl.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/hdi/src/wifi_hdi_proxy.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/hdi/src/wifi_hdi_sta_impl.c", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_adapter.c", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_base_interface.c", -- Gitee From ed00d6ae5181a412bc792894437a0ba903cb28aa Mon Sep 17 00:00:00 2001 From: fengye Date: Tue, 20 Sep 2022 10:09:48 +0000 Subject: [PATCH 369/491] Added max configs number Signed-off-by: fengye --- wifi/frameworks/native/interfaces/wifi_msg.h | 2 + .../wifi_framework/wifi_manage/BUILD.gn | 4 +- .../wifi_sta/sta_state_machine.cpp | 2 + .../wifi_framework/wifi_toolkit/BUILD.gn | 5 +- .../config/wifi_config_file_impl.h | 4 +- .../config/wifi_config_file_spec.cpp | 159 ++++++++---------- .../config/wifi_config_file_spec.h | 69 +++----- .../wifi_toolkit/config/wifi_settings.cpp | 46 ++++- .../wifi_toolkit/config/wifi_settings.h | 20 ++- .../utils/wifi_encryption_util.cpp | 4 +- .../wifi_toolkit/utils/wifi_encryption_util.h | 3 +- .../wifi_toolkit/utils/wifi_global_func.cpp | 2 +- .../wifi_toolkit/utils/wifi_global_func.h | 1 + 13 files changed, 171 insertions(+), 150 deletions(-) diff --git a/wifi/frameworks/native/interfaces/wifi_msg.h b/wifi/frameworks/native/interfaces/wifi_msg.h index 7ce3a5c..8fc1682 100644 --- a/wifi/frameworks/native/interfaces/wifi_msg.h +++ b/wifi/frameworks/native/interfaces/wifi_msg.h @@ -17,6 +17,7 @@ #include #include +#include #include #include #include @@ -393,6 +394,7 @@ struct WifiDeviceConfig { /* Random mac address */ std::string macAddress; int uid; + time_t lastConnectTime; WifiIpConfig wifiIpConfig; WifiEapConfig wifiEapConfig; WifiProxyConfig wifiProxyconfig; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn index 51a46c3..a0f2d4c 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn @@ -346,12 +346,14 @@ if (defined(ohos_lite)) { "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", "c_utils:utils", - "huks:libhukssdk", "ipc:ipc_core", "netmanager_base:net_conn_manager_if", "safwk:system_ability_fwk", "samgr:samgr_proxy", ] + if (wifi_feature_with_encryption) { + external_deps += [ "huks:libhukssdk" ] + } defines = [ "FEATURE_AP_SUPPORT", "FEATURE_P2P_SUPPORT", diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp index b0f3702..11cce69 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp @@ -804,6 +804,7 @@ void StaStateMachine::DealConnectToUserSelectedNetwork(InternalMessage *msg) } /* Sets network status. */ WifiSettings::GetInstance().EnableNetwork(networkId, forceReconnect); + WifiSettings::GetInstance().SetDeviceTime(networkId); WifiSettings::GetInstance().SetDeviceState(networkId, (int)WifiDeviceConfigStatus::ENABLED, false); } @@ -835,6 +836,7 @@ void StaStateMachine::DealConnectionEvent(InternalMessage *msg) } WIFI_LOGI("enter DealConnectionEvent"); + WifiSettings::GetInstance().SetDeviceTime(targetNetworkId); WifiSettings::GetInstance().SetDeviceState(targetNetworkId, (int)WifiDeviceConfigStatus::ENABLED, false); WifiSettings::GetInstance().SyncDeviceConfig(); /* Stop clearing the Wpa_blocklist. */ diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/BUILD.gn index 8a63d01..9d9f39d 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/BUILD.gn @@ -105,9 +105,10 @@ if (defined(ohos_lite)) { "c_utils:utils", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", - "huks:libhukssdk", ] - + if (wifi_feature_with_encryption) { + external_deps += [ "huks:libhukssdk" ] + } cflags_cc = [ "-std=c++17", "-fno-rtti", diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_impl.h b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_impl.h index c676190..c1f0d8b 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_impl.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_impl.h @@ -157,7 +157,7 @@ int WifiConfigFileImpl::ReadNetworkSection(T &item, std::ifstream &fs, std::s TrimString(key); TrimString(value); /* template function, needing specialization */ - sectionError += SetTClassKeyValue(item, key, value, mFileName); + sectionError += SetTClassKeyValue(item, key, value); } LOGE("Section config not end correctly"); sectionError++; @@ -242,7 +242,7 @@ int WifiConfigFileImpl::SaveConfig() * specialization. */ ss << "[" << GetTClassName() << "_" << (i + 1) << "] {" << std::endl; - ss << OutTClassString(item, mFileName) << std::endl; + ss << OutTClassString(item) << std::endl; ss << "}" << std::endl; } std::string content = ss.str(); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.cpp index b12f4bd..1ac5df8 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.cpp @@ -40,6 +40,7 @@ static void ClearWifiDeviceConfig(WifiDeviceConfig &item) item.wepTxKeyIndex = 0; item.priority = 0; item.hiddenSSID = false; + item.lastConnectTime = -1; return; } @@ -103,8 +104,7 @@ void ClearTClass(WifiDeviceConfig &item) return; } -static int SetWifiDeviceConfigFirst(WifiDeviceConfig &item, const std::string &key, const std::string &value, - const std::string &fileName) +static int SetWifiDeviceConfigFirst(WifiDeviceConfig &item, const std::string &key, const std::string &value) { if (key == "networkId") { item.networkId = std::stoi(value); @@ -145,6 +145,8 @@ static int SetWifiDeviceConfigFirst(WifiDeviceConfig &item, const std::string &k item.priority = std::stoi(value); } else if (key == "uid") { item.uid = std::stoi(value); + } else if (key == "lastConnectTime") { + item.lastConnectTime = std::stoi(value); } else { return -1; } @@ -152,17 +154,16 @@ static int SetWifiDeviceConfigFirst(WifiDeviceConfig &item, const std::string &k } #ifdef FEATURE_ENCRYPTION_SUPPORT -static int SetWifiDeviceConfigEncrypt(WifiDeviceConfig &item, const std::string &key, const std::string &value, - const std::string &fileName) +static int SetWifiDeviceConfigEncrypt(WifiDeviceConfig &item, const std::string &key, const std::string &value) { int errorKeyValue = 0; WifiEncryptionInfo mWifiEncryptionInfo; - mWifiEncryptionInfo.SetFile(fileName); + mWifiEncryptionInfo.SetFile(GetTClassName()); if (key == "encryptedData") { item.preSharedKey = value; } else if (key == "IV") { WifiEncryptionInfo mWifiEncryptionInfo; - mWifiEncryptionInfo.SetFile(fileName); + mWifiEncryptionInfo.SetFile(GetTClassName()); EncryptedData *encry = new EncryptedData(item.preSharedKey, value); std::string decry = ""; if (WifiDecryption(mWifiEncryptionInfo, *encry, decry) == HKS_SUCCESS) { @@ -197,15 +198,14 @@ static int SetWifiDeviceConfigEncrypt(WifiDeviceConfig &item, const std::string } #endif -static int SetWifiDeviceConfig(WifiDeviceConfig &item, const std::string &key, const std::string &value, - const std::string &fileName) +static int SetWifiDeviceConfig(WifiDeviceConfig &item, const std::string &key, const std::string &value) { int errorKeyValue = 0; - if (SetWifiDeviceConfigFirst(item, key, value, fileName) == 0) { + if (SetWifiDeviceConfigFirst(item, key, value) == 0) { return errorKeyValue; } #ifdef FEATURE_ENCRYPTION_SUPPORT - errorKeyValue = SetWifiDeviceConfigEncrypt(item, key, value, fileName); + errorKeyValue = SetWifiDeviceConfigEncrypt(item, key, value); if (errorKeyValue != -1) { return errorKeyValue; } else { @@ -226,8 +226,7 @@ static int SetWifiDeviceConfig(WifiDeviceConfig &item, const std::string &key, c return errorKeyValue; } -static int SetWifiDeviceConfigIp(WifiDeviceConfig &item, const std::string &key, const std::string &value, - const std::string &fileName) +static int SetWifiDeviceConfigIp(WifiDeviceConfig &item, const std::string &key, const std::string &value) { int errorKeyValue = 0; if (key == "wifiIpConfig.assignMethod") { @@ -273,12 +272,11 @@ static int SetWifiDeviceConfigIp(WifiDeviceConfig &item, const std::string &key, #ifdef FEATURE_ENCRYPTION_SUPPORT -static int SetWifiDeviceConfigEncryptEap(WifiDeviceConfig &item, const std::string &key, const std::string &value, - const std::string &fileName) +static int SetWifiDeviceConfigEncryptEap(WifiDeviceConfig &item, const std::string &key, const std::string &value) { int errorKeyValue = 0; WifiEncryptionInfo mWifiEncryptionInfo; - mWifiEncryptionInfo.SetFile(fileName); + mWifiEncryptionInfo.SetFile(GetTClassName()); if (key == "wifiEapConfig.encryptedData") { item.wifiEapConfig.password = value; } else if (key == "wifiEapConfig.IV") { @@ -298,12 +296,11 @@ static int SetWifiDeviceConfigEncryptEap(WifiDeviceConfig &item, const std::stri } #endif -static int SetWifiDeviceConfigEap(WifiDeviceConfig &item, const std::string &key, const std::string &value, - const std::string &fileName) +static int SetWifiDeviceConfigEap(WifiDeviceConfig &item, const std::string &key, const std::string &value) { int errorKeyValue = 0; #ifdef FEATURE_ENCRYPTION_SUPPORT - errorKeyValue = SetWifiDeviceConfigEncryptEap(item, key, value, fileName); + errorKeyValue = SetWifiDeviceConfigEncryptEap(item, key, value); if (errorKeyValue != -1) { return errorKeyValue; } else { @@ -329,8 +326,7 @@ static int SetWifiDeviceConfigEap(WifiDeviceConfig &item, const std::string &key return errorKeyValue; } -static int SetWifiDeviceConfigProxy(WifiDeviceConfig &item, const std::string &key, const std::string &value, - const std::string &fileName) +static int SetWifiDeviceConfigProxy(WifiDeviceConfig &item, const std::string &key, const std::string &value) { int errorKeyValue = 0; if (key == "wifiProxyconfig.configureMethod") { @@ -350,8 +346,7 @@ static int SetWifiDeviceConfigProxy(WifiDeviceConfig &item, const std::string &k return errorKeyValue; } -static int SetWifiDeviceconfigPrivacy(WifiDeviceConfig &item, const std::string &key, const std::string &value, - const std::string &fileName) +static int SetWifiDeviceconfigPrivacy(WifiDeviceConfig &item, const std::string &key, const std::string &value) { int errorKeyValue = 0; if (key == "wifiPrivacySetting") { @@ -364,20 +359,19 @@ static int SetWifiDeviceconfigPrivacy(WifiDeviceConfig &item, const std::string } template<> -int SetTClassKeyValue(WifiDeviceConfig &item, const std::string &key, const std::string &value, - const std::string &fileName) +int SetTClassKeyValue(WifiDeviceConfig &item, const std::string &key, const std::string &value) { int errorKeyValue = 0; if (key.compare(0, strlen("wifiIpConfig"), "wifiIpConfig") == 0) { - errorKeyValue += SetWifiDeviceConfigIp(item, key, value, fileName); + errorKeyValue += SetWifiDeviceConfigIp(item, key, value); } else if (key.compare(0, strlen("wifiEapConfig"), "wifiEapConfig") == 0) { - errorKeyValue += SetWifiDeviceConfigEap(item, key, value, fileName); + errorKeyValue += SetWifiDeviceConfigEap(item, key, value); } else if (key.compare(0, strlen("wifiProxyconfig"), "wifiProxyconfig") == 0) { - errorKeyValue += SetWifiDeviceConfigProxy(item, key, value, fileName); + errorKeyValue += SetWifiDeviceConfigProxy(item, key, value); } else if (key.compare(0, strlen("wifiPrivacySetting"), "wifiPrivacySetting") == 0) { - errorKeyValue += SetWifiDeviceconfigPrivacy(item, key, value, fileName); + errorKeyValue += SetWifiDeviceconfigPrivacy(item, key, value); } else { - errorKeyValue += SetWifiDeviceConfig(item, key, value, fileName); + errorKeyValue += SetWifiDeviceConfig(item, key, value); } return errorKeyValue; } @@ -389,11 +383,11 @@ std::string GetTClassName() } #ifdef FEATURE_ENCRYPTION_SUPPORT -static std::string OutPutEncryptionDeviceConfig(WifiDeviceConfig &item, const std::string &fileName) +static std::string OutPutEncryptionDeviceConfig(WifiDeviceConfig &item) { std::ostringstream ss; WifiEncryptionInfo mWifiEncryptionInfo; - mWifiEncryptionInfo.SetFile(fileName); + mWifiEncryptionInfo.SetFile(GetTClassName()); EncryptedData encry; if (WifiEncryption(mWifiEncryptionInfo, item.preSharedKey, encry) == HKS_SUCCESS) { ss << " " <<"encryptedData=" << encry.encryptedPassword << std::endl; @@ -421,7 +415,7 @@ static std::string OutPutEncryptionDeviceConfig(WifiDeviceConfig &item, const st } #endif -static std::string OutPutWifiDeviceConfig(WifiDeviceConfig &item, const std::string &fileName) +static std::string OutPutWifiDeviceConfig(WifiDeviceConfig &item) { std::ostringstream ss; ss << " " <<"" << std::endl; @@ -439,8 +433,9 @@ static std::string OutPutWifiDeviceConfig(WifiDeviceConfig &item, const std::str ss << " " <<"priority=" << item.priority << std::endl; ss << " " <<"hiddenSSID=" << (int)item.hiddenSSID << std::endl; ss << " " <<"keyMgmt=" << item.keyMgmt << std::endl; + ss << " " <<"lastConnectTime=" << item.lastConnectTime << std::endl; #ifdef FEATURE_ENCRYPTION_SUPPORT - ss <" << std::endl; @@ -492,7 +487,7 @@ static std::string OutPutWifiDeviceConfigIp(WifiDeviceConfig &item, const std::s return ss.str(); } -static std::string OutPutWifiDeviceConfigEap(WifiDeviceConfig &item, const std::string &fileName) +static std::string OutPutWifiDeviceConfigEap(WifiDeviceConfig &item) { std::ostringstream ss; if (item.wifiEapConfig.eap.length() == 0) { @@ -503,7 +498,7 @@ static std::string OutPutWifiDeviceConfigEap(WifiDeviceConfig &item, const std:: ss << " " <<"wifiEapConfig.identity=" << item.wifiEapConfig.identity << std::endl; #ifdef FEATURE_ENCRYPTION_SUPPORT WifiEncryptionInfo mWifiEncryptionInfo; - mWifiEncryptionInfo.SetFile(fileName); + mWifiEncryptionInfo.SetFile(GetTClassName()); EncryptedData encry; if (WifiEncryption(mWifiEncryptionInfo, item.wifiEapConfig.password, encry) == HKS_SUCCESS) { ss << " " <<"wifiEapConfig.encryptedData=" << encry.encryptedPassword << std::endl; @@ -521,7 +516,7 @@ static std::string OutPutWifiDeviceConfigEap(WifiDeviceConfig &item, const std:: return ss.str(); } -static std::string OutPutWifiDeviceConfigProxy(WifiDeviceConfig &item, const std::string &fileName) +static std::string OutPutWifiDeviceConfigProxy(WifiDeviceConfig &item) { std::ostringstream ss; ss << " " <<"" << std::endl; @@ -538,7 +533,7 @@ static std::string OutPutWifiDeviceConfigProxy(WifiDeviceConfig &item, const std return ss.str(); } -static std::string OutPutWifiDeviceConfigPrivacy(WifiDeviceConfig &item, const std::string &fileName) +static std::string OutPutWifiDeviceConfigPrivacy(WifiDeviceConfig &item) { std::ostringstream ss; ss << " " <<"" << std::endl; @@ -548,12 +543,12 @@ static std::string OutPutWifiDeviceConfigPrivacy(WifiDeviceConfig &item, const s } template<> -std::string OutTClassString(WifiDeviceConfig &item, const std::string &fileName) +std::string OutTClassString(WifiDeviceConfig &item) { std::ostringstream ss; - ss << OutPutWifiDeviceConfig(item, fileName) << OutPutWifiDeviceConfigIp(item, fileName) - << OutPutWifiDeviceConfigEap(item, fileName) << OutPutWifiDeviceConfigProxy(item, fileName) - << OutPutWifiDeviceConfigPrivacy(item, fileName); + ss << OutPutWifiDeviceConfig(item) << OutPutWifiDeviceConfigIp(item) + << OutPutWifiDeviceConfigEap(item) << OutPutWifiDeviceConfigProxy(item) + << OutPutWifiDeviceConfigPrivacy(item); return ss.str(); } @@ -570,12 +565,11 @@ void ClearTClass(HotspotConfig &item) } #ifdef FEATURE_ENCRYPTION_SUPPORT -static int SetWifiHotspotConfigEncrypt(HotspotConfig &item, const std::string &key, const std::string &value, - const std::string &fileName) +static int SetWifiHotspotConfigEncrypt(HotspotConfig &item, const std::string &key, const std::string &value) { int errorKeyValue = 0; WifiEncryptionInfo mWifiEncryptionInfo; - mWifiEncryptionInfo.SetFile(fileName); + mWifiEncryptionInfo.SetFile(GetTClassName()); if (key == "encryptedData") { item.SetPreSharedKey(value); } else if (key == "IV") { @@ -596,12 +590,11 @@ static int SetWifiHotspotConfigEncrypt(HotspotConfig &item, const std::string &k #endif template<> -int SetTClassKeyValue(HotspotConfig &item, const std::string &key, const std::string &value, - const std::string &fileName) +int SetTClassKeyValue(HotspotConfig &item, const std::string &key, const std::string &value) { int errorKeyValue = 0; #ifdef FEATURE_ENCRYPTION_SUPPORT - errorKeyValue = SetWifiHotspotConfigEncrypt(item, key, value, fileName); + errorKeyValue = SetWifiHotspotConfigEncrypt(item, key, value); if (errorKeyValue != -1) { return errorKeyValue; } else { @@ -643,7 +636,7 @@ std::string GetTClassName() } template<> -std::string OutTClassString(HotspotConfig &item, const std::string &fileName) +std::string OutTClassString(HotspotConfig &item) { std::ostringstream ss; ss << " " <<"" << std::endl; @@ -651,7 +644,7 @@ std::string OutTClassString(HotspotConfig &item, const std::strin ss << " " <<"HexSsid=" << ConvertArrayToHex((uint8_t*)&item.GetSsid()[0], item.GetSsid().length()) << std::endl; #ifdef FEATURE_ENCRYPTION_SUPPORT WifiEncryptionInfo mWifiEncryptionInfo; - mWifiEncryptionInfo.SetFile(fileName); + mWifiEncryptionInfo.SetFile(GetTClassName()); EncryptedData encry; if (WifiEncryption(mWifiEncryptionInfo, item.GetPreSharedKey(), encry) == HKS_SUCCESS) { ss << " " <<"encryptedData=" << encry.encryptedPassword << std::endl; @@ -682,8 +675,7 @@ void ClearTClass(P2pVendorConfig &item) } template<> -int SetTClassKeyValue(P2pVendorConfig &item, const std::string &key, const std::string &value, - const std::string &fileName) +int SetTClassKeyValue(P2pVendorConfig &item, const std::string &key, const std::string &value) { int errorKeyValue = 0; if (key == "randomMacSupport") { @@ -710,7 +702,7 @@ std::string GetTClassName() } template<> -std::string OutTClassString(P2pVendorConfig &item, const std::string &fileName) +std::string OutTClassString(P2pVendorConfig &item) { std::ostringstream ss; ss << " " <<"" << std::endl; @@ -733,8 +725,7 @@ void ClearTClass(StationInfo &item) } template<> -int SetTClassKeyValue(StationInfo &item, const std::string &key, const std::string &value, - const std::string &fileName) +int SetTClassKeyValue(StationInfo &item, const std::string &key, const std::string &value) { int errorKeyValue = 0; if (key == "deviceName") { @@ -757,7 +748,7 @@ std::string GetTClassName() } template<> -std::string OutTClassString(StationInfo &item, const std::string &fileName) +std::string OutTClassString(StationInfo &item) { std::ostringstream ss; ss << " " <<"" << std::endl; @@ -808,8 +799,7 @@ void ClearTClass(WifiConfig &item) return; } -static int SetWifiConfigValueFirst(WifiConfig &item, const std::string &key, const std::string &value, - const std::string &fileName) +static int SetWifiConfigValueFirst(WifiConfig &item, const std::string &key, const std::string &value) { if (key == "scanAlwaysSwitch") { item.scanAlwaysSwitch = (std::stoi(value) != 0); /* 0 -> false 1 -> true */ @@ -849,8 +839,7 @@ static int SetWifiConfigValueFirst(WifiConfig &item, const std::string &key, con return 0; } -static int SetWifiConfigValueSecond(WifiConfig &item, const std::string &key, const std::string &value, - const std::string &fileName) +static int SetWifiConfigValueSecond(WifiConfig &item, const std::string &key, const std::string &value) { if (key == "preLoadSta") { item.preLoadSta = (std::stoi(value) != 0); /* 0 -> false 1 -> true */ @@ -895,14 +884,13 @@ static int SetWifiConfigValueSecond(WifiConfig &item, const std::string &key, co } template<> -int SetTClassKeyValue(WifiConfig &item, const std::string &key, const std::string &value, - const std::string &fileName) +int SetTClassKeyValue(WifiConfig &item, const std::string &key, const std::string &value) { int errorKeyValue = 0; - if (SetWifiConfigValueFirst(item, key, value, fileName) == 0) { + if (SetWifiConfigValueFirst(item, key, value) == 0) { return errorKeyValue; } - if (SetWifiConfigValueSecond(item, key, value, fileName) == 0) { + if (SetWifiConfigValueSecond(item, key, value) == 0) { return errorKeyValue; } LOGE("Invalid config key value"); @@ -917,7 +905,7 @@ std::string GetTClassName() } template<> -std::string OutTClassString(WifiConfig &item, const std::string &fileName) +std::string OutTClassString(WifiConfig &item) { std::ostringstream ss; ss << " " <<"" << std::endl; @@ -976,8 +964,7 @@ void ClearTClass(WifiP2pGroupInfo &item) item.ClearClientDevices(); } -static int SetWifiP2pDevicClassKeyValue(WifiP2pDevice &item, const std::string &key, const std::string &value, - const std::string &fileName) +static int SetWifiP2pDevicClassKeyValue(WifiP2pDevice &item, const std::string &key, const std::string &value) { int errorKeyValue = 0; if (key == "deviceName") { @@ -1002,12 +989,11 @@ static int SetWifiP2pDevicClassKeyValue(WifiP2pDevice &item, const std::string & } #ifdef FEATURE_ENCRYPTION_SUPPORT -static int SetWifiP2pGroupInfoEncrypt(WifiP2pGroupInfo &item, const std::string &key, const std::string &value, - const std::string &fileName) +static int SetWifiP2pGroupInfoEncrypt(WifiP2pGroupInfo &item, const std::string &key, const std::string &value) { int errorKeyValue = 0; WifiEncryptionInfo mWifiEncryptionInfo; - mWifiEncryptionInfo.SetFile(fileName); + mWifiEncryptionInfo.SetFile(GetTClassName()); if (key == "encryptedData") { item.SetPassphrase(value); } else if (key == "IV") { @@ -1027,12 +1013,11 @@ static int SetWifiP2pGroupInfoEncrypt(WifiP2pGroupInfo &item, const std::string } #endif -static int SetWifiP2pGroupInfoDev(WifiP2pGroupInfo &item, const std::string &key, const std::string &value, - const std::string &fileName) +static int SetWifiP2pGroupInfoDev(WifiP2pGroupInfo &item, const std::string &key, const std::string &value) { if (key.compare(0, strlen("ownerDev."), "ownerDev.") == 0) { WifiP2pDevice owner = item.GetOwner(); - SetWifiP2pDevicClassKeyValue(owner, key.substr(strlen("ownerDev.")), value, fileName); + SetWifiP2pDevicClassKeyValue(owner, key.substr(strlen("ownerDev.")), value); item.SetOwner(owner); } else if (key.compare(0, strlen("vecDev_"), "vecDev_") == 0) { std::string::size_type pos = key.find("."); @@ -1043,7 +1028,7 @@ static int SetWifiP2pGroupInfoDev(WifiP2pGroupInfo &item, const std::string &key unsigned long index = std::stoi(key.substr(strlen("vecDev_"), pos)); if (index < item.GetClientDevices().size()) { std::vector clients = item.GetClientDevices(); - SetWifiP2pDevicClassKeyValue(clients[index], key.substr(pos + 1), value, fileName); + SetWifiP2pDevicClassKeyValue(clients[index], key.substr(pos + 1), value); item.SetClientDevices(clients); } } @@ -1054,12 +1039,11 @@ static int SetWifiP2pGroupInfoDev(WifiP2pGroupInfo &item, const std::string &key } template<> -int SetTClassKeyValue(WifiP2pGroupInfo &item, const std::string &key, const std::string &value, - const std::string &fileName) +int SetTClassKeyValue(WifiP2pGroupInfo &item, const std::string &key, const std::string &value) { int errorKeyValue = 0; #ifdef FEATURE_ENCRYPTION_SUPPORT - errorKeyValue = SetWifiP2pGroupInfoEncrypt(item, key, value, fileName); + errorKeyValue = SetWifiP2pGroupInfoEncrypt(item, key, value); if (errorKeyValue != -1) { return errorKeyValue; } else { @@ -1093,7 +1077,7 @@ int SetTClassKeyValue(WifiP2pGroupInfo &item, const std::strin item.SetP2pGroupStatus(static_cast(std::stoi(value))); } else if (key == "goIpAddress") { item.SetGoIpAddress(value); - } else if (SetWifiP2pGroupInfoDev(item, key, value, fileName) == 0) { + } else if (SetWifiP2pGroupInfoDev(item, key, value) == 0) { return errorKeyValue; } else { LOGE("Invalid config key value"); @@ -1124,7 +1108,7 @@ static std::string OutWifiP2pDeviceClassString(const WifiP2pDevice &item, std::s } template<> -std::string OutTClassString(WifiP2pGroupInfo &item, const std::string &fileName) +std::string OutTClassString(WifiP2pGroupInfo &item) { std::ostringstream ss; ss << " " <<"" << std::endl; @@ -1136,7 +1120,7 @@ std::string OutTClassString(WifiP2pGroupInfo &item, const std: ss << " " <<"interface=" << item.GetInterface() << std::endl; #ifdef FEATURE_ENCRYPTION_SUPPORT WifiEncryptionInfo mWifiEncryptionInfo; - mWifiEncryptionInfo.SetFile(fileName); + mWifiEncryptionInfo.SetFile(GetTClassName()); EncryptedData encry; if (WifiEncryption(mWifiEncryptionInfo, item.GetPassphrase(), encry) == HKS_SUCCESS) { ss << " " <<"encryptedData=" << encry.encryptedPassword << std::endl; @@ -1173,8 +1157,7 @@ void ClearTClass(TrustListPolicy &item) } template <> -int SetTClassKeyValue(TrustListPolicy &item, const std::string &key, const std::string &value, - const std::string &fileName) +int SetTClassKeyValue(TrustListPolicy &item, const std::string &key, const std::string &value) { int errorKeyValue = 0; if (key == "sceneId") { @@ -1196,7 +1179,7 @@ std::string GetTClassName() return "TrustListPolicy"; } -template <> std::string OutTClassString(TrustListPolicy &item, const std::string &fileName) +template <> std::string OutTClassString(TrustListPolicy &item) { std::ostringstream ss; ss << " " <<"" << std::endl; @@ -1214,8 +1197,7 @@ template <> void ClearTClass(MovingFreezePolicy &item) } template <> -int SetTClassKeyValue(MovingFreezePolicy &item, const std::string &key, const std::string &value, - const std::string &fileName) +int SetTClassKeyValue(MovingFreezePolicy &item, const std::string &key, const std::string &value) { int errorKeyValue = 0; if (key == "trustList") { @@ -1232,7 +1214,7 @@ template <> std::string GetTClassName() return "MovingFreezePolicy"; } -template <> std::string OutTClassString(MovingFreezePolicy &item, const std::string &fileName) +template <> std::string OutTClassString(MovingFreezePolicy &item) { std::ostringstream ss; ss << " " <<"" << std::endl; @@ -1251,8 +1233,7 @@ template <> void ClearTClass(WifiStoreRandomMac &item) } template <> -int SetTClassKeyValue(WifiStoreRandomMac &item, const std::string &key, const std::string &value, - const std::string &fileName) +int SetTClassKeyValue(WifiStoreRandomMac &item, const std::string &key, const std::string &value) { int errorKeyValue = 0; if (key == "ssid") { @@ -1284,7 +1265,7 @@ template <> std::string GetTClassName() return "WifiStoreRandomMac"; } -template <> std::string OutTClassString(WifiStoreRandomMac &item, const std::string &fileName) +template <> std::string OutTClassString(WifiStoreRandomMac &item) { std::ostringstream ss; ss << " " <<"" << std::endl; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.h b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.h index dea11c0..78ab9be 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.h @@ -48,11 +48,10 @@ void ClearTClass(T &item) * @param item - T &item * @param key - Item key * @param value - Item value - * @param fileName - fileName * @return int - parse error: 0 Success, >0 parse failed */ template -int SetTClassKeyValue(T &item, const std::string &key, const std::string &value, const std::string &fileName) +int SetTClassKeyValue(T &item, const std::string &key, const std::string &value) { /* fixed compile warning, -Werror,-Wunused-parameter */ item; @@ -79,11 +78,10 @@ std::string GetTClassName() * * @tparam T - typename * @param item - item - * @param fileName - fileName * @return std::string - output item's total member=value string */ template -std::string OutTClassString(T &item, const std::string &fileName) +std::string OutTClassString(T &item) { /* fixed compile warning, -Werror,-Wunused-parameter */ item; @@ -110,12 +108,10 @@ void ClearTClass(WifiDeviceConfig &item); * @param item - WifiDeviceConfig &item * @param key - WifiDeviceConfig struct member name * @param value - the WifiDeviceConfig item member value - * @param fileName - fileName * @return int - parse error: 0 Success, >0 parse failed */ template <> -int SetTClassKeyValue(WifiDeviceConfig &item, const std::string &key, const std::string &value, - const std::string &fileName); +int SetTClassKeyValue(WifiDeviceConfig &item, const std::string &key, const std::string &value); /** * @Description Output WifiDeviceConfig class name @@ -132,11 +128,10 @@ std::string GetTClassName(); * * @tparam * @param item - WifiDeviceConfig &item - * @param fileName - fileName * @return std::string - output total member=value string about the WifiDeviceConfig item */ template <> -std::string OutTClassString(WifiDeviceConfig &item, const std::string &fileName); +std::string OutTClassString(WifiDeviceConfig &item); /** * @Description Clear and init HotspotConfig @@ -154,12 +149,10 @@ void ClearTClass(HotspotConfig &item); * @param item - HotspotConfig &item * @param key - HotspotConfig struct member name * @param value - the HotspotConfig item member value - * @param fileName - fileName * @return int - parse error: 0 Success, >0 parse failed */ template <> -int SetTClassKeyValue(HotspotConfig &item, const std::string &key, const std::string &value, - const std::string &fileName); +int SetTClassKeyValue(HotspotConfig &item, const std::string &key, const std::string &value); /** * @Description Output HotspotConfig class name @@ -176,11 +169,10 @@ std::string GetTClassName(); * * @tparam * @param item - HotspotConfig &item - * @param fileName - fileName * @return std::string - output total member=value string about the HotspotConfig item */ template <> -std::string OutTClassString(HotspotConfig &item, const std::string &fileName); +std::string OutTClassString(HotspotConfig &item); /** * @Description Clear and init P2pVendorConfig @@ -198,12 +190,10 @@ void ClearTClass(P2pVendorConfig &item); * @param item - P2pVendorConfig &item * @param key - P2pVendorConfig struct member name * @param value - the P2pVendorConfig item member value - * @param fileName - fileName * @return int - parse error: 0 Success, >0 parse failed */ template<> -int SetTClassKeyValue(P2pVendorConfig &item, const std::string &key, const std::string &value, - const std::string &fileName); +int SetTClassKeyValue(P2pVendorConfig &item, const std::string &key, const std::string &value); /** * @Description Output P2pVendorConfig class name @@ -220,11 +210,10 @@ std::string GetTClassName(); * * @tparam * @param item - P2pVendorConfig &item - * @param fileName - fileName * @return std::string - output total member=value string about the P2pVendorConfig item */ template<> -std::string OutTClassString(P2pVendorConfig &item, const std::string &fileName); +std::string OutTClassString(P2pVendorConfig &item); /** * @Description Clear and init StationInfo @@ -242,12 +231,10 @@ void ClearTClass(StationInfo &item); * @param item - StationInfo &item * @param key - StationInfo struct member name * @param value - the StationInfo item member value - * @param fileName - fileName * @return int - parse error: 0 Success, >0 parse failed */ template <> -int SetTClassKeyValue(StationInfo &item, const std::string &key, const std::string &value, - const std::string &fileName); +int SetTClassKeyValue(StationInfo &item, const std::string &key, const std::string &value); /** * @Description Output StationInfo class name @@ -264,11 +251,10 @@ std::string GetTClassName(); * * @tparam * @param item - StationInfo &item - * @param fileName - fileName * @return std::string - output total member=value string about the StationInfo item */ template <> -std::string OutTClassString(StationInfo &item, const std::string &fileName); +std::string OutTClassString(StationInfo &item); /** * @Description Clear and init WifiConfig @@ -286,12 +272,10 @@ void ClearTClass(WifiConfig &item); * @param item - WifiConfig &item * @param key - WifiConfig struct member name * @param value - the WifiConfig item member value - * @param fileName - fileName * @return int - parse error: 0 Success, >0 parse failed */ template <> -int SetTClassKeyValue(WifiConfig &item, const std::string &key, const std::string &value, - const std::string &fileName); +int SetTClassKeyValue(WifiConfig &item, const std::string &key, const std::string &value); /** * @Description Output WifiConfig class name @@ -308,11 +292,10 @@ std::string GetTClassName(); * * @tparam * @param item - WifiConfig &item - * @param fileName - fileName * @return std::string - output total member=value string about the WifiConfig item */ template <> -std::string OutTClassString(WifiConfig &item, const std::string &fileName); +std::string OutTClassString(WifiConfig &item); /** * @Description Clear and init WifiP2pGroupInfo @@ -330,12 +313,10 @@ void ClearTClass(WifiP2pGroupInfo &item); * @param item - WifiP2pGroupInfo &item * @param key - WifiP2pGroupInfo struct member name * @param value - the WifiP2pGroupInfo item member value - * @param fileName - fileName * @return int - parse error: 0 Success, >0 parse failed */ template<> -int SetTClassKeyValue(WifiP2pGroupInfo &item, const std::string &key, const std::string &value, - const std::string &fileName); +int SetTClassKeyValue(WifiP2pGroupInfo &item, const std::string &key, const std::string &value); /** * @Description Output WifiP2pGroupInfo class name @@ -352,11 +333,10 @@ std::string GetTClassName(); * * @tparam * @param item - WifiP2pGroupInfo &item - * @param fileName - fileName * @return std::string - output total member=value string about the WifiP2pGroupInfo item */ template<> -std::string OutTClassString(WifiP2pGroupInfo &item, const std::string &fileName); +std::string OutTClassString(WifiP2pGroupInfo &item); /** * @Description Clear and init TrustListPolicy @@ -374,12 +354,10 @@ void ClearTClass(TrustListPolicy &item); * @param item - TrustListPolicy &item * @param key - TrustListPolicy struct member name * @param value - the TrustListPolicy item member value - * @param fileName - fileName * @return int - parse error: 0 Success, >0 parse failed */ template <> -int SetTClassKeyValue(TrustListPolicy &item, const std::string &key, const std::string &value, - const std::string &fileName); +int SetTClassKeyValue(TrustListPolicy &item, const std::string &key, const std::string &value); /** * @Description Output TrustListPolicy class name @@ -396,11 +374,10 @@ std::string GetTClassName(); * * @tparam * @param item - TrustListPolicy &item - * @param fileName - fileName * @return std::string - output total member=value string about the TrustListPolicy item */ template <> -std::string OutTClassString(TrustListPolicy &item, const std::string &fileName); +std::string OutTClassString(TrustListPolicy &item); /** * @Description Clear and init MovingFreezePolicy @@ -418,12 +395,10 @@ void ClearTClass(MovingFreezePolicy &item); * @param item - MovingFreezePolicy &item * @param key - MovingFreezePolicy struct member name * @param value - the MovingFreezePolicy item member value - * @param fileName - fileName * @return int - parse error: 0 Success, >0 parse failed */ template <> -int SetTClassKeyValue(MovingFreezePolicy &item, const std::string &key, const std::string &value, - const std::string &fileName); +int SetTClassKeyValue(MovingFreezePolicy &item, const std::string &key, const std::string &value); /** * @Description Output MovingFreezePolicy class name @@ -440,11 +415,10 @@ std::string GetTClassName(); * * @tparam * @param item - MovingFreezePolicy &item - * @param fileName - fileName * @return std::string - output total member=value string about the MovingFreezePolicy item */ template <> -std::string OutTClassString(MovingFreezePolicy &item, const std::string &fileName); +std::string OutTClassString(MovingFreezePolicy &item); /** * @Description Clear and init WifiStoreRandomMac @@ -462,12 +436,10 @@ void ClearTClass(WifiStoreRandomMac &item); * @param item - WifiStoreRandomMac &item * @param key - WifiStoreRandomMac struct member name * @param value - the WifiStoreRandomMac item member value - * @param fileName - fileName * @return int - parse error: 0 Success, >0 parse failed */ template <> -int SetTClassKeyValue(WifiStoreRandomMac &item, const std::string &key, const std::string &value, - const std::string &fileName); +int SetTClassKeyValue(WifiStoreRandomMac &item, const std::string &key, const std::string &value); /** * @Description Output WifiStoreRandomMac class name @@ -484,11 +456,10 @@ std::string GetTClassName(); * * @tparam * @param item - WifiStoreRandomMac &item - * @param fileName - fileName * @return std::string - output total member=value string about the WifiStoreRandomMac item */ template <> -std::string OutTClassString(WifiStoreRandomMac &item, const std::string &fileName); +std::string OutTClassString(WifiStoreRandomMac &item); /* ----------template function specialization declare end----------- */ } // namespace Wifi } // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp index b8d1b57..8bf8a56 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp @@ -122,7 +122,7 @@ void WifiSettings::InitP2pVendorConfig() int WifiSettings::Init() { mCountryCode = "CN"; - InitGetApMaxConnNum(); + InitSettingsNum(); /* read ini config */ mSavedDeviceConfig.SetConfigFilePath(DEVICE_CONFIG_FILE_PATH); @@ -367,6 +367,19 @@ int WifiSettings::SetDeviceState(int networkId, int state, bool bSetOther) return 0; } +int WifiSettings::SetDeviceTime(int networkId) +{ + time_t timeNow; + time(&timeNow); + std::unique_lock lock(mConfigMutex); + auto iter = mWifiDeviceConfig.find(networkId); + if (iter == mWifiDeviceConfig.end()) { + return -1; + } + iter->second.lastConnectTime = timeNow; + return 0; +} + int WifiSettings::GetCandidateConfig(const int uid, const int &networkId, WifiDeviceConfig &config) { std::vector configs; @@ -439,14 +452,40 @@ int WifiSettings::GetWifiP2pGroupInfo(std::vector &groups) return 0; } +int WifiSettings::RemoveExcessDeviceConfigs(std::vector &configs) +{ + int maxNumConfigs = mMaxNumConfigs; + if (maxNumConfigs < 0) { + return 1; + } + int numExcessNetworks = configs.size() - maxNumConfigs; + if (numExcessNetworks <= 0) { + return 1; + } + sort(configs.begin(), configs.end(), [](WifiDeviceConfig a, WifiDeviceConfig b) { + if (a.status != b.status) { + return (a.status == 0) < (b.status == 0); + } else if (a.lastConnectTime != b.lastConnectTime) { + return a.lastConnectTime < b.lastConnectTime; + } else { + return a.networkId < b.networkId; + } + }); + configs.erase(configs.begin(),configs.begin()+numExcessNetworks); + return 0; +} + int WifiSettings::SyncDeviceConfig() { #ifndef CONFIG_NO_CONFIG_WRITE std::unique_lock lock(mConfigMutex); std::vector tmp; for (auto iter = mWifiDeviceConfig.begin(); iter != mWifiDeviceConfig.end(); ++iter) { - tmp.push_back(iter->second); + if (!iter->second.isEphemeral) { + tmp.push_back(iter->second); + } } + RemoveExcessDeviceConfigs(tmp); mSavedDeviceConfig.SetValue(tmp); return mSavedDeviceConfig.SaveConfig(); #else @@ -929,10 +968,11 @@ void WifiSettings::InitDefaultP2pVendorConfig() mP2pVendorConfig.SetSecondaryDeviceType(""); } -void WifiSettings::InitGetApMaxConnNum() +void WifiSettings::InitSettingsNum() { /* query drivers capability, support max connection num. */ mApMaxConnNum = MAX_AP_CONN; + mMaxNumConfigs = MAX_CONFIGS_NUM; } void WifiSettings::InitScanControlForbidList(void) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.h b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.h index f50a5c4..bb1053c 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.h @@ -247,6 +247,15 @@ public: */ int SetDeviceState(int networkId, int state, bool bSetOther = false); + /** + * @Description Set a wifi device's last connect time who's networkId equals input networkId; + * + * @param networkId - the wifi device's id + * @return int - when 0 means success, other means some fails happened, + * Input state invalid or not find the wifi device config + */ + int SetDeviceTime(int networkId); + /** * @Description Get the candidate device configuration * @@ -273,6 +282,14 @@ public: */ int SyncDeviceConfig(); + /** + * @Description Remove excess networks in case the number of saved networks exceeds the mas limit + * + * @param configs - WifiDeviceConfig objects + * @return int - 0 if networks were removed, 1 otherwise. + */ + int RemoveExcessDeviceConfig(std::vector &configs); + /** * @Description Reload wifi device config from config file * @@ -1096,7 +1113,7 @@ private: void InitHotspotConfig(); void InitDefaultP2pVendorConfig(); void InitP2pVendorConfig(); - void InitGetApMaxConnNum(); + void InitSettingsNum(); void InitScanControlForbidList(); void InitScanControlIntervalList(); void InitScanControlInfo(); @@ -1125,6 +1142,7 @@ private: std::atomic mP2pDiscoverState; std::atomic mP2pConnectState; int mApMaxConnNum; /* ap support max sta numbers */ + int mMaxNumConfigs; /* max saved configs numbers */ int mLastSelectedNetworkId; /* last selected networkid */ time_t mLastSelectedTimeVal; /* last selected time */ int mScreenState; /* 1 MODE_STATE_OPEN, 2 MODE_STATE_CLOSE */ diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.cpp index c7530a5..8d74ca4 100755 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#ifdef FEATURE_ENCRYPTION_SUPPORT #include "wifi_encryption_util.h" #include #include @@ -167,4 +168,5 @@ int32_t WifiDecryption(const WifiEncryptionInfo &wifiEncryptionInfo, const Encry return ret; } } // namespace Wifi -} // namespace OHOS \ No newline at end of file +} // namespace OHOS +#endif \ No newline at end of file diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.h b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.h index 87fb1ba..8675411 100755 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.h @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - +#ifdef FEATURE_ENCRYPTION_SUPPORT #ifndef OHOS_WIFI_CONFIG_HKS_H #define OHOS_WIFI_CONFIG_HKS_H #include @@ -71,4 +71,5 @@ int32_t WifiDecryption(const WifiEncryptionInfo &wifiEncryptionInfo, const Encry std::string &decryptedData); } } +#endif #endif \ No newline at end of file diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_global_func.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_global_func.cpp index 45a3a01..7e86f27 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_global_func.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_global_func.cpp @@ -332,7 +332,7 @@ std::string ConvertArrayToHex(const uint8_t plainText[], uint32_t size) static bool ValidateChar(const char ch) { - if (ch > '~' || ch < ' ') { + if (ch == '\n' || ch == '\r') { return false; } return true; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_global_func.h b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_global_func.h index ae03baa..8e59c73 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_global_func.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_global_func.h @@ -33,6 +33,7 @@ constexpr int MIN_PSK_LEN = 8; constexpr int MAX_PSK_LEN = 63; constexpr int HEX_TYPE_LEN = 3; /* 3 hex type: 0 a A */ constexpr int MAX_AP_CONN = 32; +constexpr int MAX_CONFIGS_NUM = 1000; /** * @Description Check valid ssid config -- Gitee From 67efae964bf465fb4ecb0bfb7524fc8409848998 Mon Sep 17 00:00:00 2001 From: fengye Date: Tue, 20 Sep 2022 10:42:17 +0000 Subject: [PATCH 370/491] Added max configs number Signed-off-by: fengye --- .../wifi_framework/wifi_toolkit/config/wifi_settings.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.h b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.h index bb1053c..96d9901 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.h @@ -288,7 +288,7 @@ public: * @param configs - WifiDeviceConfig objects * @return int - 0 if networks were removed, 1 otherwise. */ - int RemoveExcessDeviceConfig(std::vector &configs); + int RemoveExcessDeviceConfigs(std::vector &configs); /** * @Description Reload wifi device config from config file -- Gitee From 34bb7b39c7a4b1a30bff562d1d48da22fd2a6186 Mon Sep 17 00:00:00 2001 From: fengye Date: Tue, 20 Sep 2022 12:11:42 +0000 Subject: [PATCH 371/491] fix bug Signed-off-by: fengye --- .../wifi_toolkit/config/wifi_config_file_spec.cpp | 6 ------ .../wifi_framework/wifi_toolkit/config/wifi_settings.cpp | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.cpp index 1ac5df8..45edad6 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.cpp @@ -129,12 +129,8 @@ static int SetWifiDeviceConfigFirst(WifiDeviceConfig &item, const std::string &k item.channel = std::stoi(value); } else if (key == "frequency") { item.frequency = std::stoi(value); - } else if (key == "level") { - item.level = std::stoi(value); } else if (key == "isPasspoint") { item.isPasspoint = std::stoi(value); - } else if (key == "isEphemeral") { - item.isEphemeral = std::stoi(value); } else if (key == "preSharedKey") { item.preSharedKey = value; } else if (key == "keyMgmt") { @@ -427,9 +423,7 @@ static std::string OutPutWifiDeviceConfig(WifiDeviceConfig &item) ss << " " <<"band=" << item.band << std::endl; ss << " " <<"channel=" << item.channel << std::endl; ss << " " <<"frequency=" << item.frequency << std::endl; - ss << " " <<"level=" << item.level << std::endl; ss << " " <<"isPasspoint=" << item.isPasspoint << std::endl; - ss << " " <<"isEphemeral=" << item.isEphemeral << std::endl; ss << " " <<"priority=" << item.priority << std::endl; ss << " " <<"hiddenSSID=" << (int)item.hiddenSSID << std::endl; ss << " " <<"keyMgmt=" << item.keyMgmt << std::endl; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp index e6a976d..d0f188d 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp @@ -471,7 +471,7 @@ int WifiSettings::RemoveExcessDeviceConfigs(std::vector &confi return a.networkId < b.networkId; } }); - configs.erase(configs.begin(),configs.begin()+numExcessNetworks); + configs.erase(configs.begin(), configs.begin() + numExcessNetworks); return 0; } -- Gitee From e1792d95bea795578f466054476da3610ca87756 Mon Sep 17 00:00:00 2001 From: lujunxin Date: Wed, 21 Sep 2022 02:15:47 +0000 Subject: [PATCH 372/491] add eap-peap in wifi_client Signed-off-by: lujunxin --- wifi/test/wifi_client/wifi_client.cpp | 28 ++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/wifi/test/wifi_client/wifi_client.cpp b/wifi/test/wifi_client/wifi_client.cpp index 2edb2a0..19a0a94 100644 --- a/wifi/test/wifi_client/wifi_client.cpp +++ b/wifi/test/wifi_client/wifi_client.cpp @@ -240,9 +240,12 @@ static bool GetNetworkId(int argc, const char *argv[], int &nid) static bool GetDeviceConfig(int argc, const char *argv[], WifiDeviceConfig &config) { + int phase2 = 0; string keyMgmt = ""; config.ssid = ""; config.preSharedKey = ""; + config.wifiEapConfig.eap = ""; + config.wifiEapConfig.identity = ""; for (int i = ARG_IDX; i < argc; i++) { if (strncmp(argv[i], "ssid=", strlen("ssid=")) == 0) { @@ -251,24 +254,39 @@ static bool GetDeviceConfig(int argc, const char *argv[], WifiDeviceConfig &conf config.preSharedKey = argv[i] + strlen("pwd="); } else if (strncmp(argv[i], "key_mgmt=", strlen("key_mgmt=")) == 0) { keyMgmt = argv[i] + strlen("key_mgmt="); + } else if (strncmp(argv[i], "id=", strlen("id=")) == 0) { + config.wifiEapConfig.identity = argv[i] + strlen("id="); + } else if (strncmp(argv[i], "phase2=", strlen("phase2=")) == 0) { + (void)sscanf_s(argv[i], "phase2=%d", &phase2); + } else if (strncmp(argv[i], "eapmethod=", strlen("eapmethod=")) == 0) { + config.wifiEapConfig.eap = argv[i] + strlen("eapmethod="); } } if (config.ssid == "" || keyMgmt == "") { HelpCommand(argv[CMD_IDX]); return false; } - if (keyMgmt != "open" && keyMgmt != "wpa" && keyMgmt != "wpa2") { - Logd("key_mgmt should be one of {open, wpa, wpa2}"); + if (keyMgmt != "open" && keyMgmt != "wpa" && keyMgmt != "wpa2" && keyMgmt != "eap") { + Logd("key_mgmt should be one of {open, wpa, wpa2, eap}"); return false; } - if (keyMgmt != "open" && config.preSharedKey.length() < MIN_WPA_LENGTH) { + if ((keyMgmt != "open" && keyMgmt != "eap") && config.preSharedKey.length() < MIN_WPA_LENGTH) { Logd("password length should be >= %d", MIN_WPA_LENGTH); return false; } if (keyMgmt == "open") { - config.keyMgmt = "NONE"; + config.keyMgmt = KEY_MGMT_NONE; + } else if (keyMgmt == "eap") { + config.keyMgmt = KEY_MGMT_EAP; + if (config.wifiEapConfig.eap == EAP_METHOD_PEAP) { + config.wifiEapConfig.phase2Method = Phase2Method(phase2); + config.wifiEapConfig.password = config.preSharedKey; + config.preSharedKey = ""; + } else { + Logd("EapMethod %s unsupported", config.wifiEapConfig.eap.c_str()); + } } else { - config.keyMgmt = "WPA-PSK"; + config.keyMgmt = KEY_MGMT_WPA_PSK; } return true; } -- Gitee From 18fd79806e906595c312becd5e63d50d7cf8347b Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Wed, 21 Sep 2022 12:27:21 +0000 Subject: [PATCH 373/491] fix testcase result shows unavailable using test framework Signed-off-by: zhangfeng --- dhcp/test/services/dhcp_client/BUILD.gn | 2 +- .../services/dhcp_client/dhcp_ipv4_test.cpp | 16 ----------- .../services/dhcp_client/dhcp_main_test.cpp | 27 ------------------- .../services/dhcp_client/dhcp_socket_test.cpp | 3 --- dhcp/test/services/mgr_service/BUILD.gn | 6 +++-- .../services/mgr_service/dhcp_manage_test.cpp | 25 ----------------- .../wifi_manage/common/message_queue.cpp | 7 ++++- .../wifi_sta/sta_network_check.cpp | 8 +++++- .../ipc_framework/cRPC/unittest/BUILD.gn | 5 ++++ .../cRPC/unittest/rpc_test_main.cpp | 9 ++----- .../wifi_manage/idl_client/unittest/BUILD.gn | 8 +++--- .../unittest/idl_client_test_main.cpp | 21 --------------- .../wifi_manage/unittest/BUILD.gn | 3 ++- .../wifi_manage/unittest/wifi_manage_test.cpp | 21 --------------- .../wifi_manage/wifi_ap/BUILD.gn | 2 +- .../wifi_manage/wifi_ap/wifi_ap_test.cpp | 25 ----------------- .../wifi_manage/wifi_p2p/test/BUILD.gn | 2 +- .../wifi_p2p/test/wifi_p2p_test_entry.cpp | 27 ------------------- .../wifi_manage/wifi_scan/BUILD.gn | 2 +- .../wifi_manage/wifi_scan/wifi_scan_test.cpp | 24 ----------------- .../wifi_manage/wifi_sta/BUILD.gn | 2 +- .../wifi_sta/sta_network_check_test.cpp | 6 ++--- .../wifi_sta/sta_state_machine_test.cpp | 2 +- .../wifi_manage/wifi_sta/wifi_sta_test.cpp | 24 ----------------- .../wifi_toolkit/unittest/BUILD.gn | 6 ++++- .../wifi_toolkit/unittest/toolkit_test.cpp | 22 --------------- .../wifi_standard/wifi_hal/unittest/BUILD.gn | 3 ++- .../wifi_hal/unittest/wifi_hal_test.cpp | 22 --------------- 28 files changed, 45 insertions(+), 285 deletions(-) delete mode 100644 dhcp/test/services/dhcp_client/dhcp_main_test.cpp delete mode 100644 dhcp/test/services/mgr_service/dhcp_manage_test.cpp delete mode 100644 wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/idl_client_test_main.cpp delete mode 100644 wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manage_test.cpp delete mode 100644 wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_test.cpp delete mode 100644 wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_test_entry.cpp delete mode 100644 wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/wifi_scan_test.cpp delete mode 100644 wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/wifi_sta_test.cpp delete mode 100644 wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/toolkit_test.cpp delete mode 100644 wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_test.cpp diff --git a/dhcp/test/services/dhcp_client/BUILD.gn b/dhcp/test/services/dhcp_client/BUILD.gn index 1728f97..659f38a 100644 --- a/dhcp/test/services/dhcp_client/BUILD.gn +++ b/dhcp/test/services/dhcp_client/BUILD.gn @@ -38,7 +38,6 @@ ohos_unittest("dhcp_client_unittest") { "dhcp_client_test.cpp", "dhcp_function_test.cpp", "dhcp_ipv4_test.cpp", - "dhcp_main_test.cpp", "dhcp_options_test.cpp", "dhcp_socket_test.cpp", "global_test.cpp", @@ -58,6 +57,7 @@ ohos_unittest("dhcp_client_unittest") { deps = [ "//third_party/googletest:gmock_main", + "//third_party/googletest:gtest_main", "//third_party/openssl:libcrypto_static", ] diff --git a/dhcp/test/services/dhcp_client/dhcp_ipv4_test.cpp b/dhcp/test/services/dhcp_client/dhcp_ipv4_test.cpp index bb6e5ae..49ddb06 100644 --- a/dhcp/test/services/dhcp_client/dhcp_ipv4_test.cpp +++ b/dhcp/test/services/dhcp_client/dhcp_ipv4_test.cpp @@ -82,19 +82,3 @@ HWTEST_F(DhcpIpv4Test, TEST_FAILED, TestSize.Level1) EXPECT_EQ(DHCP_OPT_FAILED, GetPacketHeaderInfo(NULL, 0)); EXPECT_EQ(DHCP_OPT_FAILED, GetPacketCommonInfo(NULL)); } - -HWTEST_F(DhcpIpv4Test, TEST_SUCCESS, TestSize.Level1) -{ - MockSystemFunc::SetMockFlag(true); - - EXPECT_CALL(MockSystemFunc::GetInstance(), socket(_, _, _)).WillRepeatedly(Return(1)); - EXPECT_CALL(MockSystemFunc::GetInstance(), bind(_, _, _)).WillRepeatedly(Return(0)); - EXPECT_CALL(MockSystemFunc::GetInstance(), sendto(_, _, _, _, _, _)) - .WillRepeatedly(Return(1)); - EXPECT_CALL(MockSystemFunc::GetInstance(), close(_)).WillRepeatedly(Return(0)); - - EXPECT_EQ(0, DhcpDiscover(0, 1)); - EXPECT_EQ(0, DhcpRenew(0, 0, 0)); - - MockSystemFunc::SetMockFlag(false); -} diff --git a/dhcp/test/services/dhcp_client/dhcp_main_test.cpp b/dhcp/test/services/dhcp_client/dhcp_main_test.cpp deleted file mode 100644 index 37c317f..0000000 --- a/dhcp/test/services/dhcp_client/dhcp_main_test.cpp +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include -#include "global_test.h" - -int main(int argc, char *argv[]) -{ - testing::InitGoogleTest(&argc, argv); - testing::InitGoogleMock(&argc, argv); - testing::Environment *env = new GlobalTest(); - testing::AddGlobalTestEnvironment(env); - return RUN_ALL_TESTS(); -} diff --git a/dhcp/test/services/dhcp_client/dhcp_socket_test.cpp b/dhcp/test/services/dhcp_client/dhcp_socket_test.cpp index 1e67f41..3d1181a 100644 --- a/dhcp/test/services/dhcp_client/dhcp_socket_test.cpp +++ b/dhcp/test/services/dhcp_client/dhcp_socket_test.cpp @@ -115,9 +115,6 @@ HWTEST_F(DhcpSocketTest, SendToDhcpPacket_SUCCESS, TestSize.Level1) EXPECT_EQ(SendToDhcpPacket(NULL, 0, 0, 0, NULL), SOCKET_OPT_FAILED); int ifindex = 1; EXPECT_EQ(SendToDhcpPacket(NULL, 0, 0, ifindex, (uint8_t *)MAC_BCAST_ADDR), SOCKET_OPT_FAILED); - struct DhcpPacket packet; - packet.xid = 123456; - EXPECT_EQ(SendToDhcpPacket(&packet, 0, 0, ifindex, (uint8_t *)MAC_BCAST_ADDR), SOCKET_OPT_SUCCESS); MockSystemFunc::SetMockFlag(false); } diff --git a/dhcp/test/services/mgr_service/BUILD.gn b/dhcp/test/services/mgr_service/BUILD.gn index 10e44e0..f41a65f 100644 --- a/dhcp/test/services/mgr_service/BUILD.gn +++ b/dhcp/test/services/mgr_service/BUILD.gn @@ -37,7 +37,6 @@ ohos_unittest("dhcp_manage_unittest") { "$DHCP_ROOT_DIR/services/mgr_service/src/dhcp_service.cpp", "dhcp_client_service_test.cpp", "dhcp_func_test.cpp", - "dhcp_manage_test.cpp", "dhcp_result_notify.cpp", "dhcp_server_service_test.cpp", "dhcp_service_test.cpp", @@ -59,7 +58,10 @@ ohos_unittest("dhcp_manage_unittest") { "//base/notification/common_event_service/frameworks/core/include", ] - deps = [ "//third_party/googletest:gmock_main" ] + deps = [ + "//third_party/googletest:gmock_main", + "//third_party/googletest:gtest_main", + ] ldflags = [ "-fPIC", diff --git a/dhcp/test/services/mgr_service/dhcp_manage_test.cpp b/dhcp/test/services/mgr_service/dhcp_manage_test.cpp deleted file mode 100644 index 17d38d8..0000000 --- a/dhcp/test/services/mgr_service/dhcp_manage_test.cpp +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include "global_test.h" - -int main(int argc, char *argv[]) -{ - testing::InitGoogleTest(&argc, argv); - testing::Environment *env = new GlobalTest(); - testing::AddGlobalTestEnvironment(env); - return RUN_ALL_TESTS(); -} \ No newline at end of file diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.cpp index 61ea680..09ec3a5 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.cpp @@ -25,7 +25,9 @@ namespace OHOS { namespace Wifi { MessageQueue::MessageQueue() : pMessageQueue(nullptr), mIsBlocked(false), mNeedQuit(false) -{} +{ + LOGI("MessageQueue::MessageQueue"); +} MessageQueue::~MessageQueue() { @@ -44,6 +46,7 @@ MessageQueue::~MessageQueue() bool MessageQueue::AddMessageToQueue(InternalMessage *message, int64_t handleTime) { + LOGI("MessageQueue::AddMessageToQueue"); if (message == nullptr) { LOGE("message is null."); return false; @@ -96,6 +99,7 @@ bool MessageQueue::AddMessageToQueue(InternalMessage *message, int64_t handleTim bool MessageQueue::DeleteMessageFromQueue(int messageName) { + LOGI("MessageQueue::DeleteMessageFromQueue"); std::unique_lock lck(mMtxQueue); InternalMessage *pTop = pMessageQueue; if (pTop == nullptr) { @@ -174,6 +178,7 @@ InternalMessage *MessageQueue::GetNextMessage() void MessageQueue::StopQueueLoop() { LOGI("Start stop queue loop."); + mNeedQuit = true; while (mIsBlocked) { mNeedQuit = true; mCvQueue.notify_all(); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check.cpp index 6b17c5d..0790bbd 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check.cpp @@ -30,6 +30,7 @@ constexpr int NET_ERR_REQUEST_ERROR_CLASS_MAX = 499; StaNetworkCheck::StaNetworkCheck(NetStateHandler handle) { + WIFI_LOGI("StaNetworkCheck constructor\n"); pDealNetCheckThread = nullptr; netStateHandler = handle; lastNetState = NETWORK_STATE_UNKNOWN; @@ -48,6 +49,10 @@ StaNetworkCheck::~StaNetworkCheck() bool StaNetworkCheck::HttpDetection() { WIFI_LOGI("Enter httpDetection"); + if (netStateHandler == nullptr) { + WIFI_LOGE("Handler func is null, ignore net detect of this time."); + return false; + } /* Detect portal hotspot and send message to InterfaceSeervice if result is yes. */ HttpRequest httpRequest; std::string httpReturn; @@ -63,7 +68,7 @@ bool StaNetworkCheck::HttpDetection() constexpr int NET_ERROR_LEN = 5; codeNum = std::atoi(httpReturn.substr(retCode + NET_ERROR_POS, NET_ERROR_LEN).c_str()); } - + size_t contLenStr = httpReturn.find(contStr); int contLenNum = 0; if (contLenStr > 0) { @@ -187,6 +192,7 @@ void StaNetworkCheck::SignalNetCheckThread() void StaNetworkCheck::ExitNetCheckThread() { isStopNetCheck = false; + isExitNetCheckThread = true; while (!isExited) { isExitNetCheckThread = true; mCondition.notify_one(); diff --git a/wifi/test/wifi_standard/ipc_framework/cRPC/unittest/BUILD.gn b/wifi/test/wifi_standard/ipc_framework/cRPC/unittest/BUILD.gn index 6d8b7ad..af450cd 100644 --- a/wifi/test/wifi_standard/ipc_framework/cRPC/unittest/BUILD.gn +++ b/wifi/test/wifi_standard/ipc_framework/cRPC/unittest/BUILD.gn @@ -49,6 +49,11 @@ ohos_unittest("crpc_unittest") { "--coverage", ] + deps = [ + "//third_party/googletest:gmock_main", + "//third_party/googletest:gtest_main", + ] + external_deps = [ "c_utils:utils", "hiviewdfx_hilog_native:libhilog", diff --git a/wifi/test/wifi_standard/ipc_framework/cRPC/unittest/rpc_test_main.cpp b/wifi/test/wifi_standard/ipc_framework/cRPC/unittest/rpc_test_main.cpp index 6b29b2c..7de704f 100644 --- a/wifi/test/wifi_standard/ipc_framework/cRPC/unittest/rpc_test_main.cpp +++ b/wifi/test/wifi_standard/ipc_framework/cRPC/unittest/rpc_test_main.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include static constexpr int MAX_SIZE = 10240; @@ -53,9 +54,3 @@ extern "C" int __wrap_write(int fd, const void *buf, unsigned int size) return size; } } - -int main(int argc, char *argv[]) -{ - testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/BUILD.gn index ae33f10..993b968 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/BUILD.gn @@ -42,7 +42,6 @@ ohos_unittest("idl_client_unittest") { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_p2p_hal_interface.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_sta_hal_interface.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_supplicant_hal_interface.cpp", - "idl_client_test_main.cpp", "wifi_ap_hal_interface_test.cpp", "wifi_chip_hal_interface_test.cpp", "wifi_idl_client_test.cpp", @@ -70,6 +69,8 @@ ohos_unittest("idl_client_unittest") { deps = [ "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC:crpc_client", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit", + "//third_party/googletest:gmock_main", + "//third_party/googletest:gtest_main", ] ldflags = [ @@ -135,8 +136,5 @@ ohos_unittest("mock_wifi_hal_service") { group("unittest") { testonly = true - deps = [ - # ":idl_client_unittest", - # ":mock_wifi_hal_service", - ] + deps = [] } diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/idl_client_test_main.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/idl_client_test_main.cpp deleted file mode 100644 index 2c2414a..0000000 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/idl_client_test_main.cpp +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include - -int main(int argc, char *argv[]) -{ - testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn index 0cc64b8..a78577c 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn @@ -40,7 +40,6 @@ ohos_unittest("manager_unittest") { "wifi_auth_center_test.cpp", "wifi_config_center_test.cpp", "wifi_internal_event_dispatcher_test.cpp", - "wifi_manage_test.cpp", "wifi_manager_service_test.cpp", "wifi_service_manager_test.cpp", ] @@ -81,6 +80,8 @@ ohos_unittest("manager_unittest") { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit", "$WIFI_ROOT_DIR/utils:wifi_utils", "//foundation/communication/netmanager_base/services/netmanagernative:netsys_native_manager", + "//third_party/googletest:gmock_main", + "//third_party/googletest:gtest_main", ] ldflags = [ diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manage_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manage_test.cpp deleted file mode 100644 index e7867ae..0000000 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manage_test.cpp +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include - -int main(int argc, char *argv[]) -{ - testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} \ No newline at end of file diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn index f77c105..817cb4d 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn @@ -54,7 +54,6 @@ ohos_unittest("WifiApServiceTest") { "ap_stations_manager_test.cpp", "global_test.cpp", "wifi_ap_nat_manager_test.cpp", - "wifi_ap_test.cpp", ] include_dirs = [ "./", @@ -95,6 +94,7 @@ ohos_unittest("WifiApServiceTest") { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit", "$WIFI_ROOT_DIR/utils:wifi_utils", "//third_party/googletest:gmock_main", + "//third_party/googletest:gtest_main", ] external_deps = [ "c_utils:utils", diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_test.cpp deleted file mode 100644 index e2e4b1c..0000000 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_test.cpp +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (c) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "global_test.h" -#include - -int main(int argc, char *argv[]) -{ - testing::InitGoogleTest(&argc, argv); - testing::Environment *env = new GlobalTest(); - testing::AddGlobalTestEnvironment(env); - return RUN_ALL_TESTS(); -} \ No newline at end of file diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn index 7de390d..d1a9377 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn @@ -96,7 +96,6 @@ ohos_unittest("wifi_p2p_test") { "wifi_p2p_service_request_list_test.cpp", "wifi_p2p_service_response_list_test.cpp", "wifi_p2p_service_test.cpp", - "wifi_p2p_test_entry.cpp", "wifi_p2p_upnp_service_info_test.cpp", "wifi_p2p_upnp_service_request_test.cpp", "wifi_p2p_upnp_service_response_test.cpp", @@ -138,6 +137,7 @@ ohos_unittest("wifi_p2p_test") { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit", "$WIFI_ROOT_DIR/utils:wifi_utils", "//third_party/googletest:gmock_main", + "//third_party/googletest:gtest_main", ] external_deps = [ "c_utils:utils", diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_test_entry.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_test_entry.cpp deleted file mode 100644 index 4d6c9d3..0000000 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_test_entry.cpp +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include - -#include "global_test.h" - -using ::testing::ext::TestSize; - -int main(int argc, char *argv[]) -{ - testing::InitGoogleTest(&argc, argv); - testing::Environment *env = new GlobalTest(); - testing::AddGlobalTestEnvironment(env); - return RUN_ALL_TESTS(); -} \ No newline at end of file diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn index f88b5ce..25446d8 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn @@ -46,7 +46,6 @@ ohos_unittest("wifi_scan_unittest") { "scan_monitor_test.cpp", "scan_service_test.cpp", "scan_state_machine_test.cpp", - "wifi_scan_test.cpp", ] include_dirs = [ @@ -83,6 +82,7 @@ ohos_unittest("wifi_scan_unittest") { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit", "//third_party/googletest:gmock_main", + "//third_party/googletest:gtest_main", ] defines = [ "AP_INSTANCE_MAX_NUM=$wifi_feature_with_ap_num" ] external_deps = [ diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/wifi_scan_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/wifi_scan_test.cpp deleted file mode 100644 index 067af39..0000000 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/wifi_scan_test.cpp +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include -#include "global_test.h" - -int main(int argc, char *argv[]) -{ - testing::InitGoogleTest(&argc, argv); - testing::Environment *env = new GlobalTest(); - testing::AddGlobalTestEnvironment(env); - return RUN_ALL_TESTS(); -} \ No newline at end of file diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn index 1c3154c..93d4407 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn @@ -61,7 +61,6 @@ ohos_unittest("wifi_sta_unittest") { "sta_saved_device_appraisal_test.cpp", "sta_service_test.cpp", "sta_state_machine_test.cpp", - "wifi_sta_test.cpp", ] include_dirs = [ @@ -112,6 +111,7 @@ ohos_unittest("wifi_sta_unittest") { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit", "$WIFI_ROOT_DIR/utils:wifi_utils", "//third_party/googletest:gmock_main", + "//third_party/googletest:gtest_main", ] external_deps = [ "ability_base:want", diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check_test.cpp index 1ee7a1e..5bb12b3 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check_test.cpp +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,10 +12,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "sta_network_check.h" #include #include +#include "sta_network_check.h" using ::testing::ext::TestSize; @@ -43,7 +43,7 @@ public: public: std::unique_ptr pStaNetworkCheck; - NetStateHandler handle; + NetStateHandler handle = nullptr; }; void StaNetworkCheckTest::SignalNetCheckThreadSuccess() diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine_test.cpp index 7db65eb..632b8c2 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine_test.cpp +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine_test.cpp @@ -48,7 +48,7 @@ public: pStaStateMachine.reset(new StaStateMachine()); pStaStateMachine->InitStaStateMachine(); - NetStateHandler handle; + NetStateHandler handle = nullptr; pStaStateMachine->pNetcheck = new MockStaNetworkCheck(handle); pStaStateMachine->RegisterStaServiceCallback(WifiManager::GetInstance().GetStaCallback()); } diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/wifi_sta_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/wifi_sta_test.cpp deleted file mode 100644 index 067af39..0000000 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/wifi_sta_test.cpp +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include -#include "global_test.h" - -int main(int argc, char *argv[]) -{ - testing::InitGoogleTest(&argc, argv); - testing::Environment *env = new GlobalTest(); - testing::AddGlobalTestEnvironment(env); - return RUN_ALL_TESTS(); -} \ No newline at end of file diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/BUILD.gn index ed2a44f..35fbb4b 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/BUILD.gn @@ -36,7 +36,6 @@ ohos_unittest("toolkit_unittest") { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/mac_address.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/network_interface.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_global_func.cpp", - "toolkit_test.cpp", "wifi_config_file_test.cpp", "wifi_global_func_test.cpp", "wifi_ip_tools_test.cpp", @@ -59,6 +58,11 @@ ohos_unittest("toolkit_unittest") { "--coverage", ] + deps = [ + "//third_party/googletest:gmock_main", + "//third_party/googletest:gtest_main", + ] + external_deps = [ "c_utils:utils", "hiviewdfx_hilog_native:libhilog", diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/toolkit_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/toolkit_test.cpp deleted file mode 100644 index 3319c14..0000000 --- a/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/toolkit_test.cpp +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include - -int main(int argc, char *argv[]) -{ - testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} diff --git a/wifi/test/wifi_standard/wifi_hal/unittest/BUILD.gn b/wifi/test/wifi_standard/wifi_hal/unittest/BUILD.gn index 76eb78e..a4c65ab 100644 --- a/wifi/test/wifi_standard/wifi_hal/unittest/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_hal/unittest/BUILD.gn @@ -62,7 +62,6 @@ ohos_unittest("wifi_hal_unittest") { "wifi_hal_hostapd_test.cpp", "wifi_hal_p2p_interface_test.cpp", "wifi_hal_sta_interface_test.cpp", - "wifi_hal_test.cpp", "wifi_hal_wpa_p2p_test.cpp", "wifi_hal_wpa_sta_test.cpp", ] @@ -87,6 +86,8 @@ ohos_unittest("wifi_hal_unittest") { deps = [ "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC:crpc_server", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", + "//third_party/googletest:gmock_main", + "//third_party/googletest:gtest_main", ] ldflags = [ diff --git a/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_test.cpp b/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_test.cpp deleted file mode 100644 index 5d68c02..0000000 --- a/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_test.cpp +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include - -int main(int argc, char *argv[]) -{ - testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} \ No newline at end of file -- Gitee From dd90fbf7ff7192abc620e5f349264b886f7e6ef3 Mon Sep 17 00:00:00 2001 From: z00588131 Date: Thu, 22 Sep 2022 02:32:54 +0000 Subject: [PATCH 374/491] fix add candidate config fail issuewq! Signed-off-by: z00588131 --- wifi/utils/src/wifi_common_util.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/wifi/utils/src/wifi_common_util.cpp b/wifi/utils/src/wifi_common_util.cpp index 34f76dc..aebf9e6 100644 --- a/wifi/utils/src/wifi_common_util.cpp +++ b/wifi/utils/src/wifi_common_util.cpp @@ -299,7 +299,8 @@ bool IsForegroundApp(const int uid) } auto iter = std::find_if(infos.begin(), infos.end(), [&uid](const RunningProcessInfo &rhs) { - return ((rhs.uid_ == uid) && (rhs.state_ == AppProcessState::APP_STATE_FOREGROUND)); + return ((rhs.uid_ == uid) && (rhs.state_ == AppProcessState::APP_STATE_FOREGROUND || + rhs.state_ == AppProcessState::APP_STATE_FOCUS)); }); if (iter != infos.end()) { return true; @@ -349,4 +350,4 @@ TimeStats::~TimeStats() } #endif } // namespace Wifi -} // namespace OHOS \ No newline at end of file +} // namespace OHOS -- Gitee From 83f699043177c67fb0f175e23b11227162b327b3 Mon Sep 17 00:00:00 2001 From: fengye Date: Fri, 23 Sep 2022 01:57:10 +0000 Subject: [PATCH 375/491] modified output Signed-off-by: fengye --- wifi/frameworks/native/interfaces/wifi_msg.h | 4 +++ .../wifi_sta/sta_state_machine.cpp | 12 +++---- .../config/wifi_config_file_spec.cpp | 33 +++++++++++++++---- .../wifi_toolkit/config/wifi_settings.cpp | 24 +++++++++++++- .../wifi_toolkit/config/wifi_settings.h | 10 ++++-- 5 files changed, 66 insertions(+), 17 deletions(-) diff --git a/wifi/frameworks/native/interfaces/wifi_msg.h b/wifi/frameworks/native/interfaces/wifi_msg.h index 8fc1682..a533055 100644 --- a/wifi/frameworks/native/interfaces/wifi_msg.h +++ b/wifi/frameworks/native/interfaces/wifi_msg.h @@ -395,6 +395,7 @@ struct WifiDeviceConfig { std::string macAddress; int uid; time_t lastConnectTime; + int numRebootsSinceLastUse; WifiIpConfig wifiIpConfig; WifiEapConfig wifiEapConfig; WifiProxyConfig wifiProxyconfig; @@ -416,6 +417,9 @@ struct WifiDeviceConfig { wifiPrivacySetting = WifiPrivacyConfig::RANDOMMAC; rssi = -100; uid = WIFI_INVALID_UID; + lastConnectTime = -1; + numRebootsSinceLastUse = 0; + numAssociation = 0; } }; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp index 4f2bdbf..bceaa91 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp @@ -752,8 +752,7 @@ void StaStateMachine::ConvertFreqToChannel() LOGE("GetDeviceConfig failed!"); return; } - int tempBand = config.band; - int tempChannel = config.channel; + int config.frequency = linkedInfo.frequency; if (linkedInfo.frequency >= FREQ_2G_MIN && linkedInfo.frequency <= FREQ_2G_MAX) { config.band = linkedInfo.band = static_cast(BandType::BAND_2GHZ); config.channel = (linkedInfo.frequency - FREQ_2G_MIN) / CENTER_FREQ_DIFF + CHANNEL_2G_MIN; @@ -763,10 +762,7 @@ void StaStateMachine::ConvertFreqToChannel() config.band = linkedInfo.band = static_cast(BandType::BAND_5GHZ); config.channel = (linkedInfo.frequency - FREQ_5G_MIN) / CENTER_FREQ_DIFF + CHANNEL_5G_MIN; } - if (tempBand != config.band || tempChannel != config.channel) { - WifiSettings::GetInstance().AddDeviceConfig(config); - WifiSettings::GetInstance().SyncDeviceConfig(); - } + WifiSettings::GetInstance().AddDeviceConfig(config); return; } @@ -803,7 +799,7 @@ void StaStateMachine::DealConnectToUserSelectedNetwork(InternalMessage *msg) } /* Sets network status. */ WifiSettings::GetInstance().EnableNetwork(networkId, forceReconnect); - WifiSettings::GetInstance().SetDeviceTime(networkId); + WifiSettings::GetInstance().SetDeviceAfterConnect(networkId); WifiSettings::GetInstance().SetDeviceState(networkId, (int)WifiDeviceConfigStatus::ENABLED, false); } @@ -835,7 +831,7 @@ void StaStateMachine::DealConnectionEvent(InternalMessage *msg) } WIFI_LOGI("enter DealConnectionEvent"); - WifiSettings::GetInstance().SetDeviceTime(targetNetworkId); + WifiSettings::GetInstance().SetDeviceAfterConnect(targetNetworkId); WifiSettings::GetInstance().SetDeviceState(targetNetworkId, (int)WifiDeviceConfigStatus::ENABLED, false); WifiSettings::GetInstance().SyncDeviceConfig(); /* Stop clearing the Wpa_blocklist. */ diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.cpp index 45edad6..76449c5 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.cpp @@ -41,6 +41,8 @@ static void ClearWifiDeviceConfig(WifiDeviceConfig &item) item.priority = 0; item.hiddenSSID = false; item.lastConnectTime = -1; + item.numRebootsSinceLastUse = 0; + item.numAssociation = 0; return; } @@ -104,8 +106,27 @@ void ClearTClass(WifiDeviceConfig &item) return; } +static int SetWifiDeviceConfigOutDated(WifiDeviceConfig &item, const std::string &key, const std::string &value) +{ + if (key == "band") { + item.band = std::stoi(value); + } else if (key == "channel") { + item.channel = std::stoi(value); + } else if (key == "level") { + item.level = std::stoi(value); + } else if (key == "isEphemeral") { + item.isEphemeral = std::stoi(value); + } else { + return -1; + } + return 0; +} + static int SetWifiDeviceConfigFirst(WifiDeviceConfig &item, const std::string &key, const std::string &value) { + if(SetWifiDeviceConfigOutDated(item, key, value) == 0) { + return 0 + } if (key == "networkId") { item.networkId = std::stoi(value); } else if (key == "status") { @@ -123,10 +144,6 @@ static int SetWifiDeviceConfigFirst(WifiDeviceConfig &item, const std::string &k } else { return -1; } - } else if (key == "band") { - item.band = std::stoi(value); - } else if (key == "channel") { - item.channel = std::stoi(value); } else if (key == "frequency") { item.frequency = std::stoi(value); } else if (key == "isPasspoint") { @@ -143,6 +160,10 @@ static int SetWifiDeviceConfigFirst(WifiDeviceConfig &item, const std::string &k item.uid = std::stoi(value); } else if (key == "lastConnectTime") { item.lastConnectTime = std::stoi(value); + } else if (key == "numRebootsSinceLastUse") { + item.numRebootsSinceLastUse = std::stoi(value); + } else if (key == "numAssociation") { + item.numAssociation = std::stoi(value); } else { return -1; } @@ -420,14 +441,14 @@ static std::string OutPutWifiDeviceConfig(WifiDeviceConfig &item) ss << " " <<"bssid=" << item.bssid << std::endl; ss << " " <<"ssid=" << ValidateString(item.ssid) << std::endl; ss << " " <<"HexSsid=" << ConvertArrayToHex((uint8_t*)&item.ssid[0], item.ssid.length()) << std::endl; - ss << " " <<"band=" << item.band << std::endl; - ss << " " <<"channel=" << item.channel << std::endl; ss << " " <<"frequency=" << item.frequency << std::endl; ss << " " <<"isPasspoint=" << item.isPasspoint << std::endl; ss << " " <<"priority=" << item.priority << std::endl; ss << " " <<"hiddenSSID=" << (int)item.hiddenSSID << std::endl; ss << " " <<"keyMgmt=" << item.keyMgmt << std::endl; ss << " " <<"lastConnectTime=" << item.lastConnectTime << std::endl; + ss << " " <<"numRebootsSinceLastUse=" << item.numRebootsSinceLastUse << std::endl; + ss << " " <<"numAssociation=" << item.numAssociation << std::endl; #ifdef FEATURE_ENCRYPTION_SUPPORT ss <second.lastConnectTime = timeNow; + iter->second.numRebootsSinceLastUse = 0; + iter->second.numAssociation++; return 0; } @@ -452,6 +455,21 @@ int WifiSettings::GetWifiP2pGroupInfo(std::vector &groups) return 0; } +int WifiSettings::increaseNumRebootsSinceLastUse() +{ + if (!deviceConfigLoadFlag.test_and_set()) { + LOGE("Reload wifi config"); + ReloadDeviceConfig(); + } + + std::unique_lock lock(mConfigMutex); + bool found = false; + for (auto iter = mWifiDeviceConfig.begin(); iter != mWifiDeviceConfig.end(); iter++) { + iter->second.numRebootsSinceLastUse++; + } + return 0; +} + int WifiSettings::RemoveExcessDeviceConfigs(std::vector &configs) { int maxNumConfigs = mMaxNumConfigs; @@ -467,6 +485,10 @@ int WifiSettings::RemoveExcessDeviceConfigs(std::vector &confi return (a.status == 0) < (b.status == 0); } else if (a.lastConnectTime != b.lastConnectTime) { return a.lastConnectTime < b.lastConnectTime; + } else if (a.numRebootsSinceLastUse != b.numRebootsSinceLastUse) { + return a.numRebootsSinceLastUse > b.numRebootsSinceLastUse; + } else if (a.numAssociation != b.numAssociation) { + return a.numAssociation < b.numAssociation; } else { return a.networkId < b.networkId; } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.h b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.h index 0bdd27e..cb9dece 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.h @@ -248,13 +248,13 @@ public: int SetDeviceState(int networkId, int state, bool bSetOther = false); /** - * @Description Set a wifi device's last connect time who's networkId equals input networkId; + * @Description Set a wifi device's attributes who's networkId equals input networkId after connect; * * @param networkId - the wifi device's id * @return int - when 0 means success, other means some fails happened, * Input state invalid or not find the wifi device config */ - int SetDeviceTime(int networkId); + int SetDeviceAfterConnect(int networkId); /** * @Description Get the candidate device configuration @@ -282,6 +282,12 @@ public: */ int SyncDeviceConfig(); + /** + * @Description Increments the number of reboots since last use for each configuration + * + * @return int - 0 success; -1 save file failed + */ + int increaseNumRebootsSinceLastUse(); /** * @Description Remove excess networks in case the number of saved networks exceeds the mas limit * -- Gitee From 9a907147a3ba050115d2f2a38ce47a0c16691590 Mon Sep 17 00:00:00 2001 From: fengye Date: Fri, 23 Sep 2022 02:27:37 +0000 Subject: [PATCH 376/491] modified output Signed-off-by: fengye --- wifi/frameworks/native/interfaces/wifi_msg.h | 1 + .../wifi_manage/wifi_p2p/group_negotiation_state.cpp | 4 ++-- .../wifi_manage/wifi_p2p/p2p_group_operating_state.cpp | 4 ++-- .../wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.cpp | 4 ++-- .../wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.h | 4 ++-- .../wifi_manage/wifi_p2p/wifi_p2p_group_manager.cpp | 4 ++-- .../wifi_manage/wifi_p2p/wifi_p2p_group_manager.h | 4 ++-- .../wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp | 2 +- .../wifi_toolkit/config/wifi_config_file_impl.h | 4 ++-- .../wifi_toolkit/config/wifi_config_file_spec.cpp | 4 ++-- .../wifi_toolkit/config/wifi_config_file_spec.h | 4 ++-- .../wifi_framework/wifi_toolkit/config/wifi_settings.cpp | 4 ++-- .../wifi_framework/wifi_toolkit/config/wifi_settings.h | 4 ++-- .../wifi_toolkit/utils/wifi_encryption_util.cpp | 4 ++-- 14 files changed, 26 insertions(+), 25 deletions(-) diff --git a/wifi/frameworks/native/interfaces/wifi_msg.h b/wifi/frameworks/native/interfaces/wifi_msg.h index a533055..53f494e 100644 --- a/wifi/frameworks/native/interfaces/wifi_msg.h +++ b/wifi/frameworks/native/interfaces/wifi_msg.h @@ -396,6 +396,7 @@ struct WifiDeviceConfig { int uid; time_t lastConnectTime; int numRebootsSinceLastUse; + int numAssociation; WifiIpConfig wifiIpConfig; WifiEapConfig wifiEapConfig; WifiProxyConfig wifiProxyconfig; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.cpp index f0650c9..c6b6588 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.cpp @@ -231,5 +231,5 @@ bool GroupNegotiationState::ExecuteStateMsg(InternalMessage *msg) return NOT_EXECUTED; } } -} // namespace Wifi -} // namespace OHOS +} // namespace Wifi +} // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.cpp index 666940c..6fc8f74 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.cpp @@ -355,5 +355,5 @@ bool P2pGroupOperatingState::ExecuteStateMsg(InternalMessage *msg) return NOT_EXECUTED; } } -} // namespace Wifi -} // namespace OHOS +} // namespace Wifi +} // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.cpp index 5d521c8..e5c4cb6 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.cpp @@ -381,5 +381,5 @@ bool P2pIdleState::ExecuteStateMsg(InternalMessage *msg) return NOT_EXECUTED; } } -} // namespace Wifi -} // namespace OHOS +} // namespace Wifi +} // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.h index d23f1c1..4944a9c 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.h @@ -419,7 +419,7 @@ private: static bool m_isNeedDhcp; std::string p2pDevIface; }; -} // namespace Wifi -} // namespace OHOS +} // namespace Wifi +} // namespace OHOS #endif // OHOS_P2P_STATE_MACHINE_H diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_manager.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_manager.cpp index b18e880..12457af 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_manager.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_manager.cpp @@ -255,5 +255,5 @@ void WifiP2pGroupManager::UpdateGroupsNetwork(std::map wp } } } -} // namespace Wifi -} // namespace OHOS +} // namespace Wifi +} // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_manager.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_manager.h index 4887a73..626abd4 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_manager.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_manager.h @@ -211,7 +211,7 @@ private: std::mutex groupMutex; WifiP2pLinkedInfo p2pConnInfo; /* group connection information */ }; -} // namespace Wifi -} // namespace OHOS +} // namespace Wifi +} // namespace OHOS #endif // OHOS_P2P_GROUP_MANAGER_H diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp index bceaa91..56e9a61 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp @@ -752,7 +752,7 @@ void StaStateMachine::ConvertFreqToChannel() LOGE("GetDeviceConfig failed!"); return; } - int config.frequency = linkedInfo.frequency; + config.frequency = linkedInfo.frequency; if (linkedInfo.frequency >= FREQ_2G_MIN && linkedInfo.frequency <= FREQ_2G_MAX) { config.band = linkedInfo.band = static_cast(BandType::BAND_2GHZ); config.channel = (linkedInfo.frequency - FREQ_2G_MIN) / CENTER_FREQ_DIFF + CHANNEL_2G_MIN; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_impl.h b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_impl.h index c1f0d8b..4ed6ec2 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_impl.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_impl.h @@ -279,6 +279,6 @@ int WifiConfigFileImpl::SetValue(const std::vector &results) mValues = results; return 0; } -} // namespace Wifi -} // namespace OHOS +} // namespace Wifi +} // namespace OHOS #endif \ No newline at end of file diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.cpp index 76449c5..3701604 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.cpp @@ -1292,5 +1292,5 @@ template <> std::string OutTClassString(WifiStoreRandomMac & ss << " " <<"" << std::endl; return ss.str(); } -} // namespace Wifi -} // namespace OHOS \ No newline at end of file +} // namespace Wifi +} // namespace OHOS \ No newline at end of file diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.h b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.h index 78ab9be..2cda3aa 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.h @@ -461,6 +461,6 @@ std::string GetTClassName(); template <> std::string OutTClassString(WifiStoreRandomMac &item); /* ----------template function specialization declare end----------- */ -} // namespace Wifi -} // namespace OHOS +} // namespace Wifi +} // namespace OHOS #endif diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp index b31236a..c35e076 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp @@ -1513,5 +1513,5 @@ int WifiSettings::GetThermalLevel() const { return mThermalLevel; } -} // namespace Wifi -} // namespace OHOS +} // namespace Wifi +} // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.h b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.h index cb9dece..6417d64 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.h @@ -1183,6 +1183,6 @@ private: WifiConfigFileImpl mSavedWifiStoreRandomMac; bool explicitGroup; }; -} // namespace Wifi -} // namespace OHOS +} // namespace Wifi +} // namespace OHOS #endif diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.cpp index 8d74ca4..243c7b0 100755 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.cpp @@ -167,6 +167,6 @@ int32_t WifiDecryption(const WifiEncryptionInfo &wifiEncryptionInfo, const Encry HksFreeParamSet(&decryParamSet); return ret; } -} // namespace Wifi -} // namespace OHOS +} // namespace Wifi +} // namespace OHOS #endif \ No newline at end of file -- Gitee From 99a118ad03797d7e179c836912d9f1a60154d27b Mon Sep 17 00:00:00 2001 From: fengye Date: Fri, 23 Sep 2022 02:44:47 +0000 Subject: [PATCH 377/491] modified output Signed-off-by: fengye --- .../wifi_toolkit/config/wifi_config_file_spec.cpp | 2 +- .../wifi_framework/wifi_toolkit/config/wifi_settings.cpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.cpp index 3701604..3918d90 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.cpp @@ -125,7 +125,7 @@ static int SetWifiDeviceConfigOutDated(WifiDeviceConfig &item, const std::string static int SetWifiDeviceConfigFirst(WifiDeviceConfig &item, const std::string &key, const std::string &value) { if(SetWifiDeviceConfigOutDated(item, key, value) == 0) { - return 0 + return 0; } if (key == "networkId") { item.networkId = std::stoi(value); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp index c35e076..39c3e46 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp @@ -463,7 +463,6 @@ int WifiSettings::increaseNumRebootsSinceLastUse() } std::unique_lock lock(mConfigMutex); - bool found = false; for (auto iter = mWifiDeviceConfig.begin(); iter != mWifiDeviceConfig.end(); iter++) { iter->second.numRebootsSinceLastUse++; } -- Gitee From 9d40150ad692705420c04dc8f2ed9749406de141 Mon Sep 17 00:00:00 2001 From: fengye Date: Fri, 23 Sep 2022 02:46:24 +0000 Subject: [PATCH 378/491] modified output Signed-off-by: fengye --- .../wifi_toolkit/config/wifi_config_file_spec.cpp | 2 +- .../wifi_framework/wifi_toolkit/config/wifi_settings.cpp | 4 ++-- .../wifi_framework/wifi_toolkit/config/wifi_settings.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.cpp index 3918d90..d739895 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.cpp @@ -124,7 +124,7 @@ static int SetWifiDeviceConfigOutDated(WifiDeviceConfig &item, const std::string static int SetWifiDeviceConfigFirst(WifiDeviceConfig &item, const std::string &key, const std::string &value) { - if(SetWifiDeviceConfigOutDated(item, key, value) == 0) { + if (SetWifiDeviceConfigOutDated(item, key, value) == 0) { return 0; } if (key == "networkId") { diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp index 39c3e46..b9ec721 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp @@ -145,7 +145,7 @@ int WifiSettings::Init() #ifdef FEATURE_ENCRYPTION_SUPPORT SetUpHks(); #endif - increaseNumRebootsSinceLastUse(); + IncreaseNumRebootsSinceLastUse(); return 0; } @@ -455,7 +455,7 @@ int WifiSettings::GetWifiP2pGroupInfo(std::vector &groups) return 0; } -int WifiSettings::increaseNumRebootsSinceLastUse() +int WifiSettings::IncreaseNumRebootsSinceLastUse() { if (!deviceConfigLoadFlag.test_and_set()) { LOGE("Reload wifi config"); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.h b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.h index 6417d64..f64ee8a 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.h @@ -287,7 +287,7 @@ public: * * @return int - 0 success; -1 save file failed */ - int increaseNumRebootsSinceLastUse(); + int IncreaseNumRebootsSinceLastUse(); /** * @Description Remove excess networks in case the number of saved networks exceeds the mas limit * -- Gitee From 461b275362d17968562ba047df84e2b657d49006 Mon Sep 17 00:00:00 2001 From: z00588131 Date: Fri, 23 Sep 2022 07:32:39 +0000 Subject: [PATCH 379/491] fix auto start fail issue Signed-off-by: z00588131 --- .../wifi_manage/wifi_manager.cpp | 41 ++++++++++--------- .../wifi_framework/wifi_manage/wifi_manager.h | 5 +-- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp index c0a0b8b..3c812dd 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp @@ -14,26 +14,25 @@ */ #include "wifi_manager.h" -#include "wifi_global_func.h" -#include "wifi_logger.h" -#include "wifi_sta_hal_interface.h" -#include "wifi_chip_hal_interface.h" +#include #include "wifi_auth_center.h" +#include "wifi_chip_hal_interface.h" +#include "wifi_common_event_helper.h" #include "wifi_config_center.h" +#include "wifi_global_func.h" +#include "wifi_logger.h" #ifdef OHOS_ARCH_LITE -#include #include "wifi_internal_event_dispatcher_lite.h" #else #include "wifi_internal_event_dispatcher.h" #endif +#include "wifi_sta_hal_interface.h" #include "wifi_service_manager.h" #include "wifi_settings.h" -#include "wifi_common_event_helper.h" - -DEFINE_WIFILOG_LABEL("WifiManager"); namespace OHOS { namespace Wifi { +DEFINE_WIFILOG_LABEL("WifiManager"); int WifiManager::mCloseApIndex = 0; WifiManager &WifiManager::GetInstance() { @@ -59,6 +58,7 @@ WifiManager::~WifiManager() void WifiManager::AutoStartStaService(void) { + WIFI_LOGI("AutoStartStaService"); WifiOprMidState staState = WifiConfigCenter::GetInstance().GetWifiMidState(); if (staState == WifiOprMidState::CLOSED) { if (!WifiConfigCenter::GetInstance().SetWifiMidState(staState, WifiOprMidState::OPENING)) { @@ -110,8 +110,7 @@ void WifiManager::ForceStopWifi(void) WifiConfigCenter::GetInstance().SetWifiMidState(curState, WifiOprMidState::CLOSED); } -#ifdef OHOS_ARCH_LITE -void WifiManager::AutoStartStaServiceThread(void) +void WifiManager::CheckAndStartSta(void) { DIR *dir = nullptr; struct dirent *dent = nullptr; @@ -141,7 +140,15 @@ void WifiManager::AutoStartStaServiceThread(void) closedir(dir); AutoStartStaService(); } + +void WifiManager::AutoStartServiceThread(void) +{ + WIFI_LOGI("Auto start service..."); + CheckAndStartSta(); +#ifdef FEATURE_P2P_SUPPORT + AutoStartP2pService(); #endif +} #ifdef FEATURE_P2P_SUPPORT WifiCfgMonitorEventCallback WifiManager::cfgMonitorCallback = { @@ -150,6 +157,7 @@ WifiCfgMonitorEventCallback WifiManager::cfgMonitorCallback = { void WifiManager::AutoStartP2pService(void) { + WIFI_LOGI("AutoStartP2pService"); WifiOprMidState p2pState = WifiConfigCenter::GetInstance().GetP2pMidState(); if (p2pState == WifiOprMidState::CLOSED) { if (!WifiConfigCenter::GetInstance().SetP2pMidState(p2pState, WifiOprMidState::OPENING)) { @@ -189,6 +197,7 @@ void WifiManager::AutoStartP2pService(void) void WifiManager::AutoStartScanService(void) { + WIFI_LOGI("AutoStartScanService"); if (!WifiConfigCenter::GetInstance().IsScanAlwaysActive()) { WIFI_LOGW("Scan always is not open, not open scan service."); return; @@ -246,22 +255,14 @@ int WifiManager::Init() return -1; } if (WifiConfigCenter::GetInstance().GetStaLastRunState()) { /* Automatic startup upon startup */ - WIFI_LOGI("AutoStartSta/P2pService"); -#ifdef OHOS_ARCH_LITE - std::thread startStaSrvThread(WifiManager::AutoStartStaServiceThread); + WIFI_LOGI("AutoStartServiceThread"); + std::thread startStaSrvThread(WifiManager::AutoStartServiceThread); startStaSrvThread.detach(); -#else - AutoStartStaService(); -#ifdef FEATURE_P2P_SUPPORT - AutoStartP2pService(); -#endif -#endif } else { /** * The sta service automatically starts upon startup. After the sta * service is started, the scanning is directly started. */ - WIFI_LOGI("AutoStartScanService"); AutoStartScanService(); } return 0; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.h index 9a5892a..3eb7b34 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.h @@ -191,9 +191,8 @@ private: static void AutoStartP2pService(void); #endif static void AutoStartScanService(void); -#ifdef OHOS_ARCH_LITE - static void AutoStartStaServiceThread(void); -#endif + static void CheckAndStartSta(void); + static void AutoStartServiceThread(void); private: std::thread mCloseServiceThread; -- Gitee From 85518f5c6b7116a970398eec964b6f70633b8e65 Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Sat, 24 Sep 2022 02:52:32 +0000 Subject: [PATCH 380/491] remove unused right Signed-off-by: zhangfeng --- wifi/frameworks/js/napi/src/wifi_napi_event.cpp | 3 --- .../wifi_manage/common/wifi_permission_helper.cpp | 4 +--- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/wifi/frameworks/js/napi/src/wifi_napi_event.cpp b/wifi/frameworks/js/napi/src/wifi_napi_event.cpp index 9d82577..5dc8348 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_event.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_event.cpp @@ -44,16 +44,13 @@ const std::string EVENT_P2P_DISCOVERY_CHANGE = "p2pDiscoveryChange"; const std::string EVENT_STREAM_CHANGE = "streamChange"; /* Permissions definition */ -const std::string WIFI_PERMISSION_NULL = "ohos.permission.NULL"; const std::string WIFI_PERMISSION_GET_WIFI_INFO = "ohos.permission.GET_WIFI_INFO"; const std::string WIFI_PERMISSION_SET_WIFI_INFO = "ohos.permission.SET_WIFI_INFO"; const std::string WIFI_PERMISSION_GET_WIFI_CONFIG = "ohos.permission.GET_WIFI_CONFIG"; const std::string WIFI_PERMISSION_MANAGE_WIFI_CONNECTION = "ohos.permission.MANAGE_WIFI_CONNECTION"; const std::string WIFI_PERMISSION_MANAGE_WIFI_HOTSPOT = "ohos.permission.MANAGE_WIFI_HOTSPOT"; -const std::string WIFI_PERMISSION_MANAGE_ENHANCER_WIFI = "ohos.permission.MANAGE_ENHANCER_WIFI"; const std::string WIFI_PERMISSION_GET_WIFI_LOCAL_MAC = "ohos.permission.GET_WIFI_LOCAL_MAC"; const std::string WIFI_PERMISSION_LOCATION = "ohos.permission.LOCATION"; -const std::string WIFI_PERMISSION_GET_P2P_DEVICE_LOCATION = "ohos.permission.GET_P2P_DEVICE_LOCATION"; const std::string WIFI_PERMISSION_GET_WIFI_INFO_INTERNAL = "ohos.permission.GET_WIFI_INFO_INTERNAL"; const int WIFI_NAPI_PERMISSION_DENIED = 0; const int WIFI_NAPI_PERMISSION_GRANTED = 1; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_helper.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_helper.cpp index c4ddd9f..49d23bb 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_helper.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_helper.cpp @@ -34,10 +34,8 @@ static PermissionDef g_wifiPermissions[] = { {"ohos.permission.GET_WIFI_CONFIG", USER_GRANT, NOT_RESTRICTED}, {"ohos.permission.MANAGE_WIFI_CONNECTION", USER_GRANT, NOT_RESTRICTED}, {"ohos.permission.MANAGE_WIFI_HOTSPOT", USER_GRANT, NOT_RESTRICTED}, - {"ohos.permission.MANAGE_ENHANCER_WIFI", USER_GRANT, NOT_RESTRICTED}, {"ohos.permission.GET_WIFI_LOCAL_MAC", USER_GRANT, NOT_RESTRICTED}, {"ohos.permission.LOCATION", USER_GRANT, NOT_RESTRICTED}, - {"ohos.permission.GET_P2P_DEVICE_LOCATION", USER_GRANT, NOT_RESTRICTED}, {"ohos.permission.MANAGE_WIFI_HOTSPOT_EXT", USER_GRANT, NOT_RESTRICTED}, }; @@ -283,4 +281,4 @@ int WifiPermissionHelper::VerifyManageWifiHotspotExtPermission(const int &pid, c return PERMISSION_GRANTED; } } // namespace Wifi -} // namespace OHOS \ No newline at end of file +} // namespace OHOS -- Gitee From 4e154dbc5ffe0716a6a4539d8a2a2850c7ccd3ed Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Mon, 19 Sep 2022 11:40:26 +0000 Subject: [PATCH 381/491] (WiFI)-Adapts to the specification standard of file system Signed-off-by: zhangfeng --- .../wifi_standard/include/wifi_common_def.h | 29 +++++++++++++++++++ .../wifi_framework/wifi_manage/BUILD.gn | 2 ++ .../wifi_manage/idl_client/BUILD.gn | 1 + .../idl_client/wifi_idl_client.cpp | 2 +- .../wifi_manage/wifi_ap/BUILD.gn | 1 + .../wifi_manage/wifi_common/BUILD.gn | 1 + .../wifi_manage/wifi_p2p/BUILD.gn | 1 + .../wifi_manage/wifi_scan/BUILD.gn | 1 + .../wifi_manage/wifi_sta/BUILD.gn | 1 + .../wifi_framework/wifi_toolkit/BUILD.gn | 1 + .../wifi_toolkit/config/wifi_settings.h | 21 +++++++------- wifi/services/wifi_standard/wifi_hal/BUILD.gn | 1 + .../wifi_hal/etc/init/wifi_hal_service.cfg | 8 +++++ wifi/services/wifi_standard/wifi_hal/main.c | 7 +++-- .../wifi_standard/wifi_hal/wifi_hal_adapter.c | 8 +++-- .../wifi_standard/wifi_hal/wifi_hal_define.h | 2 ++ .../hostapd_hal/wifi_hostapd_hal.c | 11 +++---- .../wpa_supplicant_hal/wifi_wpa_hal.c | 13 +++++---- .../wifi_hal/wifi_hal_module_manage.c | 2 +- .../wifi_hal/wifi_hal_p2p_interface.c | 28 +++++++++--------- .../wifi_hal/wifi_hal_sta_interface.c | 18 +++++------- .../wifi_manage/unittest/BUILD.gn | 1 + .../wifi_manage/wifi_ap/BUILD.gn | 1 + .../wifi_manage/wifi_p2p/test/BUILD.gn | 1 + .../wifi_manage/wifi_scan/BUILD.gn | 1 + .../wifi_manage/wifi_sta/BUILD.gn | 1 + .../wifi_toolkit/unittest/BUILD.gn | 1 + .../wifi_standard/wifi_hal/unittest/BUILD.gn | 1 + 28 files changed, 114 insertions(+), 52 deletions(-) create mode 100644 wifi/services/wifi_standard/include/wifi_common_def.h diff --git a/wifi/services/wifi_standard/include/wifi_common_def.h b/wifi/services/wifi_standard/include/wifi_common_def.h new file mode 100644 index 0000000..5418b32 --- /dev/null +++ b/wifi/services/wifi_standard/include/wifi_common_def.h @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OHOS_WIFI_COMMON_DEF_H +#define OHOS_WIFI_COMMON_DEF_H + +#ifdef __cplusplus +extern "C" { +#endif + +#define CONFIG_ROOR_DIR "/data/service/el1/public/wifi" + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn index 62f97cb..586e826 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn @@ -68,6 +68,7 @@ if (defined(ohos_lite)) { "//foundation/systemabilitymgr/samgr_lite/interfaces/innerkits/registry", "//foundation/systemabilitymgr/samgr_lite/interfaces/innerkits/samgr", "//third_party/bounds_checking_function/include", + "$WIFI_ROOT_DIR/services/wifi_standard/include", ] deps = [ @@ -177,6 +178,7 @@ if (defined(ohos_lite)) { "//base/security/access_token/interfaces/innerkits/accesstoken/include", "//foundation/communication/netmanager_base/frameworks/native/netmanagernative", "//foundation/communication/netmanager_base/interfaces/innerkits/netmanagernative/include", + "$WIFI_ROOT_DIR/services/wifi_standard/include", ] } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/BUILD.gn index 687b6ac..5dbcea7 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/BUILD.gn @@ -32,6 +32,7 @@ config("wifi_fw_common_header") { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/utils", "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/interface", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client", + "$WIFI_ROOT_DIR/services/wifi_standard/include", ] if (defined(ohos_lite)) { include_dirs += [ diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp index 9dc16c9..3f6a65e 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp @@ -56,7 +56,7 @@ WifiIdlClient::~WifiIdlClient() int WifiIdlClient::InitClient(void) { - const std::string idlSockPath = "/data/misc/wifi/unix_sock.sock"; + const std::string idlSockPath = CONFIG_ROOR_DIR"/unix_sock.sock"; pRpcClient = CreateRpcClient(idlSockPath.c_str()); if (pRpcClient == nullptr) { LOGE("init rpc client failed!"); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn index e808bca..499d77c 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn @@ -56,6 +56,7 @@ ohos_shared_library("wifi_ap_service") { "$DHCP_ROOT_DIR/interfaces/inner_api/interfaces", "$WIFI_ROOT_DIR/utils/inc", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_common", + "$WIFI_ROOT_DIR/services/wifi_standard/include", ] cflags_cc = [ diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_common/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_common/BUILD.gn index f15b49e..a00d9f5 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_common/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_common/BUILD.gn @@ -26,6 +26,7 @@ ohos_shared_library("wifi_common_service") { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/config", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/log", "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", + "$WIFI_ROOT_DIR/services/wifi_standard/include", ] sources = [ "wifi_chip_capability.cpp" ] diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/BUILD.gn index 742068e..36a54d1 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/BUILD.gn @@ -85,6 +85,7 @@ ohos_shared_library("wifi_p2p_service") { "$WIFI_ROOT_DIR/utils/inc", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/hid2d", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_common", + "$WIFI_ROOT_DIR/services/wifi_standard/include", ] cflags_cc = [ diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn index 5577271..571543e 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn @@ -47,6 +47,7 @@ local_base_include_dirs = [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/net_conf", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta", + "$WIFI_ROOT_DIR/services/wifi_standard/include", ] if (defined(ohos_lite)) { diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn index f78042b..cecfd77 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn @@ -56,6 +56,7 @@ local_base_include_dirs = [ "$WIFI_ROOT_DIR/utils/inc", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_common", + "$WIFI_ROOT_DIR/services/wifi_standard/include", ] if (defined(ohos_lite)) { diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/BUILD.gn index 766f5f3..ece2b23 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/BUILD.gn @@ -54,6 +54,7 @@ local_base_include_dirs = [ "$DHCP_ROOT_DIR/interfaces/inner_api/include", "$DHCP_ROOT_DIR/services/mgr_service/include", "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", + "$WIFI_ROOT_DIR/services/wifi_standard/include", ] if (defined(ohos_lite)) { diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.h b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.h index ab736ba..547acf4 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -22,6 +22,7 @@ #include #include #include +#include "wifi_common_def.h" #include "wifi_config_file_impl.h" constexpr int RANDOM_STR_LEN = 6; @@ -40,15 +41,15 @@ constexpr int MODE_UPDATE = 2; /* Obtain the scanning result that is valid within 180s. */ constexpr int WIFI_GET_SCAN_INFO_VALID_TIMESTAMP = 180; -constexpr char DEVICE_CONFIG_FILE_PATH[] = "/data/misc/wifi/device_config.conf"; -constexpr char HOTSPOT_CONFIG_FILE_PATH[] = "/data/misc/wifi/hotspot_config.conf"; -constexpr char BLOCK_LIST_FILE_PATH[] = "/data/misc/wifi/block_list.conf"; -constexpr char WIFI_CONFIG_FILE_PATH[] = "/data/misc/wifi/wifi_config.conf"; -constexpr char WIFI_P2P_GROUP_INFO_FILE_PATH[] = "/data/misc/wifi/p2p_groups.conf"; -constexpr char WIFI_P2P_VENDOR_CONFIG_FILE_PATH[] = "/data/misc/wifi/p2p_vendor_config.conf"; -const std::string WIFI_TRUST_LIST_POLICY_FILE_PATH = "/data/misc/wifi/trust_list_polices.conf"; -const std::string WIFI_MOVING_FREEZE_POLICY_FILE_PATH = "/data/misc/wifi/moving_freeze_policy.conf"; -constexpr char WIFI_STA_RANDOM_MAC_FILE_PATH[] = "/data/misc/wifi/sta_randomMac.conf"; +constexpr char DEVICE_CONFIG_FILE_PATH[] = CONFIG_ROOR_DIR"/device_config.conf"; +constexpr char HOTSPOT_CONFIG_FILE_PATH[] = CONFIG_ROOR_DIR"/hotspot_config.conf"; +constexpr char BLOCK_LIST_FILE_PATH[] = CONFIG_ROOR_DIR"/block_list.conf"; +constexpr char WIFI_CONFIG_FILE_PATH[] = CONFIG_ROOR_DIR"/wifi_config.conf"; +constexpr char WIFI_P2P_GROUP_INFO_FILE_PATH[] = CONFIG_ROOR_DIR"/p2p_groups.conf"; +constexpr char WIFI_P2P_VENDOR_CONFIG_FILE_PATH[] = CONFIG_ROOR_DIR"/p2p_vendor_config.conf"; +const std::string WIFI_TRUST_LIST_POLICY_FILE_PATH = CONFIG_ROOR_DIR"/trust_list_polices.conf"; +const std::string WIFI_MOVING_FREEZE_POLICY_FILE_PATH = CONFIG_ROOR_DIR"/moving_freeze_policy.conf"; +constexpr char WIFI_STA_RANDOM_MAC_FILE_PATH[] = CONFIG_ROOR_DIR"/sta_randomMac.conf"; namespace OHOS { namespace Wifi { diff --git a/wifi/services/wifi_standard/wifi_hal/BUILD.gn b/wifi/services/wifi_standard/wifi_hal/BUILD.gn index e3a5138..d6540ca 100644 --- a/wifi/services/wifi_standard/wifi_hal/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_hal/BUILD.gn @@ -60,6 +60,7 @@ local_base_include_dirs = [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/hdi/inc", + "$WIFI_ROOT_DIR/services/wifi_standard/include", ] if (defined(ohos_lite)) { diff --git a/wifi/services/wifi_standard/wifi_hal/etc/init/wifi_hal_service.cfg b/wifi/services/wifi_standard/wifi_hal/etc/init/wifi_hal_service.cfg index 758e2de..764b688 100644 --- a/wifi/services/wifi_standard/wifi_hal/etc/init/wifi_hal_service.cfg +++ b/wifi/services/wifi_standard/wifi_hal/etc/init/wifi_hal_service.cfg @@ -1,4 +1,12 @@ { + "jobs" : [{ + "name" : "early-boot", + "cmds" : [ + "mkdir /data/service/el1/public/wifi 0770 wifi wifi", + "mkdir /data/service/el1/public/wifi/wpa_supplicant 0770 wifi wifi" + ] + } + ], "services" : [{ "name" : "wifi_hal_service", "path" : ["/system/bin/wifi_hal_service"], diff --git a/wifi/services/wifi_standard/wifi_hal/main.c b/wifi/services/wifi_standard/wifi_hal/main.c index fe37513..3a4afc5 100644 --- a/wifi/services/wifi_standard/wifi_hal/main.c +++ b/wifi/services/wifi_standard/wifi_hal/main.c @@ -18,13 +18,14 @@ #include #include #include "server.h" -#include "wifi_log.h" +#include "wifi_common_def.h" #include "wifi_hal_adapter.h" #include "wifi_hal_ap_interface.h" #include "wifi_hal_crpc_server.h" -#include "wifi_hal_sta_interface.h" #include "wifi_hal_p2p_interface.h" +#include "wifi_hal_sta_interface.h" #include "wifi_hostapd_hal.h" +#include "wifi_log.h" #undef LOG_TAG #define LOG_TAG "WifiHalService" @@ -81,7 +82,7 @@ static void SendStartNotify(void) int main(void) { LOGI("Wifi hal service starting..."); - char rpcSockPath[] = "/data/misc/wifi/unix_sock.sock"; + char rpcSockPath[] = CONFIG_ROOR_DIR"/unix_sock.sock"; if (access(rpcSockPath, 0) == 0) { unlink(rpcSockPath); } diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_adapter.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_adapter.c index a7abcd0..c55d745 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_adapter.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_adapter.c @@ -20,6 +20,7 @@ #include #include #include "securec.h" +#include "wifi_common_def.h" #include "wifi_log.h" #undef LOG_TAG @@ -28,7 +29,7 @@ WifiHalVendorInterface *g_wifiHalVendorInterface = NULL; #define MODULE_NAME_MAX_LEN 256 -#define MODULE_CONFIG_FILE_PATH "/data/misc/wifi/wifi_hal_vendor.conf" +#define MODULE_CONFIG_FILE_PATH CONFIG_ROOR_DIR"/wifi_hal_vendor.conf" #define PATH_NUM 2 #define BUFF_SIZE 256 @@ -158,7 +159,7 @@ int ExcuteCmd(const char *szCmd) int CopyConfigFile(const char* configName) { char buf[BUFF_SIZE] = {0}; - if (snprintf_s(buf, sizeof(buf), sizeof(buf) - 1, "/data/misc/wifi/wpa_supplicant/%s", configName) < 0) { + if (snprintf_s(buf, sizeof(buf), sizeof(buf) - 1, "%s/wpa_supplicant/%s", CONFIG_ROOR_DIR, configName) < 0) { LOGE("snprintf_s dest dir failed."); return HAL_FAILURE; } @@ -174,7 +175,8 @@ int CopyConfigFile(const char* configName) } if (access(path[i], F_OK) != -1) { char cmd[BUFF_SIZE] = {0}; - if (snprintf_s(cmd, sizeof(cmd), sizeof(cmd) - 1, "cp %s /data/misc/wifi/wpa_supplicant/", path[i]) < 0) { + if (snprintf_s(cmd, sizeof(cmd), sizeof(cmd) - 1, + "cp %s %s/wpa_supplicant/", path[i], CONFIG_ROOR_DIR) < 0) { LOGE("snprintf_s cp cmd failed."); return HAL_FAILURE; } diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_define.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_define.h index d5fc765..1e1471b 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_define.h +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_define.h @@ -36,6 +36,8 @@ extern "C" { #define WIFI_P2P_SERVER_NAME_LENGTH 256 #define WIFI_NETWORK_PSK_MAXLEN 64 +#define WPA_SUPPLICANT_NAME "wpa_supplicant" + #define HAL_SUCCESS 0 #define HAL_FAILURE (-1) #define WIFI_HAL_FALSE 0 diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.c index 863dbaf..f5e97ff 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -23,6 +23,7 @@ #include #include "securec.h" #include "common/wpa_ctrl.h" +#include "wifi_common_def.h" #include "wifi_hal_callback.h" #include "wifi_log.h" @@ -34,12 +35,12 @@ */ #define CONFIG_DENY_MAC_FILE_NAME "deny_mac.conf" #define SLEEP_TIME_100_MS (100 * 1000) -#define CONFIG_PATH_DIR "/data/misc/wifi/wpa_supplicant" +#define CONFIG_PATH_DIR CONFIG_ROOR_DIR"/wpa_supplicant" #if (AP_NUM > 1) #define WIFI_5G_CFG "hostapd_0.conf" #define WIFI_2G_CFG "hostapd_1.conf" -#define HOSTAPD_5G_CFG "/data/misc/wifi/wpa_supplicant/"WIFI_5G_CFG -#define HOSTAPD_2G_CFG "/data/misc/wifi/wpa_supplicant/"WIFI_2G_CFG +#define HOSTAPD_5G_CFG CONFIG_ROOR_DIR"/wpa_supplicant/"WIFI_5G_CFG +#define HOSTAPD_2G_CFG CONFIG_ROOR_DIR"/wpa_supplicant/"WIFI_2G_CFG #define HOSTAPD_5G_UDPPORT "127.0.0.1:9866" #define HOSTAPD_2G_UDPPORT "127.0.0.1:9877" @@ -49,7 +50,7 @@ WifiHostapdHalDeviceInfo g_hostapdHalDevInfo[] = { }; #else #define WIFI_DEFAULT_CFG "hostapd.conf" -#define HOSTAPD_DEFAULT_CFG "/data/misc/wifi/wpa_supplicant/"WIFI_DEFAULT_CFG +#define HOSTAPD_DEFAULT_CFG CONFIG_ROOR_DIR"/wpa_supplicant/"WIFI_DEFAULT_CFG #define HOSTAPD_DEFAULT_UDPPORT "127.0.0.1:9877" WifiHostapdHalDeviceInfo g_hostapdHalDevInfo[] = { {AP_2G_MAIN_INSTANCE, NULL, WIFI_DEFAULT_CFG, HOSTAPD_DEFAULT_CFG, HOSTAPD_DEFAULT_UDPPORT} diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c index d5e690e..52ee046 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c @@ -14,18 +14,19 @@ */ #include "wifi_wpa_hal.h" -#include #include +#include #include "securec.h" -#include "wifi_wpa_common.h" #include "utils/common.h" /* request for printf_decode to decode wpa's returned ssid info */ -#include "wifi_hal_common_func.h" +#include "wifi_common_def.h" #include "wifi_hal_callback.h" -#include "wifi_hal_struct.h" +#include "wifi_hal_common_func.h" #include "wifi_hal_p2p_struct.h" +#include "wifi_hal_struct.h" +#include "wifi_log.h" #include "wifi_p2p_hal.h" +#include "wifi_wpa_common.h" -#include "wifi_log.h" #undef LOG_TAG #define LOG_TAG "WifiWpaHal" @@ -758,7 +759,7 @@ static int WpaCliConnect(WifiWpaInterface *p) } int count = WPA_TRY_CONNECT_TIMES; while (count-- > 0) { - int ret = InitWpaCtrl(&p->wpaCtrl, "/data/misc/wifi/sockets/wpa"); + int ret = InitWpaCtrl(&p->wpaCtrl, CONFIG_ROOR_DIR"/sockets/wpa"); if (ret == 0) { LOGI("Global wpa interface connect successfully!"); break; diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module_manage.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module_manage.c index c581541..97d51ae 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module_manage.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module_manage.c @@ -34,7 +34,7 @@ static ModuleInfo *g_halModuleList = NULL; #define STOP_MODULE_TRY_TIMES 30 #define MAX_WPA_MAIN_ARGC_NUM 20 -#define MAX_WPA_MAIN_ARGV_LEN 64 +#define MAX_WPA_MAIN_ARGV_LEN 128 struct StWpaMainParam { int argc; diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_p2p_interface.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_p2p_interface.c index 56b9f40..5667e68 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_p2p_interface.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_p2p_interface.c @@ -14,26 +14,28 @@ */ #include "wifi_hal_p2p_interface.h" -#include "wifi_log.h" -#include "wifi_wpa_hal.h" -#include "wifi_p2p_hal.h" +#include "securec.h" +#include "wifi_common_def.h" +#include "wifi_hal_adapter.h" #include "wifi_hal_callback.h" -#include "wifi_hal_module_manage.h" #include "wifi_hal_common_func.h" -#include "wifi_hal_adapter.h" -#include "securec.h" +#include "wifi_hal_module_manage.h" +#include "wifi_log.h" +#include "wifi_p2p_hal.h" +#include "wifi_wpa_hal.h" #undef LOG_TAG #define LOG_TAG "WifiHalP2pInterface" const int P2P_CONNECT_DELAY_TIME = 100000; -const char *g_wpaSupplicantP2p = "wpa_supplicant"; + #ifdef NON_SEPERATE_P2P -const char *g_systemCmdWpaP2pStart = "wpa_supplicant -iglan0 -g/data/misc/wifi/sockets/wpa" - " -m /data/misc/wifi/wpa_supplicant/p2p_supplicant.conf"; +#define P2P_START_CMD "wpa_supplicant -iglan0 -g"CONFIG_ROOR_DIR"/sockets/wpa"\ + " -m "CONFIG_ROOR_DIR"/wpa_supplicant/p2p_supplicant.conf" #else -const char *g_systemCmdWpaP2pStart = "wpa_supplicant -iglan0 -g/data/misc/wifi/sockets/wpa"; +#define P2P_START_CMD "wpa_supplicant -iglan0 -g"CONFIG_ROOR_DIR"/sockets/wpa" #endif + static int g_p2pSupplicantConnectEvent = 0; static WifiErrorNo P2pStartSupplicant(void) @@ -42,7 +44,7 @@ static WifiErrorNo P2pStartSupplicant(void) if (CopyConfigFile("p2p_supplicant.conf") != 0) { return WIFI_HAL_FAILED; } - ModuleManageRetCode ret = StartModule(g_wpaSupplicantP2p, g_systemCmdWpaP2pStart); + ModuleManageRetCode ret = StartModule(WPA_SUPPLICANT_NAME, P2P_START_CMD); if (ret == MM_SUCCESS) { return WIFI_HAL_SUCCESS; } @@ -62,7 +64,7 @@ static WifiErrorNo P2pConnectSupplicant(void) static WifiErrorNo P2pStopSupplicant(void) { - ModuleManageRetCode ret = StopModule(g_wpaSupplicantP2p); + ModuleManageRetCode ret = StopModule(WPA_SUPPLICANT_NAME); if (ret == MM_FAILED) { LOGE("stop p2p_wpa_supplicant failed!"); return WIFI_HAL_FAILED; @@ -123,7 +125,7 @@ static WifiErrorNo AddP2pIface(void) #else if (strcpy_s(argv.name, sizeof(argv.name), "p2p0") != EOK || #endif - strcpy_s(argv.confName, sizeof(argv.confName), "/data/misc/wifi/wpa_supplicant/p2p_supplicant.conf") != EOK) { + strcpy_s(argv.confName, sizeof(argv.confName), CONFIG_ROOR_DIR"/wpa_supplicant/p2p_supplicant.conf") != EOK) { return WIFI_HAL_FAILED; } #ifdef NON_SEPERATE_P2P diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c index ac161d2..38be689 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c @@ -15,6 +15,7 @@ #include "wifi_hal_sta_interface.h" #include "securec.h" +#include "wifi_common_def.h" #include "wifi_hal_adapter.h" #include "wifi_hal_module_manage.h" #ifdef HDI_INTERFACE_SUPPORT @@ -30,12 +31,11 @@ #define WPA_CMD_STOP_LENG 64 #define WPA_TERMINATE_SLEEP_TIME (50 * 1000) /* 50ms */ -static const char *g_serviceName = "wpa_supplicant"; #ifdef NON_SEPERATE_P2P -static const char *g_startCmd = "wpa_supplicant -iglan0 -g/data/misc/wifi/sockets/wpa" - " -m/data/misc/wifi/wpa_supplicant/p2p_supplicant.conf"; +#define START_CMD "wpa_supplicant -iglan0 -g"CONFIG_ROOR_DIR"/sockets/wpa"\ + " -m"CONFIG_ROOR_DIR"/wpa_supplicant/p2p_supplicant.conf" #else -static const char *g_startCmd = "wpa_supplicant -iglan0 -g/data/misc/wifi/sockets/wpa"; +#define START_CMD "wpa_supplicant -iglan0 -g"CONFIG_ROOR_DIR"/sockets/wpa" #endif static WifiErrorNo AddWpaIface(int staNo) @@ -52,12 +52,12 @@ static WifiErrorNo AddWpaIface(int staNo) AddInterfaceArgv argv; if (staNo == 0) { if (strcpy_s(argv.name, sizeof(argv.name), "wlan0") != EOK || strcpy_s(argv.confName, sizeof(argv.confName), - "/data/misc/wifi/wpa_supplicant/wpa_supplicant.conf") != EOK) { + CONFIG_ROOR_DIR"/wpa_supplicant/wpa_supplicant.conf") != EOK) { return WIFI_HAL_FAILED; } } else { if (strcpy_s(argv.name, sizeof(argv.name), "wlan2") != EOK || strcpy_s(argv.confName, sizeof(argv.confName), - "/data/misc/wifi/wpa_supplicant/wpa_supplicant.conf") != EOK) { + CONFIG_ROOR_DIR"/wpa_supplicant/wpa_supplicant.conf") != EOK) { return WIFI_HAL_FAILED; } } @@ -104,7 +104,6 @@ static WifiErrorNo StopWpaAndWpaHal(int staNo) return WIFI_HAL_SUCCESS; } - WifiErrorNo Start(void) { LOGI("Ready to start wifi"); @@ -181,7 +180,7 @@ WifiErrorNo StartSupplicant(void) return WIFI_HAL_FAILED; } #endif - ModuleManageRetCode ret = StartModule(g_serviceName, g_startCmd); + ModuleManageRetCode ret = StartModule(WPA_SUPPLICANT_NAME, START_CMD); if (ret != MM_SUCCESS) { LOGE("start wpa_supplicant failed!"); return WIFI_HAL_FAILED; @@ -202,7 +201,7 @@ WifiErrorNo StopSupplicant(void) LOGE("wpaCliCmdWpaTerminate failed! ret=%{public}d", res); } usleep(WPA_TERMINATE_SLEEP_TIME); - ModuleManageRetCode ret = StopModule(g_serviceName); + ModuleManageRetCode ret = StopModule(WPA_SUPPLICANT_NAME); if (ret == MM_FAILED) { LOGE("stop wpa_supplicant failed!"); return WIFI_HAL_FAILED; @@ -859,4 +858,3 @@ WifiErrorNo SetSuspendMode(bool mode) } return WIFI_HAL_SUCCESS; } - diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn index 0cc64b8..42a5e80 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn @@ -73,6 +73,7 @@ ohos_unittest("manager_unittest") { "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include", "//foundation/communication/netmanager_base/frameworks/native/netmanagernative", "//foundation/communication/netmanager_base/interfaces/innerkits/netmanagernative/include", + "$WIFI_ROOT_DIR/services/wifi_standard/include", ] deps = [ diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn index f77c105..d003cc9 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn @@ -82,6 +82,7 @@ ohos_unittest("WifiApServiceTest") { "$DHCP_ROOT_DIR/interfaces/inner_api/interfaces", "//third_party/googletest/googlemock/include", "//third_party/googletest/googletest/include", + "$WIFI_ROOT_DIR/services/wifi_standard/include", ] ldflags = [ "-fPIC", diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn index 7de390d..2ff2fa8 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn @@ -129,6 +129,7 @@ ohos_unittest("wifi_p2p_test") { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/hid2d", "$WIFI_ROOT_DIR/utils/inc", + "$WIFI_ROOT_DIR/services/wifi_standard/include", ] deps = [ diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn index f88b5ce..22ec3a7 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn @@ -77,6 +77,7 @@ ohos_unittest("wifi_scan_unittest") { "$WIFI_ROOT_DIR/services/wifi_standard/depends/include/system/core/libnetutils/include/netutils", "//third_party/googletest/googlemock/include", "//third_party/googletest/googletest/include", + "$WIFI_ROOT_DIR/services/wifi_standard/include", ] deps = [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn index 1c3154c..f748c61 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn @@ -102,6 +102,7 @@ ohos_unittest("wifi_sta_unittest") { "//foundation/ability/ability_lite/interfaces/kits/want_lite/", "$WIFI_ROOT_DIR/utils/inc", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_common", + "$WIFI_ROOT_DIR/services/wifi_standard/include", ] deps = [ diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/BUILD.gn index ed2a44f..cfc67c8 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/BUILD.gn @@ -52,6 +52,7 @@ ohos_unittest("toolkit_unittest") { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/log", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/config", "$WIFI_ROOT_DIR/frameworks/native/interfaces", + "$WIFI_ROOT_DIR/services/wifi_standard/include", ] ldflags = [ diff --git a/wifi/test/wifi_standard/wifi_hal/unittest/BUILD.gn b/wifi/test/wifi_standard/wifi_hal/unittest/BUILD.gn index 3244571..d4b4275 100644 --- a/wifi/test/wifi_standard/wifi_hal/unittest/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_hal/unittest/BUILD.gn @@ -78,6 +78,7 @@ ohos_unittest("wifi_hal_unittest") { "//drivers/peripheral/wlan/interfaces/include", "//drivers/peripheral/wlan/client/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/hdi/inc", + "$WIFI_ROOT_DIR/services/wifi_standard/include", ] deps = [ -- Gitee From 21999a50f028b6c9150c063517d9fa6a2b9090dd Mon Sep 17 00:00:00 2001 From: fengye Date: Sat, 24 Sep 2022 06:45:36 +0000 Subject: [PATCH 382/491] modified output Signed-off-by: fengye --- .../wifi_framework/wifi_toolkit/config/wifi_settings.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp index b9ec721..53e5b8b 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp @@ -457,11 +457,6 @@ int WifiSettings::GetWifiP2pGroupInfo(std::vector &groups) int WifiSettings::IncreaseNumRebootsSinceLastUse() { - if (!deviceConfigLoadFlag.test_and_set()) { - LOGE("Reload wifi config"); - ReloadDeviceConfig(); - } - std::unique_lock lock(mConfigMutex); for (auto iter = mWifiDeviceConfig.begin(); iter != mWifiDeviceConfig.end(); iter++) { iter->second.numRebootsSinceLastUse++; -- Gitee From bef589296d0db2257c7516b36b0ffe24fabf71ec Mon Sep 17 00:00:00 2001 From: fengye Date: Sat, 24 Sep 2022 07:08:01 +0000 Subject: [PATCH 383/491] modified output Signed-off-by: fengye --- .../wifi_framework/wifi_toolkit/config/wifi_settings.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp index 53e5b8b..873af99 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp @@ -370,14 +370,13 @@ int WifiSettings::SetDeviceState(int networkId, int state, bool bSetOther) int WifiSettings::SetDeviceAfterConnect(int networkId) { - time_t timeNow; - time(&timeNow); std::unique_lock lock(mConfigMutex); auto iter = mWifiDeviceConfig.find(networkId); if (iter == mWifiDeviceConfig.end()) { return -1; } - iter->second.lastConnectTime = timeNow; + LOGI("Set Device After Connect"); + iter->second.lastConnectTime = time(0); iter->second.numRebootsSinceLastUse = 0; iter->second.numAssociation++; return 0; @@ -474,6 +473,7 @@ int WifiSettings::RemoveExcessDeviceConfigs(std::vector &confi if (numExcessNetworks <= 0) { return 1; } + LOGI("Remove %d configs", numExcessNetworks); sort(configs.begin(), configs.end(), [](WifiDeviceConfig a, WifiDeviceConfig b) { if (a.status != b.status) { return (a.status == 0) < (b.status == 0); -- Gitee From 0235fb05f7081b4b821a6a5c9861ec3f3640bcb1 Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Sat, 24 Sep 2022 07:59:03 +0000 Subject: [PATCH 384/491] sandbox modify for dhcp Signed-off-by: zhangfeng Change-Id: I8dd88a8d966cb4650339342da9dd13581b2e4222 --- .../inner_api/include/dhcp_define.h | 8 ++++---- .../dhcp_client/include/dhcp_client.h | 2 +- dhcp/services/dhcp_server/BUILD.gn | 3 +-- .../dhcp_server/include/dhcp_define.h | 20 +++++++------------ dhcp/services/dhcp_server/src/dhcp_argument.c | 2 +- .../dhcp_server/unittest/system_func_mock.h | 4 +--- .../wifi_standard/etc/init/wifi_standard.cfg | 2 +- 7 files changed, 16 insertions(+), 25 deletions(-) diff --git a/dhcp/interfaces/inner_api/include/dhcp_define.h b/dhcp/interfaces/inner_api/include/dhcp_define.h index e91a393..a666a2b 100644 --- a/dhcp/interfaces/inner_api/include/dhcp_define.h +++ b/dhcp/interfaces/inner_api/include/dhcp_define.h @@ -64,7 +64,7 @@ const std::string INVALID_STRING("*"); const std::string EVENT_DATA_DELIMITER(","); const std::string EVENT_DATA_IPV4("ipv4"); const std::string EVENT_DATA_IPV6("ipv6"); -const std::string DHCP_WORK_DIR("/data/dhcp/"); +const std::string DHCP_WORK_DIR("/data/service/el1/public/dhcp/"); const std::string DHCP_CLIENT_PID_FILETYPE(".pid"); const std::string DHCP_RESULT_FILETYPE(".result"); #ifdef OHOS_ARCH_LITE @@ -74,9 +74,9 @@ const std::string DHCP_SERVER_FILE("/bin/dhcp_server"); const std::string DHCP_CLIENT_FILE("/system/bin/dhcp_client_service"); const std::string DHCP_SERVER_FILE("/system/bin/dhcp_server"); #endif -const std::string DHCP_SERVER_CONFIG_FILE("/data/dhcp/etc/dhcpd.conf"); -const std::string DHCP_SERVER_CONFIG_DIR("/data/dhcp/etc/"); -const std::string DHCP_SERVER_LEASES_FILE("/data/dhcp/dhcpd_lease.lease"); +const std::string DHCP_SERVER_CONFIG_FILE(DHCP_WORK_DIR + "etc/dhcpd.conf"); +const std::string DHCP_SERVER_CONFIG_DIR(DHCP_WORK_DIR + "etc/"); +const std::string DHCP_SERVER_LEASES_FILE(DHCP_WORK_DIR + "dhcpd_lease.lease"); const std::string DHCP_SERVER_CFG_IPV4("#ipv4"); const std::string DHCP_SERVER_CFG_IPV6("#ipv6"); const std::string COMMON_EVENT_DHCP_GET_IPV4 = "usual.event.wifi.dhcp.GET_IPV4"; diff --git a/dhcp/services/dhcp_client/include/dhcp_client.h b/dhcp/services/dhcp_client/include/dhcp_client.h index 2679ba4..9d70482 100644 --- a/dhcp/services/dhcp_client/include/dhcp_client.h +++ b/dhcp/services/dhcp_client/include/dhcp_client.h @@ -23,7 +23,7 @@ extern "C" { #endif -#define WORKDIR "/data/dhcp/" +#define WORKDIR "/data/service/el1/public/dhcp/" #define DHCPC_NAME "dhcp_client_service" #define DHCPC_CONF "dhcp_client_service.conf" #define DHCPC_PID "dhcp_client_service.pid" diff --git a/dhcp/services/dhcp_server/BUILD.gn b/dhcp/services/dhcp_server/BUILD.gn index 936a0c2..85ecd3b 100644 --- a/dhcp/services/dhcp_server/BUILD.gn +++ b/dhcp/services/dhcp_server/BUILD.gn @@ -55,7 +55,6 @@ if (defined(ohos_lite)) { cflags_cc = [ "-fno-rtti" ] defines = [ - "__OHOS__", "_GNU_SOURCE", "OHOS_ARCH_LITE", ] @@ -76,7 +75,7 @@ if (defined(ohos_lite)) { cflags_cc = [ "-fno-rtti" ] - defines = [ "__OHOS__" ] + defines = [] if (dhcp_hilog_enable) { external_deps += [ "hiviewdfx_hilog_native:libhilog" ] defines += [ "DHCP_HILOG_ENABLE" ] diff --git a/dhcp/services/dhcp_server/include/dhcp_define.h b/dhcp/services/dhcp_server/include/dhcp_define.h index f0602b7..e1e40f9 100644 --- a/dhcp/services/dhcp_server/include/dhcp_define.h +++ b/dhcp/services/dhcp_server/include/dhcp_define.h @@ -31,19 +31,13 @@ #define DHCP_MAX_PATH_LENGTH 256 #define DHCP_ONE_BYTE_BITS 8 -#ifdef __OHOS__ -#define DHCPD_CONFIG_FILE "/data/dhcp/etc/dhcpd.conf" -#define DHCPD_EXT_CONFIG_PATH "/data/dhcp/etc/dhcpd.d" -#define DHCPD_LOG_PATH "/data/log/dhcpd" -#define DHCPD_LEASE_FILE "/data/dhcp/dhcpd_lease.lease" -#define DHCPD_PID_FILE "/data/dhcp/dhcpd.pid" -#else -#define DHCPD_CONFIG_FILE "/etc/dhcp/dhcpd.conf" -#define DHCPD_EXT_CONFIG_PATH "/etc/dhcp/dhcpd.d" -#define DHCPD_LEASE_FILE "/etc/dhcp/dhcpd_lease.lease" -#define DHCPD_LOG_PATH "/var/log/dhcpd" -#define DHCPD_PID_FILE "/etc/dhcp/dhcpd.pid" -#endif // __OHOS__ +#define DHCP_ROOT "/data/service/el1/public/dhcp/" + +#define DHCPD_CONFIG_FILE DHCP_ROOT"etc/dhcpd.conf" +#define DHCPD_EXT_CONFIG_PATH DHCP_ROOT"etc/dhcpd.d" +#define DHCPD_LEASE_FILE DHCP_ROOT"dhcpd_lease.lease" +#define DHCPD_PID_FILE DHCP_ROOT"dhcpd.pid" + #define DHCPD_VERSION "0.0.1" #define DHCP_SERVER_PORT 67 diff --git a/dhcp/services/dhcp_server/src/dhcp_argument.c b/dhcp/services/dhcp_server/src/dhcp_argument.c index e295951..4ce5d60 100644 --- a/dhcp/services/dhcp_server/src/dhcp_argument.c +++ b/dhcp/services/dhcp_server/src/dhcp_argument.c @@ -166,7 +166,7 @@ void PrintRequiredArguments(void) } printf(".\n\n"); printf("Usage: dhcp_server [options] \n"); - printf("e.g: dhcp_server -i eth0 -c /data/dhcp/dhcp_server.conf \n"); + printf("e.g: dhcp_server -i eth0 -c /data/service/el1/public/dhcp/dhcp_server.conf \n"); printf(" dhcp_server --help \n\n"); } diff --git a/dhcp/test/services/dhcp_server/unittest/system_func_mock.h b/dhcp/test/services/dhcp_server/unittest/system_func_mock.h index 13b6ebf..93e0edd 100644 --- a/dhcp/test/services/dhcp_server/unittest/system_func_mock.h +++ b/dhcp/test/services/dhcp_server/unittest/system_func_mock.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -22,9 +22,7 @@ #include #include -#ifdef __OHOS__ typedef int socklen_t; -#endif // __OHOS__ using ::testing::_; using ::testing::Return; diff --git a/wifi/services/wifi_standard/etc/init/wifi_standard.cfg b/wifi/services/wifi_standard/etc/init/wifi_standard.cfg index e931f7c..031a792 100644 --- a/wifi/services/wifi_standard/etc/init/wifi_standard.cfg +++ b/wifi/services/wifi_standard/etc/init/wifi_standard.cfg @@ -2,7 +2,7 @@ "jobs" : [{ "name" : "services:wifi_manager_service", "cmds" : [ - "mkdir /data/dhcp 0770 dhcp dhcp" + "mkdir /data/service/el1/public/dhcp 0770 dhcp dhcp" ] } ], -- Gitee From b205d3117c82312736763c32868698ccc8bf8e0a Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Mon, 26 Sep 2022 06:25:00 +0000 Subject: [PATCH 385/491] Optimize automatic startup efficiency Signed-off-by: zhangfeng --- .../wifi_framework/wifi_manage/wifi_manager.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp index 3c812dd..38e9b30 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp @@ -118,12 +118,12 @@ void WifiManager::CheckAndStartSta(void) const int sleepTime = 1; const int maxWaitTimes = 30; - dir = opendir("/sys/class/net"); - if (dir == nullptr) { - AutoStartStaService(); - return; - } while (currentWaitTime < maxWaitTimes) { + dir = opendir("/sys/class/net"); + if (dir == nullptr) { + AutoStartStaService(); + return; + } while ((dent = readdir(dir)) != nullptr) { if (dent->d_name[0] == '.') { continue; -- Gitee From 6df0884ad8e4d2e120dbea79d21c8e735f51b308 Mon Sep 17 00:00:00 2001 From: z00588131 Date: Tue, 27 Sep 2022 15:36:18 +0000 Subject: [PATCH 386/491] Correct a writing error Signed-off-by: z00588131 --- .../wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp index 38e9b30..02f336e 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp @@ -134,10 +134,10 @@ void WifiManager::CheckAndStartSta(void) return; } } + closedir(dir); sleep(sleepTime); currentWaitTime++; } - closedir(dir); AutoStartStaService(); } -- Gitee From 2d4bcced90eed3be295522d413a1c1a9702c0a92 Mon Sep 17 00:00:00 2001 From: z00588131 Date: Wed, 28 Sep 2022 01:23:01 +0000 Subject: [PATCH 387/491] Fix compile error for sync code Signed-off-by: z00588131 --- dhcp/test/services/dhcp_server/unittest/system_func_mock.cpp | 3 +-- dhcp/test/services/dhcp_server/unittest/system_func_mock.h | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dhcp/test/services/dhcp_server/unittest/system_func_mock.cpp b/dhcp/test/services/dhcp_server/unittest/system_func_mock.cpp index 1871dbc..ef0340d 100644 --- a/dhcp/test/services/dhcp_server/unittest/system_func_mock.cpp +++ b/dhcp/test/services/dhcp_server/unittest/system_func_mock.cpp @@ -25,7 +25,6 @@ #include #include #include -#include using namespace OHOS::Wifi; @@ -213,4 +212,4 @@ ssize_t sendto(int __fd, const void *__buf, size_t __n, int __flags, struct sock } return SystemFuncMock::GetInstance().sendto(__fd, __buf, __n, __flags, __addr, __addr_len); } -} \ No newline at end of file +} diff --git a/dhcp/test/services/dhcp_server/unittest/system_func_mock.h b/dhcp/test/services/dhcp_server/unittest/system_func_mock.h index 93e0edd..29b044a 100644 --- a/dhcp/test/services/dhcp_server/unittest/system_func_mock.h +++ b/dhcp/test/services/dhcp_server/unittest/system_func_mock.h @@ -22,7 +22,7 @@ #include #include -typedef int socklen_t; +typedef unsigned int socklen_t; using ::testing::_; using ::testing::Return; @@ -51,4 +51,4 @@ private: }; } // namespace Wifi } // namespace OHOS -#endif \ No newline at end of file +#endif -- Gitee From c2c5ce1cca44466d48d44369d42f75306eaaa0e1 Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Thu, 29 Sep 2022 07:31:55 +0000 Subject: [PATCH 388/491] Fix auto connect and scan issue for L1 linux Signed-off-by: zhangfeng Change-Id: Id8fae4bd6290ed13d9adaca903ea79f118798114 --- .../wpa_sta_hal/wifi_supplicant_hal.c | 69 +++++++++++-------- 1 file changed, 42 insertions(+), 27 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c index 61f457a..70e9595 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c @@ -28,12 +28,14 @@ #define LOG_TAG "WifiWpaStaHal" #define FAIL_BUSY 2 -#define SCAN_INFO_NONE 0 -#define SCAN_INFO_ONE 1 -#define SCAN_INFO_TWO 2 -#define SCAN_INFO_THREE 3 -#define SCAN_INFO_FOUR 4 -#define SCAN_INFO_FIVE 5 + +#define COLUMN_INDEX_ZERO 0 +#define COLUMN_INDEX_ONE 1 +#define COLUMN_INDEX_TWO 2 +#define COLUMN_INDEX_THREE 3 +#define COLUMN_INDEX_FOUR 4 +#define COLUMN_INDEX_FIVE 5 + #define FAIL_PBC_OVERLAP_RETUEN 3 #define CMD_BUFFER_SIZE 1024 #define REPLY_BUF_LENGTH (4096 * 10) @@ -570,14 +572,14 @@ static void ListNetworkProcess(WifiNetworkInfo *pcmd, char *tmpBuf, int bufLeng) continue; } tmpBuf[end] = '\0'; - if (i == SCAN_INFO_NONE) { + if (i == COLUMN_INDEX_ZERO) { pcmd->id = atoi(tmpBuf); - } else if (i == SCAN_INFO_ONE) { + } else if (i == COLUMN_INDEX_ONE) { if (strcpy_s(pcmd->ssid, sizeof(pcmd->ssid), tmpBuf + start) != EOK) { break; } printf_decode((u8 *)pcmd->ssid, sizeof(pcmd->ssid), pcmd->ssid); - } else if (i == SCAN_INFO_TWO) { + } else if (i == COLUMN_INDEX_TWO) { if (strcpy_s(pcmd->bssid, sizeof(pcmd->bssid), tmpBuf + start) != EOK) { break; } @@ -756,6 +758,7 @@ static int WpaCliCmdScan(WifiWpaStaInterface *this, const ScanSettings *settings return 0; } +#ifndef OHOS_ARCH_LITE static int ConvertChanToFreqMhz(int channel, int band) { int BAND_FIRST_CH_NUM_24 = 1; @@ -921,9 +924,9 @@ static bool GetChanWidthCenterFreqVht(ScanInfo *pcmd, ScanInfoElem* infoElem) if ((infoElem->content == NULL) || ((unsigned int)infoElem->size < VHT_INFO_SIZE)) { return false; } - int channelType = infoElem->content[SCAN_INFO_NONE] & UINT8_MASK; - int centerFrequencyIndex1 = infoElem->content[SCAN_INFO_ONE] & UINT8_MASK; - int centerFrequencyIndex2 = infoElem->content[SCAN_INFO_TWO] & UINT8_MASK; + int channelType = infoElem->content[COLUMN_INDEX_ZERO] & UINT8_MASK; + int centerFrequencyIndex1 = infoElem->content[COLUMN_INDEX_ONE] & UINT8_MASK; + int centerFrequencyIndex2 = infoElem->content[COLUMN_INDEX_TWO] & UINT8_MASK; pcmd->channelWidth = GetVhtChanWidth(channelType, centerFrequencyIndex1, centerFrequencyIndex2); if ((unsigned int)pcmd->channelWidth == UNSPECIFIED) { return false; @@ -946,20 +949,20 @@ static bool GetChanWidthCenterFreqHe(ScanInfo *pcmd, ScanInfoElem* infoElem) return false; } char* content = infoElem->content + 1; - bool isVhtInfoExist = (content[SCAN_INFO_ONE] & VHT_OPER_INFO_EXTST_MASK) != 0; - bool is6GhzInfoExist = (content[SCAN_INFO_TWO] & GHZ_HE_INFO_EXIST_MASK_6) != 0; - bool coHostedBssPresent = (content[SCAN_INFO_ONE] & BSS_EXIST_MASK) != 0; - int expectedLen = HE_OPER_BASIC_LEN + (isVhtInfoExist ? SCAN_INFO_THREE : 0) - + (coHostedBssPresent ? 1 : 0) + (is6GhzInfoExist ? SCAN_INFO_FIVE: 0); + bool isVhtInfoExist = (content[COLUMN_INDEX_ONE] & VHT_OPER_INFO_EXTST_MASK) != 0; + bool is6GhzInfoExist = (content[COLUMN_INDEX_TWO] & GHZ_HE_INFO_EXIST_MASK_6) != 0; + bool coHostedBssPresent = (content[COLUMN_INDEX_ONE] & BSS_EXIST_MASK) != 0; + int expectedLen = HE_OPER_BASIC_LEN + (isVhtInfoExist ? COLUMN_INDEX_THREE : 0) + + (coHostedBssPresent ? 1 : 0) + (is6GhzInfoExist ? COLUMN_INDEX_FIVE: 0); if (infoElem->size < expectedLen) { return false; } if (is6GhzInfoExist) { - int startIndx = VHT_OPER_INFO_BEGIN_INDEX + (isVhtInfoExist ? SCAN_INFO_THREE : 0) + int startIndx = VHT_OPER_INFO_BEGIN_INDEX + (isVhtInfoExist ? COLUMN_INDEX_THREE : 0) + (coHostedBssPresent ? 1 : 0); int heChannelWidth = content[startIndx + 1] & GHZ_HE_WIDTH_MASK_6; - int centerSegFreq0 = content[startIndx + SCAN_INFO_TWO] & UINT8_MASK; - int centerSegFreq1 = content[startIndx + SCAN_INFO_THREE] & UINT8_MASK; + int centerSegFreq0 = content[startIndx + COLUMN_INDEX_TWO] & UINT8_MASK; + int centerSegFreq1 = content[startIndx + COLUMN_INDEX_THREE] & UINT8_MASK; pcmd->channelWidth = GetHeChanWidth(heChannelWidth, centerSegFreq0, centerSegFreq1); pcmd->centerFrequency0 = GetHeCentFreq(centerSegFreq0); pcmd->centerFrequency1 = GetHeCentFreq(centerSegFreq1); @@ -1080,10 +1083,11 @@ static void GetInfoElems(int length, int end, char *srcBuf, ScanInfo *pcmd) pcmd->ieSize = infoElemsSize; return; } +#endif static int DelScanInfoLine(ScanInfo *pcmd, char *srcBuf, int length) { - int i = 0; + int columnIndex = 0; int start = 0; int end = 0; int fail = 0; @@ -1093,21 +1097,31 @@ static int DelScanInfoLine(ScanInfo *pcmd, char *srcBuf, int length) continue; } srcBuf[end] = '\0'; - if (i == 0) { + if (columnIndex == COLUMN_INDEX_ZERO) { if (strcpy_s(pcmd->bssid, sizeof(pcmd->bssid), srcBuf + start) != EOK) { fail = 1; break; } - } else if (i == 1) { + } else if (columnIndex == COLUMN_INDEX_ONE) { pcmd->freq = atoi(srcBuf + start); - } else if (i == SCAN_INFO_TWO) { + } else if (columnIndex == COLUMN_INDEX_TWO) { pcmd->siglv = atoi(srcBuf + start); - } else if (i == SCAN_INFO_THREE) { + } else if (columnIndex == COLUMN_INDEX_THREE) { if (strcpy_s(pcmd->flags, sizeof(pcmd->flags), srcBuf + start) != EOK) { fail = 1; break; } - } else if (i == SCAN_INFO_FOUR) { +#ifdef OHOS_ARCH_LITE // The wpa of arch lite don't return "informationElements". + start = end + 1; + if (strcpy_s(pcmd->ssid, sizeof(pcmd->ssid), srcBuf + start) != EOK) { + fail = 1; + break; + } + printf_decode((u8 *)pcmd->ssid, sizeof(pcmd->ssid), pcmd->ssid); + start = length; + break; +#else + } else if (columnIndex == COLUMN_INDEX_FOUR) { if (strcpy_s(pcmd->ssid, sizeof(pcmd->ssid), srcBuf + start) != EOK) { fail = 1; break; @@ -1116,8 +1130,9 @@ static int DelScanInfoLine(ScanInfo *pcmd, char *srcBuf, int length) GetInfoElems(length, end, srcBuf, pcmd); start = length; break; +#endif } - ++i; + ++columnIndex; ++end; start = end; } -- Gitee From 0e87a6e455ba991aec5b3e321c2dc3aa464e7fdf Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Fri, 30 Sep 2022 04:46:27 +0000 Subject: [PATCH 389/491] Fix the message processing thread is not woken up issue Signed-off-by: zhangfeng Change-Id: Ic359c9a74164e4849c2b327471fc86b5422a9729 --- .../wifi_manage/common/handler.cpp | 4 +- .../wifi_manage/common/message_queue.cpp | 44 ++++++++++++------- .../wifi_manage/common/message_queue.h | 8 ++++ 3 files changed, 38 insertions(+), 18 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/handler.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/handler.cpp index ef1a2d7..3cd0100 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/handler.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/handler.cpp @@ -94,10 +94,10 @@ void Handler::GetAndDistributeMessage() while (isRunning) { InternalMessage *msg = pMyQueue->GetNextMessage(); if (msg == nullptr) { - LOGE("GetNextMessage failed.\n"); + LOGE("GetNextMessage null.\n"); continue; } - + LOGI("Handler get message: %{public}d\n", msg->GetMessageName()); DistributeMessage(msg); MessageManage::GetInstance().ReclaimMsg(msg); } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.cpp index 09ec3a5..5d0d730 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.cpp @@ -24,7 +24,7 @@ namespace OHOS { namespace Wifi { -MessageQueue::MessageQueue() : pMessageQueue(nullptr), mIsBlocked(false), mNeedQuit(false) +MessageQueue::MessageQueue() : pMessageQueue(nullptr), mIsBlocked(false), mNeedQuit(false), mWakeup(false) { LOGI("MessageQueue::MessageQueue"); } @@ -44,14 +44,18 @@ MessageQueue::~MessageQueue() return; } +bool MessageQueue::WakeupOrKeepOriginalValue() +{ + return mIsBlocked ? mIsBlocked : mWakeup; +} + bool MessageQueue::AddMessageToQueue(InternalMessage *message, int64_t handleTime) { - LOGI("MessageQueue::AddMessageToQueue"); if (message == nullptr) { LOGE("message is null."); return false; } - + LOGI("MessageQueue::AddMessageToQueue: %{public}d", message->GetMessageName()); if (mNeedQuit) { MessageManage::GetInstance().ReclaimMsg(message); LOGE("Already quit the message queue."); @@ -59,7 +63,6 @@ bool MessageQueue::AddMessageToQueue(InternalMessage *message, int64_t handleTim } message->SetHandleTime(handleTime); - bool needWake = false; /* * If the queue is empty, the current message needs to be executed * immediately, or the execution time is earlier than the queue header, the @@ -72,11 +75,15 @@ bool MessageQueue::AddMessageToQueue(InternalMessage *message, int64_t handleTim if (pTop == nullptr || handleTime == 0 || handleTime < pTop->GetHandleTime()) { message->SetNextMsg(pTop); pMessageQueue = message; - needWake = mIsBlocked; - /* Inserts messages in the middle of the queue based on the execution time. */ + mWakeup = WakeupOrKeepOriginalValue(); } else { InternalMessage *pPrev = nullptr; InternalMessage *pCurrent = pTop; + /* If the inserted message is executed earlier(In the head position), the thread needs to be awakened */ + if (handleTime <= pTop->GetHandleTime()) { + mWakeup = WakeupOrKeepOriginalValue(); + } + /* Inserts messages in the middle of the queue based on the execution time. */ while (pCurrent != nullptr) { pPrev = pCurrent; pCurrent = pCurrent->GetNextMsg(); @@ -89,8 +96,9 @@ bool MessageQueue::AddMessageToQueue(InternalMessage *message, int64_t handleTim } } + LOGI("Add message needWake: %{public}d", static_cast(mWakeup.load())); /* Wake up the process. */ - if (needWake) { + if (mWakeup) { mCvQueue.notify_all(); mIsBlocked = false; } @@ -137,22 +145,24 @@ InternalMessage *MessageQueue::GetNextMessage() LOGE("gettimeofday failed."); return nullptr; } + int64_t nowTime = static_cast(curTime.tv_sec) * TIME_USEC_1000 + curTime.tv_usec / TIME_USEC_1000; { - std::unique_lock lck(mMtxQueue); + std::unique_lock lck(mMtxQueue); // Data queue lock InternalMessage *curMsg = pMessageQueue; mIsBlocked = true; if (curMsg != nullptr) { if (nowTime < curMsg->GetHandleTime()) { /* The execution time of the first message is not reached. - The remaining time is blocked here. */ + The remaining time is blocked here. */ nextBlockTime = curMsg->GetHandleTime() - nowTime; } else { - /* Return the first message. */ + /* Get the message of queue header. */ + mWakeup = false; mIsBlocked = false; pMessageQueue = curMsg->GetNextMsg(); curMsg->SetNextMsg(nullptr); - LOGD("Return first message."); + LOGI("Get queue message: %{public}d", curMsg->GetMessageName()); return curMsg; } } else { @@ -161,14 +171,16 @@ InternalMessage *MessageQueue::GetNextMessage() } } - std::unique_lock lck(mMtxBlock); - if (mIsBlocked && (!mNeedQuit)) { + std::unique_lock lck(mMtxBlock); // mCvQueue lock + if (mIsBlocked && (!mNeedQuit) && (!mWakeup)) { + LOGI("mCvQueue wait_for: %{public}d", nextBlockTime); if (mCvQueue.wait_for(lck, std::chrono::milliseconds(nextBlockTime)) == std::cv_status::timeout) { - LOGD("mCvQueue timeout."); + LOGI("mCvQueue wake up, reason: cv_status::timeout."); } else { - LOGD("Wake up."); + LOGI("mCvQueue is wake up."); } } + mWakeup = false; mIsBlocked = false; } LOGE("Already quit the message queue."); @@ -187,4 +199,4 @@ void MessageQueue::StopQueueLoop() LOGI("Queue loop has stopped."); } } // namespace Wifi -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.h index c957789..bf5a4e1 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.h @@ -70,6 +70,12 @@ public: */ void StopQueueLoop(); +private: + /** + * @Description : Set the mWakeup to true or keep it its original value. + */ + inline bool WakeupOrKeepOriginalValue(); + private: /* Message Queuing */ InternalMessage *pMessageQueue; @@ -77,6 +83,8 @@ private: std::atomic mIsBlocked; /* Exit Loop */ std::atomic mNeedQuit; + /* Wakeup flag, true: to wake up the thread */ + std::atomic mWakeup; /* Thread lock of operation queue */ std::mutex mMtxQueue; /* Blocked thread lock */ -- Gitee From 7efd906e0805a38c93812b8918ef02d6861ce175 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Fri, 30 Sep 2022 15:58:15 +0800 Subject: [PATCH 390/491] add memory optimization 0930 Signed-off-by: yanxiaotao@huawei.com --- .../native/c_adapter/src/wifi_c_device.cpp | 24 ----------------- .../idl_interface/i_wifi_sta_iface.c | 6 +++++ .../wifi_manage/wifi_scan/scan_service.cpp | 26 ++++++++++++++----- .../wifi_sta/sta_saved_device_appraisal.cpp | 10 +++++-- .../wifi_toolkit/config/wifi_settings.cpp | 2 ++ .../wifi_hal/wifi_hal_crpc_sta.c | 1 + .../wpa_sta_hal/wifi_supplicant_hal.c | 13 +++++++++- wifi/utils/inc/wifi_common_util.h | 18 +++++++++++++ wifi/utils/src/wifi_common_util.cpp | 24 +++++++++++++++++ 9 files changed, 90 insertions(+), 34 deletions(-) diff --git a/wifi/frameworks/native/c_adapter/src/wifi_c_device.cpp b/wifi/frameworks/native/c_adapter/src/wifi_c_device.cpp index e6df333..eb0799d 100644 --- a/wifi/frameworks/native/c_adapter/src/wifi_c_device.cpp +++ b/wifi/frameworks/native/c_adapter/src/wifi_c_device.cpp @@ -24,13 +24,6 @@ DEFINE_WIFILOG_LABEL("WifiCDevice"); -static std::map g_secTypeKeyMgmtMap = { - {WIFI_SEC_TYPE_OPEN, "NONE"}, - {WIFI_SEC_TYPE_WEP, "WEP"}, - {WIFI_SEC_TYPE_PSK, "WPA-PSK"}, - {WIFI_SEC_TYPE_SAE, "SAE"}, -}; - std::unique_ptr wifiDevicePtr = OHOS::Wifi::WifiDevice::GetInstance(WIFI_DEVICE_ABILITY_ID); std::unique_ptr wifiScanPtr = OHOS::Wifi::WifiScan::GetInstance(WIFI_SCAN_ABILITY_ID); @@ -97,23 +90,6 @@ WifiErrorCode GetScanInfoList(WifiScanInfo *result, unsigned int *size) return GetCErrorCode(ret); } -static std::string GetKeyMgmtBySecType(const int securityType) -{ - WifiSecurityType key = WifiSecurityType(securityType); - std::map::const_iterator iter = g_secTypeKeyMgmtMap.find(key); - return iter == g_secTypeKeyMgmtMap.end() ? "NONE" : iter->second; -} - -static int GetSecTypeByKeyMgmt(const std::string& keyMgmt) -{ - for (auto& each : g_secTypeKeyMgmtMap) { - if (each.second == keyMgmt) { - return static_cast(each.first); - } - } - return static_cast(WIFI_SEC_TYPE_OPEN); -} - static void GetStaticIpFromC(const IpConfig& ipConfig, OHOS::Wifi::StaticIpAddress& staticIp) { /* Just IPV4 now */ diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.c b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.c index ef80260..f2ff511 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.c +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.c @@ -457,6 +457,9 @@ WifiErrorNo GetNetworkList(WifiNetworkInfo *infos, int *size) static void GetScanInfoElems(Context *context, ScanInfo* scanInfo) { ReadInt(context, &scanInfo->ieSize); + if (scanInfo->ieSize <= 0) { + return; + } /* This pointer will be released in its client */ scanInfo->infoElems = (ScanInfoElem *)calloc(scanInfo->ieSize, sizeof(ScanInfoElem)); if (scanInfo->infoElems == NULL) { @@ -465,6 +468,9 @@ static void GetScanInfoElems(Context *context, ScanInfo* scanInfo) for (int i = 0; i < scanInfo->ieSize; ++i) { ReadInt(context, (int *)&scanInfo->infoElems[i].id); ReadInt(context, &scanInfo->infoElems[i].size); + if (scanInfo->infoElems[i].size <= 0) { + continue; + } /* This pointer will be released in its client */ scanInfo->infoElems[i].content = calloc(scanInfo->infoElems[i].size + 1, sizeof(char)); if (scanInfo->infoElems[i].content == NULL) { diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp index e878058..9a8c520 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp @@ -583,6 +583,9 @@ bool ScanService::StoreFullScanInfo( std::vector storeInfoList; for (auto iter = scanInfoList.begin(); iter != scanInfoList.end(); ++iter) { + if (iter->ssid.empty()) { + continue; + } WifiScanInfo scanInfo; scanInfo.bssid = iter->bssid; scanInfo.ssid = iter->ssid; @@ -609,7 +612,7 @@ bool ScanService::StoreFullScanInfo( bool find = false; for (auto storedIter = storeInfoList.begin(); storedIter != storeInfoList.end(); ++storedIter) { if (iter->bssid == storedIter->bssid) { - find = true; + find = true; break; } } @@ -618,6 +621,7 @@ bool ScanService::StoreFullScanInfo( } } + WIFI_LOGI("Save %{public}d scan results.", (int)(storeInfoList.size())); if (WifiSettings::GetInstance().SaveScanInfoList(storeInfoList) != 0) { WIFI_LOGE("WifiSettings::GetInstance().SaveScanInfoList failed.\n"); return false; @@ -982,8 +986,7 @@ void ScanService::StopSystemScan() void ScanService::StartSystemTimerScan(bool scanAtOnce) { - WIFI_LOGI("Enter ScanService::StartSystemTimerScan."); - + WIFI_LOGI("Enter ScanService::StartSystemTimerScan, scanAtOnce: %{public}d.", scanAtOnce); ErrCode rlt = ApplyScanPolices(ScanType::SCAN_TYPE_SYSTEMTIMER); if (rlt != WIFI_OPT_SUCCESS) { return; @@ -1003,20 +1006,29 @@ void ScanService::StartSystemTimerScan(bool scanAtOnce) * or the time since the last scan is longer than the scan interval. */ int scanTime = SYSTEM_SCAN_INIT_TIME; - WIFI_LOGD("interval:%{public}d", systemScanIntervalMode.scanIntervalMode.interval); if (systemScanIntervalMode.scanIntervalMode.interval > 0) { scanTime = systemScanIntervalMode.scanIntervalMode.interval; } if (scanAtOnce || (lastSystemScanTime == 0) || (sinceLastScan >= systemScanIntervalMode.scanIntervalMode.interval)) { - if (Scan(false) != WIFI_OPT_SUCCESS) { + std::vector deviceConfigs; + if (WifiSettings::GetInstance().GetDeviceConfig(deviceConfigs) == 0 + && deviceConfigs.size() == 0) { + WIFI_LOGW("NO saved configs, system timer scan is not allowed!"); + std::vector results; + /* call GetScanInfoList to clear older scan results */ + int ret = WifiSettings::GetInstance().GetScanInfoList(results); + if (ret != 0) { + WIFI_LOGW("GetScanInfoList return error. \n"); + } + } else if (Scan(false) != WIFI_OPT_SUCCESS) { WIFI_LOGE("Scan failed."); } lastSystemScanTime = nowTime; } else { scanTime = systemScanIntervalMode.scanIntervalMode.interval - sinceLastScan; } - WIFI_LOGI("scanTime: %{public}d, interval:%{public}d, count:%{public}d", + WIFI_LOGI("StartSystemTimerScan, scanTime: %{public}d, interval:%{public}d, count:%{public}d", scanTime, systemScanIntervalMode.scanIntervalMode.interval, systemScanIntervalMode.scanIntervalMode.count); @@ -1340,7 +1352,7 @@ ErrCode ScanService::ApplyTrustListPolicy(ScanType scanType) ErrCode ScanService::ApplyScanPolices(ScanType type) { - LOGI("Enter ScanService::ApplyScanPolices."); + LOGI("Enter ScanService::ApplyScanPolices, type: %{public}d", type); /* Obtains app parameters and scenario status parameters. */ auto appPackageName = WifiSettings::GetInstance().GetAppPackageName(); auto trustListPolicies = WifiSettings::GetInstance().ReloadTrustListPolicies(); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp index b0e3031..c9695ae 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp @@ -55,8 +55,14 @@ ErrCode StaSavedDeviceAppraisal::DeviceAppraisals( } WifiDeviceConfig device; - if (WifiSettings::GetInstance().GetDeviceConfig(scanInfo.bssid, DEVICE_CONFIG_INDEX_BSSID, device) == -1) { - WIFI_LOGI("Skip unsaved Network %{public}s.", scanInfo.ssid.c_str()); /* Skipping Unsaved Networks */ + std::string keymgmt = GetKeyMgmtBySecType((int)scanInfo.securityType); + if (WifiSettings::GetInstance().GetDeviceConfig(scanInfo.ssid, keymgmt, device) == 0) { + WIFI_LOGI("Skip unsaved ssid Network %{public}s.", SsidAnonymize(scanInfo.ssid)); /* Skipping Unsaved Networks */ + continue; + } + + if (device.bssid != scanInfo.bssid) { + WIFI_LOGI("Skip unsaved bssid Network %{public}s.", MacAnonymize(scanInfo.ssid)); /* Skipping Unsaved Networks */ continue; } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp index 0da0ed2..c404167 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp @@ -197,6 +197,8 @@ int WifiSettings::GetScanInfoList(std::vector &results) } results.push_back(*iter); } + /* delete the old scan result */ + mWifiScanInfoList = results; return 0; } diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_sta.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_sta.c index bfc22b9..01ca367 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_sta.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_sta.c @@ -137,6 +137,7 @@ int RpcGetScanInfos(RpcServer *server, Context *context) WriteInt(context, results[i].infoElems[j].size); WriteUStr(context, (unsigned char *)results[i].infoElems[j].content, results[i].infoElems[j].size); free(results[i].infoElems[j].content); + results[i].infoElems[j].content = NULL; } if (results[i].infoElems != NULL) { free(results[i].infoElems); diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c index 70e9595..720259f 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c @@ -1079,8 +1079,19 @@ static void GetInfoElems(int length, int end, char *srcBuf, ScanInfo *pcmd) ++infoElemsSize; } GetChanWidthCenterFreq(pcmd, &iesNeedParse); + /* Do NOT report inforElement to up layer */ + if (infoElemsTemp != NULL) { + for (int i = 0; i < infoElemsSize; i++) { + if (infoElemsTemp[i].content != NULL) { + free(infoElemsTemp[i].content); + infoElemsTemp[i].content = NULL; + } + } + free(infoElemsTemp); + infoElemsTemp = NULL; + } pcmd->infoElems = infoElemsTemp; - pcmd->ieSize = infoElemsSize; + pcmd->ieSize = 0; return; } #endif diff --git a/wifi/utils/inc/wifi_common_util.h b/wifi/utils/inc/wifi_common_util.h index 2afc162..aedf8bd 100644 --- a/wifi/utils/inc/wifi_common_util.h +++ b/wifi/utils/inc/wifi_common_util.h @@ -20,6 +20,7 @@ #include #include #include "securec.h" +#include "wifi_device_config.h" #ifndef WIFI_MAC_LEN #define WIFI_MAC_LEN 6 @@ -27,6 +28,23 @@ namespace OHOS { namespace Wifi { + +/** + * @Description get KeyMgmt by security type. + * + * @param securityType - Input security type + * @return std::string - KeyMgmt + */ +std::string GetKeyMgmtBySecType(const int securityType); + +/** + * @Description get security type by KeyMgmt + * + * @param keyMgmt - KeyMgmt + * @return int - security type + */ +int GetSecTypeByKeyMgmt(const std::string& keyMgmt); + /** * @Description MAC address anonymization * diff --git a/wifi/utils/src/wifi_common_util.cpp b/wifi/utils/src/wifi_common_util.cpp index aebf9e6..926b78b 100644 --- a/wifi/utils/src/wifi_common_util.cpp +++ b/wifi/utils/src/wifi_common_util.cpp @@ -48,6 +48,30 @@ constexpr int MAX_5G_CHANNEL = 165; constexpr int FREQ_CHANNEL_1 = 2412; constexpr int FREQ_CHANNEL_36 = 5180; +static std::map g_secTypeKeyMgmtMap = { + {WIFI_SEC_TYPE_OPEN, "NONE"}, + {WIFI_SEC_TYPE_WEP, "WEP"}, + {WIFI_SEC_TYPE_PSK, "WPA-PSK"}, + {WIFI_SEC_TYPE_SAE, "SAE"}, +}; + +std::string GetKeyMgmtBySecType(const int securityType) +{ + WifiSecurityType key = WifiSecurityType(securityType); + std::map::const_iterator iter = g_secTypeKeyMgmtMap.find(key); + return iter == g_secTypeKeyMgmtMap.end() ? "NONE" : iter->second; +} + +int GetSecTypeByKeyMgmt(const std::string& keyMgmt) +{ + for (auto& each : g_secTypeKeyMgmtMap) { + if (each.second == keyMgmt) { + return static_cast(each.first); + } + } + return static_cast(WIFI_SEC_TYPE_OPEN); +} + static std::string DataAnonymize(const std::string str, const char delim, const char hiddenCh, const int startIdx = 0) { -- Gitee From 9e6ab50921442316e4381ae0ff188a464fe7e55a Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Fri, 30 Sep 2022 16:02:31 +0800 Subject: [PATCH 391/491] add memory optimization 0930 Signed-off-by: yanxiaotao@huawei.com --- .../wifi_sta/sta_saved_device_appraisal.cpp | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp index c9695ae..e630c5a 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp @@ -50,19 +50,15 @@ ErrCode StaSavedDeviceAppraisal::DeviceAppraisals( scanInfoElected.rssi = VALUE_LIMIT_MIN_RSSI; for (auto scanInfo : scanInfos) { - if (scanInfo.bssid.size() == 0) { - continue; - } - WifiDeviceConfig device; std::string keymgmt = GetKeyMgmtBySecType((int)scanInfo.securityType); if (WifiSettings::GetInstance().GetDeviceConfig(scanInfo.ssid, keymgmt, device) == 0) { - WIFI_LOGI("Skip unsaved ssid Network %{public}s.", SsidAnonymize(scanInfo.ssid)); /* Skipping Unsaved Networks */ + WIFI_LOGI("Skip unsaved ssid Network %{public}s.", SsidAnonymize(scanInfo.ssid).c_str()); continue; } if (device.bssid != scanInfo.bssid) { - WIFI_LOGI("Skip unsaved bssid Network %{public}s.", MacAnonymize(scanInfo.ssid)); /* Skipping Unsaved Networks */ + WIFI_LOGI("Skip unsaved bssid Network %{public}s.", MacAnonymize(scanInfo.ssid).c_str()); continue; } @@ -82,7 +78,7 @@ ErrCode StaSavedDeviceAppraisal::DeviceAppraisals( sign = 1; WIFI_LOGI("set highestScore: %{public}d, ssid: %{public}s", highestScore, SsidAnonymize(device.ssid).c_str()); } else { - WIFI_LOGI("The config %{public}s is ignored!\n", scanInfo.ssid.c_str()); + WIFI_LOGI("The config %{public}s is ignored!\n", MacAnonymize(scanInfo.ssid).c_str()); } } if (sign == 1) { @@ -108,17 +104,17 @@ bool StaSavedDeviceAppraisal::WhetherSkipDevice(WifiDeviceConfig &device) { /* Skip this type of device and evaluate it by other appraisals */ if (device.isPasspoint || device.isEphemeral) { - WIFI_LOGI("Skip isPasspoint or isEphemeral Network %{public}s.", device.ssid.c_str()); + WIFI_LOGI("Skip isPasspoint or isEphemeral Network %{public}s.", SsidAnonymize(device.ssid).c_str()); return true; } if (device.status == static_cast(WifiDeviceConfigStatus::DISABLED)) { - WIFI_LOGI("Skip disabled Network %{public}s.", device.ssid.c_str()); + WIFI_LOGI("Skip disabled Network %{public}s.", SsidAnonymize(device.ssid).c_str()); return true; } std::string bssid = WifiSettings::GetInstance().GetConnectTimeoutBssid(); if (!bssid.empty() && bssid == device.bssid) { - WIFI_LOGI("Skip the connect timeout Network %{public}s.", device.ssid.c_str()); + WIFI_LOGI("Skip the connect timeout Network %{public}s.", SsidAnonymize(device.ssid).c_str()); return true; } return false; -- Gitee From 4c7df893392bf392bb458e15b01e2207df911f12 Mon Sep 17 00:00:00 2001 From: shilei Date: Tue, 4 Oct 2022 17:09:59 +0800 Subject: [PATCH 392/491] add Signed-off-by: shilei Change-Id: Ief8a9d0b2587b3a2edc9e514cce2251fd1019c3a --- wifi/application/wifi_direct_demo/entry/src/main/config.json | 1 + 1 file changed, 1 insertion(+) diff --git a/wifi/application/wifi_direct_demo/entry/src/main/config.json b/wifi/application/wifi_direct_demo/entry/src/main/config.json index ad48171..7348386 100644 --- a/wifi/application/wifi_direct_demo/entry/src/main/config.json +++ b/wifi/application/wifi_direct_demo/entry/src/main/config.json @@ -14,6 +14,7 @@ "mainAbility": ".MainAbility", "srcPath": "", "deviceType": [ + "default", "phone", "tablet" ], -- Gitee From bccc270312c3501236399afcb268b69ebff4b00b Mon Sep 17 00:00:00 2001 From: lujunxin Date: Tue, 27 Sep 2022 03:22:39 +0000 Subject: [PATCH 393/491] add napi interface for eap-peap Signed-off-by: lujunxin --- wifi/frameworks/js/napi/inc/wifi_napi_utils.h | 13 +++++ .../js/napi/src/wifi_napi_device.cpp | 54 ++++++++++++++++--- 2 files changed, 59 insertions(+), 8 deletions(-) diff --git a/wifi/frameworks/js/napi/inc/wifi_napi_utils.h b/wifi/frameworks/js/napi/inc/wifi_napi_utils.h index 9ca9c83..e46e325 100644 --- a/wifi/frameworks/js/napi/inc/wifi_napi_utils.h +++ b/wifi/frameworks/js/napi/inc/wifi_napi_utils.h @@ -94,6 +94,19 @@ enum class SecTypeJs { SEC_TYPE_WEP = 2, /* Wired Equivalent Privacy (WEP) */ SEC_TYPE_PSK = 3, /* Pre-shared key (PSK) */ SEC_TYPE_SAE = 4, /* Simultaneous Authentication of Equals (SAE) */ + SEC_TYPE_EAP = 5, /* Extensible Authentication Protocol (EAP) */ +}; + +enum class EapMethodJs { + EAP_NONE = 0, + EAP_PEAP = 1, + EAP_TLS = 2, + EAP_TTLS = 3, + EAP_PWD = 4, + EAP_SIM = 5, + EAP_AKA = 6, + EAP_AKA_PRIME = 7, + EAP_UNAUTH_TLS = 8, }; } // namespace Wifi } // namespace OHOS diff --git a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp index 5e04885..63c1d0b 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp @@ -77,19 +77,18 @@ static SecTypeJs SecurityTypeNativeToJs(const WifiSecurity& cppSecurityType) case WifiSecurity::OPEN: jsSecurityType = SecTypeJs::SEC_TYPE_OPEN; break; - case WifiSecurity::WEP: jsSecurityType = SecTypeJs::SEC_TYPE_WEP; break; - case WifiSecurity::PSK: jsSecurityType = SecTypeJs::SEC_TYPE_PSK; break; - case WifiSecurity::SAE: jsSecurityType = SecTypeJs::SEC_TYPE_SAE; break; - + case WifiSecurity::EAP: + jsSecurityType = SecTypeJs::SEC_TYPE_EAP; + break; default: jsSecurityType = SecTypeJs::SEC_TYPE_INVALID; break; @@ -230,19 +229,18 @@ static void ConvertEncryptionMode(const SecTypeJs& securityType, std::string& ke case SecTypeJs::SEC_TYPE_OPEN: keyMgmt = KEY_MGMT_NONE; break; - case SecTypeJs::SEC_TYPE_WEP: keyMgmt = KEY_MGMT_WEP; break; - case SecTypeJs::SEC_TYPE_PSK: keyMgmt = KEY_MGMT_WPA_PSK; break; - case SecTypeJs::SEC_TYPE_SAE: keyMgmt = KEY_MGMT_SAE; break; - + case SecTypeJs::SEC_TYPE_EAP: + keyMgmt = KEY_MGMT_EAP; + break; default: keyMgmt = KEY_MGMT_NONE; break; @@ -258,6 +256,44 @@ static void ProcessPassphrase(const SecTypeJs& securityType, WifiDeviceConfig& c } } +void ProcessEapPeapConfig(const napi_env& env, const napi_value& object, WifiEapConfig& eapConfig) +{ + // identity, password, phase2Method filed is necessary + eapConfig.eap = EAP_METHOD_PEAP; + JsObjectToString(env, object, "identity", NAPI_MAX_STR_LENT, eapConfig.identity); + JsObjectToString(env, object, "password", NAPI_MAX_STR_LENT, eapConfig.password); + + int phase2 = static_cast(Phase2Method::NONE); + JsObjectToInt(env, object, "phase2Method", phase2); + eapConfig.phase2Method = Phase2Method(phase2); +} + +napi_value ProcessEapConfig(const napi_env& env, const napi_value& object, WifiDeviceConfig& devConfig) +{ + bool hasProperty = false; + + NAPI_CALL(env, napi_has_named_property(env, object, "eapConfig", &hasProperty)); + if (!hasProperty) { + WIFI_LOGI("Js has no property: eapConfig."); + return UndefinedNapiValue(env); + } + + napi_value napiEap; + napi_get_named_property(env, object, "eapConfig", &napiEap); + + int eapMethod = static_cast(EapMethodJs::EAP_NONE); + JsObjectToInt(env, napiEap, "eapMethod", eapMethod); + switch(EapMethodJs(eapMethod)) { + case EapMethodJs::EAP_PEAP: + ProcessEapPeapConfig(env, napiEap, devConfig.wifiEapConfig); + break; + default: + WIFI_LOGE("EapMethod: %{public}d unsupported", eapMethod); + break; + } + return UndefinedNapiValue(env); +} + napi_value ConfigStaticIp(const napi_env& env, const napi_value& object, WifiDeviceConfig& cppConfig) { bool hasProperty = false; @@ -322,6 +358,7 @@ static void JsObjToDeviceConfig(const napi_env& env, const napi_value& object, W cppConfig.wifiIpConfig.assignMethod = AssignIpMethod::STATIC; ConfigStaticIp(env, object, cppConfig); } + (void)ProcessEapConfig(env, object, cppConfig); } napi_value AddDeviceConfig(napi_env env, napi_callback_info info) @@ -862,6 +899,7 @@ static SecTypeJs ConvertKeyMgmtToSecType(const std::string& keyMgmt) {KEY_MGMT_WEP, SecTypeJs::SEC_TYPE_WEP}, {KEY_MGMT_WPA_PSK, SecTypeJs::SEC_TYPE_PSK}, {KEY_MGMT_SAE, SecTypeJs::SEC_TYPE_SAE}, + {KEY_MGMT_EAP, SecTypeJs::SEC_TYPE_EAP}, }; std::map::iterator iter = mapKeyMgmtToSecType.find(keyMgmt); -- Gitee From f5c54234d071497b1956774967fb3cc7ac9cf355 Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Thu, 6 Oct 2022 08:04:14 +0000 Subject: [PATCH 394/491] Wpa stop process optimization Signed-off-by: zhangfeng --- .../wpa_supplicant_hal/wifi_wpa_hal.c | 14 +++++ .../wpa_supplicant_hal/wifi_wpa_hal.h | 2 +- .../wpa_sta_hal/wifi_supplicant_hal.c | 17 ----- .../wpa_sta_hal/wifi_supplicant_hal.h | 1 - .../wifi_hal/wifi_hal_module_manage.c | 62 ++++++++++++++----- .../wifi_hal/wifi_hal_sta_interface.c | 17 +---- 6 files changed, 62 insertions(+), 51 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c index 52ee046..161824b 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c @@ -833,6 +833,7 @@ static int WpaCliRemoveIface(WifiWpaInterface *p, const char *name) if (p == NULL || name == NULL) { return -1; } + LOGI("Remove interface: %{public}s", name); WpaIfaceInfo *prev = NULL; WpaIfaceInfo *info = p->ifaces; while (info != NULL) { @@ -863,6 +864,18 @@ static int WpaCliRemoveIface(WifiWpaInterface *p, const char *name) return 0; } +static int WpaCliWpaTerminate() +{ + LOGI("Enter WpaCliWpaTerminate"); + char cmd[WPA_CMD_BUF_LEN] = {0}; + char buf[WPA_CMD_REPLY_BUF_SMALL_LEN] = {0}; + if (snprintf_s(cmd, sizeof(cmd), sizeof(cmd) - 1, "TERMINATE") < 0) { + LOGE("WpaCliWpaTerminate, snprintf err"); + return -1; + } + return WpaCliCmd(cmd, buf, sizeof(buf)); +} + WifiWpaInterface *GetWifiWapGlobalInterface(void) { if (g_wpaInterface != NULL) { @@ -877,6 +890,7 @@ WifiWpaInterface *GetWifiWapGlobalInterface(void) g_wpaInterface->wpaCliClose = WpaCliClose; g_wpaInterface->wpaCliAddIface = WpaCliAddIface; g_wpaInterface->wpaCliRemoveIface = WpaCliRemoveIface; + g_wpaInterface->wpaCliTerminate = WpaCliWpaTerminate; return g_wpaInterface; } diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.h index 36620fd..e5ca7aa 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.h +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.h @@ -50,9 +50,9 @@ struct stWifiWpaInterface { int (*wpaCliConnect)(WifiWpaInterface *p); void (*wpaCliClose)(WifiWpaInterface *p); - int (*wpaCliAddIface)(WifiWpaInterface *p, const AddInterfaceArgv *argv, bool isWpaAdd); int (*wpaCliRemoveIface)(WifiWpaInterface *p, const char *name); + int (*wpaCliTerminate)(); }; WifiWpaInterface *GetWifiWapGlobalInterface(void); diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c index 70e9595..a12645d 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c @@ -1234,22 +1234,6 @@ static int WpaCliCmdGetSignalInfo(WifiWpaStaInterface *this, WpaSignalInfo *info return 0; } -static int WpaCliCmdWpaTerminate(WifiWpaStaInterface *this) -{ - LOGI("Enter WpaCliCmdWpaTerminate"); - if (this == NULL) { - LOGE("WpaCliCmdWpaTerminate, this is NULL."); - return -1; - } - char cmd[CMD_BUFFER_SIZE] = {0}; - char buf[REPLY_BUF_SMALL_LENGTH] = {0}; - if (snprintf_s(cmd, sizeof(cmd), sizeof(cmd) - 1, "TERMINATE") < 0) { - LOGE("WpaCliCmdWpaTerminate, snprintf err"); - return -1; - } - return WpaCliCmd(cmd, buf, sizeof(buf)); -} - static int WpaCliCmdWpaSetSuspendMode(WifiWpaStaInterface *this, bool mode) { LOGI("Enter WpaCliCmdWpaSetSuspendMode, mode:%{public}d.", mode); @@ -1313,7 +1297,6 @@ WifiWpaStaInterface *GetWifiStaInterface(int staNo) p->wpaCliCmdScan = WpaCliCmdScan; p->wpaCliCmdScanInfo = WpaCliCmdScanInfo; p->wpaCliCmdGetSignalInfo = WpaCliCmdGetSignalInfo; - p->wpaCliCmdWpaTerminate = WpaCliCmdWpaTerminate; p->wpaCliCmdWpaSetSuspendMode = WpaCliCmdWpaSetSuspendMode; p->next = g_wpaStaInterface; g_wpaStaInterface = p; diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.h index 8c65940..0f87341 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.h +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.h @@ -102,7 +102,6 @@ struct WifiWpaStaInterface { int (*wpaCliCmdScan)(WifiWpaStaInterface *p, const ScanSettings *settings); int (*wpaCliCmdScanInfo)(WifiWpaStaInterface *p, ScanInfo *pcmd, int *size); int (*wpaCliCmdGetSignalInfo)(WifiWpaStaInterface *p, WpaSignalInfo *info); - int (*wpaCliCmdWpaTerminate)(WifiWpaStaInterface *p); int (*wpaCliCmdWpaSetSuspendMode)(WifiWpaStaInterface *p, bool mode); }; diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module_manage.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module_manage.c index 97d51ae..7457467 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module_manage.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module_manage.c @@ -23,16 +23,16 @@ #include #include #include +#include "securec.h" #include "wifi_hal_define.h" #include "wifi_log.h" -#include "securec.h" +#include "wifi_wpa_hal.h" #undef LOG_TAG #define LOG_TAG "WifiHalModuleManage" static ModuleInfo *g_halModuleList = NULL; -#define STOP_MODULE_TRY_TIMES 30 #define MAX_WPA_MAIN_ARGC_NUM 20 #define MAX_WPA_MAIN_ARGV_LEN 128 @@ -154,37 +154,65 @@ int StartModuleInternal(const char *moduleName, const char *startCmd, pid_t *pPr return HAL_SUCCESS; } -int StopModuleInternal(const char *moduleName, pid_t processId) +static int StopModuleInternalKillProcess(pid_t processId) +{ + LOGI("Stop module kill process: %{public}d", processId); + if (kill(processId, SIGTERM) == -1) { + if (ESRCH == errno) { + LOGI("kill [%{public}d] success, pid no exist", processId); + return HAL_SUCCESS; + } + LOGE("kill [%{public}d] failed", processId); + return HAL_FAILURE; + } + return HAL_SUCCESS; +} + +static int StopModuleInternalCheckProcess(const char *moduleName, pid_t processId) { if (moduleName == NULL) { return HAL_SUCCESS; } - LOGI("Start stop module internal"); - int tryTimes = STOP_MODULE_TRY_TIMES; + LOGI("Stop module internal check wpa process: %{public}d", processId); + const int STOP_MODULE_TRY_TIMES = 30; const int SLEEP_TIME_US = 1000 * 100; // 100ms + int tryTimes = STOP_MODULE_TRY_TIMES; while (tryTimes-- >= 0) { - if (kill(processId, SIGTERM) == -1) { - if (ESRCH == errno) { - LOGI("kill [%{public}d] success, pid no exist", processId); - return HAL_SUCCESS; - } - LOGE("kill [%{public}d] failed", processId); - return HAL_FAILURE; - } - usleep(SLEEP_TIME_US); int ret = waitpid(processId, NULL, WNOHANG); if (ret <= 0) { - LOGI("Waitpid %{public}d return %{public}d, tryTimes value %{public}d and retry", processId, ret, tryTimes); + LOGI("Waitpid %{public}d ret %{public}d, tryTimes %{public}d and retry", processId, ret, tryTimes); + usleep(SLEEP_TIME_US); continue; } else { - LOGI("waitpid [%{public}d] success", processId); + LOGI("Stop wpa process [%{public}d] success, tryTimes %{public}d", processId, tryTimes); return HAL_SUCCESS; } } - LOGE("stop [%{public}d] failed, cannot send SIGTERM signal to stop process", processId); + LOGE("Stop wpa process [%{public}d] failed for timeout, try to kill process", processId); + StopModuleInternalKillProcess(processId); return HAL_FAILURE; } +static int StopModuleInternalSendTerminate() +{ + WifiWpaInterface *pWpaInterface = GetWifiWapGlobalInterface(); + if (pWpaInterface == NULL) { + LOGE("Get wpa global interface failed!"); + return HAL_FAILURE; + } + int ret = pWpaInterface->wpaCliTerminate(pWpaInterface); + return (ret == 0 ? HAL_SUCCESS : HAL_FAILURE); +} + +int StopModuleInternal(const char *moduleName, pid_t processId) +{ + int ret = StopModuleInternalSendTerminate(); + if (ret != HAL_SUCCESS) { + LOGE("Send terminate failed!"); + } + return StopModuleInternalCheckProcess(moduleName, processId); +} + ModuleInfo *FindModule(const char *moduleName) { if (moduleName == NULL) { diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c index 38be689..a89da77 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c @@ -28,9 +28,6 @@ #undef LOG_TAG #define LOG_TAG "WifiHalStaInterface" -#define WPA_CMD_STOP_LENG 64 -#define WPA_TERMINATE_SLEEP_TIME (50 * 1000) /* 50ms */ - #ifdef NON_SEPERATE_P2P #define START_CMD "wpa_supplicant -iglan0 -g"CONFIG_ROOR_DIR"/sockets/wpa"\ " -m"CONFIG_ROOR_DIR"/wpa_supplicant/p2p_supplicant.conf" @@ -98,9 +95,8 @@ static WifiErrorNo StopWpaAndWpaHal(int staNo) LOGE("wpa_supplicant stop failed!"); return WIFI_HAL_FAILED; } - - LOGI("wpa_supplicant stop successfully"); ReleaseWifiStaInterface(staNo); + LOGI("wpa_supplicant stop successfully"); return WIFI_HAL_SUCCESS; } @@ -191,21 +187,12 @@ WifiErrorNo StartSupplicant(void) WifiErrorNo StopSupplicant(void) { LOGI("Stop supplicant"); - WifiWpaStaInterface *pStaIfc = GetWifiStaInterface(0); - if (pStaIfc == NULL) { - LOGE("Supplicant is NOT inited!"); - return WIFI_HAL_SUPPLICANT_NOT_INIT; - } - int res = pStaIfc->wpaCliCmdWpaTerminate(pStaIfc); - if (res < 0) { - LOGE("wpaCliCmdWpaTerminate failed! ret=%{public}d", res); - } - usleep(WPA_TERMINATE_SLEEP_TIME); ModuleManageRetCode ret = StopModule(WPA_SUPPLICANT_NAME); if (ret == MM_FAILED) { LOGE("stop wpa_supplicant failed!"); return WIFI_HAL_FAILED; } + if (ret == MM_SUCCESS) { ReleaseWpaGlobalInterface(); } -- Gitee From b88d68a1a3ad6f2c1ce7198634c67caad4fd0db1 Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Thu, 6 Oct 2022 09:27:19 +0000 Subject: [PATCH 395/491] Fix wifi_manager_se crash issue Signed-off-by: zhangfeng Change-Id: Ief35408a4ef1edb5faf48761b9f4257b845482e9 --- .../wifi_sta/sta_state_machine.cpp | 31 +++++++++++++------ .../wifi_manage/wifi_sta/sta_state_machine.h | 11 +++++-- 2 files changed, 31 insertions(+), 11 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp index 737ac31..43fe280 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp @@ -34,13 +34,10 @@ #include "mock_dhcp_service.h" #endif -DEFINE_WIFILOG_LABEL("StaStateMachine"); -#define PBC_ANY_BSSID "any" - -const int SLEEPTIME = 3; - namespace OHOS { namespace Wifi { +DEFINE_WIFILOG_LABEL("StaStateMachine"); +#define PBC_ANY_BSSID "any" StaStateMachine::StaStateMachine() : StateMachine("StaStateMachine"), lastNetworkId(INVALID_NETWORK_ID), @@ -660,6 +657,7 @@ int StaStateMachine::InitStaSMHandleMap() staSmHandleFuncMap[WIFI_SVR_CMD_STA_WPA_PASSWD_WRONG_EVENT] = &StaStateMachine::DealWpaLinkFailEvent; staSmHandleFuncMap[WIFI_SVR_CMD_STA_WPA_FULL_CONNECT_EVENT] = &StaStateMachine::DealWpaLinkFailEvent; staSmHandleFuncMap[WIFI_SVR_CMD_STA_WPA_ASSOC_REJECT_EVENT] = &StaStateMachine::DealWpaLinkFailEvent; + staSmHandleFuncMap[CMD_START_NETCHECK] = &StaStateMachine::DealNetworkCheck; return WIFI_OPT_SUCCESS; } @@ -881,6 +879,7 @@ void StaStateMachine::DealDisconnectEvent(InternalMessage *msg) } #endif StopTimer(static_cast(CMD_SIGNAL_POLL)); + StopTimer(static_cast(CMD_START_NETCHECK)); pNetcheck->StopNetCheckThread(); if (currentTpType == IPTYPE_IPV4) { pDhcpService->StopDhcpClient(IF_NAME, false); @@ -2048,6 +2047,21 @@ void StaStateMachine::SetWifiLinkedInfo(int networkId) } } +void StaStateMachine::DealNetworkCheck(InternalMessage *msg) +{ + LOGI("enter DealNetworkCheck.\n"); + if (msg == nullptr) { + LOGE("InternalMessage msg is null."); + return; + } + + if (pNetcheck == nullptr) { + LOGE("pNetcheck is null."); + return; + } + pNetcheck->SignalNetCheckThread(); +} + /* ------------------ state machine dhcp callback function ----------------- */ StaStateMachine::DhcpResultNotify::DhcpResultNotify(StaStateMachine *staStateMachine) @@ -2121,10 +2135,9 @@ void StaStateMachine::DhcpResultNotify::OnSuccess(int status, const std::string pStaStateMachine->SaveLinkstate(ConnState::CONNECTED, DetailedState::CONNECTED); pStaStateMachine->staCallback.OnStaConnChanged( OperateResState::CONNECT_AP_CONNECTED, pStaStateMachine->linkedInfo); - /* Wait for the network adapter information to take effect. */ - sleep(SLEEPTIME); - /* Check whether the Internet access is normal by send http. */ - pStaStateMachine->pNetcheck->SignalNetCheckThread(); + /* Delay to wait for the network adapter information to take effect. */ + constexpr int NETCHECK_DELAY_TIME = 2000; // 2000 ms + pStaStateMachine->StartTimer(static_cast(CMD_START_NETCHECK), NETCHECK_DELAY_TIME); } pStaStateMachine->getIpSucNum++; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h index 449610d..a092da7 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h @@ -41,9 +41,10 @@ constexpr int STA_CAN_ONLY_WITH_WIFI_OFF_MODE = 3; constexpr int STA_DISABLED_MODE = 4; constexpr int CMD_NETWORK_CONNECT_TIMEOUT = 0X01; -constexpr int STA_NETWORK_CONNECTTING_DELAY = 20 * 1000; - constexpr int CMD_SIGNAL_POLL = 0X02; +constexpr int CMD_START_NETCHECK = 0X03; + +constexpr int STA_NETWORK_CONNECTTING_DELAY = 20 * 1000; constexpr int STA_SIGNAL_POLL_DELAY = 3 * 1000; /* pincode length */ @@ -651,6 +652,12 @@ private: * @param deviceKeymgmt - Encryption mode of the current network[in] */ bool ComparedKeymgmt(const std::string scanInfoKeymgmt, const std::string deviceKeymgmt); + /** + * @Description : Deal network check cmd. + * + * @param msg - Message body received by the state machine[in] + */ + void DealNetworkCheck(InternalMessage *msg); private: StaSmHandleFuncMap staSmHandleFuncMap; -- Gitee From 6d50aa7b4b3de241e41bc412ee020dbc6fad2b9c Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Sat, 8 Oct 2022 15:22:00 +0800 Subject: [PATCH 396/491] add memory optimization 1008 Signed-off-by: yanxiaotao@huawei.com --- wifi/frameworks/native/c_adapter/src/wifi_c_device.cpp | 4 ++-- .../wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.c | 4 +++- wifi/utils/inc/wifi_common_util.h | 1 - wifi/utils/src/wifi_common_util.cpp | 1 + 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/wifi/frameworks/native/c_adapter/src/wifi_c_device.cpp b/wifi/frameworks/native/c_adapter/src/wifi_c_device.cpp index eb0799d..870b372 100644 --- a/wifi/frameworks/native/c_adapter/src/wifi_c_device.cpp +++ b/wifi/frameworks/native/c_adapter/src/wifi_c_device.cpp @@ -130,7 +130,7 @@ static void ConvertDeviceConfigFromC(const WifiDeviceConfig *config, OHOS::Wifi: deviceConfig.bssid = OHOS::Wifi::MacArrayToStr(config->bssid); } deviceConfig.preSharedKey = config->preSharedKey; - deviceConfig.keyMgmt = GetKeyMgmtBySecType(config->securityType); + deviceConfig.keyMgmt = OHOS:Wifi:GetKeyMgmtBySecType(config->securityType); deviceConfig.networkId = config->netId; deviceConfig.frequency = config->freq; /* wapiPskType is not support, don't verify now */ @@ -159,7 +159,7 @@ static OHOS::Wifi::ErrCode ConvertDeviceConfigFromCpp(const OHOS::Wifi::WifiDevi if (memcpy_s(result->preSharedKey, WIFI_MAX_KEY_LEN, deviceConfig.preSharedKey.c_str(), WIFI_MAX_KEY_LEN) != EOK) { return OHOS::Wifi::WIFI_OPT_FAILED; } - result->securityType = GetSecTypeByKeyMgmt(deviceConfig.keyMgmt); + result->securityType = OHOS:Wifi:GetSecTypeByKeyMgmt(deviceConfig.keyMgmt); result->netId = deviceConfig.networkId; result->freq = deviceConfig.frequency; /* wapiPskType is not support now */ diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.c b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.c index f2ff511..75d3d6e 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.c +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.c @@ -456,8 +456,10 @@ WifiErrorNo GetNetworkList(WifiNetworkInfo *infos, int *size) static void GetScanInfoElems(Context *context, ScanInfo* scanInfo) { + const unsigned int MAX_INFO_ELEMS_SIZE = 256; ReadInt(context, &scanInfo->ieSize); - if (scanInfo->ieSize <= 0) { + if (scanInfo->ieSize <= 0 || scanInfo->ieSize > MAX_INFO_ELEMS_SIZE) { + LOGE("Invalid ieSize: %{public}d!", scanInfo->ieSize); return; } /* This pointer will be released in its client */ diff --git a/wifi/utils/inc/wifi_common_util.h b/wifi/utils/inc/wifi_common_util.h index aedf8bd..9a52f0d 100644 --- a/wifi/utils/inc/wifi_common_util.h +++ b/wifi/utils/inc/wifi_common_util.h @@ -20,7 +20,6 @@ #include #include #include "securec.h" -#include "wifi_device_config.h" #ifndef WIFI_MAC_LEN #define WIFI_MAC_LEN 6 diff --git a/wifi/utils/src/wifi_common_util.cpp b/wifi/utils/src/wifi_common_util.cpp index 926b78b..759ee80 100644 --- a/wifi/utils/src/wifi_common_util.cpp +++ b/wifi/utils/src/wifi_common_util.cpp @@ -26,6 +26,7 @@ #include "system_ability_definition.h" #endif #include "wifi_logger.h" +#include "wifi_device_config.h" namespace OHOS { namespace Wifi { -- Gitee From bdf89ce2eb3ae42ffd79bf78323760c390a1ca96 Mon Sep 17 00:00:00 2001 From: Zhangfeng Date: Sun, 9 Oct 2022 02:56:29 +0000 Subject: [PATCH 397/491] Resolving YAML Parsing error issue Signed-off-by: zhangfeng --- wifi/hisysevent.yaml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/wifi/hisysevent.yaml b/wifi/hisysevent.yaml index 1bd9fd4..b1f1fb9 100644 --- a/wifi/hisysevent.yaml +++ b/wifi/hisysevent.yaml @@ -15,24 +15,24 @@ domain: COMMUNICATION # Start or stop Wi-Fi switch WIFI_STATE: - __BASE: {type: STATISTIC, level: MINOR, tag: PowerStats, desc: start or stop wifi AP message} - TYPE: {type: STRING, desc: sta or ap} - OPER_TYPE: {type: INT32, desc: operation type, enable or disable} + __BASE: {type: STATISTIC, level: MINOR, tag: PowerStats, desc: Wi-Fi enable or disable event} + TYPE: {type: STRING, desc: Service type} + OPER_TYPE: {type: INT32, desc: Enable(0) or disable(1)} # Connect or disconnect Wi-Fi WIFI_CONNECTION: - __BASE: {type: STATISTIC, level: MINOR, tag: PowerStats, desc: wifi connection or disconnection message} - TYPE: {type: INT32, desc: connect or disconnect operation type} - PACKAGE_NAME: {type: STRING, desc: package name} + __BASE: {type: STATISTIC, level: MINOR, tag: PowerStats, desc: Wi-Fi connection event} + TYPE: {type: INT32, desc: Connect(0) or disconnect(1)} + PACKAGE_NAME: {type: STRING, desc: Package name} # Scans Wi-Fi hotspots WIFI_SCAN: - __BASE: {type: STATISTIC, level: MINOR, tag: PowerStats, desc: wifi scan message} - EXECUTE_RESULT: {type: INT32, desc: wifi scan execute result} - PACKAGE_NAME: {type: STRING, desc: package name} + __BASE: {type: STATISTIC, level: MINOR, tag: PowerStats, desc: Wi-Fi scan event} + EXECUTE_RESULT: {type: INT32, desc: Scan fail(0) or scan success(1)} + PACKAGE_NAME: {type: STRING, desc: Package name} # Wi-Fi event received WIFI_EVENT_RECEIVED: - __BASE: {type: STATISTIC, level: MINOR, tag: PowerStats, desc: wifi event for int value} - EVENT_TYPE: {type: STRING, desc: event type} - VALUE: {type: INT32, desc: event value} + __BASE: {type: STATISTIC, level: MINOR, tag: PowerStats, desc: Wi-Fi event} + EVENT_TYPE: {type: STRING, desc: Event type} + VALUE: {type: INT32, desc: Event value} -- Gitee From 6100d89ce4498706a70808583f8670923916b072 Mon Sep 17 00:00:00 2001 From: Zhangfeng Date: Sun, 9 Oct 2022 04:02:11 +0000 Subject: [PATCH 398/491] Resolving YAML Parsing error issue Signed-off-by: zhangfeng Signed-off-by: Zhangfeng --- wifi/hisysevent.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/wifi/hisysevent.yaml b/wifi/hisysevent.yaml index b1f1fb9..b07a237 100644 --- a/wifi/hisysevent.yaml +++ b/wifi/hisysevent.yaml @@ -15,24 +15,24 @@ domain: COMMUNICATION # Start or stop Wi-Fi switch WIFI_STATE: - __BASE: {type: STATISTIC, level: MINOR, tag: PowerStats, desc: Wi-Fi enable or disable event} + __BASE: {type: STATISTIC, level: MINOR, tag: PowerStats, desc: Wifi enable or disable event} TYPE: {type: STRING, desc: Service type} - OPER_TYPE: {type: INT32, desc: Enable(0) or disable(1)} + OPER_TYPE: {type: INT32, desc: 0 is enable and 1 is disable} # Connect or disconnect Wi-Fi WIFI_CONNECTION: - __BASE: {type: STATISTIC, level: MINOR, tag: PowerStats, desc: Wi-Fi connection event} - TYPE: {type: INT32, desc: Connect(0) or disconnect(1)} + __BASE: {type: STATISTIC, level: MINOR, tag: PowerStats, desc: Wifi connection event} + TYPE: {type: INT32, desc: 0 is connect and 1 is disconnect} PACKAGE_NAME: {type: STRING, desc: Package name} # Scans Wi-Fi hotspots WIFI_SCAN: - __BASE: {type: STATISTIC, level: MINOR, tag: PowerStats, desc: Wi-Fi scan event} - EXECUTE_RESULT: {type: INT32, desc: Scan fail(0) or scan success(1)} + __BASE: {type: STATISTIC, level: MINOR, tag: PowerStats, desc: Wifi scan event} + EXECUTE_RESULT: {type: INT32, desc: 0 is scan fail and 1 is scan success} PACKAGE_NAME: {type: STRING, desc: Package name} # Wi-Fi event received WIFI_EVENT_RECEIVED: - __BASE: {type: STATISTIC, level: MINOR, tag: PowerStats, desc: Wi-Fi event} + __BASE: {type: STATISTIC, level: MINOR, tag: PowerStats, desc: Wifi event} EVENT_TYPE: {type: STRING, desc: Event type} VALUE: {type: INT32, desc: Event value} -- Gitee From 8d69eb3ac706a0966a037f5ba08cc31f689d25a1 Mon Sep 17 00:00:00 2001 From: fengye Date: Sun, 9 Oct 2022 07:15:47 +0000 Subject: [PATCH 399/491] fix bug Signed-off-by: fengye --- .../wifi_toolkit/config/wifi_config_file_spec.cpp | 2 +- .../wifi_framework/wifi_toolkit/utils/wifi_encryption_util.cpp | 3 ++- .../wifi_framework/wifi_toolkit/utils/wifi_encryption_util.h | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.cpp index d739895..77a5178 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_file_spec.cpp @@ -159,7 +159,7 @@ static int SetWifiDeviceConfigFirst(WifiDeviceConfig &item, const std::string &k } else if (key == "uid") { item.uid = std::stoi(value); } else if (key == "lastConnectTime") { - item.lastConnectTime = std::stoi(value); + item.lastConnectTime = std::stol(value); } else if (key == "numRebootsSinceLastUse") { item.numRebootsSinceLastUse = std::stoi(value); } else if (key == "numAssociation") { diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.cpp index 243c7b0..f580902 100755 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2022 Huawei Device Co., Ltd. + * Copyright (C) 2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #ifdef FEATURE_ENCRYPTION_SUPPORT #include "wifi_encryption_util.h" #include diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.h b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.h index 8675411..c7b74f4 100755 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2022 Huawei Device Co., Ltd. + * Copyright (C) 2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #ifdef FEATURE_ENCRYPTION_SUPPORT #ifndef OHOS_WIFI_CONFIG_HKS_H #define OHOS_WIFI_CONFIG_HKS_H -- Gitee From 03bea68393b4f024dd2682a8dc4ae72482425dfb Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Sun, 9 Oct 2022 23:41:09 +0800 Subject: [PATCH 400/491] dd memory optimization 1008 Signed-off-by: yanxiaotao@huawei.com --- .../wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp index e630c5a..2c43ea4 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp @@ -53,12 +53,8 @@ ErrCode StaSavedDeviceAppraisal::DeviceAppraisals( WifiDeviceConfig device; std::string keymgmt = GetKeyMgmtBySecType((int)scanInfo.securityType); if (WifiSettings::GetInstance().GetDeviceConfig(scanInfo.ssid, keymgmt, device) == 0) { - WIFI_LOGI("Skip unsaved ssid Network %{public}s.", SsidAnonymize(scanInfo.ssid).c_str()); - continue; - } - - if (device.bssid != scanInfo.bssid) { - WIFI_LOGI("Skip unsaved bssid Network %{public}s.", MacAnonymize(scanInfo.ssid).c_str()); + WIFI_LOGI("Skip unsaved ssid Network %{public}s, keymgmt:%{public}s, securityType:%{public}d.", + SsidAnonymize(scanInfo.ssid).c_str(), keymgmt.c_str(), (int)scanInfo.securityType); continue; } -- Gitee From 63ce1602ae3c0d6a37c9fdf335a053881bbf5c5b Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Sun, 9 Oct 2022 23:49:52 +0800 Subject: [PATCH 401/491] dd memory optimization 1008 Signed-off-by: yanxiaotao@huawei.com --- wifi/utils/src/wifi_common_util.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/wifi/utils/src/wifi_common_util.cpp b/wifi/utils/src/wifi_common_util.cpp index 759ee80..f312876 100644 --- a/wifi/utils/src/wifi_common_util.cpp +++ b/wifi/utils/src/wifi_common_util.cpp @@ -54,6 +54,8 @@ static std::map g_secTypeKeyMgmtMap = { {WIFI_SEC_TYPE_WEP, "WEP"}, {WIFI_SEC_TYPE_PSK, "WPA-PSK"}, {WIFI_SEC_TYPE_SAE, "SAE"}, + {WIFI_SEC_TYPE_EAP, "WPA-EAP"}, + {WIFI_SEC_TYPE_EAP_SUITE_B, "WPA-EAP"}, }; std::string GetKeyMgmtBySecType(const int securityType) -- Gitee From e9414038a47ccbfe956ad8f802f79db7b740b67d Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 10 Oct 2022 21:37:30 +0800 Subject: [PATCH 402/491] memory optimization for wifi 1008 Signed-off-by: yanxiaotao@huawei.com --- .../native/c_adapter/src/wifi_c_device.cpp | 28 +++++++++++++++++-- .../wifi_sta/sta_saved_device_appraisal.cpp | 6 ++-- wifi/utils/inc/wifi_common_util.h | 17 ----------- wifi/utils/src/wifi_common_util.cpp | 27 ------------------ 4 files changed, 28 insertions(+), 50 deletions(-) diff --git a/wifi/frameworks/native/c_adapter/src/wifi_c_device.cpp b/wifi/frameworks/native/c_adapter/src/wifi_c_device.cpp index 870b372..e6df333 100644 --- a/wifi/frameworks/native/c_adapter/src/wifi_c_device.cpp +++ b/wifi/frameworks/native/c_adapter/src/wifi_c_device.cpp @@ -24,6 +24,13 @@ DEFINE_WIFILOG_LABEL("WifiCDevice"); +static std::map g_secTypeKeyMgmtMap = { + {WIFI_SEC_TYPE_OPEN, "NONE"}, + {WIFI_SEC_TYPE_WEP, "WEP"}, + {WIFI_SEC_TYPE_PSK, "WPA-PSK"}, + {WIFI_SEC_TYPE_SAE, "SAE"}, +}; + std::unique_ptr wifiDevicePtr = OHOS::Wifi::WifiDevice::GetInstance(WIFI_DEVICE_ABILITY_ID); std::unique_ptr wifiScanPtr = OHOS::Wifi::WifiScan::GetInstance(WIFI_SCAN_ABILITY_ID); @@ -90,6 +97,23 @@ WifiErrorCode GetScanInfoList(WifiScanInfo *result, unsigned int *size) return GetCErrorCode(ret); } +static std::string GetKeyMgmtBySecType(const int securityType) +{ + WifiSecurityType key = WifiSecurityType(securityType); + std::map::const_iterator iter = g_secTypeKeyMgmtMap.find(key); + return iter == g_secTypeKeyMgmtMap.end() ? "NONE" : iter->second; +} + +static int GetSecTypeByKeyMgmt(const std::string& keyMgmt) +{ + for (auto& each : g_secTypeKeyMgmtMap) { + if (each.second == keyMgmt) { + return static_cast(each.first); + } + } + return static_cast(WIFI_SEC_TYPE_OPEN); +} + static void GetStaticIpFromC(const IpConfig& ipConfig, OHOS::Wifi::StaticIpAddress& staticIp) { /* Just IPV4 now */ @@ -130,7 +154,7 @@ static void ConvertDeviceConfigFromC(const WifiDeviceConfig *config, OHOS::Wifi: deviceConfig.bssid = OHOS::Wifi::MacArrayToStr(config->bssid); } deviceConfig.preSharedKey = config->preSharedKey; - deviceConfig.keyMgmt = OHOS:Wifi:GetKeyMgmtBySecType(config->securityType); + deviceConfig.keyMgmt = GetKeyMgmtBySecType(config->securityType); deviceConfig.networkId = config->netId; deviceConfig.frequency = config->freq; /* wapiPskType is not support, don't verify now */ @@ -159,7 +183,7 @@ static OHOS::Wifi::ErrCode ConvertDeviceConfigFromCpp(const OHOS::Wifi::WifiDevi if (memcpy_s(result->preSharedKey, WIFI_MAX_KEY_LEN, deviceConfig.preSharedKey.c_str(), WIFI_MAX_KEY_LEN) != EOK) { return OHOS::Wifi::WIFI_OPT_FAILED; } - result->securityType = OHOS:Wifi:GetSecTypeByKeyMgmt(deviceConfig.keyMgmt); + result->securityType = GetSecTypeByKeyMgmt(deviceConfig.keyMgmt); result->netId = deviceConfig.networkId; result->freq = deviceConfig.frequency; /* wapiPskType is not support now */ diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp index 2c43ea4..bafe1c6 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp @@ -51,10 +51,8 @@ ErrCode StaSavedDeviceAppraisal::DeviceAppraisals( for (auto scanInfo : scanInfos) { WifiDeviceConfig device; - std::string keymgmt = GetKeyMgmtBySecType((int)scanInfo.securityType); - if (WifiSettings::GetInstance().GetDeviceConfig(scanInfo.ssid, keymgmt, device) == 0) { - WIFI_LOGI("Skip unsaved ssid Network %{public}s, keymgmt:%{public}s, securityType:%{public}d.", - SsidAnonymize(scanInfo.ssid).c_str(), keymgmt.c_str(), (int)scanInfo.securityType); + if (WifiSettings::GetInstance().GetDeviceConfig(scanInfo.ssid, DEVICE_CONFIG_INDEX_SSID, device) != 0) { + WIFI_LOGI("Skip unsaved ssid Network %{public}s.", SsidAnonymize(scanInfo.ssid).c_str()); continue; } diff --git a/wifi/utils/inc/wifi_common_util.h b/wifi/utils/inc/wifi_common_util.h index 9a52f0d..2afc162 100644 --- a/wifi/utils/inc/wifi_common_util.h +++ b/wifi/utils/inc/wifi_common_util.h @@ -27,23 +27,6 @@ namespace OHOS { namespace Wifi { - -/** - * @Description get KeyMgmt by security type. - * - * @param securityType - Input security type - * @return std::string - KeyMgmt - */ -std::string GetKeyMgmtBySecType(const int securityType); - -/** - * @Description get security type by KeyMgmt - * - * @param keyMgmt - KeyMgmt - * @return int - security type - */ -int GetSecTypeByKeyMgmt(const std::string& keyMgmt); - /** * @Description MAC address anonymization * diff --git a/wifi/utils/src/wifi_common_util.cpp b/wifi/utils/src/wifi_common_util.cpp index f312876..aebf9e6 100644 --- a/wifi/utils/src/wifi_common_util.cpp +++ b/wifi/utils/src/wifi_common_util.cpp @@ -26,7 +26,6 @@ #include "system_ability_definition.h" #endif #include "wifi_logger.h" -#include "wifi_device_config.h" namespace OHOS { namespace Wifi { @@ -49,32 +48,6 @@ constexpr int MAX_5G_CHANNEL = 165; constexpr int FREQ_CHANNEL_1 = 2412; constexpr int FREQ_CHANNEL_36 = 5180; -static std::map g_secTypeKeyMgmtMap = { - {WIFI_SEC_TYPE_OPEN, "NONE"}, - {WIFI_SEC_TYPE_WEP, "WEP"}, - {WIFI_SEC_TYPE_PSK, "WPA-PSK"}, - {WIFI_SEC_TYPE_SAE, "SAE"}, - {WIFI_SEC_TYPE_EAP, "WPA-EAP"}, - {WIFI_SEC_TYPE_EAP_SUITE_B, "WPA-EAP"}, -}; - -std::string GetKeyMgmtBySecType(const int securityType) -{ - WifiSecurityType key = WifiSecurityType(securityType); - std::map::const_iterator iter = g_secTypeKeyMgmtMap.find(key); - return iter == g_secTypeKeyMgmtMap.end() ? "NONE" : iter->second; -} - -int GetSecTypeByKeyMgmt(const std::string& keyMgmt) -{ - for (auto& each : g_secTypeKeyMgmtMap) { - if (each.second == keyMgmt) { - return static_cast(each.first); - } - } - return static_cast(WIFI_SEC_TYPE_OPEN); -} - static std::string DataAnonymize(const std::string str, const char delim, const char hiddenCh, const int startIdx = 0) { -- Gitee From 63672a2992fc3de191095199e704d8ad3df20f6e Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Tue, 11 Oct 2022 08:48:39 +0000 Subject: [PATCH 403/491] Fix hostapd repeat start fail issue Signed-off-by: zhangfeng --- .../wifi_hal/wifi_hal_ap_interface.c | 2 +- .../wifi_hal/wifi_hal_module_manage.c | 17 +++++++++++------ .../wifi_hal/wifi_hal_module_manage.h | 5 +++-- .../wifi_hal/wifi_hal_p2p_interface.c | 2 +- .../wifi_hal/wifi_hal_sta_interface.c | 2 +- 5 files changed, 17 insertions(+), 11 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c index 25684c7..95663e1 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c @@ -155,7 +155,7 @@ WifiErrorNo StopSoftAp(int id) WifiErrorNo StopHostapd(void) { ModuleManageRetCode ret; - ret = StopModule(g_serviceName); + ret = StopModule(g_serviceName, true); if (ret == MM_FAILED) { LOGE("stop hostapd failed!"); return WIFI_HAL_FAILED; diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module_manage.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module_manage.c index 7457467..c9e01fa 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module_manage.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module_manage.c @@ -190,7 +190,7 @@ static int StopModuleInternalCheckProcess(const char *moduleName, pid_t processI } LOGE("Stop wpa process [%{public}d] failed for timeout, try to kill process", processId); StopModuleInternalKillProcess(processId); - return HAL_FAILURE; + return HAL_SUCCESS; } static int StopModuleInternalSendTerminate() @@ -204,11 +204,16 @@ static int StopModuleInternalSendTerminate() return (ret == 0 ? HAL_SUCCESS : HAL_FAILURE); } -int StopModuleInternal(const char *moduleName, pid_t processId) +int StopModuleInternal(const char *moduleName, pid_t processId, bool isHostapd) { - int ret = StopModuleInternalSendTerminate(); + int ret; + if (isHostapd) { + ret = StopModuleInternalKillProcess(processId); + } else { + ret = StopModuleInternalSendTerminate(); + } if (ret != HAL_SUCCESS) { - LOGE("Send terminate failed!"); + LOGE("Send stop module command failed!"); } return StopModuleInternalCheckProcess(moduleName, processId); } @@ -261,7 +266,7 @@ ModuleManageRetCode StartModule(const char *moduleName, const char *startCmd) return MM_SUCCESS; } -ModuleManageRetCode StopModule(const char *moduleName) +ModuleManageRetCode StopModule(const char *moduleName, bool isHostapd) { if (moduleName == NULL) { return MM_FAILED; @@ -275,7 +280,7 @@ ModuleManageRetCode StopModule(const char *moduleName) LOGD("module %{public}s reference left %{public}d, return ok", moduleName, p->referenceCount); return MM_REDUCE_REFERENCE; } - int ret = StopModuleInternal(p->szModuleName, p->processId); + int ret = StopModuleInternal(p->szModuleName, p->processId, isHostapd); if (ret != 0) { /* stop module failed! */ p->referenceCount += 1; return MM_FAILED; diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module_manage.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module_manage.h index 2789213..b3a7c18 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module_manage.h +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module_manage.h @@ -17,6 +17,7 @@ #define OHOS_WIFI_HAL_MODULE_MANAGE_H #include +#include #ifdef __cplusplus extern "C" { @@ -58,10 +59,10 @@ ModuleManageRetCode StartModule(const char *moduleName, const char *startCmd); * @Description Stop a specified service. * * @param moduleName - * @param modulePropertyName + * @param isHostapd * @return ModuleManageRetCode */ -ModuleManageRetCode StopModule(const char *moduleName); +ModuleManageRetCode StopModule(const char *moduleName, bool isHostapd); #ifdef __cplusplus } diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_p2p_interface.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_p2p_interface.c index 5667e68..9c62816 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_p2p_interface.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_p2p_interface.c @@ -64,7 +64,7 @@ static WifiErrorNo P2pConnectSupplicant(void) static WifiErrorNo P2pStopSupplicant(void) { - ModuleManageRetCode ret = StopModule(WPA_SUPPLICANT_NAME); + ModuleManageRetCode ret = StopModule(WPA_SUPPLICANT_NAME, false); if (ret == MM_FAILED) { LOGE("stop p2p_wpa_supplicant failed!"); return WIFI_HAL_FAILED; diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c index a89da77..36a9a0c 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c @@ -187,7 +187,7 @@ WifiErrorNo StartSupplicant(void) WifiErrorNo StopSupplicant(void) { LOGI("Stop supplicant"); - ModuleManageRetCode ret = StopModule(WPA_SUPPLICANT_NAME); + ModuleManageRetCode ret = StopModule(WPA_SUPPLICANT_NAME, false); if (ret == MM_FAILED) { LOGE("stop wpa_supplicant failed!"); return WIFI_HAL_FAILED; -- Gitee From 13b20066b985b3eaa3e6dbf3c39cd72bcaa9febb Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Tue, 11 Oct 2022 08:52:16 +0000 Subject: [PATCH 404/491] Fix softbus remove group fail(timeout) issue Signed-off-by: zhangfeng --- .../wifi_manage/common/message_queue.cpp | 49 +++++++++---------- .../wifi_manage/common/message_queue.h | 8 --- 2 files changed, 23 insertions(+), 34 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.cpp index 5d0d730..2dd4062 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.cpp @@ -14,9 +14,9 @@ */ #include "message_queue.h" +#include #include #include -#include "wifi_errcode.h" #include "wifi_log.h" #undef LOG_TAG @@ -24,7 +24,7 @@ namespace OHOS { namespace Wifi { -MessageQueue::MessageQueue() : pMessageQueue(nullptr), mIsBlocked(false), mNeedQuit(false), mWakeup(false) +MessageQueue::MessageQueue() : pMessageQueue(nullptr), mIsBlocked(false), mNeedQuit(false) { LOGI("MessageQueue::MessageQueue"); } @@ -44,18 +44,16 @@ MessageQueue::~MessageQueue() return; } -bool MessageQueue::WakeupOrKeepOriginalValue() -{ - return mIsBlocked ? mIsBlocked : mWakeup; -} - bool MessageQueue::AddMessageToQueue(InternalMessage *message, int64_t handleTime) { if (message == nullptr) { LOGE("message is null."); return false; } - LOGI("MessageQueue::AddMessageToQueue: %{public}d", message->GetMessageName()); + + LOGI("MessageQueue::AddMessageToQueue, msg: %{public}d, timestamp:%" PRIu64 "\n", + message->GetMessageName(), handleTime); + if (mNeedQuit) { MessageManage::GetInstance().ReclaimMsg(message); LOGE("Already quit the message queue."); @@ -63,6 +61,7 @@ bool MessageQueue::AddMessageToQueue(InternalMessage *message, int64_t handleTim } message->SetHandleTime(handleTime); + bool mNeedWakeup = false; /* * If the queue is empty, the current message needs to be executed * immediately, or the execution time is earlier than the queue header, the @@ -72,17 +71,15 @@ bool MessageQueue::AddMessageToQueue(InternalMessage *message, int64_t handleTim { std::unique_lock lck(mMtxQueue); InternalMessage *pTop = pMessageQueue; - if (pTop == nullptr || handleTime == 0 || handleTime < pTop->GetHandleTime()) { + if (pTop == nullptr || handleTime == 0 || handleTime <= pTop->GetHandleTime()) { + LOGI("Add the message in the head of queue."); message->SetNextMsg(pTop); pMessageQueue = message; - mWakeup = WakeupOrKeepOriginalValue(); + mNeedWakeup = mIsBlocked; } else { + LOGI("Insert the message in the middle of the queue."); InternalMessage *pPrev = nullptr; InternalMessage *pCurrent = pTop; - /* If the inserted message is executed earlier(In the head position), the thread needs to be awakened */ - if (handleTime <= pTop->GetHandleTime()) { - mWakeup = WakeupOrKeepOriginalValue(); - } /* Inserts messages in the middle of the queue based on the execution time. */ while (pCurrent != nullptr) { pPrev = pCurrent; @@ -96,12 +93,13 @@ bool MessageQueue::AddMessageToQueue(InternalMessage *message, int64_t handleTim } } - LOGI("Add message needWake: %{public}d", static_cast(mWakeup.load())); - /* Wake up the process. */ - if (mWakeup) { - mCvQueue.notify_all(); + LOGI("Add message needWakeup: %{public}d", static_cast(mNeedWakeup)); + if (mNeedWakeup) { + std::unique_lock lck(mMtxBlock); mIsBlocked = false; } + /* Wake up the process. */ + mCvQueue.notify_one(); return true; } @@ -152,13 +150,13 @@ InternalMessage *MessageQueue::GetNextMessage() InternalMessage *curMsg = pMessageQueue; mIsBlocked = true; if (curMsg != nullptr) { + LOGI("Message queue is not empty."); if (nowTime < curMsg->GetHandleTime()) { /* The execution time of the first message is not reached. The remaining time is blocked here. */ nextBlockTime = curMsg->GetHandleTime() - nowTime; } else { /* Get the message of queue header. */ - mWakeup = false; mIsBlocked = false; pMessageQueue = curMsg->GetNextMsg(); curMsg->SetNextMsg(nullptr); @@ -172,15 +170,14 @@ InternalMessage *MessageQueue::GetNextMessage() } std::unique_lock lck(mMtxBlock); // mCvQueue lock - if (mIsBlocked && (!mNeedQuit) && (!mWakeup)) { + if (mIsBlocked && (!mNeedQuit)) { LOGI("mCvQueue wait_for: %{public}d", nextBlockTime); if (mCvQueue.wait_for(lck, std::chrono::milliseconds(nextBlockTime)) == std::cv_status::timeout) { - LOGI("mCvQueue wake up, reason: cv_status::timeout."); + LOGI("mCvQueue wake up, reason: cv_status::timeout: %{public}d", nextBlockTime); } else { LOGI("mCvQueue is wake up."); } } - mWakeup = false; mIsBlocked = false; } LOGE("Already quit the message queue."); @@ -191,11 +188,11 @@ void MessageQueue::StopQueueLoop() { LOGI("Start stop queue loop."); mNeedQuit = true; - while (mIsBlocked) { - mNeedQuit = true; - mCvQueue.notify_all(); - std::this_thread::sleep_for(std::chrono::milliseconds(1)); // sleep 1 ms + if (mIsBlocked) { + std::unique_lock lck(mMtxBlock); + mIsBlocked = false; } + mCvQueue.notify_one(); LOGI("Queue loop has stopped."); } } // namespace Wifi diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.h index bf5a4e1..c957789 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.h @@ -70,12 +70,6 @@ public: */ void StopQueueLoop(); -private: - /** - * @Description : Set the mWakeup to true or keep it its original value. - */ - inline bool WakeupOrKeepOriginalValue(); - private: /* Message Queuing */ InternalMessage *pMessageQueue; @@ -83,8 +77,6 @@ private: std::atomic mIsBlocked; /* Exit Loop */ std::atomic mNeedQuit; - /* Wakeup flag, true: to wake up the thread */ - std::atomic mWakeup; /* Thread lock of operation queue */ std::mutex mMtxQueue; /* Blocked thread lock */ -- Gitee From fde3387c47bf62be03b5558a98d22f835659b8c7 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Wed, 12 Oct 2022 20:37:14 +0800 Subject: [PATCH 405/491] memory optimization for wifi 1008 Signed-off-by: yanxiaotao@huawei.com --- .../wifi_manage/wifi_scan/scan_service.cpp | 15 +++------------ .../wifi_toolkit/config/wifi_settings.cpp | 2 -- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp index 9a8c520..ece459b 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp @@ -1011,17 +1011,7 @@ void ScanService::StartSystemTimerScan(bool scanAtOnce) } if (scanAtOnce || (lastSystemScanTime == 0) || (sinceLastScan >= systemScanIntervalMode.scanIntervalMode.interval)) { - std::vector deviceConfigs; - if (WifiSettings::GetInstance().GetDeviceConfig(deviceConfigs) == 0 - && deviceConfigs.size() == 0) { - WIFI_LOGW("NO saved configs, system timer scan is not allowed!"); - std::vector results; - /* call GetScanInfoList to clear older scan results */ - int ret = WifiSettings::GetInstance().GetScanInfoList(results); - if (ret != 0) { - WIFI_LOGW("GetScanInfoList return error. \n"); - } - } else if (Scan(false) != WIFI_OPT_SUCCESS) { + if (Scan(false) != WIFI_OPT_SUCCESS) { WIFI_LOGE("Scan failed."); } lastSystemScanTime = nowTime; @@ -1766,7 +1756,8 @@ bool ScanService::AllowScanDuringScreenOff(ScanMode scanMode) const bool ScanService::AllowScanDuringStaScene(int staScene, ScanMode scanMode) { - WIFI_LOGI("Enter ScanService::AllowScanDuringStaScene.\n"); + WIFI_LOGI("Enter ScanService::AllowScanDuringStaScene, staScene:%{public}d, scanMode:%{public}d", + staScene, scanMode); time_t now = time(nullptr); if (now < 0) { diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp index c404167..0da0ed2 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp @@ -197,8 +197,6 @@ int WifiSettings::GetScanInfoList(std::vector &results) } results.push_back(*iter); } - /* delete the old scan result */ - mWifiScanInfoList = results; return 0; } -- Gitee From cee63890aa2f2d6f0a00de40ed106ac575fcd13d Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Wed, 12 Oct 2022 21:40:35 +0800 Subject: [PATCH 406/491] memory optimization for wifi 1012 Signed-off-by: yanxiaotao@huawei.com --- .../wifi_manage/wifi_scan/scan_interface.cpp | 6 ++-- .../wifi_manage/wifi_scan/scan_service.cpp | 30 +++++++++++-------- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface.cpp index 721d14a..addf90c 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface.cpp @@ -85,14 +85,14 @@ ErrCode ScanInterface::ScanWithParam(const WifiScanParams &wifiScanParams) ErrCode ScanInterface::DisableScan(bool disable) { - WIFI_LOGI("Enter ScanInterface::DisableScan"); + WIFI_LOGI("Enter ScanInterface::DisableScan, disable=%{public}d.", disable); CHECK_NULL_AND_RETURN(pScanService, WIFI_OPT_FAILED); return pScanService->DisableScan(disable); } ErrCode ScanInterface::OnScreenStateChanged(int screenState) { - WIFI_LOGI("Enter ScanInterface::OnScreenStateChanged\n"); + WIFI_LOGI("Enter ScanInterface::OnScreenStateChanged, screenState=%{public}d.", screenState); if (screenState != MODE_STATE_OPEN && screenState != MODE_STATE_CLOSE) { WIFI_LOGE("screenState param is error"); @@ -105,7 +105,7 @@ ErrCode ScanInterface::OnScreenStateChanged(int screenState) ErrCode ScanInterface::OnClientModeStatusChanged(int staStatus) { - WIFI_LOGI("Enter ScanInterface::OnClientModeStatusChanged\n"); + WIFI_LOGI("Enter ScanInterface::OnClientModeStatusChanged, staStatus=%{public}d.", staStatus); CHECK_NULL_AND_RETURN(pScanService, WIFI_OPT_FAILED); pScanService->HandleStaStatusChanged(staStatus); pScanService->SetStaCurrentTime(); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp index ece459b..bebefb0 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp @@ -868,7 +868,7 @@ void ScanService::HandleScreenStatusChanged() void ScanService::HandleStaStatusChanged(int status) { - WIFI_LOGI("Enter ScanService::HandleStaStatusChanged."); + WIFI_LOGI("Enter ScanService::HandleStaStatusChanged, change to status: %{public}d.", status); staStatus = status; switch (staStatus) { @@ -945,13 +945,13 @@ void ScanService::SystemScanProcess(bool scanAtOnce) if (state == MODE_STATE_OPEN) { { std::unique_lock lock(scanControlInfoMutex); + int i = 0; for (auto iter = scanControlInfo.scanIntervalList.begin(); iter != scanControlInfo.scanIntervalList.end(); ++iter) { if (iter->scanScene == SCAN_SCENE_ALL && iter->scanMode == ScanMode::SYSTEM_TIMER_SCAN && iter->isSingle == false) { - WIFI_LOGD("iter->intervalMode is:%{public}d", iter->intervalMode); - WIFI_LOGD("iter->interval is:%{public}d", iter->interval); - WIFI_LOGD("iter->count is:%{public}d", iter->count); + WIFI_LOGI("iter[%{public}d]: intervalMode:%{public}d, interval:%{public}d, count:%{public}d", + i++, iter->intervalMode, iter->interval, iter->count); systemScanIntervalMode.scanIntervalMode.intervalMode = iter->intervalMode; systemScanIntervalMode.scanIntervalMode.interval = iter->interval; systemScanIntervalMode.scanIntervalMode.count = iter->count; @@ -1096,7 +1096,7 @@ ErrCode ScanService::AllowExternScan() WIFI_LOGI("Enter ScanService::AllowExternScan.\n"); int staScene = GetStaScene(); ScanMode scanMode = WifiSettings::GetInstance().GetAppRunningState(); - WIFI_LOGI("staScene is %{public}d, scanMode is %{public}d", staScene, (int)scanMode); + WIFI_LOGI("AllowExternScan, staScene is %{public}d, scanMode is %{public}d", staScene, (int)scanMode); if (!AllowExternScanByThermal()) { WIFI_LOGW("extern scan not allow by thermal level"); @@ -1132,23 +1132,26 @@ ErrCode ScanService::AllowSystemTimerScan() if (staStatus != static_cast(OperateResState::DISCONNECT_DISCONNECTED) && staStatus != static_cast(OperateResState::CONNECT_AP_CONNECTED)) { + WIFI_LOGW("system timer scan not allowed for staStatus: %{public}d.", staStatus); return WIFI_OPT_FAILED; } /* The network is connected and cannot be automatically switched. */ autoNetworkSelection = WifiSettings::GetInstance().GetWhetherToAllowNetworkSwitchover(); if ((staStatus == static_cast(OperateResState::CONNECT_AP_CONNECTED)) && (!autoNetworkSelection)) { + WIFI_LOGW("system timer scan not allowed for CONNECT_AP_CONNECTED"); return WIFI_OPT_FAILED; } int staScene = GetStaScene(); /* Determines whether to allow scanning based on the STA status. */ if (staScene == SCAN_SCENE_MAX) { + WIFI_LOGW("system timer scan not allowed for invalid staScene: %{public}d", staScene); return WIFI_OPT_FAILED; } if (!AllowScanDuringStaScene(staScene, ScanMode::SYSTEM_TIMER_SCAN)) { - WIFI_LOGW("system timer scan not allowed, staScene is %{public}d", staScene); + WIFI_LOGW("system timer scan not allowed, staScene: %{public}d", staScene); return WIFI_OPT_FAILED; } @@ -1176,7 +1179,7 @@ ErrCode ScanService::AllowSystemTimerScan() } if (!AllowScanByDisableScanCtrl()) { - WIFI_LOGD("extern scan not allow by disable scan control."); + WIFI_LOGW("system timer scan not allow by disable scan control."); return WIFI_OPT_FAILED; } @@ -1228,7 +1231,7 @@ ErrCode ScanService::AllowPnoScan() } if (!AllowScanByDisableScanCtrl()) { - WIFI_LOGW("extern scan not allow by disable scan control."); + WIFI_LOGW("pnoScan not allow by disable scan control."); return WIFI_OPT_FAILED; } @@ -1238,7 +1241,7 @@ ErrCode ScanService::AllowPnoScan() ErrCode ScanService::AllowScanByType(ScanType scanType) { - LOGI("Enter ScanService::AllowScanByType."); + LOGI("Enter ScanService::AllowScanByType, scanType: %{public}d.", scanType); ErrCode allScanResult = WIFI_OPT_SUCCESS; switch (scanType) { @@ -1256,7 +1259,7 @@ ErrCode ScanService::AllowScanByType(ScanType scanType) break; } - WIFI_LOGW("AllowScanByType ErrCode=%{public}d.", static_cast(allScanResult)); + WIFI_LOGW("AllowScanByType, allScanResult:%{public}d.", static_cast(allScanResult)); return allScanResult; } @@ -1350,7 +1353,7 @@ ErrCode ScanService::ApplyScanPolices(ScanType type) ErrCode rlt = WIFI_OPT_SUCCESS; if (appPackageName.empty()) { rlt = AllowScanByType(type); - WIFI_LOGW("appPackageName empty, apply scan polices ErrCode=%{public}d.", static_cast(rlt)); + WIFI_LOGW("appPackageName empty, apply scan polices rlt: %{public}d.", static_cast(rlt)); if (scanResultBackup != -1 && rlt == WIFI_OPT_MOVING_FREEZE_CTRL) { mScanSerivceCallbacks.OnScanFinishEvent(scanResultBackup); } @@ -1372,7 +1375,7 @@ ErrCode ScanService::ApplyScanPolices(ScanType type) rlt = ApplyTrustListPolicy(type); if (rlt != WIFI_OPT_SUCCESS) { if (scanResultBackup != -1 && rlt == WIFI_OPT_MOVING_FREEZE_CTRL) { - LOGE("trust list policy, but moving freeze ctrl failed."); + WIFI_LOGE("trust list policy, but moving freeze ctrl failed."); mScanSerivceCallbacks.OnScanFinishEvent(scanResultBackup); } return rlt; @@ -1396,7 +1399,8 @@ bool ScanService::AllowExternScanByThermal() bool ScanService::AllowExternScanByForbid(int staScene, ScanMode scanMode) { - WIFI_LOGI("Enter ScanService::AllowExternScanByForbid.\n"); + WIFI_LOGI("Enter ScanService::AllowExternScanByForbid, staScene:%{public}d, staScene:%{public}d." + staScene, scanMode); if (IsExternScanning()) { if (!AllowScanDuringScanning(scanMode)) { -- Gitee From 759fca86d3ee077146054ca0a45b895c75550550 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Wed, 12 Oct 2022 21:55:04 +0800 Subject: [PATCH 407/491] memory optimization for wifi 1012 Signed-off-by: yanxiaotao@huawei.com --- .../wifi_framework/wifi_manage/wifi_scan/scan_service.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp index bebefb0..e729460 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp @@ -1399,7 +1399,7 @@ bool ScanService::AllowExternScanByThermal() bool ScanService::AllowExternScanByForbid(int staScene, ScanMode scanMode) { - WIFI_LOGI("Enter ScanService::AllowExternScanByForbid, staScene:%{public}d, staScene:%{public}d." + WIFI_LOGI("Enter ScanService::AllowExternScanByForbid, staScene:%{public}d, scanMode:%{public}d.", staScene, scanMode); if (IsExternScanning()) { -- Gitee From 1f4b4aa6eda80460104275fc41f22c2fee309687 Mon Sep 17 00:00:00 2001 From: xiaosi Date: Thu, 13 Oct 2022 09:54:59 +0800 Subject: [PATCH 408/491] fix for codecheck 1013 Signed-off-by: xiaosi --- dhcp/services/dhcp_client/src/dhcp_client.c | 2 +- dhcp/services/dhcp_server/src/dhcp_argument.c | 38 +++++++++---------- dhcp/services/dhcp_server/src/dhcp_server.c | 2 +- .../wifi_manage/common/state_machine.cpp | 2 +- .../common/wifi_broadcast_helper.cpp | 4 +- .../idl_client/wifi_idl_client.cpp | 4 +- .../idl_client/wifi_idl_inner_interface.cpp | 4 +- .../idl_client/wifi_idl_inner_interface.h | 4 +- 8 files changed, 30 insertions(+), 30 deletions(-) diff --git a/dhcp/services/dhcp_client/src/dhcp_client.c b/dhcp/services/dhcp_client/src/dhcp_client.c index 6b511b2..f36e4e0 100644 --- a/dhcp/services/dhcp_client/src/dhcp_client.c +++ b/dhcp/services/dhcp_client/src/dhcp_client.c @@ -61,7 +61,7 @@ int StopProcess(const char *pidFile) } LOGI("StopProcess() sending signal SIGTERM to process:%{public}d.", pid); - if (-1 == kill(pid, SIGTERM)) { + if (kill(pid, SIGTERM == -1)) { if (ESRCH == errno) { LOGW("StopProcess() pidFile:%{public}s,pid:%{public}d is not exist.", pidFile, pid); unlink(pidFile); diff --git a/dhcp/services/dhcp_server/src/dhcp_argument.c b/dhcp/services/dhcp_server/src/dhcp_argument.c index 4ce5d60..f69baf3 100644 --- a/dhcp/services/dhcp_server/src/dhcp_argument.c +++ b/dhcp/services/dhcp_server/src/dhcp_argument.c @@ -64,9 +64,9 @@ static int DefaultArgument(const char *argument, const char *val) return RET_SUCCESS; } -const char *optionString = "i:c:d:g:s:n:P:S:Bp:o:lb:rvhD"; +const char *g_optionString = "i:c:d:g:s:n:P:S:Bp:o:lb:rvhD"; -static struct option longOptions[] = { +static struct option g_longOptions[] = { {"ifname", REQUIRED_ARG, 0, 'i'}, {"conf", REQUIRED_ARG, 0, 'c'}, {"dns", REQUIRED_ARG, 0, 'd'}, @@ -83,22 +83,22 @@ static struct option longOptions[] = { }; static DhcpUsage usages[] = { - {&longOptions[NUM_ZERO], "", "network interface name.", "--ifname eth0", 1, PutArgument}, - {&longOptions[NUM_ONE], "", "configure file name.", "--conf /etc/conf/dhcp_server.conf", 0, PutArgument}, - {&longOptions[NUM_TWO], "[,dns2][,dns3][...]", "domain name server IP address list.", "", 0, PutArgument}, - {&longOptions[NUM_THREE], "", "gateway option.", "", 0, PutIpArgument}, - {&longOptions[NUM_FOUR], "", "server identifier.", "", 1, PutIpArgument}, - {&longOptions[NUM_FIVE], "", "default subnet mask.", "", 1, PutIpArgument}, - {&longOptions[NUM_SIX], ",", "pool address range.", "", 0, + {&g_longOptions[NUM_ZERO], "", "network interface name.", "--ifname eth0", 1, PutArgument}, + {&g_longOptions[NUM_ONE], "", "configure file name.", "--conf /etc/conf/dhcp_server.conf", 0, PutArgument}, + {&g_longOptions[NUM_TWO], "[,dns2][,dns3][...]", "domain name server IP address list.", "", 0, PutArgument}, + {&g_longOptions[NUM_THREE], "", "gateway option.", "", 0, PutIpArgument}, + {&g_longOptions[NUM_FOUR], "", "server identifier.", "", 1, PutIpArgument}, + {&g_longOptions[NUM_FIVE], "", "default subnet mask.", "", 1, PutIpArgument}, + {&g_longOptions[NUM_SIX], ",", "pool address range.", "", 0, PutPoolArgument}, - {&longOptions[NUM_SEVEN], "", "set lease time value, the value is in units of seconds.", "", 0, + {&g_longOptions[NUM_SEVEN], "", "set lease time value, the value is in units of seconds.", "", 0, PutArgument}, - {&longOptions[NUM_EIGHT], "", "set renewal time value, the value is in units of seconds.", "", 0, + {&g_longOptions[NUM_EIGHT], "", "set renewal time value, the value is in units of seconds.", "", 0, PutArgument}, - {&longOptions[NUM_NINE], "", "set rebinding time value, the value is in units of seconds.", "", 0, + {&g_longOptions[NUM_NINE], "", "set rebinding time value, the value is in units of seconds.", "", 0, PutArgument}, - {&longOptions[NUM_TEN], "", "show version information.", "", 0, ShowVersion}, - {&longOptions[NUM_ELEVEN], "", "show help information.", "", 0, DefaultArgument}, + {&g_longOptions[NUM_TEN], "", "show version information.", "", 0, ShowVersion}, + {&g_longOptions[NUM_ELEVEN], "", "show help information.", "", 0, DefaultArgument}, {0, "", "", ""}, }; @@ -265,11 +265,11 @@ int PutArgument(const char *argument, const char *val) return RET_FAILED; } -int findIndex(int c) +int FindIndex(int c) { - int size = sizeof(longOptions) / sizeof(longOptions[0]); + int size = sizeof(g_longOptions) / sizeof(g_longOptions[0]); for (int i = 0; i < size; ++i) { - if (longOptions[i].val == c) { + if (g_longOptions[i].val == c) { return i; } } @@ -283,14 +283,14 @@ int ParseArguments(int argc, char *argv[]) size_t optsc = sizeof(usages) / sizeof(DhcpUsage); int index = -1; int rst = RET_SUCCESS; - while ((ret = getopt_long(argc, argv, optionString, longOptions, &index)) != -1) { + while ((ret = getopt_long(argc, argv, g_optionString, g_longOptions, &index)) != -1) { if (ret == '?') { LOGW("unknown input arguments! ret = ?"); index = -1; continue; } if (index < 0) { - index = findIndex(ret); + index = FindIndex(ret); } if (index < 0 || index >= (int)optsc) { LOGD("unknown input arguments! ret = %c, index = %d", ret, index); diff --git a/dhcp/services/dhcp_server/src/dhcp_server.c b/dhcp/services/dhcp_server/src/dhcp_server.c index 094121d..90af88d 100644 --- a/dhcp/services/dhcp_server/src/dhcp_server.c +++ b/dhcp/services/dhcp_server/src/dhcp_server.c @@ -848,7 +848,7 @@ int AddReplyServerIdOption(PDhcpOptionList options, uint32_t serverId) LOGE("option list pointer is null."); return RET_FAILED; } - if (!serverId || serverId==INADDR_BROADCAST) { + if (!serverId || serverId == INADDR_BROADCAST) { LOGE("servier id error."); return RET_FAILED; } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp index 51cd75e..b67e6b5 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include +#include #include "state_machine.h" #include "wifi_log.h" diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_broadcast_helper.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_broadcast_helper.cpp index d2b77d0..6250514 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_broadcast_helper.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_broadcast_helper.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ #include "wifi_broadcast_helper.h" -#include +#include #include #include "wifi_logger.h" @@ -33,7 +33,7 @@ void WifiBroadCastHelper::Show(const std::string &v) return; } -void WifiBroadCastHelper::Show(int v) +void WifiBroadCastHelper::Show(const int v) { WIFI_LOGI(" -i:%{public}d", v); return; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp index 3f6a65e..54b9805 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp @@ -582,8 +582,8 @@ WifiErrorNo WifiIdlClient::ReqRegisterStaEventCallback(const WifiEventCallback & cEventCallback.onSsidWrongkey = OnWpaSsidWrongKey; cEventCallback.onWpsOverlap = OnWpsOverlap; cEventCallback.onWpsTimeOut = OnWpsTimeOut; - cEventCallback.onWpsConnectionFull = onWpaConnectionFull; - cEventCallback.onWpsConnectionReject = onWpaConnectionReject; + cEventCallback.onWpsConnectionFull = OnWpaConnectionFull; + cEventCallback.onWpsConnectionReject = OnWpaConnectionReject; } return RegisterStaEventCallback(cEventCallback); } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.cpp index 48ab46f..b03cf34 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.cpp @@ -97,7 +97,7 @@ void OnWpaSsidWrongKey(int status) } } -void onWpaConnectionFull(int status) +void OnWpaConnectionFull(int status) { const OHOS::Wifi::WifiEventCallback &cbk = OHOS::Wifi::WifiStaHalInterface::GetInstance().GetCallbackInst(); if (cbk.onWpaConnectionFull) { @@ -105,7 +105,7 @@ void onWpaConnectionFull(int status) } } -void onWpaConnectionReject(int status) +void OnWpaConnectionReject(int status) { const OHOS::Wifi::WifiEventCallback &cbk = OHOS::Wifi::WifiStaHalInterface::GetInstance().GetCallbackInst(); if (cbk.onWpaConnectionReject) { diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.h index 4a9d9c7..153d917 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.h @@ -53,8 +53,8 @@ void OnWpaStateChanged(int status); void OnWpaSsidWrongKey(int status); void OnWpsOverlap(int status); void OnWpsTimeOut(int status); -void onWpaConnectionFull(int status); -void onWpaConnectionReject(int status); +void OnWpaConnectionFull(int status); +void OnWpaConnectionReject(int status); /** * @Description Get the Supplicant Rpc Client object. -- Gitee From 008d6a15afa249da6e1fd6605cff7d98c70f43c8 Mon Sep 17 00:00:00 2001 From: xiaosi Date: Thu, 13 Oct 2022 15:10:41 +0800 Subject: [PATCH 409/491] fix for codecheck 1013_01 Signed-off-by: xiaosi --- dhcp/services/dhcp_client/src/dhcp_client.c | 2 +- .../wifi_framework/wifi_manage/wifi_ap/ap_service.h | 2 +- .../wifi_framework/wifi_manage/wifi_ap/ap_started_state.h | 2 +- .../wifi_framework/wifi_manage/wifi_ap/ap_state_machine.h | 3 ++- .../wifi_p2p/authorizing_negotiation_request_state.h | 3 ++- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dhcp/services/dhcp_client/src/dhcp_client.c b/dhcp/services/dhcp_client/src/dhcp_client.c index f36e4e0..df6843b 100644 --- a/dhcp/services/dhcp_client/src/dhcp_client.c +++ b/dhcp/services/dhcp_client/src/dhcp_client.c @@ -61,7 +61,7 @@ int StopProcess(const char *pidFile) } LOGI("StopProcess() sending signal SIGTERM to process:%{public}d.", pid); - if (kill(pid, SIGTERM == -1)) { + if (kill(pid, SIGTERM) == -1) { if (ESRCH == errno) { LOGW("StopProcess() pidFile:%{public}s,pid:%{public}d is not exist.", pidFile, pid); unlink(pidFile); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.h index 5176e20..f7ca798 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.h @@ -32,7 +32,7 @@ public: * @param None * @return None */ - ApService(ApStateMachine &, int id = 0); + ApService(ApStateMachine &apStateMachine, int id = 0); /** * @Description destructor method. diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.h index 91e1953..7037baf 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.h @@ -34,7 +34,7 @@ public: * @param None * @return None */ - ApStartedState(ApStateMachine &, ApConfigUse &, ApMonitor &, int id = 0); + ApStartedState(ApStateMachine &apStateMachine, ApConfigUse &apConfigUse, ApMonitor &apMonitor, int id = 0); /** * @Description destructor method. * @param None diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine.h index 5069ebc..27b97bd 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine.h @@ -80,7 +80,8 @@ public: * @param None * @return None */ - ApStateMachine(ApStationsManager &, ApRootState &, ApIdleState &, ApStartedState &, ApMonitor &, int id = 0); + ApStateMachine(ApStationsManager &apStationsManager, ApRootState &apRootState, ApIdleState &apIdleState, + ApStartedState &apStartedState, ApMonitor &apMonitor, int id = 0); /** * @Description destructor method. diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/authorizing_negotiation_request_state.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/authorizing_negotiation_request_state.h index 2e5437c..7f127d1 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/authorizing_negotiation_request_state.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/authorizing_negotiation_request_state.h @@ -32,7 +32,8 @@ public: * @param None * @return None */ - AuthorizingNegotiationRequestState(P2pStateMachine &, WifiP2pGroupManager &, WifiP2pDeviceManager &); + AuthorizingNegotiationRequestState(P2pStateMachine &stateMachine, WifiP2pGroupManager &groupMgr, + WifiP2pDeviceManager &deviceMgr); /** * @Description Destroy the Authorizing Negotlation Request State object -- Gitee From 30c713509da6d0cd1253a216e3166e35d3226a65 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Sat, 15 Oct 2022 22:15:20 +0800 Subject: [PATCH 410/491] optimize wifi code 1015 Signed-off-by: yanxiaotao@huawei.com --- .../wifi_manage/wifi_ap/ap_interface.cpp | 4 +- .../wifi_manage/wifi_ap/ap_interface.h | 2 +- .../wifi_manage/wifi_ap/ap_service.cpp | 79 ++++++++++++++++--- .../wifi_manage/wifi_ap/ap_service.h | 2 +- .../wifi_manage/wifi_ap/i_ap_service.h | 2 +- .../wifi_manage/wifi_hotspot_service_impl.cpp | 14 +++- .../wifi_manage/wifi_hotspot_service_impl.h | 8 ++ .../wifi_manage/wifi_manager.cpp | 4 - .../wifi_toolkit/config/wifi_settings.cpp | 1 + 9 files changed, 97 insertions(+), 19 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_interface.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_interface.cpp index 318b833..5c9d7f2 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_interface.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_interface.cpp @@ -81,9 +81,9 @@ ErrCode ApInterface::GetValidBands(std::vector &bands) return m_ApService.GetValidBands(bands); } -ErrCode ApInterface::GetValidChannels(BandType band, std::vector &validchannel) +ErrCode ApInterface::GetValidChannels(BandType band, std::vector &validChannel) { - return m_ApService.GetValidChannels(band, validchannel); + return m_ApService.GetValidChannels(band, validChannel); } ErrCode ApInterface::RegisterApServiceCallbacks(const IApServiceCallbacks &callbacks) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_interface.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_interface.h index 51156df..526a0a5 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_interface.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_interface.h @@ -110,7 +110,7 @@ public: * @param validchannel - band's valid channel * @return ErrCode - success: WIFI_OPT_SUCCESS failed: ERROR_CODE */ - virtual ErrCode GetValidChannels(BandType band, std::vector &validchannel) override; + virtual ErrCode GetValidChannels(BandType band, std::vector &validChannel) override; /** * @Description Get supported power model list diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.cpp index 75f7cd6..54aa042 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.cpp @@ -135,27 +135,88 @@ ErrCode ApService::GetStationList(std::vector &result) const ErrCode ApService::GetValidBands(std::vector &bands) { WIFI_LOGI("Instance %{public}d %{public}s", m_id, __func__); - if (WifiSettings::GetInstance().GetValidBands(bands) < 0) { - WIFI_LOGE("Delete block list failed!"); + std::vector allowed5GFreq; + std::vector allowed2GFreq; + if (WifiSettings::GetInstance().GetValidBands(bands) != 0) { + WIFI_LOGE("%{public}s, GetValidBands failed!", __func__); return ErrCode::WIFI_OPT_FAILED; } + if (bands.size() > 0) { + return ErrCode::WIFI_OPT_SUCCESS; + } + + std::vector &tmpBands; + /* Get freqs from hal */ + if (WifiApHalInterface::GetInstance().GetFrequenciesByBand(static_cast(BandType::BAND_2GHZ), allowed2GFreq)) { + WIFI_LOGW("%{public}s, fail to get 2.4G channel", __func__); + } + if (WifiApHalInterface::GetInstance().GetFrequenciesByBand(static_cast(BandType::BAND_5GHZ), allowed5GFreq)) { + WIFI_LOGW("%{public}s, fail to get 5G channel", __func__); + } + if (allowed2GFreq.size() > 0) { + tmpBands.push_back(BandType::BAND_2GHZ); + } + if (allowed5GFreq.size() > 0) { + tmpBands.push_back(BandType::BAND_5GHZ); + } + if (tmpBands.size() <= 0) { + WIFI_LOGW("%{public}s, GetValidBands failed!", __func__); + return ErrCode::WIFI_OPT_FAILED; + } + bands = tmpBands; return ErrCode::WIFI_OPT_SUCCESS; } -ErrCode ApService::GetValidChannels(BandType band, std::vector &validchannel) +ErrCode ApService::GetValidChannels(BandType band, std::vector &validChannel) { WIFI_LOGI("Instance %{public}d %{public}s", m_id, __func__); ChannelsTable channelsInfo; - if (WifiSettings::GetInstance().GetValidChannels(channelsInfo)) { - WIFI_LOGE("Failed to obtain data from the WifiSettings."); + if (WifiSettings::GetInstance().GetValidChannels(channelsInfo) != 0) { + WIFI_LOGE("Failed to obtain channels from the WifiSettings."); return ErrCode::WIFI_OPT_FAILED; } - auto it = channelsInfo.find(band); - if (it == channelsInfo.end()) { - WIFI_LOGE("The value of band is invalid."); + + if (channelsInfo.size() > 0) { + auto it = channelsInfo.find(band); + if (it == channelsInfo.end()) { + WIFI_LOGE("%{public}s, NOT find the band: %{public}d.", band, __func__); + return ErrCode::WIFI_OPT_INVALID_PARAM; + } + validChannel = channelsInfo[band]; + WIFI_LOGI("%{public}s, get valid channel size:%{public}d, band:%{public}d from WifiSettings.", + __func__, validChannel.size(), band); + return ErrCode::WIFI_OPT_SUCCESS; + } + + /* get freqs from hal service */ + std::vector allowed5GFreq, allowed2GFreq; + std::vector allowed5GChan, allowed2GChan; + if (WifiApHalInterface::GetInstance().GetFrequenciesByBand(static_cast(BandType::BAND_2GHZ), allowed2GFreq)) { + WIFI_LOGW("%{public}s, fail to get 2.4G channel", __func__); + } + if (WifiApHalInterface::GetInstance().GetFrequenciesByBand(static_cast(BandType::BAND_5GHZ), allowed5GFreq)) { + WIFI_LOGW("%{public}s, fail to get 5G channel", __func__); + } + if (allowed2GFreq.size() == 0) { + WifiSettings::GetInstance().SetDefaultFrequenciesByCountryBand(BandType::BAND_2GHZ, allowed2GFreq); + } + TransformFrequencyIntoChannel(allowed2GFreq, allowed2GChan); + TransformFrequencyIntoChannel(allowed5GFreq, allowed5GChan); + + ChannelsTable ChanTbs; + ChanTbs[BandType::BAND_2GHZ] = allowed2GChan; + ChanTbs[BandType::BAND_5GHZ] = allowed5GChan; + if (WifiSettings::GetInstance().SetValidChannels(ChanTbs)) { + WIFI_LOGE("%{public}s, fail to SetValidChannels", __func__); + } + if (band == BandType::BAND_2GHZ || band == BandType::BAND_5GHZ) { + validChannel = ChanTbs[band]; + } else { + WIFI_LOGE("%{public}s, invalid band: %{public}d", __func__, band); return ErrCode::WIFI_OPT_INVALID_PARAM; } - validchannel = channelsInfo[band]; + WIFI_LOGI("%{public}s, get valid channel size:%{public}d, band:%{public}d from hal service.", + __func__, validChannel.size(), band); return ErrCode::WIFI_OPT_SUCCESS; } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.h index f7ca798..22df6bf 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.h @@ -107,7 +107,7 @@ public: * @param validchannel - band's valid channel * @return ErrCode - success: WIFI_OPT_SUCCESS failed: ERROR_CODE */ - ErrCode GetValidChannels(BandType band, std::vector &validchannel); + ErrCode GetValidChannels(BandType band, std::vector &validChannel); /** * @Description Sets the callback function for the state machine. diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/i_ap_service.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/i_ap_service.h index 56b1594..aaa39b1 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/i_ap_service.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/i_ap_service.h @@ -36,7 +36,7 @@ public: virtual ErrCode DisconnetStation(const StationInfo &stationInfo) = 0; virtual ErrCode GetStationList(std::vector &result) = 0; virtual ErrCode GetValidBands(std::vector &bands) = 0; - virtual ErrCode GetValidChannels(BandType band, std::vector &validchannel) = 0; + virtual ErrCode GetValidChannels(BandType band, std::vector &validChannel) = 0; virtual ErrCode GetSupportedPowerModel(std::set& setPowerModelList) = 0; virtual ErrCode GetPowerModel(PowerModel& model) = 0; virtual ErrCode SetPowerModel(const PowerModel& model) = 0; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp index 3afe59d..6e72d08 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp @@ -139,7 +139,19 @@ ErrCode WifiHotspotServiceImpl::SetHotspotConfig(const HotspotConfig &config) } if (!mGetChannels) { - if (!WifiConfigCenter::GetInstance().GetSupportedBandChannel()) { + if (!IsApServiceRunning()) { + return WIFI_OPT_AP_NOT_OPENED; + } + IApService *pService = WifiServiceManager::GetInstance().GetApServiceInst(m_id); + if (pService == nullptr) { + WIFI_LOGE("Instance %{public}d get hotspot service is null!", m_id); + return WIFI_OPT_AP_NOT_OPENED; + } + std::vector valid2GChannel; + std::vector valid5GChannel; + (void)pService->GetValidChannels(BandType::BAND_2GHZ, &valid2GChannel); + (void)pService->GetValidChannels(BandType::BAND_5GHZ, &valid5GChannel); + if (valid2GChannel.size() + valid5GChannel.size() == 0) { WIFI_LOGE("Failed to get supported band and channel!"); } else { mGetChannels = true; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.h index 55050ff..33a6076 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.h @@ -162,6 +162,14 @@ public: */ ErrCode GetSupportedPowerModel(std::set& setPowerModelList) override; + /** + * @Description Get supported channels by band + * + * @param band - the band which to get supported channels + * @param channels - the supported channels + * @return ErrCode - operation result + */ + ErrCode GetSupportedChannelsByBand(int band, std::vector &channels) /** * @Description Get power model * diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp index 02f336e..bd22897 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp @@ -245,10 +245,6 @@ int WifiManager::Init() #ifdef FEATURE_P2P_SUPPORT InitP2pCallback(); #endif - if (!WifiConfigCenter::GetInstance().GetSupportedBandChannel()) { - WIFI_LOGE("Failed to get current chip supported band and channel!"); - } - if (WifiServiceManager::GetInstance().CheckPreLoadService() < 0) { WIFI_LOGE("WifiServiceManager check preload feature service failed!"); WifiManager::GetInstance().Exit(); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp index 0da0ed2..d129f53 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp @@ -47,6 +47,7 @@ WifiSettings::WifiSettings() mHotspotState[0] = static_cast(ApState::AP_STATE_CLOSED); powerModel[0] = PowerModel::GENERAL; mThermalLevel = static_cast(ThermalLevel::NORMAL); + mValidChannels.clear(); } WifiSettings::~WifiSettings() -- Gitee From c28ab8c0f10fc86e4e4b2ca839154bb38ff382ee Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Sun, 16 Oct 2022 19:03:56 +0800 Subject: [PATCH 411/491] optimize wifi code 1016 Signed-off-by: yanxiaotao@huawei.com --- .../wifi_framework/wifi_manage/BUILD.gn | 72 +++++++++---------- .../wifi_manage/wifi_config_center.cpp | 27 ------- .../wifi_manage/wifi_config_center.h | 5 -- .../wifi_manage/wifi_device_service_impl.cpp | 21 +++--- .../wifi_manage/wifi_manager.cpp | 12 ++-- 5 files changed, 48 insertions(+), 89 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn index 586e826..d69ebc3 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn @@ -212,7 +212,15 @@ if (defined(ohos_lite)) { ":wifi_manager_service_header", ] - external_deps = [ "ipc:ipc_core" ] + deps = [ + "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", + "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk:system_ability_fwk", + ] + + external_deps = [ + "c_utils:utils", + "ipc:ipc_core", + ] } ohos_source_set("wifi_device_service_impl") { part_name = "wifi" @@ -221,8 +229,6 @@ if (defined(ohos_lite)) { "wifi_device_death_recipient.cpp", "wifi_device_service_impl.cpp", "wifi_device_stub.cpp", - "wifi_protect.cpp", - "wifi_protect_manager.cpp", ] configs = [ ":wifi_manager_service_config", @@ -238,7 +244,14 @@ if (defined(ohos_lite)) { defines += [ "FEATURE_AP_SUPPORT" ] } - deps = [ ":wifi_p2p_service_impl" ] + deps = [ + ":wifi_p2p_service_impl", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit", + "$WIFI_ROOT_DIR/utils:wifi_utils", + "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", + "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk:system_ability_fwk", + ] + external_deps = [ "ability_base:want", "bundle_framework:appexecfwk_base", @@ -262,9 +275,18 @@ if (defined(ohos_lite)) { ":wifi_manager_service_header", ] - deps = [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit" ] + deps = [ + "$WIFI_ROOT_DIR/utils:wifi_utils", + "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit", + "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk:system_ability_fwk", + ] + + external_deps = [ + "c_utils:utils", + "ipc:ipc_core", + ] - external_deps = [ "ipc:ipc_core" ] defines = [ "FEATURE_AP_SUPPORT", "AP_INSTANCE_MAX_NUM=$wifi_feature_with_ap_num", @@ -285,10 +307,16 @@ if (defined(ohos_lite)) { ":wifi_manager_service_header", ] - deps = [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit" ] + deps = [ + "$WIFI_ROOT_DIR/utils:wifi_utils", + "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", + "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk:system_ability_fwk", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit", + ] external_deps = [ "ipc:ipc_core", + "c_utils:utils", "netmanager_base:net_conn_manager_if", ] defines = [ "FEATURE_P2P_SUPPORT" ] @@ -310,7 +338,6 @@ if (defined(ohos_lite)) { deps = [ "$WIFI_ROOT_DIR/services/wifi_standard/etc/init:etc", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit", "$WIFI_ROOT_DIR/utils:wifi_utils", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", @@ -346,16 +373,8 @@ if (defined(ohos_lite)) { deps = [ ":wifi_device_service_impl", ":wifi_manager_service", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", - "$WIFI_ROOT_DIR/utils:wifi_utils", - "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk:system_ability_fwk", ] - external_deps = [ - "c_utils:utils", - "ipc:ipc_core", - ] part_name = "wifi" subsystem_name = "communication" } @@ -365,14 +384,8 @@ if (defined(ohos_lite)) { deps = [ ":wifi_manager_service", ":wifi_scan_service_impl", - "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk:system_ability_fwk", ] - external_deps = [ - "c_utils:utils", - "ipc:ipc_core", - ] part_name = "wifi" subsystem_name = "communication" } @@ -382,14 +395,6 @@ if (defined(ohos_lite)) { deps = [ ":wifi_hotspot_service_impl", ":wifi_manager_service", - "$WIFI_ROOT_DIR/utils:wifi_utils", - "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk:system_ability_fwk", - ] - - external_deps = [ - "c_utils:utils", - "ipc:ipc_core", ] part_name = "wifi" @@ -401,15 +406,8 @@ if (defined(ohos_lite)) { deps = [ ":wifi_manager_service", ":wifi_p2p_service_impl", - "$WIFI_ROOT_DIR/utils:wifi_utils", - "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk:system_ability_fwk", ] - external_deps = [ - "c_utils:utils", - "ipc:ipc_core", - ] part_name = "wifi" subsystem_name = "communication" } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.cpp index 51bf129..ea5cb46 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.cpp @@ -236,33 +236,6 @@ int WifiConfigCenter::GetValidChannels(ChannelsTable &channelsInfo) return WifiSettings::GetInstance().GetValidChannels(channelsInfo); } -bool WifiConfigCenter::GetSupportedBandChannel() -{ - std::vector allowed5GFreq, allowed2GFreq; - std::vector allowed5GChan, allowed2GChan; - if (WifiApHalInterface::GetInstance().GetFrequenciesByBand(static_cast(BandType::BAND_2GHZ), allowed2GFreq)) { - WIFI_LOGW("fail to get 2.4G channel"); - WifiSettings::GetInstance().SetDefaultFrequenciesByCountryBand(BandType::BAND_2GHZ, allowed2GFreq); - } - if (WifiApHalInterface::GetInstance().GetFrequenciesByBand(static_cast(BandType::BAND_5GHZ), allowed5GFreq)) { - WIFI_LOGW("fail to get 5G channel"); - WifiSettings::GetInstance().SetDefaultFrequenciesByCountryBand(BandType::BAND_5GHZ, allowed5GFreq); - } - - TransformFrequencyIntoChannel(allowed5GFreq, allowed5GChan); - TransformFrequencyIntoChannel(allowed2GFreq, allowed2GChan); - - ChannelsTable ChanTbs; - ChanTbs[BandType::BAND_2GHZ] = allowed2GChan; - ChanTbs[BandType::BAND_5GHZ] = allowed5GChan; - - if (WifiSettings::GetInstance().SetValidChannels(ChanTbs)) { - WIFI_LOGE("fail to SetValidChannels"); - return false; - } - return true; -} - WifiOprMidState WifiConfigCenter::GetScanMidState() { return mScanMidState.load(); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.h index 8bbd03c..4affcf4 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.h @@ -312,11 +312,6 @@ public: */ int GetValidChannels(ChannelsTable &channelsInfo); - /** - * @Description request to chip for initiation current valid bands and channels - */ - bool GetSupportedBandChannel(); - /** * @Description Get current scan service middle state * diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp index dbd7808..e171725 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp @@ -323,26 +323,20 @@ ErrCode WifiDeviceServiceImpl::DisableWifi() ErrCode WifiDeviceServiceImpl::InitWifiProtect(const WifiProtectType &protectType, const std::string &protectName) { - if (WifiProtectManager::GetInstance().InitWifiProtect(protectType, protectName)) { - return WIFI_OPT_SUCCESS; - } - return WIFI_OPT_FAILED; + /* refer to WifiProtectManager::GetInstance().InitWifiProtect, DO NOT support now! */ + return WIFI_OPT_SUCCESS; } ErrCode WifiDeviceServiceImpl::GetWifiProtectRef(const WifiProtectMode &protectMode, const std::string &protectName) { - if (WifiProtectManager::GetInstance().GetWifiProtect(protectMode, protectName)) { - return WIFI_OPT_SUCCESS; - } - return WIFI_OPT_FAILED; + /* refer to WifiProtectManager::GetInstance().GetWifiProtect, DO NOT support now! */ + return WIFI_OPT_SUCCESS; } ErrCode WifiDeviceServiceImpl::PutWifiProtectRef(const std::string &protectName) { - if (WifiProtectManager::GetInstance().PutWifiProtect(protectName)) { - return WIFI_OPT_SUCCESS; - } - return WIFI_OPT_FAILED; + /* refer to WifiProtectManager::GetInstance().PutWifiProtect, DO NOT support now! */ + return WIFI_OPT_SUCCESS; } bool WifiDeviceServiceImpl::CheckConfigEap(const WifiDeviceConfig &config) @@ -1063,7 +1057,8 @@ ErrCode WifiDeviceServiceImpl::GetDeviceMacAddress(std::string &result) bool WifiDeviceServiceImpl::SetLowLatencyMode(bool enabled) { WIFI_LOGI("SetLowLatencyMode"); - return WifiProtectManager::GetInstance().SetLowLatencyMode(enabled); + /* refer to WifiProtectManager::GetInstance().SetLowLatencyMode, DO NOT support now! */ + return true; } ErrCode WifiDeviceServiceImpl::CheckCanEnableWifi(void) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp index bd22897..dbc5178 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp @@ -268,7 +268,8 @@ void WifiManager::Exit() { WIFI_LOGI("[WifiManager] Exit."); WifiServiceManager::GetInstance().UninstallAllService(); - WifiStaHalInterface::GetInstance().ExitAllIdlClient(); + /* NOTE:: DO NOT allow call hal interface function, delete at 2022.10.16 */ + /* Refer to WifiStaHalInterface::GetInstance().ExitAllIdlClient(); */ WifiInternalEventDispatcher::GetInstance().Exit(); if (mCloseServiceThread.joinable()) { PushServiceCloseMsg(WifiCloseServiceCode::SERVICE_THREAD_EXIT); @@ -292,11 +293,6 @@ void WifiManager::AddSupportedFeatures(WifiFeatures feature) int WifiManager::GetSupportedFeatures(long &features) { - int capability = 0; - if (WifiChipHalInterface::GetInstance().GetChipCapabilities(capability) != WIFI_IDL_OPT_OK) { - WIFI_LOGE("Failed to get chip capability!"); - return -1; - } long supportedFeatures = mSupportedFeatures; supportedFeatures |= static_cast(WifiFeatures::WIFI_FEATURE_INFRA); supportedFeatures |= static_cast(WifiFeatures::WIFI_FEATURE_INFRA_5G); @@ -305,7 +301,9 @@ int WifiManager::GetSupportedFeatures(long &features) supportedFeatures |= static_cast(WifiFeatures::WIFI_FEATURE_WPA3_SAE); supportedFeatures |= static_cast(WifiFeatures::WIFI_FEATURE_WPA3_SUITE_B); supportedFeatures |= static_cast(WifiFeatures::WIFI_FEATURE_OWE); - features = (supportedFeatures & capability); + /* NOTE: features = supportedFeatures & WifiChipHalInterface::GetInstance().GetChipCapabilities */ + /* It does NOT allow call HalInterface from wifi_manager */ + features = supportedFeatures; return 0; } -- Gitee From 88b76ead629b52a04897fe9616c4354c34c96e16 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Sun, 16 Oct 2022 19:44:39 +0800 Subject: [PATCH 412/491] optimize wifi code 1016 Signed-off-by: yanxiaotao@huawei.com --- .../wifi_framework/wifi_manage/wifi_ap/ap_service.cpp | 4 ++-- .../wifi_manage/wifi_hotspot_service_impl.cpp | 4 ++-- .../wifi_manage/wifi_hotspot_service_impl.h | 8 -------- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.cpp index 54aa042..a2190e7 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.cpp @@ -145,7 +145,7 @@ ErrCode ApService::GetValidBands(std::vector &bands) return ErrCode::WIFI_OPT_SUCCESS; } - std::vector &tmpBands; + std::vector tmpBands; /* Get freqs from hal */ if (WifiApHalInterface::GetInstance().GetFrequenciesByBand(static_cast(BandType::BAND_2GHZ), allowed2GFreq)) { WIFI_LOGW("%{public}s, fail to get 2.4G channel", __func__); @@ -179,7 +179,7 @@ ErrCode ApService::GetValidChannels(BandType band, std::vector &validCh if (channelsInfo.size() > 0) { auto it = channelsInfo.find(band); if (it == channelsInfo.end()) { - WIFI_LOGE("%{public}s, NOT find the band: %{public}d.", band, __func__); + WIFI_LOGE("%{public}s, NOT find the band: %{public}d.", __func__, band); return ErrCode::WIFI_OPT_INVALID_PARAM; } validChannel = channelsInfo[band]; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp index 6e72d08..ff23be4 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp @@ -149,8 +149,8 @@ ErrCode WifiHotspotServiceImpl::SetHotspotConfig(const HotspotConfig &config) } std::vector valid2GChannel; std::vector valid5GChannel; - (void)pService->GetValidChannels(BandType::BAND_2GHZ, &valid2GChannel); - (void)pService->GetValidChannels(BandType::BAND_5GHZ, &valid5GChannel); + (void)pService->GetValidChannels(BandType::BAND_2GHZ, valid2GChannel); + (void)pService->GetValidChannels(BandType::BAND_5GHZ, valid5GChannel); if (valid2GChannel.size() + valid5GChannel.size() == 0) { WIFI_LOGE("Failed to get supported band and channel!"); } else { diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.h index 33a6076..55050ff 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.h @@ -162,14 +162,6 @@ public: */ ErrCode GetSupportedPowerModel(std::set& setPowerModelList) override; - /** - * @Description Get supported channels by band - * - * @param band - the band which to get supported channels - * @param channels - the supported channels - * @return ErrCode - operation result - */ - ErrCode GetSupportedChannelsByBand(int band, std::vector &channels) /** * @Description Get power model * -- Gitee From 91859574af12f34983af02ed84dd2c779d65f848 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 17 Oct 2022 11:41:29 +0800 Subject: [PATCH 413/491] Optimize wifi code 1017 Signed-off-by: yanxiaotao@huawei.com --- .../wifi_standard/wifi_framework/wifi_manage/BUILD.gn | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn index d69ebc3..2536c35 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn @@ -276,9 +276,9 @@ if (defined(ohos_lite)) { ] deps = [ + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit", "$WIFI_ROOT_DIR/utils:wifi_utils", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit", "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk:system_ability_fwk", ] @@ -308,15 +308,15 @@ if (defined(ohos_lite)) { ] deps = [ + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit", "$WIFI_ROOT_DIR/utils:wifi_utils", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk:system_ability_fwk", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit", ] external_deps = [ - "ipc:ipc_core", "c_utils:utils", + "ipc:ipc_core", "netmanager_base:net_conn_manager_if", ] defines = [ "FEATURE_P2P_SUPPORT" ] -- Gitee From 80d2cf8d3ccc36cf72c8a4eb63b8f0620c8f7a20 Mon Sep 17 00:00:00 2001 From: fengye Date: Wed, 19 Oct 2022 09:09:49 +0000 Subject: [PATCH 414/491] close Signed-off-by: fengye --- .../wifi_framework/wifi_toolkit/utils/wifi_encryption_util.h | 1 - wifi/wifi.gni | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.h b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.h index c7b74f4..5817b92 100755 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.h @@ -12,7 +12,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - #ifdef FEATURE_ENCRYPTION_SUPPORT #ifndef OHOS_WIFI_CONFIG_HKS_H #define OHOS_WIFI_CONFIG_HKS_H diff --git a/wifi/wifi.gni b/wifi/wifi.gni index 3b90668..920d168 100644 --- a/wifi/wifi.gni +++ b/wifi/wifi.gni @@ -22,6 +22,6 @@ declare_args() { wifi_feature_with_ap_num = 1 wifi_feature_with_auth_disable = false wifi_feature_with_dhcp_disable = false - wifi_feature_with_encryption = true + wifi_feature_with_encryption = false wifi_feature_is_hdi_supported = false } -- Gitee From 01b8182c01d1690849a2c55e90ceaa21347f3350 Mon Sep 17 00:00:00 2001 From: fengye Date: Thu, 20 Oct 2022 03:27:21 +0000 Subject: [PATCH 415/491] unittest Signed-off-by: fengye --- .../wifi_toolkit/unittest/BUILD.gn | 5 + .../unittest/wifi_encryption_util_test.cpp | 96 +++++++++++++++++++ .../unittest/wifi_encryption_util_test.h | 39 ++++++++ 3 files changed, 140 insertions(+) create mode 100755 wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/wifi_encryption_util_test.cpp create mode 100755 wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/wifi_encryption_util_test.h diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/BUILD.gn index f38917d..1c19eb0 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/BUILD.gn @@ -35,8 +35,10 @@ ohos_unittest("toolkit_unittest") { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/ipv6_address.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/mac_address.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/network_interface.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_global_func.cpp", "wifi_config_file_test.cpp", + "wifi_encryption_util_test.cpp" "wifi_global_func_test.cpp", "wifi_ip_tools_test.cpp", "wifi_log_helper_test.cpp", @@ -68,6 +70,9 @@ ohos_unittest("toolkit_unittest") { "c_utils:utils", "hiviewdfx_hilog_native:libhilog", ] + if (wifi_feature_with_encryption) { + external_deps += [ "huks:libhukssdk" ] + } configs = [ ":module_private_config" ] part_name = "wifi" diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/wifi_encryption_util_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/wifi_encryption_util_test.cpp new file mode 100755 index 0000000..93828ea --- /dev/null +++ b/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/wifi_encryption_util_test.cpp @@ -0,0 +1,96 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#ifdef FEATURE_ENCRYPTION_SUPPORT +#include "wifi_encryption_util_test.h" +#include "wifi_encryption_util.h" + +using namespace testing::ext; + +namespace OHOS { +namespace Wifi { + +static struct HksParam g_genParam[] = { + { .tag = HKS_TAG_KEY_STORAGE_FLAG, .uint32Param = HKS_STORAGE_PERSISTENT }, + { .tag = HKS_TAG_ALGORITHM, .uint32Param = HKS_ALG_AES }, + { .tag = HKS_TAG_KEY_SIZE, .uint32Param = HKS_AES_KEY_SIZE_256 }, + { .tag = HKS_TAG_PURPOSE, .uint32Param = HKS_KEY_PURPOSE_ENCRYPT | HKS_KEY_PURPOSE_DECRYPT }, + { .tag = HKS_TAG_DIGEST, .uint32Param = HKS_DIGEST_NONE }, + { .tag = HKS_TAG_PADDING, .uint32Param = HKS_PADDING_NONE }, + { .tag = HKS_TAG_IS_KEY_ALIAS, .boolParam = true }, + { .tag = HKS_TAG_KEY_GENERATE_TYPE, .uint32Param = HKS_KEY_GENERATE_TYPE_DEFAULT }, + { .tag = HKS_TAG_BLOCK_MODE, .uint32Param = HKS_MODE_GCM }, + { .tag = HKS_TAG_ASSOCIATED_DATA, .blob = { .size = AAD_SIZE, .data = (uint8_t *)AAD } }, +}; + +HWTEST_F(WifiEncryptionUtilFuncTest, GetKey_001, TestSize.Level1) +{ + WifiEncryptionInfo testEncryptionInfo; + testEncryptionInfo.setFile("TestKey"); + struct HksParam IVParam[] = { + { .tag = HKS_TAG_NONCE, .blob = { .size = NONCE_SIZE, .data = nonce } }, + }; + struct HksParamSet *testParamSet = nullptr; + EXPECT_TRUE(HksInitParamSet(&testParamSet) == HKS_SUCCESS); + EXPECT_TRUE(HksAddParams(testParamSet, g_genParam, sizeof(g_genParam) / sizeof(HksParam)) == HKS_SUCCESS); + EXPECT_TRUE(HksAddParams(testParamSet, IVParam, sizeof(IVParam) / sizeof(HksParam)) == HKS_SUCCESS); + EXPECT_TRUE(HksBuildParamSet(&testParamSet) == HKS_SUCCESS); + EXPECT_TRUE(GetKey(testEncryptionInfo, testParamSet) == HKS_SUCCESS); +} + +HWTEST_F(WifiEncryptionUtilFuncTest, WifiEncryption_002, TestSize.Level1) +{ + WifiEncryptionInfo testEncryptionInfo; + testEncryptionInfo.setFile("TestEncryption"); + EncryptedData encryResult; + const std::string inputString = "12345678"; + EXPECT_TRUE(WifiEncryption(testEncryptionInfo, inputString, encryResult) == HKS_SUCCESS); +} + +HWTEST_F(WifiEncryptionUtilFuncTest, WifiEncryption_003, TestSize.Level1) +{ + WifiEncryptionInfo testEncryptionInfo; + testEncryptionInfo.setFile("TestEncryption"); + EncryptedData encryResult; + const std::string inputString = ""; + EXPECT_TRUE(WifiEncryption(testEncryptionInfo, inputString, encryResult) == HKS_SUCCESS); + EXPECT_TRUE(inputString.compare(encryResult.encryptedPassword) == 0); +} + +HWTEST_F(WifiEncryptionUtilFuncTest, WifiDecryption_004, TestSize.Level1) +{ + WifiEncryptionInfo testEncryptionInfo; + testEncryptionInfo.setFile("TestDecryption"); + EncryptedData encryResult; + const std::string inputString = "12345678"; + EXPECT_TRUE(WifiEncryption(testEncryptionInfo, inputString, encryResult) == HKS_SUCCESS); + std::string decryptedData = ""; + EXPECT_TRUE(WifiDecryption(testEncryptionInfo, encryResult, decryptedData) == HKS_SUCCESS); + EXPECT_TRUE(inputString.compare(decryptedData) == 0); +} + +HWTEST_F(WifiEncryptionUtilFuncTest, WifiDecryptionFailed_005, TestSize.Level1) +{ + WifiEncryptionInfo testEncryptionInfo; + testEncryptionInfo.setFile("NonExist"); + EncryptedData encryResult; + const std::string inputString = "12345678"; + std::string decryptedData = ""; + EXPECT_TRUE(WifiDecryption(testEncryptionInfo, encryResult, decryptedData) != HKS_SUCCESS); + EXPECT_TRUE(decryptedData.compare("") == 0); +} + +} // namespace Wifi +} // namespace OHOS +#endif \ No newline at end of file diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/wifi_encryption_util_test.h b/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/wifi_encryption_util_test.h new file mode 100755 index 0000000..8b0ec84 --- /dev/null +++ b/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/wifi_encryption_util_test.h @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#ifdef FEATURE_ENCRYPTION_SUPPORT +#ifndef OHOS_WIFI_NETWORK_INTERFACE_TEST_H +#define OHOS_WIFI_NETWORK_INTERFACE_TEST_H + +#include +#include "wifi_encryption_util.h" +namespace OHOS { +namespace Wifi { +class WifiNetworkInterfaceTest : public testing::Test { +public: + static void SetUpTestCase() + {} + static void TearDownTestCase() + {} + virtual void SetUp() + { + ASSERT_EQ(SetUpHks(), HKS_SUCCESS) + } + virtual void TearDown() + {} +}; +} // namespace Wifi +} // namespace OHOS +#endif +#endif \ No newline at end of file -- Gitee From 39786f2415ec72287b2f47735dee025f33324c40 Mon Sep 17 00:00:00 2001 From: fengye Date: Thu, 20 Oct 2022 03:33:55 +0000 Subject: [PATCH 416/491] unittest Signed-off-by: fengye --- .../wifi_toolkit/unittest/wifi_config_file_test.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/wifi_config_file_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/wifi_config_file_test.cpp index c08b566..3bf4e99 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/wifi_config_file_test.cpp +++ b/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/wifi_config_file_test.cpp @@ -94,10 +94,7 @@ HWTEST_F(WifiConfigFileTest, SaveDeviceValueCheck, TestSize.Level1) tmp.status = static_cast(WifiDeviceConfigStatus::ENABLED); tmp.bssid = "01:xx:xx:xx:xx:06"; tmp.ssid = "my wifi"; - tmp.band = static_cast(BandType::BAND_2GHZ); - tmp.channel = 1; tmp.isPasspoint = true; - tmp.isEphemeral = true; tmp.preSharedKey = "12345678"; tmp.keyMgmt = "NONE"; tmp.wepKeys[0] = "12345678"; @@ -119,10 +116,7 @@ HWTEST_F(WifiConfigFileTest, SaveDeviceValueCheck, TestSize.Level1) EXPECT_TRUE(tmp.status == ldCfg.status); EXPECT_TRUE(tmp.bssid == ldCfg.bssid); EXPECT_TRUE(tmp.ssid == ldCfg.ssid); - EXPECT_TRUE(tmp.band == ldCfg.band); - EXPECT_TRUE(tmp.channel == ldCfg.channel); EXPECT_TRUE(tmp.isPasspoint == ldCfg.isPasspoint); - EXPECT_TRUE(tmp.isEphemeral == ldCfg.isEphemeral); EXPECT_TRUE(tmp.preSharedKey == ldCfg.preSharedKey); EXPECT_TRUE(tmp.keyMgmt == ldCfg.keyMgmt); EXPECT_TRUE(tmp.wepTxKeyIndex == ldCfg.wepTxKeyIndex); -- Gitee From 2be7b37e21a1983a8253cab5c1a09aff840ecaaa Mon Sep 17 00:00:00 2001 From: fengye Date: Thu, 20 Oct 2022 09:02:34 +0000 Subject: [PATCH 417/491] test cases Signed-off-by: fengye --- .../wifi_toolkit/utils/wifi_encryption_util.h | 24 +++++++ .../wifi_toolkit/unittest/BUILD.gn | 2 +- .../unittest/wifi_encryption_util_test.cpp | 63 +++++++------------ .../unittest/wifi_encryption_util_test.h | 10 +-- 4 files changed, 54 insertions(+), 45 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.h b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.h index 5817b92..d0280bd 100755 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.h @@ -60,13 +60,37 @@ public: ~WifiEncryptionInfo() {} }; +/** + * @Description Set up Huks service + */ int32_t SetUpHks(); +/** + * @Description Generate new or get existed GCM-AES key based on input encryptionInfo and genParamSet + * @param wifiEncryptionInfo - keyAlias info + * @param genParamSet - generate params + * @return HKS_SUCCESS - find key, others - find key failed + */ int32_t GetKey(const WifiEncryptionInfo &wifiEncryptionInfo, const struct HksParamSet *genParamSet); +/** + * @Description Encrypt inputString using GCM-AES based on input encryptionInfo + * @param wifiEncryptionInfo - keyAlias info + * @param inputString - plaint string that needs to be encrypted + * @param encryptedData - encrypted result with encrypted string and IV value + * @return HKS_SUCCESS - encryption success, others - encryption failed + */ int32_t WifiEncryption(const WifiEncryptionInfo &wifiEncryptionInfo, const std::string &inputString, EncryptedData &encryptedData); + +/** + * @Description Decrypt encryptedData using GCM-AES based on input encryptionInfo + * @param wifiEncryptionInfo - keyAlias info + * @param encryptedData - encrypted result with encrypted string and IV value + * @param decryptedData - string after decryption + * @return HKS_SUCCESS - decryption success, others - decryption failed + */ int32_t WifiDecryption(const WifiEncryptionInfo &wifiEncryptionInfo, const EncryptedData &encryptedData, std::string &decryptedData); } diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/BUILD.gn index 1c19eb0..70e565f 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/BUILD.gn @@ -38,7 +38,7 @@ ohos_unittest("toolkit_unittest") { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_global_func.cpp", "wifi_config_file_test.cpp", - "wifi_encryption_util_test.cpp" + "wifi_encryption_util_test.cpp", "wifi_global_func_test.cpp", "wifi_ip_tools_test.cpp", "wifi_log_helper_test.cpp", diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/wifi_encryption_util_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/wifi_encryption_util_test.cpp index 93828ea..3ad1f36 100755 --- a/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/wifi_encryption_util_test.cpp +++ b/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/wifi_encryption_util_test.cpp @@ -36,59 +36,44 @@ static struct HksParam g_genParam[] = { HWTEST_F(WifiEncryptionUtilFuncTest, GetKey_001, TestSize.Level1) { - WifiEncryptionInfo testEncryptionInfo; - testEncryptionInfo.setFile("TestKey"); - struct HksParam IVParam[] = { - { .tag = HKS_TAG_NONCE, .blob = { .size = NONCE_SIZE, .data = nonce } }, - }; + WifiEncryptionInfo testEncryptionInfo; + testEncryptionInfo.SetFile("TestKey"); struct HksParamSet *testParamSet = nullptr; EXPECT_TRUE(HksInitParamSet(&testParamSet) == HKS_SUCCESS); - EXPECT_TRUE(HksAddParams(testParamSet, g_genParam, sizeof(g_genParam) / sizeof(HksParam)) == HKS_SUCCESS); - EXPECT_TRUE(HksAddParams(testParamSet, IVParam, sizeof(IVParam) / sizeof(HksParam)) == HKS_SUCCESS); - EXPECT_TRUE(HksBuildParamSet(&testParamSet) == HKS_SUCCESS); - EXPECT_TRUE(GetKey(testEncryptionInfo, testParamSet) == HKS_SUCCESS); + EXPECT_TRUE(HksAddParams(testParamSet, g_genParam, sizeof(g_genParam) / sizeof(HksParam)) == HKS_SUCCESS); + EXPECT_TRUE(HksBuildParamSet(&testParamSet) == HKS_SUCCESS); + EXPECT_TRUE(GetKey(testEncryptionInfo, testParamSet) == HKS_SUCCESS); } HWTEST_F(WifiEncryptionUtilFuncTest, WifiEncryption_002, TestSize.Level1) { - WifiEncryptionInfo testEncryptionInfo; - testEncryptionInfo.setFile("TestEncryption"); - EncryptedData encryResult; - const std::string inputString = "12345678"; - EXPECT_TRUE(WifiEncryption(testEncryptionInfo, inputString, encryResult) == HKS_SUCCESS); + WifiEncryptionInfo testEncryptionInfo; + testEncryptionInfo.SetFile("TestEncryption"); + EncryptedData encryResult; + const std::string inputString = "12345678"; + EXPECT_TRUE(WifiEncryption(testEncryptionInfo, inputString, encryResult) == HKS_SUCCESS); } HWTEST_F(WifiEncryptionUtilFuncTest, WifiEncryption_003, TestSize.Level1) { - WifiEncryptionInfo testEncryptionInfo; - testEncryptionInfo.setFile("TestEncryption"); - EncryptedData encryResult; - const std::string inputString = ""; - EXPECT_TRUE(WifiEncryption(testEncryptionInfo, inputString, encryResult) == HKS_SUCCESS); - EXPECT_TRUE(inputString.compare(encryResult.encryptedPassword) == 0); + WifiEncryptionInfo testEncryptionInfo; + testEncryptionInfo.SetFile("TestEncryption"); + EncryptedData encryResult; + const std::string inputString = ""; + EXPECT_TRUE(WifiEncryption(testEncryptionInfo, inputString, encryResult) == HKS_SUCCESS); + EXPECT_TRUE(inputString.compare(encryResult.encryptedPassword) == 0); } HWTEST_F(WifiEncryptionUtilFuncTest, WifiDecryption_004, TestSize.Level1) { - WifiEncryptionInfo testEncryptionInfo; - testEncryptionInfo.setFile("TestDecryption"); - EncryptedData encryResult; - const std::string inputString = "12345678"; - EXPECT_TRUE(WifiEncryption(testEncryptionInfo, inputString, encryResult) == HKS_SUCCESS); - std::string decryptedData = ""; - EXPECT_TRUE(WifiDecryption(testEncryptionInfo, encryResult, decryptedData) == HKS_SUCCESS); - EXPECT_TRUE(inputString.compare(decryptedData) == 0); -} - -HWTEST_F(WifiEncryptionUtilFuncTest, WifiDecryptionFailed_005, TestSize.Level1) -{ - WifiEncryptionInfo testEncryptionInfo; - testEncryptionInfo.setFile("NonExist"); - EncryptedData encryResult; - const std::string inputString = "12345678"; - std::string decryptedData = ""; - EXPECT_TRUE(WifiDecryption(testEncryptionInfo, encryResult, decryptedData) != HKS_SUCCESS); - EXPECT_TRUE(decryptedData.compare("") == 0); + WifiEncryptionInfo testEncryptionInfo; + testEncryptionInfo.SetFile("TestDecryption"); + EncryptedData encryResult; + const std::string inputString = "12345678"; + EXPECT_TRUE(WifiEncryption(testEncryptionInfo, inputString, encryResult) == HKS_SUCCESS); + std::string decryptedData = ""; + EXPECT_TRUE(WifiDecryption(testEncryptionInfo, encryResult, decryptedData) == HKS_SUCCESS); + EXPECT_TRUE(inputString.compare(decryptedData) == 0); } } // namespace Wifi diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/wifi_encryption_util_test.h b/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/wifi_encryption_util_test.h index 8b0ec84..4b27d19 100755 --- a/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/wifi_encryption_util_test.h +++ b/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/wifi_encryption_util_test.h @@ -13,14 +13,14 @@ * limitations under the License. */ #ifdef FEATURE_ENCRYPTION_SUPPORT -#ifndef OHOS_WIFI_NETWORK_INTERFACE_TEST_H -#define OHOS_WIFI_NETWORK_INTERFACE_TEST_H +#ifndef OHOS_WIFI_ENCRYPTION_UTIL_TEST_H +#define OHOS_WIFI_ENCRYPTION_UTIL_TEST_H #include #include "wifi_encryption_util.h" namespace OHOS { namespace Wifi { -class WifiNetworkInterfaceTest : public testing::Test { +class WifiEncryptionUtilFuncTest : public testing::Test { public: static void SetUpTestCase() {} @@ -28,8 +28,8 @@ public: {} virtual void SetUp() { - ASSERT_EQ(SetUpHks(), HKS_SUCCESS) - } + ASSERT_EQ(SetUpHks(), HKS_SUCCESS); + } virtual void TearDown() {} }; -- Gitee From 6080d04f74b424bfebee064de17541ebd590d86c Mon Sep 17 00:00:00 2001 From: fengye Date: Thu, 20 Oct 2022 09:22:53 +0000 Subject: [PATCH 418/491] test cases Signed-off-by: fengye --- .../utils/wifi_encryption_util.cpp | 2 +- .../unittest/wifi_encryption_util_test.cpp | 47 +++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.cpp index f580902..3ec4365 100755 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_encryption_util.cpp @@ -131,7 +131,7 @@ int32_t WifiDecryption(const WifiEncryptionInfo &wifiEncryptionInfo, const Encry uint8_t nonce[NONCE_SIZE] = {0}; uint32_t lengthIV = NONCE_SIZE; retStrToArrat = HexStringToVec(encryptedData.IV, nonce, NONCE_SIZE, lengthIV); - if (retStrToArrat != 0) { + if (retStrToArrat != 0) { return HKS_FAILURE; } struct HksParam IVParam[] = { diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/wifi_encryption_util_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/wifi_encryption_util_test.cpp index 3ad1f36..6accc5b 100755 --- a/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/wifi_encryption_util_test.cpp +++ b/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/wifi_encryption_util_test.cpp @@ -76,6 +76,53 @@ HWTEST_F(WifiEncryptionUtilFuncTest, WifiDecryption_004, TestSize.Level1) EXPECT_TRUE(inputString.compare(decryptedData) == 0); } +HWTEST_F(WifiEncryptionUtilFuncTest, WifiDecryption_005, TestSize.Level1) +{ + WifiEncryptionInfo testEncryptionInfo; + testEncryptionInfo.SetFile("TestDecryption"); + EncryptedData encryResult; + encryResuolt.encryptedPassword = ""; + std::string decryptedData = ""; + EXPECT_TRUE(WifiDecryption(testEncryptionInfo, encryResult, decryptedData) == HKS_SUCCESS); + EXPECT_TRUE(decryptedData.compare("") == 0); +} + +HWTEST_F(WifiEncryptionUtilFuncTest, WifiDecryptionFailed_006, TestSize.Level1) +{ + WifiEncryptionInfo testEncryptionInfo; + testEncryptionInfo.SetFile("TestDecryption"); + EncryptedData encryResult; + encryResuolt.encryptedPassword = "1234567"; + std::string decryptedData = ""; + EXPECT_TRUE(WifiDecryption(testEncryptionInfo, encryResult, decryptedData) != HKS_SUCCESS); + EXPECT_TRUE(decryptedData.compare("") == 0); +} + +HWTEST_F(WifiEncryptionUtilFuncTest, WifiDecryptionFailed_007, TestSize.Level1) +{ + WifiEncryptionInfo testEncryptionInfo; + testEncryptionInfo.SetFile("TestDecryption"); + EncryptedData encryResult; + encryResuolt.encryptedPassword = "12345678"; + encryResuolt.encryptedPassword = "1234567"; + std::string decryptedData = ""; + EXPECT_TRUE(WifiDecryption(testEncryptionInfo, encryResult, decryptedData) != HKS_SUCCESS); + EXPECT_TRUE(decryptedData.compare("") == 0); +} + +HWTEST_F(WifiEncryptionUtilFuncTest, WifiDecryption_008, TestSize.Level1) +{ + WifiEncryptionInfo testEncryptionInfo; + testEncryptionInfo.SetFile("TestEncryption008"); + EncryptedData encryResult; + const std::string inputString = "12345678"; + EXPECT_TRUE(WifiEncryption(testEncryptionInfo, inputString, encryResult) == HKS_SUCCESS); + std::string decryptedData = ""; + WifiEncryptionInfo testDecryptionInfo; + testDecryptionInfo.SetFile("TestDecryption008"); + EXPECT_TRUE(WifiDecryption(testDecryptionInfo, encryResult, decryptedData) == HKS_SUCCESS); + EXPECT_TRUE(inputString.compare(decryptedData) != 0); +} } // namespace Wifi } // namespace OHOS #endif \ No newline at end of file -- Gitee From 3e7b3ca5fa3d23f79210d676aebae95144d644a1 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Thu, 20 Oct 2022 17:47:57 +0800 Subject: [PATCH 419/491] add error code for wifi 1020 Signed-off-by: yanxiaotao@huawei.com --- .../wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.c | 1 - 1 file changed, 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.c b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.c index 75d3d6e..05117f3 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.c +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.c @@ -459,7 +459,6 @@ static void GetScanInfoElems(Context *context, ScanInfo* scanInfo) const unsigned int MAX_INFO_ELEMS_SIZE = 256; ReadInt(context, &scanInfo->ieSize); if (scanInfo->ieSize <= 0 || scanInfo->ieSize > MAX_INFO_ELEMS_SIZE) { - LOGE("Invalid ieSize: %{public}d!", scanInfo->ieSize); return; } /* This pointer will be released in its client */ -- Gitee From 9d84055f51c7f7f3ab4094b5b8a28bfb77b3ffe7 Mon Sep 17 00:00:00 2001 From: fengye Date: Thu, 20 Oct 2022 10:38:23 +0000 Subject: [PATCH 420/491] test cases Signed-off-by: fengye --- .../wifi_framework/wifi_toolkit/unittest/BUILD.gn | 3 ++- .../unittest/wifi_encryption_util_test.cpp | 11 +++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/BUILD.gn index 70e565f..b9e39c1 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/BUILD.gn @@ -65,12 +65,13 @@ ohos_unittest("toolkit_unittest") { "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", ] - + defines = [] external_deps = [ "c_utils:utils", "hiviewdfx_hilog_native:libhilog", ] if (wifi_feature_with_encryption) { + defines += [ "FEATURE_ENCRYPTION_SUPPORT" ] external_deps += [ "huks:libhukssdk" ] } configs = [ ":module_private_config" ] diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/wifi_encryption_util_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/wifi_encryption_util_test.cpp index 6accc5b..587c371 100755 --- a/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/wifi_encryption_util_test.cpp +++ b/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/wifi_encryption_util_test.cpp @@ -81,7 +81,7 @@ HWTEST_F(WifiEncryptionUtilFuncTest, WifiDecryption_005, TestSize.Level1) WifiEncryptionInfo testEncryptionInfo; testEncryptionInfo.SetFile("TestDecryption"); EncryptedData encryResult; - encryResuolt.encryptedPassword = ""; + encryResult.encryptedPassword = ""; std::string decryptedData = ""; EXPECT_TRUE(WifiDecryption(testEncryptionInfo, encryResult, decryptedData) == HKS_SUCCESS); EXPECT_TRUE(decryptedData.compare("") == 0); @@ -92,7 +92,7 @@ HWTEST_F(WifiEncryptionUtilFuncTest, WifiDecryptionFailed_006, TestSize.Level1) WifiEncryptionInfo testEncryptionInfo; testEncryptionInfo.SetFile("TestDecryption"); EncryptedData encryResult; - encryResuolt.encryptedPassword = "1234567"; + encryResult.encryptedPassword = "1234567"; std::string decryptedData = ""; EXPECT_TRUE(WifiDecryption(testEncryptionInfo, encryResult, decryptedData) != HKS_SUCCESS); EXPECT_TRUE(decryptedData.compare("") == 0); @@ -103,8 +103,8 @@ HWTEST_F(WifiEncryptionUtilFuncTest, WifiDecryptionFailed_007, TestSize.Level1) WifiEncryptionInfo testEncryptionInfo; testEncryptionInfo.SetFile("TestDecryption"); EncryptedData encryResult; - encryResuolt.encryptedPassword = "12345678"; - encryResuolt.encryptedPassword = "1234567"; + encryResult.encryptedPassword = "12345678"; + encryResult.encryptedPassword = "1234567"; std::string decryptedData = ""; EXPECT_TRUE(WifiDecryption(testEncryptionInfo, encryResult, decryptedData) != HKS_SUCCESS); EXPECT_TRUE(decryptedData.compare("") == 0); @@ -120,8 +120,7 @@ HWTEST_F(WifiEncryptionUtilFuncTest, WifiDecryption_008, TestSize.Level1) std::string decryptedData = ""; WifiEncryptionInfo testDecryptionInfo; testDecryptionInfo.SetFile("TestDecryption008"); - EXPECT_TRUE(WifiDecryption(testDecryptionInfo, encryResult, decryptedData) == HKS_SUCCESS); - EXPECT_TRUE(inputString.compare(decryptedData) != 0); + EXPECT_TRUE(WifiDecryption(testDecryptionInfo, encryResult, decryptedData) != HKS_SUCCESS); } } // namespace Wifi } // namespace OHOS -- Gitee From 5a04d49d43784c975deb7697eef0902c67fc269d Mon Sep 17 00:00:00 2001 From: fengye Date: Thu, 20 Oct 2022 11:12:08 +0000 Subject: [PATCH 421/491] test cases Signed-off-by: fengye --- .../wifi_framework/wifi_toolkit/unittest/BUILD.gn | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/BUILD.gn index b9e39c1..0712b7b 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/BUILD.gn @@ -71,9 +71,9 @@ ohos_unittest("toolkit_unittest") { "hiviewdfx_hilog_native:libhilog", ] if (wifi_feature_with_encryption) { - defines += [ "FEATURE_ENCRYPTION_SUPPORT" ] - external_deps += [ "huks:libhukssdk" ] - } + external_deps += [ "huks:libhukssdk" ] + defines += [ "FEATURE_ENCRYPTION_SUPPORT" ] + } configs = [ ":module_private_config" ] part_name = "wifi" -- Gitee From f609089f6de285a9fec78952cedd5496900a79fe Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Thu, 20 Oct 2022 12:19:49 +0000 Subject: [PATCH 422/491] ok Signed-off-by: yanxiaotao --- wifi.patch | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 wifi.patch diff --git a/wifi.patch b/wifi.patch new file mode 100644 index 0000000..2dc9702 --- /dev/null +++ b/wifi.patch @@ -0,0 +1,46 @@ +static std::map errCodeMap = { + { ErrCode::WIFI_OPT_SUCCESS, ExtErrCode::WIFI_EXT_SUCCESS }, + { ErrCode::WIFI_OPT_FAILED, ExtErrCode::WIFI_EXT_FAILED_UNKNOWN }, + { ErrCode::WIFI_OPT_NOT_SUPPORTED, ExtErrCode::WIFI_EXT_NOT_SUPPORTED }, + { ErrCode::WIFI_OPT_INVALID_PARAM, ExtErrCode::WIFI_EXT_INVALID_PARAM }, + { ErrCode::WIFI_OPT_FORBID_AIRPLANE, ExtErrCode::WIFI_EXT_FORBID_AIRPLANE }, + { ErrCode::WIFI_OPT_FORBID_POWSAVING, ExtErrCode::WIFI_EXT_FORBID_POWSAVING}, + { ErrCode::WIFI_OPT_PERMISSION_DENIED, ExtErrCode::WIFI_EXT_PERMISSION_DENIED }, + { ErrCode::WIFI_OPT_OPEN_FAIL_WHEN_CLOSING, ExtErrCode::WIFI_EXT_FAILED_UNKNOWN }, + { ErrCode::WIFI_OPT_OPEN_SUCC_WHEN_OPENED, ExtErrCode::WIFI_EXT_FAILED_UNKNOWN }, + { ErrCode::WIFI_OPT_CLOSE_FAIL_WHEN_OPENING, ExtErrCode::WIFI_EXT_FAILED_UNKNOWN }, + { ErrCode::WIFI_OPT_CLOSE_SUCC_WHEN_CLOSED, ExtErrCode::WIFI_EXT_FAILED_UNKNOWN }, + { ErrCode::WIFI_OPT_STA_NOT_OPENED, ExtErrCode::WIFI_EXT_WIFI_NOT_OPENED }, + { ErrCode::WIFI_OPT_SCAN_NOT_OPENED, ExtErrCode::WIFI_EXT_FAILED_UNKNOWN }, + { ErrCode::WIFI_OPT_AP_NOT_OPENED, ExtErrCode::WIFI_EXT_AP_NOT_OPENED }, + { ErrCode::WIFI_OPT_INVALID_CONFIG, ExtErrCode::WIFI_EXT_FAILED_UNKNOWN }, + { ErrCode::WIFI_OPT_P2P_NOT_OPENED, ExtErrCode::WIFI_EXT_WIFI_NOT_OPENED }, + { ErrCode::WIFI_OPT_P2P_MAC_NOT_FOUND, ExtErrCode::WIFI_EXT_FAILED_UNKNOWN }, + { ErrCode::WIFI_OPT_P2P_ERR_MAC_FORMAT, ExtErrCode::WIFI_EXT_FAILED_UNKNOWN }, + { ErrCode::WIFI_OPT_P2P_ERR_INTENT, ExtErrCode::WIFI_EXT_FAILED_UNKNOWN }, + { ErrCode::WIFI_OPT_P2P_ERR_SIZE_NW_NAME, ExtErrCode::WIFI_EXT_FAILED_UNKNOWN }, + { ErrCode::WIFI_OPT_MOVING_FREEZE_CTRL, ExtErrCode::WIFI_EXT_FAILED_UNKNOWN }, +}; + +static std::map extErrMsgMap { + { ExtErrCode::WIFI_EXT_FAILED_UNKNOWN, "Unkonwn fail." }, + { ExtErrCode::WIFI_EXT_FORBID_AIRPLANE, "Airplane mode is opened." }, + { ExtErrCode::WIFI_EXT_FORBID_POWSAVING, "Power saving is opened." }, + { ExtErrCode::WIFI_EXT_WIFI_NOT_OPENED, "WIFI doesn't open." }, + { ExtErrCode::WIFI_EXT_AP_NOT_OPENED, "AP doesn't open." }, + { ExtErrCode::WIFI_EXT_PERMISSION_DENIED, "Permission denied." }, + { ExtErrCode::WIFI_EXT_INVALID_PARAM, "Parameter error." }, + { ExtErrCode::WIFI_EXT_NOT_SUPPORTED, "Capability not supported." }, +}; + +enum ExtErrCode { + WIFI_EXT_SUCCESS = 0, /* successfully */ + WIFI_EXT_FAILED_UNKNOWN = 1, /* failed */ + WIFI_EXT_FORBID_AIRPLANE = 4, /* forbid when current airplane opened */ + WIFI_EXT_FORBID_POWSAVING = 5, /* forbid when current powersaving opened */ + WIFI_EXT_WIFI_NOT_OPENED = 11, /* sta service not opened */ + WIFI_EXT_AP_NOT_OPENED = 13, /* ap service not opened */ + WIFI_EXT_PERMISSION_DENIED = 201, /* permission denied */ + WIFI_EXT_INVALID_PARAM = 401, /* invalid params */ + WIFI_EXT_NOT_SUPPORTED = 801, /* not supported */ +}; \ No newline at end of file -- Gitee From 6dd22ddd4322659fc0492f03122e6a30e4356827 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Thu, 20 Oct 2022 23:42:50 +0800 Subject: [PATCH 423/491] Optimize wifi code 1020 Signed-off-by: yanxiaotao@huawei.com --- wifi.patch | 46 ------------------- .../wifi_manage/wifi_ap/ap_service.cpp | 20 ++++---- .../wifi_sta/sta_auto_connect_service.cpp | 15 +++--- 3 files changed, 17 insertions(+), 64 deletions(-) delete mode 100644 wifi.patch diff --git a/wifi.patch b/wifi.patch deleted file mode 100644 index 2dc9702..0000000 --- a/wifi.patch +++ /dev/null @@ -1,46 +0,0 @@ -static std::map errCodeMap = { - { ErrCode::WIFI_OPT_SUCCESS, ExtErrCode::WIFI_EXT_SUCCESS }, - { ErrCode::WIFI_OPT_FAILED, ExtErrCode::WIFI_EXT_FAILED_UNKNOWN }, - { ErrCode::WIFI_OPT_NOT_SUPPORTED, ExtErrCode::WIFI_EXT_NOT_SUPPORTED }, - { ErrCode::WIFI_OPT_INVALID_PARAM, ExtErrCode::WIFI_EXT_INVALID_PARAM }, - { ErrCode::WIFI_OPT_FORBID_AIRPLANE, ExtErrCode::WIFI_EXT_FORBID_AIRPLANE }, - { ErrCode::WIFI_OPT_FORBID_POWSAVING, ExtErrCode::WIFI_EXT_FORBID_POWSAVING}, - { ErrCode::WIFI_OPT_PERMISSION_DENIED, ExtErrCode::WIFI_EXT_PERMISSION_DENIED }, - { ErrCode::WIFI_OPT_OPEN_FAIL_WHEN_CLOSING, ExtErrCode::WIFI_EXT_FAILED_UNKNOWN }, - { ErrCode::WIFI_OPT_OPEN_SUCC_WHEN_OPENED, ExtErrCode::WIFI_EXT_FAILED_UNKNOWN }, - { ErrCode::WIFI_OPT_CLOSE_FAIL_WHEN_OPENING, ExtErrCode::WIFI_EXT_FAILED_UNKNOWN }, - { ErrCode::WIFI_OPT_CLOSE_SUCC_WHEN_CLOSED, ExtErrCode::WIFI_EXT_FAILED_UNKNOWN }, - { ErrCode::WIFI_OPT_STA_NOT_OPENED, ExtErrCode::WIFI_EXT_WIFI_NOT_OPENED }, - { ErrCode::WIFI_OPT_SCAN_NOT_OPENED, ExtErrCode::WIFI_EXT_FAILED_UNKNOWN }, - { ErrCode::WIFI_OPT_AP_NOT_OPENED, ExtErrCode::WIFI_EXT_AP_NOT_OPENED }, - { ErrCode::WIFI_OPT_INVALID_CONFIG, ExtErrCode::WIFI_EXT_FAILED_UNKNOWN }, - { ErrCode::WIFI_OPT_P2P_NOT_OPENED, ExtErrCode::WIFI_EXT_WIFI_NOT_OPENED }, - { ErrCode::WIFI_OPT_P2P_MAC_NOT_FOUND, ExtErrCode::WIFI_EXT_FAILED_UNKNOWN }, - { ErrCode::WIFI_OPT_P2P_ERR_MAC_FORMAT, ExtErrCode::WIFI_EXT_FAILED_UNKNOWN }, - { ErrCode::WIFI_OPT_P2P_ERR_INTENT, ExtErrCode::WIFI_EXT_FAILED_UNKNOWN }, - { ErrCode::WIFI_OPT_P2P_ERR_SIZE_NW_NAME, ExtErrCode::WIFI_EXT_FAILED_UNKNOWN }, - { ErrCode::WIFI_OPT_MOVING_FREEZE_CTRL, ExtErrCode::WIFI_EXT_FAILED_UNKNOWN }, -}; - -static std::map extErrMsgMap { - { ExtErrCode::WIFI_EXT_FAILED_UNKNOWN, "Unkonwn fail." }, - { ExtErrCode::WIFI_EXT_FORBID_AIRPLANE, "Airplane mode is opened." }, - { ExtErrCode::WIFI_EXT_FORBID_POWSAVING, "Power saving is opened." }, - { ExtErrCode::WIFI_EXT_WIFI_NOT_OPENED, "WIFI doesn't open." }, - { ExtErrCode::WIFI_EXT_AP_NOT_OPENED, "AP doesn't open." }, - { ExtErrCode::WIFI_EXT_PERMISSION_DENIED, "Permission denied." }, - { ExtErrCode::WIFI_EXT_INVALID_PARAM, "Parameter error." }, - { ExtErrCode::WIFI_EXT_NOT_SUPPORTED, "Capability not supported." }, -}; - -enum ExtErrCode { - WIFI_EXT_SUCCESS = 0, /* successfully */ - WIFI_EXT_FAILED_UNKNOWN = 1, /* failed */ - WIFI_EXT_FORBID_AIRPLANE = 4, /* forbid when current airplane opened */ - WIFI_EXT_FORBID_POWSAVING = 5, /* forbid when current powersaving opened */ - WIFI_EXT_WIFI_NOT_OPENED = 11, /* sta service not opened */ - WIFI_EXT_AP_NOT_OPENED = 13, /* ap service not opened */ - WIFI_EXT_PERMISSION_DENIED = 201, /* permission denied */ - WIFI_EXT_INVALID_PARAM = 401, /* invalid params */ - WIFI_EXT_NOT_SUPPORTED = 801, /* not supported */ -}; \ No newline at end of file diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.cpp index a2190e7..dc84cd0 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.cpp @@ -145,7 +145,6 @@ ErrCode ApService::GetValidBands(std::vector &bands) return ErrCode::WIFI_OPT_SUCCESS; } - std::vector tmpBands; /* Get freqs from hal */ if (WifiApHalInterface::GetInstance().GetFrequenciesByBand(static_cast(BandType::BAND_2GHZ), allowed2GFreq)) { WIFI_LOGW("%{public}s, fail to get 2.4G channel", __func__); @@ -154,16 +153,15 @@ ErrCode ApService::GetValidBands(std::vector &bands) WIFI_LOGW("%{public}s, fail to get 5G channel", __func__); } if (allowed2GFreq.size() > 0) { - tmpBands.push_back(BandType::BAND_2GHZ); + bands.push_back(BandType::BAND_2GHZ); } if (allowed5GFreq.size() > 0) { - tmpBands.push_back(BandType::BAND_5GHZ); + bands.push_back(BandType::BAND_5GHZ); } - if (tmpBands.size() <= 0) { + if (bands.size() <= 0) { WIFI_LOGW("%{public}s, GetValidBands failed!", __func__); return ErrCode::WIFI_OPT_FAILED; } - bands = tmpBands; return ErrCode::WIFI_OPT_SUCCESS; } @@ -178,14 +176,12 @@ ErrCode ApService::GetValidChannels(BandType band, std::vector &validCh if (channelsInfo.size() > 0) { auto it = channelsInfo.find(band); - if (it == channelsInfo.end()) { - WIFI_LOGE("%{public}s, NOT find the band: %{public}d.", __func__, band); - return ErrCode::WIFI_OPT_INVALID_PARAM; + if (it != channelsInfo.end()) { + validChannel = channelsInfo[band]; + WIFI_LOGI("%{public}s, get valid channel size:%{public}d, band:%{public}d from WifiSettings.", + __func__, validChannel.size(), band); + return ErrCode::WIFI_OPT_SUCCESS; } - validChannel = channelsInfo[band]; - WIFI_LOGI("%{public}s, get valid channel size:%{public}d, band:%{public}d from WifiSettings.", - __func__, validChannel.size(), band); - return ErrCode::WIFI_OPT_SUCCESS; } /* get freqs from hal service */ diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp index 2828a26..4275da8 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp @@ -84,10 +84,13 @@ void StaAutoConnectService::OnScanInfosReadyHandler(const std::vector &blockedBssids) { - WIFI_LOGI("Enter StaAutoConnectService::GetBlockedBssids.\n"); - for (auto iter = blockedBssidMap.begin(); iter != blockedBssidMap.end(); ++iter) { blockedBssids.push_back(iter->first); } + WIFI_LOGI("StaAutoConnectService::GetBlockedBssids, blockedBssids count: %{public}d.", + blockedBssids.size()); return; } @@ -195,7 +198,7 @@ void StaAutoConnectService::ConnectElectedDevice(WifiDeviceConfig &electedDevice { WIFI_LOGI("Enter StaAutoConnectService::ConnectElectedDevice.\n"); if (electedDevice.bssid.empty()) { - WIFI_LOGE("electedDevice is null.\n"); + WIFI_LOGE("electedDevice bssid is empty."); return; } @@ -317,7 +320,7 @@ ErrCode StaAutoConnectService::AutoSelectDevice(WifiDeviceConfig &electedDevice, { WIFI_LOGI("Enter StaAutoConnectService::SelectNetwork.\n"); if (scanInfos.empty()) { - WIFI_LOGE("No scanInfo.\n"); + WIFI_LOGE("scanInfo is empty."); return WIFI_OPT_FAILED; } -- Gitee From 86000a549a1012f4f4b575b5f9b4ce22de3d14ef Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Sun, 23 Oct 2022 10:35:32 +0800 Subject: [PATCH 424/491] Optimize wifi code 1023 Signed-off-by: yanxiaotao@huawei.com --- .../wifi_manage/wifi_ap/ap_monitor.cpp | 4 ++-- .../wifi_manage/wifi_ap/ap_started_state.cpp | 8 ++++---- .../wifi_manage/wifi_ap/ap_stations_manager.cpp | 9 +++++---- .../wifi_manage/wifi_device_service_impl.cpp | 4 ++-- .../wifi_manage/wifi_device_stub.cpp | 2 +- .../wifi_manage/wifi_p2p/p2p_monitor.cpp | 3 ++- .../wifi_manage/wifi_scan/scan_service.cpp | 4 ++-- .../wifi_manage/wifi_scan/scan_state_machine.cpp | 2 +- .../wifi_sta/sta_auto_connect_service.cpp | 15 ++++++++------- .../wifi_manage/wifi_sta/sta_monitor.cpp | 8 ++++---- .../wifi_manage/wifi_sta/sta_state_machine.cpp | 12 ++++++------ 11 files changed, 37 insertions(+), 34 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor.cpp index d03b785..4244f53 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor.cpp @@ -43,8 +43,8 @@ void ApMonitor::DealStaJoinOrLeave(const StationInfo &info, ApStatemachineEvent WIFI_LOGI("StationChangeEvent event: [%{public}d(join=3,leave=4)] %{public}s . %{private}s . %{private}s.,", event, info.deviceName.c_str(), - info.bssid.c_str(), - info.ipAddr.c_str()); + MacAnonymize(info.bssid).c_str(), + IpAnonymize(info.ipAddr).c_str()); SendMessage(m_selectIfacName, event, 0, 0, anySta); } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.cpp index 6735d15..5682ba3 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.cpp @@ -323,8 +323,8 @@ void ApStartedState::ProcessCmdAddBlockList(InternalMessage &msg) const staInfo.deviceName = msg.GetStringFromMessage(); staInfo.bssid = msg.GetStringFromMessage(); staInfo.ipAddr = msg.GetStringFromMessage(); - WIFI_LOGI("staInfo:%{private}s, %{private}s, %{private}s.", staInfo.deviceName.c_str(), staInfo.bssid.c_str(), - staInfo.ipAddr.c_str()); + WIFI_LOGI("staInfo:%{private}s, %{public}s, %{public}s.", + staInfo.deviceName.c_str(), MacAnonymize(staInfo.bssid).c_str(), IpAnonymize(staInfo.ipAddr).c_str()); m_ApStateMachine.m_ApStationsManager.AddBlockList(staInfo); } @@ -335,8 +335,8 @@ void ApStartedState::ProcessCmdDelBlockList(InternalMessage &msg) const staInfo.deviceName = msg.GetStringFromMessage(); staInfo.bssid = msg.GetStringFromMessage(); staInfo.ipAddr = msg.GetStringFromMessage(); - WIFI_LOGI("staInfo:%{private}s, %{private}s, %{private}s.", staInfo.deviceName.c_str(), staInfo.bssid.c_str(), - staInfo.ipAddr.c_str()); + WIFI_LOGI("staInfo:%{private}s, %{public}s, %{public}s.", staInfo.deviceName.c_str(), + MacAnonymize(staInfo.bssid).c_str(), IpAnonymize(staInfo.ipAddr).c_str()); m_ApStateMachine.m_ApStationsManager.DelBlockList(staInfo); } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager.cpp index 5926ed8..a0e2b24 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager.cpp @@ -78,7 +78,8 @@ bool ApStationsManager::EnableAllBlockList() const bool ret = true; for (std::vector::iterator iter = results.begin(); iter != results.end(); iter++) { if (WifiApHalInterface::GetInstance().AddBlockByMac(iter->bssid, m_id) != WifiErrorNo::WIFI_IDL_OPT_OK) { - WIFI_LOGE("Instance is %{public}d failed to add block bssid is:%{private}s.", m_id, iter->bssid.c_str()); + WIFI_LOGE("Instance is %{public}d failed to add block bssid is:%{public}s.", m_id, + MacAnonymize(iter->bssid).c_str()); ret = false; } } @@ -146,10 +147,10 @@ bool ApStationsManager::DisConnectStation(const StationInfo &staInfo) const std::string mac = staInfo.bssid; int ret = static_cast(WifiApHalInterface::GetInstance().DisconnectStaByMac(mac, m_id)); if (ret != WifiErrorNo::WIFI_IDL_OPT_OK) { - WIFI_LOGE("Instance is %{public}d failed to DisConnectStation staInfo bssid:%{private}s,address:%{private}s, name:%{private}s.", + WIFI_LOGE("Instance is %{public}d failed to DisConnectStation staInfo bssid:%{public}s,address:%{public}s, name:%{private}s.", m_id, - staInfo.bssid.c_str(), - staInfo.ipAddr.c_str(), + MacAnonymize(staInfo.bssid).c_str(), + IpAnonymize(staInfo.ipAddr).c_str(), staInfo.deviceName.c_str()); return false; } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp index e171725..4c11fd7 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp @@ -940,8 +940,8 @@ ErrCode WifiDeviceServiceImpl::GetLinkedInfo(WifiLinkedInfo &info) info.macAddress = ""; } - WIFI_LOGI("GetLinkedInfo, networkId=%{public}d, ssid=%{private}s, rssi=%{public}d, frequency=%{public}d", - info.networkId, info.ssid.c_str(), info.rssi, info.frequency); + WIFI_LOGI("GetLinkedInfo, networkId=%{public}d, ssid=%{public}s, rssi=%{public}d, frequency=%{public}d", + info.networkId, SsidAnonymize(info.ssid.c_str()), info.rssi, info.frequency); WIFI_LOGI("GetLinkedInfo, connState=%{public}d, supplicantState=%{public}d, detailedState=%{public}d", info.connState, info.supplicantState, info.detailedState); return WIFI_OPT_SUCCESS; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp index 4b273de..95619f5 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp @@ -655,7 +655,7 @@ void WifiDeviceStub::OnRemoveCandidateConfig(uint32_t code, MessageParcel &data, } else { WifiDeviceConfig config; ReadWifiDeviceConfig(data, config); - WIFI_LOGD("Remove candidate config by config: %{private}s", config.ssid.c_str()); + WIFI_LOGD("Remove candidate config by config: %{public}s", SsidAnonymize(config.ssid).c_str()); ret = RemoveCandidateConfig(config); } reply.WriteInt32(0); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_monitor.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_monitor.cpp index ebd720b..66c4eb3 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_monitor.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_monitor.cpp @@ -425,7 +425,8 @@ void P2pMonitor::WpaEventInvitationReceived(const IdlP2pInvitationInfo &recvInfo void P2pMonitor::WpaEventInvitationResult(const std::string &bssid, int status) const { - WIFI_LOGD("onInvitationResult callback, bssid:%{private}s, status:%{public}d", bssid.c_str(), status); + WIFI_LOGI("onInvitationResult callback, bssid:%{public}s, status:%{public}d", + MacAnonymize(bssid).c_str(), status); P2pStatus p2pStatus = IntStatusToP2pStatus(status); Broadcast2SmInvitationResult(selectIfacName, p2pStatus); } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp index e729460..a75c391 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp @@ -820,8 +820,8 @@ void ScanService::HandlePnoScanInfo(std::vector &scanInfoList) for (; iter != scanInfoList.end(); ++iter) { if ((iter->timestamp / SECOND_TO_MILLI_SECOND) > pnoScanStartTime) { filterScanInfo.push_back(*iter); - WIFI_LOGI("InterScanInfo.bssid is %{private}s.\n", iter->bssid.c_str()); - WIFI_LOGI("InterScanInfo.ssid is %{public}s.\n", iter->ssid.c_str()); + WIFI_LOGI("InterScanInfo.bssid is %{private}s.\n", MacAnonymize(iter->bssid).c_str()); + WIFI_LOGI("InterScanInfo.ssid is %{public}s.\n", SsidAnonymize(iter->ssid).c_str()); WIFI_LOGI("InterScanInfo.capabilities is %{public}s.\n", iter->capabilities.c_str()); WIFI_LOGI("InterScanInfo.frequency is %{public}d.\n", iter->frequency); WIFI_LOGI("InterScanInfo.rssi is %{public}d.\n", iter->rssi); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine.cpp index a89f85d..5ea660c 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine.cpp @@ -1434,7 +1434,7 @@ bool ScanStateMachine::NeedCommonScanAfterPno(std::vector &scanIn { WIFI_LOGI("Enter ScanStateMachine::NeedCommonScanAfterPno.\n"); if (scanInfos.size() > 0) { - WIFI_LOGI("Enter UpdateNetworkScoreCache.[%{public}s]\n", scanInfos[0].bssid.c_str()); + WIFI_LOGI("Enter UpdateNetworkScoreCache.[%{public}s]\n", MacAnonymize(scanInfos[0].bssid).c_str()); } return false; } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp index 4275da8..e37eb34 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp @@ -84,7 +84,7 @@ void StaAutoConnectService::OnScanInfosReadyHandler(const std::vector MIN_ROAM_RSSI_DIFF) { WIFI_LOGI("Roming network rssi - Current network rssi > 6."); @@ -576,7 +577,7 @@ void StaAutoConnectService::GetAvailableScanInfos(std::vector &av auto itr = find(blockedBssids.begin(), blockedBssids.end(), scanInfo.bssid); if (itr != blockedBssids.end()) { /* Skip Blocklist Network */ - WIFI_LOGI("Skip blocklistedBssid network, ssid: %{public}s.\n", scanInfo.ssid.c_str()); + WIFI_LOGI("Skip blocklistedBssid network, ssid: %{public}s.\n", SsidAnonymize(scanInfo.ssid).c_str()); continue; } @@ -584,13 +585,13 @@ void StaAutoConnectService::GetAvailableScanInfos(std::vector &av if (scanInfo.frequency < MIN_5GHZ_BAND_FREQUENCY) { if (scanInfo.rssi <= MIN_RSSI_VALUE_24G) { WIFI_LOGI("Skip network %{public}s with low 2.4G signals %{public}d.\n", - scanInfo.ssid.c_str(), scanInfo.rssi); + SsidAnonymize(scanInfo.ssid).c_str(), scanInfo.rssi); continue; } } else { if (scanInfo.rssi <= MIN_RSSI_VALUE_5G) { WIFI_LOGI("Skip network %{public}s with low 5G signals %{public}d.\n", - scanInfo.ssid.c_str(), scanInfo.rssi); + SsidAnonymize(scanInfo.ssid).c_str(), scanInfo.rssi); continue; } } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp index 8ad1dc4..5541eb0 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp @@ -76,10 +76,10 @@ void StaMonitor::SetStateMachine(StaStateMachine *paraStaStateMachine) void StaMonitor::OnConnectChangedCallBack(int status, int networkId, const std::string &bssid) { - WIFI_LOGI("OnConnectChangedCallBack() status:%{public}d,networkId=%{public}d,bssid=%{private}s", + WIFI_LOGI("OnConnectChangedCallBack() status:%{public}d,networkId=%{public}d,bssid=%{public}s", status, networkId, - bssid.c_str()); + MacAnonymize(bssid).c_str()); if (pStaStateMachine == nullptr) { WIFI_LOGE("The statemachine pointer is null."); return; @@ -110,9 +110,9 @@ void StaMonitor::OnConnectChangedCallBack(int status, int networkId, const std:: void StaMonitor::OnBssidChangedCallBack(const std::string &reason, const std::string &bssid) { - WIFI_LOGI("OnBssidChangedCallBack() reason:%{public}s,bssid=%{private}s", + WIFI_LOGI("OnBssidChangedCallBack() reason:%{public}s,bssid=%{public}s", reason.c_str(), - bssid.c_str()); + MacAnonymize(bssid).c_str()); if (pStaStateMachine == nullptr) { WIFI_LOGE("The statemachine pointer is null."); return; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp index 43fe280..c944d8e 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp @@ -695,7 +695,7 @@ void StaStateMachine::DealSignalPollResult(InternalMessage *msg) int currentSignalLevel = WifiSettings::GetInstance().GetSignalLevel(linkedInfo.rssi, linkedInfo.band); LOGI("DealSignalPollResult, networkId:%{public}d, ssid:%{private}s, rssi:%{public}d, band:%{public}d, " "connState:%{public}d, detailedState:%{public}d.\n", - linkedInfo.networkId, linkedInfo.ssid.c_str(), linkedInfo.rssi, linkedInfo.band, + linkedInfo.networkId, SsidAnonymize(linkedInfo.ssid).c_str(), linkedInfo.rssi, linkedInfo.band, linkedInfo.connState, linkedInfo.detailedState); LOGI("DealSignalPollResult currentSignalLevel:%{public}d, lastSignalLevel:%{public}d.\n", currentSignalLevel, lastSignalLevel); @@ -1023,10 +1023,10 @@ void StaStateMachine::StartWpsMode(InternalMessage *msg) } wpsParam.multiAp = MULTI_AP; WIFI_LOGI("wpsConfig setup = %{public}d", wpsConfig.setup); - WIFI_LOGI("wpsParam.AnyFlag = %{public}d, wpsParam.mulitAp = %{public}d, wpsParam.bssid = %s", + WIFI_LOGI("wpsParam.AnyFlag = %{public}d, wpsParam.mulitAp = %{public}d, wpsParam.bssid = %{public}s", wpsParam.anyFlag, wpsParam.multiAp, - wpsParam.bssid.c_str()); + MacAnonymize(wpsParam.bssid).c_str()); if (wpsConfig.setup == SetupMethod::PBC) { if (WifiStaHalInterface::GetInstance().StartWpsPbcMode(wpsParam) == WIFI_IDL_OPT_OK) { @@ -1865,8 +1865,8 @@ bool StaStateMachine::LinkedState::ExecuteStateMsg(InternalMessage *msg) ret = EXECUTED; std::string reason = msg->GetStringFromMessage(); std::string bssid = msg->GetStringFromMessage(); - WIFI_LOGI("reveived bssid changed event, reason:%{public}s,bssid:%{private}s.\n", - reason.c_str(), bssid.c_str()); + WIFI_LOGI("reveived bssid changed event, reason:%{public}s,bssid:%{public}s.\n", + reason.c_str(), MacAnonymize(bssid).c_str()); if (strcmp(reason.c_str(), "ASSOC_COMPLETE") != 0) { WIFI_LOGE("Bssid change not for ASSOC_COMPLETE, do nothing."); return false; @@ -1979,7 +1979,7 @@ void StaStateMachine::ConnectToNetworkProcess(InternalMessage *msg) WifiSettings::GetInstance().AddDeviceConfig(deviceConfig); } WifiSettings::GetInstance().SyncDeviceConfig(); - WIFI_LOGD("Device ssid = %s", deviceConfig.ssid.c_str()); + WIFI_LOGD("Device ssid = %s", SsidAnonymize(deviceConfig.ssid).c_str()); } std::string macAddr; -- Gitee From 0868f9c0be042f9810c4341e297473d7895e83c5 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Sun, 23 Oct 2022 11:01:21 +0800 Subject: [PATCH 425/491] Optimize wifi code 1023 Signed-off-by: yanxiaotao@huawei.com --- .../wifi_framework/wifi_manage/wifi_device_service_impl.cpp | 2 +- .../wifi_framework/wifi_manage/wifi_p2p/p2p_monitor.cpp | 1 + .../wifi_framework/wifi_manage/wifi_scan/scan_service.cpp | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp index 4c11fd7..d40a1cf 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp @@ -941,7 +941,7 @@ ErrCode WifiDeviceServiceImpl::GetLinkedInfo(WifiLinkedInfo &info) } WIFI_LOGI("GetLinkedInfo, networkId=%{public}d, ssid=%{public}s, rssi=%{public}d, frequency=%{public}d", - info.networkId, SsidAnonymize(info.ssid.c_str()), info.rssi, info.frequency); + info.networkId, SsidAnonymize(info.ssid).c_str(), info.rssi, info.frequency); WIFI_LOGI("GetLinkedInfo, connState=%{public}d, supplicantState=%{public}d, detailedState=%{public}d", info.connState, info.supplicantState, info.detailedState); return WIFI_OPT_SUCCESS; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_monitor.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_monitor.cpp index 66c4eb3..57437ec 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_monitor.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_monitor.cpp @@ -17,6 +17,7 @@ #include "wifi_p2p_hal_interface.h" #include "dhcpd_interface.h" #include "wifi_logger.h" +#include "wifi_common_util.h" DEFINE_WIFILOG_P2P_LABEL("P2pMonitor"); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp index a75c391..4d957d7 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp @@ -21,6 +21,7 @@ #include "wifi_logger.h" #include "wifi_settings.h" #include "wifi_sta_hal_interface.h" +#include "wifi_common_util.h" DEFINE_WIFILOG_SCAN_LABEL("ScanService"); -- Gitee From 26621a79a5a05d139efeb78300b9da46bbcdd607 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Sun, 23 Oct 2022 11:29:42 +0800 Subject: [PATCH 426/491] Optimize wifi code 1023 Signed-off-by: yanxiaotao@huawei.com --- .../wifi_manage/wifi_ap/ap_started_state.cpp | 1 + .../wifi_manage/wifi_ap/ap_stations_manager.cpp | 1 + .../wifi_framework/wifi_manage/wifi_device_stub.cpp | 1 + .../wifi_manage/wifi_scan/scan_state_machine.cpp | 1 + .../wifi_manage/wifi_sta/sta_auto_connect_service.cpp | 7 ++++--- .../wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp | 1 + 6 files changed, 9 insertions(+), 3 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.cpp index 5682ba3..c083f74 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.cpp @@ -31,6 +31,7 @@ #include "wifi_chip_capability.h" #include "wifi_settings.h" #include "wifi_logger.h" +#include "wifi_common_util.h" DEFINE_WIFILOG_HOTSPOT_LABEL("WifiApStartedState"); namespace OHOS { diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager.cpp index a0e2b24..29b2cc4 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager.cpp @@ -20,6 +20,7 @@ #include "wifi_ap_hal_interface.h" #include "ap_state_machine.h" #include "wifi_logger.h" +#include "wifi_common_util.h" DEFINE_WIFILOG_HOTSPOT_LABEL("WifiApStationsManager"); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp index 95619f5..a9070b4 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp @@ -20,6 +20,7 @@ #include "wifi_device_callback_proxy.h" #include "wifi_internal_event_dispatcher.h" #include "wifi_device_death_recipient.h" +#include "wifi_common_util.h" DEFINE_WIFILOG_LABEL("WifiDeviceStub"); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine.cpp index 5ea660c..37deefc 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine.cpp @@ -18,6 +18,7 @@ #include "wifi_logger.h" #include "wifi_settings.h" #include "wifi_sta_hal_interface.h" +#include "wifi_common_util.h" namespace OHOS { namespace Wifi { diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp index e37eb34..b2e9c5b 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp @@ -16,6 +16,7 @@ #include "wifi_logger.h" #include "wifi_sta_hal_interface.h" #include "wifi_settings.h" +#include "wifi_common_util.h" DEFINE_WIFILOG_LABEL("StaAutoConnectService"); @@ -85,7 +86,7 @@ void StaAutoConnectService::OnScanInfosReadyHandler(const std::vector MIN_ROAM_RSSI_DIFF) { diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp index 5541eb0..306502c 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp @@ -18,6 +18,7 @@ #include "wifi_logger.h" #include "wifi_supplicant_hal_interface.h" #include "wifi_sta_hal_interface.h" +#include "wifi_common_util.h" DEFINE_WIFILOG_LABEL("StaMonitor"); -- Gitee From d3a20d2fcb15d38832d2ae3411266ac95e956567 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 24 Oct 2022 08:46:32 +0800 Subject: [PATCH 427/491] Optimize wifi code 1024 Signed-off-by: yanxiaotao@huawei.com --- .../wifi_framework/wifi_manage/wifi_ap/ap_monitor.cpp | 1 + .../wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn | 1 + 2 files changed, 2 insertions(+) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor.cpp index 4244f53..e9a5c74 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor.cpp @@ -24,6 +24,7 @@ #include "wifi_ap_hal_interface.h" #include "wifi_logger.h" #include "dhcpd_interface.h" +#include "wifi_common_util.h" DEFINE_WIFILOG_HOTSPOT_LABEL("WifiApMonitor"); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn index 571543e..ea673cd 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn @@ -48,6 +48,7 @@ local_base_include_dirs = [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/net_conf", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta", "$WIFI_ROOT_DIR/services/wifi_standard/include", + "$WIFI_ROOT_DIR/utils/inc", ] if (defined(ohos_lite)) { -- Gitee From b5c7f257288525b252ae8075cdfa4772f99045bb Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 24 Oct 2022 10:18:27 +0800 Subject: [PATCH 428/491] Optimize wifi code 1024 Signed-off-by: yanxiaotao@huawei.com --- .../wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn index ea673cd..4ffab92 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn @@ -64,6 +64,7 @@ if (defined(ohos_lite)) { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_service_base", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit", + "$WIFI_ROOT_DIR/utils:wifi_utils", "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", "//third_party/bounds_checking_function:libsec_shared", ] @@ -93,6 +94,7 @@ if (defined(ohos_lite)) { deps = [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit", + "$WIFI_ROOT_DIR/utils:wifi_utils", ] external_deps = [ -- Gitee From a11aad0361c0a984961006aa82989d445a9bec8e Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 24 Oct 2022 11:24:14 +0800 Subject: [PATCH 429/491] Optimize wifi code 1024 Signed-off-by: yanxiaotao@huawei.com --- .../wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn | 1 + 1 file changed, 1 insertion(+) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn index 499d77c..422dc8d 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn @@ -78,6 +78,7 @@ ohos_shared_library("wifi_ap_service") { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_common:wifi_common_service", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit", + "$WIFI_ROOT_DIR/utils:wifi_utils", ] defines = [ "AP_INTF=\"$wifi_feature_with_ap_intf\"" ] -- Gitee From 74c8d83623a22f34803bb5489564918af0af21fc Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 24 Oct 2022 14:17:28 +0800 Subject: [PATCH 430/491] Optimize wifi code 1024 Signed-off-by: yanxiaotao@huawei.com --- .../wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn | 1 + 1 file changed, 1 insertion(+) diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn index e3cf04f..576ac1c 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn @@ -82,6 +82,7 @@ ohos_unittest("wifi_scan_unittest") { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit", + "$WIFI_ROOT_DIR/utils:wifi_utils", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", ] -- Gitee From 50259de6c3fb1679cf418aaf77ae7757e3b2290e Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Mon, 24 Oct 2022 09:15:36 +0000 Subject: [PATCH 431/491] update wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn. Signed-off-by: yanxiaotao --- .../wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn | 1 + 1 file changed, 1 insertion(+) diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn index 576ac1c..abb6f02 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn @@ -77,6 +77,7 @@ ohos_unittest("wifi_scan_unittest") { "//third_party/googletest/googlemock/include", "//third_party/googletest/googletest/include", "$WIFI_ROOT_DIR/services/wifi_standard/include", + "$WIFI_ROOT_DIR/utils/inc", ] deps = [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", -- Gitee From 97a4a618245c7e4cebb5d8bedb3225293f647f13 Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Mon, 24 Oct 2022 11:36:49 +0000 Subject: [PATCH 432/491] ok Signed-off-by: yanxiaotao --- .../wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c | 1 + 1 file changed, 1 insertion(+) diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c index 161824b..113ac25 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c @@ -712,6 +712,7 @@ static void *WpaReceiveCallback(void *arg) if (len <= 0) { continue; } + LOGE("wpa recv buf: %{public}s!", buf); /* Message format: IFACE=wlan0 EventType params... */ char *p = strchr(buf, '>'); if (p == NULL) { -- Gitee From 5851e4b2ebf5961fba55de9867d6d9d13cd968f4 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 24 Oct 2022 20:26:58 +0800 Subject: [PATCH 433/491] add error code for wifi 1024 Signed-off-by: yanxiaotao@huawei.com --- wifi/frameworks/js/napi/BUILD.gn | 46 +++++ .../js/napi/inc/wifi_napi_errcode.h | 99 ++++++++++ .../js/napi/src/wifi_napi_device.cpp | 7 +- .../js/napi/src/wifi_napi_errcode.cpp | 187 ++++++++++++++++++ .../js/napi/src/wifi_napi_utils.cpp | 17 +- 5 files changed, 336 insertions(+), 20 deletions(-) create mode 100644 wifi/frameworks/js/napi/inc/wifi_napi_errcode.h create mode 100644 wifi/frameworks/js/napi/src/wifi_napi_errcode.cpp diff --git a/wifi/frameworks/js/napi/BUILD.gn b/wifi/frameworks/js/napi/BUILD.gn index 8fadc28..f51b542 100644 --- a/wifi/frameworks/js/napi/BUILD.gn +++ b/wifi/frameworks/js/napi/BUILD.gn @@ -139,3 +139,49 @@ ohos_shared_library("wifi_native_js") { part_name = "wifi" subsystem_name = "communication" } + +ohos_shared_library("wifi_manager") { + install_enable = true + include_dirs = [ + "//third_party/node/src", + "//native_engine", + "//commonlibrary/c_utils/base/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/log", + "$WIFI_ROOT_DIR/frameworks/native/interfaces", + "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", + "//base/security/access_token/interfaces/innerkits/accesstoken/include", + "$WIFI_ROOT_DIR/frameworks/native/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper", + "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/context", + "$WIFI_ROOT_DIR/utils/inc", + "$WIFI_ROOT_DIR/frameworks/js/napi/inc", + ] + + sources = [ + "src/wifi_napi_device.cpp", + "src/wifi_napi_entry.cpp", + "src/wifi_napi_event.cpp", + "src/wifi_napi_hotspot.cpp", + "src/wifi_napi_p2p.cpp", + "src/wifi_napi_utils.cpp", + ] + deps = [ + "$WIFI_ROOT_DIR/frameworks/native:wifi_sdk", + "${ability_runtime_path}/frameworks/native/appkit:app_context", + "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", + "//foundation/arkui/napi:ace_napi", + ] + + defines = [ "ENABLE_NAPI_THROW_ERRCODE" ] + + external_deps = [ + "access_token:libaccesstoken_sdk", + "bundle_framework:appexecfwk_base", + "c_utils:utils", + "ipc:ipc_core", + ] + + relative_install_dir = "module" + part_name = "wifi" + subsystem_name = "communication" +} \ No newline at end of file diff --git a/wifi/frameworks/js/napi/inc/wifi_napi_errcode.h b/wifi/frameworks/js/napi/inc/wifi_napi_errcode.h new file mode 100644 index 0000000..f5b5bc9 --- /dev/null +++ b/wifi/frameworks/js/napi/inc/wifi_napi_errcode.h @@ -0,0 +1,99 @@ +/* + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef WIFI_NAPI_ERRCODE_H_ +#define WIFI_NAPI_ERRCODE_H_ + +#include +#include "wifi_napi_utils.h" + +namespace OHOS { +namespace Wifi { +static const std::string BUSINESS_ERROR_PROPERTY_CODE = "code"; +static const std::string BUSINESS_ERROR_PROPERTY_MESSAGE = "message"; +static const std::string BUSINESS_ERROR_PROPERTY_DATA = "data"; + +enum { + WIFI_NAPI_SUCCESS = 0, /* successfully */ + WIFI_NAPI_ERRCODE_FAILED_UNKNOWN = 1, /* failed */ + WIFI_NAPI_ERRCODE_FORBID_AIRPLANE = 4, /* forbid when current airplane opened */ + WIFI_NAPI_ERRCODE_FORBID_POWSAVING = 5, /* forbid when current powersaving opened */ + WIFI_NAPI_ERRCODE_WIFI_NOT_OPENED = 11, /* sta service not opened */ + WIFI_NAPI_ERRCODE_AP_NOT_OPENED = 13, /* ap service not opened */ + WIFI_NAPI_ERRCODE_PERMISSION_DENIED = 201, /* permission denied */ + WIFI_NAPI_ERRCODE_INVALID_PARAM = 401, /* invalid params */ + WIFI_NAPI_ERRCODE_NOT_SUPPORTED = 801, /* not supported */ +}; + +#ifndef WIFI_NAPI_ASSERT +#define WIFI_NAPI_ASSERT(env, cond, errCode) \ +do { \ + if (!(cond)) { \ + napi_value res = nullptr; \ + #ifdef ENABLE_NAPI_THROW_ERRCODE \ + HandleSyncErrCode(env, errCode); \ + napi_get_undefined(env, &res); \ + #else \ + napi_get_boolean(env, cond, &res); \ + #endif \ + return res; \ + } \ +} while (0) +#endif + +#ifndef WIFI_NAPI_RETURN +#define WIFI_NAPI_RETURN(env, cond, errCode) \ +do { \ + napi_value res = nullptr; \ + if (!(cond)) { \ + #ifdef ENABLE_NAPI_THROW_ERRCODE \ + HandleSyncErrCode(env, errCode); \ + napi_get_undefined(env, &res); \ + #else \ + napi_get_boolean(env, cond, &res); \ + #endif \ + return res; \ + } \ + #ifdef ENABLE_NAPI_THROW_ERRCODE \ + napi_get_undefined(env, &res); \ + #else \ + napi_get_boolean(env, cond, &res); \ + #endif \ + return res; \ +} while (0) +#endif + +void HandleCallbackErrCode( const napi_env &env, const AsyncContext &info); + +/** + * @brief Thow error code for async function. + * + * @param env The env. + * @param info The input data. + * @param result The result to be return. + */ +void HandlePromiseErrCode( const napi_env &env, const AsyncContext &info); + +/** + * @brief Thow error code for async function. + * + * @param env The env. + * @param errCode The error code. + */ +void HandleSyncErrCode(const napi_env &env, int32_t errCode); +} // namespace Wifi +} // namespace OHOS +#endif + diff --git a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp index 63c1d0b..8cef17a 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp @@ -26,14 +26,13 @@ static constexpr int DEFAULT_INVALID_VALUE = -1; std::unique_ptr wifiDevicePtr = WifiDevice::GetInstance(WIFI_DEVICE_ABILITY_ID); std::unique_ptr wifiScanPtr = WifiScan::GetInstance(WIFI_SCAN_ABILITY_ID); + napi_value EnableWifi(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; - NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_INVALID_PARAM); ErrCode ret = wifiDevicePtr->EnableWifi(); - napi_value result; - napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); - return result; + WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, WIFI_OPT_SUCCESS); } napi_value DisableWifi(napi_env env, napi_callback_info info) diff --git a/wifi/frameworks/js/napi/src/wifi_napi_errcode.cpp b/wifi/frameworks/js/napi/src/wifi_napi_errcode.cpp new file mode 100644 index 0000000..dc406cf --- /dev/null +++ b/wifi/frameworks/js/napi/src/wifi_napi_errcode.cpp @@ -0,0 +1,187 @@ +/* + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "wifi_manager_napi_errcode.h" +#include +#include "wifi_logger.h" +#include "wifi_errcode.h" + +namespace OHOS { +namespace Wifi { +DEFINE_WIFILOG_LABEL("WifiNAPIErrCode"); +static std::map errCodeMap = { + { ErrCode::WIFI_OPT_SUCCESS, WIFI_NAPI_SUCCESS }, + { ErrCode::WIFI_OPT_FAILED, WIFI_NAPI_ERRCODE_FAILED_UNKNOWN }, + { ErrCode::WIFI_OPT_NOT_SUPPORTED, WIFI_NAPI_ERRCODE_NOT_SUPPORTED }, + { ErrCode::WIFI_OPT_INVALID_PARAM, WIFI_NAPI_ERRCODE_INVALID_PARAM }, + { ErrCode::WIFI_OPT_FORBID_AIRPLANE, WIFI_NAPI_ERRCODE_FORBID_AIRPLANE }, + { ErrCode::WIFI_OPT_FORBID_POWSAVING, WIFI_NAPI_ERRCODE_FORBID_POWSAVING}, + { ErrCode::WIFI_OPT_PERMISSION_DENIED, WIFI_NAPI_ERRCODE_PERMISSION_DENIED }, + { ErrCode::WIFI_OPT_OPEN_FAIL_WHEN_CLOSING, WIFI_NAPI_ERRCODE_FAILED_UNKNOWN }, + { ErrCode::WIFI_OPT_OPEN_SUCC_WHEN_OPENED, WIFI_NAPI_ERRCODE_FAILED_UNKNOWN }, + { ErrCode::WIFI_OPT_CLOSE_FAIL_WHEN_OPENING, WIFI_NAPI_ERRCODE_FAILED_UNKNOWN }, + { ErrCode::WIFI_OPT_CLOSE_SUCC_WHEN_CLOSED, WIFI_NAPI_ERRCODE_FAILED_UNKNOWN }, + { ErrCode::WIFI_OPT_STA_NOT_OPENED, WIFI_NAPI_ERRCODE_WIFI_NOT_OPENED }, + { ErrCode::WIFI_OPT_SCAN_NOT_OPENED, WIFI_NAPI_ERRCODE_FAILED_UNKNOWN }, + { ErrCode::WIFI_OPT_AP_NOT_OPENED, WIFI_NAPI_ERRCODE_AP_NOT_OPENED }, + { ErrCode::WIFI_OPT_INVALID_CONFIG, WIFI_NAPI_ERRCODE_FAILED_UNKNOWN }, + { ErrCode::WIFI_OPT_P2P_NOT_OPENED, WIFI_NAPI_ERRCODE_WIFI_NOT_OPENED }, + { ErrCode::WIFI_OPT_P2P_MAC_NOT_FOUND, WIFI_NAPI_ERRCODE_FAILED_UNKNOWN }, + { ErrCode::WIFI_OPT_P2P_ERR_MAC_FORMAT, WIFI_NAPI_ERRCODE_FAILED_UNKNOWN }, + { ErrCode::WIFI_OPT_P2P_ERR_INTENT, WIFI_NAPI_ERRCODE_FAILED_UNKNOWN }, + { ErrCode::WIFI_OPT_P2P_ERR_SIZE_NW_NAME, WIFI_NAPI_ERRCODE_FAILED_UNKNOWN }, + { ErrCode::WIFI_OPT_MOVING_FREEZE_CTRL, WIFI_NAPI_ERRCODE_FAILED_UNKNOWN }, +}; + +static std::map napiErrMsgMap { + { WIFI_NAPI_ERRCODE_FAILED_UNKNOWN, "System exception." }, + { WIFI_NAPI_ERRCODE_FORBID_AIRPLANE, "Airplane mode is opened." }, + { WIFI_NAPI_ERRCODE_FORBID_POWSAVING, "Power saving is opened." }, + { WIFI_NAPI_ERRCODE_WIFI_NOT_OPENED, "WIFI doesn't open." }, + { WIFI_NAPI_ERRCODE_AP_NOT_OPENED, "AP doesn't open." }, + { WIFI_NAPI_ERRCODE_PERMISSION_DENIED, "Permission denied." }, + { WIFI_NAPI_ERRCODE_INVALID_PARAM, "Parameter error." }, + { WIFI_NAPI_ERRCODE_NOT_SUPPORTED, "Capability not supported." }, +}; + +static napi_value NapiGetNull(const napi_env &env) +{ + napi_value res = nullptr; + napi_get_null(env, &res); + return res; +} + +static napi_value NapiGetUndefined(const napi_env &env) +{ + napi_value undefined = nullptr; + napi_get_undefined(env, &undefined); + return undefined; +} + +static int32_t GetNapiErrCode(const napi_env &env, const int32_t errCodeIn) +{ + auto iter = errCodeMap.find(errCodeIn); + if (iter != errCodeMap.end()) { + return WIFI_NAPI_ERRCODE_FAILED_UNKNOWN; + } + return iter->second; +} + +static std::string GetNapiErrMsg(const napi_env &env, const int32_t errCode) +{ + if (errCode == ErrCode::WIFI_OPT_SUCCESS) { + return ""; + } + + int32_t napiErrCode = GetNapiErrCode(env, errCode); + auto iter = napiErrMsgMap.find(napiErrCode); + if (iter != napiErrMsgMap.end()) { + std::string errMessage = "BussinessError "; + errMessage.append(std::to_string(napiErrCode)).append(": ").append(iter->second); + return errMessage; + } + return "Inner error."; +} + +static napi_value GetCallbackErrorValue(napi_env env, const int32_t errCode, const std::string errMsg) +{ + if (errCode == ErrCode::WIFI_OPT_SUCCESS) { + return NapiGetNull(env); + } + napi_value businessError = nullptr; + napi_value eCode = nullptr; + napi_value eMsg = nullptr; + NAPI_CALL(env, napi_create_int32(env, errCode, &eCode)); + NAPI_CALL(env, napi_create_string_utf8(env, errMsg.c_str(), errMsg.length(), &eMsg)); + NAPI_CALL(env, napi_create_object(env, &businessError)); + NAPI_CALL(env, napi_set_named_property(env, businessError, "code", eCode)); + NAPI_CALL(env, napi_set_named_property(env, businessError, "message", eMsg)); + return businessError; +} + +void HandleCallbackErrCode( const napi_env &env, const AsyncContext &info) +{ + WIFI_LOGI("HandleCallbackErrCode, errCode = %{public}d", info.errorCode); + constexpr int RESULT_PARAMS_NUM = 2; + napi_value undefine = NapiGetUndefined(env); + napi_value callback = nullptr; + napi_value result[RESULT_PARAMS_NUM] = {nullptr}; + result[1] = info.result; + if (info.errorCode == ERR_CODE_SUCCESS) { +#ifdef ENABLE_NAPI_THROW_ERRCODE + napi_create_uint32(env, undefine, &result[0]); +#else + napi_create_uint32(env, info.errorCode, &result[0]); + napi_get_reference_value(env, info.callback[0], &callback); +#endif + napi_call_function(env, nullptr, callback, RESULT_PARAMS_NUM, result, &undefine); + } else { + napi_ref errCb = info.callback[1]; + if (!errCb) { + WIFI_LOGE("Get callback func[1] is null"); + errCb = info.callback[0]; + } + napi_get_reference_value(env, errCb, &callback); +#ifdef ENABLE_NAPI_THROW_ERRCODE + std::string errMsg = GetNapiErrMsg(env, info.errorCode); + int32_t errCodeInfo = GetNapiErrCode(env, info.errorCode); + results[0] = GetCallbackErrorValue(env, errCodeInfo, errMsg); +#else + napi_create_uint32(env, info.errorCode, &result[0]); +#endif + napi_call_function(env, nullptr, callback, RESULT_PARAMS_NUM, result, &undefine); + } +} + +void HandlePromiseErrCode( const napi_env &env, const AsyncContext &info) +{ + WIFI_LOGI("HandlePromiseErrCode, errCode = %{public}d", info.errorCode); + if (info.errorCode == ErrCode::WIFI_OPT_SUCCESS) { + napi_resolve_deferred(env, info.deferred, info.result); + } else { +#ifdef ENABLE_NAPI_THROW_ERRCODE + int32_t errCodeInfo = GetNapiErrCode(env, info.errorCode); + std::string errMsg = GetNapiErrMsg(env, info.errorCode); + napi_value businessError = nullptr; + napi_value eCode = nullptr; + napi_value eMsg = nullptr; + napi_value eData = NapiGetNull(env); + napi_create_int32(env, errCodeInfo, &eCode); + napi_create_string_utf8(env, errMsg.c_str(), errMsg.length(), &eMsg); + napi_create_object(env, &businessError); + napi_set_named_property(env, businessError, "code", eCode); + napi_set_named_property(env, businessError, "message", eMsg); + napi_set_named_property(env, businessError, "data", eData); + napi_reject_deferred(env, info.deferred, businessError); +#else + napi_reject_deferred(info.env, info.deferred, info.result); +#endif + } +} + +void HandleSyncErrCode(const napi_env &env, int32_t errCode) +{ + WIFI_LOGI("HandleSyncErrCode, errCode = %{public}d", errCode); + if (errCode == ErrCode::WIFI_OPT_SUCCESS) { + return; + } + std::string errMsg = GetNapiErrMsg(env, errCode); + int32_t errCodeInfo = GetNapiErrCode(env, errCode); + if (errMsg != "") { + napi_throw_error(env, std::to_string(errCodeInfo).c_str(), errMsg.c_str()); + } +} +} // namespace Wifi +} // namespace OHOS diff --git a/wifi/frameworks/js/napi/src/wifi_napi_utils.cpp b/wifi/frameworks/js/napi/src/wifi_napi_utils.cpp index 721a76f..92a291d 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_utils.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_utils.cpp @@ -256,22 +256,7 @@ static napi_value DoCallBackAsyncWork(const napi_env& env, AsyncContext *asyncCo napi_value undefine, callback; napi_get_undefined(env, &undefine); context->completeFunc(data); - constexpr int ARGS_TWO = 2; - napi_value result[ARGS_TWO] = {nullptr}; - napi_create_uint32(env, context->errorCode, &result[0]); - result[1] = context->result; - if (context->errorCode == ERR_CODE_SUCCESS) { - napi_get_reference_value(env, context->callback[0], &callback); - napi_call_function(env, nullptr, callback, ARGS_TWO, result, &undefine); - } else { - napi_ref errCb = context->callback[1]; - if (!errCb) { - WIFI_LOGE("Get callback func[1] is null"); - errCb = context->callback[0]; - } - napi_get_reference_value(env, errCb, &callback); - napi_call_function(env, nullptr, callback, ARGS_TWO, result, &undefine); - } + HandleCallbackErrCode(env, context); if (context->callback[0] != nullptr) { napi_delete_reference(env, context->callback[0]); } -- Gitee From 82a7385365d7edc88599055d8cfc3bbcd5f4c598 Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Mon, 24 Oct 2022 12:57:23 +0000 Subject: [PATCH 434/491] ok Signed-off-by: yanxiaotao --- .../wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c index 113ac25..3ec35e0 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c @@ -683,8 +683,8 @@ static void *WpaReceiveCallback(void *arg) if (arg == NULL) { return NULL; } - char staIface[] = "IFACE=wlan"; - char p2pIface[] = "IFACE=p2p"; + char staIface[] = "IFNAME=wlan"; + char p2pIface[] = "IFNAME=p2p"; WifiWpaInterface *pWpa = arg; char *buf = (char *)calloc(REPLY_BUF_LENGTH, sizeof(char)); if (buf == NULL) { @@ -723,7 +723,7 @@ static void *WpaReceiveCallback(void *arg) if (strncmp(p, WPA_EVENT_TERMINATING, strlen(WPA_EVENT_TERMINATING)) == 0) { break; } - char *iface = strstr(buf, "IFACE="); + char *iface = strstr(buf, "IFNAME="); if (iface == NULL) { /* if 'IFACE=' is not reported */ if (WpaP2pCallBackFunc(p) == 0) { -- Gitee From af6119028bd9ee4a7ed935b4b84afa596265e051 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 24 Oct 2022 21:09:51 +0800 Subject: [PATCH 435/491] add error code for wifi 1024 Signed-off-by: yanxiaotao@huawei.com --- wifi/frameworks/js/napi/inc/wifi_napi_errcode.h | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/wifi/frameworks/js/napi/inc/wifi_napi_errcode.h b/wifi/frameworks/js/napi/inc/wifi_napi_errcode.h index f5b5bc9..46f5dab 100644 --- a/wifi/frameworks/js/napi/inc/wifi_napi_errcode.h +++ b/wifi/frameworks/js/napi/inc/wifi_napi_errcode.h @@ -16,8 +16,9 @@ #ifndef WIFI_NAPI_ERRCODE_H_ #define WIFI_NAPI_ERRCODE_H_ -#include #include "wifi_napi_utils.h" +#include +#include "wifi_napi_errcode.h" namespace OHOS { namespace Wifi { @@ -75,14 +76,19 @@ do { \ } while (0) #endif +/** + * @brief Thow error code for async-callback function. + * + * @param env The env. + * @param info The input data. + */ void HandleCallbackErrCode( const napi_env &env, const AsyncContext &info); /** - * @brief Thow error code for async function. + * @brief Thow error code for async-promise function. * * @param env The env. * @param info The input data. - * @param result The result to be return. */ void HandlePromiseErrCode( const napi_env &env, const AsyncContext &info); -- Gitee From 665b0a2fd85d1fc1221969f22de105850bb1166d Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 24 Oct 2022 21:27:17 +0800 Subject: [PATCH 436/491] add error code for wifi 1024 Signed-off-by: yanxiaotao@huawei.com --- wifi/frameworks/js/napi/BUILD.gn | 1 + wifi/frameworks/js/napi/inc/wifi_napi_errcode.h | 6 +++--- wifi/frameworks/js/napi/src/wifi_napi_entry.cpp | 4 ++++ wifi/frameworks/js/napi/src/wifi_napi_errcode.cpp | 6 +++--- wifi/frameworks/js/napi/src/wifi_napi_utils.cpp | 8 ++------ 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/wifi/frameworks/js/napi/BUILD.gn b/wifi/frameworks/js/napi/BUILD.gn index f51b542..9e78d24 100644 --- a/wifi/frameworks/js/napi/BUILD.gn +++ b/wifi/frameworks/js/napi/BUILD.gn @@ -164,6 +164,7 @@ ohos_shared_library("wifi_manager") { "src/wifi_napi_hotspot.cpp", "src/wifi_napi_p2p.cpp", "src/wifi_napi_utils.cpp", + "src/wifi_napi_errcode.cpp", ] deps = [ "$WIFI_ROOT_DIR/frameworks/native:wifi_sdk", diff --git a/wifi/frameworks/js/napi/inc/wifi_napi_errcode.h b/wifi/frameworks/js/napi/inc/wifi_napi_errcode.h index 46f5dab..fbef647 100644 --- a/wifi/frameworks/js/napi/inc/wifi_napi_errcode.h +++ b/wifi/frameworks/js/napi/inc/wifi_napi_errcode.h @@ -43,7 +43,7 @@ enum { do { \ if (!(cond)) { \ napi_value res = nullptr; \ - #ifdef ENABLE_NAPI_THROW_ERRCODE \ + #ifdef ENABLE_NAPI_WIFI_MANAGER \ HandleSyncErrCode(env, errCode); \ napi_get_undefined(env, &res); \ #else \ @@ -59,7 +59,7 @@ do { \ do { \ napi_value res = nullptr; \ if (!(cond)) { \ - #ifdef ENABLE_NAPI_THROW_ERRCODE \ + #ifdef ENABLE_NAPI_WIFI_MANAGER \ HandleSyncErrCode(env, errCode); \ napi_get_undefined(env, &res); \ #else \ @@ -67,7 +67,7 @@ do { \ #endif \ return res; \ } \ - #ifdef ENABLE_NAPI_THROW_ERRCODE \ + #ifdef ENABLE_NAPI_WIFI_MANAGER \ napi_get_undefined(env, &res); \ #else \ napi_get_boolean(env, cond, &res); \ diff --git a/wifi/frameworks/js/napi/src/wifi_napi_entry.cpp b/wifi/frameworks/js/napi/src/wifi_napi_entry.cpp index 2cd3cf6..0b2f504 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_entry.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_entry.cpp @@ -93,7 +93,11 @@ static napi_module wifiJsModule = { .nm_flags = 0, .nm_filename = NULL, .nm_register_func = Init, +#ifdef ENABLE_NAPI_WIFI_MANAGER + .nm_modname = "wifiManager", +#else .nm_modname = "wifi", +#endif .nm_priv = ((void *)0), .reserved = { 0 } }; diff --git a/wifi/frameworks/js/napi/src/wifi_napi_errcode.cpp b/wifi/frameworks/js/napi/src/wifi_napi_errcode.cpp index dc406cf..4dc8820 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_errcode.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_errcode.cpp @@ -120,7 +120,7 @@ void HandleCallbackErrCode( const napi_env &env, const AsyncContext &info) napi_value result[RESULT_PARAMS_NUM] = {nullptr}; result[1] = info.result; if (info.errorCode == ERR_CODE_SUCCESS) { -#ifdef ENABLE_NAPI_THROW_ERRCODE +#ifdef ENABLE_NAPI_WIFI_MANAGER napi_create_uint32(env, undefine, &result[0]); #else napi_create_uint32(env, info.errorCode, &result[0]); @@ -134,7 +134,7 @@ void HandleCallbackErrCode( const napi_env &env, const AsyncContext &info) errCb = info.callback[0]; } napi_get_reference_value(env, errCb, &callback); -#ifdef ENABLE_NAPI_THROW_ERRCODE +#ifdef ENABLE_NAPI_WIFI_MANAGER std::string errMsg = GetNapiErrMsg(env, info.errorCode); int32_t errCodeInfo = GetNapiErrCode(env, info.errorCode); results[0] = GetCallbackErrorValue(env, errCodeInfo, errMsg); @@ -151,7 +151,7 @@ void HandlePromiseErrCode( const napi_env &env, const AsyncContext &info) if (info.errorCode == ErrCode::WIFI_OPT_SUCCESS) { napi_resolve_deferred(env, info.deferred, info.result); } else { -#ifdef ENABLE_NAPI_THROW_ERRCODE +#ifdef ENABLE_NAPI_WIFI_MANAGER int32_t errCodeInfo = GetNapiErrCode(env, info.errorCode); std::string errMsg = GetNapiErrMsg(env, info.errorCode); napi_value businessError = nullptr; diff --git a/wifi/frameworks/js/napi/src/wifi_napi_utils.cpp b/wifi/frameworks/js/napi/src/wifi_napi_utils.cpp index 92a291d..ce07eeb 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_utils.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_utils.cpp @@ -256,7 +256,7 @@ static napi_value DoCallBackAsyncWork(const napi_env& env, AsyncContext *asyncCo napi_value undefine, callback; napi_get_undefined(env, &undefine); context->completeFunc(data); - HandleCallbackErrCode(env, context); + HandleCallbackErrCode(env, *context); if (context->callback[0] != nullptr) { napi_delete_reference(env, context->callback[0]); } @@ -293,11 +293,7 @@ static napi_value DoPromiseAsyncWork(const napi_env& env, AsyncContext *asyncCon } AsyncContext *context = (AsyncContext *)data; context->completeFunc(data); - if (context->errorCode == ERR_CODE_SUCCESS) { - napi_resolve_deferred(context->env, context->deferred, context->result); - } else { - napi_reject_deferred(context->env, context->deferred, context->result); - } + HandlePromiseErrCode(env, *context); napi_delete_async_work(env, context->work); delete context; }, -- Gitee From ec1e9d5f0f1cf6d856f898c5b69f8dd7bc927c4c Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 24 Oct 2022 21:29:43 +0800 Subject: [PATCH 437/491] add error code for wifi 1024 Signed-off-by: yanxiaotao@huawei.com --- wifi/frameworks/js/napi/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/frameworks/js/napi/BUILD.gn b/wifi/frameworks/js/napi/BUILD.gn index 9e78d24..11a528a 100644 --- a/wifi/frameworks/js/napi/BUILD.gn +++ b/wifi/frameworks/js/napi/BUILD.gn @@ -173,7 +173,7 @@ ohos_shared_library("wifi_manager") { "//foundation/arkui/napi:ace_napi", ] - defines = [ "ENABLE_NAPI_THROW_ERRCODE" ] + defines = [ "ENABLE_NAPI_WIFI_MANAGER" ] external_deps = [ "access_token:libaccesstoken_sdk", -- Gitee From 69c7bc3ebec05763a02567a656d62b4f843744c4 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 24 Oct 2022 21:58:44 +0800 Subject: [PATCH 438/491] add error code for wifi 1024 Signed-off-by: yanxiaotao@huawei.com --- wifi/frameworks/js/napi/src/wifi_napi_device.cpp | 1 + wifi/frameworks/js/napi/src/wifi_napi_utils.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp index 8cef17a..27c64e8 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp @@ -18,6 +18,7 @@ #include #include "wifi_common_util.h" #include "wifi_logger.h" +#include "wifi_napi_errcode.h" namespace OHOS { namespace Wifi { diff --git a/wifi/frameworks/js/napi/src/wifi_napi_utils.cpp b/wifi/frameworks/js/napi/src/wifi_napi_utils.cpp index ce07eeb..ebbc35b 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_utils.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_utils.cpp @@ -17,6 +17,7 @@ #include "securec.h" #include "wifi_logger.h" #include "context.h" +#include "wifi_napi_errcode.h" namespace OHOS { namespace Wifi { -- Gitee From 898d9747991bf43374b720f00557cb4266fa30ba Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 24 Oct 2022 22:00:10 +0800 Subject: [PATCH 439/491] add error code for wifi 1024 Signed-off-by: yanxiaotao@huawei.com --- wifi/frameworks/js/napi/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/frameworks/js/napi/BUILD.gn b/wifi/frameworks/js/napi/BUILD.gn index 11a528a..aa0e2ac 100644 --- a/wifi/frameworks/js/napi/BUILD.gn +++ b/wifi/frameworks/js/napi/BUILD.gn @@ -160,11 +160,11 @@ ohos_shared_library("wifi_manager") { sources = [ "src/wifi_napi_device.cpp", "src/wifi_napi_entry.cpp", + "src/wifi_napi_errcode.cpp", "src/wifi_napi_event.cpp", "src/wifi_napi_hotspot.cpp", "src/wifi_napi_p2p.cpp", "src/wifi_napi_utils.cpp", - "src/wifi_napi_errcode.cpp", ] deps = [ "$WIFI_ROOT_DIR/frameworks/native:wifi_sdk", -- Gitee From 1f138378ad0d6bc7196e0e733f7626911c3dfdd3 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 24 Oct 2022 22:23:05 +0800 Subject: [PATCH 440/491] add error code for wifi 1024 Signed-off-by: yanxiaotao@huawei.com --- .../js/napi/inc/wifi_napi_errcode.h | 34 ++++++++++++------- 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/wifi/frameworks/js/napi/inc/wifi_napi_errcode.h b/wifi/frameworks/js/napi/inc/wifi_napi_errcode.h index fbef647..352a2a9 100644 --- a/wifi/frameworks/js/napi/inc/wifi_napi_errcode.h +++ b/wifi/frameworks/js/napi/inc/wifi_napi_errcode.h @@ -38,17 +38,14 @@ enum { WIFI_NAPI_ERRCODE_NOT_SUPPORTED = 801, /* not supported */ }; +#ifdef ENABLE_NAPI_WIFI_MANAGER #ifndef WIFI_NAPI_ASSERT #define WIFI_NAPI_ASSERT(env, cond, errCode) \ do { \ if (!(cond)) { \ napi_value res = nullptr; \ - #ifdef ENABLE_NAPI_WIFI_MANAGER \ HandleSyncErrCode(env, errCode); \ napi_get_undefined(env, &res); \ - #else \ - napi_get_boolean(env, cond, &res); \ - #endif \ return res; \ } \ } while (0) @@ -59,22 +56,35 @@ do { \ do { \ napi_value res = nullptr; \ if (!(cond)) { \ - #ifdef ENABLE_NAPI_WIFI_MANAGER \ HandleSyncErrCode(env, errCode); \ - napi_get_undefined(env, &res); \ - #else \ + } \ + napi_get_undefined(env, &res); \ + return res; \ +} while (0) +#endif + +#else /* #else WIFI_NAPI_ASSERT */ + +#ifndef WIFI_NAPI_ASSERT +#define WIFI_NAPI_ASSERT(env, cond, errCode) \ +do { \ + if (!(cond)) { \ + napi_value res = nullptr; \ napi_get_boolean(env, cond, &res); \ - #endif \ return res; \ } \ - #ifdef ENABLE_NAPI_WIFI_MANAGER \ - napi_get_undefined(env, &res); \ - #else \ +} while (0) +#endif + +#ifndef WIFI_NAPI_RETURN +#define WIFI_NAPI_RETURN(env, cond, errCode) \ +do { \ + napi_value res = nullptr; \ napi_get_boolean(env, cond, &res); \ - #endif \ return res; \ } while (0) #endif +#endif /* #endif WIFI_NAPI_ASSERT */ /** * @brief Thow error code for async-callback function. -- Gitee From 2c4dbaece73425b0c25cbb8ba7ebe0cc04de3b1b Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 24 Oct 2022 22:32:51 +0800 Subject: [PATCH 441/491] add error code for wifi 1024 Signed-off-by: yanxiaotao@huawei.com --- wifi/frameworks/js/napi/src/wifi_napi_utils.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/wifi/frameworks/js/napi/src/wifi_napi_utils.cpp b/wifi/frameworks/js/napi/src/wifi_napi_utils.cpp index ebbc35b..a5b3ed8 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_utils.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_utils.cpp @@ -254,8 +254,6 @@ static napi_value DoCallBackAsyncWork(const napi_env& env, AsyncContext *asyncCo return; } AsyncContext *context = (AsyncContext *)data; - napi_value undefine, callback; - napi_get_undefined(env, &undefine); context->completeFunc(data); HandleCallbackErrCode(env, *context); if (context->callback[0] != nullptr) { -- Gitee From 33f66481aab75d14fb6440d70578256de502fae7 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Tue, 25 Oct 2022 08:48:31 +0800 Subject: [PATCH 442/491] add error code for wifi 1025 Signed-off-by: yanxiaotao@huawei.com --- wifi/frameworks/js/napi/BUILD.gn | 3 +++ 1 file changed, 3 insertions(+) diff --git a/wifi/frameworks/js/napi/BUILD.gn b/wifi/frameworks/js/napi/BUILD.gn index aa0e2ac..38bd8be 100644 --- a/wifi/frameworks/js/napi/BUILD.gn +++ b/wifi/frameworks/js/napi/BUILD.gn @@ -34,6 +34,7 @@ ohos_shared_library("wifi") { sources = [ "src/wifi_napi_device.cpp", "src/wifi_napi_entry.cpp", + "src/wifi_napi_errcode.cpp", "src/wifi_napi_event.cpp", "src/wifi_napi_hotspot.cpp", "src/wifi_napi_p2p.cpp", @@ -75,6 +76,7 @@ ohos_shared_library("wifiext") { sources = [ "src/wifi_ext_napi_entry.cpp", "src/wifi_ext_napi_hotspot.cpp", + "src/wifi_napi_errcode.cpp", "src/wifi_napi_utils.cpp", ] deps = [ @@ -114,6 +116,7 @@ ohos_shared_library("wifi_native_js") { sources = [ "src/wifi_napi_device.cpp", "src/wifi_napi_entry.cpp", + "src/wifi_napi_errcode.cpp", "src/wifi_napi_event.cpp", "src/wifi_napi_hotspot.cpp", "src/wifi_napi_p2p.cpp", -- Gitee From 2ab72e78c224dd1cecf41988ab2afab13c5eef12 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Tue, 25 Oct 2022 09:03:42 +0800 Subject: [PATCH 443/491] bugfix for printf 1025 Signed-off-by: yanxiaotao@huawei.com --- .../wifi_framework/wifi_manage/wifi_ap/ap_service.cpp | 4 ++-- .../wifi_manage/wifi_sta/sta_auto_connect_service.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.cpp index dc84cd0..3011b1a 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.cpp @@ -178,7 +178,7 @@ ErrCode ApService::GetValidChannels(BandType band, std::vector &validCh auto it = channelsInfo.find(band); if (it != channelsInfo.end()) { validChannel = channelsInfo[band]; - WIFI_LOGI("%{public}s, get valid channel size:%{public}d, band:%{public}d from WifiSettings.", + WIFI_LOGI("%{public}s, get valid channel size:%{public}lu, band:%{public}d from WifiSettings.", __func__, validChannel.size(), band); return ErrCode::WIFI_OPT_SUCCESS; } @@ -211,7 +211,7 @@ ErrCode ApService::GetValidChannels(BandType band, std::vector &validCh WIFI_LOGE("%{public}s, invalid band: %{public}d", __func__, band); return ErrCode::WIFI_OPT_INVALID_PARAM; } - WIFI_LOGI("%{public}s, get valid channel size:%{public}d, band:%{public}d from hal service.", + WIFI_LOGI("%{public}s, get valid channel size:%{public}lu, band:%{public}d from hal service.", __func__, validChannel.size(), band); return ErrCode::WIFI_OPT_SUCCESS; } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp index b2e9c5b..3d57317 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp @@ -86,7 +86,7 @@ void StaAutoConnectService::OnScanInfosReadyHandler(const std::vector &blockedBs for (auto iter = blockedBssidMap.begin(); iter != blockedBssidMap.end(); ++iter) { blockedBssids.push_back(iter->first); } - WIFI_LOGI("StaAutoConnectService::GetBlockedBssids, blockedBssids count: %{public}d.", + WIFI_LOGI("StaAutoConnectService::GetBlockedBssids, blockedBssids count: %{public}lu.", blockedBssids.size()); return; } -- Gitee From 713a2ab69b248eafdbe11902f97080e00ee7b9d4 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Tue, 25 Oct 2022 09:51:11 +0800 Subject: [PATCH 444/491] bugfix for printf 1025 Signed-off-by: yanxiaotao@huawei.com --- .../wifi_framework/wifi_manage/wifi_ap/ap_service.cpp | 4 ++-- .../wifi_manage/wifi_sta/sta_auto_connect_service.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.cpp index 3011b1a..85af1d0 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.cpp @@ -178,7 +178,7 @@ ErrCode ApService::GetValidChannels(BandType band, std::vector &validCh auto it = channelsInfo.find(band); if (it != channelsInfo.end()) { validChannel = channelsInfo[band]; - WIFI_LOGI("%{public}s, get valid channel size:%{public}lu, band:%{public}d from WifiSettings.", + WIFI_LOGI("%{public}s, get valid channel size:%{public}u, band:%{public}d from WifiSettings.", __func__, validChannel.size(), band); return ErrCode::WIFI_OPT_SUCCESS; } @@ -211,7 +211,7 @@ ErrCode ApService::GetValidChannels(BandType band, std::vector &validCh WIFI_LOGE("%{public}s, invalid band: %{public}d", __func__, band); return ErrCode::WIFI_OPT_INVALID_PARAM; } - WIFI_LOGI("%{public}s, get valid channel size:%{public}lu, band:%{public}d from hal service.", + WIFI_LOGI("%{public}s, get valid channel size:%{public}u, band:%{public}d from hal service.", __func__, validChannel.size(), band); return ErrCode::WIFI_OPT_SUCCESS; } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp index 3d57317..fb6bea5 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp @@ -86,7 +86,7 @@ void StaAutoConnectService::OnScanInfosReadyHandler(const std::vector &blockedBs for (auto iter = blockedBssidMap.begin(); iter != blockedBssidMap.end(); ++iter) { blockedBssids.push_back(iter->first); } - WIFI_LOGI("StaAutoConnectService::GetBlockedBssids, blockedBssids count: %{public}lu.", + WIFI_LOGI("StaAutoConnectService::GetBlockedBssids, blockedBssids count: %{public}u.", blockedBssids.size()); return; } -- Gitee From a25c508a2aa51157c2c85fd0c4c86a48afccd727 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Tue, 25 Oct 2022 10:21:42 +0800 Subject: [PATCH 445/491] add error code for wifi 1025 Signed-off-by: yanxiaotao@huawei.com --- wifi/frameworks/js/napi/inc/wifi_napi_errcode.h | 2 +- wifi/frameworks/js/napi/src/wifi_napi_errcode.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wifi/frameworks/js/napi/inc/wifi_napi_errcode.h b/wifi/frameworks/js/napi/inc/wifi_napi_errcode.h index 352a2a9..10de1d9 100644 --- a/wifi/frameworks/js/napi/inc/wifi_napi_errcode.h +++ b/wifi/frameworks/js/napi/inc/wifi_napi_errcode.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2022 Huawei Device Co., Ltd. + * Copyright (C) 2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/wifi/frameworks/js/napi/src/wifi_napi_errcode.cpp b/wifi/frameworks/js/napi/src/wifi_napi_errcode.cpp index 4dc8820..b7e8b41 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_errcode.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_errcode.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2022 Huawei Device Co., Ltd. + * Copyright (C) 2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "wifi_manager_napi_errcode.h" +#include "wifi_napi_errcode.h" #include #include "wifi_logger.h" #include "wifi_errcode.h" -- Gitee From 7609b54c25a9137c8dc507aad40ef62af9352bc5 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Tue, 25 Oct 2022 11:02:20 +0800 Subject: [PATCH 446/491] add error code for wifi 1025 Signed-off-by: yanxiaotao@huawei.com --- wifi/frameworks/js/napi/inc/wifi_napi_errcode.h | 6 ++++-- wifi/frameworks/js/napi/src/wifi_napi_errcode.cpp | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/wifi/frameworks/js/napi/inc/wifi_napi_errcode.h b/wifi/frameworks/js/napi/inc/wifi_napi_errcode.h index 10de1d9..c76de11 100644 --- a/wifi/frameworks/js/napi/inc/wifi_napi_errcode.h +++ b/wifi/frameworks/js/napi/inc/wifi_napi_errcode.h @@ -63,7 +63,7 @@ do { \ } while (0) #endif -#else /* #else WIFI_NAPI_ASSERT */ +#else /* #else ENABLE_NAPI_WIFI_MANAGER */ #ifndef WIFI_NAPI_ASSERT #define WIFI_NAPI_ASSERT(env, cond, errCode) \ @@ -84,7 +84,7 @@ do { \ return res; \ } while (0) #endif -#endif /* #endif WIFI_NAPI_ASSERT */ +#endif /* #endif ENABLE_NAPI_WIFI_MANAGER */ /** * @brief Thow error code for async-callback function. @@ -102,6 +102,7 @@ void HandleCallbackErrCode( const napi_env &env, const AsyncContext &info); */ void HandlePromiseErrCode( const napi_env &env, const AsyncContext &info); +#ifdef ENABLE_NAPI_WIFI_MANAGER /** * @brief Thow error code for async function. * @@ -109,6 +110,7 @@ void HandlePromiseErrCode( const napi_env &env, const AsyncContext &info); * @param errCode The error code. */ void HandleSyncErrCode(const napi_env &env, int32_t errCode); +#endif } // namespace Wifi } // namespace OHOS #endif diff --git a/wifi/frameworks/js/napi/src/wifi_napi_errcode.cpp b/wifi/frameworks/js/napi/src/wifi_napi_errcode.cpp index b7e8b41..7daa783 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_errcode.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_errcode.cpp @@ -95,6 +95,7 @@ static std::string GetNapiErrMsg(const napi_env &env, const int32_t errCode) return "Inner error."; } +#ifdef ENABLE_NAPI_WIFI_MANAGER static napi_value GetCallbackErrorValue(napi_env env, const int32_t errCode, const std::string errMsg) { if (errCode == ErrCode::WIFI_OPT_SUCCESS) { @@ -110,6 +111,7 @@ static napi_value GetCallbackErrorValue(napi_env env, const int32_t errCode, con NAPI_CALL(env, napi_set_named_property(env, businessError, "message", eMsg)); return businessError; } +#endif void HandleCallbackErrCode( const napi_env &env, const AsyncContext &info) { -- Gitee From 7d37a978681f1f61211cee495f584d04c977ffde Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Tue, 25 Oct 2022 12:52:04 +0800 Subject: [PATCH 447/491] add error code for wifi 1025 Signed-off-by: yanxiaotao@huawei.com --- .../js/napi/src/wifi_napi_errcode.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/wifi/frameworks/js/napi/src/wifi_napi_errcode.cpp b/wifi/frameworks/js/napi/src/wifi_napi_errcode.cpp index 7daa783..b4ea84e 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_errcode.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_errcode.cpp @@ -56,13 +56,6 @@ static std::map napiErrMsgMap { { WIFI_NAPI_ERRCODE_NOT_SUPPORTED, "Capability not supported." }, }; -static napi_value NapiGetNull(const napi_env &env) -{ - napi_value res = nullptr; - napi_get_null(env, &res); - return res; -} - static napi_value NapiGetUndefined(const napi_env &env) { napi_value undefined = nullptr; @@ -96,10 +89,17 @@ static std::string GetNapiErrMsg(const napi_env &env, const int32_t errCode) } #ifdef ENABLE_NAPI_WIFI_MANAGER +static napi_value NapiGetNull(const napi_env &env) +{ + napi_value res = nullptr; + napi_get_null(env, &res); + return res; +} + static napi_value GetCallbackErrorValue(napi_env env, const int32_t errCode, const std::string errMsg) { if (errCode == ErrCode::WIFI_OPT_SUCCESS) { - return NapiGetNull(env); + return NapiGetUndefined(env); } napi_value businessError = nullptr; napi_value eCode = nullptr; @@ -121,7 +121,7 @@ void HandleCallbackErrCode( const napi_env &env, const AsyncContext &info) napi_value callback = nullptr; napi_value result[RESULT_PARAMS_NUM] = {nullptr}; result[1] = info.result; - if (info.errorCode == ERR_CODE_SUCCESS) { + if (info.errorCode == ErrCode::WIFI_OPT_SUCCESS) { #ifdef ENABLE_NAPI_WIFI_MANAGER napi_create_uint32(env, undefine, &result[0]); #else -- Gitee From a8d5bbbcb66fa62bb0924c122ae7fd562b692385 Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Tue, 25 Oct 2022 08:06:35 +0000 Subject: [PATCH 448/491] ok Signed-off-by: yanxiaotao --- .../wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c index 3ec35e0..b14d1f1 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c @@ -712,7 +712,7 @@ static void *WpaReceiveCallback(void *arg) if (len <= 0) { continue; } - LOGE("wpa recv buf: %{public}s!", buf); + LOGD("wpa recv buf: %{public}s!", buf); /* Message format: IFACE=wlan0 EventType params... */ char *p = strchr(buf, '>'); if (p == NULL) { -- Gitee From 4694107923c2af9f3e0ce4a4d7d0846b0919acdf Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Tue, 25 Oct 2022 16:32:43 +0800 Subject: [PATCH 449/491] add error code for wifi 1025 Signed-off-by: yanxiaotao@huawei.com --- wifi/frameworks/BUILD.gn | 1 + wifi/frameworks/js/napi/src/wifi_napi_errcode.cpp | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/wifi/frameworks/BUILD.gn b/wifi/frameworks/BUILD.gn index 113c244..73b1c42 100644 --- a/wifi/frameworks/BUILD.gn +++ b/wifi/frameworks/BUILD.gn @@ -26,6 +26,7 @@ group("wifi_kits") { "$WIFI_ROOT_DIR/frameworks/js/napi:wifi", "$WIFI_ROOT_DIR/frameworks/js/napi:wifi_native_js", "$WIFI_ROOT_DIR/frameworks/js/napi:wifiext", + "$WIFI_ROOT_DIR/frameworks/js/napi:wifi_manager", ] } } diff --git a/wifi/frameworks/js/napi/src/wifi_napi_errcode.cpp b/wifi/frameworks/js/napi/src/wifi_napi_errcode.cpp index b4ea84e..bd47cd5 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_errcode.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_errcode.cpp @@ -123,7 +123,7 @@ void HandleCallbackErrCode( const napi_env &env, const AsyncContext &info) result[1] = info.result; if (info.errorCode == ErrCode::WIFI_OPT_SUCCESS) { #ifdef ENABLE_NAPI_WIFI_MANAGER - napi_create_uint32(env, undefine, &result[0]); + result[0] = NapiGetUndefined(env); #else napi_create_uint32(env, info.errorCode, &result[0]); napi_get_reference_value(env, info.callback[0], &callback); @@ -139,7 +139,7 @@ void HandleCallbackErrCode( const napi_env &env, const AsyncContext &info) #ifdef ENABLE_NAPI_WIFI_MANAGER std::string errMsg = GetNapiErrMsg(env, info.errorCode); int32_t errCodeInfo = GetNapiErrCode(env, info.errorCode); - results[0] = GetCallbackErrorValue(env, errCodeInfo, errMsg); + result[0] = GetCallbackErrorValue(env, errCodeInfo, errMsg); #else napi_create_uint32(env, info.errorCode, &result[0]); #endif -- Gitee From ef683af0d5b20aebaabd57cba6ffed836c0854f6 Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Tue, 25 Oct 2022 08:34:18 +0000 Subject: [PATCH 450/491] add for throw error code for sta Signed-off-by: yanxiaotao --- .../js/napi/src/wifi_napi_device.cpp | 204 ++++++++---------- 1 file changed, 93 insertions(+), 111 deletions(-) diff --git a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp index 27c64e8..a7dd3bf 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp @@ -39,35 +39,28 @@ napi_value EnableWifi(napi_env env, napi_callback_info info) napi_value DisableWifi(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; - NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_INVALID_PARAM); ErrCode ret = wifiDevicePtr->DisableWifi(); - napi_value result; - napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); - return result; + WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, WIFI_OPT_SUCCESS); } napi_value IsWifiActive(napi_env env, napi_callback_info info) { - NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_INVALID_PARAM); bool activeStatus = false; ErrCode ret = wifiDevicePtr->IsWifiActive(activeStatus); if (ret != WIFI_OPT_SUCCESS) { WIFI_LOGE("Get wifi active status fail: %{public}d", ret); } - - napi_value result; - napi_get_boolean(env, activeStatus, &result); - return result; + WIFI_NAPI_RETURN(env, activeStatus, WIFI_OPT_SUCCESS); } napi_value Scan(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; - NAPI_ASSERT(env, wifiScanPtr != nullptr, "Wifi scan instance is null."); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_INVALID_PARAM); ErrCode ret = wifiScanPtr->Scan(); - napi_value result; - napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); - return result; + WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, WIFI_OPT_SUCCESS); } static SecTypeJs SecurityTypeNativeToJs(const WifiSecurity& cppSecurityType) @@ -179,10 +172,10 @@ napi_value GetScanInfos(napi_env env, napi_callback_info info) napi_value thisVar = nullptr; void *data = nullptr; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data)); - NAPI_ASSERT(env, wifiScanPtr != nullptr, "Wifi device instance is null."); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_INVALID_PARAM); ScanInfoAsyncContext *asyncContext = new ScanInfoAsyncContext(env); - NAPI_ASSERT(env, asyncContext != nullptr, "asyncContext is null."); + WIFI_NAPI_ASSERT(env, asyncContext != nullptr, WIFI_OPT_INVALID_PARAM); napi_create_string_latin1(env, "getScanInfos", NAPI_AUTO_LENGTH, &asyncContext->resourceName); asyncContext->executeFunc = [&](void* data) -> void { @@ -206,13 +199,14 @@ napi_value GetScanInfos(napi_env env, napi_callback_info info) napi_value GetScanResults(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; - NAPI_ASSERT(env, wifiScanPtr != nullptr, "Wifi scan instance is null."); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_INVALID_PARAM); std::vector scanInfos; ErrCode ret = wifiScanPtr->GetScanInfoList(scanInfos); if (ret != WIFI_OPT_SUCCESS) { WIFI_LOGE("GetScanInfoList return fail: %{public}d", ret); } + WIFI_NAPI_ASSERT(env, ret == WIFI_OPT_SUCCESS, ret); WIFI_LOGI("GetScanInfoList, size: %{public}zu", scanInfos.size()); napi_value arrayResult; napi_create_array_with_length(env, scanInfos.size(), &arrayResult); @@ -369,15 +363,15 @@ napi_value AddDeviceConfig(napi_env env, napi_callback_info info) napi_value thisVar = nullptr; void *data = nullptr; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data)); - NAPI_ASSERT(env, argc >= 1, "Wrong number of arguments"); - NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + WIFI_NAPI_ASSERT(env, argc >= 1, WIFI_OPT_INVALID_PARAM); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_INVALID_PARAM); napi_valuetype valueType; napi_typeof(env, argv[0], &valueType); - NAPI_ASSERT(env, valueType == napi_object, "Wrong argument type, object is expected for parameter 1."); + WIFI_NAPI_ASSERT(env, valueType == napi_object, WIFI_OPT_INVALID_PARAM); DeviceConfigContext *asyncContext = new DeviceConfigContext(env); - NAPI_ASSERT(env, asyncContext != nullptr, "asyncContext is null."); + WIFI_NAPI_ASSERT(env, asyncContext != nullptr, WIFI_OPT_INVALID_PARAM); napi_create_string_latin1(env, "addDeviceConfig", NAPI_AUTO_LENGTH, &asyncContext->resourceName); WifiDeviceConfig *config = new WifiDeviceConfig(); @@ -421,15 +415,15 @@ napi_value AddUntrustedConfig(napi_env env, napi_callback_info info) napi_value thisVar = nullptr; void *data = nullptr; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data)); - NAPI_ASSERT(env, argc >= 1, "Wrong number of arguments"); - NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + WIFI_NAPI_ASSERT(env, argc >= 1, WIFI_OPT_INVALID_PARAM); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_INVALID_PARAM); napi_valuetype valueType; napi_typeof(env, argv[0], &valueType); - NAPI_ASSERT(env, valueType == napi_object, "Wrong argument type, object is expected for parameter 1."); + WIFI_NAPI_ASSERT(env, valueType == napi_object, WIFI_OPT_INVALID_PARAM); DeviceConfigContext *asyncContext = new DeviceConfigContext(env); - NAPI_ASSERT(env, asyncContext != nullptr, "asyncContext is null."); + WIFI_NAPI_ASSERT(env, asyncContext != nullptr, WIFI_OPT_INVALID_PARAM); napi_create_string_latin1(env, "AddUntrustedConfig", NAPI_AUTO_LENGTH, &asyncContext->resourceName); WifiDeviceConfig *config = new WifiDeviceConfig(); @@ -473,15 +467,15 @@ napi_value RemoveUntrustedConfig(napi_env env, napi_callback_info info) napi_value thisVar = nullptr; void *data = nullptr; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data)); - NAPI_ASSERT(env, argc >= 1, "Wrong number of arguments"); - NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + WIFI_NAPI_ASSERT(env, argc >= 1, WIFI_OPT_INVALID_PARAM); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_INVALID_PARAM); napi_valuetype valueType; napi_typeof(env, argv[0], &valueType); - NAPI_ASSERT(env, valueType == napi_object, "Wrong argument type, object is expected for parameter 1."); + WIFI_NAPI_ASSERT(env, valueType == napi_object, WIFI_OPT_INVALID_PARAM); DeviceConfigContext *asyncContext = new DeviceConfigContext(env); - NAPI_ASSERT(env, asyncContext != nullptr, "asyncContext is null."); + WIFI_NAPI_ASSERT(env, asyncContext != nullptr, WIFI_OPT_INVALID_PARAM); napi_create_string_latin1(env, "RemoveUntrustedConfig", NAPI_AUTO_LENGTH, &asyncContext->resourceName); WifiDeviceConfig *config = new WifiDeviceConfig(); @@ -520,15 +514,15 @@ napi_value AddCandidateConfig(napi_env env, napi_callback_info info) napi_value thisVar = nullptr; void *data = nullptr; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data)); - NAPI_ASSERT(env, argc >= 1, "Wrong number of arguments"); - NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + WIFI_NAPI_ASSERT(env, argc >= 1, WIFI_OPT_INVALID_PARAM); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_INVALID_PARAM); napi_valuetype valueType; napi_typeof(env, argv[0], &valueType); - NAPI_ASSERT(env, valueType == napi_object, "Wrong argument type, object is expected for parameter 1."); + WIFI_NAPI_ASSERT(env, valueType == napi_object, WIFI_OPT_INVALID_PARAM); DeviceConfigContext *asyncContext = new DeviceConfigContext(env); - NAPI_ASSERT(env, asyncContext != nullptr, "asyncContext is null."); + WIFI_NAPI_ASSERT(env, asyncContext != nullptr, WIFI_OPT_INVALID_PARAM); napi_create_string_latin1(env, "AddCandidateConfig", NAPI_AUTO_LENGTH, &asyncContext->resourceName); WifiDeviceConfig *config = new WifiDeviceConfig(); @@ -573,15 +567,15 @@ napi_value RemoveCandidateConfig(napi_env env, napi_callback_info info) napi_value thisVar = nullptr; void *data = nullptr; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data)); - NAPI_ASSERT(env, argc >= 1, "Wrong number of arguments"); - NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + WIFI_NAPI_ASSERT(env, argc >= 1, WIFI_OPT_INVALID_PARAM); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_INVALID_PARAM); napi_valuetype valueType; napi_typeof(env, argv[0], &valueType); - NAPI_ASSERT(env, valueType == napi_number, "Wrong argument type, object is expected for parameter 1."); + WIFI_NAPI_ASSERT(env, valueType == napi_number, WIFI_OPT_INVALID_PARAM); DeviceConfigContext *asyncContext = new DeviceConfigContext(env); - NAPI_ASSERT(env, asyncContext != nullptr, "asyncContext is null."); + WIFI_NAPI_ASSERT(env, asyncContext != nullptr, WIFI_OPT_INVALID_PARAM); napi_create_string_latin1(env, "RemoveCandidateConfig", NAPI_AUTO_LENGTH, &asyncContext->resourceName); napi_get_value_int32(env, argv[0], &asyncContext->networkId); @@ -611,21 +605,19 @@ napi_value ConnectToCandidateConfig(napi_env env, napi_callback_info info) napi_value argv[1]; napi_value thisVar; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); - NAPI_ASSERT(env, argc == 1, "Wrong number of arguments"); + WIFI_NAPI_ASSERT(env, argc == 1, WIFI_OPT_INVALID_PARAM); napi_valuetype valueType; napi_typeof(env, argv[0], &valueType); - NAPI_ASSERT(env, valueType == napi_number, "Wrong argument type. napi_number expected."); + WIFI_NAPI_ASSERT(env, valueType == napi_number, WIFI_OPT_INVALID_PARAM); int networkId = -1; napi_get_value_int32(env, argv[0], &networkId); bool isCandidate = true; - NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_INVALID_PARAM); ErrCode ret = wifiDevicePtr->ConnectToNetwork(networkId, isCandidate); - napi_value result; - napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); - return result; + WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret); } napi_value ConnectToNetwork(napi_env env, napi_callback_info info) @@ -635,21 +627,19 @@ napi_value ConnectToNetwork(napi_env env, napi_callback_info info) napi_value argv[1]; napi_value thisVar; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); - NAPI_ASSERT(env, argc == 1, "Wrong number of arguments"); + WIFI_NAPI_ASSERT(env, argc == 1, WIFI_OPT_INVALID_PARAM); napi_valuetype valueType; napi_typeof(env, argv[0], &valueType); - NAPI_ASSERT(env, valueType == napi_number, "Wrong argument type. napi_number expected."); + WIFI_NAPI_ASSERT(env, valueType == napi_number, WIFI_OPT_INVALID_PARAM); int networkId = -1; napi_get_value_int32(env, argv[0], &networkId); bool isCandidate = false; - NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED); ErrCode ret = wifiDevicePtr->ConnectToNetwork(networkId, isCandidate); - napi_value result; - napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); - return result; + WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret); } napi_value ConnectToDevice(napi_env env, napi_callback_info info) @@ -662,37 +652,31 @@ napi_value ConnectToDevice(napi_env env, napi_callback_info info) napi_valuetype valueType; napi_typeof(env, argv[0], &valueType); - NAPI_ASSERT(env, valueType == napi_object, "Wrong argument type. Object expected."); + WIFI_NAPI_ASSERT(env, valueType == napi_object, WIFI_OPT_INVALID_PARAM); - NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED); WifiDeviceConfig config; JsObjToDeviceConfig(env, argv[0], config); ErrCode ret = wifiDevicePtr->ConnectToDevice(config); if (ret != WIFI_OPT_SUCCESS) { WIFI_LOGE("Connect to device fail: %{public}d", ret); } - napi_value result; - napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); - return result; + WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret); } napi_value IsConnected(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; - NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); - napi_value result; - napi_get_boolean(env, wifiDevicePtr->IsConnected(), &result); - return result; + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_RETURN(env, wifiDevicePtr->IsConnected(), WIFI_OPT_SUCCESS); } napi_value Disconnect(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; - NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED); ErrCode ret = wifiDevicePtr->Disconnect(); - napi_value result; - napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); - return result; + WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret); } napi_value GetSignalLevel(napi_env env, napi_callback_info info) @@ -702,15 +686,16 @@ napi_value GetSignalLevel(napi_env env, napi_callback_info info) napi_value thisVar; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); /* the input have 2 parameters */ - NAPI_ASSERT(env, argc == 2, "Wrong number of arguments"); + WIFI_NAPI_ASSERT(env, argc == 2, WIFI_OPT_INVALID_PARAM); napi_valuetype type1; napi_valuetype type2; napi_typeof(env, argv[0], &type1); napi_typeof(env, argv[1], &type2); - NAPI_ASSERT(env, type1 == napi_number, "Wrong argument type. napi_number expected."); - NAPI_ASSERT(env, type2 == napi_number, "Wrong argument type. napi_number expected."); - NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + WIFI_NAPI_ASSERT(env, type1 == napi_number, WIFI_OPT_INVALID_PARAM); + WIFI_NAPI_ASSERT(env, type2 == napi_number, WIFI_OPT_INVALID_PARAM); + WIFI_NAPI_ASSERT(env, argc == 2, WIFI_OPT_INVALID_PARAM); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED); int level = -1; int rssi = 0; @@ -721,29 +706,23 @@ napi_value GetSignalLevel(napi_env env, napi_callback_info info) if (ret != WIFI_OPT_SUCCESS) { WIFI_LOGE("Get wifi signal level fail: %{public}d", ret); } - - napi_value result; - napi_create_uint32(env, level, &result); - return result; + WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret); } napi_value ReConnect(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; - NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); - - napi_value result; - napi_get_boolean(env, wifiDevicePtr->ReConnect() == WIFI_OPT_SUCCESS, &result); - return result; + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED); + ErrCode ret = wifiDevicePtr->ReConnect(); + WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret); } napi_value ReAssociate(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; - NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); - napi_value result; - napi_get_boolean(env, wifiDevicePtr->ReAssociate() == WIFI_OPT_SUCCESS, &result); - return result; + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED); + ErrCode ret = wifiDevicePtr->ReAssociate(); + WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret); } static void IpInfoToJsObj(const napi_env& env, IpInfo& ipInfo, napi_value& result) @@ -761,7 +740,7 @@ static void IpInfoToJsObj(const napi_env& env, IpInfo& ipInfo, napi_value& resul napi_value GetIpInfo(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; - NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED); IpInfo ipInfo; napi_value result; @@ -769,6 +748,7 @@ napi_value GetIpInfo(napi_env env, napi_callback_info info) if (ret != WIFI_OPT_SUCCESS) { WIFI_LOGE("Get ip info fail: %{public}d", ret); } + WIFI_NAPI_ASSERT(env, ret == WIFI_OPT_SUCCESS, ret); IpInfoToJsObj(env, ipInfo, result); return result; } @@ -803,10 +783,10 @@ napi_value GetLinkedInfo(napi_env env, napi_callback_info info) napi_value thisVar = nullptr; void *data = nullptr; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data)); - NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED); LinkedInfoAsyncContext *asyncContext = new LinkedInfoAsyncContext(env); - NAPI_ASSERT(env, asyncContext != nullptr, "asyncContext is null."); + WIFI_NAPI_ASSERT(env, asyncContext != nullptr, WIFI_OPT_FAILED); napi_create_string_latin1(env, "getLinkedInfo", NAPI_AUTO_LENGTH, &asyncContext->resourceName); asyncContext->executeFunc = [&](void* data) -> void { @@ -833,28 +813,26 @@ napi_value RemoveDevice(napi_env env, napi_callback_info info) napi_value argv[1]; napi_value thisVar; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); - NAPI_ASSERT(env, argc == 1, "Wrong number of arguments"); + WIFI_NAPI_ASSERT(env, argc == 1, WIFI_OPT_INVALID_PARAM); napi_valuetype valueType; napi_typeof(env, argv[0], &valueType); - NAPI_ASSERT(env, valueType == napi_number, "Wrong argument type. napi_number expected."); + WIFI_NAPI_ASSERT(env, valueType == napi_number, WIFI_OPT_INVALID_PARAM); int networkId = -1; napi_get_value_int32(env, argv[0], &networkId); - NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED); - napi_value result; - napi_get_boolean(env, wifiDevicePtr->RemoveDevice(networkId) == WIFI_OPT_SUCCESS, &result); - return result; + ErrCode ret = wifiDevicePtr->RemoveDevice(networkId); + WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret); } napi_value RemoveAllNetwork(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; - NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); - napi_value result; - napi_get_boolean(env, wifiDevicePtr->RemoveAllDevice() == WIFI_OPT_SUCCESS, &result); - return result; + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED); + ErrCode ret = wifiDevicePtr->RemoveAllDevice(); + WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret); } napi_value DisableNetwork(napi_env env, napi_callback_info info) @@ -864,29 +842,29 @@ napi_value DisableNetwork(napi_env env, napi_callback_info info) napi_value argv[1]; napi_value thisVar; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); - NAPI_ASSERT(env, argc == 1, "Wrong number of arguments"); + WIFI_NAPI_ASSERT(env, argc == 1, WIFI_OPT_INVALID_PARAM); napi_valuetype valueType; napi_typeof(env, argv[0], &valueType); - NAPI_ASSERT(env, valueType == napi_number, "Wrong argument type. napi_number expected."); - NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + WIFI_NAPI_ASSERT(env, valueType == napi_number, WIFI_OPT_INVALID_PARAM); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED); int networkId = -1; napi_get_value_int32(env, argv[0], &networkId); - napi_value result; - napi_get_boolean(env, wifiDevicePtr->DisableDeviceConfig(networkId) == WIFI_OPT_SUCCESS, &result); - return result; + ErrCode ret = wifiDevicePtr->DisableDeviceConfig(networkId); + WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret); } napi_value GetCountryCode(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; - NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED); std::string countryCode; ErrCode ret = wifiDevicePtr->GetCountryCode(countryCode); if (ret != WIFI_OPT_SUCCESS) { WIFI_LOGE("Get countryCode fail: %{public}d", ret); } + WIFI_NAPI_ASSERT(env, ret == WIFI_OPT_SUCCESS, ret); napi_value cc; napi_create_string_utf8(env, countryCode.c_str(), NAPI_AUTO_LENGTH, &cc); return cc; @@ -1008,7 +986,7 @@ static void DeviceConfigToJsArray(const napi_env& env, std::vector vecDeviceConfigs; bool isCandidate = false; ErrCode ret = wifiDevicePtr->GetDeviceConfigs(vecDeviceConfigs, isCandidate); @@ -1016,6 +994,7 @@ napi_value GetDeviceConfigs(napi_env env, napi_callback_info info) WIFI_LOGE("Get device configs fail: %{public}d", ret); } + WIFI_NAPI_ASSERT(env, ret == WIFI_OPT_SUCCESS, ret); WIFI_LOGI("Get device configs size: %{public}zu", vecDeviceConfigs.size()); napi_value arrayResult; napi_create_array_with_length(env, vecDeviceConfigs.size(), &arrayResult); @@ -1028,7 +1007,7 @@ napi_value GetDeviceConfigs(napi_env env, napi_callback_info info) napi_value GetCandidateConfigs(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; - NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED); std::vector vecDeviceConfigs; bool isCandidate = true; ErrCode ret = wifiDevicePtr->GetDeviceConfigs(vecDeviceConfigs, isCandidate); @@ -1036,6 +1015,7 @@ napi_value GetCandidateConfigs(napi_env env, napi_callback_info info) WIFI_LOGE("Get candidate device configs fail: %{public}d", ret); } + WIFI_NAPI_ASSERT(env, ret == WIFI_OPT_SUCCESS, ret); WIFI_LOGI("Get candidate device configs size: %{public}zu", vecDeviceConfigs.size()); napi_value arrayResult; napi_create_array_with_length(env, vecDeviceConfigs.size(), &arrayResult); @@ -1055,9 +1035,9 @@ napi_value UpdateNetwork(napi_env env, napi_callback_info info) napi_valuetype valueType; napi_typeof(env, argv[0], &valueType); - NAPI_ASSERT(env, valueType == napi_object, "Wrong argument type. Object expected."); + WIFI_NAPI_ASSERT(env, valueType == napi_object, WIFI_OPT_INVALID_PARAM); - NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED); int updateResult; WifiDeviceConfig config; JsObjToDeviceConfig(env, argv[0], config); @@ -1066,6 +1046,7 @@ napi_value UpdateNetwork(napi_env env, napi_callback_info info) WIFI_LOGE("Update device config fail: %{public}d", ret); } + WIFI_NAPI_ASSERT(env, ret == WIFI_OPT_SUCCESS, ret); napi_value result; napi_create_uint32(env, updateResult, &result); return result; @@ -1074,13 +1055,14 @@ napi_value UpdateNetwork(napi_env env, napi_callback_info info) napi_value GetSupportedFeatures(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; - NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED); long features = -1; ErrCode ret = wifiDevicePtr->GetSupportedFeatures(features); if (ret != WIFI_OPT_SUCCESS) { WIFI_LOGE("Get supported features fail: %{public}d", ret); } + WIFI_NAPI_ASSERT(env, ret == WIFI_OPT_SUCCESS, ret); napi_value result; napi_create_int64(env, features, &result); return result; @@ -1093,34 +1075,34 @@ napi_value IsFeatureSupported(napi_env env, napi_callback_info info) napi_value argv[1]; napi_value thisVar; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); - NAPI_ASSERT(env, argc == 1, "Wrong number of arguments"); + WIFI_NAPI_ASSERT(env, argc == 1, WIFI_OPT_INVALID_PARAM); napi_valuetype valueType; napi_typeof(env, argv[0], &valueType); - NAPI_ASSERT(env, valueType == napi_number, "Wrong argument type. napi_number expected."); + WIFI_NAPI_ASSERT(env, valueType == napi_number, WIFI_OPT_INVALID_PARAM); long feature = -1; napi_get_value_int64(env, argv[0], (int64_t*)&feature); - NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED); - napi_value result; - napi_get_boolean(env, wifiDevicePtr->IsFeatureSupported(feature), &result); - return result; + bool ret = wifiDevicePtr->IsFeatureSupported(feature); + WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret); } napi_value GetDeviceMacAddress(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; - NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED); std::string macAddr; ErrCode ret = wifiDevicePtr->GetDeviceMacAddress(macAddr); if (ret != WIFI_OPT_SUCCESS) { WIFI_LOGE("Get mac address fail: %{public}d", ret); } + WIFI_NAPI_ASSERT(env, ret == WIFI_OPT_SUCCESS, ret); napi_value addr; napi_create_string_utf8(env, macAddr.c_str(), NAPI_AUTO_LENGTH, &addr); return addr; } } // namespace Wifi -} // namespace OHOS +} // namespace OHOS \ No newline at end of file -- Gitee From d2670dc9a366db1a957940318e217a640f1efcaa Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Tue, 25 Oct 2022 19:55:33 +0800 Subject: [PATCH 451/491] bugfix for printf 1025 Signed-off-by: yanxiaotao@huawei.com --- .../wifi_framework/wifi_manage/wifi_ap/ap_service.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.cpp index 85af1d0..ca3bee6 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.cpp @@ -178,8 +178,8 @@ ErrCode ApService::GetValidChannels(BandType band, std::vector &validCh auto it = channelsInfo.find(band); if (it != channelsInfo.end()) { validChannel = channelsInfo[band]; - WIFI_LOGI("%{public}s, get valid channel size:%{public}u, band:%{public}d from WifiSettings.", - __func__, validChannel.size(), band); + WIFI_LOGI("%{public}s, get valid channel size:%{public}d, band:%{public}d from WifiSettings.", + __func__, (int)validChannel.size(), band); return ErrCode::WIFI_OPT_SUCCESS; } } @@ -211,8 +211,8 @@ ErrCode ApService::GetValidChannels(BandType band, std::vector &validCh WIFI_LOGE("%{public}s, invalid band: %{public}d", __func__, band); return ErrCode::WIFI_OPT_INVALID_PARAM; } - WIFI_LOGI("%{public}s, get valid channel size:%{public}u, band:%{public}d from hal service.", - __func__, validChannel.size(), band); + WIFI_LOGI("%{public}s, get valid channel size:%{public}d, band:%{public}d from hal service.", + __func__, (int)validChannel.size(), band); return ErrCode::WIFI_OPT_SUCCESS; } -- Gitee From 356f1bc01fca4f54afcd94900b2088a604ea4881 Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Tue, 25 Oct 2022 12:06:33 +0000 Subject: [PATCH 452/491] ok Signed-off-by: yanxiaotao --- wifi/frameworks/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/frameworks/BUILD.gn b/wifi/frameworks/BUILD.gn index 73b1c42..79ec889 100644 --- a/wifi/frameworks/BUILD.gn +++ b/wifi/frameworks/BUILD.gn @@ -24,9 +24,9 @@ group("wifi_kits") { if (!defined(ohos_lite)) { deps += [ "$WIFI_ROOT_DIR/frameworks/js/napi:wifi", + "$WIFI_ROOT_DIR/frameworks/js/napi:wifi_manager", "$WIFI_ROOT_DIR/frameworks/js/napi:wifi_native_js", "$WIFI_ROOT_DIR/frameworks/js/napi:wifiext", - "$WIFI_ROOT_DIR/frameworks/js/napi:wifi_manager", ] } } -- Gitee From 9d1b359492b99bf8839a52ce946808692a29b2cf Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Tue, 25 Oct 2022 20:25:38 +0800 Subject: [PATCH 453/491] add error code for wifi 1025 Signed-off-by: yanxiaotao@huawei.com --- wifi/frameworks/js/napi/BUILD.gn | 4 ---- 1 file changed, 4 deletions(-) diff --git a/wifi/frameworks/js/napi/BUILD.gn b/wifi/frameworks/js/napi/BUILD.gn index 38bd8be..bd08c00 100644 --- a/wifi/frameworks/js/napi/BUILD.gn +++ b/wifi/frameworks/js/napi/BUILD.gn @@ -159,7 +159,6 @@ ohos_shared_library("wifi_manager") { "$WIFI_ROOT_DIR/utils/inc", "$WIFI_ROOT_DIR/frameworks/js/napi/inc", ] - sources = [ "src/wifi_napi_device.cpp", "src/wifi_napi_entry.cpp", @@ -175,16 +174,13 @@ ohos_shared_library("wifi_manager") { "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//foundation/arkui/napi:ace_napi", ] - defines = [ "ENABLE_NAPI_WIFI_MANAGER" ] - external_deps = [ "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", "c_utils:utils", "ipc:ipc_core", ] - relative_install_dir = "module" part_name = "wifi" subsystem_name = "communication" -- Gitee From 0f1938843de539e52b982cefc4ed203e63fa0243 Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Tue, 25 Oct 2022 13:42:57 +0000 Subject: [PATCH 454/491] ok-1025 Signed-off-by: yanxiaotao --- .../wifi_manage/wifi_sta/sta_auto_connect_service.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp index fb6bea5..725cb5e 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp @@ -86,9 +86,9 @@ void StaAutoConnectService::OnScanInfosReadyHandler(const std::vector &blockedBs for (auto iter = blockedBssidMap.begin(); iter != blockedBssidMap.end(); ++iter) { blockedBssids.push_back(iter->first); } - WIFI_LOGI("StaAutoConnectService::GetBlockedBssids, blockedBssids count: %{public}u.", - blockedBssids.size()); + WIFI_LOGI("StaAutoConnectService::GetBlockedBssids, blockedBssids count: %{public}d.", + (int)blockedBssids.size()); return; } -- Gitee From 5fd05acd41697e1e17d35583c6a4c94cbbc646e9 Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Wed, 26 Oct 2022 06:32:11 +0000 Subject: [PATCH 455/491] modify for error code 1026 Signed-off-by: yanxiaotao --- .../js/napi/src/wifi_napi_hotspot.cpp | 57 ++++++++----------- 1 file changed, 24 insertions(+), 33 deletions(-) diff --git a/wifi/frameworks/js/napi/src/wifi_napi_hotspot.cpp b/wifi/frameworks/js/napi/src/wifi_napi_hotspot.cpp index ed71132..8dde2de 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_hotspot.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_hotspot.cpp @@ -18,6 +18,7 @@ #include "wifi_logger.h" #include #include +#include "wifi_napi_errcode.h" namespace OHOS { namespace Wifi { @@ -33,43 +34,37 @@ std::map g_mapSecTypeToKeyMgmt = { napi_value EnableHotspot(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; - NAPI_ASSERT(env, wifiHotspotPtr != nullptr, "Wifi hotspot instance is null."); + WIFI_NAPI_ASSERT(env, wifiHotspotPtr != nullptr, WIFI_OPT_FAILED); ErrCode ret = wifiHotspotPtr->EnableHotspot(); if (ret != WIFI_OPT_SUCCESS) { WIFI_LOGE("Enable hotspot error: %{public}d", ret); } - napi_value result; - napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); - return result; + WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret); } napi_value DisableHotspot(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; - NAPI_ASSERT(env, wifiHotspotPtr != nullptr, "Wifi hotspot instance is null."); + WIFI_NAPI_ASSERT(env, wifiHotspotPtr != nullptr, WIFI_OPT_FAILED); ErrCode ret = wifiHotspotPtr->DisableHotspot(); if (ret != WIFI_OPT_SUCCESS) { WIFI_LOGE("Disable hotspot error: %{public}d", ret); } - napi_value result; - napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); - return result; + WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret); } napi_value IsHotspotActive(napi_env env, napi_callback_info info) { - NAPI_ASSERT(env, wifiHotspotPtr != nullptr, "Wifi hotspot instance is null."); - napi_value result; - napi_get_boolean(env, wifiHotspotPtr->IsHotspotActive(), &result); - return result; + WIFI_NAPI_ASSERT(env, wifiHotspotPtr != nullptr, WIFI_OPT_FAILED); + bool ret = wifiHotspotPtr->IsHotspotActive(); + WIFI_NAPI_RETURN(env, ret == true, WIFI_OPT_FAILED); } napi_value IsHotspotDualBandSupported(napi_env env, napi_callback_info info) { - NAPI_ASSERT(env, wifiHotspotPtr != nullptr, "Wifi hotspot instance is null."); - napi_value result; - napi_get_boolean(env, wifiHotspotPtr->IsHotspotDualBandSupported(), &result); - return result; + WIFI_NAPI_ASSERT(env, wifiHotspotPtr != nullptr, WIFI_OPT_FAILED); + bool ret = wifiHotspotPtr->IsHotspotDualBandSupported(); + WIFI_NAPI_RETURN(env, ret == true, WIFI_OPT_FAILED); } static KeyMgmt GetKeyMgmtFromJsSecurityType(int secType) @@ -130,8 +125,8 @@ napi_value SetHotspotConfig(napi_env env, napi_callback_info info) napi_valuetype valueType; napi_typeof(env, argv[0], &valueType); - NAPI_ASSERT(env, valueType == napi_object, "Wrong argument type. Object expected."); - NAPI_ASSERT(env, wifiHotspotPtr != nullptr, "Wifi hotspot instance is null."); + WIFI_NAPI_ASSERT(env, valueType == napi_object, WIFI_OPT_INVALID_PARAM); + WIFI_NAPI_ASSERT(env, wifiHotspotPtr != nullptr, WIFI_OPT_FAILED); ErrCode ret = WIFI_OPT_FAILED; HotspotConfig config; @@ -141,9 +136,7 @@ napi_value SetHotspotConfig(napi_env env, napi_callback_info info) WIFI_LOGE("Set hotspot config error: %{public}d", ret); } } - napi_value result; - napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); - return result; + WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret); } static void HotspotconfigToJs(const napi_env& env, HotspotConfig& cppConfig, napi_value& result) @@ -158,12 +151,13 @@ static void HotspotconfigToJs(const napi_env& env, HotspotConfig& cppConfig, nap napi_value GetHotspotConfig(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; - NAPI_ASSERT(env, wifiHotspotPtr != nullptr, "Wifi hotspot instance is null."); + WIFI_NAPI_ASSERT(env, wifiHotspotPtr != nullptr, WIFI_OPT_FAILED); HotspotConfig config; ErrCode ret = wifiHotspotPtr->GetHotspotConfig(config); if (ret != WIFI_OPT_SUCCESS) { WIFI_LOGE("Get hotspot config error: %{public}d", ret); } + WIFI_NAPI_ASSERT(env, ret == WIFI_OPT_SUCCESS, ret); napi_value result; napi_create_object(env, &result); HotspotconfigToJs(env, config, result); @@ -188,13 +182,14 @@ static void StationInfoToJsArray(const napi_env& env, const std::vector vecStationInfo; ErrCode ret = wifiHotspotPtr->GetStationList(vecStationInfo); if (ret != WIFI_OPT_SUCCESS) { WIFI_LOGE("Get station list error: %{public}d", ret); } WIFI_LOGI("Get station list size: %{public}zu", vecStationInfo.size()); + WIFI_NAPI_ASSERT(env, ret == WIFI_OPT_SUCCESS, ret); napi_value arrayResult; napi_create_array_with_length(env, vecStationInfo.size(), &arrayResult); @@ -214,8 +209,8 @@ napi_value AddBlockList(napi_env env, napi_callback_info info) napi_valuetype valueType; napi_typeof(env, argv[0], &valueType); - NAPI_ASSERT(env, valueType == napi_string, "Wrong argument type. String expected."); - NAPI_ASSERT(env, wifiHotspotPtr != nullptr, "Wifi hotspot instance is null."); + WIFI_NAPI_ASSERT(env, valueType == napi_string, WIFI_OPT_INVALID_PARAM); + WIFI_NAPI_ASSERT(env, wifiHotspotPtr != nullptr, WIFI_OPT_FAILED); StationInfo stationInfo; char bssid[WIFI_BSSID_LENGTH] = {0}; @@ -226,9 +221,7 @@ napi_value AddBlockList(napi_env env, napi_callback_info info) if (ret != WIFI_OPT_SUCCESS) { WIFI_LOGE("Add block list fail: %{public}d", ret); } - napi_value result; - napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); - return result; + WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret); } napi_value DelBlockList(napi_env env, napi_callback_info info) @@ -241,8 +234,8 @@ napi_value DelBlockList(napi_env env, napi_callback_info info) napi_valuetype valueType; napi_typeof(env, argv[0], &valueType); - NAPI_ASSERT(env, valueType == napi_string, "Wrong argument type. String expected."); - NAPI_ASSERT(env, wifiHotspotPtr != nullptr, "Wifi hotspot instance is null."); + WIFI_NAPI_ASSERT(env, valueType == napi_string, WIFI_OPT_INVALID_PARAM); + WIFI_NAPI_ASSERT(env, wifiHotspotPtr != nullptr, WIFI_OPT_FAILED); StationInfo stationInfo; char bssid[WIFI_BSSID_LENGTH] = {0}; @@ -253,9 +246,7 @@ napi_value DelBlockList(napi_env env, napi_callback_info info) if (ret != WIFI_OPT_SUCCESS) { WIFI_LOGE("Del block list fail: %{public}d", ret); } - napi_value result; - napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); - return result; + WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret); } } // namespace Wifi } // namespace OHOS -- Gitee From 9880cb3df3d5825da2d29cd9e570507c2051e38d Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Wed, 26 Oct 2022 06:32:38 +0000 Subject: [PATCH 456/491] modify for wifi error code 1026 Signed-off-by: yanxiaotao --- .../js/napi/src/wifi_napi_device.cpp | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp index a7dd3bf..5fd8bc4 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp @@ -31,7 +31,7 @@ std::unique_ptr wifiScanPtr = WifiScan::GetInstance(WIFI_SCAN_ABILITY_ napi_value EnableWifi(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; - WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_INVALID_PARAM); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED); ErrCode ret = wifiDevicePtr->EnableWifi(); WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, WIFI_OPT_SUCCESS); } @@ -39,14 +39,14 @@ napi_value EnableWifi(napi_env env, napi_callback_info info) napi_value DisableWifi(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; - WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_INVALID_PARAM); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED); ErrCode ret = wifiDevicePtr->DisableWifi(); WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, WIFI_OPT_SUCCESS); } napi_value IsWifiActive(napi_env env, napi_callback_info info) { - WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_INVALID_PARAM); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED); bool activeStatus = false; ErrCode ret = wifiDevicePtr->IsWifiActive(activeStatus); if (ret != WIFI_OPT_SUCCESS) { @@ -58,7 +58,7 @@ napi_value IsWifiActive(napi_env env, napi_callback_info info) napi_value Scan(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; - WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_INVALID_PARAM); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED); ErrCode ret = wifiScanPtr->Scan(); WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, WIFI_OPT_SUCCESS); } @@ -172,10 +172,10 @@ napi_value GetScanInfos(napi_env env, napi_callback_info info) napi_value thisVar = nullptr; void *data = nullptr; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data)); - WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_INVALID_PARAM); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED); ScanInfoAsyncContext *asyncContext = new ScanInfoAsyncContext(env); - WIFI_NAPI_ASSERT(env, asyncContext != nullptr, WIFI_OPT_INVALID_PARAM); + WIFI_NAPI_ASSERT(env, asyncContext != nullptr, WIFI_OPT_FAILED); napi_create_string_latin1(env, "getScanInfos", NAPI_AUTO_LENGTH, &asyncContext->resourceName); asyncContext->executeFunc = [&](void* data) -> void { @@ -199,7 +199,7 @@ napi_value GetScanInfos(napi_env env, napi_callback_info info) napi_value GetScanResults(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; - WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_INVALID_PARAM); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED); std::vector scanInfos; ErrCode ret = wifiScanPtr->GetScanInfoList(scanInfos); if (ret != WIFI_OPT_SUCCESS) { @@ -364,14 +364,14 @@ napi_value AddDeviceConfig(napi_env env, napi_callback_info info) void *data = nullptr; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data)); WIFI_NAPI_ASSERT(env, argc >= 1, WIFI_OPT_INVALID_PARAM); - WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_INVALID_PARAM); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED); napi_valuetype valueType; napi_typeof(env, argv[0], &valueType); WIFI_NAPI_ASSERT(env, valueType == napi_object, WIFI_OPT_INVALID_PARAM); DeviceConfigContext *asyncContext = new DeviceConfigContext(env); - WIFI_NAPI_ASSERT(env, asyncContext != nullptr, WIFI_OPT_INVALID_PARAM); + WIFI_NAPI_ASSERT(env, asyncContext != nullptr, WIFI_OPT_FAILED); napi_create_string_latin1(env, "addDeviceConfig", NAPI_AUTO_LENGTH, &asyncContext->resourceName); WifiDeviceConfig *config = new WifiDeviceConfig(); @@ -416,14 +416,14 @@ napi_value AddUntrustedConfig(napi_env env, napi_callback_info info) void *data = nullptr; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data)); WIFI_NAPI_ASSERT(env, argc >= 1, WIFI_OPT_INVALID_PARAM); - WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_INVALID_PARAM); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED); napi_valuetype valueType; napi_typeof(env, argv[0], &valueType); WIFI_NAPI_ASSERT(env, valueType == napi_object, WIFI_OPT_INVALID_PARAM); DeviceConfigContext *asyncContext = new DeviceConfigContext(env); - WIFI_NAPI_ASSERT(env, asyncContext != nullptr, WIFI_OPT_INVALID_PARAM); + WIFI_NAPI_ASSERT(env, asyncContext != nullptr, WIFI_OPT_FAILED); napi_create_string_latin1(env, "AddUntrustedConfig", NAPI_AUTO_LENGTH, &asyncContext->resourceName); WifiDeviceConfig *config = new WifiDeviceConfig(); @@ -468,14 +468,14 @@ napi_value RemoveUntrustedConfig(napi_env env, napi_callback_info info) void *data = nullptr; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data)); WIFI_NAPI_ASSERT(env, argc >= 1, WIFI_OPT_INVALID_PARAM); - WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_INVALID_PARAM); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED); napi_valuetype valueType; napi_typeof(env, argv[0], &valueType); WIFI_NAPI_ASSERT(env, valueType == napi_object, WIFI_OPT_INVALID_PARAM); DeviceConfigContext *asyncContext = new DeviceConfigContext(env); - WIFI_NAPI_ASSERT(env, asyncContext != nullptr, WIFI_OPT_INVALID_PARAM); + WIFI_NAPI_ASSERT(env, asyncContext != nullptr, WIFI_OPT_FAILED); napi_create_string_latin1(env, "RemoveUntrustedConfig", NAPI_AUTO_LENGTH, &asyncContext->resourceName); WifiDeviceConfig *config = new WifiDeviceConfig(); @@ -515,14 +515,14 @@ napi_value AddCandidateConfig(napi_env env, napi_callback_info info) void *data = nullptr; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data)); WIFI_NAPI_ASSERT(env, argc >= 1, WIFI_OPT_INVALID_PARAM); - WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_INVALID_PARAM); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED); napi_valuetype valueType; napi_typeof(env, argv[0], &valueType); WIFI_NAPI_ASSERT(env, valueType == napi_object, WIFI_OPT_INVALID_PARAM); DeviceConfigContext *asyncContext = new DeviceConfigContext(env); - WIFI_NAPI_ASSERT(env, asyncContext != nullptr, WIFI_OPT_INVALID_PARAM); + WIFI_NAPI_ASSERT(env, asyncContext != nullptr, WIFI_OPT_FAILED); napi_create_string_latin1(env, "AddCandidateConfig", NAPI_AUTO_LENGTH, &asyncContext->resourceName); WifiDeviceConfig *config = new WifiDeviceConfig(); @@ -568,14 +568,14 @@ napi_value RemoveCandidateConfig(napi_env env, napi_callback_info info) void *data = nullptr; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data)); WIFI_NAPI_ASSERT(env, argc >= 1, WIFI_OPT_INVALID_PARAM); - WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_INVALID_PARAM); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED); napi_valuetype valueType; napi_typeof(env, argv[0], &valueType); WIFI_NAPI_ASSERT(env, valueType == napi_number, WIFI_OPT_INVALID_PARAM); DeviceConfigContext *asyncContext = new DeviceConfigContext(env); - WIFI_NAPI_ASSERT(env, asyncContext != nullptr, WIFI_OPT_INVALID_PARAM); + WIFI_NAPI_ASSERT(env, asyncContext != nullptr, WIFI_OPT_FAILED); napi_create_string_latin1(env, "RemoveCandidateConfig", NAPI_AUTO_LENGTH, &asyncContext->resourceName); napi_get_value_int32(env, argv[0], &asyncContext->networkId); @@ -615,7 +615,7 @@ napi_value ConnectToCandidateConfig(napi_env env, napi_callback_info info) napi_get_value_int32(env, argv[0], &networkId); bool isCandidate = true; - WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_INVALID_PARAM); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED); ErrCode ret = wifiDevicePtr->ConnectToNetwork(networkId, isCandidate); WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret); } -- Gitee From ee67a2267153d093565341a3ab4226a591c31f56 Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Wed, 26 Oct 2022 06:32:46 +0000 Subject: [PATCH 457/491] modify for wifi error code 1026 Signed-off-by: yanxiaotao --- .../js/napi/src/wifi_napi_event.cpp | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/wifi/frameworks/js/napi/src/wifi_napi_event.cpp b/wifi/frameworks/js/napi/src/wifi_napi_event.cpp index 5dc8348..4775c59 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_event.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_event.cpp @@ -21,6 +21,7 @@ #include "wifi_logger.h" #include "wifi_napi_utils.h" #include "wifi_scan.h" +#include "wifi_napi_errcode.h" namespace OHOS { namespace Wifi { @@ -587,15 +588,25 @@ void EventRegister::Register(const napi_env& env, const std::string& type, napi_ WIFI_LOGI("Register event: %{public}s, env: %{private}p", type.c_str(), env); if (!IsEventSupport(type)) { WIFI_LOGE("Register type error or not support!"); +#ifdef ENABLE_NAPI_WIFI_MANAGER + HandleSyncErrCode(env, WIFI_OPT_NOT_SUPPORTED); +#endif return; } if (CheckPermission(type) != WIFI_NAPI_PERMISSION_GRANTED) { WIFI_LOGE("Register fail for NO permission!"); +#ifdef ENABLE_NAPI_WIFI_MANAGER + HandleSyncErrCode(env, WIFI_OPT_PERMISSION_DENIED); +#endif return; } std::unique_lock guard(g_regInfoMutex); if (!isEventRegistered) { - if (RegisterWifiEvents() != WIFI_OPT_SUCCESS) { + ErrCode ret = RegisterWifiEvents(); + if (ret != WIFI_OPT_SUCCESS) { +#ifdef ENABLE_NAPI_WIFI_MANAGER + HandleSyncErrCode(env, ret); +#endif return; } isEventRegistered = true; @@ -665,16 +676,25 @@ void EventRegister::Unregister(const napi_env& env, const std::string& type, nap WIFI_LOGI("Unregister event: %{public}s, env: %{private}p", type.c_str(), env); if (!IsEventSupport(type)) { WIFI_LOGE("Unregister type error or not support!"); +#ifdef ENABLE_NAPI_WIFI_MANAGER + HandleSyncErrCode(env, WIFI_OPT_NOT_SUPPORTED); +#endif return; } if (CheckPermission(type) != WIFI_NAPI_PERMISSION_GRANTED) { WIFI_LOGE("Unregister fail for NO permission!"); +#ifdef ENABLE_NAPI_WIFI_MANAGER + HandleSyncErrCode(env, WIFI_OPT_PERMISSION_DENIED); +#endif return; } std::unique_lock guard(g_regInfoMutex); auto iter = g_eventRegisterInfo.find(type); if (iter == g_eventRegisterInfo.end()) { WIFI_LOGE("Unregister type not registered!"); +#ifdef ENABLE_NAPI_WIFI_MANAGER + HandleSyncErrCode(env, WIFI_OPT_NOT_SUPPORTED); +#endif return; } if (handler != nullptr) { -- Gitee From 1b88c1a3901c3101a682cfd9f9aae93abaae5583 Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Wed, 26 Oct 2022 06:32:52 +0000 Subject: [PATCH 458/491] modify for wifi error code 1026 Signed-off-by: yanxiaotao --- wifi/frameworks/js/napi/src/wifi_napi_p2p.cpp | 81 ++++++++----------- 1 file changed, 32 insertions(+), 49 deletions(-) diff --git a/wifi/frameworks/js/napi/src/wifi_napi_p2p.cpp b/wifi/frameworks/js/napi/src/wifi_napi_p2p.cpp index 4c7af52..4110180 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_p2p.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_p2p.cpp @@ -15,6 +15,7 @@ #include "wifi_napi_p2p.h" #include "wifi_logger.h" +#include "wifi_napi_errcode.h" namespace OHOS { namespace Wifi { @@ -112,10 +113,10 @@ napi_value GetCurrentGroup(napi_env env, napi_callback_info info) napi_value thisVar = nullptr; void *data = nullptr; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data)); - NAPI_ASSERT(env, wifiP2pPtr != nullptr, "Wifi p2p instance is null."); + WIFI_NAPI_ASSERT(env, wifiP2pPtr != nullptr, WIFI_OPT_FAILED); P2pGroupInfoAsyncContext *asyncContext = new P2pGroupInfoAsyncContext(env); - NAPI_ASSERT(env, asyncContext != nullptr, "asyncContext is null."); + WIFI_NAPI_ASSERT(env, asyncContext != nullptr, WIFI_OPT_FAILED); napi_create_string_latin1(env, "getCurrentGroup", NAPI_AUTO_LENGTH, &asyncContext->resourceName); asyncContext->executeFunc = [&](void* data) -> void { @@ -143,10 +144,10 @@ napi_value GetP2pGroups(napi_env env, napi_callback_info info) napi_value thisVar = nullptr; void *data = nullptr; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data)); - NAPI_ASSERT(env, wifiP2pPtr != nullptr, "Wifi p2p instance is null."); + WIFI_NAPI_ASSERT(env, wifiP2pPtr != nullptr, WIFI_OPT_FAILED); P2pGroupInfoListAsyncContext *asyncContext = new P2pGroupInfoListAsyncContext(env); - NAPI_ASSERT(env, asyncContext != nullptr, "asyncContext is null."); + WIFI_NAPI_ASSERT(env, asyncContext != nullptr, WIFI_OPT_FAILED); napi_create_string_latin1(env, "GetP2pGroups", NAPI_AUTO_LENGTH, &asyncContext->resourceName); asyncContext->executeFunc = [&](void* data) -> void { @@ -174,42 +175,36 @@ napi_value DeletePersistentGroup(napi_env env, napi_callback_info info) napi_value argv[argc]; napi_value thisVar; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); - NAPI_ASSERT(env, wifiP2pPtr != nullptr, "Wifi p2p instance is null."); + WIFI_NAPI_ASSERT(env, wifiP2pPtr != nullptr, WIFI_OPT_FAILED); napi_valuetype valueType; napi_typeof(env, argv[0], &valueType); - NAPI_ASSERT(env, valueType == napi_number, "Wrong argument type. napi_number expected."); + WIFI_NAPI_ASSERT(env, valueType == napi_number, WIFI_OPT_INVALID_PARAM); WifiP2pGroupInfo groupInfo; int netId = -999; napi_get_value_int32(env, argv[0], &netId); groupInfo.SetNetworkId(netId); ErrCode ret = wifiP2pPtr->DeleteGroup(groupInfo); - napi_value result; - napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); - return result; + WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret); } napi_value StartDiscoverDevices(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; - NAPI_ASSERT(env, wifiP2pPtr != nullptr, "Wifi p2p instance is null."); + WIFI_NAPI_ASSERT(env, wifiP2pPtr != nullptr, WIFI_OPT_FAILED); ErrCode ret = wifiP2pPtr->DiscoverDevices(); - napi_value result; - napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); - return result; + WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret); } napi_value StopDiscoverDevices(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; - NAPI_ASSERT(env, wifiP2pPtr != nullptr, "Wifi p2p instance is null."); + WIFI_NAPI_ASSERT(env, wifiP2pPtr != nullptr, WIFI_OPT_FAILED); ErrCode ret = wifiP2pPtr->StopDiscoverDevices(); - napi_value result; - napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); - return result; + WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret); } napi_value GetP2pDevices(napi_env env, napi_callback_info info) @@ -219,10 +214,10 @@ napi_value GetP2pDevices(napi_env env, napi_callback_info info) napi_value thisVar = nullptr; void *data = nullptr; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data)); - NAPI_ASSERT(env, wifiP2pPtr != nullptr, "Wifi p2p instance is null."); + WIFI_NAPI_ASSERT(env, wifiP2pPtr != nullptr, WIFI_OPT_FAILED); QueryP2pDeviceAsyncContext *asyncContext = new QueryP2pDeviceAsyncContext(env); - NAPI_ASSERT(env, asyncContext != nullptr, "asyncContext is null."); + WIFI_NAPI_ASSERT(env, asyncContext != nullptr, WIFI_OPT_FAILED); napi_create_string_latin1(env, "GetP2pDevices", NAPI_AUTO_LENGTH, &asyncContext->resourceName); asyncContext->executeFunc = [&](void* data) -> void { @@ -250,10 +245,10 @@ napi_value GetP2pLocalDevice(napi_env env, napi_callback_info info) napi_value thisVar = nullptr; void *data = nullptr; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data)); - NAPI_ASSERT(env, wifiP2pPtr != nullptr, "Wifi p2p instance is null."); + WIFI_NAPI_ASSERT(env, wifiP2pPtr != nullptr, WIFI_OPT_FAILED); P2pLocalDeviceAsyncContext *asyncContext = new P2pLocalDeviceAsyncContext(env); - NAPI_ASSERT(env, asyncContext != nullptr, "asyncContext is null."); + WIFI_NAPI_ASSERT(env, asyncContext != nullptr, WIFI_OPT_FAILED); napi_create_string_latin1(env, "GetP2pLocalDevice", NAPI_AUTO_LENGTH, &asyncContext->resourceName); asyncContext->executeFunc = [&](void* data) -> void { @@ -281,20 +276,18 @@ napi_value SetDeviceName(napi_env env, napi_callback_info info) napi_value argv[1]; napi_value thisVar; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); - NAPI_ASSERT(env, argc == 1, "Wrong number of arguments"); - NAPI_ASSERT(env, wifiP2pPtr != nullptr, "Wifi p2p instance is null."); + WIFI_NAPI_ASSERT(env, argc == 1, WIFI_OPT_INVALID_PARAM); + WIFI_NAPI_ASSERT(env, wifiP2pPtr != nullptr, WIFI_OPT_FAILED); napi_valuetype valueType; napi_typeof(env, argv[0], &valueType); - NAPI_ASSERT(env, valueType == napi_string, "Wrong argument type. napi_number expected."); + WIFI_NAPI_ASSERT(env, valueType == napi_string, WIFI_OPT_INVALID_PARAM); char name[64] = {0}; size_t typeLen = 0; napi_get_value_string_utf8(env, argv[0], name, sizeof(name), &typeLen); ErrCode ret = wifiP2pPtr->SetP2pDeviceName(name); - napi_value result; - napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); - return result; + WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret); } static void JsObjToP2pConfig(const napi_env& env, const napi_value& object, WifiP2pConfig& config) @@ -323,11 +316,11 @@ napi_value P2pConnect(napi_env env, napi_callback_info info) napi_value argv[argc]; napi_value thisVar; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); - NAPI_ASSERT(env, wifiP2pPtr != nullptr, "Wifi p2p instance is null."); + WIFI_NAPI_ASSERT(env, wifiP2pPtr != nullptr, WIFI_OPT_FAILED); napi_valuetype valueType; napi_typeof(env, argv[0], &valueType); - NAPI_ASSERT(env, valueType == napi_object, "Wrong argument type. Object expected."); + WIFI_NAPI_ASSERT(env, valueType == napi_object, WIFI_OPT_INVALID_PARAM); WifiP2pConfig config; JsObjToP2pConfig(env, argv[0], config); @@ -335,20 +328,15 @@ napi_value P2pConnect(napi_env env, napi_callback_info info) if (ret != WIFI_OPT_SUCCESS) { WIFI_LOGE("Connect to device fail: %{public}d", ret); } - napi_value result; - napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); - return result; + WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret); } napi_value P2pCancelConnect(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; - NAPI_ASSERT(env, wifiP2pPtr != nullptr, "Wifi p2p instance is null."); - + WIFI_NAPI_ASSERT(env, wifiP2pPtr != nullptr, WIFI_OPT_FAILED); ErrCode ret = wifiP2pPtr->P2pCancelConnect(); - napi_value result; - napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); - return result; + WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret); } napi_value CreateGroup(napi_env env, napi_callback_info info) @@ -358,29 +346,24 @@ napi_value CreateGroup(napi_env env, napi_callback_info info) napi_value argv[1]; napi_value thisVar; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); - NAPI_ASSERT(env, wifiP2pPtr != nullptr, "Wifi p2p instance is null."); + WIFI_NAPI_ASSERT(env, wifiP2pPtr != nullptr, WIFI_OPT_FAILED); napi_valuetype valueType; napi_typeof(env, argv[0], &valueType); - NAPI_ASSERT(env, valueType == napi_object, "Wrong argument type. Object expected."); + WIFI_NAPI_ASSERT(env, valueType == napi_object, WIFI_OPT_INVALID_PARAM); WifiP2pConfig config; JsObjToP2pConfig(env, argv[0], config); ErrCode ret = wifiP2pPtr->CreateGroup(config); - napi_value result; - napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); - return result; + WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret); } napi_value RemoveGroup(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; - NAPI_ASSERT(env, wifiP2pPtr != nullptr, "Wifi p2p instance is null."); - + WIFI_NAPI_ASSERT(env, wifiP2pPtr != nullptr, WIFI_OPT_FAILED); ErrCode ret = wifiP2pPtr->RemoveGroup(); - napi_value result; - napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); - return result; + WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret); } static void LinkedInfoToJs(const napi_env& env, WifiP2pLinkedInfo& linkedInfo, napi_value& result) @@ -398,10 +381,10 @@ napi_value GetP2pLinkedInfo(napi_env env, napi_callback_info info) napi_value thisVar = nullptr; void *data = nullptr; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data)); - NAPI_ASSERT(env, wifiP2pPtr != nullptr, "Wifi p2p instance is null."); + WIFI_NAPI_ASSERT(env, wifiP2pPtr != nullptr, WIFI_OPT_FAILED); P2pLinkedInfoAsyncContext *asyncContext = new P2pLinkedInfoAsyncContext(env); - NAPI_ASSERT(env, asyncContext != nullptr, "asyncContext is null."); + WIFI_NAPI_ASSERT(env, asyncContext != nullptr, WIFI_OPT_FAILED); napi_create_string_latin1(env, "queryP2pLinkedInfo", NAPI_AUTO_LENGTH, &asyncContext->resourceName); asyncContext->executeFunc = [&](void* data) -> void { -- Gitee From 27d1a6b379a743bb992ccd6b30f7b87e7879f485 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Wed, 26 Oct 2022 14:43:16 +0800 Subject: [PATCH 459/491] add error code for wifi 1026 Signed-off-by: yanxiaotao@huawei.com --- .../js/napi/src/wifi_ext_napi_hotspot.cpp | 38 ++++++------------- .../js/napi/src/wifi_napi_entry.cpp | 1 + 2 files changed, 13 insertions(+), 26 deletions(-) diff --git a/wifi/frameworks/js/napi/src/wifi_ext_napi_hotspot.cpp b/wifi/frameworks/js/napi/src/wifi_ext_napi_hotspot.cpp index 4a2e50f..35b48c8 100644 --- a/wifi/frameworks/js/napi/src/wifi_ext_napi_hotspot.cpp +++ b/wifi/frameworks/js/napi/src/wifi_ext_napi_hotspot.cpp @@ -29,28 +29,24 @@ napi_value EnableHotspot(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; std::unique_ptr hotspot = GetHotspotInstance(); - NAPI_ASSERT(env, hotspot != nullptr, "Wifi hotspot instance is null."); + WIFI_NAPI_ASSERT(env, hotspot != nullptr, WIFI_OPT_FAILED); ErrCode ret = hotspot->EnableHotspot(ServiceType::WIFI_EXT); if (ret != WIFI_OPT_SUCCESS) { WIFI_LOGE("Enable hotspot error: %{public}d", ret); } - napi_value result; - napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); - return result; + WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret); } napi_value DisableHotspot(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; std::unique_ptr hotspot = GetHotspotInstance(); - NAPI_ASSERT(env, hotspot != nullptr, "Wifi hotspot instance is null."); + WIFI_NAPI_ASSERT(env, hotspot != nullptr, WIFI_OPT_FAILED); ErrCode ret = hotspot->DisableHotspot(ServiceType::WIFI_EXT); if (ret != WIFI_OPT_SUCCESS) { WIFI_LOGE("Disable hotspot error: %{public}d", ret); } - napi_value result; - napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); - return result; + WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret); } static ErrCode NativePowerModelListToJsObj(const napi_env& env, @@ -79,16 +75,13 @@ napi_value GetSupportedPowerModel(napi_env env, napi_callback_info info) NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data)); PowerModelListAsyncContext *asyncContext = new (std::nothrow) PowerModelListAsyncContext(env); - NAPI_ASSERT(env, asyncContext != nullptr, "asyncContext is null."); + WIFI_NAPI_ASSERT(env, asyncContext != nullptr, WIFI_OPT_FAILED); napi_create_string_latin1(env, "getSupportedPowerModel", NAPI_AUTO_LENGTH, &asyncContext->resourceName); asyncContext->executeFunc = [&](void* data) -> void { PowerModelListAsyncContext *context = static_cast(data); std::unique_ptr hotspot = GetHotspotInstance(); - if (hotspot == nullptr) { - WIFI_LOGE("hotspot instance is null."); - return; - } + WIFI_NAPI_ASSERT(env, hotspot != nullptr, WIFI_OPT_FAILED); TRACE_FUNC_CALL_NAME("hotspot->GetSupportedPowerModel"); context->errorCode = hotspot->GetSupportedPowerModel(context->setPowerModelList); }; @@ -114,16 +107,13 @@ napi_value GetPowerModel(napi_env env, napi_callback_info info) NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data)); PowerModelAsyncContext *asyncContext = new (std::nothrow) PowerModelAsyncContext(env); - NAPI_ASSERT(env, asyncContext != nullptr, "asyncContext is null."); + WIFI_NAPI_ASSERT(env, asyncContext != nullptr, WIFI_OPT_FAILED); napi_create_string_latin1(env, "getPowerModel", NAPI_AUTO_LENGTH, &asyncContext->resourceName); asyncContext->executeFunc = [&](void* data) -> void { PowerModelAsyncContext *context = static_cast(data); std::unique_ptr hotspot = GetHotspotInstance(); - if (hotspot == nullptr) { - WIFI_LOGE("hotspot instance is null."); - return; - } + WIFI_NAPI_ASSERT(env, hotspot != nullptr, WIFI_OPT_FAILED); TRACE_FUNC_CALL_NAME("hotspot->GetPowerModel"); context->errorCode = hotspot->GetPowerModel(context->powerModel); }; @@ -145,25 +135,21 @@ napi_value SetPowerModel(napi_env env, napi_callback_info info) napi_value argv[1]; napi_value thisVar; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); - NAPI_ASSERT(env, argc == 1, "Wrong number of arguments"); + WIFI_NAPI_ASSERT(env, argc == 1, WIFI_OPT_INVALID_PARAM); napi_valuetype valueType; napi_typeof(env, argv[0], &valueType); - NAPI_ASSERT(env, valueType == napi_number, "Wrong argument type. napi_number expected."); + WIFI_NAPI_ASSERT(env, valueType == napi_number, WIFI_OPT_INVALID_PARAM); int model = -1; napi_get_value_int32(env, argv[0], &model); - std::unique_ptr hotspot = GetHotspotInstance(); - NAPI_ASSERT(env, hotspot != nullptr, "Wifi hotspot instance is null."); - + WIFI_NAPI_ASSERT(env, hotspot != nullptr, WIFI_OPT_FAILED); ErrCode ret = hotspot->SetPowerModel(static_cast(model)); if (ret != WIFI_OPT_SUCCESS) { WIFI_LOGE("Set power model error: %{public}d", ret); } - napi_value result; - napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); - return result; + WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret); } } // namespace Wifi } // namespace OHOS diff --git a/wifi/frameworks/js/napi/src/wifi_napi_entry.cpp b/wifi/frameworks/js/napi/src/wifi_napi_entry.cpp index 0b2f504..7db9218 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_entry.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_entry.cpp @@ -75,6 +75,7 @@ static napi_value Init(napi_env env, napi_value exports) { DECLARE_NAPI_FUNCTION("removeGroup", RemoveGroup), DECLARE_NAPI_FUNCTION("p2pConnect", P2pConnect), DECLARE_NAPI_FUNCTION("p2pCancelConnect", P2pCancelConnect), + DECLARE_NAPI_FUNCTION("p2pDisonnect", P2pCancelConnect), DECLARE_NAPI_FUNCTION("startDiscoverDevices", StartDiscoverDevices), DECLARE_NAPI_FUNCTION("stopDiscoverDevices", StopDiscoverDevices), DECLARE_NAPI_FUNCTION("deletePersistentGroup", DeletePersistentGroup), -- Gitee From acc10f03d90cbfb327e2eec715795f951d278038 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Wed, 26 Oct 2022 14:45:21 +0800 Subject: [PATCH 460/491] add error code for wifi 1026 Signed-off-by: yanxiaotao@huawei.com --- wifi/frameworks/js/napi/src/wifi_ext_napi_hotspot.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/wifi/frameworks/js/napi/src/wifi_ext_napi_hotspot.cpp b/wifi/frameworks/js/napi/src/wifi_ext_napi_hotspot.cpp index 35b48c8..ff73d2a 100644 --- a/wifi/frameworks/js/napi/src/wifi_ext_napi_hotspot.cpp +++ b/wifi/frameworks/js/napi/src/wifi_ext_napi_hotspot.cpp @@ -15,6 +15,7 @@ #include "wifi_ext_napi_hotspot.h" #include "wifi_logger.h" +#include "wifi_napi_errcode.h" namespace OHOS { namespace Wifi { -- Gitee From 7e51e5a93dd975277905c9e22563e446c26989fc Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Wed, 26 Oct 2022 15:15:21 +0800 Subject: [PATCH 461/491] add error code for wifi 1026 Signed-off-by: yanxiaotao@huawei.com --- wifi/frameworks/js/napi/src/wifi_ext_napi_hotspot.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/wifi/frameworks/js/napi/src/wifi_ext_napi_hotspot.cpp b/wifi/frameworks/js/napi/src/wifi_ext_napi_hotspot.cpp index ff73d2a..1be09a0 100644 --- a/wifi/frameworks/js/napi/src/wifi_ext_napi_hotspot.cpp +++ b/wifi/frameworks/js/napi/src/wifi_ext_napi_hotspot.cpp @@ -82,7 +82,10 @@ napi_value GetSupportedPowerModel(napi_env env, napi_callback_info info) asyncContext->executeFunc = [&](void* data) -> void { PowerModelListAsyncContext *context = static_cast(data); std::unique_ptr hotspot = GetHotspotInstance(); - WIFI_NAPI_ASSERT(env, hotspot != nullptr, WIFI_OPT_FAILED); + if (hotspot == nullptr) { + WIFI_LOGE("hotspot instance is null."); + return; + } TRACE_FUNC_CALL_NAME("hotspot->GetSupportedPowerModel"); context->errorCode = hotspot->GetSupportedPowerModel(context->setPowerModelList); }; @@ -114,7 +117,10 @@ napi_value GetPowerModel(napi_env env, napi_callback_info info) asyncContext->executeFunc = [&](void* data) -> void { PowerModelAsyncContext *context = static_cast(data); std::unique_ptr hotspot = GetHotspotInstance(); - WIFI_NAPI_ASSERT(env, hotspot != nullptr, WIFI_OPT_FAILED); + if (hotspot == nullptr) { + WIFI_LOGE("hotspot instance is null."); + return; + } TRACE_FUNC_CALL_NAME("hotspot->GetPowerModel"); context->errorCode = hotspot->GetPowerModel(context->powerModel); }; -- Gitee From 7c94077de588d17d5c0686102cda49971b78f885 Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Wed, 26 Oct 2022 08:29:25 +0000 Subject: [PATCH 462/491] fix for format_check error 1026 Signed-off-by: yanxiaotao --- wifi/frameworks/js/napi/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/frameworks/js/napi/BUILD.gn b/wifi/frameworks/js/napi/BUILD.gn index bd08c00..b8dd953 100644 --- a/wifi/frameworks/js/napi/BUILD.gn +++ b/wifi/frameworks/js/napi/BUILD.gn @@ -162,11 +162,11 @@ ohos_shared_library("wifi_manager") { sources = [ "src/wifi_napi_device.cpp", "src/wifi_napi_entry.cpp", - "src/wifi_napi_errcode.cpp", "src/wifi_napi_event.cpp", "src/wifi_napi_hotspot.cpp", "src/wifi_napi_p2p.cpp", "src/wifi_napi_utils.cpp", + "src/wifi_napi_errcode.cpp", ] deps = [ "$WIFI_ROOT_DIR/frameworks/native:wifi_sdk", -- Gitee From 6b5086fd705449ce1ea97257ea6a0743a603bb1e Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Wed, 26 Oct 2022 08:57:50 +0000 Subject: [PATCH 463/491] ok Signed-off-by: yanxiaotao --- wifi/frameworks/js/napi/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/frameworks/js/napi/BUILD.gn b/wifi/frameworks/js/napi/BUILD.gn index b8dd953..bd08c00 100644 --- a/wifi/frameworks/js/napi/BUILD.gn +++ b/wifi/frameworks/js/napi/BUILD.gn @@ -162,11 +162,11 @@ ohos_shared_library("wifi_manager") { sources = [ "src/wifi_napi_device.cpp", "src/wifi_napi_entry.cpp", + "src/wifi_napi_errcode.cpp", "src/wifi_napi_event.cpp", "src/wifi_napi_hotspot.cpp", "src/wifi_napi_p2p.cpp", "src/wifi_napi_utils.cpp", - "src/wifi_napi_errcode.cpp", ] deps = [ "$WIFI_ROOT_DIR/frameworks/native:wifi_sdk", -- Gitee From 1f701e7a6bd599275eb2c98b4c46a98657c263f1 Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Wed, 26 Oct 2022 09:42:50 +0000 Subject: [PATCH 464/491] fix format_check error Signed-off-by: yanxiaotao --- wifi/frameworks/js/napi/BUILD.gn | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/wifi/frameworks/js/napi/BUILD.gn b/wifi/frameworks/js/napi/BUILD.gn index bd08c00..cc77ce3 100644 --- a/wifi/frameworks/js/napi/BUILD.gn +++ b/wifi/frameworks/js/napi/BUILD.gn @@ -150,15 +150,16 @@ ohos_shared_library("wifi_manager") { "//native_engine", "//commonlibrary/c_utils/base/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/log", + "$WIFI_ROOT_DIR/frameworks/js/napi/inc", + "$WIFI_ROOT_DIR/frameworks/native/include", "$WIFI_ROOT_DIR/frameworks/native/interfaces", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", "//base/security/access_token/interfaces/innerkits/accesstoken/include", - "$WIFI_ROOT_DIR/frameworks/native/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper", "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/context", "$WIFI_ROOT_DIR/utils/inc", - "$WIFI_ROOT_DIR/frameworks/js/napi/inc", ] + sources = [ "src/wifi_napi_device.cpp", "src/wifi_napi_entry.cpp", @@ -174,13 +175,16 @@ ohos_shared_library("wifi_manager") { "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//foundation/arkui/napi:ace_napi", ] - defines = [ "ENABLE_NAPI_WIFI_MANAGER" ] + + defines = [ "ENABLE_NAPI_COMPATIBLE" ] + external_deps = [ "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", "c_utils:utils", "ipc:ipc_core", ] + relative_install_dir = "module" part_name = "wifi" subsystem_name = "communication" -- Gitee From 9698953cad024463c2ca89909296ecfa7edd0fa4 Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Wed, 26 Oct 2022 09:55:54 +0000 Subject: [PATCH 465/491] ok Signed-off-by: yanxiaotao --- wifi/frameworks/js/napi/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/frameworks/js/napi/BUILD.gn b/wifi/frameworks/js/napi/BUILD.gn index cc77ce3..217ae73 100644 --- a/wifi/frameworks/js/napi/BUILD.gn +++ b/wifi/frameworks/js/napi/BUILD.gn @@ -188,4 +188,4 @@ ohos_shared_library("wifi_manager") { relative_install_dir = "module" part_name = "wifi" subsystem_name = "communication" -} \ No newline at end of file +} -- Gitee From a6848aa4be7dd7749495a52a86a730f50b66e5e9 Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Wed, 26 Oct 2022 10:02:47 +0000 Subject: [PATCH 466/491] Update BUILD.gn 1026 Signed-off-by: yanxiaotao --- wifi/frameworks/js/napi/BUILD.gn | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/wifi/frameworks/js/napi/BUILD.gn b/wifi/frameworks/js/napi/BUILD.gn index 217ae73..aee0e73 100644 --- a/wifi/frameworks/js/napi/BUILD.gn +++ b/wifi/frameworks/js/napi/BUILD.gn @@ -150,16 +150,15 @@ ohos_shared_library("wifi_manager") { "//native_engine", "//commonlibrary/c_utils/base/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/log", - "$WIFI_ROOT_DIR/frameworks/js/napi/inc", - "$WIFI_ROOT_DIR/frameworks/native/include", "$WIFI_ROOT_DIR/frameworks/native/interfaces", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", "//base/security/access_token/interfaces/innerkits/accesstoken/include", + "$WIFI_ROOT_DIR/frameworks/native/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper", "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/context", "$WIFI_ROOT_DIR/utils/inc", + "$WIFI_ROOT_DIR/frameworks/js/napi/inc", ] - sources = [ "src/wifi_napi_device.cpp", "src/wifi_napi_entry.cpp", @@ -175,16 +174,13 @@ ohos_shared_library("wifi_manager") { "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//foundation/arkui/napi:ace_napi", ] - - defines = [ "ENABLE_NAPI_COMPATIBLE" ] - + defines = [ "ENABLE_NAPI_WIFI_MANAGER" ] external_deps = [ "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", "c_utils:utils", "ipc:ipc_core", ] - relative_install_dir = "module" part_name = "wifi" subsystem_name = "communication" -- Gitee From 00159204d2d9244a0eb04675918c40dd5ddd610f Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Wed, 26 Oct 2022 22:59:51 +0800 Subject: [PATCH 467/491] set defalut mask for static ip 1026 Signed-off-by: yanxiaotao@huawei.com --- wifi/frameworks/js/napi/src/wifi_napi_device.cpp | 4 ++++ .../wifi_standard/wifi_framework/wifi_manage/BUILD.gn | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp index 63c1d0b..e8016a4 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp @@ -298,6 +298,10 @@ napi_value ConfigStaticIp(const napi_env& env, const napi_value& object, WifiDev { bool hasProperty = false; JsObjectToInt(env, object, "prefixLength", cppConfig.wifiIpConfig.staticIpAddress.ipAddress.prefixLength); + if (cppConfig.wifiIpConfig.staticIpAddress.ipAddress.prefixLength <= 0) { + constexpr int defaultPrefixLen = 24; + cppConfig.wifiIpConfig.staticIpAddress.ipAddress.prefixLength = defaultPrefixLen; + } NAPI_CALL(env, napi_has_named_property(env, object, "staticIp", &hasProperty)); if (!hasProperty) { WIFI_LOGE("Js has no property: staticIp."); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn index df6bcc1..d3f22d2 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn @@ -364,7 +364,6 @@ if (defined(ohos_lite)) { } defines = [ "FEATURE_AP_SUPPORT", - "FEATURE_P2P_SUPPORT", "AP_INSTANCE_MAX_NUM=$wifi_feature_with_ap_num", ] @@ -376,6 +375,10 @@ if (defined(ohos_lite)) { defines += [ "FEATURE_ENCRYPTION_SUPPORT" ] } + if (wifi_feature_with_p2p) { + defines += [ "FEATURE_P2P_SUPPORT" ] + } + part_name = "wifi" subsystem_name = "communication" } -- Gitee From 402ff733b8f1da81e8741cc57adff94f7bc3f68e Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Thu, 27 Oct 2022 16:01:53 +0800 Subject: [PATCH 468/491] add error code for wifi 1027 Signed-off-by: yanxiaotao@huawei.com --- .../js/napi/inc/wifi_napi_errcode.h | 37 ++-- wifi/frameworks/js/napi/inc/wifi_napi_utils.h | 8 + .../js/napi/src/wifi_ext_napi_hotspot.cpp | 22 ++- .../js/napi/src/wifi_napi_device.cpp | 183 +++++++++--------- .../js/napi/src/wifi_napi_errcode.cpp | 83 ++++---- .../js/napi/src/wifi_napi_event.cpp | 40 +++- .../js/napi/src/wifi_napi_hotspot.cpp | 39 ++-- wifi/frameworks/js/napi/src/wifi_napi_p2p.cpp | 67 ++++--- .../js/napi/src/wifi_napi_utils.cpp | 18 ++ 9 files changed, 283 insertions(+), 214 deletions(-) diff --git a/wifi/frameworks/js/napi/inc/wifi_napi_errcode.h b/wifi/frameworks/js/napi/inc/wifi_napi_errcode.h index c76de11..121e3e6 100644 --- a/wifi/frameworks/js/napi/inc/wifi_napi_errcode.h +++ b/wifi/frameworks/js/napi/inc/wifi_napi_errcode.h @@ -26,25 +26,24 @@ static const std::string BUSINESS_ERROR_PROPERTY_CODE = "code"; static const std::string BUSINESS_ERROR_PROPERTY_MESSAGE = "message"; static const std::string BUSINESS_ERROR_PROPERTY_DATA = "data"; -enum { - WIFI_NAPI_SUCCESS = 0, /* successfully */ - WIFI_NAPI_ERRCODE_FAILED_UNKNOWN = 1, /* failed */ - WIFI_NAPI_ERRCODE_FORBID_AIRPLANE = 4, /* forbid when current airplane opened */ - WIFI_NAPI_ERRCODE_FORBID_POWSAVING = 5, /* forbid when current powersaving opened */ - WIFI_NAPI_ERRCODE_WIFI_NOT_OPENED = 11, /* sta service not opened */ - WIFI_NAPI_ERRCODE_AP_NOT_OPENED = 13, /* ap service not opened */ - WIFI_NAPI_ERRCODE_PERMISSION_DENIED = 201, /* permission denied */ - WIFI_NAPI_ERRCODE_INVALID_PARAM = 401, /* invalid params */ - WIFI_NAPI_ERRCODE_NOT_SUPPORTED = 801, /* not supported */ +enum WifiNapiErrCode { + WIFI_ERRCODE_SUCCESS = 0, /* successfully */ + WIFI_ERRCODE_PERMISSION_DENIED = 201, /* permission denied */ + WIFI_ERRCODE_INVALID_PARAM = 401, /* invalid params */ + WIFI_ERRCODE_NOT_SUPPORTED = 801, /* not supported */ + WIFI_ERRCODE_OPERATION_FAILED = 1000, /* failed */ + WIFI_ERRCODE_WIFI_NOT_OPENED = 1001, /* sta service not opened */ + WIFI_ERRCODE_OPEN_FAIL_WHEN_CLOSING = 1003, /* forbid when current airplane opened */ + WIFI_ERRCODE_CLOSE_FAIL_WHEN_OPENING = 1004, /* forbid when current powersaving opened */ }; #ifdef ENABLE_NAPI_WIFI_MANAGER #ifndef WIFI_NAPI_ASSERT -#define WIFI_NAPI_ASSERT(env, cond, errCode) \ +#define WIFI_NAPI_ASSERT(env, cond, errCode, sysCap) \ do { \ if (!(cond)) { \ napi_value res = nullptr; \ - HandleSyncErrCode(env, errCode); \ + HandleSyncErrCode(env, errCode, sysCap); \ napi_get_undefined(env, &res); \ return res; \ } \ @@ -52,11 +51,11 @@ do { \ #endif #ifndef WIFI_NAPI_RETURN -#define WIFI_NAPI_RETURN(env, cond, errCode) \ +#define WIFI_NAPI_RETURN(env, cond, errCode, sysCap) \ do { \ napi_value res = nullptr; \ if (!(cond)) { \ - HandleSyncErrCode(env, errCode); \ + HandleSyncErrCode(env, errCode, sysCap); \ } \ napi_get_undefined(env, &res); \ return res; \ @@ -66,7 +65,7 @@ do { \ #else /* #else ENABLE_NAPI_WIFI_MANAGER */ #ifndef WIFI_NAPI_ASSERT -#define WIFI_NAPI_ASSERT(env, cond, errCode) \ +#define WIFI_NAPI_ASSERT(env, cond, errCode, sysCap) \ do { \ if (!(cond)) { \ napi_value res = nullptr; \ @@ -77,7 +76,7 @@ do { \ #endif #ifndef WIFI_NAPI_RETURN -#define WIFI_NAPI_RETURN(env, cond, errCode) \ +#define WIFI_NAPI_RETURN(env, cond, errCode, sysCap) \ do { \ napi_value res = nullptr; \ napi_get_boolean(env, cond, &res); \ @@ -100,7 +99,8 @@ void HandleCallbackErrCode( const napi_env &env, const AsyncContext &info); * @param env The env. * @param info The input data. */ -void HandlePromiseErrCode( const napi_env &env, const AsyncContext &info); +void HandlePromiseErrCode(const napi_env &env, const AsyncContext &info); + #ifdef ENABLE_NAPI_WIFI_MANAGER /** @@ -108,8 +108,9 @@ void HandlePromiseErrCode( const napi_env &env, const AsyncContext &info); * * @param env The env. * @param errCode The error code. + * @param sysCap System capability code. */ -void HandleSyncErrCode(const napi_env &env, int32_t errCode); +void HandleSyncErrCode(const napi_env &env, int32_t errCode, int32_t sysCap); #endif } // namespace Wifi } // namespace OHOS diff --git a/wifi/frameworks/js/napi/inc/wifi_napi_utils.h b/wifi/frameworks/js/napi/inc/wifi_napi_utils.h index e46e325..ead7569 100644 --- a/wifi/frameworks/js/napi/inc/wifi_napi_utils.h +++ b/wifi/frameworks/js/napi/inc/wifi_napi_utils.h @@ -24,6 +24,12 @@ namespace OHOS { namespace Wifi { static constexpr int NAPI_MAX_STR_LENT = 128; +static const std::int32_t SYSCAP_WIFI_CORE = 2400000; +static const std::int32_t SYSCAP_WIFI_STA = 2500000; +static const std::int32_t SYSCAP_WIFI_AP_CORE = 2600000; +static const std::int32_t SYSCAP_WIFI_AP_EXT = 2700000; +static const std::int32_t SYSCAP_WIFI_P2P = 2800000; + class TraceFuncCall final { public: TraceFuncCall(std::string funcName); @@ -53,6 +59,7 @@ public: std::function completeFunc; napi_value resourceName; napi_value result; + int32_t sysCap; int errorCode; AsyncContext(napi_env e, napi_async_work w = nullptr, napi_deferred d = nullptr) @@ -63,6 +70,7 @@ public: executeFunc = nullptr; completeFunc = nullptr; result = nullptr; + sysCap = 0; errorCode = ERR_CODE_SUCCESS; } diff --git a/wifi/frameworks/js/napi/src/wifi_ext_napi_hotspot.cpp b/wifi/frameworks/js/napi/src/wifi_ext_napi_hotspot.cpp index 1be09a0..4192799 100644 --- a/wifi/frameworks/js/napi/src/wifi_ext_napi_hotspot.cpp +++ b/wifi/frameworks/js/napi/src/wifi_ext_napi_hotspot.cpp @@ -30,24 +30,24 @@ napi_value EnableHotspot(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; std::unique_ptr hotspot = GetHotspotInstance(); - WIFI_NAPI_ASSERT(env, hotspot != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, hotspot != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_AP_EXT); ErrCode ret = hotspot->EnableHotspot(ServiceType::WIFI_EXT); if (ret != WIFI_OPT_SUCCESS) { WIFI_LOGE("Enable hotspot error: %{public}d", ret); } - WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret); + WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret, SYSCAP_WIFI_AP_EXT); } napi_value DisableHotspot(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; std::unique_ptr hotspot = GetHotspotInstance(); - WIFI_NAPI_ASSERT(env, hotspot != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, hotspot != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_AP_EXT); ErrCode ret = hotspot->DisableHotspot(ServiceType::WIFI_EXT); if (ret != WIFI_OPT_SUCCESS) { WIFI_LOGE("Disable hotspot error: %{public}d", ret); } - WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret); + WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret, SYSCAP_WIFI_AP_EXT); } static ErrCode NativePowerModelListToJsObj(const napi_env& env, @@ -76,7 +76,7 @@ napi_value GetSupportedPowerModel(napi_env env, napi_callback_info info) NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data)); PowerModelListAsyncContext *asyncContext = new (std::nothrow) PowerModelListAsyncContext(env); - WIFI_NAPI_ASSERT(env, asyncContext != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, asyncContext != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_AP_EXT); napi_create_string_latin1(env, "getSupportedPowerModel", NAPI_AUTO_LENGTH, &asyncContext->resourceName); asyncContext->executeFunc = [&](void* data) -> void { @@ -98,6 +98,7 @@ napi_value GetSupportedPowerModel(napi_env env, napi_callback_info info) }; size_t nonCallbackArgNum = 0; + asyncContext->sysCap = SYSCAP_WIFI_AP_EXT; return DoAsyncWork(env, asyncContext, argc, argv, nonCallbackArgNum); } @@ -111,7 +112,7 @@ napi_value GetPowerModel(napi_env env, napi_callback_info info) NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data)); PowerModelAsyncContext *asyncContext = new (std::nothrow) PowerModelAsyncContext(env); - WIFI_NAPI_ASSERT(env, asyncContext != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, asyncContext != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_AP_EXT); napi_create_string_latin1(env, "getPowerModel", NAPI_AUTO_LENGTH, &asyncContext->resourceName); asyncContext->executeFunc = [&](void* data) -> void { @@ -132,6 +133,7 @@ napi_value GetPowerModel(napi_env env, napi_callback_info info) }; size_t nonCallbackArgNum = 0; + asyncContext->sysCap = SYSCAP_WIFI_AP_EXT; return DoAsyncWork(env, asyncContext, argc, argv, nonCallbackArgNum); } @@ -142,21 +144,21 @@ napi_value SetPowerModel(napi_env env, napi_callback_info info) napi_value argv[1]; napi_value thisVar; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); - WIFI_NAPI_ASSERT(env, argc == 1, WIFI_OPT_INVALID_PARAM); + WIFI_NAPI_ASSERT(env, argc == 1, WIFI_OPT_INVALID_PARAM, SYSCAP_WIFI_AP_EXT); napi_valuetype valueType; napi_typeof(env, argv[0], &valueType); - WIFI_NAPI_ASSERT(env, valueType == napi_number, WIFI_OPT_INVALID_PARAM); + WIFI_NAPI_ASSERT(env, valueType == napi_number, WIFI_OPT_INVALID_PARAM, SYSCAP_WIFI_AP_EXT); int model = -1; napi_get_value_int32(env, argv[0], &model); std::unique_ptr hotspot = GetHotspotInstance(); - WIFI_NAPI_ASSERT(env, hotspot != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, hotspot != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_AP_EXT); ErrCode ret = hotspot->SetPowerModel(static_cast(model)); if (ret != WIFI_OPT_SUCCESS) { WIFI_LOGE("Set power model error: %{public}d", ret); } - WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret); + WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret, SYSCAP_WIFI_AP_EXT); } } // namespace Wifi } // namespace OHOS diff --git a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp index 5fd8bc4..9777a0e 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp @@ -31,36 +31,36 @@ std::unique_ptr wifiScanPtr = WifiScan::GetInstance(WIFI_SCAN_ABILITY_ napi_value EnableWifi(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; - WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_STA); ErrCode ret = wifiDevicePtr->EnableWifi(); - WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, WIFI_OPT_SUCCESS); + WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret, SYSCAP_WIFI_STA); } napi_value DisableWifi(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; - WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_STA); ErrCode ret = wifiDevicePtr->DisableWifi(); - WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, WIFI_OPT_SUCCESS); + WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret, SYSCAP_WIFI_STA); } napi_value IsWifiActive(napi_env env, napi_callback_info info) { - WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_STA); bool activeStatus = false; ErrCode ret = wifiDevicePtr->IsWifiActive(activeStatus); if (ret != WIFI_OPT_SUCCESS) { WIFI_LOGE("Get wifi active status fail: %{public}d", ret); } - WIFI_NAPI_RETURN(env, activeStatus, WIFI_OPT_SUCCESS); + WIFI_NAPI_RETURN(env, activeStatus, WIFI_OPT_SUCCESS, SYSCAP_WIFI_STA); } napi_value Scan(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; - WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_STA); ErrCode ret = wifiScanPtr->Scan(); - WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, WIFI_OPT_SUCCESS); + WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret, SYSCAP_WIFI_STA); } static SecTypeJs SecurityTypeNativeToJs(const WifiSecurity& cppSecurityType) @@ -172,10 +172,10 @@ napi_value GetScanInfos(napi_env env, napi_callback_info info) napi_value thisVar = nullptr; void *data = nullptr; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data)); - WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_STA); ScanInfoAsyncContext *asyncContext = new ScanInfoAsyncContext(env); - WIFI_NAPI_ASSERT(env, asyncContext != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, asyncContext != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_STA); napi_create_string_latin1(env, "getScanInfos", NAPI_AUTO_LENGTH, &asyncContext->resourceName); asyncContext->executeFunc = [&](void* data) -> void { @@ -193,20 +193,21 @@ napi_value GetScanInfos(napi_env env, napi_callback_info info) }; size_t nonCallbackArgNum = 0; + asyncContext.sysCap = SYSCAP_WIFI_STA; return DoAsyncWork(env, asyncContext, argc, argv, nonCallbackArgNum); } napi_value GetScanResults(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; - WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_STA); std::vector scanInfos; ErrCode ret = wifiScanPtr->GetScanInfoList(scanInfos); if (ret != WIFI_OPT_SUCCESS) { WIFI_LOGE("GetScanInfoList return fail: %{public}d", ret); } - WIFI_NAPI_ASSERT(env, ret == WIFI_OPT_SUCCESS, ret); + WIFI_NAPI_ASSERT(env, ret == WIFI_OPT_SUCCESS, ret, SYSCAP_WIFI_STA); WIFI_LOGI("GetScanInfoList, size: %{public}zu", scanInfos.size()); napi_value arrayResult; napi_create_array_with_length(env, scanInfos.size(), &arrayResult); @@ -363,15 +364,15 @@ napi_value AddDeviceConfig(napi_env env, napi_callback_info info) napi_value thisVar = nullptr; void *data = nullptr; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data)); - WIFI_NAPI_ASSERT(env, argc >= 1, WIFI_OPT_INVALID_PARAM); - WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, argc >= 1, WIFI_OPT_INVALID_PARAM, SYSCAP_WIFI_STA); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_STA); napi_valuetype valueType; napi_typeof(env, argv[0], &valueType); - WIFI_NAPI_ASSERT(env, valueType == napi_object, WIFI_OPT_INVALID_PARAM); + WIFI_NAPI_ASSERT(env, valueType == napi_object, WIFI_OPT_INVALID_PARAM, SYSCAP_WIFI_STA); DeviceConfigContext *asyncContext = new DeviceConfigContext(env); - WIFI_NAPI_ASSERT(env, asyncContext != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, asyncContext != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_STA); napi_create_string_latin1(env, "addDeviceConfig", NAPI_AUTO_LENGTH, &asyncContext->resourceName); WifiDeviceConfig *config = new WifiDeviceConfig(); @@ -404,6 +405,7 @@ napi_value AddDeviceConfig(napi_env env, napi_callback_info info) }; size_t nonCallbackArgNum = 1; + asyncContext.sysCap = SYSCAP_WIFI_STA; return DoAsyncWork(env, asyncContext, argc, argv, nonCallbackArgNum); } @@ -415,15 +417,15 @@ napi_value AddUntrustedConfig(napi_env env, napi_callback_info info) napi_value thisVar = nullptr; void *data = nullptr; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data)); - WIFI_NAPI_ASSERT(env, argc >= 1, WIFI_OPT_INVALID_PARAM); - WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, argc >= 1, WIFI_OPT_INVALID_PARAM, SYSCAP_WIFI_STA); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_STA); napi_valuetype valueType; napi_typeof(env, argv[0], &valueType); - WIFI_NAPI_ASSERT(env, valueType == napi_object, WIFI_OPT_INVALID_PARAM); + WIFI_NAPI_ASSERT(env, valueType == napi_object, WIFI_OPT_INVALID_PARAM, SYSCAP_WIFI_STA); DeviceConfigContext *asyncContext = new DeviceConfigContext(env); - WIFI_NAPI_ASSERT(env, asyncContext != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, asyncContext != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_STA); napi_create_string_latin1(env, "AddUntrustedConfig", NAPI_AUTO_LENGTH, &asyncContext->resourceName); WifiDeviceConfig *config = new WifiDeviceConfig(); @@ -456,6 +458,7 @@ napi_value AddUntrustedConfig(napi_env env, napi_callback_info info) }; size_t nonCallbackArgNum = 1; + asyncContext.sysCap = SYSCAP_WIFI_STA; return DoAsyncWork(env, asyncContext, argc, argv, nonCallbackArgNum); } @@ -467,15 +470,15 @@ napi_value RemoveUntrustedConfig(napi_env env, napi_callback_info info) napi_value thisVar = nullptr; void *data = nullptr; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data)); - WIFI_NAPI_ASSERT(env, argc >= 1, WIFI_OPT_INVALID_PARAM); - WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, argc >= 1, WIFI_OPT_INVALID_PARAM, SYSCAP_WIFI_STA); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_STA); napi_valuetype valueType; napi_typeof(env, argv[0], &valueType); - WIFI_NAPI_ASSERT(env, valueType == napi_object, WIFI_OPT_INVALID_PARAM); + WIFI_NAPI_ASSERT(env, valueType == napi_object, WIFI_OPT_INVALID_PARAM, SYSCAP_WIFI_STA); DeviceConfigContext *asyncContext = new DeviceConfigContext(env); - WIFI_NAPI_ASSERT(env, asyncContext != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, asyncContext != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_STA); napi_create_string_latin1(env, "RemoveUntrustedConfig", NAPI_AUTO_LENGTH, &asyncContext->resourceName); WifiDeviceConfig *config = new WifiDeviceConfig(); @@ -503,6 +506,7 @@ napi_value RemoveUntrustedConfig(napi_env env, napi_callback_info info) }; size_t nonCallbackArgNum = 1; + asyncContext.sysCap = SYSCAP_WIFI_STA; return DoAsyncWork(env, asyncContext, argc, argv, nonCallbackArgNum); } @@ -514,15 +518,15 @@ napi_value AddCandidateConfig(napi_env env, napi_callback_info info) napi_value thisVar = nullptr; void *data = nullptr; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data)); - WIFI_NAPI_ASSERT(env, argc >= 1, WIFI_OPT_INVALID_PARAM); - WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, argc >= 1, WIFI_OPT_INVALID_PARAM, SYSCAP_WIFI_STA); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_STA); napi_valuetype valueType; napi_typeof(env, argv[0], &valueType); - WIFI_NAPI_ASSERT(env, valueType == napi_object, WIFI_OPT_INVALID_PARAM); + WIFI_NAPI_ASSERT(env, valueType == napi_object, WIFI_OPT_INVALID_PARAM, SYSCAP_WIFI_STA); DeviceConfigContext *asyncContext = new DeviceConfigContext(env); - WIFI_NAPI_ASSERT(env, asyncContext != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, asyncContext != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_STA); napi_create_string_latin1(env, "AddCandidateConfig", NAPI_AUTO_LENGTH, &asyncContext->resourceName); WifiDeviceConfig *config = new WifiDeviceConfig(); @@ -556,6 +560,7 @@ napi_value AddCandidateConfig(napi_env env, napi_callback_info info) }; size_t nonCallbackArgNum = 1; + asyncContext.sysCap = SYSCAP_WIFI_STA; return DoAsyncWork(env, asyncContext, argc, argv, nonCallbackArgNum); } @@ -567,15 +572,15 @@ napi_value RemoveCandidateConfig(napi_env env, napi_callback_info info) napi_value thisVar = nullptr; void *data = nullptr; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data)); - WIFI_NAPI_ASSERT(env, argc >= 1, WIFI_OPT_INVALID_PARAM); - WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, argc >= 1, WIFI_OPT_INVALID_PARAM, SYSCAP_WIFI_STA); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_STA); napi_valuetype valueType; napi_typeof(env, argv[0], &valueType); - WIFI_NAPI_ASSERT(env, valueType == napi_number, WIFI_OPT_INVALID_PARAM); + WIFI_NAPI_ASSERT(env, valueType == napi_number, WIFI_OPT_INVALID_PARAM, SYSCAP_WIFI_STA); DeviceConfigContext *asyncContext = new DeviceConfigContext(env); - WIFI_NAPI_ASSERT(env, asyncContext != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, asyncContext != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_STA); napi_create_string_latin1(env, "RemoveCandidateConfig", NAPI_AUTO_LENGTH, &asyncContext->resourceName); napi_get_value_int32(env, argv[0], &asyncContext->networkId); @@ -595,6 +600,7 @@ napi_value RemoveCandidateConfig(napi_env env, napi_callback_info info) }; size_t nonCallbackArgNum = 1; + asyncContext.sysCap = SYSCAP_WIFI_STA; return DoAsyncWork(env, asyncContext, argc, argv, nonCallbackArgNum); } @@ -605,19 +611,19 @@ napi_value ConnectToCandidateConfig(napi_env env, napi_callback_info info) napi_value argv[1]; napi_value thisVar; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); - WIFI_NAPI_ASSERT(env, argc == 1, WIFI_OPT_INVALID_PARAM); + WIFI_NAPI_ASSERT(env, argc == 1, WIFI_OPT_INVALID_PARAM, SYSCAP_WIFI_STA); napi_valuetype valueType; napi_typeof(env, argv[0], &valueType); - WIFI_NAPI_ASSERT(env, valueType == napi_number, WIFI_OPT_INVALID_PARAM); + WIFI_NAPI_ASSERT(env, valueType == napi_number, WIFI_OPT_INVALID_PARAM, SYSCAP_WIFI_STA); int networkId = -1; napi_get_value_int32(env, argv[0], &networkId); bool isCandidate = true; - WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_STA); ErrCode ret = wifiDevicePtr->ConnectToNetwork(networkId, isCandidate); - WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret); + WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret, SYSCAP_WIFI_STA); } napi_value ConnectToNetwork(napi_env env, napi_callback_info info) @@ -627,19 +633,19 @@ napi_value ConnectToNetwork(napi_env env, napi_callback_info info) napi_value argv[1]; napi_value thisVar; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); - WIFI_NAPI_ASSERT(env, argc == 1, WIFI_OPT_INVALID_PARAM); + WIFI_NAPI_ASSERT(env, argc == 1, WIFI_OPT_INVALID_PARAM, SYSCAP_WIFI_STA); napi_valuetype valueType; napi_typeof(env, argv[0], &valueType); - WIFI_NAPI_ASSERT(env, valueType == napi_number, WIFI_OPT_INVALID_PARAM); + WIFI_NAPI_ASSERT(env, valueType == napi_number, WIFI_OPT_INVALID_PARAM, SYSCAP_WIFI_STA); int networkId = -1; napi_get_value_int32(env, argv[0], &networkId); bool isCandidate = false; - WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_STA); ErrCode ret = wifiDevicePtr->ConnectToNetwork(networkId, isCandidate); - WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret); + WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret, SYSCAP_WIFI_STA); } napi_value ConnectToDevice(napi_env env, napi_callback_info info) @@ -652,31 +658,31 @@ napi_value ConnectToDevice(napi_env env, napi_callback_info info) napi_valuetype valueType; napi_typeof(env, argv[0], &valueType); - WIFI_NAPI_ASSERT(env, valueType == napi_object, WIFI_OPT_INVALID_PARAM); + WIFI_NAPI_ASSERT(env, valueType == napi_object, WIFI_OPT_INVALID_PARAM, SYSCAP_WIFI_STA); - WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_STA); WifiDeviceConfig config; JsObjToDeviceConfig(env, argv[0], config); ErrCode ret = wifiDevicePtr->ConnectToDevice(config); if (ret != WIFI_OPT_SUCCESS) { WIFI_LOGE("Connect to device fail: %{public}d", ret); } - WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret); + WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret, SYSCAP_WIFI_STA); } napi_value IsConnected(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; - WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED); - WIFI_NAPI_RETURN(env, wifiDevicePtr->IsConnected(), WIFI_OPT_SUCCESS); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_STA); + WIFI_NAPI_RETURN(env, wifiDevicePtr->IsConnected(), WIFI_OPT_SUCCESS, SYSCAP_WIFI_STA); } napi_value Disconnect(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; - WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_STA); ErrCode ret = wifiDevicePtr->Disconnect(); - WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret); + WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret, SYSCAP_WIFI_STA); } napi_value GetSignalLevel(napi_env env, napi_callback_info info) @@ -686,16 +692,16 @@ napi_value GetSignalLevel(napi_env env, napi_callback_info info) napi_value thisVar; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); /* the input have 2 parameters */ - WIFI_NAPI_ASSERT(env, argc == 2, WIFI_OPT_INVALID_PARAM); + WIFI_NAPI_ASSERT(env, argc == 2, WIFI_OPT_INVALID_PARAM, SYSCAP_WIFI_STA); napi_valuetype type1; napi_valuetype type2; napi_typeof(env, argv[0], &type1); napi_typeof(env, argv[1], &type2); - WIFI_NAPI_ASSERT(env, type1 == napi_number, WIFI_OPT_INVALID_PARAM); - WIFI_NAPI_ASSERT(env, type2 == napi_number, WIFI_OPT_INVALID_PARAM); - WIFI_NAPI_ASSERT(env, argc == 2, WIFI_OPT_INVALID_PARAM); - WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, type1 == napi_number, WIFI_OPT_INVALID_PARAM, SYSCAP_WIFI_STA); + WIFI_NAPI_ASSERT(env, type2 == napi_number, WIFI_OPT_INVALID_PARAM, SYSCAP_WIFI_STA); + WIFI_NAPI_ASSERT(env, argc == 2, WIFI_OPT_INVALID_PARAM, SYSCAP_WIFI_STA); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_STA); int level = -1; int rssi = 0; @@ -706,23 +712,23 @@ napi_value GetSignalLevel(napi_env env, napi_callback_info info) if (ret != WIFI_OPT_SUCCESS) { WIFI_LOGE("Get wifi signal level fail: %{public}d", ret); } - WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret); + WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret, SYSCAP_WIFI_STA); } napi_value ReConnect(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; - WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_STA); ErrCode ret = wifiDevicePtr->ReConnect(); - WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret); + WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret, SYSCAP_WIFI_STA); } napi_value ReAssociate(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; - WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_STA); ErrCode ret = wifiDevicePtr->ReAssociate(); - WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret); + WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret, SYSCAP_WIFI_STA); } static void IpInfoToJsObj(const napi_env& env, IpInfo& ipInfo, napi_value& result) @@ -740,7 +746,7 @@ static void IpInfoToJsObj(const napi_env& env, IpInfo& ipInfo, napi_value& resul napi_value GetIpInfo(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; - WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_STA); IpInfo ipInfo; napi_value result; @@ -748,7 +754,7 @@ napi_value GetIpInfo(napi_env env, napi_callback_info info) if (ret != WIFI_OPT_SUCCESS) { WIFI_LOGE("Get ip info fail: %{public}d", ret); } - WIFI_NAPI_ASSERT(env, ret == WIFI_OPT_SUCCESS, ret); + WIFI_NAPI_ASSERT(env, ret == WIFI_OPT_SUCCESS, ret, SYSCAP_WIFI_STA); IpInfoToJsObj(env, ipInfo, result); return result; } @@ -783,10 +789,10 @@ napi_value GetLinkedInfo(napi_env env, napi_callback_info info) napi_value thisVar = nullptr; void *data = nullptr; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data)); - WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_STA); LinkedInfoAsyncContext *asyncContext = new LinkedInfoAsyncContext(env); - WIFI_NAPI_ASSERT(env, asyncContext != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, asyncContext != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_STA); napi_create_string_latin1(env, "getLinkedInfo", NAPI_AUTO_LENGTH, &asyncContext->resourceName); asyncContext->executeFunc = [&](void* data) -> void { @@ -803,6 +809,7 @@ napi_value GetLinkedInfo(napi_env env, napi_callback_info info) }; size_t nonCallbackArgNum = 0; + asyncContext.sysCap = SYSCAP_WIFI_STA; return DoAsyncWork(env, asyncContext, argc, argv, nonCallbackArgNum); } @@ -813,26 +820,26 @@ napi_value RemoveDevice(napi_env env, napi_callback_info info) napi_value argv[1]; napi_value thisVar; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); - WIFI_NAPI_ASSERT(env, argc == 1, WIFI_OPT_INVALID_PARAM); + WIFI_NAPI_ASSERT(env, argc == 1, WIFI_OPT_INVALID_PARAM, SYSCAP_WIFI_STA); napi_valuetype valueType; napi_typeof(env, argv[0], &valueType); - WIFI_NAPI_ASSERT(env, valueType == napi_number, WIFI_OPT_INVALID_PARAM); + WIFI_NAPI_ASSERT(env, valueType == napi_number, WIFI_OPT_INVALID_PARAM, SYSCAP_WIFI_STA); int networkId = -1; napi_get_value_int32(env, argv[0], &networkId); - WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_STA); ErrCode ret = wifiDevicePtr->RemoveDevice(networkId); - WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret); + WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret, SYSCAP_WIFI_STA); } napi_value RemoveAllNetwork(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; - WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_STA); ErrCode ret = wifiDevicePtr->RemoveAllDevice(); - WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret); + WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret, SYSCAP_WIFI_STA); } napi_value DisableNetwork(napi_env env, napi_callback_info info) @@ -842,29 +849,29 @@ napi_value DisableNetwork(napi_env env, napi_callback_info info) napi_value argv[1]; napi_value thisVar; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); - WIFI_NAPI_ASSERT(env, argc == 1, WIFI_OPT_INVALID_PARAM); + WIFI_NAPI_ASSERT(env, argc == 1, WIFI_OPT_INVALID_PARAM, SYSCAP_WIFI_STA); napi_valuetype valueType; napi_typeof(env, argv[0], &valueType); - WIFI_NAPI_ASSERT(env, valueType == napi_number, WIFI_OPT_INVALID_PARAM); - WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, valueType == napi_number, WIFI_OPT_INVALID_PARAM, SYSCAP_WIFI_STA); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_STA); int networkId = -1; napi_get_value_int32(env, argv[0], &networkId); ErrCode ret = wifiDevicePtr->DisableDeviceConfig(networkId); - WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret); + WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret, SYSCAP_WIFI_STA); } napi_value GetCountryCode(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; - WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_CORE); std::string countryCode; ErrCode ret = wifiDevicePtr->GetCountryCode(countryCode); if (ret != WIFI_OPT_SUCCESS) { WIFI_LOGE("Get countryCode fail: %{public}d", ret); } - WIFI_NAPI_ASSERT(env, ret == WIFI_OPT_SUCCESS, ret); + WIFI_NAPI_ASSERT(env, ret == WIFI_OPT_SUCCESS, ret, SYSCAP_WIFI_CORE); napi_value cc; napi_create_string_utf8(env, countryCode.c_str(), NAPI_AUTO_LENGTH, &cc); return cc; @@ -986,7 +993,7 @@ static void DeviceConfigToJsArray(const napi_env& env, std::vector vecDeviceConfigs; bool isCandidate = false; ErrCode ret = wifiDevicePtr->GetDeviceConfigs(vecDeviceConfigs, isCandidate); @@ -994,7 +1001,7 @@ napi_value GetDeviceConfigs(napi_env env, napi_callback_info info) WIFI_LOGE("Get device configs fail: %{public}d", ret); } - WIFI_NAPI_ASSERT(env, ret == WIFI_OPT_SUCCESS, ret); + WIFI_NAPI_ASSERT(env, ret == WIFI_OPT_SUCCESS, ret, SYSCAP_WIFI_STA); WIFI_LOGI("Get device configs size: %{public}zu", vecDeviceConfigs.size()); napi_value arrayResult; napi_create_array_with_length(env, vecDeviceConfigs.size(), &arrayResult); @@ -1007,7 +1014,7 @@ napi_value GetDeviceConfigs(napi_env env, napi_callback_info info) napi_value GetCandidateConfigs(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; - WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_STA); std::vector vecDeviceConfigs; bool isCandidate = true; ErrCode ret = wifiDevicePtr->GetDeviceConfigs(vecDeviceConfigs, isCandidate); @@ -1015,7 +1022,7 @@ napi_value GetCandidateConfigs(napi_env env, napi_callback_info info) WIFI_LOGE("Get candidate device configs fail: %{public}d", ret); } - WIFI_NAPI_ASSERT(env, ret == WIFI_OPT_SUCCESS, ret); + WIFI_NAPI_ASSERT(env, ret == WIFI_OPT_SUCCESS, ret, SYSCAP_WIFI_STA); WIFI_LOGI("Get candidate device configs size: %{public}zu", vecDeviceConfigs.size()); napi_value arrayResult; napi_create_array_with_length(env, vecDeviceConfigs.size(), &arrayResult); @@ -1035,9 +1042,9 @@ napi_value UpdateNetwork(napi_env env, napi_callback_info info) napi_valuetype valueType; napi_typeof(env, argv[0], &valueType); - WIFI_NAPI_ASSERT(env, valueType == napi_object, WIFI_OPT_INVALID_PARAM); + WIFI_NAPI_ASSERT(env, valueType == napi_object, WIFI_OPT_INVALID_PARAM, SYSCAP_WIFI_STA); - WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_STA); int updateResult; WifiDeviceConfig config; JsObjToDeviceConfig(env, argv[0], config); @@ -1046,7 +1053,7 @@ napi_value UpdateNetwork(napi_env env, napi_callback_info info) WIFI_LOGE("Update device config fail: %{public}d", ret); } - WIFI_NAPI_ASSERT(env, ret == WIFI_OPT_SUCCESS, ret); + WIFI_NAPI_ASSERT(env, ret == WIFI_OPT_SUCCESS, ret, SYSCAP_WIFI_STA); napi_value result; napi_create_uint32(env, updateResult, &result); return result; @@ -1055,14 +1062,14 @@ napi_value UpdateNetwork(napi_env env, napi_callback_info info) napi_value GetSupportedFeatures(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; - WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_CORE); long features = -1; ErrCode ret = wifiDevicePtr->GetSupportedFeatures(features); if (ret != WIFI_OPT_SUCCESS) { WIFI_LOGE("Get supported features fail: %{public}d", ret); } - WIFI_NAPI_ASSERT(env, ret == WIFI_OPT_SUCCESS, ret); + WIFI_NAPI_ASSERT(env, ret == WIFI_OPT_SUCCESS, ret, SYSCAP_WIFI_CORE); napi_value result; napi_create_int64(env, features, &result); return result; @@ -1075,31 +1082,31 @@ napi_value IsFeatureSupported(napi_env env, napi_callback_info info) napi_value argv[1]; napi_value thisVar; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); - WIFI_NAPI_ASSERT(env, argc == 1, WIFI_OPT_INVALID_PARAM); + WIFI_NAPI_ASSERT(env, argc == 1, WIFI_OPT_INVALID_PARAM, SYSCAP_WIFI_CORE); napi_valuetype valueType; napi_typeof(env, argv[0], &valueType); - WIFI_NAPI_ASSERT(env, valueType == napi_number, WIFI_OPT_INVALID_PARAM); + WIFI_NAPI_ASSERT(env, valueType == napi_number, WIFI_OPT_INVALID_PARAM, SYSCAP_WIFI_CORE); long feature = -1; napi_get_value_int64(env, argv[0], (int64_t*)&feature); - WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_CORE); bool ret = wifiDevicePtr->IsFeatureSupported(feature); - WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret); + WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret, SYSCAP_WIFI_CORE); } napi_value GetDeviceMacAddress(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; - WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_STA); std::string macAddr; ErrCode ret = wifiDevicePtr->GetDeviceMacAddress(macAddr); if (ret != WIFI_OPT_SUCCESS) { WIFI_LOGE("Get mac address fail: %{public}d", ret); } - WIFI_NAPI_ASSERT(env, ret == WIFI_OPT_SUCCESS, ret); + WIFI_NAPI_ASSERT(env, ret == WIFI_OPT_SUCCESS, ret, SYSCAP_WIFI_STA); napi_value addr; napi_create_string_utf8(env, macAddr.c_str(), NAPI_AUTO_LENGTH, &addr); return addr; diff --git a/wifi/frameworks/js/napi/src/wifi_napi_errcode.cpp b/wifi/frameworks/js/napi/src/wifi_napi_errcode.cpp index bd47cd5..df8e9b6 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_errcode.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_errcode.cpp @@ -22,38 +22,37 @@ namespace OHOS { namespace Wifi { DEFINE_WIFILOG_LABEL("WifiNAPIErrCode"); static std::map errCodeMap = { - { ErrCode::WIFI_OPT_SUCCESS, WIFI_NAPI_SUCCESS }, - { ErrCode::WIFI_OPT_FAILED, WIFI_NAPI_ERRCODE_FAILED_UNKNOWN }, - { ErrCode::WIFI_OPT_NOT_SUPPORTED, WIFI_NAPI_ERRCODE_NOT_SUPPORTED }, - { ErrCode::WIFI_OPT_INVALID_PARAM, WIFI_NAPI_ERRCODE_INVALID_PARAM }, - { ErrCode::WIFI_OPT_FORBID_AIRPLANE, WIFI_NAPI_ERRCODE_FORBID_AIRPLANE }, - { ErrCode::WIFI_OPT_FORBID_POWSAVING, WIFI_NAPI_ERRCODE_FORBID_POWSAVING}, - { ErrCode::WIFI_OPT_PERMISSION_DENIED, WIFI_NAPI_ERRCODE_PERMISSION_DENIED }, - { ErrCode::WIFI_OPT_OPEN_FAIL_WHEN_CLOSING, WIFI_NAPI_ERRCODE_FAILED_UNKNOWN }, - { ErrCode::WIFI_OPT_OPEN_SUCC_WHEN_OPENED, WIFI_NAPI_ERRCODE_FAILED_UNKNOWN }, - { ErrCode::WIFI_OPT_CLOSE_FAIL_WHEN_OPENING, WIFI_NAPI_ERRCODE_FAILED_UNKNOWN }, - { ErrCode::WIFI_OPT_CLOSE_SUCC_WHEN_CLOSED, WIFI_NAPI_ERRCODE_FAILED_UNKNOWN }, - { ErrCode::WIFI_OPT_STA_NOT_OPENED, WIFI_NAPI_ERRCODE_WIFI_NOT_OPENED }, - { ErrCode::WIFI_OPT_SCAN_NOT_OPENED, WIFI_NAPI_ERRCODE_FAILED_UNKNOWN }, - { ErrCode::WIFI_OPT_AP_NOT_OPENED, WIFI_NAPI_ERRCODE_AP_NOT_OPENED }, - { ErrCode::WIFI_OPT_INVALID_CONFIG, WIFI_NAPI_ERRCODE_FAILED_UNKNOWN }, - { ErrCode::WIFI_OPT_P2P_NOT_OPENED, WIFI_NAPI_ERRCODE_WIFI_NOT_OPENED }, - { ErrCode::WIFI_OPT_P2P_MAC_NOT_FOUND, WIFI_NAPI_ERRCODE_FAILED_UNKNOWN }, - { ErrCode::WIFI_OPT_P2P_ERR_MAC_FORMAT, WIFI_NAPI_ERRCODE_FAILED_UNKNOWN }, - { ErrCode::WIFI_OPT_P2P_ERR_INTENT, WIFI_NAPI_ERRCODE_FAILED_UNKNOWN }, - { ErrCode::WIFI_OPT_P2P_ERR_SIZE_NW_NAME, WIFI_NAPI_ERRCODE_FAILED_UNKNOWN }, - { ErrCode::WIFI_OPT_MOVING_FREEZE_CTRL, WIFI_NAPI_ERRCODE_FAILED_UNKNOWN }, + { ErrCode::WIFI_OPT_SUCCESS, WifiNapiErrCode::WIFI_ERRCODE_SUCCESS }, + { ErrCode::WIFI_OPT_FAILED, WifiNapiErrCode::WIFI_ERRCODE_OPERATION_FAILED }, + { ErrCode::WIFI_OPT_NOT_SUPPORTED, WifiNapiErrCode::WIFI_ERRCODE_NOT_SUPPORTED }, + { ErrCode::WIFI_OPT_INVALID_PARAM, WifiNapiErrCode::WIFI_ERRCODE_INVALID_PARAM }, + { ErrCode::WIFI_OPT_FORBID_AIRPLANE, WifiNapiErrCode::WIFI_ERRCODE_OPERATION_FAILED }, + { ErrCode::WIFI_OPT_FORBID_POWSAVING, WifiNapiErrCode::WIFI_ERRCODE_OPERATION_FAILED}, + { ErrCode::WIFI_OPT_PERMISSION_DENIED, WifiNapiErrCode::WIFI_ERRCODE_PERMISSION_DENIED }, + { ErrCode::WIFI_OPT_OPEN_FAIL_WHEN_CLOSING, WifiNapiErrCode::WIFI_ERRCODE_OPEN_FAIL_WHEN_CLOSING }, + { ErrCode::WIFI_OPT_OPEN_SUCC_WHEN_OPENED, WifiNapiErrCode::WIFI_ERRCODE_CLOSE_FAIL_WHEN_OPENING }, + { ErrCode::WIFI_OPT_CLOSE_FAIL_WHEN_OPENING, WifiNapiErrCode::WIFI_ERRCODE_OPERATION_FAILED }, + { ErrCode::WIFI_OPT_CLOSE_SUCC_WHEN_CLOSED, WifiNapiErrCode::WIFI_ERRCODE_OPERATION_FAILED }, + { ErrCode::WIFI_OPT_STA_NOT_OPENED, WifiNapiErrCode::WIFI_ERRCODE_WIFI_NOT_OPENED }, + { ErrCode::WIFI_OPT_SCAN_NOT_OPENED, WifiNapiErrCode::WIFI_ERRCODE_OPERATION_FAILED }, + { ErrCode::WIFI_OPT_AP_NOT_OPENED, WifiNapiErrCode::WIFI_ERRCODE_OPERATION_FAILED }, + { ErrCode::WIFI_OPT_INVALID_CONFIG, WifiNapiErrCode::WIFI_ERRCODE_OPERATION_FAILED }, + { ErrCode::WIFI_OPT_P2P_NOT_OPENED, WifiNapiErrCode::WIFI_ERRCODE_WIFI_NOT_OPENED }, + { ErrCode::WIFI_OPT_P2P_MAC_NOT_FOUND, WifiNapiErrCode::WIFI_ERRCODE_OPERATION_FAILED }, + { ErrCode::WIFI_OPT_P2P_ERR_MAC_FORMAT, WifiNapiErrCode::WIFI_ERRCODE_OPERATION_FAILED }, + { ErrCode::WIFI_OPT_P2P_ERR_INTENT, WifiNapiErrCode::WIFI_ERRCODE_OPERATION_FAILED }, + { ErrCode::WIFI_OPT_P2P_ERR_SIZE_NW_NAME, WifiNapiErrCode::WIFI_ERRCODE_OPERATION_FAILED }, + { ErrCode::WIFI_OPT_MOVING_FREEZE_CTRL, WifiNapiErrCode::WIFI_ERRCODE_OPERATION_FAILED }, }; static std::map napiErrMsgMap { - { WIFI_NAPI_ERRCODE_FAILED_UNKNOWN, "System exception." }, - { WIFI_NAPI_ERRCODE_FORBID_AIRPLANE, "Airplane mode is opened." }, - { WIFI_NAPI_ERRCODE_FORBID_POWSAVING, "Power saving is opened." }, - { WIFI_NAPI_ERRCODE_WIFI_NOT_OPENED, "WIFI doesn't open." }, - { WIFI_NAPI_ERRCODE_AP_NOT_OPENED, "AP doesn't open." }, - { WIFI_NAPI_ERRCODE_PERMISSION_DENIED, "Permission denied." }, - { WIFI_NAPI_ERRCODE_INVALID_PARAM, "Parameter error." }, - { WIFI_NAPI_ERRCODE_NOT_SUPPORTED, "Capability not supported." }, + { WifiNapiErrCode::WIFI_ERRCODE_OPERATION_FAILED, "System exception." }, + { WifiNapiErrCode::WIFI_ERRCODE_WIFI_NOT_OPENED, "WIFI doesn't open." }, + { WifiNapiErrCode::WIFI_ERRCODE_PERMISSION_DENIED, "Permission denied." }, + { WifiNapiErrCode::WIFI_ERRCODE_INVALID_PARAM, "Parameter error." }, + { WifiNapiErrCode::WIFI_ERRCODE_NOT_SUPPORTED, "Capability not supported." }, + { WifiNapiErrCode::WIFI_ERRCODE_OPEN_FAIL_WHEN_CLOSING, "Failed for wifi is closing." }, + { WifiNapiErrCode::WIFI_ERRCODE_CLOSE_FAIL_WHEN_OPENING, "Failed for wifi is opening." }, }; static napi_value NapiGetUndefined(const napi_env &env) @@ -67,12 +66,12 @@ static int32_t GetNapiErrCode(const napi_env &env, const int32_t errCodeIn) { auto iter = errCodeMap.find(errCodeIn); if (iter != errCodeMap.end()) { - return WIFI_NAPI_ERRCODE_FAILED_UNKNOWN; + return WifiNapiErrCode::WIFI_ERRCODE_OPERATION_FAILED; } return iter->second; } -static std::string GetNapiErrMsg(const napi_env &env, const int32_t errCode) +static std::string GetNapiErrMsg(const napi_env &env, const int32_t errCode, int sysCap) { if (errCode == ErrCode::WIFI_OPT_SUCCESS) { return ""; @@ -82,6 +81,7 @@ static std::string GetNapiErrMsg(const napi_env &env, const int32_t errCode) auto iter = napiErrMsgMap.find(napiErrCode); if (iter != napiErrMsgMap.end()) { std::string errMessage = "BussinessError "; + napiErrCode += sysCap; errMessage.append(std::to_string(napiErrCode)).append(": ").append(iter->second); return errMessage; } @@ -98,9 +98,6 @@ static napi_value NapiGetNull(const napi_env &env) static napi_value GetCallbackErrorValue(napi_env env, const int32_t errCode, const std::string errMsg) { - if (errCode == ErrCode::WIFI_OPT_SUCCESS) { - return NapiGetUndefined(env); - } napi_value businessError = nullptr; napi_value eCode = nullptr; napi_value eMsg = nullptr; @@ -115,7 +112,7 @@ static napi_value GetCallbackErrorValue(napi_env env, const int32_t errCode, con void HandleCallbackErrCode( const napi_env &env, const AsyncContext &info) { - WIFI_LOGI("HandleCallbackErrCode, errCode = %{public}d", info.errorCode); + WIFI_LOGI("HandleCallbackErrCode, errCode = %{public}d", (int)info.errorCode); constexpr int RESULT_PARAMS_NUM = 2; napi_value undefine = NapiGetUndefined(env); napi_value callback = nullptr; @@ -137,8 +134,8 @@ void HandleCallbackErrCode( const napi_env &env, const AsyncContext &info) } napi_get_reference_value(env, errCb, &callback); #ifdef ENABLE_NAPI_WIFI_MANAGER - std::string errMsg = GetNapiErrMsg(env, info.errorCode); - int32_t errCodeInfo = GetNapiErrCode(env, info.errorCode); + std::string errMsg = GetNapiErrMsg(env, info.errorCode, info.sysCap); + int32_t errCodeInfo = GetNapiErrCode(env, info.errorCode) + info.sysCap; result[0] = GetCallbackErrorValue(env, errCodeInfo, errMsg); #else napi_create_uint32(env, info.errorCode, &result[0]); @@ -149,12 +146,12 @@ void HandleCallbackErrCode( const napi_env &env, const AsyncContext &info) void HandlePromiseErrCode( const napi_env &env, const AsyncContext &info) { - WIFI_LOGI("HandlePromiseErrCode, errCode = %{public}d", info.errorCode); + WIFI_LOGI("HandlePromiseErrCode, errCode = %{public}d", (int)info.errorCode); if (info.errorCode == ErrCode::WIFI_OPT_SUCCESS) { napi_resolve_deferred(env, info.deferred, info.result); } else { #ifdef ENABLE_NAPI_WIFI_MANAGER - int32_t errCodeInfo = GetNapiErrCode(env, info.errorCode); + int32_t errCodeInfo = info.sysCap + GetNapiErrCode(env, info.errorCode); std::string errMsg = GetNapiErrMsg(env, info.errorCode); napi_value businessError = nullptr; napi_value eCode = nullptr; @@ -173,14 +170,14 @@ void HandlePromiseErrCode( const napi_env &env, const AsyncContext &info) } } -void HandleSyncErrCode(const napi_env &env, int32_t errCode) +void HandleSyncErrCode(const napi_env &env, int32_t errCode, int32_t sysCap) { - WIFI_LOGI("HandleSyncErrCode, errCode = %{public}d", errCode); + WIFI_LOGI("HandleSyncErrCode, errCode = %{public}d", (int)errCode); if (errCode == ErrCode::WIFI_OPT_SUCCESS) { return; } - std::string errMsg = GetNapiErrMsg(env, errCode); - int32_t errCodeInfo = GetNapiErrCode(env, errCode); + std::string errMsg = GetNapiErrMsg(env, errCode, sysCap); + int32_t errCodeInfo = sysCap + GetNapiErrCode(env, errCode); if (errMsg != "") { napi_throw_error(env, std::to_string(errCodeInfo).c_str(), errMsg.c_str()); } diff --git a/wifi/frameworks/js/napi/src/wifi_napi_event.cpp b/wifi/frameworks/js/napi/src/wifi_napi_event.cpp index 4775c59..ef63752 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_event.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_event.cpp @@ -97,6 +97,24 @@ std::multimap g_EventPermissionMap = { { EVENT_STREAM_CHANGE, WIFI_PERMISSION_MANAGE_WIFI_CONNECTION }, }; +std::map g_EventSysCapMap = { + { EVENT_STA_POWER_STATE_CHANGE, SYSCAP_WIFI_STA }, + { EVENT_STA_CONN_STATE_CHANGE, SYSCAP_WIFI_STA }, + { EVENT_STA_SCAN_STATE_CHANGE, SYSCAP_WIFI_STA }, + { EVENT_STA_RSSI_STATE_CHANGE, SYSCAP_WIFI_STA }, + { EVENT_STA_DEVICE_CONFIG_CHANGE, SYSCAP_WIFI_STA }, + { EVENT_HOTSPOT_STATE_CHANGE, SYSCAP_WIFI_AP_CORE }, + { EVENT_HOTSPOT_STA_JOIN, SYSCAP_WIFI_AP_CORE }, + { EVENT_HOTSPOT_STA_LEAVE, SYSCAP_WIFI_AP_CORE }, + { EVENT_P2P_STATE_CHANGE, SYSCAP_WIFI_P2P }, + { EVENT_P2P_CONN_STATE_CHANGE, SYSCAP_WIFI_P2P }, + { EVENT_P2P_DEVICE_STATE_CHANGE, SYSCAP_WIFI_P2P }, + { EVENT_P2P_PERSISTENT_GROUP_CHANGE, SYSCAP_WIFI_P2P }, + { EVENT_P2P_PEER_DEVICE_CHANGE, SYSCAP_WIFI_P2P }, + { EVENT_P2P_DISCOVERY_CHANGE, SYSCAP_WIFI_P2P }, + { EVENT_STREAM_CHANGE, SYSCAP_WIFI_P2P }, +}; + void NapiEvent::EventNotify(AsyncEventData *asyncEvent) { WIFI_LOGI("Enter wifi event notify"); @@ -464,6 +482,18 @@ napi_value Off(napi_env env, napi_callback_info cbinfo) { return result; } +static int32_t findSysCap(const std::string& type) +{ + int32_t sysCap = SYSCAP_WIFI_STA; + auto iter = g_EventSysCapMap.find(type); + if(iter == g_EventSysCapMap.end()) { + WIFI_LOGI("findSysCap, type:%{public}s, DO NOT find sysCap.", type); + return sysCap; + } + sysCap = iter->second; + return sysCap; +} + sptr wifiDeviceCallback = sptr(new (std::nothrow) WifiNapiDeviceEventCallback()); @@ -585,18 +615,20 @@ int EventRegister::CheckPermission(const std::string& eventType) void EventRegister::Register(const napi_env& env, const std::string& type, napi_value handler) { - WIFI_LOGI("Register event: %{public}s, env: %{private}p", type.c_str(), env); + int32_t sysCap = findSysCap(type); + WIFI_LOGI("Register event: %{public}s, env: %{private}p, %{public}d.", + type.c_str(), env, (int)sysCap); if (!IsEventSupport(type)) { WIFI_LOGE("Register type error or not support!"); #ifdef ENABLE_NAPI_WIFI_MANAGER - HandleSyncErrCode(env, WIFI_OPT_NOT_SUPPORTED); + HandleSyncErrCode(env, WIFI_OPT_NOT_SUPPORTED, sysCap); #endif return; } if (CheckPermission(type) != WIFI_NAPI_PERMISSION_GRANTED) { WIFI_LOGE("Register fail for NO permission!"); #ifdef ENABLE_NAPI_WIFI_MANAGER - HandleSyncErrCode(env, WIFI_OPT_PERMISSION_DENIED); + HandleSyncErrCode(env, WIFI_OPT_PERMISSION_DENIED, sysCap); #endif return; } @@ -605,7 +637,7 @@ void EventRegister::Register(const napi_env& env, const std::string& type, napi_ ErrCode ret = RegisterWifiEvents(); if (ret != WIFI_OPT_SUCCESS) { #ifdef ENABLE_NAPI_WIFI_MANAGER - HandleSyncErrCode(env, ret); + HandleSyncErrCode(env, ret, sysCap); #endif return; } diff --git a/wifi/frameworks/js/napi/src/wifi_napi_hotspot.cpp b/wifi/frameworks/js/napi/src/wifi_napi_hotspot.cpp index 8dde2de..dc0f5cb 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_hotspot.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_hotspot.cpp @@ -34,37 +34,37 @@ std::map g_mapSecTypeToKeyMgmt = { napi_value EnableHotspot(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; - WIFI_NAPI_ASSERT(env, wifiHotspotPtr != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, wifiHotspotPtr != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_AP_CORE); ErrCode ret = wifiHotspotPtr->EnableHotspot(); if (ret != WIFI_OPT_SUCCESS) { WIFI_LOGE("Enable hotspot error: %{public}d", ret); } - WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret); + WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret, SYSCAP_WIFI_AP_CORE); } napi_value DisableHotspot(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; - WIFI_NAPI_ASSERT(env, wifiHotspotPtr != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, wifiHotspotPtr != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_AP_CORE); ErrCode ret = wifiHotspotPtr->DisableHotspot(); if (ret != WIFI_OPT_SUCCESS) { WIFI_LOGE("Disable hotspot error: %{public}d", ret); } - WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret); + WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret, SYSCAP_WIFI_AP_CORE); } napi_value IsHotspotActive(napi_env env, napi_callback_info info) { - WIFI_NAPI_ASSERT(env, wifiHotspotPtr != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, wifiHotspotPtr != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_AP_CORE); bool ret = wifiHotspotPtr->IsHotspotActive(); - WIFI_NAPI_RETURN(env, ret == true, WIFI_OPT_FAILED); + WIFI_NAPI_RETURN(env, ret == true, WIFI_OPT_FAILED, SYSCAP_WIFI_AP_CORE); } napi_value IsHotspotDualBandSupported(napi_env env, napi_callback_info info) { - WIFI_NAPI_ASSERT(env, wifiHotspotPtr != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, wifiHotspotPtr != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_AP_CORE); bool ret = wifiHotspotPtr->IsHotspotDualBandSupported(); - WIFI_NAPI_RETURN(env, ret == true, WIFI_OPT_FAILED); + WIFI_NAPI_RETURN(env, ret == true, WIFI_OPT_FAILED, SYSCAP_WIFI_AP_CORE); } static KeyMgmt GetKeyMgmtFromJsSecurityType(int secType) @@ -125,8 +125,8 @@ napi_value SetHotspotConfig(napi_env env, napi_callback_info info) napi_valuetype valueType; napi_typeof(env, argv[0], &valueType); - WIFI_NAPI_ASSERT(env, valueType == napi_object, WIFI_OPT_INVALID_PARAM); - WIFI_NAPI_ASSERT(env, wifiHotspotPtr != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, valueType == napi_object, WIFI_OPT_INVALID_PARAM, SYSCAP_WIFI_AP_CORE); + WIFI_NAPI_ASSERT(env, wifiHotspotPtr != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_AP_CORE); ErrCode ret = WIFI_OPT_FAILED; HotspotConfig config; @@ -136,7 +136,7 @@ napi_value SetHotspotConfig(napi_env env, napi_callback_info info) WIFI_LOGE("Set hotspot config error: %{public}d", ret); } } - WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret); + WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret, SYSCAP_WIFI_AP_CORE); } static void HotspotconfigToJs(const napi_env& env, HotspotConfig& cppConfig, napi_value& result) @@ -151,13 +151,13 @@ static void HotspotconfigToJs(const napi_env& env, HotspotConfig& cppConfig, nap napi_value GetHotspotConfig(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; - WIFI_NAPI_ASSERT(env, wifiHotspotPtr != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, wifiHotspotPtr != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_AP_CORE); HotspotConfig config; ErrCode ret = wifiHotspotPtr->GetHotspotConfig(config); if (ret != WIFI_OPT_SUCCESS) { WIFI_LOGE("Get hotspot config error: %{public}d", ret); } - WIFI_NAPI_ASSERT(env, ret == WIFI_OPT_SUCCESS, ret); + WIFI_NAPI_ASSERT(env, ret == WIFI_OPT_SUCCESS, ret, SYSCAP_WIFI_AP_CORE); napi_value result; napi_create_object(env, &result); HotspotconfigToJs(env, config, result); @@ -182,14 +182,14 @@ static void StationInfoToJsArray(const napi_env& env, const std::vector vecStationInfo; ErrCode ret = wifiHotspotPtr->GetStationList(vecStationInfo); if (ret != WIFI_OPT_SUCCESS) { WIFI_LOGE("Get station list error: %{public}d", ret); } WIFI_LOGI("Get station list size: %{public}zu", vecStationInfo.size()); - WIFI_NAPI_ASSERT(env, ret == WIFI_OPT_SUCCESS, ret); + WIFI_NAPI_ASSERT(env, ret == WIFI_OPT_SUCCESS, ret, SYSCAP_WIFI_AP_CORE); napi_value arrayResult; napi_create_array_with_length(env, vecStationInfo.size(), &arrayResult); @@ -221,7 +221,7 @@ napi_value AddBlockList(napi_env env, napi_callback_info info) if (ret != WIFI_OPT_SUCCESS) { WIFI_LOGE("Add block list fail: %{public}d", ret); } - WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret); + WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret, SYSCAP_WIFI_AP_CORE); } napi_value DelBlockList(napi_env env, napi_callback_info info) @@ -231,11 +231,10 @@ napi_value DelBlockList(napi_env env, napi_callback_info info) napi_value argv[argc]; napi_value thisVar; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); - napi_valuetype valueType; napi_typeof(env, argv[0], &valueType); - WIFI_NAPI_ASSERT(env, valueType == napi_string, WIFI_OPT_INVALID_PARAM); - WIFI_NAPI_ASSERT(env, wifiHotspotPtr != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, valueType == napi_string, WIFI_OPT_INVALID_PARAM, SYSCAP_WIFI_AP_CORE); + WIFI_NAPI_ASSERT(env, wifiHotspotPtr != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_AP_CORE); StationInfo stationInfo; char bssid[WIFI_BSSID_LENGTH] = {0}; @@ -246,7 +245,7 @@ napi_value DelBlockList(napi_env env, napi_callback_info info) if (ret != WIFI_OPT_SUCCESS) { WIFI_LOGE("Del block list fail: %{public}d", ret); } - WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret); + WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret, SYSCAP_WIFI_AP_CORE); } } // namespace Wifi } // namespace OHOS diff --git a/wifi/frameworks/js/napi/src/wifi_napi_p2p.cpp b/wifi/frameworks/js/napi/src/wifi_napi_p2p.cpp index 4110180..0de0491 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_p2p.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_p2p.cpp @@ -113,10 +113,10 @@ napi_value GetCurrentGroup(napi_env env, napi_callback_info info) napi_value thisVar = nullptr; void *data = nullptr; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data)); - WIFI_NAPI_ASSERT(env, wifiP2pPtr != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, wifiP2pPtr != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_P2P); P2pGroupInfoAsyncContext *asyncContext = new P2pGroupInfoAsyncContext(env); - WIFI_NAPI_ASSERT(env, asyncContext != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, asyncContext != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_P2P); napi_create_string_latin1(env, "getCurrentGroup", NAPI_AUTO_LENGTH, &asyncContext->resourceName); asyncContext->executeFunc = [&](void* data) -> void { @@ -133,6 +133,7 @@ napi_value GetCurrentGroup(napi_env env, napi_callback_info info) }; size_t nonCallbackArgNum = 0; + asyncContext->sysCap = SYSCAP_WIFI_P2P; return DoAsyncWork(env, asyncContext, argc, argv, nonCallbackArgNum); } @@ -144,10 +145,10 @@ napi_value GetP2pGroups(napi_env env, napi_callback_info info) napi_value thisVar = nullptr; void *data = nullptr; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data)); - WIFI_NAPI_ASSERT(env, wifiP2pPtr != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, wifiP2pPtr != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_P2P); P2pGroupInfoListAsyncContext *asyncContext = new P2pGroupInfoListAsyncContext(env); - WIFI_NAPI_ASSERT(env, asyncContext != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, asyncContext != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_P2P); napi_create_string_latin1(env, "GetP2pGroups", NAPI_AUTO_LENGTH, &asyncContext->resourceName); asyncContext->executeFunc = [&](void* data) -> void { @@ -164,6 +165,7 @@ napi_value GetP2pGroups(napi_env env, napi_callback_info info) }; size_t nonCallbackArgNum = 0; + asyncContext->sysCap = SYSCAP_WIFI_P2P; return DoAsyncWork(env, asyncContext, argc, argv, nonCallbackArgNum); } @@ -175,36 +177,36 @@ napi_value DeletePersistentGroup(napi_env env, napi_callback_info info) napi_value argv[argc]; napi_value thisVar; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); - WIFI_NAPI_ASSERT(env, wifiP2pPtr != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, wifiP2pPtr != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_P2P); napi_valuetype valueType; napi_typeof(env, argv[0], &valueType); - WIFI_NAPI_ASSERT(env, valueType == napi_number, WIFI_OPT_INVALID_PARAM); + WIFI_NAPI_ASSERT(env, valueType == napi_number, WIFI_OPT_INVALID_PARAM, SYSCAP_WIFI_P2P); WifiP2pGroupInfo groupInfo; int netId = -999; napi_get_value_int32(env, argv[0], &netId); groupInfo.SetNetworkId(netId); ErrCode ret = wifiP2pPtr->DeleteGroup(groupInfo); - WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret); + WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret, SYSCAP_WIFI_P2P); } napi_value StartDiscoverDevices(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; - WIFI_NAPI_ASSERT(env, wifiP2pPtr != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, wifiP2pPtr != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_P2P); ErrCode ret = wifiP2pPtr->DiscoverDevices(); - WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret); + WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret, SYSCAP_WIFI_P2P); } napi_value StopDiscoverDevices(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; - WIFI_NAPI_ASSERT(env, wifiP2pPtr != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, wifiP2pPtr != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_P2P); ErrCode ret = wifiP2pPtr->StopDiscoverDevices(); - WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret); + WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret, SYSCAP_WIFI_P2P); } napi_value GetP2pDevices(napi_env env, napi_callback_info info) @@ -214,10 +216,10 @@ napi_value GetP2pDevices(napi_env env, napi_callback_info info) napi_value thisVar = nullptr; void *data = nullptr; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data)); - WIFI_NAPI_ASSERT(env, wifiP2pPtr != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, wifiP2pPtr != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_P2P); QueryP2pDeviceAsyncContext *asyncContext = new QueryP2pDeviceAsyncContext(env); - WIFI_NAPI_ASSERT(env, asyncContext != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, asyncContext != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_P2P); napi_create_string_latin1(env, "GetP2pDevices", NAPI_AUTO_LENGTH, &asyncContext->resourceName); asyncContext->executeFunc = [&](void* data) -> void { @@ -234,6 +236,7 @@ napi_value GetP2pDevices(napi_env env, napi_callback_info info) }; size_t nonCallbackArgNum = 0; + asyncContext->sysCap = SYSCAP_WIFI_P2P; return DoAsyncWork(env, asyncContext, argc, argv, nonCallbackArgNum); } @@ -245,10 +248,10 @@ napi_value GetP2pLocalDevice(napi_env env, napi_callback_info info) napi_value thisVar = nullptr; void *data = nullptr; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data)); - WIFI_NAPI_ASSERT(env, wifiP2pPtr != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, wifiP2pPtr != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_P2P); P2pLocalDeviceAsyncContext *asyncContext = new P2pLocalDeviceAsyncContext(env); - WIFI_NAPI_ASSERT(env, asyncContext != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, asyncContext != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_P2P); napi_create_string_latin1(env, "GetP2pLocalDevice", NAPI_AUTO_LENGTH, &asyncContext->resourceName); asyncContext->executeFunc = [&](void* data) -> void { @@ -266,6 +269,7 @@ napi_value GetP2pLocalDevice(napi_env env, napi_callback_info info) }; size_t nonCallbackArgNum = 0; + asyncContext->sysCap = SYSCAP_WIFI_P2P; return DoAsyncWork(env, asyncContext, argc, argv, nonCallbackArgNum); } @@ -276,18 +280,18 @@ napi_value SetDeviceName(napi_env env, napi_callback_info info) napi_value argv[1]; napi_value thisVar; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); - WIFI_NAPI_ASSERT(env, argc == 1, WIFI_OPT_INVALID_PARAM); - WIFI_NAPI_ASSERT(env, wifiP2pPtr != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, argc == 1, WIFI_OPT_INVALID_PARAM, SYSCAP_WIFI_P2P); + WIFI_NAPI_ASSERT(env, wifiP2pPtr != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_P2P); napi_valuetype valueType; napi_typeof(env, argv[0], &valueType); - WIFI_NAPI_ASSERT(env, valueType == napi_string, WIFI_OPT_INVALID_PARAM); + WIFI_NAPI_ASSERT(env, valueType == napi_string, WIFI_OPT_INVALID_PARAM, SYSCAP_WIFI_P2P); char name[64] = {0}; size_t typeLen = 0; napi_get_value_string_utf8(env, argv[0], name, sizeof(name), &typeLen); ErrCode ret = wifiP2pPtr->SetP2pDeviceName(name); - WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret); + WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret, SYSCAP_WIFI_P2P); } static void JsObjToP2pConfig(const napi_env& env, const napi_value& object, WifiP2pConfig& config) @@ -316,11 +320,11 @@ napi_value P2pConnect(napi_env env, napi_callback_info info) napi_value argv[argc]; napi_value thisVar; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); - WIFI_NAPI_ASSERT(env, wifiP2pPtr != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, wifiP2pPtr != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_P2P); napi_valuetype valueType; napi_typeof(env, argv[0], &valueType); - WIFI_NAPI_ASSERT(env, valueType == napi_object, WIFI_OPT_INVALID_PARAM); + WIFI_NAPI_ASSERT(env, valueType == napi_object, WIFI_OPT_INVALID_PARAM, SYSCAP_WIFI_P2P); WifiP2pConfig config; JsObjToP2pConfig(env, argv[0], config); @@ -328,15 +332,15 @@ napi_value P2pConnect(napi_env env, napi_callback_info info) if (ret != WIFI_OPT_SUCCESS) { WIFI_LOGE("Connect to device fail: %{public}d", ret); } - WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret); + WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret, SYSCAP_WIFI_P2P); } napi_value P2pCancelConnect(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; - WIFI_NAPI_ASSERT(env, wifiP2pPtr != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, wifiP2pPtr != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_P2P); ErrCode ret = wifiP2pPtr->P2pCancelConnect(); - WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret); + WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret, SYSCAP_WIFI_P2P); } napi_value CreateGroup(napi_env env, napi_callback_info info) @@ -346,24 +350,24 @@ napi_value CreateGroup(napi_env env, napi_callback_info info) napi_value argv[1]; napi_value thisVar; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); - WIFI_NAPI_ASSERT(env, wifiP2pPtr != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, wifiP2pPtr != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_P2P); napi_valuetype valueType; napi_typeof(env, argv[0], &valueType); - WIFI_NAPI_ASSERT(env, valueType == napi_object, WIFI_OPT_INVALID_PARAM); + WIFI_NAPI_ASSERT(env, valueType == napi_object, WIFI_OPT_INVALID_PARAM, SYSCAP_WIFI_P2P); WifiP2pConfig config; JsObjToP2pConfig(env, argv[0], config); ErrCode ret = wifiP2pPtr->CreateGroup(config); - WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret); + WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret, SYSCAP_WIFI_P2P); } napi_value RemoveGroup(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; - WIFI_NAPI_ASSERT(env, wifiP2pPtr != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, wifiP2pPtr != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_P2P); ErrCode ret = wifiP2pPtr->RemoveGroup(); - WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret); + WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret, SYSCAP_WIFI_P2P); } static void LinkedInfoToJs(const napi_env& env, WifiP2pLinkedInfo& linkedInfo, napi_value& result) @@ -381,10 +385,10 @@ napi_value GetP2pLinkedInfo(napi_env env, napi_callback_info info) napi_value thisVar = nullptr; void *data = nullptr; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data)); - WIFI_NAPI_ASSERT(env, wifiP2pPtr != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, wifiP2pPtr != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_P2P); P2pLinkedInfoAsyncContext *asyncContext = new P2pLinkedInfoAsyncContext(env); - WIFI_NAPI_ASSERT(env, asyncContext != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, asyncContext != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_P2P); napi_create_string_latin1(env, "queryP2pLinkedInfo", NAPI_AUTO_LENGTH, &asyncContext->resourceName); asyncContext->executeFunc = [&](void* data) -> void { @@ -401,6 +405,7 @@ napi_value GetP2pLinkedInfo(napi_env env, napi_callback_info info) }; size_t nonCallbackArgNum = 0; + asyncContext->sysCap = SYSCAP_WIFI_P2P; return DoAsyncWork(env, asyncContext, argc, argv, nonCallbackArgNum); } } // namespace Wifi diff --git a/wifi/frameworks/js/napi/src/wifi_napi_utils.cpp b/wifi/frameworks/js/napi/src/wifi_napi_utils.cpp index a5b3ed8..2b80657 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_utils.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_utils.cpp @@ -23,6 +23,24 @@ namespace OHOS { namespace Wifi { DEFINE_WIFILOG_LABEL("WifiNAPIUtils"); +std::multimap g_EventSysCapMap = { + { EVENT_STA_POWER_STATE_CHANGE, SYSCAP_WIFI_STA }, + { EVENT_STA_CONN_STATE_CHANGE, SYSCAP_WIFI_STA }, + { EVENT_STA_SCAN_STATE_CHANGE, SYSCAP_WIFI_STA }, + { EVENT_STA_RSSI_STATE_CHANGE, SYSCAP_WIFI_STA }, + { EVENT_STA_DEVICE_CONFIG_CHANGE, SYSCAP_WIFI_STA }, + { EVENT_HOTSPOT_STATE_CHANGE, SYSCAP_WIFI_AP_CORE }, + { EVENT_HOTSPOT_STA_JOIN, SYSCAP_WIFI_AP_CORE }, + { EVENT_HOTSPOT_STA_LEAVE, SYSCAP_WIFI_AP_CORE }, + { EVENT_P2P_STATE_CHANGE, SYSCAP_WIFI_P2P }, + { EVENT_P2P_CONN_STATE_CHANGE, SYSCAP_WIFI_P2P }, + { EVENT_P2P_DEVICE_STATE_CHANGE, SYSCAP_WIFI_P2P }, + { EVENT_P2P_PERSISTENT_GROUP_CHANGE, SYSCAP_WIFI_P2P }, + { EVENT_P2P_PEER_DEVICE_CHANGE, SYSCAP_WIFI_P2P }, + { EVENT_P2P_DISCOVERY_CHANGE, SYSCAP_WIFI_P2P }, + { EVENT_STREAM_CHANGE, SYSCAP_WIFI_P2P }, +}; + TraceFuncCall::TraceFuncCall(std::string funcName): m_funcName(funcName) { if (m_isTrace) { -- Gitee From 33b66caf9e5d8e68e07b242c4f2c952f15f0808e Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Thu, 27 Oct 2022 16:30:41 +0800 Subject: [PATCH 469/491] add error code for wifi 1027 Signed-off-by: yanxiaotao@huawei.com --- wifi/frameworks/js/napi/src/wifi_napi_device.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp index 9777a0e..192125d 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp @@ -193,7 +193,7 @@ napi_value GetScanInfos(napi_env env, napi_callback_info info) }; size_t nonCallbackArgNum = 0; - asyncContext.sysCap = SYSCAP_WIFI_STA; + asyncContext->sysCap = SYSCAP_WIFI_STA; return DoAsyncWork(env, asyncContext, argc, argv, nonCallbackArgNum); } @@ -405,7 +405,7 @@ napi_value AddDeviceConfig(napi_env env, napi_callback_info info) }; size_t nonCallbackArgNum = 1; - asyncContext.sysCap = SYSCAP_WIFI_STA; + asyncContext->sysCap = SYSCAP_WIFI_STA; return DoAsyncWork(env, asyncContext, argc, argv, nonCallbackArgNum); } @@ -458,7 +458,7 @@ napi_value AddUntrustedConfig(napi_env env, napi_callback_info info) }; size_t nonCallbackArgNum = 1; - asyncContext.sysCap = SYSCAP_WIFI_STA; + asyncContext->sysCap = SYSCAP_WIFI_STA; return DoAsyncWork(env, asyncContext, argc, argv, nonCallbackArgNum); } @@ -506,7 +506,7 @@ napi_value RemoveUntrustedConfig(napi_env env, napi_callback_info info) }; size_t nonCallbackArgNum = 1; - asyncContext.sysCap = SYSCAP_WIFI_STA; + asyncContext->sysCap = SYSCAP_WIFI_STA; return DoAsyncWork(env, asyncContext, argc, argv, nonCallbackArgNum); } @@ -560,7 +560,7 @@ napi_value AddCandidateConfig(napi_env env, napi_callback_info info) }; size_t nonCallbackArgNum = 1; - asyncContext.sysCap = SYSCAP_WIFI_STA; + asyncContext->sysCap = SYSCAP_WIFI_STA; return DoAsyncWork(env, asyncContext, argc, argv, nonCallbackArgNum); } @@ -600,7 +600,7 @@ napi_value RemoveCandidateConfig(napi_env env, napi_callback_info info) }; size_t nonCallbackArgNum = 1; - asyncContext.sysCap = SYSCAP_WIFI_STA; + asyncContext->sysCap = SYSCAP_WIFI_STA; return DoAsyncWork(env, asyncContext, argc, argv, nonCallbackArgNum); } @@ -809,7 +809,7 @@ napi_value GetLinkedInfo(napi_env env, napi_callback_info info) }; size_t nonCallbackArgNum = 0; - asyncContext.sysCap = SYSCAP_WIFI_STA; + asyncContext->sysCap = SYSCAP_WIFI_STA; return DoAsyncWork(env, asyncContext, argc, argv, nonCallbackArgNum); } -- Gitee From 3d3644831c9913b83da05cc1af6a89120dffe05a Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Thu, 27 Oct 2022 17:23:57 +0800 Subject: [PATCH 470/491] add error code for wifi 1027 Signed-off-by: yanxiaotao@huawei.com --- wifi/frameworks/js/napi/src/wifi_napi_event.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/wifi/frameworks/js/napi/src/wifi_napi_event.cpp b/wifi/frameworks/js/napi/src/wifi_napi_event.cpp index ef63752..0044932 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_event.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_event.cpp @@ -487,7 +487,7 @@ static int32_t findSysCap(const std::string& type) int32_t sysCap = SYSCAP_WIFI_STA; auto iter = g_EventSysCapMap.find(type); if(iter == g_EventSysCapMap.end()) { - WIFI_LOGI("findSysCap, type:%{public}s, DO NOT find sysCap.", type); + WIFI_LOGI("findSysCap, type:%{public}s, DO NOT find sysCap.", type.c_str()); return sysCap; } sysCap = iter->second; @@ -705,7 +705,9 @@ void EventRegister::DeleteAllRegisterObj(const napi_env& env, std::vector Date: Thu, 27 Oct 2022 17:34:12 +0800 Subject: [PATCH 471/491] add error code for wifi 1027 Signed-off-by: yanxiaotao@huawei.com --- .../frameworks/js/napi/src/wifi_napi_utils.cpp | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/wifi/frameworks/js/napi/src/wifi_napi_utils.cpp b/wifi/frameworks/js/napi/src/wifi_napi_utils.cpp index 2b80657..a5b3ed8 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_utils.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_utils.cpp @@ -23,24 +23,6 @@ namespace OHOS { namespace Wifi { DEFINE_WIFILOG_LABEL("WifiNAPIUtils"); -std::multimap g_EventSysCapMap = { - { EVENT_STA_POWER_STATE_CHANGE, SYSCAP_WIFI_STA }, - { EVENT_STA_CONN_STATE_CHANGE, SYSCAP_WIFI_STA }, - { EVENT_STA_SCAN_STATE_CHANGE, SYSCAP_WIFI_STA }, - { EVENT_STA_RSSI_STATE_CHANGE, SYSCAP_WIFI_STA }, - { EVENT_STA_DEVICE_CONFIG_CHANGE, SYSCAP_WIFI_STA }, - { EVENT_HOTSPOT_STATE_CHANGE, SYSCAP_WIFI_AP_CORE }, - { EVENT_HOTSPOT_STA_JOIN, SYSCAP_WIFI_AP_CORE }, - { EVENT_HOTSPOT_STA_LEAVE, SYSCAP_WIFI_AP_CORE }, - { EVENT_P2P_STATE_CHANGE, SYSCAP_WIFI_P2P }, - { EVENT_P2P_CONN_STATE_CHANGE, SYSCAP_WIFI_P2P }, - { EVENT_P2P_DEVICE_STATE_CHANGE, SYSCAP_WIFI_P2P }, - { EVENT_P2P_PERSISTENT_GROUP_CHANGE, SYSCAP_WIFI_P2P }, - { EVENT_P2P_PEER_DEVICE_CHANGE, SYSCAP_WIFI_P2P }, - { EVENT_P2P_DISCOVERY_CHANGE, SYSCAP_WIFI_P2P }, - { EVENT_STREAM_CHANGE, SYSCAP_WIFI_P2P }, -}; - TraceFuncCall::TraceFuncCall(std::string funcName): m_funcName(funcName) { if (m_isTrace) { -- Gitee From eebc2cfecf94441ef75639e1e4b8540b2335e177 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Thu, 27 Oct 2022 18:05:41 +0800 Subject: [PATCH 472/491] add error code for wifi 1027 Signed-off-by: yanxiaotao@huawei.com --- wifi/frameworks/js/napi/src/wifi_napi_errcode.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/frameworks/js/napi/src/wifi_napi_errcode.cpp b/wifi/frameworks/js/napi/src/wifi_napi_errcode.cpp index df8e9b6..90c85c5 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_errcode.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_errcode.cpp @@ -152,7 +152,7 @@ void HandlePromiseErrCode( const napi_env &env, const AsyncContext &info) } else { #ifdef ENABLE_NAPI_WIFI_MANAGER int32_t errCodeInfo = info.sysCap + GetNapiErrCode(env, info.errorCode); - std::string errMsg = GetNapiErrMsg(env, info.errorCode); + std::string errMsg = GetNapiErrMsg(env, info.errorCode, info.sysCap); napi_value businessError = nullptr; napi_value eCode = nullptr; napi_value eMsg = nullptr; -- Gitee From b58c07e3e431f2a6b76532a29b6bac0e629cd356 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Thu, 27 Oct 2022 21:02:00 +0800 Subject: [PATCH 473/491] add error code for wifi 1027 Signed-off-by: yanxiaotao@huawei.com --- wifi/frameworks/js/napi/src/wifi_napi_event.cpp | 2 +- wifi/frameworks/js/napi/src/wifi_napi_hotspot.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wifi/frameworks/js/napi/src/wifi_napi_event.cpp b/wifi/frameworks/js/napi/src/wifi_napi_event.cpp index 0044932..4098b82 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_event.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_event.cpp @@ -711,7 +711,7 @@ void EventRegister::Unregister(const napi_env& env, const std::string& type, nap if (!IsEventSupport(type)) { WIFI_LOGE("Unregister type error or not support!"); #ifdef ENABLE_NAPI_WIFI_MANAGER - HandleSyncErrCode(env, WIFI_OPT_NOT_SUPPORTED); + HandleSyncErrCode(env, WIFI_OPT_NOT_SUPPORTED, sysCap); #endif return; } diff --git a/wifi/frameworks/js/napi/src/wifi_napi_hotspot.cpp b/wifi/frameworks/js/napi/src/wifi_napi_hotspot.cpp index dc0f5cb..ea8d620 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_hotspot.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_hotspot.cpp @@ -209,8 +209,8 @@ napi_value AddBlockList(napi_env env, napi_callback_info info) napi_valuetype valueType; napi_typeof(env, argv[0], &valueType); - WIFI_NAPI_ASSERT(env, valueType == napi_string, WIFI_OPT_INVALID_PARAM); - WIFI_NAPI_ASSERT(env, wifiHotspotPtr != nullptr, WIFI_OPT_FAILED); + WIFI_NAPI_ASSERT(env, valueType == napi_string, WIFI_OPT_INVALID_PARAM, SYSCAP_WIFI_AP_CORE); + WIFI_NAPI_ASSERT(env, wifiHotspotPtr != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_AP_CORE); StationInfo stationInfo; char bssid[WIFI_BSSID_LENGTH] = {0}; -- Gitee From d8f399a456bdb4663f057dc9fbe17b62be8d92c9 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Thu, 27 Oct 2022 22:37:21 +0800 Subject: [PATCH 474/491] set defalut mask for static ip 1027 Signed-off-by: yanxiaotao@huawei.com --- wifi/frameworks/js/napi/src/wifi_napi_device.cpp | 4 ---- wifi/services/wifi_standard/wifi_framework/BUILD.gn | 8 ++++++-- .../wifi_standard/wifi_framework/wifi_manage/BUILD.gn | 10 +++++----- .../wifi_toolkit/net_helper/ip_tools.cpp | 5 +++-- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp index e8016a4..63c1d0b 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp @@ -298,10 +298,6 @@ napi_value ConfigStaticIp(const napi_env& env, const napi_value& object, WifiDev { bool hasProperty = false; JsObjectToInt(env, object, "prefixLength", cppConfig.wifiIpConfig.staticIpAddress.ipAddress.prefixLength); - if (cppConfig.wifiIpConfig.staticIpAddress.ipAddress.prefixLength <= 0) { - constexpr int defaultPrefixLen = 24; - cppConfig.wifiIpConfig.staticIpAddress.ipAddress.prefixLength = defaultPrefixLen; - } NAPI_CALL(env, napi_has_named_property(env, object, "staticIp", &hasProperty)); if (!hasProperty) { WIFI_LOGE("Js has no property: staticIp."); diff --git a/wifi/services/wifi_standard/wifi_framework/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/BUILD.gn index eac1007..7ce0a78 100644 --- a/wifi/services/wifi_standard/wifi_framework/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/BUILD.gn @@ -27,9 +27,11 @@ group("wifi_system_ability") { "$WIFI_ROOT_DIR/services/wifi_standard/sa_profile:wifi_standard_sa_profile", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_device_ability", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_hotspot_ability", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_p2p_ability", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_scan_ability", ] + if (wifi_feature_with_p2p) { + deps += [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_p2p_ability" ] + } } } @@ -45,7 +47,9 @@ group("wifi_manage") { deps += [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap:wifi_ap_service", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_common:wifi_common_service", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p:wifi_p2p_service", ] } + if (wifi_feature_with_p2p) { + deps += [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p:wifi_p2p_service" ] + } } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn index d3f22d2..a6288b7 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn @@ -237,22 +237,22 @@ if (defined(ohos_lite)) { ] defines = [] - if (wifi_feature_with_p2p) { - defines += [ "FEATURE_P2P_SUPPORT" ] - } - if (wifi_feature_with_ap_num > 0) { defines += [ "FEATURE_AP_SUPPORT" ] } deps = [ - ":wifi_p2p_service_impl", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit", "$WIFI_ROOT_DIR/utils:wifi_utils", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk:system_ability_fwk", ] + if (wifi_feature_with_p2p) { + defines += [ "FEATURE_P2P_SUPPORT" ] + deps += [ ":wifi_p2p_service_impl" ] + } + if (wifi_feature_with_encryption) { defines += [ "FEATURE_ENCRYPTION_SUPPORT" ] } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/ip_tools.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/ip_tools.cpp index 26f7a29..b8c7af2 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/ip_tools.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/ip_tools.cpp @@ -120,8 +120,9 @@ void IpTools::ConvertIpv6Address(const std::string &address, std::vector MAX_PREFIX_LEN) { - return netMask; + if (prefixLength <= MIN_PREFIX_LEN || prefixLength > MAX_PREFIX_LEN) { + const int defaultPrefix = 24; + prefixLength = defaultPrefix; } int mask[IPV4_BYTE_NUM] = {0, 0, 0, 0}; -- Gitee From aa3fbf8c75a30b978913bd368864622c7725b513 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Thu, 27 Oct 2022 22:44:32 +0800 Subject: [PATCH 475/491] set defalut mask for static ip 1027 Signed-off-by: yanxiaotao@huawei.com --- wifi/services/wifi_standard/wifi_framework/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_framework/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/BUILD.gn index 7ce0a78..daae026 100644 --- a/wifi/services/wifi_standard/wifi_framework/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/BUILD.gn @@ -50,6 +50,6 @@ group("wifi_manage") { ] } if (wifi_feature_with_p2p) { - deps += [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p:wifi_p2p_service" ] + deps += [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p:wifi_p2p_service" ] } } -- Gitee From 6bcc5e320b05b7af116748e86ef34f991c220de0 Mon Sep 17 00:00:00 2001 From: xiaosi Date: Fri, 28 Oct 2022 09:49:58 +0800 Subject: [PATCH 476/491] codecheck_1028 Signed-off-by: xiaosi --- wifi/frameworks/js/napi/src/wifi_napi_device.cpp | 2 +- .../wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_macro.h | 2 +- .../wifi_framework/wifi_manage/wifi_ap/ap_service.h | 2 +- .../wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c | 2 +- .../wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c | 2 +- wifi/services/wifi_standard/wifi_hal/wifi_hal_module_manage.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp index 63c1d0b..11fb351 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp @@ -283,7 +283,7 @@ napi_value ProcessEapConfig(const napi_env& env, const napi_value& object, WifiD int eapMethod = static_cast(EapMethodJs::EAP_NONE); JsObjectToInt(env, napiEap, "eapMethod", eapMethod); - switch(EapMethodJs(eapMethod)) { + switch (EapMethodJs(eapMethod)) { case EapMethodJs::EAP_PEAP: ProcessEapPeapConfig(env, napiEap, devConfig.wifiEapConfig); break; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_macro.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_macro.h index 5764b74..e7d7ad3 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_macro.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_macro.h @@ -21,7 +21,7 @@ */ #define DISALLOW_COPY_AND_ASSIGN(TypeName) \ TypeName(const TypeName &) = delete; \ - TypeName &operator=(const TypeName &) = delete; + TypeName (&operator=(const TypeName &)) = delete; #define FRIEND_GTEST(test_typename) friend class test_typename##_test #endif \ No newline at end of file diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.h index 22df6bf..d04045e 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.h @@ -32,7 +32,7 @@ public: * @param None * @return None */ - ApService(ApStateMachine &apStateMachine, int id = 0); + explicit ApService(ApStateMachine &apStateMachine, int id = 0); /** * @Description destructor method. diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c index b14d1f1..d6cf462 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c @@ -865,7 +865,7 @@ static int WpaCliRemoveIface(WifiWpaInterface *p, const char *name) return 0; } -static int WpaCliWpaTerminate() +static int WpaCliWpaTerminate(void) { LOGI("Enter WpaCliWpaTerminate"); char cmd[WPA_CMD_BUF_LEN] = {0}; diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c index 3a4d918..43b70dc 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c @@ -953,7 +953,7 @@ static bool GetChanWidthCenterFreqHe(ScanInfo *pcmd, ScanInfoElem* infoElem) bool is6GhzInfoExist = (content[COLUMN_INDEX_TWO] & GHZ_HE_INFO_EXIST_MASK_6) != 0; bool coHostedBssPresent = (content[COLUMN_INDEX_ONE] & BSS_EXIST_MASK) != 0; int expectedLen = HE_OPER_BASIC_LEN + (isVhtInfoExist ? COLUMN_INDEX_THREE : 0) - + (coHostedBssPresent ? 1 : 0) + (is6GhzInfoExist ? COLUMN_INDEX_FIVE: 0); + + (coHostedBssPresent ? 1 : 0) + (is6GhzInfoExist ? COLUMN_INDEX_FIVE : 0); if (infoElem->size < expectedLen) { return false; } diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module_manage.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module_manage.c index c9e01fa..5b2ddb2 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module_manage.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module_manage.c @@ -193,7 +193,7 @@ static int StopModuleInternalCheckProcess(const char *moduleName, pid_t processI return HAL_SUCCESS; } -static int StopModuleInternalSendTerminate() +static int StopModuleInternalSendTerminate(void) { WifiWpaInterface *pWpaInterface = GetWifiWapGlobalInterface(); if (pWpaInterface == NULL) { -- Gitee From 9a8f4ac4279a9cde952df549e76f5f7b53f5a976 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Sun, 30 Oct 2022 13:31:55 +0800 Subject: [PATCH 477/491] clear p2p devices status when group is removed 1030 Signed-off-by: yanxiaotao@huawei.com --- .../wifi_manage/wifi_p2p/p2p_state_machine.cpp | 2 ++ .../wifi_manage/wifi_p2p/wifi_p2p_device_manager.cpp | 8 ++++++++ .../wifi_manage/wifi_p2p/wifi_p2p_device_manager.h | 6 ++++++ 3 files changed, 16 insertions(+) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp index 1fe2e82..c1fbac4 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp @@ -633,6 +633,7 @@ void P2pStateMachine::HandlerDiscoverPeers() void P2pStateMachine::ChangeConnectedStatus(P2pConnectedState connectedState) { + WIFI_LOGI("ChangeConnectedStatus, connectedState: %{public}d", connectedState); WifiP2pLinkedInfo p2pInfo; WifiSettings::GetInstance().GetP2pInfo(p2pInfo); p2pInfo.SetConnectState(connectedState); @@ -650,6 +651,7 @@ void P2pStateMachine::ChangeConnectedStatus(P2pConnectedState connectedState) UpdateOwnDevice(P2pDeviceStatus::PDS_AVAILABLE); ClearWifiP2pInfo(); BroadcastP2pConnectionChanged(); + deviceManager.UpdateDeviceStatus(P2pDeviceStatus::PDS_AVAILABLE); } return; } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_device_manager.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_device_manager.cpp index bd8e095..e6582db 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_device_manager.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_device_manager.cpp @@ -145,6 +145,14 @@ bool WifiP2pDeviceManager::UpdateDeviceStatus(const std::string &deviceAddress, return false; } +bool WifiP2pDeviceManager::UpdateDeviceStatus(const P2pDeviceStatus status) +{ + std::unique_lock lock(deviceMutex); + for (auto it = p2pDevices.begin(); it != p2pDevices.end(); it++) { + it->SetP2pDeviceStatus(status); + } +} + bool WifiP2pDeviceManager::UpdateDeviceStatus(const WifiP2pDevice &device) { if (!device.IsValid()) { diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_device_manager.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_device_manager.h index 5e07956..38af758 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_device_manager.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_device_manager.h @@ -116,6 +116,12 @@ public: * @return - bool true:success false:failed */ virtual bool UpdateDeviceStatus(const WifiP2pDevice &device); + /** + * @Description - Updates the status of a P2P device based on the device information. + * @param status - status that needs to be updated + * @return - void + */ + virtual void UpdateDeviceStatus(const P2pDeviceStatus status); /** * @Description - Obtain information about a P2P device based on the device address. * @param devices - MAC of the device -- Gitee From f7e0702d043555375ad9b50e47768e1de97c137d Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Sun, 30 Oct 2022 21:20:15 +0800 Subject: [PATCH 478/491] clear p2p devices status when group is removed 1030 Signed-off-by: yanxiaotao@huawei.com --- .../wifi_manage/wifi_p2p/wifi_p2p_device_manager.cpp | 1 + .../wifi_manage/wifi_p2p/wifi_p2p_device_manager.h | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_device_manager.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_device_manager.cpp index e6582db..f2a29bb 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_device_manager.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_device_manager.cpp @@ -151,6 +151,7 @@ bool WifiP2pDeviceManager::UpdateDeviceStatus(const P2pDeviceStatus status) for (auto it = p2pDevices.begin(); it != p2pDevices.end(); it++) { it->SetP2pDeviceStatus(status); } + return true; } bool WifiP2pDeviceManager::UpdateDeviceStatus(const WifiP2pDevice &device) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_device_manager.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_device_manager.h index 38af758..0db5983 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_device_manager.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_device_manager.h @@ -119,9 +119,9 @@ public: /** * @Description - Updates the status of a P2P device based on the device information. * @param status - status that needs to be updated - * @return - void + * @return - bool true:success false:failed */ - virtual void UpdateDeviceStatus(const P2pDeviceStatus status); + virtual bool UpdateDeviceStatus(const P2pDeviceStatus status); /** * @Description - Obtain information about a P2P device based on the device address. * @param devices - MAC of the device -- Gitee From bae1badad97ad6c16f5e491bd4163a3650774143 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Sun, 30 Oct 2022 22:39:46 +0800 Subject: [PATCH 479/491] clear p2p devices status when group is removed 1030 Signed-off-by: yanxiaotao@huawei.com --- .../services/wifi_standard/wifi_framework/BUILD.gn | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/BUILD.gn index daae026..3be1bdd 100644 --- a/wifi/services/wifi_standard/wifi_framework/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/BUILD.gn @@ -26,12 +26,14 @@ group("wifi_system_ability") { deps = [ "$WIFI_ROOT_DIR/services/wifi_standard/sa_profile:wifi_standard_sa_profile", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_device_ability", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_hotspot_ability", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_scan_ability", ] if (wifi_feature_with_p2p) { deps += [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_p2p_ability" ] } + if (wifi_feature_with_ap_num > 0) { + deps += [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_hotspot_ability" ] + } } } @@ -45,11 +47,13 @@ group("wifi_manage") { ] if (!defined(ohos_lite)) { deps += [ - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap:wifi_ap_service", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_common:wifi_common_service", ] - } - if (wifi_feature_with_p2p) { - deps += [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p:wifi_p2p_service" ] + if (wifi_feature_with_p2p) { + deps += [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p:wifi_p2p_service" ] + } + if (wifi_feature_with_ap_num > 0) { + deps += [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p:wifi_ap_service" ] + } } } -- Gitee From 91cbc4571d6cfe0d168c1b4f70d2c02fad4881a5 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Sun, 30 Oct 2022 22:53:27 +0800 Subject: [PATCH 480/491] clear p2p devices status when group is removed 1030 Signed-off-by: yanxiaotao@huawei.com --- wifi/services/wifi_standard/wifi_framework/BUILD.gn | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/BUILD.gn index 3be1bdd..63b76f4 100644 --- a/wifi/services/wifi_standard/wifi_framework/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/BUILD.gn @@ -28,12 +28,12 @@ group("wifi_system_ability") { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_device_ability", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_scan_ability", ] - if (wifi_feature_with_p2p) { - deps += [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_p2p_ability" ] - } if (wifi_feature_with_ap_num > 0) { deps += [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_hotspot_ability" ] } + if (wifi_feature_with_p2p) { + deps += [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_p2p_ability" ] + } } } @@ -49,11 +49,11 @@ group("wifi_manage") { deps += [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_common:wifi_common_service", ] - if (wifi_feature_with_p2p) { - deps += [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p:wifi_p2p_service" ] - } if (wifi_feature_with_ap_num > 0) { deps += [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p:wifi_ap_service" ] } + if (wifi_feature_with_p2p) { + deps += [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p:wifi_p2p_service" ] + } } } -- Gitee From 1ce40e71872bfc9fc3920f6cc5feed60b804bd98 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 31 Oct 2022 09:36:03 +0800 Subject: [PATCH 481/491] clear p2p devices status when group is removed 1030 Signed-off-by: yanxiaotao@huawei.com --- wifi/services/wifi_standard/wifi_framework/BUILD.gn | 1 + 1 file changed, 1 insertion(+) diff --git a/wifi/services/wifi_standard/wifi_framework/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/BUILD.gn index 63b76f4..2a7815f 100644 --- a/wifi/services/wifi_standard/wifi_framework/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/BUILD.gn @@ -57,3 +57,4 @@ group("wifi_manage") { } } } + -- Gitee From b74801f4f410233e79cad7ad459d2f17d0ec09d3 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 31 Oct 2022 10:25:19 +0800 Subject: [PATCH 482/491] clear p2p devices status when group is removed 1030 Signed-off-by: yanxiaotao@huawei.com --- wifi/frameworks/js/napi/src/wifi_napi_device.cpp | 5 ++++- wifi/services/wifi_standard/wifi_framework/BUILD.gn | 5 +---- .../wifi_manage/wifi_scan/scan_state_machine.cpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp index 29615ee..8fbf4fb 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp @@ -711,8 +711,11 @@ napi_value GetSignalLevel(napi_env env, napi_callback_info info) ErrCode ret = wifiDevicePtr->GetSignalLevel(rssi, band, level); if (ret != WIFI_OPT_SUCCESS) { WIFI_LOGE("Get wifi signal level fail: %{public}d", ret); + WIFI_NAPI_ASSERT(env, ret == WIFI_OPT_SUCCESS, ret, SYSCAP_WIFI_STA); } - WIFI_NAPI_RETURN(env, ret == WIFI_OPT_SUCCESS, ret, SYSCAP_WIFI_STA); + napi_value result; + napi_create_uint32(env, level, &result); + return result; } napi_value ReConnect(napi_env env, napi_callback_info info) diff --git a/wifi/services/wifi_standard/wifi_framework/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/BUILD.gn index 2a7815f..6d12bea 100644 --- a/wifi/services/wifi_standard/wifi_framework/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/BUILD.gn @@ -46,9 +46,7 @@ group("wifi_manage") { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit", ] if (!defined(ohos_lite)) { - deps += [ - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_common:wifi_common_service", - ] + deps += [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_common:wifi_common_service" ] if (wifi_feature_with_ap_num > 0) { deps += [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p:wifi_ap_service" ] } @@ -57,4 +55,3 @@ group("wifi_manage") { } } } - diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine.cpp index 37deefc..2f0a5ad 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine.cpp @@ -913,7 +913,7 @@ bool ScanStateMachine::StartSingleCommonScan(WifiScanParam &scanParam) for (auto hiddenIter = scanParam.hiddenNetworkSsid.begin(); hiddenIter != scanParam.hiddenNetworkSsid.end(); ++hiddenIter) { - WIFI_LOGI("hidden ssid is %{public}s.\n", hiddenIter->c_str()); + WIFI_LOGI("hidden ssid is %{public}s.\n", SsidAnonymize(*hiddenIter).c_str()); } WIFI_LOGI("Begin call Scan.\n"); -- Gitee From 5c85b919d1d5aeb61c23c2be6b622f200ee48ced Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 31 Oct 2022 10:44:40 +0800 Subject: [PATCH 483/491] clear p2p devices status when group is removed 1030 Signed-off-by: yanxiaotao@huawei.com --- .../wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.c b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.c index 05117f3..5217925 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.c +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.c @@ -456,7 +456,7 @@ WifiErrorNo GetNetworkList(WifiNetworkInfo *infos, int *size) static void GetScanInfoElems(Context *context, ScanInfo* scanInfo) { - const unsigned int MAX_INFO_ELEMS_SIZE = 256; + const int MAX_INFO_ELEMS_SIZE = 256; ReadInt(context, &scanInfo->ieSize); if (scanInfo->ieSize <= 0 || scanInfo->ieSize > MAX_INFO_ELEMS_SIZE) { return; -- Gitee From 6860dd85b170d497add45cb878df658cb5b3cad5 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 31 Oct 2022 10:48:01 +0800 Subject: [PATCH 484/491] clear p2p devices status when group is removed 1030 Signed-off-by: yanxiaotao@huawei.com --- wifi/services/wifi_standard/wifi_framework/BUILD.gn | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/BUILD.gn index 6d12bea..6bff6db 100644 --- a/wifi/services/wifi_standard/wifi_framework/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/BUILD.gn @@ -47,9 +47,7 @@ group("wifi_manage") { ] if (!defined(ohos_lite)) { deps += [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_common:wifi_common_service" ] - if (wifi_feature_with_ap_num > 0) { - deps += [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p:wifi_ap_service" ] - } + deps += [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p:wifi_ap_service" ] if (wifi_feature_with_p2p) { deps += [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p:wifi_p2p_service" ] } -- Gitee From 5572129db5a5176c65859f1aa3047db6e91422b5 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 31 Oct 2022 10:55:11 +0800 Subject: [PATCH 485/491] clear p2p devices status when group is removed 1030 Signed-off-by: yanxiaotao@huawei.com --- wifi/services/wifi_standard/wifi_framework/BUILD.gn | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/BUILD.gn index 6bff6db..8113087 100644 --- a/wifi/services/wifi_standard/wifi_framework/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/BUILD.gn @@ -46,8 +46,10 @@ group("wifi_manage") { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit", ] if (!defined(ohos_lite)) { - deps += [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_common:wifi_common_service" ] - deps += [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p:wifi_ap_service" ] + deps += [ + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap:wifi_ap_service", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_common:wifi_common_service", + ] if (wifi_feature_with_p2p) { deps += [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p:wifi_p2p_service" ] } -- Gitee From d0a656198325299f29aaba2068712723c2269e85 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 31 Oct 2022 12:00:12 +0800 Subject: [PATCH 486/491] clear p2p devices status when group is removed 1030 Signed-off-by: yanxiaotao@huawei.com --- .../wifi_p2p/wifi_p2p_device_manager.cpp | 18 +++++++++--------- .../wifi_p2p/wifi_p2p_device_manager.h | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_device_manager.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_device_manager.cpp index f2a29bb..897e7fa 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_device_manager.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_device_manager.cpp @@ -145,15 +145,6 @@ bool WifiP2pDeviceManager::UpdateDeviceStatus(const std::string &deviceAddress, return false; } -bool WifiP2pDeviceManager::UpdateDeviceStatus(const P2pDeviceStatus status) -{ - std::unique_lock lock(deviceMutex); - for (auto it = p2pDevices.begin(); it != p2pDevices.end(); it++) { - it->SetP2pDeviceStatus(status); - } - return true; -} - bool WifiP2pDeviceManager::UpdateDeviceStatus(const WifiP2pDevice &device) { if (!device.IsValid()) { @@ -163,6 +154,15 @@ bool WifiP2pDeviceManager::UpdateDeviceStatus(const WifiP2pDevice &device) return UpdateDeviceStatus(device.GetDeviceAddress(), device.GetP2pDeviceStatus()); } +bool WifiP2pDeviceManager::UpdateAllDeviceStatus(const P2pDeviceStatus status) +{ + std::unique_lock lock(deviceMutex); + for (auto it = p2pDevices.begin(); it != p2pDevices.end(); it++) { + it->SetP2pDeviceStatus(status); + } + return true; +} + WifiP2pDevice WifiP2pDeviceManager::GetDevices(const std::string &deviceAddress) { std::unique_lock lock(deviceMutex); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_device_manager.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_device_manager.h index 0db5983..9e3ef43 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_device_manager.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_device_manager.h @@ -117,11 +117,11 @@ public: */ virtual bool UpdateDeviceStatus(const WifiP2pDevice &device); /** - * @Description - Updates the status of a P2P device based on the device information. + * @Description - Updates the status of P2P devices based on the device information. * @param status - status that needs to be updated * @return - bool true:success false:failed */ - virtual bool UpdateDeviceStatus(const P2pDeviceStatus status); + virtual bool UpdateAllDeviceStatus(const P2pDeviceStatus status); /** * @Description - Obtain information about a P2P device based on the device address. * @param devices - MAC of the device -- Gitee From 00ded0ebf38f4267a51395035be51b1875d4597c Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 31 Oct 2022 12:11:30 +0800 Subject: [PATCH 487/491] clear p2p devices status when group is removed 1031 Signed-off-by: yanxiaotao@huawei.com --- .../wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp index c1fbac4..0340fc1 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp @@ -651,7 +651,7 @@ void P2pStateMachine::ChangeConnectedStatus(P2pConnectedState connectedState) UpdateOwnDevice(P2pDeviceStatus::PDS_AVAILABLE); ClearWifiP2pInfo(); BroadcastP2pConnectionChanged(); - deviceManager.UpdateDeviceStatus(P2pDeviceStatus::PDS_AVAILABLE); + deviceManager.UpdateAllDeviceStatus(P2pDeviceStatus::PDS_AVAILABLE); } return; } -- Gitee From 5dbaf8422ce2a506a2b5a593699371ddcc62f5de Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 31 Oct 2022 17:36:17 +0800 Subject: [PATCH 488/491] fix code check warnings 1031 Signed-off-by: yanxiaotao@huawei.com --- wifi/frameworks/js/napi/src/wifi_napi_device.cpp | 4 ++-- wifi/frameworks/js/napi/src/wifi_napi_event.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp index 8fbf4fb..b1ff923 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp @@ -688,11 +688,12 @@ napi_value Disconnect(napi_env env, napi_callback_info info) napi_value GetSignalLevel(napi_env env, napi_callback_info info) { size_t argc = 2; + const int PARAMS_NUM = 2; napi_value argv[2]; napi_value thisVar; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); /* the input have 2 parameters */ - WIFI_NAPI_ASSERT(env, argc == 2, WIFI_OPT_INVALID_PARAM, SYSCAP_WIFI_STA); + WIFI_NAPI_ASSERT(env, argc == PARAMS_NUM, WIFI_OPT_INVALID_PARAM, SYSCAP_WIFI_STA); napi_valuetype type1; napi_valuetype type2; @@ -700,7 +701,6 @@ napi_value GetSignalLevel(napi_env env, napi_callback_info info) napi_typeof(env, argv[1], &type2); WIFI_NAPI_ASSERT(env, type1 == napi_number, WIFI_OPT_INVALID_PARAM, SYSCAP_WIFI_STA); WIFI_NAPI_ASSERT(env, type2 == napi_number, WIFI_OPT_INVALID_PARAM, SYSCAP_WIFI_STA); - WIFI_NAPI_ASSERT(env, argc == 2, WIFI_OPT_INVALID_PARAM, SYSCAP_WIFI_STA); WIFI_NAPI_ASSERT(env, wifiDevicePtr != nullptr, WIFI_OPT_FAILED, SYSCAP_WIFI_STA); int level = -1; diff --git a/wifi/frameworks/js/napi/src/wifi_napi_event.cpp b/wifi/frameworks/js/napi/src/wifi_napi_event.cpp index 4098b82..88f3657 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_event.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_event.cpp @@ -486,9 +486,9 @@ static int32_t findSysCap(const std::string& type) { int32_t sysCap = SYSCAP_WIFI_STA; auto iter = g_EventSysCapMap.find(type); - if(iter == g_EventSysCapMap.end()) { - WIFI_LOGI("findSysCap, type:%{public}s, DO NOT find sysCap.", type.c_str()); - return sysCap; + if (iter == g_EventSysCapMap.end()) { + WIFI_LOGI("findSysCap, type:%{public}s, DO NOT find sysCap.", type.c_str()); + return sysCap; } sysCap = iter->second; return sysCap; -- Gitee From c08749ca9160dcba592467a79d53533873fddaa6 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 31 Oct 2022 22:28:31 +0800 Subject: [PATCH 489/491] fix code check warnings 1031 Signed-off-by: yanxiaotao@huawei.com --- .../wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c | 10 ---------- wifi/utils/src/wifi_common_util.cpp | 6 +----- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c index d6cf462..bc91d6a 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c @@ -194,11 +194,6 @@ static void DealServiceDiscRespEvent(char *buf) info.updateIndicator = atoi(token); } else if (index == P2P_SERVICE_INFO_THIRD_SECTION) { unsigned len = strlen(token) + 1; - if (len == 0) { - free(info.tlvs); - info.tlvs = NULL; - return; - } if (info.tlvs != NULL) { free(info.tlvs); info.tlvs = NULL; @@ -449,11 +444,6 @@ static void DealP2pServDiscReqEvent(char *buf) info.updateIndic = atoi(token); } else if (index == P2P_SERVICE_DISC_REQ_FIVE) { unsigned len = strlen(token) + 1; - if (len == 0) { - free(info.tlvs); - info.tlvs = NULL; - return; - } if (info.tlvs != NULL) { free(info.tlvs); info.tlvs = NULL; diff --git a/wifi/utils/src/wifi_common_util.cpp b/wifi/utils/src/wifi_common_util.cpp index aebf9e6..7ca25ab 100644 --- a/wifi/utils/src/wifi_common_util.cpp +++ b/wifi/utils/src/wifi_common_util.cpp @@ -157,7 +157,7 @@ static char ConvertArrayChar(unsigned char ch) { constexpr int maxDecNum = 9; constexpr int numDiffForHexAlphabet = 10; - if (ch >= 0 && ch <= maxDecNum) { + if (ch <= maxDecNum) { return '0' + ch; } if (ch >= 0xa && ch <= 0xf) { @@ -266,7 +266,6 @@ bool IsSystemApp() return false; } - std::string bundleName; int uid = IPCSkeleton::GetCallingUid(); bool isSysApp = bundleInstance->CheckIsSystemAppByUid(uid); WIFI_LOGI("Is system App uid[%{public}d]: %{public}d", uid, isSysApp); @@ -286,9 +285,6 @@ bool IsForegroundApp(const int uid) int32_t userId = static_cast(uid / UID_CALLINGUID_TRANSFORM_DIVISOR); auto appMgrClient = std::make_unique(); - if (appMgrClient == nullptr) { - return false; - } appMgrClient->ConnectAppMgrService(); AppMgrResultCode ret; std::vector infos; -- Gitee From 67364ec560a14a90114845a5c3a0bea4accf6bd6 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Tue, 1 Nov 2022 15:31:56 +0800 Subject: [PATCH 490/491] fix code check warnings 1031 Signed-off-by: yanxiaotao@huawei.com --- .../wifi_toolkit/unittest/wifi_ip_tools_test.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/wifi_ip_tools_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/wifi_ip_tools_test.cpp index 8496eaa..ddb6b24 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/wifi_ip_tools_test.cpp +++ b/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/wifi_ip_tools_test.cpp @@ -75,9 +75,9 @@ HWTEST_F(WifiIpToolsTest, ConvertIpv6AddressTest, TestSize.Level1) HWTEST_F(WifiIpToolsTest, ConvertIpv4MaskTest, TestSize.Level1) { - EXPECT_TRUE(IpTools::ConvertIpv4Mask(-1) == ""); - EXPECT_TRUE(IpTools::ConvertIpv4Mask(33) == ""); - EXPECT_TRUE(IpTools::ConvertIpv4Mask(0) == "0.0.0.0"); + EXPECT_TRUE(IpTools::ConvertIpv4Mask(-1) == "255.255.255.0"); + EXPECT_TRUE(IpTools::ConvertIpv4Mask(33) == "255.255.255.0"); + EXPECT_TRUE(IpTools::ConvertIpv4Mask(0) == "255.255.255.0"); EXPECT_TRUE(IpTools::ConvertIpv4Mask(32) == "255.255.255.255"); EXPECT_TRUE(IpTools::ConvertIpv4Mask(11) == "255.224.0.0"); } -- Gitee From f6b161f550f461a8810fca0a7a81af6904cba6fe Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Tue, 1 Nov 2022 15:36:43 +0800 Subject: [PATCH 491/491] fix code check warnings 1031 Signed-off-by: yanxiaotao@huawei.com --- .../wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c index bc91d6a..cde0054 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c @@ -194,7 +194,7 @@ static void DealServiceDiscRespEvent(char *buf) info.updateIndicator = atoi(token); } else if (index == P2P_SERVICE_INFO_THIRD_SECTION) { unsigned len = strlen(token) + 1; - if (info.tlvs != NULL) { + if (info.tlvs != NULL || len > WPA_CMD_BUF_LEN) { free(info.tlvs); info.tlvs = NULL; } @@ -444,7 +444,7 @@ static void DealP2pServDiscReqEvent(char *buf) info.updateIndic = atoi(token); } else if (index == P2P_SERVICE_DISC_REQ_FIVE) { unsigned len = strlen(token) + 1; - if (info.tlvs != NULL) { + if (info.tlvs != NULL || len > WPA_CMD_BUF_LEN) { free(info.tlvs); info.tlvs = NULL; } -- Gitee

接口名

描述

@@ -132,16 +133,16 @@ WLAN基础功能由@ohos.wifi\_native\_js类提供，其接口\(JS接口\)说明 在调用WLAN JS接口前需要导入接口类。 -``` -import wifi_native_js from '@ohos.wifi_native_js'; // 导入js接口类 +```js +import wf from '@ohos.wifi'; // 导入js接口类 ``` （一）获取WLAN状态 1. 调用isWifiActive​\(\)接口查询WLAN是否打开。 - ``` - var isWifiActive = wifi_native_js.isWifiActive(); // 若WLAN打开，则返回true，否则返回false + ```js + var isWifiActive = wf.isWifiActive(); // 若WLAN打开，则返回true，否则返回false ``` @@ -150,14 +151,14 @@ import wifi_native_js from '@ohos.wifi_native_js'; // 导入js接口类 1. 调用scan​\(\)接口发起扫描。 2. 调用getScanInfoList​\(\)接口获取扫描结果。 - ``` + ```js // 调用WLAN扫描接口 - var isScanSuccess = wifi_native_js.scan(); // true + var isScanSuccess = wf.scan(); // true // 延迟一定时间 // 获取扫描结果 - wifi_native_js.getScanInfos(result => { + wf.getScanInfos(result => { var num = Object.keys(result).length; console.info("wifi scan result mum: " + num); for (var i = 0; i < num; ++i) { @@ -177,7 +178,7 @@ import wifi_native_js from '@ohos.wifi_native_js'; // 导入js接口类 1. 调用addDeviceConfig添加配置，然后通过返回的配置id连接WLAN或调用connectToDevice通过配置直接连接WLAN。 - ``` + ```js // WLAN配置信息 var config = { "ssid":"test_wifi", @@ -188,14 +189,14 @@ import wifi_native_js from '@ohos.wifi_native_js'; // 导入js接口类 } 方式一： // 添加配置 - wifi_native_js.addDeviceConfig(config, (result) => { + wf.addDeviceConfig(config, (result) => { console.info("config id: " + result); // 通过配置id连接WLAN - wifi_native_js.connectToNetwork(result); + wf.connectToNetwork(result); }); 方式二： // 通过配置信息直接连接WLAN - wifi_native_js.connectToDevice(config); + wf.connectToDevice(config); ``` diff --git a/interfaces/innerkits/native_cpp/napi/BUILD.gn b/interfaces/innerkits/native_cpp/napi/BUILD.gn index ea63e51..70a0c64 100755 --- a/interfaces/innerkits/native_cpp/napi/BUILD.gn +++ b/interfaces/innerkits/native_cpp/napi/BUILD.gn @@ -13,7 +13,7 @@ import("//build/ohos.gni") -ohos_shared_library("wifi_native_js") { +ohos_shared_library("wifi") { install_enable = true include_dirs = [ "//third_party/node/src", @@ -53,6 +53,42 @@ ohos_shared_library("wifi_native_js") { subsystem_name = "communication" } -group("wifi_js") { - deps = [ ":wifi_native_js" ] +ohos_shared_library("wifi_native_js") { + install_enable = true + include_dirs = [ + "//third_party/node/src", + "//native_engine", + "//utils/native/base/include", + "//utils/system/safwk/native/include", + "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log", + "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces", + "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", + "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/include", + "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper", + "//base/notification/ces_standard/frameworks/core/include", + ] + + sources = [ + "wifi_napi_device.cpp", + "wifi_napi_entry.cpp", + "wifi_napi_event.cpp", + "wifi_napi_hotspot.cpp", + "wifi_napi_p2p.cpp", + "wifi_napi_utils.cpp", + ] + deps = [ + "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", + "//base/notification/ces_standard/frameworks/core:cesfwk_core", + "//base/notification/ces_standard/frameworks/native:cesfwk_innerkits", + "//foundation/aafwk/standard/interfaces/innerkits/want:want", + "//foundation/ace/napi:ace_napi", + "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard:wifi_sdk", + "//utils/native/base:utils", + ] + + external_deps = [ "ipc:ipc_core" ] + + relative_install_dir = "module" + part_name = "wifi_native_js" + subsystem_name = "communication" } diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_entry.cpp b/interfaces/innerkits/native_cpp/napi/wifi_napi_entry.cpp index 059554c..103d12b 100755 --- a/interfaces/innerkits/native_cpp/napi/wifi_napi_entry.cpp +++ b/interfaces/innerkits/native_cpp/napi/wifi_napi_entry.cpp @@ -87,6 +87,40 @@ static napi_module wifiJsModule = { .nm_flags = 0, .nm_filename = NULL, .nm_register_func = Init, + .nm_modname = "wifi", + .nm_priv = ((void *)0), + .reserved = { 0 } +}; + +/* + * Module initialization function + */ +static napi_value InitForCompatible(napi_env env, napi_value exports) { + napi_property_descriptor desc[] = { + DECLARE_NAPI_FUNCTION("enableWifi", EnableWifi), + DECLARE_NAPI_FUNCTION("disableWifi", DisableWifi), + DECLARE_NAPI_FUNCTION("isWifiActive", IsWifiActive), + DECLARE_NAPI_FUNCTION("scan", Scan), + DECLARE_NAPI_FUNCTION("getScanInfos", GetScanInfos), + DECLARE_NAPI_FUNCTION("addDeviceConfig", AddDeviceConfig), + DECLARE_NAPI_FUNCTION("connectToNetwork", ConnectToNetwork), + DECLARE_NAPI_FUNCTION("connectToDevice", ConnectToDevice), + DECLARE_NAPI_FUNCTION("disconnect", Disconnect), + DECLARE_NAPI_FUNCTION("getSignalLevel", GetSignalLevel), + }; + + NAPI_CALL(env, napi_define_properties(env, exports, sizeof(desc) / sizeof(napi_property_descriptor), desc)); + return exports; +} + +/* @Deprecated - Changeme module name from "wifi_native_js" to "wifi", + * "wifi_native_js" will be discarded. Modify @11/2021 + */ +static napi_module wifiJsModuleForCompatible = { + .nm_version = 1, + .nm_flags = 0, + .nm_filename = NULL, + .nm_register_func = InitForCompatible, .nm_modname = "wifi_native_js", .nm_priv = ((void *)0), .reserved = { 0 } @@ -94,6 +128,7 @@ static napi_module wifiJsModule = { extern "C" __attribute__((constructor)) void RegisterModule(void) { napi_module_register(&wifiJsModule); + napi_module_register(&wifiJsModuleForCompatible); } } // namespace Wifi } // namespace OHOS diff --git a/ohos.build b/ohos.build index 6e9a2cf..7a14899 100755 --- a/ohos.build +++ b/ohos.build @@ -81,7 +81,8 @@ "wifi_native_js": { "module_list": [ - "//foundation/communication/wifi/interfaces/innerkits/native_cpp/napi:wifi_native_js" + "//foundation/communication/wifi/interfaces/innerkits/native_cpp/napi:wifi_native_js", + "//foundation/communication/wifi/interfaces/innerkits/native_cpp/napi:wifi" ] } } -- Gitee From cb977a255feb533fba511229fccc13e5fdf2799e Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Fri, 19 Nov 2021 06:16:56 +0000 Subject: [PATCH 012/491] fix(*): add allow-list for scan and some code optimization Signed-off-by: zhangfeng --- .../wifi_standard/interfaces/define.h | 10 + .../wifi_standard/interfaces/wifi_errcode.h | 1 + .../wifi_standard/interfaces/wifi_scan_msg.h | 35 +- .../wifi_standard/src/wifi_scan_proxy.cpp | 25 +- .../ipc_framework/cRPC/src/context.c | 2 +- .../common/config/wifi_config_file_impl.h | 16 +- .../common/config/wifi_config_file_spec.cpp | 78 +- .../common/config/wifi_config_file_spec.h | 80 ++ .../common/config/wifi_settings.cpp | 177 ++- .../common/config/wifi_settings.h | 96 +- .../common/include/wifi_internal_msg.h | 21 +- .../common/net_helper/mac_address.cpp | 2 +- .../common/net_helper/network_interface.cpp | 28 +- .../common/utils/wifi_common_event_helper.cpp | 2 +- .../common/utils/wifi_global_func.cpp | 9 +- .../wifi_manage/wifi_ap/ap_config_use.cpp | 4 +- .../wifi_manage/wifi_ap/ap_started_state.cpp | 6 +- .../wifi_ap/wifi_ap_nat_manager.cpp | 10 +- .../wifi_manage/wifi_config_center.cpp | 47 +- .../wifi_manage/wifi_config_center.h | 63 +- .../wifi_manage/wifi_device_stub.cpp | 2 +- .../wifi_manage/wifi_hotspot_stub.cpp | 28 +- .../wifi_manage/wifi_manager.cpp | 6 +- .../wifi_p2p/group_formed_state.cpp | 10 +- .../wifi_p2p/p2p_enabled_state.cpp | 20 +- .../wifi_p2p/p2p_group_operating_state.cpp | 2 +- .../wifi_p2p/p2p_state_machine.cpp | 6 +- .../wifi_p2p/provision_discovery_state.cpp | 8 +- .../wifi_manage/wifi_p2p/wifi_p2p_service.cpp | 2 +- .../wifi_p2p/wifi_p2p_service_manager.cpp | 2 +- .../wifi_manage/wifi_p2p_service_impl.cpp | 2 +- .../wifi_manage/wifi_scan/BUILD.gn | 3 + .../wifi_manage/wifi_scan/iscan_service.h | 22 +- .../wifi_scan/iscan_service_callbacks.h | 1 + .../wifi_manage/wifi_scan/scan_common.h | 5 +- .../wifi_manage/wifi_scan/scan_interface.cpp | 41 +- .../wifi_manage/wifi_scan/scan_interface.h | 24 +- .../wifi_manage/wifi_scan/scan_service.cpp | 1103 +++++++++++------ .../wifi_manage/wifi_scan/scan_service.h | 288 +++-- .../wifi_manage/wifi_scan_stub.cpp | 56 +- .../wifi_manage/wifi_sta/sta_monitor.cpp | 2 +- .../unittest/wifi_config_center_test.cpp | 2 +- .../wifi_scan/Mock/mock_scan_service.cpp | 9 +- .../wifi_scan/Mock/mock_scan_service.h | 4 +- .../wifi_scan/Mock/mock_wifi_settings.h | 19 +- .../wifi_scan/scan_interface_test.cpp | 8 +- .../wifi_scan/scan_service_test.cpp | 443 +++++-- .../wifi_sta/sta_state_machine_test.cpp | 1 + 48 files changed, 2047 insertions(+), 784 deletions(-) diff --git a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/define.h b/interfaces/innerkits/native_cpp/wifi_standard/interfaces/define.h index c7b93f9..51473c9 100644 --- a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/define.h +++ b/interfaces/innerkits/native_cpp/wifi_standard/interfaces/define.h @@ -151,4 +151,14 @@ #define WIFI_HOTSPOT_ABILITY_ID 1127 #define WIFI_P2P_ABILITY_ID 1128 +#define MODE_STATE_SCREEN (1) +#define MODE_STATE_AIR_PLANE (2) +#define MODE_STATE_APP_RUN (3) +#define MODE_STATE_POWER_SAVING (4) +#define MODE_STATE_FREEZE (5) +#define MODE_STATE_NO_CHARGER_PLUG (6) + +#define MODE_STATE_OPEN (1) +#define MODE_STATE_CLOSE (2) + #endif \ No newline at end of file diff --git a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_errcode.h b/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_errcode.h index f172ad1..6d2eb76 100644 --- a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_errcode.h +++ b/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_errcode.h @@ -40,6 +40,7 @@ enum ErrCode { WIFI_OPT_P2P_ERR_MAC_FORMAT, WIFI_OPT_P2P_ERR_INTENT, WIFI_OPT_P2P_ERR_SIZE_NW_NAME, + WIFI_OPT_MOVING_FREEZE_CTRL, /* moving freeze scanning control */ }; } // namespace Wifi } // namespace OHOS diff --git a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_scan_msg.h b/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_scan_msg.h index 61244ce..9b33054 100755 --- a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_scan_msg.h +++ b/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_scan_msg.h @@ -26,18 +26,25 @@ namespace OHOS { namespace Wifi { #define MIN_SCAN_INTERVAL 20 #define DEFAULT_MAX_SCAN_INTERVAL 160 -#define SCAN_SCENE_SCREEN_OFF 0 -#define SCAN_SCENE_SCANNING 1 -#define SCAN_SCENE_CONNECTING 2 -#define SCAN_SCENE_DISCONNCTED 3 -#define SCAN_SCENE_CONNECTED 4 -#define SCAN_SCENE_ASSOCIATING 5 -#define SCAN_SCENE_ASSOCIATED 6 -#define SCAN_SCENE_OBTAINING_IP 7 -#define SCAN_SCENE_DEEP_SLEEP 8 -/* 8~253 Custom Scenario */ +#define SCAN_SCENE_SCREEN_OFF 0 // Screen off state +#define SCAN_SCENE_SCANNING 1 // scanning state +#define SCAN_SCENE_CONNECTING 2 // connecting state +#define SCAN_SCENE_DISCONNCTED 3 // disconnected state +#define SCAN_SCENE_CONNECTED 4 // connected state +#define SCAN_SCENE_ASSOCIATING 5 // associating state +#define SCAN_SCENE_ASSOCIATED 6 // associated state +#define SCAN_SCENE_OBTAINING_IP 7 // Obtaining IP state +#define SCAN_SCENE_DEEP_SLEEP 8 // Deep sleep state +#define SCAN_SCENE_FREQUENCY_ORIGIN 9 // Scan frequency, origin. + // This parameter takes effect when no charger. +#define SCAN_SCENE_FREQUENCY_CUSTOM 10 // Scan frequency, custom. + // This parameter takes effect when no charger. +#define SCAN_SCENE_CUSTOM (SCAN_SCENE_FREQUENCY_CUSTOM + 1) + +/* SCAN_SCENE_CUSTOM~253 Custom Scenario */ #define SCAN_SCENE_ALL 254 /* all Scenario */ #define SCAN_SCENE_MAX 255 /* invalid value */ + /* Scanning mode of the control policy */ enum class ScanMode { APP_FOREGROUND_SCAN = 0, /* Scan initiated by the foreground application */ @@ -141,6 +148,7 @@ struct WifiScanInfo { }; typedef struct tagScanForbidMode { + int scanScene; /* current scanned scene */ int forbidTime; /* * Specifies the scanning duration. * If the value is 0, all invalid values are restricted. @@ -156,6 +164,9 @@ typedef struct tagScanForbidMode { forbidCount = 0; scanMode = ScanMode::SCAN_MODE_MAX; } + + ~tagScanForbidMode() + {} } ScanForbidMode; enum class IntervalMode { @@ -214,11 +225,11 @@ typedef struct tagScanIntervalMode { } } ScanIntervalMode; -typedef std::map> ScanForbidMap; +typedef std::vector ScanForbidList; typedef std::vector ScanIntervalList; typedef struct tagScanControlInfo { - ScanForbidMap scanForbidMap; /* Scanning forbidden list corresponding to the scenario */ + ScanForbidList scanForbidList; /* Scanning forbidden list corresponding to the scenario */ ScanIntervalList scanIntervalList; /* * Interval for scanning mode. * The value cannot be set to 2.4 GHz, 5 GHz, or anytime scan. diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_proxy.cpp b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_proxy.cpp index 51638c4..5ce1061 100755 --- a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_proxy.cpp +++ b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_proxy.cpp @@ -46,25 +46,20 @@ ErrCode WifiScanProxy::SetScanControlInfo(const ScanControlInfo &info) MessageParcel data; MessageParcel reply; data.WriteInt32(0); - data.WriteInt32(info.scanForbidMap.size()); - auto iter = info.scanForbidMap.begin(); - for (; iter != info.scanForbidMap.end(); iter++) { - data.WriteInt32((int)iter->first); - data.WriteInt32(iter->second.size()); - for (std::size_t i = 0; i < iter->second.size(); i++) { - data.WriteInt32((int)iter->second[i].scanMode); - data.WriteInt32(iter->second[i].forbidTime); - data.WriteInt32(iter->second[i].forbidCount); - } + data.WriteInt32(info.scanForbidList.size()); + for (auto iter = info.scanForbidList.begin(); iter != info.scanForbidList.end(); iter++) { + data.WriteInt32(iter->scanScene); + data.WriteInt32(static_cast(iter->scanMode)); + data.WriteInt32(iter->forbidTime); + data.WriteInt32(iter->forbidCount); } data.WriteInt32(info.scanIntervalList.size()); - auto iter2 = info.scanIntervalList.begin(); - for (; iter2 != info.scanIntervalList.end(); iter2++) { + for (auto iter2 = info.scanIntervalList.begin(); iter2 != info.scanIntervalList.end(); iter2++) { data.WriteInt32(iter2->scanScene); - data.WriteInt32((int)iter2->scanMode); - data.WriteInt32((int)iter2->isSingle); - data.WriteInt32((int)iter2->intervalMode); + data.WriteInt32(static_cast(iter2->scanMode)); + data.WriteBool(iter2->isSingle); + data.WriteInt32(static_cast(iter2->intervalMode)); data.WriteInt32(iter2->interval); data.WriteInt32(iter2->count); } diff --git a/services/wifi_standard/ipc_framework/cRPC/src/context.c b/services/wifi_standard/ipc_framework/cRPC/src/context.c index 35e3b2f..5919afd 100644 --- a/services/wifi_standard/ipc_framework/cRPC/src/context.c +++ b/services/wifi_standard/ipc_framework/cRPC/src/context.c @@ -39,7 +39,7 @@ Context *CreateContext(int capacity) free(context); return NULL; } - context->cSplit = '|'; + context->cSplit = '\t'; context->cMsgEnd = "$$$$$$"; return context; } diff --git a/services/wifi_standard/wifi_framework/common/config/wifi_config_file_impl.h b/services/wifi_standard/wifi_framework/common/config/wifi_config_file_impl.h index 368d31e..0af4bd0 100644 --- a/services/wifi_standard/wifi_framework/common/config/wifi_config_file_impl.h +++ b/services/wifi_standard/wifi_framework/common/config/wifi_config_file_impl.h @@ -91,6 +91,13 @@ public: */ int GetValue(std::vector &results); + /** + * @Description Get config values + * + * @return config values + */ + const std::vector& GetValue() const; + /** * @Description Set the config value * @@ -123,7 +130,6 @@ int WifiConfigFileImpl::LoadConfig() T item; std::string line; while (std::getline(fs, line)) { - DelComment(line); TrimString(line); if (line.empty()) { continue; @@ -188,7 +194,13 @@ int WifiConfigFileImpl::GetValue(std::vector &results) return 0; } -template +template +const std::vector& WifiConfigFileImpl::GetValue() const +{ + return mValues; +} + +template int WifiConfigFileImpl::SetValue(const std::vector &results) { mValues = results; diff --git a/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp b/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp index 64a95bc..e7eb55f 100644 --- a/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp +++ b/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp @@ -516,6 +516,8 @@ void ClearTClass(WifiConfig &item) item.secondRssiLevel5G = RSSI_LEVEL_2_5G; item.thirdRssiLevel5G = RSSI_LEVEL_3_5G; item.fourthRssiLevel5G = RSSI_LEVEL_4_5G; + item.strDnsBak = "8.8.8.8"; + item.isLoadStabak = true; return; } @@ -595,6 +597,10 @@ void SetTClassKeyValue(WifiConfig &item, const std::string &key, con item.thirdRssiLevel5G = std::stoi(value); } else if (key == "fourthRssiLevel5G") { item.fourthRssiLevel5G = std::stoi(value); + } else if (key == "strDnsBak") { + item.strDnsBak = value; + } else if (key == "isLoadStabak") { + item.isLoadStabak = (std::stoi(value) != 0); } return; } @@ -640,6 +646,8 @@ std::string OutTClassString(WifiConfig &item) ss << "secondRssiLevel5G=" << item.secondRssiLevel5G << std::endl; ss << "thirdRssiLevel5G=" << item.thirdRssiLevel5G << std::endl; ss << "fourthRssiLevel5G=" << item.fourthRssiLevel5G << std::endl; + ss << "strDnsBak=" << item.strDnsBak << std::endl; + ss << "isLoadStabak=" << item.isLoadStabak << std::endl; return ss.str(); } @@ -764,5 +772,71 @@ std::string OutTClassString(WifiP2pGroupInfo &item) } return ss.str(); } -} // namespace Wifi -} // namespace OHOS + +template <> +void ClearTClass(TrustListPolicy &item) +{ + item.sceneId = 0; + item.sceneName.clear(); + item.trustList.clear(); + return; +} + +template <> +void SetTClassKeyValue(TrustListPolicy &item, const std::string &key, const std::string &value) +{ + if (key == "sceneId") { + item.sceneId = std::stoi(value); + } else if (key == "sceneName") { + item.sceneName = value; + } else if (key == "trustList") { + item.trustList = value; + } + + return; +} + +template <> +std::string GetTClassName() +{ + return "TrustListPolicy"; +} + +template <> std::string OutTClassString(TrustListPolicy &item) +{ + std::ostringstream ss; + ss << "sceneId=" << item.sceneId << std::endl; + ss << "sceneName=" << item.sceneName << std::endl; + ss << "trustList=" << item.trustList << std::endl; + return ss.str(); +} + +template <> void ClearTClass(MovingFreezePolicy &item) +{ + item.trustList.clear(); + return; +} + +template <> +void SetTClassKeyValue(MovingFreezePolicy &item, const std::string &key, const std::string &value) +{ + if (key == "trustList") { + item.trustList = value; + } + + return; +} + +template <> std::string GetTClassName() +{ + return "MovingFreezePolicy"; +} + +template <> std::string OutTClassString(MovingFreezePolicy &item) +{ + std::ostringstream ss; + ss << "trustList=" << item.trustList << std::endl; + return ss.str(); +} +} // namespace Wifi +} // namespace OHOS diff --git a/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.h b/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.h index c76bd86..50ec000 100644 --- a/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.h +++ b/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.h @@ -328,6 +328,86 @@ std::string GetTClassName(); */ template<> std::string OutTClassString(WifiP2pGroupInfo &item); + +/** + * @Description Clear and init TrustListPolicy + * + * @tparam + * @param item - TrustListPolicy &item + */ +template <> +void ClearTClass(TrustListPolicy &item); + +/** + * @Description Set TrustListPolicy item data + * + * @tparam + * @param item - TrustListPolicy &item + * @param key - TrustListPolicy struct member name + * @param value - the TrustListPolicy item member value + */ +template <> +void SetTClassKeyValue(TrustListPolicy &item, const std::string &key, const std::string &value); + +/** + * @Description Output TrustListPolicy class name + * + * @tparam + * @param item - TrustListPolicy &item + * @return std::string - Class name + */ +template <> +std::string GetTClassName(); + +/** + * @Description Output the TrustListPolicy item, format: item's member = the member value + * + * @tparam + * @param item - TrustListPolicy &item + * @return std::string - output total member=value string about the TrustListPolicy item + */ +template <> +std::string OutTClassString(TrustListPolicy &item); + +/** + * @Description Clear and init MovingFreezePolicy + * + * @tparam + * @param item - MovingFreezePolicy &item + */ +template <> +void ClearTClass(MovingFreezePolicy &item); + +/** + * @Description Set MovingFreezePolicy item data + * + * @tparam + * @param item - MovingFreezePolicy &item + * @param key - MovingFreezePolicy struct member name + * @param value - the MovingFreezePolicy item member value + */ +template <> +void SetTClassKeyValue(MovingFreezePolicy &item, const std::string &key, const std::string &value); + +/** + * @Description Output MovingFreezePolicy class name + * + * @tparam + * @param item - MovingFreezePolicy &item + * @return std::string - Class name + */ +template <> +std::string GetTClassName(); + +/** + * @Description Output the MovingFreezePolicy item, format: item's member = the member value + * + * @tparam + * @param item - MovingFreezePolicy &item + * @return std::string - output total member=value string about the MovingFreezePolicy item + */ +template <> +std::string OutTClassString(MovingFreezePolicy &item); /* ----------template function specialization declare end----------- */ } // namespace Wifi } // namespace OHOS diff --git a/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp b/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp index ea3256f..daad43c 100644 --- a/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp +++ b/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp @@ -37,10 +37,12 @@ WifiSettings::WifiSettings() mApMaxConnNum(0), mLastSelectedNetworkId(-1), mLastSelectedTimeVal(0), - mScreenState(1), + mScreenState(MODE_STATE_OPEN), mAirplaneModeState(MODE_STATE_CLOSE), - mAppRunningModeState(1), - mPowerSavingModeState(MODE_STATE_CLOSE) + mAppRunningModeState(ScanMode::SYS_FOREGROUND_SCAN), + mPowerSavingModeState(MODE_STATE_CLOSE), + mFreezeModeState(MODE_STATE_CLOSE), + mNoChargerPlugModeState(MODE_STATE_CLOSE) {} WifiSettings::~WifiSettings() @@ -121,12 +123,17 @@ int WifiSettings::Init() mSavedWifiConfig.SetConfigFilePath(WIFI_CONFIG_FILE_PATH); mSavedWifiP2pGroupInfo.SetConfigFilePath(WIFI_P2P_GROUP_INFO_FILE_PATH); mSavedWifiP2pVendorConfig.SetConfigFilePath(WIFI_P2P_VENDOR_CONFIG_FILE_PATH); + mTrustListPolicies.SetConfigFilePath(WIFI_TRUST_LIST_POLICY_FILE_PATH); + mMovingFreezePolicy.SetConfigFilePath(WIFI_MOVING_FREEZE_POLICY_FILE_PATH); InitWifiConfig(); ReloadDeviceConfig(); InitHotspotConfig(); - InitScanControlInfo(); InitP2pVendorConfig(); ReloadWifiP2pGroupInfoConfig(); + InitScanControlInfo(); + ReloadTrustListPolicies(); + ReloadMovingFreezePolicy(); + return 0; } @@ -798,30 +805,42 @@ void WifiSettings::InitGetApMaxConnNum() void WifiSettings::InitScanControlForbidList(void) { /* Disable external scanning during scanning. */ - std::vector forbidModeList; ScanForbidMode forbidMode; forbidMode.scanMode = ScanMode::ALL_EXTERN_SCAN; - forbidModeList.push_back(forbidMode); - mScanControlInfo.scanForbidMap[SCAN_SCENE_SCANNING] = forbidModeList; + forbidMode.scanScene = SCAN_SCENE_SCANNING; + mScanControlInfo.scanForbidList.push_back(forbidMode); /* Disable external scanning when the screen is shut down. */ - mScanControlInfo.scanForbidMap[SCAN_SCENE_SCREEN_OFF] = forbidModeList; + forbidMode.scanMode = ScanMode::ALL_EXTERN_SCAN; + forbidMode.scanScene = SCAN_SCENE_SCREEN_OFF; + mScanControlInfo.scanForbidList.push_back(forbidMode); /* Disable all scans in connection */ + forbidMode.scanMode = ScanMode::ALL_EXTERN_SCAN; + forbidMode.scanScene = SCAN_SCENE_CONNECTING; + mScanControlInfo.scanForbidList.push_back(forbidMode); forbidMode.scanMode = ScanMode::PNO_SCAN; - forbidModeList.push_back(forbidMode); + forbidMode.scanScene = SCAN_SCENE_CONNECTING; + mScanControlInfo.scanForbidList.push_back(forbidMode); forbidMode.scanMode = ScanMode::SYSTEM_TIMER_SCAN; - forbidModeList.push_back(forbidMode); - mScanControlInfo.scanForbidMap[SCAN_SCENE_CONNECTING] = forbidModeList; + forbidMode.scanScene = SCAN_SCENE_CONNECTING; + mScanControlInfo.scanForbidList.push_back(forbidMode); /* Deep sleep disables all scans. */ - mScanControlInfo.scanForbidMap[SCAN_SCENE_DEEP_SLEEP] = forbidModeList; + forbidMode.scanMode = ScanMode::ALL_EXTERN_SCAN; + forbidMode.scanScene = SCAN_SCENE_DEEP_SLEEP; + mScanControlInfo.scanForbidList.push_back(forbidMode); + forbidMode.scanMode = ScanMode::PNO_SCAN; + forbidMode.scanScene = SCAN_SCENE_DEEP_SLEEP; + mScanControlInfo.scanForbidList.push_back(forbidMode); + forbidMode.scanMode = ScanMode::SYSTEM_TIMER_SCAN; + forbidMode.scanScene = SCAN_SCENE_DEEP_SLEEP; + mScanControlInfo.scanForbidList.push_back(forbidMode); /* PNO scanning disabled */ - forbidModeList.clear(); forbidMode.scanMode = ScanMode::PNO_SCAN; - forbidModeList.push_back(forbidMode); - mScanControlInfo.scanForbidMap[SCAN_SCENE_CONNECTED] = forbidModeList; + forbidMode.scanScene = SCAN_SCENE_CONNECTED; + mScanControlInfo.scanForbidList.push_back(forbidMode); return; } @@ -829,7 +848,7 @@ void WifiSettings::InitScanControlIntervalList(void) { /* Foreground app: 4 times in 2 minutes for a single application */ ScanIntervalMode scanIntervalMode; - scanIntervalMode.scanScene = SCAN_SCENE_ALL; + scanIntervalMode.scanScene = SCAN_SCENE_FREQUENCY_ORIGIN; scanIntervalMode.scanMode = ScanMode::APP_FOREGROUND_SCAN; scanIntervalMode.isSingle = true; scanIntervalMode.intervalMode = IntervalMode::INTERVAL_FIXED; @@ -838,7 +857,7 @@ void WifiSettings::InitScanControlIntervalList(void) mScanControlInfo.scanIntervalList.push_back(scanIntervalMode); /* Backend apps: once every 30 minutes */ - scanIntervalMode.scanScene = SCAN_SCENE_ALL; + scanIntervalMode.scanScene = SCAN_SCENE_FREQUENCY_ORIGIN; scanIntervalMode.scanMode = ScanMode::APP_BACKGROUND_SCAN; scanIntervalMode.isSingle = false; scanIntervalMode.intervalMode = IntervalMode::INTERVAL_FIXED; @@ -846,6 +865,34 @@ void WifiSettings::InitScanControlIntervalList(void) scanIntervalMode.count = BACKGROUND_SCAN_CONTROL_TIMES; mScanControlInfo.scanIntervalList.push_back(scanIntervalMode); + /* no charger plug */ + /* All app: If the scanning interval is less than 5s for five */ + /* consecutive times, the scanning can be performed only after */ + /* the scanning interval is greater than 5s. */ + const int frequencyContinueInterval = 5; + const int frequencyContinueCount = 5; + scanIntervalMode.scanScene = SCAN_SCENE_FREQUENCY_CUSTOM; + scanIntervalMode.scanMode = ScanMode::ALL_EXTERN_SCAN; + scanIntervalMode.isSingle = false; + scanIntervalMode.intervalMode = IntervalMode::INTERVAL_CONTINUE; + scanIntervalMode.interval = frequencyContinueInterval; + scanIntervalMode.count = frequencyContinueCount; + mScanControlInfo.scanIntervalList.push_back(scanIntervalMode); + + /* no charger plug */ + /* Single app: If all scanning interval in 10 times is less than */ + /* the threshold (20s), the app is added to the blocklist and */ + /* cannot initiate scanning. */ + const int frequencyBlocklistInterval = 20; + const int frequencyBlocklistCount = 10; + scanIntervalMode.scanScene = SCAN_SCENE_FREQUENCY_CUSTOM; + scanIntervalMode.scanMode = ScanMode::ALL_EXTERN_SCAN; + scanIntervalMode.isSingle = true; + scanIntervalMode.intervalMode = IntervalMode::INTERVAL_BLOCKLIST; + scanIntervalMode.interval = frequencyBlocklistInterval; + scanIntervalMode.count = frequencyBlocklistCount; + mScanControlInfo.scanIntervalList.push_back(scanIntervalMode); + /* PNO scanning every 20 seconds */ scanIntervalMode.scanScene = SCAN_SCENE_ALL; scanIntervalMode.scanMode = ScanMode::PNO_SCAN; @@ -956,7 +1003,7 @@ void WifiSettings::SetScreenState(const int &state) mScreenState = state; } -int WifiSettings::GetScreenState() +int WifiSettings::GetScreenState() const { return mScreenState; } @@ -966,17 +1013,21 @@ void WifiSettings::SetAirplaneModeState(const int &state) mAirplaneModeState = state; } -int WifiSettings::GetAirplaneModeState() +int WifiSettings::GetAirplaneModeState() const { return mAirplaneModeState; } -void WifiSettings::SetAppRunningState(const int &state) +void WifiSettings::SetAppRunningState(ScanMode appRunMode) { - mAppRunningModeState = state; + if (static_cast(appRunMode) < static_cast(ScanMode::APP_FOREGROUND_SCAN) || + static_cast(appRunMode) > static_cast(ScanMode::SYS_BACKGROUND_SCAN)) { + return; + } + mAppRunningModeState = appRunMode; } -int WifiSettings::GetAppRunningState() +ScanMode WifiSettings::GetAppRunningState() const { return mAppRunningModeState; } @@ -986,11 +1037,41 @@ void WifiSettings::SetPowerSavingModeState(const int &state) mPowerSavingModeState = state; } -int WifiSettings::GetPowerSavingModeState() +int WifiSettings::GetPowerSavingModeState() const { return mPowerSavingModeState; } +void WifiSettings::SetAppPackageName(const std::string &appPackageName) +{ + mAppPackageName = appPackageName; +} + +const std::string& WifiSettings::GetAppPackageName() const +{ + return mAppPackageName; +} + +void WifiSettings::SetFreezeModeState(int state) +{ + mFreezeModeState = state; +} + +int WifiSettings::GetFreezeModeState() const +{ + return mFreezeModeState; +} + +void WifiSettings::SetNoChargerPlugModeState(int state) +{ + mNoChargerPlugModeState = state; +} + +int WifiSettings::GetNoChargerPlugModeState() const +{ + return mNoChargerPlugModeState; +} + int WifiSettings::SetWhetherToAllowNetworkSwitchover(bool bSwitch) { mWifiConfig.whetherToAllowNetworkSwitchover = bSwitch; @@ -1122,11 +1203,57 @@ int WifiSettings::GetMinRssi5Ghz() return mWifiConfig.minRssi5Ghz; } +std::string WifiSettings::GetStrDnsBak() const +{ + return mWifiConfig.strDnsBak; +} + +bool WifiSettings::IsLoadStabak() const +{ + return mWifiConfig.isLoadStabak; +} + int WifiSettings::SetP2pDeviceName(const std::string &deviceName) { std::unique_lock lock(mP2pMutex); mP2pVendorConfig.SetDeviceName(deviceName); return mSavedWifiP2pVendorConfig.SaveConfig(); } -} // namespace Wifi -} // namespace OHOS \ No newline at end of file + +const std::vector& WifiSettings::ReloadTrustListPolicies() +{ + std::unique_lock lock(mStaMutex); + mTrustListPolicies.LoadConfig(); + if (mTrustListPolicies.GetValue().size() <= 0) { + std::vector policies; + TrustListPolicy policy; + policies.push_back(policy); + mTrustListPolicies.SetValue(policies); + mTrustListPolicies.SaveConfig(); + mTrustListPolicies.LoadConfig(); + } + + return mTrustListPolicies.GetValue(); +} + +const MovingFreezePolicy &WifiSettings::ReloadMovingFreezePolicy() +{ + std::unique_lock lock(mStaMutex); + mMovingFreezePolicy.LoadConfig(); + + if (mMovingFreezePolicy.GetValue().size() <= 0) { + std::vector policies; + MovingFreezePolicy policy; + policies.push_back(policy); + mMovingFreezePolicy.SetValue(policies); + mMovingFreezePolicy.SaveConfig(); + mMovingFreezePolicy.LoadConfig(); + } + + if (mMovingFreezePolicy.GetValue().size() <= 0) { + return mFPolicy; + } + return mMovingFreezePolicy.GetValue()[0]; +} +} // namespace Wifi +} // namespace OHOS \ No newline at end of file diff --git a/services/wifi_standard/wifi_framework/common/config/wifi_settings.h b/services/wifi_standard/wifi_framework/common/config/wifi_settings.h index d1b2136..1d8e5c3 100644 --- a/services/wifi_standard/wifi_framework/common/config/wifi_settings.h +++ b/services/wifi_standard/wifi_framework/common/config/wifi_settings.h @@ -24,9 +24,6 @@ #include #include "wifi_config_file_impl.h" -constexpr int MODE_STATE_OPEN = 1; -constexpr int MODE_STATE_CLOSE = 2; - constexpr int RANDOM_STR_LEN = 6; constexpr int MSEC = 1000; constexpr int FOREGROUND_SCAN_CONTROL_TIMES = 4; @@ -49,6 +46,9 @@ constexpr char BLOCK_LIST_FILE_PATH[] = "/data/misc/wifi/block_list.conf"; constexpr char WIFI_CONFIG_FILE_PATH[] = "/data/misc/wifi/wifi_config.conf"; constexpr char WIFI_P2P_GROUP_INFO_FILE_PATH[] = "/data/misc/wifi/p2p_groups.conf"; constexpr char WIFI_P2P_VENDOR_CONFIG_FILE_PATH[] = "/data/misc/wifi/p2p_vendor_config.conf"; +const std::string WIFI_TRUST_LIST_POLICY_FILE_PATH = "/data/misc/wifi/trust_list_polices.conf"; +const std::string WIFI_MOVING_FREEZE_POLICY_FILE_PATH = "/data/misc/wifi/moving_freeze_policy.conf"; + namespace OHOS { namespace Wifi { using ChannelsTable = std::map>; @@ -673,7 +673,7 @@ public: * * @return int - 1 on; 2 off */ - int GetScreenState(); + int GetScreenState() const; /** * @Description Set the Airplane Mode State @@ -687,21 +687,21 @@ public: * * @return int - 1 open; 2 close */ - int GetAirplaneModeState(); + int GetAirplaneModeState() const; /** * @Description Set the App Running State * - * @param state - 1 front; 2 backend + * @param appRunMode - app run mode */ - void SetAppRunningState(const int &state); + void SetAppRunningState(ScanMode appRunMode); /** * @Description Get the App Running State * - * @return int - 1 front; 2 backend + * @return ScanMode */ - int GetAppRunningState(); + ScanMode GetAppRunningState() const; /** * @Description Set the Power Saving Mode State @@ -715,7 +715,49 @@ public: * * @return int - 1 open; 2 close */ - int GetPowerSavingModeState(); + int GetPowerSavingModeState() const; + + /** + * @Description Set app package name. + * + * @param appPackageName - app package name + */ + void SetAppPackageName(const std::string &appPackageName); + + /** + * @Description Get app package name. + * + * @return const std::string& - app package name. + */ + const std::string& GetAppPackageName() const; + + /** + * @Description Set freeze mode state. + * + * @param state - 1 freeze mode; 2 moving mode + */ + void SetFreezeModeState(int state); + + /** + * @Description Get freeze mode state. + * + * @return freeze mode. + */ + int GetFreezeModeState() const; + + /** + * @Description Set no charger plugged in mode. + * + * @param state - 1 no charger plugged in mode; 2 charger plugged in mode + */ + void SetNoChargerPlugModeState(int state); + + /** + * @Description Get no charger plugged in mode. + * + * @return no charger plugged in mode. + */ + int GetNoChargerPlugModeState() const; /** * @Description Set enable/disable Whether to allow network switchover @@ -889,6 +931,19 @@ public: */ int GetMinRssi5Ghz(); + /** + * @Description Get the Alternate dns. + * + * @return string - dns + */ + std::string GetStrDnsBak() const; + /** + * @Description Obtaining Whether to Load the Configuration of the Standby STA. + * + * @return bool - Indicates whether to load the configuration of the standby STA. + */ + bool IsLoadStabak() const; + /** * @Description set the device name * @@ -897,6 +952,19 @@ public: */ int SetP2pDeviceName(const std::string &deviceName); + /** + * @Description get trustlist policies. + * + * @return const std::vector& - trustlist policies. + */ + const std::vector& ReloadTrustListPolicies(); + + /** + * @Description get moving freeze state trustlist. + * + * @return const MovingFreezePolicy& - moving freeze policy. + */ + const MovingFreezePolicy& ReloadMovingFreezePolicy(); private: WifiSettings(); void InitWifiConfig(); @@ -936,8 +1004,11 @@ private: time_t mLastSelectedTimeVal; /* last selected time */ int mScreenState; /* 1 on 2 off */ int mAirplaneModeState; /* 1 on 2 off */ - int mAppRunningModeState; /* 1 front 2 backend */ + ScanMode mAppRunningModeState; /* 0 app for 1 app back 2 sys for 3 sys back */ int mPowerSavingModeState; /* 1 on 2 off */ + std::string mAppPackageName; + int mFreezeModeState; /* 1 on 2 off */ + int mNoChargerPlugModeState; /* 1 on 2 off */ WifiConfig mWifiConfig; std::mutex mStaMutex; @@ -954,6 +1025,9 @@ private: WifiConfigFileImpl mSavedWifiConfig; WifiConfigFileImpl mSavedWifiP2pGroupInfo; WifiConfigFileImpl mSavedWifiP2pVendorConfig; + WifiConfigFileImpl mTrustListPolicies; + WifiConfigFileImpl mMovingFreezePolicy; + MovingFreezePolicy mFPolicy; }; } // namespace Wifi } // namespace OHOS diff --git a/services/wifi_standard/wifi_framework/common/include/wifi_internal_msg.h b/services/wifi_standard/wifi_framework/common/include/wifi_internal_msg.h index bcb2f54..b177614 100755 --- a/services/wifi_standard/wifi_framework/common/include/wifi_internal_msg.h +++ b/services/wifi_standard/wifi_framework/common/include/wifi_internal_msg.h @@ -24,8 +24,6 @@ namespace Wifi { constexpr int REOPEN_STA_INTERVAL = 500; /* when reopen sta, need over last close sta time then interval */ constexpr int DEVICE_CONFIG_INDEX_SSID = 0; constexpr int DEVICE_CONFIG_INDEX_BSSID = 1; -constexpr int STATE_OPEN = 1; -constexpr int STATE_CLOSE = 2; constexpr int PRIORITY_1 = 1; constexpr int PRIORITY_2 = 2; constexpr int PRIORITY_3 = 3; @@ -183,7 +181,7 @@ struct InterScanInfo { struct SingleAppForbid { int appID; ScanIntervalMode scanIntervalMode; - int lessThanIntervalNum; + int lessThanIntervalCount; time_t continueScanTime; time_t blockListScanTime; int expScanCount; @@ -192,7 +190,7 @@ struct SingleAppForbid { SingleAppForbid() { appID = 0; - lessThanIntervalNum = 0; + lessThanIntervalCount = 0; continueScanTime = 0; blockListScanTime = 0; expScanCount = 0; @@ -266,7 +264,8 @@ struct WifiConfig { int secondRssiLevel5G; int thirdRssiLevel5G; int fourthRssiLevel5G; - + std::string strDnsBak; + bool isLoadStabak; WifiConfig() { scanAlwaysSwitch = false; @@ -300,8 +299,20 @@ struct WifiConfig { secondRssiLevel5G = RSSI_LEVEL_2_5G; thirdRssiLevel5G = RSSI_LEVEL_3_5G; fourthRssiLevel5G = RSSI_LEVEL_4_5G; + strDnsBak = "8.8.8.8"; + isLoadStabak = true; } }; + +struct TrustListPolicy { + int sceneId = 0; /* scene id */ + std::string sceneName; /* scene name, just to read. */ + std::string trustList; /* trust list, eg: for A,B,and C,the format is A|B|C */ +}; + +struct MovingFreezePolicy { + std::string trustList; /* trust list */ +}; } // namespace Wifi } // namespace OHOS #endif diff --git a/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp b/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp index c527ee2..eea3838 100644 --- a/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp +++ b/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp @@ -110,7 +110,7 @@ bool MacAddress::IsValid() const void MacAddress::Dump() const { - LOGI("MAC: [%s]", mac_.c_str()); + LOGI("MAC: [%{private}s]", mac_.c_str()); } const std::string &MacAddress::GetMacAddressWifiString() const diff --git a/services/wifi_standard/wifi_framework/common/net_helper/network_interface.cpp b/services/wifi_standard/wifi_framework/common/net_helper/network_interface.cpp index 9300a01..48f41b3 100755 --- a/services/wifi_standard/wifi_framework/common/net_helper/network_interface.cpp +++ b/services/wifi_standard/wifi_framework/common/net_helper/network_interface.cpp @@ -58,22 +58,22 @@ bool NetworkInterface::IsValidInterfaceName(const std::string &interfaceName) void NetworkInterface::Dump(const std::string &interfaceName) { - WIFI_LOGI("InterfaceName [%s]", interfaceName.c_str()); + WIFI_LOGI("InterfaceName [%{private}s]", interfaceName.c_str()); std::vector vecIPv4; std::vector vecIPv6; bool ret = FetchInterfaceConfig(interfaceName, vecIPv4, vecIPv6); if (!ret) { - WIFI_LOGI("Fetch Interface [%s] failed.", interfaceName.c_str()); + WIFI_LOGI("Fetch Interface [%{private}s] failed.", interfaceName.c_str()); } - WIFI_LOGI("\tIPv4 size [%zu]", vecIPv4.size()); + WIFI_LOGI("\tIPv4 size [%{private}zu]", vecIPv4.size()); for (const auto &item : vecIPv4) { item.Dump(); } - WIFI_LOGI("\tIPv6 size [%zu]", vecIPv6.size()); + WIFI_LOGI("\tIPv6 size [%{private}zu]", vecIPv6.size()); for (const auto &item : vecIPv6) { item.Dump(); } @@ -146,14 +146,14 @@ bool NetworkInterface::AddIpAddress(const std::string &interfaceName, const Base /* Avoid repeated add. */ if (IsExistAddressForInterface(interfaceName, ipAddress)) { - WIFI_LOGI("In interface [%{public}s], the address [%s] is exist.", + WIFI_LOGI("In interface [%{public}s], the address [%{private}s] is exist.", interfaceName.c_str(), ipAddress.GetAddressWithString().c_str()); return true; } if (!IpAddressChange(interfaceName, ipAddress, true)) { - WIFI_LOGE("Interface [%{public}s] add address [%s] failed.", + WIFI_LOGE("Interface [%{public}s] add address [%{private}s] failed.", interfaceName.c_str(), ipAddress.GetAddressWithString().c_str()); return false; @@ -164,18 +164,18 @@ bool NetworkInterface::AddIpAddress(const std::string &interfaceName, const Base bool NetworkInterface::DelIpAddress(const std::string &interfaceName, const BaseAddress &ipAddress) { if (!ipAddress.IsValid()) { - WIFI_LOGE("Del IP address [%s] is not valid.", ipAddress.GetAddressWithString().c_str()); + WIFI_LOGE("Del IP address [%{private}s] is not valid.", ipAddress.GetAddressWithString().c_str()); return false; } if (!IsExistAddressForInterface(interfaceName, ipAddress)) { - WIFI_LOGI("In interface [%{public}s], the address [%s] is not exist.", + WIFI_LOGI("In interface [%{public}s], the address [%{private}s] is not exist.", interfaceName.c_str(), ipAddress.GetAddressWithString().c_str()); return true; } if (!IpAddressChange(interfaceName, ipAddress, false)) { - WIFI_LOGE("Interface [%{public}s] del address [%s] failed.", + WIFI_LOGE("Interface [%{public}s] del address [%{private}s] failed.", interfaceName.c_str(), ipAddress.GetAddressWithString().c_str()); return false; @@ -283,7 +283,7 @@ bool NetworkInterface::IpAddressChange( const std::string &interface, const BaseAddress &ipAddress, bool action, bool dad) { if (!ipAddress.IsValid() || ipAddress.GetFamilyType() == BaseAddress::FamilyType::FAMILY_INET6) { - WIFI_LOGE("bad input parameter [%{public}s][%s]/[%zu]to change ip.", interface.c_str(), + WIFI_LOGE("bad input parameter [%{public}s][%{private}s]/[%{private}zu]to change ip.", interface.c_str(), ipAddress.GetAddressWithString().c_str(), ipAddress.GetAddressPrefixLength()); return false; } @@ -317,7 +317,7 @@ bool NetworkInterface::IpAddressChange( } if (ioctl(fd, SIOCSIFADDR, &ifr) < 0) { close(fd); - WIFI_LOGE("ioctl set ip address failed, error is: %d.", errno); + WIFI_LOGE("ioctl set ip address failed, error is: %{public}d.", errno); return false; } if (inet_aton(Mask.c_str(), &(sin->sin_addr)) < 0) { @@ -326,7 +326,7 @@ bool NetworkInterface::IpAddressChange( } if (ioctl(fd, SIOCSIFNETMASK, &ifr) < 0) { close(fd); - WIFI_LOGE("ioctl set mask address failed, error is: %d.", errno); + WIFI_LOGE("ioctl set mask address failed, error is: %{public}d.", errno); return false; } close(fd); @@ -337,12 +337,12 @@ bool NetworkInterface::WriteDataToFile(const std::string &fileName, const std::s { int fd = open(fileName.c_str(), O_WRONLY | O_CLOEXEC); if (fd < 0) { - WIFI_LOGE("open %{public}s fail, error: %d", fileName.c_str(), errno); + WIFI_LOGE("open %{public}s fail, error: %{public}d", fileName.c_str(), errno); return false; } if (static_cast(write(fd, content.c_str(), content.length())) != content.length()) { - WIFI_LOGE("write content [%s] to file [%{public}s] failed. error: %{public}d.", + WIFI_LOGE("write content [%{public}s] to file [%{public}s] failed. error: %{public}d.", content.c_str(), fileName.c_str(), errno); close(fd); return false; diff --git a/services/wifi_standard/wifi_framework/common/utils/wifi_common_event_helper.cpp b/services/wifi_standard/wifi_framework/common/utils/wifi_common_event_helper.cpp index 6559618..525b90f 100755 --- a/services/wifi_standard/wifi_framework/common/utils/wifi_common_event_helper.cpp +++ b/services/wifi_standard/wifi_framework/common/utils/wifi_common_event_helper.cpp @@ -37,7 +37,7 @@ bool WifiCommonEventHelper::PublishEvent(const std::string &eventAction, const i CommonEventPublishInfo publishInfo; publishInfo.SetSubscriberPermissions(permissions); if (!CommonEventManager::PublishCommonEvent(commonData, publishInfo)) { - WIFI_LOGE("failed to publish event[%s], code:%d", eventAction.c_str(), code); + WIFI_LOGE("failed to publish event[%{public}s], code:%{public}d", eventAction.c_str(), code); return false; } return true; diff --git a/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp b/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp index 55085f2..264ff8e 100755 --- a/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp +++ b/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp @@ -136,12 +136,9 @@ std::string GetRandomStr(int len) bool IsAllowScanAnyTime(const ScanControlInfo &info) { - auto forbidIter = info.scanForbidMap.find(SCAN_SCENE_ALL); - for (; forbidIter != info.scanForbidMap.end(); forbidIter++) { - for (auto iter = forbidIter->second.begin(); iter != forbidIter->second.end(); iter++) { - if (iter->scanMode == ScanMode::ANYTIME_SCAN) { - return false; - } + for (auto forbidIter = info.scanForbidList.begin(); forbidIter != info.scanForbidList.end(); forbidIter++) { + if (forbidIter->scanMode == ScanMode::ANYTIME_SCAN && forbidIter->scanScene == SCAN_SCENE_ALL) { + return false; } } return true; diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use.cpp index 9f846f7..77b9280 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use.cpp @@ -69,8 +69,8 @@ void ApConfigUse::TransformFrequencyIntoChannel(const std::vector &freqVect void ApConfigUse::LogConfig(HotspotConfig &apConfig) const { - WIFI_LOGI("HotspotConfig::SSID = %s", apConfig.GetSsid().c_str()); - WIFI_LOGI("HotspotConfig::preSharedKey = %s", apConfig.GetPreSharedKey().c_str()); + WIFI_LOGI("HotspotConfig::SSID = %{private}s", apConfig.GetSsid().c_str()); + WIFI_LOGI("HotspotConfig::preSharedKey = %{private}s", apConfig.GetPreSharedKey().c_str()); WIFI_LOGI("HotspotConfig::securityType = %{public}d", static_cast(apConfig.GetSecurityType())); WIFI_LOGI("HotspotConfig::band = %{public}d", static_cast(apConfig.GetBand())); WIFI_LOGI("HotspotConfig::channel = %{public}d", apConfig.GetChannel()); diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.cpp index 42876b6..14c38c3 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.cpp @@ -303,7 +303,8 @@ void ApStartedState::ProcessCmdAddBlockList(InternalMessage &msg) const staInfo.deviceName = msg.GetStringFromMessage(); staInfo.bssid = msg.GetStringFromMessage(); staInfo.ipAddr = msg.GetStringFromMessage(); - WIFI_LOGI("staInfo:%s, %s, %s.", staInfo.deviceName.c_str(), staInfo.bssid.c_str(), staInfo.ipAddr.c_str()); + WIFI_LOGI("staInfo:%{private}s, %{private}s, %{private}s.", staInfo.deviceName.c_str(), staInfo.bssid.c_str(), + staInfo.ipAddr.c_str()); m_ApStateMachine.m_ApStationsManager.AddBlockList(staInfo); } @@ -314,7 +315,8 @@ void ApStartedState::ProcessCmdDelBlockList(InternalMessage &msg) const staInfo.deviceName = msg.GetStringFromMessage(); staInfo.bssid = msg.GetStringFromMessage(); staInfo.ipAddr = msg.GetStringFromMessage(); - WIFI_LOGI("staInfo:%s, %s, %s.", staInfo.deviceName.c_str(), staInfo.bssid.c_str(), staInfo.ipAddr.c_str()); + WIFI_LOGI("staInfo:%{private}s, %{private}s, %{private}s.", staInfo.deviceName.c_str(), staInfo.bssid.c_str(), + staInfo.ipAddr.c_str()); m_ApStateMachine.m_ApStationsManager.DelBlockList(staInfo); } diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager.cpp index 99081e7..f8d376c 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager.cpp @@ -38,8 +38,8 @@ const int SYSTEM_NOT_EXECUTED = 127; bool WifiApNatManager::EnableInterfaceNat(bool enable, std::string inInterfaceName, std::string outInterfaceName) const { - WIFI_LOGI("EnableInterfaceNat enable [%{public}s], inInterfaceName [%s] outInterfaceName " - "[%s].", + WIFI_LOGI("EnableInterfaceNat enable [%{public}s], inInterfaceName [%privates] outInterfaceName " + "[%privates].", enable ? "true" : "false", inInterfaceName.c_str(), outInterfaceName.c_str()); @@ -148,7 +148,7 @@ bool WifiApNatManager::WriteDataToFile(const std::string &fileName, const std::s { std::ofstream outf(fileName, std::ios::out); if (!outf) { - WIFI_LOGE("write content [%s] to file [%s] failed. error: %{public}d.", + WIFI_LOGE("write content [%publics] to file [%publics] failed. error: %{public}d.", content.c_str(), fileName.c_str(), errno); return false; } @@ -165,11 +165,11 @@ bool WifiApNatManager::ExecCommand(const std::vector &vecCommandArg command += " "; } - WIFI_LOGE("exec cmd: [%s]", command.c_str()); + WIFI_LOGE("exec cmd: [%{private}s]", command.c_str()); int ret = system(command.c_str()); if (ret == -1 || ret == SYSTEM_NOT_EXECUTED) { - WIFI_LOGE("exec failed. cmd: %s, error:%{public}d.", command.c_str(), errno); + WIFI_LOGE("exec failed. cmd: %{private}s, error:%{public}d.", command.c_str(), errno); return false; } diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.cpp index dabbd67..2c01f7b 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.cpp @@ -145,6 +145,11 @@ int WifiConfigCenter::GetCountryCode(std::string &countryCode) return WifiSettings::GetInstance().GetCountryCode(countryCode); } +bool WifiConfigCenter::IsLoadStabak() +{ + return WifiSettings::GetInstance().IsLoadStabak(); +} + WifiOprMidState WifiConfigCenter::GetApMidState() { return mApMidState.load(); @@ -310,7 +315,7 @@ void WifiConfigCenter::SetScreenState(const int &state) WifiSettings::GetInstance().SetScreenState(state); } -int WifiConfigCenter::GetScreenState() +int WifiConfigCenter::GetScreenState() const { return WifiSettings::GetInstance().GetScreenState(); } @@ -320,17 +325,17 @@ void WifiConfigCenter::SetAirplaneModeState(const int &state) WifiSettings::GetInstance().SetAirplaneModeState(state); } -int WifiConfigCenter::GetAirplaneModeState() +int WifiConfigCenter::GetAirplaneModeState() const { return WifiSettings::GetInstance().GetAirplaneModeState(); } -void WifiConfigCenter::SetAppRunningState(const int &state) +void WifiConfigCenter::SetAppRunningState(ScanMode appRunMode) { - WifiSettings::GetInstance().SetAppRunningState(state); + WifiSettings::GetInstance().SetAppRunningState(appRunMode); } -int WifiConfigCenter::GetAppRunningState() +ScanMode WifiConfigCenter::GetAppRunningState() const { return WifiSettings::GetInstance().GetAppRunningState(); } @@ -340,11 +345,41 @@ void WifiConfigCenter::SetPowerSavingModeState(const int &state) WifiSettings::GetInstance().SetPowerSavingModeState(state); } -int WifiConfigCenter::GetPowerSavingModeState() +int WifiConfigCenter::GetPowerSavingModeState() const { return WifiSettings::GetInstance().GetPowerSavingModeState(); } +void WifiConfigCenter::SetAppPackageName(const std::string &appPackageName) +{ + WifiSettings::GetInstance().SetAppPackageName(appPackageName); +} + +const std::string& WifiConfigCenter::GetAppPackageName() const +{ + return WifiSettings::GetInstance().GetAppPackageName(); +} + +void WifiConfigCenter::SetFreezeModeState(int state) +{ + WifiSettings::GetInstance().SetFreezeModeState(state); +} + +int WifiConfigCenter::GetFreezeModeState() const +{ + return WifiSettings::GetInstance().GetFreezeModeState(); +} + +void WifiConfigCenter::SetNoChargerPlugModeState(int state) +{ + WifiSettings::GetInstance().SetNoChargerPlugModeState(state); +} + +int WifiConfigCenter::GetNoChargerPlugModeState() const +{ + return WifiSettings::GetInstance().GetNoChargerPlugModeState(); +} + int WifiConfigCenter::SetP2pDeviceName(const std::string &deviceName) { return WifiSettings::GetInstance().SetP2pDeviceName(deviceName); diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.h index c2e2e68..cd9a02b 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.h @@ -194,6 +194,13 @@ public: */ int GetCountryCode(std::string &countryCode); + /** + * @Description Obtaining Whether to Load the Configuration of the Standby STA. + * + * @return bool - Indicates whether to load the configuration of the standby STA. + */ + bool IsLoadStabak(); + /** * @Description Get current hotspot middle state * @@ -433,7 +440,7 @@ public: * * @return int - 1 open; 2 close */ - int GetScreenState(); + int GetScreenState() const; /** * @Description Set current airplane mode state @@ -447,21 +454,21 @@ public: * * @return int - 1 open; 2 close */ - int GetAirplaneModeState(); + int GetAirplaneModeState() const; /** * @Description Set current app running mode * - * @param state - 1 front; 2 backend + * @param appRunMode - app run mode */ - void SetAppRunningState(const int &state); + void SetAppRunningState(ScanMode appRunMode); /** * @Description Get current app running mode * - * @return int - 1 front; 2 backend + * @param ScanMode */ - int GetAppRunningState(); + ScanMode GetAppRunningState() const; /** * @Description Set current power saving mode @@ -475,7 +482,49 @@ public: * * @return int - 1 saving mode; 2 not saving mode */ - int GetPowerSavingModeState(); + int GetPowerSavingModeState() const; + + /** + * @Description Set app package name. + * + * @param appPackageName - app package name + */ + void SetAppPackageName(const std::string &appPackageName); + + /** + * @Description Get app package name. + * + * @return const std::string& - app package name. + */ + const std::string& GetAppPackageName() const; + + /** + * @Description Set freeze mode state. + * + * @param state - 1 freeze mode; 2 moving mode + */ + void SetFreezeModeState(int state); + + /** + * @Description Get freeze mode state. + * + * @return freeze mode. + */ + int GetFreezeModeState() const; + + /** + * @Description Set no charger plugged in mode. + * + * @param state - 1 no charger plugged in mode; 2 charger plugged in mode + */ + void SetNoChargerPlugModeState(int state); + + /** + * @Description Get no charger plugged in mode. + * + * @return no charger plugged in mode. + */ + int GetNoChargerPlugModeState() const; /** * @Description set the device name diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp index fe05033..f6f39c2 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp @@ -506,7 +506,7 @@ void WifiDeviceStub::OnGetCountryCode(uint32_t code, MessageParcel &data, Messag void WifiDeviceStub::OnRegisterCallBack(uint32_t code, MessageParcel &data, MessageParcel &reply) { - WIFI_LOGD("run %{public}s code %{public}u, datasize %zu", __func__, code, data.GetRawDataSize()); + WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); ErrCode ret = WIFI_OPT_FAILED; do { sptr remote = data.ReadRemoteObject(); diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.cpp index f145399..44a4491 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.cpp @@ -72,7 +72,7 @@ int WifiHotspotStub::OnRemoteRequest(uint32_t code, MessageParcel &data, Message void WifiHotspotStub::OnIsHotspotActive(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) { - WIFI_LOGD("run %{public}s code %{public}u, datasize %zu", __func__, code, data.GetRawDataSize()); + WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); bool bActive = false; ErrCode ret = IsHotspotActive(bActive); reply.WriteInt32(0); @@ -85,7 +85,7 @@ void WifiHotspotStub::OnIsHotspotActive(uint32_t code, MessageParcel &data, Mess void WifiHotspotStub::OnGetApStateWifi(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) { - WIFI_LOGD("run %{public}s code %{public}u, datasize %zu", __func__, code, data.GetRawDataSize()); + WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); int state = 0; ErrCode ret = GetHotspotState(state); reply.WriteInt32(0); @@ -99,7 +99,7 @@ void WifiHotspotStub::OnGetApStateWifi(uint32_t code, MessageParcel &data, Messa void WifiHotspotStub::OnGetHotspotConfig( uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) { - WIFI_LOGD("run %{public}s code %{public}u, datasize %zu", __func__, code, data.GetRawDataSize()); + WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); HotspotConfig hotspotConfig; ErrCode ret = GetHotspotConfig(hotspotConfig); @@ -119,7 +119,7 @@ void WifiHotspotStub::OnGetHotspotConfig( void WifiHotspotStub::OnSetApConfigWifi(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) { - WIFI_LOGD("run %{public}s code %{public}u, datasize %zu", __func__, code, data.GetRawDataSize()); + WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); HotspotConfig config; config.SetSsid(data.ReadCString()); config.SetSecurityType(static_cast(data.ReadInt32())); @@ -136,7 +136,7 @@ void WifiHotspotStub::OnSetApConfigWifi(uint32_t code, MessageParcel &data, Mess void WifiHotspotStub::OnGetStationList(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) { - WIFI_LOGD("run %{public}s code %{public}u, datasize %zu", __func__, code, data.GetRawDataSize()); + WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); std::vector result; ErrCode ret = GetStationList(result); @@ -157,7 +157,7 @@ void WifiHotspotStub::OnGetStationList(uint32_t code, MessageParcel &data, Messa void WifiHotspotStub::OnDisassociateSta(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) { - WIFI_LOGD("run %{public}s code %{public}u, datasize %zu", __func__, code, data.GetRawDataSize()); + WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); StationInfo info; info.deviceName = data.ReadCString(); info.bssid = data.ReadCString(); @@ -170,7 +170,7 @@ void WifiHotspotStub::OnDisassociateSta(uint32_t code, MessageParcel &data, Mess void WifiHotspotStub::OnGetValidBands(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) { - WIFI_LOGD("run %{public}s code %{public}u, datasize %zu", __func__, code, data.GetRawDataSize()); + WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); std::vector bands; ErrCode ret = GetValidBands(bands); @@ -189,7 +189,7 @@ void WifiHotspotStub::OnGetValidBands(uint32_t code, MessageParcel &data, Messag void WifiHotspotStub::OnGetValidChannels( uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) { - WIFI_LOGD("run %{public}s code %{public}u, datasize %zu", __func__, code, data.GetRawDataSize()); + WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); std::vector channels; int32_t band = data.ReadInt32(); ErrCode ret = GetValidChannels(static_cast(band), channels); @@ -208,7 +208,7 @@ void WifiHotspotStub::OnGetValidChannels( void WifiHotspotStub::OnEnableWifiAp(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) { - WIFI_LOGD("run %{public}s code %{public}u, datasize %zu", __func__, code, data.GetRawDataSize()); + WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); ErrCode ret = EnableHotspot(); reply.WriteInt32(0); reply.WriteInt32(ret); @@ -218,7 +218,7 @@ void WifiHotspotStub::OnEnableWifiAp(uint32_t code, MessageParcel &data, Message void WifiHotspotStub::OnDisableWifiAp(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) { - WIFI_LOGD("run %{public}s code %{public}u, datasize %zu", __func__, code, data.GetRawDataSize()); + WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); ErrCode ret = DisableHotspot(); reply.WriteInt32(0); reply.WriteInt32(ret); @@ -228,7 +228,7 @@ void WifiHotspotStub::OnDisableWifiAp(uint32_t code, MessageParcel &data, Messag void WifiHotspotStub::OnAddBlockList(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) { - WIFI_LOGD("run %{public}s code %{public}u, datasize %zu", __func__, code, data.GetRawDataSize()); + WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); StationInfo info; info.deviceName = data.ReadCString(); info.bssid = data.ReadCString(); @@ -242,7 +242,7 @@ void WifiHotspotStub::OnAddBlockList(uint32_t code, MessageParcel &data, Message void WifiHotspotStub::OnDelBlockList(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) { - WIFI_LOGD("run %{public}s code %{public}u, datasize %zu", __func__, code, data.GetRawDataSize()); + WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); StationInfo info; info.deviceName = data.ReadCString(); info.bssid = data.ReadCString(); @@ -256,7 +256,7 @@ void WifiHotspotStub::OnDelBlockList(uint32_t code, MessageParcel &data, Message void WifiHotspotStub::OnGetBlockLists(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) { - WIFI_LOGD("run %{public}s code %{public}u, datasize %zu", __func__, code, data.GetRawDataSize()); + WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); std::vector infos; ErrCode ret = GetBlockLists(infos); reply.WriteInt32(0); @@ -277,7 +277,7 @@ void WifiHotspotStub::OnGetBlockLists(uint32_t code, MessageParcel &data, Messag void WifiHotspotStub::OnRegisterCallBack( uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) { - WIFI_LOGD("run %{public}s code %{public}u, datasize %zu", __func__, code, data.GetRawDataSize()); + WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); ErrCode ret = WIFI_OPT_FAILED; do { sptr remote = data.ReadRemoteObject(); diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp index 0b94b45..ea429de 100755 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp @@ -63,12 +63,12 @@ void WifiManager::AutoStartStaService(void) ErrCode errCode = WIFI_OPT_FAILED; do { if (WifiServiceManager::GetInstance().CheckAndEnforceService(WIFI_SERVICE_STA) < 0) { - WIFI_LOGE("Load %s service failed!", WIFI_SERVICE_STA); + WIFI_LOGE("Load %{public}s service failed!", WIFI_SERVICE_STA); break; } IStaService *pService = WifiServiceManager::GetInstance().GetStaServiceInst(); if (pService == nullptr) { - WIFI_LOGE("Create %s service failed!", WIFI_SERVICE_STA); + WIFI_LOGE("Create %{public}s service failed!", WIFI_SERVICE_STA); break; } errCode = pService->RegisterStaServiceCallback(WifiManager::GetInstance().GetStaCallback()); @@ -78,7 +78,7 @@ void WifiManager::AutoStartStaService(void) } errCode = pService->EnableWifi(); if (errCode != WIFI_OPT_SUCCESS) { - WIFI_LOGE("service enable sta failed, ret %d!", static_cast(errCode)); + WIFI_LOGE("service enable sta failed, ret %{public}d!", static_cast(errCode)); break; } } while (0); diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.cpp index 1f35679..a04399a 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.cpp @@ -242,14 +242,15 @@ bool GroupFormedState::ProcessConnectEvt(const InternalMessage &msg) const bool GroupFormedState::ProcessCmdCancelConnect(const InternalMessage &msg) const { - WIFI_LOGI("Process cmd cancel connect recv CMD: %d", msg.GetMessageName()); + WIFI_LOGI("recv CMD: %{public}d", msg.GetMessageName()); p2pStateMachine.BroadcastActionResult(P2pActionCallback::P2pDisConnect, ErrCode::WIFI_OPT_FAILED); return EXECUTED; } bool GroupFormedState::ProcessCmdDiscServices(const InternalMessage &msg) const { - WIFI_LOGI("Process cmd disc services recv CMD: %d", msg.GetMessageName()); + WIFI_LOGI("recv CMD: %{public}d", msg.GetMessageName()); + WIFI_LOGD("p2p_enabled_state recv CMD_DISCOVER_SERVICES"); p2pStateMachine.CancelSupplicantSrvDiscReq(); std::string reqId; @@ -270,7 +271,7 @@ bool GroupFormedState::ProcessCmdDiscServices(const InternalMessage &msg) const retCode = WifiP2PHalInterface::GetInstance().P2pFind(DISC_TIMEOUT_S); if (retCode != WifiErrorNo::WIFI_IDL_OPT_OK) { - WIFI_LOGE("call P2pFind failed, ErrorCode: %d", static_cast(retCode)); + WIFI_LOGE("call P2pFind failed, ErrorCode: %{public}d", static_cast(retCode)); p2pStateMachine.BroadcastActionResult(P2pActionCallback::DiscoverServices, ErrCode::WIFI_OPT_FAILED); return EXECUTED; } @@ -290,7 +291,8 @@ bool GroupFormedState::ProcessCmdStartListen(const InternalMessage &msg) const constexpr int defaultOpClass = 81; constexpr int defaultChannel = 6; if (WifiP2PHalInterface::GetInstance().SetListenChannel(defaultChannel, defaultOpClass)) { - WIFI_LOGI("p2p set listen channel failed. channel:%d, opclass:%d", defaultChannel, defaultOpClass); + WIFI_LOGI("p2p set listen channel failed. channel:%{public}d, opclass:%{public}d", defaultChannel, + defaultOpClass); p2pStateMachine.BroadcastActionResult(P2pActionCallback::StartP2pListen, WIFI_OPT_FAILED); return EXECUTED; } diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabled_state.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabled_state.cpp index 94f500b..b01290f 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabled_state.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabled_state.cpp @@ -509,14 +509,14 @@ bool P2pEnabledState::ProcessServiceDiscRspEvt(InternalMessage &msg) const } bool P2pEnabledState::ProcessExceptionTimeOut(InternalMessage &msg) const { - WIFI_LOGI("recv exception timeout event: %d", msg.GetMessageName()); + WIFI_LOGI("recv exception timeout event: %{public}d", msg.GetMessageName()); p2pStateMachine.SwitchState(&p2pStateMachine.p2pIdleState); return EXECUTED; } bool P2pEnabledState::ProcessCmdSetDeviceName(InternalMessage &msg) const { - LOGD("p2p_enabled_state CMD: set device name."); + WIFI_LOGD("p2p_enabled_state CMD: set device name."); std::string deviceName; if (!msg.GetMessageObj(deviceName)) { LOGE("Failed to obtain string information."); @@ -525,11 +525,11 @@ bool P2pEnabledState::ProcessCmdSetDeviceName(InternalMessage &msg) const WifiErrorNo retCode = WifiP2PHalInterface::GetInstance().SetP2pDeviceName(deviceName); if (retCode == WifiErrorNo::WIFI_IDL_OPT_FAILED) { - LOGE("Failed to set the device name."); + WIFI_LOGE("Failed to set the device name."); p2pStateMachine.BroadcastActionResult(P2pActionCallback::P2pSetDeviceName, WIFI_OPT_FAILED); return EXECUTED; } else { - LOGE("Successfully set the device name."); + WIFI_LOGE("Successfully set the device name."); deviceManager.GetThisDevice().SetDeviceName(deviceName); p2pStateMachine.BroadcastThisDeviceChanaged(deviceManager.GetThisDevice()); p2pStateMachine.BroadcastActionResult(P2pActionCallback::P2pSetDeviceName, WIFI_OPT_SUCCESS); @@ -538,16 +538,16 @@ bool P2pEnabledState::ProcessCmdSetDeviceName(InternalMessage &msg) const const std::string ssidPostfixName = std::string("-") + deviceName; retCode = WifiP2PHalInterface::GetInstance().SetP2pSsidPostfix(ssidPostfixName); if (retCode == WifiErrorNo::WIFI_IDL_OPT_FAILED) { - LOGE("Failed to set the SSID prefix"); + WIFI_LOGE("Failed to set the SSID prefix"); } return EXECUTED; } bool P2pEnabledState::ProcessCmdSetWfdInfo(InternalMessage &msg) const { - LOGI("recv CMD: %d", msg.GetMessageName()); + WIFI_LOGI("recv CMD: %{public}d", msg.GetMessageName()); WifiP2pWfdInfo wfdInfo; if (!msg.GetMessageObj(wfdInfo)) { - LOGE("Failed to obtain wfd information."); + WIFI_LOGE("Failed to obtain wfd information."); return EXECUTED; } @@ -555,11 +555,11 @@ bool P2pEnabledState::ProcessCmdSetWfdInfo(InternalMessage &msg) const wfdInfo.GetDeviceInfoElement(subelement); subelement = "0 " + subelement; if (WifiP2PHalInterface::GetInstance().SetWfdDeviceConfig(subelement) != WifiErrorNo::WIFI_IDL_OPT_OK) { - LOGE("Failed to set wfd config:%s.", subelement.c_str()); + WIFI_LOGE("Failed to set wfd config:%{public}s.", subelement.c_str()); return EXECUTED; } if (WifiP2PHalInterface::GetInstance().SetWfdEnable(wfdInfo.GetWfdEnabled()) != WifiErrorNo::WIFI_IDL_OPT_OK) { - LOGE("Set wifidisplay enabled failed."); + WIFI_LOGE("Set wifidisplay enabled failed."); return EXECUTED; } return EXECUTED; @@ -567,7 +567,7 @@ bool P2pEnabledState::ProcessCmdSetWfdInfo(InternalMessage &msg) const bool P2pEnabledState::ProcessCmdCancelConnect(InternalMessage &msg) const { - WIFI_LOGI("recv CMD: %d", msg.GetMessageName()); + WIFI_LOGI("recv CMD: %{public}d", msg.GetMessageName()); p2pStateMachine.BroadcastActionResult(P2pActionCallback::P2pDisConnect, ErrCode::WIFI_OPT_FAILED); return EXECUTED; } diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.cpp index 3458e1d..7feea73 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.cpp @@ -83,7 +83,7 @@ bool P2pGroupOperatingState::ProcessCmdCreateGroup(const InternalMessage &msg) c /** * Create a new persistence group. */ - WIFI_LOGE("Create a new %s group.", (netId == PERSISTENT_NET_ID) ? "persistence" : "temporary"); + WIFI_LOGE("Create a new %{public}s group.", (netId == PERSISTENT_NET_ID) ? "persistence" : "temporary"); if (config.GetPassphrase().empty() && config.GetGroupName().empty()) { ret = WifiP2PHalInterface::GetInstance().GroupAdd((netId == PERSISTENT_NET_ID) ? true : false, netId, freq); } else if (!config.GetPassphrase().empty() && !config.GetGroupName().empty() && diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp index 3d64218..fa30520 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp @@ -707,7 +707,7 @@ void P2pStateMachine::DhcpResultNotify::OnFailed(int status, const std::string & void P2pStateMachine::DhcpResultNotify::OnSerExitNotify(const std::string& ifname) { - WIFI_LOGD("Dhcp exit notify.ifname:%s.", ifname.c_str()); + WIFI_LOGD("Dhcp exit notify.ifname:%{public}s.", ifname.c_str()); pP2pStateMachine->SendMessage(static_cast(P2P_STATE_MACHINE_CMD::CMD_P2P_DISABLE)); } @@ -860,7 +860,7 @@ bool P2pStateMachine::DealCreateNewGroupWithConfig(const WifiP2pConfigInternal & } if (ret == WIFI_IDL_OPT_FAILED || netId == TEMPORARY_NET_ID) { - WIFI_LOGD("Remove network %d!", createdNetId); + WIFI_LOGD("Remove network %{public}d!", createdNetId); WifiP2PHalInterface::GetInstance().RemoveNetwork(createdNetId); } @@ -897,7 +897,7 @@ void P2pStateMachine::UpdateGroupInfoToWpa() const WifiP2PHalInterface::GetInstance().P2pSetGroupConfig(createdNetId, wpaConfig); grpInfo.at(i) = grpBuf; } else { - WIFI_LOGW("AddNetwork failed when add %s group!", grpBuf.GetGroupName().c_str()); + WIFI_LOGW("AddNetwork failed when add %{public}s group!", grpBuf.GetGroupName().c_str()); } } return; diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/provision_discovery_state.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/provision_discovery_state.cpp index 581abba..685b053 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/provision_discovery_state.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/provision_discovery_state.cpp @@ -67,21 +67,21 @@ void ProvisionDiscoveryState::Init() bool ProvisionDiscoveryState::ProcessCmdDiscoverPeer(InternalMessage &msg) const { - WIFI_LOGI("Discover peer recv CMD: %{public}d", msg.GetMessageName()); + WIFI_LOGI("recv CMD: %{public}d", msg.GetMessageName()); p2pStateMachine.BroadcastActionResult(P2pActionCallback::DiscoverDevices, ErrCode::WIFI_OPT_FAILED); return EXECUTED; } bool ProvisionDiscoveryState::ProcessCmdDiscServices(InternalMessage &msg) const { - LOGI("Disc service recv CMD: %d", msg.GetMessageName()); + WIFI_LOGI("recv CMD: %{public}d", msg.GetMessageName()); p2pStateMachine.BroadcastActionResult(P2pActionCallback::DiscoverServices, ErrCode::WIFI_OPT_FAILED); return EXECUTED; } bool ProvisionDiscoveryState::ProcessCmdStartListen(InternalMessage &msg) const { - LOGI("Start listen recv CMD: %d", msg.GetMessageName()); + WIFI_LOGI("recv CMD: %{public}d", msg.GetMessageName()); p2pStateMachine.BroadcastActionResult(P2pActionCallback::StartP2pListen, ErrCode::WIFI_OPT_FAILED); return EXECUTED; } @@ -170,7 +170,7 @@ bool ProvisionDiscoveryState::ProcessProvDiscFailEvt(InternalMessage &msg) const bool ProvisionDiscoveryState::ProcessCmdCancelConnect(InternalMessage &msg) const { - WIFI_LOGI("recv event: %d", msg.GetMessageName()); + WIFI_LOGI("recv event: %{public}d", msg.GetMessageName()); WifiP2PHalInterface::GetInstance().CancelConnect(); p2pStateMachine.DealGroupCreationFailed(); p2pStateMachine.SwitchState(&p2pStateMachine.p2pIdleState); diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service.cpp index 53b63ee..fc001c2 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service.cpp @@ -169,7 +169,7 @@ ErrCode WifiP2pService::SetP2pDeviceName(const std::string &devName) ErrCode WifiP2pService::SetP2pWfdInfo(const WifiP2pWfdInfo &wfdInfo) { - WIFI_LOGD("enable = %d device info = %d port = %d throughput = %d\n", + WIFI_LOGD("enable = %{public}d device info = %{public}d port = %{public}d throughput = %{public}d\n", wfdInfo.GetWfdEnabled(), wfdInfo.GetDeviceInfo(), wfdInfo.GetCtrlPort(), wfdInfo.GetMaxThroughput()); p2pStateMachine.SendMessage(static_cast(P2P_STATE_MACHINE_CMD::CMD_SET_WFD_INFO), wfdInfo); return ErrCode::WIFI_OPT_SUCCESS; diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_manager.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_manager.cpp index beb1a69..ffce8f5 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_manager.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_manager.cpp @@ -369,7 +369,7 @@ bool WifiP2pServiceManager::UpdateServiceName(const std::string &devAddr, const { auto iter = deviceService.find(devAddr); if (iter == deviceService.end()) { - WIFI_LOGE("Cannot find %s, update service name failed!", devAddr.c_str()); + WIFI_LOGE("Cannot find %{public}s, update service name failed!", devAddr.c_str()); return false; } diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp index c7c29b7..aeada0a 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp @@ -607,7 +607,7 @@ bool WifiP2pServiceImpl::IsP2pServiceRunning() ErrCode WifiP2pServiceImpl::SetP2pDeviceName(const std::string &deviceName) { - WIFI_LOGI("SetDeviceName:%s", deviceName.c_str()); + WIFI_LOGI("SetDeviceName:%{public}s", deviceName.c_str()); int length = deviceName.length(); if (length > DEVICE_NAME_LENGTH || length < 0) { return WIFI_OPT_INVALID_PARAM; diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn b/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn index caa661a..c0c4bf6 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn @@ -13,6 +13,9 @@ import("//build/ohos.gni") +#defines = [] +#defines += [ "OHOS_WIFI_SCAN_CONTROL_CLOSE" ] + ohos_shared_library("wifi_scan_service") { install_enable = true sources = [ diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/iscan_service.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/iscan_service.h index 4be9345..e4471b2 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/iscan_service.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/iscan_service.h @@ -50,6 +50,13 @@ public: * @return success: WIFI_OPT_SUCCESS, failed: WIFI_OPT_FAILED */ virtual ErrCode ScanWithParam(const WifiScanParams &wifiScanParams) = 0; + /** + * @Description Disable/Restore the scanning operation. + * + * * @param params - disable or not. + * @return success: WIFI_OPT_SUCCESS, failed: WIFI_OPT_FAILED + */ + virtual ErrCode DisableScan(bool disable) = 0; /** * @Description Processes interface service screen change request. * @@ -70,7 +77,13 @@ public: * @param appMode operate app mode[in] * @return success: WIFI_OPT_SUCCESS, failed: WIFI_OPT_FAILED */ - virtual ErrCode OnAppRunningModeChanged(int appMode) = 0; + virtual ErrCode OnAppRunningModeChanged(ScanMode appRunMode) = 0; + /** + * @Description Updates the MovingFreeze state when the associated state changes. + * + * @return success: WIFI_OPT_SUCCESS, failed: WIFI_OPT_FAILED + */ + virtual ErrCode OnMovingFreezeStateChange() = 0; /** * @Description Processes interface service custom scene change request. * @@ -79,6 +92,13 @@ public: * @return success: WIFI_OPT_SUCCESS, failed: WIFI_OPT_FAILED */ virtual ErrCode OnCustomControlStateChanged(int customScene, int customSceneStatus) = 0; + /** + * @Description Get custom scene state. + * + * @param sceneMap custom scene state map[out] + * @return success: WIFI_OPT_SUCCESS, failed: WIFI_OPT_FAILED + */ + virtual ErrCode OnGetCustomSceneState(std::map& sceneMap) const = 0; /** * @Description Processes interface service scan control info change request. * diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/iscan_service_callbacks.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/iscan_service_callbacks.h index 7b18eea..c1e495a 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/iscan_service_callbacks.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/iscan_service_callbacks.h @@ -26,6 +26,7 @@ struct IScanSerivceCallbacks { std::function OnScanStopEvent; std::function OnScanFinishEvent; std::function &)> OnScanInfoEvent; + std::function &)> OnStoreScanInfoEvent; }; } // namespace Wifi } // namespace OHOS diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_common.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_common.h index c7782e8..de38165 100755 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_common.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_common.h @@ -52,6 +52,7 @@ struct ScanConfig { int backScanPeriod; /* Scan interval for background scan */ bool fullScanFlag; /* Flag indicating whether the request is full scan */ bool externFlag; /* Flag indicating whether the request is an external scan */ + bool scanningWithParamFlag; /* Flag Indicating whether scanning with parameter */ std::string ssid; /* The network name */ std::string bssid; /* The address of the access point */ int scanStyle; /* Type of scan to perform */ @@ -62,6 +63,7 @@ struct ScanConfig { backScanPeriod = 0; fullScanFlag = false; externFlag = false; + scanningWithParamFlag = false; scanStyle = 0xFF; } }; @@ -101,12 +103,13 @@ struct StoreScanConfig { int64_t scanTime; /* Scan Start Time */ bool fullScanFlag; /* Flag of scan without specifying parameters */ bool externFlag; /* Flag indicating whether the request is an external scan. */ - + bool scanningWithParamFlag; /* Flag Indicating whether scanning with parameter */ StoreScanConfig() { scanTime = 0; fullScanFlag = false; externFlag = false; + scanningWithParamFlag = false; } }; diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface.cpp index da8b40f..8d1cd59 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface.cpp @@ -15,7 +15,7 @@ #include "scan_interface.h" #include "wifi_logger.h" -DEFINE_WIFILOG_SCAN_LABEL("ScanStateMachine"); +DEFINE_WIFILOG_SCAN_LABEL("ScanInterface"); namespace OHOS { namespace Wifi { @@ -83,19 +83,22 @@ ErrCode ScanInterface::ScanWithParam(const WifiScanParams &wifiScanParams) return pScanService->ScanWithParam(wifiScanParams); } +ErrCode ScanInterface::DisableScan(bool disable) +{ + WIFI_LOGI("Enter ScanInterface::DisableScan"); + + return pScanService->DisableScan(disable); +} + ErrCode ScanInterface::OnScreenStateChanged(int screenState) { WIFI_LOGI("Enter ScanInterface::OnScreenStateChanged\n"); - if (screenState != STATE_OPEN && screenState != STATE_CLOSE) { + if (screenState != MODE_STATE_OPEN && screenState != MODE_STATE_CLOSE) { WIFI_LOGE("screenState param is error"); return WIFI_OPT_INVALID_PARAM; } - bool screenOn = true; - if (screenState == STATE_CLOSE) { - screenOn = false; - } - pScanService->HandleScreenStatusChanged(screenOn); + pScanService->HandleScreenStatusChanged(); return WIFI_OPT_SUCCESS; } @@ -108,11 +111,21 @@ ErrCode ScanInterface::OnClientModeStatusChanged(int staStatus) return WIFI_OPT_SUCCESS; } -ErrCode ScanInterface::OnAppRunningModeChanged(int appMode) +ErrCode ScanInterface::OnAppRunningModeChanged(ScanMode appRunMode) { WIFI_LOGI("Enter ScanInterface::OnAppRunningModeChanged\n"); - pScanService->SetOperateAppMode(appMode); + WIFI_LOGD("appRunMode=%{public}d", static_cast(appRunMode)); + + return WIFI_OPT_SUCCESS; +} + +ErrCode ScanInterface::OnMovingFreezeStateChange() +{ + LOGI("Enter ScanInterface::OnMovingFreezeStateChange"); + + pScanService->HandleMovingFreezeChanged(); + return WIFI_OPT_SUCCESS; } @@ -120,7 +133,7 @@ ErrCode ScanInterface::OnCustomControlStateChanged(int customScene, int customSc { WIFI_LOGI("Enter ScanInterface::OnCustomControlStateChanged\n"); - if (customSceneStatus != STATE_OPEN && customSceneStatus != STATE_CLOSE) { + if (customSceneStatus != MODE_STATE_OPEN && customSceneStatus != MODE_STATE_CLOSE) { WIFI_LOGE("screenState param is error"); return WIFI_OPT_INVALID_PARAM; } @@ -128,6 +141,14 @@ ErrCode ScanInterface::OnCustomControlStateChanged(int customScene, int customSc return WIFI_OPT_SUCCESS; } +ErrCode ScanInterface::OnGetCustomSceneState(std::map& sceneMap) const +{ + WIFI_LOGI("Enter ScanInterface::OnGetCustomSceneState\n"); + + pScanService->HandleGetCustomSceneState(sceneMap); + return WIFI_OPT_SUCCESS; +} + ErrCode ScanInterface::OnControlStrategyChanged() { WIFI_LOGI("Enter ScanInterface::OnControlStrategyChanged\n"); diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface.h index 06da44c..5063ded 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface.h @@ -16,6 +16,8 @@ #ifndef OHOS_WIFI_SCAN_INTERFACE_H #define OHOS_WIFI_SCAN_INTERFACE_H +#include +#include "define.h" #include "iscan_service.h" #include "scan_service.h" @@ -53,6 +55,13 @@ public: * @return success: WIFI_OPT_SUCCESS, failed: WIFI_OPT_FAILED */ ErrCode ScanWithParam(const WifiScanParams &wifiScanParams); + /** + * @Description Disable/Restore the scanning operation. + * + * * @param params - disable or not. + * @return success: WIFI_OPT_SUCCESS, failed: WIFI_OPT_FAILED + */ + ErrCode DisableScan(bool disable); /** * @Description Processes interface service screen change request. * @@ -73,7 +82,13 @@ public: * @param appMode operate app mode[in] * @return success: WIFI_OPT_SUCCESS, failed: WIFI_OPT_FAILED */ - ErrCode OnAppRunningModeChanged(int appMode); + ErrCode OnAppRunningModeChanged(ScanMode appRunMode); + /** + * @Description Updates the MovingFreeze state when the associated state changes. + * + * @return success: WIFI_OPT_SUCCESS, failed: WIFI_OPT_FAILED + */ + ErrCode OnMovingFreezeStateChange(); /** * @Description Processes interface service custom scene change request. * @@ -82,6 +97,13 @@ public: * @return success: WIFI_OPT_SUCCESS, failed: WIFI_OPT_FAILED */ ErrCode OnCustomControlStateChanged(int customScene, int customSceneStatus); + /** + * @Description Get custom scene state. + * + * @param sceneMap custom scene state map[out] + * @return success: WIFI_OPT_SUCCESS, failed: WIFI_OPT_FAILED + */ + ErrCode OnGetCustomSceneState(std::map& customSceneStateMap) const; /** * @Description Processes interface service scan control info change request. * diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp index 3713488..87c73ad 100755 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp @@ -12,11 +12,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include + #include "scan_service.h" #include "wifi_logger.h" #include "wifi_settings.h" #include "wifi_sta_hal_interface.h" +#include "wifi_internal_msg.h" +#include "log_helper.h" +#include "wifi_global_func.h" DEFINE_WIFILOG_SCAN_LABEL("ScanService"); @@ -28,16 +31,20 @@ ScanService::ScanService() scanStartedFlag(false), scanConfigStoreIndex(0), pnoScanStartTime(0), - isScreenOn(true), staStatus(static_cast(OperateResState::DISCONNECT_DISCONNECTED)), isPnoScanBegined(false), autoNetworkSelection(false), lastSystemScanTime(0), pnoScanFailedNum(0), - operateAppMode(static_cast(ScanMode::SYS_FOREGROUND_SCAN)), - customScene(SCAN_SCENE_ALL), + disableScanFlag(false), staCurrentTime(0), - customCurrentTime(0) + customCurrentTime(0), + staSceneForbidCount(0), + customSceneForbidCount(0), + scanTrustMode(false), + isAbsFreezeState(false), + isAbsFreezeScaned(false), + scanResultBackup(-1) {} ScanService::~ScanService() @@ -58,7 +65,6 @@ bool ScanService::InitScanService(const IScanSerivceCallbacks &scanSerivceCallba WIFI_LOGI("Enter ScanService::InitScanService.\n"); mScanSerivceCallbacks = scanSerivceCallbacks; - pScanStateMachine = new (std::nothrow) ScanStateMachine(); if (pScanStateMachine == nullptr) { WIFI_LOGE("Alloc pScanStateMachine failed.\n"); @@ -92,25 +98,30 @@ bool ScanService::InitScanService(const IScanSerivceCallbacks &scanSerivceCallba WIFI_IDL_OPT_OK)) { WIFI_LOGE("GetSupportFrequencies failed.\n"); } - GetScanControlInfo(); - GetScreenState(); + pScanMonitor->SetScanStateMachine(pScanStateMachine); pScanStateMachine->SendMessage(static_cast(CMD_SCAN_PREPARE)); + GetScanControlInfo(); + return true; } void ScanService::UnInitScanService() { WIFI_LOGI("Enter ScanService::UnInitScanService.\n"); - pScanStateMachine->SendMessage(static_cast(CMD_SCAN_FINISH)); - scanStartedFlag = false; - pScanStateMachine->StopTimer(static_cast(SYSTEM_SCAN_TIMER)); pScanStateMachine->StopTimer(static_cast(DISCONNECTED_SCAN_TIMER)); pScanStateMachine->StopTimer(static_cast(RESTART_PNO_SCAN_TIMER)); + pScanStateMachine->SendMessage(static_cast(CMD_SCAN_FINISH)); + scanStartedFlag = false; return; } +void ScanService::RegisterScanCallbacks(const IScanSerivceCallbacks &iScanSerivceCallbacks) +{ + mScanSerivceCallbacks = iScanSerivceCallbacks; +} + void ScanService::HandleScanStatusReport(ScanStatusReport &scanStatusReport) { WIFI_LOGI("Enter ScanService::HandleScanStatusReport.\n"); @@ -118,7 +129,7 @@ void ScanService::HandleScanStatusReport(ScanStatusReport &scanStatusReport) switch (scanStatusReport.status) { case SCAN_STARTED_STATUS: { scanStartedFlag = true; - /* Pno scan maybe has started, stop it first */ + /* Pno scan maybe has started, stop it first. */ pScanStateMachine->SendMessage(CMD_STOP_PNO_SCAN); mScanSerivceCallbacks.OnScanStartEvent(); SystemScanProcess(true); @@ -142,7 +153,7 @@ void ScanService::HandleScanStatusReport(ScanStatusReport &scanStatusReport) break; } case PNO_SCAN_FAILED: { - /* Start the timer and restart the PNO scanning after a delay */ + /* Start the timer and restart the PNO scanning after a delay. */ pScanStateMachine->StartTimer(static_cast(RESTART_PNO_SCAN_TIMER), RESTART_PNO_SCAN_TIME); EndPnoScan(); break; @@ -192,17 +203,16 @@ ErrCode ScanService::Scan(bool externFlag) } if (externFlag) { - int appId = 0; - if (!AllowExternScan(appId)) { - WIFI_LOGE("AllowExternScan return false.\n"); - return WIFI_OPT_FAILED; + ErrCode rlt = ApplyScanPolices(ScanType::SCAN_TYPE_EXTERN); + if (rlt != WIFI_OPT_SUCCESS) { + return rlt; } } ScanConfig scanConfig; /* * Invoke the interface provided by the configuration center to obtain the - * hidden network list + * hidden network list. */ if (!GetHiddenNetworkSsidList(scanConfig.hiddenNetworkSsid)) { WIFI_LOGE("GetHiddenNetworkSsidList failed.\n"); @@ -229,10 +239,9 @@ ErrCode ScanService::ScanWithParam(const WifiScanParams ¶ms) return WIFI_OPT_FAILED; } - int appId = 0; - if (!AllowExternScan(appId)) { - WIFI_LOGE("AllowExternScan return false.\n"); - return WIFI_OPT_FAILED; + ErrCode rlt = ApplyScanPolices(ScanType::SCAN_TYPE_EXTERN); + if (rlt != WIFI_OPT_SUCCESS) { + return rlt; } if ((params.band < static_cast(SCAN_BAND_UNSPECIFIED)) || @@ -241,7 +250,7 @@ ErrCode ScanService::ScanWithParam(const WifiScanParams ¶ms) return WIFI_OPT_FAILED; } - /* When the frequency is specified, the band must be SCAN_BAND_UNSPECIFIED */ + /* When the frequency is specified, the band must be SCAN_BAND_UNSPECIFIED. */ if (params.freqs.empty() && (params.band == static_cast(SCAN_BAND_UNSPECIFIED))) { WIFI_LOGE("params is error.\n"); return WIFI_OPT_FAILED; @@ -257,7 +266,7 @@ ErrCode ScanService::ScanWithParam(const WifiScanParams ¶ms) } else { /* * Invoke the interface provided by the configuration center to obtain the - * hidden network list + * hidden network list. */ if (!GetHiddenNetworkSsidList(scanConfig.hiddenNetworkSsid)) { WIFI_LOGE("GetHiddenNetworkSsidList failed.\n"); @@ -269,6 +278,7 @@ ErrCode ScanService::ScanWithParam(const WifiScanParams ¶ms) scanConfig.ssid = params.ssid; scanConfig.bssid = params.bssid; scanConfig.externFlag = true; + scanConfig.scanningWithParamFlag = true; scanConfig.scanStyle = SCAN_TYPE_HIGH_ACCURACY; if (!SingleScan(scanConfig)) { @@ -279,6 +289,14 @@ ErrCode ScanService::ScanWithParam(const WifiScanParams ¶ms) return WIFI_OPT_SUCCESS; } +ErrCode ScanService::DisableScan(bool disable) +{ + LOGI("Enter ScanService::DisableScan"); + std::unique_lock lock(scanControlInfoMutex); + disableScanFlag = disable; + return WIFI_OPT_SUCCESS; +} + bool ScanService::SingleScan(ScanConfig &scanConfig) { WIFI_LOGI("Enter ScanService::SingleScan.\n"); @@ -299,24 +317,25 @@ bool ScanService::SingleScan(ScanConfig &scanConfig) interConfig.scanFreqs.assign(scanConfig.scanFreqs.begin(), scanConfig.scanFreqs.end()); /* * When band is SCAN_BAND_BOTH_WITH_DFS, need to scan all frequency, - * scanFreqs can be empty + * scanFreqs can be empty. */ } else if (scanConfig.scanBand != SCAN_BAND_BOTH_WITH_DFS) { - /* Converting frequency bands to frequencies */ + /* Converting frequency bands to frequencies. */ if (!GetBandFreqs(scanConfig.scanBand, interConfig.scanFreqs)) { WIFI_LOGE("GetBandFreqs failed.\n"); return false; } } - /* Save the configuration */ + /* Save the configuration. */ int requestIndex = StoreRequestScanConfig(scanConfig, interConfig); if (requestIndex == MAX_SCAN_CONFIG_STORE_INDEX) { WIFI_LOGE("StoreRequestScanConfig failed.\n"); return false; } - /* Construct a message */ + std::unique_lock lock(scanConfigMapMutex); + /* Construct a message. */ InternalMessage *interMessage = pScanStateMachine->CreateMessage(static_cast(CMD_START_COMMON_SCAN), requestIndex); if (interMessage == nullptr) { @@ -331,8 +350,8 @@ bool ScanService::SingleScan(ScanConfig &scanConfig) WIFI_LOGE("AddScanMessageBody failed.\n"); return false; } - pScanStateMachine->SendMessage(interMessage); + return true; } @@ -444,7 +463,9 @@ int ScanService::StoreRequestScanConfig(const ScanConfig &scanConfig, const Inte static_cast(times.tv_sec) * SECOND_TO_MICRO_SECOND + times.tv_nsec / SECOND_TO_MILLI_SECOND; storeScanConfig.fullScanFlag = scanConfig.fullScanFlag; storeScanConfig.externFlag = scanConfig.externFlag; + storeScanConfig.scanningWithParamFlag = scanConfig.scanningWithParamFlag; + std::unique_lock lock(scanConfigMapMutex); scanConfigMap.insert(std::pair(scanConfigStoreIndex, storeScanConfig)); return scanConfigStoreIndex; @@ -454,6 +475,12 @@ void ScanService::HandleCommonScanFailed(std::vector &requestIndexList) { WIFI_LOGI("Enter ScanService::HandleCommonScanFailed.\n"); + if (staStatus != static_cast(OperateResState::DISCONNECT_DISCONNECTED) && + staStatus != static_cast(OperateResState::CONNECT_AP_CONNECTED)) { + return; + } + + std::unique_lock lock(scanConfigMapMutex); for (std::vector::iterator reqIter = requestIndexList.begin(); reqIter != requestIndexList.end(); ++reqIter) { ScanConfigMap::iterator configIter = scanConfigMap.find(*reqIter); /* No configuration found. */ @@ -461,8 +488,10 @@ void ScanService::HandleCommonScanFailed(std::vector &requestIndexList) continue; } - /* Notification of the end of scanning */ + /* Notification of the end of scanning. */ mScanSerivceCallbacks.OnScanFinishEvent(static_cast(ScanHandleNotify::SCAN_FAIL)); + scanResultBackup = static_cast(ScanHandleNotify::SCAN_FAIL); + scanConfigMap.erase(*reqIter); } @@ -475,38 +504,44 @@ void ScanService::HandleCommonScanInfo( WIFI_LOGI("Enter ScanService::HandleCommonScanInfo.\n"); bool fullScanStored = false; - for (std::vector::iterator reqIter = requestIndexList.begin(); reqIter != requestIndexList.end(); ++reqIter) { - ScanConfigMap::iterator configIter = scanConfigMap.find(*reqIter); - /* No configuration found. */ - if (configIter == scanConfigMap.end()) { - continue; - } - - /* Full Scan Info */ - if (configIter->second.fullScanFlag) { - if (fullScanStored) { - scanConfigMap.erase(*reqIter); + { + std::unique_lock lock(scanConfigMapMutex); + for (std::vector::iterator reqIter = requestIndexList.begin(); reqIter != requestIndexList.end(); + ++reqIter) { + ScanConfigMap::iterator configIter = scanConfigMap.find(*reqIter); + /* No configuration found. */ + if (configIter == scanConfigMap.end()) { continue; } - if (StoreFullScanInfo(configIter->second, scanInfoList)) { - fullScanStored = true; - mScanSerivceCallbacks.OnScanFinishEvent(static_cast(ScanHandleNotify::SCAN_OK)); + /* Full Scan Info. */ + if (configIter->second.fullScanFlag) { + if (fullScanStored) { + scanConfigMap.erase(*reqIter); + continue; + } + + if (StoreFullScanInfo(configIter->second, scanInfoList)) { + fullScanStored = true; + mScanSerivceCallbacks.OnScanFinishEvent(static_cast(ScanHandleNotify::SCAN_OK)); + scanResultBackup = static_cast(ScanHandleNotify::SCAN_OK); + } else { + WIFI_LOGE("StoreFullScanInfo failed.\n"); + } + /* Specify Scan Info. */ } else { - WIFI_LOGE("StoreFullScanInfo failed.\n"); - } - /* Specify Scan Info */ - } else { - if (!StoreUserScanInfo(configIter->second, scanInfoList)) { - WIFI_LOGE("StoreUserScanInfo failed.\n"); + if (!StoreUserScanInfo(configIter->second, scanInfoList)) { + WIFI_LOGE("StoreUserScanInfo failed.\n"); + } + mScanSerivceCallbacks.OnScanFinishEvent(static_cast(ScanHandleNotify::SCAN_OK)); + scanResultBackup = static_cast(ScanHandleNotify::SCAN_OK); } - mScanSerivceCallbacks.OnScanFinishEvent(static_cast(ScanHandleNotify::SCAN_OK)); - } - scanConfigMap.erase(*reqIter); + scanConfigMap.erase(*reqIter); + } } - /* Send the scanning result to the module registered for listening */ + /* Send the scanning result to the module registered for listening. */ ScanInfoHandlerMap::iterator handleIter = scanInfoHandlerMap.begin(); for (; handleIter != scanInfoHandlerMap.end(); ++handleIter) { if (handleIter->second) { @@ -525,26 +560,30 @@ bool ScanService::StoreFullScanInfo( { WIFI_LOGI("Enter ScanService::StoreFullScanInfo.\n"); - /* Filtering result */ + /* Filtering result. */ WIFI_LOGI("scanConfig.scanTime is %" PRIu64 ".\n", scanConfig.scanTime); WIFI_LOGI("Receive %{public}d scan results.\n", (int)(scanInfoList.size())); - std::vector filterScanInfo; - std::vector::const_iterator iter = scanInfoList.begin(); - for (; iter != scanInfoList.end(); ++iter) { + + std::vector storeInfoList; + for (auto iter = scanInfoList.begin(); iter != scanInfoList.end(); ++iter) { WifiScanInfo scanInfo; scanInfo.bssid = iter->bssid; scanInfo.ssid = iter->ssid; scanInfo.capabilities = iter->capabilities; scanInfo.frequency = iter->frequency; + scanInfo.channelWidth = iter->channelWidth; + scanInfo.centerFrequency0 = iter->centerFrequency0; + scanInfo.centerFrequency1 = iter->centerFrequency1; scanInfo.rssi = iter->rssi; + scanInfo.securityType = iter->securityType; + scanInfo.infoElems = iter->infoElems; + scanInfo.features = iter->features; scanInfo.timestamp = iter->timestamp; scanInfo.band = iter->band; - scanInfo.securityType = iter->securityType; - - filterScanInfo.push_back(scanInfo); + storeInfoList.push_back(scanInfo); } - if (WifiSettings::GetInstance().SaveScanInfoList(filterScanInfo) != 0) { + if (WifiSettings::GetInstance().SaveScanInfoList(storeInfoList) != 0) { WIFI_LOGE("WifiSettings::GetInstance().SaveScanInfoList failed.\n"); return false; } @@ -552,13 +591,10 @@ bool ScanService::StoreFullScanInfo( return true; } -bool ScanService::StoreUserScanInfo( - const StoreScanConfig &scanConfig, const std::vector &scanInfoList) +bool ScanService::StoreUserScanInfo(const StoreScanConfig &scanConfig, std::vector &scanInfoList) { WIFI_LOGI("Enter ScanService::StoreUserScanInfo.\n"); - /* Filtering result */ - std::vector filterScanInfo; std::vector::const_iterator iter = scanInfoList.begin(); for (; iter != scanInfoList.end(); ++iter) { /* Timestamp filtering */ @@ -566,7 +602,7 @@ bool ScanService::StoreUserScanInfo( continue; } - /* frequency filtering */ + /* frequency filtering. */ if (!scanConfig.scanFreqs.empty()) { if (std::find(scanConfig.scanFreqs.begin(), scanConfig.scanFreqs.end(), iter->frequency) == scanConfig.scanFreqs.end()) { @@ -574,32 +610,22 @@ bool ScanService::StoreUserScanInfo( } } - /* SSID filtering */ + /* SSID filtering. */ if ((!scanConfig.ssid.empty()) && (scanConfig.ssid != iter->ssid)) { continue; } - /* BSSID filtering */ + /* BSSID filtering. */ if ((!scanConfig.bssid.empty()) && (scanConfig.bssid != iter->bssid)) { continue; } - - WifiScanInfo scanInfo; - scanInfo.bssid = iter->bssid; - scanInfo.ssid = iter->ssid; - scanInfo.capabilities = iter->capabilities; - scanInfo.frequency = iter->frequency; - scanInfo.rssi = iter->rssi; - scanInfo.timestamp = iter->timestamp; - scanInfo.band = iter->band; - scanInfo.securityType = iter->securityType; - filterScanInfo.push_back(scanInfo); } /* - * The specified parameter scanning is initiated by the system and is not - * stored in the configuration center + * The specified parameter scanning is initiated by the system and + * store in the configuration center. */ + ReportStoreScanInfos(scanInfoList); return true; } @@ -607,29 +633,16 @@ bool ScanService::StoreUserScanInfo( void ScanService::ReportScanInfos(std::vector &interScanList) { WIFI_LOGI("Enter ScanService::ReportScanInfos.\n"); + mScanSerivceCallbacks.OnScanInfoEvent(interScanList); return; } -void ScanService::ConvertScanInfos( - const std::vector &interScanList, std::vector &scanInfoList) +void ScanService::ReportStoreScanInfos(std::vector &interScanList) { - WIFI_LOGI("Enter ScanService::ConvertScanInfos.\n"); + WIFI_LOGI("Enter ScanService::ReportStoreScanInfos.\n"); - /* Filtering result */ - std::vector::const_iterator iter = interScanList.begin(); - for (; iter != interScanList.end(); ++iter) { - WifiScanInfo scanInfo; - scanInfo.bssid = iter->bssid; - scanInfo.ssid = iter->ssid; - scanInfo.capabilities = iter->capabilities; - scanInfo.frequency = iter->frequency; - scanInfo.rssi = iter->rssi; - scanInfo.timestamp = iter->timestamp; - scanInfo.band = iter->band; - scanInfo.securityType = iter->securityType; - scanInfoList.push_back(scanInfo); - } + mScanSerivceCallbacks.OnStoreScanInfoEvent(interScanList); return; } @@ -642,8 +655,8 @@ bool ScanService::BeginPnoScan() return false; } - if (!AllowPnoScan()) { - WIFI_LOGI("AllowPnoScan return false.\n"); + ErrCode rlt = ApplyScanPolices(ScanType::SCAN_TYPE_PNO); + if (rlt != WIFI_OPT_SUCCESS) { return false; } @@ -736,19 +749,19 @@ bool ScanService::AddPnoScanMessageBody(InternalMessage *interMessage, const Pno interMessage->AddIntMessageBody(pnoScanConfig.minRssi5Ghz); interMessage->AddIntMessageBody(pnoScanConfig.hiddenNetworkSsid.size()); - std::vector::const_iterator iter = pnoScanConfig.hiddenNetworkSsid.begin(); + auto iter = pnoScanConfig.hiddenNetworkSsid.begin(); for (; iter != pnoScanConfig.hiddenNetworkSsid.end(); ++iter) { interMessage->AddStringMessageBody(*iter); } interMessage->AddIntMessageBody(pnoScanConfig.savedNetworkSsid.size()); - std::vector::const_iterator iter2 = pnoScanConfig.savedNetworkSsid.begin(); + auto iter2 = pnoScanConfig.savedNetworkSsid.begin(); for (; iter2 != pnoScanConfig.savedNetworkSsid.end(); ++iter2) { interMessage->AddStringMessageBody(*iter2); } interMessage->AddIntMessageBody(pnoScanConfig.freqs.size()); - std::vector::const_iterator iter3 = pnoScanConfig.freqs.begin(); + auto iter3 = pnoScanConfig.freqs.begin(); for (; iter3 != pnoScanConfig.freqs.end(); ++iter3) { interMessage->AddIntMessageBody(*iter3); } @@ -774,7 +787,7 @@ void ScanService::HandlePnoScanInfo(std::vector &scanInfoList) } } - /* Send the scanning result to the module registered for listening */ + /* Send the scanning result to the module registered for listening. */ PnoScanInfoHandlerMap::iterator handleIter = pnoScanInfoHandlerMap.begin(); for (; handleIter != pnoScanInfoHandlerMap.end(); ++handleIter) { if (handleIter->second) { @@ -782,7 +795,7 @@ void ScanService::HandlePnoScanInfo(std::vector &scanInfoList) } } - /* send message to main service */ + /* send message to main service. */ ReportScanInfos(filterScanInfo); return; @@ -801,11 +814,9 @@ void ScanService::EndPnoScan() return; } -void ScanService::HandleScreenStatusChanged(bool screenOn) +void ScanService::HandleScreenStatusChanged() { WIFI_LOGI("Enter ScanService::HandleScreenStatusChanged."); - - isScreenOn = screenOn; SystemScanProcess(false); return; } @@ -830,42 +841,82 @@ void ScanService::HandleStaStatusChanged(int status) } } + staSceneForbidCount = 0; return; } +void ScanService::HandleMovingFreezeChanged() +{ + LOGI("Enter ScanService::HandleMovingFreezeChanged."); + ScanMode appRunMode = WifiSettings::GetInstance().GetAppRunningState(); + int freezeState = WifiSettings::GetInstance().GetFreezeModeState(); + int noChargerPlugModeState = WifiSettings::GetInstance().GetNoChargerPlugModeState(); + + bool movingFreeze = (appRunMode == ScanMode::APP_BACKGROUND_SCAN || appRunMode == ScanMode::SYS_BACKGROUND_SCAN) && + (freezeState == MODE_STATE_OPEN) && (noChargerPlugModeState == MODE_STATE_OPEN); + bool movingFreezeBakup = IsMovingFreezeState(); + + SetMovingFreezeState(movingFreeze); + WIFI_LOGD("moving freeze changed: movingFreeze=%{public}d, movingFreezeBakup=%{public}d", movingFreeze, + movingFreezeBakup); + /* Moving -> Freeze, set the scanned flag to false. */ + if (!movingFreezeBakup && movingFreeze) { + WIFI_LOGD("set movingFreeze scanned false."); + SetMovingFreezeScaned(false); + } +} + void ScanService::HandleCustomStatusChanged(int customScene, int customSceneStatus) { WIFI_LOGI("Enter ScanService::HandleCustomStatusChanged."); + WIFI_LOGD("sizeof(time_t):%{public}d", int(sizeof(time_t))); time_t now = time(nullptr); WIFI_LOGD("customScene:%{public}d, status:%{public}d", customScene, customSceneStatus); - if (customSceneStatus == STATE_OPEN) { + if (customSceneStatus == MODE_STATE_OPEN) { customSceneTimeMap.insert(std::pair(customScene, now)); } - if (customSceneStatus == STATE_CLOSE) { + if (customSceneStatus == MODE_STATE_CLOSE) { customSceneTimeMap.erase(customScene); } SystemScanProcess(false); + customSceneForbidCount = 0; return; } +void ScanService::HandleGetCustomSceneState(std::map& sceneMap) const +{ + sceneMap = customSceneTimeMap; +} + void ScanService::SystemScanProcess(bool scanAtOnce) { WIFI_LOGI("Enter ScanService::SystemScanProcess."); StopSystemScan(); - WIFI_LOGD("isScreenOn is:%{public}d", isScreenOn); - if (isScreenOn) { - for (auto iter = scanControlInfo.scanIntervalList.begin(); iter != scanControlInfo.scanIntervalList.end(); - ++iter) { - if (iter->scanScene == SCAN_SCENE_ALL && iter->scanMode == ScanMode::SYSTEM_TIMER_SCAN && - iter->isSingle == false) { - WIFI_LOGD("iter->intervalMode is:%{public}d", iter->intervalMode); - WIFI_LOGD("iter->interval is:%{public}d", iter->interval); - WIFI_LOGD("iter->count is:%{public}d", iter->count); - systemScanIntervalMode.scanIntervalMode.intervalMode = iter->intervalMode; - systemScanIntervalMode.scanIntervalMode.interval = iter->interval; - systemScanIntervalMode.scanIntervalMode.count = iter->count; + + int state = WifiSettings::GetInstance().GetScreenState(); + if (state == MODE_STATE_OPEN) { + WIFI_LOGD("Screen is on."); + } else { + WIFI_LOGD("ScreenOn is off."); + } + + if (state == MODE_STATE_OPEN) { + { + std::unique_lock lock(scanControlInfoMutex); + for (auto iter = scanControlInfo.scanIntervalList.begin(); iter != scanControlInfo.scanIntervalList.end(); + ++iter) { + if (iter->scanScene == SCAN_SCENE_ALL && iter->scanMode == ScanMode::SYSTEM_TIMER_SCAN && + iter->isSingle == false) { + WIFI_LOGD("iter->intervalMode is:%{public}d", iter->intervalMode); + WIFI_LOGD("iter->interval is:%{public}d", iter->interval); + WIFI_LOGD("iter->count is:%{public}d", iter->count); + systemScanIntervalMode.scanIntervalMode.intervalMode = iter->intervalMode; + systemScanIntervalMode.scanIntervalMode.interval = iter->interval; + systemScanIntervalMode.scanIntervalMode.count = iter->count; + systemScanIntervalMode.expScanCount = 0; + } } } StartSystemTimerScan(scanAtOnce); @@ -894,12 +945,12 @@ void ScanService::StartSystemTimerScan(bool scanAtOnce) { WIFI_LOGI("Enter ScanService::StartSystemTimerScan."); - if (!AllowSystemTimerScan()) { - WIFI_LOGI("AllowSystemTimerScan return false."); + ErrCode rlt = ApplyScanPolices(ScanType::SCAN_TYPE_SYSTEMTIMER); + if (rlt != WIFI_OPT_SUCCESS) { return; } - struct timespec times = {0, 0}; + struct timespec times = { 0, 0 }; clock_gettime(CLOCK_MONOTONIC, ×); int64_t nowTime = static_cast(times.tv_sec) * SECOND_TO_MILLI_SECOND + times.tv_nsec / SECOND_TO_MICRO_SECOND; @@ -910,7 +961,7 @@ void ScanService::StartSystemTimerScan(bool scanAtOnce) /* * The scan is performed immediately, the first scan is required, - * or the time since the last scan is longer than the scan interval + * or the time since the last scan is longer than the scan interval. */ int scanTime = SYSTEM_SCAN_INIT_TIME; WIFI_LOGD("interval:%{public}d", systemScanIntervalMode.scanIntervalMode.interval); @@ -986,165 +1037,296 @@ void ScanService::GetScanControlInfo() { WIFI_LOGI("Enter ScanService::GetScanControlInfo.\n"); + std::unique_lock lock(scanControlInfoMutex); if (WifiSettings::GetInstance().GetScanControlInfo(scanControlInfo) != 0) { WIFI_LOGE("WifiSettings::GetInstance().GetScanControlInfo failed"); } - - return; -} - -void ScanService::GetScreenState() -{ - WIFI_LOGI("Enter ScanService::GetScreenState.\n"); - int screenState = WifiSettings::GetInstance().GetScreenState(); - isScreenOn = true; - if (screenState == SCREEN_CLOSED) { - isScreenOn = false; - } - - return; -} - -void ScanService::SetOperateAppMode(int appMode) -{ - WIFI_LOGI("Enter ScanService::SetOperateAppMode.\n"); - operateAppMode = appMode; - return; } -ScanMode ScanService::GetOperateAppMode() -{ - WIFI_LOGI("Enter ScanService::GetOperateAppMode.\n"); - ScanMode scanMode = ScanMode::SYS_FOREGROUND_SCAN; - switch (operateAppMode) { - case APP_FOREGROUND_SCAN: - scanMode = ScanMode::APP_FOREGROUND_SCAN; - break; - - case APP_BACKGROUND_SCAN: - scanMode = ScanMode::APP_BACKGROUND_SCAN; - break; - - case SYS_FOREGROUND_SCAN: - scanMode = ScanMode::SYS_FOREGROUND_SCAN; - break; - - case SYS_BACKGROUND_SCAN: - scanMode = ScanMode::SYS_BACKGROUND_SCAN; - break; - - default: - WIFI_LOGE("operateAppMode %{public}d is invalid.", operateAppMode); - break; - } - - return scanMode; -} - -bool ScanService::AllowExternScan(int appId) +ErrCode ScanService::AllowExternScan() { WIFI_LOGI("Enter ScanService::AllowExternScan.\n"); int staScene = GetStaScene(); - ScanMode scanMode = GetOperateAppMode(); + ScanMode scanMode = WifiSettings::GetInstance().GetAppRunningState(); WIFI_LOGD("staScene is %{public}d, scanMode is %{public}d", staScene, (int)scanMode); if (!AllowExternScanByForbid(staScene, scanMode)) { WIFI_LOGD("extern scan not allow by forbid mode"); - return false; + return WIFI_OPT_FAILED; } + int appId = 0; if (!AllowExternScanByInterval(appId, staScene, scanMode)) { WIFI_LOGD("extern scan not allow by interval mode"); - return false; + return WIFI_OPT_FAILED; + } + if (!AllowScanByMovingFreeze()) { + WIFI_LOGD("extern scan not allow by moving freeze mode"); + return WIFI_OPT_MOVING_FREEZE_CTRL; + } + + if (!AllowScanByDisableScanCtrl()) { + WIFI_LOGD("extern scan not allow by disable scan control."); + return WIFI_OPT_FAILED; } WIFI_LOGD("extern scan has allowed"); - return true; + return WIFI_OPT_SUCCESS; } -bool ScanService::AllowSystemTimerScan() +ErrCode ScanService::AllowSystemTimerScan() { WIFI_LOGI("Enter ScanService::AllowSystemTimerScan.\n"); if (staStatus != static_cast(OperateResState::DISCONNECT_DISCONNECTED) && staStatus != static_cast(OperateResState::CONNECT_AP_CONNECTED)) { - return false; + return WIFI_OPT_FAILED; } - /* The network is connected and cannot be automatically switched */ + /* The network is connected and cannot be automatically switched. */ autoNetworkSelection = WifiSettings::GetInstance().GetWhetherToAllowNetworkSwitchover(); if ((staStatus == static_cast(OperateResState::CONNECT_AP_CONNECTED)) && (!autoNetworkSelection)) { - return false; + return WIFI_OPT_FAILED; } int staScene = GetStaScene(); /* Determines whether to allow scanning based on the STA status. */ if (staScene == SCAN_SCENE_MAX) { - return false; + return WIFI_OPT_FAILED; } if (!AllowScanDuringStaScene(staScene, ScanMode::SYSTEM_TIMER_SCAN)) { WIFI_LOGD("system timer scan not allowed, staScene is %{public}d", staScene); - return false; + return WIFI_OPT_FAILED; } if (!AllowScanDuringCustomScene(ScanMode::SYSTEM_TIMER_SCAN)) { WIFI_LOGD("system timer scan not allowed"); - return false; + return WIFI_OPT_FAILED; } - for (auto iter = scanControlInfo.scanIntervalList.begin(); iter != scanControlInfo.scanIntervalList.end(); ++iter) { - if (iter->scanScene == SCAN_SCENE_ALL && iter->scanMode == ScanMode::SYSTEM_TIMER_SCAN && - iter->isSingle == false) { - if (!SystemScanByInterval(systemScanIntervalMode.expScanCount, - systemScanIntervalMode.scanIntervalMode.interval, - systemScanIntervalMode.scanIntervalMode.count)) { - return false; + if (!AllowScanByMovingFreeze()) { + return WIFI_OPT_MOVING_FREEZE_CTRL; + } + + { + std::unique_lock lock(scanControlInfoMutex); + for (auto iter = scanControlInfo.scanIntervalList.begin(); iter != scanControlInfo.scanIntervalList.end(); + ++iter) { + if (iter->scanScene == SCAN_SCENE_ALL && iter->scanMode == ScanMode::SYSTEM_TIMER_SCAN && + iter->isSingle == false) { + if (!SystemScanByInterval(systemScanIntervalMode.expScanCount, + systemScanIntervalMode.scanIntervalMode.interval, systemScanIntervalMode.scanIntervalMode.count)) { + return WIFI_OPT_FAILED; + } } } } + if (!AllowScanByDisableScanCtrl()) { + WIFI_LOGD("extern scan not allow by disable scan control."); + return WIFI_OPT_FAILED; + } + WIFI_LOGD("allow system timer scan"); - return true; + return WIFI_OPT_SUCCESS; } -bool ScanService::AllowPnoScan() +ErrCode ScanService::AllowPnoScan() { WIFI_LOGI("Enter ScanService::AllowPnoScan.\n"); if (staStatus != static_cast(OperateResState::DISCONNECT_DISCONNECTED)) { - return false; + return WIFI_OPT_FAILED; } int staScene = GetStaScene(); if (staScene == SCAN_SCENE_MAX) { - return false; + return WIFI_OPT_FAILED; } if (!AllowScanDuringStaScene(staScene, ScanMode::PNO_SCAN)) { WIFI_LOGD("pnoScan is not allowed for forbid map, staScene is %{public}d", staScene); - return false; + return WIFI_OPT_FAILED; } if (!AllowScanDuringCustomScene(ScanMode::PNO_SCAN)) { WIFI_LOGD("pnoScan is not allowed for forbid map"); - return false; + return WIFI_OPT_FAILED; + } + if (!AllowScanByMovingFreeze()) { + return WIFI_OPT_MOVING_FREEZE_CTRL; } - for (auto iter = scanControlInfo.scanIntervalList.begin(); iter != scanControlInfo.scanIntervalList.end(); ++iter) { - if (iter->scanScene == SCAN_SCENE_ALL && iter->scanMode == ScanMode::PNO_SCAN && iter->isSingle == false) { - pnoScanIntervalMode.scanIntervalMode.intervalMode = iter->intervalMode; - pnoScanIntervalMode.scanIntervalMode.interval = iter->interval; - pnoScanIntervalMode.scanIntervalMode.count = iter->count; - if (!PnoScanByInterval(pnoScanIntervalMode.fixedScanCount, - pnoScanIntervalMode.fixedCurrentTime, - pnoScanIntervalMode.scanIntervalMode.interval, - pnoScanIntervalMode.scanIntervalMode.count)) { - WIFI_LOGD("pnoScan is not allowed for interval mode"); - return false; + { + std::unique_lock lock(scanControlInfoMutex); + for (auto iter = scanControlInfo.scanIntervalList.begin(); iter != scanControlInfo.scanIntervalList.end(); + ++iter) { + if (iter->scanScene == SCAN_SCENE_ALL && iter->scanMode == ScanMode::PNO_SCAN && iter->isSingle == false) { + pnoScanIntervalMode.scanIntervalMode.intervalMode = iter->intervalMode; + pnoScanIntervalMode.scanIntervalMode.interval = iter->interval; + pnoScanIntervalMode.scanIntervalMode.count = iter->count; + if (!PnoScanByInterval(pnoScanIntervalMode.fixedScanCount, pnoScanIntervalMode.fixedCurrentTime, + pnoScanIntervalMode.scanIntervalMode.interval, pnoScanIntervalMode.scanIntervalMode.count)) { + WIFI_LOGD("pnoScan is not allowed for interval mode"); + return WIFI_OPT_FAILED; + } } } } + + if (!AllowScanByDisableScanCtrl()) { + WIFI_LOGD("extern scan not allow by disable scan control."); + return WIFI_OPT_FAILED; + } + WIFI_LOGD("pno scan is allowed"); - return true; + return WIFI_OPT_SUCCESS; +} + +ErrCode ScanService::AllowScanByType(ScanType scanType) +{ + LOGI("Enter ScanService::AllowScanByType."); + + ErrCode allScanResult = WIFI_OPT_SUCCESS; + switch (scanType) { + case ScanType::SCAN_TYPE_EXTERN: + allScanResult = AllowExternScan(); + break; + case ScanType::SCAN_TYPE_SYSTEMTIMER: + allScanResult = AllowSystemTimerScan(); + break; + case ScanType::SCAN_TYPE_PNO: + allScanResult = AllowPnoScan(); + break; + default: + LOGE("scanType error.\n"); + break; + } + + WIFI_LOGD("AllowScanByType ErrCode=%{public}d.", static_cast(allScanResult)); + return allScanResult; +} + +void ScanService::SetScanTrustMode() +{ + std::unique_lock lock(scanControlInfoMutex); + scanTrustMode = true; +} + +void ScanService::ResetToNonTrustMode() +{ + std::unique_lock lock(scanControlInfoMutex); + scanTrustMode = false; +} + +bool ScanService::IsScanTrustMode() const +{ + std::unique_lock lock(scanControlInfoMutex); + return scanTrustMode; +} + +void ScanService::AddScanTrustSceneId(int sceneId) +{ + std::unique_lock lock(scanControlInfoMutex); + scanTrustSceneIds.emplace(sceneId); +} + +void ScanService::ClearScanTrustSceneIds() +{ + std::unique_lock lock(scanControlInfoMutex); + scanTrustSceneIds.clear(); +} + +bool ScanService::IsInScanTrust(int sceneId) const +{ + std::unique_lock lock(scanControlInfoMutex); + if (scanTrustSceneIds.find(sceneId) != scanTrustSceneIds.end()) { + return true; + } + + return false; +} + +void ScanService::SetMovingFreezeState(bool state) +{ + std::unique_lock lock(scanControlInfoMutex); + isAbsFreezeState = state; +} + +bool ScanService::IsMovingFreezeState() const +{ + std::unique_lock lock(scanControlInfoMutex); + return isAbsFreezeState; +} + +void ScanService::SetMovingFreezeScaned(bool scanned) +{ + std::unique_lock lock(scanControlInfoMutex); + isAbsFreezeScaned = scanned; +} + +bool ScanService::IsMovingFreezeScaned() const +{ + std::unique_lock lock(scanControlInfoMutex); + return isAbsFreezeScaned; +} + +ErrCode ScanService::ApplyTrustListPolicy(ScanType scanType) +{ + LOGI("Enter ScanService::ApplyTrustListPolicy."); + ErrCode policyResult = WIFI_OPT_SUCCESS; + + SetScanTrustMode(); + policyResult = AllowScanByType(scanType); + if (policyResult != WIFI_OPT_SUCCESS) { + WIFI_LOGD("AllowScanByType failed."); + } + ResetToNonTrustMode(); + WIFI_LOGD("ResetToNonTrustMode"); + + WIFI_LOGD("apply trust list policy, ErrCode=%{public}d", static_cast(policyResult)); + + return policyResult; +} + +ErrCode ScanService::ApplyScanPolices(ScanType type) +{ + LOGI("Enter ScanService::ApplyScanPolices."); + /* Obtains app parameters and scenario status parameters. */ + auto &appPackageName = WifiSettings::GetInstance().GetAppPackageName(); + auto &trustListPolicies = WifiSettings::GetInstance().ReloadTrustListPolicies(); + auto &movingFreezePolicy = WifiSettings::GetInstance().ReloadMovingFreezePolicy(); + ErrCode rlt = WIFI_OPT_SUCCESS; + if (appPackageName.empty()) { + rlt = AllowScanByType(type); + WIFI_LOGD("appPackageName empty, apply scan polices ErrCode=%{public}d.", static_cast(rlt)); + if (scanResultBackup != -1 && rlt == WIFI_OPT_MOVING_FREEZE_CTRL) { + mScanSerivceCallbacks.OnScanFinishEvent(scanResultBackup); + } + return rlt; + } + + /* Generates an scene id list based on appPackageName. */ + ClearScanTrustSceneIds(); + for (auto &policy : trustListPolicies) { + if (IsPackageInTrustList(policy.trustList, policy.sceneId, appPackageName)) { + AddScanTrustSceneId(policy.sceneId); + } + } + const int movingFreezeSceneId = -1; + if (IsPackageInTrustList(movingFreezePolicy.trustList, movingFreezeSceneId, appPackageName)) { + AddScanTrustSceneId(movingFreezeSceneId); + } + + rlt = ApplyTrustListPolicy(type); + if (rlt != WIFI_OPT_SUCCESS) { + if (scanResultBackup != -1 && rlt == WIFI_OPT_MOVING_FREEZE_CTRL) { + LOGE("trust list policy, but moving freeze ctrl failed."); + mScanSerivceCallbacks.OnScanFinishEvent(scanResultBackup); + } + return rlt; + } + WIFI_LOGD("apply scan policies result: scan control ok."); + return WIFI_OPT_SUCCESS; } bool ScanService::AllowExternScanByForbid(int staScene, ScanMode scanMode) @@ -1160,7 +1342,8 @@ bool ScanService::AllowExternScanByForbid(int staScene, ScanMode scanMode) } } - if (isScreenOn == false) { + int state = WifiSettings::GetInstance().GetScreenState(); + if (state == MODE_STATE_CLOSE) { if (!AllowScanDuringScreenOff(scanMode)) { return false; } @@ -1180,6 +1363,7 @@ bool ScanService::AllowExternScanByForbid(int staScene, ScanMode scanMode) if (!AllowScanDuringCustomScene(ScanMode::ALL_EXTERN_SCAN)) { return false; } + return true; } @@ -1193,12 +1377,22 @@ bool ScanService::AllowExternScanByInterval(int appId, int staScene, ScanMode sc if (!AllowExternScanByIntervalMode(appId, staScene, ScanMode::ALL_EXTERN_SCAN)) { return false; } - if (!AllowExternScanByIntervalMode(appId, SCAN_SCENE_ALL, scanMode)) { + if (!AllowExternScanByIntervalMode(appId, SCAN_SCENE_FREQUENCY_ORIGIN, scanMode)) { return false; } - if (!AllowExternScanByIntervalMode(appId, SCAN_SCENE_ALL, ScanMode::ALL_EXTERN_SCAN)) { + if (!AllowExternScanByIntervalMode(appId, SCAN_SCENE_FREQUENCY_ORIGIN, ScanMode::ALL_EXTERN_SCAN)) { return false; } + int noChargerPlugModeState = WifiSettings::GetInstance().GetNoChargerPlugModeState(); + if (noChargerPlugModeState == MODE_STATE_OPEN) { + WIFI_LOGI("No charger plug mode state."); + if (!AllowExternScanByIntervalMode(appId, SCAN_SCENE_FREQUENCY_CUSTOM, scanMode)) { + return false; + } + if (!AllowExternScanByIntervalMode(appId, SCAN_SCENE_FREQUENCY_CUSTOM, ScanMode::ALL_EXTERN_SCAN)) { + return false; + } + } if (!AllowExternScanByCustomScene(appId, scanMode)) { return false; } @@ -1225,15 +1419,22 @@ int ScanService::GetStaScene() case static_cast(OperateResState::CONNECT_OBTAINING_IP): return SCAN_SCENE_OBTAINING_IP; + case static_cast(OperateResState::CONNECT_ASSOCIATING): + return SCAN_SCENE_ASSOCIATING; + + case static_cast(OperateResState::CONNECT_ASSOCIATED): + return SCAN_SCENE_ASSOCIATED; + default: return SCAN_SCENE_MAX; } } -bool ScanService::IsExternScanning() +bool ScanService::IsExternScanning() const { WIFI_LOGI("Enter ScanService::IsExternScanning.\n"); + std::unique_lock lock(scanConfigMapMutex); for (auto iter = scanConfigMap.begin(); iter != scanConfigMap.end(); ++iter) { if (iter->second.externFlag) { return true; @@ -1242,6 +1443,19 @@ bool ScanService::IsExternScanning() return false; } +bool ScanService::IsScanningWithParam() +{ + WIFI_LOGI("Enter ScanService::IsScanningWithParam.\n"); + + std::unique_lock lock(scanConfigMapMutex); + for (auto iter = scanConfigMap.begin(); iter != scanConfigMap.end(); ++iter) { + if (iter->second.scanningWithParamFlag) { + return true; + } + } + return false; +} + void ScanService::GetAllowBandFreqsControlInfo(ScanBandType &scanBand, std::vector &freqs) { WIFI_LOGI("Enter ScanService::GetAllowBandFreqsControlInfo.\n"); @@ -1262,14 +1476,17 @@ void ScanService::GetAllowBandFreqsControlInfo(ScanBandType &scanBand, std::vect if (!AllowScanDuringCustomScene(ScanMode::BAND_5GHZ_SCAN)) { allow5Ghz = false; } - auto forbidIter = scanControlInfo.scanForbidMap.find(SCAN_SCENE_ALL); - if (forbidIter != scanControlInfo.scanForbidMap.end()) { - for (auto iter = forbidIter->second.begin(); iter != forbidIter->second.end(); ++iter) { - if (iter->scanMode == ScanMode::BAND_24GHZ_SCAN) { - allow24Ghz = false; - } - if (iter->scanMode == ScanMode::BAND_5GHZ_SCAN) { - allow5Ghz = false; + + { + std::unique_lock lock(scanControlInfoMutex); + for (auto iter = scanControlInfo.scanForbidList.begin(); iter != scanControlInfo.scanForbidList.end(); ++iter) { + if (iter->scanScene == SCAN_SCENE_ALL) { + if (iter->scanMode == ScanMode::BAND_24GHZ_SCAN) { + allow24Ghz = false; + } + if (iter->scanMode == ScanMode::BAND_5GHZ_SCAN) { + allow5Ghz = false; + } } } } @@ -1407,19 +1624,6 @@ bool ScanService::GetHiddenNetworkSsidList(std::vector &hiddenNetwo return true; } -void ScanService::SetCustomScene(int scene, time_t currentTime) -{ - WIFI_LOGI("Enter ScanService::SetCustomScene.\n"); - - if (scene < static_cast(SCAN_SCENE_DEEP_SLEEP) || scene >= static_cast(SCAN_SCENE_ALL)) { - WIFI_LOGE("invalid CustomScene status:%{public}d", scene); - return; - } - customSceneTimeMap[scene] = currentTime; - - return; -} - void ScanService::ClearScanControlValue() { WIFI_LOGI("Enter ScanService::ClearScanControlValue.\n"); @@ -1438,34 +1642,47 @@ void ScanService::SetStaCurrentTime() time_t now = time(0); staCurrentTime = now; + int state = WifiSettings::GetInstance().GetScreenState(); + if (state == MODE_STATE_CLOSE) { + if (ApplyScanPolices(ScanType::SCAN_TYPE_PNO) != WIFI_OPT_SUCCESS) { + EndPnoScan(); + pnoScanFailedNum = 0; + pScanStateMachine->StopTimer(static_cast(RESTART_PNO_SCAN_TIMER)); + } + } return; } -bool ScanService::AllowScanDuringScanning(ScanMode scanMode) +bool ScanService::AllowScanDuringScanning(ScanMode scanMode) const { WIFI_LOGI("Enter ScanService::AllowScanDuringScanning.\n"); - auto forbidIter = scanControlInfo.scanForbidMap.find(SCAN_SCENE_SCANNING); - if (forbidIter != scanControlInfo.scanForbidMap.end()) { - for (auto iter = forbidIter->second.begin(); iter != forbidIter->second.end(); ++iter) { - if (iter->scanMode == scanMode) { - return false; - } + std::unique_lock lock(scanControlInfoMutex); + for (auto iter = scanControlInfo.scanForbidList.begin(); iter != scanControlInfo.scanForbidList.end(); ++iter) { + if (iter->scanScene == SCAN_SCENE_SCANNING && iter->scanMode == scanMode) { + WIFI_LOGD("scan not allow by scanning scene."); + return false; } } return true; } -bool ScanService::AllowScanDuringScreenOff(ScanMode scanMode) +bool ScanService::AllowScanDuringScreenOff(ScanMode scanMode) const { WIFI_LOGI("Enter ScanService::AllowScanDuringScreenOff.\n"); - auto forbidIter = scanControlInfo.scanForbidMap.find(SCAN_SCENE_SCREEN_OFF); - if (forbidIter != scanControlInfo.scanForbidMap.end()) { - for (auto iter = forbidIter->second.begin(); iter != forbidIter->second.end(); ++iter) { - if (iter->scanMode == scanMode) { - return false; - } + bool isTrustListMode = IsScanTrustMode(); + bool isInList = IsInScanTrust(SCAN_SCENE_SCREEN_OFF); + if (isTrustListMode && isInList) { + WIFI_LOGD("Trust list mode,sceneId(SCAN_SCENE_SCREEN_OFF) in the list,return true."); + return true; + } + + std::unique_lock lock(scanControlInfoMutex); + for (auto iter = scanControlInfo.scanForbidList.begin(); iter != scanControlInfo.scanForbidList.end(); ++iter) { + if (iter->scanScene == SCAN_SCENE_SCREEN_OFF && iter->scanMode == scanMode) { + WIFI_LOGD("scan not allow by screen off scene."); + return false; } } return true; @@ -1475,29 +1692,35 @@ bool ScanService::AllowScanDuringStaScene(int staScene, ScanMode scanMode) { WIFI_LOGI("Enter ScanService::AllowScanDuringStaScene.\n"); - time_t now = time(0); - - auto forbidIter = scanControlInfo.scanForbidMap.find(staScene); - if (forbidIter != scanControlInfo.scanForbidMap.end()) { - for (auto iter = forbidIter->second.begin(); iter != forbidIter->second.end(); ++iter) { - /* forbid scan mode found in scan scene */ - if (iter->scanMode == scanMode) { - /* Unconditional scan control for forbidCount times */ - if (iter->forbidCount > 0) { - iter->forbidCount--; - return false; - } - /* forbidCount=0 and forbidTime=0, directly forbid scan */ - if (iter->forbidTime == 0) { - return false; - } - /* Scan interval less than forbidTime, forbid scan */ - if (iter->forbidTime > 0 && iter->forbidTime > now - staCurrentTime) { - return false; - } + time_t now = time(nullptr); + if (now < 0) { + return false; + } + std::unique_lock lock(scanControlInfoMutex); + for (auto iter = scanControlInfo.scanForbidList.begin(); iter != scanControlInfo.scanForbidList.end(); ++iter) { + WIFI_LOGD("now - staCurrentTime:%{public}d, iter->forbidTime:%{public}d", int(now - staCurrentTime), + iter->forbidTime); + /* forbid scan mode found in scan scene. */ + if (iter->scanScene == staScene && iter->scanMode == scanMode) { + /* forbidCount=0 and forbidTime=0, directly forbid scan. */ + if ((iter->forbidTime == 0) && (iter->forbidCount == 0)) { + WIFI_LOGD("Scan is forbidden by staScene."); + return false; + } + /* Unconditional scan control for forbidCount times */ + if ((iter->forbidCount > 0) && (iter->forbidCount - staSceneForbidCount > 0)) { + WIFI_LOGD("Scan is forbidden in forbidCount."); + staSceneForbidCount++; + return false; + } + /* Scan interval less than forbidTime, forbid scan. */ + if ((iter->forbidTime > 0) && (now - staCurrentTime <= iter->forbidTime)) { + WIFI_LOGD("Scan is forbidden in forbidTime."); + return false; } } } + return true; } @@ -1505,31 +1728,43 @@ bool ScanService::AllowScanDuringCustomScene(ScanMode scanMode) { WIFI_LOGI("Enter ScanService::AllowScanDuringCustomScene.\n"); - time_t now = time(0); - auto customIter = customSceneTimeMap.begin(); - for (; customIter != customSceneTimeMap.end(); ++customIter) { - auto forbidIter = scanControlInfo.scanForbidMap.find(customIter->first); - if (forbidIter != scanControlInfo.scanForbidMap.end()) { - for (auto iter = forbidIter->second.begin(); iter != forbidIter->second.end(); ++iter) { - /* forbid scan mode found in scan scene */ - if (iter->scanMode == scanMode) { - /* Unconditional scan control for forbidCount times */ - if (iter->forbidCount > 0) { - iter->forbidCount--; - return false; - } - /* forbidCount=0 and forbidTime=0, directly forbid scan */ - if (iter->forbidTime == 0) { - return false; - } - /* Scan interval less than forbidTime, forbid scan */ - if (iter->forbidTime > 0 && iter->forbidTime > now - customIter->second) { - return false; - } - } + bool isTrustListMode = IsScanTrustMode(); + for (auto customIter = customSceneTimeMap.begin(); customIter != customSceneTimeMap.end(); ++customIter) { + if (isTrustListMode && IsInScanTrust(customIter->first)) { + WIFI_LOGD("Trust list mode,sceneId(%{public}d) in the list, continue.", customIter->first); + continue; + } + + if (!AllowCustomSceneCheck(customIter, scanMode)) { + return false; + } + } + return true; +} + +bool ScanService::AllowCustomSceneCheck(const std::map::const_iterator &customIter, ScanMode scanMode) +{ + std::unique_lock lock(scanControlInfoMutex); + for (auto iter = scanControlInfo.scanForbidList.begin(); iter != scanControlInfo.scanForbidList.end(); ++iter) { + if (iter->scanScene == customIter->first && iter->scanMode == scanMode) { + /* forbidCount=0 and forbidTime=0, directly forbid scan. */ + if ((iter->forbidTime == 0) && (iter->forbidCount == 0)) { + WIFI_LOGD("Scan is forbidden by staScene."); + return false; + } + /* Unconditional scan control for forbidCount times. */ + if (iter->forbidCount > 0 && iter->forbidCount - customSceneForbidCount > 0) { + customSceneForbidCount++; + return false; + } + /* Scan interval less than forbidTime, forbid scan. */ + time_t now = time(nullptr); + if (iter->forbidTime > 0 && iter->forbidTime > now - customIter->second) { + return false; } } } + return true; } @@ -1537,11 +1772,16 @@ bool ScanService::AllowExternScanByIntervalMode(int appId, int scanScene, ScanMo { WIFI_LOGI("Enter ScanService::AllowExternScanByIntervalMode.\n"); + bool isTrustListMode = IsScanTrustMode(); + if (isTrustListMode && IsInScanTrust(scanScene)) { + WIFI_LOGD("Trust list mode,sceneId(%{public}d) in the list, return true.", scanScene); + return true; + } + + std::unique_lock lock(scanControlInfoMutex); for (auto intervalListIter = scanControlInfo.scanIntervalList.begin(); intervalListIter != scanControlInfo.scanIntervalList.end(); ++intervalListIter) { - WIFI_LOGD( - "scanScene:%{public}d, scanMode:%{public}d", intervalListIter->scanScene, intervalListIter->scanMode); /* Determine whether control is required in the current scene and scan mode. */ if (intervalListIter->scanScene == scanScene && intervalListIter->scanMode == scanMode) { /* If a single application is distinguished. */ @@ -1563,91 +1803,37 @@ bool ScanService::AllowExternScanByCustomScene(int appId, ScanMode scanMode) { WIFI_LOGI("Enter ScanService::AllowExternScanByCustomScene.\n"); - auto customIter = customSceneTimeMap.begin(); - for (; customIter != customSceneTimeMap.end(); ++customIter) { - for (auto intervalListIter = scanControlInfo.scanIntervalList.begin(); - intervalListIter != scanControlInfo.scanIntervalList.end(); - ++intervalListIter) { - /* Determine whether control is required in the current scene and scan mode. */ - if (intervalListIter->scanScene == customIter->first && intervalListIter->scanMode == scanMode) { - /* If a single application is distinguished */ - if (intervalListIter->isSingle) { - if (!AllowSingleAppScanByInterval(appId, *intervalListIter)) { - return false; - } - } else { - if (!AllowFullAppScanByInterval(appId, *intervalListIter)) { - return false; - } - } - break; - } + bool isTrustListMode = IsScanTrustMode(); + for (auto customIter = customSceneTimeMap.begin(); customIter != customSceneTimeMap.end(); ++customIter) { + if (isTrustListMode && IsInScanTrust(customIter->first)) { + WIFI_LOGD("Trust list mode,sceneId(%{public}d) in the list, continue.", customIter->first); + continue; } - } - return true; -} - -bool ScanService::AllowSingleAppScanByInterval(int appId, ScanIntervalMode scanIntervalMode) -{ - WIFI_LOGI("Enter ScanService::AllowSingleAppScan.\n"); - bool appIdExisted = false; - for (auto forbidListIter = appForbidList.begin(); forbidListIter != appForbidList.end(); ++forbidListIter) { - if (forbidListIter->appID == appId && - forbidListIter->scanIntervalMode.scanScene == scanIntervalMode.scanScene && - forbidListIter->scanIntervalMode.scanMode == scanIntervalMode.scanMode) { - appIdExisted = true; - } - } - /* If the appId is the first scan request, add it to appForbidList. */ - if (!appIdExisted) { - SingleAppForbid singleAppForbid; - singleAppForbid.appID = appId; - singleAppForbid.scanIntervalMode.scanScene = scanIntervalMode.scanScene; - singleAppForbid.scanIntervalMode.scanMode = scanIntervalMode.scanMode; - singleAppForbid.scanIntervalMode.interval = scanIntervalMode.interval; - singleAppForbid.scanIntervalMode.intervalMode = scanIntervalMode.intervalMode; - singleAppForbid.scanIntervalMode.count = scanIntervalMode.count; - appForbidList.push_back(singleAppForbid); - } - for (auto iter = appForbidList.begin(); iter != appForbidList.end(); ++iter) { - if (iter->appID == appId && iter->scanIntervalMode.scanScene == scanIntervalMode.scanScene && - iter->scanIntervalMode.scanMode == scanIntervalMode.scanMode) { - if (!ExternScanByInterval(appId, *iter)) { - return false; - } + if (!AllowExternCustomSceneCheck(customIter, appId, scanMode)) { + return false; } } return true; } -bool ScanService::AllowFullAppScanByInterval(int appId, ScanIntervalMode scanIntervalMode) +bool ScanService::AllowExternCustomSceneCheck(const std::map::const_iterator &customIter, int appId, + ScanMode scanMode) { - WIFI_LOGI("Enter ScanService::AllowFullAppScan.\n"); - - bool fullAppExisted = false; - for (auto fullAppForbidIter = fullAppForbidList.begin(); fullAppForbidIter != fullAppForbidList.end(); - ++fullAppForbidIter) { - if (fullAppForbidIter->scanIntervalMode.scanScene == scanIntervalMode.scanScene && - fullAppForbidIter->scanIntervalMode.scanMode == scanIntervalMode.scanMode) { - fullAppExisted = true; - } - } - if (!fullAppExisted) { - SingleAppForbid singleAppForbid; - singleAppForbid.scanIntervalMode.scanScene = scanIntervalMode.scanScene; - singleAppForbid.scanIntervalMode.scanMode = scanIntervalMode.scanMode; - singleAppForbid.scanIntervalMode.interval = scanIntervalMode.interval; - singleAppForbid.scanIntervalMode.intervalMode = scanIntervalMode.intervalMode; - singleAppForbid.scanIntervalMode.count = scanIntervalMode.count; - fullAppForbidList.push_back(singleAppForbid); - } - for (auto iter = fullAppForbidList.begin(); iter != fullAppForbidList.end(); ++iter) { - if (iter->scanIntervalMode.scanScene == scanIntervalMode.scanScene && - iter->scanIntervalMode.scanMode == scanIntervalMode.scanMode) { - if (!ExternScanByInterval(appId, *iter)) { + std::unique_lock lock(scanControlInfoMutex); + for (auto intervalListIter = scanControlInfo.scanIntervalList.begin(); + intervalListIter != scanControlInfo.scanIntervalList.end(); ++intervalListIter) { + /* Determine whether control is required in the current scene and scan mode. */ + if (intervalListIter->scanScene == customIter->first && intervalListIter->scanMode == scanMode && + intervalListIter->isSingle) { + /* If a single application is distinguished. */ + if (!AllowSingleAppScanByInterval(appId, *intervalListIter)) { return false; } + } else if (intervalListIter->scanScene == customIter->first && intervalListIter->scanMode == scanMode && + !intervalListIter->isSingle) { + if (!AllowFullAppScanByInterval(appId, *intervalListIter)) + return false; } } return true; @@ -1697,28 +1883,21 @@ bool ScanService::ExternScanByInterval(int appId, SingleAppForbid &singleAppForb switch (singleAppForbid.scanIntervalMode.intervalMode) { case IntervalMode::INTERVAL_FIXED: - return AllowScanByIntervalFixed(singleAppForbid.fixedScanCount, - singleAppForbid.fixedCurrentTime, - singleAppForbid.scanIntervalMode.interval, - singleAppForbid.scanIntervalMode.count); + return AllowScanByIntervalFixed(singleAppForbid.fixedScanCount, singleAppForbid.fixedCurrentTime, + singleAppForbid.scanIntervalMode.interval, singleAppForbid.scanIntervalMode.count); case IntervalMode::INTERVAL_EXP: - return AllowScanByIntervalExp(singleAppForbid.expScanCount, - singleAppForbid.scanIntervalMode.interval, + return AllowScanByIntervalExp(singleAppForbid.expScanCount, singleAppForbid.scanIntervalMode.interval, singleAppForbid.scanIntervalMode.count); case IntervalMode::INTERVAL_CONTINUE: - return AllowScanByIntervalContinue(singleAppForbid.continueScanTime, - singleAppForbid.lessThanIntervalNum, - singleAppForbid.scanIntervalMode.interval, - singleAppForbid.scanIntervalMode.count); + return AllowScanByIntervalContinue(singleAppForbid.continueScanTime, singleAppForbid.lessThanIntervalCount, + singleAppForbid.scanIntervalMode.interval, singleAppForbid.scanIntervalMode.count); case IntervalMode::INTERVAL_BLOCKLIST: WIFI_LOGI("INTERVAL_BLOCKLIST IntervalMode.\n"); - return AllowScanByIntervalBlocklist(appId, - singleAppForbid.blockListScanTime, - singleAppForbid.lessThanIntervalNum, - singleAppForbid.scanIntervalMode.interval, + return AllowScanByIntervalBlocklist(appId, singleAppForbid.blockListScanTime, + singleAppForbid.lessThanIntervalCount, singleAppForbid.scanIntervalMode.interval, singleAppForbid.scanIntervalMode.count); default: @@ -1726,31 +1905,114 @@ bool ScanService::ExternScanByInterval(int appId, SingleAppForbid &singleAppForb } } +bool ScanService::AllowSingleAppScanByInterval(int appId, ScanIntervalMode scanIntervalMode) +{ + WIFI_LOGI("Enter ScanService::AllowSingleAppScanByInterval.\n"); + + bool appIdExisted = false; + for (auto forbidListIter = appForbidList.begin(); forbidListIter != appForbidList.end(); ++forbidListIter) { + if (forbidListIter->appID == appId && + forbidListIter->scanIntervalMode.scanScene == scanIntervalMode.scanScene && + forbidListIter->scanIntervalMode.scanMode == scanIntervalMode.scanMode) { + appIdExisted = true; + } + } + /* If the appId is the first scan request, add it to appForbidList. */ + if (!appIdExisted) { + SingleAppForbid singleAppForbid; + singleAppForbid.appID = appId; + singleAppForbid.scanIntervalMode.scanScene = scanIntervalMode.scanScene; + singleAppForbid.scanIntervalMode.scanMode = scanIntervalMode.scanMode; + singleAppForbid.scanIntervalMode.interval = scanIntervalMode.interval; + singleAppForbid.scanIntervalMode.intervalMode = scanIntervalMode.intervalMode; + singleAppForbid.scanIntervalMode.count = scanIntervalMode.count; + appForbidList.push_back(singleAppForbid); + } + for (auto iter = appForbidList.begin(); iter != appForbidList.end(); ++iter) { + if (iter->appID == appId && iter->scanIntervalMode.scanScene == scanIntervalMode.scanScene && + iter->scanIntervalMode.scanMode == scanIntervalMode.scanMode) { + if (!ExternScanByInterval(appId, *iter)) { + WIFI_LOGI("AllowSingleAppScanByInterval:false."); + return false; + } + } + } + WIFI_LOGI("AllowSingleAppScanByInterval:true."); + return true; +} + +bool ScanService::AllowFullAppScanByInterval(int appId, ScanIntervalMode scanIntervalMode) +{ + WIFI_LOGI("Enter ScanService::AllowFullAppScanByInterval.\n"); + + bool fullAppExisted = false; + for (auto fullAppForbidIter = fullAppForbidList.begin(); fullAppForbidIter != fullAppForbidList.end(); + ++fullAppForbidIter) { + if (fullAppForbidIter->scanIntervalMode.scanScene == scanIntervalMode.scanScene && + fullAppForbidIter->scanIntervalMode.scanMode == scanIntervalMode.scanMode) { + fullAppExisted = true; + } + } + if (!fullAppExisted) { + SingleAppForbid singleAppForbid; + singleAppForbid.scanIntervalMode.scanScene = scanIntervalMode.scanScene; + singleAppForbid.scanIntervalMode.scanMode = scanIntervalMode.scanMode; + singleAppForbid.scanIntervalMode.interval = scanIntervalMode.interval; + singleAppForbid.scanIntervalMode.intervalMode = scanIntervalMode.intervalMode; + singleAppForbid.scanIntervalMode.count = scanIntervalMode.count; + fullAppForbidList.push_back(singleAppForbid); + } + for (auto iter = fullAppForbidList.begin(); iter != fullAppForbidList.end(); ++iter) { + if (iter->scanIntervalMode.scanScene == scanIntervalMode.scanScene && + iter->scanIntervalMode.scanMode == scanIntervalMode.scanMode) { + if (!ExternScanByInterval(appId, *iter)) { + WIFI_LOGI("AllowFullAppScanByInterval:false."); + return false; + } + } + } + WIFI_LOGI("AllowFullAppScanByInterval:true."); + return true; +} + bool ScanService::AllowScanByIntervalFixed(int &fixedScanCount, time_t &fixedScanTime, int &interval, int &count) { WIFI_LOGI("Enter ScanService::AllowScanByIntervalFixed.\n"); - time_t now = time(0); + time_t now = time(nullptr); /* First scan */ if (fixedScanCount == 0) { fixedScanCount++; fixedScanTime = now; + WIFI_LOGD("first scan, fixedScanTime:%{public}ld, interval:%{public}d count:%{public}d fixed return true.", + fixedScanTime, interval, count); return true; } /* The scanning interval is greater than interval, and counting is restarted. */ + + time_t timeExp = now - fixedScanTime; if (now - fixedScanTime >= interval) { fixedScanCount = 1; fixedScanTime = now; + WIFI_LOGD("interval>interval,fixedScanTime:%{public}ld,interval:%{public}d " + "count:%{public}d,timeExp:%{public}ld,return true.", + fixedScanTime, interval, count, timeExp); return true; } - /** + /* * * Scan is forbidden because the scanning interval is less than interval * and the number of scan times exceeds count. */ if (fixedScanCount >= count) { + WIFI_LOGD(" fixedScanCount=%{public}d count=%{public}d,timeExp:%{public}ld,return false.", fixedScanCount, + count, timeExp); return false; } fixedScanCount++; + WIFI_LOGD("normal " + "scan,fixedScanCount:%{public}d,fixedScanTime:%{public}ld,interval:%{public}d,count:%{public}d,timeExp:" + "%{public}ld,return true.", + fixedScanCount, fixedScanTime, interval, count, timeExp); return true; } @@ -1770,13 +2032,13 @@ bool ScanService::AllowScanByIntervalExp(int &expScanCount, int &interval, int & return true; } -bool ScanService::AllowScanByIntervalContinue( - time_t &continueScanTime, int &lessThanIntervalCount, int &interval, int &count) +bool ScanService::AllowScanByIntervalContinue(time_t &continueScanTime, int &lessThanIntervalCount, int &interval, + int &count) { WIFI_LOGI("Enter ScanService::AllowScanByIntervalContinue.\n"); - WIFI_LOGD("lessThanIntervalCount:%{public}d, interval:%{public}d, count:%{public}d", - lessThanIntervalCount, interval, count); + WIFI_LOGD("lessThanIntervalCount:%{public}d, interval:%{public}d, count:%{public}d", lessThanIntervalCount, + interval, count); time_t now = time(nullptr); /* First scan */ if (continueScanTime == 0) { @@ -1850,5 +2112,62 @@ bool ScanService::AllowScanByIntervalBlocklist( blockListScanTime = now; return true; } + +bool ScanService::AllowScanByDisableScanCtrl() +{ + std::unique_lock lock(scanControlInfoMutex); + return !disableScanFlag; +} + +bool ScanService::AllowScanByMovingFreeze() +{ + LOGI("Enter ScanService::AllowScanByMovingFreeze.\n"); + + /* moving freeze trust mode. */ + bool isTrustListMode = IsScanTrustMode(); + if (isTrustListMode && IsInScanTrust(-1)) { + WIFI_LOGD("Trust list mode,sceneId(MovingFreeze) in the list, return true."); + return true; + } + + if (!IsMovingFreezeState()) { + WIFI_LOGD("It's not in the movingfreeze mode, return true."); + return true; + } + + if (!IsMovingFreezeScaned()) { + SetMovingFreezeScaned(true); + WIFI_LOGD("In movingfreeze mode, return true for the first scan."); + return true; + } else { + WIFI_LOGD("In movingfreeze mode, return false for the already scanned."); + return false; + } + + return true; +} + +bool ScanService::IsPackageInTrustList(const std::string &trustList, int sceneId, + const std::string &appPackageName) const +{ + std::vector trustPackages; + SplitString(trustList, "|", trustPackages); + + bool bFind = false; + for (const auto &package : trustPackages) { + if (package == appPackageName) { + WIFI_LOGD("IsPackageInTrustList=true"); + bFind = true; + break; + } + } + + if (!bFind) { + WIFI_LOGD("sceneId=%{public}d, appName=%{public}s trustList=%{public}s, not in the lists.", sceneId, + appPackageName.c_str(), trustList.c_str()); + } + + return bFind; +} } // namespace Wifi } // namespace OHOS diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.h index 046c0d8..9f22cdc 100755 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.h @@ -15,24 +15,24 @@ #ifndef OHOS_WIFI_SCAN_SERVICE_H #define OHOS_WIFI_SCAN_SERVICE_H -#include #include +#include +#include #include +#include +#include #include "iscan_service_callbacks.h" -#include "wifi_log.h" -#include "wifi_error_no.h" #include "define.h" +#include "wifi_scan_msg.h" +#include "wifi_errcode.h" #include "scan_common.h" #include "scan_monitor.h" #include "scan_state_machine.h" -#include "wifi_internal_msg.h" -#include "log_helper.h" namespace OHOS { namespace Wifi { const int DISCONNECTED_SCAN_INTERVAL = 20 * 60 * 1000; const int RESTART_PNO_SCAN_TIME = 5 * 1000; -const int SCREEN_CLOSED = 2; const int FREQS_24G_MAX_VALUE = 2500; const int FREQS_5G_MIN_VALUE = 5000; const int SECOND_TO_MICRO_SECOND = 1000000; @@ -43,10 +43,6 @@ const int CUSTOM_SCAN_SCENE = 2; const int SCREEN_SCAN_SCENE = 3; const int OTHER_SCAN_SCENE = 4; const int SYSTEM_SCAN_INIT_TIME = 20; -const int APP_FOREGROUND_SCAN = 0; -const int APP_BACKGROUND_SCAN = 1; -const int SYS_FOREGROUND_SCAN = 2; -const int SYS_BACKGROUND_SCAN = 3; class ScanService { FRIEND_GTEST(ScanService); @@ -65,6 +61,12 @@ public: * */ virtual void UnInitScanService(); + /** + * @Description Registers the callback function of the scanning module to the interface service. + * + * @param scanSerivceCallbacks callback function + */ + virtual void RegisterScanCallbacks(const IScanSerivceCallbacks &iScanSerivceCallbacks); /** * @Description Start a complete Wi-Fi scan. * @@ -79,6 +81,13 @@ public: * @return success: WIFI_OPT_SUCCESS, failed: WIFI_OPT_FAILED */ virtual ErrCode ScanWithParam(const WifiScanParams ¶ms); + /** + * @Description Disable/Restore the scanning operation. + * + * * @param params - disable or not. + * @return WIFI_OPT_SUCCESS: success, WIFI_OPT_FAILED: failed + */ + ErrCode DisableScan(bool disable); /** * @Description Starting a Single Scan. * @@ -126,15 +135,19 @@ public: /** * @Description Screen State (On/Off) Change Handler * - * @param screenOn - screen state[in] */ - virtual void HandleScreenStatusChanged(bool screenOn); + virtual void HandleScreenStatusChanged(); /** * @Description STA status change processing * * @param state - STA state[in] */ virtual void HandleStaStatusChanged(int status); + /** + * @Description movingfreeze status change processing + * + */ + virtual void HandleMovingFreezeChanged(); /** * @Description custom scene status change processing * @@ -142,24 +155,18 @@ public: * @param customSceneStatus custom scene status[in] */ virtual void HandleCustomStatusChanged(int customScene, int customSceneStatus); - /** - * @Description Sets the type of the app to be operated. + * @Description Get custom scene state. * - * @param appMode - Type of the app to be scanned. + * @param customState custom scene state map[out] + * @return */ - virtual void SetOperateAppMode(int appMode); + virtual void HandleGetCustomSceneState(std::map& sceneMap) const; /** * @Description Query and save the scan control policy. * */ virtual void GetScanControlInfo(); - /** - * @Description Obtain the scenario set by the customer through changeState. - * - * @param scene - Scenario value corresponding to the scenario - */ - virtual void SetCustomScene(int scene, time_t currentTime); /** * @Description When scanning control changes, the count data needs to be cleared. * @@ -177,39 +184,51 @@ private: using PnoScanInfoHandlerMap = std::map; IScanSerivceCallbacks mScanSerivceCallbacks; - ScanStateMachine *pScanStateMachine; /* Scanning state machine pointer */ - ScanMonitor *pScanMonitor; /* Scanning Monitor Pointer */ - bool scanStartedFlag; /* The scanning is started */ + ScanStateMachine *pScanStateMachine; /* Scanning state machine pointer */ + ScanMonitor *pScanMonitor; /* Scanning Monitor Pointer */ + bool scanStartedFlag; /* The scanning is started */ ScanInfoHandlerMap scanInfoHandlerMap; /* Map of obtaining the scanning result */ PnoScanInfoHandlerMap pnoScanInfoHandlerMap; /* Map of obtaining PNO scanning results */ - ScanConfigMap scanConfigMap; /* Save Scan Configuration */ - int scanConfigStoreIndex; /* Index for saving the scan configuration */ - int64_t pnoScanStartTime; /* PNO scanning start time */ - bool isScreenOn; /* Screen state */ - int staStatus; /* STA state */ - bool isPnoScanBegined; /* The PNO scanning has been started */ - bool autoNetworkSelection; /* Automatic network selection */ - int64_t lastSystemScanTime; /* Last System Scan Time */ - int pnoScanFailedNum; /* Number of PNO Scan Failures */ - ScanControlInfo scanControlInfo; /* Scan Control Policy */ - int operateAppMode; /* Operation app type */ - std::vector freqs2G; /* The support frequencys for 2.4G */ - std::vector freqs5G; /* The support frequencys for 5G */ - std::vector freqsDfs; /* The support frequencys for DFS */ - SystemScanIntervalMode systemScanIntervalMode; /* Store system scan data */ - PnoScanIntervalMode pnoScanIntervalMode; /* Store pno scan data */ - int customScene; /* Customer-defined scenario */ - time_t staCurrentTime; /* Indicates the time when the STA enters the STA scenario */ + ScanConfigMap scanConfigMap; /* Save Scan Configuration */ + int scanConfigStoreIndex; /* Index for saving the scan configuration */ + int64_t pnoScanStartTime; /* PNO scanning start time */ + int staStatus; /* STA state */ + bool isPnoScanBegined; /* The PNO scanning has been started */ + bool autoNetworkSelection; /* Automatic network selection */ + int64_t lastSystemScanTime; /* Last System Scan Time */ + int pnoScanFailedNum; /* Number of PNO Scan Failures */ + ScanControlInfo scanControlInfo; /* Scan Control Policy */ + bool disableScanFlag; /* Disable Scan Flag. */ + std::vector freqs2G; /* The support frequencys for 2.4G */ + std::vector freqs5G; /* The support frequencys for 5G */ + std::vector freqsDfs; /* The support frequencys for DFS */ + SystemScanIntervalMode systemScanIntervalMode; /* Store system scan data */ + PnoScanIntervalMode pnoScanIntervalMode; /* Store pno scan data */ + time_t staCurrentTime; /* Indicates the time when the STA enters the STA scenario */ time_t customCurrentTime; /* Indicates the time when the STA enters the Customer-defined scenario */ - std::vector appForbidList; /* Store extern app scan data */ - std::vector scanBlocklist; /* - * If the number of consecutive count times is less than - * the value of interval, the user is added to the blocklist - * and cannot be scanned. - */ - std::vector fullAppForbidList; /* Stores data that is scanned and controlled regardless of - applications. */ - std::map customSceneTimeMap; /* Record the time when a scene is entered. */ + std::vector appForbidList; /* Store extern app scan data */ + /* + * If the number of consecutive count times is less than the value of + * interval, the user is added to the blocklist and cannot be scanned. + */ + std::vector scanBlocklist; + /* Stores data that is scanned and controlled regardless of applications. */ + std::vector fullAppForbidList; + std::map customSceneTimeMap; /* Record the time when a scene is entered. */ + int staSceneForbidCount; + int customSceneForbidCount; + mutable std::mutex scanConfigMapMutex; + mutable std::mutex scanControlInfoMutex; + enum class ScanType { + SCAN_TYPE_EXTERN = 0, + SCAN_TYPE_SYSTEMTIMER, + SCAN_TYPE_PNO, + }; + bool scanTrustMode; /* scan trustlist mode */ + std::unordered_set scanTrustSceneIds; /* scan scene ids */ + bool isAbsFreezeState; /* absolute freeze state. */ + bool isAbsFreezeScaned; /* scanned in freeze state. */ + int scanResultBackup; /* scan result backup. */ /** * @Description Obtains the frequency of a specified band. @@ -250,7 +269,7 @@ private: * @param scanInfoList - scan result list[in] * @return success: true, failed: false */ - bool StoreUserScanInfo(const StoreScanConfig &scanConfig, const std::vector &scanInfoList); + bool StoreUserScanInfo(const StoreScanConfig &scanConfig, std::vector &scanInfoList); /** * @Description Sends the scanning result to the interface service, * which then sends the scanning result to the connection @@ -259,14 +278,16 @@ private: * @param scanInfoList - scan result list[in] */ void ReportScanInfos(std::vector &interScanList); + /** - * @Description Convert the scanning result to the format of the interface service. + * @Description Sends the store scanning result to the interface service, + * which then sends the store scanning result to the connection + * management module for processing. * * @param scanInfoList - scan result list[in] - * @param scanInfoList - Converted list[out] */ - void ConvertScanInfos( - const std::vector &interScanList, std::vector &scanInfoList); + void ReportStoreScanInfos(std::vector &interScanList); + /** * @Description Enter the PNO scanning message body. * @@ -325,31 +346,106 @@ private: * */ void RestartPnoScanTimeOut(); - /** - * @Description Querying the screen status. - * - */ - void GetScreenState(); /** * @Description Determines whether external scanning is allowed based on the scanning policy. * - * @param appId - ID of the app to be scanned.[in] * @return success: true, failed: false */ - bool AllowExternScan(int appId); + ErrCode AllowExternScan(); /** * @Description Determine whether to allow scheduled system scanning. * * @return success: true, failed: false */ - bool AllowSystemTimerScan(); + ErrCode AllowSystemTimerScan(); /** * @Description Determines whether to allow PNO scanning based on the scanning policy. * * @return success: true, failed: false */ - bool AllowPnoScan(); + ErrCode AllowPnoScan(); + /** + * @Description Determines whether to allow scanning based on the scanning type.. + * + * @param scanType - scan type: 0 - Extern; 1 - SystemTimer 2 Pno + * @return true: allow, false: not allowed. + */ + ErrCode AllowScanByType(ScanType scanType); + /** + * @Description Set the current mode to trust list mode. + * + */ + void SetScanTrustMode(); + /** + * @Description Reset to non scan trust list mode. + * + */ + void ResetToNonTrustMode(); + /** + * @Description Is it the trust list mode? + * + * @param sceneId - current scene id[out]. + * @return true: success, false: failed + */ + bool IsScanTrustMode() const; + /** + * @Description Add the scene id to trust list. + * Assume that the scene id of moving freeze is -1. + * + * @param sceneId - scene id. + */ + void AddScanTrustSceneId(int sceneId); + /** + * @Description Clear trust list. + * + */ + void ClearScanTrustSceneIds(); + /** + * @Description Is sceneId in trust list. + * + * @param sceneId - scene id. + */ + bool IsInScanTrust(int sceneId) const; + /** + * @Description Set the moving freeze status by state. + * + * @param state - state value. + */ + void SetMovingFreezeState(bool state); + /** + * @Description Is it the moving freeze state? + * + * @return true: success, false: failed + */ + bool IsMovingFreezeState() const; + /** + * @Description Set the moving freeze state to scanned. + * + * @param scanned - scanned flag. + */ + void SetMovingFreezeScaned(bool scanned); /** + * @Description Whether scanned in moving freeze state.? + * + */ + bool IsMovingFreezeScaned() const; + /** + * @Description Apply trustlists scanning policies. + * + * @param scanType - scan type: 0 - Extern; 1 - SystemTimer 2 Pno + * @return true: success, false: failed + */ + ErrCode ApplyTrustListPolicy(ScanType scanType); + /* * + * @Description Apply trustlists and moving freeze scanning policies. + * + * @param scanType - type: 0 - Extern; 1 - SystemTimer 2 Pno + * @return WIFI_OPT_SUCCESS: success, + * WIFI_OPT_FAILED: general scan control fail, + * WIFI_OPT_MOVING_FREEZE_CTRL: moving freeze scan control fail. + */ + ErrCode ApplyScanPolices(ScanType type); + /* * * @Description Obtains the current screen. * * @return success: ScanScene, failed: SCAN_SCENE_MAX @@ -379,7 +475,13 @@ private: * * @return success: true, failed: false */ - bool IsExternScanning(); + bool IsExternScanning() const; + /** + * @Description Indicates whether scanning with parameter. + * + * @return success: true, failed: false + */ + bool IsScanningWithParam(); /** * @Description Adjust the frequency band and frequency based on the scanning policy. * @@ -413,12 +515,6 @@ private: * @param freqs - frequency list[in] */ void Delete5GhzFreqs(std::vector &freqs); - /** - * @Description Obtains the type of the app to be operated. - * - * @return success: ScanMode, failed: others - */ - ScanMode GetOperateAppMode(); /** * @Description Get the ssid of saved networks. * @@ -449,7 +545,7 @@ private: * @return true - success * @return false - failed */ - bool AllowScanDuringScanning(ScanMode scanMode); + bool AllowScanDuringScanning(ScanMode scanMode) const; /** * @Description Check whether the scan mode can be used during screen off under the forbid mode control. * @@ -457,7 +553,7 @@ private: * @return true - success * @return false - failed */ - bool AllowScanDuringScreenOff(ScanMode scanMode); + bool AllowScanDuringScreenOff(ScanMode scanMode) const; /** * @Description * @@ -586,6 +682,48 @@ private: */ bool AllowScanByIntervalBlocklist( int appId, time_t &blockListScanTime, int &lessThanIntervalCount, int &interval, int &count); + + /** + * @Description Determines whether scanning is allowed by disable scan control. + * + * @return true: allow, false: not allowed. + */ + bool AllowScanByDisableScanCtrl(); + + /** + * @Description Determines whether scanning is allowed in movingfreeze mode. + * + * @return true: allow, false: not allowed. + */ + bool AllowScanByMovingFreeze(); + + /** + * @Description Is the app in the trustlist? + * + * @param trustList trustlist[in] + * @param sceneId scene id[in] + * @param appPackageName app package name[in] + * @return true: in the trustlist, false: not in the trustlist. + */ + bool IsPackageInTrustList(const std::string& trustList, int sceneId, const std::string &appPackageName) const; + /* * + * @Description all scan check at custom check. + * + * @param customIter custom iterator[in] + * @param scanMode scene mode[in] + * @return true: allow, false: not allowed. + */ + bool AllowCustomSceneCheck(const std::map::const_iterator &customIter, ScanMode scanMode); + /* * + * @Description all extern scan check at custom check. + * + * @param customIter custom iterator[in] + * @param appId app id[in] + * @param scanMode scene mode[in] + * @return true: allow, false: not allowed. + */ + bool AllowExternCustomSceneCheck(const std::map::const_iterator &customIter, int appId, + ScanMode scanMode); }; } // namespace Wifi } // namespace OHOS diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_stub.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_stub.cpp index 4c4de8e..dbd8ad3 100755 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_stub.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_stub.cpp @@ -21,9 +21,10 @@ #include "wifi_internal_event_dispatcher.h" #include "wifi_scan_death_recipient.h" +DEFINE_WIFILOG_SCAN_LABEL("WifiScanStub"); + namespace OHOS { namespace Wifi { -DEFINE_WIFILOG_SCAN_LABEL("WifiScanStub"); WifiScanStub::WifiScanStub() : callback_(nullptr), mSingleCallback(false) {} @@ -83,45 +84,26 @@ sptr WifiScanStub::GetCallback() const int WifiScanStub::OnSetScanControlInfo(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) { - WIFI_LOGD("run OnSetScanControlInfo code %{public}u, datasize %zu", code, data.GetRawDataSize()); + WIFI_LOGD("run OnSetScanControlInfo code %{public}u, datasize %{public}zu", code, data.GetRawDataSize()); ScanControlInfo info; - int forbidMapSize = data.ReadInt32(); - for (int i = 0; i < forbidMapSize; i++) { - int tmp = data.ReadInt32(); - int modeMapSize = data.ReadInt32(); - std::vector scanModeList; - for (int j = 0; j < modeMapSize; j++) { - ScanForbidMode scanForbidMode; - int tmpScanMode = data.ReadInt32(); - if (tmpScanMode < 0 || tmpScanMode >= int(ScanMode::SCAN_MODE_MAX)) { - continue; - } - scanForbidMode.scanMode = ScanMode(tmpScanMode); - scanForbidMode.forbidTime = data.ReadInt32(); - scanForbidMode.forbidCount = data.ReadInt32(); - scanModeList.push_back(scanForbidMode); - } - if (tmp < 0 || tmp >= int(SCAN_SCENE_MAX)) { - continue; - } - info.scanForbidMap.insert(std::pair>(tmp, scanModeList)); + int forbidListSize = data.ReadInt32(); + for (int i = 0; i < forbidListSize; i++) { + ScanForbidMode scanForbidMode; + scanForbidMode.scanScene = data.ReadInt32(); + scanForbidMode.scanMode = static_cast(data.ReadInt32()); + scanForbidMode.forbidTime = data.ReadInt32(); + scanForbidMode.forbidCount = data.ReadInt32(); + info.scanForbidList.push_back(scanForbidMode); } int intervalSize = data.ReadInt32(); for (int i = 0; i < intervalSize; i++) { ScanIntervalMode scanIntervalMode; scanIntervalMode.scanScene = data.ReadInt32(); - int mode = data.ReadInt32(); - if (mode < 0 || mode >= int(ScanMode::SCAN_MODE_MAX)) { - continue; - } - scanIntervalMode.scanMode = ScanMode(mode); - scanIntervalMode.isSingle = data.ReadInt32(); - scanIntervalMode.intervalMode = (IntervalMode)data.ReadInt32(); + scanIntervalMode.scanMode = static_cast(data.ReadInt32()); + scanIntervalMode.isSingle = data.ReadBool(); + scanIntervalMode.intervalMode = static_cast(data.ReadInt32()); scanIntervalMode.interval = data.ReadInt32(); - if (scanIntervalMode.interval < MIN_SCAN_INTERVAL) { - continue; - } scanIntervalMode.count = data.ReadInt32(); info.scanIntervalList.push_back(scanIntervalMode); } @@ -135,7 +117,7 @@ int WifiScanStub::OnSetScanControlInfo(uint32_t code, MessageParcel &data, Messa int WifiScanStub::OnScan(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) { - WIFI_LOGD("run OnScan code %{public}u, datasize %zu", code, data.GetRawDataSize()); + WIFI_LOGD("run OnScan code %{public}u, datasize %{public}zu", code, data.GetRawDataSize()); ErrCode ret = Scan(); reply.WriteInt32(0); reply.WriteInt32(ret); @@ -145,7 +127,7 @@ int WifiScanStub::OnScan(uint32_t code, MessageParcel &data, MessageParcel &repl int WifiScanStub::OnScanByParams(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) { - WIFI_LOGD("run OnScanByParams code %{public}u, datasize %zu", code, data.GetRawDataSize()); + WIFI_LOGD("run OnScanByParams code %{public}u, datasize %{public}zu", code, data.GetRawDataSize()); WifiScanParams params; params.ssid = data.ReadCString(); params.bssid = data.ReadCString(); @@ -165,7 +147,7 @@ int WifiScanStub::OnScanByParams(uint32_t code, MessageParcel &data, MessageParc int WifiScanStub::OnIsWifiClosedScan(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) { - WIFI_LOGD("run OnIsWifiClosedScan code %{public}u, datasize %zu", code, data.GetRawDataSize()); + WIFI_LOGD("run OnIsWifiClosedScan code %{public}u, datasize %{public}zu", code, data.GetRawDataSize()); bool bOpen = false; ErrCode ret = IsWifiClosedScan(bOpen); reply.WriteInt32(0); @@ -178,7 +160,7 @@ int WifiScanStub::OnIsWifiClosedScan(uint32_t code, MessageParcel &data, Message int WifiScanStub::OnGetScanInfoList(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) { - WIFI_LOGD("run OnGetScanInfoList code %{public}u, datasize %zu", code, data.GetRawDataSize()); + WIFI_LOGD("run OnGetScanInfoList code %{public}u, datasize %{public}zu", code, data.GetRawDataSize()); std::vector result; ErrCode ret = GetScanInfoList(result); reply.WriteInt32(0); @@ -216,7 +198,7 @@ int WifiScanStub::OnGetScanInfoList(uint32_t code, MessageParcel &data, MessageP int WifiScanStub::OnRegisterCallBack(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) { - WIFI_LOGD("run %{public}s code %{public}u, datasize %zu", __func__, code, data.GetRawDataSize()); + WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); ErrCode ret = WIFI_OPT_FAILED; do { sptr remote = data.ReadRemoteObject(); diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp index 368f7fb..fa20f67 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp @@ -72,7 +72,7 @@ void StaMonitor::SetStateMachine(StaStateMachine *paraStaStateMachine) } void StaMonitor::OnConnectChangedCallBack(int status, int networkId,const std::string &bssid) { - WIFI_LOGI("OnConnectChangedCallBack() status:%{public}d,networkId=%{public}d,bssid={private}%s", + WIFI_LOGI("OnConnectChangedCallBack() status:%{public}d,networkId=%{public}d,bssid=%{private}s", status, networkId, bssid.c_str()); diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_config_center_test.cpp b/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_config_center_test.cpp index 9ffa1fa..3ecb4d9 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_config_center_test.cpp +++ b/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_config_center_test.cpp @@ -357,7 +357,7 @@ HWTEST_F(WifiConfigCenterTest, SetGetAirplaneModeState_SUCCESS, TestSize.Level1) HWTEST_F(WifiConfigCenterTest, SetGetAppRunningState_SUCCESS, TestSize.Level1) { - int mode = 1; + ScanMode mode = ScanMode::APP_BACKGROUND_SCAN; WifiConfigCenter::GetInstance().SetAppRunningState(mode); EXPECT_EQ(mode, WifiConfigCenter::GetInstance().GetAppRunningState()); } diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_service.cpp b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_service.cpp index 7abdfc5..1a001a5 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_service.cpp +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_service.cpp @@ -57,9 +57,8 @@ void MockScanService::SystemScanProcess(bool scanAtOnce) WIFI_LOGI("Enter MockScanService::SystemScanProcess"); } -void MockScanService::HandleScreenStatusChanged(bool screenOn) +void MockScanService::HandleScreenStatusChanged() { - (void)screenOn; WIFI_LOGI("Enter MockScanService::HandleScreenStatusChanged"); } @@ -76,10 +75,10 @@ void MockScanService::HandleCustomStatusChanged(int customScene, int customScene WIFI_LOGI("Enter MockScanService::HandleCustomStatusChanged"); } -void MockScanService::SetOperateAppMode(int appMode) +void MockScanService::HandleGetCustomSceneState(std::map& sceneMap) const { - (void)appMode; - WIFI_LOGI("Enter MockScanService::SetOperateAppMode"); + (void)sceneMap; + WIFI_LOGI("Enter MockScanService::HandleGetCustomSceneState"); } void MockScanService::GetScanControlInfo() diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_service.h b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_service.h index 03a6a48..ea49c00 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_service.h +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_service.h @@ -30,10 +30,10 @@ public: ErrCode Scan(bool externFlag); ErrCode ScanWithParam(const WifiScanParams ¶ms); void SystemScanProcess(bool scanAtOnce); - void HandleScreenStatusChanged(bool screenOn); + void HandleScreenStatusChanged(); void HandleStaStatusChanged(int status); void HandleCustomStatusChanged(int customScene, int customSceneStatus); - void SetOperateAppMode(int appMode); + void HandleGetCustomSceneState(std::map& sceneMap) const; void GetScanControlInfo(); void ClearScanControlValue(); void SetStaCurrentTime(); diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_settings.h b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_settings.h index 77eaedf..8162760 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_settings.h +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_settings.h @@ -16,6 +16,7 @@ #define OHOS_MOCK_WIFI_SETTINGS_H #include "wifi_msg.h" +#include "wifi_internal_msg.h" #include namespace OHOS { @@ -28,12 +29,19 @@ public: virtual int GetScanControlInfo(ScanControlInfo &info) = 0; virtual int SetScanControlInfo(const ScanControlInfo &info) = 0; virtual void SetScreenState(const int &state) = 0; - virtual int GetScreenState() = 0; + virtual int GetScreenState() const = 0; + virtual ScanMode GetAppRunningState() const = 0; + virtual const std::string& GetAppPackageName() const = 0; + virtual int GetFreezeModeState() const = 0; + virtual int GetNoChargerPlugModeState() const = 0; + virtual void SetSupportHwPnoFlag(bool supportHwPnoFlag) = 0; virtual bool GetSupportHwPnoFlag() = 0; virtual int GetMinRssi2Dot4Ghz() = 0; virtual int GetMinRssi5Ghz() = 0; virtual bool GetWhetherToAllowNetworkSwitchover() = 0; virtual int GetDeviceConfig(std::vector &results) = 0; + virtual const std::vector& ReloadTrustListPolicies() = 0; + virtual const MovingFreezePolicy& ReloadMovingFreezePolicy() = 0; }; class WifiSettings : public MockWifiSettings { @@ -45,12 +53,19 @@ public: MOCK_METHOD1(GetScanControlInfo, int(ScanControlInfo &info)); MOCK_METHOD1(SetScanControlInfo, int(const ScanControlInfo &info)); MOCK_METHOD1(SetScreenState, void(const int &state)); - MOCK_METHOD0(GetScreenState, int()); + MOCK_CONST_METHOD0(GetScreenState, int()); + MOCK_CONST_METHOD0(GetAppRunningState, ScanMode()); + MOCK_CONST_METHOD0(GetAppPackageName, const std::string&()); + MOCK_CONST_METHOD0(GetFreezeModeState, int()); + MOCK_CONST_METHOD0(GetNoChargerPlugModeState, int()); + MOCK_METHOD1(SetSupportHwPnoFlag, void(bool supportHwPnoFlag)); MOCK_METHOD0(GetSupportHwPnoFlag, bool()); MOCK_METHOD0(GetMinRssi2Dot4Ghz, int()); MOCK_METHOD0(GetMinRssi5Ghz, int()); MOCK_METHOD0(GetWhetherToAllowNetworkSwitchover, bool()); MOCK_METHOD1(GetDeviceConfig, int(std::vector &results)); + MOCK_METHOD0(ReloadTrustListPolicies, const std::vector&()); + MOCK_METHOD0(ReloadMovingFreezePolicy, const MovingFreezePolicy&()); }; } // namespace Wifi } // namespace OHOS diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface_test.cpp b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface_test.cpp index 513d1b3..22d1f04 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface_test.cpp +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface_test.cpp @@ -95,13 +95,13 @@ HWTEST_F(ScanInterfaceTest, ScanWithParamSuccess, TestSize.Level1) HWTEST_F(ScanInterfaceTest, OnScreenStateChangedSuccess1, TestSize.Level1) { - int screenState = STATE_OPEN; + int screenState = MODE_STATE_OPEN; EXPECT_EQ(WIFI_OPT_SUCCESS, pScanInterface->OnScreenStateChanged(screenState)); } HWTEST_F(ScanInterfaceTest, OnScreenStateChangedSuccess2, TestSize.Level1) { - int screenState = STATE_CLOSE; + int screenState = MODE_STATE_CLOSE; EXPECT_EQ(WIFI_OPT_SUCCESS, pScanInterface->OnScreenStateChanged(screenState)); } @@ -118,12 +118,12 @@ HWTEST_F(ScanInterfaceTest, OnClientModeStatusChangedSuccess, TestSize.Level1) HWTEST_F(ScanInterfaceTest, OnAppRunningModeChangedSuccess, TestSize.Level1) { - EXPECT_EQ(WIFI_OPT_SUCCESS, pScanInterface->OnAppRunningModeChanged(0)); + EXPECT_EQ(WIFI_OPT_SUCCESS, pScanInterface->OnAppRunningModeChanged(ScanMode::APP_FOREGROUND_SCAN)); } HWTEST_F(ScanInterfaceTest, OnCustomControlStateChangedSuccess, TestSize.Level1) { - int customSceneStatus = STATE_OPEN; + int customSceneStatus = MODE_STATE_OPEN; EXPECT_EQ(WIFI_OPT_SUCCESS, pScanInterface->OnCustomControlStateChanged(0, customSceneStatus)); } diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service_test.cpp b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service_test.cpp index 1a6f8e1..877122c 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service_test.cpp +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service_test.cpp @@ -43,7 +43,7 @@ public: EXPECT_CALL(WifiStaHalInterface::GetInstance(), StopPnoScan()).Times(AtLeast(0)); pScanService = std::make_unique(); pScanService->pScanStateMachine = new MockScanStateMachine(); - pScanService->mScanSerivceCallbacks = WifiManager::GetInstance().GetScanCallback(); + pScanService->RegisterScanCallbacks(WifiManager::GetInstance().GetScanCallback()); } virtual void TearDown() { @@ -268,7 +268,6 @@ public: { ScanConfig scanConfig; scanConfig.scanBand = SCAN_BAND_24_GHZ; - ; scanConfig.externFlag = true; scanConfig.scanStyle = SCAN_TYPE_HIGH_ACCURACY; EXPECT_EQ(true, pScanService->SingleScan(scanConfig)); @@ -554,8 +553,7 @@ public: void HandleScreenStatusChangedSuccess() { - pScanService->HandleScreenStatusChanged(false); - pScanService->HandleScreenStatusChanged(true); + pScanService->HandleScreenStatusChanged(); } void HandleStaStatusChangedSuccess1() @@ -582,7 +580,7 @@ public: { EXPECT_CALL(WifiSettings::GetInstance(), GetWhetherToAllowNetworkSwitchover()).Times(AtLeast(0)); int customScene = 0; - int customSceneStatus = STATE_CLOSE; + int customSceneStatus = MODE_STATE_CLOSE; pScanService->HandleCustomStatusChanged(customScene, customSceneStatus); } @@ -590,15 +588,15 @@ public: { EXPECT_CALL(WifiSettings::GetInstance(), GetWhetherToAllowNetworkSwitchover()).Times(AtLeast(0)); int customScene = 0; - int customSceneStatus = STATE_OPEN; + int customSceneStatus = MODE_STATE_OPEN; pScanService->HandleCustomStatusChanged(customScene, customSceneStatus); } void SystemScanProcessSuccess1() { EXPECT_CALL(WifiSettings::GetInstance(), GetWhetherToAllowNetworkSwitchover()); - pScanService->isScreenOn = true; ScanIntervalMode mode; + mode.scanScene = SCAN_SCENE_ALL; mode.scanMode = ScanMode::SYSTEM_TIMER_SCAN; mode.isSingle = false; pScanService->scanControlInfo.scanIntervalList.push_back(mode); @@ -610,7 +608,6 @@ public: EXPECT_CALL(WifiSettings::GetInstance(), GetWhetherToAllowNetworkSwitchover()); EXPECT_CALL(WifiSettings::GetInstance(), GetMinRssi2Dot4Ghz()).Times(AtLeast(0)); EXPECT_CALL(WifiSettings::GetInstance(), GetMinRssi5Ghz()).Times(AtLeast(0)); - pScanService->isScreenOn = false; pScanService->SystemScanProcess(true); } @@ -660,51 +657,10 @@ public: EXPECT_CALL(WifiSettings::GetInstance(), GetScanControlInfo(_)).WillRepeatedly(Return(-1)); pScanService->GetScanControlInfo(); } - - void GetScreenStateSuccess() - { - EXPECT_CALL(WifiSettings::GetInstance(), GetScreenState()).WillRepeatedly(Return(SCREEN_CLOSED)); - pScanService->GetScreenState(); - } - - void SetOperateAppModeSuccess() - { - pScanService->SetOperateAppMode(0); - } - - void GetOperateAppModeSuccess1() - { - pScanService->operateAppMode = APP_FOREGROUND_SCAN; - EXPECT_EQ(ScanMode::APP_FOREGROUND_SCAN, pScanService->GetOperateAppMode()); - } - - void GetOperateAppModeSuccess2() - { - pScanService->operateAppMode = APP_BACKGROUND_SCAN; - EXPECT_EQ(ScanMode::APP_BACKGROUND_SCAN, pScanService->GetOperateAppMode()); - } - - void GetOperateAppModeSuccess3() - { - pScanService->operateAppMode = SYS_FOREGROUND_SCAN; - EXPECT_EQ(ScanMode::SYS_FOREGROUND_SCAN, pScanService->GetOperateAppMode()); - } - - void GetOperateAppModeSuccess4() - { - pScanService->operateAppMode = SYS_BACKGROUND_SCAN; - EXPECT_EQ(ScanMode::SYS_BACKGROUND_SCAN, pScanService->GetOperateAppMode()); - } - - void GetOperateAppModeFail() - { - pScanService->operateAppMode = MAX_PNO_SCAN_FAILED_NUM; - EXPECT_EQ(ScanMode::SYS_FOREGROUND_SCAN, pScanService->GetOperateAppMode()); - } - + void AllowExternScanSuccess() { - pScanService->AllowExternScan(0); + pScanService->AllowExternScan(); } void AllowExternScanFail1() @@ -713,13 +669,21 @@ public: StoreScanConfig cfg; cfg.externFlag = true; pScanService->scanConfigMap.emplace(staScene, cfg); - pScanService->AllowExternScan(0); + + ScanMode scanMode = ScanMode::SYS_FOREGROUND_SCAN; + ScanForbidMode forbidMode; + forbidMode.scanScene = SCAN_SCENE_SCANNING; + forbidMode.scanMode = scanMode; + pScanService->scanControlInfo.scanForbidList.push_back(forbidMode); + + pScanService->AllowExternScan(); } void AllowSystemTimerScanSuccess() { EXPECT_CALL(WifiSettings::GetInstance(), GetWhetherToAllowNetworkSwitchover()); ScanIntervalMode mode; + mode.scanScene = SCAN_SCENE_ALL; mode.scanMode = ScanMode::SYSTEM_TIMER_SCAN; mode.isSingle = false; pScanService->scanControlInfo.scanIntervalList.push_back(mode); @@ -729,6 +693,7 @@ public: void AllowPnoScanSuccess() { ScanIntervalMode mode; + mode.scanScene = SCAN_SCENE_ALL; mode.scanMode = ScanMode::PNO_SCAN; mode.isSingle = false; pScanService->scanControlInfo.scanIntervalList.push_back(mode); @@ -741,11 +706,126 @@ public: StoreScanConfig cfg; cfg.externFlag = true; pScanService->scanConfigMap.emplace(staScene, cfg); - pScanService->isScreenOn = false; ScanMode scanMode = ScanMode::SYS_FOREGROUND_SCAN; EXPECT_EQ(pScanService->AllowExternScanByForbid(staScene, scanMode), true); } + void AllowExternScanByForbidFail1() + { + int staScene = 0; + StoreScanConfig cfg; + cfg.externFlag = true; + pScanService->scanConfigMap.emplace(staScene, cfg); + + ScanMode scanMode = ScanMode::SYS_FOREGROUND_SCAN; + ScanForbidMode forbidMode; + forbidMode.scanScene = SCAN_SCENE_SCANNING; + forbidMode.scanMode = scanMode; + pScanService->scanControlInfo.scanForbidList.push_back(forbidMode); + + EXPECT_EQ(pScanService->AllowExternScanByForbid(staScene, scanMode), false); + } + + void AllowExternScanByForbidFail2() + { + int staScene = 0; + StoreScanConfig cfg; + cfg.externFlag = true; + pScanService->scanConfigMap.emplace(staScene, cfg); + + ScanMode scanMode = ScanMode::SYS_FOREGROUND_SCAN; + ScanForbidMode forbidMode; + forbidMode.scanScene = SCAN_SCENE_SCANNING; + forbidMode.scanMode = ScanMode::ALL_EXTERN_SCAN; + pScanService->scanControlInfo.scanForbidList.push_back(forbidMode); + + EXPECT_EQ(pScanService->AllowExternScanByForbid(staScene, scanMode), false); + } + + void AllowExternScanByForbidFail3() + { + int staScene = 0; + ScanMode scanMode = ScanMode::SYS_FOREGROUND_SCAN; + ScanForbidMode forbidMode; + forbidMode.scanScene = SCAN_SCENE_SCREEN_OFF; + forbidMode.scanMode = scanMode; + pScanService->scanControlInfo.scanForbidList.push_back(forbidMode); + EXPECT_EQ(pScanService->AllowExternScanByForbid(staScene, scanMode), false); + } + + void AllowExternScanByForbidFail4() + { + int staScene = 0; + ScanMode scanMode = ScanMode::SYS_FOREGROUND_SCAN; + ScanForbidMode forbidMode; + forbidMode.scanScene = SCAN_SCENE_SCREEN_OFF; + forbidMode.scanMode = ScanMode::ALL_EXTERN_SCAN; + pScanService->scanControlInfo.scanForbidList.push_back(forbidMode); + EXPECT_EQ(pScanService->AllowExternScanByForbid(staScene, scanMode), false); + } + + void AllowExternScanByForbidFail5() + { + int staScene = 0; + ScanMode scanMode = ScanMode::SYS_FOREGROUND_SCAN; + ScanForbidMode scanForbidMode; + scanForbidMode.scanScene = staScene; + scanForbidMode.scanMode = scanMode; + scanForbidMode.forbidTime = 0; + scanForbidMode.forbidCount = 0; + pScanService->scanControlInfo.scanForbidList.push_back(scanForbidMode); + EXPECT_EQ(pScanService->AllowExternScanByForbid(staScene, scanMode), false); + } + + void AllowExternScanByForbidFail6() + { + int staScene = 0; + ScanMode scanMode = ScanMode::SYS_FOREGROUND_SCAN; + ScanForbidMode scanForbidMode; + scanForbidMode.scanScene = staScene; + scanForbidMode.scanMode = ScanMode::ALL_EXTERN_SCAN; + scanForbidMode.forbidTime = 0; + scanForbidMode.forbidCount = 0; + pScanService->scanControlInfo.scanForbidList.push_back(scanForbidMode); + EXPECT_EQ(pScanService->AllowExternScanByForbid(staScene, scanMode), false); + } + + void AllowExternScanByForbidFail7() + { + int staScene = 0; + ScanMode scanMode = ScanMode::SYS_FOREGROUND_SCAN; + time_t now = time(nullptr); + if (now < 0) { + return; + } + pScanService->customSceneTimeMap.emplace(staScene, now); + ScanForbidMode scanForbidMode; + scanForbidMode.scanScene = staScene; + scanForbidMode.scanMode = scanMode; + scanForbidMode.forbidTime = 0; + scanForbidMode.forbidCount = 0; + pScanService->scanControlInfo.scanForbidList.push_back(scanForbidMode); + EXPECT_EQ(pScanService->AllowExternScanByForbid(staScene, scanMode), false); + } + + void AllowExternScanByForbidFail8() + { + int staScene = 0; + ScanMode scanMode = ScanMode::SYS_FOREGROUND_SCAN; + time_t now = time(nullptr); + if (now < 0) { + return; + } + pScanService->customSceneTimeMap.emplace(staScene, now); + ScanForbidMode scanForbidMode; + scanForbidMode.scanScene = staScene; + scanForbidMode.scanMode = ScanMode::ALL_EXTERN_SCAN; + scanForbidMode.forbidTime = 0; + scanForbidMode.forbidCount = 0; + pScanService->scanControlInfo.scanForbidList.push_back(scanForbidMode); + EXPECT_EQ(pScanService->AllowExternScanByForbid(staScene, scanMode), false); + } + void AllowExternScanByIntervaluccess() { pScanService->AllowExternScanByInterval(0, 0, ScanMode::SYS_FOREGROUND_SCAN); @@ -777,10 +857,14 @@ public: void GetStaSceneSuccess5() { + pScanService->staStatus = static_cast(OperateResState::CONNECT_ASSOCIATING); + EXPECT_EQ(SCAN_SCENE_ASSOCIATING, pScanService->GetStaScene()); } void GetStaSceneSuccess6() { + pScanService->staStatus = static_cast(OperateResState::CONNECT_ASSOCIATED); + EXPECT_EQ(SCAN_SCENE_ASSOCIATED, pScanService->GetStaScene()); } void GetStaSceneFail() @@ -925,28 +1009,159 @@ public: EXPECT_EQ(pScanService->AllowScanDuringScanning(scanMode), true); } + void AllowScanDuringScanningFail() + { + ScanMode scanMode = ScanMode::SYS_FOREGROUND_SCAN; + ScanForbidMode forbidMode; + forbidMode.scanScene = SCAN_SCENE_SCANNING; + forbidMode.scanMode = scanMode; + pScanService->scanControlInfo.scanForbidList.push_back(forbidMode); + EXPECT_EQ(pScanService->AllowScanDuringScanning(scanMode), false); + } + void AllowScanDuringScreenOffSuccess() { ScanMode scanMode = ScanMode::SYS_FOREGROUND_SCAN; EXPECT_EQ(pScanService->AllowScanDuringScreenOff(scanMode), true); } + void AllowScanDuringScreenOffFail1() + { + ScanMode scanMode = ScanMode::SYS_FOREGROUND_SCAN; + ScanForbidMode forbidMode; + forbidMode.scanScene = SCAN_SCENE_SCREEN_OFF; + forbidMode.scanMode = scanMode; + pScanService->scanControlInfo.scanForbidList.push_back(forbidMode); + + EXPECT_EQ(pScanService->AllowScanDuringScreenOff(scanMode), false); + } + void AllowScanDuringStaSceneSuccess1() { const int staScene = 0; ScanMode scanMode = ScanMode::SYS_FOREGROUND_SCAN; + ScanForbidMode scanForbidMode; + scanForbidMode.scanScene = staScene; + scanForbidMode.scanMode = scanMode; + scanForbidMode.forbidTime = 1; + scanForbidMode.forbidCount = 1; + pScanService->staSceneForbidCount = 1; time_t nowTime = time(nullptr); const int timeForTest = 2; pScanService->staCurrentTime = nowTime - timeForTest; + pScanService->scanControlInfo.scanForbidList.push_back(scanForbidMode); EXPECT_EQ(pScanService->AllowScanDuringStaScene(staScene, scanMode), true); } + void AllowScanDuringStaSceneFail1() + { + const int staScene = 0; + ScanMode scanMode = ScanMode::SYS_FOREGROUND_SCAN; + ScanForbidMode scanForbidMode; + scanForbidMode.scanScene = staScene; + scanForbidMode.scanMode = scanMode; + scanForbidMode.forbidTime = 0; + scanForbidMode.forbidCount = 0; + pScanService->scanControlInfo.scanForbidList.push_back(scanForbidMode); + EXPECT_EQ(pScanService->AllowScanDuringStaScene(staScene, scanMode), false); + } + + void AllowScanDuringStaSceneFail2() + { + const int staScene = 0; + ScanMode scanMode = ScanMode::SYS_FOREGROUND_SCAN; + ScanForbidMode scanForbidMode; + scanForbidMode.scanScene = staScene; + scanForbidMode.scanMode = scanMode; + scanForbidMode.forbidTime = 1; + scanForbidMode.forbidCount = 1; + pScanService->staSceneForbidCount = 0; + pScanService->scanControlInfo.scanForbidList.push_back(scanForbidMode); + EXPECT_EQ(pScanService->AllowScanDuringStaScene(staScene, scanMode), false); + } + + void AllowScanDuringStaSceneFail3() + { + const int staScene = 0; + ScanMode scanMode = ScanMode::SYS_FOREGROUND_SCAN; + ScanForbidMode scanForbidMode; + scanForbidMode.scanScene = staScene; + scanForbidMode.scanMode = scanMode; + scanForbidMode.forbidTime = 1; + scanForbidMode.forbidCount = 1; + pScanService->staSceneForbidCount = 1; + pScanService->staSceneForbidCount = 1; + time_t nowTime = time(nullptr); + const int timeForTest = 2; + pScanService->staCurrentTime = nowTime + timeForTest; + pScanService->scanControlInfo.scanForbidList.push_back(scanForbidMode); + EXPECT_EQ(pScanService->AllowScanDuringStaScene(staScene, scanMode), false); + } + void AllowScanDuringCustomSceneSuccess() { ScanMode scanMode = ScanMode::SYS_FOREGROUND_SCAN; EXPECT_EQ(pScanService->AllowScanDuringCustomScene(scanMode), true); } + void AllowScanDuringCustomSceneFail1() + { + const int staScene = 0; + ScanMode scanMode = ScanMode::SYS_FOREGROUND_SCAN; + time_t now = time(nullptr); + if (now < 0) { + return; + } + pScanService->customSceneTimeMap.emplace(staScene, now); + ScanForbidMode scanForbidMode; + scanForbidMode.scanScene = staScene; + scanForbidMode.scanMode = scanMode; + scanForbidMode.forbidTime = 0; + scanForbidMode.forbidCount = 0; + pScanService->scanControlInfo.scanForbidList.push_back(scanForbidMode); + EXPECT_EQ(pScanService->AllowScanDuringCustomScene(scanMode), false); + } + + void AllowScanDuringCustomSceneFail2() + { + const int staScene = 0; + ScanMode scanMode = ScanMode::SYS_FOREGROUND_SCAN; + time_t now = time(nullptr); + if (now < 0) { + return; + } + pScanService->customSceneTimeMap.emplace(staScene, now); + ScanForbidMode scanForbidMode; + scanForbidMode.scanScene = staScene; + scanForbidMode.scanMode = scanMode; + scanForbidMode.forbidTime = 1; + scanForbidMode.forbidCount = 1; + pScanService->staSceneForbidCount = 0; + pScanService->scanControlInfo.scanForbidList.push_back(scanForbidMode); + EXPECT_EQ(pScanService->AllowScanDuringCustomScene(scanMode), false); + } + + void AllowScanDuringCustomSceneFail3() + { + const int staScene = 0; + ScanMode scanMode = ScanMode::SYS_FOREGROUND_SCAN; + time_t now = time(nullptr); + if (now < 0) { + return; + } + pScanService->customSceneTimeMap.emplace(staScene, now); + ScanForbidMode scanForbidMode; + scanForbidMode.scanScene = staScene; + scanForbidMode.scanMode = scanMode; + scanForbidMode.forbidTime = 1; + scanForbidMode.forbidCount = 1; + time_t nowTime = time(nullptr); + const int timeForTest = 2; + pScanService->staCurrentTime = nowTime + timeForTest; + pScanService->scanControlInfo.scanForbidList.push_back(scanForbidMode); + EXPECT_EQ(pScanService->AllowScanDuringCustomScene(scanMode), false); + } + void AllowExternScanByIntervalMode() { pScanService->AllowExternScanByIntervalMode(0, 0, ScanMode::SYS_FOREGROUND_SCAN); @@ -1049,6 +1264,7 @@ public: int appId = 0; SingleAppForbid sAppForbid; sAppForbid.appID = appId; + sAppForbid.scanIntervalMode.scanScene = SCAN_SCENE_ALL; sAppForbid.scanIntervalMode.scanMode = ScanMode::SCAN_MODE_MAX; pScanService->appForbidList.push_back(sAppForbid); ScanIntervalMode scanIntervalMode = sAppForbid.scanIntervalMode; @@ -1060,6 +1276,7 @@ public: int appId = 0; SingleAppForbid sAppForbid; sAppForbid.appID = appId; + sAppForbid.scanIntervalMode.scanScene = SCAN_SCENE_ALL; sAppForbid.scanIntervalMode.scanMode = ScanMode::SCAN_MODE_MAX; sAppForbid.fixedScanCount = 1; @@ -1087,6 +1304,7 @@ public: int appId = 0; SingleAppForbid sAppForbid; sAppForbid.appID = appId; + sAppForbid.scanIntervalMode.scanScene = SCAN_SCENE_ALL; sAppForbid.scanIntervalMode.scanMode = ScanMode::SCAN_MODE_MAX; pScanService->fullAppForbidList.push_back(sAppForbid); ScanIntervalMode scanIntervalMode = sAppForbid.scanIntervalMode; @@ -1098,6 +1316,7 @@ public: int appId = 0; SingleAppForbid sAppForbid; sAppForbid.appID = appId; + sAppForbid.scanIntervalMode.scanScene = SCAN_SCENE_ALL; sAppForbid.scanIntervalMode.scanMode = ScanMode::SCAN_MODE_MAX; sAppForbid.fixedScanCount = 1; @@ -1230,9 +1449,8 @@ public: int count = 0; pScanService->scanBlocklist.push_back(appId); pScanService->scanBlocklist.push_back(1); - // blockListScanTime now; branch. - bool rlt = pScanService->AllowScanByIntervalBlocklist(appId, blockListScanTime, lessThanIntervalCount, interval, - count); + bool rlt = pScanService->AllowScanByIntervalBlocklist( + appId, blockListScanTime, lessThanIntervalCount, interval, count); EXPECT_EQ(rlt, true); } @@ -1246,9 +1464,8 @@ public: int lessThanIntervalCount = 0; int interval = time(nullptr) + timeTest; int count = 0; - // if blockListScanTime 0 branch. - bool rlt = pScanService->AllowScanByIntervalBlocklist(appId, blockListScanTime, lessThanIntervalCount, interval, - count); + bool rlt = pScanService->AllowScanByIntervalBlocklist( + appId, blockListScanTime, lessThanIntervalCount, interval, count); EXPECT_EQ(rlt, true); } @@ -1262,9 +1479,8 @@ public: int interval = intervalTest; const int countTest = 2; int count = countTest; - // if lessThanIntervalCount count branch. - bool rlt = pScanService->AllowScanByIntervalBlocklist(appId, blockListScanTime, lessThanIntervalCount, interval, - count); + bool rlt = pScanService->AllowScanByIntervalBlocklist( + appId, blockListScanTime, lessThanIntervalCount, interval, count); EXPECT_EQ(rlt, true); } @@ -1278,9 +1494,8 @@ public: int interval = intervalTest; int count = 0; pScanService->scanBlocklist.push_back(appId); - // if find scanBlocklist.begin() branch. - bool rlt = pScanService->AllowScanByIntervalBlocklist(appId, blockListScanTime, lessThanIntervalCount, interval, - count); + bool rlt = pScanService->AllowScanByIntervalBlocklist( + appId, blockListScanTime, lessThanIntervalCount, interval, count); EXPECT_EQ(rlt, false); } @@ -1293,9 +1508,8 @@ public: const int intervalTest = 10; int interval = intervalTest; int count = 0; - // scanBlocklist (appId) branch. - bool rlt = pScanService->AllowScanByIntervalBlocklist(appId, blockListScanTime, lessThanIntervalCount, interval, - count); + bool rlt = pScanService->AllowScanByIntervalBlocklist( + appId, blockListScanTime, lessThanIntervalCount, interval, count); EXPECT_EQ(rlt, false); } }; @@ -1665,64 +1879,69 @@ HWTEST_F(ScanServiceTest, GetScanControlInfoFail, TestSize.Level1) GetScanControlInfoFail(); } -HWTEST_F(ScanServiceTest, GetScreenStateSuccess, TestSize.Level1) +HWTEST_F(ScanServiceTest, AllowExternScanSuccess, TestSize.Level1) { - GetScreenStateSuccess(); + AllowExternScanSuccess(); } -HWTEST_F(ScanServiceTest, SetOperateAppModeSuccess, TestSize.Level1) +HWTEST_F(ScanServiceTest, AllowExternScanFail1, TestSize.Level1) { - SetOperateAppModeSuccess(); + AllowExternScanFail1(); } -HWTEST_F(ScanServiceTest, GetOperateAppModeSuccess1, TestSize.Level1) +HWTEST_F(ScanServiceTest, AllowSystemTimerScanSuccess, TestSize.Level1) { - GetOperateAppModeSuccess1(); + AllowSystemTimerScanSuccess(); } -HWTEST_F(ScanServiceTest, GetOperateAppModeSuccess2, TestSize.Level1) +HWTEST_F(ScanServiceTest, AllowPnoScanSuccess, TestSize.Level1) { - GetOperateAppModeSuccess2(); + AllowPnoScanSuccess(); } -HWTEST_F(ScanServiceTest, GetOperateAppModeSuccess3, TestSize.Level1) +HWTEST_F(ScanServiceTest, AllowExternScanByForbidSuccess1, TestSize.Level1) { - GetOperateAppModeSuccess3(); + AllowExternScanByForbidSuccess1(); } -HWTEST_F(ScanServiceTest, GetOperateAppModeSuccess4, TestSize.Level1) +HWTEST_F(ScanServiceTest, AllowExternScanByForbidFail1, TestSize.Level1) { - GetOperateAppModeSuccess4(); + AllowExternScanByForbidFail1(); } -HWTEST_F(ScanServiceTest, GetOperateAppModeFail, TestSize.Level1) +HWTEST_F(ScanServiceTest, AllowExternScanByForbidFail2, TestSize.Level1) { - GetOperateAppModeFail(); + AllowExternScanByForbidFail2(); } -HWTEST_F(ScanServiceTest, AllowExternScanSuccess, TestSize.Level1) +HWTEST_F(ScanServiceTest, AllowExternScanByForbidFail3, TestSize.Level1) { - AllowExternScanSuccess(); + AllowExternScanByForbidFail3(); } -HWTEST_F(ScanServiceTest, AllowExternScanFail1, TestSize.Level1) +HWTEST_F(ScanServiceTest, AllowExternScanByForbidFail4, TestSize.Level1) { - AllowExternScanFail1(); + AllowExternScanByForbidFail4(); } -HWTEST_F(ScanServiceTest, AllowSystemTimerScanSuccess, TestSize.Level1) +HWTEST_F(ScanServiceTest, AllowExternScanByForbidFail5, TestSize.Level1) { - AllowSystemTimerScanSuccess(); + AllowExternScanByForbidFail5(); } -HWTEST_F(ScanServiceTest, AllowPnoScanSuccess, TestSize.Level1) +HWTEST_F(ScanServiceTest, AllowExternScanByForbidFail6, TestSize.Level1) { - AllowPnoScanSuccess(); + AllowExternScanByForbidFail6(); } -HWTEST_F(ScanServiceTest, AllowExternScanByForbidSuccess1, TestSize.Level1) +HWTEST_F(ScanServiceTest, AllowExternScanByForbidFail7, TestSize.Level1) { - AllowExternScanByForbidSuccess1(); + AllowExternScanByForbidFail7(); +} + +HWTEST_F(ScanServiceTest, AllowExternScanByForbidFail8, TestSize.Level1) +{ + AllowExternScanByForbidFail8(); } HWTEST_F(ScanServiceTest, AllowExternScanByIntervaluccess, TestSize.Level1) @@ -1865,21 +2084,61 @@ HWTEST_F(ScanServiceTest, AllowScanDuringScanningSuccess, TestSize.Level1) AllowScanDuringScanningSuccess(); } +HWTEST_F(ScanServiceTest, AllowScanDuringScanningFail, TestSize.Level1) +{ + AllowScanDuringScanningFail(); +} + HWTEST_F(ScanServiceTest, AllowScanDuringScreenOffSuccess, TestSize.Level1) { AllowScanDuringScreenOffSuccess(); } +HWTEST_F(ScanServiceTest, AllowScanDuringScreenOffFail1, TestSize.Level1) +{ + AllowScanDuringScreenOffFail1(); +} + HWTEST_F(ScanServiceTest, AllowScanDuringStaSceneSuccess, TestSize.Level1) { AllowScanDuringStaSceneSuccess1(); } +HWTEST_F(ScanServiceTest, AllowScanDuringStaSceneFail1, TestSize.Level1) +{ + AllowScanDuringStaSceneFail1(); +} + +HWTEST_F(ScanServiceTest, AllowScanDuringStaSceneFail2, TestSize.Level1) +{ + AllowScanDuringStaSceneFail2(); +} + +HWTEST_F(ScanServiceTest, AllowScanDuringStaSceneFail3, TestSize.Level1) +{ + AllowScanDuringStaSceneFail3(); +} + HWTEST_F(ScanServiceTest, AllowScanDuringCustomSceneSuccess, TestSize.Level1) { AllowScanDuringCustomSceneSuccess(); } +HWTEST_F(ScanServiceTest, AllowScanDuringCustomSceneFail1, TestSize.Level1) +{ + AllowScanDuringCustomSceneFail1(); +} + +HWTEST_F(ScanServiceTest, AllowScanDuringCustomSceneFail2, TestSize.Level1) +{ + AllowScanDuringCustomSceneFail2(); +} + +HWTEST_F(ScanServiceTest, AllowScanDuringCustomSceneFail3, TestSize.Level1) +{ + AllowScanDuringCustomSceneFail3(); +} + HWTEST_F(ScanServiceTest, AllowExternScanByIntervalMode, TestSize.Level1) { AllowExternScanByIntervalMode(); diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine_test.cpp b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine_test.cpp index 0d55758..46e6e03 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine_test.cpp +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine_test.cpp @@ -1222,6 +1222,7 @@ public: EXPECT_CALL(WifiSettings::GetInstance(), GetIpInfo(_)) .WillRepeatedly(DoAll(SetArgReferee<0>(ipInfo), Return(0))); EXPECT_CALL(WifiSettings::GetInstance(), SaveLinkedInfo(_)).Times(AtLeast(0)); + EXPECT_CALL(WifiSettings::GetInstance(), GetStrDnsBak()).Times(AtLeast(0)); std::string ifname = "wlan0"; DhcpResult result; -- Gitee From a5fe4bcd3a0f1f24cdbe0fd370aa97652079c49d Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Sat, 20 Nov 2021 06:37:10 +0000 Subject: [PATCH 013/491] fix(*): add interfaces and fix some issues and code optimize Signed-off-by: zhangfeng --- .../native_cpp/napi/wifi_napi_device.cpp | 35 +++++++++--- .../native_cpp/napi/wifi_napi_utils.cpp | 15 +++++ .../native_cpp/napi/wifi_napi_utils.h | 1 + .../wifi_standard/include/wifi_device.h | 55 ++++++++++++++++++ .../wifi_standard/interfaces/define.h | 1 + .../wifi_standard/interfaces/i_wifi_device.h | 16 ++++++ .../wifi_standard/interfaces/wifi_msg.h | 14 ++--- .../wifi_standard/src/wifi_device_impl.cpp | 13 +++++ .../wifi_standard/src/wifi_device_impl.h | 26 +++++++-- .../wifi_standard/src/wifi_device_proxy.cpp | 56 +++++++++++++++++++ .../wifi_standard/src/wifi_device_proxy.h | 16 ++++++ .../common/config/wifi_config_file_impl.h | 3 + .../common/config/wifi_settings.cpp | 9 +++ .../common/config/wifi_settings.h | 8 +++ .../wifi_manage/wifi_device_service_impl.cpp | 44 ++++++++++++++- .../wifi_manage/wifi_device_service_impl.h | 5 ++ .../wifi_manage/wifi_device_stub.cpp | 28 +++++++++- .../wifi_manage/wifi_device_stub.h | 2 + .../wifi_manage/wifi_scan/scan_service.cpp | 2 - .../wifi_manage/wifi_sta/ista_service.h | 6 ++ .../wifi_sta/sta_auto_connect_service.cpp | 28 ++-------- .../wifi_sta/sta_auto_connect_service.h | 5 -- .../wifi_manage/wifi_sta/sta_interface.cpp | 6 ++ .../wifi_manage/wifi_sta/sta_interface.h | 6 ++ .../wifi_sta/sta_saved_device_appraisal.cpp | 11 ++-- .../wifi_manage/wifi_sta/sta_service.cpp | 32 +++++++++-- .../wifi_manage/wifi_sta/sta_service.h | 6 ++ .../wifi_sta/sta_state_machine.cpp | 6 +- .../wpa_sta_hal/wifi_supplicant_hal.c | 2 +- .../sta_auto_connect_service_test.cpp | 11 ---- 30 files changed, 391 insertions(+), 77 deletions(-) diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_device.cpp b/interfaces/innerkits/native_cpp/napi/wifi_napi_device.cpp index 211a4ce..db79042 100755 --- a/interfaces/innerkits/native_cpp/napi/wifi_napi_device.cpp +++ b/interfaces/innerkits/native_cpp/napi/wifi_napi_device.cpp @@ -330,30 +330,49 @@ napi_value GetSignalLevel(napi_env env, napi_callback_info info) return result; } -/* This interface has not been implemented */ napi_value ReConnect(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); - napi_value result = nullptr; + + napi_value result; + napi_get_boolean(env, wifiDevicePtr->ReConnect(), &result); return result; } -/* This interface has not been implemented */ napi_value ReAssociate(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); - napi_value result = nullptr; + napi_value result; + napi_get_boolean(env, wifiDevicePtr->ReAssociate(), &result); return result; } -/* This interface has not been implemented */ +static void IpInfoToJsObj(const napi_env& env, IpInfo& ipInfo, napi_value& result) +{ + napi_create_object(env, &result); + SetValueUnsignedInt32(env, "ipAddress", ipInfo.ipAddress, result); + SetValueUnsignedInt32(env, "gateway", ipInfo.gateway, result); + SetValueUnsignedInt32(env, "netmask", ipInfo.netmask, result); + SetValueUnsignedInt32(env, "primaryDns", ipInfo.primaryDns, result); + SetValueUnsignedInt32(env, "secondDns", ipInfo.secondDns, result); + SetValueUnsignedInt32(env, "serverIp", ipInfo.serverIp, result); + SetValueUnsignedInt32(env, "leaseDuration", ipInfo.leaseDuration, result); +} + napi_value GetIpInfo(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); - napi_value result = nullptr; + + IpInfo ipInfo; + napi_value result; + ErrCode ret = wifiDevicePtr->GetIpInfo(ipInfo); + if (ret != WIFI_OPT_SUCCESS) { + WIFI_LOGE("Get ip info fail: %{public}d", ret); + } + IpInfoToJsObj(env, ipInfo, result); return result; } @@ -442,7 +461,6 @@ napi_value RemoveAllNetwork(napi_env env, napi_callback_info info) return result; } -/* This interface has not been implemented */ napi_value DisableNetwork(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; @@ -459,7 +477,8 @@ napi_value DisableNetwork(napi_env env, napi_callback_info info) int networkId = -1; napi_get_value_int32(env, argv[0], &networkId); - napi_value result = nullptr; + napi_value result; + napi_get_boolean(env, wifiDevicePtr->DisableDeviceConfig(networkId) == WIFI_OPT_SUCCESS, &result); return result; } diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_utils.cpp b/interfaces/innerkits/native_cpp/napi/wifi_napi_utils.cpp index ece60b7..81e51b9 100755 --- a/interfaces/innerkits/native_cpp/napi/wifi_napi_utils.cpp +++ b/interfaces/innerkits/native_cpp/napi/wifi_napi_utils.cpp @@ -147,6 +147,21 @@ napi_status SetValueInt32(const napi_env& env, const char* fieldStr, const int i return status; } +napi_status SetValueUnsignedInt32(const napi_env& env, const char* fieldStr, const int intValue, napi_value& result) +{ + napi_value value; + napi_status status = napi_create_uint32(env, intValue, &value); + if (status != napi_ok) { + WIFI_LOGE("Set value create unsigned int32 error! field: %{public}s", fieldStr); + return status; + } + status = napi_set_named_property(env, result, fieldStr, value); + if (status != napi_ok) { + WIFI_LOGE("Set unsigned int32 named property error! field: %{public}s", fieldStr); + } + return status; +} + napi_status SetValueInt64(const napi_env& env, const char* fieldStr, const int64_t intValue, napi_value& result) { napi_value value; diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_utils.h b/interfaces/innerkits/native_cpp/napi/wifi_napi_utils.h index 9e16e0f..a278583 100755 --- a/interfaces/innerkits/native_cpp/napi/wifi_napi_utils.h +++ b/interfaces/innerkits/native_cpp/napi/wifi_napi_utils.h @@ -77,6 +77,7 @@ napi_value JsObjectToInt(const napi_env& env, const napi_value& object, const ch napi_value JsObjectToBool(const napi_env& env, const napi_value& object, const char* fieldStr, bool& fieldRef); napi_status SetValueUtf8String(const napi_env& env, const char* fieldStr, const char* str, napi_value& result); napi_status SetValueInt32(const napi_env& env, const char* fieldStr, const int intValue, napi_value& result); +napi_status SetValueUnsignedInt32(const napi_env& env, const char* fieldStr, const int intValue, napi_value& result); napi_status SetValueInt64(const napi_env& env, const char* fieldStr, const int64_t intValue, napi_value& result); napi_status SetValueBool(const napi_env& env, const char* fieldStr, const bool boolValue, napi_value& result); napi_value DoAsyncWork(const napi_env& env, AsyncContext *asyncContext, diff --git a/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_device.h b/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_device.h index f9d66fa..05ea77e 100644 --- a/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_device.h +++ b/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_device.h @@ -77,6 +77,15 @@ public: */ virtual ErrCode AddDeviceConfig(const WifiDeviceConfig &config, int &result) = 0; + /** + * @Description Update a wifi device configuration. + * + * @param config - WifiDeviceConfig object + * @param result - the device configuration's network id after updated + * @return ErrCode - operation result + */ + virtual ErrCode UpdateDeviceConfig(const WifiDeviceConfig &config, int &result) = 0; + /** * @Description Remove the wifi device config equals to input network id. * @@ -116,6 +125,13 @@ public: */ virtual ErrCode ConnectToDevice(const WifiDeviceConfig &config) = 0; + /** + * @Description Check whether Wi-Fi is connected. + * + * @return bool - true: connected, false: not connected + */ + virtual bool IsConnected() = 0; + /** * @Description Disconnect. * @@ -198,6 +214,45 @@ public: */ virtual bool IsFeatureSupported(long feature) = 0; + /** + * @Description Enable device config, when set attemptEnable, disable other device config + * + * @param networkId - need enable device config's network id + * @param attemptEnable - if set true, disable other device config + * @return ErrCode - operation result + */ + virtual ErrCode EnableDeviceConfig(int networkId, bool attemptEnable) = 0; + + /** + * @Description Disable Wi-Fi device configuration. + * + * @param networkId - device config's network id + * @return ErrCode - operation result + */ + virtual ErrCode DisableDeviceConfig(int networkId) = 0; + + /** + * @Description Obtaining ip Request Information + * + * @param info - IpInfo object + * @return ErrCode - operation result + */ + virtual ErrCode GetIpInfo(IpInfo &info) = 0; + + /** + * @Description Reconnect to the currently active network + * + * @return ErrCode - operation result + */ + virtual ErrCode ReConnect() = 0; + + /** + * @Description ReAssociate network + * + * @return ErrCode - operation result + */ + virtual ErrCode ReAssociate() = 0; + /** * @Description Get the device MAC address. * diff --git a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/define.h b/interfaces/innerkits/native_cpp/wifi_standard/interfaces/define.h index c7b93f9..476e0cf 100644 --- a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/define.h +++ b/interfaces/innerkits/native_cpp/wifi_standard/interfaces/define.h @@ -52,6 +52,7 @@ #define WIFI_SVR_CMD_INIT_WIFI_PROTECT 0x1023 /* init the Wi-Fi protect. */ #define WIFI_SVR_CMD_GET_WIFI_PROTECT 0x1024 /* get the Wi-Fi protect. */ #define WIFI_SVR_CMD_PUT_WIFI_PROTECT 0x1025 /* put the Wi-Fi protect. */ +#define WIFI_SVR_CMD_IS_WIFI_CONNECTED 0x1026 /* is Wi-Fi connected */ /* -------------ap module message define----------------- */ #define WIFI_SVR_CMD_ENABLE_WIFI_AP 0x1100 /* open ap */ diff --git a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_device.h b/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_device.h index 96f912c..6c6c2db 100644 --- a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_device.h +++ b/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_device.h @@ -78,6 +78,15 @@ public: */ virtual ErrCode AddDeviceConfig(const WifiDeviceConfig &config, int &result) = 0; + /** + * @Description Update a wifi device configuration. + * + * @param config - WifiDeviceConfig object + * @param result - the device configuration's network id after updated + * @return ErrCode - operation result + */ + virtual ErrCode UpdateDeviceConfig(const WifiDeviceConfig &config, int &result) = 0; + /** * @Description Remove the wifi device config equals to input network id * @@ -134,6 +143,13 @@ public: */ virtual ErrCode ConnectToDevice(const WifiDeviceConfig &config) = 0; + /** + * @Description Check whether Wi-Fi is connected. + * + * @return bool - true: connected, false: not connected + */ + virtual bool IsConnected() = 0; + /** * @Description Reconnect to the currently active network * diff --git a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_msg.h b/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_msg.h index 66918ff..0e3d83c 100755 --- a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_msg.h +++ b/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_msg.h @@ -415,13 +415,13 @@ enum class WifiProtectMode { /* DHCP info */ struct IpInfo { - int ipAddress; /* ip address */ - int gateway; /* gate */ - int netmask; /* mask */ - int primaryDns; /* main dns */ - int secondDns; /* backup dns */ - int serverIp; /* DHCP server's address */ - int leaseDuration; + unsigned int ipAddress; /* ip address */ + unsigned int gateway; /* gate */ + unsigned int netmask; /* mask */ + unsigned int primaryDns; /* main dns */ + unsigned int secondDns; /* backup dns */ + unsigned int serverIp; /* DHCP server's address */ + unsigned int leaseDuration; IpInfo() { diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_impl.cpp b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_impl.cpp index 3a47d02..95d75d3 100644 --- a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_impl.cpp +++ b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_impl.cpp @@ -90,12 +90,19 @@ ErrCode WifiDeviceImpl::PutWifiProtectRef(const std::string &protectName) RETURN_IF_FAIL(client_); return client_->PutWifiProtectRef(protectName); } + ErrCode WifiDeviceImpl::AddDeviceConfig(const WifiDeviceConfig &config, int &result) { RETURN_IF_FAIL(client_); return client_->AddDeviceConfig(config, result); } +ErrCode WifiDeviceImpl::UpdateDeviceConfig(const WifiDeviceConfig &config, int &result) +{ + RETURN_IF_FAIL(client_); + return client_->UpdateDeviceConfig(config, result); +} + ErrCode WifiDeviceImpl::RemoveDevice(int networkId) { RETURN_IF_FAIL(client_); @@ -138,6 +145,12 @@ ErrCode WifiDeviceImpl::ConnectToDevice(const WifiDeviceConfig &config) return client_->ConnectToDevice(config); } +bool WifiDeviceImpl::IsConnected() +{ + RETURN_IF_FAIL(client_); + return client_->IsConnected(); +} + ErrCode WifiDeviceImpl::ReConnect() { RETURN_IF_FAIL(client_); diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_impl.h b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_impl.h index 84da625..8f9e0b5 100644 --- a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_impl.h +++ b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_impl.h @@ -76,6 +76,15 @@ public: */ ErrCode AddDeviceConfig(const WifiDeviceConfig &config, int &result) override; + /** + * @Description Update a wifi device configuration. + * + * @param config - WifiDeviceConfig object + * @param result - the device configuration's network id after updated + * @return ErrCode - operation result + */ + ErrCode UpdateDeviceConfig(const WifiDeviceConfig &config, int &result) override; + /** * @Description Remove the wifi device config equals to input network id * @@ -115,6 +124,13 @@ public: */ ErrCode ConnectToDevice(const WifiDeviceConfig &config) override; + /** + * @Description Check whether Wi-Fi is connected. + * + * @return bool - true: connected, false: not connected + */ + bool IsConnected() override; + /** * @Description Disconnect * @@ -204,7 +220,7 @@ public: * @param attemptEnable - if set true, disable other device config * @return ErrCode - operation result */ - ErrCode EnableDeviceConfig(int networkId, bool attemptEnable); + ErrCode EnableDeviceConfig(int networkId, bool attemptEnable) override; /** * @Description Disable Wi-Fi device configuration. @@ -212,7 +228,7 @@ public: * @param networkId - device config's network id * @return ErrCode - operation result */ - ErrCode DisableDeviceConfig(int networkId); + ErrCode DisableDeviceConfig(int networkId) override; /** * @Description Obtaining ip Request Information @@ -220,21 +236,21 @@ public: * @param info - IpInfo object * @return ErrCode - operation result */ - ErrCode GetIpInfo(IpInfo &info); + ErrCode GetIpInfo(IpInfo &info) override; /** * @Description Reconnect to the currently active network * * @return ErrCode - operation result */ - ErrCode ReConnect(); + ErrCode ReConnect() override; /** * @Description ReAssociate network * * @return ErrCode - operation result */ - ErrCode ReAssociate(void); + ErrCode ReAssociate() override; /** * @Description Enable WPS connection diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy.cpp b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy.cpp index 2b676f1..dcaea8e 100644 --- a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy.cpp +++ b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy.cpp @@ -249,6 +249,40 @@ ErrCode WifiDeviceProxy::AddDeviceConfig(const WifiDeviceConfig &config, int &re return WIFI_OPT_SUCCESS; } +ErrCode WifiDeviceProxy::UpdateDeviceConfig(const WifiDeviceConfig &config, int &result) +{ + if (mRemoteDied) { + WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + return WIFI_OPT_FAILED; + } + + if (config.networkId <= INVALID_NETWORK_ID) { + WIFI_LOGE("update device config fail for networkId is invalid: %{public}d", config.networkId); + return WIFI_OPT_FAILED; + } + + MessageOption option; + MessageParcel data, reply; + data.WriteInt32(0); + WriteDeviceConfig(config, data); + + int error = Remote()->SendRequest(WIFI_SVR_CMD_UPDATE_DEVICE_CONFIG, data, reply, option); + if (error != ERR_NONE) { + WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", WIFI_SVR_CMD_UPDATE_DEVICE_CONFIG, error); + return WIFI_OPT_FAILED; + } + int exception = reply.ReadInt32(); + if (exception) { + return WIFI_OPT_FAILED; + } + int ret = reply.ReadInt32(); + if (ret != WIFI_OPT_SUCCESS) { + return ErrCode(ret); + } + result = reply.ReadInt32(); + return WIFI_OPT_SUCCESS; +} + ErrCode WifiDeviceProxy::RemoveDevice(int networkId) { if (mRemoteDied) { @@ -476,6 +510,28 @@ ErrCode WifiDeviceProxy::ConnectToDevice(const WifiDeviceConfig &config) return ErrCode(reply.ReadInt32()); } +bool WifiDeviceProxy::IsConnected() +{ + if (mRemoteDied) { + WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + return WIFI_OPT_FAILED; + } + MessageOption option; + MessageParcel data, reply; + data.WriteInt32(0); + + int error = Remote()->SendRequest(WIFI_SVR_CMD_IS_WIFI_CONNECTED, data, reply, option); + if (error != ERR_NONE) { + WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", WIFI_SVR_CMD_IS_WIFI_CONNECTED, error); + return WIFI_OPT_FAILED; + } + int exception = reply.ReadInt32(); + if (exception) { + return false; + } + return reply.ReadBool(); +} + ErrCode WifiDeviceProxy::ReConnect() { if (mRemoteDied) { diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy.h b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy.h index c6318d4..32dce5c 100644 --- a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy.h +++ b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy.h @@ -76,6 +76,15 @@ public: */ ErrCode AddDeviceConfig(const WifiDeviceConfig &config, int &result) override; + /** + * @Description Update a wifi device configuration. + * + * @param config - WifiDeviceConfig object + * @param result - the device configuration's network id after updated + * @return ErrCode - operation result + */ + ErrCode UpdateDeviceConfig(const WifiDeviceConfig &config, int &result) override; + /** * @Description Remove the wifi device config equals to input network id * @@ -132,6 +141,13 @@ public: */ ErrCode ConnectToDevice(const WifiDeviceConfig &config) override; + /** + * @Description Check whether Wi-Fi is connected. + * + * @return bool - true: connected, false: not connected + */ + bool IsConnected() override; + /** * @Description Reconnect to the currently active network * diff --git a/services/wifi_standard/wifi_framework/common/config/wifi_config_file_impl.h b/services/wifi_standard/wifi_framework/common/config/wifi_config_file_impl.h index 368d31e..c899b9c 100644 --- a/services/wifi_standard/wifi_framework/common/config/wifi_config_file_impl.h +++ b/services/wifi_standard/wifi_framework/common/config/wifi_config_file_impl.h @@ -20,6 +20,7 @@ #include #include #include "wifi_config_file_spec.h" +#include "wifi_log.h" namespace OHOS { namespace Wifi { @@ -116,6 +117,7 @@ int WifiConfigFileImpl::LoadConfig() { std::ifstream fs(mFileName.c_str()); if (!fs.is_open()) { + LOGE("Loading config file: %{public}s, fs.is_open() failed!", mFileName.c_str()); return -1; } mValues.clear(); @@ -159,6 +161,7 @@ int WifiConfigFileImpl::SaveConfig() { std::ofstream fs(mFileName.c_str()); if (!fs.is_open()) { + LOGE("Save config file: %{public}s, fs.is_open() failed!", mFileName.c_str()); return -1; } std::ostringstream ss; diff --git a/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp b/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp index ea3256f..6183562 100644 --- a/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp +++ b/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp @@ -474,9 +474,18 @@ int WifiSettings::SaveLinkedInfo(const WifiLinkedInfo &info) { std::unique_lock lock(mInfoMutex); mWifiLinkedInfo = info; + if (mWifiLinkedInfo.connState == ConnState::CONNECTED) { + lastSuccConnectBssid = mWifiLinkedInfo.bssid; + } return 0; } +std::string WifiSettings::GetLastSuccConnectBssid() +{ + std::unique_lock lock(mInfoMutex); + return lastSuccConnectBssid; +} + int WifiSettings::SetMacAddress(const std::string &macAddress) { std::unique_lock lock(mStaMutex); diff --git a/services/wifi_standard/wifi_framework/common/config/wifi_settings.h b/services/wifi_standard/wifi_framework/common/config/wifi_settings.h index d1b2136..96493c1 100644 --- a/services/wifi_standard/wifi_framework/common/config/wifi_settings.h +++ b/services/wifi_standard/wifi_framework/common/config/wifi_settings.h @@ -320,6 +320,13 @@ public: */ int SaveLinkedInfo(const WifiLinkedInfo &info); + /** + * @Description Obtains the BSSID of the last successful connection. + * + * @return std::string - bssid + */ + std::string GetLastSuccConnectBssid(); + /** * @Description Save mac address * @@ -939,6 +946,7 @@ private: int mAppRunningModeState; /* 1 front 2 backend */ int mPowerSavingModeState; /* 1 on 2 off */ WifiConfig mWifiConfig; + std::string lastSuccConnectBssid; std::mutex mStaMutex; std::mutex mApMutex; diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp index 82c3cf9..5885ac5 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp @@ -234,6 +234,30 @@ ErrCode WifiDeviceServiceImpl::AddDeviceConfig(const WifiDeviceConfig &config, i return WIFI_OPT_SUCCESS; } +ErrCode WifiDeviceServiceImpl::UpdateDeviceConfig(const WifiDeviceConfig &config, int &result) +{ + if (WifiPermissionUtils::VerifySetWifiInfoPermission() == PERMISSION_DENIED) { + WIFI_LOGE("UpdateDeviceConfig:VerifySetWifiInfoPermission PERMISSION_DENIED!"); + return WIFI_OPT_PERMISSION_DENIED; + } + + if (!IsStaServiceRunning()) { + return WIFI_OPT_STA_NOT_OPENED; + } + + IStaService *pService = WifiServiceManager::GetInstance().GetStaServiceInst(); + if (pService == nullptr) { + return WIFI_OPT_STA_NOT_OPENED; + } + + int retNetworkId = pService->UpdateDeviceConfig(config); + if (retNetworkId <= INVALID_NETWORK_ID) { + return WIFI_OPT_FAILED; + } + result = retNetworkId; + return WIFI_OPT_SUCCESS; +} + ErrCode WifiDeviceServiceImpl::RemoveDevice(int networkId) { if (WifiPermissionUtils::VerifySetWifiInfoPermission() == PERMISSION_DENIED) { @@ -377,6 +401,13 @@ ErrCode WifiDeviceServiceImpl::ConnectToDevice(const WifiDeviceConfig &config) return pService->ConnectToDevice(config); } +bool WifiDeviceServiceImpl::IsConnected() +{ + WifiLinkedInfo linkedInfo; + WifiConfigCenter::GetInstance().GetLinkedInfo(linkedInfo); + return linkedInfo.connState == ConnState::CONNECTED; +} + ErrCode WifiDeviceServiceImpl::ReConnect() { if (WifiPermissionUtils::VerifySetWifiInfoPermission() == PERMISSION_DENIED) { @@ -392,11 +423,18 @@ ErrCode WifiDeviceServiceImpl::ReConnect() return WIFI_OPT_SCAN_NOT_OPENED; } - IScanService *pService = WifiServiceManager::GetInstance().GetScanServiceInst(); - if (pService == nullptr) { + IScanService *pScanService = WifiServiceManager::GetInstance().GetScanServiceInst(); + if (pScanService == nullptr) { return WIFI_OPT_SCAN_NOT_OPENED; } - return pService->Scan(false); + + IStaService *pStaService = WifiServiceManager::GetInstance().GetStaServiceInst(); + if (pStaService == nullptr) { + return WIFI_OPT_STA_NOT_OPENED; + } + + pStaService->ClearDisabledBssidForReconnect(); + return pScanService->Scan(false); } ErrCode WifiDeviceServiceImpl::ReAssociate(void) diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h index c78b68c..a9dd23b 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h @@ -49,8 +49,11 @@ public: ErrCode GetWifiProtectRef(const WifiProtectMode &protectMode, const std::string &protectName) override; ErrCode PutWifiProtectRef(const std::string &protectName) override; + ErrCode AddDeviceConfig(const WifiDeviceConfig &config, int &result) override; + ErrCode UpdateDeviceConfig(const WifiDeviceConfig &config, int &result) override; + ErrCode RemoveDevice(int networkId) override; ErrCode RemoveAllDevice() override; @@ -65,6 +68,8 @@ public: ErrCode ConnectToDevice(const WifiDeviceConfig &config) override; + bool IsConnected() override; + ErrCode ReConnect() override; ErrCode ReAssociate(void) override; diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp index fe05033..83fb57a 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp @@ -41,6 +41,7 @@ void WifiDeviceStub::InitHandleMap() handleFuncMap[WIFI_SVR_CMD_GET_WIFI_PROTECT] = &WifiDeviceStub::OnGetWifiProtectRef; handleFuncMap[WIFI_SVR_CMD_PUT_WIFI_PROTECT] = &WifiDeviceStub::OnPutWifiProtectRef; handleFuncMap[WIFI_SVR_CMD_ADD_DEVICE_CONFIG] = &WifiDeviceStub::OnAddDeviceConfig; + handleFuncMap[WIFI_SVR_CMD_UPDATE_DEVICE_CONFIG] = &WifiDeviceStub::OnUpdateDeviceConfig; handleFuncMap[WIFI_SVR_CMD_REMOVE_DEVICE_CONFIG] = &WifiDeviceStub::OnRemoveDevice; handleFuncMap[WIFI_SVR_CMD_REMOVE_ALL_DEVICE_CONFIG] = &WifiDeviceStub::OnRemoveAllDevice; handleFuncMap[WIFI_SVR_CMD_GET_DEVICE_CONFIGS] = &WifiDeviceStub::OnGetDeviceConfigs; @@ -63,6 +64,7 @@ void WifiDeviceStub::InitHandleMap() handleFuncMap[WIFI_SVR_CMD_GET_SIGNAL_LEVEL] = &WifiDeviceStub::OnGetSignalLevel; handleFuncMap[WIFI_SVR_CMD_GET_SUPPORTED_FEATURES] = &WifiDeviceStub::OnGetSupportedFeatures; handleFuncMap[WIFI_SVR_CMD_GET_DERVICE_MAC_ADD] = &WifiDeviceStub::OnGetDeviceMacAdd; + handleFuncMap[WIFI_SVR_CMD_IS_WIFI_CONNECTED] = &WifiDeviceStub::OnIsWifiConnected; return; } @@ -135,13 +137,14 @@ void WifiDeviceStub::OnPutWifiProtectRef(uint32_t code, MessageParcel &data, Mes reply.WriteInt32(ret); return; } + void WifiDeviceStub::OnAddDeviceConfig(uint32_t code, MessageParcel &data, MessageParcel &reply) { WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); WifiDeviceConfig config; ReadWifiDeviceConfig(data, config); - int result = 0; + int result = INVALID_NETWORK_ID; ErrCode ret = AddDeviceConfig(config, result); reply.WriteInt32(0); @@ -153,6 +156,21 @@ void WifiDeviceStub::OnAddDeviceConfig(uint32_t code, MessageParcel &data, Messa return; } +void WifiDeviceStub::OnUpdateDeviceConfig(uint32_t code, MessageParcel &data, MessageParcel &reply) +{ + WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); + WifiDeviceConfig config; + ReadWifiDeviceConfig(data, config); + int result = INVALID_NETWORK_ID; + ErrCode ret = UpdateDeviceConfig(config, result); + reply.WriteInt32(0); + reply.WriteInt32(ret); + if (ret == WIFI_OPT_SUCCESS) { + reply.WriteInt32(result); + } + return; +} + void WifiDeviceStub::ReadWifiDeviceConfig(MessageParcel &data, WifiDeviceConfig &config) { config.networkId = data.ReadInt32(); @@ -345,6 +363,14 @@ void WifiDeviceStub::OnConnect2To(uint32_t code, MessageParcel &data, MessagePar return; } +void WifiDeviceStub::OnIsWifiConnected(uint32_t code, MessageParcel &data, MessageParcel &reply) +{ + WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); + reply.WriteInt32(0); + reply.WriteBool(IsConnected()); + return; +} + void WifiDeviceStub::OnReConnect(uint32_t code, MessageParcel &data, MessageParcel &reply) { WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.h index c3b00ef..0d3163a 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.h @@ -41,6 +41,7 @@ private: void OnGetWifiProtectRef(uint32_t code, MessageParcel &data, MessageParcel &reply); void OnPutWifiProtectRef(uint32_t code, MessageParcel &data, MessageParcel &reply); void OnAddDeviceConfig(uint32_t code, MessageParcel &data, MessageParcel &reply); + void OnUpdateDeviceConfig(uint32_t code, MessageParcel &data, MessageParcel &reply); void OnRemoveDevice(uint32_t code, MessageParcel &data, MessageParcel &reply); void OnRemoveAllDevice(uint32_t code, MessageParcel &data, MessageParcel &reply); void OnGetDeviceConfigs(uint32_t code, MessageParcel &data, MessageParcel &reply); @@ -63,6 +64,7 @@ private: void OnGetSignalLevel(uint32_t code, MessageParcel &data, MessageParcel &reply); void OnGetSupportedFeatures(uint32_t code, MessageParcel &data, MessageParcel &reply); void OnGetDeviceMacAdd(uint32_t code, MessageParcel &data, MessageParcel &reply); + void OnIsWifiConnected(uint32_t code, MessageParcel &data, MessageParcel &reply); private: void ReadWifiDeviceConfig(MessageParcel &data, WifiDeviceConfig &config); diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp index 3eadcbe..e4983fe 100755 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp @@ -533,8 +533,6 @@ bool ScanService::StoreFullScanInfo( std::vector filterScanInfo; std::vector::const_iterator iter = scanInfoList.begin(); for (; iter != scanInfoList.end(); ++iter) { - char tmpBuf[128] = ""; - EncryptLogMsg(iter->ssid.c_str(), tmpBuf, sizeof(tmpBuf)); WifiScanInfo scanInfo; scanInfo.bssid = iter->bssid; scanInfo.ssid = iter->ssid; diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/ista_service.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/ista_service.h index 4d636e5..8534295 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/ista_service.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/ista_service.h @@ -120,6 +120,12 @@ public: * @return ErrCode - success: WIFI_OPT_SUCCESS fail: WIFI_OPT_FAILED */ virtual ErrCode DisableDeviceConfig(int networkId) = 0; + /** + * @Description Clear disabled bssid for reconnect + * + * @return ErrCode - success: WIFI_OPT_SUCCESS fail: WIFI_OPT_FAILED + */ + virtual ErrCode ClearDisabledBssidForReconnect() = 0; /** * @Description Start WPS Connection * diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp index b640c4c..2480158 100755 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp @@ -314,9 +314,6 @@ ErrCode StaAutoConnectService::AutoSelectDevice(WifiDeviceConfig &electedDevice, return WIFI_OPT_FAILED; } - /* Before initiating network selection, update all configured networks. */ - RefreshConfigDevice(); - std::vector availableScanInfos; /* Filter out unnecessary networks. */ GetAvailableScanInfos(availableScanInfos, scanInfos, blockedBssids, info); @@ -542,23 +539,6 @@ bool StaAutoConnectService::Whether5GDevice(int frequency) } } -void StaAutoConnectService::RefreshConfigDevice() -{ - WIFI_LOGI("Enter StaAutoConnectService::RefreshConfigDevice.\n"); - std::vector configs; - WifiSettings::GetInstance().GetDeviceConfig(configs); - if (configs.empty()) { - WIFI_LOGE("No config networks.\n"); - return; - } - for (auto network : configs) { - if (network.status == 1) { - WIFI_LOGI("The network is disable.networkId is %{public}d.", network.networkId); - } - } - return; -} - void StaAutoConnectService::GetAvailableScanInfos(std::vector &availableScanInfos, const std::vector &scanInfos, std::vector &blockedBssids, WifiLinkedInfo &info) { @@ -580,19 +560,21 @@ void StaAutoConnectService::GetAvailableScanInfos(std::vector &av auto itr = find(blockedBssids.begin(), blockedBssids.end(), scanInfo.bssid); if (itr != blockedBssids.end()) { /* Skip Blocklist Network */ - WIFI_LOGI("Skip blocklistedBssid network %s.\n", scanInfo.ssid.c_str()); + WIFI_LOGI("Skip blocklistedBssid network, ssid: %{public}s.\n", scanInfo.ssid.c_str()); continue; } /* Skipping networks with weak signals */ if (scanInfo.frequency < MIN_5GHZ_BAND_FREQUENCY) { if (scanInfo.rssi <= MIN_RSSI_VALUE_24G) { - WIFI_LOGI("Skip network %s with low 2.4G signals %{public}d.\n", scanInfo.ssid.c_str(), scanInfo.rssi); + WIFI_LOGI("Skip network %{public}s with low 2.4G signals %{public}d.\n", + scanInfo.ssid.c_str(), scanInfo.rssi); continue; } } else { if (scanInfo.rssi <= MIN_RSSI_VALUE_5G) { - WIFI_LOGI("Skip network %s with low 5G signals %{public}d.\n", scanInfo.ssid.c_str(), scanInfo.rssi); + WIFI_LOGI("Skip network %{public}s with low 5G signals %{public}d.\n", + scanInfo.ssid.c_str(), scanInfo.rssi); continue; } } diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.h index b4936c6..bfd1108 100755 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.h @@ -209,11 +209,6 @@ private: * @Return success : true failed : false */ bool RoamingEncryptionModeCheck(WifiDeviceConfig &electedDevice, InterScanInfo scanInfo, WifiLinkedInfo &info); - /** - * @Description Updating the Configuration Center Device. - * - */ - void RefreshConfigDevice(); /** * @Description Whether the device is a 2.4G device. * diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.cpp index d4a64ec..c7c04d6 100755 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.cpp @@ -161,6 +161,12 @@ ErrCode StaInterface::DisableDeviceConfig(int networkId) return pStaService->DisableDeviceConfig(networkId); } +ErrCode StaInterface::ClearDisabledBssidForReconnect() +{ + LOGD("Enter StaInterface::ClearDisabledBssidForReconnect.\n"); + return pStaService->ClearDisabledBssidForReconnect(); +} + ErrCode StaInterface::StartWps(const WpsConfig &config) { LOGD("Enter StaInterface::StartWps.\n"); diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.h index df405d4..a132e73 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.h @@ -124,6 +124,12 @@ public: * @return ErrCode - success: WIFI_OPT_SUCCESS fail: WIFI_OPT_FAILED */ virtual ErrCode DisableDeviceConfig(int networkId) override; + /** + * @Description Clear disabled bssid for reconnect + * + * @return ErrCode - success: WIFI_OPT_SUCCESS fail: WIFI_OPT_FAILED + */ + virtual ErrCode ClearDisabledBssidForReconnect() override; /** * @Description Start WPS Connection * diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp index dbaebf5..4232d50 100755 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp @@ -54,7 +54,7 @@ ErrCode StaSavedDeviceAppraisal::DeviceAppraisals( WifiDeviceConfig device; if (WifiSettings::GetInstance().GetDeviceConfig(scanInfo.bssid, DEVICE_CONFIG_INDEX_BSSID, device) == -1) { - WIFI_LOGI("Skip unsaved Network %s.", scanInfo.ssid.c_str()); /* Skipping Unsaved Networks */ + WIFI_LOGI("Skip unsaved Network %{public}s.", scanInfo.ssid.c_str()); /* Skipping Unsaved Networks */ continue; } @@ -64,14 +64,16 @@ ErrCode StaSavedDeviceAppraisal::DeviceAppraisals( int score = 0; AppraiseDeviceQuality(score, scanInfo, device, info); - WIFI_LOGI( - "The device %s score is %{public}d.rssi is %{public}d.\n", scanInfo.ssid.c_str(), score, scanInfo.rssi); + WIFI_LOGI("The device %{public}s score is %{public}d.rssi is %{public}d.\n", + scanInfo.ssid.c_str(), score, scanInfo.rssi); if (score > highestScore || (score == highestScore && scanInfo.rssi > scanInfoElected.rssi)) { highestScore = score; scanInfoElected.rssi = scanInfo.rssi; electedDevice = device; sign = 1; + } else { + WIFI_LOGI("The config %{public}s is ignored!\n", scanInfo.ssid.c_str()); } } if (sign == 1) { @@ -94,11 +96,12 @@ bool StaSavedDeviceAppraisal::WhetherSkipDevice(WifiDeviceConfig &device) { /* Skip this type of device and evaluate it by other appraisals */ if (device.isPasspoint || device.isEphemeral) { - WIFI_LOGI("Skip isPasspoint or isEphemeral Network %s.", device.ssid.c_str()); + WIFI_LOGI("Skip isPasspoint or isEphemeral Network %{public}s.", device.ssid.c_str()); return true; } if (device.status == static_cast(WifiDeviceConfigStatus::DISABLED)) { + WIFI_LOGI("Skip disabled Network %{public}s.", device.ssid.c_str()); return true; } return false; diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp index f5b8c31..2d3c30d 100755 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp @@ -109,20 +109,25 @@ int StaService::AddDeviceConfig(const WifiDeviceConfig &config) const { LOGI("Enter StaService::AddDeviceConfig.\n"); int netWorkId = INVALID_NETWORK_ID; + std::string bssid; WifiDeviceConfig tempDeviceConfig; if (WifiSettings::GetInstance().GetDeviceConfig(config.ssid, config.keyMgmt, tempDeviceConfig) == 0) { - LOGD("A network with the same name already exists in the configuration center!\n"); + LOGI("A network with the same name already exists in the configuration center!\n"); netWorkId = tempDeviceConfig.networkId; - pStaAutoConnectService->EnableOrDisableBssid(config.bssid, true, 0); + bssid = config.bssid.empty() ? tempDeviceConfig.bssid : config.bssid; + pStaAutoConnectService->EnableOrDisableBssid(bssid, true, 0); } else { if (WifiStaHalInterface::GetInstance().GetNextNetworkId(netWorkId) != WIFI_IDL_OPT_OK) { LOGE("StaService::AddDeviceConfig GetNextNetworkId failed!"); - return netWorkId; + return INVALID_NETWORK_ID; } - LOGD("StaService::AddDeviceConfig Add a new network and GetNextNetworkId() succeed!"); + LOGD("StaService::AddDeviceConfig alloc new id[%{public}d] succeed!", netWorkId); } tempDeviceConfig = config; tempDeviceConfig.networkId = netWorkId; + if (!bssid.empty()) { + tempDeviceConfig.bssid = bssid; + } /* Setting the network to wpa */ if(pStaStateMachine->ConvertDeviceCfg(tempDeviceConfig) != WIFI_OPT_SUCCESS) { @@ -138,6 +143,13 @@ int StaService::AddDeviceConfig(const WifiDeviceConfig &config) const int StaService::UpdateDeviceConfig(const WifiDeviceConfig &config) const { + LOGI("Enter StaService::UpdateDeviceConfig.\n"); + WifiDeviceConfig tempDeviceConfig; + if (config.networkId <= INVALID_NETWORK_ID || + WifiSettings::GetInstance().GetDeviceConfig(config.networkId, tempDeviceConfig) != 0) { + LOGI("Update not exists network, id: %{public}d\n", config.networkId); + return INVALID_NETWORK_ID; + } return AddDeviceConfig(config); } @@ -156,7 +168,7 @@ ErrCode StaService::ConnectToDevice(const WifiDeviceConfig &config) const ErrCode StaService::ConnectToNetwork(int networkId) const { - LOGI("Enter StaService::ConnectToNetwork, networkId is %d.\n", networkId); + LOGI("Enter StaService::ConnectToNetwork, networkId is %{public}d.\n", networkId); WifiDeviceConfig config; if (WifiSettings::GetInstance().GetDeviceConfig(networkId, config) != 0) { LOGE("WifiDeviceConfig is null!"); @@ -231,6 +243,16 @@ ErrCode StaService::DisableDeviceConfig(int networkId) const return WIFI_OPT_SUCCESS; } +ErrCode StaService::ClearDisabledBssidForReconnect() const +{ + WIFI_LOGD("Enter StaService::ClearDisabledBssidForReconnect\n"); + std::string lastSuccConnectBssid = WifiSettings::GetInstance().GetLastSuccConnectBssid(); + if (!lastSuccConnectBssid.empty()) { + pStaAutoConnectService->EnableOrDisableBssid(lastSuccConnectBssid, true, 0); + } + return WIFI_OPT_SUCCESS; +} + ErrCode StaService::Disconnect() const { WIFI_LOGI("Enter StaService::Disconnect.\n"); diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.h index c7bc5d2..ab6097f 100755 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.h @@ -130,6 +130,12 @@ public: * @return ErrCode - success: WIFI_OPT_SUCCESS fail: WIFI_OPT_FAILED */ virtual ErrCode DisableDeviceConfig(int networkId) const; + /** + * @Description Clear disabled bssid before reconnect. + * + * @return ErrCode - success: WIFI_OPT_SUCCESS fail: WIFI_OPT_FAILED + */ + virtual ErrCode ClearDisabledBssidForReconnect() const; /** * @Description Start WPS Connection * diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp index fb5624f..fc2d9ca 100755 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp @@ -805,7 +805,7 @@ void StaStateMachine::DealReassociateCmd(InternalMessage *msg) if (msg == nullptr) { WIFI_LOGE("msg is null\n"); } - WIFI_LOGD("enter DealStartWpsCmd\n"); + WIFI_LOGD("enter DealReassociateCmd\n"); /* Obtains the current system time, assigns the timestamp of the last * connection attempt, and prohibits scanning requests within 10 seconds. */ @@ -1715,7 +1715,7 @@ void StaStateMachine::ConnectToNetworkProcess(InternalMessage *msg) WifiSettings::GetInstance().AddDeviceConfig(deviceConfig); } WifiSettings::GetInstance().SyncDeviceConfig(); - WIFI_LOGD("Device ssid = %s", deviceConfig.ssid.c_str()); + WIFI_LOGD("Device ssid = %{public}s", deviceConfig.ssid.c_str()); } linkedInfo.networkId = lastNetworkId; @@ -1824,6 +1824,8 @@ void StaStateMachine::DhcpResultNotify::OnSuccess(int status, const std::string /* Check whether the Internet access is normal by send http. */ pStaStateMachine->pNetcheck->SignalNetCheckThread(); + } else { + WIFI_LOGE("Dhcp getIpSucNum: %{public}d", pStaStateMachine->getIpSucNum); } pStaStateMachine->getIpSucNum++; return; diff --git a/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c b/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c index 26a90a6..1da66b2 100644 --- a/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c +++ b/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c @@ -32,7 +32,7 @@ #define SCAN_INFO_TWO 2 #define SCAN_INFO_THREE 3 #define FAIL_PBC_OVERLAP_RETUEN 3 -#define CMD_BUFFER_SIZE 256 +#define CMD_BUFFER_SIZE 1024 #define REPLY_BUF_LENGTH 4096 #define REPLY_BUF_SMALL_LENGTH 64 #define CMD_FREQ_MAX_LEN 8 diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service_test.cpp b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service_test.cpp index e0c4c8d..929ed86 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service_test.cpp +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service_test.cpp @@ -154,7 +154,6 @@ public: void RoamingEncryptionModeCheckFail2(); void RoamingEncryptionModeCheckFail3(); void RoamingEncryptionModeCheckFail4(); - void RefreshConfigDeviceSuccess(); void RoamingSelectionSuccess1(); void RoamingSelectionFail1(); void RoamingSelectionFail2(); @@ -1183,11 +1182,6 @@ void StaAutoConnectServiceTest::RoamingEncryptionModeCheckFail4() EXPECT_TRUE(pStaAutoConnectService->RoamingEncryptionModeCheck(deviceConfig, scanInfo, info) == false); } -void StaAutoConnectServiceTest::RefreshConfigDeviceSuccess() -{ - pStaAutoConnectService->RefreshConfigDevice(); -} - void StaAutoConnectServiceTest::RoamingSelectionSuccess1() { WifiDeviceConfig deviceConfig; @@ -1667,11 +1661,6 @@ HWTEST_F(StaAutoConnectServiceTest, RoamingEncryptionModeCheckFail4, TestSize.Le RoamingEncryptionModeCheckFail4(); } -HWTEST_F(StaAutoConnectServiceTest, RefreshConfigDeviceSuccess, TestSize.Level1) -{ - RefreshConfigDeviceSuccess(); -} - HWTEST_F(StaAutoConnectServiceTest, RoamingSelectionSuccess1, TestSize.Level1) { RoamingSelectionSuccess1(); -- Gitee From 3df9297050913ca87d70cbbf2e2aaac6963c2104 Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Mon, 22 Nov 2021 03:31:30 +0000 Subject: [PATCH 014/491] fix(*): fix issues Signed-off-by: zhangfeng --- .../wifi_standard/interfaces/wifi_msg.h | 11 +- .../src/wifi_device_callback_stub.cpp | 6 +- .../wifi_standard/src/wifi_device_proxy.cpp | 6 +- .../common/config/wifi_config_file_spec.cpp | 41 +- .../common/config/wifi_config_file_spec.h | 40 + .../common/config/wifi_settings.cpp | 46 + .../common/config/wifi_settings.h | 18 + .../common/include/wifi_internal_msg.h | 9 + .../common/net_helper/http_request.cpp | 139 ++- .../common/net_helper/http_request.h | 31 +- .../wifi_device_callback_proxy.cpp | 6 +- .../wifi_manage/wifi_device_stub.cpp | 6 +- .../wifi_manage/wifi_sta/BUILD.gn | 1 - .../wifi_manage/wifi_sta/sta_define.h | 27 +- .../wifi_sta/sta_network_check.cpp | 110 ++- .../wifi_manage/wifi_sta/sta_network_check.h | 4 +- .../wifi_sta/sta_network_speed.cpp | 120 --- .../wifi_manage/wifi_sta/sta_network_speed.h | 70 -- .../wifi_manage/wifi_sta/sta_service.cpp | 73 +- .../wifi_sta/sta_state_machine.cpp | 898 +++++++++--------- .../wifi_manage/wifi_sta/sta_state_machine.h | 118 ++- .../wifi_manage/wifi_sta/BUILD.gn | 1 - .../wifi_sta/sta_state_machine_test.cpp | 6 +- 23 files changed, 968 insertions(+), 819 deletions(-) delete mode 100644 services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_speed.cpp delete mode 100644 services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_speed.h diff --git a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_msg.h b/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_msg.h index 66918ff..628da4b 100755 --- a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_msg.h +++ b/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_msg.h @@ -97,10 +97,12 @@ struct WifiLinkedInfo { unsigned int ipAddress; ConnState connState; bool ifHiddenSSID; - std::string rxLinkSpeed; /* Downstream network speed */ - std::string txLinkSpeed; /* Upstream network speed */ + int rxLinkSpeed; /* Downstream network speed */ + int txLinkSpeed; /* Upstream network speed */ int chload; int snr; /* Signal-to-Noise Ratio */ + int isDataRestricted; + std::string portalUrl; SupplicantState supplicantState; /* wpa_supplicant state */ DetailedState detailedState; /* connection state */ @@ -116,6 +118,7 @@ struct WifiLinkedInfo { ifHiddenSSID = false; chload = 0; snr = 0; + isDataRestricted = 0; supplicantState = SupplicantState::INVALID; detailedState = DetailedState::INVALID; } @@ -390,6 +393,10 @@ enum class WpsStartState { START_PBC_FAILED_OVERLAP = 10, START_WPS_FAILED = 11, WPS_TIME_OUT = 12, + START_AP_PIN_SUCCEED = 13, + START_AP_PIN_FAILED = 14, + STOP_AP_PIN_SUCCEED = 15, + STOP_AP_PIN_FAILED = 16, }; enum class StreamDirection { diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_callback_stub.cpp b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_callback_stub.cpp index 8927eb0..bf28eb3 100644 --- a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_callback_stub.cpp +++ b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_callback_stub.cpp @@ -159,10 +159,12 @@ int WifiDeviceCallBackStub::RemoteOnWifiConnectionChanged(uint32_t code, Message info.connState = ConnState::FAILED; } info.ifHiddenSSID = data.ReadBool(); - info.rxLinkSpeed = data.ReadCString(); - info.txLinkSpeed = data.ReadCString(); + info.rxLinkSpeed = data.ReadInt32(); + info.txLinkSpeed = data.ReadInt32(); info.chload = data.ReadInt32(); info.snr = data.ReadInt32(); + info.isDataRestricted = data.ReadInt32(); + info.portalUrl = data.ReadCString(); int tmpState = data.ReadInt32(); if (tmpState >= 0 && tmpState <= int(SupplicantState::INVALID)) { info.supplicantState = SupplicantState(tmpState); diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy.cpp b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy.cpp index 2b676f1..258f04f 100644 --- a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy.cpp +++ b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy.cpp @@ -663,10 +663,12 @@ void WifiDeviceProxy::ReadLinkedInfo(MessageParcel &reply, WifiLinkedInfo &info) info.connState = ConnState::FAILED; } info.ifHiddenSSID = reply.ReadBool(); - info.rxLinkSpeed = reply.ReadCString(); - info.txLinkSpeed = reply.ReadCString(); + info.rxLinkSpeed = reply.ReadInt32(); + info.txLinkSpeed = reply.ReadInt32(); info.chload = reply.ReadInt32(); info.snr = reply.ReadInt32(); + info.isDataRestricted = reply.ReadInt32(); + info.portalUrl = reply.ReadCString(); int tmpState = reply.ReadInt32(); if ((tmpState >= 0) && (tmpState <= (int)SupplicantState::INVALID)) { diff --git a/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp b/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp index e7eb55f..43ec488 100644 --- a/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp +++ b/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp @@ -792,7 +792,6 @@ void SetTClassKeyValue(TrustListPolicy &item, const std::string } else if (key == "trustList") { item.trustList = value; } - return; } @@ -838,5 +837,45 @@ template <> std::string OutTClassString(MovingFreezePolicy & ss << "trustList=" << item.trustList << std::endl; return ss.str(); } + +template <> void ClearTClass(WifiStoreRandomMac &item) +{ + item.ssid.clear(); + item.keyMgmt.clear(); + item.peerBssid.clear(); + item.randomMac.clear(); + return; +} + +template <> +void SetTClassKeyValue(WifiStoreRandomMac &item, const std::string &key, const std::string &value) +{ + if (key == "ssid") { + item.ssid = value; + } else if (key == "keyMgmt") { + item.keyMgmt = value; + } else if (key == "peerBssid") { + item.peerBssid = value; + } else if (key == "randomMac") { + item.randomMac = value; + } + return; +} + +template <> std::string GetTClassName() +{ + return "WifiStoreRandomMac"; +} + +template <> std::string OutTClassString(WifiStoreRandomMac &item) +{ + std::ostringstream ss; + ss << "ssid=" << item.ssid << std::endl; + ss << "keyMgmt=" << item.keyMgmt << std::endl; + ss << "peerBssid=" << item.peerBssid << std::endl; + ss << "randomMac=" << item.randomMac << std::endl; + return ss.str(); +} } // namespace Wifi } // namespace OHOS + diff --git a/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.h b/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.h index 50ec000..87dcdba 100644 --- a/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.h +++ b/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.h @@ -408,6 +408,46 @@ std::string GetTClassName(); */ template <> std::string OutTClassString(MovingFreezePolicy &item); + +/** + * @Description Clear and init WifiStoreRandomMac + * + * @tparam + * @param item - WifiStoreRandomMac &item + */ +template <> +void ClearTClass(WifiStoreRandomMac &item); + +/** + * @Description Set WifiStoreRandomMac item data + * + * @tparam + * @param item - WifiStoreRandomMac &item + * @param key - WifiStoreRandomMac struct member name + * @param value - the WifiStoreRandomMac item member value + */ +template <> +void SetTClassKeyValue(WifiStoreRandomMac &item, const std::string &key, const std::string &value); + +/** + * @Description Output WifiStoreRandomMac class name + * + * @tparam + * @param item - WifiStoreRandomMac &item + * @return std::string - Class name + */ +template <> +std::string GetTClassName(); + +/** + * @Description Output the WifiStoreRandomMac item, format: item's member = the member value + * + * @tparam + * @param item - WifiStoreRandomMac &item + * @return std::string - output total member=value string about the WifiStoreRandomMac item + */ +template <> +std::string OutTClassString(WifiStoreRandomMac &item); /* ----------template function specialization declare end----------- */ } // namespace Wifi } // namespace OHOS diff --git a/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp b/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp index daad43c..7f4262f 100644 --- a/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp +++ b/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp @@ -125,6 +125,7 @@ int WifiSettings::Init() mSavedWifiP2pVendorConfig.SetConfigFilePath(WIFI_P2P_VENDOR_CONFIG_FILE_PATH); mTrustListPolicies.SetConfigFilePath(WIFI_TRUST_LIST_POLICY_FILE_PATH); mMovingFreezePolicy.SetConfigFilePath(WIFI_MOVING_FREEZE_POLICY_FILE_PATH); + mSavedWifiStoreRandomMac.SetConfigFilePath(WIFI_STA_RANDOM_MAC_FILE_PATH); InitWifiConfig(); ReloadDeviceConfig(); InitHotspotConfig(); @@ -498,6 +499,51 @@ int WifiSettings::GetMacAddress(std::string &macAddress) return 0; } +int WifiSettings::ReloadStaRandomMac() +{ + if (mSavedWifiStoreRandomMac.LoadConfig()) { + return -1; + } + std::unique_lock lock(mStaMutex); + mWifiStoreRandomMac.clear(); + mSavedWifiStoreRandomMac.GetValue(mWifiStoreRandomMac); + return 0; +} + +bool WifiSettings::AddRandomMac(WifiStoreRandomMac &randomMacInfo) +{ + std::unique_lock lock(mStaMutex); + bool isConnected = false; + + for (auto &ele : mWifiStoreRandomMac) { + if ((randomMacInfo.ssid == ele.ssid) && (randomMacInfo.keyMgmt == ele.keyMgmt)) { + ele.peerBssid = randomMacInfo.peerBssid; + randomMacInfo.randomMac = ele.randomMac; + isConnected = true; + break; + } else if (randomMacInfo.peerBssid == ele.peerBssid && (randomMacInfo.keyMgmt == ele.keyMgmt) && + (randomMacInfo.keyMgmt == "NONE")) { + isConnected = false; + } else if (randomMacInfo.peerBssid == ele.peerBssid && (randomMacInfo.keyMgmt == ele.keyMgmt) && + (randomMacInfo.keyMgmt != "NONE")) { + ele.ssid = randomMacInfo.ssid; + randomMacInfo.randomMac = ele.randomMac; + isConnected = true; + } else { + isConnected = false; + } + } + + if (!isConnected) { + mWifiStoreRandomMac.push_back(randomMacInfo); + } + + mSavedWifiStoreRandomMac.SetValue(mWifiStoreRandomMac); + mSavedWifiStoreRandomMac.SaveConfig(); + return isConnected; +} + + int WifiSettings::SetCountryCode(const std::string &countryCode) { std::unique_lock lock(mStaMutex); diff --git a/services/wifi_standard/wifi_framework/common/config/wifi_settings.h b/services/wifi_standard/wifi_framework/common/config/wifi_settings.h index 1d8e5c3..ba7b222 100644 --- a/services/wifi_standard/wifi_framework/common/config/wifi_settings.h +++ b/services/wifi_standard/wifi_framework/common/config/wifi_settings.h @@ -48,6 +48,7 @@ constexpr char WIFI_P2P_GROUP_INFO_FILE_PATH[] = "/data/misc/wifi/p2p_groups.con constexpr char WIFI_P2P_VENDOR_CONFIG_FILE_PATH[] = "/data/misc/wifi/p2p_vendor_config.conf"; const std::string WIFI_TRUST_LIST_POLICY_FILE_PATH = "/data/misc/wifi/trust_list_polices.conf"; const std::string WIFI_MOVING_FREEZE_POLICY_FILE_PATH = "/data/misc/wifi/moving_freeze_policy.conf"; +constexpr char WIFI_STA_RANDOM_MAC_FILE_PATH[] = "/data/misc/wifi/sta_randomMac.conf"; namespace OHOS { namespace Wifi { @@ -336,6 +337,21 @@ public: */ int GetMacAddress(std::string &macAddress); + /** + * @Description reload mac address + * + * @return int - 0 success + */ + int ReloadStaRandomMac(); + + /** + * @Description add random mac address + * + * @param randomMacInfo - randmon mac address info + * @return int - 0 success + */ + bool AddRandomMac(WifiStoreRandomMac &randomMacInfo); + /** * @Description Save the country code * @@ -983,6 +999,7 @@ private: std::atomic mScanAlwaysActive; /* if scan always */ std::vector mWifiScanInfoList; std::vector mGroupInfoList; + std::vector mWifiStoreRandomMac; ScanControlInfo mScanControlInfo; WifiP2pLinkedInfo mWifiP2pInfo; std::map mWifiDeviceConfig; @@ -1028,6 +1045,7 @@ private: WifiConfigFileImpl mTrustListPolicies; WifiConfigFileImpl mMovingFreezePolicy; MovingFreezePolicy mFPolicy; + WifiConfigFileImpl mSavedWifiStoreRandomMac; }; } // namespace Wifi } // namespace OHOS diff --git a/services/wifi_standard/wifi_framework/common/include/wifi_internal_msg.h b/services/wifi_standard/wifi_framework/common/include/wifi_internal_msg.h index b177614..be7f6d4 100755 --- a/services/wifi_standard/wifi_framework/common/include/wifi_internal_msg.h +++ b/services/wifi_standard/wifi_framework/common/include/wifi_internal_msg.h @@ -266,6 +266,7 @@ struct WifiConfig { int fourthRssiLevel5G; std::string strDnsBak; bool isLoadStabak; + WifiConfig() { scanAlwaysSwitch = false; @@ -313,6 +314,14 @@ struct TrustListPolicy { struct MovingFreezePolicy { std::string trustList; /* trust list */ }; + +/* wifi RandomMac store */ +struct WifiStoreRandomMac { + std::string ssid; + std::string keyMgmt; + std::string peerBssid; + std::string randomMac; +}; } // namespace Wifi } // namespace OHOS #endif diff --git a/services/wifi_standard/wifi_framework/common/net_helper/http_request.cpp b/services/wifi_standard/wifi_framework/common/net_helper/http_request.cpp index 75f2263..0e709da 100644 --- a/services/wifi_standard/wifi_framework/common/net_helper/http_request.cpp +++ b/services/wifi_standard/wifi_framework/common/net_helper/http_request.cpp @@ -14,7 +14,12 @@ */ #include "http_request.h" +#include +#include +#include +#include "securec.h" #include "wifi_log.h" + #undef LOG_TAG #define LOG_TAG "OHWIFI_UTILS_HTTP_REQ" @@ -78,12 +83,16 @@ int HttpRequest::HttpRequestExec( GetPortFromUrl(); if (iPort < 0) { LOGE("HttpRequest::HttpRequestExec get port failed from URL!\n"); + close(mISocketFd); + mISocketFd = INVALID_SOCKET; return -1; } iRet = GetIPFromUrl(); if (iRet != 0) { LOGE("HttpRequest::HttpRequestExec get ip failed from URL!\n"); + close(mISocketFd); + mISocketFd = INVALID_SOCKET; return -1; } @@ -92,8 +101,13 @@ int HttpRequest::HttpRequestExec( iRet = HttpConnect(strResponse); if (iRet != 0) { LOGE("HttpRequest::HttpConnect failed!\n"); + close(mISocketFd); + mISocketFd = INVALID_SOCKET; return -1; } + close(mISocketFd); + mISocketFd = INVALID_SOCKET; + LOGD("HttpRequest::HttpConnect success!\n"); return 0; } @@ -188,24 +202,49 @@ int HttpRequest::HttpDataTransmit(const int &iSockFd) if (buf == nullptr) { return -1; } + constexpr int timeoutMs = 500; + constexpr int timeRate = 1000; + struct timeval tv; + struct timeval tvEnd; + gettimeofday(&tv, nullptr); + long long tvTime = tv.tv_sec * timeRate + tv.tv_usec / timeRate; + long long tvEndTime; + bool bDataRec = false; while (1) { + gettimeofday(&tvEnd, nullptr); + tvEndTime = tvEnd.tv_sec * timeRate + tvEnd.tv_usec / timeRate; + if (tvEndTime - tvTime > timeoutMs) { + LOGE("HttpRequest::HttpDataTransmit recv timeout\n"); + delete[] buf; + buf = nullptr; + return -1; + } + (void)memset_s(buf, BUFSIZE, 0, BUFSIZE); ret = recv(iSockFd, buf, BUFSIZE, 0); if (ret == 0) { /* The connection is closed. */ - LOGE("HttpRequest::HttpDataTransmit recv error! Error code: %{public}d", errno); - delete[] buf; - return -1; + if (!bDataRec) { + LOGE("HttpRequest::HttpDataTransmit recv error! Error code: %{public}d", errno); + delete[] buf; + buf = nullptr; + return -1; + } else { + LOGD("HttpRequest::HttpDataTransmit recv success\n"); + delete[] buf; + return 0; + } } else if (ret > 0) { - strRes = buf; - delete[] buf; - return 0; + bDataRec = true; + strRes += buf; } else if (ret < 0) { /* Error */ if (errno == EINTR || errno == EWOULDBLOCK || errno == EAGAIN) { + LOGE("HttpRequest::HttpDataTransmit recv not finish!\n"); continue; } else { LOGE("HttpRequest::HttpDataTransmit recv error! Error code: %{public}d", errno); delete[] buf; + buf = nullptr; return -1; } } @@ -246,6 +285,43 @@ void HttpRequest::GetPortFromUrl() } } +std::mutex gMutex; +std::unordered_set gHostDataSet; +void GetHostThread(HostData* pThreadData) +{ + std::string ipOrDomain; + { + std::unique_lock lck(gMutex); + if (gHostDataSet.find(pThreadData) == gHostDataSet.end()) { + LOGE("GetHostThread Error."); + return; + } + ipOrDomain = pThreadData->strIpOrDomain; + } + hostent *he = gethostbyname(ipOrDomain.c_str()); + if (he == nullptr) { + { + std::unique_lock lck(gMutex); + if (gHostDataSet.find(pThreadData) != gHostDataSet.end()) { + LOGD("GetHostThread delete."); + gHostDataSet.erase(pThreadData); + delete pThreadData; + pThreadData = nullptr; + } + } + LOGE("GetIPFromUrl Url is wrong. error message:[%s]\n", hstrerror(h_errno)); + } else { + std::unique_lock lck(gMutex); + in_addr **addr_list = (in_addr **)he->h_addr_list; + for (int i = 0; addr_list[i] != nullptr; i++) { + pThreadData->strIp = inet_ntoa(*addr_list[i]); + } + pThreadData->bIp = true; + pThreadData->mWait_timeout.notify_one(); + } + return; +} + int HttpRequest::GetIPFromUrl() { std::string strIpOrDomain; @@ -260,23 +336,44 @@ int HttpRequest::GetIPFromUrl() } if (inet_addr(strIpOrDomain.c_str()) == INADDR_NONE) { - /* Incorrect IP address format. */ - LOGI("GetIPFromUrl Url maybe contain Domain\n"); - struct hostent *he = gethostbyname(strIpOrDomain.c_str()); - if (he == nullptr) { - LOGE("GetIPFromUrl Url is wrong."); - return -1; - } else { - struct in_addr **addrList = reinterpret_cast(he->h_addr_list); - for (int i = 0; addrList[i] != nullptr; i++) { - char ipStr[MAX_IP_STRING_LENGTH] = {0}; - if (inet_ntop(AF_INET, addrList[i], ipStr, sizeof(ipStr)) == nullptr) { - continue; - } - strIp = std::string(ipStr); + LOGI("GetIPFromUrl Url maybe contain Domain."); + HostData* pData = nullptr; + { + std::unique_lock lck(gMutex); + pData = new HostData; + gHostDataSet.emplace(pData); + pData->strIpOrDomain = strIpOrDomain; + } + + int iRlt = -1; + std::thread getHost = std::thread(&GetHostThread, pData); + getHost.detach(); + + bool bTimeOut = false; + const int timeoutMs = 150; + { + std::unique_lock lck(gMutex); + if (pData->mWait_timeout.wait_for(lck, std::chrono::milliseconds(timeoutMs)) == std::cv_status::timeout) { + bTimeOut = true; + } + } + + if (!bTimeOut) { + std::unique_lock lck(gMutex); + if (gHostDataSet.find(pData) == gHostDataSet.end()) { + LOGD("GetHostThread None."); + return -1; + } + if (pData->bIp) { + iRlt = 0; + strIp = pData->strIp; + gHostDataSet.erase(pData); + delete pData; + pData = nullptr; + LOGD("Get ip ok."); } - return 0; } + return iRlt; } else { LOGI("GetIPFromUrl Url contain ip\n"); strIp = strIpOrDomain; diff --git a/services/wifi_standard/wifi_framework/common/net_helper/http_request.h b/services/wifi_standard/wifi_framework/common/net_helper/http_request.h index 5e1a328..b18aef4 100644 --- a/services/wifi_standard/wifi_framework/common/net_helper/http_request.h +++ b/services/wifi_standard/wifi_framework/common/net_helper/http_request.h @@ -21,22 +21,23 @@ #include #include #include -#include -#include #include #include #include #include #include +#include +#include +#include -constexpr int BUFSIZE = 41000; -constexpr int URLSIZE = 1024; -constexpr int INVALID_SOCKET = -1; -constexpr int HTTP_HEADER_LENGTH = 7; -constexpr int HTTPS_HEADER_LENGTH = 8; -constexpr int DEFAULT_PORT = 80; -constexpr int SEND_HTTP_DELAY_TIME = 6; -constexpr int MAX_IP_STRING_LENGTH = 64; +#define BUFSIZE 1024 +#define URLSIZE 1024 +#define INVALID_SOCKET (-1) + +const int HTTP_HEADER_LENGTH = 7; +const int HTTPS_HEADER_LENGTH = 8; +const int DEFAULT_PORT = 80; +const int SEND_HTTP_DELAY_TIME = 1; namespace OHOS { namespace Wifi { @@ -152,6 +153,12 @@ private: std::string strParam; std::string httpHead; }; -} // namespace Wifi -} // namespace OHOS +struct HostData { + bool bIp = false; + std::string strIp; + std::string strIpOrDomain; + std::condition_variable mWait_timeout; +}; +} +} /* namespace OHOS */ #endif \ No newline at end of file diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_callback_proxy.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_callback_proxy.cpp index 59ce431..01aabb8 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_callback_proxy.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_callback_proxy.cpp @@ -66,10 +66,12 @@ void WifiDeviceCallBackProxy::OnWifiConnectionChanged(int state, const WifiLinke data.WriteInt32(info.ipAddress); data.WriteInt32((int)info.connState); data.WriteBool(info.ifHiddenSSID); - data.WriteCString(info.rxLinkSpeed.c_str()); - data.WriteCString(info.txLinkSpeed.c_str()); + data.WriteInt32(info.rxLinkSpeed); + data.WriteInt32(info.txLinkSpeed); data.WriteInt32(info.chload); data.WriteInt32(info.snr); + data.WriteInt32(info.isDataRestricted); + data.WriteCString(info.portalUrl.c_str()); data.WriteInt32((int)info.supplicantState); data.WriteInt32((int)info.detailedState); diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp index f6f39c2..9b69db6 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp @@ -446,10 +446,12 @@ void WifiDeviceStub::OnGetLinkedInfo(uint32_t code, MessageParcel &data, Message reply.WriteInt32(wifiInfo.ipAddress); reply.WriteInt32((int)wifiInfo.connState); reply.WriteBool(wifiInfo.ifHiddenSSID); - reply.WriteCString(wifiInfo.rxLinkSpeed.c_str()); - reply.WriteCString(wifiInfo.txLinkSpeed.c_str()); + reply.WriteInt32(wifiInfo.rxLinkSpeed); + reply.WriteInt32(wifiInfo.txLinkSpeed); reply.WriteInt32(wifiInfo.chload); reply.WriteInt32(wifiInfo.snr); + reply.WriteInt32(wifiInfo.isDataRestricted); + reply.WriteCString(wifiInfo.portalUrl.c_str()); reply.WriteInt32((int)wifiInfo.supplicantState); reply.WriteInt32((int)wifiInfo.detailedState); } diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn index 028d382..2744bf4 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn @@ -29,7 +29,6 @@ ohos_shared_library("wifi_sta_service") { "sta_interface.cpp", "sta_monitor.cpp", "sta_network_check.cpp", - "sta_network_speed.cpp", "sta_saved_device_appraisal.cpp", "sta_service.cpp", "sta_state_machine.cpp", diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_define.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_define.h index 4ecebb0..7d899b1 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_define.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_define.h @@ -24,19 +24,15 @@ namespace Wifi { #define WIFI_SVR_CMD_STA_ENABLE_WIFI 0x2001 #define WIFI_SVR_CMD_STA_DISABLE_WIFI 0x2002 -#define WIFI_SVR_CMD_STA_START_SUPPLICANT 0x2003 -#define WIFI_SVR_CMD_STA_OPERATIONAL_MODE 0x2004 -#define WIFI_SVR_CMD_STA_STOP_SUPPLICANT 0x2005 -#define WIFI_SVR_CMD_STA_CONNECT_NETWORK 0x2006 -#define WIFI_SVR_CMD_STA_CONNECT_SAVED_NETWORK 0x2007 -#define WIFI_SVR_CMD_STA_REMOVE_DEVICE_CONFIG 0x2008 -#define WIFI_SVR_CMD_STA_RECONNECT_NETWORK 0x2009 -#define WIFI_SVR_CMD_STA_REMOVE_All_DEVICE_CONFIG 0x2010 -#define WIFI_SVR_CMD_STA_REASSOCIATE_NETWORK 0x200A -#define WIFI_SVR_CMD_STA_DISCONNECT 0x200B -#define WIFI_SVR_CMD_STA_STARTWPS 0x200C -#define WIFI_SVR_CMD_STA_CANCELWPS 0x200D -#define WIFI_SVR_COM_STA_START_ROAM 0x200E +#define WIFI_SVR_CMD_STA_OPERATIONAL_MODE 0x2003 +#define WIFI_SVR_CMD_STA_CONNECT_NETWORK 0x2004 +#define WIFI_SVR_CMD_STA_CONNECT_SAVED_NETWORK 0x2005 +#define WIFI_SVR_CMD_STA_RECONNECT_NETWORK 0x2006 +#define WIFI_SVR_CMD_STA_REASSOCIATE_NETWORK 0x2007 +#define WIFI_SVR_CMD_STA_DISCONNECT 0x2008 +#define WIFI_SVR_CMD_STA_STARTWPS 0x2009 +#define WIFI_SVR_CMD_STA_CANCELWPS 0x200A +#define WIFI_SVR_COM_STA_START_ROAM 0x200B #define WIFI_SVR_CMD_STA_ERROR 0x3001 #define WIFI_SVR_CMD_STA_SUP_CONNECTION_EVENT 0x3002 @@ -86,13 +82,14 @@ typedef enum EnumStaIpType { } StaIpType; typedef enum EnumStaNetState { - NETWORK_STATE_UNKNOW, + NETWORK_STATE_UNKNOWN, NETWORK_STATE_WORKING, + NETWORK_CHECK_PORTAL, NETWORK_STATE_NOWORKING, NETWORK_STATE_BUTT, } StaNetState; -typedef std::function NetStateHandler; +using NetStateHandler = std::function; } // namespace Wifi } // namespace OHOS #endif /* OHOS_STA_DEFINE_H */ diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check.cpp index d9926f6..17852fb 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check.cpp @@ -20,11 +20,19 @@ DEFINE_WIFILOG_LABEL("StaNetworkCheck"); namespace OHOS { namespace Wifi { +constexpr int NET_ERR_OK = 200; +constexpr int NET_ERR_CREATED = 201; +constexpr int NET_ERR_NO_CONTENT = 204; +constexpr int NET_ERR_BAD_REQUEST = 400; + +constexpr int NET_ERR_REDIRECT_CLASS_MAX = 399; +constexpr int NET_ERR_REQUEST_ERROR_CLASS_MAX = 499; + StaNetworkCheck::StaNetworkCheck(NetStateHandler handle) { pDealNetCheckThread = nullptr; netStateHandler = handle; - lastNetState = NETWORK_STATE_UNKNOW; + lastNetState = NETWORK_STATE_UNKNOWN; isStopNetCheck = true; isExitNetCheckThread = false; } @@ -36,43 +44,97 @@ StaNetworkCheck::~StaNetworkCheck() WIFI_LOGI("StaNetworkCheck::~StaNetworkCheck complete\n"); } -void StaNetworkCheck::HttpDetection() +bool StaNetworkCheck::HttpDetection() { WIFI_LOGI("Enter httpDetection"); /* Detect portal hotspot and send message to InterfaceSeervice if result is yes. */ HttpRequest httpRequest; std::string httpReturn; std::string httpMsg(DEFAULT_PORTAL_HTTPS_URL); + const std::string genStr("generate_204"); + const std::string contStr("Content-Length:"); if (httpRequest.HttpGet(httpMsg, httpReturn) == 0) { - if (httpReturn.find("204") != std::string::npos) { + int retCode = httpReturn.find("HTTP/"); + int codeNum = 0; + if (retCode >= 0) { + constexpr int NET_ERROR_POS = 8; + constexpr int NET_ERROR_LEN = 5; + codeNum = std::atoi(httpReturn.substr(retCode + NET_ERROR_POS, NET_ERROR_LEN).c_str()); + } + + int contLenStr = httpReturn.find(contStr); + int contLenNum = 0; + if (contLenStr > 0) { + constexpr int NET_CONTENT_LENGTH = 6; + contLenNum = std::atoi(httpReturn.substr(contLenStr + contStr.length(), NET_CONTENT_LENGTH).c_str()); + } + + constexpr int PORTAL_CONTENT_LENGTH_MIN = 4; + if (codeNum == NET_ERR_NO_CONTENT) { WIFI_LOGE("This network is normal!"); if ((lastNetState != NETWORK_STATE_WORKING) && (isExitNetCheckThread == false) && (isStopNetCheck == false)) { - netStateHandler(StaNetState::NETWORK_STATE_WORKING); + netStateHandler(StaNetState::NETWORK_STATE_WORKING, ""); } lastNetState = NETWORK_STATE_WORKING; - return; - } else { + return true; + } else if (codeNum != NET_ERR_NO_CONTENT && + (codeNum >= NET_ERR_CREATED && codeNum <= NET_ERR_REDIRECT_CLASS_MAX)) { /* Callback result to InterfaceService. */ WIFI_LOGI("This network is portal AP, need certification!"); - return; + std::string urlTmp; + const std::string locStr("Location: "); + int startStr = httpReturn.find(locStr); + if (startStr > 0) { + startStr += locStr.length(); + int endstr = httpReturn.find(genStr, startStr); + if (endstr > 0) { + endstr += genStr.length(); + urlTmp = httpReturn.substr(startStr, endstr-startStr); + } + netStateHandler(StaNetState::NETWORK_CHECK_PORTAL, urlTmp); + } + return false; + } else if ((codeNum == NET_ERR_OK || + (codeNum >= NET_ERR_BAD_REQUEST && codeNum <= NET_ERR_REQUEST_ERROR_CLASS_MAX)) && + contLenNum > PORTAL_CONTENT_LENGTH_MIN) { + WIFI_LOGI("This network is portal AP, need certification!"); + std::string urlTmp; + const std::string locStr("http"); + int startStr = httpReturn.find(locStr); + if (startStr > 0) { + int endstr = httpReturn.find(genStr, startStr); + if (endstr > 0) { + endstr += genStr.length(); + urlTmp = httpReturn.substr(startStr, endstr-startStr); + } + netStateHandler(StaNetState::NETWORK_CHECK_PORTAL, urlTmp); + } + return false; + } else { + WIFI_LOGE("http msg error[%s]!", httpReturn.c_str()); + netStateHandler(StaNetState::NETWORK_STATE_NOWORKING, ""); + lastNetState = NETWORK_STATE_NOWORKING; + return true; } } WIFI_LOGE("This network cant online!"); if ((lastNetState != NETWORK_STATE_NOWORKING) && (isExitNetCheckThread == false) && (isStopNetCheck == false)) { - netStateHandler(StaNetState::NETWORK_STATE_NOWORKING); + netStateHandler(StaNetState::NETWORK_STATE_NOWORKING, ""); } lastNetState = NETWORK_STATE_NOWORKING; + return true; } void StaNetworkCheck::RunNetCheckThreadFunc() { WIFI_LOGI("enter RunNetCheckThreadFunc!\n"); + int timeoutMs = 3000; for (;;) { - std::unique_lock lck(mMutex); - while (isStopNetCheck) { - WIFI_LOGI("waiting for sigal\n"); + while (isStopNetCheck && !isExitNetCheckThread) { + LOGI("waiting for signal.\n"); + std::unique_lock lck(mMutex); mCondition.wait(lck); } @@ -80,9 +142,20 @@ void StaNetworkCheck::RunNetCheckThreadFunc() WIFI_LOGI("break the loop\n"); break; } - lck.unlock(); - HttpDetection(); - sleep(1); + + if (!HttpDetection()) { + isStopNetCheck = true; + } + + if (!isExitNetCheckThread) { + std::unique_lock lck(mMutex); + if (mCondition_timeout.wait_for(lck, std::chrono::milliseconds(timeoutMs)) == std::cv_status::timeout) { + LOGD("mCondition_timeout timeout.\n"); + } else { + LOGD("Wake up, break the loop.\n"); + break; + } + } } } @@ -106,25 +179,28 @@ void StaNetworkCheck::StopNetCheckThread() void StaNetworkCheck::SignalNetCheckThread() { WIFI_LOGI("enter SignalNetCheckThread!\n"); - lastNetState = NETWORK_STATE_UNKNOW; - isStopNetCheck = false; std::unique_lock lck(mMutex); + lastNetState = NETWORK_STATE_UNKNOWN; + isStopNetCheck = false; mCondition.notify_one(); } void StaNetworkCheck::ExitNetCheckThread() { { + std::unique_lock lck(mMutex); isStopNetCheck = false; isExitNetCheckThread = true; - std::unique_lock lck(mMutex); mCondition.notify_one(); + mCondition_timeout.notify_one(); } if (pDealNetCheckThread != nullptr) { + LOGD("pDealNetCheckThread->join();"); pDealNetCheckThread->join(); delete pDealNetCheckThread; pDealNetCheckThread = nullptr; + LOGD("pDealNetCheckThread = nullptr; done"); } } } // namespace Wifi diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check.h index 577e15b..2950171 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check.h @@ -64,7 +64,7 @@ private: * @Description : Detect Internet ability * */ - void HttpDetection(); + bool HttpDetection(); /** * @Description : NetCheck thread function * @@ -74,12 +74,12 @@ private: * @Description : Exit the NetCheck thread. * */ - void ExitNetCheckThread(); private: std::mutex mMutex; std::condition_variable mCondition; + std::condition_variable mCondition_timeout; bool isStopNetCheck; bool isExitNetCheckThread; }; diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_speed.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_speed.cpp deleted file mode 100644 index 6e14659..0000000 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_speed.cpp +++ /dev/null @@ -1,120 +0,0 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "sta_network_speed.h" -#include "wifi_logger.h" - -DEFINE_WIFILOG_LABEL("StaNetWorkSpeed"); - -namespace OHOS { -namespace Wifi { -StaNetWorkSpeed::StaNetWorkSpeed() -{} - -StaNetWorkSpeed::~StaNetWorkSpeed() -{ - WIFI_LOGI("StaNetWorkSpeed::~StaNetWorkSpeed enter"); -} - -void StaNetWorkSpeed::GetNetSpeed(std::string &strRx, std::string &strTx) -{ - WIFI_LOGE("enter GetNetSpeed\n"); - long rxBytesPre = 0; - long txBytesPre = 0; - long rxBytesNext = 0; - long txBytesNext = 0; - GetTxAndRxBytes(rxBytesPre, txBytesPre); - sleep(1); - GetTxAndRxBytes(rxBytesNext, txBytesNext); - - if ((rxBytesNext - rxBytesPre) < MAXIMUM_BYTE) { - strRx = std::to_string(rxBytesNext - rxBytesPre); - strRx += "B/s"; - } else if ((rxBytesNext - rxBytesPre) < MAXIMUM_KILOBYTE) { - strRx = std::to_string((rxBytesNext - rxBytesPre) / MAXIMUM_KILOBYTE); - strRx += "M/s"; - } else { - strRx = std::to_string((rxBytesNext - rxBytesPre) / MAXIMUM_BYTE); - strRx += "KB/s"; - } - - if ((txBytesNext - txBytesPre) < MAXIMUM_BYTE) { - strTx = std::to_string(txBytesNext - txBytesPre); - strTx += "B/s"; - } else if ((txBytesNext - txBytesPre) < MAXIMUM_KILOBYTE) { - strTx = std::to_string((txBytesNext - txBytesPre) / MAXIMUM_KILOBYTE); - strTx += "M/s"; - } else { - strTx = std::to_string((txBytesNext - txBytesPre) / MAXIMUM_BYTE); - strTx += "KB/s"; - } - WIFI_LOGI("GetNetSpeed strRx = %{public}s\n", strRx.c_str()); - WIFI_LOGI("GetNetSpeed strTx = %{public}s\n", strTx.c_str()); -} - -std::vector StaNetWorkSpeed::SplitString(std::string source, const std::string delim) -{ - std::vector res; - if (source.empty()) { - return res; - } - - if (delim.empty()) { - res.push_back(source); - return res; - } - std::string::size_type begPos = 0; - std::string::size_type endPos = 0; - std::string tmpStr; - while ((endPos = source.find(delim, begPos)) != std::string::npos) { - if (endPos > begPos) { - tmpStr = source.substr(begPos, endPos - begPos); - res.push_back(tmpStr); - } - begPos = endPos + delim.size(); - } - tmpStr = source.substr(begPos); - if (!tmpStr.empty()) { - res.push_back(tmpStr); - } - return res; -} - -ErrCode StaNetWorkSpeed::GetTxAndRxBytes(long &rxBytes, long &txBytes) -{ - std::ifstream fs(WLAN0_NETSPEED_FILE.c_str()); - if (!fs.is_open()) { - return ErrCode::WIFI_OPT_FAILED; - } - - std::string line; - while (std::getline(fs, line)) { - if (line.empty()) { - continue; - } - - if (line.find(IF_NAME) == std::string::npos) { - continue; - } - - std::vector splitDataList; - splitDataList = SplitString(line.substr(line.find(":")), " "); - rxBytes = std::atol(splitDataList[UP_TRAFFIC_INDEX].c_str()); - txBytes = std::atol(splitDataList[REV_TRAFFIC_INDEX].c_str()); - } - fs.close(); - return ErrCode::WIFI_OPT_SUCCESS; -} -} // namespace Wifi -} // namespace OHOS \ No newline at end of file diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_speed.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_speed.h deleted file mode 100644 index d19abda..0000000 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_speed.h +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef OHOS_WIFI_NET_SPEED_H -#define OHOS_WIFI_NET_SPEED_H - -#include -#include -#include -#include -#include "wifi_log.h" -#include "sta_define.h" -#include "wifi_errcode.h" - -static const std::string IF_NAME = "wlan0"; -static const std::string WLAN0_NETSPEED_FILE = "/proc/net/dev"; - -static const int MAXIMUM_BYTE = 1024; -static const int MAXIMUM_KILOBYTE = 1048576; - -static const int UP_TRAFFIC_INDEX = 1; -static const int REV_TRAFFIC_INDEX = 9; - -namespace OHOS { -namespace Wifi { -class StaNetWorkSpeed { -public: - StaNetWorkSpeed(); - ~StaNetWorkSpeed(); - /** - * @Description : Get internet speed - * - * @param strRx - download speed string[out] - * @param strTx - Upload speed string [out] - */ - void GetNetSpeed(std::string &strRx, std::string &strTx); - -private: - /** - * @Description : Get upload and download speed. - * - * @param rxBytes - download speed long[out] - * @param txBytes - Upload speed long [out] - * @Return success:WIFI_OPT_SUCCESS failed: WIFI_OPT_FAILED - */ - ErrCode GetTxAndRxBytes(long &rxBytes, long &txBytes); - /** - * @Description : Split string according to delimiter. - * - * @param source - Source string[in] - * @param delim - Delimiter string [in] - * @Return : Separated string vector - */ - std::vector SplitString(std::string source, const std::string delim); -}; -} // namespace Wifi -} // namespace OHOS -#endif \ No newline at end of file diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp index f5b8c31..d4b86dc 100755 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp @@ -141,6 +141,50 @@ int StaService::UpdateDeviceConfig(const WifiDeviceConfig &config) const return AddDeviceConfig(config); } +ErrCode StaService::RemoveDevice(int networkId) const +{ + LOGD("Enter StaService::RemoveDevice.\n"); + /* Remove network configuration. */ + if (WifiStaHalInterface::GetInstance().RemoveDevice(networkId) != WIFI_IDL_OPT_OK) { + LOGE("RemoveDeviceConfig() failed!"); + return WIFI_OPT_FAILED; + } + if (WifiStaHalInterface::GetInstance().SaveDeviceConfig() != WIFI_IDL_OPT_OK) { + LOGW("RemoveDevice-SaveDeviceConfig() failed!"); + } else { + LOGD("RemoveDevice-SaveDeviceConfig() succeed!"); + } + WifiDeviceConfig config; + if (WifiSettings::GetInstance().GetDeviceConfig(networkId, config) == 0) { + pStaAutoConnectService->EnableOrDisableBssid(config.bssid, true, 0); + } + /* Remove network configuration directly without notification to InterfaceService. */ + WifiSettings::GetInstance().RemoveDevice(networkId); + WifiSettings::GetInstance().SyncDeviceConfig(); + return WIFI_OPT_SUCCESS; +} + +ErrCode StaService::RemoveAllDevice() const +{ + LOGD("Enter StaService::RemoveAllDevice.\n"); + if (WifiStaHalInterface::GetInstance().ClearDeviceConfig() == WIFI_IDL_OPT_OK) { + LOGD("Remove all device config successfully!"); + if (WifiStaHalInterface::GetInstance().SaveDeviceConfig() != WIFI_IDL_OPT_OK) { + LOGE("WifiStaHalInterface:RemoveAllDevice:SaveDeviceConfig failed!"); + } + } else { + LOGE("WifiStaHalInterface:RemoveAllDevice failed!"); + return WIFI_OPT_FAILED; + } + + WifiSettings::GetInstance().ClearDeviceConfig(); + if (WifiSettings::GetInstance().SyncDeviceConfig() != 0) { + LOGE("RemoveAllDevice-SyncDeviceConfig() failed!"); + return WIFI_OPT_FAILED; + } + return WIFI_OPT_SUCCESS; +} + ErrCode StaService::ConnectToDevice(const WifiDeviceConfig &config) const { LOGI("Enter StaService::ConnectToDevice.\n"); @@ -175,35 +219,7 @@ ErrCode StaService::ReAssociate() const return WIFI_OPT_SUCCESS; } -ErrCode StaService::RemoveDevice(int networkId) const -{ - LOGD("Enter StaService::RemoveDeviceConfigProcess.\n"); - /* Remove network configuration. */ - if (WifiStaHalInterface::GetInstance().RemoveDevice(networkId) != WIFI_IDL_OPT_OK) { - LOGE("RemoveDeviceConfig() failed!"); - return WIFI_OPT_FAILED; - } - if (WifiStaHalInterface::GetInstance().SaveDeviceConfig() != WIFI_IDL_OPT_OK) { - LOGW("RemoveDeviceConfig-SaveDeviceConfig() failed!"); - } else { - LOGD("RemoveDeviceConfig-SaveDeviceConfig() succeed!"); - } - WifiDeviceConfig config; - if (WifiSettings::GetInstance().GetDeviceConfig(networkId, config) == 0) { - pStaAutoConnectService->EnableOrDisableBssid(config.bssid, true, 0); - } - /* Remove network configuration directly without notification to InterfaceService. */ - WifiSettings::GetInstance().RemoveDevice(networkId); - WifiSettings::GetInstance().SyncDeviceConfig(); - return WIFI_OPT_SUCCESS; -} -ErrCode StaService::RemoveAllDevice() const -{ - WIFI_LOGI("Enter StaService::RemoveAllDevice.\n"); - pStaStateMachine->SendMessage(WIFI_SVR_CMD_STA_REMOVE_All_DEVICE_CONFIG); - return WIFI_OPT_SUCCESS; -} ErrCode StaService::EnableDeviceConfig(int networkId, bool attemptEnable) const { @@ -278,7 +294,6 @@ ErrCode StaService::AutoConnectService(const std::vector &scanInf { WIFI_LOGI("Enter StaService::AutoConnectService.\n"); pStaAutoConnectService->OnScanInfosReadyHandler(scanInfos); - pStaStateMachine->SyncLinkInfo(scanInfos); return WIFI_OPT_SUCCESS; } diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp index fb5624f..79acbe3 100755 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp @@ -19,6 +19,7 @@ #include "wifi_logger.h" #include "wifi_sta_hal_interface.h" #include "wifi_settings.h" +#include "mac_address.h" #include "if_config.h" #include "wifi_supplicant_hal_interface.h" @@ -32,15 +33,6 @@ DEFINE_WIFILOG_LABEL("StaStateMachine"); #define PBC_ANY_BSSID "any" const int SLEEPTIME = 3; -const int BAND_ONE = 1; -const int BAND_TWO = 2; - -#define MAC_LENGTH 12 -#define MAC_STEP 2 -#define RAND_SEED_16 16 -#define RAND_SEED_8 8 -#define BUFFER_SIZE 128 - namespace OHOS { namespace Wifi { @@ -52,6 +44,7 @@ StaStateMachine::StaStateMachine() pinCode(0), wpsState(SetupMethod::INVALID), lastConnectToNetworkTimer(-1), + lastSignalLevel(-1), targetRoamBssid(WPA_BSSID_ANY), currentTpType(IPTYPE_IPV4), isWpsConnect(IsWpsConnected::WPS_INVALID), @@ -60,7 +53,6 @@ StaStateMachine::StaStateMachine() isRoam(false), pDhcpService(nullptr), pDhcpResultNotify(nullptr), - pNetSpeed(nullptr), pNetcheck(nullptr), pRootState(nullptr), pInitState(nullptr), @@ -94,7 +86,7 @@ StaStateMachine::~StaStateMachine() ParsePointer(pGetIpState); ParsePointer(pLinkedState); ParsePointer(pApRoamingState); - ParsePointer(pNetSpeed); + if (pDhcpService != nullptr) { if (currentTpType == IPTYPE_IPV4) { pDhcpService->StopDhcpClient(IF_NAME, false); @@ -131,7 +123,8 @@ ErrCode StaStateMachine::InitStaStateMachine() } pNetcheck = new (std::nothrow) - StaNetworkCheck(std::bind(&StaStateMachine::HandleNetCheckResult, this, std::placeholders::_1)); + StaNetworkCheck(std::bind(&StaStateMachine::HandleNetCheckResult, this, + std::placeholders::_1, std::placeholders::_2)); if (pNetcheck == nullptr) { WIFI_LOGE("pNetcheck is null\n"); return WIFI_OPT_FAILED; @@ -144,35 +137,33 @@ ErrCode StaStateMachine::InitStaStates() { WIFI_LOGE("Enter InitStaStates\n"); int tmpErrNumber; - pRootState = new RootState(); + pRootState = new (std::nothrow)RootState(); tmpErrNumber = JudgmentEmpty(pRootState); - pInitState = new InitState(this); + pInitState = new (std::nothrow)InitState(this); tmpErrNumber += JudgmentEmpty(pInitState); - pWpaStartingState = new WpaStartingState(this); + pWpaStartingState = new (std::nothrow)WpaStartingState(this); tmpErrNumber += JudgmentEmpty(pWpaStartingState); - pWpaStartedState = new WpaStartedState(this); + pWpaStartedState = new (std::nothrow)WpaStartedState(this); tmpErrNumber += JudgmentEmpty(pWpaStartedState); - pWpaStoppingState = new WpaStoppingState(this); + pWpaStoppingState = new (std::nothrow)WpaStoppingState(this); tmpErrNumber += JudgmentEmpty(pWpaStoppingState); - pLinkState = new LinkState(this); + pLinkState = new (std::nothrow)LinkState(this); tmpErrNumber += JudgmentEmpty(pLinkState); - pSeparatingState = new SeparatingState(); + pSeparatingState = new (std::nothrow)SeparatingState(); tmpErrNumber += JudgmentEmpty(pSeparatingState); - pSeparatedState = new SeparatedState(this); + pSeparatedState = new (std::nothrow)SeparatedState(this); tmpErrNumber += JudgmentEmpty(pSeparatedState); - pApLinkedState = new ApLinkedState(this); + pApLinkedState = new (std::nothrow)ApLinkedState(this); tmpErrNumber += JudgmentEmpty(pApLinkedState); - pWpsState = new StaWpsState(this); + pWpsState = new (std::nothrow)StaWpsState(this); tmpErrNumber += JudgmentEmpty(pWpsState); - pGetIpState = new GetIpState(this); + pGetIpState = new (std::nothrow)GetIpState(this); tmpErrNumber += JudgmentEmpty(pGetIpState); - pLinkedState = new LinkedState(); + pLinkedState = new (std::nothrow)LinkedState(); tmpErrNumber += JudgmentEmpty(pLinkedState); - pApRoamingState = new ApRoamingState(this); + pApRoamingState = new (std::nothrow)ApRoamingState(this); tmpErrNumber += JudgmentEmpty(pApRoamingState); - pNetSpeed = new StaNetWorkSpeed(); - tmpErrNumber += JudgmentEmpty(pNetSpeed); - pDhcpResultNotify = new DhcpResultNotify(this); + pDhcpResultNotify = new (std::nothrow)DhcpResultNotify(this); tmpErrNumber += JudgmentEmpty(pDhcpResultNotify); if (tmpErrNumber != 0) { WIFI_LOGE("InitStaStates some one state is null\n"); @@ -187,6 +178,8 @@ void StaStateMachine::InitWifiLinkedInfo() linkedInfo.ssid = ""; linkedInfo.bssid = ""; linkedInfo.macAddress = ""; + linkedInfo.rxLinkSpeed = 0; + linkedInfo.txLinkSpeed = 0; linkedInfo.rssi = 0; linkedInfo.band = 0; linkedInfo.frequency = 0; @@ -196,6 +189,8 @@ void StaStateMachine::InitWifiLinkedInfo() linkedInfo.ifHiddenSSID = false; linkedInfo.chload = 0; linkedInfo.snr = 0; + linkedInfo.isDataRestricted = 0; + linkedInfo.portalUrl = ""; linkedInfo.detailedState = DetailedState::DISCONNECTED; } @@ -205,6 +200,8 @@ void StaStateMachine::InitLastWifiLinkedInfo() lastLinkedInfo.ssid = ""; lastLinkedInfo.bssid = ""; lastLinkedInfo.macAddress = ""; + lastLinkedInfo.rxLinkSpeed = 0; + lastLinkedInfo.txLinkSpeed = 0; lastLinkedInfo.rssi = 0; lastLinkedInfo.band = 0; lastLinkedInfo.frequency = 0; @@ -214,6 +211,8 @@ void StaStateMachine::InitLastWifiLinkedInfo() lastLinkedInfo.ifHiddenSSID = false; lastLinkedInfo.chload = 0; lastLinkedInfo.snr = 0; + linkedInfo.isDataRestricted = 0; + linkedInfo.portalUrl = ""; lastLinkedInfo.detailedState = DetailedState::DISCONNECTED; } @@ -236,7 +235,7 @@ void StaStateMachine::BuildStateTree() void StaStateMachine::RegisterStaServiceCallback(const StaServiceCallback &callbacks) { - LOGI("RegisterStaServiceCallback"); + LOGI("RegisterStaServiceCallback."); staCallback = callbacks; } @@ -284,7 +283,10 @@ void StaStateMachine::InitState::GoInState() } void StaStateMachine::InitState::GoOutState() -{} +{ + LOGI("InitState GoOutState function."); + return; +} bool StaStateMachine::InitState::ExecuteStateMsg(InternalMessage *msg) { @@ -294,34 +296,18 @@ bool StaStateMachine::InitState::ExecuteStateMsg(InternalMessage *msg) bool ret = NOT_EXECUTED; switch (msg->GetMessageName()) { - case WIFI_SVR_CMD_STA_START_SUPPLICANT: { - ret = EXECUTED; - pStaStateMachine->StartWifiProcess(); - break; - } - case WIFI_SVR_CMD_STA_ENABLE_WIFI: { ret = EXECUTED; pStaStateMachine->operationalMode = msg->GetParam1(); - pStaStateMachine->SendMessage(WIFI_SVR_CMD_STA_START_SUPPLICANT); + pStaStateMachine->StartWifiProcess(); break; } case WIFI_SVR_CMD_STA_OPERATIONAL_MODE: break; - case WIFI_SVR_CMD_STA_REMOVE_DEVICE_CONFIG: { - ret = EXECUTED; - pStaStateMachine->RemoveDeviceConfigProcess(msg); - break; - } - - case WIFI_SVR_CMD_STA_REMOVE_All_DEVICE_CONFIG: { - ret = EXECUTED; - pStaStateMachine->RemoveAllDeviceConfigProcess(); - break; - } default: + LOGI("InitState-msgCode=%d not handled.\n", msg->GetMessageName()); break; } return ret; @@ -413,7 +399,7 @@ void StaStateMachine::StartWifiProcess() SwitchState(pSeparatedState); } else { /* Notify the InterfaceService that wifi is failed to enable wifi. */ - LOGE("StartWifi failed, and errcode is %d", res); + LOGE("StartWifi failed, and errcode is %d.", res); WifiSettings::GetInstance().SetWifiState(static_cast(WifiState::DISABLED)); staCallback.OnStaOpenRes(OperateResState::OPEN_WIFI_FAILED); staCallback.OnStaOpenRes(OperateResState::OPEN_WIFI_DISABLED); @@ -442,6 +428,7 @@ void StaStateMachine::WpaStartingState::GoInState() void StaStateMachine::WpaStartingState::GoOutState() { + LOGI("WpaStartingState GoOutState function."); return; } @@ -484,6 +471,7 @@ void StaStateMachine::WpaStartedState::GoInState() } void StaStateMachine::WpaStartedState::GoOutState() { + LOGD("WpaStartedState GoOutState function."); return; } @@ -495,27 +483,9 @@ bool StaStateMachine::WpaStartedState::ExecuteStateMsg(InternalMessage *msg) bool ret = NOT_EXECUTED; switch (msg->GetMessageName()) { - case WIFI_SVR_CMD_STA_STOP_SUPPLICANT: { - ret = EXECUTED; - pStaStateMachine->StopWifiProcess(); - break; - } - case WIFI_SVR_CMD_STA_DISABLE_WIFI: { ret = EXECUTED; - pStaStateMachine->SendMessage(WIFI_SVR_CMD_STA_STOP_SUPPLICANT); - break; - } - - case WIFI_SVR_CMD_STA_REMOVE_DEVICE_CONFIG: { - ret = EXECUTED; - pStaStateMachine->RemoveDeviceConfigProcess(msg); - break; - } - - case WIFI_SVR_CMD_STA_REMOVE_All_DEVICE_CONFIG: { - ret = EXECUTED; - pStaStateMachine->RemoveAllDeviceConfigProcess(); + pStaStateMachine->StopWifiProcess(); break; } @@ -530,6 +500,7 @@ void StaStateMachine::StopWifiProcess() WIFI_LOGD("Enter StaStateMachine::StopWifiProcess.\n"); WifiSettings::GetInstance().SetWifiState(static_cast(WifiState::DISABLING)); staCallback.OnStaCloseRes(OperateResState::CLOSE_WIFI_CLOSING); + StopTimer(static_cast(CMD_SIGNAL_POLL)); if (currentTpType == IPTYPE_IPV4) { pDhcpService->StopDhcpClient(IF_NAME, false); } else { @@ -546,68 +517,21 @@ void StaStateMachine::StopWifiProcess() InitWifiLinkedInfo(); WifiSettings::GetInstance().SaveLinkedInfo(linkedInfo); - WifiErrorNo errorNo = WifiStaHalInterface::GetInstance().StopWifi(); - if (errorNo == WIFI_IDL_OPT_OK) { + if (WifiStaHalInterface::GetInstance().StopWifi() == WIFI_IDL_OPT_OK) { + /* Callback result to InterfaceService. */ WifiSettings::GetInstance().SetWifiState(static_cast(WifiState::DISABLED)); - /* Notify result to InterfaceService. */ staCallback.OnStaCloseRes(OperateResState::CLOSE_WIFI_SUCCEED); WIFI_LOGD("Stop WifiProcess successfully!"); /* The current state of StaStateMachine transfers to InitState. */ SwitchState(pInitState); } else { - LOGE("StopWifiProcess failed, and errcode is %d", errorNo); + LOGE("StopWifiProcess failed."); WifiSettings::GetInstance().SetWifiState(static_cast(WifiState::UNKNOWN)); staCallback.OnStaCloseRes(OperateResState::CLOSE_WIFI_FAILED); } } -void StaStateMachine::RemoveDeviceConfigProcess(const InternalMessage *msg) -{ - if (msg == nullptr) { - return; - } - - WIFI_LOGD("Enter StaStateMachine::RemoveDeviceConfigProcess.\n"); - /* Remove network configuration. */ - if (WifiStaHalInterface::GetInstance().RemoveDevice(msg->GetParam1()) == WIFI_IDL_OPT_OK) { - WIFI_LOGD("Remove device config successfully!"); - - if (WifiStaHalInterface::GetInstance().SaveDeviceConfig() != WIFI_IDL_OPT_OK) { - WIFI_LOGW("RemoveDeviceConfig:SaveDeviceConfig failed!"); - } else { - WIFI_LOGD("RemoveDeviceConfig-SaveDeviceConfig successfully!"); - } - } else { - WIFI_LOGE("RemoveDeviceConfig failed!"); - } - - /* Remove network configuration directly without notification to InterfaceService. */ - WifiSettings::GetInstance().RemoveDevice(msg->GetParam1()); - if (WifiSettings::GetInstance().SyncDeviceConfig() != 0) { - WIFI_LOGE("RemoveDeviceConfigProcess-SyncDeviceConfig() failed!"); - } -} - -void StaStateMachine::RemoveAllDeviceConfigProcess() -{ - WIFI_LOGD("Enter StaStateMachine::RemoveAllDeviceConfigProcess.\n"); - if (WifiStaHalInterface::GetInstance().ClearDeviceConfig() == WIFI_IDL_OPT_OK) { - WIFI_LOGD("Remove all device config successfully!"); - - if (WifiStaHalInterface::GetInstance().SaveDeviceConfig() != WIFI_IDL_OPT_OK) { - WIFI_LOGW("RemoveAllDeviceConfig:SaveDeviceConfig failed!"); - } - } else { - WIFI_LOGE("RemoveAllDeviceConfig failed!"); - } - - WifiSettings::GetInstance().ClearDeviceConfig(); - if (WifiSettings::GetInstance().SyncDeviceConfig() != 0) { - WIFI_LOGE("RemoveAllDeviceConfigProcess-SyncDeviceConfig() failed!"); - } -} - /* --------------------------- state machine WpaStopping State ------------------------------ */ StaStateMachine::WpaStoppingState::WpaStoppingState(StaStateMachine *staStateMachine) : State("WpaStoppingState"), pStaStateMachine(staStateMachine) @@ -618,13 +542,16 @@ StaStateMachine::WpaStoppingState::~WpaStoppingState() void StaStateMachine::WpaStoppingState::GoInState() { - WIFI_LOGE("WpaStoppingState GoInState function."); + LOGI("WpaStoppingState GoInState function."); pStaStateMachine->SwitchState(pStaStateMachine->pInitState); return; } void StaStateMachine::WpaStoppingState::GoOutState() -{} +{ + LOGI("WpaStoppingState GoOutState function."); + return; +} bool StaStateMachine::WpaStoppingState::ExecuteStateMsg(InternalMessage *msg) { @@ -633,11 +560,11 @@ bool StaStateMachine::WpaStoppingState::ExecuteStateMsg(InternalMessage *msg) } bool ret = NOT_EXECUTED; - WIFI_LOGI("RootState-msgCode=%{public}d not handled.\n", msg->GetMessageName()); + WIFI_LOGI("WpaStoppingState-msgCode=%{public}d not handled.\n", msg->GetMessageName()); return ret; } -/* --------------------------- state machine Connect State ------------------------------ */ +/* --------------------------- state machine link State ------------------------------ */ StaStateMachine::LinkState::LinkState(StaStateMachine *staStateMachine) : State("LinkState"), pStaStateMachine(staStateMachine) {} @@ -648,19 +575,21 @@ StaStateMachine::LinkState::~LinkState() void StaStateMachine::LinkState::GoInState() { WIFI_LOGI("LinkState GoInState function."); - return; } void StaStateMachine::LinkState::GoOutState() -{} +{ + LOGI("LinkState GoOutState function."); + return; +} bool StaStateMachine::LinkState::ExecuteStateMsg(InternalMessage *msg) { if (msg == nullptr) { return false; } - + LOGI("LinkState ExecuteStateMsg function:msgName=[%{public}d].\n", msg->GetMessageName()); auto iter = pStaStateMachine->staSmHandleFuncMap.find(msg->GetMessageName()); if (iter != pStaStateMachine->staSmHandleFuncMap.end()) { (pStaStateMachine->*(iter->second))(msg); @@ -672,6 +601,7 @@ bool StaStateMachine::LinkState::ExecuteStateMsg(InternalMessage *msg) /* -- state machine Connect State Message processing function -- */ int StaStateMachine::InitStaSMHandleMap() { + staSmHandleFuncMap[CMD_SIGNAL_POLL] = &StaStateMachine::DealSignalPollResult; staSmHandleFuncMap[WIFI_SVR_CMD_STA_CONNECT_NETWORK] = &StaStateMachine::DealConnectToUserSelectedNetwork; staSmHandleFuncMap[WIFI_SVR_CMD_STA_CONNECT_SAVED_NETWORK] = &StaStateMachine::DealConnectToUserSelectedNetwork; staSmHandleFuncMap[WIFI_SVR_CMD_STA_NETWORK_DISCONNECTION_EVENT] = &StaStateMachine::DealDisconnectEvent; @@ -687,13 +617,112 @@ int StaStateMachine::InitStaSMHandleMap() return WIFI_OPT_SUCCESS; } +int setRssi(int rssi) +{ + if (rssi < INVALID_RSSI_VALUE) { + rssi = INVALID_RSSI_VALUE; + } + + if (rssi > MAX_RSSI_VALUE) { + rssi = MAX_RSSI_VALUE; + } + return rssi; +} + +void StaStateMachine::DealSignalPollResult(InternalMessage *msg) +{ + LOGI("enter DealSignalPollResult.\n"); + if (msg == nullptr) { + LOGE("InternalMessage msg is null."); + return; + } + WifiWpaSignalInfo signalInfo; + WifiStaHalInterface::GetInstance().GetConnectSignalInfo(linkedInfo.bssid, signalInfo); + LOGI("DealSignalPollResult GetConnectSignalInfo rssi = %d, txLinkSpeed = %d, rxLinkSpeed =%d, frequency =%d.\n", + signalInfo.signal, + signalInfo.txrate, + signalInfo.rxrate, + signalInfo.frequency); + if (signalInfo.signal > INVALID_RSSI_VALUE && signalInfo.signal < MAX_RSSI_VALUE) { + if (signalInfo.signal > 0) { + linkedInfo.rssi = setRssi((signalInfo.signal - SIGNAL_INFO)); + } else { + linkedInfo.rssi = setRssi(signalInfo.signal); + } + int currentSignalLevel = WifiSettings::GetInstance().GetSignalLevel(linkedInfo.rssi, linkedInfo.band); + LOGI("DealSignalPollResult linkedInfo.rssi = %d, linkedInfo.band = %d.\n", linkedInfo.rssi, linkedInfo.band); + LOGI("DealSignalPollResult currentSignalLevel = %d, lastSignalLevel = %d.\n", + currentSignalLevel, lastSignalLevel); + if (currentSignalLevel != lastSignalLevel) { + LOGI("DealSignalPollResult currentSignalLevel = %d, lastSignalLevel = %d.\n", + currentSignalLevel, lastSignalLevel); + if (staCallback.OnStaRssiLevelChanged != nullptr) { + staCallback.OnStaRssiLevelChanged(linkedInfo.rssi); + } + lastSignalLevel = currentSignalLevel; + } + } else { + linkedInfo.rssi = INVALID_RSSI_VALUE; + } + + if (signalInfo.txrate > 0) { + linkedInfo.txLinkSpeed = signalInfo.txrate; + linkedInfo.linkSpeed = signalInfo.txrate; + if (staCallback.OnStaStreamChanged != nullptr) { + staCallback.OnStaStreamChanged(StreamDirection::STREAM_DIRECTION_UP); + } + } + + if (signalInfo.rxrate > 0) { + linkedInfo.rxLinkSpeed = signalInfo.rxrate; + if (staCallback.OnStaStreamChanged != nullptr) { + staCallback.OnStaStreamChanged(StreamDirection::STREAM_DIRECTION_DOWN); + } + } + + if (signalInfo.frequency > 0) { + linkedInfo.frequency = signalInfo.frequency; + } + WifiSettings::GetInstance().SaveLinkedInfo(linkedInfo); + ConvertFreqToChannel(); + StartTimer(static_cast(CMD_SIGNAL_POLL), STA_SIGNAL_POLL_DELAY); +} + +void StaStateMachine::ConvertFreqToChannel() +{ + WifiDeviceConfig config; + if (WifiSettings::GetInstance().GetDeviceConfig(linkedInfo.networkId, config) != 0) { + LOGE("GetDeviceConfig failed!"); + return; + } + if (linkedInfo.frequency >= FREQ_2G_MIN && linkedInfo.frequency <= FREQ_2G_MAX) { + config.band = linkedInfo.band = static_cast(BandType::BAND_2GHZ); + config.channel = (linkedInfo.frequency - FREQ_2G_MIN) / CENTER_FREQ_DIFF + CHANNEL_2G_MIN; + } else if (linkedInfo.frequency == CHANNEL_14_FREQ) { + config.channel = CHANNEL_14; + } else if (linkedInfo.frequency >= FREQ_5G_MIN && linkedInfo.frequency <= FREQ_5G_MAX) { + config.band = linkedInfo.band = static_cast(BandType::BAND_5GHZ); + config.channel = (linkedInfo.frequency - FREQ_5G_MIN) / CENTER_FREQ_DIFF + CHANNEL_5G_MIN; + } + + WifiSettings::GetInstance().AddDeviceConfig(config); + WifiSettings::GetInstance().SyncDeviceConfig(); + return; +} + void StaStateMachine::DealConnectToUserSelectedNetwork(InternalMessage *msg) { + LOGI("enter DealConnectToUserSelectedNetwork.\n"); if (msg == nullptr) { + LOGE("msg is null.\n"); return; } + /* Save connection information. */ + SaveLinkstate(ConnState::CONNECTING, DetailedState::CONNECTING); + + /* Callback result to InterfaceService. */ + staCallback.OnStaConnChanged(OperateResState::CONNECT_CONNECTING, linkedInfo); - WIFI_LOGI("enter ConnectToUserSelectedNetwork\n"); int networkId = msg->GetParam1(); bool forceReconnect = msg->GetParam2(); @@ -704,11 +733,13 @@ void StaStateMachine::DealConnectToUserSelectedNetwork(InternalMessage *msg) /* Sets network status. */ WifiSettings::GetInstance().EnableNetwork(networkId, forceReconnect); + WifiSettings::GetInstance().SetDeviceState(networkId, (int)WifiDeviceConfigStatus::ENABLED, false); StartConnectToNetwork(networkId); } void StaStateMachine::DealConnectTimeOutCmd(InternalMessage *msg) { + LOGD("enter DealConnectTimeOutCmd.\n"); if (msg == nullptr) { WIFI_LOGE("msg is nul\n"); } @@ -718,7 +749,6 @@ void StaStateMachine::DealConnectTimeOutCmd(InternalMessage *msg) return; } - WIFI_LOGD("enter DealDisableOneNetCmd\n"); DisableNetwork(targetNetworkId); InitWifiLinkedInfo(); WifiSettings::GetInstance().SaveLinkedInfo(linkedInfo); @@ -739,11 +769,13 @@ void StaStateMachine::DealConnectionEvent(InternalMessage *msg) StopTimer(static_cast(WPA_BLOCK_LIST_CLEAR_EVENT)); StopTimer(static_cast(CMD_NETWORK_CONNECT_TIMEOUT)); ConnectToNetworkProcess(msg); + StartTimer(static_cast(CMD_SIGNAL_POLL), 0); if (wpsState != SetupMethod::INVALID) { SyncAllDeviceConfigs(); wpsState = SetupMethod::INVALID; } + /* Callback result to InterfaceService. */ staCallback.OnStaConnChanged(OperateResState::CONNECT_OBTAINING_IP, linkedInfo); @@ -753,11 +785,14 @@ void StaStateMachine::DealConnectionEvent(InternalMessage *msg) void StaStateMachine::DealDisconnectEvent(InternalMessage *msg) { + LOGD("Enter DealDisconnectEvent.\n"); if (msg == nullptr) { WIFI_LOGE("msg is null\n"); } - - WIFI_LOGD("Enter DealDisconnectEvent.\n"); + if (wpsState != SetupMethod::INVALID) { + return; + } + StopTimer(static_cast(CMD_SIGNAL_POLL)); pNetcheck->StopNetCheckThread(); if (currentTpType == IPTYPE_IPV4) { pDhcpService->StopDhcpClient(IF_NAME, false); @@ -785,6 +820,7 @@ void StaStateMachine::DealDisconnectEvent(InternalMessage *msg) /* Callback result to InterfaceService. */ staCallback.OnStaConnChanged(OperateResState::DISCONNECT_DISCONNECTED, linkedInfo); SwitchState(pSeparatedState); + return; } void StaStateMachine::DealWpaWrongPskEvent(InternalMessage *msg) @@ -802,10 +838,11 @@ void StaStateMachine::DealWpaWrongPskEvent(InternalMessage *msg) void StaStateMachine::DealReassociateCmd(InternalMessage *msg) { + LOGD("enter DealReassociateCmd.\n"); if (msg == nullptr) { WIFI_LOGE("msg is null\n"); } - WIFI_LOGD("enter DealStartWpsCmd\n"); + /* Obtains the current system time, assigns the timestamp of the last * connection attempt, and prohibits scanning requests within 10 seconds. */ @@ -814,8 +851,10 @@ void StaStateMachine::DealReassociateCmd(InternalMessage *msg) if (WifiStaHalInterface::GetInstance().Reassociate() == WIFI_IDL_OPT_OK) { /* Callback result to InterfaceService */ - staCallback.OnStaConnChanged(OperateResState::CONNECT_AP_CONNECTED, linkedInfo); + staCallback.OnStaConnChanged(OperateResState::CONNECT_ASSOCIATING, linkedInfo); WIFI_LOGD("StaStateMachine::LinkState::ExecuteStateMsg ReAssociate successfully!"); + StopTimer(static_cast(CMD_NETWORK_CONNECT_TIMEOUT)); + StartTimer(static_cast(CMD_NETWORK_CONNECT_TIMEOUT), STA_NETWORK_CONNECTTING_DELAY); } else { WIFI_LOGE("ReAssociate failed!"); } @@ -823,15 +862,19 @@ void StaStateMachine::DealReassociateCmd(InternalMessage *msg) void StaStateMachine::DealStartWpsCmd(InternalMessage *msg) { + WIFI_LOGD("enter DealStartWpsCmd\n"); if (msg == nullptr) { return; } - WIFI_LOGD("enter DealStartWpsCmd\n"); - RemoveAllDeviceConfigs(); + if (WifiStaHalInterface::GetInstance().ClearDeviceConfig() != WIFI_IDL_OPT_OK) { + LOGE("ClearDeviceConfig() failed!"); + return; + } + StartWpsMode(msg); - if (wpsState == SetupMethod::DISPLAY) { + if ((wpsState == SetupMethod::DISPLAY) || (wpsState == SetupMethod::KEYPAD)) { WIFI_LOGD("Clear WPA block list every ten second!"); SendMessage(WPA_BLOCK_LIST_CLEAR_EVENT); } @@ -842,8 +885,12 @@ void StaStateMachine::StartWpsMode(InternalMessage *msg) if (msg == nullptr) { return; } - - constexpr int multiAp = 0; + /* + * Make judgement to wps configuration information: the function will exit if + * the result is fail, then else continue to chose the Wps starting mode. The + * current state of StaStateMachine transfers to WpsState after Wps code start + * successfully. + */ WifiIdlWpsConfig wpsParam; WpsConfig wpsConfig; wpsConfig.setup = static_cast(msg->GetParam1()); @@ -856,7 +903,7 @@ void StaStateMachine::StartWpsMode(InternalMessage *msg) wpsParam.anyFlag = 0; wpsParam.bssid = wpsConfig.bssid; } - wpsParam.multiAp = multiAp; + wpsParam.multiAp = MULTI_AP; WIFI_LOGI("wpsConfig setup = %{public}d", wpsConfig.setup); WIFI_LOGI("wpsParam.AnyFlag = %{public}d, wpsParam.mulitAp = %{public}d, wpsParam.bssid = %s", wpsParam.anyFlag, @@ -883,22 +930,24 @@ void StaStateMachine::StartWpsMode(InternalMessage *msg) SwitchState(pWpsState); } else { WIFI_LOGE("StartWpsPinMode() failed!"); - staCallback.OnWpsChanged(WpsStartState::START_PIN_FAILED, pinCode); + staCallback.OnWpsChanged(WpsStartState::START_PIN_FAILED, pinCode); + } + } else if (wpsConfig.setup == SetupMethod::KEYPAD) { + if (WifiStaHalInterface::GetInstance().StartWpsPinMode(wpsParam, pinCode) == WIFI_IDL_OPT_OK) { + wpsState = wpsConfig.setup; + /* Callback result to InterfaceService. */ + staCallback.OnWpsChanged(WpsStartState::START_AP_PIN_SUCCEED, pinCode); + SwitchState(pWpsState); + } else { + LOGE("StartWpsPinMode() failed."); + staCallback.OnWpsChanged(WpsStartState::START_AP_PIN_FAILED, pinCode); } } else { - WIFI_LOGE("Start Wps failed!"); + LOGE("Start Wps failed!"); staCallback.OnWpsChanged(WpsStartState::START_WPS_FAILED, pinCode); } } -void StaStateMachine::RemoveAllDeviceConfigs() -{ - WifiStaHalInterface::GetInstance().ClearDeviceConfig(); - WifiStaHalInterface::GetInstance().SaveDeviceConfig(); - WIFI_LOGD("Remove all device configurations completed!"); - return; -} - void StaStateMachine::DealWpaBlockListClearEvent(InternalMessage *msg) { if (msg != nullptr) { @@ -941,6 +990,8 @@ void StaStateMachine::DealCancelWpsCmd(InternalMessage *msg) staCallback.OnWpsChanged(WpsStartState::STOP_PBC_SUCCEED, pinCode); } else if (wpsState == SetupMethod::DISPLAY) { staCallback.OnWpsChanged(WpsStartState::STOP_PIN_SUCCEED, pinCode); + } else if (wpsState == SetupMethod::KEYPAD) { + staCallback.OnWpsChanged(WpsStartState::STOP_AP_PIN_SUCCEED, pinCode); } if (wpsState != SetupMethod::INVALID) { wpsState = SetupMethod::INVALID; @@ -963,6 +1014,8 @@ void StaStateMachine::DealCancelWpsCmd(InternalMessage *msg) staCallback.OnWpsChanged(WpsStartState::STOP_PBC_FAILED, pinCode); } else if (wpsState == SetupMethod::DISPLAY) { staCallback.OnWpsChanged(WpsStartState::STOP_PIN_FAILED, pinCode); + } else if (wpsState == SetupMethod::KEYPAD) { + staCallback.OnWpsChanged(WpsStartState::STOP_AP_PIN_FAILED, pinCode); } } SwitchState(pSeparatedState); @@ -1008,12 +1061,12 @@ void StaStateMachine::DealStartRoamCmd(InternalMessage *msg) linkedInfo.bssid = bssid; WifiSettings::GetInstance().SaveLinkedInfo(linkedInfo); - /* Start roaming */ - SwitchState(pApRoamingState); if (WifiStaHalInterface::GetInstance().Reassociate() != WIFI_IDL_OPT_OK) { WIFI_LOGE("START_ROAM-ReAssociate() failed!"); } WIFI_LOGI("START_ROAM-ReAssociate() succeeded!"); + /* Start roaming */ + SwitchState(pApRoamingState); } void StaStateMachine::StartConnectToNetwork(int networkId) @@ -1035,18 +1088,110 @@ void StaStateMachine::StartConnectToNetwork(int networkId) LOGE("SaveDeviceConfig() failed!"); } - /* Update wifi status. */ - WifiSettings::GetInstance().SetWifiState(static_cast(WifiState::ENABLING)); - - /* Save connection information. */ - SaveLinkstate(ConnState::CONNECTING, DetailedState::CONNECTING); - - /* Callback result to InterfaceService. */ - staCallback.OnStaConnChanged(OperateResState::CONNECT_CONNECTING, linkedInfo); StopTimer(static_cast(CMD_NETWORK_CONNECT_TIMEOUT)); StartTimer(static_cast(CMD_NETWORK_CONNECT_TIMEOUT), STA_NETWORK_CONNECTTING_DELAY); } +void StaStateMachine::MacAddressGenerate(std::string &strMac) +{ + LOGD("enter MacAddressGenerate\n"); + constexpr int arraySize = 4; + constexpr int macBitSize = 12; + constexpr int firstBit = 1; + constexpr int lastBit = 11; + constexpr int two = 2; + constexpr int hexBase = 16; + constexpr int octBase = 8; + char strMacTmp[arraySize] = {0}; + srand(static_cast(time(nullptr))); + for (int i = 0; i < macBitSize; i++) { + if (i != firstBit) { + sprintf_s(strMacTmp, arraySize, "%x", rand() % hexBase); + } else { + sprintf_s(strMacTmp, arraySize, "%x", two * (rand() % octBase)); + } + strMac += strMacTmp; + if ((i % two) != 0 && (i != lastBit)) { + strMac.append(":"); + } + } +} + +bool StaStateMachine::ComparedKeymgmt(const std::string scanInfoKeymgmt, const std::string deviceKeymgmt) +{ + if (deviceKeymgmt == "WPA-PSK") { + return scanInfoKeymgmt.find("PSK") != std::string::npos; + } else if (deviceKeymgmt == "WPA-EAP") { + return scanInfoKeymgmt.find("EAP") != std::string::npos; + } else if (deviceKeymgmt == "SAE") { + return scanInfoKeymgmt.find("SAE") != std::string::npos; + } else if (deviceKeymgmt == "NONE") { + return (scanInfoKeymgmt.find("PSK") == std::string::npos) && + (scanInfoKeymgmt.find("EAP") == std::string::npos) && (scanInfoKeymgmt.find("SAE") == std::string::npos); + } else { + return false; + } +} + +bool StaStateMachine::SetRandomMac(int networkId) +{ + LOGD("enter SetRandomMac.\n"); + WifiDeviceConfig deviceConfig; + if (WifiSettings::GetInstance().GetDeviceConfig(networkId, deviceConfig) != 0) { + LOGE("SetRandomMac : GetDeviceConfig failed!\n"); + return false; + } + std::string lastMac; + std::string currentMac; + if (deviceConfig.wifiPrivacySetting == WifiPrivacyConfig::DEVICEMAC) { + } else { + WifiStoreRandomMac randomMacInfo; + std::vector scanInfoList; + WifiSettings::GetInstance().GetScanInfoList(scanInfoList); + for (auto scanInfo : scanInfoList) { + if ((deviceConfig.ssid == scanInfo.ssid) && + (ComparedKeymgmt(scanInfo.capabilities, deviceConfig.keyMgmt))) { + randomMacInfo.ssid = scanInfo.ssid; + randomMacInfo.keyMgmt = deviceConfig.keyMgmt; + randomMacInfo.peerBssid = scanInfo.bssid; + break; + } + } + if (randomMacInfo.ssid.empty()) { + LOGE("scanInfo has no target wifi!\n"); + return false; + } + + /* Sets the MAC address of WifiSettings. */ + MacAddressGenerate(randomMacInfo.randomMac); + WifiSettings::GetInstance().AddRandomMac(randomMacInfo); + currentMac = randomMacInfo.randomMac; + } + + if ((WifiStaHalInterface::GetInstance().GetStaDeviceMacAddress(lastMac)) != WIFI_IDL_OPT_OK) { + LOGE("GetStaDeviceMacAddress failed!"); + return false; + } + + if (MacAddress::IsValidMac(currentMac.c_str())) { + LOGI("Check MacAddress successfully.\n"); + if (lastMac != currentMac) { + if (WifiStaHalInterface::GetInstance().SetConnectMacAddr(currentMac) != WIFI_IDL_OPT_OK) { + LOGE("set Mac [%s] failed.\n", currentMac.c_str()); + return false; + } + } + WifiSettings::GetInstance().SetMacAddress(currentMac); + deviceConfig.macAddress = currentMac; + WifiSettings::GetInstance().AddDeviceConfig(deviceConfig); + WifiSettings::GetInstance().SyncDeviceConfig(); + } else { + LOGE("Check MacAddress error.\n"); + return false; + } + return true; +} + void StaStateMachine::StartRoamToNetwork(std::string bssid) { InternalMessage *msg = CreateMessage(); @@ -1072,34 +1217,8 @@ void StaStateMachine::OnNetworkConnectionEvent(int networkId, std::string bssid) SendMessage(msg); } -void StaStateMachine::SyncLinkInfo(const std::vector &scanInfos) -{ - WIFI_LOGI("Enter StaStateMachine::SyncLinkInfo.\n"); - if (scanInfos.empty()) { - return; - } - for (auto scanInfo : scanInfos) { - if ((scanInfo.ssid == linkedInfo.ssid) && (scanInfo.bssid == linkedInfo.bssid)) { - InternalMessage *msg = CreateMessage(); - if (msg == nullptr) { - break; - } - msg->SetMessageName(CMD_SYNC_LINKINFO); - msg->SetParam1(scanInfo.rssi); - msg->SetParam2(scanInfo.frequency); - msg->AddStringMessageBody(scanInfo.capabilities); - WIFI_LOGI("scanInfo.rssi == [%{public}d]\n", scanInfo.rssi); - WIFI_LOGI("scanInfo.frequency == [%{public}d]\n", scanInfo.frequency); - WIFI_LOGI("scanInfo.capabilities ==[%{public}s]\n", scanInfo.capabilities.c_str()); - SendMessage(msg); - return; - } - } -} - -/* --------------------------- state machine Disconnecting State ------------------------------ */ -StaStateMachine::SeparatingState::SeparatingState() - : State("SeparatingState") +/* --------------------------- state machine Separating State ------------------------------ */ +StaStateMachine::SeparatingState::SeparatingState() : State("SeparatingState") {} StaStateMachine::SeparatingState::~SeparatingState() @@ -1108,12 +1227,13 @@ StaStateMachine::SeparatingState::~SeparatingState() void StaStateMachine::SeparatingState::GoInState() { WIFI_LOGI("SeparatingState GoInState function."); - return; } void StaStateMachine::SeparatingState::GoOutState() -{} +{ + LOGI("SeparatingState GoOutState function."); +} bool StaStateMachine::SeparatingState::ExecuteStateMsg(InternalMessage *msg) { @@ -1122,7 +1242,7 @@ bool StaStateMachine::SeparatingState::ExecuteStateMsg(InternalMessage *msg) } bool ret = NOT_EXECUTED; - WIFI_LOGI("RootState-msgCode=%{public}d not handled.\n", msg->GetMessageName()); + WIFI_LOGI("SeparatingState-msgCode=%{public}d not handled.\n", msg->GetMessageName()); return ret; } @@ -1137,12 +1257,14 @@ StaStateMachine::SeparatedState::~SeparatedState() void StaStateMachine::SeparatedState::GoInState() { WIFI_LOGI("SeparatedState GoInState function."); - return; } void StaStateMachine::SeparatedState::GoOutState() -{} +{ + WIFI_LOGI("SeparatedState GoOutState function."); + return; +} bool StaStateMachine::SeparatedState::ExecuteStateMsg(InternalMessage *msg) { @@ -1158,7 +1280,7 @@ bool StaStateMachine::SeparatedState::ExecuteStateMsg(InternalMessage *msg) case WIFI_SVR_CMD_STA_ENABLE_WIFI: { ret = EXECUTED; WIFI_LOGE("Wifi has already started! start Wifi failed!"); - /* Callback result to InterfaceService. */ + /* Callback result to InterfaceService. */ pStaStateMachine->staCallback.OnStaOpenRes(OperateResState::OPEN_WIFI_OVERRIDE_OPEN_FAILED); break; } @@ -1185,7 +1307,10 @@ void StaStateMachine::ApLinkedState::GoInState() } void StaStateMachine::ApLinkedState::GoOutState() -{} +{ + WIFI_LOGI("ApLinkedState GoOutState function."); + return; +} bool StaStateMachine::ApLinkedState::ExecuteStateMsg(InternalMessage *msg) { @@ -1195,24 +1320,14 @@ bool StaStateMachine::ApLinkedState::ExecuteStateMsg(InternalMessage *msg) bool ret = NOT_EXECUTED; switch (msg->GetMessageName()) { - /* The current state of StaStateMachine transfers to DisConnectingState when - * receive the disconnecting message. + /* The current state of StaStateMachine transfers to SeparatingState when + * receive the Separating message. */ case WIFI_SVR_CMD_STA_DISCONNECT: { ret = EXECUTED; pStaStateMachine->DisConnectProcess(); break; } - case CMD_SYNC_LINKINFO: { - ret = EXECUTED; - pStaStateMachine->linkedInfo.rssi = msg->GetParam1(); - pStaStateMachine->linkedInfo.frequency = msg->GetParam2(); - pStaStateMachine->GetBandFromFreQuencies(pStaStateMachine->linkedInfo.frequency); - WifiSettings::GetInstance().SaveLinkedInfo(pStaStateMachine->linkedInfo); - std::string mgmt = msg->GetStringFromMessage(); - pStaStateMachine->SynchronousEncryptionModeAandBand(mgmt); - break; - } case WIFI_SVR_CMD_STA_NETWORK_CONNECTION_EVENT: { ret = EXECUTED; pStaStateMachine->StopTimer(static_cast(WPA_BLOCK_LIST_CLEAR_EVENT)); @@ -1224,55 +1339,15 @@ bool StaStateMachine::ApLinkedState::ExecuteStateMsg(InternalMessage *msg) break; } - case CMD_GET_NETWORK_SPEED: { - ret = EXECUTED; - pStaStateMachine->pNetSpeed->GetNetSpeed( - pStaStateMachine->linkedInfo.rxLinkSpeed, pStaStateMachine->linkedInfo.txLinkSpeed); /* Obtains rate */ - WifiSettings::GetInstance().SaveLinkedInfo(pStaStateMachine->linkedInfo); - pStaStateMachine->StartTimer(static_cast(CMD_GET_NETWORK_SPEED), STA_NETWORK_SPEED_DELAY); - break; - } default: break; } return ret; } -void StaStateMachine::SynchronousEncryptionModeAandBand(std::string mgmt) -{ - WifiDeviceConfig config; - if (WifiSettings::GetInstance().GetDeviceConfig(linkedInfo.networkId, config) != 0) { - WIFI_LOGE("GetDeviceConfig failed!"); - } - config.band = linkedInfo.band; - if (mgmt.find("WPA-PSK") != std::string::npos || mgmt.find("WPA2-PSK") != std::string::npos) { - mgmt = "WPA-PSK"; - config.keyMgmt = mgmt; - } else if (mgmt.find("EAP") != std::string::npos) { - mgmt = "WPA-EAP"; - config.keyMgmt = mgmt; - } else if (mgmt.find("SAE") != std::string::npos) { - mgmt = "SAE"; - config.keyMgmt = mgmt; - } else { - if (mgmt.find("WEP") != std::string::npos) { - WepEncryptionModeIndex(config); - } - } - WifiSettings::GetInstance().AddDeviceConfig(config); - WifiSettings::GetInstance().SyncDeviceConfig(); -} - -void StaStateMachine::WepEncryptionModeIndex(WifiDeviceConfig &config) -{ - for (int i = 0; i < MAX_WEPKEYS_SIZE; i++) { - if (config.wepKeys[i].size() != 0) { - config.wepTxKeyIndex = i + 1; - } - } -} void StaStateMachine::DisConnectProcess() { + staCallback.OnStaConnChanged(OperateResState::DISCONNECT_DISCONNECTING, linkedInfo); if (WifiStaHalInterface::GetInstance().Disconnect() == WIFI_IDL_OPT_OK) { WIFI_LOGI("Disconnect() succeed!"); /* Save connection information to WifiSettings. */ @@ -1280,9 +1355,6 @@ void StaStateMachine::DisConnectProcess() DisableNetwork(linkedInfo.networkId); - /* Callback result to InterfaceService. */ - staCallback.OnStaConnChanged(OperateResState::DISCONNECT_DISCONNECTING, linkedInfo); - /* The current state of StaStateMachine transfers to SeparatedState. */ SwitchState(pSeparatedState); } else { @@ -1291,32 +1363,6 @@ void StaStateMachine::DisConnectProcess() } } -void StaStateMachine::GetBandFromFreQuencies(const int &freQuency) -{ - std::vector freqs2G; - std::vector freqs5G; - if ((WifiStaHalInterface::GetInstance().GetSupportFrequencies(BAND_ONE, freqs2G) == WIFI_IDL_OPT_OK)) { - std::vector::iterator it = find(freqs2G.begin(), freqs2G.end(), freQuency); - if (it != freqs2G.end()) { - linkedInfo.band = BAND_2_G; - return; - } - } else { - WIFI_LOGE("GetSupportFrequencies 2.4Gband failed!\n"); - } - - if ((WifiStaHalInterface::GetInstance().GetSupportFrequencies(BAND_TWO, freqs5G) == WIFI_IDL_OPT_OK)) { - std::vector::iterator it = find(freqs5G.begin(), freqs5G.end(), freQuency); - if (it != freqs5G.end()) { - linkedInfo.band = BAND_5_G; - } else { - WIFI_LOGE("frequency convert band failed!\n"); - } - } else { - WIFI_LOGE("GetSupportFrequencies 5Gband failed!\n"); - } -} - /* --------------------------- state machine Wps State ------------------------------ */ StaStateMachine::StaWpsState::StaWpsState(StaStateMachine *staStateMachine) : State("StaWpsState"), pStaStateMachine(staStateMachine) @@ -1355,7 +1401,8 @@ bool StaStateMachine::StaWpsState::ExecuteStateMsg(InternalMessage *msg) pStaStateMachine->ConnectToNetworkProcess(msg); pStaStateMachine->SyncAllDeviceConfigs(); /* Callback result to InterfaceService. */ - pStaStateMachine->staCallback.OnStaConnChanged(OperateResState::CONNECT_AP_CONNECTED, pStaStateMachine->linkedInfo); + pStaStateMachine->staCallback.OnStaConnChanged(OperateResState::CONNECT_OBTAINING_IP, + pStaStateMachine->linkedInfo); pStaStateMachine->SwitchState(pStaStateMachine->pGetIpState); break; } @@ -1365,9 +1412,11 @@ bool StaStateMachine::StaWpsState::ExecuteStateMsg(InternalMessage *msg) /* Callback InterfaceService that wps has started successfully. */ WIFI_LOGE("WPS has already started, start wps failed!"); if (setup == SetupMethod::PBC) { - pStaStateMachine->staCallback.OnWpsChanged(WpsStartState::PBC_STARTED_ALREADY, pStaStateMachine->pinCode); - } else if (setup == SetupMethod::DISPLAY) { - pStaStateMachine->staCallback.OnWpsChanged(WpsStartState::PIN_STARTED_ALREADY, pStaStateMachine->pinCode); + pStaStateMachine->staCallback.OnWpsChanged(WpsStartState::PBC_STARTED_ALREADY, + pStaStateMachine->pinCode); + } else if ((setup == SetupMethod::DISPLAY) || (setup == SetupMethod::KEYPAD)) { + pStaStateMachine->staCallback.OnWpsChanged(WpsStartState::PIN_STARTED_ALREADY, + pStaStateMachine->pinCode); } break; } @@ -1375,7 +1424,8 @@ bool StaStateMachine::StaWpsState::ExecuteStateMsg(InternalMessage *msg) ret = EXECUTED; WIFI_LOGI("Wps PBC Overlap!"); /* Callback InterfaceService that PBC is conflicting. */ - pStaStateMachine->staCallback.OnWpsChanged(WpsStartState::START_PBC_FAILED_OVERLAP, pStaStateMachine->pinCode); + pStaStateMachine->staCallback.OnWpsChanged(WpsStartState::START_PBC_FAILED_OVERLAP, + pStaStateMachine->pinCode); pStaStateMachine->SwitchState(pStaStateMachine->pSeparatedState); break; } @@ -1449,7 +1499,7 @@ void StaStateMachine::GetIpState::GoInState() std::string noProxys = config.wifiProxyconfig.manualProxyConfig.exclusionObjectList; std::string port = std::to_string(config.wifiProxyconfig.manualProxyConfig.serverPort); if (!hostName.empty()) { - IfConfig::GetInstance().SetProxy(false, hostName, port, noProxys, ""); + IfConfig::GetInstance().SetProxy(true, hostName, port, noProxys, ""); } } @@ -1465,23 +1515,25 @@ void StaStateMachine::GetIpState::GoInState() } } else { LOGD("GetIpState get dhcp result."); - if (pStaStateMachine->isRoam && pStaStateMachine->pDhcpService->GetServerStatus()) { - pStaStateMachine->pDhcpService->RenewDhcpClient(IF_NAME); - pStaStateMachine->pDhcpService->GetDhcpResult(IF_NAME, pStaStateMachine->pDhcpResultNotify, DHCP_TIME); + int dhcpRet; + DhcpServiceInfo dhcpInfo; + pStaStateMachine->pDhcpService->GetDhcpInfo(IF_NAME, dhcpInfo); + if (pStaStateMachine->isRoam && dhcpInfo.clientRunStatus == 1) { + dhcpRet = pStaStateMachine->pDhcpService->RenewDhcpClient(IF_NAME); } else { pStaStateMachine->currentTpType = static_cast(WifiSettings::GetInstance().GetDhcpIpType()); if (pStaStateMachine->currentTpType == IPTYPE_IPV4) { - pStaStateMachine->pDhcpService->StartDhcpClient(IF_NAME, false); + dhcpRet = pStaStateMachine->pDhcpService->StartDhcpClient(IF_NAME, false); } else { - pStaStateMachine->pDhcpService->StartDhcpClient(IF_NAME, true); + dhcpRet = pStaStateMachine->pDhcpService->StartDhcpClient(IF_NAME, true); } - if (pStaStateMachine->pDhcpService->GetDhcpResult( - IF_NAME, pStaStateMachine->pDhcpResultNotify, DHCP_TIME) != 0) { - LOGE(" Dhcp connection failed.\n"); - if (pStaStateMachine->staCallback.OnStaConnChanged != nullptr) { - pStaStateMachine->staCallback.OnStaConnChanged(OperateResState::CONNECT_OBTAINING_IP_FAILED, - pStaStateMachine->linkedInfo); - } + } + if ((dhcpRet != 0) || (pStaStateMachine->pDhcpService->GetDhcpResult( + IF_NAME, pStaStateMachine->pDhcpResultNotify, DHCP_TIME) != 0)) { + LOGE(" Dhcp connection failed.\n"); + pStaStateMachine->staCallback.OnStaConnChanged( + OperateResState::CONNECT_OBTAINING_IP_FAILED, pStaStateMachine->linkedInfo); + if (!pStaStateMachine->isRoam) { pStaStateMachine->DisConnectProcess(); } } @@ -1507,7 +1559,6 @@ bool StaStateMachine::GetIpState::ExecuteStateMsg(InternalMessage *msg) bool StaStateMachine::ConfigStaticIpAddress(StaticIpAddress &staticIpAddress) { WIFI_LOGI("Enter StaStateMachine::SetDhcpResultFromStatic."); - DhcpResult result; switch (currentTpType) { case IPTYPE_IPV4: { @@ -1555,7 +1606,7 @@ bool StaStateMachine::ConfigStaticIpAddress(StaticIpAddress &staticIpAddress) return true; } -void StaStateMachine::HandleNetCheckResult(StaNetState netState) +void StaStateMachine::HandleNetCheckResult(StaNetState netState, const std::string portalUrl) { WIFI_LOGI("Enter HandleNetCheckResult"); if (linkedInfo.connState == ConnState::DISCONNECTED) { @@ -1570,37 +1621,17 @@ void StaStateMachine::HandleNetCheckResult(StaNetState netState) staCallback.OnStaConnChanged(OperateResState::CONNECT_NETWORK_ENABLED, linkedInfo); /* The current state of StaStateMachine transfers to LinkedState. */ SwitchState(pLinkedState); + } else if (netState == StaNetState::NETWORK_CHECK_PORTAL) { + linkedInfo.portalUrl = portalUrl; + SaveLinkstate(ConnState::CONNECTED, DetailedState::CAPTIVE_PORTAL_CHECK); + staCallback.OnStaConnChanged(OperateResState::CONNECT_CHECK_PORTAL, linkedInfo); } else { - WIFI_LOGI("HandleNetCheckResult network state is notworking\n"); + WIFI_LOGI("HandleNetCheckResult network state is notworking.\n"); SaveLinkstate(ConnState::CONNECTED, DetailedState::NOTWORKING); staCallback.OnStaConnChanged(OperateResState::CONNECT_NETWORK_DISABLED, linkedInfo); } } -int StaStateMachine::PortalHttpDetection() -{ - WIFI_LOGI("EnterPortalHttpDetection"); - - /* Detect portal hotspot and send message to InterfaceSeervice if result is yes. */ - HttpRequest httpRequest; - std::string httpReturn; - std::string httpMsg(DEFAULT_PORTAL_HTTPS_URL); - - if (httpRequest.HttpGet(httpMsg, httpReturn) == 0) { - if (httpReturn.find("204") != std::string::npos) { - WIFI_LOGE("This network is not Portal AP!"); - return WIFI_OPT_FAILED; - } else { - /* Notify result to InterfaceService. */ - WIFI_LOGI("This network is portal AP,need certification!"); - staCallback.OnStaConnChanged(OperateResState::CONNECT_CHECK_PORTAL, linkedInfo); - return 0; - } - } - WIFI_LOGE("Portal check failed!"); - return WIFI_OPT_FAILED; -} - /* --------------------------- state machine Connected State ------------------------------ */ StaStateMachine::LinkedState::LinkedState() : State("LinkedState") @@ -1659,6 +1690,9 @@ bool StaStateMachine::ApRoamingState::ExecuteStateMsg(InternalMessage *msg) case WIFI_SVR_CMD_STA_NETWORK_CONNECTION_EVENT: { ret = EXECUTED; pStaStateMachine->isRoam = true; + pStaStateMachine->StopTimer(static_cast(CMD_NETWORK_CONNECT_TIMEOUT)); + pStaStateMachine->staCallback.OnStaConnChanged( + OperateResState::CONNECT_ASSOCIATED, pStaStateMachine->linkedInfo); pStaStateMachine->ConnectToNetworkProcess(msg); /* Notify result to InterfaceService. */ pStaStateMachine->staCallback.OnStaConnChanged( @@ -1690,25 +1724,25 @@ void StaStateMachine::ConnectToNetworkProcess(InternalMessage *msg) int result = WifiSettings::GetInstance().GetDeviceConfig(lastNetworkId, deviceConfig); WIFI_LOGI("Device config networkId = %{public}d", deviceConfig.networkId); - WIFI_LOGI("Connected to AP[networkid=%{public}d], obtaining ip...", lastNetworkId); - - /* Save connection information. */ - WifiIdlGetDeviceConfig config; - config.networkId = lastNetworkId; - config.param = "ssid"; - if (WifiStaHalInterface::GetInstance().GetDeviceConfig(config) != WIFI_IDL_OPT_OK) { - WIFI_LOGE("GetDeviceConfig failed!"); - } - if (result == 0 && deviceConfig.bssid == bssid) { - WIFI_LOGI("Device config already exists."); + LOGI("Device Configuration already exists."); } else { - deviceConfig.networkId = lastNetworkId; deviceConfig.bssid = bssid; - deviceConfig.ssid = config.value; - deviceConfig.ssid.erase(0, 1); - deviceConfig.ssid.erase(deviceConfig.ssid.length() - 1, 1); - if (wpsState == SetupMethod::DISPLAY || wpsState == SetupMethod::PBC) { + if ((wpsState == SetupMethod::DISPLAY) || (wpsState == SetupMethod::PBC) || (wpsState == SetupMethod::KEYPAD)) { + /* Save connection information. */ + WifiIdlGetDeviceConfig config; + config.networkId = lastNetworkId; + config.param = "ssid"; + if (WifiStaHalInterface::GetInstance().GetDeviceConfig(config) != WIFI_IDL_OPT_OK) { + LOGE("GetDeviceConfig failed!"); + } + + deviceConfig.networkId = lastNetworkId; + deviceConfig.bssid = bssid; + deviceConfig.ssid = config.value; + /* Remove the double quotation marks at the head and tail. */ + deviceConfig.ssid.erase(0, 1); + deviceConfig.ssid.erase(deviceConfig.ssid.length() - 1, 1); WifiSettings::GetInstance().AddWpsDeviceConfig(deviceConfig); isWpsConnect = IsWpsConnected::WPS_CONNECTED; } else { @@ -1750,6 +1784,8 @@ void StaStateMachine::SetWifiLinkedInfo(int networkId) linkedInfo.txLinkSpeed = lastLinkedInfo.txLinkSpeed; linkedInfo.chload = lastLinkedInfo.chload; linkedInfo.snr = lastLinkedInfo.snr; + linkedInfo.isDataRestricted = lastLinkedInfo.isDataRestricted; + linkedInfo.portalUrl = lastLinkedInfo.portalUrl; linkedInfo.detailedState = lastLinkedInfo.detailedState; } else if (networkId != INVALID_NETWORK_ID) { linkedInfo.networkId = networkId; @@ -1790,18 +1826,24 @@ StaStateMachine::DhcpResultNotify::~DhcpResultNotify() void StaStateMachine::DhcpResultNotify::OnSuccess(int status, const std::string &ifname, DhcpResult &result) { - WIFI_LOGI("Enter DhcpResultNotify::OnSuccess"); - if (ifname.compare("wlan0") == 0) { - WIFI_LOGD("iptype=%d, ip=%s, gateway=%s, subnet=%s, serverAddress=%s, leaseDuration=%d", - result.iptype, - result.strYourCli.c_str(), - result.strSubnet.c_str(), - result.strRouter1.c_str(), - result.strServer.c_str(), - result.uLeaseTime); - + LOGI("Enter DhcpResultNotify::OnSuccess. ifname=[%s] status=[%d]\n", ifname.c_str(), status); + if ((pStaStateMachine->linkedInfo.detailedState == DetailedState::DISCONNECTING) || + (pStaStateMachine->linkedInfo.detailedState == DetailedState::DISCONNECTED)) { + return; + } + WIFI_LOGD("iptype=%d, ip=%s, gateway=%s, subnet=%s, serverAddress=%s, leaseDuration=%d", + result.iptype, + result.strYourCli.c_str(), + result.strRouter1.c_str(), + result.strSubnet.c_str(), + result.strServer.c_str(), + result.uLeaseTime); + IpInfo ipInfo; + WifiSettings::GetInstance().GetIpInfo(ipInfo); + if (!((IpTools::ConvertIpv4Address(result.strYourCli) == ipInfo.ipAddress) && + (IpTools::ConvertIpv4Address(result.strRouter1) == ipInfo.gateway))) { + result.strDns2 = WifiSettings::GetInstance().GetStrDnsBak(); if (result.iptype == 0) { - IpInfo ipInfo; ipInfo.ipAddress = IpTools::ConvertIpv4Address(result.strYourCli); ipInfo.gateway = IpTools::ConvertIpv4Address(result.strRouter1); ipInfo.netmask = IpTools::ConvertIpv4Address(result.strSubnet); @@ -1811,55 +1853,60 @@ void StaStateMachine::DhcpResultNotify::OnSuccess(int status, const std::string ipInfo.leaseDuration = result.uLeaseTime; WifiSettings::GetInstance().SaveIpInfo(ipInfo); pStaStateMachine->linkedInfo.ipAddress = IpTools::ConvertIpv4Address(result.strYourCli); + pStaStateMachine->linkedInfo.isDataRestricted = + (result.strVendor.find("ANDROID_METERED") == std::string::npos) ? 0 : 1; WifiSettings::GetInstance().SaveLinkedInfo(pStaStateMachine->linkedInfo); } IfConfig::GetInstance().SetIfAddr(result, result.iptype); - if (pStaStateMachine->getIpSucNum == 0) { - pStaStateMachine->SaveLinkstate(ConnState::CONNECTED, DetailedState::CONNECTED); - pStaStateMachine->staCallback.OnStaConnChanged( - OperateResState::CONNECT_AP_CONNECTED, pStaStateMachine->linkedInfo); - /* Wait for the network adapter information to take effect. */ - sleep(SLEEPTIME); + } + if (pStaStateMachine->getIpSucNum == 0 || pStaStateMachine->isRoam) { + pStaStateMachine->SaveLinkstate(ConnState::CONNECTED, DetailedState::CONNECTED); + pStaStateMachine->staCallback.OnStaConnChanged( + OperateResState::CONNECT_AP_CONNECTED, pStaStateMachine->linkedInfo); + /* Wait for the network adapter information to take effect. */ + sleep(SLEEPTIME); - /* Check whether the Internet access is normal by send http. */ - pStaStateMachine->pNetcheck->SignalNetCheckThread(); - } - pStaStateMachine->getIpSucNum++; - return; + /* Check whether the Internet access is normal by send http. */ + pStaStateMachine->pNetcheck->SignalNetCheckThread(); } + pStaStateMachine->getIpSucNum++; + return; } void StaStateMachine::DhcpResultNotify::OnFailed(int status, const std::string &ifname, const std::string &reason) { - WIFI_LOGI("Enter DhcpResultNotify::OnFailed"); - if (ifname.compare("wlan0") == 0) { - if (pStaStateMachine->currentTpType != IPTYPE_IPV4) { - if (pStaStateMachine->getIpSucNum == 0 && pStaStateMachine->getIpFailNum == 1) { - pStaStateMachine->staCallback.OnStaConnChanged(OperateResState::CONNECT_OBTAINING_IP_FAILED, - pStaStateMachine->linkedInfo); - pStaStateMachine->DisConnectProcess(); - } + LOGI("Enter DhcpResultNotify::OnFailed. ifname=[%s] status=[%d], reason = [%s]\n", ifname.c_str(), status, + reason.c_str()); + if ((pStaStateMachine->linkedInfo.detailedState == DetailedState::DISCONNECTING) || + (pStaStateMachine->linkedInfo.detailedState == DetailedState::DISCONNECTED)) { + return; + } + + if (pStaStateMachine->currentTpType != IPTYPE_IPV4) { + if (pStaStateMachine->getIpSucNum == 0 && pStaStateMachine->getIpFailNum == 1) { + pStaStateMachine->staCallback.OnStaConnChanged(OperateResState::CONNECT_OBTAINING_IP_FAILED, + pStaStateMachine->linkedInfo); + pStaStateMachine->DisConnectProcess(); + } + } else { + pStaStateMachine->staCallback.OnStaConnChanged( + OperateResState::CONNECT_OBTAINING_IP_FAILED, pStaStateMachine->linkedInfo); + if (!pStaStateMachine->isRoam) { + pStaStateMachine->DisConnectProcess(); } else { - pStaStateMachine->staCallback.OnStaConnChanged( - OperateResState::CONNECT_OBTAINING_IP_FAILED, pStaStateMachine->linkedInfo); - if (!pStaStateMachine->isRoam) { - pStaStateMachine->DisConnectProcess(); - } else { - pStaStateMachine->SaveLinkstate(ConnState::CONNECTED, DetailedState::CONNECTED); - } + pStaStateMachine->SaveLinkstate(ConnState::CONNECTED, DetailedState::CONNECTED); } - pStaStateMachine->getIpFailNum++; } + pStaStateMachine->getIpFailNum++; } void StaStateMachine::DhcpResultNotify::OnSerExitNotify(const std::string &ifname) { - WIFI_LOGI("Enter DhcpResultNotify::OnSerExitNotify"); + LOGI("Enter DhcpResultNotify::OnSerExitNotify. ifname = [%s]\n", ifname.c_str()); } /* ------------------ state machine Comment function ----------------- */ - void StaStateMachine::SaveLinkstate(ConnState state, DetailedState detailState) { linkedInfo.connState = state; @@ -1869,104 +1916,25 @@ void StaStateMachine::SaveLinkstate(ConnState state, DetailedState detailState) WifiSettings::GetInstance().SaveLinkedInfo(linkedInfo); } -void StaStateMachine::DisableNetwork(int networkId) +ErrCode StaStateMachine::DisableNetwork(int networkId) { - if (WifiStaHalInterface::GetInstance().DisableNetwork(networkId) == WIFI_IDL_OPT_OK) { - WIFI_LOGI("DisableNetwork() succeed, networkId=%{public}d", networkId); - - if (WifiStaHalInterface::GetInstance().SaveDeviceConfig() == WIFI_IDL_OPT_OK) { - WIFI_LOGI("DisableNetwork-SaveDeviceConfig() succeed!"); - } else { - WIFI_LOGW("DisableNetwork-SaveDeviceConfig() failed!"); - } - } else { - WIFI_LOGE("DisableNetwork() failed, networkId=%{public}d", networkId); + if (WifiStaHalInterface::GetInstance().DisableNetwork(networkId) != WIFI_IDL_OPT_OK) { + LOGE("DisableNetwork() failed, networkId=%d.", networkId); + return WIFI_OPT_FAILED; } -} - -void StaStateMachine::SetOperationalMode(int mode) -{ - SendMessage(WIFI_SVR_CMD_STA_OPERATIONAL_MODE, mode, 0); -} -void StaStateMachine::MacAddressGenerate(std::string &strMac) -{ - char szMacStr[] = "0123456789abcdef"; - std::random_device rd; - for (int i = 0; i < MAC_LENGTH; i++) { - int rndnum = std::abs((int)rd()); - if (i != 1) { - strMac.push_back(szMacStr[rndnum % RAND_SEED_16]); - } else { - strMac.push_back(szMacStr[MAC_STEP * (rndnum % RAND_SEED_8)]); - } - if ((i % MAC_STEP) != 0 && (i != MAC_LENGTH-1)) { - strMac.push_back(':'); - } + if (WifiStaHalInterface::GetInstance().SaveDeviceConfig() != WIFI_IDL_OPT_OK) { + LOGE("DisableNetwork-SaveDeviceConfig() failed!"); + return WIFI_OPT_FAILED; } + LOGI("DisableNetwork-SaveDeviceConfig() succeed!"); + return WIFI_OPT_SUCCESS; } -bool StaStateMachine::SetRandomMac(const int networkId) -{ - std::string strMac; - WifiDeviceConfig deviceConfig; - if (WifiSettings::GetInstance().GetDeviceConfig(networkId, deviceConfig) == 0) { - if (!deviceConfig.macAddress.empty()) { - strMac = deviceConfig.macAddress; - } else { - MacAddressGenerate(strMac); - deviceConfig.macAddress = strMac; - WifiSettings::GetInstance().AddDeviceConfig(deviceConfig); - WifiSettings::GetInstance().SyncDeviceConfig(); - } - - if (CheckMacFormat(strMac) == 0) { - WIFI_LOGI("Check MacAddress successfully.\n"); - if (WifiStaHalInterface::GetInstance().SetConnectMacAddr(strMac) != WIFI_IDL_OPT_OK) { - WIFI_LOGE("wlan0 set Mac [%s] failed.\n", strMac.c_str()); - return false; - } - return true; - } else { - WIFI_LOGE("Check MacAddress error.\n"); - return false; - } - } else { - WIFI_LOGE("SetRandomMac GetDeviceConfig failed!"); - return false; - } -} -int StaStateMachine::CheckMacFormat(const std::string &mac) +void StaStateMachine::SetOperationalMode(int mode) { - int status; - const std::string pattern = "^([A-Fa-f0-9]{2}[-,:]){5}[A-Fa-f0-9]{2}$"; - const int cflags = REG_EXTENDED | REG_NEWLINE; - - char ebuf[BUFFER_SIZE] = {0}; - regmatch_t pmatch[1]; - const size_t nmatch = 1; - regex_t reg; - - status = regcomp(®, pattern.c_str(), cflags); - if (status != 0) { - regerror(status, ®, ebuf, sizeof(ebuf)); - fprintf(stderr, "regcomp failed: %s , pattern: %s \n", ebuf, pattern.c_str()); - regfree(®); - return -1; - } - - status = regexec(®, mac.c_str(), nmatch, pmatch, 0); - if (status != 0) { - regerror(status, ®, ebuf, sizeof(ebuf)); - WIFI_LOGE("regexec failed."); - regfree(®); - return -1; - } - - printf("[%s] match success.\n", __FUNCTION__); - regfree(®); - return 0; + SendMessage(WIFI_SVR_CMD_STA_OPERATIONAL_MODE, mode, 0); } } // namespace Wifi } // namespace OHOS \ No newline at end of file diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h index 06d9b21..35bc332 100755 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h @@ -24,7 +24,6 @@ #include "wifi_errcode.h" #include "wifi_msg.h" #include "state_machine.h" -#include "sta_network_speed.h" #include "sta_network_check.h" #include "i_dhcp_result_notify.h" #include "sta_service_callback.h" @@ -33,32 +32,50 @@ namespace OHOS { namespace Wifi { -static const int STA_CONNECT_MODE = 1; -static const int STA_SCAN_ONLY_MODE = 2; -static const int STA_CAN_ONLY_WITH_WIFI_OFF_MODE = 3; -static const int STA_DISABLED_MODE = 4; -static const int CMD_START_WIFI_SUCCESS = 0x01; -static const int CMD_STOP_WIFI_SUCCESS = 0x02; -static const int CMD_CONNECT_NETWORK = 0x03; -static const int CMD_DISCONNECT_NETWORK = 0X05; -static const int CMD_SYNC_LINKINFO = 0X06; -static const int CMD_GET_NETWORK_SPEED = 0X07; -static const int STA_NETWORK_SPEED_DELAY = 1 * 1000; -static const int CMD_NETWORK_CONNECT_TIMEOUT = 0X08; -static const int STA_NETWORK_CONNECTTING_DELAY = 60 * 1000; -static const int PIN_CODE_LEN = 8; /* pincode length */ - -static const int DHCP_TIME = 15; +constexpr int STA_CONNECT_MODE = 1; +constexpr int STA_SCAN_ONLY_MODE = 2; +constexpr int STA_CAN_ONLY_WITH_WIFI_OFF_MODE = 3; +constexpr int STA_DISABLED_MODE = 4; + +constexpr int CMD_NETWORK_CONNECT_TIMEOUT = 0X01; +constexpr int STA_NETWORK_CONNECTTING_DELAY = 60 * 1000; + +constexpr int CMD_SIGNAL_POLL = 0X02; +constexpr int STA_SIGNAL_POLL_DELAY = 3 * 1000; + +/* pincode length */ +constexpr int PIN_CODE_LEN = 8; + +/* DHCP timeout interval */ +constexpr int DHCP_TIME = 15; +/* rssi thresholds */ +constexpr int INVALID_RSSI_VALUE = -127; +constexpr int MAX_RSSI_VALUE = 200; +constexpr int SIGNAL_INFO = 256; + +/* 2.4g and 5g frequency thresholds */ +constexpr int FREQ_2G_MIN = 2412; +constexpr int FREQ_2G_MAX = 2472; +constexpr int FREQ_5G_MIN = 5170; +constexpr int FREQ_5G_MAX = 5825; +constexpr int CHANNEL_14_FREQ = 2484; +constexpr int CHANNEL_14 = 14; +constexpr int CENTER_FREQ_DIFF = 5; +constexpr int CHANNEL_2G_MIN = 1; +constexpr int CHANNEL_5G_MIN = 34; + +constexpr int MULTI_AP = 0; /* * During the WPS PIN connection, the WPA_SUPPLICANT blocklist is cleared every 10 seconds * until the network connection is successful. */ -static const int BLOCK_LIST_CLEAR_TIMER = 20 * 1000; +constexpr int BLOCK_LIST_CLEAR_TIMER = 20 * 1000; /* Signal levels are classified into: 0 1 2 3 4 ,the max is 4. */ -static const int MAX_LEVEL = 4; +constexpr int MAX_LEVEL = 4; const std::string WPA_BSSID_ANY = "any"; +const std::string IF_NAME = "wlan0"; class StaStateMachine : public StateMachine { FRIEND_GTEST(StaStateMachine); @@ -324,12 +341,7 @@ public: * @param callbacks - Callback function pointer storage structure */ void RegisterStaServiceCallback(const StaServiceCallback &callbacks); - /** - * @Description Synchronize the linked information - * - * @param scanInfos - the results obtaining by scanning(in) - */ - void SyncLinkInfo(const std::vector &scanInfos); + /** * @Description Convert the deviceConfig structure and set it to wpa_supplicant * @@ -404,17 +416,6 @@ private: */ void GetBandFromFreQuencies(const int &freQuency); - /** - * @Description Remove network configuration. - * - * @param msg -Internal message(in) - */ - void RemoveDeviceConfigProcess(const InternalMessage *msg); - /** - * @Description Remove all network configuration. - * - */ - void RemoveAllDeviceConfigProcess(); /** * @Description Processing after a success response is returned after Wi-Fi is enabled successfully, such as setting the MAC address and @@ -445,7 +446,7 @@ private: * * @param networkId - the networkId of network which is going to be disabled.(in) */ - void DisableNetwork(int networkId); + ErrCode DisableNetwork(int networkId); /** * @Description Disconnect network * @@ -476,7 +477,7 @@ private: * * @param netState - the state of connecting network(in) */ - void HandleNetCheckResult(StaNetState netState); + void HandleNetCheckResult(StaNetState netState, const std::string portalUrl); /** * @Description Remove all device configurations before enabling WPS. * @@ -487,12 +488,22 @@ private: * */ void SyncAllDeviceConfigs(); - /** * @Description Initialize the connection state processing message map * */ int InitStaSMHandleMap(); + /** + * @Description : Deal SignalPoll Result. + * + * @param msg - Message body received by the state machine[in] + */ + void DealSignalPollResult(InternalMessage *msg); + /** + * @Description : Converting frequencies to channels. + * + */ + void ConvertFreqToChannel(); /** * @Description Connect to selected network. * @@ -576,22 +587,26 @@ private: * */ void ReassociateProcess(); + /** - * @Description Synchronous Encryption Mode Aand Band + * @Description Set a random MAC address. * - * @param mgmt - Encryption Mode[in] + * @param networkId - network id[in] */ - void SynchronousEncryptionModeAandBand(std::string mgmt); + bool SetRandomMac(int networkId); /** - * @Description Set Wep Encryption Mode Index + * @Description Generate a random MAC address. * - * @param config - A Network[in] + * @param strMac - Randomly generated MAC address[out] */ - void WepEncryptionModeIndex(WifiDeviceConfig &config); - - bool SetRandomMac(const int networkId); void MacAddressGenerate(std::string &strMac); - int CheckMacFormat(const std::string &mac); + /** + * @Description Compare the encryption mode of the current network with that of the network in the scanning result. + * + * @param scanInfoKeymgmt - Network encryption mode in the scanning result[in] + * @param deviceKeymgmt - Encryption mode of the current network[in] + */ + bool ComparedKeymgmt(const std::string scanInfoKeymgmt, const std::string deviceKeymgmt); private: StaSmHandleFuncMap staSmHandleFuncMap; @@ -602,9 +617,9 @@ private: int targetNetworkId; int pinCode; SetupMethod wpsState; - int lastConnectToNetworkTimer; /* Time stamp of the last attempt to connect to - * the network. - */ + /* Time stamp of the last attempt to connect to the network. */ + int lastConnectToNetworkTimer; + int lastSignalLevel; std::string targetRoamBssid; int currentTpType; IsWpsConnected isWpsConnect; @@ -615,7 +630,6 @@ private: WifiLinkedInfo lastLinkedInfo; IDhcpService *pDhcpService; DhcpResultNotify *pDhcpResultNotify; - StaNetWorkSpeed *pNetSpeed; StaNetworkCheck *pNetcheck; RootState *pRootState; diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn index ed8238a..2230707 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn @@ -43,7 +43,6 @@ ohos_unittest("wifi_sta_unittest") { "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.cpp", "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp", "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_speed.cpp", "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp", "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp", "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp", diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine_test.cpp b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine_test.cpp index 46e6e03..3bcf99e 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine_test.cpp +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine_test.cpp @@ -1113,20 +1113,20 @@ public: { EXPECT_CALL(WifiSettings::GetInstance(), SaveLinkedInfo(_)); pStaStateMachine->linkedInfo.connState = ConnState::CONNECTED; - pStaStateMachine->HandleNetCheckResult(StaNetState::NETWORK_STATE_WORKING); + pStaStateMachine->HandleNetCheckResult(StaNetState::NETWORK_STATE_WORKING, ""); } void HandleNetCheckResultSuccess3() { EXPECT_CALL(WifiSettings::GetInstance(), SaveLinkedInfo(_)); pStaStateMachine->linkedInfo.connState = ConnState::CONNECTED; - pStaStateMachine->HandleNetCheckResult(StaNetState::NETWORK_STATE_UNKNOW); + pStaStateMachine->HandleNetCheckResult(StaNetState::NETWORK_STATE_UNKNOWN, ""); } void HandleNetCheckResultFail() { pStaStateMachine->linkedInfo.connState = ConnState::DISCONNECTED; - pStaStateMachine->HandleNetCheckResult(StaNetState::NETWORK_STATE_UNKNOW); + pStaStateMachine->HandleNetCheckResult(StaNetState::NETWORK_STATE_UNKNOWN, ""); } void LinkedStateGoInStateSuccess() -- Gitee From 4c964242dc0a862414ea773f5b7f67136a91b87e Mon Sep 17 00:00:00 2001 From: maweiye Date: Mon, 29 Nov 2021 16:56:46 +0800 Subject: [PATCH 015/491] update %ld to PRId64 Signed-off-by: maweiye --- .../wifi_manage/wifi_scan/scan_service.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp index 87c73ad..6128e29 100755 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp @@ -14,6 +14,7 @@ */ #include "scan_service.h" +#include #include "wifi_logger.h" #include "wifi_settings.h" #include "wifi_sta_hal_interface.h" @@ -1984,7 +1985,8 @@ bool ScanService::AllowScanByIntervalFixed(int &fixedScanCount, time_t &fixedSca if (fixedScanCount == 0) { fixedScanCount++; fixedScanTime = now; - WIFI_LOGD("first scan, fixedScanTime:%{public}ld, interval:%{public}d count:%{public}d fixed return true.", + WIFI_LOGD("first scan, fixedScanTime:%{public}" PRId64 ", interval:%{public}d " + "count:%{public}d fixed return true.", fixedScanTime, interval, count); return true; } @@ -1994,8 +1996,8 @@ bool ScanService::AllowScanByIntervalFixed(int &fixedScanCount, time_t &fixedSca if (now - fixedScanTime >= interval) { fixedScanCount = 1; fixedScanTime = now; - WIFI_LOGD("interval>interval,fixedScanTime:%{public}ld,interval:%{public}d " - "count:%{public}d,timeExp:%{public}ld,return true.", + WIFI_LOGD("interval>interval,fixedScanTime:%{public}" PRId64 ",interval:%{public}d " + "count:%{public}d,timeExp:%{public}" PRId64 ",return true.", fixedScanTime, interval, count, timeExp); return true; } @@ -2004,14 +2006,14 @@ bool ScanService::AllowScanByIntervalFixed(int &fixedScanCount, time_t &fixedSca * and the number of scan times exceeds count. */ if (fixedScanCount >= count) { - WIFI_LOGD(" fixedScanCount=%{public}d count=%{public}d,timeExp:%{public}ld,return false.", fixedScanCount, - count, timeExp); + WIFI_LOGD(" fixedScanCount=%{public}d count=%{public}d,timeExp:%{public}" PRId64 ",return false.", + fixedScanCount, count, timeExp); return false; } fixedScanCount++; WIFI_LOGD("normal " - "scan,fixedScanCount:%{public}d,fixedScanTime:%{public}ld,interval:%{public}d,count:%{public}d,timeExp:" - "%{public}ld,return true.", + "scan,fixedScanCount:%{public}d,fixedScanTime:%{public}" PRId64 ",interval:%{public}d," + "count:%{public}d,timeExp:%{public}" PRId64 ",return true.", fixedScanCount, fixedScanTime, interval, count, timeExp); return true; } -- Gitee From 2924072e71c56a82e8bb056225e22c28c772406a Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Fri, 10 Dec 2021 07:50:38 +0000 Subject: [PATCH 016/491] fix(*): 1. update d.ts file; 2. modify sta report status enum value; 3. Reconnect directed to wpa_supplicant's interface Signed-off-by: zhangfeng --- interfaces/innerkits/native_cpp/napi/BUILD.gn | 2 + .../native_cpp/napi/wifi_napi_device.cpp | 35 ++ .../native_cpp/napi/wifi_napi_device.h | 2 + .../native_cpp/napi/wifi_napi_entry.cpp | 10 +- .../wifi_standard/interfaces/wifi_msg.h | 48 +- .../wifi_standard/interfaces/wifi_scan_msg.h | 2 - .../src/wifi_device_callback_stub.cpp | 4 +- .../wifi_standard/src/wifi_device_proxy.cpp | 11 +- interfaces/kits/jskits/@ohos.wifi.d.ts | 557 +++++++++++++++++- .../common/config/wifi_settings.cpp | 9 - .../common/config/wifi_settings.h | 8 - .../common/include/wifi_internal_msg.h | 2 + .../common/utils/wifi_common_event_helper.cpp | 2 +- .../common/utils/wifi_common_event_helper.h | 2 +- .../common/utils/wifi_global_func.cpp | 51 +- .../common/utils/wifi_global_func.h | 7 +- .../dhcp_manage/dhcp_server/src/dhcp_server.c | 5 +- .../idl_client/idl_interface/i_wifi.c | 8 + .../idl_interface/i_wifi_event_callback.h | 2 + .../idl_interface/i_wifi_sta_iface.c | 4 +- .../idl_client/wifi_event_callback.h | 2 + .../idl_client/wifi_idl_client.cpp | 2 + .../wifi_manage/idl_client/wifi_idl_define.h | 2 + .../idl_client/wifi_idl_inner_interface.cpp | 16 + .../idl_client/wifi_idl_inner_interface.h | 2 + .../wifi_manage/wifi_device_service_impl.cpp | 17 +- .../wifi_internal_event_dispatcher.cpp | 36 +- .../wifi_internal_event_dispatcher.h | 2 +- .../wifi_manage/wifi_manager.cpp | 14 +- .../wifi_manage/wifi_scan/BUILD.gn | 3 - .../wifi_manage/wifi_scan/scan_service.cpp | 14 - .../wifi_manage/wifi_sta/ista_service.h | 12 +- .../wifi_manage/wifi_sta/sta_define.h | 2 + .../wifi_manage/wifi_sta/sta_interface.cpp | 16 +- .../wifi_manage/wifi_sta/sta_interface.h | 12 +- .../wifi_manage/wifi_sta/sta_monitor.cpp | 31 +- .../wifi_manage/wifi_sta/sta_monitor.h | 19 +- .../wifi_sta/sta_network_check.cpp | 4 +- .../wifi_manage/wifi_sta/sta_service.cpp | 25 +- .../wifi_manage/wifi_sta/sta_service.h | 12 +- .../wifi_sta/sta_state_machine.cpp | 94 ++- .../wifi_manage/wifi_sta/sta_state_machine.h | 14 +- .../wifi_hal/wifi_hal_callback.c | 28 + .../wifi_hal/wifi_hal_callback.h | 15 + .../wifi_hal/wifi_hal_crpc_server.c | 2 + .../wifi_standard/wifi_hal/wifi_hal_define.h | 2 + .../wpa_supplicant_hal/wifi_wpa_hal.c | 13 + .../wifi_hal/wifi_hal_sta_interface.c | 3 +- .../common/unittest/wifi_global_func_test.cpp | 32 +- .../sta_auto_connect_service_test.cpp | 4 +- .../wifi_sta/sta_state_machine_test.cpp | 4 +- 51 files changed, 958 insertions(+), 267 deletions(-) diff --git a/interfaces/innerkits/native_cpp/napi/BUILD.gn b/interfaces/innerkits/native_cpp/napi/BUILD.gn index 70a0c64..514e7e6 100755 --- a/interfaces/innerkits/native_cpp/napi/BUILD.gn +++ b/interfaces/innerkits/native_cpp/napi/BUILD.gn @@ -86,6 +86,8 @@ ohos_shared_library("wifi_native_js") { "//utils/native/base:utils", ] + defines = [ "ENABLE_NAPI_COMPATIBLE" ] + external_deps = [ "ipc:ipc_core" ] relative_install_dir = "module" diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_device.cpp b/interfaces/innerkits/native_cpp/napi/wifi_napi_device.cpp index db79042..ff5c63f 100755 --- a/interfaces/innerkits/native_cpp/napi/wifi_napi_device.cpp +++ b/interfaces/innerkits/native_cpp/napi/wifi_napi_device.cpp @@ -288,6 +288,15 @@ napi_value ConnectToDevice(napi_env env, napi_callback_info info) return result; } +napi_value IsConnected(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + napi_value result; + napi_get_boolean(env, wifiDevicePtr->IsConnected(), &result); + return result; +} + napi_value Disconnect(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; @@ -546,6 +555,32 @@ napi_value GetDeviceConfigs(napi_env env, napi_callback_info info) return arrayResult; } +napi_value UpdateNetwork(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + size_t argc = 1; + napi_value argv[1]; + napi_value thisVar; + NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); + + napi_valuetype valueType; + napi_typeof(env, argv[0], &valueType); + NAPI_ASSERT(env, valueType == napi_object, "Wrong argument type. Object expected."); + + NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + int updateResult; + WifiDeviceConfig config; + JsObjToDeviceConfig(env, argv[0], config); + ErrCode ret = wifiDevicePtr->UpdateDeviceConfig(config, updateResult); + if (ret != WIFI_OPT_SUCCESS) { + WIFI_LOGE("Update device config fail: %{public}d", ret); + } + + napi_value result; + napi_create_uint32(env, updateResult, &result); + return result; +} + napi_value GetSupportedFeatures(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_device.h b/interfaces/innerkits/native_cpp/napi/wifi_napi_device.h index ce19d2a..3a424b0 100755 --- a/interfaces/innerkits/native_cpp/napi/wifi_napi_device.h +++ b/interfaces/innerkits/native_cpp/napi/wifi_napi_device.h @@ -30,6 +30,7 @@ napi_value GetScanInfos(napi_env env, napi_callback_info info); napi_value AddDeviceConfig(napi_env env, napi_callback_info info); napi_value ConnectToNetwork(napi_env env, napi_callback_info info); napi_value ConnectToDevice(napi_env env, napi_callback_info info); +napi_value IsConnected(napi_env env, napi_callback_info info); napi_value Disconnect(napi_env env, napi_callback_info info); napi_value GetSignalLevel(napi_env env, napi_callback_info info); napi_value ReConnect(napi_env env, napi_callback_info info); @@ -41,6 +42,7 @@ napi_value RemoveAllNetwork(napi_env env, napi_callback_info info); napi_value DisableNetwork(napi_env env, napi_callback_info info); napi_value GetCountryCode(napi_env env, napi_callback_info info); napi_value GetDeviceConfigs(napi_env env, napi_callback_info info); +napi_value UpdateNetwork(napi_env env, napi_callback_info info); napi_value GetSupportedFeatures(napi_env env, napi_callback_info info); napi_value IsFeatureSupported(napi_env env, napi_callback_info info); napi_value GetDeviceMacAddress(napi_env env, napi_callback_info info); diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_entry.cpp b/interfaces/innerkits/native_cpp/napi/wifi_napi_entry.cpp index 103d12b..1415486 100755 --- a/interfaces/innerkits/native_cpp/napi/wifi_napi_entry.cpp +++ b/interfaces/innerkits/native_cpp/napi/wifi_napi_entry.cpp @@ -21,8 +21,8 @@ namespace OHOS { namespace Wifi { +#ifndef ENABLE_NAPI_COMPATIBLE DEFINE_WIFILOG_LABEL("WifiNAPIEntry"); - /* * Event class initialization function */ @@ -55,6 +55,7 @@ static napi_value Init(napi_env env, napi_value exports) { DECLARE_NAPI_FUNCTION("addDeviceConfig", AddDeviceConfig), DECLARE_NAPI_FUNCTION("connectToNetwork", ConnectToNetwork), DECLARE_NAPI_FUNCTION("connectToDevice", ConnectToDevice), + DECLARE_NAPI_FUNCTION("isConnected", IsConnected), DECLARE_NAPI_FUNCTION("disconnect", Disconnect), DECLARE_NAPI_FUNCTION("getSignalLevel", GetSignalLevel), DECLARE_NAPI_FUNCTION("reconnect", ReConnect), @@ -66,6 +67,7 @@ static napi_value Init(napi_env env, napi_value exports) { DECLARE_NAPI_FUNCTION("disableNetwork", DisableNetwork), DECLARE_NAPI_FUNCTION("getCountryCode", GetCountryCode), DECLARE_NAPI_FUNCTION("getDeviceConfigs", GetDeviceConfigs), + DECLARE_NAPI_FUNCTION("updateNetwork", UpdateNetwork), DECLARE_NAPI_FUNCTION("getSupportedFeatures", GetSupportedFeatures), DECLARE_NAPI_FUNCTION("isFeatureSupported", IsFeatureSupported), DECLARE_NAPI_FUNCTION("getDeviceMacAddress", GetDeviceMacAddress), @@ -92,6 +94,8 @@ static napi_module wifiJsModule = { .reserved = { 0 } }; +#else + /* * Module initialization function */ @@ -125,10 +129,14 @@ static napi_module wifiJsModuleForCompatible = { .nm_priv = ((void *)0), .reserved = { 0 } }; +#endif extern "C" __attribute__((constructor)) void RegisterModule(void) { +#ifndef ENABLE_NAPI_COMPATIBLE napi_module_register(&wifiJsModule); +#else napi_module_register(&wifiJsModuleForCompatible); +#endif } } // namespace Wifi } // namespace OHOS diff --git a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_msg.h b/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_msg.h index 9b69256..4cf1a46 100755 --- a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_msg.h +++ b/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_msg.h @@ -68,21 +68,38 @@ enum class DetailedState { SCANNING = 12, SUSPENDED = 13, VERIFYING_POOR_LINK = 14, - + PASSWORD_ERROR = 15, + CONNECTION_REJECT = 16, + CONNECTION_FULL = 17, + CONNECTION_TIMEOUT = 18, + OBTAINING_IPADDR_FAIL = 19, INVALID = 0xFF, }; -enum class ConnState { - IDLE, +enum ConnState { + /** The device is searching for an available AP. */ SCANNING, + + /** The Wi-Fi connection is being set up. */ CONNECTING, + + /** The Wi-Fi connection is being authenticated. */ AUTHENTICATING, + + /** The IP address of the Wi-Fi connection is being obtained. */ OBTAINING_IPADDR, + + /** The Wi-Fi connection has been set up. */ CONNECTED, - SUSPENDED, + + /** The Wi-Fi connection is being torn down. */ DISCONNECTING, + + /** The Wi-Fi connection has been torn down. */ DISCONNECTED, - FAILED + + /** Failed to set up the Wi-Fi connection. */ + UNKNOWN }; struct WifiLinkedInfo { @@ -114,7 +131,7 @@ struct WifiLinkedInfo { frequency = 0; linkSpeed = 0; ipAddress = 0; - connState = ConnState::FAILED; + connState = ConnState::UNKNOWN; ifHiddenSSID = false; chload = 0; snr = 0; @@ -359,25 +376,6 @@ struct WifiDeviceConfig { enum class WifiState { DISABLING = 0, DISABLED = 1, ENABLING = 2, ENABLED = 3, UNKNOWN = 4 }; -enum class ConnectionState { - CONNECT_CONNECTING = 0, - CONNECT_AP_CONNECTED = 1, - CONNECT_CHECK_PORTAL = 2, - CONNECT_NETWORK_ENABLED = 3, - CONNECT_NETWORK_DISABLED = 4, - DISCONNECT_DISCONNECTING = 5, - DISCONNECT_DISCONNECT_FAILED = 6, - DISCONNECT_DISCONNECTED = 7, - CONNECT_PASSWORD_WRONG = 8, - CONNECT_CONNECTING_TIMEOUT = 9, - CONNECT_OBTAINING_IP = 10, - CONNECT_OBTAINING_IP_FAILED = 11, - CONNECT_ASSOCIATING = 12, - CONNECT_ASSOCIATED = 13, - - UNKNOWN, -}; - /* wps state */ enum class WpsStartState { START_PBC_SUCCEED = 0, diff --git a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_scan_msg.h b/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_scan_msg.h index 9b33054..fe0c2fd 100755 --- a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_scan_msg.h +++ b/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_scan_msg.h @@ -36,9 +36,7 @@ namespace Wifi { #define SCAN_SCENE_OBTAINING_IP 7 // Obtaining IP state #define SCAN_SCENE_DEEP_SLEEP 8 // Deep sleep state #define SCAN_SCENE_FREQUENCY_ORIGIN 9 // Scan frequency, origin. - // This parameter takes effect when no charger. #define SCAN_SCENE_FREQUENCY_CUSTOM 10 // Scan frequency, custom. - // This parameter takes effect when no charger. #define SCAN_SCENE_CUSTOM (SCAN_SCENE_FREQUENCY_CUSTOM + 1) /* SCAN_SCENE_CUSTOM~253 Custom Scenario */ diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_callback_stub.cpp b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_callback_stub.cpp index bf28eb3..151f1dd 100644 --- a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_callback_stub.cpp +++ b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_callback_stub.cpp @@ -153,10 +153,10 @@ int WifiDeviceCallBackStub::RemoteOnWifiConnectionChanged(uint32_t code, Message info.macAddress = data.ReadCString(); info.ipAddress = data.ReadInt32(); int tmpConnState = data.ReadInt32(); - if (tmpConnState >= 0 && tmpConnState <= int(ConnState::FAILED)) { + if (tmpConnState >= 0 && tmpConnState <= int(ConnState::UNKNOWN)) { info.connState = ConnState(tmpConnState); } else { - info.connState = ConnState::FAILED; + info.connState = ConnState::UNKNOWN; } info.ifHiddenSSID = data.ReadBool(); info.rxLinkSpeed = data.ReadInt32(); diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy.cpp b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy.cpp index 374a2f8..4b48f0b 100644 --- a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy.cpp +++ b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy.cpp @@ -256,11 +256,6 @@ ErrCode WifiDeviceProxy::UpdateDeviceConfig(const WifiDeviceConfig &config, int return WIFI_OPT_FAILED; } - if (config.networkId <= INVALID_NETWORK_ID) { - WIFI_LOGE("update device config fail for networkId is invalid: %{public}d", config.networkId); - return WIFI_OPT_FAILED; - } - MessageOption option; MessageParcel data, reply; data.WriteInt32(0); @@ -713,10 +708,10 @@ void WifiDeviceProxy::ReadLinkedInfo(MessageParcel &reply, WifiLinkedInfo &info) info.macAddress = reply.ReadCString(); info.ipAddress = reply.ReadInt32(); int tmpConnState = reply.ReadInt32(); - if ((tmpConnState >= 0) && (tmpConnState <= (int)ConnState::FAILED)) { - info.connState = (ConnState)tmpConnState; + if ((tmpConnState >= 0) && (tmpConnState <= (int)ConnState::UNKNOWN)) { + info.connState = ConnState(tmpConnState); } else { - info.connState = ConnState::FAILED; + info.connState = ConnState::UNKNOWN; } info.ifHiddenSSID = reply.ReadBool(); info.rxLinkSpeed = reply.ReadInt32(); diff --git a/interfaces/kits/jskits/@ohos.wifi.d.ts b/interfaces/kits/jskits/@ohos.wifi.d.ts index 6da7d84..75f0040 100755 --- a/interfaces/kits/jskits/@ohos.wifi.d.ts +++ b/interfaces/kits/jskits/@ohos.wifi.d.ts @@ -13,14 +13,15 @@ * limitations under the License. */ -import { AsyncCallback } from "./basic"; +import { AsyncCallback, Callback } from "./basic"; /** * Provides methods to operate or manage Wi-Fi. * - * @SysCap SystemCapability.Communication.WifiDevice - * @devices phone, tablet * @since 6 + * @SysCap SystemCapability.Communication.WiFi + * @devices phone, tablet, tv, wearable, car + * @import import wifi from '@ohos.wifi'; */ declare namespace wifi { /** @@ -131,10 +132,357 @@ declare namespace wifi { */ function getSignalLevel(rssi: number, band: number): number; + /** + * Obtains information about a Wi-Fi connection. + * + * @return Returns the Wi-Fi connection information. + * @since 8 + */ + function getLinkedInfo(): Promise; + function getLinkedInfo(callback: AsyncCallback): void; + + /** + * Checks whether a Wi-Fi connection has been set up. + * + * @return Returns {@code true} if a Wi-Fi connection has been set up; returns {@code false} otherwise. + * @since 8 + */ + function isConnected(): boolean; + + /** + * Obtains the features supported by this device. + * + *

To check whether this device supports a specified feature. + * + * @return Returns the features supported by this device. + * @since 8 + * @systemapi Hide this for inner system use. + */ + function getSupportedFeatures(): number; + + /** + * Checks whether this device supports a specified feature. + * + * @param featureId Indicates the ID of the feature. + * @return Returns {@code true} if this device supports the specified feature; returns {@code false} otherwise. + * @since 8 + */ + function isFeatureSupported(featureId: number): boolean; + + /** + * Obtains the MAC address of a Wi-Fi device. Wi-Fi must be enabled. + * + *

The MAC address is unique and cannot be changed. + * + * @return Returns the MAC address of the Wi-Fi device. + * @since 8 + * @systemapi Hide this for inner system use. + */ + function getDeviceMacAddress(): string[]; + + /** + * Obtains the IP information of a Wi-Fi connection. + * + *

The IP information includes the host IP address, gateway address, and DNS information. + * + * @return Returns the IP information of the Wi-Fi connection. + * @since 8 + */ + function getIpInfo(): IpInfo; + + /** + * Obtains the country code of this device. + * + * @return Returns the country code of this device. + * @since 8 + */ + function getCountryCode(): string; + + /** + * Re-associates to current network. + * + * @return {@code true} if the Wi-Fi network is re-associate successfully. + * @since 8 + * @systemapi Hide this for inner system use. + */ + function reassociate(): boolean; + + /** + * Re-connects to current network. + * + * @return {@code true} if the Wi-Fi network is re-connect successfully. + * @since 8 + * @systemapi Hide this for inner system use. + */ + function reconnect(): boolean; + + /** + * Obtains the list of all existing Wi-Fi configurations. + * + *

You can obtain only the Wi-Fi configurations you created on your own application. + * + * @return Returns the list of all existing Wi-Fi configurations you created on your application. + * @since 8 + * @systemapi Hide this for inner system use. + */ + function getDeviceConfigs(): Array; + + /** + * Updates the specified Wi-Fi configuration. + * + * @param config Indicates the Wi-Fi configuration to update. + * + * @return Returns the network ID in the updated Wi-Fi configuration if the update is successful; + * returns {@code -1} if the specified Wi-Fi configuration is not contained in the list. + * @since 8 + * @systemapi Hide this for inner system use. + */ + function updateNetwork(config: WifiDeviceConfig): number; + + /** + * Disables a specified network. + * + *

The disabled network will not be associated with again. + * + * @param netId Identifies the network to disable. + * @return Returns {@code true} if the specified network is disabled; returns {@code false} otherwise. + * @since 8 + * @systemapi Hide this for inner system use. + */ + function disableNetwork(netId: number): boolean; + + /** + * Removes all the saved Wi-Fi configurations. + * + * @return Returns {@code true} if all the saved Wi-Fi configurations are removed; + * returns {@code false} otherwise. + * @since 8 + * @systemapi Hide this for inner system use. + */ + function removeAllNetwork(): boolean; + + /** + * Deletes a Wi-Fi network with a specified ID. + * + *

After a Wi-Fi network is deleted, its configuration will be deleted from the list of Wi-Fi configurations. + * If the Wi-Fi network is being connected, the connection will be interrupted. + * The application can only delete Wi-Fi networks it has created. + * + * @param id Indicates the ID of the Wi-Fi network, + * which can be obtained using the {@link #addDeviceConfig} or {@link #getLinkedInfo} method. + * @return Returns {@code true} if the Wi-Fi network is deleted successfully; returns {@code false} otherwise. + * @since 8 + * @systemapi Hide this for inner system use. + */ + function removeDevice(id: number): boolean; + + /** + * Enables a Wi-Fi hotspot. + * + *

This method is asynchronous. After the Wi-Fi hotspot is enabled, Wi-Fi may be disabled. + * + * @return Returns {@code true} if this method is called successfully; returns {@code false} otherwise. + * @since 8 + * @systemapi Hide this for inner system use. + */ + function enableHotspot(): boolean; + + /** + * Disables a Wi-Fi hotspot. + * + *

This method is asynchronous. If Wi-Fi is enabled after the Wi-Fi hotspot is disabled, Wi-Fi may be re-enabled. + * + * @return Returns {@code true} if this method is called successfully; returns {@code false} otherwise. + * @since 8 + * @systemapi Hide this for inner system use. + */ + function disableHotspot(): boolean; + + /** + * Checks whether Wi-Fi hotspot is active on a device. + * + * @return Returns {@code true} if Wi-Fi hotspot is enabled; returns {@code false} otherwise. + * @since 8 + * @systemapi Hide this for inner system use. + */ + function isHotspotActive(): boolean; + + /** + * Sets the hotspot for a device. + * + *

Only OPEN and WPA2 PSK hotspots can be configured. + * + * @param config Indicates the Wi-Fi hotspot configuration. + * The SSID and {@code securityType} must be available and correct. + * If {@code securityType} is not {@code open}, {@code preSharedKey} must be available and correct. + * @return Returns {@code true} if the method is called successfully; returns {@code false} otherwise. + * @since 8 + * @systemapi Hide this for inner system use. + */ + function setHotspotConfig(config: HotspotConfig): boolean; + + /** + * Obtains the Wi-Fi hotspot configuration. + * + * @return Returns the configuration of an existing or enabled Wi-Fi hotspot. + * @since 8 + * @systemapi Hide this for inner system use. + */ + function getHotspotConfig(): HotspotConfig; + + /** + * Obtains the list of clients that are connected to a Wi-Fi hotspot. + * + *

This method can only be used on a device that serves as a Wi-Fi hotspot. + * + * @return Returns the list of clients that are connected to the Wi-Fi hotspot. + * @since 8 + * @systemapi Hide this for inner system use. + */ + function getStations(): Array; + + /** + * Defines the EventListener class and provides functions to subscribe or unsubscribe the Wi-Fi events. + * + * @since 8 + * @SysCap SystemCapability.Communication.WiFi + * @devices phone, tablet, tv, wearable, car + */ + export class EventListener { + /** + * Subscribe Wi-Fi status change events. + * + * @return Returns 0: inactive, 1: active, 2: activating, 3: deactivating + * @since 7 + * @permission {@code ohos.permission.GET_WIFI_INFO} + */ + on(type: "wifiStateChange", callback: Callback): void; + + /** + * Unsubscribe Wi-Fi status change events. + * + *

All callback functions will be deregistered If there is no specific callback parameter.

+ * + * @since 7 + * @permission {@code ohos.permission.GET_WIFI_INFO} + */ + off(type: "wifiStateChange", callback?: Callback): void; + + /** + * Subscribe Wi-Fi connection change events. + * + * @return Returns 0: disconnected, 1: connected + * @since 7 + * @permission {@code ohos.permission.GET_WIFI_INFO} + */ + on(type: "wifiConnectionChange", callback: Callback): void; + + /** + * Unsubscribe Wi-Fi connection change events. + * + *

All callback functions will be deregistered If there is no specific callback parameter.

+ * + * @since 7 + * @permission {@code ohos.permission.GET_WIFI_INFO} + */ + off(type: "wifiConnectionChange", callback?: Callback): void; + + /** + * Subscribe Wi-Fi scan status change events. + * + * @return Returns 0: scan fail, 1: scan success + * @since 7 + * @permission {@code ohos.permission.GET_WIFI_INFO} + */ + on(type: "wifiScanStateChange", callback: Callback): void; + + /** + * Unsubscribe Wi-Fi scan status change events. + * + *

All callback functions will be deregistered If there is no specific callback parameter.

+ * + * @since 7 + * @permission {@code ohos.permission.GET_WIFI_INFO} + */ + off(type: "wifiScanStateChange", callback?: Callback): void; + + /** + * Subscribe Wi-Fi rssi change events. + * + * @return Returns RSSI value in dBm + * @since 7 + * @permission {@code ohos.permission.GET_WIFI_INFO} + */ + on(type: "wifiRssiChange", callback: Callback): void; + + /** + * Unsubscribe Wi-Fi rssi change events. + * + *

All callback functions will be deregistered If there is no specific callback parameter.

+ * + * @since 7 + * @permission {@code ohos.permission.GET_WIFI_INFO} + */ + off(type: "wifiRssiChange", callback?: Callback): void; + + /** + * Subscribe Wi-Fi hotspot state change events. + * + * @return Returns 0: inactive, 1: active, 2: activating, 3: deactivating + * @since 8 + */ + on(type: "hotspotStateChange", callback: Callback): void; + + /** + * Unsubscribe Wi-Fi hotspot state change events. + * + *

All callback functions will be deregistered If there is no specific callback parameter.

+ * + * @since 8 + */ + off(type: "hotspotStateChange", callback?: Callback): void; + + /** + * Subscribe Wi-Fi hotspot sta join events. + * + * @return Returns StationInfo + * @since 8 + * @systemapi Hide this for inner system use. + */ + on(type: "hotspotStaJoin", callback: Callback): void; + + /** + * Unsubscribe Wi-Fi hotspot sta join events. + * + *

All callback functions will be deregistered If there is no specific callback parameter.

+ * + * @since 8 + * @systemapi Hide this for inner system use. + */ + off(type: "hotspotStaJoin", callback?: Callback): void; + + /** + * Subscribe Wi-Fi hotspot sta leave events. + * + * @return Returns {@link #StationInfo} object + * @since 8 + * @systemapi Hide this for inner system use. + */ + on(type: "hotspotStaLeave", callback: Callback): void; + + /** + * Unsubscribe Wi-Fi hotspot sta leave events. + * + * @return Returns {@link #StationInfo} object + * @since 8 + * @systemapi Hide this for inner system use. + */ + off(type: "hotspotStaLeave", callback?: Callback): void; + } + /** * Wi-Fi device configuration information. * - * @devices phone, tablet * @since 6 * @systemapi Hide this for inner system use. */ @@ -158,7 +506,6 @@ declare namespace wifi { /** * Describes the scanned Wi-Fi information. * - * @devices phone, tablet * @since 6 */ interface WifiScanInfo { @@ -187,7 +534,6 @@ declare namespace wifi { /** * Describes the wifi security type. * - * @devices phone, tablet * @since 6 */ enum WifiSecurityType { @@ -197,6 +543,205 @@ declare namespace wifi { WIFI_SEC_TYPE_PSK = 3, /* Pre-shared key (PSK) */ WIFI_SEC_TYPE_SAE = 4, /* Simultaneous Authentication of Equals (SAE) */ } + + /** + * Wi-Fi connection information. + * + * @since 8 + */ + interface WifiLinkedInfo { + /** The SSID of the Wi-Fi hotspot */ + ssid: string; + + /** The BSSID of the Wi-Fi hotspot */ + bssid: string; + + /** The ID(uniquely identifies) of a Wi-Fi connection. */ + /* @systemapi */ + networkId: number; + + /** The RSSI(dBm) of a Wi-Fi access point. */ + rssi: number; + + /** The frequency band of a Wi-Fi access point. */ + band: number; + + /** The speed of a Wi-Fi access point. */ + linkSpeed: number; + + /** The frequency of a Wi-Fi access point. */ + frequency: number; + + /** Whether the SSID of the access point (AP) of this Wi-Fi connection is hidden. */ + isHidden: boolean; + + /** Whether this Wi-Fi connection restricts the data volume. */ + isRestricted: boolean; + + /** The load value of this Wi-Fi connection. A greater value indicates a higher load. */ + /* @systemapi */ + chload: number; + + /** The signal-to-noise ratio (SNR) of this Wi-Fi connection. */ + /* @systemapi */ + snr: number; + + /** The Wi-Fi MAC address of a device. */ + macAddress: string; + + /** The IP address of this Wi-Fi connection. */ + ipAddress: number; + + /** The state of the supplicant of this Wi-Fi connection. */ + /* @systemapi */ + suppState: SuppState; + + /** The state of this Wi-Fi connection. */ + connState: ConnState; + } + + /** + * Wi-Fi IP information. + * + * @since 8 + */ + interface IpInfo { + /** The IP address of the Wi-Fi connection */ + ipAddress: number; + + /** The gateway of the Wi-Fi connection */ + gateway: number; + + /** The network mask of the Wi-Fi connection */ + netmask: number; + + /** The primary DNS server IP address of the Wi-Fi connection */ + primaryDns: number; + + /** The secondary DNS server IP address of the Wi-Fi connection */ + secondDns: number; + + /** The DHCP server IP address of the Wi-Fi connection */ + serverIp: number; + + /** The IP address lease duration of the Wi-Fi connection */ + leaseDuration: number; + } + + /** + * Wi-Fi hotspot configuration information. + * + * @since 8 + * @systemapi + */ + interface HotspotConfig { + /** The SSID of the Wi-Fi hotspot */ + ssid: string; + + /** The encryption mode of the Wi-Fi hotspot */ + securityType: WifiSecurityType; + + /** The frequency band of the Wi-Fi hotspot */ + band: number; + + /** The password of the Wi-Fi hotspot */ + preSharedKey: string; + + /** The maximum number of connections allowed by the Wi-Fi hotspot */ + maxConn: number; + } + + /** + * Wi-Fi station information. + * + * @since 8 + * @systemapi + */ + interface StationInfo { + /** the network name of the Wi-Fi client */ + name: string; + + /** The MAC address of the Wi-Fi client */ + macAddress: string; + + /** The IP address of the Wi-Fi client */ + ipAddress: string; + } + + /** + * The state of the supplicant enumeration. + * + * @since 8 + * @systemapi + */ + export enum SuppState { + /** The supplicant is not associated with or is disconnected from the AP. */ + DISCONNECTED, + + /** The network interface is disabled. */ + INTERFACE_DISABLED, + + /** The supplicant is disabled. */ + INACTIVE, + + /** The supplicant is scanning for a Wi-Fi connection. */ + SCANNING, + + /** The supplicant is authenticating with a specified AP. */ + AUTHENTICATING, + + /** The supplicant is associating with a specified AP. */ + ASSOCIATING, + + /** The supplicant is associated with a specified AP. */ + ASSOCIATED, + + /** The four-way handshake is ongoing. */ + FOUR_WAY_HANDSHAKE, + + /** The group handshake is ongoing. */ + GROUP_HANDSHAKE, + + /** All authentication is completed. */ + COMPLETED, + + /** Failed to establish a connection to the supplicant. */ + UNINITIALIZED, + + /** The supplicant is in an unknown or invalid state. */ + INVALID + } + + /** + * The state of Wi-Fi connection enumeration. + * + * @since 8 + */ + export enum ConnState { + /** The device is searching for an available AP. */ + SCANNING, + + /** The Wi-Fi connection is being set up. */ + CONNECTING, + + /** The Wi-Fi connection is being authenticated. */ + AUTHENTICATING, + + /** The IP address of the Wi-Fi connection is being obtained. */ + OBTAINING_IPADDR, + + /** The Wi-Fi connection has been set up. */ + CONNECTED, + + /** The Wi-Fi connection is being torn down. */ + DISCONNECTING, + + /** The Wi-Fi connection has been torn down. */ + DISCONNECTED, + + /** Failed to set up the Wi-Fi connection. */ + UNKNOWN + } } export default wifi; diff --git a/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp b/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp index 4bfefa2..7f4262f 100644 --- a/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp +++ b/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp @@ -482,18 +482,9 @@ int WifiSettings::SaveLinkedInfo(const WifiLinkedInfo &info) { std::unique_lock lock(mInfoMutex); mWifiLinkedInfo = info; - if (mWifiLinkedInfo.connState == ConnState::CONNECTED) { - lastSuccConnectBssid = mWifiLinkedInfo.bssid; - } return 0; } -std::string WifiSettings::GetLastSuccConnectBssid() -{ - std::unique_lock lock(mInfoMutex); - return lastSuccConnectBssid; -} - int WifiSettings::SetMacAddress(const std::string &macAddress) { std::unique_lock lock(mStaMutex); diff --git a/services/wifi_standard/wifi_framework/common/config/wifi_settings.h b/services/wifi_standard/wifi_framework/common/config/wifi_settings.h index 77492f3..ba7b222 100644 --- a/services/wifi_standard/wifi_framework/common/config/wifi_settings.h +++ b/services/wifi_standard/wifi_framework/common/config/wifi_settings.h @@ -321,13 +321,6 @@ public: */ int SaveLinkedInfo(const WifiLinkedInfo &info); - /** - * @Description Obtains the BSSID of the last successful connection. - * - * @return std::string - bssid - */ - std::string GetLastSuccConnectBssid(); - /** * @Description Save mac address * @@ -1034,7 +1027,6 @@ private: int mFreezeModeState; /* 1 on 2 off */ int mNoChargerPlugModeState; /* 1 on 2 off */ WifiConfig mWifiConfig; - std::string lastSuccConnectBssid; std::mutex mStaMutex; std::mutex mApMutex; diff --git a/services/wifi_standard/wifi_framework/common/include/wifi_internal_msg.h b/services/wifi_standard/wifi_framework/common/include/wifi_internal_msg.h index be7f6d4..f94f91e 100755 --- a/services/wifi_standard/wifi_framework/common/include/wifi_internal_msg.h +++ b/services/wifi_standard/wifi_framework/common/include/wifi_internal_msg.h @@ -86,6 +86,8 @@ enum class OperateResState { DISCONNECT_DISCONNECT_FAILED, /* disconnect failed */ DISCONNECT_DISCONNECTED, /* disconnect succeed */ CONNECT_PASSWORD_WRONG, /* wrong password */ + CONNECT_CONNECTION_FULL, /* connection full */ + CONNECT_CONNECTION_REJECT, /* connection reject */ CONNECT_OBTAINING_IP, /* obtain ip */ CONNECT_OBTAINING_IP_FAILED, /* obtain ip FAILED */ CONNECT_ASSOCIATING, diff --git a/services/wifi_standard/wifi_framework/common/utils/wifi_common_event_helper.cpp b/services/wifi_standard/wifi_framework/common/utils/wifi_common_event_helper.cpp index 525b90f..e48ad68 100755 --- a/services/wifi_standard/wifi_framework/common/utils/wifi_common_event_helper.cpp +++ b/services/wifi_standard/wifi_framework/common/utils/wifi_common_event_helper.cpp @@ -85,7 +85,7 @@ bool WifiCommonEventHelper::PublishRssiValueChangedEvent(const int &code, const return WifiCommonEventHelper::PublishEvent(COMMON_EVENT_WIFI_RSSI_VALUE, code, data); } -bool WifiCommonEventHelper::PublishConnectionStateChangedEvent(const int &code, const std::string &data) +bool WifiCommonEventHelper::PublishConnStateChangedEvent(const int &code, const std::string &data) { return WifiCommonEventHelper::PublishEvent(COMMON_EVENT_WIFI_CONN_STATE, code, data); } diff --git a/services/wifi_standard/wifi_framework/common/utils/wifi_common_event_helper.h b/services/wifi_standard/wifi_framework/common/utils/wifi_common_event_helper.h index 028f25d..d663fb2 100644 --- a/services/wifi_standard/wifi_framework/common/utils/wifi_common_event_helper.h +++ b/services/wifi_standard/wifi_framework/common/utils/wifi_common_event_helper.h @@ -47,7 +47,7 @@ public: static bool PublishScanFinishedEvent(const int &code, const std::string &data); static bool PublishScanStateChangedEvent(const int &code, const std::string &data); static bool PublishRssiValueChangedEvent(const int &code, const std::string &data); - static bool PublishConnectionStateChangedEvent(const int &code, const std::string &data); + static bool PublishConnStateChangedEvent(const int &code, const std::string &data); static bool PublishHotspotStateChangedEvent(const int &code, const std::string &data); static bool PublishApStaJoinEvent(const int &code, const std::string &data); static bool PublishApStaLeaveEvent(const int &code, const std::string &data); diff --git a/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp b/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp index 264ff8e..2dca17f 100755 --- a/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp +++ b/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp @@ -144,39 +144,54 @@ bool IsAllowScanAnyTime(const ScanControlInfo &info) return true; } -ConnectionState ConvertConnStateInternal(OperateResState resState) +ConnState ConvertConnStateInternal(OperateResState resState, bool &isReport) { switch (resState) { case OperateResState::CONNECT_CONNECTING: - return ConnectionState::CONNECT_CONNECTING; + isReport = true; + return ConnState::CONNECTING; case OperateResState::CONNECT_AP_CONNECTED: - return ConnectionState::CONNECT_AP_CONNECTED; - case OperateResState::CONNECT_CHECK_PORTAL: - return ConnectionState::CONNECT_CHECK_PORTAL; + isReport = true; + return ConnState::CONNECTED; case OperateResState::CONNECT_NETWORK_ENABLED: - return ConnectionState::CONNECT_NETWORK_ENABLED; + isReport = false; + return ConnState::UNKNOWN; case OperateResState::CONNECT_NETWORK_DISABLED: - return ConnectionState::CONNECT_NETWORK_DISABLED; + isReport = false; + return ConnState::UNKNOWN; case OperateResState::DISCONNECT_DISCONNECTING: - return ConnectionState::DISCONNECT_DISCONNECTING; - case OperateResState::DISCONNECT_DISCONNECT_FAILED: - return ConnectionState::DISCONNECT_DISCONNECT_FAILED; + isReport = true; + return ConnState::DISCONNECTING; case OperateResState::DISCONNECT_DISCONNECTED: - return ConnectionState::DISCONNECT_DISCONNECTED; + isReport = true; + return ConnState::DISCONNECTED; case OperateResState::CONNECT_PASSWORD_WRONG: - return ConnectionState::CONNECT_PASSWORD_WRONG; + isReport = false; + return ConnState::UNKNOWN; + case OperateResState::CONNECT_CONNECTION_FULL: + isReport = false; + return ConnState::UNKNOWN; + case OperateResState::CONNECT_CONNECTION_REJECT: + isReport = false; + return ConnState::UNKNOWN; case OperateResState::CONNECT_CONNECTING_TIMEOUT: - return ConnectionState::CONNECT_CONNECTING_TIMEOUT; + isReport = false; + return ConnState::UNKNOWN; case OperateResState::CONNECT_OBTAINING_IP: - return ConnectionState::CONNECT_OBTAINING_IP; + isReport = true; + return ConnState::OBTAINING_IPADDR; case OperateResState::CONNECT_OBTAINING_IP_FAILED: - return ConnectionState::CONNECT_OBTAINING_IP_FAILED; + isReport = false; + return ConnState::UNKNOWN; case OperateResState::CONNECT_ASSOCIATING: - return ConnectionState::CONNECT_ASSOCIATING; + isReport = false; + return ConnState::UNKNOWN; case OperateResState::CONNECT_ASSOCIATED: - return ConnectionState::CONNECT_ASSOCIATED; + isReport = false; + return ConnState::UNKNOWN; default: - return ConnectionState::UNKNOWN; + isReport = true; + return ConnState::UNKNOWN; } } diff --git a/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.h b/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.h index 98e3812..2951aa9 100644 --- a/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.h +++ b/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.h @@ -98,12 +98,13 @@ std::string GetRandomStr(int len); bool IsAllowScanAnyTime(const ScanControlInfo &info); /** - * @Description Internal transition from OperateResState struct to ConnectionState + * @Description Internal transition from OperateResState struct to ConnState * * @param resState - OperateResState state - * @return ConnectionState - convert output connection state + * @param isReport - true : need report; flase : not report + * @return ConnState - convert output connection state */ -ConnectionState ConvertConnStateInternal(OperateResState resState); +ConnState ConvertConnStateInternal(OperateResState resState, bool &isReport); /** * @Description Check whether the MAC address is valid diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_server.c b/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_server.c index c1af5ed..bc0d0b8 100644 --- a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_server.c +++ b/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_server.c @@ -525,8 +525,7 @@ static int BeginLooper(PDhcpServerContext ctx) } InitReply(ctx, &from, &reply); int replyType = MessageProcess(ctx, &from, &reply); - int snedRet = -1; - if (replyType && (snedRet = SendDhcpReply(ctx, replyType, &reply)) != RET_SUCCESS) { + if (replyType && SendDhcpReply(ctx, replyType, &reply) != RET_SUCCESS) { LOGE("failed to send reply message."); } if (replyType == REPLY_ACK || replyType == REPLY_OFFER) { @@ -535,7 +534,7 @@ static int BeginLooper(PDhcpServerContext ctx) LOGW("failed to save lease recoders."); }; } - } // while (srvIns->looperState) + } FreeOptionList(&from.options); FreeOptionList(&reply.options); LOGD("dhcp server message looper stoped."); diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi.c b/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi.c index 6567a78..915dc15 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi.c +++ b/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi.c @@ -261,6 +261,12 @@ static void IdlCbkWpaEventDeal(Context *context, int event) if (event == WIFI_IDL_CBK_CMD_WPA_STATE_CHANGEM && callback->onWpaStateChanged != NULL) { callback->onWpaStateChanged(status); } + if (event == WIFI_IDL_CBK_CMD_WPS_CONNECTION_FULL && callback->onWpsConnectionFull != NULL) { + callback->onWpsConnectionFull(status); + } + if (event == WIFI_IDL_CBK_CMD_WPS_CONNECTION_REJECT && callback->onWpsConnectionReject != NULL) { + callback->onWpsConnectionReject(status); + } return; } @@ -293,6 +299,8 @@ static int IdlDealStaApEvent(Context *context, int event) case WIFI_IDL_CBK_CMD_SSID_WRONG_KEY: case WIFI_IDL_CBK_CMD_WPS_OVERLAP: case WIFI_IDL_CBK_CMD_WPS_TIME_OUT: + case WIFI_IDL_CBK_CMD_WPS_CONNECTION_FULL: + case WIFI_IDL_CBK_CMD_WPS_CONNECTION_REJECT: IdlCbkWpaEventDeal(context, event); break; default: diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_event_callback.h b/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_event_callback.h index 21d6bc1..8eb496c 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_event_callback.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_event_callback.h @@ -31,6 +31,8 @@ typedef struct IWifiEventCallback { void (*onSsidWrongkey)(int status); void (*onWpsOverlap)(int status); void (*onWpsTimeOut)(int status); + void (*onWpsConnectionFull)(int status); + void (*onWpsConnectionReject)(int status); } IWifiEventCallback; #ifdef __cplusplus diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.c b/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.c index b6ccac6..edcb99e 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.c +++ b/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.c @@ -557,7 +557,9 @@ static int CheckRegisterEvent(int *events, int size) WIFI_IDL_CBK_CMD_WPA_STATE_CHANGEM, WIFI_IDL_CBK_CMD_SSID_WRONG_KEY, WIFI_IDL_CBK_CMD_WPS_OVERLAP, - WIFI_IDL_CBK_CMD_WPS_TIME_OUT + WIFI_IDL_CBK_CMD_WPS_TIME_OUT, + WIFI_IDL_CBK_CMD_WPS_CONNECTION_FULL, + WIFI_IDL_CBK_CMD_WPS_CONNECTION_REJECT }; int max = sizeof(staEvents) / sizeof(staEvents[0]); int num = 0; diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_event_callback.h b/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_event_callback.h index 6a5c9be..213fe48 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_event_callback.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_event_callback.h @@ -26,6 +26,8 @@ struct WifiEventCallback { std::function onWpaSsidWrongKey; std::function onWpsOverlap; std::function onWpsTimeOut; + std::function onWpaConnectionFull; + std::function onWpaConnectionReject; }; } // namespace Wifi } // namespace OHOS diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp b/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp index dba6e98..3419d06 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp @@ -528,6 +528,8 @@ WifiErrorNo WifiIdlClient::ReqRegisterStaEventCallback(const WifiEventCallback & cEventCallback.onSsidWrongkey = OnWpaSsidWrongKey; cEventCallback.onWpsOverlap = OnWpsOverlap; cEventCallback.onWpsTimeOut = OnWpsTimeOut; + cEventCallback.onWpsConnectionFull = onWpaConnectionFull; + cEventCallback.onWpsConnectionReject = onWpaConnectionReject; } return RegisterStaEventCallback(cEventCallback); } diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_define.h b/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_define.h index a4b727f..760d668 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_define.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_define.h @@ -36,6 +36,8 @@ typedef enum WifiIdlEvent { WIFI_IDL_CBK_CMD_SSID_WRONG_KEY, /* Password error status notification */ WIFI_IDL_CBK_CMD_WPS_OVERLAP, /* wps PBC overlap */ WIFI_IDL_CBK_CMD_WPS_TIME_OUT, /* wps connect time out */ + WIFI_IDL_CBK_CMD_WPS_CONNECTION_FULL, /* network connection full */ + WIFI_IDL_CBK_CMD_WPS_CONNECTION_REJECT, /* network connection reject */ /* P2p callback */ WIFI_IDL_CBK_CMD_P2P_SUPPLICANT_CONNECT, /* p2p connect supplicant */ WIFI_IDL_CBK_CMD_SUP_CONN_FAILED_EVENT, /* Wpa_supplicant client connection failure event */ diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.cpp b/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.cpp index 3b7213a..21b8bda 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.cpp @@ -86,6 +86,22 @@ void OnWpaSsidWrongKey(int status) } } +void onWpaConnectionFull(int status) +{ + const OHOS::Wifi::WifiEventCallback &cbk = OHOS::Wifi::WifiStaHalInterface::GetInstance().GetCallbackInst(); + if (cbk.onWpaConnectionFull) { + cbk.onWpaConnectionFull(status); + } +} + +void onWpaConnectionReject(int status) +{ + const OHOS::Wifi::WifiEventCallback &cbk = OHOS::Wifi::WifiStaHalInterface::GetInstance().GetCallbackInst(); + if (cbk.onWpaConnectionReject) { + cbk.onWpaConnectionReject(status); + } +} + void OnWpsOverlap(int status) { const OHOS::Wifi::WifiEventCallback &cbk = OHOS::Wifi::WifiStaHalInterface::GetInstance().GetCallbackInst(); diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.h b/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.h index 43e1a28..87fd7c4 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.h @@ -52,6 +52,8 @@ void OnWpaStateChanged(int status); void OnWpaSsidWrongKey(int status); void OnWpsOverlap(int status); void OnWpsTimeOut(int status); +void onWpaConnectionFull(int status); +void onWpaConnectionReject(int status); /** * @Description Get the Supplicant Rpc Client object. diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp index bfe168e..e5c106e 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp @@ -422,22 +422,11 @@ ErrCode WifiDeviceServiceImpl::ReConnect() return WIFI_OPT_STA_NOT_OPENED; } - if (!IsScanServiceRunning()) { - return WIFI_OPT_SCAN_NOT_OPENED; - } - - IScanService *pScanService = WifiServiceManager::GetInstance().GetScanServiceInst(); - if (pScanService == nullptr) { - return WIFI_OPT_SCAN_NOT_OPENED; - } - - IStaService *pStaService = WifiServiceManager::GetInstance().GetStaServiceInst(); - if (pStaService == nullptr) { + IStaService *pService = WifiServiceManager::GetInstance().GetStaServiceInst(); + if (pService == nullptr) { return WIFI_OPT_STA_NOT_OPENED; } - - pStaService->ClearDisabledBssidForReconnect(); - return pScanService->Scan(false); + return pService->ReConnect(); } ErrCode WifiDeviceServiceImpl::ReAssociate(void) diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher.cpp index b69efdc..0dd7dec 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher.cpp @@ -271,7 +271,7 @@ void WifiInternalEventDispatcher::DealStaCallbackMsg( WifiInternalEventDispatcher::PublishWifiStateChangedEvent(msg.msgData); break; case WIFI_CBK_MSG_CONNECTION_CHANGE: - WifiInternalEventDispatcher::PublishConnectionStateChangedEvent(msg.msgData, msg.linkInfo); + WifiInternalEventDispatcher::PublishConnStateChangedEvent(msg.msgData, msg.linkInfo); break; case WIFI_CBK_MSG_RSSI_CHANGE: WifiInternalEventDispatcher::PublishRssiValueChangedEvent(msg.msgData); @@ -499,46 +499,28 @@ void WifiInternalEventDispatcher::DealP2pCallbackMsg( return; } -void WifiInternalEventDispatcher::PublishConnectionStateChangedEvent(int state, const WifiLinkedInfo &info) +void WifiInternalEventDispatcher::PublishConnStateChangedEvent(int state, const WifiLinkedInfo &info) { std::string eventData = "Other"; switch (state) { - case int(OHOS::Wifi::ConnectionState::CONNECT_CONNECTING): + case int(OHOS::Wifi::ConnState::CONNECTING): eventData = "Connecting"; break; - case int(OHOS::Wifi::ConnectionState::CONNECT_OBTAINING_IP_FAILED): - eventData = "OBtaingIpFail"; + case int(OHOS::Wifi::ConnState::CONNECTED): + eventData = "ApConnected"; break; - case int(OHOS::Wifi::ConnectionState::CONNECT_AP_CONNECTED): - eventData = "ApConnecting"; + case int(OHOS::Wifi::ConnState::DISCONNECTING): + eventData = "Disconnecting"; break; - case int(OHOS::Wifi::ConnectionState::CONNECT_CHECK_PORTAL): - eventData = "Connecting"; - break; - case int(OHOS::Wifi::ConnectionState::CONNECT_NETWORK_ENABLED): - eventData = "NetworkEnabled"; - break; - case int(OHOS::Wifi::ConnectionState::CONNECT_NETWORK_DISABLED): - eventData = "NetworkDisabled"; - break; - case int(OHOS::Wifi::ConnectionState::DISCONNECT_DISCONNECTING): - eventData = "DisconnectDisconnecting"; - break; - case int(OHOS::Wifi::ConnectionState::DISCONNECT_DISCONNECTED): + case int(OHOS::Wifi::ConnState::DISCONNECTED): eventData = "Disconnected"; break; - case int(OHOS::Wifi::ConnectionState::CONNECT_PASSWORD_WRONG): - eventData = "ConnectPasswordWrong"; - break; - case int(OHOS::Wifi::ConnectionState::CONNECT_CONNECTING_TIMEOUT): - eventData = "ConnectingTimeout"; - break; default: { eventData = "UnknownState"; break; } } - if (!WifiCommonEventHelper::PublishConnectionStateChangedEvent(state, eventData)) { + if (!WifiCommonEventHelper::PublishConnStateChangedEvent(state, eventData)) { WIFI_LOGE("failed to publish connection state changed event!"); return; } diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher.h index db3ecec..721a86d 100755 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher.h @@ -118,7 +118,7 @@ private: static void DealHotspotCallbackMsg(WifiInternalEventDispatcher &pInstance, const WifiEventCallbackMsg &msg); static void DealP2pCallbackMsg(WifiInternalEventDispatcher &pInstance, const WifiEventCallbackMsg &msg); static void SendP2pCallbackMsg(sptr &callback, const WifiEventCallbackMsg &msg); - static void PublishConnectionStateChangedEvent(int state, const WifiLinkedInfo &info); + static void PublishConnStateChangedEvent(int state, const WifiLinkedInfo &info); static void PublishWifiStateChangedEvent(int state); static void PublishRssiValueChangedEvent(int state); private: diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp index ea429de..61f2263 100755 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp @@ -363,11 +363,15 @@ void WifiManager::DealStaCloseRes(OperateResState state) void WifiManager::DealStaConnChanged(OperateResState state, const WifiLinkedInfo &info) { - WifiEventCallbackMsg cbMsg; - cbMsg.msgCode = WIFI_CBK_MSG_CONNECTION_CHANGE; - cbMsg.msgData = static_cast(ConvertConnStateInternal(state)); - cbMsg.linkInfo = info; - WifiInternalEventDispatcher::GetInstance().AddBroadCastMsg(cbMsg); + bool isReport = true; + int reportStateNum = static_cast(ConvertConnStateInternal(state, isReport)); + if (isReport) { + WifiEventCallbackMsg cbMsg; + cbMsg.msgCode = WIFI_CBK_MSG_CONNECTION_CHANGE; + cbMsg.msgData = reportStateNum; + cbMsg.linkInfo = info; + WifiInternalEventDispatcher::GetInstance().AddBroadCastMsg(cbMsg); + } if (state == OperateResState::CONNECT_CONNECTING || state == OperateResState::CONNECT_AP_CONNECTED || state == OperateResState::DISCONNECT_DISCONNECTING || state == OperateResState::DISCONNECT_DISCONNECTED || diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn b/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn index c0c4bf6..caa661a 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn @@ -13,9 +13,6 @@ import("//build/ohos.gni") -#defines = [] -#defines += [ "OHOS_WIFI_SCAN_CONTROL_CLOSE" ] - ohos_shared_library("wifi_scan_service") { install_enable = true sources = [ diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp index 6128e29..e8cd672 100755 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp @@ -1985,20 +1985,12 @@ bool ScanService::AllowScanByIntervalFixed(int &fixedScanCount, time_t &fixedSca if (fixedScanCount == 0) { fixedScanCount++; fixedScanTime = now; - WIFI_LOGD("first scan, fixedScanTime:%{public}" PRId64 ", interval:%{public}d " - "count:%{public}d fixed return true.", - fixedScanTime, interval, count); return true; } /* The scanning interval is greater than interval, and counting is restarted. */ - - time_t timeExp = now - fixedScanTime; if (now - fixedScanTime >= interval) { fixedScanCount = 1; fixedScanTime = now; - WIFI_LOGD("interval>interval,fixedScanTime:%{public}" PRId64 ",interval:%{public}d " - "count:%{public}d,timeExp:%{public}" PRId64 ",return true.", - fixedScanTime, interval, count, timeExp); return true; } /* * @@ -2006,15 +1998,9 @@ bool ScanService::AllowScanByIntervalFixed(int &fixedScanCount, time_t &fixedSca * and the number of scan times exceeds count. */ if (fixedScanCount >= count) { - WIFI_LOGD(" fixedScanCount=%{public}d count=%{public}d,timeExp:%{public}" PRId64 ",return false.", - fixedScanCount, count, timeExp); return false; } fixedScanCount++; - WIFI_LOGD("normal " - "scan,fixedScanCount:%{public}d,fixedScanTime:%{public}" PRId64 ",interval:%{public}d," - "count:%{public}d,timeExp:%{public}" PRId64 ",return true.", - fixedScanCount, fixedScanTime, interval, count, timeExp); return true; } diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/ista_service.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/ista_service.h index 8534295..5e7dc36 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/ista_service.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/ista_service.h @@ -72,6 +72,12 @@ public: * @Return success: WIFI_OPT_SUCCESS fail: WIFI_OPT_FAILED */ virtual ErrCode Disconnect() = 0; + /** + * @Description ReConnect network + * + * @Return success: WIFI_OPT_SUCCESS fail: WIFI_OPT_FAILED + */ + virtual ErrCode ReConnect() = 0; /** * @Description ReAssociate network * @@ -120,12 +126,6 @@ public: * @return ErrCode - success: WIFI_OPT_SUCCESS fail: WIFI_OPT_FAILED */ virtual ErrCode DisableDeviceConfig(int networkId) = 0; - /** - * @Description Clear disabled bssid for reconnect - * - * @return ErrCode - success: WIFI_OPT_SUCCESS fail: WIFI_OPT_FAILED - */ - virtual ErrCode ClearDisabledBssidForReconnect() = 0; /** * @Description Start WPS Connection * diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_define.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_define.h index 7d899b1..0ee332c 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_define.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_define.h @@ -57,6 +57,8 @@ namespace Wifi { #define WIFI_SVR_CMD_STA_CONFIG_MULTIPLE_PBC_DETECTED 0x3015 #define WIFI_SVR_CMD_STA_WPA_STATE_CHANGE_EVENT 0x3016 #define WIFI_SVR_CMD_STA_WPA_PASSWD_WRONG_EVENT 0x3017 +#define WIFI_SVR_CMD_STA_WPA_FULL_CONNECT_EVENT 0x3018 +#define WIFI_SVR_CMD_STA_WPA_ASSOC_REJECT_EVENT 0x3019 #define WPA_BLOCK_LIST_CLEAR_EVENT 0x4001 diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.cpp index c7c04d6..2bdf289 100755 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.cpp @@ -97,6 +97,16 @@ ErrCode StaInterface::ConnectToDevice(const WifiDeviceConfig &config) return WIFI_OPT_SUCCESS; } +ErrCode StaInterface::ReConnect() +{ + LOGD("Enter StaInterface::ReConnect.\n"); + if (pStaService->ReConnect() != WIFI_OPT_SUCCESS) { + LOGD("ReConnect failed.\n"); + return WIFI_OPT_FAILED; + } + return WIFI_OPT_SUCCESS; +} + ErrCode StaInterface::ReAssociate() { LOGD("Enter StaInterface::ReAssociate.\n"); @@ -161,12 +171,6 @@ ErrCode StaInterface::DisableDeviceConfig(int networkId) return pStaService->DisableDeviceConfig(networkId); } -ErrCode StaInterface::ClearDisabledBssidForReconnect() -{ - LOGD("Enter StaInterface::ClearDisabledBssidForReconnect.\n"); - return pStaService->ClearDisabledBssidForReconnect(); -} - ErrCode StaInterface::StartWps(const WpsConfig &config) { LOGD("Enter StaInterface::StartWps.\n"); diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.h index a132e73..95fc940 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.h @@ -76,6 +76,12 @@ public: * @Return success: WIFI_OPT_SUCCESS fail: WIFI_OPT_FAILED */ virtual ErrCode Disconnect() override; + /** + * @Description ReConnect network + * + * @Return success: WIFI_OPT_SUCCESS fail: WIFI_OPT_FAILED + */ + virtual ErrCode ReConnect() override; /** * @Description ReAssociate network * @@ -124,12 +130,6 @@ public: * @return ErrCode - success: WIFI_OPT_SUCCESS fail: WIFI_OPT_FAILED */ virtual ErrCode DisableDeviceConfig(int networkId) override; - /** - * @Description Clear disabled bssid for reconnect - * - * @return ErrCode - success: WIFI_OPT_SUCCESS fail: WIFI_OPT_FAILED - */ - virtual ErrCode ClearDisabledBssidForReconnect() override; /** * @Description Start WPS Connection * diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp index fa20f67..3bf2772 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp @@ -40,7 +40,9 @@ ErrCode StaMonitor::InitStaMonitor() std::bind(&StaMonitor::OnWpaStateChangedCallBack, this, _1), std::bind(&StaMonitor::OnWpaSsidWrongKeyCallBack, this, _1), std::bind(&StaMonitor::OnWpsPbcOverlapCallBack, this, _1), - std::bind(&StaMonitor::OnWpsTimeOutCallBack, this, _1) + std::bind(&StaMonitor::OnWpsTimeOutCallBack, this, _1), + std::bind(&StaMonitor::onWpaConnectionFullCallBack, this, _1), + std::bind(&StaMonitor::onWpaConnectionRejectCallBack, this, _1) }; if (WifiStaHalInterface::GetInstance().RegisterStaEventCallback(callBack) != WIFI_IDL_OPT_OK) { @@ -118,8 +120,33 @@ void StaMonitor::OnWpaSsidWrongKeyCallBack(int status) return; } /* Notification state machine wpa password wrong event. */ - pStaStateMachine->SendMessage(WIFI_SVR_CMD_STA_WPA_PASSWD_WRONG_EVENT, status); + pStaStateMachine->SendMessage(WIFI_SVR_CMD_STA_WPA_PASSWD_WRONG_EVENT); } + +void StaMonitor::onWpaConnectionFullCallBack(int status) +{ + LOGI("OnWpaSsidWrongKeyCallBack() status:%d.\n", status); + if (pStaStateMachine == nullptr) { + WIFI_LOGE("The statemachine pointer is null."); + return; + } + + /* Notification state machine wpa password wrong event. */ + pStaStateMachine->SendMessage(WIFI_SVR_CMD_STA_WPA_FULL_CONNECT_EVENT); +} + +void StaMonitor::onWpaConnectionRejectCallBack(int status) +{ + LOGI("onWpsConnectionRejectCallBack() status:%d.\n", status); + if (pStaStateMachine == nullptr) { + WIFI_LOGE("The statemachine pointer is null."); + return; + } + + /* Notification state machine wpa password wrong event. */ + pStaStateMachine->SendMessage(WIFI_SVR_CMD_STA_WPA_ASSOC_REJECT_EVENT); +} + void StaMonitor::OnWpsPbcOverlapCallBack(int status) { WIFI_LOGI("OnWpsPbcOverlapCallBack() status:%{public}d\n", status); diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.h index 1c71714..d6b0667 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.h @@ -59,7 +59,6 @@ public: * @param status : status codes [in] * @param networkId - network id [in] * @param bssid - bssid of the network [in] - * @param pInstance - handles [in] */ void OnConnectChangedCallBack(int status, int networkId,const std::string &bssid); @@ -67,7 +66,6 @@ public: * @Description : Callback of the wpa state change event. * * @param status - status codes [in] - * @param pInstance - handles [in] */ void OnWpaStateChangedCallBack(int status); @@ -75,15 +73,27 @@ public: * @Description : Callback of the Wpa ssid wrong key event. * * @param status - status codes [in] - * @param pInstance - handles [in] */ void OnWpaSsidWrongKeyCallBack(int status); + /** + * @Description : Callback of the Connection Full event. + * + * @param status - status codes [in] + */ + void onWpaConnectionFullCallBack(int status); + + /** + * @Description : Callback of the Connection Refused event. + * + * @param status - status codes [in] + */ + void onWpaConnectionRejectCallBack(int status); + /** * @Description : Callback of the WPS_OVERLAP event. * * @param status - status codes [in] - * @param pInstance - handles [in] */ void OnWpsPbcOverlapCallBack(int status); @@ -91,7 +101,6 @@ public: * @Description : Callback of the WPS_TIMEOUT event. * * @param status - status codes [in] - * @param pInstance - handles [in] */ void OnWpsTimeOutCallBack(int status); diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check.cpp index 17852fb..bccbdad 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check.cpp @@ -119,7 +119,7 @@ bool StaNetworkCheck::HttpDetection() return true; } } - WIFI_LOGE("This network cant online!"); + WIFI_LOGE("This network can't online!"); if ((lastNetState != NETWORK_STATE_NOWORKING) && (isExitNetCheckThread == false) && (isStopNetCheck == false)) { netStateHandler(StaNetState::NETWORK_STATE_NOWORKING, ""); } @@ -204,4 +204,4 @@ void StaNetworkCheck::ExitNetCheckThread() } } } // namespace Wifi -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp index 6d002cc..080b493 100755 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp @@ -143,13 +143,6 @@ int StaService::AddDeviceConfig(const WifiDeviceConfig &config) const int StaService::UpdateDeviceConfig(const WifiDeviceConfig &config) const { - LOGI("Enter StaService::UpdateDeviceConfig.\n"); - WifiDeviceConfig tempDeviceConfig; - if (config.networkId <= INVALID_NETWORK_ID || - WifiSettings::GetInstance().GetDeviceConfig(config.networkId, tempDeviceConfig) != 0) { - LOGI("Update not exists network, id: %{public}d\n", config.networkId); - return INVALID_NETWORK_ID; - } return AddDeviceConfig(config); } @@ -231,8 +224,6 @@ ErrCode StaService::ReAssociate() const return WIFI_OPT_SUCCESS; } - - ErrCode StaService::EnableDeviceConfig(int networkId, bool attemptEnable) const { WIFI_LOGD("Enter StaService::EnableDeviceConfig! networkid is %{public}d", networkId); @@ -259,16 +250,6 @@ ErrCode StaService::DisableDeviceConfig(int networkId) const return WIFI_OPT_SUCCESS; } -ErrCode StaService::ClearDisabledBssidForReconnect() const -{ - WIFI_LOGD("Enter StaService::ClearDisabledBssidForReconnect\n"); - std::string lastSuccConnectBssid = WifiSettings::GetInstance().GetLastSuccConnectBssid(); - if (!lastSuccConnectBssid.empty()) { - pStaAutoConnectService->EnableOrDisableBssid(lastSuccConnectBssid, true, 0); - } - return WIFI_OPT_SUCCESS; -} - ErrCode StaService::Disconnect() const { WIFI_LOGI("Enter StaService::Disconnect.\n"); @@ -329,5 +310,11 @@ void StaService::RegisterStaServiceCallback(const StaServiceCallback &callbacks) pStaStateMachine->RegisterStaServiceCallback(callbacks); } +ErrCode StaService::ReConnect() const +{ + WIFI_LOGI("Enter StaService::ReConnect.\n"); + pStaStateMachine->SendMessage(WIFI_SVR_CMD_STA_RECONNECT_NETWORK); + return WIFI_OPT_SUCCESS; +} } // namespace Wifi } // namespace OHOS diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.h index ab6097f..bc00ccc 100755 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.h @@ -130,12 +130,6 @@ public: * @return ErrCode - success: WIFI_OPT_SUCCESS fail: WIFI_OPT_FAILED */ virtual ErrCode DisableDeviceConfig(int networkId) const; - /** - * @Description Clear disabled bssid before reconnect. - * - * @return ErrCode - success: WIFI_OPT_SUCCESS fail: WIFI_OPT_FAILED - */ - virtual ErrCode ClearDisabledBssidForReconnect() const; /** * @Description Start WPS Connection * @@ -176,6 +170,12 @@ public: */ virtual void RegisterStaServiceCallback(const StaServiceCallback &callbacks) const; + /** + * @Description Reconnect network + * + * @Return success: WIFI_OPT_SUCCESS fail: WIFI_OPT_FAILED + */ + virtual ErrCode ReConnect() const; private: StaStateMachine *pStaStateMachine; diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp index 79acbe3..d0a901e 100755 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp @@ -43,7 +43,6 @@ StaStateMachine::StaStateMachine() targetNetworkId(INVALID_NETWORK_ID), pinCode(0), wpsState(SetupMethod::INVALID), - lastConnectToNetworkTimer(-1), lastSignalLevel(-1), targetRoamBssid(WPA_BSSID_ANY), currentTpType(IPTYPE_IPV4), @@ -611,9 +610,12 @@ int StaStateMachine::InitStaSMHandleMap() staSmHandleFuncMap[WIFI_SVR_CMD_STA_STARTWPS] = &StaStateMachine::DealStartWpsCmd; staSmHandleFuncMap[WIFI_SVR_CMD_STA_WPS_TIMEOUT_EVNET] = &StaStateMachine::DealWpsConnectTimeOutEvent; staSmHandleFuncMap[WIFI_SVR_CMD_STA_CANCELWPS] = &StaStateMachine::DealCancelWpsCmd; + staSmHandleFuncMap[WIFI_SVR_CMD_STA_RECONNECT_NETWORK] = &StaStateMachine::DealReConnectCmd; staSmHandleFuncMap[WIFI_SVR_CMD_STA_REASSOCIATE_NETWORK] = &StaStateMachine::DealReassociateCmd; staSmHandleFuncMap[WIFI_SVR_COM_STA_START_ROAM] = &StaStateMachine::DealStartRoamCmd; - staSmHandleFuncMap[WIFI_SVR_CMD_STA_WPA_PASSWD_WRONG_EVENT] = &StaStateMachine::DealWpaWrongPskEvent; + staSmHandleFuncMap[WIFI_SVR_CMD_STA_WPA_PASSWD_WRONG_EVENT] = &StaStateMachine::DealWpaLinkFailEvent; + staSmHandleFuncMap[WIFI_SVR_CMD_STA_WPA_FULL_CONNECT_EVENT] = &StaStateMachine::DealWpaLinkFailEvent; + staSmHandleFuncMap[WIFI_SVR_CMD_STA_WPA_ASSOC_REJECT_EVENT] = &StaStateMachine::DealWpaLinkFailEvent; return WIFI_OPT_SUCCESS; } @@ -751,6 +753,7 @@ void StaStateMachine::DealConnectTimeOutCmd(InternalMessage *msg) DisableNetwork(targetNetworkId); InitWifiLinkedInfo(); + SaveLinkstate(ConnState::DISCONNECTED, DetailedState::CONNECTION_TIMEOUT); WifiSettings::GetInstance().SaveLinkedInfo(linkedInfo); staCallback.OnStaConnChanged(OperateResState::CONNECT_CONNECTING_TIMEOUT, linkedInfo); staCallback.OnStaConnChanged(OperateResState::DISCONNECT_DISCONNECTED, linkedInfo); @@ -823,17 +826,52 @@ void StaStateMachine::DealDisconnectEvent(InternalMessage *msg) return; } -void StaStateMachine::DealWpaWrongPskEvent(InternalMessage *msg) +void StaStateMachine::DealWpaLinkFailEvent(InternalMessage *msg) { + LOGD("enter DealWpaLinkFailEvent.\n"); if (msg == nullptr) { - WIFI_LOGE("msg is null\n"); + LOGE("msg is null.\n"); } - WIFI_LOGD("enter DealWpaWrongPskEvent\n"); + StopTimer(static_cast(CMD_NETWORK_CONNECT_TIMEOUT)); InitWifiLinkedInfo(); WifiSettings::GetInstance().SaveLinkedInfo(linkedInfo); - WifiSettings::GetInstance().SetDeviceState(targetNetworkId, (int)WifiDeviceConfigStatus::DISABLED); - WifiSettings::GetInstance().SyncDeviceConfig(); - staCallback.OnStaConnChanged(OperateResState::CONNECT_PASSWORD_WRONG, linkedInfo); + if (msg->GetMessageName() == WIFI_SVR_CMD_STA_WPA_PASSWD_WRONG_EVENT) { + SaveLinkstate(ConnState::DISCONNECTED, DetailedState::PASSWORD_ERROR); + staCallback.OnStaConnChanged(OperateResState::CONNECT_PASSWORD_WRONG, linkedInfo); + } else if (msg->GetMessageName() == WIFI_SVR_CMD_STA_WPA_FULL_CONNECT_EVENT) { + DisableNetwork(targetNetworkId); + SaveLinkstate(ConnState::DISCONNECTED, DetailedState::CONNECTION_FULL); + staCallback.OnStaConnChanged(OperateResState::CONNECT_CONNECTION_FULL, linkedInfo); + staCallback.OnStaConnChanged(OperateResState::DISCONNECT_DISCONNECTED, linkedInfo); + } else if (msg->GetMessageName() == WIFI_SVR_CMD_STA_WPA_ASSOC_REJECT_EVENT) { + DisableNetwork(targetNetworkId); + SaveLinkstate(ConnState::DISCONNECTED, DetailedState::CONNECTION_REJECT); + staCallback.OnStaConnChanged(OperateResState::CONNECT_CONNECTION_REJECT, linkedInfo); + staCallback.OnStaConnChanged(OperateResState::DISCONNECT_DISCONNECTED, linkedInfo); + } +} + +void StaStateMachine::DealReConnectCmd(InternalMessage *msg) +{ + LOGD("enter DealReConnectCmd.\n"); + if (msg == nullptr) { + WIFI_LOGE("msg is null\n"); + } + + if (linkedInfo.connState == ConnState::CONNECTED) { + WIFI_LOGE("Network is already connected, ignore the re-connect comand!\n"); + return; + } + + if (WifiStaHalInterface::GetInstance().Reconnect() == WIFI_IDL_OPT_OK) { + WIFI_LOGD("StaStateMachine ReConnect successfully!"); + /* Callback result to InterfaceService */ + staCallback.OnStaConnChanged(OperateResState::CONNECT_CONNECTING, linkedInfo); + StopTimer(static_cast(CMD_NETWORK_CONNECT_TIMEOUT)); + StartTimer(static_cast(CMD_NETWORK_CONNECT_TIMEOUT), STA_NETWORK_CONNECTTING_DELAY); + } else { + WIFI_LOGE("ReConnect failed!"); + } } void StaStateMachine::DealReassociateCmd(InternalMessage *msg) @@ -843,16 +881,10 @@ void StaStateMachine::DealReassociateCmd(InternalMessage *msg) WIFI_LOGE("msg is null\n"); } - /* Obtains the current system time, assigns the timestamp of the last - * connection attempt, and prohibits scanning requests within 10 seconds. - */ - lastConnectToNetworkTimer = static_cast(WifiSettings::GetInstance().GetUserLastSelectedNetworkTimeVal()); - WIFI_LOGD("the last time connect to network is %{public}d", lastConnectToNetworkTimer); - if (WifiStaHalInterface::GetInstance().Reassociate() == WIFI_IDL_OPT_OK) { /* Callback result to InterfaceService */ staCallback.OnStaConnChanged(OperateResState::CONNECT_ASSOCIATING, linkedInfo); - WIFI_LOGD("StaStateMachine::LinkState::ExecuteStateMsg ReAssociate successfully!"); + WIFI_LOGD("StaStateMachine ReAssociate successfully!"); StopTimer(static_cast(CMD_NETWORK_CONNECT_TIMEOUT)); StartTimer(static_cast(CMD_NETWORK_CONNECT_TIMEOUT), STA_NETWORK_CONNECTTING_DELAY); } else { @@ -1352,12 +1384,12 @@ void StaStateMachine::DisConnectProcess() WIFI_LOGI("Disconnect() succeed!"); /* Save connection information to WifiSettings. */ SaveLinkstate(ConnState::DISCONNECTED, DetailedState::DISCONNECTED); - DisableNetwork(linkedInfo.networkId); /* The current state of StaStateMachine transfers to SeparatedState. */ SwitchState(pSeparatedState); } else { + SaveLinkstate(ConnState::DISCONNECTING, DetailedState::FAILED); staCallback.OnStaConnChanged(OperateResState::DISCONNECT_DISCONNECT_FAILED, linkedInfo); WIFI_LOGE("Disconnect() failed!"); } @@ -1401,6 +1433,7 @@ bool StaStateMachine::StaWpsState::ExecuteStateMsg(InternalMessage *msg) pStaStateMachine->ConnectToNetworkProcess(msg); pStaStateMachine->SyncAllDeviceConfigs(); /* Callback result to InterfaceService. */ + pStaStateMachine->SaveLinkstate(ConnState::CONNECTING, DetailedState::OBTAINING_IPADDR); pStaStateMachine->staCallback.OnStaConnChanged(OperateResState::CONNECT_OBTAINING_IP, pStaStateMachine->linkedInfo); pStaStateMachine->SwitchState(pStaStateMachine->pGetIpState); @@ -1531,6 +1564,7 @@ void StaStateMachine::GetIpState::GoInState() if ((dhcpRet != 0) || (pStaStateMachine->pDhcpService->GetDhcpResult( IF_NAME, pStaStateMachine->pDhcpResultNotify, DHCP_TIME) != 0)) { LOGE(" Dhcp connection failed.\n"); + pStaStateMachine->SaveLinkstate(ConnState::DISCONNECTED, DetailedState::OBTAINING_IPADDR_FAIL); pStaStateMachine->staCallback.OnStaConnChanged( OperateResState::CONNECT_OBTAINING_IP_FAILED, pStaStateMachine->linkedInfo); if (!pStaStateMachine->isRoam) { @@ -1761,7 +1795,7 @@ void StaStateMachine::ConnectToNetworkProcess(InternalMessage *msg) lastLinkedInfo.macAddress = deviceConfig.macAddress; lastLinkedInfo.ifHiddenSSID = deviceConfig.hiddenSSID; SetWifiLinkedInfo(lastNetworkId); - SaveLinkstate(ConnState::OBTAINING_IPADDR, DetailedState::OBTAINING_IPADDR); + SaveLinkstate(ConnState::CONNECTING, DetailedState::OBTAINING_IPADDR); } void StaStateMachine::SetWifiLinkedInfo(int networkId) @@ -1797,7 +1831,7 @@ void StaStateMachine::SetWifiLinkedInfo(int networkId) linkedInfo.ssid = config.ssid; linkedInfo.bssid = config.bssid; linkedInfo.band = config.band; - linkedInfo.connState = ConnState::OBTAINING_IPADDR; + linkedInfo.connState = ConnState::CONNECTING; linkedInfo.ifHiddenSSID = config.hiddenSSID; linkedInfo.detailedState = DetailedState::OBTAINING_IPADDR; @@ -1805,7 +1839,7 @@ void StaStateMachine::SetWifiLinkedInfo(int networkId) lastLinkedInfo.ssid = config.ssid; lastLinkedInfo.bssid = config.bssid; lastLinkedInfo.band = config.band; - lastLinkedInfo.connState = ConnState::OBTAINING_IPADDR; + lastLinkedInfo.connState = ConnState::CONNECTING; lastLinkedInfo.ifHiddenSSID = config.hiddenSSID; lastLinkedInfo.detailedState = DetailedState::OBTAINING_IPADDR; } @@ -1859,16 +1893,16 @@ void StaStateMachine::DhcpResultNotify::OnSuccess(int status, const std::string } IfConfig::GetInstance().SetIfAddr(result, result.iptype); - } - if (pStaStateMachine->getIpSucNum == 0 || pStaStateMachine->isRoam) { - pStaStateMachine->SaveLinkstate(ConnState::CONNECTED, DetailedState::CONNECTED); - pStaStateMachine->staCallback.OnStaConnChanged( - OperateResState::CONNECT_AP_CONNECTED, pStaStateMachine->linkedInfo); - /* Wait for the network adapter information to take effect. */ - sleep(SLEEPTIME); + if (pStaStateMachine->getIpSucNum == 0 || pStaStateMachine->isRoam) { + pStaStateMachine->SaveLinkstate(ConnState::CONNECTED, DetailedState::CONNECTED); + pStaStateMachine->staCallback.OnStaConnChanged( + OperateResState::CONNECT_AP_CONNECTED, pStaStateMachine->linkedInfo); + /* Wait for the network adapter information to take effect. */ + sleep(SLEEPTIME); /* Check whether the Internet access is normal by send http. */ pStaStateMachine->pNetcheck->SignalNetCheckThread(); + } } pStaStateMachine->getIpSucNum++; return; @@ -1888,14 +1922,20 @@ void StaStateMachine::DhcpResultNotify::OnFailed(int status, const std::string & pStaStateMachine->staCallback.OnStaConnChanged(OperateResState::CONNECT_OBTAINING_IP_FAILED, pStaStateMachine->linkedInfo); pStaStateMachine->DisConnectProcess(); + pStaStateMachine->SaveLinkstate(ConnState::DISCONNECTED, DetailedState::OBTAINING_IPADDR_FAIL); } } else { pStaStateMachine->staCallback.OnStaConnChanged( OperateResState::CONNECT_OBTAINING_IP_FAILED, pStaStateMachine->linkedInfo); if (!pStaStateMachine->isRoam) { pStaStateMachine->DisConnectProcess(); + pStaStateMachine->SaveLinkstate(ConnState::DISCONNECTED, DetailedState::OBTAINING_IPADDR_FAIL); } else { - pStaStateMachine->SaveLinkstate(ConnState::CONNECTED, DetailedState::CONNECTED); + if (!pStaStateMachine->isRoam) { + pStaStateMachine->DisConnectProcess(); + } else { + pStaStateMachine->SaveLinkstate(ConnState::CONNECTED, DetailedState::CONNECTED); + } } } pStaStateMachine->getIpFailNum++; diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h index 35bc332..53aa254 100755 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h @@ -38,13 +38,13 @@ constexpr int STA_CAN_ONLY_WITH_WIFI_OFF_MODE = 3; constexpr int STA_DISABLED_MODE = 4; constexpr int CMD_NETWORK_CONNECT_TIMEOUT = 0X01; -constexpr int STA_NETWORK_CONNECTTING_DELAY = 60 * 1000; +constexpr int STA_NETWORK_CONNECTTING_DELAY = 30 * 1000; constexpr int CMD_SIGNAL_POLL = 0X02; constexpr int STA_SIGNAL_POLL_DELAY = 3 * 1000; /* pincode length */ -constexpr int PIN_CODE_LEN = 8; +constexpr int PIN_CODE_LEN = 8; /* DHCP timeout interval */ constexpr int DHCP_TIME = 15; @@ -558,6 +558,12 @@ private: * @param msg - Message body received by the state machine[in] */ void DealCancelWpsCmd(InternalMessage *msg); + /** + * @Description Reconnect network + * + * @param msg - Message body received by the state machine[in] + */ + void DealReConnectCmd(InternalMessage *msg); /** * @Description Operations after the Reassociate lead is issued * @@ -575,7 +581,7 @@ private: * * @param msg - Message body received by the state machine[in] */ - void DealWpaWrongPskEvent(InternalMessage *msg); + void DealWpaLinkFailEvent(InternalMessage *msg); /** * @Description Wps mode is ON * @@ -617,8 +623,6 @@ private: int targetNetworkId; int pinCode; SetupMethod wpsState; - /* Time stamp of the last attempt to connect to the network. */ - int lastConnectToNetworkTimer; int lastSignalLevel; std::string targetRoamBssid; int currentTpType; diff --git a/services/wifi_standard/wifi_hal/wifi_hal_callback.c b/services/wifi_standard/wifi_hal/wifi_hal_callback.c index ede9dfb..2a2bfa9 100644 --- a/services/wifi_standard/wifi_hal/wifi_hal_callback.c +++ b/services/wifi_standard/wifi_hal/wifi_hal_callback.c @@ -103,6 +103,34 @@ void WifiHalCbNotifyWrongKey(int status) return; } +void WifiHalCbNotifyConnectionFull(int status) +{ + LOGD("connection is full, state: %d, and begin push notify message", status); + WifiHalEventCallbackMsg *pCbkMsg = (WifiHalEventCallbackMsg *)calloc(1, sizeof(WifiHalEventCallbackMsg)); + if (pCbkMsg == NULL) { + LOGE("create callback message failed!"); + return; + } + + pCbkMsg->msg.connMsg.status = status; + EmitEventCallbackMsg(pCbkMsg, WIFI_CONNECTION_FULL_EVENT); + return; +} + +void WifiHalCbNotifyConnectionReject(int status) +{ + LOGD("connection is eeject, state: %d, and begin push notify message", status); + WifiHalEventCallbackMsg *pCbkMsg = (WifiHalEventCallbackMsg *)calloc(1, sizeof(WifiHalEventCallbackMsg)); + if (pCbkMsg == NULL) { + LOGE("create callback message failed!"); + return; + } + + pCbkMsg->msg.connMsg.status = status; + EmitEventCallbackMsg(pCbkMsg, WIFI_CONNECTION_REJECT_EVENT); + return; +} + void WifiHalCbNotifyWpsOverlap(int event) { LOGD("wps overlap, state: %{public}d, and begin push notify message", event); diff --git a/services/wifi_standard/wifi_hal/wifi_hal_callback.h b/services/wifi_standard/wifi_hal/wifi_hal_callback.h index 4f2d85d..d79c5d8 100644 --- a/services/wifi_standard/wifi_hal/wifi_hal_callback.h +++ b/services/wifi_standard/wifi_hal/wifi_hal_callback.h @@ -48,6 +48,21 @@ void WifiHalCbNotifyWpaStateChange(int status); * @param status */ void WifiHalCbNotifyWrongKey(int status); + +/** + * @Description Wi-Fi Hal callback notification connection full + * + * @param status + */ +void WifiHalCbNotifyConnectionFull(int status); + +/** + * @Description Wi-Fi Hal callback notification connection reject + * + * @param status + */ +void WifiHalCbNotifyConnectionReject(int status); + /** * @Description Wi-Fi Hal callback notification WPS overlaps. * diff --git a/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.c b/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.c index 58bdbb8..870aef2 100644 --- a/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.c +++ b/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.c @@ -497,6 +497,8 @@ static void DealStaApCallback(int event, Context *context) case WIFI_SSID_WRONG_KEY: case WIFI_WPS_OVERLAP: case WIFI_WPS_TIME_OUT: + case WIFI_CONNECTION_FULL_EVENT: + case WIFI_CONNECTION_REJECT_EVENT: DealConnectWpsResultCbk(event, context); break; case WIFI_CONNECT_CHANGED_NOTIFY_EVENT: diff --git a/services/wifi_standard/wifi_hal/wifi_hal_define.h b/services/wifi_standard/wifi_hal/wifi_hal_define.h index bc4d779..3a358cd 100644 --- a/services/wifi_standard/wifi_hal/wifi_hal_define.h +++ b/services/wifi_standard/wifi_hal/wifi_hal_define.h @@ -80,6 +80,8 @@ typedef enum WifiHalEvent { WIFI_AP_DISABLE_EVENT, /* AP closure notification. */ WIFI_WPA_STATE_EVENT, /* WPA status change. */ WIFI_SSID_WRONG_KEY, /* Incorrect password. */ + WIFI_CONNECTION_FULL_EVENT, /* connection is full */ + WIFI_CONNECTION_REJECT_EVENT, /* connection reject */ WIFI_WPS_OVERLAP, /* wps pbc overlap */ WIFI_WPS_TIME_OUT, /* wps connect time out */ WIFI_P2P_SUP_CONNECTION_EVENT, /* Connection result of the wpa_supplicant client */ diff --git a/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c b/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c index 380c385..4614a33 100644 --- a/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c +++ b/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c @@ -46,6 +46,8 @@ #define WPA_CB_DISCONNECTED 2 #define WPS_EVENT_PBC_OVERLAP "WPS-OVERLAP-DETECTED PBC session overlap" #define REPLY_BUF_LENGTH 4096 +#define CONNECTION_FULL_STATUS 17 +#define CONNECTION_REJECT_STATUS 37 static WifiWpaInterface *g_wpaInterface = NULL; @@ -550,6 +552,17 @@ static void WpaCallBackFuncTwo(const char *p) WifiHalCbNotifyWpsOverlap(1); } else if (strncmp(p, WPS_EVENT_TIMEOUT, strlen(WPS_EVENT_TIMEOUT)) == 0) { WifiHalCbNotifyWpsTimeOut(1); + } else if (strncmp(p, WPA_EVENT_AUTH_REJECT, strlen(WPA_EVENT_AUTH_REJECT)) == 0) { + char *connectionStatus = strstr(p, "status_code="); + if (connectionStatus != NULL) { + connectionStatus += strlen("status_code="); + int status = atoi(connectionStatus); + if (status == CONNECTION_FULL_STATUS) { + WifiHalCbNotifyConnectionFull(status); + } else if (status == CONNECTION_REJECT_STATUS) { + WifiHalCbNotifyConnectionReject(status); + } + } } return; } diff --git a/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c b/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c index 5b9b6c4..b848cf6 100644 --- a/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c +++ b/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c @@ -21,7 +21,7 @@ #include "wifi_supplicant_hal.h" #undef LOG_TAG -#define LOG_TAG "WifHalStaInterface" +#define LOG_TAG "WifiHalStaInterface" #define BUFF_SIZE 1024 #define WPA_CMD_STOP_LENG 64 #define WPA_TRY_CONNECT_SLEEP_TIME (100 * 1000) /* 100ms */ @@ -48,7 +48,6 @@ static int ExcuteStaCmd(const char *szCmd) return -1; } - static WifiErrorNo AddWpaIface(int staNo) { WifiWpaInterface *pWpaInterface = GetWifiWapGlobalInterface(); diff --git a/tests/wifi_standard/wifi_framework/common/unittest/wifi_global_func_test.cpp b/tests/wifi_standard/wifi_framework/common/unittest/wifi_global_func_test.cpp index f5e715a..32b8b04 100644 --- a/tests/wifi_standard/wifi_framework/common/unittest/wifi_global_func_test.cpp +++ b/tests/wifi_standard/wifi_framework/common/unittest/wifi_global_func_test.cpp @@ -133,33 +133,15 @@ HWTEST_F(WifiGlobalFuncTest, CheckMacIsValid, TestSize.Level1) HWTEST_F(WifiGlobalFuncTest, ConvertConnStateInternalTest, TestSize.Level1) { - EXPECT_TRUE(ConvertConnStateInternal(OperateResState::CONNECT_CONNECTING) == ConnectionState::CONNECT_CONNECTING); + bool isReport = true; + EXPECT_TRUE(ConvertConnStateInternal(OperateResState::CONNECT_CONNECTING, isReport) == ConnState::CONNECTING); EXPECT_TRUE( - ConvertConnStateInternal(OperateResState::CONNECT_AP_CONNECTED) == ConnectionState::CONNECT_AP_CONNECTED); - EXPECT_TRUE( - ConvertConnStateInternal(OperateResState::CONNECT_CHECK_PORTAL) == ConnectionState::CONNECT_CHECK_PORTAL); - EXPECT_TRUE( - ConvertConnStateInternal(OperateResState::CONNECT_NETWORK_ENABLED) == ConnectionState::CONNECT_NETWORK_ENABLED); - EXPECT_TRUE(ConvertConnStateInternal(OperateResState::CONNECT_NETWORK_DISABLED) == - ConnectionState::CONNECT_NETWORK_DISABLED); - EXPECT_TRUE(ConvertConnStateInternal(OperateResState::DISCONNECT_DISCONNECTING) == - ConnectionState::DISCONNECT_DISCONNECTING); - EXPECT_TRUE(ConvertConnStateInternal(OperateResState::DISCONNECT_DISCONNECT_FAILED) == - ConnectionState::DISCONNECT_DISCONNECT_FAILED); - EXPECT_TRUE( - ConvertConnStateInternal(OperateResState::DISCONNECT_DISCONNECTED) == ConnectionState::DISCONNECT_DISCONNECTED); - EXPECT_TRUE( - ConvertConnStateInternal(OperateResState::CONNECT_PASSWORD_WRONG) == ConnectionState::CONNECT_PASSWORD_WRONG); - EXPECT_TRUE(ConvertConnStateInternal(OperateResState::CONNECT_CONNECTING_TIMEOUT) == - ConnectionState::CONNECT_CONNECTING_TIMEOUT); - EXPECT_TRUE(ConvertConnStateInternal(OperateResState::CONNECT_OBTAINING_IP_FAILED) == - ConnectionState::CONNECT_OBTAINING_IP_FAILED); - EXPECT_TRUE(ConvertConnStateInternal(OperateResState::CONNECT_ASSOCIATING) == ConnectionState::CONNECT_ASSOCIATING); - EXPECT_TRUE(ConvertConnStateInternal(OperateResState::CONNECT_ASSOCIATED) == ConnectionState::CONNECT_ASSOCIATED); - EXPECT_TRUE(ConvertConnStateInternal(OperateResState::OPEN_WIFI_SUCCEED) == ConnectionState::UNKNOWN); + ConvertConnStateInternal(OperateResState::CONNECT_AP_CONNECTED, isReport) == ConnState::CONNECTED); + + EXPECT_TRUE(ConvertConnStateInternal(OperateResState::DISCONNECT_DISCONNECTING, isReport) == + ConnState::DISCONNECTING); EXPECT_TRUE( - ConvertConnStateInternal(OperateResState::CONNECT_OBTAINING_IP) == ConnectionState::CONNECT_OBTAINING_IP); - EXPECT_TRUE(ConvertConnStateInternal(OperateResState::CONNECT_SELECT_NETWORK_FAILED) == ConnectionState::UNKNOWN); + ConvertConnStateInternal(OperateResState::DISCONNECT_DISCONNECTED, isReport) == ConnState::DISCONNECTED); } HWTEST_F(WifiGlobalFuncTest, SplitStringTest, TestSize.Level1) diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service_test.cpp b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service_test.cpp index 929ed86..41f953e 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service_test.cpp +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service_test.cpp @@ -1195,9 +1195,9 @@ void StaAutoConnectServiceTest::RoamingSelectionSuccess1() info.connState = ConnState::CONNECTED; scanInfos[0].securityType = WifiSecurity::WEP; scanInfos[0].rssi = 8; - scanInfos[0].ssid = "huawei"; + scanInfos[0].ssid = "ohos"; scanInfos[0].bssid = "2a:76:93:47:e2:8e"; - info.ssid = "huawei"; + info.ssid = "ohos"; info.bssid = "2a:76:93:47:e2:8b"; info.rssi = 1; int indexType = DEVICE_CONFIG_INDEX_SSID; diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine_test.cpp b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine_test.cpp index 3bcf99e..99f252e 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine_test.cpp +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine_test.cpp @@ -452,7 +452,7 @@ public: EXPECT_CALL(WifiSettings::GetInstance(), SaveLinkedInfo(_)).Times(testing::AtLeast(0)); EXPECT_CALL(WifiManager::GetInstance(), DealStaConnChanged(_, _)).Times(testing::AtLeast(0)); InternalMessage msg; - pStaStateMachine->DealWpaWrongPskEvent(&msg); + pStaStateMachine->DealWpaLinkFailEvent(&msg); } void DealWpaWrongPskEventFail() @@ -460,7 +460,7 @@ public: EXPECT_CALL(WifiSettings::GetInstance(), SaveLinkedInfo(_)).Times(testing::AtLeast(0)); EXPECT_CALL(WifiManager::GetInstance(), DealStaConnChanged(_, _)).Times(testing::AtLeast(0)); InternalMessage msg; - pStaStateMachine->DealWpaWrongPskEvent(nullptr); + pStaStateMachine->DealWpaLinkFailEvent(nullptr); } void DealReassociateCmdSuccess() -- Gitee From e8c2022c091a172b50f95d62639467c95d3a19c9 Mon Sep 17 00:00:00 2001 From: z00588131 Date: Thu, 23 Dec 2021 08:08:56 +0000 Subject: [PATCH 017/491] fix(*): 1. update d.ts file; Signed-off-by: z00588131 --- interfaces/kits/jskits/@ohos.wifi.d.ts | 66 +++++++++++++------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/interfaces/kits/jskits/@ohos.wifi.d.ts b/interfaces/kits/jskits/@ohos.wifi.d.ts index 75f0040..760c5f0 100755 --- a/interfaces/kits/jskits/@ohos.wifi.d.ts +++ b/interfaces/kits/jskits/@ohos.wifi.d.ts @@ -136,7 +136,7 @@ declare namespace wifi { * Obtains information about a Wi-Fi connection. * * @return Returns the Wi-Fi connection information. - * @since 8 + * @since 7 */ function getLinkedInfo(): Promise; function getLinkedInfo(callback: AsyncCallback): void; @@ -145,7 +145,7 @@ declare namespace wifi { * Checks whether a Wi-Fi connection has been set up. * * @return Returns {@code true} if a Wi-Fi connection has been set up; returns {@code false} otherwise. - * @since 8 + * @since 7 */ function isConnected(): boolean; @@ -155,7 +155,7 @@ declare namespace wifi { *

To check whether this device supports a specified feature. * * @return Returns the features supported by this device. - * @since 8 + * @since 7 * @systemapi Hide this for inner system use. */ function getSupportedFeatures(): number; @@ -165,7 +165,7 @@ declare namespace wifi { * * @param featureId Indicates the ID of the feature. * @return Returns {@code true} if this device supports the specified feature; returns {@code false} otherwise. - * @since 8 + * @since 7 */ function isFeatureSupported(featureId: number): boolean; @@ -175,7 +175,7 @@ declare namespace wifi { *

The MAC address is unique and cannot be changed. * * @return Returns the MAC address of the Wi-Fi device. - * @since 8 + * @since 7 * @systemapi Hide this for inner system use. */ function getDeviceMacAddress(): string[]; @@ -186,7 +186,7 @@ declare namespace wifi { *

The IP information includes the host IP address, gateway address, and DNS information. * * @return Returns the IP information of the Wi-Fi connection. - * @since 8 + * @since 7 */ function getIpInfo(): IpInfo; @@ -194,7 +194,7 @@ declare namespace wifi { * Obtains the country code of this device. * * @return Returns the country code of this device. - * @since 8 + * @since 7 */ function getCountryCode(): string; @@ -202,7 +202,7 @@ declare namespace wifi { * Re-associates to current network. * * @return {@code true} if the Wi-Fi network is re-associate successfully. - * @since 8 + * @since 7 * @systemapi Hide this for inner system use. */ function reassociate(): boolean; @@ -211,7 +211,7 @@ declare namespace wifi { * Re-connects to current network. * * @return {@code true} if the Wi-Fi network is re-connect successfully. - * @since 8 + * @since 7 * @systemapi Hide this for inner system use. */ function reconnect(): boolean; @@ -222,7 +222,7 @@ declare namespace wifi { *

You can obtain only the Wi-Fi configurations you created on your own application. * * @return Returns the list of all existing Wi-Fi configurations you created on your application. - * @since 8 + * @since 7 * @systemapi Hide this for inner system use. */ function getDeviceConfigs(): Array; @@ -234,7 +234,7 @@ declare namespace wifi { * * @return Returns the network ID in the updated Wi-Fi configuration if the update is successful; * returns {@code -1} if the specified Wi-Fi configuration is not contained in the list. - * @since 8 + * @since 7 * @systemapi Hide this for inner system use. */ function updateNetwork(config: WifiDeviceConfig): number; @@ -246,7 +246,7 @@ declare namespace wifi { * * @param netId Identifies the network to disable. * @return Returns {@code true} if the specified network is disabled; returns {@code false} otherwise. - * @since 8 + * @since 7 * @systemapi Hide this for inner system use. */ function disableNetwork(netId: number): boolean; @@ -256,7 +256,7 @@ declare namespace wifi { * * @return Returns {@code true} if all the saved Wi-Fi configurations are removed; * returns {@code false} otherwise. - * @since 8 + * @since 7 * @systemapi Hide this for inner system use. */ function removeAllNetwork(): boolean; @@ -271,7 +271,7 @@ declare namespace wifi { * @param id Indicates the ID of the Wi-Fi network, * which can be obtained using the {@link #addDeviceConfig} or {@link #getLinkedInfo} method. * @return Returns {@code true} if the Wi-Fi network is deleted successfully; returns {@code false} otherwise. - * @since 8 + * @since 7 * @systemapi Hide this for inner system use. */ function removeDevice(id: number): boolean; @@ -282,7 +282,7 @@ declare namespace wifi { *

This method is asynchronous. After the Wi-Fi hotspot is enabled, Wi-Fi may be disabled. * * @return Returns {@code true} if this method is called successfully; returns {@code false} otherwise. - * @since 8 + * @since 7 * @systemapi Hide this for inner system use. */ function enableHotspot(): boolean; @@ -293,7 +293,7 @@ declare namespace wifi { *

This method is asynchronous. If Wi-Fi is enabled after the Wi-Fi hotspot is disabled, Wi-Fi may be re-enabled. * * @return Returns {@code true} if this method is called successfully; returns {@code false} otherwise. - * @since 8 + * @since 7 * @systemapi Hide this for inner system use. */ function disableHotspot(): boolean; @@ -302,7 +302,7 @@ declare namespace wifi { * Checks whether Wi-Fi hotspot is active on a device. * * @return Returns {@code true} if Wi-Fi hotspot is enabled; returns {@code false} otherwise. - * @since 8 + * @since 7 * @systemapi Hide this for inner system use. */ function isHotspotActive(): boolean; @@ -316,7 +316,7 @@ declare namespace wifi { * The SSID and {@code securityType} must be available and correct. * If {@code securityType} is not {@code open}, {@code preSharedKey} must be available and correct. * @return Returns {@code true} if the method is called successfully; returns {@code false} otherwise. - * @since 8 + * @since 7 * @systemapi Hide this for inner system use. */ function setHotspotConfig(config: HotspotConfig): boolean; @@ -325,7 +325,7 @@ declare namespace wifi { * Obtains the Wi-Fi hotspot configuration. * * @return Returns the configuration of an existing or enabled Wi-Fi hotspot. - * @since 8 + * @since 7 * @systemapi Hide this for inner system use. */ function getHotspotConfig(): HotspotConfig; @@ -336,7 +336,7 @@ declare namespace wifi { *

This method can only be used on a device that serves as a Wi-Fi hotspot. * * @return Returns the list of clients that are connected to the Wi-Fi hotspot. - * @since 8 + * @since 7 * @systemapi Hide this for inner system use. */ function getStations(): Array; @@ -344,7 +344,7 @@ declare namespace wifi { /** * Defines the EventListener class and provides functions to subscribe or unsubscribe the Wi-Fi events. * - * @since 8 + * @since 7 * @SysCap SystemCapability.Communication.WiFi * @devices phone, tablet, tv, wearable, car */ @@ -429,7 +429,7 @@ declare namespace wifi { * Subscribe Wi-Fi hotspot state change events. * * @return Returns 0: inactive, 1: active, 2: activating, 3: deactivating - * @since 8 + * @since 7 */ on(type: "hotspotStateChange", callback: Callback): void; @@ -438,7 +438,7 @@ declare namespace wifi { * *

All callback functions will be deregistered If there is no specific callback parameter.

* - * @since 8 + * @since 7 */ off(type: "hotspotStateChange", callback?: Callback): void; @@ -446,7 +446,7 @@ declare namespace wifi { * Subscribe Wi-Fi hotspot sta join events. * * @return Returns StationInfo - * @since 8 + * @since 7 * @systemapi Hide this for inner system use. */ on(type: "hotspotStaJoin", callback: Callback): void; @@ -456,7 +456,7 @@ declare namespace wifi { * *

All callback functions will be deregistered If there is no specific callback parameter.

* - * @since 8 + * @since 7 * @systemapi Hide this for inner system use. */ off(type: "hotspotStaJoin", callback?: Callback): void; @@ -465,7 +465,7 @@ declare namespace wifi { * Subscribe Wi-Fi hotspot sta leave events. * * @return Returns {@link #StationInfo} object - * @since 8 + * @since 7 * @systemapi Hide this for inner system use. */ on(type: "hotspotStaLeave", callback: Callback): void; @@ -474,7 +474,7 @@ declare namespace wifi { * Unsubscribe Wi-Fi hotspot sta leave events. * * @return Returns {@link #StationInfo} object - * @since 8 + * @since 7 * @systemapi Hide this for inner system use. */ off(type: "hotspotStaLeave", callback?: Callback): void; @@ -547,7 +547,7 @@ declare namespace wifi { /** * Wi-Fi connection information. * - * @since 8 + * @since 7 */ interface WifiLinkedInfo { /** The SSID of the Wi-Fi hotspot */ @@ -603,7 +603,7 @@ declare namespace wifi { /** * Wi-Fi IP information. * - * @since 8 + * @since 7 */ interface IpInfo { /** The IP address of the Wi-Fi connection */ @@ -631,7 +631,7 @@ declare namespace wifi { /** * Wi-Fi hotspot configuration information. * - * @since 8 + * @since 7 * @systemapi */ interface HotspotConfig { @@ -654,7 +654,7 @@ declare namespace wifi { /** * Wi-Fi station information. * - * @since 8 + * @since 7 * @systemapi */ interface StationInfo { @@ -671,7 +671,7 @@ declare namespace wifi { /** * The state of the supplicant enumeration. * - * @since 8 + * @since 7 * @systemapi */ export enum SuppState { @@ -715,7 +715,7 @@ declare namespace wifi { /** * The state of Wi-Fi connection enumeration. * - * @since 8 + * @since 7 */ export enum ConnState { /** The device is searching for an available AP. */ -- Gitee From 72ce11c1195826752cabc9c8695c2da4aff3699f Mon Sep 17 00:00:00 2001 From: z00588131 Date: Wed, 12 Jan 2022 12:10:05 +0000 Subject: [PATCH 018/491] feat(P2P): add Wi-Fi hid2d feature Signed-off-by: z00588131 --- OAT.xml | 98 +- interfaces/innerkits/native_c/station_info.h | 122 +- interfaces/innerkits/native_c/wifi_device.h | 556 +++---- .../innerkits/native_c/wifi_device_config.h | 466 +++--- .../innerkits/native_c/wifi_error_code.h | 138 +- interfaces/innerkits/native_c/wifi_event.h | 234 +-- interfaces/innerkits/native_c/wifi_hid2d.h | 257 ++++ interfaces/innerkits/native_c/wifi_hotspot.h | 304 ++-- .../innerkits/native_c/wifi_hotspot_config.h | 242 ++-- .../innerkits/native_c/wifi_linked_info.h | 158 +- interfaces/innerkits/native_c/wifi_p2p.h | 207 +++ .../innerkits/native_c/wifi_p2p_config.h | 123 ++ .../innerkits/native_c/wifi_scan_info.h | 134 +- .../native_cpp/napi/wifi_napi_device.cpp | 1272 ++++++++--------- .../native_cpp/napi/wifi_napi_device.h | 206 +-- .../native_cpp/napi/wifi_napi_entry.cpp | 284 ++-- .../native_cpp/napi/wifi_napi_event.cpp | 862 +++++------ .../native_cpp/napi/wifi_napi_event.h | 212 +-- .../native_cpp/napi/wifi_napi_hotspot.cpp | 390 ++--- .../native_cpp/napi/wifi_napi_hotspot.h | 64 +- .../native_cpp/napi/wifi_napi_p2p.cpp | 46 +- .../innerkits/native_cpp/napi/wifi_napi_p2p.h | 54 +- .../native_cpp/napi/wifi_napi_utils.cpp | 628 ++++---- .../native_cpp/napi/wifi_napi_utils.h | 192 +-- .../native_cpp/wifi_standard/BUILD.gn | 8 +- .../wifi_standard/c_adapter/wifi_c_device.cpp | 671 ++++----- .../wifi_standard/c_adapter/wifi_c_event.cpp | 580 ++++---- .../wifi_standard/c_adapter/wifi_c_hid2d.cpp | 197 +++ .../c_adapter/wifi_c_hotspot.cpp | 368 ++--- .../wifi_standard/c_adapter/wifi_c_p2p.cpp | 447 ++++++ .../wifi_standard/c_adapter/wifi_c_utils.cpp | 113 +- .../wifi_standard/c_adapter/wifi_c_utils.h | 105 +- .../wifi_standard/include/wifi_device.h | 10 +- .../wifi_standard/include/wifi_hid2d.h | 139 ++ .../wifi_standard/include/wifi_p2p.h | 4 +- .../wifi_standard/interfaces/define.h | 15 +- .../wifi_standard/interfaces/i_wifi_device.h | 10 +- .../wifi_standard/interfaces/i_wifi_p2p.h | 108 +- .../wifi_standard/interfaces/wifi_hid2d_msg.h | 151 ++ .../wifi_standard/interfaces/wifi_p2p_msg.h | 4 +- .../wifi_standard/src/wifi_device_impl.cpp | 8 +- .../wifi_standard/src/wifi_device_impl.h | 10 +- .../wifi_standard/src/wifi_device_proxy.cpp | 25 +- .../wifi_standard/src/wifi_device_proxy.h | 14 +- .../wifi_standard/src/wifi_hid2d.cpp | 55 + .../wifi_standard/src/wifi_hid2d_msg.cpp | 60 + .../wifi_standard/src/wifi_hotspot_proxy.h | 7 +- .../wifi_standard/src/wifi_logger.h | 11 +- .../src/wifi_p2p_callback_stub.cpp | 7 +- .../wifi_standard/src/wifi_p2p_impl.cpp | 79 +- .../wifi_standard/src/wifi_p2p_impl.h | 110 +- .../wifi_standard/src/wifi_p2p_proxy.cpp | 350 ++++- .../wifi_standard/src/wifi_p2p_proxy.h | 111 +- interfaces/kits/jskits/@ohos.wifi.d.ts | 66 +- .../wifi_framework/common/log/wifi_log.h | 9 +- .../common/net_helper/dhcpd_interface.cpp | 4 +- .../net_helper}/if_config.cpp | 93 +- .../net_helper}/if_config.h | 32 +- .../common/net_helper/ip_tools.cpp | 2 +- .../common/net_helper/mac_address.cpp | 37 +- .../common/net_helper/mac_address.h | 19 +- .../include/dhcp_client_service_impl.h | 16 +- .../mgr_service/include/dhcp_define.h | 5 +- .../mgr_service/include/dhcp_server_service.h | 9 +- .../src/dhcp_client_service_impl.cpp | 51 +- .../mgr_service/src/dhcp_server_service.cpp | 46 +- .../wifi_framework/wifi_manage/BUILD.gn | 7 +- .../wifi_manage/common/state_machine.cpp | 8 +- .../wifi_manage/idl_client/BUILD.gn | 3 +- .../idl_interface/i_wifi_p2p_iface.c | 24 +- .../idl_interface/i_wifi_p2p_iface.h | 10 +- .../idl_client/idl_interface/i_wifi_struct.h | 9 +- .../idl_client/wifi_idl_client.cpp | 25 +- .../wifi_manage/idl_client/wifi_idl_client.h | 12 +- .../idl_client/wifi_p2p_hal_interface.cpp | 7 +- .../idl_client/wifi_p2p_hal_interface.h | 11 +- .../wifi_manage/wifi_ap/BUILD.gn | 1 + .../wifi_ap/wifi_ap_nat_manager.cpp | 33 +- .../wifi_manage/wifi_ap/wifi_ap_nat_manager.h | 10 +- .../wifi_manage/wifi_device_service_impl.cpp | 9 +- .../wifi_manage/wifi_device_service_impl.h | 4 +- .../wifi_manage/wifi_device_stub.cpp | 12 +- .../wifi_manage/wifi_device_stub.h | 4 +- .../wifi_manage/wifi_hid2d_cfg.cpp | 793 ++++++++++ .../wifi_manage/wifi_hid2d_cfg.h | 256 ++++ .../wifi_manage/wifi_hid2d_service_utils.cpp | 123 ++ .../wifi_manage/wifi_hid2d_service_utils.h | 55 + .../wifi_internal_event_dispatcher.cpp | 11 +- .../wifi_manage/wifi_p2p/BUILD.gn | 1 + .../wifi_p2p/group_formed_state.cpp | 12 +- .../wifi_manage/wifi_p2p/group_formed_state.h | 3 +- .../wifi_p2p/group_negotiation_state.cpp | 3 +- .../wifi_manage/wifi_p2p/ip2p_service.h | 21 +- .../wifi_manage/wifi_p2p/p2p_define.h | 5 +- .../wifi_p2p/p2p_enabled_state.cpp | 41 +- .../wifi_p2p/p2p_group_operating_state.cpp | 34 +- .../wifi_p2p/p2p_group_operating_state.h | 10 +- .../wifi_manage/wifi_p2p/p2p_idle_state.cpp | 32 +- .../wifi_manage/wifi_p2p/p2p_idle_state.h | 17 +- .../wifi_manage/wifi_p2p/p2p_interface.cpp | 13 +- .../wifi_manage/wifi_p2p/p2p_interface.h | 47 +- .../wifi_manage/wifi_p2p/p2p_monitor.cpp | 4 +- .../wifi_p2p/p2p_state_machine.cpp | 28 +- .../wifi_manage/wifi_p2p/p2p_state_machine.h | 16 +- .../wifi_p2p/wifi_p2p_group_manager.h | 26 +- .../wifi_manage/wifi_p2p/wifi_p2p_service.cpp | 32 +- .../wifi_manage/wifi_p2p/wifi_p2p_service.h | 20 +- .../wifi_manage/wifi_p2p_service_impl.cpp | 153 +- .../wifi_manage/wifi_p2p_service_impl.h | 108 +- .../wifi_manage/wifi_p2p_stub.cpp | 203 ++- .../wifi_manage/wifi_p2p_stub.h | 14 +- .../wifi_manage/wifi_protect.cpp | 158 +- .../wifi_framework/wifi_manage/wifi_protect.h | 224 +-- .../wifi_manage/wifi_protect_manager.cpp | 550 +++---- .../wifi_manage/wifi_protect_manager.h | 249 ++-- .../wifi_manage/wifi_scan/scan_interface.cpp | 27 +- .../wifi_manage/wifi_sta/BUILD.gn | 4 +- .../wifi_manage/wifi_sta/sta_define.h | 10 +- .../wifi_manage/wifi_sta/sta_interface.cpp | 19 +- .../wifi_manage/wifi_sta/sta_monitor.cpp | 11 +- .../wifi_sta/sta_state_machine.cpp | 23 +- .../wifi_manage/wifi_sta/sta_state_machine.h | 10 +- .../wifi_standard/wifi_hal/etc/init/BUILD.gn | 10 +- .../wifi_hal/etc/init/p2p_supplicant.conf | 26 + .../wifi_hal/wifi_hal_ap_interface.c | 27 +- .../wifi_hal/wifi_hal_callback.c | 3 +- .../wifi_hal/wifi_hal_crpc_p2p.c | 25 +- .../wifi_hal/wifi_hal_crpc_p2p.h | 11 +- .../wifi_hal/wifi_hal_crpc_server.c | 4 +- .../wpa_supplicant_hal/wifi_wpa_hal.c | 24 +- .../wpa_supplicant_hal/wifi_wpa_hal.h | 6 +- .../wpa_p2p_hal/wifi_p2p_hal.c | 30 +- .../wpa_p2p_hal/wifi_p2p_hal.h | 3 +- .../wifi_hal/wifi_hal_p2p_interface.c | 36 +- .../wifi_hal/wifi_hal_p2p_interface.h | 10 +- .../wifi_hal/wifi_hal_p2p_struct.h | 9 +- .../wifi_hal/wifi_hal_sta_interface.c | 30 +- .../unittest/mock_wifi_hal_service.c | 6 +- .../wifi_manage/wifi_ap/BUILD.gn | 3 +- .../wifi_ap/wifi_ap_nat_manager_test.cpp | 15 - .../wifi_manage/wifi_p2p/test/BUILD.gn | 17 +- .../test/Mock/mock_wifi_p2p_hal_interface.h | 5 +- .../wifi_sta/Mock/mock_if_config.h | 13 +- .../wifi_sta/sta_state_machine_test.cpp | 11 +- utils/inc/wifi_common_util.h | 12 +- utils/src/wifi_common_util.cpp | 12 +- 146 files changed, 10160 insertions(+), 5158 deletions(-) create mode 100755 interfaces/innerkits/native_c/wifi_hid2d.h create mode 100755 interfaces/innerkits/native_c/wifi_p2p.h create mode 100755 interfaces/innerkits/native_c/wifi_p2p_config.h create mode 100755 interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_hid2d.cpp create mode 100755 interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_p2p.cpp create mode 100755 interfaces/innerkits/native_cpp/wifi_standard/include/wifi_hid2d.h create mode 100755 interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_hid2d_msg.h create mode 100755 interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hid2d.cpp create mode 100755 interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hid2d_msg.cpp rename services/wifi_standard/wifi_framework/{wifi_manage/wifi_sta/net_conf => common/net_helper}/if_config.cpp (81%) rename services/wifi_standard/wifi_framework/{wifi_manage/wifi_sta/net_conf => common/net_helper}/if_config.h (69%) create mode 100755 services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_cfg.cpp create mode 100755 services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_cfg.h create mode 100755 services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_service_utils.cpp create mode 100755 services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_service_utils.h create mode 100755 services/wifi_standard/wifi_hal/etc/init/p2p_supplicant.conf diff --git a/OAT.xml b/OAT.xml index 5da7ae2..7210120 100755 --- a/OAT.xml +++ b/OAT.xml @@ -1,50 +1,50 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/interfaces/innerkits/native_c/station_info.h b/interfaces/innerkits/native_c/station_info.h index 9ec5cd2..a24578a 100755 --- a/interfaces/innerkits/native_c/station_info.h +++ b/interfaces/innerkits/native_c/station_info.h @@ -1,61 +1,61 @@ -/* - * Copyright (c) 2020 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * @addtogroup wifiservice - * @{ - * - * @brief Provides functions for the Wi-Fi station and hotspot modes. - * - * You can use this module to enable and disable the Wi-Fi station or hotspot mode, connect to and disconnect from a - * station or hotspot, query the station or hotspot status, and listen for events. \n - * - * @since 7 - */ - -/** - * @file station_info.h - * - * @brief Defines the structure and macro of the station information contained in the event information. - * - * The station information is passed to {@link OnHotspotStaJoin} or {@link OnHotspotStaLeave} invoked when a specified - * event occurs. - * - * @since 7 - */ - -#ifndef HARMONY_OS_LITE_WIFI_STATION_INFO_H -#define HARMONY_OS_LITE_WIFI_STATION_INFO_H -#include "wifi_device_config.h" - -/** - * @brief Represents the station information. - * - * The station information is returned when {@link OnHotspotStaJoin} or {@link OnHotspotStaLeave} is called. \n - * - * @since 7 - */ -typedef struct { - /** Network name of the station. Notice: please pre-allocate memory for "name" */ - char *name; - /** MAC address. For its length, see {@link WIFI_MAC_LEN}. */ - unsigned char macAddress[WIFI_MAC_LEN]; - /** IP address of the station */ - unsigned int ipAddress; - unsigned short disconnectedReason; -} StationInfo; - -#endif // HARMONY_OS_LITE_WIFI_STATION_INFO_H -/** @} */ +/* + * Copyright (c) 2020 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @addtogroup wifiservice + * @{ + * + * @brief Provides functions for the Wi-Fi station and hotspot modes. + * + * You can use this module to enable and disable the Wi-Fi station or hotspot mode, connect to and disconnect from a + * station or hotspot, query the station or hotspot status, and listen for events. \n + * + * @since 7 + */ + +/** + * @file station_info.h + * + * @brief Defines the structure and macro of the station information contained in the event information. + * + * The station information is passed to {@link OnHotspotStaJoin} or {@link OnHotspotStaLeave} invoked when a specified + * event occurs. + * + * @since 7 + */ + +#ifndef HARMONY_OS_LITE_WIFI_STATION_INFO_H +#define HARMONY_OS_LITE_WIFI_STATION_INFO_H +#include "wifi_device_config.h" + +/** + * @brief Represents the station information. + * + * The station information is returned when {@link OnHotspotStaJoin} or {@link OnHotspotStaLeave} is called. \n + * + * @since 7 + */ +typedef struct { + /** Network name of the station. Notice: please pre-allocate memory for "name" */ + char *name; + /** MAC address. For its length, see {@link WIFI_MAC_LEN}. */ + unsigned char macAddress[WIFI_MAC_LEN]; + /** IP address of the station */ + unsigned int ipAddress; + unsigned short disconnectedReason; +} StationInfo; + +#endif // HARMONY_OS_LITE_WIFI_STATION_INFO_H +/** @} */ diff --git a/interfaces/innerkits/native_c/wifi_device.h b/interfaces/innerkits/native_c/wifi_device.h index 03e4d81..386aac0 100755 --- a/interfaces/innerkits/native_c/wifi_device.h +++ b/interfaces/innerkits/native_c/wifi_device.h @@ -1,273 +1,283 @@ -/* - * Copyright (c) 2020 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * @addtogroup wifiservice - * @{ - * - * @brief Provides functions for the Wi-Fi station and hotspot modes. - * - * You can use this module to enable and disable the Wi-Fi station or hotspot mode, connect to and disconnect from a - * station or hotspot, query the station or hotspot status, and listen for events. \n - * - * @since 7 - */ - -/** - * @file wifi_device.h - * - * @brief Provides capabilities to enable and disable the station mode, connect to and disconnect from a station, - * query the station status, and listen for events. - * - * @since 7 - */ - -#ifndef WIFI_DEVICE_C_H -#define WIFI_DEVICE_C_H -#include "wifi_event.h" -#include "station_info.h" -#include "wifi_scan_info.h" -#include "wifi_error_code.h" -#include "wifi_linked_info.h" -#include "wifi_device_config.h" - -#ifdef __cplusplus -extern "C" { -#endif - -/** - * @brief Enables the station mode. - * - * @return Returns {@link WIFI_SUCCESS} if the station mode is enabled; returns an error code defined in - * {@link WifiErrorCode} otherwise. - * @since 7 - */ -WifiErrorCode EnableWifi(void); - -/** - * @brief Disables the station mode. - * - * @return Returns {@link WIFI_SUCCESS} if the station mode is disabled; returns an error code defined in - * {@link WifiErrorCode} otherwise. - * @since 7 - */ -WifiErrorCode DisableWifi(void); - -/** - * @brief Checks whether the station mode is enabled. - * - * @return Returns {@link WIFI_STA_ACTIVE} if the station mode is enabled; returns {@link WIFI_STA_NOT_ACTIVE} - * otherwise. - * @since 7 - */ -int IsWifiActive(void); - -/** - * @brief Starts a Wi-Fi scan. - * - * @return Returns {@link WIFI_SUCCESS} if the Wi-Fi scan is started; returns an error code defined in - * {@link WifiErrorCode} otherwise. - * @since 7 - */ -WifiErrorCode Scan(void); - -/** - * @brief Obtains an array of hotspots detected in a Wi-Fi scan. - * - * The array of hotspots can be obtained only after the Wi-Fi scan is complete. \n - * - * @param result Indicates the array of hotspots detected in a Wi-Fi scan. The array is requested and released by the - * caller. The value must be greater than or equal to {@link WIFI_SCAN_HOTSPOT_LIMIT}. - * @param size Indicates the size of the array. - * @return Returns {@link WIFI_SUCCESS} if the array of hotspots detected in the Wi-Fi scan is obtained; returns an - * error code defined in {@link WifiErrorCode} otherwise. - * @since 7 - */ -WifiErrorCode GetScanInfoList(WifiScanInfo *result, unsigned int *size); - -/** - * @brief Adds a specified hotspot configuration for connecting to a hotspot. - * - * This function generates a networkId. \n - * - * @param config Indicates the hotspot configuration to add. - * @param result Indicates the generated networkId. Each networkId matches a hotspot configuration. - * @return Returns {@link WIFI_SUCCESS} if the specified hotspot configuration is added; returns an error code defined - * in {@link WifiErrorCode} otherwise. - * @since 7 - */ -WifiErrorCode AddDeviceConfig(const WifiDeviceConfig *config, int *result); - -/** - * @brief Obtains all hotspot configurations. - * - * Hotspot configurations were added using {@link AddDeviceConfig}. \n - * - * @param result Indicates the array of all hotspot configurations. The array is requested and released by the caller. - * The value must be greater than or equal to {@link WIFI_MAX_CONFIG_SIZE}. - * @param size Indicates the size of the array. - * @return Returns {@link WIFI_SUCCESS} if all hotspot configurations are obtained; returns an error code defined in - * {@link WifiErrorCode} otherwise. - * @since 7 - */ -WifiErrorCode GetDeviceConfigs(WifiDeviceConfig *result, unsigned int *size); - -/** - * @brief Removes a hotspot configuration matching a specified networkId. - * - * @param networkId Indicates the networkId matching the hotspot configuration to remove. - * @return Returns {@link WIFI_SUCCESS} if the hotspot configuration is removed; returns an error code defined in - * {@link WifiErrorCode} otherwise. - * @since 7 - */ -WifiErrorCode RemoveDevice(int networkId); - -/** - * @brief Disable a hotspot configuration matching a specified networkId. If the config is diabled, it will - * not be auto connected. - * - * @param networkId Indicates the networkId matching the hotspot configuration to disable. - * @return Returns {@link WIFI_SUCCESS} if the hotspot configuration is disabled; returns an error code defined in - * {@link WifiErrorCode} otherwise. - * @since 7 - */ -WifiErrorCode DisableDeviceConfig(int networkId); - -/** - * @brief Enable a hotspot configuration matching a specified networkId. If the config is enabled, it will - * be connected automatically when wifi is enabled. When the config is added, it is enabled in default. - * - * @param networkId Indicates the networkId matching the hotspot configuration to enable. - * @return Returns {@link WIFI_SUCCESS} if the hotspot configuration is enabled; returns an error code defined in - * {@link WifiErrorCode} otherwise. - * @since 7 - */ -WifiErrorCode EnableDeviceConfig(int networkId); - -/** - * @brief Connects to a hotspot matching a specified networkId. - * - * Before calling this function, call {@link AddDeviceConfig} to add a hotspot configuration. \n - * - * @param networkId Indicates the networkId matching the target hotspot. - * @return Returns {@link WIFI_SUCCESS} if the hotspot is connected; returns an error code defined in - * {@link WifiErrorCode} otherwise. - * @since 7 - */ -WifiErrorCode ConnectTo(int networkId); - -/** - * @brief Connect to a hotspot by config. - * - * @param config is device configuration to connect the Wi-Fi network. - * @return Returns {@link WIFI_SUCCESS} if the hotspot is connected; returns an error code defined in - * {@link WifiErrorCode} otherwise. - * @since 7 - */ -WifiErrorCode ConnectToDevice(const WifiDeviceConfig *config); - -/** - * @brief Disconnects this Wi-Fi connection. - * - * @return Returns {@link WIFI_SUCCESS} if this Wi-Fi connection is disconnected; returns an error code defined - * in {@link WifiErrorCode} otherwise. - * @since 7 - */ -WifiErrorCode Disconnect(void); - -/** - * @brief Obtains information about the connected hotspot. - * - * @param result Indicates the information about the connected hotspot. - * @return Returns {@link WIFI_SUCCESS} if the information about the connected hotspot is obtained; returns an error - * code defined in {@link WifiErrorCode} otherwise. - * @since 7 - */ -WifiErrorCode GetLinkedInfo(WifiLinkedInfo *result); - -/** - * @brief Obtains the MAC address of this device. - * - * @param result Indicates the MAC address of this device. It is a char array whose length is 6. - * @return Returns {@link WIFI_SUCCESS} if the MAC address of this device is obtained; returns an error code defined - * in {@link WifiErrorCode} otherwise. - * @since 7 - */ -WifiErrorCode GetDeviceMacAddress(unsigned char *result); - -/** - * @brief Starts a Wi-Fi scan based on a specified parameter. - * - * Only results matching the specified parameter will be returned for the Wi-Fi scan.\n - * - * @param params Indicates the pointer to the parameter for starting the Wi-Fi scan. - * For details, see {@link WifiScanParams}. - * @return Returns {@link WIFI_SUCCESS} if the Wi-Fi scan is started successfully; - * returns an error code defined in {@link WifiErrorCode} otherwise. - * @since 7 - */ -WifiErrorCode AdvanceScan(WifiScanParams *params); - -/* - * @brief get the ip address. - * - * @return Returns {@link WIFI_SUCCESS} if the IP is got; returns an error code defined - * in {@link WifiErrorCode} otherwise. - * @since 7 - */ -WifiErrorCode GetIpInfo(IpInfo *info); - -/** - * @brief Obtains the signal level indicated by a specified received signal strength indicator (RSSI) and frequency - * band. - * - * - * Based on the signal level, you can display the signal strength represented by the number of signal bars. \n - * - * @param rssi Indicates the RSSI. - * @param band Indicates the frequency band, either {@link HOTSPOT_BAND_TYPE_5G} or {@link HOTSPOT_BAND_TYPE_2G}. - * @return Returns the signal level if it is obtained; returns -1 otherwise. - * @since 7 - */ -int GetSignalLevel(int rssi, int band); - -/** - * @brief Registers a callback for a specified Wi-Fi event. - * - * The registered callback will be invoked when the Wi-Fi event defined in {@link WifiEvent} occurs. \n - * - * @param event Indicates the event for which the callback is to be registered. - * @return Returns {@link WIFI_SUCCESS} if the callback is registered successfully; returns an error code defined - * in {@link WifiErrorCode} otherwise. - * @since 7 - */ -WifiErrorCode RegisterWifiEvent(WifiEvent *event); - -/** - * @brief Unregisters a callback previously registered for a specified Wi-Fi event. - * - * @param event Indicates the event for which the callback is to be unregistered. - * @return Returns {@link WIFI_SUCCESS} if the callback is unregistered successfully; returns an error code defined - * in {@link WifiErrorCode} otherwise. - * @since 7 - */ -WifiErrorCode UnRegisterWifiEvent(const WifiEvent *event); - -#ifdef __cplusplus -} -#endif - -#endif // WIFI_DEVICE_C_H -/** @} */ +/* + * Copyright (C) 2020-2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @addtogroup wifiservice + * @{ + * + * @brief Provides functions for the Wi-Fi station and hotspot modes. + * + * You can use this module to enable and disable the Wi-Fi station or hotspot mode, connect to and disconnect from a + * station or hotspot, query the station or hotspot status, and listen for events. \n + * + * @since 7 + */ + +/** + * @file wifi_device.h + * + * @brief Provides capabilities to enable and disable the station mode, connect to and disconnect from a station, + * query the station status, and listen for events. + * + * @since 7 + */ + +#ifndef WIFI_DEVICE_C_H +#define WIFI_DEVICE_C_H +#include "wifi_event.h" +#include "station_info.h" +#include "wifi_scan_info.h" +#include "wifi_error_code.h" +#include "wifi_linked_info.h" +#include "wifi_device_config.h" + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * @brief Enables the station mode. + * + * @return Returns {@link WIFI_SUCCESS} if the station mode is enabled; returns an error code defined in + * {@link WifiErrorCode} otherwise. + * @since 7 + */ +WifiErrorCode EnableWifi(void); + +/** + * @brief Disables the station mode. + * + * @return Returns {@link WIFI_SUCCESS} if the station mode is disabled; returns an error code defined in + * {@link WifiErrorCode} otherwise. + * @since 7 + */ +WifiErrorCode DisableWifi(void); + +/** + * @brief Checks whether the station mode is enabled. + * + * @return Returns {@link WIFI_STA_ACTIVE} if the station mode is enabled; returns {@link WIFI_STA_NOT_ACTIVE} + * otherwise. + * @since 7 + */ +int IsWifiActive(void); + +/** + * @brief Starts a Wi-Fi scan. + * + * @return Returns {@link WIFI_SUCCESS} if the Wi-Fi scan is started; returns an error code defined in + * {@link WifiErrorCode} otherwise. + * @since 7 + */ +WifiErrorCode Scan(void); + +/** + * @brief Obtains an array of hotspots detected in a Wi-Fi scan. + * + * The array of hotspots can be obtained only after the Wi-Fi scan is complete. \n + * + * @param result Indicates the array of hotspots detected in a Wi-Fi scan. The array is requested and released by the + * caller. The value must be greater than or equal to {@link WIFI_SCAN_HOTSPOT_LIMIT}. + * @param size Indicates the size of the array. + * @return Returns {@link WIFI_SUCCESS} if the array of hotspots detected in the Wi-Fi scan is obtained; returns an + * error code defined in {@link WifiErrorCode} otherwise. + * @since 7 + */ +WifiErrorCode GetScanInfoList(WifiScanInfo *result, unsigned int *size); + +/** + * @brief Adds a specified hotspot configuration for connecting to a hotspot. + * + * This function generates a networkId. \n + * + * @param config Indicates the hotspot configuration to add. + * @param result Indicates the generated networkId. Each networkId matches a hotspot configuration. + * @return Returns {@link WIFI_SUCCESS} if the specified hotspot configuration is added; returns an error code defined + * in {@link WifiErrorCode} otherwise. + * @since 7 + */ +WifiErrorCode AddDeviceConfig(const WifiDeviceConfig *config, int *result); + +/** + * @brief Obtains all hotspot configurations. + * + * Hotspot configurations were added using {@link AddDeviceConfig}. \n + * + * @param result Indicates the array of all hotspot configurations. The array is requested and released by the caller. + * The value must be greater than or equal to {@link WIFI_MAX_CONFIG_SIZE}. + * @param size Indicates the size of the array. + * @return Returns {@link WIFI_SUCCESS} if all hotspot configurations are obtained; returns an error code defined in + * {@link WifiErrorCode} otherwise. + * @since 7 + */ +WifiErrorCode GetDeviceConfigs(WifiDeviceConfig *result, unsigned int *size); + +/** + * @brief Removes a hotspot configuration matching a specified networkId. + * + * @param networkId Indicates the networkId matching the hotspot configuration to remove. + * @return Returns {@link WIFI_SUCCESS} if the hotspot configuration is removed; returns an error code defined in + * {@link WifiErrorCode} otherwise. + * @since 7 + */ +WifiErrorCode RemoveDevice(int networkId); + +/** + * @brief Disable a hotspot configuration matching a specified networkId. If the config is diabled, it will + * not be auto connected. + * + * @param networkId Indicates the networkId matching the hotspot configuration to disable. + * @return Returns {@link WIFI_SUCCESS} if the hotspot configuration is disabled; returns an error code defined in + * {@link WifiErrorCode} otherwise. + * @since 7 + */ +WifiErrorCode DisableDeviceConfig(int networkId); + +/** + * @brief Enable a hotspot configuration matching a specified networkId. If the config is enabled, it will + * be connected automatically when wifi is enabled. When the config is added, it is enabled in default. + * + * @param networkId Indicates the networkId matching the hotspot configuration to enable. + * @return Returns {@link WIFI_SUCCESS} if the hotspot configuration is enabled; returns an error code defined in + * {@link WifiErrorCode} otherwise. + * @since 7 + */ +WifiErrorCode EnableDeviceConfig(int networkId); + +/** + * @brief Connects to a hotspot matching a specified networkId. + * + * Before calling this function, call {@link AddDeviceConfig} to add a hotspot configuration. \n + * + * @param networkId Indicates the networkId matching the target hotspot. + * @return Returns {@link WIFI_SUCCESS} if the hotspot is connected; returns an error code defined in + * {@link WifiErrorCode} otherwise. + * @since 7 + */ +WifiErrorCode ConnectTo(int networkId); + +/** + * @brief Connect to a hotspot by config. + * + * @param config is device configuration to connect the Wi-Fi network. + * @return Returns {@link WIFI_SUCCESS} if the hotspot is connected; returns an error code defined in + * {@link WifiErrorCode} otherwise. + * @since 7 + */ +WifiErrorCode ConnectToDevice(const WifiDeviceConfig *config); + +/** + * @brief Disconnects this Wi-Fi connection. + * + * @return Returns {@link WIFI_SUCCESS} if this Wi-Fi connection is disconnected; returns an error code defined + * in {@link WifiErrorCode} otherwise. + * @since 7 + */ +WifiErrorCode Disconnect(void); + +/** + * @brief Obtains information about the connected hotspot. + * + * @param result Indicates the information about the connected hotspot. + * @return Returns {@link WIFI_SUCCESS} if the information about the connected hotspot is obtained; returns an error + * code defined in {@link WifiErrorCode} otherwise. + * @since 7 + */ +WifiErrorCode GetLinkedInfo(WifiLinkedInfo *result); + +/** + * @brief Obtains the MAC address of this device. + * + * @param result Indicates the MAC address of this device. It is a char array whose length is 6. + * @return Returns {@link WIFI_SUCCESS} if the MAC address of this device is obtained; returns an error code defined + * in {@link WifiErrorCode} otherwise. + * @since 7 + */ +WifiErrorCode GetDeviceMacAddress(unsigned char *result); + +/** + * @brief Starts a Wi-Fi scan based on a specified parameter. + * + * Only results matching the specified parameter will be returned for the Wi-Fi scan.\n + * + * @param params Indicates the pointer to the parameter for starting the Wi-Fi scan. + * For details, see {@link WifiScanParams}. + * @return Returns {@link WIFI_SUCCESS} if the Wi-Fi scan is started successfully; + * returns an error code defined in {@link WifiErrorCode} otherwise. + * @since 7 + */ +WifiErrorCode AdvanceScan(WifiScanParams *params); + +/* + * @brief get the ip address. + * + * @return Returns {@link WIFI_SUCCESS} if the IP is got; returns an error code defined + * in {@link WifiErrorCode} otherwise. + * @since 7 + */ +WifiErrorCode GetIpInfo(IpInfo *info); + +/** + * @brief Obtains the signal level indicated by a specified received signal strength indicator (RSSI) and frequency + * band. + * + * + * Based on the signal level, you can display the signal strength represented by the number of signal bars. \n + * + * @param rssi Indicates the RSSI. + * @param band Indicates the frequency band, either {@link HOTSPOT_BAND_TYPE_5G} or {@link HOTSPOT_BAND_TYPE_2G}. + * @return Returns the signal level if it is obtained; returns -1 otherwise. + * @since 7 + */ +int GetSignalLevel(int rssi, int band); + +/** + * @brief set low latency mode + * + * @param enabled 0: disable low latency, 1: enable low latency + * @return Returns {@link WIFI_SUCCESS} if set success; returns an error code defined + * in {@link WifiErrorCode} otherwise. + * @since 8 + */ +WifiErrorCode SetLowLatencyMode(int enabled); + +/** + * @brief Registers a callback for a specified Wi-Fi event. + * + * The registered callback will be invoked when the Wi-Fi event defined in {@link WifiEvent} occurs. \n + * + * @param event Indicates the event for which the callback is to be registered. + * @return Returns {@link WIFI_SUCCESS} if the callback is registered successfully; returns an error code defined + * in {@link WifiErrorCode} otherwise. + * @since 7 + */ +WifiErrorCode RegisterWifiEvent(WifiEvent *event); + +/** + * @brief Unregisters a callback previously registered for a specified Wi-Fi event. + * + * @param event Indicates the event for which the callback is to be unregistered. + * @return Returns {@link WIFI_SUCCESS} if the callback is unregistered successfully; returns an error code defined + * in {@link WifiErrorCode} otherwise. + * @since 7 + */ +WifiErrorCode UnRegisterWifiEvent(const WifiEvent *event); + +#ifdef __cplusplus +} +#endif + +#endif // WIFI_DEVICE_C_H +/** @} */ diff --git a/interfaces/innerkits/native_c/wifi_device_config.h b/interfaces/innerkits/native_c/wifi_device_config.h index 32167b9..d0598b2 100755 --- a/interfaces/innerkits/native_c/wifi_device_config.h +++ b/interfaces/innerkits/native_c/wifi_device_config.h @@ -1,233 +1,233 @@ -/* - * Copyright (c) 2020 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * @addtogroup wifiservice - * @{ - * - * @brief Provides functions for the Wi-Fi station and hotspot modes. - * - * You can use this module to enable and disable the Wi-Fi station or hotspot mode, connect to and disconnect from a - * station or hotspot, query the station or hotspot status, and listen for events. \n - * - * @since 7 - */ - -/** - * @file wifi_device_config.h - * - * @brief Defines the Wi-Fi station configuration. - * - * The Wi-Fi station configuration includes the security type and data length. \n - * - * @since 7 - */ - -#ifndef HARMONY_OS_LITE_WIFI_DEVICE_CONFIG_H -#define HARMONY_OS_LITE_WIFI_DEVICE_CONFIG_H - -/** - * @brief Indicates the maximum number of Wi-Fi station configurations that can be added using {@link AddDeviceConfig}. - * - * If the maximum number is reached, an error will be returned. In this case, you must delete at least one - * configuration before you can add new ones. \n - */ -#define WIFI_MAX_CONFIG_SIZE 10 -/** - * @brief Indicates the value of networkId when the configuration file is unavailable. - * - * Generally, the configuration file is unavailable because the configuration matching the networkId is - * uninitialized. \n - */ -#define WIFI_CONFIG_INVALID (-1) -/** - * @brief Indicates the maximum length of a Wi-Fi SSID. - * - * The maximum length is 32, and the last bit is reserved and set to \0. \n - */ -#define WIFI_MAX_SSID_LEN 33 // 32 + \0 -/** - * @brief Indicates the maximum length of a Wi-Fi key. - * - * The maximum length is 64, and the last bit is reserved and set to \0. \n - */ -#define WIFI_MAX_KEY_LEN 65 // 64 + \0 -/** - * @brief Indicates the maximum length of a Wi-Fi MAC address or a Wi-Fi BSSID. - * - */ -#define WIFI_MAC_LEN 6 - -/** - * @brief Indicates the maximum length of a Wi-Fi PSK. - * - */ -#define WIFI_PSK_LEN 32 - -/** - * @brief Indicates the maximum number of DNS servers. - * - * A maximum of two DNS servers are allowed. \n - */ -#define WIFI_MAX_DNS_NUM 2 - -/** - * @brief Indicates the maximum length of a device name. - * - */ -#define DEVICE_NAME_LEN 128 - -/** - * @brief Enumerates Wi-Fi security types. - * - * @since 7 - */ -typedef enum { - /** Invalid security type */ - WIFI_SEC_TYPE_INVALID = -1, - /** Open */ - WIFI_SEC_TYPE_OPEN, - /** Wired Equivalent Privacy (WEP) */ - WIFI_SEC_TYPE_WEP, - /** Pre-shared key (PSK) */ - WIFI_SEC_TYPE_PSK, - /** Simultaneous Authentication of Equals (SAE) */ - WIFI_SEC_TYPE_SAE, -} WifiSecurityType; - -/** - * @brief Enumerates psk encryption types. - * - * @since 7 - */ -typedef enum { - /** Indicates that the ascii type of psk encryption type */ - WIFI_PSK_TYPE_ASCII = 0, - /** Indicates that the hex type of psk encryption type */ - WIFI_PSK_TYPE_HEX, -} WifiPskType; - -/** - * @brief Defines the IP configuration of the Wi-Fi device. - * - * The IP configuration is mainly used for connecting to the device. \n - * - * @since 3 - */ -typedef struct { - /** IP address of the Wi-Fi device */ - unsigned int ipAddress; - /** Gateway of the Wi-Fi device */ - unsigned int gateway; - /** DNS server addresses for the Wi-Fi device */ - unsigned int dnsServers[WIFI_MAX_DNS_NUM]; - /** Subnet mask of the Wi-Fi device */ - unsigned int netmask; -} IpConfig; - -/** - * @brief Enumerates IP address types for the Wi-Fi device. - * - * @since 3 - */ -typedef enum { - /** Static IP address */ - STATIC_IP, - /** IP address dynamically assigned by DHCP */ - DHCP, - /** Unknown IP address type */ - UNKNOWN -} IpType; - -/** - * @brief Represents the Wi-Fi station configuration used to connect to a specified Wi-Fi device. - * - * @since 7 - */ -typedef struct WifiDeviceConfig { - /** Service set ID (SSID). For its length, see {@link WIFI_MAX_SSID_LEN}. */ - char ssid[WIFI_MAX_SSID_LEN]; - /** Basic service set ID (BSSID). For its length, see {@link WIFI_MAC_LEN}. */ - unsigned char bssid[WIFI_MAC_LEN]; - /** Key. For its length, see {@link WIFI_MAX_KEY_LEN}. */ - char preSharedKey[WIFI_MAX_KEY_LEN]; - /** Security type. It is defined in {@link WifiSecurityType}. */ - int securityType; - /** Allocated networkId */ - int netId; - /** Frequency */ - unsigned int freq; - /** PSK type, see {@link WifiPskType}. */ - int wapiPskType; - /** IP address type */ - IpType ipType; - /** Static IP address */ - IpConfig staticIp; - /* 1 for hidden config */ - int isHiddenSsid; -} WifiDeviceConfig; - -/** - * @brief Enumerates Wi-Fi scan types. - * - * @since 7 - */ -typedef enum { - /** A scan based on a specified frequency. */ - WIFI_FREQ_SCAN, - /** A scan based on a specified SSID. */ - WIFI_SSID_SCAN, - /** A scan based on a specified BSSID. */ - WIFI_BSSID_SCAN, - /** A scan based on a specified frequency band. */ - WIFI_BAND_SCAN -} WifiScanType; - -/** - * @brief Represents the Wi-Fi station configuration used to connect to a specified Wi-Fi device. - * - * @since 7 - */ -typedef struct { - /** Service set ID (SSID). Its maximum length is defined by {@link WIFI_MAX_SSID_LEN}. */ - char ssid[WIFI_MAX_SSID_LEN]; - /** Length of the SSID. */ - char ssidLen; - /** Basic service set ID (BSSID). Its length is defined by {@link WIFI_MAC_LEN}. */ - char bssid[WIFI_MAC_LEN]; - /** Frequency. */ - int freqs; - /** Frequency band. */ - int band; - /** Wi-Fi scan type, which is defined by {@link WifiScanType}. */ - WifiScanType scanType; -} WifiScanParams; - -/** - * @brief IP info - * - * @since 7 - */ -typedef struct { - unsigned int ipAddress; - unsigned int netMask; - unsigned int netGate; - unsigned int dns1; - unsigned int dns2; - unsigned int serverAddress; - int leaseDuration; -} IpInfo; -#endif // HARMONY_OS_LITE_WIFI_DEVICE_CONFIG_H -/** @} */ +/* + * Copyright (c) 2020 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @addtogroup wifiservice + * @{ + * + * @brief Provides functions for the Wi-Fi station and hotspot modes. + * + * You can use this module to enable and disable the Wi-Fi station or hotspot mode, connect to and disconnect from a + * station or hotspot, query the station or hotspot status, and listen for events. \n + * + * @since 7 + */ + +/** + * @file wifi_device_config.h + * + * @brief Defines the Wi-Fi station configuration. + * + * The Wi-Fi station configuration includes the security type and data length. \n + * + * @since 7 + */ + +#ifndef HARMONY_OS_LITE_WIFI_DEVICE_CONFIG_H +#define HARMONY_OS_LITE_WIFI_DEVICE_CONFIG_H + +/** + * @brief Indicates the maximum number of Wi-Fi station configurations that can be added using {@link AddDeviceConfig}. + * + * If the maximum number is reached, an error will be returned. In this case, you must delete at least one + * configuration before you can add new ones. \n + */ +#define WIFI_MAX_CONFIG_SIZE 10 +/** + * @brief Indicates the value of networkId when the configuration file is unavailable. + * + * Generally, the configuration file is unavailable because the configuration matching the networkId is + * uninitialized. \n + */ +#define WIFI_CONFIG_INVALID (-1) +/** + * @brief Indicates the maximum length of a Wi-Fi SSID. + * + * The maximum length is 32, and the last bit is reserved and set to \0. \n + */ +#define WIFI_MAX_SSID_LEN 33 // 32 + \0 +/** + * @brief Indicates the maximum length of a Wi-Fi key. + * + * The maximum length is 64, and the last bit is reserved and set to \0. \n + */ +#define WIFI_MAX_KEY_LEN 65 // 64 + \0 +/** + * @brief Indicates the maximum length of a Wi-Fi MAC address or a Wi-Fi BSSID. + * + */ +#define WIFI_MAC_LEN 6 + +/** + * @brief Indicates the maximum length of a Wi-Fi PSK. + * + */ +#define WIFI_PSK_LEN 32 + +/** + * @brief Indicates the maximum number of DNS servers. + * + * A maximum of two DNS servers are allowed. \n + */ +#define WIFI_MAX_DNS_NUM 2 + +/** + * @brief Indicates the maximum length of a device name. + * + */ +#define DEVICE_NAME_LEN 128 + +/** + * @brief Enumerates Wi-Fi security types. + * + * @since 7 + */ +typedef enum { + /** Invalid security type */ + WIFI_SEC_TYPE_INVALID = -1, + /** Open */ + WIFI_SEC_TYPE_OPEN, + /** Wired Equivalent Privacy (WEP) */ + WIFI_SEC_TYPE_WEP, + /** Pre-shared key (PSK) */ + WIFI_SEC_TYPE_PSK, + /** Simultaneous Authentication of Equals (SAE) */ + WIFI_SEC_TYPE_SAE, +} WifiSecurityType; + +/** + * @brief Enumerates psk encryption types. + * + * @since 7 + */ +typedef enum { + /** Indicates that the ascii type of psk encryption type */ + WIFI_PSK_TYPE_ASCII = 0, + /** Indicates that the hex type of psk encryption type */ + WIFI_PSK_TYPE_HEX, +} WifiPskType; + +/** + * @brief Defines the IP configuration of the Wi-Fi device. + * + * The IP configuration is mainly used for connecting to the device. \n + * + * @since 3 + */ +typedef struct { + /** IP address of the Wi-Fi device */ + unsigned int ipAddress; + /** Gateway of the Wi-Fi device */ + unsigned int gateway; + /** DNS server addresses for the Wi-Fi device */ + unsigned int dnsServers[WIFI_MAX_DNS_NUM]; + /** Subnet mask of the Wi-Fi device */ + unsigned int netmask; +} IpConfig; + +/** + * @brief Enumerates IP address types for the Wi-Fi device. + * + * @since 3 + */ +typedef enum { + /** Static IP address */ + STATIC_IP, + /** IP address dynamically assigned by DHCP */ + DHCP, + /** Unknown IP address type */ + UNKNOWN +} IpType; + +/** + * @brief Represents the Wi-Fi station configuration used to connect to a specified Wi-Fi device. + * + * @since 7 + */ +typedef struct WifiDeviceConfig { + /** Service set ID (SSID). For its length, see {@link WIFI_MAX_SSID_LEN}. */ + char ssid[WIFI_MAX_SSID_LEN]; + /** Basic service set ID (BSSID). For its length, see {@link WIFI_MAC_LEN}. */ + unsigned char bssid[WIFI_MAC_LEN]; + /** Key. For its length, see {@link WIFI_MAX_KEY_LEN}. */ + char preSharedKey[WIFI_MAX_KEY_LEN]; + /** Security type. It is defined in {@link WifiSecurityType}. */ + int securityType; + /** Allocated networkId */ + int netId; + /** Frequency */ + unsigned int freq; + /** PSK type, see {@link WifiPskType}. */ + int wapiPskType; + /** IP address type */ + IpType ipType; + /** Static IP address */ + IpConfig staticIp; + /* 1 for hidden config */ + int isHiddenSsid; +} WifiDeviceConfig; + +/** + * @brief Enumerates Wi-Fi scan types. + * + * @since 7 + */ +typedef enum { + /** A scan based on a specified frequency. */ + WIFI_FREQ_SCAN, + /** A scan based on a specified SSID. */ + WIFI_SSID_SCAN, + /** A scan based on a specified BSSID. */ + WIFI_BSSID_SCAN, + /** A scan based on a specified frequency band. */ + WIFI_BAND_SCAN +} WifiScanType; + +/** + * @brief Represents the Wi-Fi station configuration used to connect to a specified Wi-Fi device. + * + * @since 7 + */ +typedef struct { + /** Service set ID (SSID). Its maximum length is defined by {@link WIFI_MAX_SSID_LEN}. */ + char ssid[WIFI_MAX_SSID_LEN]; + /** Length of the SSID. */ + char ssidLen; + /** Basic service set ID (BSSID). Its length is defined by {@link WIFI_MAC_LEN}. */ + char bssid[WIFI_MAC_LEN]; + /** Frequency. */ + int freqs; + /** Frequency band. */ + int band; + /** Wi-Fi scan type, which is defined by {@link WifiScanType}. */ + WifiScanType scanType; +} WifiScanParams; + +/** + * @brief IP info + * + * @since 7 + */ +typedef struct { + unsigned int ipAddress; + unsigned int netMask; + unsigned int netGate; + unsigned int dns1; + unsigned int dns2; + unsigned int serverAddress; + int leaseDuration; +} IpInfo; +#endif // HARMONY_OS_LITE_WIFI_DEVICE_CONFIG_H +/** @} */ diff --git a/interfaces/innerkits/native_c/wifi_error_code.h b/interfaces/innerkits/native_c/wifi_error_code.h index de6e240..a48fd1e 100755 --- a/interfaces/innerkits/native_c/wifi_error_code.h +++ b/interfaces/innerkits/native_c/wifi_error_code.h @@ -1,70 +1,70 @@ -/* - * Copyright (c) 2020 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * @addtogroup wifiservice - * @{ - * - * @brief Provides functions for the Wi-Fi station and hotspot modes. - * - * You can use this module to enable and disable the Wi-Fi station or hotspot mode, connect to and disconnect from a - * station or hotspot, query the station or hotspot status, and listen for events. \n - * - * @since 7 - */ - -/** - * @file wifi_error_code.h - * - * @brief Defines error codes of the Wi-Fi service. - * - * @since 7 - */ - -#ifndef WIFI_ERROR_CODE_C_H -#define WIFI_ERROR_CODE_C_H - -/** - * @brief Enumerates Wi-Fi error codes. - * - * @since 7 - */ -typedef enum { - /** No errors. */ - WIFI_SUCCESS = 0, - /** Invalid parameters */ - ERROR_WIFI_INVALID_ARGS = -1, - /** Invalid chip */ - ERROR_WIFI_CHIP_INVALID = -2, - /** Invalid Wi-Fi interface */ - ERROR_WIFI_IFACE_INVALID = -3, - /** Invalid RTT controller */ - ERROR_WIFI_RTT_CONTROLLER_INVALID = -4, - /** Wi-Fi not supported by the current version or device */ - ERROR_WIFI_NOT_SUPPORTED = -5, - /** Wi-Fi unavailable */ - ERROR_WIFI_NOT_AVAILABLE = -6, - /** Wi-Fi not initialized or started */ - ERROR_WIFI_NOT_STARTED = -7, - /** System busy */ - ERROR_WIFI_BUSY = -8, - /** Wi-Fi invalid password */ - ERROR_WIFI_INVALID_PASSWORD = -9, - /** Unknown error */ - ERROR_WIFI_UNKNOWN = -128 -} WifiErrorCode; - -#endif // WIFI_ERROR_CODE_C_H +/* + * Copyright (c) 2020 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @addtogroup wifiservice + * @{ + * + * @brief Provides functions for the Wi-Fi station and hotspot modes. + * + * You can use this module to enable and disable the Wi-Fi station or hotspot mode, connect to and disconnect from a + * station or hotspot, query the station or hotspot status, and listen for events. \n + * + * @since 7 + */ + +/** + * @file wifi_error_code.h + * + * @brief Defines error codes of the Wi-Fi service. + * + * @since 7 + */ + +#ifndef WIFI_ERROR_CODE_C_H +#define WIFI_ERROR_CODE_C_H + +/** + * @brief Enumerates Wi-Fi error codes. + * + * @since 7 + */ +typedef enum { + /** No errors. */ + WIFI_SUCCESS = 0, + /** Invalid parameters */ + ERROR_WIFI_INVALID_ARGS = -1, + /** Invalid chip */ + ERROR_WIFI_CHIP_INVALID = -2, + /** Invalid Wi-Fi interface */ + ERROR_WIFI_IFACE_INVALID = -3, + /** Invalid RTT controller */ + ERROR_WIFI_RTT_CONTROLLER_INVALID = -4, + /** Wi-Fi not supported by the current version or device */ + ERROR_WIFI_NOT_SUPPORTED = -5, + /** Wi-Fi unavailable */ + ERROR_WIFI_NOT_AVAILABLE = -6, + /** Wi-Fi not initialized or started */ + ERROR_WIFI_NOT_STARTED = -7, + /** System busy */ + ERROR_WIFI_BUSY = -8, + /** Wi-Fi invalid password */ + ERROR_WIFI_INVALID_PASSWORD = -9, + /** Unknown error */ + ERROR_WIFI_UNKNOWN = -128 +} WifiErrorCode; + +#endif // WIFI_ERROR_CODE_C_H /** @} */ \ No newline at end of file diff --git a/interfaces/innerkits/native_c/wifi_event.h b/interfaces/innerkits/native_c/wifi_event.h index a4459be..5a83f43 100755 --- a/interfaces/innerkits/native_c/wifi_event.h +++ b/interfaces/innerkits/native_c/wifi_event.h @@ -1,117 +1,117 @@ -/* - * Copyright (c) 2020 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * @addtogroup wifiservice - * @{ - * - * @brief Provides functions for the Wi-Fi station and hotspot modes. - * - * You can use this module to enable and disable the Wi-Fi station or hotspot mode, connect to and disconnect from a - * station or hotspot, query the station or hotspot status, and listen for events. \n - * - * @since 7 - */ - -/** - * @file wifi_event.h - * - * @brief Defines callbacks and structure of Wi-Fi events. - * - * {@link RegisterWifiEvent} can be used to listen for Wi-Fi connection, disconnection, and scan events. \n - * - * @since 7 - */ -#ifndef WIFI_EVENT_C_H -#define WIFI_EVENT_C_H - -#include "wifi_linked_info.h" -#include "station_info.h" -#include "wifi_error_code.h" - -#ifdef __cplusplus -extern "C" { -#endif - -/** - * @brief Indicates that the Wi-Fi station mode is enabled. - * - */ -#define WIFI_STA_ACTIVE 1 -/** - * @brief Indicates that the Wi-Fi station mode is disabled. - * - */ -#define WIFI_STA_NOT_ACTIVE 0 - -/** - * @brief Indicates that the Wi-Fi hotspot mode is enabled. - * - */ -#define WIFI_HOTSPOT_ACTIVE 1 -/** - * @brief Indicates that the Wi-Fi hotspot mode is disabled. - * - */ -#define WIFI_HOTSPOT_NOT_ACTIVE 0 - -/** - * @brief Indicates the maximum number of event listeners that can be registered using {@link RegisterWifiEvent}. - * - * When the maximum number is reached, you need to unregister at least one listener before registering new ones. \n - */ -#define WIFI_MAX_EVENT_SIZE 10 - -/** - * @brief Represents the pointer to a Wi-Fi event callback for station and hotspot connection, disconnection, or scan. - * - * - * If you do not need a callback, set the value of its pointer to NULL. \n - * - * @since 7 - */ -typedef struct { - /** Connection state change */ - void (*OnWifiConnectionChanged)(int state, WifiLinkedInfo *info); - /** Scan state change */ - void (*OnWifiScanStateChanged)(int state, int size); - /** Hotspot state change */ - void (*OnHotspotStateChanged)(int state); - /** Station connected */ - void (*OnHotspotStaJoin)(StationInfo *info); - /** Station disconnected */ - void (*OnHotspotStaLeave)(StationInfo *info); -} WifiEvent; - -/** - * @brief Enumerates states in Wi-Fi events. - * - * - * - * @since 7 - */ -typedef enum { - /** Unavailable state */ - WIFI_STATE_NOT_AVALIABLE = 0, - /** Available state */ - WIFI_STATE_AVALIABLE -} WifiEventState; - -#ifdef __cplusplus -} -#endif - -#endif // WIFI_EVENT_C_H -/** @} */ +/* + * Copyright (c) 2020 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @addtogroup wifiservice + * @{ + * + * @brief Provides functions for the Wi-Fi station and hotspot modes. + * + * You can use this module to enable and disable the Wi-Fi station or hotspot mode, connect to and disconnect from a + * station or hotspot, query the station or hotspot status, and listen for events. \n + * + * @since 7 + */ + +/** + * @file wifi_event.h + * + * @brief Defines callbacks and structure of Wi-Fi events. + * + * {@link RegisterWifiEvent} can be used to listen for Wi-Fi connection, disconnection, and scan events. \n + * + * @since 7 + */ +#ifndef WIFI_EVENT_C_H +#define WIFI_EVENT_C_H + +#include "wifi_linked_info.h" +#include "station_info.h" +#include "wifi_error_code.h" + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * @brief Indicates that the Wi-Fi station mode is enabled. + * + */ +#define WIFI_STA_ACTIVE 1 +/** + * @brief Indicates that the Wi-Fi station mode is disabled. + * + */ +#define WIFI_STA_NOT_ACTIVE 0 + +/** + * @brief Indicates that the Wi-Fi hotspot mode is enabled. + * + */ +#define WIFI_HOTSPOT_ACTIVE 1 +/** + * @brief Indicates that the Wi-Fi hotspot mode is disabled. + * + */ +#define WIFI_HOTSPOT_NOT_ACTIVE 0 + +/** + * @brief Indicates the maximum number of event listeners that can be registered using {@link RegisterWifiEvent}. + * + * When the maximum number is reached, you need to unregister at least one listener before registering new ones. \n + */ +#define WIFI_MAX_EVENT_SIZE 10 + +/** + * @brief Represents the pointer to a Wi-Fi event callback for station and hotspot connection, disconnection, or scan. + * + * + * If you do not need a callback, set the value of its pointer to NULL. \n + * + * @since 7 + */ +typedef struct { + /** Connection state change */ + void (*OnWifiConnectionChanged)(int state, WifiLinkedInfo *info); + /** Scan state change */ + void (*OnWifiScanStateChanged)(int state, int size); + /** Hotspot state change */ + void (*OnHotspotStateChanged)(int state); + /** Station connected */ + void (*OnHotspotStaJoin)(StationInfo *info); + /** Station disconnected */ + void (*OnHotspotStaLeave)(StationInfo *info); +} WifiEvent; + +/** + * @brief Enumerates states in Wi-Fi events. + * + * + * + * @since 7 + */ +typedef enum { + /** Unavailable state */ + WIFI_STATE_NOT_AVALIABLE = 0, + /** Available state */ + WIFI_STATE_AVALIABLE +} WifiEventState; + +#ifdef __cplusplus +} +#endif + +#endif // WIFI_EVENT_C_H +/** @} */ diff --git a/interfaces/innerkits/native_c/wifi_hid2d.h b/interfaces/innerkits/native_c/wifi_hid2d.h new file mode 100755 index 0000000..658ac1e --- /dev/null +++ b/interfaces/innerkits/native_c/wifi_hid2d.h @@ -0,0 +1,257 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OHOS_C_HID2D_H +#define OHOS_C_HID2D_H + +#include "wifi_error_code.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef MAC_LEN +#define MAC_LEN 6 +#endif + +#define IPV4_ARRAY_LEN 4 + +#ifndef IF_NAME_LEN +#define IF_NAME_LEN 32 +#endif + +#define MAX_SSID_LEN 33 // max length: 32 + \0 +#define MAX_KEY_LEN 65 // max length: 64 + \0 + +#define CFG_DATA_MAX_BYTES 255 + +typedef enum DhcpMode { + CONNECT_GO_NODHCP = 0, + CONNECT_AP_DHCP = 1, + CONNECT_AP_NODHCP = 2 +} DhcpMode; + +typedef enum FreqType { + FREQUENCY_DEFAULT = 0, + FREQUENCY_160M = 1, +} FreqType; + +typedef enum SelfCfgType { + TYPE_OF_GET_SELF_CONFIG = 1, + TYPE_OF_GET_SELF_CONFIG_WITH_PASSWORD = 2 +} SelfCfgType; + +typedef enum PeerCfgType { + TYPE_OF_SET_PEER_CONFIG = 1, + TYPE_OF_SET_PEER_STATE_CHANGE = 2 +} PeerCfgType; + +typedef enum PreferBandwidth { + /** default */ + BW_DEFAULT, + /** indicates the ultimate bandwidth, corresponding to 160 Mbit/s or 320 Mbit/s in the future. */ + BW_EXTRAM, + /** high throughput. The default value is 80 Mbit/s. */ + BW_HIGH_PERF, + /** low-latency service type, 40 Mbit/s/80 Mbit/s, + * which needs to be determined based on the current channel status. */ + BW_LOW_LATENCY +} PreferBandwidth; + +typedef enum RecommendStatus { + RS_SUCCESS, + RS_LOCAL_ADJUST, + RS_REMOTE_ADJUST, + RS_FAILURE +} RecommendStatus; + +typedef struct Hid2dConnectConfig { + /** Service set ID (SSID). */ + char ssid[MAX_SSID_LEN]; + /** Basic service set ID (BSSID). */ + unsigned char bssid[MAC_LEN]; + /** Key. */ + char preSharedKey[MAX_KEY_LEN]; + /** group frequency. */ + int frequency; + /** connection mode. */ + DhcpMode dhcpMode; +} Hid2dConnectConfig; + +/** + * @Description Ip address info structure, the element format is a 4-bit int array. + * example: 127.0.0.1 -> int[ 127, 0, 0, 1 ] + */ +typedef struct IpAddrInfo { + unsigned int ip[IPV4_ARRAY_LEN]; + unsigned int gateway[IPV4_ARRAY_LEN]; + unsigned int netmask[IPV4_ARRAY_LEN]; +} IpAddrInfo; + +typedef struct RecommendChannelRequest { + /** the interface name of the remote device */ + char remoteIfName[IF_NAME_LEN]; + /** the mode of the interface on the remote device */ + int remoteIfMode; + /** interface name of the local device */ + char localIfName[IF_NAME_LEN]; + /** the mode of the interface on the local device */ + int localIfMode; + /** preferred frequency band */ + int prefBand; + /** preferred bandwidth type (enumerated) */ + PreferBandwidth prefBandwidth; +} RecommendChannelRequest; + +typedef struct RecommendChannelResponse { + /** 0: success; 1: local adjustment; 2: remote adjustment; –1: failure */ + RecommendStatus status; + /* 1 fails. 0-N corresponds to the input array subscript (that is, the interface to be connected) */ + int index; + /* The primary 20 MHz frequency of the channel */ + int centerFreq; + /** + * Do not used if the access point bandwidth is 20 MHz + * If the AP use 40, 80 or 160 MHz, this is the center frequency, if the AP use 80 + 80 MHz, + * this is the center frequency of the first segment + */ + int centerFreq1; + /** + * Only used if the AP bandwidth is 80 + 80 MHz + * if the AP use 80 + 80 MHz, this is the center frequency of the second segment + */ + int centerFreq2; + /* band width */ + int bandwidth; +} RecommendChannelResponse; + +/** + * @Description Request an IP address to the Gc from the IP address pool, used on the GO side. + * + * @param gcMac - gc mac address + * @param ipAddr - Indicates the applied IP address, which is a 4-bit int array. + * example: 127.0.0.1 -> ipAddr[ 127, 0, 0, 1 ] + * @return WifiErrorCode - operate result + */ +WifiErrorCode Hid2dRequestGcIp(const unsigned char gcMac[MAC_LEN], unsigned int ipAddr[IPV4_ARRAY_LEN]); + +/** + * @Description Increase(+1) shared link reference counting + * + * @return WifiErrorCode - operate result + */ +WifiErrorCode Hid2dSharedlinkIncrease(); + +/** + * @Description Decrease(-1) shared link reference counting + * + * @return WifiErrorCode - operate result + */ +WifiErrorCode Hid2dSharedlinkDecrease(); + +/** + * @Description Create hid2d group, used on the GO side. + * + * @param frequency - frequency + * @param type - frequency type + * @return WifiErrorCode - operate result + */ +WifiErrorCode Hid2dCreateGroup(const int frequency, FreqType type); + +/** + * @Description The GC side actively disconnects from the GO, used on the GC side. + * + * @param gcIfName - network interface name + * @return WifiErrorCode - operate result + */ +WifiErrorCode Hid2dRemoveGcGroup(const char gcIfName[IF_NAME_LEN]); + +/** + * @Description Connect to a specified group using hid2d, used on the GC side. + * + * @param config - connection parameters + * @return WifiErrorCode - operate result + */ +WifiErrorCode Hid2dConnect(const Hid2dConnectConfig *config); + +/** + * @Description Configuring IP addresses for P2P network interfaces, used on the GC side. + * + * @param ifName - network interface name + * @param IpInfo - IP infos + * @return WifiErrorCode - operate result + */ +WifiErrorCode Hid2dConfigIPAddr(const char ifName[IF_NAME_LEN], const IpAddrInfo *ipInfo); + +/** + * @Description Clear IP address when the P2P connection is disconnected, used on the GC side. + * + * @param ifName - network interface name + * @return WifiErrorCode - operate result + */ +WifiErrorCode Hid2dReleaseIPAddr(const char ifName[IF_NAME_LEN]); + +/** + * @Description Obtain the recommended channel and bandwidth for link setup + * + * @param request - request data + * @param response - response result + * + * @return WifiErrorCode - operate result + */ +WifiErrorCode Hid2dGetRecommendChannel(const RecommendChannelRequest *request, RecommendChannelResponse *response); + +/** + * @Description Get 5G channel list + * + * @param chanList - An array of pre-allocated memory for storing channel list results, + * Use the '0' to indicates the end of valid data in the "chanList" array. + * + * @param len - the length of the pre-alloc "chanList" + * @return WifiErrorCode - operate result + */ +WifiErrorCode Hid2dGetChannelListFor5G(int *chanList, int len); + +/** + * @Description get the self wifi configuration information + * + * @param cfgType - configuration type + * @param cfgData - the queried data of wifi configuration + * @param getDatValidLen - the valid data length in the array `cfgData` + * @return WifiErrorCode - operate result + */ +WifiErrorCode Hid2dGetSelfWifiCfgInfo(SelfCfgType cfgType, char cfgData[CFG_DATA_MAX_BYTES], int *getDatValidLen); + +/** + * @Description set the peer wifi configuration information + * + * @param cfgType - configuration type + * @param cfgData - the wifi configuration data to be set + * @param setDataValidLen - the valid data length in the array `cfgData` + * @return WifiErrorCode - operate result + */ +WifiErrorCode Hid2dSetPeerWifiCfgInfo(PeerCfgType cfgType, char cfgData[CFG_DATA_MAX_BYTES], int setDataValidLen); + +/** + * @Description Querying the support capability of wide bandwidth + * + * @return int - 0: not supported, 1: supported + */ +int Hid2dIsWideBandwidthSupported(); +#ifdef __cplusplus +} +#endif + +#endif diff --git a/interfaces/innerkits/native_c/wifi_hotspot.h b/interfaces/innerkits/native_c/wifi_hotspot.h index 2aee5e2..82ef30a 100755 --- a/interfaces/innerkits/native_c/wifi_hotspot.h +++ b/interfaces/innerkits/native_c/wifi_hotspot.h @@ -1,152 +1,152 @@ -/* - * Copyright (c) 2020 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * @addtogroup wifiservice - * @{ - * - * @brief Provides functions for the Wi-Fi station and hotspot modes. - * - * You can use this module to enable and disable the Wi-Fi station or hotspot mode, connect to and disconnect from a - * station or hotspot, query the station or hotspot status, and listen for events. \n - * - * @since 7 - */ - -/** - * @file wifi_hotspot.h - * - * @brief Provides capabilities to enable and disable the hotspot mode, connect to and disconnect from a hotspot, query - * the hotspot status, and listen for events. - * - * @since 7 - */ - -#ifndef HARMONY_OS_LITE_WIFI_HOTSPOT_H -#define HARMONY_OS_LITE_WIFI_HOTSPOT_H -#include "wifi_device.h" -#include "wifi_error_code.h" -#include "wifi_hotspot_config.h" -#include "wifi_event.h" - -#ifdef __cplusplus -extern "C" { -#endif - -/** - * @brief Defines the default channel of the hotspot mode. - */ -#define HOTSPOT_DEFAULT_CHANNEL 6 - -/** - * @brief Enables the hotspot mode. - * - * Before using this function, you need to invoke {@link SetHotspotConfig} and set at least the SSID, security type, - * and key. \n - * - * @return Returns {@link WIFI_SUCCESS} if the hotspot mode is enabled; returns an error code defined in - * {@link WifiErrorCode} otherwise. - * @since 7 - */ -WifiErrorCode EnableHotspot(void); - -/** - * @brief Disables the hotspot mode. - * - * @return Returns {@link WIFI_SUCCESS} if the hotspot mode is disabled; returns an error code defined in - * {@link WifiErrorCode} otherwise. - * @since 7 - */ -WifiErrorCode DisableHotspot(void); - -/** - * @brief Sets a specified hotspot configuration. - * - * The hotspot configuration includes the SSID, security type, and key. The configuration set overwrites the existing - * configuration and takes effect after the hotspot mode is re-enabled. \n - * Before enabling the hotspot mode for the first time, you must call this function. \n - * - * @param config Indicates the hotspot configuration to set. - * @return Returns {@link WIFI_SUCCESS} if the hotspot configuration is set; returns an error code defined in - * {@link WifiErrorCode} otherwise. - * @since 7 - */ -WifiErrorCode SetHotspotConfig(const HotspotConfig *config); - -/** - * @brief Obtains a specified hotspot configuration. - * - * The hotspot configuration includes the SSID, security type, and key. \n - * - * @param result Indicates the obtained hotspot configuration. - * @return Returns {@link WIFI_SUCCESS} if the hotspot configuration is obtained; returns an error code defined in - * {@link WifiErrorCode} otherwise. - * @since 7 - */ -WifiErrorCode GetHotspotConfig(HotspotConfig *result); - -/** - * @brief Checks whether the hotspot mode is enabled. - * - * @return Returns {@link WIFI_HOTSPOT_ACTIVE} if the hotspot mode is enabled; returns {@link WIFI_HOTSPOT_NOT_ACTIVE} - * otherwise. - * @since 7 - */ -int IsHotspotActive(void); - -/** - * @brief Obtains an array of stations connected to this hotspot. - * - * The station information is defined in {@link StationInfo}. \n - * - * @param result Indicates the array of stations connected to this hotspot. The array is requested and released by the - * caller. The value must be greater than or equal to {@link WIFI_MAX_STA_NUM}. - * @param size Indicates the size of the array. - * @return Returns {@link WIFI_SUCCESS} if the array of stations connected to this hotspot is obtained; returns an error - * code defined in {@link WifiErrorCode} otherwise. - * @since 7 - */ -WifiErrorCode GetStationList(StationInfo *result, unsigned int *size); - -/** - * @brief Disconnects from the station with a specified MAC address. - * - * @param mac Indicates the pointer to the MAC address of the station. - * @param macLen Indicates the length of the MAC address of the station. - * @return Returns {@link WIFI_SUCCESS} if the function is successfully called; - * returns an error code defined in {@link WifiErrorCode} otherwise. - * @since 7 - */ -WifiErrorCode DisassociateSta(unsigned char *mac, int macLen); - -/** - * @brief Adds the hotspot transmit power to the beacon. - * - * After the transmit power is added, the beacon must contain specified IEs. If the minimum transmit power - * 0xFFFFFFFF is added, the beacon does not contain the IEs. \n - * The transmit power is added to the ie field only, exerting no impacts on the transmit power. \n - * @param power Indicates the transmit power to add. - * @return Returns {@link WIFI_SUCCESS} if the function is successfully called; returns an error code defined - * in {@link WifiErrorCode} otherwise. - * @since 7 - */ -WifiErrorCode AddTxPowerInfo(int power); - -#ifdef __cplusplus -} -#endif - -#endif // HARMONY_OS_LITE_WIFI_HOTSPOT_H_ -/** @} */ +/* + * Copyright (c) 2020 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @addtogroup wifiservice + * @{ + * + * @brief Provides functions for the Wi-Fi station and hotspot modes. + * + * You can use this module to enable and disable the Wi-Fi station or hotspot mode, connect to and disconnect from a + * station or hotspot, query the station or hotspot status, and listen for events. \n + * + * @since 7 + */ + +/** + * @file wifi_hotspot.h + * + * @brief Provides capabilities to enable and disable the hotspot mode, connect to and disconnect from a hotspot, query + * the hotspot status, and listen for events. + * + * @since 7 + */ + +#ifndef HARMONY_OS_LITE_WIFI_HOTSPOT_H +#define HARMONY_OS_LITE_WIFI_HOTSPOT_H +#include "wifi_device.h" +#include "wifi_error_code.h" +#include "wifi_hotspot_config.h" +#include "wifi_event.h" + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * @brief Defines the default channel of the hotspot mode. + */ +#define HOTSPOT_DEFAULT_CHANNEL 6 + +/** + * @brief Enables the hotspot mode. + * + * Before using this function, you need to invoke {@link SetHotspotConfig} and set at least the SSID, security type, + * and key. \n + * + * @return Returns {@link WIFI_SUCCESS} if the hotspot mode is enabled; returns an error code defined in + * {@link WifiErrorCode} otherwise. + * @since 7 + */ +WifiErrorCode EnableHotspot(void); + +/** + * @brief Disables the hotspot mode. + * + * @return Returns {@link WIFI_SUCCESS} if the hotspot mode is disabled; returns an error code defined in + * {@link WifiErrorCode} otherwise. + * @since 7 + */ +WifiErrorCode DisableHotspot(void); + +/** + * @brief Sets a specified hotspot configuration. + * + * The hotspot configuration includes the SSID, security type, and key. The configuration set overwrites the existing + * configuration and takes effect after the hotspot mode is re-enabled. \n + * Before enabling the hotspot mode for the first time, you must call this function. \n + * + * @param config Indicates the hotspot configuration to set. + * @return Returns {@link WIFI_SUCCESS} if the hotspot configuration is set; returns an error code defined in + * {@link WifiErrorCode} otherwise. + * @since 7 + */ +WifiErrorCode SetHotspotConfig(const HotspotConfig *config); + +/** + * @brief Obtains a specified hotspot configuration. + * + * The hotspot configuration includes the SSID, security type, and key. \n + * + * @param result Indicates the obtained hotspot configuration. + * @return Returns {@link WIFI_SUCCESS} if the hotspot configuration is obtained; returns an error code defined in + * {@link WifiErrorCode} otherwise. + * @since 7 + */ +WifiErrorCode GetHotspotConfig(HotspotConfig *result); + +/** + * @brief Checks whether the hotspot mode is enabled. + * + * @return Returns {@link WIFI_HOTSPOT_ACTIVE} if the hotspot mode is enabled; returns {@link WIFI_HOTSPOT_NOT_ACTIVE} + * otherwise. + * @since 7 + */ +int IsHotspotActive(void); + +/** + * @brief Obtains an array of stations connected to this hotspot. + * + * The station information is defined in {@link StationInfo}. \n + * + * @param result Indicates the array of stations connected to this hotspot. The array is requested and released by the + * caller. The value must be greater than or equal to {@link WIFI_MAX_STA_NUM}. + * @param size Indicates the size of the array. + * @return Returns {@link WIFI_SUCCESS} if the array of stations connected to this hotspot is obtained; returns an error + * code defined in {@link WifiErrorCode} otherwise. + * @since 7 + */ +WifiErrorCode GetStationList(StationInfo *result, unsigned int *size); + +/** + * @brief Disconnects from the station with a specified MAC address. + * + * @param mac Indicates the pointer to the MAC address of the station. + * @param macLen Indicates the length of the MAC address of the station. + * @return Returns {@link WIFI_SUCCESS} if the function is successfully called; + * returns an error code defined in {@link WifiErrorCode} otherwise. + * @since 7 + */ +WifiErrorCode DisassociateSta(unsigned char *mac, int macLen); + +/** + * @brief Adds the hotspot transmit power to the beacon. + * + * After the transmit power is added, the beacon must contain specified IEs. If the minimum transmit power + * 0xFFFFFFFF is added, the beacon does not contain the IEs. \n + * The transmit power is added to the ie field only, exerting no impacts on the transmit power. \n + * @param power Indicates the transmit power to add. + * @return Returns {@link WIFI_SUCCESS} if the function is successfully called; returns an error code defined + * in {@link WifiErrorCode} otherwise. + * @since 7 + */ +WifiErrorCode AddTxPowerInfo(int power); + +#ifdef __cplusplus +} +#endif + +#endif // HARMONY_OS_LITE_WIFI_HOTSPOT_H_ +/** @} */ diff --git a/interfaces/innerkits/native_c/wifi_hotspot_config.h b/interfaces/innerkits/native_c/wifi_hotspot_config.h index fef32e7..51ecc2e 100755 --- a/interfaces/innerkits/native_c/wifi_hotspot_config.h +++ b/interfaces/innerkits/native_c/wifi_hotspot_config.h @@ -1,121 +1,121 @@ -/* - * Copyright (c) 2020 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * @addtogroup wifiservice - * @{ - * - * @brief Provides functions for the Wi-Fi station and hotspot modes. - * - * You can use this module to enable and disable the Wi-Fi station or hotspot mode, connect to and disconnect from a - * station or hotspot, query the station or hotspot status, and listen for events. \n - * - * @since 7 - */ - -/** - * @file wifi_hotspot_config.h - * - * @brief Defines the Wi-Fi hotspot configuration. - * - * @since 7 - */ - -#ifndef WIFI_HOTSPOT_CONFIG_C_H -#define WIFI_HOTSPOT_CONFIG_C_H - -#include "wifi_device_config.h" -#include "wifi_error_code.h" - -/** - * @brief Defines the maximum number of stations connected to a hotspot. - */ -#define WIFI_MAX_STA_NUM 6 - -/** - * @brief Enumerates received signal strength indicator (RSSI) levels. - * - * Four RSSI levels are available: 1 to 4. The higher the RSSI level, the stronger the Wi-Fi signal. - * - * @since 7 - */ -typedef enum { - /** Level 1. The RSSI value for a 2.4 GHz hotspot ranges from -88 (included) to -82 (excluded), - * and that for a 5 GHz hotspot ranges from -85 (included) to -79 (excluded). */ - RSSI_LEVEL_1 = 1, - /** Level 2. The RSSI value for a 2.4 GHz hotspot ranges from -82 (included) to -75 (excluded), - * and that for a 5 GHz hotspot ranges from -79 (included) to -72 (excluded). */ - RSSI_LEVEL_2 = 2, - /** Level 3. The RSSI value for a 2.4 GHz hotspot ranges from -75 (included) to -65 (excluded), - * and that for a 5 GHz hotspot ranges from -72 (included) to -65 (excluded). */ - RSSI_LEVEL_3 = 3, - /** Level 4. The RSSI value for a 2.4 GHz or 5 GHz hotspot is greater than or equal to -65. */ - RSSI_LEVEL_4 = 4, -} RssiLevel; - -/** - * @brief Enumerates frequency bands supported by the Wi-Fi hotspot mode. - * - * @since 7 - */ -typedef enum { - /** 2.4 GHz */ - HOTSPOT_BAND_TYPE_2G = 1, - /** 5 GHz */ - HOTSPOT_BAND_TYPE_5G = 2, -} HotspotBandType; - -/** - * @brief Represents the hotspot configuration. - * - * A hotspot configuration must contain the SSID (or BSSID), security type, and key (if the security type is open). \n - * - * @since 7 - */ -typedef struct { - /** Service set ID (SSID). For its length, see {@link WIFI_MAX_SSID_LEN}. */ - char ssid[WIFI_MAX_SSID_LEN]; - /** Security type */ - int securityType; - /** Frequency band */ - int band; - /** Channel number */ - int channelNum; - /** Key. For its length, see {@link WIFI_MAX_SSID_LEN}. */ - char preSharedKey[WIFI_MAX_KEY_LEN]; -} HotspotConfig; - -/** - * @brief Sets the frequency band for this hotspot. - * - * @param band Indicates the frequency band to set. - * @return Returns {@link WIFI_SUCCESS} if the frequency band is set; returns an error code defined in - * {@link WifiErrorCode} otherwise. - * @since 7 - */ -WifiErrorCode SetBand(int band); - -/** - * @brief Obtains the frequency band of this hotspot. - * - * @param result Indicates the obtained frequency band. - * @return Returns {@link WIFI_SUCCESS} if the frequency band is obtained; returns an error code defined in - * {@link WifiErrorCode} otherwise. - * @since 7 - */ -WifiErrorCode GetBand(int *result); - -#endif // WIFI_HOTSPOT_CONFIG_C_H -/** @} */ +/* + * Copyright (c) 2020 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @addtogroup wifiservice + * @{ + * + * @brief Provides functions for the Wi-Fi station and hotspot modes. + * + * You can use this module to enable and disable the Wi-Fi station or hotspot mode, connect to and disconnect from a + * station or hotspot, query the station or hotspot status, and listen for events. \n + * + * @since 7 + */ + +/** + * @file wifi_hotspot_config.h + * + * @brief Defines the Wi-Fi hotspot configuration. + * + * @since 7 + */ + +#ifndef WIFI_HOTSPOT_CONFIG_C_H +#define WIFI_HOTSPOT_CONFIG_C_H + +#include "wifi_device_config.h" +#include "wifi_error_code.h" + +/** + * @brief Defines the maximum number of stations connected to a hotspot. + */ +#define WIFI_MAX_STA_NUM 6 + +/** + * @brief Enumerates received signal strength indicator (RSSI) levels. + * + * Four RSSI levels are available: 1 to 4. The higher the RSSI level, the stronger the Wi-Fi signal. + * + * @since 7 + */ +typedef enum { + /** Level 1. The RSSI value for a 2.4 GHz hotspot ranges from -88 (included) to -82 (excluded), + * and that for a 5 GHz hotspot ranges from -85 (included) to -79 (excluded). */ + RSSI_LEVEL_1 = 1, + /** Level 2. The RSSI value for a 2.4 GHz hotspot ranges from -82 (included) to -75 (excluded), + * and that for a 5 GHz hotspot ranges from -79 (included) to -72 (excluded). */ + RSSI_LEVEL_2 = 2, + /** Level 3. The RSSI value for a 2.4 GHz hotspot ranges from -75 (included) to -65 (excluded), + * and that for a 5 GHz hotspot ranges from -72 (included) to -65 (excluded). */ + RSSI_LEVEL_3 = 3, + /** Level 4. The RSSI value for a 2.4 GHz or 5 GHz hotspot is greater than or equal to -65. */ + RSSI_LEVEL_4 = 4, +} RssiLevel; + +/** + * @brief Enumerates frequency bands supported by the Wi-Fi hotspot mode. + * + * @since 7 + */ +typedef enum { + /** 2.4 GHz */ + HOTSPOT_BAND_TYPE_2G = 1, + /** 5 GHz */ + HOTSPOT_BAND_TYPE_5G = 2, +} HotspotBandType; + +/** + * @brief Represents the hotspot configuration. + * + * A hotspot configuration must contain the SSID (or BSSID), security type, and key (if the security type is open). \n + * + * @since 7 + */ +typedef struct { + /** Service set ID (SSID). For its length, see {@link WIFI_MAX_SSID_LEN}. */ + char ssid[WIFI_MAX_SSID_LEN]; + /** Security type */ + int securityType; + /** Frequency band */ + int band; + /** Channel number */ + int channelNum; + /** Key. For its length, see {@link WIFI_MAX_SSID_LEN}. */ + char preSharedKey[WIFI_MAX_KEY_LEN]; +} HotspotConfig; + +/** + * @brief Sets the frequency band for this hotspot. + * + * @param band Indicates the frequency band to set. + * @return Returns {@link WIFI_SUCCESS} if the frequency band is set; returns an error code defined in + * {@link WifiErrorCode} otherwise. + * @since 7 + */ +WifiErrorCode SetBand(int band); + +/** + * @brief Obtains the frequency band of this hotspot. + * + * @param result Indicates the obtained frequency band. + * @return Returns {@link WIFI_SUCCESS} if the frequency band is obtained; returns an error code defined in + * {@link WifiErrorCode} otherwise. + * @since 7 + */ +WifiErrorCode GetBand(int *result); + +#endif // WIFI_HOTSPOT_CONFIG_C_H +/** @} */ diff --git a/interfaces/innerkits/native_c/wifi_linked_info.h b/interfaces/innerkits/native_c/wifi_linked_info.h index 0e6ea3c..85c4ed1 100755 --- a/interfaces/innerkits/native_c/wifi_linked_info.h +++ b/interfaces/innerkits/native_c/wifi_linked_info.h @@ -1,79 +1,79 @@ -/* - * Copyright (c) 2020 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * @addtogroup wifiservice - * @{ - * - * @brief Provides functions for the Wi-Fi station and hotspot modes. - * - * You can use this module to enable and disable the Wi-Fi station or hotspot mode, connect to and disconnect from a - * station or hotspot, query the station or hotspot status, and listen for events. \n - * - * @since 7 - */ - -/** - * @file wifi_linked_info.h - * - * @brief Defines the data structure and macro of the Wi-Fi connection information. - * - * @since 7 - */ - -#ifndef HARMONY_OS_LITE_WIFI_LINKED_INFO_H -#define HARMONY_OS_LITE_WIFI_LINKED_INFO_H -#include "wifi_device_config.h" - -/** - * @brief Enumerates Wi-Fi connection states. - * - * @since 7 - */ -typedef enum { - /** Disconnected */ - WIFI_DISCONNECTED, - /** Connected */ - WIFI_CONNECTED -} WifiConnState; - -/** - * @brief Represents the Wi-Fi connection information. - * - * This refers to the information about the hotspot connected to this station. The information is obtained using - * {@link GetLinkedInfo}. - * - * @since 7 - */ -typedef struct { - /** Service set ID (SSID). For its length, see {@link WIFI_MAX_SSID_LEN}. */ - char ssid[WIFI_MAX_SSID_LEN]; - /** Basic service set ID (BSSID). For its length, see {@link WIFI_MAC_LEN}. */ - unsigned char bssid[WIFI_MAC_LEN]; - /** Received signal strength indicator (RSSI) */ - int rssi; - /** Wi-Fi band information of hotspot */ - int band; - /** Wi-Fi frequency information of hotspot */ - int frequency; - /** Wi-Fi connection state, which is defined in {@link WifiConnState} */ - WifiConnState connState; - /** Reason for Wi-Fi disconnection */ - unsigned short disconnectedReason; - /** IP address of the connected hotspot */ - unsigned int ipAddress; -} WifiLinkedInfo; -#endif // HARMONY_OS_LITE_WIFI_LINKED_INFO_H -/** @} */ +/* + * Copyright (c) 2020 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @addtogroup wifiservice + * @{ + * + * @brief Provides functions for the Wi-Fi station and hotspot modes. + * + * You can use this module to enable and disable the Wi-Fi station or hotspot mode, connect to and disconnect from a + * station or hotspot, query the station or hotspot status, and listen for events. \n + * + * @since 7 + */ + +/** + * @file wifi_linked_info.h + * + * @brief Defines the data structure and macro of the Wi-Fi connection information. + * + * @since 7 + */ + +#ifndef HARMONY_OS_LITE_WIFI_LINKED_INFO_H +#define HARMONY_OS_LITE_WIFI_LINKED_INFO_H +#include "wifi_device_config.h" + +/** + * @brief Enumerates Wi-Fi connection states. + * + * @since 7 + */ +typedef enum { + /** Disconnected */ + WIFI_DISCONNECTED, + /** Connected */ + WIFI_CONNECTED +} WifiConnState; + +/** + * @brief Represents the Wi-Fi connection information. + * + * This refers to the information about the hotspot connected to this station. The information is obtained using + * {@link GetLinkedInfo}. + * + * @since 7 + */ +typedef struct { + /** Service set ID (SSID). For its length, see {@link WIFI_MAX_SSID_LEN}. */ + char ssid[WIFI_MAX_SSID_LEN]; + /** Basic service set ID (BSSID). For its length, see {@link WIFI_MAC_LEN}. */ + unsigned char bssid[WIFI_MAC_LEN]; + /** Received signal strength indicator (RSSI) */ + int rssi; + /** Wi-Fi band information of hotspot */ + int band; + /** Wi-Fi frequency information of hotspot */ + int frequency; + /** Wi-Fi connection state, which is defined in {@link WifiConnState} */ + WifiConnState connState; + /** Reason for Wi-Fi disconnection */ + unsigned short disconnectedReason; + /** IP address of the connected hotspot */ + unsigned int ipAddress; +} WifiLinkedInfo; +#endif // HARMONY_OS_LITE_WIFI_LINKED_INFO_H +/** @} */ diff --git a/interfaces/innerkits/native_c/wifi_p2p.h b/interfaces/innerkits/native_c/wifi_p2p.h new file mode 100755 index 0000000..60fef2f --- /dev/null +++ b/interfaces/innerkits/native_c/wifi_p2p.h @@ -0,0 +1,207 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OHOS_C_P2P_H +#define OHOS_C_P2P_H + +#include "wifi_error_code.h" +#include "wifi_p2p_config.h" + +#ifdef __cplusplus +extern "C" { +#endif + +typedef void (*P2pStateChangedCallback)(P2pState state); +typedef void (*P2pPersistentGroupsChangedCallback)(void); +typedef void (*P2pConnectionChangedCallback)(const WifiP2pLinkedInfo info); +typedef void (*P2pPeersChangedCallback)(WifiP2pDevice* devices, int len); + +/** + * @Description Enabling the P2P Mode. + * + * @return WifiErrorCode - operate result + */ +WifiErrorCode EnableP2p(); + +/** + * @Description Disable the P2P mode. + * + * @return WifiErrorCode - operate result + */ +WifiErrorCode DisableP2p(); + +/** + * @Description Get p2p enable status + * + * @param state - enable status + * @return WifiErrorCode - operate result + */ +WifiErrorCode GetP2pEnableStatus(P2pState* state); + +/** + * @Description Start Wi-Fi P2P device search. + * + * @return WifiErrorCode - operate result + */ +WifiErrorCode DiscoverDevices(); + +/** + * @Description Stop Wi-Fi P2P device search. + * + * @return WifiErrorCode - operate result + */ +WifiErrorCode StopDiscoverDevices(); + +/** + * @Description Start the search for the Wi-Fi P2P service. + * + * @return WifiErrorCode - operate result + */ +WifiErrorCode DiscoverServices(); + +/** + * @Description Stop the search for the Wi-Fi P2P service. + * + * @return WifiErrorCode - operate result + */ +WifiErrorCode StopDiscoverServices(); + +/** + * @Description Enable Wi-Fi P2P listening. + * + * @param period - period + * @param interval - interval + * @return WifiErrorCode - operate result + */ +WifiErrorCode StartP2pListen(int period, int interval); + +/** + * @Description Disable Wi-Fi P2P listening. + * + * @return ErrCode - operate result + */ +WifiErrorCode StopP2pListen(); + +/** + * @Description Creating a P2P Group. + * + * @param config - WifiP2pConfig object + * @return WifiErrorCode - operate result + */ +WifiErrorCode CreateGroup(const WifiP2pConfig* config); + +/** + * @Description Remove a P2P Group. + * + * @param config - WifiP2pConfig object + * @return WifiErrorCode - operate result + */ +WifiErrorCode RemoveGroup(); + +/** + * @Description Delete a p2p Group. + * + * @param group - WifiP2pGroupInfo object + * @return ErrCode - operate result + */ +WifiErrorCode DeleteGroup(const WifiP2pGroupInfo* group); + +/** + * @Description P2P connection. + * + * @param config - WifiP2pConfig object + * @return WifiErrorCode - operate result + */ +WifiErrorCode P2pConnect(const WifiP2pConfig* config); + +/** + * @Description P2P disconnection. + * + * @return WifiErrorCode - operate result + */ +WifiErrorCode P2pDisConnect(); + +/** + * @Description Get the Current Group object. + * + * @param groupInfo - the WifiP2pGroupInfo object + * @return WifiErrorCode - operate result + */ +WifiErrorCode GetCurrentGroup(WifiP2pGroupInfo* groupInfo); + +/** + * @Description Obtains the P2P connection status. + * + * @param status - the P2P connection status + * @return WifiErrorCode - operate result + */ +WifiErrorCode GetP2pConnectedStatus(int* status); + +/** + * @Description Query the information about the found devices. + * + * @param clientDevices - pre-allocate memory for client devices + * @param size - the allocate size for clientDevices + * @param retSize - the queryed size of the client devices, used for return. + * @return WifiErrorCode - operate result + */ +WifiErrorCode QueryP2pDevices(WifiP2pDevice* clientDevices, int size, int* retSize); + +/** + * @Description Query the information about the found groups. + * + * @param groupInfo - pre-allocate memory for group size + * @param size - the allocate size for groupInfo + * @return ErrCode - operate result + */ +WifiErrorCode QueryP2pGroups(WifiP2pGroupInfo* groupInfo, int size); + +/** + * @Description register p2p state changed event + * + * @param callback - callback function + * @return ErrCode - operate result + */ +WifiErrorCode RegisterP2pStateChangedCallback(const P2pStateChangedCallback callback); + +/** + * @Description register p2p persistent group change event + * + * @param callback - callback function + * @return ErrCode - operate result + */ +WifiErrorCode RegisterP2pPersistentGroupsChangedCallback(const P2pPersistentGroupsChangedCallback callback); + +/** + * @Description register p2p connection change event + * + * @param callback - callback function + * @return ErrCode - operate result + */ +WifiErrorCode RegisterP2pConnectionChangedCallback(const P2pConnectionChangedCallback callback); + +/** + * @Description register p2p peers change event + * + * @param callback - callback function + * @return ErrCode - operate result + */ +WifiErrorCode RegisterP2pPeersChangedCallback(const P2pPeersChangedCallback callback); + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/interfaces/innerkits/native_c/wifi_p2p_config.h b/interfaces/innerkits/native_c/wifi_p2p_config.h new file mode 100755 index 0000000..9a882cc --- /dev/null +++ b/interfaces/innerkits/native_c/wifi_p2p_config.h @@ -0,0 +1,123 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OHOS_C_P2P_CONFIG_H +#define OHOS_C_P2P_CONFIG_H + +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef COMMON_MAC_LEN +#define COMMON_MAC_LEN 6 +#endif + +#define PASSPHRASE_LENGTH 64 +#define P2P_NAME_LENGTH 33 +#define INTERFACE_LENGTH 16 +#define DEVICE_TYPE_LENGTH 128 +#define MAX_DEVICES_NUM 256 +#define IP_ADDR_STR_LEN 16 + +typedef enum GroupOwnerBand { + GO_BAND_AUTO, + GO_BAND_2GHZ, + GO_BAND_5GHZ +} GroupOwnerBand; + +typedef struct WifiP2pConfig { + unsigned char devAddr[COMMON_MAC_LEN]; /* the device MAC address */ + GroupOwnerBand goBand; + int netId; /* network id, when -2 means persistent and -1 means temporary, else need >= 0 */ + char passphrase[PASSPHRASE_LENGTH]; /* the value ranges from 8 to 63. */ + int groupOwnerIntent; /* the value is -1.(A value of -1 indicates the system can choose an appropriate value.) */ + char groupName[P2P_NAME_LENGTH]; /* the value ranges from 1 to 32. */ +} WifiP2pConfig; + +typedef enum P2pGroupStatus { + GS_CREATING, + GS_CREATED, + GS_STARTED, + GS_REMOVING, + GS_INVALID +} P2pGroupStatus; + +typedef enum P2pDeviceStatus { + PDS_CONNECTED, + PDS_INVITED, + PDS_FAILED, + PDS_AVAILABLE, + PDS_UNAVAILABLE +} P2pDeviceStatus; + +typedef enum P2pState { + P2P_STATE_NONE = 0, + P2P_STATE_IDLE, + P2P_STATE_STARTING, + P2P_STATE_STARTED, + P2P_STATE_CLOSING, + P2P_STATE_CLOSED, +} P2pState; + +typedef enum P2pConnectionState { + P2P_DISCONNECTED = 0, + P2P_CONNECTED, +} P2pConnectionState; + +typedef struct WifiP2pWfdInfo { + int wfdEnabled; /* 0: false, 1: true */ + int deviceInfo; + int ctrlPort; + int maxThroughput; +} WifiP2pWfdInfo; + +typedef struct WifiP2pDevice { + char deviceName[P2P_NAME_LENGTH]; /* the value range is 0 to 32 characters. */ + unsigned char devAddr[COMMON_MAC_LEN]; /* the device MAC address */ + char primaryDeviceType[DEVICE_TYPE_LENGTH]; + char secondaryDeviceType[DEVICE_TYPE_LENGTH]; + P2pDeviceStatus status; + WifiP2pWfdInfo wfdInfo; + unsigned int supportWpsConfigMethods; + int deviceCapabilitys; + int groupCapabilitys; +} WifiP2pDevice; + +typedef struct WifiP2pGroupInfo { + WifiP2pDevice owner; + int isP2pGroupOwner; /* 0: false, 1: true */ + char passphrase[PASSPHRASE_LENGTH]; /* the value ranges from 8 to 63. */ + char interface[INTERFACE_LENGTH]; + char groupName[P2P_NAME_LENGTH]; + int networkId; + int frequency; /* for example : freq=2412 to select 2.4 GHz channel 1.(Based on 2.4 GHz or 5 GHz) */ + int isP2pPersistent; /* 0: false, 1: true */ + P2pGroupStatus groupStatus; + WifiP2pDevice clientDevices[MAX_DEVICES_NUM]; + int clientDevicesSize; /* the true size of clientDevices array */ + char goIpAddress[IP_ADDR_STR_LEN]; +} WifiP2pGroupInfo; + +typedef struct WifiP2pLinkedInfo { + P2pConnectionState connectState; + int isP2pGroupOwner; + unsigned char groupOwnerAddress[COMMON_MAC_LEN]; +} WifiP2pLinkedInfo; + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/interfaces/innerkits/native_c/wifi_scan_info.h b/interfaces/innerkits/native_c/wifi_scan_info.h index c7feded..bad573c 100755 --- a/interfaces/innerkits/native_c/wifi_scan_info.h +++ b/interfaces/innerkits/native_c/wifi_scan_info.h @@ -1,67 +1,67 @@ -/* - * Copyright (c) 2020 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * @addtogroup wifiservice - * @{ - * - * @brief Provides functions for the Wi-Fi station and hotspot modes. - * - * You can use this module to enable and disable the Wi-Fi station or hotspot mode, connect to and disconnect from a - * station or hotspot, query the station or hotspot status, and listen for events. \n - * - * @since 7 - */ - -/** - * @file wifi_scan_info.h - * - * @brief Defines the data structure and macro of the Wi-Fi scan result information. - * - * @since 7 - */ - -#ifndef WIFI_SCAN_INFO_C_H -#define WIFI_SCAN_INFO_C_H - -#include "wifi_device_config.h" - -/** - * @brief Indicates the maximum number of hotspots that can be detected in a Wi-Fi scan. - */ -#define WIFI_SCAN_HOTSPOT_LIMIT 64 - -/** - * @brief Represents the Wi-Fi scan result information. - * - * @since 7 - */ -typedef struct { - /** Service set ID (SSID). For its length, see {@link WIFI_MAX_SSID_LEN}. */ - char ssid[WIFI_MAX_SSID_LEN]; - /** Basic service set ID (BSSID). For its length, see {@link WIFI_MAC_LEN}. */ - unsigned char bssid[WIFI_MAC_LEN]; - /** Security type. For details, see {@link WifiSecurityType}. */ - int securityType; - /** Received signal strength indicator (RSSI) */ - int rssi; - /** Frequency band */ - int band; - /** Frequency in MHz */ - int frequency; -} WifiScanInfo; - -#endif // WIFI_SCAN_INFO_C_H -/** @} */ +/* + * Copyright (c) 2020 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @addtogroup wifiservice + * @{ + * + * @brief Provides functions for the Wi-Fi station and hotspot modes. + * + * You can use this module to enable and disable the Wi-Fi station or hotspot mode, connect to and disconnect from a + * station or hotspot, query the station or hotspot status, and listen for events. \n + * + * @since 7 + */ + +/** + * @file wifi_scan_info.h + * + * @brief Defines the data structure and macro of the Wi-Fi scan result information. + * + * @since 7 + */ + +#ifndef WIFI_SCAN_INFO_C_H +#define WIFI_SCAN_INFO_C_H + +#include "wifi_device_config.h" + +/** + * @brief Indicates the maximum number of hotspots that can be detected in a Wi-Fi scan. + */ +#define WIFI_SCAN_HOTSPOT_LIMIT 64 + +/** + * @brief Represents the Wi-Fi scan result information. + * + * @since 7 + */ +typedef struct { + /** Service set ID (SSID). For its length, see {@link WIFI_MAX_SSID_LEN}. */ + char ssid[WIFI_MAX_SSID_LEN]; + /** Basic service set ID (BSSID). For its length, see {@link WIFI_MAC_LEN}. */ + unsigned char bssid[WIFI_MAC_LEN]; + /** Security type. For details, see {@link WifiSecurityType}. */ + int securityType; + /** Received signal strength indicator (RSSI) */ + int rssi; + /** Frequency band */ + int band; + /** Frequency in MHz */ + int frequency; +} WifiScanInfo; + +#endif // WIFI_SCAN_INFO_C_H +/** @} */ diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_device.cpp b/interfaces/innerkits/native_cpp/napi/wifi_napi_device.cpp index ff5c63f..ed34861 100755 --- a/interfaces/innerkits/native_cpp/napi/wifi_napi_device.cpp +++ b/interfaces/innerkits/native_cpp/napi/wifi_napi_device.cpp @@ -1,636 +1,636 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "wifi_napi_device.h" -#include "wifi_logger.h" -#include -#include - -namespace OHOS { -namespace Wifi { -DEFINE_WIFILOG_LABEL("WifiNAPIDevice"); - -std::unique_ptr wifiDevicePtr = WifiDevice::GetInstance(WIFI_DEVICE_ABILITY_ID); -std::unique_ptr wifiScanPtr = WifiScan::GetInstance(WIFI_SCAN_ABILITY_ID); -napi_value EnableWifi(napi_env env, napi_callback_info info) -{ - TRACE_FUNC_CALL; - NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); - ErrCode ret = wifiDevicePtr->EnableWifi(); - napi_value result; - napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); - return result; -} - -napi_value DisableWifi(napi_env env, napi_callback_info info) -{ - TRACE_FUNC_CALL; - NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); - ErrCode ret = wifiDevicePtr->DisableWifi(); - napi_value result; - napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); - return result; -} - -napi_value IsWifiActive(napi_env env, napi_callback_info info) -{ - NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); - bool activeStatus = false; - ErrCode ret = wifiDevicePtr->IsWifiActive(activeStatus); - if (ret != WIFI_OPT_SUCCESS) { - WIFI_LOGE("Get wifi active status fail: %{public}d", ret); - } - - napi_value result; - napi_get_boolean(env, activeStatus, &result); - return result; -} - -napi_value Scan(napi_env env, napi_callback_info info) -{ - TRACE_FUNC_CALL; - NAPI_ASSERT(env, wifiScanPtr != nullptr, "Wifi scan instance is null."); - ErrCode ret = wifiScanPtr->Scan(); - - napi_value result; - napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); - return result; -} - -static SecTypeJs SecurityTypeNativeToJs(const WifiSecurity& cppSecurityType) -{ - SecTypeJs jsSecurityType = SecTypeJs::SEC_TYPE_INVALID; - switch (cppSecurityType) { - case WifiSecurity::OPEN: - jsSecurityType = SecTypeJs::SEC_TYPE_OPEN; - break; - - case WifiSecurity::WEP: - jsSecurityType = SecTypeJs::SEC_TYPE_WEP; - break; - - case WifiSecurity::PSK: - jsSecurityType = SecTypeJs::SEC_TYPE_PSK; - break; - - case WifiSecurity::SAE: - jsSecurityType = SecTypeJs::SEC_TYPE_SAE; - break; - - default: - jsSecurityType = SecTypeJs::SEC_TYPE_INVALID; - break; - } - return jsSecurityType; -} - -static bool NativeScanInfosToJsObj(const napi_env& env, - const std::vector& vecScnIanfos, napi_value& arrayResult) -{ - uint32_t idx = 0; - for (auto& each : vecScnIanfos) { - napi_value eachObj; - napi_create_object(env, &eachObj); - - SetValueUtf8String(env, "ssid", each.ssid.c_str(), eachObj); - SetValueUtf8String(env, "bssid", each.bssid.c_str(), eachObj); - SetValueInt32(env, "securityType", static_cast(SecurityTypeNativeToJs(each.securityType)), eachObj); - SetValueInt32(env, "rssi", each.rssi, eachObj); - SetValueInt32(env, "band", each.band, eachObj); - SetValueInt32(env, "frequency", each.frequency, eachObj); - SetValueInt64(env, "timestamp", each.timestamp, eachObj); - - napi_status status = napi_set_element(env, arrayResult, idx++, eachObj); - if (status != napi_ok) { - WIFI_LOGE("Wifi napi set element error: %{public}d, idx: %{public}d", status, idx - 1); - return false; - } - } - return true; -} - -napi_value GetScanInfos(napi_env env, napi_callback_info info) -{ - TRACE_FUNC_CALL; - size_t argc = 2; - napi_value argv[argc]; - napi_value thisVar = nullptr; - void *data = nullptr; - NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data)); - NAPI_ASSERT(env, wifiScanPtr != nullptr, "Wifi device instance is null."); - - ScanInfoAsyncContext *asyncContext = new ScanInfoAsyncContext(env); - NAPI_ASSERT(env, asyncContext != nullptr, "asyncContext is null."); - napi_create_string_latin1(env, "getScanInfos", NAPI_AUTO_LENGTH, &asyncContext->resourceName); - - asyncContext->executeFunc = [&](void* data) -> void { - ScanInfoAsyncContext *context = static_cast(data); - TRACE_FUNC_CALL_NAME("wifiScanPtr->GetScanInfoList"); - context->isSuccess = (wifiScanPtr->GetScanInfoList(context->vecScanInfos) == WIFI_OPT_SUCCESS); - WIFI_LOGI("GetScanInfoList, size: %{public}zu", context->vecScanInfos.size()); - }; - - asyncContext->completeFunc = [&](void* data) -> void { - ScanInfoAsyncContext *context = static_cast(data); - napi_create_array_with_length(context->env, context->vecScanInfos.size(), &context->result); - context->isSuccess = NativeScanInfosToJsObj(context->env, context->vecScanInfos, context->result); - WIFI_LOGI("Push scan info list to client"); - }; - - size_t nonCallbackArgNum = 0; - return DoAsyncWork(env, asyncContext, argc, argv, nonCallbackArgNum); -} - -static void ConvertEncryptionMode(const SecTypeJs& securityType, std::string& keyMgmt) -{ - switch (securityType) { - case SecTypeJs::SEC_TYPE_OPEN: - keyMgmt = "NONE"; - break; - - case SecTypeJs::SEC_TYPE_WEP: - keyMgmt = "WEP"; - break; - - case SecTypeJs::SEC_TYPE_PSK: - keyMgmt = "WPA-PSK"; - break; - - case SecTypeJs::SEC_TYPE_SAE: - keyMgmt = "SAE"; - break; - - default: - keyMgmt = "NONE"; - break; - } -} - -static void JsObjToDeviceConfig(const napi_env& env, const napi_value& object, WifiDeviceConfig& cppConfig) -{ - JsObjectToString(env, object, "ssid", 33, cppConfig.ssid); /* 33: ssid max length is 32 + '\0' */ - JsObjectToString(env, object, "bssid", 18, cppConfig.bssid); /* 18: max bssid length for string type */ - JsObjectToString(env, object, "preSharedKey", 256, cppConfig.preSharedKey); /* 256: max length */ - JsObjectToBool(env, object, "isHiddenSsid", cppConfig.hiddenSSID); - int type = static_cast(SecTypeJs::SEC_TYPE_INVALID); - JsObjectToInt(env, object, "securityType", type); - ConvertEncryptionMode(SecTypeJs(type), cppConfig.keyMgmt); -} - -napi_value AddDeviceConfig(napi_env env, napi_callback_info info) -{ - TRACE_FUNC_CALL; - size_t argc = 3; - napi_value argv[argc]; - napi_value thisVar = nullptr; - void *data = nullptr; - NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data)); - NAPI_ASSERT(env, argc >= 1, "Wrong number of arguments"); - NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); - - napi_valuetype valueType; - napi_typeof(env, argv[0], &valueType); - NAPI_ASSERT(env, valueType == napi_object, "Wrong argument type, object is expected for parameter 1."); - - AddDeviceConfigContext *asyncContext = new AddDeviceConfigContext(env); - NAPI_ASSERT(env, asyncContext != nullptr, "asyncContext is null."); - napi_create_string_latin1(env, "addDeviceConfig", NAPI_AUTO_LENGTH, &asyncContext->resourceName); - - WifiDeviceConfig *config = new WifiDeviceConfig(); - if (config == nullptr) { - delete asyncContext; - return UndefinedNapiValue(env); - } - JsObjToDeviceConfig(env, argv[0], *config); - asyncContext->config = config; - - asyncContext->executeFunc = [&](void* data) -> void { - AddDeviceConfigContext *context = static_cast(data); - TRACE_FUNC_CALL_NAME("wifiDevicePtr->AddDeviceConfig"); - ErrCode ret = wifiDevicePtr->AddDeviceConfig(*context->config, context->addResult); - if (context->addResult < 0 || ret != WIFI_OPT_SUCCESS) { - context->addResult = -1; - } - context->isSuccess = (ret == WIFI_OPT_SUCCESS); - }; - - asyncContext->completeFunc = [&](void* data) -> void { - AddDeviceConfigContext *context = static_cast(data); - napi_create_int32(context->env, context->addResult, &context->result); - if (context->config != nullptr) { - delete context->config; - context->config = nullptr; - } - WIFI_LOGI("Push add device config result to client"); - }; - - size_t nonCallbackArgNum = 1; - return DoAsyncWork(env, asyncContext, argc, argv, nonCallbackArgNum); -} - -napi_value ConnectToNetwork(napi_env env, napi_callback_info info) -{ - TRACE_FUNC_CALL; - size_t argc = 1; - napi_value argv[1]; - napi_value thisVar; - NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); - NAPI_ASSERT(env, argc == 1, "Wrong number of arguments"); - - napi_valuetype valueType; - napi_typeof(env, argv[0], &valueType); - NAPI_ASSERT(env, valueType == napi_number, "Wrong argument type. napi_number expected."); - - int networkId = -1; - napi_get_value_int32(env, argv[0], &networkId); - - NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); - ErrCode ret = wifiDevicePtr->ConnectToNetwork(networkId); - napi_value result; - napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); - return result; -} - -napi_value ConnectToDevice(napi_env env, napi_callback_info info) -{ - TRACE_FUNC_CALL; - size_t argc = 1; - napi_value argv[1]; - napi_value thisVar; - NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); - - napi_valuetype valueType; - napi_typeof(env, argv[0], &valueType); - NAPI_ASSERT(env, valueType == napi_object, "Wrong argument type. Object expected."); - - NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); - WifiDeviceConfig config; - JsObjToDeviceConfig(env, argv[0], config); - ErrCode ret = wifiDevicePtr->ConnectToDevice(config); - if (ret != WIFI_OPT_SUCCESS) { - WIFI_LOGE("Connect to device fail: %{public}d", ret); - } - - napi_value result; - napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); - return result; -} - -napi_value IsConnected(napi_env env, napi_callback_info info) -{ - TRACE_FUNC_CALL; - NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); - napi_value result; - napi_get_boolean(env, wifiDevicePtr->IsConnected(), &result); - return result; -} - -napi_value Disconnect(napi_env env, napi_callback_info info) -{ - TRACE_FUNC_CALL; - NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); - ErrCode ret = wifiDevicePtr->Disconnect(); - napi_value result; - napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); - return result; -} - -napi_value GetSignalLevel(napi_env env, napi_callback_info info) -{ - size_t argc = 2; - napi_value argv[2]; - napi_value thisVar; - NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); - /* the input have 2 parameters */ - NAPI_ASSERT(env, argc == 2, "Wrong number of arguments"); - - napi_valuetype type1; - napi_valuetype type2; - napi_typeof(env, argv[0], &type1); - napi_typeof(env, argv[1], &type2); - NAPI_ASSERT(env, type1 == napi_number, "Wrong argument type. napi_number expected."); - NAPI_ASSERT(env, type2 == napi_number, "Wrong argument type. napi_number expected."); - NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); - - int level = -1; - int rssi = 0; - int band = 0; - napi_get_value_int32(env, argv[0], &rssi); - napi_get_value_int32(env, argv[1], &band); - ErrCode ret = wifiDevicePtr->GetSignalLevel(rssi, band, level); - if (ret != WIFI_OPT_SUCCESS) { - WIFI_LOGE("Get wifi signal level fail: %{public}d", ret); - } - - napi_value result; - napi_create_uint32(env, level, &result); - return result; -} - -napi_value ReConnect(napi_env env, napi_callback_info info) -{ - TRACE_FUNC_CALL; - NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); - - napi_value result; - napi_get_boolean(env, wifiDevicePtr->ReConnect(), &result); - return result; -} - -napi_value ReAssociate(napi_env env, napi_callback_info info) -{ - TRACE_FUNC_CALL; - NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); - napi_value result; - napi_get_boolean(env, wifiDevicePtr->ReAssociate(), &result); - return result; -} - -static void IpInfoToJsObj(const napi_env& env, IpInfo& ipInfo, napi_value& result) -{ - napi_create_object(env, &result); - SetValueUnsignedInt32(env, "ipAddress", ipInfo.ipAddress, result); - SetValueUnsignedInt32(env, "gateway", ipInfo.gateway, result); - SetValueUnsignedInt32(env, "netmask", ipInfo.netmask, result); - SetValueUnsignedInt32(env, "primaryDns", ipInfo.primaryDns, result); - SetValueUnsignedInt32(env, "secondDns", ipInfo.secondDns, result); - SetValueUnsignedInt32(env, "serverIp", ipInfo.serverIp, result); - SetValueUnsignedInt32(env, "leaseDuration", ipInfo.leaseDuration, result); -} - -napi_value GetIpInfo(napi_env env, napi_callback_info info) -{ - TRACE_FUNC_CALL; - NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); - - IpInfo ipInfo; - napi_value result; - ErrCode ret = wifiDevicePtr->GetIpInfo(ipInfo); - if (ret != WIFI_OPT_SUCCESS) { - WIFI_LOGE("Get ip info fail: %{public}d", ret); - } - IpInfoToJsObj(env, ipInfo, result); - return result; -} - -static void LinkedInfoToJs(const napi_env& env, WifiLinkedInfo& linkedInfo, napi_value& result) -{ - SetValueUtf8String(env, "ssid", linkedInfo.ssid.c_str(), result); - SetValueUtf8String(env, "bssid", linkedInfo.bssid.c_str(), result); - SetValueInt32(env, "networkId", linkedInfo.networkId, result); - SetValueInt32(env, "rssi", linkedInfo.rssi, result); - SetValueInt32(env, "band", linkedInfo.band, result); - SetValueInt32(env, "linkSpeed", linkedInfo.linkSpeed, result); - SetValueInt32(env, "frequency", linkedInfo.frequency, result); - SetValueBool(env, "isHidden", linkedInfo.ifHiddenSSID, result); - /* isRestricted not support now, set as default value */ - SetValueBool(env, "isRestricted", false, result); - SetValueInt32(env, "chload", linkedInfo.chload, result); - SetValueInt32(env, "snr", linkedInfo.snr, result); - SetValueUtf8String(env, "macAddress", linkedInfo.macAddress.c_str(), result); - SetValueInt32(env, "ipAddress", linkedInfo.ipAddress, result); - /* Check suppState is consistent with HOS */ - SetValueInt32(env, "suppState", static_cast(linkedInfo.supplicantState), result); - /* Check connState is consistent with HOS */ - SetValueInt32(env, "connState", static_cast(linkedInfo.connState), result); -} - -/* This interface has not been fully implemented */ -napi_value GetLinkedInfo(napi_env env, napi_callback_info info) -{ - TRACE_FUNC_CALL; - size_t argc = 2; - napi_value argv[argc]; - napi_value thisVar = nullptr; - void *data = nullptr; - NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data)); - NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); - - LinkedInfoAsyncContext *asyncContext = new LinkedInfoAsyncContext(env); - NAPI_ASSERT(env, asyncContext != nullptr, "asyncContext is null."); - napi_create_string_latin1(env, "getLinkedInfo", NAPI_AUTO_LENGTH, &asyncContext->resourceName); - - asyncContext->executeFunc = [&](void* data) -> void { - LinkedInfoAsyncContext *context = static_cast(data); - TRACE_FUNC_CALL_NAME("wifiDevicePtr->GetLinkedInfo"); - context->isSuccess = (wifiDevicePtr->GetLinkedInfo(context->linkedInfo) == WIFI_OPT_SUCCESS); - }; - - asyncContext->completeFunc = [&](void* data) -> void { - LinkedInfoAsyncContext *context = static_cast(data); - napi_create_object(context->env, &context->result); - LinkedInfoToJs(context->env, context->linkedInfo, context->result); - WIFI_LOGI("Push get linkedInfo result to client"); - }; - - size_t nonCallbackArgNum = 0; - return DoAsyncWork(env, asyncContext, argc, argv, nonCallbackArgNum); -} - -napi_value RemoveDevice(napi_env env, napi_callback_info info) -{ - TRACE_FUNC_CALL; - size_t argc = 1; - napi_value argv[1]; - napi_value thisVar; - NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); - NAPI_ASSERT(env, argc == 1, "Wrong number of arguments"); - - napi_valuetype valueType; - napi_typeof(env, argv[0], &valueType); - NAPI_ASSERT(env, valueType == napi_number, "Wrong argument type. napi_number expected."); - - int networkId = -1; - napi_get_value_int32(env, argv[0], &networkId); - NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); - - napi_value result; - napi_get_boolean(env, wifiDevicePtr->RemoveDevice(networkId) == WIFI_OPT_SUCCESS, &result); - return result; -} - -napi_value RemoveAllNetwork(napi_env env, napi_callback_info info) -{ - TRACE_FUNC_CALL; - NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); - napi_value result; - napi_get_boolean(env, wifiDevicePtr->RemoveAllDevice() == WIFI_OPT_SUCCESS, &result); - return result; -} - -napi_value DisableNetwork(napi_env env, napi_callback_info info) -{ - TRACE_FUNC_CALL; - size_t argc = 1; - napi_value argv[1]; - napi_value thisVar; - NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); - NAPI_ASSERT(env, argc == 1, "Wrong number of arguments"); - - napi_valuetype valueType; - napi_typeof(env, argv[0], &valueType); - NAPI_ASSERT(env, valueType == napi_number, "Wrong argument type. napi_number expected."); - NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); - - int networkId = -1; - napi_get_value_int32(env, argv[0], &networkId); - napi_value result; - napi_get_boolean(env, wifiDevicePtr->DisableDeviceConfig(networkId) == WIFI_OPT_SUCCESS, &result); - return result; -} - -napi_value GetCountryCode(napi_env env, napi_callback_info info) -{ - TRACE_FUNC_CALL; - NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); - std::string countryCode; - ErrCode ret = wifiDevicePtr->GetCountryCode(countryCode); - if (ret != WIFI_OPT_SUCCESS) { - WIFI_LOGE("Get countryCode fail: %{public}d", ret); - } - napi_value cc; - napi_create_string_utf8(env, countryCode.c_str(), NAPI_AUTO_LENGTH, &cc); - return cc; -} - -static SecTypeJs ConvertKeyMgmtToSecType(const std::string& keyMgmt) -{ - std::map mapKeyMgmtToSecType = { - {"NONE", SecTypeJs::SEC_TYPE_OPEN}, - {"WEP", SecTypeJs::SEC_TYPE_WEP}, - {"WPA-PSK", SecTypeJs::SEC_TYPE_PSK}, - {"SAE", SecTypeJs::SEC_TYPE_SAE}, - }; - - std::map::iterator iter = mapKeyMgmtToSecType.find(keyMgmt); - return iter == mapKeyMgmtToSecType.end() ? SecTypeJs::SEC_TYPE_OPEN : iter->second; -} - -static void DeviceConfigToJsArray(const napi_env& env, const std::vector& vecDeviceConfigs, - const int idx, napi_value& arrayResult) -{ - napi_value result; - napi_create_object(env, &result); - SetValueUtf8String(env, "ssid", vecDeviceConfigs[idx].ssid.c_str(), result); - SetValueUtf8String(env, "bssid", vecDeviceConfigs[idx].bssid.c_str(), result); - SetValueUtf8String(env, "preSharedKey", vecDeviceConfigs[idx].preSharedKey.c_str(), result); - SetValueBool(env, "isHiddenSsid", vecDeviceConfigs[idx].hiddenSSID, result); - SetValueInt32(env, "securityType", - static_cast(ConvertKeyMgmtToSecType(vecDeviceConfigs[idx].keyMgmt)), result); - - napi_status status = napi_set_element(env, arrayResult, idx, result); - if (status != napi_ok) { - WIFI_LOGE("Wifi napi set element error: %{public}d", status); - } -} - -napi_value GetDeviceConfigs(napi_env env, napi_callback_info info) -{ - TRACE_FUNC_CALL; - NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); - std::vector vecDeviceConfigs; - ErrCode ret = wifiDevicePtr->GetDeviceConfigs(vecDeviceConfigs); - if (ret != WIFI_OPT_SUCCESS) { - WIFI_LOGE("Get device configs fail: %{public}d", ret); - } - - WIFI_LOGI("Get device configs size: %{public}zu", vecDeviceConfigs.size()); - napi_value arrayResult; - napi_create_array_with_length(env, vecDeviceConfigs.size(), &arrayResult); - for (size_t i = 0; i != vecDeviceConfigs.size(); ++i) { - DeviceConfigToJsArray(env, vecDeviceConfigs, i, arrayResult); - } - return arrayResult; -} - -napi_value UpdateNetwork(napi_env env, napi_callback_info info) -{ - TRACE_FUNC_CALL; - size_t argc = 1; - napi_value argv[1]; - napi_value thisVar; - NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); - - napi_valuetype valueType; - napi_typeof(env, argv[0], &valueType); - NAPI_ASSERT(env, valueType == napi_object, "Wrong argument type. Object expected."); - - NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); - int updateResult; - WifiDeviceConfig config; - JsObjToDeviceConfig(env, argv[0], config); - ErrCode ret = wifiDevicePtr->UpdateDeviceConfig(config, updateResult); - if (ret != WIFI_OPT_SUCCESS) { - WIFI_LOGE("Update device config fail: %{public}d", ret); - } - - napi_value result; - napi_create_uint32(env, updateResult, &result); - return result; -} - -napi_value GetSupportedFeatures(napi_env env, napi_callback_info info) -{ - TRACE_FUNC_CALL; - NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); - long features = -1; - ErrCode ret = wifiDevicePtr->GetSupportedFeatures(features); - if (ret != WIFI_OPT_SUCCESS) { - WIFI_LOGE("Get supported features fail: %{public}d", ret); - } - - napi_value result; - napi_create_int64(env, features, &result); - return result; -} - -napi_value IsFeatureSupported(napi_env env, napi_callback_info info) -{ - TRACE_FUNC_CALL; - size_t argc = 1; - napi_value argv[1]; - napi_value thisVar; - NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); - NAPI_ASSERT(env, argc == 1, "Wrong number of arguments"); - - napi_valuetype valueType; - napi_typeof(env, argv[0], &valueType); - NAPI_ASSERT(env, valueType == napi_number, "Wrong argument type. napi_number expected."); - - long feature = -1; - napi_get_value_int64(env, argv[0], (int64_t*)&feature); - NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); - - napi_value result; - napi_get_boolean(env, wifiDevicePtr->IsFeatureSupported(feature), &result); - return result; -} - -napi_value GetDeviceMacAddress(napi_env env, napi_callback_info info) -{ - TRACE_FUNC_CALL; - NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); - std::string macAddr; - ErrCode ret = wifiDevicePtr->GetDeviceMacAddress(macAddr); - if (ret != WIFI_OPT_SUCCESS) { - WIFI_LOGE("Get mac address fail: %{public}d", ret); - } - - napi_value addr; - napi_create_string_utf8(env, macAddr.c_str(), NAPI_AUTO_LENGTH, &addr); - return addr; -} -} // namespace Wifi -} // namespace OHOS +/* + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "wifi_napi_device.h" +#include "wifi_logger.h" +#include +#include + +namespace OHOS { +namespace Wifi { +DEFINE_WIFILOG_LABEL("WifiNAPIDevice"); + +std::unique_ptr wifiDevicePtr = WifiDevice::GetInstance(WIFI_DEVICE_ABILITY_ID); +std::unique_ptr wifiScanPtr = WifiScan::GetInstance(WIFI_SCAN_ABILITY_ID); +napi_value EnableWifi(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + ErrCode ret = wifiDevicePtr->EnableWifi(); + napi_value result; + napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); + return result; +} + +napi_value DisableWifi(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + ErrCode ret = wifiDevicePtr->DisableWifi(); + napi_value result; + napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); + return result; +} + +napi_value IsWifiActive(napi_env env, napi_callback_info info) +{ + NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + bool activeStatus = false; + ErrCode ret = wifiDevicePtr->IsWifiActive(activeStatus); + if (ret != WIFI_OPT_SUCCESS) { + WIFI_LOGE("Get wifi active status fail: %{public}d", ret); + } + + napi_value result; + napi_get_boolean(env, activeStatus, &result); + return result; +} + +napi_value Scan(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + NAPI_ASSERT(env, wifiScanPtr != nullptr, "Wifi scan instance is null."); + ErrCode ret = wifiScanPtr->Scan(); + + napi_value result; + napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); + return result; +} + +static SecTypeJs SecurityTypeNativeToJs(const WifiSecurity& cppSecurityType) +{ + SecTypeJs jsSecurityType = SecTypeJs::SEC_TYPE_INVALID; + switch (cppSecurityType) { + case WifiSecurity::OPEN: + jsSecurityType = SecTypeJs::SEC_TYPE_OPEN; + break; + + case WifiSecurity::WEP: + jsSecurityType = SecTypeJs::SEC_TYPE_WEP; + break; + + case WifiSecurity::PSK: + jsSecurityType = SecTypeJs::SEC_TYPE_PSK; + break; + + case WifiSecurity::SAE: + jsSecurityType = SecTypeJs::SEC_TYPE_SAE; + break; + + default: + jsSecurityType = SecTypeJs::SEC_TYPE_INVALID; + break; + } + return jsSecurityType; +} + +static bool NativeScanInfosToJsObj(const napi_env& env, + const std::vector& vecScnIanfos, napi_value& arrayResult) +{ + uint32_t idx = 0; + for (auto& each : vecScnIanfos) { + napi_value eachObj; + napi_create_object(env, &eachObj); + + SetValueUtf8String(env, "ssid", each.ssid.c_str(), eachObj); + SetValueUtf8String(env, "bssid", each.bssid.c_str(), eachObj); + SetValueInt32(env, "securityType", static_cast(SecurityTypeNativeToJs(each.securityType)), eachObj); + SetValueInt32(env, "rssi", each.rssi, eachObj); + SetValueInt32(env, "band", each.band, eachObj); + SetValueInt32(env, "frequency", each.frequency, eachObj); + SetValueInt64(env, "timestamp", each.timestamp, eachObj); + + napi_status status = napi_set_element(env, arrayResult, idx++, eachObj); + if (status != napi_ok) { + WIFI_LOGE("Wifi napi set element error: %{public}d, idx: %{public}d", status, idx - 1); + return false; + } + } + return true; +} + +napi_value GetScanInfos(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + size_t argc = 2; + napi_value argv[argc]; + napi_value thisVar = nullptr; + void *data = nullptr; + NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data)); + NAPI_ASSERT(env, wifiScanPtr != nullptr, "Wifi device instance is null."); + + ScanInfoAsyncContext *asyncContext = new ScanInfoAsyncContext(env); + NAPI_ASSERT(env, asyncContext != nullptr, "asyncContext is null."); + napi_create_string_latin1(env, "getScanInfos", NAPI_AUTO_LENGTH, &asyncContext->resourceName); + + asyncContext->executeFunc = [&](void* data) -> void { + ScanInfoAsyncContext *context = static_cast(data); + TRACE_FUNC_CALL_NAME("wifiScanPtr->GetScanInfoList"); + context->isSuccess = (wifiScanPtr->GetScanInfoList(context->vecScanInfos) == WIFI_OPT_SUCCESS); + WIFI_LOGI("GetScanInfoList, size: %{public}zu", context->vecScanInfos.size()); + }; + + asyncContext->completeFunc = [&](void* data) -> void { + ScanInfoAsyncContext *context = static_cast(data); + napi_create_array_with_length(context->env, context->vecScanInfos.size(), &context->result); + context->isSuccess = NativeScanInfosToJsObj(context->env, context->vecScanInfos, context->result); + WIFI_LOGI("Push scan info list to client"); + }; + + size_t nonCallbackArgNum = 0; + return DoAsyncWork(env, asyncContext, argc, argv, nonCallbackArgNum); +} + +static void ConvertEncryptionMode(const SecTypeJs& securityType, std::string& keyMgmt) +{ + switch (securityType) { + case SecTypeJs::SEC_TYPE_OPEN: + keyMgmt = "NONE"; + break; + + case SecTypeJs::SEC_TYPE_WEP: + keyMgmt = "WEP"; + break; + + case SecTypeJs::SEC_TYPE_PSK: + keyMgmt = "WPA-PSK"; + break; + + case SecTypeJs::SEC_TYPE_SAE: + keyMgmt = "SAE"; + break; + + default: + keyMgmt = "NONE"; + break; + } +} + +static void JsObjToDeviceConfig(const napi_env& env, const napi_value& object, WifiDeviceConfig& cppConfig) +{ + JsObjectToString(env, object, "ssid", 33, cppConfig.ssid); /* 33: ssid max length is 32 + '\0' */ + JsObjectToString(env, object, "bssid", 18, cppConfig.bssid); /* 18: max bssid length for string type */ + JsObjectToString(env, object, "preSharedKey", 256, cppConfig.preSharedKey); /* 256: max length */ + JsObjectToBool(env, object, "isHiddenSsid", cppConfig.hiddenSSID); + int type = static_cast(SecTypeJs::SEC_TYPE_INVALID); + JsObjectToInt(env, object, "securityType", type); + ConvertEncryptionMode(SecTypeJs(type), cppConfig.keyMgmt); +} + +napi_value AddDeviceConfig(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + size_t argc = 3; + napi_value argv[argc]; + napi_value thisVar = nullptr; + void *data = nullptr; + NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data)); + NAPI_ASSERT(env, argc >= 1, "Wrong number of arguments"); + NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + + napi_valuetype valueType; + napi_typeof(env, argv[0], &valueType); + NAPI_ASSERT(env, valueType == napi_object, "Wrong argument type, object is expected for parameter 1."); + + AddDeviceConfigContext *asyncContext = new AddDeviceConfigContext(env); + NAPI_ASSERT(env, asyncContext != nullptr, "asyncContext is null."); + napi_create_string_latin1(env, "addDeviceConfig", NAPI_AUTO_LENGTH, &asyncContext->resourceName); + + WifiDeviceConfig *config = new WifiDeviceConfig(); + if (config == nullptr) { + delete asyncContext; + return UndefinedNapiValue(env); + } + JsObjToDeviceConfig(env, argv[0], *config); + asyncContext->config = config; + + asyncContext->executeFunc = [&](void* data) -> void { + AddDeviceConfigContext *context = static_cast(data); + TRACE_FUNC_CALL_NAME("wifiDevicePtr->AddDeviceConfig"); + ErrCode ret = wifiDevicePtr->AddDeviceConfig(*context->config, context->addResult); + if (context->addResult < 0 || ret != WIFI_OPT_SUCCESS) { + context->addResult = -1; + } + context->isSuccess = (ret == WIFI_OPT_SUCCESS); + }; + + asyncContext->completeFunc = [&](void* data) -> void { + AddDeviceConfigContext *context = static_cast(data); + napi_create_int32(context->env, context->addResult, &context->result); + if (context->config != nullptr) { + delete context->config; + context->config = nullptr; + } + WIFI_LOGI("Push add device config result to client"); + }; + + size_t nonCallbackArgNum = 1; + return DoAsyncWork(env, asyncContext, argc, argv, nonCallbackArgNum); +} + +napi_value ConnectToNetwork(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + size_t argc = 1; + napi_value argv[1]; + napi_value thisVar; + NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); + NAPI_ASSERT(env, argc == 1, "Wrong number of arguments"); + + napi_valuetype valueType; + napi_typeof(env, argv[0], &valueType); + NAPI_ASSERT(env, valueType == napi_number, "Wrong argument type. napi_number expected."); + + int networkId = -1; + napi_get_value_int32(env, argv[0], &networkId); + + NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + ErrCode ret = wifiDevicePtr->ConnectToNetwork(networkId); + napi_value result; + napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); + return result; +} + +napi_value ConnectToDevice(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + size_t argc = 1; + napi_value argv[1]; + napi_value thisVar; + NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); + + napi_valuetype valueType; + napi_typeof(env, argv[0], &valueType); + NAPI_ASSERT(env, valueType == napi_object, "Wrong argument type. Object expected."); + + NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + WifiDeviceConfig config; + JsObjToDeviceConfig(env, argv[0], config); + ErrCode ret = wifiDevicePtr->ConnectToDevice(config); + if (ret != WIFI_OPT_SUCCESS) { + WIFI_LOGE("Connect to device fail: %{public}d", ret); + } + + napi_value result; + napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); + return result; +} + +napi_value IsConnected(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + napi_value result; + napi_get_boolean(env, wifiDevicePtr->IsConnected(), &result); + return result; +} + +napi_value Disconnect(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + ErrCode ret = wifiDevicePtr->Disconnect(); + napi_value result; + napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); + return result; +} + +napi_value GetSignalLevel(napi_env env, napi_callback_info info) +{ + size_t argc = 2; + napi_value argv[2]; + napi_value thisVar; + NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); + /* the input have 2 parameters */ + NAPI_ASSERT(env, argc == 2, "Wrong number of arguments"); + + napi_valuetype type1; + napi_valuetype type2; + napi_typeof(env, argv[0], &type1); + napi_typeof(env, argv[1], &type2); + NAPI_ASSERT(env, type1 == napi_number, "Wrong argument type. napi_number expected."); + NAPI_ASSERT(env, type2 == napi_number, "Wrong argument type. napi_number expected."); + NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + + int level = -1; + int rssi = 0; + int band = 0; + napi_get_value_int32(env, argv[0], &rssi); + napi_get_value_int32(env, argv[1], &band); + ErrCode ret = wifiDevicePtr->GetSignalLevel(rssi, band, level); + if (ret != WIFI_OPT_SUCCESS) { + WIFI_LOGE("Get wifi signal level fail: %{public}d", ret); + } + + napi_value result; + napi_create_uint32(env, level, &result); + return result; +} + +napi_value ReConnect(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + + napi_value result; + napi_get_boolean(env, wifiDevicePtr->ReConnect(), &result); + return result; +} + +napi_value ReAssociate(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + napi_value result; + napi_get_boolean(env, wifiDevicePtr->ReAssociate(), &result); + return result; +} + +static void IpInfoToJsObj(const napi_env& env, IpInfo& ipInfo, napi_value& result) +{ + napi_create_object(env, &result); + SetValueUnsignedInt32(env, "ipAddress", ipInfo.ipAddress, result); + SetValueUnsignedInt32(env, "gateway", ipInfo.gateway, result); + SetValueUnsignedInt32(env, "netmask", ipInfo.netmask, result); + SetValueUnsignedInt32(env, "primaryDns", ipInfo.primaryDns, result); + SetValueUnsignedInt32(env, "secondDns", ipInfo.secondDns, result); + SetValueUnsignedInt32(env, "serverIp", ipInfo.serverIp, result); + SetValueUnsignedInt32(env, "leaseDuration", ipInfo.leaseDuration, result); +} + +napi_value GetIpInfo(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + + IpInfo ipInfo; + napi_value result; + ErrCode ret = wifiDevicePtr->GetIpInfo(ipInfo); + if (ret != WIFI_OPT_SUCCESS) { + WIFI_LOGE("Get ip info fail: %{public}d", ret); + } + IpInfoToJsObj(env, ipInfo, result); + return result; +} + +static void LinkedInfoToJs(const napi_env& env, WifiLinkedInfo& linkedInfo, napi_value& result) +{ + SetValueUtf8String(env, "ssid", linkedInfo.ssid.c_str(), result); + SetValueUtf8String(env, "bssid", linkedInfo.bssid.c_str(), result); + SetValueInt32(env, "networkId", linkedInfo.networkId, result); + SetValueInt32(env, "rssi", linkedInfo.rssi, result); + SetValueInt32(env, "band", linkedInfo.band, result); + SetValueInt32(env, "linkSpeed", linkedInfo.linkSpeed, result); + SetValueInt32(env, "frequency", linkedInfo.frequency, result); + SetValueBool(env, "isHidden", linkedInfo.ifHiddenSSID, result); + /* isRestricted not support now, set as default value */ + SetValueBool(env, "isRestricted", false, result); + SetValueInt32(env, "chload", linkedInfo.chload, result); + SetValueInt32(env, "snr", linkedInfo.snr, result); + SetValueUtf8String(env, "macAddress", linkedInfo.macAddress.c_str(), result); + SetValueUnsignedInt32(env, "ipAddress", linkedInfo.ipAddress, result); + /* Check suppState is consistent with HOS */ + SetValueInt32(env, "suppState", static_cast(linkedInfo.supplicantState), result); + /* Check connState is consistent with HOS */ + SetValueInt32(env, "connState", static_cast(linkedInfo.connState), result); +} + +/* This interface has not been fully implemented */ +napi_value GetLinkedInfo(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + size_t argc = 2; + napi_value argv[argc]; + napi_value thisVar = nullptr; + void *data = nullptr; + NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data)); + NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + + LinkedInfoAsyncContext *asyncContext = new LinkedInfoAsyncContext(env); + NAPI_ASSERT(env, asyncContext != nullptr, "asyncContext is null."); + napi_create_string_latin1(env, "getLinkedInfo", NAPI_AUTO_LENGTH, &asyncContext->resourceName); + + asyncContext->executeFunc = [&](void* data) -> void { + LinkedInfoAsyncContext *context = static_cast(data); + TRACE_FUNC_CALL_NAME("wifiDevicePtr->GetLinkedInfo"); + context->isSuccess = (wifiDevicePtr->GetLinkedInfo(context->linkedInfo) == WIFI_OPT_SUCCESS); + }; + + asyncContext->completeFunc = [&](void* data) -> void { + LinkedInfoAsyncContext *context = static_cast(data); + napi_create_object(context->env, &context->result); + LinkedInfoToJs(context->env, context->linkedInfo, context->result); + WIFI_LOGI("Push get linkedInfo result to client"); + }; + + size_t nonCallbackArgNum = 0; + return DoAsyncWork(env, asyncContext, argc, argv, nonCallbackArgNum); +} + +napi_value RemoveDevice(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + size_t argc = 1; + napi_value argv[1]; + napi_value thisVar; + NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); + NAPI_ASSERT(env, argc == 1, "Wrong number of arguments"); + + napi_valuetype valueType; + napi_typeof(env, argv[0], &valueType); + NAPI_ASSERT(env, valueType == napi_number, "Wrong argument type. napi_number expected."); + + int networkId = -1; + napi_get_value_int32(env, argv[0], &networkId); + NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + + napi_value result; + napi_get_boolean(env, wifiDevicePtr->RemoveDevice(networkId) == WIFI_OPT_SUCCESS, &result); + return result; +} + +napi_value RemoveAllNetwork(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + napi_value result; + napi_get_boolean(env, wifiDevicePtr->RemoveAllDevice() == WIFI_OPT_SUCCESS, &result); + return result; +} + +napi_value DisableNetwork(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + size_t argc = 1; + napi_value argv[1]; + napi_value thisVar; + NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); + NAPI_ASSERT(env, argc == 1, "Wrong number of arguments"); + + napi_valuetype valueType; + napi_typeof(env, argv[0], &valueType); + NAPI_ASSERT(env, valueType == napi_number, "Wrong argument type. napi_number expected."); + NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + + int networkId = -1; + napi_get_value_int32(env, argv[0], &networkId); + napi_value result; + napi_get_boolean(env, wifiDevicePtr->DisableDeviceConfig(networkId) == WIFI_OPT_SUCCESS, &result); + return result; +} + +napi_value GetCountryCode(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + std::string countryCode; + ErrCode ret = wifiDevicePtr->GetCountryCode(countryCode); + if (ret != WIFI_OPT_SUCCESS) { + WIFI_LOGE("Get countryCode fail: %{public}d", ret); + } + napi_value cc; + napi_create_string_utf8(env, countryCode.c_str(), NAPI_AUTO_LENGTH, &cc); + return cc; +} + +static SecTypeJs ConvertKeyMgmtToSecType(const std::string& keyMgmt) +{ + std::map mapKeyMgmtToSecType = { + {"NONE", SecTypeJs::SEC_TYPE_OPEN}, + {"WEP", SecTypeJs::SEC_TYPE_WEP}, + {"WPA-PSK", SecTypeJs::SEC_TYPE_PSK}, + {"SAE", SecTypeJs::SEC_TYPE_SAE}, + }; + + std::map::iterator iter = mapKeyMgmtToSecType.find(keyMgmt); + return iter == mapKeyMgmtToSecType.end() ? SecTypeJs::SEC_TYPE_OPEN : iter->second; +} + +static void DeviceConfigToJsArray(const napi_env& env, const std::vector& vecDeviceConfigs, + const int idx, napi_value& arrayResult) +{ + napi_value result; + napi_create_object(env, &result); + SetValueUtf8String(env, "ssid", vecDeviceConfigs[idx].ssid.c_str(), result); + SetValueUtf8String(env, "bssid", vecDeviceConfigs[idx].bssid.c_str(), result); + SetValueUtf8String(env, "preSharedKey", vecDeviceConfigs[idx].preSharedKey.c_str(), result); + SetValueBool(env, "isHiddenSsid", vecDeviceConfigs[idx].hiddenSSID, result); + SetValueInt32(env, "securityType", + static_cast(ConvertKeyMgmtToSecType(vecDeviceConfigs[idx].keyMgmt)), result); + + napi_status status = napi_set_element(env, arrayResult, idx, result); + if (status != napi_ok) { + WIFI_LOGE("Wifi napi set element error: %{public}d", status); + } +} + +napi_value GetDeviceConfigs(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + std::vector vecDeviceConfigs; + ErrCode ret = wifiDevicePtr->GetDeviceConfigs(vecDeviceConfigs); + if (ret != WIFI_OPT_SUCCESS) { + WIFI_LOGE("Get device configs fail: %{public}d", ret); + } + + WIFI_LOGI("Get device configs size: %{public}zu", vecDeviceConfigs.size()); + napi_value arrayResult; + napi_create_array_with_length(env, vecDeviceConfigs.size(), &arrayResult); + for (size_t i = 0; i != vecDeviceConfigs.size(); ++i) { + DeviceConfigToJsArray(env, vecDeviceConfigs, i, arrayResult); + } + return arrayResult; +} + +napi_value UpdateNetwork(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + size_t argc = 1; + napi_value argv[1]; + napi_value thisVar; + NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); + + napi_valuetype valueType; + napi_typeof(env, argv[0], &valueType); + NAPI_ASSERT(env, valueType == napi_object, "Wrong argument type. Object expected."); + + NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + int updateResult; + WifiDeviceConfig config; + JsObjToDeviceConfig(env, argv[0], config); + ErrCode ret = wifiDevicePtr->UpdateDeviceConfig(config, updateResult); + if (ret != WIFI_OPT_SUCCESS) { + WIFI_LOGE("Update device config fail: %{public}d", ret); + } + + napi_value result; + napi_create_uint32(env, updateResult, &result); + return result; +} + +napi_value GetSupportedFeatures(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + long features = -1; + ErrCode ret = wifiDevicePtr->GetSupportedFeatures(features); + if (ret != WIFI_OPT_SUCCESS) { + WIFI_LOGE("Get supported features fail: %{public}d", ret); + } + + napi_value result; + napi_create_int64(env, features, &result); + return result; +} + +napi_value IsFeatureSupported(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + size_t argc = 1; + napi_value argv[1]; + napi_value thisVar; + NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); + NAPI_ASSERT(env, argc == 1, "Wrong number of arguments"); + + napi_valuetype valueType; + napi_typeof(env, argv[0], &valueType); + NAPI_ASSERT(env, valueType == napi_number, "Wrong argument type. napi_number expected."); + + long feature = -1; + napi_get_value_int64(env, argv[0], (int64_t*)&feature); + NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + + napi_value result; + napi_get_boolean(env, wifiDevicePtr->IsFeatureSupported(feature), &result); + return result; +} + +napi_value GetDeviceMacAddress(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + NAPI_ASSERT(env, wifiDevicePtr != nullptr, "Wifi device instance is null."); + std::string macAddr; + ErrCode ret = wifiDevicePtr->GetDeviceMacAddress(macAddr); + if (ret != WIFI_OPT_SUCCESS) { + WIFI_LOGE("Get mac address fail: %{public}d", ret); + } + + napi_value addr; + napi_create_string_utf8(env, macAddr.c_str(), NAPI_AUTO_LENGTH, &addr); + return addr; +} +} // namespace Wifi +} // namespace OHOS diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_device.h b/interfaces/innerkits/native_cpp/napi/wifi_napi_device.h index 3a424b0..e9f799a 100755 --- a/interfaces/innerkits/native_cpp/napi/wifi_napi_device.h +++ b/interfaces/innerkits/native_cpp/napi/wifi_napi_device.h @@ -1,103 +1,103 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef WIFI_NAPI_DEVICE_H_ -#define WIFI_NAPI_DEVICE_H_ - -#include "wifi_napi_utils.h" -#include "wifi_device.h" -#include "wifi_scan.h" - -namespace OHOS { -namespace Wifi { -napi_value EnableWifi(napi_env env, napi_callback_info info); -napi_value DisableWifi(napi_env env, napi_callback_info info); -napi_value IsWifiActive(napi_env env, napi_callback_info info); -napi_value Scan(napi_env env, napi_callback_info info); -napi_value GetScanInfos(napi_env env, napi_callback_info info); -napi_value AddDeviceConfig(napi_env env, napi_callback_info info); -napi_value ConnectToNetwork(napi_env env, napi_callback_info info); -napi_value ConnectToDevice(napi_env env, napi_callback_info info); -napi_value IsConnected(napi_env env, napi_callback_info info); -napi_value Disconnect(napi_env env, napi_callback_info info); -napi_value GetSignalLevel(napi_env env, napi_callback_info info); -napi_value ReConnect(napi_env env, napi_callback_info info); -napi_value ReAssociate(napi_env env, napi_callback_info info); -napi_value GetIpInfo(napi_env env, napi_callback_info info); -napi_value GetLinkedInfo(napi_env env, napi_callback_info info); -napi_value RemoveDevice(napi_env env, napi_callback_info info); -napi_value RemoveAllNetwork(napi_env env, napi_callback_info info); -napi_value DisableNetwork(napi_env env, napi_callback_info info); -napi_value GetCountryCode(napi_env env, napi_callback_info info); -napi_value GetDeviceConfigs(napi_env env, napi_callback_info info); -napi_value UpdateNetwork(napi_env env, napi_callback_info info); -napi_value GetSupportedFeatures(napi_env env, napi_callback_info info); -napi_value IsFeatureSupported(napi_env env, napi_callback_info info); -napi_value GetDeviceMacAddress(napi_env env, napi_callback_info info); - -enum class ConnStateJs { - SCANNING, /* The device is searching for an available AP */ - CONNECTING, /* The Wi-Fi connection is being set up */ - AUTHENTICATING, /* The Wi-Fi connection is being authenticated */ - OBTAINING_IPADDR, /* The IP address of the Wi-Fi connection is being obtained */ - CONNECTED, /* The Wi-Fi connection has been set up */ - DISCONNECTING, /* The Wi-Fi connection is being torn down */ - DISCONNECTED, /* The Wi-Fi connection has been torn down */ - UNKNOWN /* Failed to set up the Wi-Fi connection */ -}; - -class ScanInfoAsyncContext : public AsyncContext { -public: - std::vector vecScanInfos; - - ScanInfoAsyncContext(napi_env env, napi_async_work work = nullptr, napi_deferred deferred = nullptr) : - AsyncContext(env, work, deferred){} - - ScanInfoAsyncContext() = delete; - - virtual ~ScanInfoAsyncContext(){} -}; - -class AddDeviceConfigContext : public AsyncContext { -public: - WifiDeviceConfig *config; - int addResult; - - AddDeviceConfigContext(napi_env env, napi_async_work work = nullptr, napi_deferred deferred = nullptr) : - AsyncContext(env, work, deferred){ - config = nullptr; - addResult = -1; - } - - AddDeviceConfigContext() = delete; - - virtual ~AddDeviceConfigContext(){} -}; - -class LinkedInfoAsyncContext : public AsyncContext { -public: - WifiLinkedInfo linkedInfo; - - LinkedInfoAsyncContext(napi_env env, napi_async_work work = nullptr, napi_deferred deferred = nullptr) : - AsyncContext(env, work, deferred){} - - LinkedInfoAsyncContext() = delete; - - virtual ~LinkedInfoAsyncContext(){} -}; -} // namespace Wifi -} // namespace OHOS - -#endif +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef WIFI_NAPI_DEVICE_H_ +#define WIFI_NAPI_DEVICE_H_ + +#include "wifi_napi_utils.h" +#include "wifi_device.h" +#include "wifi_scan.h" + +namespace OHOS { +namespace Wifi { +napi_value EnableWifi(napi_env env, napi_callback_info info); +napi_value DisableWifi(napi_env env, napi_callback_info info); +napi_value IsWifiActive(napi_env env, napi_callback_info info); +napi_value Scan(napi_env env, napi_callback_info info); +napi_value GetScanInfos(napi_env env, napi_callback_info info); +napi_value AddDeviceConfig(napi_env env, napi_callback_info info); +napi_value ConnectToNetwork(napi_env env, napi_callback_info info); +napi_value ConnectToDevice(napi_env env, napi_callback_info info); +napi_value IsConnected(napi_env env, napi_callback_info info); +napi_value Disconnect(napi_env env, napi_callback_info info); +napi_value GetSignalLevel(napi_env env, napi_callback_info info); +napi_value ReConnect(napi_env env, napi_callback_info info); +napi_value ReAssociate(napi_env env, napi_callback_info info); +napi_value GetIpInfo(napi_env env, napi_callback_info info); +napi_value GetLinkedInfo(napi_env env, napi_callback_info info); +napi_value RemoveDevice(napi_env env, napi_callback_info info); +napi_value RemoveAllNetwork(napi_env env, napi_callback_info info); +napi_value DisableNetwork(napi_env env, napi_callback_info info); +napi_value GetCountryCode(napi_env env, napi_callback_info info); +napi_value GetDeviceConfigs(napi_env env, napi_callback_info info); +napi_value UpdateNetwork(napi_env env, napi_callback_info info); +napi_value GetSupportedFeatures(napi_env env, napi_callback_info info); +napi_value IsFeatureSupported(napi_env env, napi_callback_info info); +napi_value GetDeviceMacAddress(napi_env env, napi_callback_info info); + +enum class ConnStateJs { + SCANNING, /* The device is searching for an available AP */ + CONNECTING, /* The Wi-Fi connection is being set up */ + AUTHENTICATING, /* The Wi-Fi connection is being authenticated */ + OBTAINING_IPADDR, /* The IP address of the Wi-Fi connection is being obtained */ + CONNECTED, /* The Wi-Fi connection has been set up */ + DISCONNECTING, /* The Wi-Fi connection is being torn down */ + DISCONNECTED, /* The Wi-Fi connection has been torn down */ + UNKNOWN /* Failed to set up the Wi-Fi connection */ +}; + +class ScanInfoAsyncContext : public AsyncContext { +public: + std::vector vecScanInfos; + + ScanInfoAsyncContext(napi_env env, napi_async_work work = nullptr, napi_deferred deferred = nullptr) : + AsyncContext(env, work, deferred){} + + ScanInfoAsyncContext() = delete; + + virtual ~ScanInfoAsyncContext(){} +}; + +class AddDeviceConfigContext : public AsyncContext { +public: + WifiDeviceConfig *config; + int addResult; + + AddDeviceConfigContext(napi_env env, napi_async_work work = nullptr, napi_deferred deferred = nullptr) : + AsyncContext(env, work, deferred){ + config = nullptr; + addResult = -1; + } + + AddDeviceConfigContext() = delete; + + virtual ~AddDeviceConfigContext(){} +}; + +class LinkedInfoAsyncContext : public AsyncContext { +public: + WifiLinkedInfo linkedInfo; + + LinkedInfoAsyncContext(napi_env env, napi_async_work work = nullptr, napi_deferred deferred = nullptr) : + AsyncContext(env, work, deferred){} + + LinkedInfoAsyncContext() = delete; + + virtual ~LinkedInfoAsyncContext(){} +}; +} // namespace Wifi +} // namespace OHOS + +#endif diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_entry.cpp b/interfaces/innerkits/native_cpp/napi/wifi_napi_entry.cpp index 1415486..31c53cb 100755 --- a/interfaces/innerkits/native_cpp/napi/wifi_napi_entry.cpp +++ b/interfaces/innerkits/native_cpp/napi/wifi_napi_entry.cpp @@ -1,142 +1,142 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "wifi_napi_device.h" -#include "wifi_napi_hotspot.h" -#include "wifi_napi_p2p.h" -#include "wifi_napi_event.h" -#include "wifi_logger.h" - -namespace OHOS { -namespace Wifi { -#ifndef ENABLE_NAPI_COMPATIBLE -DEFINE_WIFILOG_LABEL("WifiNAPIEntry"); -/* - * Event class initialization function - */ -static void InitEventClass(napi_env& env, napi_value& exports) { - const char className[] = "EventListener"; - napi_property_descriptor properties[] = { - DECLARE_NAPI_FUNCTION("on", On), - DECLARE_NAPI_FUNCTION("off", Off), - }; - - napi_value eventListenerClass = nullptr; - napi_define_class(env, className, sizeof(className), EventListenerConstructor, nullptr, - sizeof(properties) / sizeof(napi_property_descriptor), properties, &eventListenerClass); - napi_status status = napi_set_named_property(env, exports, "EventListener", eventListenerClass); - if (status != napi_ok) { - WIFI_LOGE("Init event class set property error."); - } -} - -/* - * Module initialization function - */ -static napi_value Init(napi_env env, napi_value exports) { - napi_property_descriptor desc[] = { - DECLARE_NAPI_FUNCTION("enableWifi", EnableWifi), - DECLARE_NAPI_FUNCTION("disableWifi", DisableWifi), - DECLARE_NAPI_FUNCTION("isWifiActive", IsWifiActive), - DECLARE_NAPI_FUNCTION("scan", Scan), - DECLARE_NAPI_FUNCTION("getScanInfos", GetScanInfos), - DECLARE_NAPI_FUNCTION("addDeviceConfig", AddDeviceConfig), - DECLARE_NAPI_FUNCTION("connectToNetwork", ConnectToNetwork), - DECLARE_NAPI_FUNCTION("connectToDevice", ConnectToDevice), - DECLARE_NAPI_FUNCTION("isConnected", IsConnected), - DECLARE_NAPI_FUNCTION("disconnect", Disconnect), - DECLARE_NAPI_FUNCTION("getSignalLevel", GetSignalLevel), - DECLARE_NAPI_FUNCTION("reconnect", ReConnect), - DECLARE_NAPI_FUNCTION("reassociate", ReAssociate), - DECLARE_NAPI_FUNCTION("getIpInfo", GetIpInfo), - DECLARE_NAPI_FUNCTION("getLinkedInfo", GetLinkedInfo), - DECLARE_NAPI_FUNCTION("removeDevice", RemoveDevice), - DECLARE_NAPI_FUNCTION("removeAllNetwork", RemoveAllNetwork), - DECLARE_NAPI_FUNCTION("disableNetwork", DisableNetwork), - DECLARE_NAPI_FUNCTION("getCountryCode", GetCountryCode), - DECLARE_NAPI_FUNCTION("getDeviceConfigs", GetDeviceConfigs), - DECLARE_NAPI_FUNCTION("updateNetwork", UpdateNetwork), - DECLARE_NAPI_FUNCTION("getSupportedFeatures", GetSupportedFeatures), - DECLARE_NAPI_FUNCTION("isFeatureSupported", IsFeatureSupported), - DECLARE_NAPI_FUNCTION("getDeviceMacAddress", GetDeviceMacAddress), - DECLARE_NAPI_FUNCTION("isHotspotActive", IsHotspotActive), - DECLARE_NAPI_FUNCTION("enableHotspot", EnableHotspot), - DECLARE_NAPI_FUNCTION("disableHotspot", DisableHotspot), - DECLARE_NAPI_FUNCTION("setHotspotConfig", SetHotspotConfig), - DECLARE_NAPI_FUNCTION("getHotspotConfig", GetHotspotConfig), - DECLARE_NAPI_FUNCTION("getStations", GetStations), - }; - - NAPI_CALL(env, napi_define_properties(env, exports, sizeof(desc) / sizeof(napi_property_descriptor), desc)); - InitEventClass(env, exports); - return exports; -} - -static napi_module wifiJsModule = { - .nm_version = 1, - .nm_flags = 0, - .nm_filename = NULL, - .nm_register_func = Init, - .nm_modname = "wifi", - .nm_priv = ((void *)0), - .reserved = { 0 } -}; - -#else - -/* - * Module initialization function - */ -static napi_value InitForCompatible(napi_env env, napi_value exports) { - napi_property_descriptor desc[] = { - DECLARE_NAPI_FUNCTION("enableWifi", EnableWifi), - DECLARE_NAPI_FUNCTION("disableWifi", DisableWifi), - DECLARE_NAPI_FUNCTION("isWifiActive", IsWifiActive), - DECLARE_NAPI_FUNCTION("scan", Scan), - DECLARE_NAPI_FUNCTION("getScanInfos", GetScanInfos), - DECLARE_NAPI_FUNCTION("addDeviceConfig", AddDeviceConfig), - DECLARE_NAPI_FUNCTION("connectToNetwork", ConnectToNetwork), - DECLARE_NAPI_FUNCTION("connectToDevice", ConnectToDevice), - DECLARE_NAPI_FUNCTION("disconnect", Disconnect), - DECLARE_NAPI_FUNCTION("getSignalLevel", GetSignalLevel), - }; - - NAPI_CALL(env, napi_define_properties(env, exports, sizeof(desc) / sizeof(napi_property_descriptor), desc)); - return exports; -} - -/* @Deprecated - Changeme module name from "wifi_native_js" to "wifi", - * "wifi_native_js" will be discarded. Modify @11/2021 - */ -static napi_module wifiJsModuleForCompatible = { - .nm_version = 1, - .nm_flags = 0, - .nm_filename = NULL, - .nm_register_func = InitForCompatible, - .nm_modname = "wifi_native_js", - .nm_priv = ((void *)0), - .reserved = { 0 } -}; -#endif - -extern "C" __attribute__((constructor)) void RegisterModule(void) { -#ifndef ENABLE_NAPI_COMPATIBLE - napi_module_register(&wifiJsModule); -#else - napi_module_register(&wifiJsModuleForCompatible); -#endif -} -} // namespace Wifi -} // namespace OHOS +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "wifi_napi_device.h" +#include "wifi_napi_hotspot.h" +#include "wifi_napi_p2p.h" +#include "wifi_napi_event.h" +#include "wifi_logger.h" + +namespace OHOS { +namespace Wifi { +#ifndef ENABLE_NAPI_COMPATIBLE +DEFINE_WIFILOG_LABEL("WifiNAPIEntry"); +/* + * Event class initialization function + */ +static void InitEventClass(napi_env& env, napi_value& exports) { + const char className[] = "EventListener"; + napi_property_descriptor properties[] = { + DECLARE_NAPI_FUNCTION("on", On), + DECLARE_NAPI_FUNCTION("off", Off), + }; + + napi_value eventListenerClass = nullptr; + napi_define_class(env, className, sizeof(className), EventListenerConstructor, nullptr, + sizeof(properties) / sizeof(napi_property_descriptor), properties, &eventListenerClass); + napi_status status = napi_set_named_property(env, exports, "EventListener", eventListenerClass); + if (status != napi_ok) { + WIFI_LOGE("Init event class set property error."); + } +} + +/* + * Module initialization function + */ +static napi_value Init(napi_env env, napi_value exports) { + napi_property_descriptor desc[] = { + DECLARE_NAPI_FUNCTION("enableWifi", EnableWifi), + DECLARE_NAPI_FUNCTION("disableWifi", DisableWifi), + DECLARE_NAPI_FUNCTION("isWifiActive", IsWifiActive), + DECLARE_NAPI_FUNCTION("scan", Scan), + DECLARE_NAPI_FUNCTION("getScanInfos", GetScanInfos), + DECLARE_NAPI_FUNCTION("addDeviceConfig", AddDeviceConfig), + DECLARE_NAPI_FUNCTION("connectToNetwork", ConnectToNetwork), + DECLARE_NAPI_FUNCTION("connectToDevice", ConnectToDevice), + DECLARE_NAPI_FUNCTION("isConnected", IsConnected), + DECLARE_NAPI_FUNCTION("disconnect", Disconnect), + DECLARE_NAPI_FUNCTION("getSignalLevel", GetSignalLevel), + DECLARE_NAPI_FUNCTION("reconnect", ReConnect), + DECLARE_NAPI_FUNCTION("reassociate", ReAssociate), + DECLARE_NAPI_FUNCTION("getIpInfo", GetIpInfo), + DECLARE_NAPI_FUNCTION("getLinkedInfo", GetLinkedInfo), + DECLARE_NAPI_FUNCTION("removeDevice", RemoveDevice), + DECLARE_NAPI_FUNCTION("removeAllNetwork", RemoveAllNetwork), + DECLARE_NAPI_FUNCTION("disableNetwork", DisableNetwork), + DECLARE_NAPI_FUNCTION("getCountryCode", GetCountryCode), + DECLARE_NAPI_FUNCTION("getDeviceConfigs", GetDeviceConfigs), + DECLARE_NAPI_FUNCTION("updateNetwork", UpdateNetwork), + DECLARE_NAPI_FUNCTION("getSupportedFeatures", GetSupportedFeatures), + DECLARE_NAPI_FUNCTION("isFeatureSupported", IsFeatureSupported), + DECLARE_NAPI_FUNCTION("getDeviceMacAddress", GetDeviceMacAddress), + DECLARE_NAPI_FUNCTION("isHotspotActive", IsHotspotActive), + DECLARE_NAPI_FUNCTION("enableHotspot", EnableHotspot), + DECLARE_NAPI_FUNCTION("disableHotspot", DisableHotspot), + DECLARE_NAPI_FUNCTION("setHotspotConfig", SetHotspotConfig), + DECLARE_NAPI_FUNCTION("getHotspotConfig", GetHotspotConfig), + DECLARE_NAPI_FUNCTION("getStations", GetStations), + }; + + NAPI_CALL(env, napi_define_properties(env, exports, sizeof(desc) / sizeof(napi_property_descriptor), desc)); + InitEventClass(env, exports); + return exports; +} + +static napi_module wifiJsModule = { + .nm_version = 1, + .nm_flags = 0, + .nm_filename = NULL, + .nm_register_func = Init, + .nm_modname = "wifi", + .nm_priv = ((void *)0), + .reserved = { 0 } +}; + +#else + +/* + * Module initialization function + */ +static napi_value InitForCompatible(napi_env env, napi_value exports) { + napi_property_descriptor desc[] = { + DECLARE_NAPI_FUNCTION("enableWifi", EnableWifi), + DECLARE_NAPI_FUNCTION("disableWifi", DisableWifi), + DECLARE_NAPI_FUNCTION("isWifiActive", IsWifiActive), + DECLARE_NAPI_FUNCTION("scan", Scan), + DECLARE_NAPI_FUNCTION("getScanInfos", GetScanInfos), + DECLARE_NAPI_FUNCTION("addDeviceConfig", AddDeviceConfig), + DECLARE_NAPI_FUNCTION("connectToNetwork", ConnectToNetwork), + DECLARE_NAPI_FUNCTION("connectToDevice", ConnectToDevice), + DECLARE_NAPI_FUNCTION("disconnect", Disconnect), + DECLARE_NAPI_FUNCTION("getSignalLevel", GetSignalLevel), + }; + + NAPI_CALL(env, napi_define_properties(env, exports, sizeof(desc) / sizeof(napi_property_descriptor), desc)); + return exports; +} + +/* @Deprecated - Changeme module name from "wifi_native_js" to "wifi", + * "wifi_native_js" will be discarded. Modify @11/2021 + */ +static napi_module wifiJsModuleForCompatible = { + .nm_version = 1, + .nm_flags = 0, + .nm_filename = NULL, + .nm_register_func = InitForCompatible, + .nm_modname = "wifi_native_js", + .nm_priv = ((void *)0), + .reserved = { 0 } +}; +#endif + +extern "C" __attribute__((constructor)) void RegisterModule(void) { +#ifndef ENABLE_NAPI_COMPATIBLE + napi_module_register(&wifiJsModule); +#else + napi_module_register(&wifiJsModuleForCompatible); +#endif +} +} // namespace Wifi +} // namespace OHOS diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_event.cpp b/interfaces/innerkits/native_cpp/napi/wifi_napi_event.cpp index 11c79a4..7a1a5a4 100755 --- a/interfaces/innerkits/native_cpp/napi/wifi_napi_event.cpp +++ b/interfaces/innerkits/native_cpp/napi/wifi_napi_event.cpp @@ -1,431 +1,431 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "wifi_napi_event.h" -#include -#include "wifi_napi_utils.h" -#include "wifi_logger.h" - -using namespace OHOS::EventFwk; - -namespace OHOS { -namespace Wifi { -DEFINE_WIFILOG_LABEL("WifiNAPIEvent"); - -const std::string WIFI_EVENT_TYPE_POWER_STATE = "wifiStateChange"; -const std::string WIFI_EVENT_TYPE_CONN_STATE = "wifiConnectionChange"; -const std::string WIFI_EVENT_TYPE_SCAN_STATE = "wifiScanStateChange"; -const std::string WIFI_EVENT_TYPE_RSSI_STATE = "wifiRssiChange"; -const std::string WIFI_EVENT_TYPE_HOTSPOT_STATE = "hotspotStateChange"; -const std::string WIFI_EVENT_TYPE_AP_STA_JOIN = "hotspotStaJoin"; -const std::string WIFI_EVENT_TYPE_AP_STA_LEAVE = "hotspotStaLeave"; - -const std::string WIFI_USUAL_EVENT_POWER_STATE = "usual.event.wifi.POWER_STATE"; -const std::string WIFI_USUAL_EVENT_CONN_STATE = "usual.event.wifi.CONN_STATE"; -const std::string WIFI_USUAL_EVENT_SCAN_STATE = "usual.event.wifi.SCAN_STATE"; -const std::string WIFI_USUAL_EVENT_RSSI_STATE = "usual.event.wifi.RSSI_VALUE"; -const std::string WIFI_USUAL_EVENT_HOTSPOT_STATE = "usual.event.wifi.HOTSPOT_STATE"; -const std::string WIFI_USUAL_EVENT_AP_STA_JOIN = "usual.event.wifi.WIFI_HS_STA_JOIN"; -const std::string WIFI_USUAL_EVENT_AP_STA_LEAVE = "usual.event.wifi.WIFI_HS_STA_LEAVE"; - -std::shared_mutex g_regInfoMutex; -static std::map g_eventRegisterInfo; - -static std::map g_mapEventTypeToUsualEvent = { - { WIFI_EVENT_TYPE_POWER_STATE, WIFI_USUAL_EVENT_POWER_STATE }, - { WIFI_EVENT_TYPE_CONN_STATE, WIFI_USUAL_EVENT_CONN_STATE }, - { WIFI_EVENT_TYPE_SCAN_STATE, WIFI_USUAL_EVENT_SCAN_STATE }, - { WIFI_EVENT_TYPE_RSSI_STATE, WIFI_USUAL_EVENT_RSSI_STATE }, - { WIFI_EVENT_TYPE_HOTSPOT_STATE, WIFI_USUAL_EVENT_HOTSPOT_STATE }, -}; - -static std::map g_mapUserDefinedEventProcessFunc = {}; - -class EventRegisterInfo { -public: - explicit EventRegisterInfo(EventManager* context) : m_context(context) { - } - - EventRegisterInfo() { - } - - virtual ~EventRegisterInfo() { - } - - std::set& GetHandlersCb() { - return m_handlersCb; - } - - void SetSubscriber(std::shared_ptr& subscriber) { - m_subscriber = subscriber; - } - - std::shared_ptr GetSubscriber() { - return m_subscriber; - } - - void SetContext(EventManager* context) { - m_context = context; - } - - EventManager* GetContext() { - return m_context; - } - -private: - std::set m_handlersCb; - std::shared_ptr m_subscriber; - EventManager *m_context; -}; - -void Event::SetName(std::string& name) { - m_name = name; -} - -std::string Event::GetName() { - return m_name; -} - -napi_env Event::GetEnv() { - return m_env; -} - -napi_value WifiCommonEvent::PackResult() { - napi_value result; - napi_create_int32(GetEnv(), m_value, &result); - return result; -} - -static bool GetUsualEventByEventType(const std::string& type, std::string& usual) { - std::map::const_iterator it = g_mapEventTypeToUsualEvent.find(type); - if (it == g_mapEventTypeToUsualEvent.end()) { - return false; - } - usual = it->second; - return true; -} - -static bool GetEventTypeByUsualEvent(const std::string& usual, std::string& type) { - for (auto& each : g_mapEventTypeToUsualEvent) { - if (each.second == usual) { - type = each.first; - return true; - } - } - return false; -} - -static bool IsEventTypeExist(const std::string& type) { - return g_mapEventTypeToUsualEvent.find(type) != g_mapEventTypeToUsualEvent.end(); -} - -void WifiEventSubscriber::OnReceiveEvent(const CommonEventData& data) { - std::string event = data.GetWant().GetAction(); - int code = data.GetCode(); - WIFI_LOGI("Received event: %{public}s, value: %{public}d", event.c_str(), code); - - std::string type; - if (!GetEventTypeByUsualEvent(event, type)) { - WIFI_LOGI("Received event: %{public}s is ignored", event.c_str()); - return; - } - - EventManager *manager = nullptr; - { - std::shared_lock guard(g_regInfoMutex); - std::map::iterator it = g_eventRegisterInfo.find(type); - if (it == g_eventRegisterInfo.end()) { - WIFI_LOGE("No register info for event: %{public}s", type.c_str()); - return; - } - manager = it->second.GetContext(); - if (manager == nullptr) { - WIFI_LOGE("Context is null"); - return; - } - } - - std::map::iterator iter = g_mapUserDefinedEventProcessFunc.find(type); - if (iter != g_mapUserDefinedEventProcessFunc.end()) { - WIFI_LOGI("Has user-defined func for event: %{public}s", type.c_str()); - iter->second(manager->GetEnv(), type, data); - } else { - WIFI_LOGI("Use default policy to process event: %{public}s", type.c_str()); - WifiCommonEvent commonEvent(manager->GetEnv(), type, code); - if (!manager->Send(commonEvent)) { - WIFI_LOGE("Send event error"); - } - } -} - -EventManager::EventManager(napi_env env, napi_value thisVar) : m_env(env) { - m_thisVarRef = nullptr; - napi_create_reference(env, thisVar, 1, &m_thisVarRef); -} - -EventManager::~EventManager() {} - -bool EventManager::Send(Event& event) { - WIFI_LOGI("Report event: %{public}s", event.GetName().c_str()); - - napi_handle_scope scope = nullptr; - napi_open_handle_scope(m_env, &scope); - - std::shared_lock guard(g_regInfoMutex); - std::map::iterator it = g_eventRegisterInfo.find(event.GetName()); - if (it == g_eventRegisterInfo.end()) { - WIFI_LOGE("Event receive owner not exits: %{public}s", event.GetName().c_str()); - return false; - } - - bool result = true; - napi_value thisVar = nullptr; - napi_get_reference_value(m_env, m_thisVarRef, &thisVar); - for (auto& each : it->second.GetHandlersCb()) { - napi_value undefine; - napi_value handler = nullptr; - napi_get_undefined(m_env, &undefine); - napi_get_reference_value(m_env, each, &handler); - napi_value jsEvent = event.PackResult(); - if (napi_call_function(m_env, thisVar, handler, 1, &jsEvent, &undefine) != napi_ok) { - WIFI_LOGE("Report event failed"); - result = false; - } - } - napi_close_handle_scope(m_env, scope); - return result; -} - -bool EventManager::SubscribeServiceEvent(const std::string& event) { - MatchingSkills matchingSkills; - matchingSkills.AddEvent(event); - CommonEventSubscribeInfo subscriberInfo(matchingSkills); - std::shared_ptr subscriber = std::make_shared(subscriberInfo); - if (subscriber == nullptr) { - WIFI_LOGE("subscriber is null."); - return false; - } - WIFI_LOGI("Subscribe event -> %{public}s", event.c_str()); - bool result = CommonEventManager::SubscribeCommonEvent(subscriber); - if (result) { - g_eventRegisterInfo[m_eventType].SetSubscriber(subscriber); - } else { - WIFI_LOGE("Subscribe service event error: %{public}s", event.c_str()); - } - return result; -} - -bool EventManager::UnsubscribeServiceEvent(const std::string& event) { - bool result = CommonEventManager::UnSubscribeCommonEvent(g_eventRegisterInfo[m_eventType].GetSubscriber()); - if (!result) { - WIFI_LOGE("Unsubscribe service event error: %{public}s", event.c_str()); - } - return result; -} - -bool EventManager::SubscribeEvent(const std::string& name, napi_value handler) { - WIFI_LOGI("Subscribe event: %{public}s", name.c_str()); - - if (!IsEventTypeExist(name)) { - WIFI_LOGE("Subscribe event is not a valid event: %{public}s", name.c_str()); - return false; - } - SetEventType(name); - std::unique_lock guard(g_regInfoMutex); - std::map::iterator it = g_eventRegisterInfo.find(name); - if (it == g_eventRegisterInfo.end()) { - std::string usualEvent; - GetUsualEventByEventType(name, usualEvent); - bool result = SubscribeServiceEvent(usualEvent); - if (!result) { - WIFI_LOGE("Service register event failed: %{public}s", name.c_str()); - return false; - } - - EventRegisterInfo regInfo(this); - g_eventRegisterInfo[name] = regInfo; - } - - if (g_eventRegisterInfo[name].GetContext() != this) { - WIFI_LOGW("Subscribe event context changed!"); - g_eventRegisterInfo[name].SetContext(this); - } - - napi_ref handlerRef = nullptr; - napi_create_reference(m_env, handler, 1, &handlerRef); - g_eventRegisterInfo[name].GetHandlersCb().insert(handlerRef); - return true; -} - -void EventManager::DeleteHanderRef(std::set& setRefs, napi_value handler) { - for (auto& each : setRefs) { - napi_value handlerTemp = nullptr; - napi_get_reference_value(m_env, each, &handlerTemp); - bool isEqual = false; - napi_strict_equals(m_env, handlerTemp, handler, &isEqual); - if (isEqual) { - napi_delete_reference(m_env, each); - setRefs.erase(each); - return; - } - } -} - -void EventManager::DeleteAllHanderRef(std::set& setRefs) { - for (auto& each : setRefs) { - napi_delete_reference(m_env, each); - } - setRefs.clear(); -} - -bool EventManager::UnsubscribeEvent(const std::string& name, napi_value handler) { - WIFI_LOGI("Unsubscribe event: %{public}s", name.c_str()); - - if (!IsEventTypeExist(name)) { - WIFI_LOGE("Unsubscribe event is not a valid event: %{public}s", name.c_str()); - return false; - } - - bool isNeedUnsubscribe = false; - std::unique_lock guard(g_regInfoMutex); - std::map::iterator it = g_eventRegisterInfo.find(name); - if (it == g_eventRegisterInfo.end()) { - WIFI_LOGE("Unsubscribe event is not subscribe: %{public}s", name.c_str()); - return false; - } - if (handler != nullptr) { - DeleteHanderRef(it->second.GetHandlersCb(), handler); - } else { - WIFI_LOGW("All callback is unsubscribe for event: %{public}s", name.c_str()); - DeleteAllHanderRef(it->second.GetHandlersCb()); - } - /* No one subscribes event now */ - if (it->second.GetHandlersCb().empty()) { - isNeedUnsubscribe = true; - } - - SetEventType(name); - if (isNeedUnsubscribe) { - std::string usualEvent; - GetUsualEventByEventType(name, usualEvent); - bool result = UnsubscribeServiceEvent(usualEvent); - g_eventRegisterInfo.erase(name); - if (!result) { - WIFI_LOGE("Service unregister event failed: %{public}s", name.c_str()); - return false; - } - } - return true; -} - -void EventManager::SetEventType(const std::string& type) { - m_eventType = type; -} - -napi_env EventManager::GetEnv() { - return m_env; -} - -napi_value On(napi_env env, napi_callback_info cbinfo) { - TRACE_FUNC_CALL; - size_t requireArgc = 2; - size_t argc = 2; - napi_value argv[2] = {0}; - napi_value thisVar = 0; - napi_get_cb_info(env, cbinfo, &argc, argv, &thisVar, nullptr); - NAPI_ASSERT(env, argc >= requireArgc, "requires 2 parameter"); - - napi_valuetype eventName = napi_undefined; - napi_typeof(env, argv[0], &eventName); - NAPI_ASSERT(env, eventName == napi_string, "type mismatch for parameter 1"); - - napi_valuetype handler = napi_undefined; - napi_typeof(env, argv[1], &handler); - NAPI_ASSERT(env, handler == napi_function, "type mismatch for parameter 2"); - - EventManager *manager = nullptr; - napi_status status = napi_unwrap(env, thisVar, (void**)&manager); - if (status == napi_ok && manager != nullptr) { - char type[64] = {0}; - size_t typeLen = 0; - napi_get_value_string_utf8(env, argv[0], type, sizeof(type), &typeLen); - manager->SubscribeEvent(type, argv[1]); - } else { - WIFI_LOGE("On unwrap class failed"); - } - napi_value result = nullptr; - napi_get_undefined(env, &result); - return result; -} - -napi_value Off(napi_env env, napi_callback_info cbinfo) { - TRACE_FUNC_CALL; - size_t requireArgc = 1; - size_t requireArgcWithCb = 2; - size_t argc = 2; - napi_value argv[2] = {0}; - napi_value thisVar = 0; - napi_get_cb_info(env, cbinfo, &argc, argv, &thisVar, nullptr); - NAPI_ASSERT(env, argc >= requireArgc, "requires at least 1 parameter"); - - napi_valuetype eventName = napi_undefined; - napi_typeof(env, argv[0], &eventName); - NAPI_ASSERT(env, eventName == napi_string, "type mismatch for parameter 1"); - - if (argc >= requireArgcWithCb) { - napi_valuetype handler = napi_undefined; - napi_typeof(env, argv[1], &handler); - NAPI_ASSERT(env, handler == napi_function, "type mismatch for parameter 2"); - } - - EventManager *manager = nullptr; - napi_status status = napi_unwrap(env, thisVar, (void**)&manager); - if (status == napi_ok && manager != nullptr) { - char type[64] = {0}; - size_t typeLen = 0; - napi_get_value_string_utf8(env, argv[0], type, sizeof(type), &typeLen); - manager->UnsubscribeEvent(type, argc >= requireArgcWithCb ? argv[1] : nullptr); - } else { - WIFI_LOGE("Off unwrap class failed"); - } - napi_value result = nullptr; - napi_get_undefined(env, &result); - return result; -} - -napi_value EventListenerConstructor(napi_env env, napi_callback_info cbinfo) { - WIFI_LOGI("Event listener constructor"); - napi_value thisVar = nullptr; - void* data = nullptr; - napi_get_cb_info(env, cbinfo, nullptr, nullptr, &thisVar, &data); - - EventManager *eventManager = new EventManager(env, thisVar); - if (eventManager == nullptr) { - WIFI_LOGE("Init listener constructor failed"); - return nullptr; - } - napi_wrap( - env, thisVar, eventManager, - [](napi_env env, void* data, void* hint) { - WIFI_LOGI("Event listener destructor"); - EventManager *eventManager = (EventManager *)data; - delete eventManager; - eventManager = nullptr; - }, - nullptr, nullptr); - return thisVar; -} -} // namespace Wifi -} // namespace OHOS +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "wifi_napi_event.h" +#include +#include "wifi_napi_utils.h" +#include "wifi_logger.h" + +using namespace OHOS::EventFwk; + +namespace OHOS { +namespace Wifi { +DEFINE_WIFILOG_LABEL("WifiNAPIEvent"); + +const std::string WIFI_EVENT_TYPE_POWER_STATE = "wifiStateChange"; +const std::string WIFI_EVENT_TYPE_CONN_STATE = "wifiConnectionChange"; +const std::string WIFI_EVENT_TYPE_SCAN_STATE = "wifiScanStateChange"; +const std::string WIFI_EVENT_TYPE_RSSI_STATE = "wifiRssiChange"; +const std::string WIFI_EVENT_TYPE_HOTSPOT_STATE = "hotspotStateChange"; +const std::string WIFI_EVENT_TYPE_AP_STA_JOIN = "hotspotStaJoin"; +const std::string WIFI_EVENT_TYPE_AP_STA_LEAVE = "hotspotStaLeave"; + +const std::string WIFI_USUAL_EVENT_POWER_STATE = "usual.event.wifi.POWER_STATE"; +const std::string WIFI_USUAL_EVENT_CONN_STATE = "usual.event.wifi.CONN_STATE"; +const std::string WIFI_USUAL_EVENT_SCAN_STATE = "usual.event.wifi.SCAN_STATE"; +const std::string WIFI_USUAL_EVENT_RSSI_STATE = "usual.event.wifi.RSSI_VALUE"; +const std::string WIFI_USUAL_EVENT_HOTSPOT_STATE = "usual.event.wifi.HOTSPOT_STATE"; +const std::string WIFI_USUAL_EVENT_AP_STA_JOIN = "usual.event.wifi.WIFI_HS_STA_JOIN"; +const std::string WIFI_USUAL_EVENT_AP_STA_LEAVE = "usual.event.wifi.WIFI_HS_STA_LEAVE"; + +std::shared_mutex g_regInfoMutex; +static std::map g_eventRegisterInfo; + +static std::map g_mapEventTypeToUsualEvent = { + { WIFI_EVENT_TYPE_POWER_STATE, WIFI_USUAL_EVENT_POWER_STATE }, + { WIFI_EVENT_TYPE_CONN_STATE, WIFI_USUAL_EVENT_CONN_STATE }, + { WIFI_EVENT_TYPE_SCAN_STATE, WIFI_USUAL_EVENT_SCAN_STATE }, + { WIFI_EVENT_TYPE_RSSI_STATE, WIFI_USUAL_EVENT_RSSI_STATE }, + { WIFI_EVENT_TYPE_HOTSPOT_STATE, WIFI_USUAL_EVENT_HOTSPOT_STATE }, +}; + +static std::map g_mapUserDefinedEventProcessFunc = {}; + +class EventRegisterInfo { +public: + explicit EventRegisterInfo(EventManager* context) : m_context(context) { + } + + EventRegisterInfo() { + } + + virtual ~EventRegisterInfo() { + } + + std::set& GetHandlersCb() { + return m_handlersCb; + } + + void SetSubscriber(std::shared_ptr& subscriber) { + m_subscriber = subscriber; + } + + std::shared_ptr GetSubscriber() { + return m_subscriber; + } + + void SetContext(EventManager* context) { + m_context = context; + } + + EventManager* GetContext() { + return m_context; + } + +private: + std::set m_handlersCb; + std::shared_ptr m_subscriber; + EventManager *m_context; +}; + +void Event::SetName(std::string& name) { + m_name = name; +} + +std::string Event::GetName() { + return m_name; +} + +napi_env Event::GetEnv() { + return m_env; +} + +napi_value WifiCommonEvent::PackResult() { + napi_value result; + napi_create_int32(GetEnv(), m_value, &result); + return result; +} + +static bool GetUsualEventByEventType(const std::string& type, std::string& usual) { + std::map::const_iterator it = g_mapEventTypeToUsualEvent.find(type); + if (it == g_mapEventTypeToUsualEvent.end()) { + return false; + } + usual = it->second; + return true; +} + +static bool GetEventTypeByUsualEvent(const std::string& usual, std::string& type) { + for (auto& each : g_mapEventTypeToUsualEvent) { + if (each.second == usual) { + type = each.first; + return true; + } + } + return false; +} + +static bool IsEventTypeExist(const std::string& type) { + return g_mapEventTypeToUsualEvent.find(type) != g_mapEventTypeToUsualEvent.end(); +} + +void WifiEventSubscriber::OnReceiveEvent(const CommonEventData& data) { + std::string event = data.GetWant().GetAction(); + int code = data.GetCode(); + WIFI_LOGI("Received event: %{public}s, value: %{public}d", event.c_str(), code); + + std::string type; + if (!GetEventTypeByUsualEvent(event, type)) { + WIFI_LOGI("Received event: %{public}s is ignored", event.c_str()); + return; + } + + EventManager *manager = nullptr; + { + std::shared_lock guard(g_regInfoMutex); + std::map::iterator it = g_eventRegisterInfo.find(type); + if (it == g_eventRegisterInfo.end()) { + WIFI_LOGE("No register info for event: %{public}s", type.c_str()); + return; + } + manager = it->second.GetContext(); + if (manager == nullptr) { + WIFI_LOGE("Context is null"); + return; + } + } + + std::map::iterator iter = g_mapUserDefinedEventProcessFunc.find(type); + if (iter != g_mapUserDefinedEventProcessFunc.end()) { + WIFI_LOGI("Has user-defined func for event: %{public}s", type.c_str()); + iter->second(manager->GetEnv(), type, data); + } else { + WIFI_LOGI("Use default policy to process event: %{public}s", type.c_str()); + WifiCommonEvent commonEvent(manager->GetEnv(), type, code); + if (!manager->Send(commonEvent)) { + WIFI_LOGE("Send event error"); + } + } +} + +EventManager::EventManager(napi_env env, napi_value thisVar) : m_env(env) { + m_thisVarRef = nullptr; + napi_create_reference(env, thisVar, 1, &m_thisVarRef); +} + +EventManager::~EventManager() {} + +bool EventManager::Send(Event& event) { + WIFI_LOGI("Report event: %{public}s", event.GetName().c_str()); + + napi_handle_scope scope = nullptr; + napi_open_handle_scope(m_env, &scope); + + std::shared_lock guard(g_regInfoMutex); + std::map::iterator it = g_eventRegisterInfo.find(event.GetName()); + if (it == g_eventRegisterInfo.end()) { + WIFI_LOGE("Event receive owner not exits: %{public}s", event.GetName().c_str()); + return false; + } + + bool result = true; + napi_value thisVar = nullptr; + napi_get_reference_value(m_env, m_thisVarRef, &thisVar); + for (auto& each : it->second.GetHandlersCb()) { + napi_value undefine; + napi_value handler = nullptr; + napi_get_undefined(m_env, &undefine); + napi_get_reference_value(m_env, each, &handler); + napi_value jsEvent = event.PackResult(); + if (napi_call_function(m_env, thisVar, handler, 1, &jsEvent, &undefine) != napi_ok) { + WIFI_LOGE("Report event failed"); + result = false; + } + } + napi_close_handle_scope(m_env, scope); + return result; +} + +bool EventManager::SubscribeServiceEvent(const std::string& event) { + MatchingSkills matchingSkills; + matchingSkills.AddEvent(event); + CommonEventSubscribeInfo subscriberInfo(matchingSkills); + std::shared_ptr subscriber = std::make_shared(subscriberInfo); + if (subscriber == nullptr) { + WIFI_LOGE("subscriber is null."); + return false; + } + WIFI_LOGI("Subscribe event -> %{public}s", event.c_str()); + bool result = CommonEventManager::SubscribeCommonEvent(subscriber); + if (result) { + g_eventRegisterInfo[m_eventType].SetSubscriber(subscriber); + } else { + WIFI_LOGE("Subscribe service event error: %{public}s", event.c_str()); + } + return result; +} + +bool EventManager::UnsubscribeServiceEvent(const std::string& event) { + bool result = CommonEventManager::UnSubscribeCommonEvent(g_eventRegisterInfo[m_eventType].GetSubscriber()); + if (!result) { + WIFI_LOGE("Unsubscribe service event error: %{public}s", event.c_str()); + } + return result; +} + +bool EventManager::SubscribeEvent(const std::string& name, napi_value handler) { + WIFI_LOGI("Subscribe event: %{public}s", name.c_str()); + + if (!IsEventTypeExist(name)) { + WIFI_LOGE("Subscribe event is not a valid event: %{public}s", name.c_str()); + return false; + } + SetEventType(name); + std::unique_lock guard(g_regInfoMutex); + std::map::iterator it = g_eventRegisterInfo.find(name); + if (it == g_eventRegisterInfo.end()) { + std::string usualEvent; + GetUsualEventByEventType(name, usualEvent); + bool result = SubscribeServiceEvent(usualEvent); + if (!result) { + WIFI_LOGE("Service register event failed: %{public}s", name.c_str()); + return false; + } + + EventRegisterInfo regInfo(this); + g_eventRegisterInfo[name] = regInfo; + } + + if (g_eventRegisterInfo[name].GetContext() != this) { + WIFI_LOGW("Subscribe event context changed!"); + g_eventRegisterInfo[name].SetContext(this); + } + + napi_ref handlerRef = nullptr; + napi_create_reference(m_env, handler, 1, &handlerRef); + g_eventRegisterInfo[name].GetHandlersCb().insert(handlerRef); + return true; +} + +void EventManager::DeleteHanderRef(std::set& setRefs, napi_value handler) { + for (auto& each : setRefs) { + napi_value handlerTemp = nullptr; + napi_get_reference_value(m_env, each, &handlerTemp); + bool isEqual = false; + napi_strict_equals(m_env, handlerTemp, handler, &isEqual); + if (isEqual) { + napi_delete_reference(m_env, each); + setRefs.erase(each); + return; + } + } +} + +void EventManager::DeleteAllHanderRef(std::set& setRefs) { + for (auto& each : setRefs) { + napi_delete_reference(m_env, each); + } + setRefs.clear(); +} + +bool EventManager::UnsubscribeEvent(const std::string& name, napi_value handler) { + WIFI_LOGI("Unsubscribe event: %{public}s", name.c_str()); + + if (!IsEventTypeExist(name)) { + WIFI_LOGE("Unsubscribe event is not a valid event: %{public}s", name.c_str()); + return false; + } + + bool isNeedUnsubscribe = false; + std::unique_lock guard(g_regInfoMutex); + std::map::iterator it = g_eventRegisterInfo.find(name); + if (it == g_eventRegisterInfo.end()) { + WIFI_LOGE("Unsubscribe event is not subscribe: %{public}s", name.c_str()); + return false; + } + if (handler != nullptr) { + DeleteHanderRef(it->second.GetHandlersCb(), handler); + } else { + WIFI_LOGW("All callback is unsubscribe for event: %{public}s", name.c_str()); + DeleteAllHanderRef(it->second.GetHandlersCb()); + } + /* No one subscribes event now */ + if (it->second.GetHandlersCb().empty()) { + isNeedUnsubscribe = true; + } + + SetEventType(name); + if (isNeedUnsubscribe) { + std::string usualEvent; + GetUsualEventByEventType(name, usualEvent); + bool result = UnsubscribeServiceEvent(usualEvent); + g_eventRegisterInfo.erase(name); + if (!result) { + WIFI_LOGE("Service unregister event failed: %{public}s", name.c_str()); + return false; + } + } + return true; +} + +void EventManager::SetEventType(const std::string& type) { + m_eventType = type; +} + +napi_env EventManager::GetEnv() { + return m_env; +} + +napi_value On(napi_env env, napi_callback_info cbinfo) { + TRACE_FUNC_CALL; + size_t requireArgc = 2; + size_t argc = 2; + napi_value argv[2] = {0}; + napi_value thisVar = 0; + napi_get_cb_info(env, cbinfo, &argc, argv, &thisVar, nullptr); + NAPI_ASSERT(env, argc >= requireArgc, "requires 2 parameter"); + + napi_valuetype eventName = napi_undefined; + napi_typeof(env, argv[0], &eventName); + NAPI_ASSERT(env, eventName == napi_string, "type mismatch for parameter 1"); + + napi_valuetype handler = napi_undefined; + napi_typeof(env, argv[1], &handler); + NAPI_ASSERT(env, handler == napi_function, "type mismatch for parameter 2"); + + EventManager *manager = nullptr; + napi_status status = napi_unwrap(env, thisVar, (void**)&manager); + if (status == napi_ok && manager != nullptr) { + char type[64] = {0}; + size_t typeLen = 0; + napi_get_value_string_utf8(env, argv[0], type, sizeof(type), &typeLen); + manager->SubscribeEvent(type, argv[1]); + } else { + WIFI_LOGE("On unwrap class failed"); + } + napi_value result = nullptr; + napi_get_undefined(env, &result); + return result; +} + +napi_value Off(napi_env env, napi_callback_info cbinfo) { + TRACE_FUNC_CALL; + size_t requireArgc = 1; + size_t requireArgcWithCb = 2; + size_t argc = 2; + napi_value argv[2] = {0}; + napi_value thisVar = 0; + napi_get_cb_info(env, cbinfo, &argc, argv, &thisVar, nullptr); + NAPI_ASSERT(env, argc >= requireArgc, "requires at least 1 parameter"); + + napi_valuetype eventName = napi_undefined; + napi_typeof(env, argv[0], &eventName); + NAPI_ASSERT(env, eventName == napi_string, "type mismatch for parameter 1"); + + if (argc >= requireArgcWithCb) { + napi_valuetype handler = napi_undefined; + napi_typeof(env, argv[1], &handler); + NAPI_ASSERT(env, handler == napi_function, "type mismatch for parameter 2"); + } + + EventManager *manager = nullptr; + napi_status status = napi_unwrap(env, thisVar, (void**)&manager); + if (status == napi_ok && manager != nullptr) { + char type[64] = {0}; + size_t typeLen = 0; + napi_get_value_string_utf8(env, argv[0], type, sizeof(type), &typeLen); + manager->UnsubscribeEvent(type, argc >= requireArgcWithCb ? argv[1] : nullptr); + } else { + WIFI_LOGE("Off unwrap class failed"); + } + napi_value result = nullptr; + napi_get_undefined(env, &result); + return result; +} + +napi_value EventListenerConstructor(napi_env env, napi_callback_info cbinfo) { + WIFI_LOGI("Event listener constructor"); + napi_value thisVar = nullptr; + void* data = nullptr; + napi_get_cb_info(env, cbinfo, nullptr, nullptr, &thisVar, &data); + + EventManager *eventManager = new EventManager(env, thisVar); + if (eventManager == nullptr) { + WIFI_LOGE("Init listener constructor failed"); + return nullptr; + } + napi_wrap( + env, thisVar, eventManager, + [](napi_env env, void* data, void* hint) { + WIFI_LOGI("Event listener destructor"); + EventManager *eventManager = (EventManager *)data; + delete eventManager; + eventManager = nullptr; + }, + nullptr, nullptr); + return thisVar; +} +} // namespace Wifi +} // namespace OHOS diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_event.h b/interfaces/innerkits/native_cpp/napi/wifi_napi_event.h index e9da73d..19b583e 100755 --- a/interfaces/innerkits/native_cpp/napi/wifi_napi_event.h +++ b/interfaces/innerkits/native_cpp/napi/wifi_napi_event.h @@ -1,106 +1,106 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef WIFI_NAPI_EVENT_H_ -#define WIFI_NAPI_EVENT_H_ - -#include -#include -#include -#include "napi/native_api.h" -#include "common_event_manager.h" -#include "common_event.h" - -namespace OHOS { -namespace Wifi { - -typedef void (*UserDefinedEventProcessFunc)(const napi_env& env, const std::string& type, - const OHOS::EventFwk::CommonEventData& data); - -class Event { -public: - Event(napi_env env, std::string& name) : m_env(env), m_name(name) { - } - - virtual ~Event() { - } - - virtual napi_value PackResult() = 0; - - void SetName(std::string& name); - - std::string GetName(); - - napi_env GetEnv(); - -private: - napi_env m_env; - std::string m_name; -}; - -class WifiCommonEvent: public Event { -public: - WifiCommonEvent(napi_env env, std::string& name, int value) : Event(env, name), m_value(value) { - } - - virtual napi_value PackResult(); - -private: - int m_value; -}; - -class WifiEventSubscriber : public OHOS::EventFwk::CommonEventSubscriber { -public: - explicit WifiEventSubscriber(const OHOS::EventFwk::CommonEventSubscribeInfo &subscribeInfo) : - CommonEventSubscriber(subscribeInfo) { - } - - virtual ~WifiEventSubscriber() { - } - - virtual void OnReceiveEvent(const OHOS::EventFwk::CommonEventData &data) override; -}; - -class EventRegisterInfo; -class EventManager { -public: - EventManager(napi_env env, napi_value thisVar); - virtual ~EventManager(); - - bool Send(Event& event); - bool SubscribeEvent(const std::string& name, napi_value handler); - bool UnsubscribeEvent(const std::string& name, napi_value handler); - napi_env GetEnv(); - -private: - bool SubscribeServiceEvent(const std::string& event); - bool UnsubscribeServiceEvent(const std::string& event); - void DeleteHanderRef(std::set& setRefs, napi_value handler); - void DeleteAllHanderRef(std::set& setRefs); - void SetEventType(const std::string& type); - -private: - napi_env m_env; - napi_ref m_thisVarRef; - std::string m_eventType; -}; - -napi_value On(napi_env env, napi_callback_info cbinfo); -napi_value Off(napi_env env, napi_callback_info cbinfo); -napi_value EventListenerConstructor(napi_env env, napi_callback_info cbinfo); -} // namespace Wifi -} // namespace OHOS - -#endif +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef WIFI_NAPI_EVENT_H_ +#define WIFI_NAPI_EVENT_H_ + +#include +#include +#include +#include "napi/native_api.h" +#include "common_event_manager.h" +#include "common_event.h" + +namespace OHOS { +namespace Wifi { + +typedef void (*UserDefinedEventProcessFunc)(const napi_env& env, const std::string& type, + const OHOS::EventFwk::CommonEventData& data); + +class Event { +public: + Event(napi_env env, std::string& name) : m_env(env), m_name(name) { + } + + virtual ~Event() { + } + + virtual napi_value PackResult() = 0; + + void SetName(std::string& name); + + std::string GetName(); + + napi_env GetEnv(); + +private: + napi_env m_env; + std::string m_name; +}; + +class WifiCommonEvent: public Event { +public: + WifiCommonEvent(napi_env env, std::string& name, int value) : Event(env, name), m_value(value) { + } + + virtual napi_value PackResult(); + +private: + int m_value; +}; + +class WifiEventSubscriber : public OHOS::EventFwk::CommonEventSubscriber { +public: + explicit WifiEventSubscriber(const OHOS::EventFwk::CommonEventSubscribeInfo &subscribeInfo) : + CommonEventSubscriber(subscribeInfo) { + } + + virtual ~WifiEventSubscriber() { + } + + virtual void OnReceiveEvent(const OHOS::EventFwk::CommonEventData &data) override; +}; + +class EventRegisterInfo; +class EventManager { +public: + EventManager(napi_env env, napi_value thisVar); + virtual ~EventManager(); + + bool Send(Event& event); + bool SubscribeEvent(const std::string& name, napi_value handler); + bool UnsubscribeEvent(const std::string& name, napi_value handler); + napi_env GetEnv(); + +private: + bool SubscribeServiceEvent(const std::string& event); + bool UnsubscribeServiceEvent(const std::string& event); + void DeleteHanderRef(std::set& setRefs, napi_value handler); + void DeleteAllHanderRef(std::set& setRefs); + void SetEventType(const std::string& type); + +private: + napi_env m_env; + napi_ref m_thisVarRef; + std::string m_eventType; +}; + +napi_value On(napi_env env, napi_callback_info cbinfo); +napi_value Off(napi_env env, napi_callback_info cbinfo); +napi_value EventListenerConstructor(napi_env env, napi_callback_info cbinfo); +} // namespace Wifi +} // namespace OHOS + +#endif diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_hotspot.cpp b/interfaces/innerkits/native_cpp/napi/wifi_napi_hotspot.cpp index 0d00063..5875c68 100755 --- a/interfaces/innerkits/native_cpp/napi/wifi_napi_hotspot.cpp +++ b/interfaces/innerkits/native_cpp/napi/wifi_napi_hotspot.cpp @@ -1,195 +1,195 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "wifi_napi_hotspot.h" -#include "wifi_hotspot.h" -#include "wifi_logger.h" -#include - -namespace OHOS { -namespace Wifi { -DEFINE_WIFILOG_LABEL("WifiNAPIHotspot"); - -std::unique_ptr wifiHotspotPtr = WifiHotspot::GetInstance(WIFI_HOTSPOT_ABILITY_ID); - -std::map g_mapSecTypeToKeyMgmt = { - {SecTypeJs::SEC_TYPE_OPEN, KeyMgmt::NONE}, - {SecTypeJs::SEC_TYPE_PSK, KeyMgmt::WPA_PSK}, -}; - -napi_value EnableHotspot(napi_env env, napi_callback_info info) -{ - TRACE_FUNC_CALL; - NAPI_ASSERT(env, wifiHotspotPtr != nullptr, "Wifi hotspot instance is null."); - ErrCode ret = wifiHotspotPtr->EnableHotspot(); - if (ret != WIFI_OPT_SUCCESS) { - WIFI_LOGE("Enable hotspot error: %{public}d", ret); - } - napi_value result; - napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); - return result; -} - -napi_value DisableHotspot(napi_env env, napi_callback_info info) -{ - TRACE_FUNC_CALL; - NAPI_ASSERT(env, wifiHotspotPtr != nullptr, "Wifi hotspot instance is null."); - ErrCode ret = wifiHotspotPtr->DisableHotspot(); - if (ret != WIFI_OPT_SUCCESS) { - WIFI_LOGE("Disable hotspot error: %{public}d", ret); - } - napi_value result; - napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); - return result; -} - -napi_value IsHotspotActive(napi_env env, napi_callback_info info) -{ - NAPI_ASSERT(env, wifiHotspotPtr != nullptr, "Wifi hotspot instance is null."); - napi_value result; - napi_get_boolean(env, wifiHotspotPtr->IsHotspotActive(), &result); - return result; -} - -static KeyMgmt GetKeyMgmtFromJsSecurityType(int secType) -{ - std::map::iterator iter = g_mapSecTypeToKeyMgmt.find(SecTypeJs(secType)); - return iter == g_mapSecTypeToKeyMgmt.end() ? KeyMgmt::NONE : iter->second; -} - -static int GetJsSecurityTypeFromKeyMgmt(KeyMgmt keyMgmt) -{ - for (auto& each : g_mapSecTypeToKeyMgmt) { - if (each.second == keyMgmt) { - return static_cast(each.first); - } - } - return static_cast(SecTypeJs::SEC_TYPE_OPEN); -} - -static bool IsSecTypeSupported(int secType) -{ - return g_mapSecTypeToKeyMgmt.find(SecTypeJs(secType)) != g_mapSecTypeToKeyMgmt.end(); -} - -static bool GetHotspotconfigFromJs(const napi_env& env, const napi_value& object, HotspotConfig& config) -{ - std::string str = ""; - int value = 0; - JsObjectToString(env, object, "ssid", 33, str); // 33: ssid max length is 32 + '\0' - config.SetSsid(str); - str = ""; - JsObjectToInt(env, object, "securityType", value); - if (!IsSecTypeSupported(value)) { - WIFI_LOGE("securityType is not supported: %{public}d", value); - return false; - } - config.SetSecurityType(GetKeyMgmtFromJsSecurityType(value)); - value = 0; - JsObjectToInt(env, object, "band", value); - config.SetBand(BandType(value)); // 1: 2.4G, 2: 5G - value = 0; - JsObjectToString(env, object, "preSharedKey", 64, str); // 64: max length - config.SetPreSharedKey(str); - JsObjectToInt(env, object, "maxConn", value); - config.SetMaxConn(value); - return true; -} - -napi_value SetHotspotConfig(napi_env env, napi_callback_info info) -{ - TRACE_FUNC_CALL; - size_t argc = 1; - napi_value argv[1]; - napi_value thisVar; - NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); - - napi_valuetype valueType; - napi_typeof(env, argv[0], &valueType); - NAPI_ASSERT(env, valueType == napi_object, "Wrong argument type. Object expected."); - NAPI_ASSERT(env, wifiHotspotPtr != nullptr, "Wifi hotspot instance is null."); - - ErrCode ret = WIFI_OPT_FAILED; - HotspotConfig config; - if (GetHotspotconfigFromJs(env, argv[0], config)) { - ret = wifiHotspotPtr->SetHotspotConfig(config); - if (ret != WIFI_OPT_SUCCESS) { - WIFI_LOGE("Set hotspot config error: %{public}d", ret); - } - } - napi_value result; - napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); - return result; -} - -static void HotspotconfigToJs(const napi_env& env, HotspotConfig& cppConfig, napi_value& result) -{ - SetValueUtf8String(env, "ssid", cppConfig.GetSsid().c_str(), result); - SetValueInt32(env, "securityType", GetJsSecurityTypeFromKeyMgmt(cppConfig.GetSecurityType()), result); - SetValueInt32(env, "band", static_cast(cppConfig.GetBand()), result); - SetValueUtf8String(env, "preSharedKey", cppConfig.GetPreSharedKey().c_str(), result); - SetValueInt32(env, "maxConn", cppConfig.GetMaxConn(), result); -} - -napi_value GetHotspotConfig(napi_env env, napi_callback_info info) -{ - TRACE_FUNC_CALL; - NAPI_ASSERT(env, wifiHotspotPtr != nullptr, "Wifi hotspot instance is null."); - HotspotConfig config; - ErrCode ret = wifiHotspotPtr->GetHotspotConfig(config); - if (ret != WIFI_OPT_SUCCESS) { - WIFI_LOGE("Get hotspot config error: %{public}d", ret); - } - napi_value result; - napi_create_object(env, &result); - HotspotconfigToJs(env, config, result); - return result; -} - -static void StationInfoToJsArray(const napi_env& env, const std::vector& StationInfo, - const int idx, napi_value& arrayResult) -{ - napi_value result; - napi_create_object(env, &result); - - SetValueUtf8String(env, "name", StationInfo[idx].deviceName.c_str(), result); - SetValueUtf8String(env, "macAddress", StationInfo[idx].bssid.c_str(), result); - SetValueUtf8String(env, "ipAddress", StationInfo[idx].ipAddr.c_str(), result); - napi_status status = napi_set_element(env, arrayResult, idx, result); - if (status != napi_ok) { - WIFI_LOGE("Set station element error: %{public}d", status); - } -} - -napi_value GetStations(napi_env env, napi_callback_info info) -{ - TRACE_FUNC_CALL; - NAPI_ASSERT(env, wifiHotspotPtr != nullptr, "Wifi hotspot instance is null."); - std::vector vecStationInfo; - ErrCode ret = wifiHotspotPtr->GetStationList(vecStationInfo); - if (ret != WIFI_OPT_SUCCESS) { - WIFI_LOGE("Get station list error: %{public}d", ret); - } - WIFI_LOGI("Get station list size: %{public}zu", vecStationInfo.size()); - - napi_value arrayResult; - napi_create_array_with_length(env, vecStationInfo.size(), &arrayResult); - for (size_t i = 0; i != vecStationInfo.size(); ++i) { - StationInfoToJsArray(env, vecStationInfo, i, arrayResult); - } - return arrayResult; -} -} // namespace Wifi -} // namespace OHOS +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "wifi_napi_hotspot.h" +#include "wifi_hotspot.h" +#include "wifi_logger.h" +#include + +namespace OHOS { +namespace Wifi { +DEFINE_WIFILOG_LABEL("WifiNAPIHotspot"); + +std::unique_ptr wifiHotspotPtr = WifiHotspot::GetInstance(WIFI_HOTSPOT_ABILITY_ID); + +std::map g_mapSecTypeToKeyMgmt = { + {SecTypeJs::SEC_TYPE_OPEN, KeyMgmt::NONE}, + {SecTypeJs::SEC_TYPE_PSK, KeyMgmt::WPA_PSK}, +}; + +napi_value EnableHotspot(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + NAPI_ASSERT(env, wifiHotspotPtr != nullptr, "Wifi hotspot instance is null."); + ErrCode ret = wifiHotspotPtr->EnableHotspot(); + if (ret != WIFI_OPT_SUCCESS) { + WIFI_LOGE("Enable hotspot error: %{public}d", ret); + } + napi_value result; + napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); + return result; +} + +napi_value DisableHotspot(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + NAPI_ASSERT(env, wifiHotspotPtr != nullptr, "Wifi hotspot instance is null."); + ErrCode ret = wifiHotspotPtr->DisableHotspot(); + if (ret != WIFI_OPT_SUCCESS) { + WIFI_LOGE("Disable hotspot error: %{public}d", ret); + } + napi_value result; + napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); + return result; +} + +napi_value IsHotspotActive(napi_env env, napi_callback_info info) +{ + NAPI_ASSERT(env, wifiHotspotPtr != nullptr, "Wifi hotspot instance is null."); + napi_value result; + napi_get_boolean(env, wifiHotspotPtr->IsHotspotActive(), &result); + return result; +} + +static KeyMgmt GetKeyMgmtFromJsSecurityType(int secType) +{ + std::map::iterator iter = g_mapSecTypeToKeyMgmt.find(SecTypeJs(secType)); + return iter == g_mapSecTypeToKeyMgmt.end() ? KeyMgmt::NONE : iter->second; +} + +static int GetJsSecurityTypeFromKeyMgmt(KeyMgmt keyMgmt) +{ + for (auto& each : g_mapSecTypeToKeyMgmt) { + if (each.second == keyMgmt) { + return static_cast(each.first); + } + } + return static_cast(SecTypeJs::SEC_TYPE_OPEN); +} + +static bool IsSecTypeSupported(int secType) +{ + return g_mapSecTypeToKeyMgmt.find(SecTypeJs(secType)) != g_mapSecTypeToKeyMgmt.end(); +} + +static bool GetHotspotconfigFromJs(const napi_env& env, const napi_value& object, HotspotConfig& config) +{ + std::string str = ""; + int value = 0; + JsObjectToString(env, object, "ssid", 33, str); // 33: ssid max length is 32 + '\0' + config.SetSsid(str); + str = ""; + JsObjectToInt(env, object, "securityType", value); + if (!IsSecTypeSupported(value)) { + WIFI_LOGE("securityType is not supported: %{public}d", value); + return false; + } + config.SetSecurityType(GetKeyMgmtFromJsSecurityType(value)); + value = 0; + JsObjectToInt(env, object, "band", value); + config.SetBand(BandType(value)); // 1: 2.4G, 2: 5G + value = 0; + JsObjectToString(env, object, "preSharedKey", 64, str); // 64: max length + config.SetPreSharedKey(str); + JsObjectToInt(env, object, "maxConn", value); + config.SetMaxConn(value); + return true; +} + +napi_value SetHotspotConfig(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + size_t argc = 1; + napi_value argv[1]; + napi_value thisVar; + NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); + + napi_valuetype valueType; + napi_typeof(env, argv[0], &valueType); + NAPI_ASSERT(env, valueType == napi_object, "Wrong argument type. Object expected."); + NAPI_ASSERT(env, wifiHotspotPtr != nullptr, "Wifi hotspot instance is null."); + + ErrCode ret = WIFI_OPT_FAILED; + HotspotConfig config; + if (GetHotspotconfigFromJs(env, argv[0], config)) { + ret = wifiHotspotPtr->SetHotspotConfig(config); + if (ret != WIFI_OPT_SUCCESS) { + WIFI_LOGE("Set hotspot config error: %{public}d", ret); + } + } + napi_value result; + napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); + return result; +} + +static void HotspotconfigToJs(const napi_env& env, HotspotConfig& cppConfig, napi_value& result) +{ + SetValueUtf8String(env, "ssid", cppConfig.GetSsid().c_str(), result); + SetValueInt32(env, "securityType", GetJsSecurityTypeFromKeyMgmt(cppConfig.GetSecurityType()), result); + SetValueInt32(env, "band", static_cast(cppConfig.GetBand()), result); + SetValueUtf8String(env, "preSharedKey", cppConfig.GetPreSharedKey().c_str(), result); + SetValueInt32(env, "maxConn", cppConfig.GetMaxConn(), result); +} + +napi_value GetHotspotConfig(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + NAPI_ASSERT(env, wifiHotspotPtr != nullptr, "Wifi hotspot instance is null."); + HotspotConfig config; + ErrCode ret = wifiHotspotPtr->GetHotspotConfig(config); + if (ret != WIFI_OPT_SUCCESS) { + WIFI_LOGE("Get hotspot config error: %{public}d", ret); + } + napi_value result; + napi_create_object(env, &result); + HotspotconfigToJs(env, config, result); + return result; +} + +static void StationInfoToJsArray(const napi_env& env, const std::vector& StationInfo, + const int idx, napi_value& arrayResult) +{ + napi_value result; + napi_create_object(env, &result); + + SetValueUtf8String(env, "name", StationInfo[idx].deviceName.c_str(), result); + SetValueUtf8String(env, "macAddress", StationInfo[idx].bssid.c_str(), result); + SetValueUtf8String(env, "ipAddress", StationInfo[idx].ipAddr.c_str(), result); + napi_status status = napi_set_element(env, arrayResult, idx, result); + if (status != napi_ok) { + WIFI_LOGE("Set station element error: %{public}d", status); + } +} + +napi_value GetStations(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + NAPI_ASSERT(env, wifiHotspotPtr != nullptr, "Wifi hotspot instance is null."); + std::vector vecStationInfo; + ErrCode ret = wifiHotspotPtr->GetStationList(vecStationInfo); + if (ret != WIFI_OPT_SUCCESS) { + WIFI_LOGE("Get station list error: %{public}d", ret); + } + WIFI_LOGI("Get station list size: %{public}zu", vecStationInfo.size()); + + napi_value arrayResult; + napi_create_array_with_length(env, vecStationInfo.size(), &arrayResult); + for (size_t i = 0; i != vecStationInfo.size(); ++i) { + StationInfoToJsArray(env, vecStationInfo, i, arrayResult); + } + return arrayResult; +} +} // namespace Wifi +} // namespace OHOS diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_hotspot.h b/interfaces/innerkits/native_cpp/napi/wifi_napi_hotspot.h index 095b50a..45667c6 100755 --- a/interfaces/innerkits/native_cpp/napi/wifi_napi_hotspot.h +++ b/interfaces/innerkits/native_cpp/napi/wifi_napi_hotspot.h @@ -1,32 +1,32 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef WIFI_NAPI_HOTSPOT_H_ -#define WIFI_NAPI_HOTSPOT_H_ - -#include "wifi_napi_utils.h" - -namespace OHOS { -namespace Wifi { -napi_value EnableHotspot(napi_env env, napi_callback_info info); -napi_value DisableHotspot(napi_env env, napi_callback_info info); -napi_value IsHotspotActive(napi_env env, napi_callback_info info); -napi_value SetHotspotConfig(napi_env env, napi_callback_info info); -napi_value GetHotspotConfig(napi_env env, napi_callback_info info); -napi_value GetStations(napi_env env, napi_callback_info info); -} // namespace Wifi -} // namespace OHOS - -#endif +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef WIFI_NAPI_HOTSPOT_H_ +#define WIFI_NAPI_HOTSPOT_H_ + +#include "wifi_napi_utils.h" + +namespace OHOS { +namespace Wifi { +napi_value EnableHotspot(napi_env env, napi_callback_info info); +napi_value DisableHotspot(napi_env env, napi_callback_info info); +napi_value IsHotspotActive(napi_env env, napi_callback_info info); +napi_value SetHotspotConfig(napi_env env, napi_callback_info info); +napi_value GetHotspotConfig(napi_env env, napi_callback_info info); +napi_value GetStations(napi_env env, napi_callback_info info); +} // namespace Wifi +} // namespace OHOS + +#endif diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_p2p.cpp b/interfaces/innerkits/native_cpp/napi/wifi_napi_p2p.cpp index 2f6b735..f62b96a 100755 --- a/interfaces/innerkits/native_cpp/napi/wifi_napi_p2p.cpp +++ b/interfaces/innerkits/native_cpp/napi/wifi_napi_p2p.cpp @@ -1,23 +1,23 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "wifi_napi_p2p.h" -#include "wifi_logger.h" - -namespace OHOS { -namespace Wifi { - -} // namespace Wifi -} // namespace OHOS +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "wifi_napi_p2p.h" +#include "wifi_logger.h" + +namespace OHOS { +namespace Wifi { + +} // namespace Wifi +} // namespace OHOS diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_p2p.h b/interfaces/innerkits/native_cpp/napi/wifi_napi_p2p.h index 775c951..e007891 100755 --- a/interfaces/innerkits/native_cpp/napi/wifi_napi_p2p.h +++ b/interfaces/innerkits/native_cpp/napi/wifi_napi_p2p.h @@ -1,27 +1,27 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef WIFI_NAPI_P2P_H_ -#define WIFI_NAPI_P2P_H_ - -#include "wifi_napi_utils.h" - -namespace OHOS { -namespace Wifi { - -} // namespace Wifi -} // namespace OHOS - -#endif +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef WIFI_NAPI_P2P_H_ +#define WIFI_NAPI_P2P_H_ + +#include "wifi_napi_utils.h" + +namespace OHOS { +namespace Wifi { + +} // namespace Wifi +} // namespace OHOS + +#endif diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_utils.cpp b/interfaces/innerkits/native_cpp/napi/wifi_napi_utils.cpp index 81e51b9..a93b9c5 100755 --- a/interfaces/innerkits/native_cpp/napi/wifi_napi_utils.cpp +++ b/interfaces/innerkits/native_cpp/napi/wifi_napi_utils.cpp @@ -1,314 +1,314 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "wifi_napi_utils.h" -#include "securec.h" -#include "wifi_logger.h" - -namespace OHOS { -namespace Wifi { -DEFINE_WIFILOG_LABEL("WifiNAPIUtils"); - -TraceFuncCall::TraceFuncCall(std::string funcName): m_funcName(funcName) -{ - if (m_isTrace) { - m_startTime = std::chrono::steady_clock::now(); - WIFI_LOGD("Call func: %{public}s (start)", m_funcName.c_str()); - } -} - -TraceFuncCall::~TraceFuncCall() -{ - if (m_isTrace) { - auto us = std::chrono::duration_cast - (std::chrono::steady_clock::now() - m_startTime).count(); - constexpr int usForPerMs = 1000; - WIFI_LOGD("Call func: %{public}s (end), time cost:%{public}lldus, %{public}lldms", - m_funcName.c_str(), us, us / usForPerMs); - } -} - -napi_value UndefinedNapiValue(const napi_env& env) -{ - napi_value result; - napi_get_undefined(env, &result); - return result; -} - -napi_value JsObjectToString(const napi_env& env, const napi_value& object, - const char* fieldStr, const int bufLen, std::string& fieldRef) -{ - bool hasProperty = false; - NAPI_CALL(env, napi_has_named_property(env, object, fieldStr, &hasProperty)); - if (hasProperty) { - napi_value field; - napi_valuetype valueType; - - napi_get_named_property(env, object, fieldStr, &field); - NAPI_CALL(env, napi_typeof(env, field, &valueType)); - NAPI_ASSERT(env, valueType == napi_string, "Wrong argument type. String expected."); - if (bufLen <= 0) { - goto error; - } - char *buf = (char *)malloc(bufLen); - if (buf == nullptr) { - WIFI_LOGE("Js object to str malloc failed"); - goto error; - } - (void)memset_s(buf, bufLen, 0, bufLen); - size_t result = 0; - NAPI_CALL(env, napi_get_value_string_utf8(env, field, buf, bufLen, &result)); - fieldRef = buf; - free(buf); - buf = nullptr; - } else { - WIFI_LOGW("Js obj to str no property: %{public}s", fieldStr); - } - -error: - return UndefinedNapiValue(env); -} - -napi_value JsObjectToInt(const napi_env& env, const napi_value& object, const char* fieldStr, int& fieldRef) -{ - bool hasProperty = false; - NAPI_CALL(env, napi_has_named_property(env, object, fieldStr, &hasProperty)); - if (hasProperty) { - napi_value field; - napi_valuetype valueType; - - napi_get_named_property(env, object, fieldStr, &field); - NAPI_CALL(env, napi_typeof(env, field, &valueType)); - NAPI_ASSERT(env, valueType == napi_number, "Wrong argument type. Number expected."); - napi_get_value_int32(env, field, &fieldRef); - } else { - WIFI_LOGW("Js to int no property: %{public}s", fieldStr); - } - return UndefinedNapiValue(env); -} - -napi_value JsObjectToBool(const napi_env& env, const napi_value& object, const char* fieldStr, bool& fieldRef) -{ - bool hasProperty = false; - NAPI_CALL(env, napi_has_named_property(env, object, fieldStr, &hasProperty)); - if (hasProperty) { - napi_value field; - napi_valuetype valueType; - - napi_get_named_property(env, object, fieldStr, &field); - NAPI_CALL(env, napi_typeof(env, field, &valueType)); - NAPI_ASSERT(env, valueType == napi_boolean, "Wrong argument type. Bool expected."); - napi_get_value_bool(env, field, &fieldRef); - } else { - WIFI_LOGW("Js to bool no property: %{public}s", fieldStr); - } - return UndefinedNapiValue(env); -} - -napi_status SetValueUtf8String(const napi_env& env, const char* fieldStr, const char* str, napi_value& result) -{ - napi_value value; - napi_status status = napi_create_string_utf8(env, str, NAPI_AUTO_LENGTH, &value); - if (status != napi_ok) { - WIFI_LOGE("Set value create utf8 string error! field: %{public}s", fieldStr); - return status; - } - status = napi_set_named_property(env, result, fieldStr, value); - if (status != napi_ok) { - WIFI_LOGE("Set utf8 string named property error! field: %{public}s", fieldStr); - } - return status; -} - -napi_status SetValueInt32(const napi_env& env, const char* fieldStr, const int intValue, napi_value& result) -{ - napi_value value; - napi_status status = napi_create_int32(env, intValue, &value); - if (status != napi_ok) { - WIFI_LOGE("Set value create int32 error! field: %{public}s", fieldStr); - return status; - } - status = napi_set_named_property(env, result, fieldStr, value); - if (status != napi_ok) { - WIFI_LOGE("Set int32 named property error! field: %{public}s", fieldStr); - } - return status; -} - -napi_status SetValueUnsignedInt32(const napi_env& env, const char* fieldStr, const int intValue, napi_value& result) -{ - napi_value value; - napi_status status = napi_create_uint32(env, intValue, &value); - if (status != napi_ok) { - WIFI_LOGE("Set value create unsigned int32 error! field: %{public}s", fieldStr); - return status; - } - status = napi_set_named_property(env, result, fieldStr, value); - if (status != napi_ok) { - WIFI_LOGE("Set unsigned int32 named property error! field: %{public}s", fieldStr); - } - return status; -} - -napi_status SetValueInt64(const napi_env& env, const char* fieldStr, const int64_t intValue, napi_value& result) -{ - napi_value value; - napi_status status = napi_create_int64(env, intValue, &value); - if (status != napi_ok) { - WIFI_LOGE("Set value create int64 error! field: %{public}s", fieldStr); - return status; - } - status = napi_set_named_property(env, result, fieldStr, value); - if (status != napi_ok) { - WIFI_LOGE("Set int64 named property error! field: %{public}s", fieldStr); - } - return status; -} - -napi_status SetValueBool(const napi_env& env, const char* fieldStr, const bool boolvalue, napi_value& result) -{ - napi_value value; - napi_status status = napi_get_boolean(env, boolvalue, &value); - if (status != napi_ok) { - WIFI_LOGE("Set value create boolean error! field: %{public}s", fieldStr); - return status; - } - status = napi_set_named_property(env, result, fieldStr, value); - if (status != napi_ok) { - WIFI_LOGE("Set boolean named property error! field: %{public}s", fieldStr); - } - return status; -} - -static napi_value InitAsyncCallBackEnv(const napi_env& env, AsyncContext *asyncContext, - const size_t argc, const napi_value *argv, const size_t nonCallbackArgNum) -{ - for (size_t i = nonCallbackArgNum; i != argc; ++i) { - napi_valuetype valuetype; - NAPI_CALL(env, napi_typeof(env, argv[i], &valuetype)); - NAPI_ASSERT(env, valuetype == napi_function, "Wrong argument type. Function expected."); - napi_create_reference(env, argv[i], 1, &asyncContext->callback[i - nonCallbackArgNum]); - } - return nullptr; -} - -static napi_value InitAsyncPromiseEnv(const napi_env& env, AsyncContext *asyncContext, napi_value& promise) -{ - napi_deferred deferred; - NAPI_CALL(env, napi_create_promise(env, &deferred, &promise)); - asyncContext->deferred = deferred; - return nullptr; -} - -static napi_value DoCallBackAsyncWork(const napi_env& env, AsyncContext *asyncContext) -{ - napi_create_async_work( - env, - nullptr, - asyncContext->resourceName, - [](napi_env env, void* data) { - if (data == nullptr) { - WIFI_LOGE("Async data parameter is null"); - return; - } - AsyncContext *context = (AsyncContext *)data; - context->executeFunc(context); - }, - [](napi_env env, napi_status status, void* data) { - if (data == nullptr) { - WIFI_LOGE("Async data parameter is null"); - return; - } - AsyncContext *context = (AsyncContext *)data; - napi_value undefine; - napi_get_undefined(env, &undefine); - napi_value callback; - context->completeFunc(data); - if (context->isSuccess) { - napi_get_reference_value(env, context->callback[0], &callback); - napi_call_function(env, nullptr, callback, 1, &context->result, &undefine); - } else { - if (context->callback[1]) { - napi_get_reference_value(env, context->callback[1], &callback); - napi_call_function(env, nullptr, callback, 1, &context->result, &undefine); - } else { - WIFI_LOGE("Get scan info callback func is null"); - } - } - if (context->callback[0] != nullptr) { - napi_delete_reference(env, context->callback[0]); - } - if (context->callback[1] != nullptr) { - napi_delete_reference(env, context->callback[1]); - } - napi_delete_async_work(env, context->work); - delete context; - }, - (void *)asyncContext, - &asyncContext->work); - NAPI_CALL(env, napi_queue_async_work(env, asyncContext->work)); - return UndefinedNapiValue(env); -} - -static napi_value DoPromiseAsyncWork(const napi_env& env, AsyncContext *asyncContext) -{ - napi_create_async_work( - env, - nullptr, - asyncContext->resourceName, - [](napi_env env, void *data) { - if (data == nullptr) { - WIFI_LOGE("Async data parameter is null"); - return; - } - AsyncContext *context = (AsyncContext *)data; - context->executeFunc(context); - }, - [](napi_env env, napi_status status, void *data) { - if (data == nullptr) { - WIFI_LOGE("Async data parameter is null"); - return; - } - AsyncContext *context = (AsyncContext *)data; - context->completeFunc(data); - if (context->isSuccess) { - napi_resolve_deferred(context->env, context->deferred, context->result); - } else { - napi_reject_deferred(context->env, context->deferred, context->result); - } - napi_delete_async_work(env, context->work); - delete context; - }, - (void *)asyncContext, - &asyncContext->work); - napi_queue_async_work(env, asyncContext->work); - return UndefinedNapiValue(env); -} - -napi_value DoAsyncWork(const napi_env& env, AsyncContext *asyncContext, - const size_t argc, const napi_value *argv, const size_t nonCallbackArgNum) -{ - if (argc > nonCallbackArgNum) { - InitAsyncCallBackEnv(env, asyncContext, argc, argv, nonCallbackArgNum); - return DoCallBackAsyncWork(env, asyncContext); - } else { - napi_value promise; - InitAsyncPromiseEnv(env, asyncContext, promise); - DoPromiseAsyncWork(env, asyncContext); - return promise; - } -} -} // namespace Wifi -} // namespace OHOS +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "wifi_napi_utils.h" +#include "securec.h" +#include "wifi_logger.h" + +namespace OHOS { +namespace Wifi { +DEFINE_WIFILOG_LABEL("WifiNAPIUtils"); + +TraceFuncCall::TraceFuncCall(std::string funcName): m_funcName(funcName) +{ + if (m_isTrace) { + m_startTime = std::chrono::steady_clock::now(); + WIFI_LOGD("Call func: %{public}s (start)", m_funcName.c_str()); + } +} + +TraceFuncCall::~TraceFuncCall() +{ + if (m_isTrace) { + auto us = std::chrono::duration_cast + (std::chrono::steady_clock::now() - m_startTime).count(); + constexpr int usForPerMs = 1000; + WIFI_LOGD("Call func: %{public}s (end), time cost:%{public}lldus, %{public}lldms", + m_funcName.c_str(), us, us / usForPerMs); + } +} + +napi_value UndefinedNapiValue(const napi_env& env) +{ + napi_value result; + napi_get_undefined(env, &result); + return result; +} + +napi_value JsObjectToString(const napi_env& env, const napi_value& object, + const char* fieldStr, const int bufLen, std::string& fieldRef) +{ + bool hasProperty = false; + NAPI_CALL(env, napi_has_named_property(env, object, fieldStr, &hasProperty)); + if (hasProperty) { + napi_value field; + napi_valuetype valueType; + + napi_get_named_property(env, object, fieldStr, &field); + NAPI_CALL(env, napi_typeof(env, field, &valueType)); + NAPI_ASSERT(env, valueType == napi_string, "Wrong argument type. String expected."); + if (bufLen <= 0) { + goto error; + } + char *buf = (char *)malloc(bufLen); + if (buf == nullptr) { + WIFI_LOGE("Js object to str malloc failed"); + goto error; + } + (void)memset_s(buf, bufLen, 0, bufLen); + size_t result = 0; + NAPI_CALL(env, napi_get_value_string_utf8(env, field, buf, bufLen, &result)); + fieldRef = buf; + free(buf); + buf = nullptr; + } else { + WIFI_LOGW("Js obj to str no property: %{public}s", fieldStr); + } + +error: + return UndefinedNapiValue(env); +} + +napi_value JsObjectToInt(const napi_env& env, const napi_value& object, const char* fieldStr, int& fieldRef) +{ + bool hasProperty = false; + NAPI_CALL(env, napi_has_named_property(env, object, fieldStr, &hasProperty)); + if (hasProperty) { + napi_value field; + napi_valuetype valueType; + + napi_get_named_property(env, object, fieldStr, &field); + NAPI_CALL(env, napi_typeof(env, field, &valueType)); + NAPI_ASSERT(env, valueType == napi_number, "Wrong argument type. Number expected."); + napi_get_value_int32(env, field, &fieldRef); + } else { + WIFI_LOGW("Js to int no property: %{public}s", fieldStr); + } + return UndefinedNapiValue(env); +} + +napi_value JsObjectToBool(const napi_env& env, const napi_value& object, const char* fieldStr, bool& fieldRef) +{ + bool hasProperty = false; + NAPI_CALL(env, napi_has_named_property(env, object, fieldStr, &hasProperty)); + if (hasProperty) { + napi_value field; + napi_valuetype valueType; + + napi_get_named_property(env, object, fieldStr, &field); + NAPI_CALL(env, napi_typeof(env, field, &valueType)); + NAPI_ASSERT(env, valueType == napi_boolean, "Wrong argument type. Bool expected."); + napi_get_value_bool(env, field, &fieldRef); + } else { + WIFI_LOGW("Js to bool no property: %{public}s", fieldStr); + } + return UndefinedNapiValue(env); +} + +napi_status SetValueUtf8String(const napi_env& env, const char* fieldStr, const char* str, napi_value& result) +{ + napi_value value; + napi_status status = napi_create_string_utf8(env, str, NAPI_AUTO_LENGTH, &value); + if (status != napi_ok) { + WIFI_LOGE("Set value create utf8 string error! field: %{public}s", fieldStr); + return status; + } + status = napi_set_named_property(env, result, fieldStr, value); + if (status != napi_ok) { + WIFI_LOGE("Set utf8 string named property error! field: %{public}s", fieldStr); + } + return status; +} + +napi_status SetValueInt32(const napi_env& env, const char* fieldStr, const int intValue, napi_value& result) +{ + napi_value value; + napi_status status = napi_create_int32(env, intValue, &value); + if (status != napi_ok) { + WIFI_LOGE("Set value create int32 error! field: %{public}s", fieldStr); + return status; + } + status = napi_set_named_property(env, result, fieldStr, value); + if (status != napi_ok) { + WIFI_LOGE("Set int32 named property error! field: %{public}s", fieldStr); + } + return status; +} + +napi_status SetValueUnsignedInt32(const napi_env& env, const char* fieldStr, const int intValue, napi_value& result) +{ + napi_value value; + napi_status status = napi_create_uint32(env, intValue, &value); + if (status != napi_ok) { + WIFI_LOGE("Set value create unsigned int32 error! field: %{public}s", fieldStr); + return status; + } + status = napi_set_named_property(env, result, fieldStr, value); + if (status != napi_ok) { + WIFI_LOGE("Set unsigned int32 named property error! field: %{public}s", fieldStr); + } + return status; +} + +napi_status SetValueInt64(const napi_env& env, const char* fieldStr, const int64_t intValue, napi_value& result) +{ + napi_value value; + napi_status status = napi_create_int64(env, intValue, &value); + if (status != napi_ok) { + WIFI_LOGE("Set value create int64 error! field: %{public}s", fieldStr); + return status; + } + status = napi_set_named_property(env, result, fieldStr, value); + if (status != napi_ok) { + WIFI_LOGE("Set int64 named property error! field: %{public}s", fieldStr); + } + return status; +} + +napi_status SetValueBool(const napi_env& env, const char* fieldStr, const bool boolvalue, napi_value& result) +{ + napi_value value; + napi_status status = napi_get_boolean(env, boolvalue, &value); + if (status != napi_ok) { + WIFI_LOGE("Set value create boolean error! field: %{public}s", fieldStr); + return status; + } + status = napi_set_named_property(env, result, fieldStr, value); + if (status != napi_ok) { + WIFI_LOGE("Set boolean named property error! field: %{public}s", fieldStr); + } + return status; +} + +static napi_value InitAsyncCallBackEnv(const napi_env& env, AsyncContext *asyncContext, + const size_t argc, const napi_value *argv, const size_t nonCallbackArgNum) +{ + for (size_t i = nonCallbackArgNum; i != argc; ++i) { + napi_valuetype valuetype; + NAPI_CALL(env, napi_typeof(env, argv[i], &valuetype)); + NAPI_ASSERT(env, valuetype == napi_function, "Wrong argument type. Function expected."); + napi_create_reference(env, argv[i], 1, &asyncContext->callback[i - nonCallbackArgNum]); + } + return nullptr; +} + +static napi_value InitAsyncPromiseEnv(const napi_env& env, AsyncContext *asyncContext, napi_value& promise) +{ + napi_deferred deferred; + NAPI_CALL(env, napi_create_promise(env, &deferred, &promise)); + asyncContext->deferred = deferred; + return nullptr; +} + +static napi_value DoCallBackAsyncWork(const napi_env& env, AsyncContext *asyncContext) +{ + napi_create_async_work( + env, + nullptr, + asyncContext->resourceName, + [](napi_env env, void* data) { + if (data == nullptr) { + WIFI_LOGE("Async data parameter is null"); + return; + } + AsyncContext *context = (AsyncContext *)data; + context->executeFunc(context); + }, + [](napi_env env, napi_status status, void* data) { + if (data == nullptr) { + WIFI_LOGE("Async data parameter is null"); + return; + } + AsyncContext *context = (AsyncContext *)data; + napi_value undefine; + napi_get_undefined(env, &undefine); + napi_value callback; + context->completeFunc(data); + if (context->isSuccess) { + napi_get_reference_value(env, context->callback[0], &callback); + napi_call_function(env, nullptr, callback, 1, &context->result, &undefine); + } else { + if (context->callback[1]) { + napi_get_reference_value(env, context->callback[1], &callback); + napi_call_function(env, nullptr, callback, 1, &context->result, &undefine); + } else { + WIFI_LOGE("Get scan info callback func is null"); + } + } + if (context->callback[0] != nullptr) { + napi_delete_reference(env, context->callback[0]); + } + if (context->callback[1] != nullptr) { + napi_delete_reference(env, context->callback[1]); + } + napi_delete_async_work(env, context->work); + delete context; + }, + (void *)asyncContext, + &asyncContext->work); + NAPI_CALL(env, napi_queue_async_work(env, asyncContext->work)); + return UndefinedNapiValue(env); +} + +static napi_value DoPromiseAsyncWork(const napi_env& env, AsyncContext *asyncContext) +{ + napi_create_async_work( + env, + nullptr, + asyncContext->resourceName, + [](napi_env env, void *data) { + if (data == nullptr) { + WIFI_LOGE("Async data parameter is null"); + return; + } + AsyncContext *context = (AsyncContext *)data; + context->executeFunc(context); + }, + [](napi_env env, napi_status status, void *data) { + if (data == nullptr) { + WIFI_LOGE("Async data parameter is null"); + return; + } + AsyncContext *context = (AsyncContext *)data; + context->completeFunc(data); + if (context->isSuccess) { + napi_resolve_deferred(context->env, context->deferred, context->result); + } else { + napi_reject_deferred(context->env, context->deferred, context->result); + } + napi_delete_async_work(env, context->work); + delete context; + }, + (void *)asyncContext, + &asyncContext->work); + napi_queue_async_work(env, asyncContext->work); + return UndefinedNapiValue(env); +} + +napi_value DoAsyncWork(const napi_env& env, AsyncContext *asyncContext, + const size_t argc, const napi_value *argv, const size_t nonCallbackArgNum) +{ + if (argc > nonCallbackArgNum) { + InitAsyncCallBackEnv(env, asyncContext, argc, argv, nonCallbackArgNum); + return DoCallBackAsyncWork(env, asyncContext); + } else { + napi_value promise; + InitAsyncPromiseEnv(env, asyncContext, promise); + DoPromiseAsyncWork(env, asyncContext); + return promise; + } +} +} // namespace Wifi +} // namespace OHOS diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_utils.h b/interfaces/innerkits/native_cpp/napi/wifi_napi_utils.h index a278583..3364788 100755 --- a/interfaces/innerkits/native_cpp/napi/wifi_napi_utils.h +++ b/interfaces/innerkits/native_cpp/napi/wifi_napi_utils.h @@ -1,96 +1,96 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef WIFI_NAPI_UTILS_H_ -#define WIFI_NAPI_UTILS_H_ - -#include -#include -#include "napi/native_api.h" -#include "napi/native_node_api.h" - -namespace OHOS { -namespace Wifi { -class TraceFuncCall final { -public: - TraceFuncCall(std::string funcName); - - TraceFuncCall() = delete; - - ~TraceFuncCall(); - -private: - std::string m_funcName; - std::chrono::steady_clock::time_point m_startTime; - bool m_isTrace = true; -}; - -#define TRACE_FUNC_CALL TraceFuncCall func(__func__) -#define TRACE_FUNC_CALL_NAME(name) TraceFuncCall funcName(name) - -class AsyncContext { -public: - napi_env env; - napi_async_work work; - napi_deferred deferred; - napi_ref callback[2] = { 0 }; - std::function executeFunc; - std::function completeFunc; - napi_value resourceName; - napi_value result; - bool isSuccess; - - AsyncContext(napi_env e, napi_async_work w = nullptr, napi_deferred d = nullptr) - { - env = e; - work = w; - deferred = d; - executeFunc = nullptr; - completeFunc = nullptr; - result = nullptr; - isSuccess = false; - } - - AsyncContext() = delete; - - virtual ~AsyncContext() - { - } -}; - -napi_value UndefinedNapiValue(const napi_env& env); -napi_value JsObjectToString(const napi_env& env, const napi_value& object, - const char* fieldStr, const int bufLen, std::string& fieldRef); -napi_value JsObjectToInt(const napi_env& env, const napi_value& object, const char* fieldStr, int& fieldRef); -napi_value JsObjectToBool(const napi_env& env, const napi_value& object, const char* fieldStr, bool& fieldRef); -napi_status SetValueUtf8String(const napi_env& env, const char* fieldStr, const char* str, napi_value& result); -napi_status SetValueInt32(const napi_env& env, const char* fieldStr, const int intValue, napi_value& result); -napi_status SetValueUnsignedInt32(const napi_env& env, const char* fieldStr, const int intValue, napi_value& result); -napi_status SetValueInt64(const napi_env& env, const char* fieldStr, const int64_t intValue, napi_value& result); -napi_status SetValueBool(const napi_env& env, const char* fieldStr, const bool boolValue, napi_value& result); -napi_value DoAsyncWork(const napi_env& env, AsyncContext *asyncContext, - const size_t argc, const napi_value *argv, const size_t nonCallbackArgNum); - -enum class SecTypeJs { - SEC_TYPE_INVALID = 0, /* Invalid security type */ - SEC_TYPE_OPEN = 1, /* Open */ - SEC_TYPE_WEP = 2, /* Wired Equivalent Privacy (WEP) */ - SEC_TYPE_PSK = 3, /* Pre-shared key (PSK) */ - SEC_TYPE_SAE = 4, /* Simultaneous Authentication of Equals (SAE) */ -}; -} // namespace Wifi -} // namespace OHOS - -#endif +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef WIFI_NAPI_UTILS_H_ +#define WIFI_NAPI_UTILS_H_ + +#include +#include +#include "napi/native_api.h" +#include "napi/native_node_api.h" + +namespace OHOS { +namespace Wifi { +class TraceFuncCall final { +public: + TraceFuncCall(std::string funcName); + + TraceFuncCall() = delete; + + ~TraceFuncCall(); + +private: + std::string m_funcName; + std::chrono::steady_clock::time_point m_startTime; + bool m_isTrace = true; +}; + +#define TRACE_FUNC_CALL TraceFuncCall func(__func__) +#define TRACE_FUNC_CALL_NAME(name) TraceFuncCall funcName(name) + +class AsyncContext { +public: + napi_env env; + napi_async_work work; + napi_deferred deferred; + napi_ref callback[2] = { 0 }; + std::function executeFunc; + std::function completeFunc; + napi_value resourceName; + napi_value result; + bool isSuccess; + + AsyncContext(napi_env e, napi_async_work w = nullptr, napi_deferred d = nullptr) + { + env = e; + work = w; + deferred = d; + executeFunc = nullptr; + completeFunc = nullptr; + result = nullptr; + isSuccess = false; + } + + AsyncContext() = delete; + + virtual ~AsyncContext() + { + } +}; + +napi_value UndefinedNapiValue(const napi_env& env); +napi_value JsObjectToString(const napi_env& env, const napi_value& object, + const char* fieldStr, const int bufLen, std::string& fieldRef); +napi_value JsObjectToInt(const napi_env& env, const napi_value& object, const char* fieldStr, int& fieldRef); +napi_value JsObjectToBool(const napi_env& env, const napi_value& object, const char* fieldStr, bool& fieldRef); +napi_status SetValueUtf8String(const napi_env& env, const char* fieldStr, const char* str, napi_value& result); +napi_status SetValueInt32(const napi_env& env, const char* fieldStr, const int intValue, napi_value& result); +napi_status SetValueUnsignedInt32(const napi_env& env, const char* fieldStr, const int intValue, napi_value& result); +napi_status SetValueInt64(const napi_env& env, const char* fieldStr, const int64_t intValue, napi_value& result); +napi_status SetValueBool(const napi_env& env, const char* fieldStr, const bool boolValue, napi_value& result); +napi_value DoAsyncWork(const napi_env& env, AsyncContext *asyncContext, + const size_t argc, const napi_value *argv, const size_t nonCallbackArgNum); + +enum class SecTypeJs { + SEC_TYPE_INVALID = 0, /* Invalid security type */ + SEC_TYPE_OPEN = 1, /* Open */ + SEC_TYPE_WEP = 2, /* Wired Equivalent Privacy (WEP) */ + SEC_TYPE_PSK = 3, /* Pre-shared key (PSK) */ + SEC_TYPE_SAE = 4, /* Simultaneous Authentication of Equals (SAE) */ +}; +} // namespace Wifi +} // namespace OHOS + +#endif diff --git a/interfaces/innerkits/native_cpp/wifi_standard/BUILD.gn b/interfaces/innerkits/native_cpp/wifi_standard/BUILD.gn index 0919e32..6edbf87 100755 --- a/interfaces/innerkits/native_cpp/wifi_standard/BUILD.gn +++ b/interfaces/innerkits/native_cpp/wifi_standard/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2021 Huawei Device Co., Ltd. +# Copyright (C) 2021-2022 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -29,6 +29,7 @@ config("wifi_sdk_header") { "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log/", "//foundation/distributedschedule/samgr/adapter/interfaces/innerkits/include", "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/include", + "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include", ] } @@ -101,6 +102,7 @@ ohos_source_set("wifi_p2p_proxy_impl") { external_deps = [ "ipc:ipc_core" ] } + ohos_shared_library("wifi_sdk") { install_enable = true @@ -112,10 +114,14 @@ ohos_shared_library("wifi_sdk") { sources = [ "c_adapter/wifi_c_device.cpp", "c_adapter/wifi_c_event.cpp", + "c_adapter/wifi_c_hid2d.cpp", "c_adapter/wifi_c_hotspot.cpp", + "c_adapter/wifi_c_p2p.cpp", "c_adapter/wifi_c_utils.cpp", "src/wifi_device.cpp", "src/wifi_device_callback_stub.cpp", + "src/wifi_hid2d.cpp", + "src/wifi_hid2d_msg.cpp", "src/wifi_hotspot.cpp", "src/wifi_hotspot_callback_stub.cpp", "src/wifi_p2p.cpp", diff --git a/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_device.cpp b/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_device.cpp index 21179c7..58eaef4 100755 --- a/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_device.cpp +++ b/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_device.cpp @@ -1,332 +1,339 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "native_c/wifi_device.h" -#include "native_cpp/wifi_standard/include/wifi_device.h" -#include "native_cpp/wifi_standard/include/wifi_scan.h" -#include "native_c/wifi_scan_info.h" -#include "native_c/wifi_device_config.h" -#include "wifi_logger.h" -#include "wifi_c_utils.h" -#include "wifi_common_util.h" - -DEFINE_WIFILOG_LABEL("WifiCDevice"); - -static std::map g_secTypeKeyMgmtMap = { - {WIFI_SEC_TYPE_OPEN, "NONE"}, - {WIFI_SEC_TYPE_WEP, "WEP"}, - {WIFI_SEC_TYPE_PSK, "WPA-PSK"}, - {WIFI_SEC_TYPE_SAE, "SAE"}, -}; - -std::unique_ptr wifiDevicePtr = OHOS::Wifi::WifiDevice::GetInstance(WIFI_DEVICE_ABILITY_ID); -std::unique_ptr wifiScanPtr = OHOS::Wifi::WifiScan::GetInstance(WIFI_SCAN_ABILITY_ID); - -WifiErrorCode EnableWifi() -{ - CHECK_PTR_RETURN(wifiDevicePtr, ERROR_WIFI_NOT_AVAILABLE); - return GetCErrorCode(wifiDevicePtr->EnableWifi()); -} - -WifiErrorCode DisableWifi() -{ - CHECK_PTR_RETURN(wifiDevicePtr, ERROR_WIFI_NOT_AVAILABLE); - return GetCErrorCode(wifiDevicePtr->DisableWifi()); -} - -int IsWifiActive() -{ - if (wifiDevicePtr == nullptr) { - return false; - } - - bool isActive = false; - OHOS::Wifi::ErrCode ret = wifiDevicePtr->IsWifiActive(isActive); - return (ret == OHOS::Wifi::WIFI_OPT_SUCCESS) && isActive; -} - -WifiErrorCode Scan() -{ - CHECK_PTR_RETURN(wifiScanPtr, ERROR_WIFI_NOT_AVAILABLE); - return GetCErrorCode(wifiScanPtr->Scan()); -} - -WifiErrorCode GetScanInfoList(WifiScanInfo *result, unsigned int *size) -{ - CHECK_PTR_RETURN(wifiScanPtr, ERROR_WIFI_NOT_AVAILABLE); - if (result == nullptr) { - WIFI_LOGE("Scan info receive addr is null!"); - return ERROR_WIFI_UNKNOWN; - } - - std::vector vecScnIanfos; - OHOS::Wifi::ErrCode ret = wifiScanPtr->GetScanInfoList(vecScnIanfos); - *size = (int)vecScnIanfos.size(); - for (auto& each : vecScnIanfos) { - if (memcpy_s(result->ssid, WIFI_MAX_SSID_LEN, each.ssid.c_str(), each.ssid.size() + 1) != EOK) { - return ERROR_WIFI_UNKNOWN; - } - if (OHOS::Wifi::MacStrToArray(each.bssid, result->bssid) != EOK) { - WIFI_LOGE("Scan info convert bssid error!"); - return ERROR_WIFI_UNKNOWN; - } - result->securityType = static_cast(each.securityType); - result->rssi = each.rssi; - result->band = each.band; - result->frequency = each.frequency; - ++result; - } - return GetCErrorCode(ret); -} - -static std::string GetKeyMgmtBySecType(const int securityType) -{ - WifiSecurityType key = WifiSecurityType(securityType); - std::map::const_iterator iter = g_secTypeKeyMgmtMap.find(key); - return iter == g_secTypeKeyMgmtMap.end() ? "NONE" : iter->second; -} - -static int GetSecTypeByKeyMgmt(const std::string& keyMgmt) -{ - for (auto& each : g_secTypeKeyMgmtMap) { - if (each.second == keyMgmt) { - return static_cast(each.first); - } - } - return static_cast(WIFI_SEC_TYPE_OPEN); -} - -static void GetStaticIpFromC(const IpConfig& ipConfig, OHOS::Wifi::StaticIpAddress& staticIp) -{ - /* Just IPV4 now */ - staticIp.ipAddress.address.addressIpv4 = ipConfig.ipAddress; - staticIp.gateway.addressIpv4 = ipConfig.gateway; - if (WIFI_MAX_DNS_NUM > 0) { - staticIp.dnsServer1.addressIpv4 = ipConfig.dnsServers[0]; - } - /* Has backup DNS server */ - if (WIFI_MAX_DNS_NUM > 1) { - staticIp.dnsServer2.addressIpv4 = ipConfig.dnsServers[1]; - } - /* netmask: automatic calculate netmask, don't support customized set this value currently */ -} - -static void GetStaticIpFromCpp(const OHOS::Wifi::StaticIpAddress& staticIp, IpConfig& ipConfig) -{ - /* Just IPV4 now */ - ipConfig.ipAddress = staticIp.ipAddress.address.addressIpv4; - ipConfig.gateway = staticIp.gateway.addressIpv4; - if (WIFI_MAX_DNS_NUM > 0) { - ipConfig.dnsServers[0] = staticIp.dnsServer1.addressIpv4; - } - /* Has backup DNS server */ - if (WIFI_MAX_DNS_NUM > 1) { - ipConfig.dnsServers[1] = staticIp.dnsServer2.addressIpv4; - } - /* netmask: not support now */ -} - -static void ConvertDeviceConfigFromC(const WifiDeviceConfig *config, OHOS::Wifi::WifiDeviceConfig& deviceConfig) -{ - deviceConfig.ssid = config->ssid; - if (OHOS::Wifi::IsMacArrayEmpty(config->bssid)) { - deviceConfig.bssid = ""; - } else { - deviceConfig.bssid = OHOS::Wifi::MacArrayToStr(config->bssid); - } - deviceConfig.preSharedKey = config->preSharedKey; - deviceConfig.keyMgmt = GetKeyMgmtBySecType(config->securityType); - deviceConfig.networkId = config->netId; - deviceConfig.frequency = config->freq; - /* wapiPskType is not support, don't verify now */ - if (config->ipType == DHCP) { - deviceConfig.wifiIpConfig.assignMethod = OHOS::Wifi::AssignIpMethod::DHCP; - } else if (config->ipType == STATIC_IP) { - deviceConfig.wifiIpConfig.assignMethod = OHOS::Wifi::AssignIpMethod::STATIC; - GetStaticIpFromC(config->staticIp, deviceConfig.wifiIpConfig.staticIpAddress); - } else { - deviceConfig.wifiIpConfig.assignMethod = OHOS::Wifi::AssignIpMethod::UNASSIGNED; - } - deviceConfig.hiddenSSID = config->isHiddenSsid; -} - -static OHOS::Wifi::ErrCode ConvertDeviceConfigFromCpp(const OHOS::Wifi::WifiDeviceConfig& deviceConfig, - WifiDeviceConfig *result) -{ - if (memcpy_s(result->ssid, WIFI_MAX_SSID_LEN, deviceConfig.ssid.c_str(), deviceConfig.ssid.size() + 1) != EOK) { - return OHOS::Wifi::WIFI_OPT_FAILED; - } - if (OHOS::Wifi::MacStrToArray(deviceConfig.bssid, result->bssid) != EOK) { - WIFI_LOGE("device config convert bssid error!"); - return OHOS::Wifi::WIFI_OPT_FAILED; - } - if (memcpy_s(result->preSharedKey, WIFI_MAX_KEY_LEN, deviceConfig.preSharedKey.c_str(), WIFI_MAX_KEY_LEN) != EOK) { - return OHOS::Wifi::WIFI_OPT_FAILED; - } - result->securityType = GetSecTypeByKeyMgmt(deviceConfig.keyMgmt); - result->netId = deviceConfig.networkId; - result->freq = deviceConfig.frequency; - /* wapiPskType is not support now */ - if (deviceConfig.wifiIpConfig.assignMethod == OHOS::Wifi::AssignIpMethod::DHCP) { - result->ipType = DHCP; - } else if (deviceConfig.wifiIpConfig.assignMethod == OHOS::Wifi::AssignIpMethod::STATIC) { - result->ipType = STATIC_IP; - GetStaticIpFromCpp(deviceConfig.wifiIpConfig.staticIpAddress, result->staticIp); - } else { - result->ipType = UNKNOWN; - } - result->isHiddenSsid = deviceConfig.hiddenSSID; - return OHOS::Wifi::WIFI_OPT_SUCCESS; -} - -WifiErrorCode AddDeviceConfig(const WifiDeviceConfig *config, int *result) -{ - CHECK_PTR_RETURN(wifiDevicePtr, ERROR_WIFI_NOT_AVAILABLE); - OHOS::Wifi::WifiDeviceConfig deviceConfig; - ConvertDeviceConfigFromC(config, deviceConfig); - int addResult = -1; - OHOS::Wifi::ErrCode ret = wifiDevicePtr->AddDeviceConfig(deviceConfig, addResult); - *result = addResult; - return GetCErrorCode(ret); -} - -WifiErrorCode GetDeviceConfigs(WifiDeviceConfig *result, unsigned int *size) -{ - CHECK_PTR_RETURN(wifiDevicePtr, ERROR_WIFI_NOT_AVAILABLE); - if (result == nullptr) { - WIFI_LOGE("Get device configs result array is null!"); - return ERROR_WIFI_UNKNOWN; - } - - std::vector vecDeviceConfigs; - OHOS::Wifi::ErrCode ret = wifiDevicePtr->GetDeviceConfigs(vecDeviceConfigs); - if (ret != OHOS::Wifi::WIFI_OPT_SUCCESS) { - WIFI_LOGE("Get device configs error!"); - return GetCErrorCode(ret); - } - *size = (int)vecDeviceConfigs.size(); - for (auto& each : vecDeviceConfigs) { - OHOS::Wifi::ErrCode retValue = ConvertDeviceConfigFromCpp(each, result++); - if (retValue != OHOS::Wifi::WIFI_OPT_SUCCESS) { - ret = retValue; - WIFI_LOGE("Convert device configs error!"); - } - } - return GetCErrorCode(ret); -} - -WifiErrorCode RemoveDevice(int networkId) -{ - CHECK_PTR_RETURN(wifiDevicePtr, ERROR_WIFI_NOT_AVAILABLE); - return GetCErrorCode(wifiDevicePtr->RemoveDevice(networkId)); -} - -WifiErrorCode DisableDeviceConfig(int networkId) -{ - return GetCErrorCode(OHOS::Wifi::WIFI_OPT_NOT_SUPPORTED); -} - -WifiErrorCode EnableDeviceConfig(int networkId) -{ - return GetCErrorCode(OHOS::Wifi::WIFI_OPT_NOT_SUPPORTED); -} - -WifiErrorCode ConnectTo(int networkId) -{ - CHECK_PTR_RETURN(wifiDevicePtr, ERROR_WIFI_NOT_AVAILABLE); - return GetCErrorCode(wifiDevicePtr->ConnectToNetwork(networkId)); -} - -WifiErrorCode ConnectToDevice(const WifiDeviceConfig *config) -{ - CHECK_PTR_RETURN(wifiDevicePtr, ERROR_WIFI_NOT_AVAILABLE); - OHOS::Wifi::WifiDeviceConfig deviceConfig; - ConvertDeviceConfigFromC(config, deviceConfig); - return GetCErrorCode(wifiDevicePtr->ConnectToDevice(deviceConfig)); -} - -WifiErrorCode Disconnect() -{ - CHECK_PTR_RETURN(wifiDevicePtr, ERROR_WIFI_NOT_AVAILABLE); - return GetCErrorCode(wifiDevicePtr->Disconnect()); -} - -static OHOS::Wifi::ErrCode GetLinkedInfoFromCpp(const OHOS::Wifi::WifiLinkedInfo& linkedInfo, WifiLinkedInfo *result) -{ - if (memcpy_s(result->ssid, WIFI_MAX_SSID_LEN, linkedInfo.ssid.c_str(), linkedInfo.ssid.size() + 1) != EOK) { - return OHOS::Wifi::WIFI_OPT_FAILED; - } - if (OHOS::Wifi::MacStrToArray(linkedInfo.bssid, result->bssid) != EOK) { - WIFI_LOGE("linked info convert bssid error!"); - return OHOS::Wifi::WIFI_OPT_FAILED; - } - result->rssi = linkedInfo.rssi; - result->band = linkedInfo.band; - result->frequency = linkedInfo.frequency; - result->connState = linkedInfo.connState == OHOS::Wifi::ConnState::CONNECTED ? WIFI_CONNECTED : WIFI_DISCONNECTED; - /* disconnectedReason not support */ - result->ipAddress = linkedInfo.ipAddress; - return OHOS::Wifi::WIFI_OPT_SUCCESS; -} - -WifiErrorCode GetLinkedInfo(WifiLinkedInfo *result) -{ - CHECK_PTR_RETURN(wifiDevicePtr, ERROR_WIFI_NOT_AVAILABLE); - OHOS::Wifi::WifiLinkedInfo linkedInfo; - OHOS::Wifi::ErrCode ret = wifiDevicePtr->GetLinkedInfo(linkedInfo); - if (ret == OHOS::Wifi::WIFI_OPT_SUCCESS) { - OHOS::Wifi::ErrCode retValue = GetLinkedInfoFromCpp(linkedInfo, result); - if (retValue != OHOS::Wifi::WIFI_OPT_SUCCESS) { - WIFI_LOGE("Get linked info from cpp error!"); - ret = retValue; - } - } - return GetCErrorCode(ret); -} - -WifiErrorCode GetDeviceMacAddress(unsigned char *result) -{ - CHECK_PTR_RETURN(wifiDevicePtr, ERROR_WIFI_NOT_AVAILABLE); - std::string mac; - OHOS::Wifi::ErrCode ret = wifiDevicePtr->GetDeviceMacAddress(mac); - if (ret == OHOS::Wifi::WIFI_OPT_SUCCESS) { - if (OHOS::Wifi::MacStrToArray(mac, result) != EOK) { - WIFI_LOGE("get mac convert to array error!"); - return ERROR_WIFI_UNKNOWN; - } - } - return GetCErrorCode(ret); -} - -WifiErrorCode AdvanceScan(WifiScanParams *params) -{ - return GetCErrorCode(OHOS::Wifi::WIFI_OPT_NOT_SUPPORTED); -} - -WifiErrorCode GetIpInfo(IpInfo *info) -{ - return GetCErrorCode(OHOS::Wifi::WIFI_OPT_NOT_SUPPORTED); -} - -int GetSignalLevel(int rssi, int band) -{ - CHECK_PTR_RETURN(wifiDevicePtr, ERROR_WIFI_NOT_AVAILABLE); - int level = -1; - OHOS::Wifi::ErrCode ret = wifiDevicePtr->GetSignalLevel(rssi, band, level); - if (ret != OHOS::Wifi::WIFI_OPT_SUCCESS) { - WIFI_LOGW("Get wifi signal level fail: %{public}d", ret); - } - return level; -} +/* + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "native_c/wifi_device.h" +#include "native_cpp/wifi_standard/include/wifi_device.h" +#include "native_cpp/wifi_standard/include/wifi_scan.h" +#include "native_c/wifi_scan_info.h" +#include "native_c/wifi_device_config.h" +#include "wifi_logger.h" +#include "wifi_c_utils.h" +#include "wifi_common_util.h" + +DEFINE_WIFILOG_LABEL("WifiCDevice"); + +static std::map g_secTypeKeyMgmtMap = { + {WIFI_SEC_TYPE_OPEN, "NONE"}, + {WIFI_SEC_TYPE_WEP, "WEP"}, + {WIFI_SEC_TYPE_PSK, "WPA-PSK"}, + {WIFI_SEC_TYPE_SAE, "SAE"}, +}; + +std::unique_ptr wifiDevicePtr = OHOS::Wifi::WifiDevice::GetInstance(WIFI_DEVICE_ABILITY_ID); +std::unique_ptr wifiScanPtr = OHOS::Wifi::WifiScan::GetInstance(WIFI_SCAN_ABILITY_ID); + +WifiErrorCode EnableWifi() +{ + CHECK_PTR_RETURN(wifiDevicePtr, ERROR_WIFI_NOT_AVAILABLE); + return GetCErrorCode(wifiDevicePtr->EnableWifi()); +} + +WifiErrorCode DisableWifi() +{ + CHECK_PTR_RETURN(wifiDevicePtr, ERROR_WIFI_NOT_AVAILABLE); + return GetCErrorCode(wifiDevicePtr->DisableWifi()); +} + +int IsWifiActive() +{ + if (wifiDevicePtr == nullptr) { + return false; + } + + bool isActive = false; + OHOS::Wifi::ErrCode ret = wifiDevicePtr->IsWifiActive(isActive); + return (ret == OHOS::Wifi::WIFI_OPT_SUCCESS) && isActive; +} + +WifiErrorCode Scan() +{ + CHECK_PTR_RETURN(wifiScanPtr, ERROR_WIFI_NOT_AVAILABLE); + return GetCErrorCode(wifiScanPtr->Scan()); +} + +WifiErrorCode GetScanInfoList(WifiScanInfo *result, unsigned int *size) +{ + CHECK_PTR_RETURN(wifiScanPtr, ERROR_WIFI_NOT_AVAILABLE); + if (result == nullptr) { + WIFI_LOGE("Scan info receive addr is null!"); + return ERROR_WIFI_UNKNOWN; + } + + std::vector vecScnIanfos; + OHOS::Wifi::ErrCode ret = wifiScanPtr->GetScanInfoList(vecScnIanfos); + *size = (int)vecScnIanfos.size(); + for (auto& each : vecScnIanfos) { + if (memcpy_s(result->ssid, WIFI_MAX_SSID_LEN, each.ssid.c_str(), each.ssid.size() + 1) != EOK) { + return ERROR_WIFI_UNKNOWN; + } + if (OHOS::Wifi::MacStrToArray(each.bssid, result->bssid) != EOK) { + WIFI_LOGE("Scan info convert bssid error!"); + return ERROR_WIFI_UNKNOWN; + } + result->securityType = static_cast(each.securityType); + result->rssi = each.rssi; + result->band = each.band; + result->frequency = each.frequency; + ++result; + } + return GetCErrorCode(ret); +} + +static std::string GetKeyMgmtBySecType(const int securityType) +{ + WifiSecurityType key = WifiSecurityType(securityType); + std::map::const_iterator iter = g_secTypeKeyMgmtMap.find(key); + return iter == g_secTypeKeyMgmtMap.end() ? "NONE" : iter->second; +} + +static int GetSecTypeByKeyMgmt(const std::string& keyMgmt) +{ + for (auto& each : g_secTypeKeyMgmtMap) { + if (each.second == keyMgmt) { + return static_cast(each.first); + } + } + return static_cast(WIFI_SEC_TYPE_OPEN); +} + +static void GetStaticIpFromC(const IpConfig& ipConfig, OHOS::Wifi::StaticIpAddress& staticIp) +{ + /* Just IPV4 now */ + staticIp.ipAddress.address.addressIpv4 = ipConfig.ipAddress; + staticIp.gateway.addressIpv4 = ipConfig.gateway; + if (WIFI_MAX_DNS_NUM > 0) { + staticIp.dnsServer1.addressIpv4 = ipConfig.dnsServers[0]; + } + /* Has backup DNS server */ + if (WIFI_MAX_DNS_NUM > 1) { + staticIp.dnsServer2.addressIpv4 = ipConfig.dnsServers[1]; + } + /* netmask: automatic calculate netmask, don't support customized set this value currently */ +} + +static void GetStaticIpFromCpp(const OHOS::Wifi::StaticIpAddress& staticIp, IpConfig& ipConfig) +{ + /* Just IPV4 now */ + ipConfig.ipAddress = staticIp.ipAddress.address.addressIpv4; + ipConfig.gateway = staticIp.gateway.addressIpv4; + if (WIFI_MAX_DNS_NUM > 0) { + ipConfig.dnsServers[0] = staticIp.dnsServer1.addressIpv4; + } + /* Has backup DNS server */ + if (WIFI_MAX_DNS_NUM > 1) { + ipConfig.dnsServers[1] = staticIp.dnsServer2.addressIpv4; + } + /* netmask: not support now */ +} + +static void ConvertDeviceConfigFromC(const WifiDeviceConfig *config, OHOS::Wifi::WifiDeviceConfig& deviceConfig) +{ + deviceConfig.ssid = config->ssid; + if (OHOS::Wifi::IsMacArrayEmpty(config->bssid)) { + deviceConfig.bssid = ""; + } else { + deviceConfig.bssid = OHOS::Wifi::MacArrayToStr(config->bssid); + } + deviceConfig.preSharedKey = config->preSharedKey; + deviceConfig.keyMgmt = GetKeyMgmtBySecType(config->securityType); + deviceConfig.networkId = config->netId; + deviceConfig.frequency = config->freq; + /* wapiPskType is not support, don't verify now */ + if (config->ipType == DHCP) { + deviceConfig.wifiIpConfig.assignMethod = OHOS::Wifi::AssignIpMethod::DHCP; + } else if (config->ipType == STATIC_IP) { + deviceConfig.wifiIpConfig.assignMethod = OHOS::Wifi::AssignIpMethod::STATIC; + GetStaticIpFromC(config->staticIp, deviceConfig.wifiIpConfig.staticIpAddress); + } else { + deviceConfig.wifiIpConfig.assignMethod = OHOS::Wifi::AssignIpMethod::UNASSIGNED; + } + deviceConfig.hiddenSSID = config->isHiddenSsid; +} + +static OHOS::Wifi::ErrCode ConvertDeviceConfigFromCpp(const OHOS::Wifi::WifiDeviceConfig& deviceConfig, + WifiDeviceConfig *result) +{ + if (memcpy_s(result->ssid, WIFI_MAX_SSID_LEN, deviceConfig.ssid.c_str(), deviceConfig.ssid.size() + 1) != EOK) { + return OHOS::Wifi::WIFI_OPT_FAILED; + } + if (OHOS::Wifi::MacStrToArray(deviceConfig.bssid, result->bssid) != EOK) { + WIFI_LOGE("device config convert bssid error!"); + return OHOS::Wifi::WIFI_OPT_FAILED; + } + if (memcpy_s(result->preSharedKey, WIFI_MAX_KEY_LEN, deviceConfig.preSharedKey.c_str(), WIFI_MAX_KEY_LEN) != EOK) { + return OHOS::Wifi::WIFI_OPT_FAILED; + } + result->securityType = GetSecTypeByKeyMgmt(deviceConfig.keyMgmt); + result->netId = deviceConfig.networkId; + result->freq = deviceConfig.frequency; + /* wapiPskType is not support now */ + if (deviceConfig.wifiIpConfig.assignMethod == OHOS::Wifi::AssignIpMethod::DHCP) { + result->ipType = DHCP; + } else if (deviceConfig.wifiIpConfig.assignMethod == OHOS::Wifi::AssignIpMethod::STATIC) { + result->ipType = STATIC_IP; + GetStaticIpFromCpp(deviceConfig.wifiIpConfig.staticIpAddress, result->staticIp); + } else { + result->ipType = UNKNOWN; + } + result->isHiddenSsid = deviceConfig.hiddenSSID; + return OHOS::Wifi::WIFI_OPT_SUCCESS; +} + +WifiErrorCode AddDeviceConfig(const WifiDeviceConfig *config, int *result) +{ + CHECK_PTR_RETURN(wifiDevicePtr, ERROR_WIFI_NOT_AVAILABLE); + OHOS::Wifi::WifiDeviceConfig deviceConfig; + ConvertDeviceConfigFromC(config, deviceConfig); + int addResult = -1; + OHOS::Wifi::ErrCode ret = wifiDevicePtr->AddDeviceConfig(deviceConfig, addResult); + *result = addResult; + return GetCErrorCode(ret); +} + +WifiErrorCode GetDeviceConfigs(WifiDeviceConfig *result, unsigned int *size) +{ + CHECK_PTR_RETURN(wifiDevicePtr, ERROR_WIFI_NOT_AVAILABLE); + if (result == nullptr) { + WIFI_LOGE("Get device configs result array is null!"); + return ERROR_WIFI_UNKNOWN; + } + + std::vector vecDeviceConfigs; + OHOS::Wifi::ErrCode ret = wifiDevicePtr->GetDeviceConfigs(vecDeviceConfigs); + if (ret != OHOS::Wifi::WIFI_OPT_SUCCESS) { + WIFI_LOGE("Get device configs error!"); + return GetCErrorCode(ret); + } + *size = (int)vecDeviceConfigs.size(); + for (auto& each : vecDeviceConfigs) { + OHOS::Wifi::ErrCode retValue = ConvertDeviceConfigFromCpp(each, result++); + if (retValue != OHOS::Wifi::WIFI_OPT_SUCCESS) { + ret = retValue; + WIFI_LOGE("Convert device configs error!"); + } + } + return GetCErrorCode(ret); +} + +WifiErrorCode RemoveDevice(int networkId) +{ + CHECK_PTR_RETURN(wifiDevicePtr, ERROR_WIFI_NOT_AVAILABLE); + return GetCErrorCode(wifiDevicePtr->RemoveDevice(networkId)); +} + +WifiErrorCode DisableDeviceConfig(int networkId) +{ + return GetCErrorCode(OHOS::Wifi::WIFI_OPT_NOT_SUPPORTED); +} + +WifiErrorCode EnableDeviceConfig(int networkId) +{ + return GetCErrorCode(OHOS::Wifi::WIFI_OPT_NOT_SUPPORTED); +} + +WifiErrorCode ConnectTo(int networkId) +{ + CHECK_PTR_RETURN(wifiDevicePtr, ERROR_WIFI_NOT_AVAILABLE); + return GetCErrorCode(wifiDevicePtr->ConnectToNetwork(networkId)); +} + +WifiErrorCode ConnectToDevice(const WifiDeviceConfig *config) +{ + CHECK_PTR_RETURN(wifiDevicePtr, ERROR_WIFI_NOT_AVAILABLE); + OHOS::Wifi::WifiDeviceConfig deviceConfig; + ConvertDeviceConfigFromC(config, deviceConfig); + return GetCErrorCode(wifiDevicePtr->ConnectToDevice(deviceConfig)); +} + +WifiErrorCode Disconnect() +{ + CHECK_PTR_RETURN(wifiDevicePtr, ERROR_WIFI_NOT_AVAILABLE); + return GetCErrorCode(wifiDevicePtr->Disconnect()); +} + +static OHOS::Wifi::ErrCode GetLinkedInfoFromCpp(const OHOS::Wifi::WifiLinkedInfo& linkedInfo, WifiLinkedInfo *result) +{ + if (memcpy_s(result->ssid, WIFI_MAX_SSID_LEN, linkedInfo.ssid.c_str(), linkedInfo.ssid.size() + 1) != EOK) { + return OHOS::Wifi::WIFI_OPT_FAILED; + } + if (OHOS::Wifi::MacStrToArray(linkedInfo.bssid, result->bssid) != EOK) { + WIFI_LOGE("linked info convert bssid error!"); + return OHOS::Wifi::WIFI_OPT_FAILED; + } + result->rssi = linkedInfo.rssi; + result->band = linkedInfo.band; + result->frequency = linkedInfo.frequency; + result->connState = linkedInfo.connState == OHOS::Wifi::ConnState::CONNECTED ? WIFI_CONNECTED : WIFI_DISCONNECTED; + /* disconnectedReason not support */ + result->ipAddress = linkedInfo.ipAddress; + return OHOS::Wifi::WIFI_OPT_SUCCESS; +} + +WifiErrorCode GetLinkedInfo(WifiLinkedInfo *result) +{ + CHECK_PTR_RETURN(wifiDevicePtr, ERROR_WIFI_NOT_AVAILABLE); + OHOS::Wifi::WifiLinkedInfo linkedInfo; + OHOS::Wifi::ErrCode ret = wifiDevicePtr->GetLinkedInfo(linkedInfo); + if (ret == OHOS::Wifi::WIFI_OPT_SUCCESS) { + OHOS::Wifi::ErrCode retValue = GetLinkedInfoFromCpp(linkedInfo, result); + if (retValue != OHOS::Wifi::WIFI_OPT_SUCCESS) { + WIFI_LOGE("Get linked info from cpp error!"); + ret = retValue; + } + } + return GetCErrorCode(ret); +} + +WifiErrorCode GetDeviceMacAddress(unsigned char *result) +{ + CHECK_PTR_RETURN(wifiDevicePtr, ERROR_WIFI_NOT_AVAILABLE); + std::string mac; + OHOS::Wifi::ErrCode ret = wifiDevicePtr->GetDeviceMacAddress(mac); + if (ret == OHOS::Wifi::WIFI_OPT_SUCCESS) { + if (OHOS::Wifi::MacStrToArray(mac, result) != EOK) { + WIFI_LOGE("get mac convert to array error!"); + return ERROR_WIFI_UNKNOWN; + } + } + return GetCErrorCode(ret); +} + +WifiErrorCode AdvanceScan(WifiScanParams *params) +{ + return GetCErrorCode(OHOS::Wifi::WIFI_OPT_NOT_SUPPORTED); +} + +WifiErrorCode GetIpInfo(IpInfo *info) +{ + return GetCErrorCode(OHOS::Wifi::WIFI_OPT_NOT_SUPPORTED); +} + +int GetSignalLevel(int rssi, int band) +{ + CHECK_PTR_RETURN(wifiDevicePtr, ERROR_WIFI_NOT_AVAILABLE); + int level = -1; + OHOS::Wifi::ErrCode ret = wifiDevicePtr->GetSignalLevel(rssi, band, level); + if (ret != OHOS::Wifi::WIFI_OPT_SUCCESS) { + WIFI_LOGW("Get wifi signal level fail: %{public}d", ret); + } + return level; +} + +WifiErrorCode SetLowLatencyMode(int enabled) +{ + CHECK_PTR_RETURN(wifiDevicePtr, ERROR_WIFI_NOT_AVAILABLE); + bool ret = wifiDevicePtr->SetLowLatencyMode(enabled); + return ret ? WIFI_SUCCESS : ERROR_WIFI_NOT_AVAILABLE; +} diff --git a/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_event.cpp b/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_event.cpp index 0cbc26c..5286418 100755 --- a/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_event.cpp +++ b/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_event.cpp @@ -1,290 +1,290 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "native_c/wifi_event.h" -#include "native_c/wifi_device.h" -#include "native_c/wifi_scan_info.h" -#include "wifi_logger.h" -#include "common_event_manager.h" -#include "common_event.h" -#include - -DEFINE_WIFILOG_LABEL("WifiCEvent"); - -const std::string WIFI_USUAL_EVENT_CONN_STATE = "usual.event.wifi.CONN_STATE"; -const std::string WIFI_USUAL_EVENT_SCAN_STATE = "usual.event.wifi.SCAN_FINISHED"; -const std::string WIFI_USUAL_EVENT_HOTSPOT_STATE = "usual.event.wifi.HOTSPOT_STATE"; -const std::string WIFI_USUAL_EVENT_STA_JOIN = "usual.event.wifi.WIFI_HS_STA_JOIN"; -const std::string WIFI_USUAL_EVENT_STA_LEAVE = "usual.event.wifi.WIFI_HS_STA_LEAVE"; - -using ConnectionChangeCb = void (*)(int, WifiLinkedInfo*); -using ScanStateChangeCb = void (*)(int, int); -using HotspotStateChangeCb = void (*)(int); -using HotspotJoinCb = void (*)(StationInfo*); -using HotspotLeaveCb = void (*)(StationInfo*); - -using namespace OHOS::EventFwk; -class EventManager { -public: - EventManager() { - } - - virtual ~EventManager() { - } - - bool AddConnectionChangeCb(const ConnectionChangeCb cb) { - if (m_setConnectionChangeCb.empty()) { - if (!SubscribeServiceEvent(WIFI_USUAL_EVENT_CONN_STATE)) { - return false; - } - } - return m_setConnectionChangeCb.insert(cb).second; - } - - void RemoveConnectionChangeCb(const ConnectionChangeCb cb) { - m_setConnectionChangeCb.erase(cb); - if (m_setConnectionChangeCb.empty()) { - UnsubscribeServiceEvent(WIFI_USUAL_EVENT_CONN_STATE); - } - } - - static std::set GetConnectionChangeCb() { - return m_setConnectionChangeCb; - } - - bool AddScanStateChangeCb(const ScanStateChangeCb cb) { - if (m_setScanStateChangeCb.empty()) { - if (!SubscribeServiceEvent(WIFI_USUAL_EVENT_SCAN_STATE)) { - return false; - } - } - return m_setScanStateChangeCb.insert(cb).second; - } - - void RemoveScanStateChangeCb(const ScanStateChangeCb cb) { - m_setScanStateChangeCb.erase(cb); - if (m_setScanStateChangeCb.empty()) { - UnsubscribeServiceEvent(WIFI_USUAL_EVENT_SCAN_STATE); - } - } - - static std::set GetScanStateChangeCb() { - return m_setScanStateChangeCb; - } - - bool AddHotspotChangeCb(const HotspotStateChangeCb cb) { - if (m_setHotspotChangeCb.empty()) { - if (!SubscribeServiceEvent(WIFI_USUAL_EVENT_HOTSPOT_STATE)) { - return false; - } - } - return m_setHotspotChangeCb.insert(cb).second; - } - - void RemoveHotspotChangeCb(const HotspotStateChangeCb cb) { - m_setHotspotChangeCb.erase(cb); - if (m_setHotspotChangeCb.empty()) { - UnsubscribeServiceEvent(WIFI_USUAL_EVENT_HOTSPOT_STATE); - } - } - - static std::set GetHotspotChangeCb() { - return m_setHotspotChangeCb; - } - - bool AddHotspotJoinCb(const HotspotJoinCb cb) { - if (m_setHotspotJoinCb.empty()) { - if (!SubscribeServiceEvent(WIFI_USUAL_EVENT_STA_JOIN)) { - return false; - } - } - return m_setHotspotJoinCb.insert(cb).second; - } - - void RemoveHotspotJoinCb(const HotspotJoinCb cb) { - m_setHotspotJoinCb.erase(cb); - if (m_setHotspotJoinCb.empty()) { - UnsubscribeServiceEvent(WIFI_USUAL_EVENT_STA_JOIN); - } - } - - static std::set GetHotspotJoinCb() { - return m_setHotspotJoinCb; - } - - bool AddHotspotLeaveCb(const HotspotLeaveCb cb) { - if (m_setHotspotLeaveCb.empty()) { - if (!SubscribeServiceEvent(WIFI_USUAL_EVENT_STA_LEAVE)) { - return false; - } - } - return m_setHotspotLeaveCb.insert(cb).second; - } - - void RemoveHotspotLeaveCb(const HotspotLeaveCb cb) { - m_setHotspotLeaveCb.erase(cb); - if (m_setHotspotLeaveCb.empty()) { - UnsubscribeServiceEvent(WIFI_USUAL_EVENT_STA_LEAVE); - } - } - - static std::set GetHotspotLeaveCb() { - return m_setHotspotLeaveCb; - } - - class WifiEventSubscriber : public OHOS::EventFwk::CommonEventSubscriber { - public: - explicit WifiEventSubscriber(const OHOS::EventFwk::CommonEventSubscribeInfo &subscribeInfo) - : CommonEventSubscriber(subscribeInfo) { - } - - virtual ~WifiEventSubscriber() { - } - - virtual void OnReceiveEvent(const OHOS::EventFwk::CommonEventData &data) override { - std::string event = data.GetWant().GetAction(); - int code = data.GetCode(); - WIFI_LOGI("Received event: %{public}s, value: %{public}d", event.c_str(), code); - if (event == WIFI_USUAL_EVENT_CONN_STATE && !GetConnectionChangeCb().empty()) { - WifiLinkedInfo linkInfo; - WifiErrorCode ret = GetLinkedInfo(&linkInfo); - if (ret != WIFI_SUCCESS) { - WIFI_LOGE("Received event get linked info failed"); - return; - } - for (auto& cb : GetConnectionChangeCb()) { - cb(code, &linkInfo); - } - } - - if (event == WIFI_USUAL_EVENT_SCAN_STATE && !EventManager::m_setScanStateChangeCb.empty()) { - for (auto& cb : EventManager::m_setScanStateChangeCb) { - cb(code, WIFI_SCAN_HOTSPOT_LIMIT); - } - } - - if (event == WIFI_USUAL_EVENT_HOTSPOT_STATE && !EventManager::m_setHotspotChangeCb.empty()) { - for (auto& cb : EventManager::m_setHotspotChangeCb) { - cb(code); - } - } - - if (event == WIFI_USUAL_EVENT_STA_JOIN && !EventManager::m_setHotspotJoinCb.empty()) { - } - - if (event == WIFI_USUAL_EVENT_STA_LEAVE && !EventManager::m_setHotspotLeaveCb.empty()) { - } - } - }; - - bool SubscribeServiceEvent(const std::string& event) { - MatchingSkills matchingSkills; - matchingSkills.AddEvent(event); - CommonEventSubscribeInfo subscriberInfo(matchingSkills); - std::shared_ptr subscriber = std::make_shared(subscriberInfo); - WIFI_LOGI("Subscribe event: %{public}s", event.c_str()); - bool subscribeResult = CommonEventManager::SubscribeCommonEvent(subscriber); - if (subscribeResult) { - m_mapEventSubscriber[event] = subscriber; - } else { - WIFI_LOGE("Subscribe service event fail: %{public}s", event.c_str()); - } - return subscribeResult; - } - - bool UnsubscribeServiceEvent(const std::string& event) { - std::map>::iterator iter; - iter = m_mapEventSubscriber.find(event); - if (iter == m_mapEventSubscriber.end()) { - return false; - } - - bool unsubscribeResult = CommonEventManager::SubscribeCommonEvent(iter->second); - if (!unsubscribeResult) { - WIFI_LOGE("Unsubscribe event fail: %{public}s", event.c_str()); - } - return unsubscribeResult; - } - -private: - static std::set m_setConnectionChangeCb; - static std::set m_setScanStateChangeCb; - static std::set m_setHotspotChangeCb; - static std::set m_setHotspotJoinCb; - static std::set m_setHotspotLeaveCb; - std::map > m_mapEventSubscriber; -}; -std::set EventManager::m_setConnectionChangeCb; -std::set EventManager::m_setScanStateChangeCb; -std::set EventManager::m_setHotspotChangeCb; -std::set EventManager::m_setHotspotJoinCb; -std::set EventManager::m_setHotspotLeaveCb; - -static EventManager g_eventManager; - -WifiErrorCode RegisterWifiEvent(WifiEvent *event) -{ - WIFI_LOGI("Register wifi event"); - if (event == nullptr) { - return ERROR_WIFI_INVALID_ARGS; - } - - if (event->OnWifiConnectionChanged != nullptr) { - return g_eventManager.AddConnectionChangeCb(event->OnWifiConnectionChanged) - ? WIFI_SUCCESS : ERROR_WIFI_INVALID_ARGS; - } - if (event->OnWifiScanStateChanged != nullptr) { - return g_eventManager.AddScanStateChangeCb(event->OnWifiScanStateChanged) - ? WIFI_SUCCESS : ERROR_WIFI_INVALID_ARGS; - } - if (event->OnHotspotStateChanged != nullptr) { - return g_eventManager.AddHotspotChangeCb(event->OnHotspotStateChanged) - ? WIFI_SUCCESS : ERROR_WIFI_INVALID_ARGS; - } - if (event->OnHotspotStaJoin != nullptr) { - return g_eventManager.AddHotspotJoinCb(event->OnHotspotStaJoin) - ? WIFI_SUCCESS : ERROR_WIFI_INVALID_ARGS; - } - if (event->OnHotspotStaLeave != nullptr) { - return g_eventManager.AddHotspotLeaveCb(event->OnHotspotStaLeave) - ? WIFI_SUCCESS : ERROR_WIFI_INVALID_ARGS; - } - return ERROR_WIFI_INVALID_ARGS; -} - -WifiErrorCode UnRegisterWifiEvent(const WifiEvent *event) -{ - WIFI_LOGI("Unregister wifi event"); - if (event == nullptr) { - return ERROR_WIFI_INVALID_ARGS; - } - - if (event->OnWifiConnectionChanged != nullptr) { - g_eventManager.RemoveConnectionChangeCb(event->OnWifiConnectionChanged); - } - if (event->OnWifiScanStateChanged != nullptr) { - g_eventManager.RemoveScanStateChangeCb(event->OnWifiScanStateChanged); - } - if (event->OnHotspotStateChanged != nullptr) { - g_eventManager.RemoveHotspotChangeCb(event->OnHotspotStateChanged); - } - if (event->OnHotspotStaJoin != nullptr) { - g_eventManager.RemoveHotspotJoinCb(event->OnHotspotStaJoin); - } - if (event->OnHotspotStaLeave != nullptr) { - g_eventManager.RemoveHotspotLeaveCb(event->OnHotspotStaLeave); - } - return WIFI_SUCCESS; -} +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "native_c/wifi_event.h" +#include "native_c/wifi_device.h" +#include "native_c/wifi_scan_info.h" +#include "wifi_logger.h" +#include "common_event_manager.h" +#include "common_event.h" +#include + +DEFINE_WIFILOG_LABEL("WifiCEvent"); + +const std::string WIFI_USUAL_EVENT_CONN_STATE = "usual.event.wifi.CONN_STATE"; +const std::string WIFI_USUAL_EVENT_SCAN_STATE = "usual.event.wifi.SCAN_FINISHED"; +const std::string WIFI_USUAL_EVENT_HOTSPOT_STATE = "usual.event.wifi.HOTSPOT_STATE"; +const std::string WIFI_USUAL_EVENT_STA_JOIN = "usual.event.wifi.WIFI_HS_STA_JOIN"; +const std::string WIFI_USUAL_EVENT_STA_LEAVE = "usual.event.wifi.WIFI_HS_STA_LEAVE"; + +using ConnectionChangeCb = void (*)(int, WifiLinkedInfo*); +using ScanStateChangeCb = void (*)(int, int); +using HotspotStateChangeCb = void (*)(int); +using HotspotJoinCb = void (*)(StationInfo*); +using HotspotLeaveCb = void (*)(StationInfo*); + +using namespace OHOS::EventFwk; +class EventManager { +public: + EventManager() { + } + + virtual ~EventManager() { + } + + bool AddConnectionChangeCb(const ConnectionChangeCb cb) { + if (m_setConnectionChangeCb.empty()) { + if (!SubscribeServiceEvent(WIFI_USUAL_EVENT_CONN_STATE)) { + return false; + } + } + return m_setConnectionChangeCb.insert(cb).second; + } + + void RemoveConnectionChangeCb(const ConnectionChangeCb cb) { + m_setConnectionChangeCb.erase(cb); + if (m_setConnectionChangeCb.empty()) { + UnsubscribeServiceEvent(WIFI_USUAL_EVENT_CONN_STATE); + } + } + + static std::set GetConnectionChangeCb() { + return m_setConnectionChangeCb; + } + + bool AddScanStateChangeCb(const ScanStateChangeCb cb) { + if (m_setScanStateChangeCb.empty()) { + if (!SubscribeServiceEvent(WIFI_USUAL_EVENT_SCAN_STATE)) { + return false; + } + } + return m_setScanStateChangeCb.insert(cb).second; + } + + void RemoveScanStateChangeCb(const ScanStateChangeCb cb) { + m_setScanStateChangeCb.erase(cb); + if (m_setScanStateChangeCb.empty()) { + UnsubscribeServiceEvent(WIFI_USUAL_EVENT_SCAN_STATE); + } + } + + static std::set GetScanStateChangeCb() { + return m_setScanStateChangeCb; + } + + bool AddHotspotChangeCb(const HotspotStateChangeCb cb) { + if (m_setHotspotChangeCb.empty()) { + if (!SubscribeServiceEvent(WIFI_USUAL_EVENT_HOTSPOT_STATE)) { + return false; + } + } + return m_setHotspotChangeCb.insert(cb).second; + } + + void RemoveHotspotChangeCb(const HotspotStateChangeCb cb) { + m_setHotspotChangeCb.erase(cb); + if (m_setHotspotChangeCb.empty()) { + UnsubscribeServiceEvent(WIFI_USUAL_EVENT_HOTSPOT_STATE); + } + } + + static std::set GetHotspotChangeCb() { + return m_setHotspotChangeCb; + } + + bool AddHotspotJoinCb(const HotspotJoinCb cb) { + if (m_setHotspotJoinCb.empty()) { + if (!SubscribeServiceEvent(WIFI_USUAL_EVENT_STA_JOIN)) { + return false; + } + } + return m_setHotspotJoinCb.insert(cb).second; + } + + void RemoveHotspotJoinCb(const HotspotJoinCb cb) { + m_setHotspotJoinCb.erase(cb); + if (m_setHotspotJoinCb.empty()) { + UnsubscribeServiceEvent(WIFI_USUAL_EVENT_STA_JOIN); + } + } + + static std::set GetHotspotJoinCb() { + return m_setHotspotJoinCb; + } + + bool AddHotspotLeaveCb(const HotspotLeaveCb cb) { + if (m_setHotspotLeaveCb.empty()) { + if (!SubscribeServiceEvent(WIFI_USUAL_EVENT_STA_LEAVE)) { + return false; + } + } + return m_setHotspotLeaveCb.insert(cb).second; + } + + void RemoveHotspotLeaveCb(const HotspotLeaveCb cb) { + m_setHotspotLeaveCb.erase(cb); + if (m_setHotspotLeaveCb.empty()) { + UnsubscribeServiceEvent(WIFI_USUAL_EVENT_STA_LEAVE); + } + } + + static std::set GetHotspotLeaveCb() { + return m_setHotspotLeaveCb; + } + + class WifiEventSubscriber : public OHOS::EventFwk::CommonEventSubscriber { + public: + explicit WifiEventSubscriber(const OHOS::EventFwk::CommonEventSubscribeInfo &subscribeInfo) + : CommonEventSubscriber(subscribeInfo) { + } + + virtual ~WifiEventSubscriber() { + } + + virtual void OnReceiveEvent(const OHOS::EventFwk::CommonEventData &data) override { + std::string event = data.GetWant().GetAction(); + int code = data.GetCode(); + WIFI_LOGI("Received event: %{public}s, value: %{public}d", event.c_str(), code); + if (event == WIFI_USUAL_EVENT_CONN_STATE && !GetConnectionChangeCb().empty()) { + WifiLinkedInfo linkInfo; + WifiErrorCode ret = GetLinkedInfo(&linkInfo); + if (ret != WIFI_SUCCESS) { + WIFI_LOGE("Received event get linked info failed"); + return; + } + for (auto& cb : GetConnectionChangeCb()) { + cb(code, &linkInfo); + } + } + + if (event == WIFI_USUAL_EVENT_SCAN_STATE && !EventManager::m_setScanStateChangeCb.empty()) { + for (auto& cb : EventManager::m_setScanStateChangeCb) { + cb(code, WIFI_SCAN_HOTSPOT_LIMIT); + } + } + + if (event == WIFI_USUAL_EVENT_HOTSPOT_STATE && !EventManager::m_setHotspotChangeCb.empty()) { + for (auto& cb : EventManager::m_setHotspotChangeCb) { + cb(code); + } + } + + if (event == WIFI_USUAL_EVENT_STA_JOIN && !EventManager::m_setHotspotJoinCb.empty()) { + } + + if (event == WIFI_USUAL_EVENT_STA_LEAVE && !EventManager::m_setHotspotLeaveCb.empty()) { + } + } + }; + + bool SubscribeServiceEvent(const std::string& event) { + MatchingSkills matchingSkills; + matchingSkills.AddEvent(event); + CommonEventSubscribeInfo subscriberInfo(matchingSkills); + std::shared_ptr subscriber = std::make_shared(subscriberInfo); + WIFI_LOGI("Subscribe event: %{public}s", event.c_str()); + bool subscribeResult = CommonEventManager::SubscribeCommonEvent(subscriber); + if (subscribeResult) { + m_mapEventSubscriber[event] = subscriber; + } else { + WIFI_LOGE("Subscribe service event fail: %{public}s", event.c_str()); + } + return subscribeResult; + } + + bool UnsubscribeServiceEvent(const std::string& event) { + std::map>::iterator iter; + iter = m_mapEventSubscriber.find(event); + if (iter == m_mapEventSubscriber.end()) { + return false; + } + + bool unsubscribeResult = CommonEventManager::SubscribeCommonEvent(iter->second); + if (!unsubscribeResult) { + WIFI_LOGE("Unsubscribe event fail: %{public}s", event.c_str()); + } + return unsubscribeResult; + } + +private: + static std::set m_setConnectionChangeCb; + static std::set m_setScanStateChangeCb; + static std::set m_setHotspotChangeCb; + static std::set m_setHotspotJoinCb; + static std::set m_setHotspotLeaveCb; + std::map > m_mapEventSubscriber; +}; +std::set EventManager::m_setConnectionChangeCb; +std::set EventManager::m_setScanStateChangeCb; +std::set EventManager::m_setHotspotChangeCb; +std::set EventManager::m_setHotspotJoinCb; +std::set EventManager::m_setHotspotLeaveCb; + +static EventManager g_eventManager; + +WifiErrorCode RegisterWifiEvent(WifiEvent *event) +{ + WIFI_LOGI("Register wifi event"); + if (event == nullptr) { + return ERROR_WIFI_INVALID_ARGS; + } + + if (event->OnWifiConnectionChanged != nullptr) { + return g_eventManager.AddConnectionChangeCb(event->OnWifiConnectionChanged) + ? WIFI_SUCCESS : ERROR_WIFI_INVALID_ARGS; + } + if (event->OnWifiScanStateChanged != nullptr) { + return g_eventManager.AddScanStateChangeCb(event->OnWifiScanStateChanged) + ? WIFI_SUCCESS : ERROR_WIFI_INVALID_ARGS; + } + if (event->OnHotspotStateChanged != nullptr) { + return g_eventManager.AddHotspotChangeCb(event->OnHotspotStateChanged) + ? WIFI_SUCCESS : ERROR_WIFI_INVALID_ARGS; + } + if (event->OnHotspotStaJoin != nullptr) { + return g_eventManager.AddHotspotJoinCb(event->OnHotspotStaJoin) + ? WIFI_SUCCESS : ERROR_WIFI_INVALID_ARGS; + } + if (event->OnHotspotStaLeave != nullptr) { + return g_eventManager.AddHotspotLeaveCb(event->OnHotspotStaLeave) + ? WIFI_SUCCESS : ERROR_WIFI_INVALID_ARGS; + } + return ERROR_WIFI_INVALID_ARGS; +} + +WifiErrorCode UnRegisterWifiEvent(const WifiEvent *event) +{ + WIFI_LOGI("Unregister wifi event"); + if (event == nullptr) { + return ERROR_WIFI_INVALID_ARGS; + } + + if (event->OnWifiConnectionChanged != nullptr) { + g_eventManager.RemoveConnectionChangeCb(event->OnWifiConnectionChanged); + } + if (event->OnWifiScanStateChanged != nullptr) { + g_eventManager.RemoveScanStateChangeCb(event->OnWifiScanStateChanged); + } + if (event->OnHotspotStateChanged != nullptr) { + g_eventManager.RemoveHotspotChangeCb(event->OnHotspotStateChanged); + } + if (event->OnHotspotStaJoin != nullptr) { + g_eventManager.RemoveHotspotJoinCb(event->OnHotspotStaJoin); + } + if (event->OnHotspotStaLeave != nullptr) { + g_eventManager.RemoveHotspotLeaveCb(event->OnHotspotStaLeave); + } + return WIFI_SUCCESS; +} diff --git a/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_hid2d.cpp b/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_hid2d.cpp new file mode 100755 index 0000000..54b1dac --- /dev/null +++ b/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_hid2d.cpp @@ -0,0 +1,197 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "native_c/wifi_hid2d.h" +#include "native_cpp/wifi_standard/include/wifi_hid2d.h" +#include "define.h" +#include "wifi_logger.h" +#include "wifi_c_utils.h" +#include "wifi_common_util.h" +#include "native_c/wifi_device.h" + +DEFINE_WIFILOG_LABEL("WifiCHid2d"); + +std::unique_ptr wifiHid2dPtr = OHOS::Wifi::Hid2d::GetInstance(WIFI_P2P_ABILITY_ID); + +WifiErrorCode Hid2dRequestGcIp(const unsigned char gcMac[MAC_LEN], unsigned int ipAddr[IPV4_ARRAY_LEN]) +{ + CHECK_PTR_RETURN(wifiHid2dPtr, ERROR_WIFI_NOT_AVAILABLE); + + std::string strMac = OHOS::Wifi::MacArrayToStr(gcMac); + std::string strIpAddr; + OHOS::Wifi::ErrCode ret = wifiHid2dPtr->Hid2dRequestGcIp(strMac, strIpAddr); + if (ret != OHOS::Wifi::WIFI_OPT_SUCCESS) { + WIFI_LOGE("Request gc ip failed!"); + return ERROR_WIFI_UNKNOWN; + } + return OHOS::Wifi::IpStrToArray(strIpAddr, ipAddr); +} + +WifiErrorCode Hid2dSharedlinkIncrease() +{ + CHECK_PTR_RETURN(wifiHid2dPtr, ERROR_WIFI_NOT_AVAILABLE); + return GetCErrorCode(wifiHid2dPtr->Hid2dSharedlinkIncrease()); +} + +WifiErrorCode Hid2dSharedlinkDecrease() +{ + CHECK_PTR_RETURN(wifiHid2dPtr, ERROR_WIFI_NOT_AVAILABLE); + return GetCErrorCode(wifiHid2dPtr->Hid2dSharedlinkDecrease()); +} + +WifiErrorCode Hid2dCreateGroup(const int frequency, FreqType type) +{ + CHECK_PTR_RETURN(wifiHid2dPtr, ERROR_WIFI_NOT_AVAILABLE); + return GetCErrorCode(wifiHid2dPtr->Hid2dCreateGroup(frequency, OHOS::Wifi::FreqType(static_cast(type)))); +} + +WifiErrorCode Hid2dRemoveGcGroup(const char gcIfName[IF_NAME_LEN]) +{ + CHECK_PTR_RETURN(wifiHid2dPtr, ERROR_WIFI_NOT_AVAILABLE); + return GetCErrorCode(wifiHid2dPtr->Hid2dRemoveGcGroup(gcIfName)); +} + +WifiErrorCode Hid2dConnect(const Hid2dConnectConfig *config) +{ + CHECK_PTR_RETURN(wifiHid2dPtr, ERROR_WIFI_NOT_AVAILABLE); + CHECK_PTR_RETURN(config, ERROR_WIFI_INVALID_ARGS); + + OHOS::Wifi::Hid2dConnectConfig cppConfig; + cppConfig.SetSsid(config->ssid); + cppConfig.SetBssid(OHOS::Wifi::MacArrayToStr(config->bssid)); + cppConfig.SetPreSharedKey(config->preSharedKey); + cppConfig.SetFrequency(config->frequency); + cppConfig.SetDhcpMode(OHOS::Wifi::DhcpMode(static_cast(config->dhcpMode))); + return GetCErrorCode(wifiHid2dPtr->Hid2dConnect(cppConfig)); +} + +WifiErrorCode Hid2dConfigIPAddr(const char ifName[IF_NAME_LEN], const IpAddrInfo* ipInfo) +{ + CHECK_PTR_RETURN(wifiHid2dPtr, ERROR_WIFI_NOT_AVAILABLE); + CHECK_PTR_RETURN(ipInfo, ERROR_WIFI_INVALID_ARGS); + + OHOS::Wifi::IpAddrInfo ipAddrInfo; + ipAddrInfo.ip = OHOS::Wifi::IpArrayToStr(ipInfo->ip); + ipAddrInfo.gateway = OHOS::Wifi::IpArrayToStr(ipInfo->gateway); + ipAddrInfo.netmask = OHOS::Wifi::IpArrayToStr(ipInfo->netmask); + return GetCErrorCode(wifiHid2dPtr->Hid2dConfigIPAddr(ifName, ipAddrInfo)); +} + +WifiErrorCode Hid2dReleaseIPAddr(const char ifName[IF_NAME_LEN]) +{ + CHECK_PTR_RETURN(wifiHid2dPtr, ERROR_WIFI_NOT_AVAILABLE); + return GetCErrorCode(wifiHid2dPtr->Hid2dReleaseIPAddr(ifName)); +} + +static void ConvertRecommendChannelRequest(const RecommendChannelRequest *request, + OHOS::Wifi::RecommendChannelRequest& req) +{ + req.remoteIfName = request->remoteIfName; + req.remoteIfMode = request->remoteIfMode; + req.localIfName = request->localIfName; + req.localIfMode = request->localIfMode; + req.prefBand = request->prefBand; + req.prefBandwidth = OHOS::Wifi::PreferBandwidth(static_cast(request->prefBandwidth)); +} + +static void ConvertRecommendChannelResponse(const OHOS::Wifi::RecommendChannelResponse& rsp, + RecommendChannelResponse* response) +{ + response->status = RecommendStatus(static_cast(rsp.status)); + response->index = rsp.index; + response->centerFreq = rsp.centerFreq; + response->centerFreq1 = rsp.centerFreq1; + response->centerFreq2 = rsp.centerFreq2; + response->bandwidth = rsp.bandwidth; +} + +WifiErrorCode Hid2dGetRecommendChannel(const RecommendChannelRequest *request, RecommendChannelResponse *response) +{ + CHECK_PTR_RETURN(wifiHid2dPtr, ERROR_WIFI_NOT_AVAILABLE); + CHECK_PTR_RETURN(request, ERROR_WIFI_INVALID_ARGS); + CHECK_PTR_RETURN(response, ERROR_WIFI_INVALID_ARGS); + + WifiLinkedInfo linkedInfo; + WifiErrorCode ret = GetLinkedInfo(&linkedInfo); + if (ret == WIFI_SUCCESS && linkedInfo.connState == WIFI_CONNECTED) { + response->status = RS_SUCCESS; + response->index = 0; + + constexpr int FREQ_2G_MAX = 2472; + constexpr int CHANNEL_14_FREQ = 2484; + if (linkedInfo.frequency <= FREQ_2G_MAX || linkedInfo.frequency == CHANNEL_14_FREQ) { + response->centerFreq = linkedInfo.frequency; + response->centerFreq1 = 0; + } else { + response->centerFreq = 0; + response->centerFreq1 = linkedInfo.frequency; + } + response->centerFreq2 = 0; + response->bandwidth = linkedInfo.band; + return WIFI_SUCCESS; + } + + OHOS::Wifi::RecommendChannelRequest req; + OHOS::Wifi::RecommendChannelResponse rsp; + ConvertRecommendChannelRequest(request, req); + OHOS::Wifi::ErrCode retCode = wifiHid2dPtr->Hid2dGetRecommendChannel(req, rsp); + if (retCode != OHOS::Wifi::WIFI_OPT_SUCCESS) { + return GetCErrorCode(retCode); + } + ConvertRecommendChannelResponse(rsp, response); + return WIFI_SUCCESS; +} + +WifiErrorCode Hid2dGetChannelListFor5G(int *chanList, int len) +{ + CHECK_PTR_RETURN(wifiHid2dPtr, ERROR_WIFI_NOT_AVAILABLE); + CHECK_PTR_RETURN(chanList, ERROR_WIFI_INVALID_ARGS); + + std::vector vecChannelList; + OHOS::Wifi::ErrCode ret = wifiHid2dPtr->Hid2dGetChannelListFor5G(vecChannelList); + if (ret == OHOS::Wifi::WIFI_OPT_SUCCESS) { + size_t idx = 0; + for (; idx != vecChannelList.size() && (int)(idx + 1) < len; ++idx) { + *chanList = vecChannelList[idx]; + ++chanList; + } + if (idx != vecChannelList.size()) { + WIFI_LOGW("Get channel list for 5G, `chanList` is too small!"); + } + *chanList = 0; + } + return GetCErrorCode(ret); +} + +WifiErrorCode Hid2dGetSelfWifiCfgInfo(SelfCfgType cfgType, char cfgData[CFG_DATA_MAX_BYTES], int* getDatValidLen) +{ + CHECK_PTR_RETURN(wifiHid2dPtr, ERROR_WIFI_NOT_AVAILABLE); + CHECK_PTR_RETURN(getDatValidLen, ERROR_WIFI_INVALID_ARGS); + return GetCErrorCode(wifiHid2dPtr->Hid2dGetSelfWifiCfgInfo( + OHOS::Wifi::SelfCfgType(static_cast(cfgType)), cfgData, getDatValidLen)); +} + +WifiErrorCode Hid2dSetPeerWifiCfgInfo(PeerCfgType cfgType, char cfgData[CFG_DATA_MAX_BYTES], int setDataValidLen) +{ + CHECK_PTR_RETURN(wifiHid2dPtr, ERROR_WIFI_NOT_AVAILABLE); + return GetCErrorCode(wifiHid2dPtr->Hid2dSetPeerWifiCfgInfo( + OHOS::Wifi::PeerCfgType(static_cast(cfgType)), cfgData, setDataValidLen)); +} + +int Hid2dIsWideBandwidthSupported() +{ + constexpr int NOT_SUPPORT = 0; // false + return NOT_SUPPORT; +} diff --git a/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_hotspot.cpp b/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_hotspot.cpp index 2fe403f..62418c6 100755 --- a/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_hotspot.cpp +++ b/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_hotspot.cpp @@ -1,184 +1,184 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "native_c/wifi_hotspot.h" -#include "native_c/wifi_hotspot_config.h" -#include "native_c/wifi_device_config.h" -#include "native_cpp/wifi_standard/include/wifi_hotspot.h" -#include "wifi_logger.h" -#include "wifi_c_utils.h" -#include "ip_tools.h" -#include "wifi_common_util.h" - -DEFINE_WIFILOG_LABEL("WifiCHotspot"); - -std::unique_ptr hotspotPtr = OHOS::Wifi::WifiHotspot::GetInstance(WIFI_HOTSPOT_ABILITY_ID); - -WifiErrorCode EnableHotspot() -{ - CHECK_PTR_RETURN(hotspotPtr, ERROR_WIFI_NOT_AVAILABLE); - return GetCErrorCode(hotspotPtr->EnableHotspot()); -} - -WifiErrorCode DisableHotspot() -{ - CHECK_PTR_RETURN(hotspotPtr, ERROR_WIFI_NOT_AVAILABLE); - return GetCErrorCode(hotspotPtr->DisableHotspot()); -} - -int IsHotspotActive(void) -{ - if (hotspotPtr == nullptr) { - return false; - } - return hotspotPtr->IsHotspotActive(); -} - -/* Others type is not support for AP */ -static std::map g_mapSecTypeToKeyMgmt = { - {WifiSecurityType::WIFI_SEC_TYPE_OPEN, OHOS::Wifi::KeyMgmt::NONE}, - {WifiSecurityType::WIFI_SEC_TYPE_PSK, OHOS::Wifi::KeyMgmt::WPA_PSK}, -}; - -static OHOS::Wifi::KeyMgmt GetKeyMgmtFromSecurityType(int secType) -{ - WifiSecurityType key = WifiSecurityType(secType); - std::map::iterator iter = g_mapSecTypeToKeyMgmt.find(key); - return iter == g_mapSecTypeToKeyMgmt.end() ? OHOS::Wifi::KeyMgmt::NONE : iter->second; -} - -static int GetSecurityTypeFromKeyMgmt(OHOS::Wifi::KeyMgmt keyMgmt) -{ - for (auto& each : g_mapSecTypeToKeyMgmt) { - if (each.second == keyMgmt) { - return static_cast(each.first); - } - } - return static_cast(WifiSecurityType::WIFI_SEC_TYPE_OPEN); -} - -static bool IsSecurityTypeSupported(int secType) -{ - WifiSecurityType key = WifiSecurityType(secType); - std::map::iterator iter = g_mapSecTypeToKeyMgmt.find(key); - return iter != g_mapSecTypeToKeyMgmt.end(); -} - -static WifiErrorCode GetHotspotConfigFromC(const HotspotConfig *config, OHOS::Wifi::HotspotConfig& hotspotConfig) -{ - hotspotConfig.SetSsid(config->ssid); - if (!IsSecurityTypeSupported(config->securityType)) { - WIFI_LOGE("Ap security is not supported!"); - return ERROR_WIFI_NOT_SUPPORTED; - } - hotspotConfig.SetSecurityType(GetKeyMgmtFromSecurityType(config->securityType)); - hotspotConfig.SetBand(OHOS::Wifi::BandType(config->band)); - hotspotConfig.SetChannel(config->channelNum); - hotspotConfig.SetPreSharedKey(config->preSharedKey); - return WIFI_SUCCESS; -} - -static WifiErrorCode GetHotspotConfigFromCpp(const OHOS::Wifi::HotspotConfig& hotspotConfig, HotspotConfig *result) -{ - if (memcpy_s(result->ssid, WIFI_MAX_SSID_LEN, - hotspotConfig.GetSsid().c_str(), hotspotConfig.GetSsid().size() + 1) != EOK) { - return ERROR_WIFI_UNKNOWN; - } - result->securityType = GetSecurityTypeFromKeyMgmt(hotspotConfig.GetSecurityType()); - result->band = static_cast(hotspotConfig.GetBand()); - result->channelNum = hotspotConfig.GetChannel(); - if (memcpy_s(result->preSharedKey, WIFI_MAX_KEY_LEN, - hotspotConfig.GetPreSharedKey().c_str(), hotspotConfig.GetPreSharedKey().size() + 1) != EOK) { - return ERROR_WIFI_UNKNOWN; - } - return WIFI_SUCCESS; -} - -WifiErrorCode SetHotspotConfig(const HotspotConfig *config) -{ - CHECK_PTR_RETURN(hotspotPtr, ERROR_WIFI_NOT_AVAILABLE); - OHOS::Wifi::HotspotConfig hotspotConfig; - WifiErrorCode ret = GetHotspotConfigFromC(config, hotspotConfig); - if (ret != WIFI_SUCCESS) { - return ret; - } - return GetCErrorCode(hotspotPtr->SetHotspotConfig(hotspotConfig)); -} - -WifiErrorCode GetHotspotConfig(HotspotConfig *result) -{ - CHECK_PTR_RETURN(hotspotPtr, ERROR_WIFI_NOT_AVAILABLE); - OHOS::Wifi::HotspotConfig hotspotConfig; - OHOS::Wifi::ErrCode ret = hotspotPtr->GetHotspotConfig(hotspotConfig); - if (ret == OHOS::Wifi::WIFI_OPT_SUCCESS) { - WifiErrorCode retValue = GetHotspotConfigFromCpp(hotspotConfig, result); - if (retValue != WIFI_SUCCESS) { - WIFI_LOGE("Get hotspot config from cpp error!"); - return retValue; - } - } - return GetCErrorCode(ret); -} - -static WifiErrorCode GetStaListFromCpp(const std::vector& vecStaList, StationInfo *result) -{ - for (auto& each : vecStaList) { - if (result->name != nullptr) { - if (memcpy_s(result->name, DEVICE_NAME_LEN, each.deviceName.c_str(), each.deviceName.size() + 1) != EOK) { - return ERROR_WIFI_UNKNOWN; - } - } else { - WIFI_LOGE("WARN: device name is not pre-allocate memory!"); - } - - if (OHOS::Wifi::MacStrToArray(each.bssid, result->macAddress) != EOK) { - WIFI_LOGE("Get sta list convert bssid error!"); - return ERROR_WIFI_UNKNOWN; - } - result->ipAddress = OHOS::Wifi::IpTools::ConvertIpv4Address(each.ipAddr); - } - return WIFI_SUCCESS; -} - -WifiErrorCode GetStationList(StationInfo *result, unsigned int *size) -{ - if (result == nullptr) { - WIFI_LOGE("Station info list receive addr is null!"); - return ERROR_WIFI_UNKNOWN; - } - CHECK_PTR_RETURN(hotspotPtr, ERROR_WIFI_NOT_AVAILABLE); - - std::vector vecStaList; - OHOS::Wifi::ErrCode ret = hotspotPtr->GetStationList(vecStaList); - *size = (int)vecStaList.size(); - if (ret == OHOS::Wifi::WIFI_OPT_SUCCESS) { - WifiErrorCode retValue = GetStaListFromCpp(vecStaList, result); - if (retValue != WIFI_SUCCESS) { - WIFI_LOGE("Get station list from cpp error!"); - return retValue; - } - } - return GetCErrorCode(ret); -} - -WifiErrorCode DisassociateSta(unsigned char *mac, int macLen) -{ - return GetCErrorCode(OHOS::Wifi::WIFI_OPT_NOT_SUPPORTED); -} - -WifiErrorCode AddTxPowerInfo(int power) -{ - return GetCErrorCode(OHOS::Wifi::WIFI_OPT_NOT_SUPPORTED); -} +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "native_c/wifi_hotspot.h" +#include "native_c/wifi_hotspot_config.h" +#include "native_c/wifi_device_config.h" +#include "native_cpp/wifi_standard/include/wifi_hotspot.h" +#include "wifi_logger.h" +#include "wifi_c_utils.h" +#include "ip_tools.h" +#include "wifi_common_util.h" + +DEFINE_WIFILOG_LABEL("WifiCHotspot"); + +std::unique_ptr hotspotPtr = OHOS::Wifi::WifiHotspot::GetInstance(WIFI_HOTSPOT_ABILITY_ID); + +WifiErrorCode EnableHotspot() +{ + CHECK_PTR_RETURN(hotspotPtr, ERROR_WIFI_NOT_AVAILABLE); + return GetCErrorCode(hotspotPtr->EnableHotspot()); +} + +WifiErrorCode DisableHotspot() +{ + CHECK_PTR_RETURN(hotspotPtr, ERROR_WIFI_NOT_AVAILABLE); + return GetCErrorCode(hotspotPtr->DisableHotspot()); +} + +int IsHotspotActive(void) +{ + if (hotspotPtr == nullptr) { + return false; + } + return hotspotPtr->IsHotspotActive(); +} + +/* Others type is not support for AP */ +static std::map g_mapSecTypeToKeyMgmt = { + {WifiSecurityType::WIFI_SEC_TYPE_OPEN, OHOS::Wifi::KeyMgmt::NONE}, + {WifiSecurityType::WIFI_SEC_TYPE_PSK, OHOS::Wifi::KeyMgmt::WPA_PSK}, +}; + +static OHOS::Wifi::KeyMgmt GetKeyMgmtFromSecurityType(int secType) +{ + WifiSecurityType key = WifiSecurityType(secType); + std::map::iterator iter = g_mapSecTypeToKeyMgmt.find(key); + return iter == g_mapSecTypeToKeyMgmt.end() ? OHOS::Wifi::KeyMgmt::NONE : iter->second; +} + +static int GetSecurityTypeFromKeyMgmt(OHOS::Wifi::KeyMgmt keyMgmt) +{ + for (auto& each : g_mapSecTypeToKeyMgmt) { + if (each.second == keyMgmt) { + return static_cast(each.first); + } + } + return static_cast(WifiSecurityType::WIFI_SEC_TYPE_OPEN); +} + +static bool IsSecurityTypeSupported(int secType) +{ + WifiSecurityType key = WifiSecurityType(secType); + std::map::iterator iter = g_mapSecTypeToKeyMgmt.find(key); + return iter != g_mapSecTypeToKeyMgmt.end(); +} + +static WifiErrorCode GetHotspotConfigFromC(const HotspotConfig *config, OHOS::Wifi::HotspotConfig& hotspotConfig) +{ + hotspotConfig.SetSsid(config->ssid); + if (!IsSecurityTypeSupported(config->securityType)) { + WIFI_LOGE("Ap security is not supported!"); + return ERROR_WIFI_NOT_SUPPORTED; + } + hotspotConfig.SetSecurityType(GetKeyMgmtFromSecurityType(config->securityType)); + hotspotConfig.SetBand(OHOS::Wifi::BandType(config->band)); + hotspotConfig.SetChannel(config->channelNum); + hotspotConfig.SetPreSharedKey(config->preSharedKey); + return WIFI_SUCCESS; +} + +static WifiErrorCode GetHotspotConfigFromCpp(const OHOS::Wifi::HotspotConfig& hotspotConfig, HotspotConfig *result) +{ + if (memcpy_s(result->ssid, WIFI_MAX_SSID_LEN, + hotspotConfig.GetSsid().c_str(), hotspotConfig.GetSsid().size() + 1) != EOK) { + return ERROR_WIFI_UNKNOWN; + } + result->securityType = GetSecurityTypeFromKeyMgmt(hotspotConfig.GetSecurityType()); + result->band = static_cast(hotspotConfig.GetBand()); + result->channelNum = hotspotConfig.GetChannel(); + if (memcpy_s(result->preSharedKey, WIFI_MAX_KEY_LEN, + hotspotConfig.GetPreSharedKey().c_str(), hotspotConfig.GetPreSharedKey().size() + 1) != EOK) { + return ERROR_WIFI_UNKNOWN; + } + return WIFI_SUCCESS; +} + +WifiErrorCode SetHotspotConfig(const HotspotConfig *config) +{ + CHECK_PTR_RETURN(hotspotPtr, ERROR_WIFI_NOT_AVAILABLE); + OHOS::Wifi::HotspotConfig hotspotConfig; + WifiErrorCode ret = GetHotspotConfigFromC(config, hotspotConfig); + if (ret != WIFI_SUCCESS) { + return ret; + } + return GetCErrorCode(hotspotPtr->SetHotspotConfig(hotspotConfig)); +} + +WifiErrorCode GetHotspotConfig(HotspotConfig *result) +{ + CHECK_PTR_RETURN(hotspotPtr, ERROR_WIFI_NOT_AVAILABLE); + OHOS::Wifi::HotspotConfig hotspotConfig; + OHOS::Wifi::ErrCode ret = hotspotPtr->GetHotspotConfig(hotspotConfig); + if (ret == OHOS::Wifi::WIFI_OPT_SUCCESS) { + WifiErrorCode retValue = GetHotspotConfigFromCpp(hotspotConfig, result); + if (retValue != WIFI_SUCCESS) { + WIFI_LOGE("Get hotspot config from cpp error!"); + return retValue; + } + } + return GetCErrorCode(ret); +} + +static WifiErrorCode GetStaListFromCpp(const std::vector& vecStaList, StationInfo *result) +{ + for (auto& each : vecStaList) { + if (result->name != nullptr) { + if (memcpy_s(result->name, DEVICE_NAME_LEN, each.deviceName.c_str(), each.deviceName.size() + 1) != EOK) { + return ERROR_WIFI_UNKNOWN; + } + } else { + WIFI_LOGE("WARN: device name is not pre-allocate memory!"); + } + + if (OHOS::Wifi::MacStrToArray(each.bssid, result->macAddress) != EOK) { + WIFI_LOGE("Get sta list convert bssid error!"); + return ERROR_WIFI_UNKNOWN; + } + result->ipAddress = OHOS::Wifi::IpTools::ConvertIpv4Address(each.ipAddr); + } + return WIFI_SUCCESS; +} + +WifiErrorCode GetStationList(StationInfo *result, unsigned int *size) +{ + if (result == nullptr) { + WIFI_LOGE("Station info list receive addr is null!"); + return ERROR_WIFI_UNKNOWN; + } + CHECK_PTR_RETURN(hotspotPtr, ERROR_WIFI_NOT_AVAILABLE); + + std::vector vecStaList; + OHOS::Wifi::ErrCode ret = hotspotPtr->GetStationList(vecStaList); + *size = (int)vecStaList.size(); + if (ret == OHOS::Wifi::WIFI_OPT_SUCCESS) { + WifiErrorCode retValue = GetStaListFromCpp(vecStaList, result); + if (retValue != WIFI_SUCCESS) { + WIFI_LOGE("Get station list from cpp error!"); + return retValue; + } + } + return GetCErrorCode(ret); +} + +WifiErrorCode DisassociateSta(unsigned char *mac, int macLen) +{ + return GetCErrorCode(OHOS::Wifi::WIFI_OPT_NOT_SUPPORTED); +} + +WifiErrorCode AddTxPowerInfo(int power) +{ + return GetCErrorCode(OHOS::Wifi::WIFI_OPT_NOT_SUPPORTED); +} diff --git a/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_p2p.cpp b/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_p2p.cpp new file mode 100755 index 0000000..481d4e6 --- /dev/null +++ b/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_p2p.cpp @@ -0,0 +1,447 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "native_c/wifi_p2p.h" +#include "wifi_logger.h" +#include "native_cpp/wifi_standard/include/wifi_p2p.h" +#include "wifi_c_utils.h" +#include "wifi_common_util.h" + +constexpr int INVALID_VALUE = -1; + +DEFINE_WIFILOG_LABEL("WifiCP2P"); +std::unique_ptr wifiP2pPtr = OHOS::Wifi::WifiP2p::GetInstance(WIFI_P2P_ABILITY_ID); + +WifiErrorCode EnableP2p() +{ + CHECK_PTR_RETURN(wifiP2pPtr, ERROR_WIFI_NOT_AVAILABLE); + return GetCErrorCode(wifiP2pPtr->EnableP2p()); +} + +WifiErrorCode DisableP2p() +{ + CHECK_PTR_RETURN(wifiP2pPtr, ERROR_WIFI_NOT_AVAILABLE); + return GetCErrorCode(wifiP2pPtr->DisableP2p()); +} + +WifiErrorCode GetP2pEnableStatus(P2pState* state) +{ + CHECK_PTR_RETURN(state, ERROR_WIFI_INVALID_ARGS); + CHECK_PTR_RETURN(wifiP2pPtr, ERROR_WIFI_NOT_AVAILABLE); + + int p2pEnableStatus = INVALID_VALUE; + OHOS::Wifi::ErrCode ret = wifiP2pPtr->GetP2pEnableStatus(p2pEnableStatus); + *state = P2pState(p2pEnableStatus); + return GetCErrorCode(ret); +} + +WifiErrorCode DiscoverDevices() +{ + CHECK_PTR_RETURN(wifiP2pPtr, ERROR_WIFI_NOT_AVAILABLE); + return GetCErrorCode(wifiP2pPtr->DiscoverDevices()); +} + +WifiErrorCode StopDiscoverDevices() +{ + CHECK_PTR_RETURN(wifiP2pPtr, ERROR_WIFI_NOT_AVAILABLE); + return GetCErrorCode(wifiP2pPtr->StopDiscoverDevices()); +} + +WifiErrorCode DiscoverServices() +{ + CHECK_PTR_RETURN(wifiP2pPtr, ERROR_WIFI_NOT_AVAILABLE); + return GetCErrorCode(wifiP2pPtr->DiscoverServices()); +} + +WifiErrorCode StopDiscoverServices() +{ + CHECK_PTR_RETURN(wifiP2pPtr, ERROR_WIFI_NOT_AVAILABLE); + return GetCErrorCode(wifiP2pPtr->StopDiscoverServices()); +} + +WifiErrorCode StartP2pListen(int period, int interval) +{ + CHECK_PTR_RETURN(wifiP2pPtr, ERROR_WIFI_NOT_AVAILABLE); + return GetCErrorCode(wifiP2pPtr->StartP2pListen(period, interval)); +} + +WifiErrorCode StopP2pListen() +{ + CHECK_PTR_RETURN(wifiP2pPtr, ERROR_WIFI_NOT_AVAILABLE); + return GetCErrorCode(wifiP2pPtr->StopP2pListen()); +} + +static void ConvertConfigCToCpp(const WifiP2pConfig* config, OHOS::Wifi::WifiP2pConfig& cppConfig) +{ + cppConfig.SetDeviceAddress(OHOS::Wifi::MacArrayToStr(config->devAddr)); + cppConfig.SetGoBand(OHOS::Wifi::GroupOwnerBand(static_cast(config->goBand))); + cppConfig.SetNetId(config->netId); + cppConfig.SetPassphrase(config->passphrase); + cppConfig.SetGroupOwnerIntent(config->groupOwnerIntent); + cppConfig.SetGroupName(config->groupName); +} + +WifiErrorCode CreateGroup(const WifiP2pConfig* config) +{ + CHECK_PTR_RETURN(wifiP2pPtr, ERROR_WIFI_NOT_AVAILABLE); + OHOS::Wifi::WifiP2pConfig cppConfig; + ConvertConfigCToCpp(config, cppConfig); + return GetCErrorCode(wifiP2pPtr->FormGroup(cppConfig)); +} + +WifiErrorCode RemoveGroup() +{ + CHECK_PTR_RETURN(wifiP2pPtr, ERROR_WIFI_NOT_AVAILABLE); + return GetCErrorCode(wifiP2pPtr->RemoveGroup()); +} + +static void ConvertP2PDeviceCToCpp(const WifiP2pDevice& p2pDevice, OHOS::Wifi::WifiP2pDevice& cppDevice) +{ + cppDevice.SetDeviceName(p2pDevice.deviceName); + cppDevice.SetDeviceAddress(OHOS::Wifi::MacArrayToStr(p2pDevice.devAddr)); + cppDevice.SetPrimaryDeviceType(p2pDevice.primaryDeviceType); + cppDevice.SetSecondaryDeviceType(p2pDevice.secondaryDeviceType); + cppDevice.SetP2pDeviceStatus(OHOS::Wifi::P2pDeviceStatus(static_cast(p2pDevice.status))); + + OHOS::Wifi::WifiP2pWfdInfo wfdInfo; + wfdInfo.SetWfdEnabled((bool)p2pDevice.wfdInfo.wfdEnabled); + wfdInfo.SetDeviceInfo(p2pDevice.wfdInfo.deviceInfo); + wfdInfo.SetCtrlPort(p2pDevice.wfdInfo.ctrlPort); + wfdInfo.SetMaxThroughput(p2pDevice.wfdInfo.maxThroughput); + cppDevice.SetWfdInfo(wfdInfo); + + cppDevice.SetWpsConfigMethod(p2pDevice.supportWpsConfigMethods); + cppDevice.SetDeviceCapabilitys(p2pDevice.deviceCapabilitys); + cppDevice.SetGroupCapabilitys(p2pDevice.groupCapabilitys); +} + +static void ConvertGroupInfoCToCpp(const WifiP2pGroupInfo* group, OHOS::Wifi::WifiP2pGroupInfo& cppGroup) +{ + OHOS::Wifi::WifiP2pDevice owner; + ConvertP2PDeviceCToCpp(group->owner, owner); + cppGroup.SetOwner(owner); + cppGroup.SetIsGroupOwner((bool)group->isP2pGroupOwner); + cppGroup.SetPassphrase(group->passphrase); + cppGroup.SetInterface(group->interface); + cppGroup.SetGroupName(group->groupName); + cppGroup.SetNetworkId(group->networkId); + cppGroup.SetFrequency(group->frequency); + cppGroup.SetIsPersistent((bool)group->isP2pPersistent); + cppGroup.SetP2pGroupStatus(OHOS::Wifi::P2pGroupStatus(static_cast(group->groupStatus))); + std::vector clientDevices; + for (int i = 0; i != group->clientDevicesSize && i < MAX_DEVICES_NUM; ++i) { + OHOS::Wifi::WifiP2pDevice p2pDevice; + ConvertP2PDeviceCToCpp(group->clientDevices[i], p2pDevice); + clientDevices.emplace_back(p2pDevice); + } + cppGroup.SetClientDevices(clientDevices); + cppGroup.SetGoIpAddress(group->goIpAddress); +} + +WifiErrorCode DeleteGroup(const WifiP2pGroupInfo* group) +{ + CHECK_PTR_RETURN(wifiP2pPtr, ERROR_WIFI_NOT_AVAILABLE); + OHOS::Wifi::WifiP2pGroupInfo groupInfo; + ConvertGroupInfoCToCpp(group, groupInfo); + return GetCErrorCode(wifiP2pPtr->DeleteGroup(groupInfo)); +} + +WifiErrorCode P2pConnect(const WifiP2pConfig* config) +{ + CHECK_PTR_RETURN(wifiP2pPtr, ERROR_WIFI_NOT_AVAILABLE); + OHOS::Wifi::WifiP2pConfig deviceConfig; + ConvertConfigCToCpp(config, deviceConfig); + return GetCErrorCode(wifiP2pPtr->P2pConnect(deviceConfig)); +} + +WifiErrorCode P2pDisConnect() +{ + CHECK_PTR_RETURN(wifiP2pPtr, ERROR_WIFI_NOT_AVAILABLE); + return GetCErrorCode(wifiP2pPtr->P2pDisConnect()); +} + +static OHOS::Wifi::ErrCode ConvertP2PDeviceCppToC(const OHOS::Wifi::WifiP2pDevice& cppDevice, WifiP2pDevice* p2pDevice) +{ + if (memcpy_s(p2pDevice->deviceName, P2P_NAME_LENGTH, + cppDevice.GetDeviceName().c_str(), cppDevice.GetDeviceName().size() + 1) != EOK) { + WIFI_LOGE("memcpy_s device name failed!"); + return OHOS::Wifi::WIFI_OPT_FAILED; + } + if (OHOS::Wifi::MacStrToArray(cppDevice.GetDeviceAddress(), p2pDevice->devAddr) != EOK) { + WIFI_LOGE("Mac str to array failed!"); + return OHOS::Wifi::WIFI_OPT_FAILED; + } + if (memcpy_s(p2pDevice->primaryDeviceType, DEVICE_TYPE_LENGTH, + cppDevice.GetPrimaryDeviceType().c_str(), cppDevice.GetPrimaryDeviceType().size() + 1) != EOK) { + WIFI_LOGE("memcpy_s primary device type failed!"); + return OHOS::Wifi::WIFI_OPT_FAILED; + } + if (memcpy_s(p2pDevice->secondaryDeviceType, DEVICE_TYPE_LENGTH, + cppDevice.GetSecondaryDeviceType().c_str(), cppDevice.GetSecondaryDeviceType().size() + 1) != EOK) { + WIFI_LOGE("memcpy_s secondary device type failed!"); + return OHOS::Wifi::WIFI_OPT_FAILED; + } + + p2pDevice->status = P2pDeviceStatus(static_cast(cppDevice.GetP2pDeviceStatus())); + p2pDevice->wfdInfo.wfdEnabled = cppDevice.GetWfdInfo().GetWfdEnabled(); + p2pDevice->wfdInfo.deviceInfo = cppDevice.GetWfdInfo().GetDeviceInfo(); + p2pDevice->wfdInfo.ctrlPort = cppDevice.GetWfdInfo().GetCtrlPort(); + p2pDevice->wfdInfo.maxThroughput = cppDevice.GetWfdInfo().GetMaxThroughput(); + p2pDevice->supportWpsConfigMethods = cppDevice.GetWpsConfigMethod(); + p2pDevice->deviceCapabilitys = cppDevice.GetDeviceCapabilitys(); + p2pDevice->groupCapabilitys = cppDevice.GetGroupCapabilitys(); + return OHOS::Wifi::WIFI_OPT_SUCCESS; +} + +static OHOS::Wifi::ErrCode ConvertGroupInfoCppToC(const OHOS::Wifi::WifiP2pGroupInfo& cppGroup, WifiP2pGroupInfo* group) +{ + if (ConvertP2PDeviceCppToC(cppGroup.GetOwner(), &group->owner) != OHOS::Wifi::WIFI_OPT_SUCCESS) { + return OHOS::Wifi::WIFI_OPT_FAILED; + } + group->isP2pGroupOwner = cppGroup.IsGroupOwner(); + if (memcpy_s(group->passphrase, PASSPHRASE_LENGTH, + cppGroup.GetPassphrase().c_str(), cppGroup.GetPassphrase().size() + 1) != EOK) { + WIFI_LOGE("memcpy_s passphrase failed!"); + return OHOS::Wifi::WIFI_OPT_FAILED; + } + if (memcpy_s(group->interface, INTERFACE_LENGTH, + cppGroup.GetInterface().c_str(), cppGroup.GetInterface().size() + 1) != EOK) { + WIFI_LOGE("memcpy_s interface failed!"); + return OHOS::Wifi::WIFI_OPT_FAILED; + } + if (memcpy_s(group->groupName, P2P_NAME_LENGTH, + cppGroup.GetGroupName().c_str(), cppGroup.GetGroupName().size() + 1) != EOK) { + WIFI_LOGE("memcpy_s group name failed!"); + return OHOS::Wifi::WIFI_OPT_FAILED; + } + group->networkId = cppGroup.GetNetworkId(); + group->frequency = cppGroup.GetFrequency(); + group->isP2pPersistent = cppGroup.IsPersistent(); + group->groupStatus = P2pGroupStatus(static_cast(cppGroup.GetP2pGroupStatus())); + const std::vector& vecDevices = cppGroup.GetClientDevices(); + for (size_t i = 0; i != vecDevices.size() && i < MAX_DEVICES_NUM; ++i) { + if (ConvertP2PDeviceCppToC(vecDevices[i], &group->clientDevices[i]) != OHOS::Wifi::WIFI_OPT_SUCCESS) { + WIFI_LOGE("convert p2p device failed!"); + return OHOS::Wifi::WIFI_OPT_FAILED; + } + } + group->clientDevicesSize = (int)vecDevices.size(); + if (memcpy_s(group->goIpAddress, IP_ADDR_STR_LEN, + cppGroup.GetGoIpAddress().c_str(), cppGroup.GetGoIpAddress().size() + 1) != EOK) { + WIFI_LOGE("memcpy_s interface failed!"); + return OHOS::Wifi::WIFI_OPT_FAILED; + } + return OHOS::Wifi::WIFI_OPT_SUCCESS; +} + +WifiErrorCode GetCurrentGroup(WifiP2pGroupInfo* groupInfo) +{ + if (groupInfo == nullptr) { + WIFI_LOGE("get current group input args is null!"); + return ERROR_WIFI_INVALID_ARGS; + } + + CHECK_PTR_RETURN(wifiP2pPtr, ERROR_WIFI_NOT_AVAILABLE); + OHOS::Wifi::WifiP2pGroupInfo cppGroupInfo; + OHOS::Wifi::ErrCode ret = wifiP2pPtr->GetCurrentGroup(cppGroupInfo); + if (ret != OHOS::Wifi::WIFI_OPT_SUCCESS) { + WIFI_LOGE("get current group info failed!"); + return ERROR_WIFI_NOT_AVAILABLE; + } + return GetCErrorCode(ConvertGroupInfoCppToC(cppGroupInfo, groupInfo)); +} + +WifiErrorCode GetP2pConnectedStatus(int* status) +{ + if (status == nullptr) { + WIFI_LOGE("input args is null!"); + return ERROR_WIFI_INVALID_ARGS; + } + + CHECK_PTR_RETURN(wifiP2pPtr, ERROR_WIFI_NOT_AVAILABLE); + int p2pStatus = -1; + OHOS::Wifi::ErrCode ret = wifiP2pPtr->GetP2pConnectedStatus(p2pStatus); + if (ret != OHOS::Wifi::WIFI_OPT_SUCCESS) { + WIFI_LOGE("get p2p status failed!"); + } + *status = p2pStatus; + return GetCErrorCode(ret); +} + +WifiErrorCode QueryP2pDevices(WifiP2pDevice* clientDevices, int size, int* retSize) +{ + CHECK_PTR_RETURN(wifiP2pPtr, ERROR_WIFI_NOT_AVAILABLE); + std::vector vecDevices; + OHOS::Wifi::ErrCode ret = wifiP2pPtr->QueryP2pDevices(vecDevices); + if (ret != OHOS::Wifi::WIFI_OPT_SUCCESS) { + WIFI_LOGE("query p2p devices failed!"); + return ERROR_WIFI_UNKNOWN; + } + + for (int i = 0; i != (int)vecDevices.size() && i < size; ++i) { + if (ConvertP2PDeviceCppToC(vecDevices[i], clientDevices++) != OHOS::Wifi::WIFI_OPT_SUCCESS) { + WIFI_LOGE("convert p2p device failed!"); + return ERROR_WIFI_UNKNOWN; + } + } + *retSize = std::min(size, (int)vecDevices.size()); + return WIFI_SUCCESS; +} + +WifiErrorCode QueryP2pGroups(WifiP2pGroupInfo* groupInfo, int size) +{ + CHECK_PTR_RETURN(wifiP2pPtr, ERROR_WIFI_NOT_AVAILABLE); + std::vector groups; + OHOS::Wifi::ErrCode ret = wifiP2pPtr->QueryP2pGroups(groups); + if (ret != OHOS::Wifi::WIFI_OPT_SUCCESS) { + WIFI_LOGE("query p2p devices failed!"); + return ERROR_WIFI_UNKNOWN; + } + + for (int i = 0; i != (int)groups.size() && i < size; ++i) { + ret = ConvertGroupInfoCppToC(groups[i], groupInfo++); + if (ret != OHOS::Wifi::WIFI_OPT_SUCCESS) { + WIFI_LOGE("convert group info failed!"); + return ERROR_WIFI_UNKNOWN; + } + } + return WIFI_SUCCESS; +} + +class WifiP2pCEventCallback : public OHOS::Wifi::IWifiP2pCallback { +public: + void OnP2pStateChanged(int state) override { + WIFI_LOGI("received state changed event: %{public}d", state); + if (stateChangeCb != nullptr) { + stateChangeCb(P2pState(state)); + } + } + + void OnP2pPersistentGroupsChanged(void) override { + WIFI_LOGI("received group changed event"); + if (groupChangeCb != nullptr) { + groupChangeCb(); + } + } + + void OnP2pThisDeviceChanged(const OHOS::Wifi::WifiP2pDevice &device) override { + } + + void OnP2pPeersChanged(const std::vector &devices) override { + WIFI_LOGI("received peers changed event: %{public}d", (int)devices.size()); + WifiP2pDevice *devicePtr = nullptr; + if (!devices.empty()) { + devicePtr = new WifiP2pDevice[(int)devices.size()]; + } + for (auto& each : devices) { + if (ConvertP2PDeviceCppToC(each, devicePtr++) != OHOS::Wifi::WIFI_OPT_SUCCESS) { + WIFI_LOGE("peers changed convert p2p device failed!"); + return; + } + } + if (peersChangeCb != nullptr) { + peersChangeCb(devicePtr, (int)devices.size()); + } + if (devicePtr != nullptr) { + delete[] devicePtr; + devicePtr = nullptr; + } + } + + void OnP2pServicesChanged(const std::vector &srvInfo) override { + } + + void OnP2pConnectionChanged(const OHOS::Wifi::WifiP2pLinkedInfo &info) override { + WIFI_LOGI("received connection changed event"); + if (connectionChangeCb != nullptr) { + connectionChangeCb(ConvertP2pLinkedInfo(info)); + } + } + + void OnP2pDiscoveryChanged(bool isChange) override { + } + + void OnP2pActionResult(OHOS::Wifi::P2pActionCallback action, OHOS::Wifi::ErrCode code) override { + } + + OHOS::sptr AsObject() override { + return nullptr; + } + +public: + WifiP2pCEventCallback() { + stateChangeCb = nullptr; + groupChangeCb = nullptr; + connectionChangeCb = nullptr; + peersChangeCb = nullptr; + } + + virtual ~WifiP2pCEventCallback() { + } + +public: + P2pStateChangedCallback stateChangeCb; + P2pPersistentGroupsChangedCallback groupChangeCb; + P2pConnectionChangedCallback connectionChangeCb; + P2pPeersChangedCallback peersChangeCb; + +private: + WifiP2pLinkedInfo ConvertP2pLinkedInfo(const OHOS::Wifi::WifiP2pLinkedInfo& linkedInfo) { + WifiP2pLinkedInfo info; + info.connectState = P2pConnectionState(static_cast(linkedInfo.GetConnectState())); + info.isP2pGroupOwner = linkedInfo.IsGroupOwner(); + OHOS::Wifi::MacStrToArray(linkedInfo.GetGroupOwnerAddress(), info.groupOwnerAddress); + return info; + } +}; + +OHOS::sptr sptrCallback = + OHOS::sptr(new (std::nothrow) WifiP2pCEventCallback()); + +WifiErrorCode RegisterP2pStateChangedCallback(const P2pStateChangedCallback callback) +{ + CHECK_PTR_RETURN(callback, ERROR_WIFI_INVALID_ARGS); + CHECK_PTR_RETURN(wifiP2pPtr, ERROR_WIFI_NOT_AVAILABLE); + sptrCallback->stateChangeCb = callback; + wifiP2pPtr->RegisterCallBack(sptrCallback); + return WIFI_SUCCESS; +} + +WifiErrorCode RegisterP2pPersistentGroupsChangedCallback(const P2pPersistentGroupsChangedCallback callback) +{ + CHECK_PTR_RETURN(callback, ERROR_WIFI_INVALID_ARGS); + CHECK_PTR_RETURN(wifiP2pPtr, ERROR_WIFI_NOT_AVAILABLE); + sptrCallback->groupChangeCb = callback; + wifiP2pPtr->RegisterCallBack(sptrCallback); + return WIFI_SUCCESS; +} + +WifiErrorCode RegisterP2pConnectionChangedCallback(const P2pConnectionChangedCallback callback) +{ + CHECK_PTR_RETURN(callback, ERROR_WIFI_INVALID_ARGS); + CHECK_PTR_RETURN(wifiP2pPtr, ERROR_WIFI_NOT_AVAILABLE); + sptrCallback->connectionChangeCb = callback; + wifiP2pPtr->RegisterCallBack(sptrCallback); + return WIFI_SUCCESS; +} + +WifiErrorCode RegisterP2pPeersChangedCallback(const P2pPeersChangedCallback callback) +{ + CHECK_PTR_RETURN(callback, ERROR_WIFI_INVALID_ARGS); + CHECK_PTR_RETURN(wifiP2pPtr, ERROR_WIFI_NOT_AVAILABLE); + sptrCallback->peersChangeCb = callback; + wifiP2pPtr->RegisterCallBack(sptrCallback); + return WIFI_SUCCESS; +} diff --git a/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_utils.cpp b/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_utils.cpp index 22009da..3909607 100755 --- a/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_utils.cpp +++ b/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_utils.cpp @@ -1,45 +1,68 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "wifi_c_utils.h" -#include - -namespace OHOS { -namespace Wifi { -static std::map g_ErrCodeMap = { - {WIFI_OPT_SUCCESS, WIFI_SUCCESS}, - {WIFI_OPT_FAILED, ERROR_WIFI_UNKNOWN}, - {WIFI_OPT_NOT_SUPPORTED, ERROR_WIFI_NOT_SUPPORTED}, - {WIFI_OPT_INVALID_PARAM, ERROR_WIFI_INVALID_ARGS}, - {WIFI_OPT_FORBID_AIRPLANE, ERROR_WIFI_NOT_AVAILABLE}, - {WIFI_OPT_FORBID_POWSAVING, ERROR_WIFI_NOT_AVAILABLE}, - {WIFI_OPT_PERMISSION_DENIED, ERROR_WIFI_UNKNOWN}, - {WIFI_OPT_OPEN_FAIL_WHEN_CLOSING, ERROR_WIFI_BUSY}, - {WIFI_OPT_OPEN_SUCC_WHEN_OPENED, ERROR_WIFI_BUSY}, - {WIFI_OPT_CLOSE_FAIL_WHEN_OPENING, ERROR_WIFI_BUSY}, - {WIFI_OPT_CLOSE_SUCC_WHEN_CLOSED, ERROR_WIFI_BUSY}, - {WIFI_OPT_STA_NOT_OPENED, ERROR_WIFI_NOT_STARTED}, - {WIFI_OPT_SCAN_NOT_OPENED, ERROR_WIFI_NOT_STARTED}, - {WIFI_OPT_AP_NOT_OPENED, ERROR_WIFI_NOT_STARTED}, - {WIFI_OPT_INVALID_CONFIG, ERROR_WIFI_UNKNOWN} -}; - -WifiErrorCode GetCErrorCode(ErrCode errCode) -{ - std::map::const_iterator iter = g_ErrCodeMap.find(errCode); - return iter == g_ErrCodeMap.end() ? ERROR_WIFI_UNKNOWN : iter->second; -} -} // namespace Wifi -} // namespace OHOS +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "wifi_c_utils.h" +#include +#include "wifi_common_util.h" + +namespace OHOS { +namespace Wifi { +static std::map g_ErrCodeMap = { + {WIFI_OPT_SUCCESS, WIFI_SUCCESS}, + {WIFI_OPT_FAILED, ERROR_WIFI_UNKNOWN}, + {WIFI_OPT_NOT_SUPPORTED, ERROR_WIFI_NOT_SUPPORTED}, + {WIFI_OPT_INVALID_PARAM, ERROR_WIFI_INVALID_ARGS}, + {WIFI_OPT_FORBID_AIRPLANE, ERROR_WIFI_NOT_AVAILABLE}, + {WIFI_OPT_FORBID_POWSAVING, ERROR_WIFI_NOT_AVAILABLE}, + {WIFI_OPT_PERMISSION_DENIED, ERROR_WIFI_UNKNOWN}, + {WIFI_OPT_OPEN_FAIL_WHEN_CLOSING, ERROR_WIFI_BUSY}, + {WIFI_OPT_OPEN_SUCC_WHEN_OPENED, ERROR_WIFI_BUSY}, + {WIFI_OPT_CLOSE_FAIL_WHEN_OPENING, ERROR_WIFI_BUSY}, + {WIFI_OPT_CLOSE_SUCC_WHEN_CLOSED, ERROR_WIFI_BUSY}, + {WIFI_OPT_STA_NOT_OPENED, ERROR_WIFI_NOT_STARTED}, + {WIFI_OPT_SCAN_NOT_OPENED, ERROR_WIFI_NOT_STARTED}, + {WIFI_OPT_AP_NOT_OPENED, ERROR_WIFI_NOT_STARTED}, + {WIFI_OPT_INVALID_CONFIG, ERROR_WIFI_UNKNOWN} +}; + +WifiErrorCode GetCErrorCode(ErrCode errCode) +{ + std::map::const_iterator iter = g_ErrCodeMap.find(errCode); + return iter == g_ErrCodeMap.end() ? ERROR_WIFI_UNKNOWN : iter->second; +} + +WifiErrorCode IpStrToArray(const std::string& str, unsigned int ipAddr[IPV4_ARRAY_LEN]) { + std::vector vec = StrSplit(str, "\\."); + if (vec.size() != IPV4_ARRAY_LEN) { + return ERROR_WIFI_INVALID_ARGS; + } + for (int i = 0; i != IPV4_ARRAY_LEN && i != (int)vec.size(); ++i) { + ipAddr[i] = std::stoi(vec[i]); + } + return WIFI_SUCCESS; +} + +std::string IpArrayToStr(const unsigned int ipAddr[IPV4_ARRAY_LEN]) { + std::string str = ""; + for (int i = 0; i != IPV4_ARRAY_LEN; ++i) { + str += std::to_string(ipAddr[i]); + if (i != IPV4_ARRAY_LEN - 1) { + str += "."; + } + } + return str; +} +} // namespace Wifi +} // namespace OHOS diff --git a/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_utils.h b/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_utils.h index 947bf14..dde0e0c 100755 --- a/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_utils.h +++ b/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_utils.h @@ -1,38 +1,67 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef WIFI_C_UTILS_H_ -#define WIFI_C_UTILS_H_ - -#include -#include "native_c/wifi_device_config.h" -#include "native_c/wifi_error_code.h" -#include "wifi_errcode.h" - -namespace OHOS { -namespace Wifi { -#ifndef CHECK_PTR_RETURN -#define CHECK_PTR_RETURN(ptr, retValue) \ - if ((ptr) == nullptr) { \ - WIFI_LOGE("Error: the ptr is null!"); \ - return retValue; \ - } -#endif - -WifiErrorCode GetCErrorCode(ErrCode errCode); -} // namespace Wifi -} // namespace OHOS - -#endif +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef WIFI_C_UTILS_H_ +#define WIFI_C_UTILS_H_ + +#include +#include +#include "native_c/wifi_device_config.h" +#include "native_c/wifi_error_code.h" +#include "wifi_errcode.h" + +#ifndef IPV4_ARRAY_LEN +#define IPV4_ARRAY_LEN 4 +#endif + +namespace OHOS { +namespace Wifi { +#ifndef CHECK_PTR_RETURN +#define CHECK_PTR_RETURN(ptr, retValue) \ + if ((ptr) == nullptr) { \ + WIFI_LOGE("Error: the ptr is null!"); \ + return retValue; \ + } +#endif + +/** + * @Description Convert c++ error code to c error code. + * + * @param errCode - c++ error code + * @return WifiErrorCode - c error code + */ +WifiErrorCode GetCErrorCode(ErrCode errCode); + +/** + * @Description Convert IP address from string to int array. + * + * @param str - IP address of string type + * @param ipAddr - Convert result which is a 4-bit int array, example: 127.0.0.1 -> ipAddr[ 127, 0, 0, 1 ] + * @return WifiErrorCode - operate result + */ +WifiErrorCode IpStrToArray(const std::string& str, unsigned int ipAddr[IPV4_ARRAY_LEN]); + +/** + * @Description Convert IP address from int array to string. + * example: ipAddr[ 127, 0, 0, 1 ] -> 127.0.0.1 + * + * @param ipAddr - IP address of int array + * @return std::string - result + */ +std::string IpArrayToStr(const unsigned int ipAddr[IPV4_ARRAY_LEN]); +} // namespace Wifi +} // namespace OHOS + +#endif diff --git a/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_device.h b/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_device.h index 05ea77e..95874b2 100644 --- a/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_device.h +++ b/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_device.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -260,6 +260,14 @@ public: * @return ErrCode - operation result */ virtual ErrCode GetDeviceMacAddress(std::string &result) = 0; + + /** + * @Description set low latency mode + * + * @param enabled - true: enable low latency, false: disable low latency + * @return bool - operate result + */ + virtual bool SetLowLatencyMode(bool enabled) = 0; }; } // namespace Wifi } // namespace OHOS diff --git a/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_hid2d.h b/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_hid2d.h new file mode 100755 index 0000000..dd22415 --- /dev/null +++ b/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_hid2d.h @@ -0,0 +1,139 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OHOS_WIFI_HID2D_H +#define OHOS_WIFI_HID2D_H + +#include "wifi_errcode.h" +#include +#include "wifi_hid2d_msg.h" + +namespace OHOS { +namespace Wifi { +class Hid2d { +public: + static std::unique_ptr CreateWifiHid2d(int system_ability_id); + static std::unique_ptr GetInstance(int system_ability_id); + + virtual ~Hid2d(); + + /** + * @Description Request an IP address to the Gc from the IP address pool, used on the GO side. + * + * @param gcMac - gc mac address + * @param ipAddr - applied ip address + * @return ErrCode - operate result + */ + virtual ErrCode Hid2dRequestGcIp(const std::string& gcMac, std::string& ipAddr) = 0; + + /** + * @Description Increase(+1) hid2d shared link reference counting + * + * @return ErrCode - operate result + */ + virtual ErrCode Hid2dSharedlinkIncrease() = 0; + + /** + * @Description Decrease(-1) hid2d shared link reference counting + * + * @return ErrCode - operate result + */ + virtual ErrCode Hid2dSharedlinkDecrease() = 0; + + /** + * @Description Create hid2d group, used on the GO side. + * + * @param frequency - frequency + * @param type - frequency type + * @return ErrCode - operate result + */ + virtual ErrCode Hid2dCreateGroup(const int frequency, FreqType type) = 0; + + /** + * @Description The GC side actively disconnects from the GO, used on the GC side. + * + * @param gcIfName - network interface name + * @return ErrCode - operate result + */ + virtual ErrCode Hid2dRemoveGcGroup(const std::string& gcIfName) = 0; + + /** + * @Description Connect to a specified group using hid2d, used on the GC side. + * + * @param config - connection parameters + * @return ErrCode - operate result + */ + virtual ErrCode Hid2dConnect(const Hid2dConnectConfig& config) = 0; + + /** + * @Description Configuring IP addresses for P2P network interfaces, used on the GC side. + * + * @param ifName - network interface name + * @param ipInfo - IP infos + * @return ErrCode - operate result + */ + virtual ErrCode Hid2dConfigIPAddr(const std::string& ifName, const IpAddrInfo& ipInfo) = 0; + + /** + * @Description Clear IP address when the P2P connection is disconnected, used on the GC side. + * + * @param ifName - network interface name + * @return ErrCode - operate result + */ + virtual ErrCode Hid2dReleaseIPAddr(const std::string& ifName) = 0; + + /** + * @Description Obtain the recommended channel and bandwidth for link setup + * + * @param request - request data + * @param response - response result + * @return ErrCode - operate result + */ + virtual ErrCode Hid2dGetRecommendChannel(const RecommendChannelRequest& request, + RecommendChannelResponse& response) = 0; + + /** + * @Description get 5G channel list + * + * @param vecChannelList - result for channel list + * @return ErrCode - operate result + */ + virtual ErrCode Hid2dGetChannelListFor5G(std::vector& vecChannelList) = 0; + + /** + * @Description get the self wifi configuration information + * + * @param cfgType - configuration type + * @param cfgData - the queried data of wifi configuration + * @param getDatValidLen - the valid data length in the array `cfgData` + * @return ErrCode - operate result + */ + virtual ErrCode Hid2dGetSelfWifiCfgInfo(SelfCfgType cfgType, + char cfgData[CFG_DATA_MAX_BYTES], int* getDatValidLen) = 0; + + /** + * @Description set the peer wifi configuration information + * + * @param cfgType - configuration type + * @param cfgData - the wifi configuration data to be set + * @param setDataValidLen - the valid data length in the array `cfgData` + * @return ErrCode - operate result + */ + virtual ErrCode Hid2dSetPeerWifiCfgInfo(PeerCfgType cfgType, + char cfgData[CFG_DATA_MAX_BYTES], int setDataValidLen) = 0; +}; +} // namespace Wifi +} // namespace OHOS +#endif \ No newline at end of file diff --git a/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_p2p.h b/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_p2p.h index 2cbfaf0..e0b25ce 100644 --- a/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_p2p.h +++ b/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_p2p.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -114,7 +114,7 @@ public: /** * @Description Creating a P2P Group. * - * @param config - WifiP2pGroupInfo object + * @param config - WifiP2pConfig object * @return ErrCode - operate result */ virtual ErrCode FormGroup(const WifiP2pConfig &config) = 0; diff --git a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/define.h b/interfaces/innerkits/native_cpp/wifi_standard/interfaces/define.h index 6f47a72..d8d488e 100644 --- a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/define.h +++ b/interfaces/innerkits/native_cpp/wifi_standard/interfaces/define.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -53,6 +53,7 @@ #define WIFI_SVR_CMD_GET_WIFI_PROTECT 0x1024 /* get the Wi-Fi protect. */ #define WIFI_SVR_CMD_PUT_WIFI_PROTECT 0x1025 /* put the Wi-Fi protect. */ #define WIFI_SVR_CMD_IS_WIFI_CONNECTED 0x1026 /* is Wi-Fi connected */ +#define WIFI_SVR_CMD_SET_LOW_LATENCY_MODE 0x1027 /* set low latency mode */ /* -------------ap module message define----------------- */ #define WIFI_SVR_CMD_ENABLE_WIFI_AP 0x1100 /* open ap */ @@ -100,6 +101,18 @@ #define WIFI_SVR_CMD_P2P_REGISTER_CALLBACK 0x2018 #define WIFI_SVR_CMD_P2P_SET_DEVICE_NAME 0x2019 /* set device name */ #define WIFI_SVR_CMD_P2P_SET_WFD_INFO 0x201A /* set p2p wifi display info */ +#define WIFI_SVR_CMD_P2P_HID2D_APPLY_IP 0x201B /* hid2d apply ip */ +#define WIFI_SVR_CMD_P2P_HID2D_SHARED_LINK_INCREASE 0x201C /* hid2d shared link increase */ +#define WIFI_SVR_CMD_P2P_HID2D_SHARED_LINK_DECREASE 0x201D /* hid2d shared link decrease */ +#define WIFI_SVR_CMD_P2P_HID2D_CREATE_GROUP 0x201E /* hid2d create group */ +#define WIFI_SVR_CMD_P2P_HID2D_REMOVE_GC_GROUP 0x201F /* hid2d remove GC group */ +#define WIFI_SVR_CMD_P2P_HID2D_CONNECT 0x2020 /* hid2d connect to group */ +#define WIFI_SVR_CMD_P2P_HID2D_CONFIG_IP 0x2021 /* hid2d configure IP address */ +#define WIFI_SVR_CMD_P2P_HID2D_RELEASE_IP 0x2022 /* hid2d release IP address */ +#define WIFI_SVR_CMD_GET_P2P_RECOMMENDED_CHANNEL 0x2023 /* get recommended channel */ +#define WIFI_SVR_CMD_GET_5G_CHANNEL_LIST 0x2024 /* get recommended channel */ +#define WIFI_SVR_CMD_GET_SELF_WIFI_CFG 0x2025 /* get self wifi configuration */ +#define WIFI_SVR_CMD_SET_PEER_WIFI_CFG 0x2026 /* set peer wifi configuration */ /* -----------register event type and message define-------------- */ #define WIFI_CBK_CMD_STATE_CHANGE 0x1001 /* STA state change event */ diff --git a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_device.h b/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_device.h index 6c6c2db..5e35e09 100644 --- a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_device.h +++ b/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_device.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -268,6 +268,14 @@ public: */ virtual ErrCode GetDeviceMacAddress(std::string &result) = 0; + /** + * @Description set low latency mode + * + * @param enabled - true: enable low latency, false: disable low latency + * @return bool - operate result + */ + virtual bool SetLowLatencyMode(bool enabled) = 0; + public: DECLARE_INTERFACE_DESCRIPTOR(u"ohos.wifi.IWifiDeviceService"); }; diff --git a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_p2p.h b/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_p2p.h index df4ddd1..0158d02 100644 --- a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_p2p.h +++ b/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_p2p.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -21,6 +21,7 @@ #include "message_option.h" #include "wifi_p2p_msg.h" #include "i_wifi_p2p_callback.h" +#include "wifi_hid2d_msg.h" namespace OHOS { namespace Wifi { @@ -246,6 +247,111 @@ public: */ virtual ErrCode SetP2pWfdInfo(const WifiP2pWfdInfo &wfdInfo) = 0; + /** + * @Description Request an IP address to the Gc from the IP address pool, used on the GO side. + * + * @param gcMac - gc mac address + * @param ipAddr - applied ip address + * @return ErrCode - operate result + */ + virtual ErrCode Hid2dRequestGcIp(const std::string& gcMac, std::string& ipAddr) = 0; + + /** + * @Description Increase(+1) hid2d shared link reference counting + * + * @return ErrCode - operate result + */ + virtual ErrCode Hid2dSharedlinkIncrease() = 0; + + /** + * @Description Decrease(-1) hid2d shared link reference counting + * + * @return ErrCode - operate result + */ + virtual ErrCode Hid2dSharedlinkDecrease() = 0; + + /** + * @Description Create hid2d group, used on the GO side. + * + * @param frequency - frequency + * @param type - frequency type + * @return ErrCode - operate result + */ + virtual ErrCode Hid2dCreateGroup(const int frequency, FreqType type) = 0; + + /** + * @Description The GC side actively disconnects from the GO, used on the GC side. + * + * @param gcIfName - network interface name + * @return ErrCode - operate result + */ + virtual ErrCode Hid2dRemoveGcGroup(const std::string& gcIfName) = 0; + + /** + * @Description Connect to a specified group using hid2d, used on the GC side. + * + * @param config - connection parameters + * @return ErrCode - operate result + */ + virtual ErrCode Hid2dConnect(const Hid2dConnectConfig& config) = 0; + + /** + * @Description Configuring IP addresses for P2P network interfaces, used on the GC side. + * + * @param ifName - network interface name + * @param ipInfo - IP infos + * @return ErrCode - operate result + */ + virtual ErrCode Hid2dConfigIPAddr(const std::string& ifName, const IpAddrInfo& ipInfo) = 0; + + /** + * @Description Clear IP address when the P2P connection is disconnected, used on the GC side. + * + * @param ifName - network interface name + * @return ErrCode - operate result + */ + virtual ErrCode Hid2dReleaseIPAddr(const std::string& ifName) = 0; + + /** + * @Description Obtain the recommended channel and bandwidth for link setup + * + * @param request - request data + * @param response - response result + * @return ErrCode - operate result + */ + virtual ErrCode Hid2dGetRecommendChannel(const RecommendChannelRequest& request, + RecommendChannelResponse& response) = 0; + + /** + * @Description get 5G channel list + * + * @param vecChannelList - result for channel list + * @return ErrCode - operate result + */ + virtual ErrCode Hid2dGetChannelListFor5G(std::vector& vecChannelList) = 0; + + /** + * @Description get the self wifi configuration information + * + * @param cfgType - configuration type + * @param cfgData - the queried data of wifi configuration + * @param getDatValidLen - the valid data length in the array `cfgData` + * @return ErrCode - operate result + */ + virtual ErrCode Hid2dGetSelfWifiCfgInfo(SelfCfgType cfgType, + char cfgData[CFG_DATA_MAX_BYTES], int* getDatValidLen) = 0; + + /** + * @Description set the peer wifi configuration information + * + * @param cfgType - configuration type + * @param cfgData - the wifi configuration data to be set + * @param setDataValidLen - the valid data length in the array `cfgData` + * @return ErrCode - operate result + */ + virtual ErrCode Hid2dSetPeerWifiCfgInfo(PeerCfgType cfgType, + char cfgData[CFG_DATA_MAX_BYTES], int setDataValidLen) = 0; + public: DECLARE_INTERFACE_DESCRIPTOR(u"ohos.wifi.IWifiP2pService"); }; diff --git a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_hid2d_msg.h b/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_hid2d_msg.h new file mode 100755 index 0000000..803cb43 --- /dev/null +++ b/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_hid2d_msg.h @@ -0,0 +1,151 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#ifndef OHOS_WIFI_HID2D_MSG_H +#define OHOS_WIFI_HID2D_MSG_H + +#include + +#ifndef MAC_LEN +#define MAC_LEN 6 +#endif + +#ifndef CFG_DATA_MAX_BYTES +#define CFG_DATA_MAX_BYTES 255 +#endif + +namespace OHOS { +namespace Wifi { +enum class DhcpMode { + CONNECT_GO_NODHCP = 0, + CONNECT_AP_DHCP = 1, + CONNECT_AP_NODHCP = 2, + CONNECT_MODE_INVALID = 0xff +}; + +enum class FreqType { + FREQUENCY_DEFAULT = 0, + FREQUENCY_160M = 1, +}; + +enum class SelfCfgType { + TYPE_OF_GET_SELF_CONFIG = 1, + TYPE_OF_GET_SELF_CONFIG_WITH_PASSWORD = 2 +}; + +enum class PeerCfgType { + TYPE_OF_SET_PEER_CONFIG = 1, + TYPE_OF_SET_PEER_STATE_CHANGE = 2 +}; + +enum class PreferBandwidth { + /** default */ + BW_DEFAULT, + /** indicates the ultimate bandwidth, corresponding to 160 Mbit/s or 320 Mbit/s in the future. */ + BW_EXTRAM, + /** high throughput. The default value is 80 Mbit/s. */ + BW_HIGH_PERF, + /** low-latency service type, 40 Mbit/s/80 Mbit/s, + * which needs to be determined based on the current channel status. */ + BW_LOW_LATENCY +}; + +enum class RecommendStatus { + RS_SUCCESS, + RS_LOCAL_ADJUST, + RS_REMOTE_ADJUST, + RS_FAILURE +}; + +class Hid2dConnectConfig { +public: + Hid2dConnectConfig() : m_ssid(""), m_bssid(""), m_preSharedKey(""), + m_frequency(-1), m_dhcpMode(DhcpMode::CONNECT_MODE_INVALID) { + } + ~Hid2dConnectConfig() { + } + + void SetSsid(const std::string& ssid); + std::string GetSsid() const; + void SetBssid(const std::string& bssid); + std::string GetBssid() const; + void SetPreSharedKey(const std::string& preSharedKey); + std::string GetPreSharedKey() const; + void SetFrequency(const int frequency); + int GetFrequency() const; + void SetDhcpMode(const DhcpMode dhcpMode); + DhcpMode GetDhcpMode() const; + +private: + std::string m_ssid; + std::string m_bssid; + std::string m_preSharedKey; + int m_frequency; + DhcpMode m_dhcpMode; +}; + +class IpAddrInfo { +public: + std::string ip; + std::string gateway; + std::string netmask; +}; + +class RecommendChannelRequest { +public: + RecommendChannelRequest() : remoteIfName(""), remoteIfMode(-1), localIfName(""), + localIfMode(-1), prefBand(0), prefBandwidth(PreferBandwidth::BW_DEFAULT) { + } + + ~RecommendChannelRequest() { + } + + /** the interface name of the remote device */ + std::string remoteIfName; + /** the mode of the interface on the remote device */ + int remoteIfMode; + /** interface name of the local device */ + std::string localIfName; + /** the mode of the interface on the local device */ + int localIfMode; + /** preferred frequency band */ + int prefBand; + /** preferred bandwidth type (enumerated) */ + PreferBandwidth prefBandwidth; +}; + +class RecommendChannelResponse { +public: + RecommendChannelResponse() : status(RecommendStatus::RS_FAILURE), index(-1), + centerFreq(0), centerFreq1(0), centerFreq2(0), bandwidth(0) { + } + ~RecommendChannelResponse() { + } + + /** 0: success; 1: local adjustment; 2: remote adjustment; –1: failure */ + RecommendStatus status; + /* -1 fails. 0-N corresponds to the input array subscript (that is, the interface to be connected) */ + int index; + /* optional 20 Mbit/s bandwidth */ + int centerFreq; + /* optional frequency one */ + int centerFreq1; + /* optional frequency two */ + int centerFreq2; + /* band width */ + int bandwidth; +}; +} // namespace Wifi +} // namespace OHOS +#endif diff --git a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_p2p_msg.h b/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_p2p_msg.h index 3e54e7b..32616f1 100644 --- a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_p2p_msg.h +++ b/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_p2p_msg.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -54,6 +54,8 @@ enum class P2pActionCallback : unsigned char { P2pConnect, P2pDisConnect, P2pSetDeviceName, + CreateHid2dGroup, + Hid2dConnect, UNKNOWN }; diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_impl.cpp b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_impl.cpp index 95d75d3..c361853 100644 --- a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_impl.cpp +++ b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -250,5 +250,11 @@ ErrCode WifiDeviceImpl::GetDeviceMacAddress(std::string &result) RETURN_IF_FAIL(client_); return client_->GetDeviceMacAddress(result); } + +bool WifiDeviceImpl::SetLowLatencyMode(bool enabled) +{ + RETURN_IF_FAIL(client_); + return client_->SetLowLatencyMode(enabled); +} } // namespace Wifi } // namespace OHOS \ No newline at end of file diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_impl.h b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_impl.h index 8f9e0b5..ea7533b 100644 --- a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_impl.h +++ b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_impl.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -275,6 +275,14 @@ public: */ ErrCode GetDeviceMacAddress(std::string &result) override; + /** + * @Description set low latency mode + * + * @param enabled - true: enable low latency, false: disable low latency + * @return bool - operate result + */ + bool SetLowLatencyMode(bool enabled) override; + private: int systemAbilityId_; sptr client_; diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy.cpp b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy.cpp index 4b48f0b..9634186 100644 --- a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy.cpp +++ b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -964,6 +964,29 @@ ErrCode WifiDeviceProxy::GetDeviceMacAddress(std::string &result) return WIFI_OPT_SUCCESS; } +bool WifiDeviceProxy::SetLowLatencyMode(bool enabled) +{ + if (mRemoteDied) { + WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + return WIFI_OPT_FAILED; + } + MessageOption option; + MessageParcel data; + MessageParcel reply; + data.WriteInt32(0); + data.WriteBool(enabled); + int error = Remote()->SendRequest(WIFI_SVR_CMD_SET_LOW_LATENCY_MODE, data, reply, option); + if (error != ERR_NONE) { + WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", WIFI_SVR_CMD_SET_LOW_LATENCY_MODE, error); + return WIFI_OPT_FAILED; + } + int exception = reply.ReadInt32(); + if (exception) { + return WIFI_OPT_FAILED; + } + return reply.ReadBool(); +} + void WifiDeviceProxy::OnRemoteDied(const wptr &remoteObject) { WIFI_LOGD("Remote service is died!"); diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy.h b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy.h index 32dce5c..5fadca4 100644 --- a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy.h +++ b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -266,6 +266,18 @@ public: */ ErrCode GetDeviceMacAddress(std::string &result) override; + /** + * @Description set low latency mode + * + * @param enabled - true: enable low latency, false: disable low latency + * @return bool - operate result + */ + bool SetLowLatencyMode(bool enabled) override; + + /** + * @Description Handle remote object died event. + * @param remoteObject remote object. + */ void OnRemoteDied(const wptr &remoteObject) override; private: diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hid2d.cpp b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hid2d.cpp new file mode 100755 index 0000000..a130d68 --- /dev/null +++ b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hid2d.cpp @@ -0,0 +1,55 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "wifi_hid2d.h" +#include "wifi_p2p_impl.h" +#include "wifi_logger.h" + +DEFINE_WIFILOG_LABEL("Hid2d"); + +namespace OHOS { +namespace Wifi { +std::unique_ptr Hid2d::CreateWifiHid2d(int systemAbilityId) +{ + std::unique_ptr impl = std::make_unique(systemAbilityId); + if (impl != nullptr) { + if (impl->Init()) { + WIFI_LOGI("new hid2d successfully!"); + return impl; + } + } + + WIFI_LOGE("new wifi hid2d failed"); + return nullptr; +} + +std::unique_ptr Hid2d::GetInstance(int systemAbilityId) +{ + std::unique_ptr impl = std::make_unique(systemAbilityId); + if (impl != nullptr) { + if (impl->Init()) { + WIFI_LOGI("init hid2d successfully!"); + return impl; + } + } + + WIFI_LOGE("new wifi hid2d failed"); + return nullptr; +} + +Hid2d::~Hid2d() +{} +} // namespace Wifi +} // namespace OHOS \ No newline at end of file diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hid2d_msg.cpp b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hid2d_msg.cpp new file mode 100755 index 0000000..ffdc594 --- /dev/null +++ b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hid2d_msg.cpp @@ -0,0 +1,60 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "wifi_hid2d_msg.h" + +namespace OHOS { +namespace Wifi { + void Hid2dConnectConfig::SetSsid(const std::string& ssid) { + m_ssid = ssid; + } + + std::string Hid2dConnectConfig::GetSsid() const { + return m_ssid; + } + + void Hid2dConnectConfig::SetBssid(const std::string& bssid) { + m_bssid = bssid; + } + + std::string Hid2dConnectConfig::GetBssid() const { + return m_bssid; + } + + void Hid2dConnectConfig::SetPreSharedKey(const std::string& preSharedKey) { + m_preSharedKey = preSharedKey; + } + + std::string Hid2dConnectConfig::GetPreSharedKey() const { + return m_preSharedKey; + } + + void Hid2dConnectConfig::SetFrequency(const int frequency) { + m_frequency = frequency; + } + + int Hid2dConnectConfig::GetFrequency() const { + return m_frequency; + } + + void Hid2dConnectConfig::SetDhcpMode(const DhcpMode dhcpMode) { + m_dhcpMode = dhcpMode; + } + + DhcpMode Hid2dConnectConfig::GetDhcpMode() const { + return m_dhcpMode; + } +} // namespace Wifi +} // namespace OHOS \ No newline at end of file diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_proxy.h b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_proxy.h index 573b553..9aed1e0 100644 --- a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_proxy.h +++ b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_proxy.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -148,7 +148,12 @@ public: */ ErrCode GetSupportedFeatures(long &features) override; + /** + * @Description Handle remote object died event. + * @param remoteObject remote object. + */ void OnRemoteDied(const wptr& remoteObject) override; + private: static BrokerDelegator g_delegator; diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_logger.h b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_logger.h index 00e62e8..d2f3995 100644 --- a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_logger.h +++ b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_logger.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #ifndef OHOS_WIFI_LOGGER_H #define OHOS_WIFI_LOGGER_H @@ -45,6 +46,14 @@ const unsigned int LOG_ID_WIFI_DHCP = LOG_ID_WIFI | 0x05; #define WIFI_LOGW(...) (void)OHOS::HiviewDFX::HiLog::Warn(WIFI_LOG_LABEL, ##__VA_ARGS__) #define WIFI_LOGI(...) (void)OHOS::HiviewDFX::HiLog::Info(WIFI_LOG_LABEL, ##__VA_ARGS__) #define WIFI_LOGD(...) (void)OHOS::HiviewDFX::HiLog::Debug(WIFI_LOG_LABEL, ##__VA_ARGS__) + +#ifndef CHECK_NULL_AND_RETURN +#define CHECK_NULL_AND_RETURN(ptr, retValue) \ +if (!(ptr)) { \ + WIFI_LOGI("Pointer %{public}s in %{public}s is NULL!", #ptr, __func__); \ + return retValue; \ +} +#endif } // namespace Wifi } // namespace OHOS #endif \ No newline at end of file diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_callback_stub.cpp b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_callback_stub.cpp index 5c8ebb2..430bfc3 100644 --- a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_callback_stub.cpp +++ b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_callback_stub.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "wifi_p2p_callback_stub.h" #include "define.h" #include "wifi_p2p_msg.h" @@ -88,7 +89,7 @@ void WifiP2pCallbackStub::SetRemoteDied(bool val) void WifiP2pCallbackStub::OnP2pStateChanged(int state) { - WIFI_LOGD("WifiP2pCallbackStub::OnP2pStateChanged"); + WIFI_LOGD("WifiP2pCallbackStub::OnP2pStateChanged: %{public}d", state); if (userCallback_) { userCallback_->OnP2pStateChanged(state); } @@ -133,7 +134,7 @@ void WifiP2pCallbackStub::OnP2pServicesChanged(const std::vector(info.GetConnectState())); if (userCallback_) { userCallback_->OnP2pConnectionChanged(info); } diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_impl.cpp b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_impl.cpp index 8a111be..71ac4ab 100644 --- a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_impl.cpp +++ b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -14,6 +14,8 @@ */ #include "wifi_p2p_impl.h" #include "iservice_registry.h" +#include "if_config.h" +#include "mac_address.h" #include "wifi_logger.h" DEFINE_WIFILOG_P2P_LABEL("WifiP2pImpl"); @@ -226,15 +228,90 @@ bool WifiP2pImpl::IsFeatureSupported(long feature) } return ((tmpFeatures & feature) == feature); } + ErrCode WifiP2pImpl::SetP2pDeviceName(const std::string &deviceName) { RETURN_IF_FAIL(client_); return client_->SetP2pDeviceName(deviceName); } + ErrCode WifiP2pImpl::SetP2pWfdInfo(const WifiP2pWfdInfo &wfdInfo) { RETURN_IF_FAIL(client_); return client_->SetP2pWfdInfo(wfdInfo); } + +ErrCode WifiP2pImpl::Hid2dRequestGcIp(const std::string& gcMac, std::string& ipAddr) +{ + RETURN_IF_FAIL(client_); + return client_->Hid2dRequestGcIp(gcMac, ipAddr); +} + +ErrCode WifiP2pImpl::Hid2dSharedlinkIncrease() +{ + RETURN_IF_FAIL(client_); + return client_->Hid2dSharedlinkIncrease(); +} + +ErrCode WifiP2pImpl::Hid2dSharedlinkDecrease() +{ + RETURN_IF_FAIL(client_); + return client_->Hid2dSharedlinkDecrease(); +} + +ErrCode WifiP2pImpl::Hid2dCreateGroup(const int frequency, FreqType type) +{ + RETURN_IF_FAIL(client_); + return client_->Hid2dCreateGroup(frequency, type); +} + +ErrCode WifiP2pImpl::Hid2dRemoveGcGroup(const std::string& gcIfName) +{ + RETURN_IF_FAIL(client_); + return client_->Hid2dRemoveGcGroup(gcIfName); +} + +ErrCode WifiP2pImpl::Hid2dConnect(const Hid2dConnectConfig& config) +{ + RETURN_IF_FAIL(client_); + return client_->Hid2dConnect(config); +} + +ErrCode WifiP2pImpl::Hid2dConfigIPAddr(const std::string& ifName, const IpAddrInfo& ipInfo) +{ + RETURN_IF_FAIL(client_); + return client_->Hid2dConfigIPAddr(ifName, ipInfo); +} + +ErrCode WifiP2pImpl::Hid2dReleaseIPAddr(const std::string& ifName) +{ + RETURN_IF_FAIL(client_); + return client_->Hid2dReleaseIPAddr(ifName); +} + +ErrCode WifiP2pImpl::Hid2dGetRecommendChannel(const RecommendChannelRequest& request, + RecommendChannelResponse& response) +{ + RETURN_IF_FAIL(client_); + return client_->Hid2dGetRecommendChannel(request, response); +} + +ErrCode WifiP2pImpl::Hid2dGetChannelListFor5G(std::vector& vecChannelList) +{ + RETURN_IF_FAIL(client_); + return client_->Hid2dGetChannelListFor5G(vecChannelList); +} + +ErrCode WifiP2pImpl::Hid2dGetSelfWifiCfgInfo(SelfCfgType cfgType, char cfgData[CFG_DATA_MAX_BYTES], int* getDatValidLen) +{ + RETURN_IF_FAIL(client_); + return client_->Hid2dGetSelfWifiCfgInfo(cfgType, cfgData, getDatValidLen); +} + +ErrCode WifiP2pImpl::Hid2dSetPeerWifiCfgInfo(PeerCfgType cfgType, char cfgData[CFG_DATA_MAX_BYTES], int setDataValidLen) +{ + RETURN_IF_FAIL(client_); + return client_->Hid2dSetPeerWifiCfgInfo(cfgType, cfgData, setDataValidLen); +} } // namespace Wifi } // namespace OHOS \ No newline at end of file diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_impl.h b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_impl.h index ef650eb..f2109e9 100644 --- a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_impl.h +++ b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_impl.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -17,10 +17,11 @@ #include "wifi_p2p.h" #include "wifi_p2p_proxy.h" +#include "wifi_hid2d.h" namespace OHOS { namespace Wifi { -class WifiP2pImpl : public WifiP2p { +class WifiP2pImpl : public WifiP2p, public Hid2d { public: explicit WifiP2pImpl(int systemAbilityId); ~WifiP2pImpl(); @@ -254,6 +255,111 @@ public: */ ErrCode SetP2pWfdInfo(const WifiP2pWfdInfo &wfdInfo) override; + /** + * @Description Request an IP address to the Gc from the IP address pool, used on the GO side. + * + * @param gcMac - gc mac address + * @param ipAddr - applied ip address + * @return ErrCode - operate result + */ + ErrCode Hid2dRequestGcIp(const std::string& gcMac, std::string& ipAddr) override; + + /** + * @Description Increase(+1) hid2d shared link reference counting + * + * @return ErrCode - operate result + */ + ErrCode Hid2dSharedlinkIncrease() override; + + /** + * @Description Decrease(-1) hid2d shared link reference counting + * + * @return ErrCode - operate result + */ + ErrCode Hid2dSharedlinkDecrease() override; + + /** + * @Description Create hid2d group, used on the GO side. + * + * @param frequency - frequency + * @param type - frequency type + * @return ErrCode - operate result + */ + ErrCode Hid2dCreateGroup(const int frequency, FreqType type) override; + + /** + * @Description The GC side actively disconnects from the GO, used on the GC side. + * + * @param gcIfName - network interface name + * @return ErrCode - operate result + */ + ErrCode Hid2dRemoveGcGroup(const std::string& gcIfName) override; + + /** + * @Description Connect to a specified group using hid2d, used on the GC side. + * + * @param config - connection parameters + * @return ErrCode - operate result + */ + ErrCode Hid2dConnect(const Hid2dConnectConfig& config) override; + + /** + * @Description Configuring IP addresses for P2P network interfaces, used on the GC side. + * + * @param ifName - network interface name + * @param ipInfo - IP infos + * @return ErrCode - operate result + */ + ErrCode Hid2dConfigIPAddr(const std::string& ifName, const IpAddrInfo& ipInfo) override; + + /** + * @Description Clear IP address when the P2P connection is disconnected, used on the GC side. + * + * @param ifName - network interface name + * @return ErrCode - operate result + */ + ErrCode Hid2dReleaseIPAddr(const std::string& ifName) override; + + /** + * @Description Obtain the recommended channel and bandwidth for link setup + * + * @param request - request data + * @param response - response result + * @return ErrCode - operate result + */ + ErrCode Hid2dGetRecommendChannel(const RecommendChannelRequest& request, + RecommendChannelResponse& response) override; + + /** + * @Description get 5G channel list + * + * @param vecChannelList - result for channel list + * @return ErrCode - operate result + */ + ErrCode Hid2dGetChannelListFor5G(std::vector& vecChannelList) override; + + /** + * @Description get the self wifi configuration information + * + * @param cfgType - configuration type + * @param cfgData - the queried data of wifi configuration + * @param getDatValidLen - the valid data length in the array `cfgData` + * @return ErrCode - operate result + */ + ErrCode Hid2dGetSelfWifiCfgInfo(SelfCfgType cfgType, + char cfgData[CFG_DATA_MAX_BYTES], int* getDatValidLen) override; + + /** + * @Description set the peer wifi configuration information + * + * @param cfgType - configuration type + * @param cfgData - the wifi configuration data to be set + * @param setDataValidLen - the valid data length in the array `cfgData` + * @return ErrCode - operate result + */ + ErrCode Hid2dSetPeerWifiCfgInfo(PeerCfgType cfgType, + char cfgData[CFG_DATA_MAX_BYTES], int setDataValidLen) override; + private: int systemAbilityId_; sptr client_; diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_proxy.cpp b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_proxy.cpp index a4e415f..463356c 100644 --- a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_proxy.cpp +++ b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_proxy.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -901,6 +901,354 @@ ErrCode WifiP2pProxy::GetSupportedFeatures(long &features) return WIFI_OPT_SUCCESS; } +ErrCode WifiP2pProxy::Hid2dRequestGcIp(const std::string& gcMac, std::string& ipAddr) +{ + if (mRemoteDied) { + WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + return WIFI_OPT_FAILED; + } + MessageOption option; + MessageParcel data; + MessageParcel reply; + data.WriteInt32(0); + data.WriteCString(gcMac.c_str()); + int error = Remote()->SendRequest(WIFI_SVR_CMD_P2P_HID2D_APPLY_IP, data, reply, option); + if (error != ERR_NONE) { + WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", WIFI_SVR_CMD_P2P_HID2D_APPLY_IP, error); + return WIFI_OPT_FAILED; + } + int exception = reply.ReadInt32(); + if (exception) { + return WIFI_OPT_FAILED; + } + int ret = reply.ReadInt32(); + if (ErrCode(ret) != WIFI_OPT_SUCCESS) { + return ErrCode(ret); + } + ipAddr = reply.ReadCString(); + return WIFI_OPT_SUCCESS; +} + +ErrCode WifiP2pProxy::Hid2dSharedlinkIncrease() +{ + if (mRemoteDied) { + WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + return WIFI_OPT_FAILED; + } + MessageOption option; + MessageParcel data; + MessageParcel reply; + data.WriteInt32(0); + int error = Remote()->SendRequest(WIFI_SVR_CMD_P2P_HID2D_SHARED_LINK_INCREASE, data, reply, option); + if (error != ERR_NONE) { + WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", + WIFI_SVR_CMD_P2P_HID2D_SHARED_LINK_INCREASE, error); + return WIFI_OPT_FAILED; + } + int exception = reply.ReadInt32(); + if (exception) { + return WIFI_OPT_FAILED; + } + return ErrCode(reply.ReadInt32()); +} + +ErrCode WifiP2pProxy::Hid2dSharedlinkDecrease() +{ + if (mRemoteDied) { + WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + return WIFI_OPT_FAILED; + } + MessageOption option; + MessageParcel data; + MessageParcel reply; + data.WriteInt32(0); + int error = Remote()->SendRequest(WIFI_SVR_CMD_P2P_HID2D_SHARED_LINK_DECREASE, data, reply, option); + if (error != ERR_NONE) { + WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", + WIFI_SVR_CMD_P2P_HID2D_SHARED_LINK_DECREASE, error); + return WIFI_OPT_FAILED; + } + int exception = reply.ReadInt32(); + if (exception) { + return WIFI_OPT_FAILED; + } + return ErrCode(reply.ReadInt32()); +} + +ErrCode WifiP2pProxy::Hid2dCreateGroup(const int frequency, FreqType type) +{ + WIFI_LOGI("Request hid2d create group"); + + if (mRemoteDied) { + WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + return WIFI_OPT_FAILED; + } + MessageOption option; + MessageParcel data; + MessageParcel reply; + data.WriteInt32(0); + data.WriteInt32(frequency); + data.WriteInt32(static_cast(type)); + int error = Remote()->SendRequest(WIFI_SVR_CMD_P2P_HID2D_CREATE_GROUP, data, reply, option); + if (error != ERR_NONE) { + WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", + WIFI_SVR_CMD_P2P_HID2D_CREATE_GROUP, error); + return WIFI_OPT_FAILED; + } + int exception = reply.ReadInt32(); + if (exception) { + return WIFI_OPT_FAILED; + } + return ErrCode(reply.ReadInt32()); +} + +ErrCode WifiP2pProxy::Hid2dRemoveGcGroup(const std::string& gcIfName) +{ + WIFI_LOGI("Request hid2d remove group"); + + if (mRemoteDied) { + WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + return WIFI_OPT_FAILED; + } + MessageOption option; + MessageParcel data; + MessageParcel reply; + data.WriteInt32(0); + data.WriteCString(gcIfName.c_str()); + int error = Remote()->SendRequest(WIFI_SVR_CMD_P2P_HID2D_REMOVE_GC_GROUP, data, reply, option); + if (error != ERR_NONE) { + WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", + WIFI_SVR_CMD_P2P_HID2D_REMOVE_GC_GROUP, error); + return WIFI_OPT_FAILED; + } + int exception = reply.ReadInt32(); + if (exception) { + return WIFI_OPT_FAILED; + } + return ErrCode(reply.ReadInt32()); +} + +ErrCode WifiP2pProxy::Hid2dConnect(const Hid2dConnectConfig& config) +{ + WIFI_LOGI("Request hid2d connect"); + + if (mRemoteDied) { + WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + return WIFI_OPT_FAILED; + } + MessageOption option; + MessageParcel data; + MessageParcel reply; + data.WriteInt32(0); + data.WriteCString(config.GetSsid().c_str()); + data.WriteCString(config.GetBssid().c_str()); + data.WriteCString(config.GetPreSharedKey().c_str()); + data.WriteInt32(config.GetFrequency()); + data.WriteInt32(static_cast(config.GetDhcpMode())); + int error = Remote()->SendRequest(WIFI_SVR_CMD_P2P_HID2D_CONNECT, data, reply, option); + if (error != ERR_NONE) { + WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", + WIFI_SVR_CMD_P2P_HID2D_CONNECT, error); + return WIFI_OPT_FAILED; + } + int exception = reply.ReadInt32(); + if (exception) { + return WIFI_OPT_FAILED; + } + return ErrCode(reply.ReadInt32()); +} + +ErrCode WifiP2pProxy::Hid2dConfigIPAddr(const std::string& ifName, const IpAddrInfo& ipInfo) +{ + if (mRemoteDied) { + WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + return WIFI_OPT_FAILED; + } + MessageOption option; + MessageParcel data; + MessageParcel reply; + data.WriteInt32(0); + data.WriteCString(ifName.c_str()); + data.WriteCString(ipInfo.ip.c_str()); + data.WriteCString(ipInfo.gateway.c_str()); + data.WriteCString(ipInfo.netmask.c_str()); + int error = Remote()->SendRequest(WIFI_SVR_CMD_P2P_HID2D_CONFIG_IP, data, reply, option); + if (error != ERR_NONE) { + WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", + WIFI_SVR_CMD_P2P_HID2D_CONFIG_IP, error); + return WIFI_OPT_FAILED; + } + int exception = reply.ReadInt32(); + if (exception) { + return WIFI_OPT_FAILED; + } + return ErrCode(reply.ReadInt32()); +} + +ErrCode WifiP2pProxy::Hid2dReleaseIPAddr(const std::string& ifName) +{ + if (mRemoteDied) { + WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + return WIFI_OPT_FAILED; + } + MessageOption option; + MessageParcel data; + MessageParcel reply; + data.WriteInt32(0); + data.WriteCString(ifName.c_str()); + int error = Remote()->SendRequest(WIFI_SVR_CMD_P2P_HID2D_RELEASE_IP, data, reply, option); + if (error != ERR_NONE) { + WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", + WIFI_SVR_CMD_P2P_HID2D_RELEASE_IP, error); + return WIFI_OPT_FAILED; + } + int exception = reply.ReadInt32(); + if (exception) { + return WIFI_OPT_FAILED; + } + return ErrCode(reply.ReadInt32()); +} + +ErrCode WifiP2pProxy::Hid2dGetRecommendChannel(const RecommendChannelRequest& request, + RecommendChannelResponse& response) +{ + if (mRemoteDied) { + WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + return WIFI_OPT_FAILED; + } + MessageOption option; + MessageParcel data, reply; + data.WriteInt32(0); + data.WriteCString(request.remoteIfName.c_str()); + data.WriteInt32(request.remoteIfMode); + data.WriteCString(request.localIfName.c_str()); + data.WriteInt32(request.localIfMode); + data.WriteInt32(request.prefBand); + data.WriteInt32(static_cast(request.prefBandwidth)); + int error = Remote()->SendRequest(WIFI_SVR_CMD_GET_P2P_RECOMMENDED_CHANNEL, data, reply, option); + if (error != ERR_NONE) { + WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", + WIFI_SVR_CMD_GET_P2P_RECOMMENDED_CHANNEL, error); + return ErrCode(error); + } + int exception = reply.ReadInt32(); + if (exception) { + return WIFI_OPT_FAILED; + } + int ret = reply.ReadInt32(); + if (ErrCode(ret) != WIFI_OPT_SUCCESS) { + return ErrCode(ret); + } + response.status = RecommendStatus(reply.ReadInt32()); + response.index = reply.ReadInt32(); + response.centerFreq = reply.ReadInt32(); + response.centerFreq1 = reply.ReadInt32(); + response.centerFreq2 = reply.ReadInt32(); + response.bandwidth = reply.ReadInt32(); + return WIFI_OPT_SUCCESS; +} + +ErrCode WifiP2pProxy::Hid2dGetChannelListFor5G(std::vector& vecChannelList) +{ + if (mRemoteDied) { + WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + return WIFI_OPT_FAILED; + } + MessageOption option; + MessageParcel data; + MessageParcel reply; + data.WriteInt32(0); + int error = Remote()->SendRequest(WIFI_SVR_CMD_GET_5G_CHANNEL_LIST, data, reply, option); + if (error != ERR_NONE) { + WIFI_LOGW("Set Attr(%{public}d) failed", WIFI_SVR_CMD_GET_5G_CHANNEL_LIST); + return WIFI_OPT_FAILED; + } + int exception = reply.ReadInt32(); + if (exception) { + return WIFI_OPT_FAILED; + } + int ret = reply.ReadInt32(); + if (ErrCode(ret) != WIFI_OPT_SUCCESS) { + return ErrCode(ret); + } + int listSize = reply.ReadInt32(); + for (int i = 0; i < listSize; ++i) { + vecChannelList.emplace_back(reply.ReadInt32()); + } + return WIFI_OPT_SUCCESS; +} + +ErrCode WifiP2pProxy::Hid2dGetSelfWifiCfgInfo(SelfCfgType cfgType, + char cfgData[CFG_DATA_MAX_BYTES], int* getDatValidLen) +{ + if (mRemoteDied) { + WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + return WIFI_OPT_FAILED; + } + MessageOption option; + MessageParcel data; + MessageParcel reply; + data.WriteInt32(0); + data.WriteInt32(static_cast(cfgType)); + int error = Remote()->SendRequest(WIFI_SVR_CMD_GET_SELF_WIFI_CFG, data, reply, option); + if (error != ERR_NONE) { + WIFI_LOGW("Set Attr(%{public}d) failed", WIFI_SVR_CMD_GET_SELF_WIFI_CFG); + return WIFI_OPT_FAILED; + } + int exception = reply.ReadInt32(); + if (exception) { + return WIFI_OPT_FAILED; + } + int ret = reply.ReadInt32(); + if (ErrCode(ret) != WIFI_OPT_SUCCESS) { + return WIFI_OPT_FAILED; + } + + *getDatValidLen = reply.ReadInt32(); + if (*getDatValidLen > 0) { + const char *dataBuffer = (const char *)reply.ReadBuffer(*getDatValidLen); + if (dataBuffer == nullptr) { + WIFI_LOGE("`%{public}s` inner communication error!", __func__); + return WIFI_OPT_FAILED; + } + if (memcpy_s(cfgData, CFG_DATA_MAX_BYTES, dataBuffer, *getDatValidLen) != EOK) { + WIFI_LOGD("`%{public}s` memcpy_s failed!", __func__); + return WIFI_OPT_FAILED; + } + } + return WIFI_OPT_SUCCESS; +} + +ErrCode WifiP2pProxy::Hid2dSetPeerWifiCfgInfo(PeerCfgType cfgType, + char cfgData[CFG_DATA_MAX_BYTES], int setDataValidLen) +{ + if (setDataValidLen <= 0) { + WIFI_LOGE("`%{public}s` parameter is error!", __func__); + return WIFI_OPT_INVALID_PARAM; + } + if (mRemoteDied) { + WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + return WIFI_OPT_FAILED; + } + MessageOption option; + MessageParcel data; + MessageParcel reply; + data.WriteInt32(0); + data.WriteInt32(static_cast(cfgType)); + data.WriteInt32(setDataValidLen); + data.WriteBuffer(cfgData, setDataValidLen); + int error = Remote()->SendRequest(WIFI_SVR_CMD_SET_PEER_WIFI_CFG, data, reply, option); + if (error != ERR_NONE) { + WIFI_LOGW("Set Attr(%{public}d) failed", WIFI_SVR_CMD_SET_PEER_WIFI_CFG); + return WIFI_OPT_FAILED; + } + int exception = reply.ReadInt32(); + if (exception) { + return WIFI_OPT_FAILED; + } + return ErrCode(reply.ReadInt32()); +} + void WifiP2pProxy::OnRemoteDied(const wptr& remoteObject) { WIFI_LOGD("Remote service is died!"); diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_proxy.h b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_proxy.h index d831213..d8c1f9b 100644 --- a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_proxy.h +++ b/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_proxy.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -245,6 +245,115 @@ public: */ ErrCode SetP2pWfdInfo(const WifiP2pWfdInfo &wfdInfo) override; + /** + * @Description Request an IP address to the Gc from the IP address pool, used on the GO side. + * + * @param gcMac - gc mac address + * @param ipAddr - applied ip address + * @return ErrCode - operate result + */ + ErrCode Hid2dRequestGcIp(const std::string& gcMac, std::string& ipAddr) override; + + /** + * @Description Increase(+1) hid2d shared link reference counting + * + * @return ErrCode - operate result + */ + ErrCode Hid2dSharedlinkIncrease() override; + + /** + * @Description Decrease(-1) hid2d shared link reference counting + * + * @return ErrCode - operate result + */ + ErrCode Hid2dSharedlinkDecrease() override; + + /** + * @Description Create hid2d group, used on the GO side. + * + * @param frequency - frequency + * @param type - frequency type + * @return ErrCode - operate result + */ + ErrCode Hid2dCreateGroup(const int frequency, FreqType type) override; + + /** + * @Description The GC side actively disconnects from the GO, used on the GC side. + * + * @param gcIfName - network interface name + * @return ErrCode - operate result + */ + ErrCode Hid2dRemoveGcGroup(const std::string& gcIfName) override; + + /** + * @Description Connect to a specified group using hid2d, used on the GC side. + * + * @param config - connection parameters + * @return ErrCode - operate result + */ + ErrCode Hid2dConnect(const Hid2dConnectConfig& config) override; + + /** + * @Description Configuring IP addresses for P2P network interfaces, used on the GC side. + * + * @param ifName - network interface name + * @param ipInfo - IP infos + * @return ErrCode - operate result + */ + ErrCode Hid2dConfigIPAddr(const std::string& ifName, const IpAddrInfo& ipInfo) override; + + /** + * @Description Clear IP address when the P2P connection is disconnected, used on the GC side. + * + * @param ifName - network interface name + * @return ErrCode - operate result + */ + ErrCode Hid2dReleaseIPAddr(const std::string& ifName) override; + + /** + * @Description Obtain the recommended channel and bandwidth for link setup + * + * @param request - request data + * @param response - response result + * @return ErrCode - operate result + */ + ErrCode Hid2dGetRecommendChannel(const RecommendChannelRequest& request, + RecommendChannelResponse& response) override; + + /** + * @Description get 5G channel list + * + * @param vecChannelList - result for channel list + * @return ErrCode - operate result + */ + ErrCode Hid2dGetChannelListFor5G(std::vector& vecChannelList) override; + + /** + * @Description get the self wifi configuration information + * + * @param cfgType - configuration type + * @param cfgData - the queried data of wifi configuration + * @param getDatValidLen - the valid data length in the array `cfgData` + * @return ErrCode - operate result + */ + ErrCode Hid2dGetSelfWifiCfgInfo(SelfCfgType cfgType, + char cfgData[CFG_DATA_MAX_BYTES], int* getDatValidLen) override; + + /** + * @Description set the peer wifi configuration information + * + * @param cfgType - configuration type + * @param cfgData - the wifi configuration data to be set + * @param setDataValidLen - the valid data length in the array `cfgData` + * @return ErrCode - operate result + */ + ErrCode Hid2dSetPeerWifiCfgInfo(PeerCfgType cfgType, + char cfgData[CFG_DATA_MAX_BYTES], int setDataValidLen) override; + + /** + * @Description Handle remote object died event. + * @param remoteObject remote object. + */ void OnRemoteDied(const wptr &remoteObject) override; private: diff --git a/interfaces/kits/jskits/@ohos.wifi.d.ts b/interfaces/kits/jskits/@ohos.wifi.d.ts index 75f0040..760c5f0 100755 --- a/interfaces/kits/jskits/@ohos.wifi.d.ts +++ b/interfaces/kits/jskits/@ohos.wifi.d.ts @@ -136,7 +136,7 @@ declare namespace wifi { * Obtains information about a Wi-Fi connection. * * @return Returns the Wi-Fi connection information. - * @since 8 + * @since 7 */ function getLinkedInfo(): Promise; function getLinkedInfo(callback: AsyncCallback): void; @@ -145,7 +145,7 @@ declare namespace wifi { * Checks whether a Wi-Fi connection has been set up. * * @return Returns {@code true} if a Wi-Fi connection has been set up; returns {@code false} otherwise. - * @since 8 + * @since 7 */ function isConnected(): boolean; @@ -155,7 +155,7 @@ declare namespace wifi { *

To check whether this device supports a specified feature. * * @return Returns the features supported by this device. - * @since 8 + * @since 7 * @systemapi Hide this for inner system use. */ function getSupportedFeatures(): number; @@ -165,7 +165,7 @@ declare namespace wifi { * * @param featureId Indicates the ID of the feature. * @return Returns {@code true} if this device supports the specified feature; returns {@code false} otherwise. - * @since 8 + * @since 7 */ function isFeatureSupported(featureId: number): boolean; @@ -175,7 +175,7 @@ declare namespace wifi { *

The MAC address is unique and cannot be changed. * * @return Returns the MAC address of the Wi-Fi device. - * @since 8 + * @since 7 * @systemapi Hide this for inner system use. */ function getDeviceMacAddress(): string[]; @@ -186,7 +186,7 @@ declare namespace wifi { *

The IP information includes the host IP address, gateway address, and DNS information. * * @return Returns the IP information of the Wi-Fi connection. - * @since 8 + * @since 7 */ function getIpInfo(): IpInfo; @@ -194,7 +194,7 @@ declare namespace wifi { * Obtains the country code of this device. * * @return Returns the country code of this device. - * @since 8 + * @since 7 */ function getCountryCode(): string; @@ -202,7 +202,7 @@ declare namespace wifi { * Re-associates to current network. * * @return {@code true} if the Wi-Fi network is re-associate successfully. - * @since 8 + * @since 7 * @systemapi Hide this for inner system use. */ function reassociate(): boolean; @@ -211,7 +211,7 @@ declare namespace wifi { * Re-connects to current network. * * @return {@code true} if the Wi-Fi network is re-connect successfully. - * @since 8 + * @since 7 * @systemapi Hide this for inner system use. */ function reconnect(): boolean; @@ -222,7 +222,7 @@ declare namespace wifi { *

You can obtain only the Wi-Fi configurations you created on your own application. * * @return Returns the list of all existing Wi-Fi configurations you created on your application. - * @since 8 + * @since 7 * @systemapi Hide this for inner system use. */ function getDeviceConfigs(): Array; @@ -234,7 +234,7 @@ declare namespace wifi { * * @return Returns the network ID in the updated Wi-Fi configuration if the update is successful; * returns {@code -1} if the specified Wi-Fi configuration is not contained in the list. - * @since 8 + * @since 7 * @systemapi Hide this for inner system use. */ function updateNetwork(config: WifiDeviceConfig): number; @@ -246,7 +246,7 @@ declare namespace wifi { * * @param netId Identifies the network to disable. * @return Returns {@code true} if the specified network is disabled; returns {@code false} otherwise. - * @since 8 + * @since 7 * @systemapi Hide this for inner system use. */ function disableNetwork(netId: number): boolean; @@ -256,7 +256,7 @@ declare namespace wifi { * * @return Returns {@code true} if all the saved Wi-Fi configurations are removed; * returns {@code false} otherwise. - * @since 8 + * @since 7 * @systemapi Hide this for inner system use. */ function removeAllNetwork(): boolean; @@ -271,7 +271,7 @@ declare namespace wifi { * @param id Indicates the ID of the Wi-Fi network, * which can be obtained using the {@link #addDeviceConfig} or {@link #getLinkedInfo} method. * @return Returns {@code true} if the Wi-Fi network is deleted successfully; returns {@code false} otherwise. - * @since 8 + * @since 7 * @systemapi Hide this for inner system use. */ function removeDevice(id: number): boolean; @@ -282,7 +282,7 @@ declare namespace wifi { *

This method is asynchronous. After the Wi-Fi hotspot is enabled, Wi-Fi may be disabled. * * @return Returns {@code true} if this method is called successfully; returns {@code false} otherwise. - * @since 8 + * @since 7 * @systemapi Hide this for inner system use. */ function enableHotspot(): boolean; @@ -293,7 +293,7 @@ declare namespace wifi { *

This method is asynchronous. If Wi-Fi is enabled after the Wi-Fi hotspot is disabled, Wi-Fi may be re-enabled. * * @return Returns {@code true} if this method is called successfully; returns {@code false} otherwise. - * @since 8 + * @since 7 * @systemapi Hide this for inner system use. */ function disableHotspot(): boolean; @@ -302,7 +302,7 @@ declare namespace wifi { * Checks whether Wi-Fi hotspot is active on a device. * * @return Returns {@code true} if Wi-Fi hotspot is enabled; returns {@code false} otherwise. - * @since 8 + * @since 7 * @systemapi Hide this for inner system use. */ function isHotspotActive(): boolean; @@ -316,7 +316,7 @@ declare namespace wifi { * The SSID and {@code securityType} must be available and correct. * If {@code securityType} is not {@code open}, {@code preSharedKey} must be available and correct. * @return Returns {@code true} if the method is called successfully; returns {@code false} otherwise. - * @since 8 + * @since 7 * @systemapi Hide this for inner system use. */ function setHotspotConfig(config: HotspotConfig): boolean; @@ -325,7 +325,7 @@ declare namespace wifi { * Obtains the Wi-Fi hotspot configuration. * * @return Returns the configuration of an existing or enabled Wi-Fi hotspot. - * @since 8 + * @since 7 * @systemapi Hide this for inner system use. */ function getHotspotConfig(): HotspotConfig; @@ -336,7 +336,7 @@ declare namespace wifi { *

This method can only be used on a device that serves as a Wi-Fi hotspot. * * @return Returns the list of clients that are connected to the Wi-Fi hotspot. - * @since 8 + * @since 7 * @systemapi Hide this for inner system use. */ function getStations(): Array; @@ -344,7 +344,7 @@ declare namespace wifi { /** * Defines the EventListener class and provides functions to subscribe or unsubscribe the Wi-Fi events. * - * @since 8 + * @since 7 * @SysCap SystemCapability.Communication.WiFi * @devices phone, tablet, tv, wearable, car */ @@ -429,7 +429,7 @@ declare namespace wifi { * Subscribe Wi-Fi hotspot state change events. * * @return Returns 0: inactive, 1: active, 2: activating, 3: deactivating - * @since 8 + * @since 7 */ on(type: "hotspotStateChange", callback: Callback): void; @@ -438,7 +438,7 @@ declare namespace wifi { * *

All callback functions will be deregistered If there is no specific callback parameter.

* - * @since 8 + * @since 7 */ off(type: "hotspotStateChange", callback?: Callback): void; @@ -446,7 +446,7 @@ declare namespace wifi { * Subscribe Wi-Fi hotspot sta join events. * * @return Returns StationInfo - * @since 8 + * @since 7 * @systemapi Hide this for inner system use. */ on(type: "hotspotStaJoin", callback: Callback): void; @@ -456,7 +456,7 @@ declare namespace wifi { * *

All callback functions will be deregistered If there is no specific callback parameter.

* - * @since 8 + * @since 7 * @systemapi Hide this for inner system use. */ off(type: "hotspotStaJoin", callback?: Callback): void; @@ -465,7 +465,7 @@ declare namespace wifi { * Subscribe Wi-Fi hotspot sta leave events. * * @return Returns {@link #StationInfo} object - * @since 8 + * @since 7 * @systemapi Hide this for inner system use. */ on(type: "hotspotStaLeave", callback: Callback): void; @@ -474,7 +474,7 @@ declare namespace wifi { * Unsubscribe Wi-Fi hotspot sta leave events. * * @return Returns {@link #StationInfo} object - * @since 8 + * @since 7 * @systemapi Hide this for inner system use. */ off(type: "hotspotStaLeave", callback?: Callback): void; @@ -547,7 +547,7 @@ declare namespace wifi { /** * Wi-Fi connection information. * - * @since 8 + * @since 7 */ interface WifiLinkedInfo { /** The SSID of the Wi-Fi hotspot */ @@ -603,7 +603,7 @@ declare namespace wifi { /** * Wi-Fi IP information. * - * @since 8 + * @since 7 */ interface IpInfo { /** The IP address of the Wi-Fi connection */ @@ -631,7 +631,7 @@ declare namespace wifi { /** * Wi-Fi hotspot configuration information. * - * @since 8 + * @since 7 * @systemapi */ interface HotspotConfig { @@ -654,7 +654,7 @@ declare namespace wifi { /** * Wi-Fi station information. * - * @since 8 + * @since 7 * @systemapi */ interface StationInfo { @@ -671,7 +671,7 @@ declare namespace wifi { /** * The state of the supplicant enumeration. * - * @since 8 + * @since 7 * @systemapi */ export enum SuppState { @@ -715,7 +715,7 @@ declare namespace wifi { /** * The state of Wi-Fi connection enumeration. * - * @since 8 + * @since 7 */ export enum ConnState { /** The device is searching for an available AP. */ diff --git a/services/wifi_standard/wifi_framework/common/log/wifi_log.h b/services/wifi_standard/wifi_framework/common/log/wifi_log.h index f0d2669..48ed36f 100644 --- a/services/wifi_standard/wifi_framework/common/log/wifi_log.h +++ b/services/wifi_standard/wifi_framework/common/log/wifi_log.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -34,4 +34,11 @@ #define LOGF(...) ((void)HiLogPrint(LOG_CORE, LOG_FATAL, LOG_DOMAIN, LOG_TAG, __VA_ARGS__)) +#ifndef CHECK_NULL_AND_RETURN +#define CHECK_NULL_AND_RETURN(ptr, retValue) \ +if (!(ptr)) { \ + WIFI_LOGI("Pointer %{public}s in %{public}s is NULL!", #ptr, __func__); \ + return retValue; \ +} +#endif #endif \ No newline at end of file diff --git a/services/wifi_standard/wifi_framework/common/net_helper/dhcpd_interface.cpp b/services/wifi_standard/wifi_framework/common/net_helper/dhcpd_interface.cpp index aeb51a5..3c8b04c 100644 --- a/services/wifi_standard/wifi_framework/common/net_helper/dhcpd_interface.cpp +++ b/services/wifi_standard/wifi_framework/common/net_helper/dhcpd_interface.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -26,8 +26,6 @@ DEFINE_WIFILOG_DHCP_LABEL("WifiDhcpdInterface"); namespace OHOS { namespace Wifi { -const std::string IP_V4_MASK("255.255.255.0"); -const std::string IP_V4_DEFAULT("192.168.1.2"); const int EU_I64_ADDR_LEN = 64; const int GENE_V6_ADDR_LEN = 64; /* Generally, the prefix length cannot exceed 64 characters. */ const int IP_V6_ADDR_LEN = 128; diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/net_conf/if_config.cpp b/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp similarity index 81% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/net_conf/if_config.cpp rename to services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp index 69910b4..3662167 100755 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/net_conf/if_config.cpp +++ b/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -26,16 +26,18 @@ #include "securec.h" #include "if_config.h" #include "ip_tools.h" +#include namespace OHOS { namespace Wifi { const std::string SYSTEM_COMMAND_IP = "/system/bin/ip"; const std::string SYSTEM_COMMAND_NDC = "/system/bin/ndc"; const std::string IFNAME = "wlan0"; -const int SYSTEM_COMMAND_ERR_1 = -1; -const int SYSTEM_COMMAND_ERR_2 = 127; +const int SYSTEM_COMMAND_ERR = -1; +const int SYSTEM_NOT_EXECUTED = 127; const int IPV6_SUFFIX_LEN = 3; const int MAX_IFNAME_LEN = 13; +const int RECEIVE_BUFFER_LEN = 64; IfConfig &IfConfig::GetInstance() { @@ -49,6 +51,38 @@ IfConfig::IfConfig() IfConfig::~IfConfig() {} +bool IfConfig::SyncExecuteCommand(const std::string& cmd) +{ + int ret = system(cmd.c_str()); + if (ret == SYSTEM_COMMAND_ERR || ret == SYSTEM_NOT_EXECUTED) { + LOGE("exec failed. cmd: %s, error:%{public}d", cmd.c_str(), errno); + return false; + } + LOGI("Exec cmd end - sync"); + return true; +} + +bool IfConfig::AsyncExecuteCommand(const std::string& cmd) +{ + std::thread t( + [cmd]() { + FILE *fp = nullptr; + char buffer[RECEIVE_BUFFER_LEN]; + if ((fp = popen(cmd.c_str(), "r")) != nullptr) { + while (fgets(buffer, sizeof(buffer), fp) != nullptr) { + LOGD("exec cmd receive: %{public}s", buffer); + } + pclose(fp); + } else { + LOGE("exec cmd popen error!"); + } + LOGI("Exec cmd end - async"); + } + ); + t.detach(); + return true; +} + /** * @Description : Execute script commands * @Return success:true failed:false @@ -60,21 +94,15 @@ bool IfConfig::ExecCommand(const std::vector &vecCommandArg) command += iter; command += " "; } - LOGI("exec cmd: [%s]", command.c_str()); - int ret = system(command.c_str()); - if (ret == SYSTEM_COMMAND_ERR_1 || ret == SYSTEM_COMMAND_ERR_2) { - LOGE("exec failed. cmd: %s, error:%{public}d", command.c_str(), errno); - return false; - } - - return true; + LOGI("Exec cmd start: [%s]", command.c_str()); + return AsyncExecuteCommand(command); } /** - * @Description : Set the network card address, routing, DNS + * @Description : Set the network card routing, DNS * @Return success:0 failed:-1 */ -int IfConfig::SetIfAddr(const DhcpResult &dhcpResult, int ipType) +int IfConfig::SetIfDnsAndRoute(const DhcpResult &dhcpResult, int ipType) { LOGD("ipType=%d, ip=%s, gateway=%s, subnet=%s, strDns1=%s, strDns2=%s", dhcpResult.iptype, @@ -84,10 +112,8 @@ int IfConfig::SetIfAddr(const DhcpResult &dhcpResult, int ipType) dhcpResult.strDns1.c_str(), dhcpResult.strDns2.c_str()); SetNetDns(IFNAME, dhcpResult.strDns1, dhcpResult.strDns2); - FlushIpAddr(IFNAME, ipType); - AddIpAddr(IFNAME, dhcpResult.strYourCli, dhcpResult.strSubnet, ipType); AddIfRoute(IFNAME, dhcpResult.strYourCli, dhcpResult.strSubnet, dhcpResult.strRouter1, ipType); - LOGI("set addr succeed!"); + LOGI("set dns and route finished!"); return 0; } @@ -117,7 +143,7 @@ void IfConfig::SetNetDns(const std::string& ifName, const std::string& dns1, con */ void IfConfig::FlushIpAddr(const std::string& ifName, const int& ipType) { - if (ipType != static_cast(StaIpType::IPTYPE_IPV4)) { + if (ipType != static_cast(IpType::IPTYPE_IPV4)) { return; } struct ifreq ifr; @@ -155,7 +181,9 @@ void IfConfig::FlushIpAddr(const std::string& ifName, const int& ipType) void IfConfig::AddIpAddr( const std::string &ifName, const std::string &ipAddr, const std::string &mask, const int &ipType) { - if (ipType == static_cast(StaIpType::IPTYPE_IPV4)) { + LOGI("Add ip address, ifName = %{public}s", ifName.c_str()); + + if (ipType == static_cast(IpType::IPTYPE_IPV4)) { struct ifreq ifr; if (memset_s(&ifr, sizeof(ifr), 0, sizeof(ifr)) != EOK || strcpy_s(ifr.ifr_name, sizeof(ifr.ifr_name), ifName.c_str()) != EOK) { @@ -220,7 +248,7 @@ void IfConfig::AddIpAddr( void IfConfig::AddIfRoute(const std::string &ifName, const std::string &ipAddr, const std::string &mask, const std::string &gateWay, const int &ipType) { - if (ipType == static_cast(StaIpType::IPTYPE_IPV4)) { + if (ipType == static_cast(IpType::IPTYPE_IPV4)) { AddIpv4Route(ifName, ipAddr, mask, gateWay); } else { AddIpv6Route(ifName, ipAddr, mask, gateWay); @@ -235,7 +263,7 @@ void IfConfig::AddIfRoute(const std::string &ifName, const std::string &ipAddr, void IfConfig::AddIpv4Route( const std::string &ifName, const std::string &ipAddr, const std::string &mask, const std::string &gateWay) { - LOGI("Enter AddIpv4Route, ifName is %s, ipAddr is %s, mask is %s, gateWay is %s", + LOGI("Enter AddIpv4Route, ifName is %{public}s, ipAddr is %s, mask is %s, gateWay is %s", ifName.c_str(), ipAddr.c_str(), mask.c_str(), @@ -366,8 +394,31 @@ void IfConfig::SetProxy( ExecCommand(ipRouteCmd); } } - return; } + +bool IfConfig::GetIpAddr(const std::string& ifName, std::string& ipAddr) +{ + struct ifreq ifr; + if (memset_s(&ifr, sizeof(ifr), 0, sizeof(ifr)) != EOK || + strcpy_s(ifr.ifr_name, sizeof(ifr.ifr_name), ifName.c_str()) != EOK) { + LOGE("set ifr info failed!"); + return false; + } + int fd = socket(AF_INET, SOCK_DGRAM, 0); + if (fd < 0) { + LOGE("socket error\n"); + return false; + } + if (ioctl(fd, SIOCGIFADDR, &ifr) < 0) { + perror("ioctl error!\n"); + close(fd); + return false; + } + struct sockaddr_in *sin = reinterpret_cast(&ifr.ifr_addr); + ipAddr = inet_ntoa(sin->sin_addr); + close(fd); + return true; +} } // namespace Wifi } // namespace OHOS \ No newline at end of file diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/net_conf/if_config.h b/services/wifi_standard/wifi_framework/common/net_helper/if_config.h similarity index 69% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/net_conf/if_config.h rename to services/wifi_standard/wifi_framework/common/net_helper/if_config.h index 7c3ecf5..2bf7726 100755 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/net_conf/if_config.h +++ b/services/wifi_standard/wifi_framework/common/net_helper/if_config.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -18,10 +18,16 @@ #include #include "wifi_log.h" #include "dhcp_define.h" -#include "sta_define.h" namespace OHOS { namespace Wifi { +typedef enum IpType { + IPTYPE_IPV4, + IPTYPE_IPV6, + IPTYPE_MIX, + IPTYPE_BUTT, +} IpType; + class IfConfig { public: IfConfig(); @@ -36,7 +42,7 @@ public: * @param ipType - ip type[in] * @return int */ - int SetIfAddr(const DhcpResult &dhcpInfo, int ipType); + int SetIfDnsAndRoute(const DhcpResult &dhcpInfo, int ipType); void SetNetDns(const std::string &ifName, const std::string &dns1, const std::string &dns2); @@ -57,6 +63,26 @@ public: const std::string &pac); bool ExecCommand(const std::vector &vecCommandArg); + + bool GetIpAddr(const std::string& ifName, std::string& ipAddr); + +private: + /** + * @Description : Use synchronous mode to execute the command, the current thread will be blocked + * until the command execution is complete. + * + * @param cmd - command + * @return bool - true: success, false: failed + */ + bool SyncExecuteCommand(const std::string& cmd); + + /** + * @Description : Start a new thread to execute the command, the current thread will not be blocked + * + * @param cmd - command + * @return bool - true: success, false: failed + */ + bool AsyncExecuteCommand(const std::string& cmd); }; } // namespace Wifi } // namespace OHOS diff --git a/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp b/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp index 84f3425..26f7a29 100644 --- a/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp +++ b/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp @@ -35,7 +35,7 @@ std::string IpTools::ConvertIpv4Address(unsigned int addressIpv4) unsigned int IpTools::ConvertIpv4Address(const std::string &address) { std::string tmpAddress = address; - int addrInt = 0; + unsigned int addrInt = 0; unsigned int i = 0; for (i = 0; i < IPV4_DOT_NUM; i++) { std::string::size_type npos = tmpAddress.find("."); diff --git a/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp b/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp index eea3838..eb31eac 100644 --- a/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp +++ b/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,9 +12,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "mac_address.h" +#include #include #include +#include +#include +#include #include "securec.h" #include "log_helper.h" #include "wifi_log.h" @@ -129,5 +134,35 @@ struct sockaddr MacAddress::GetMacAddressWifiSockaddr() const } return hwAddr; } + +bool MacAddress::GetMacAddr(const std::string& ifName, unsigned char macAddr[MAC_LEN]) +{ + struct ifreq ifr; + if (memset_s(&ifr, sizeof(ifr), 0, sizeof(ifr)) != EOK || + strcpy_s(ifr.ifr_name, sizeof(ifr.ifr_name), ifName.c_str()) != EOK) { + LOGE("Init the ifreq stuct failed!"); + return false; + } + int fd = socket(AF_INET, SOCK_DGRAM, 0); + if (fd < 0) { + LOGE("get mac addr socket error"); + return false; + } + + ifr.ifr_hwaddr.sa_family = ARPHRD_ETHER; + if (ioctl(fd, SIOCGIFHWADDR, &ifr) < 0) { + LOGE("get mac addr ioctl SIOCGIFHWADDR error"); + close(fd); + return false; + } + + if (memcpy_s(macAddr, ETH_ALEN, ifr.ifr_hwaddr.sa_data, ETH_ALEN) != EOK) { + LOGE("get mac addr memcpy_s error"); + close(fd); + return false; + } + close(fd); + return true; +} } // namespace WiFi } // namespace OHOS \ No newline at end of file diff --git a/services/wifi_standard/wifi_framework/common/net_helper/mac_address.h b/services/wifi_standard/wifi_framework/common/net_helper/mac_address.h index b3d18cf..be5b4f9 100644 --- a/services/wifi_standard/wifi_framework/common/net_helper/mac_address.h +++ b/services/wifi_standard/wifi_framework/common/net_helper/mac_address.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #ifndef OHOS_MAC_ADDRESS_H #define OHOS_MAC_ADDRESS_H @@ -32,6 +33,10 @@ constexpr int ETH_ALEN = 6; /* ETH_ALEN Size of the MAC address binary data */ constexpr size_t MAC_STRING_LENGTH = ETH_ALEN * 2 + (ETH_ALEN - 1); /* length of the string of mac address */ +#ifndef MAC_LEN +#define MAC_LEN 6 +#endif + namespace OHOS { namespace Wifi { class MacAddress { @@ -52,6 +57,7 @@ public: Otherwise, the successful object is returned. */ static MacAddress Create(const std::string &mac); + /** * @Description factory method * @@ -61,10 +67,17 @@ public: */ static MacAddress Create(const sockaddr &hwAddr); -public: + /** + * @Description Obtaining the MAC address by interface name + * + * @param ifName - interface name + * @param macAddr - Array for storing returned mac data + * @return true - success false - fail + */ + static bool GetMacAddr(const std::string& ifName, unsigned char macAddr[MAC_LEN]); + static const MacAddress INVALID_MAC_ADDRESS; /* Invalid MAC Address Object Constant */ -public: /** * @Description The == operator is overloaded to determine whether two MAC addresses represent the same MAC address. diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include/dhcp_client_service_impl.h b/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include/dhcp_client_service_impl.h index 045e269..39919b8 100644 --- a/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include/dhcp_client_service_impl.h +++ b/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include/dhcp_client_service_impl.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -222,6 +222,20 @@ private: */ int UnsubscribeDhcpEvent(const std::string &strAction); + /** + * @Description : release result notify memory. + * + */ + void ReleaseResultNotifyMemory(); + + /** + * @Description : Unsubscribe all dhcp event. + * + * @param strAction - event action [in] + * @Return : success - DHCP_OPT_SUCCESS, failed - others. + */ + int UnsubscribeAllDhcpEvent(); + private: std::mutex mResultNotifyMutex; bool isExitDhcpResultHandleThread; diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include/dhcp_define.h b/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include/dhcp_define.h index 44b8a0b..7e96bba 100644 --- a/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include/dhcp_define.h +++ b/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include/dhcp_define.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -21,7 +21,6 @@ #include #include - namespace OHOS { namespace Wifi { const int ETH_MAC_ADDR_INDEX_0 = 0; @@ -76,6 +75,8 @@ const std::string DHCP_SERVER_LEASES_FILE("/data/dhcp/dhcpd_lease.lease"); const std::string DHCP_SERVER_CFG_IPV4("#ipv4"); const std::string DHCP_SERVER_CFG_IPV6("#ipv6"); const std::string COMMON_EVENT_DHCP_GET_IPV4 = "usual.event.wifi.dhcp.GET_IPV4"; +const std::string IP_V4_MASK("255.255.255.0"); +const std::string IP_V4_DEFAULT("192.168.1.2"); typedef enum EnumErrCode { /* success */ diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include/dhcp_server_service.h b/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include/dhcp_server_service.h index b0a53fd..48ac2b2 100644 --- a/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include/dhcp_server_service.h +++ b/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include/dhcp_server_service.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -186,6 +186,13 @@ public: */ int CreateDefaultConfigFile(const std::string strFile); + /** + * @Description : Stop dhcp server on exit + * + * @Return : success - DHCP_OPT_SUCCESS, failed - others. + */ + int StopDhcpServerOnExit(); + private: /** * @Description : Fork parent process function. diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/src/dhcp_client_service_impl.cpp b/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/src/dhcp_client_service_impl.cpp index 8a89ed5..d51a97b 100644 --- a/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/src/dhcp_client_service_impl.cpp +++ b/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/src/dhcp_client_service_impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -35,9 +35,11 @@ DhcpClientServiceImpl::DhcpClientServiceImpl() isExitDhcpResultHandleThread = false; pDhcpResultHandleThread = nullptr; - m_mapDhcpResultNotify.clear(); + if (!m_mapDhcpResultNotify.empty()) { + ReleaseResultNotifyMemory(); + m_mapDhcpResultNotify.clear(); + } m_mapEventSubscriber.clear(); - InitDhcpMgrThread(); DhcpFunc::CreateDirs(DHCP_WORK_DIR); } @@ -46,20 +48,27 @@ DhcpClientServiceImpl::~DhcpClientServiceImpl() { if (!m_mapEventSubscriber.empty()) { WIFI_LOGE("DhcpClientServiceImpl destructor mapEventSubscriber is not empty!"); - auto iterSubscriber = m_mapEventSubscriber.begin(); - while (iterSubscriber != m_mapEventSubscriber.end()) { - if (UnsubscribeDhcpEvent(iterSubscriber->first) != DHCP_OPT_SUCCESS) { - WIFI_LOGE("DhcpClientServiceImpl destructor %{public}s failed!", (iterSubscriber->first).c_str()); - } else { - WIFI_LOGW("DhcpClientServiceImpl destructor %{public}s success", (iterSubscriber->first).c_str()); - } + if (UnsubscribeAllDhcpEvent() != DHCP_OPT_SUCCESS) { + WIFI_LOGE("DhcpClientServiceImpl unregister all dhcp event failed!"); } - m_mapEventSubscriber.clear(); } ExitDhcpMgrThread(); } +void DhcpClientServiceImpl::ReleaseResultNotifyMemory() +{ + for (auto& item : m_mapDhcpResultNotify) { + auto& secondItem = item.second; + for (auto& each : secondItem) { + if (each != nullptr) { + delete each; + each = nullptr; + } + } + } +} + int DhcpClientServiceImpl::InitDhcpMgrThread() { pDhcpResultHandleThread = new std::thread(&DhcpClientServiceImpl::RunDhcpResultHandleThreadFunc, this); @@ -83,6 +92,7 @@ void DhcpClientServiceImpl::ExitDhcpMgrThread() if (!m_mapDhcpResultNotify.empty()) { WIFI_LOGE("ExitDhcpMgrThread() error, m_mapDhcpResultNotify is not empty!"); + ReleaseResultNotifyMemory(); m_mapDhcpResultNotify.clear(); } } @@ -231,6 +241,21 @@ int DhcpClientServiceImpl::UnsubscribeDhcpEvent(const std::string &strAction) return DHCP_OPT_SUCCESS; } +int DhcpClientServiceImpl::UnsubscribeAllDhcpEvent() +{ + for (auto& e : m_mapEventSubscriber) { + if (e.second != nullptr) { + if (!DhcpFunc::UnsubscribeDhcpCommonEvent(e.second)) { + WIFI_LOGE("UnsubscribeDhcpEvent UnsubscribeDhcpCommonEvent %{public}s failed!", e.first.c_str()); + return DHCP_OPT_FAILED; + } + } + } + m_mapEventSubscriber.clear(); + WIFI_LOGI("UnsubscribeDhcpEvent all dhcp event success!"); + return DHCP_OPT_SUCCESS; +} + void DhcpClientServiceImpl::RunDhcpResultHandleThreadFunc() { for (; ;) { @@ -656,6 +681,10 @@ int DhcpClientServiceImpl::GetDhcpResult(const std::string &ifname, IDhcpResultN } DhcpResultReq *pResultReq = new DhcpResultReq; + if (pResultReq == nullptr) { + WIFI_LOGE("GetDhcpResult() new failed! ifname:%{public}s.", ifname.c_str()); + return DHCP_OPT_FAILED; + } pResultReq->timeouts = timeouts; pResultReq->getTimestamp = (uint32_t)time(NULL); pResultReq->pResultNotify = pResultNotify; diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/src/dhcp_server_service.cpp b/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/src/dhcp_server_service.cpp index a825fcd..743f0b4 100644 --- a/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/src/dhcp_server_service.cpp +++ b/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/src/dhcp_server_service.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -40,19 +40,8 @@ DhcpServerService::DhcpServerService() DhcpServerService::~DhcpServerService() { - auto iterInterfaces = m_setInterfaces.begin(); - while (iterInterfaces != m_setInterfaces.end()) { - if (GetDhcpServerPid(*iterInterfaces) == 0) { - continue; - } - if (StopDhcpServer(*iterInterfaces) != DHCP_OPT_SUCCESS) { - WIFI_LOGE("Destructor stop dhcp server service failed, ifname:%{public}s", (*iterInterfaces).c_str()); - } else { - WIFI_LOGW("Destructor stop dhcp server service success, ifname:%{public}s", (*iterInterfaces).c_str()); - } - } - m_setInterfaces.clear(); - + WIFI_LOGI("StartDhcpServer: ~DhcpServerService"); + StopDhcpServerOnExit(); ExitDhcpMgrThreadFunc(); } @@ -136,6 +125,35 @@ int DhcpServerService::StopDhcpServer(const std::string &ifname) return DHCP_OPT_SUCCESS; } +int DhcpServerService::StopDhcpServerOnExit() +{ + for (auto& each: m_setInterfaces) { + if (each.empty()) { + WIFI_LOGE("StopDhcpServer() on exit error, ifname is empty!"); + continue; + } + + pid_t pidServer = GetDhcpServerPid(each); + if (pidServer == 0) { + WIFI_LOGI("StopDhcpServer() on exit %{public}s already stop.", each.c_str()); + continue; + } + auto iterRangeMap = m_mapInfDhcpRange.find(each); + if (iterRangeMap != m_mapInfDhcpRange.end()) { + m_mapInfDhcpRange.erase(iterRangeMap); + } + if (RemoveAllDhcpRange(each) != DHCP_OPT_SUCCESS) { + WIFI_LOGE("StopDhcpServer() on exit, RemoveAllDhcpRange %{public}s error.", each.c_str()); + } + if (StopServer(pidServer) != DHCP_OPT_SUCCESS) { + WIFI_LOGE("StopDhcpServer() on exit error, StopServer %{public}s already stop.", each.c_str()); + } + SetDhcpServerInfo(each, SERVICE_STATUS_STOP, 0); + } + m_setInterfaces.clear(); + return DHCP_OPT_SUCCESS; +} + int DhcpServerService::GetServerStatus() { return 0; diff --git a/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn b/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn index 7b44265..5c2924f 100755 --- a/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn +++ b/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2021 Huawei Device Co., Ltd. +# Copyright (C) 2021-2022 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -113,7 +113,11 @@ ohos_source_set("wifi_hotspot_service_impl") { } ohos_source_set("wifi_p2p_service_impl") { sources = [ + "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hid2d_msg.cpp", "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_msg.cpp", + "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp", + "wifi_hid2d_cfg.cpp", + "wifi_hid2d_service_utils.cpp", "wifi_p2p_callback_proxy.cpp", "wifi_p2p_death_recipient.cpp", "wifi_p2p_service_impl.cpp", @@ -224,6 +228,7 @@ ohos_shared_library("wifi_p2p_ability") { ":wifi_manager_service", ":wifi_p2p_service_impl", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", + "//foundation/communication/wifi/utils/src:wifi_utils", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//utils/native/base:utils", ] diff --git a/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp b/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp index 0262b46..5ad5936 100755 --- a/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include #include "state_machine.h" #include "wifi_log.h" @@ -621,6 +622,11 @@ State *StateMachineHandler::ExecuteTreeStateMsg(InternalMessage *msg) return nullptr; } + if (curStateInfo->state) { + LOGI("State machine: %{public}s execute Cmd:%{public}d", + curStateInfo->state->GetStateName().c_str(), msg->GetMessageName()); + } + while (curStateInfo->state && (!curStateInfo->state->ExecuteStateMsg(msg))) { curStateInfo = curStateInfo->upperStateInfo; diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/BUILD.gn b/services/wifi_standard/wifi_framework/wifi_manage/idl_client/BUILD.gn index f3e9246..e8c58ef 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/BUILD.gn +++ b/services/wifi_standard/wifi_framework/wifi_manage/idl_client/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2021 Huawei Device Co., Ltd. +# Copyright (C) 2021-2022 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -80,6 +80,7 @@ ohos_source_set("log_helper") { ohos_shared_library("wifi_idl_client") { install_enable = true sources = [ + "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hid2d_msg.cpp", "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_msg.cpp", "idl_interface/i_wifi.c", "idl_interface/i_wifi_chip.c", diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_p2p_iface.c b/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_p2p_iface.c index bf44d42..400bf5e 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_p2p_iface.c +++ b/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_p2p_iface.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -1082,4 +1082,26 @@ WifiErrorNo P2pAddNetwork(int *networkId) ReadClientEnd(client); UnlockRpcClient(client); return result; +} + +WifiErrorNo Hid2dConnect(Hid2dConnectInfo *info) +{ + RpcClient *client = GetP2pRpcClient(); + LockRpcClient(client); + Context *context = client->context; + WriteBegin(context, 0); + WriteFunc(context, "P2pHid2dConnect"); + WriteStr(context, info->ssid); + WriteStr(context, info->bssid); + WriteStr(context, info->passphrase); + WriteInt(context, info->frequency); + WriteEnd(context); + if (RpcClientCall(client, "P2pHid2dConnect") != WIFI_IDL_OPT_OK) { + return WIFI_IDL_OPT_FAILED; + } + int result = WIFI_IDL_OPT_FAILED; + ReadInt(context, &result); + ReadClientEnd(client); + UnlockRpcClient(client); + return result; } \ No newline at end of file diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_p2p_iface.h b/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_p2p_iface.h index f2abbef..1e9d7ca 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_p2p_iface.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_p2p_iface.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -420,6 +420,14 @@ WifiErrorNo P2pGetGroupConfig(int networkId, HidlP2pGroupConfig *pConfig, int si */ WifiErrorNo P2pAddNetwork(int *networkId); +/** + * @Description Send a request for hid2d connect + * + * @param info - configuration for the connection + * @return WifiErrorNo + */ +WifiErrorNo Hid2dConnect(Hid2dConnectInfo *info); + #ifdef __cplusplus } #endif diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_struct.h b/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_struct.h index 304e556..2810ed5 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_struct.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_struct.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -300,9 +300,14 @@ typedef struct HidlP2pGroupConfig { char cfgValue[WIFI_P2P_GROUP_CONFIG_VALUE_LENGTH]; /* param value */ } HidlP2pGroupConfig; +typedef struct Hid2dConnectInfo { + char ssid[WIFI_SSID_LENGTH]; + char bssid[WIFI_MAC_ADDR_LENGTH + 1]; + char passphrase[WIFI_P2P_TMP_MSG_LENGTH_128]; + int frequency; +} Hid2dConnectInfo; /* ----------------p2p struct defines end--------------------------- */ - #ifdef __cplusplus } #endif diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp b/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp index 3419d06..b8c7d27 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "wifi_idl_client.h" #include #include "wifi_global_func.h" @@ -1585,5 +1586,27 @@ WifiErrorNo WifiIdlClient::ReqP2pAddNetwork(int &networkId) const CHECK_CLIENT_NOT_NULL; return P2pAddNetwork(&networkId); } + +WifiErrorNo WifiIdlClient::ReqP2pHid2dConnect(const Hid2dConnectConfig &config) const +{ + CHECK_CLIENT_NOT_NULL; + Hid2dConnectInfo info; + if (memset_s(&info, sizeof(info), 0, sizeof(info)) != EOK) { + return WIFI_IDL_OPT_FAILED; + } + if (strncpy_s(info.ssid, sizeof(info.ssid), config.GetSsid().c_str(), config.GetSsid().length()) != EOK) { + return WIFI_IDL_OPT_FAILED; + } + if (strncpy_s(info.bssid, sizeof(info.bssid), config.GetBssid().c_str(), config.GetBssid().length()) != EOK) { + return WIFI_IDL_OPT_FAILED; + } + if (strncpy_s(info.passphrase, sizeof(info.passphrase), + config.GetPreSharedKey().c_str(), config.GetPreSharedKey().length()) != EOK) { + return WIFI_IDL_OPT_FAILED; + } + info.frequency = config.GetFrequency(); + WifiErrorNo ret = Hid2dConnect(&info); + return ret; +} } // namespace Wifi } // namespace OHOS \ No newline at end of file diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.h b/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.h index b0873d6..05c871c 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -33,6 +33,7 @@ #include "i_wifi_hotspot_iface.h" #include "i_wifi_struct.h" #include "wifi_global_func.h" +#include "wifi_hid2d_msg.h" namespace OHOS { namespace Wifi { @@ -993,6 +994,15 @@ public: * @return WifiErrorNo */ WifiErrorNo ReqP2pAddNetwork(int &networkId) const; + + /** + * @Description Send a request for hid2d connect + * + * @param config + * @return WifiErrorNo + */ + WifiErrorNo ReqP2pHid2dConnect(const Hid2dConnectConfig &config) const; + public: RpcClient *pRpcClient; diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_p2p_hal_interface.cpp b/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_p2p_hal_interface.cpp index fb9e4ba..ea7881e 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_p2p_hal_interface.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_p2p_hal_interface.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -280,5 +280,10 @@ const P2pHalCallback &WifiP2PHalInterface::GetP2pCallbackInst(void) const { return mP2pCallback; } + +WifiErrorNo WifiP2PHalInterface::Hid2dConnect(const Hid2dConnectConfig &config) const +{ + return mIdlClient->ReqP2pHid2dConnect(config); +} } // namespace Wifi } // namespace OHOS \ No newline at end of file diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_p2p_hal_interface.h b/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_p2p_hal_interface.h index b5d5b6e..6e0a992 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_p2p_hal_interface.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_p2p_hal_interface.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #ifndef OHOS_WIFI_P2P_HAL_INTERFACE_H #define OHOS_WIFI_P2P_HAL_INTERFACE_H @@ -427,6 +428,14 @@ public: */ const P2pHalCallback &GetP2pCallbackInst(void) const; + /** + * @Description Sends a request for hid2d connect to the P2P + * + * @param config hid2d config + * @return WifiErrorNo + */ + WifiErrorNo Hid2dConnect(const Hid2dConnectConfig &config) const; + private: P2pHalCallback mP2pCallback; }; diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn b/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn index 5006bc0..eee1d44 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn @@ -22,6 +22,7 @@ ohos_shared_library("wifi_ap_service") { "../common/state.cpp", "../common/state_machine.cpp", "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/dhcpd_interface.cpp", + "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp", "ap_config_use.cpp", "ap_idle_state.cpp", "ap_interface.cpp", diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager.cpp index f8d376c..2c44266 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -22,6 +22,7 @@ #include #include #include "network_interface.h" +#include "if_config.h" #include "wifi_logger.h" DEFINE_WIFILOG_HOTSPOT_LABEL("WifiApNatManager"); @@ -34,7 +35,6 @@ const std::string SYSTEM_COMMAND_IPTABLES = "/system/bin/iptables"; const std::string SYSTEM_COMMAND_IP6TABLES = "/system/bin/ip6tables"; const std::string IP_V4_FORWARDING_CONFIG_FILE = "/proc/sys/net/ipv4/ip_forward"; const std::string IP_V6_FORWARDING_CONFIG_FILE = "/proc/sys/net/ipv6/conf/all/forwarding"; -const int SYSTEM_NOT_EXECUTED = 127; bool WifiApNatManager::EnableInterfaceNat(bool enable, std::string inInterfaceName, std::string outInterfaceName) const { @@ -98,7 +98,7 @@ bool WifiApNatManager::SetInterfaceRoute(bool enable) const ipRouteCmd.push_back("254"); ipRouteCmd.push_back("prio"); ipRouteCmd.push_back("18000"); - ExecCommand(ipRouteCmd); + IfConfig::GetInstance().ExecCommand(ipRouteCmd); /* Refresh the cache */ ipRouteCmd.clear(); @@ -106,7 +106,7 @@ bool WifiApNatManager::SetInterfaceRoute(bool enable) const ipRouteCmd.push_back("route"); ipRouteCmd.push_back("flush"); ipRouteCmd.push_back("cache"); - ExecCommand(ipRouteCmd); + IfConfig::GetInstance().ExecCommand(ipRouteCmd); return true; } @@ -118,7 +118,7 @@ bool WifiApNatManager::SetInterfaceNat(bool enable, const std::string &outInterf /* Clearing the Firewalls */ iptablesCmd.push_back(SYSTEM_COMMAND_IPTABLES); iptablesCmd.push_back("-F"); - ExecCommand(iptablesCmd); + IfConfig::GetInstance().ExecCommand(iptablesCmd); /* iptable forward ACCEPT */ iptablesCmd.clear(); @@ -126,7 +126,7 @@ bool WifiApNatManager::SetInterfaceNat(bool enable, const std::string &outInterf iptablesCmd.push_back("-P"); iptablesCmd.push_back("FORWARD"); iptablesCmd.push_back(enable ? "ACCEPT" : "DROP"); - ExecCommand(iptablesCmd); + IfConfig::GetInstance().ExecCommand(iptablesCmd); /* Setting NAT Rules */ iptablesCmd.clear(); @@ -139,7 +139,7 @@ bool WifiApNatManager::SetInterfaceNat(bool enable, const std::string &outInterf iptablesCmd.push_back(outInterfaceName); iptablesCmd.push_back("-j"); iptablesCmd.push_back("MASQUERADE"); - ExecCommand(iptablesCmd); + IfConfig::GetInstance().ExecCommand(iptablesCmd); return true; } @@ -156,24 +156,5 @@ bool WifiApNatManager::WriteDataToFile(const std::string &fileName, const std::s outf.close(); return true; } - -bool WifiApNatManager::ExecCommand(const std::vector &vecCommandArg) const -{ - std::string command; - for (auto iter : vecCommandArg) { - command += iter; - command += " "; - } - - WIFI_LOGE("exec cmd: [%{private}s]", command.c_str()); - - int ret = system(command.c_str()); - if (ret == -1 || ret == SYSTEM_NOT_EXECUTED) { - WIFI_LOGE("exec failed. cmd: %{private}s, error:%{public}d.", command.c_str(), errno); - return false; - } - - return true; -} } // namespace Wifi } // namespace OHOS \ No newline at end of file diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager.h index eb4557e..9b438f2 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -63,14 +63,6 @@ private: * @return true: success false: failed */ bool WriteDataToFile(const std::string &fileName, const std::string &content) const; - - /** - * @Description Running System Commands. - * @param vecCommandArg - Related Items in Commands, - vecCommandArg[0] is file path. - * @return true: success false: failed - */ - bool ExecCommand(const std::vector &vecCommandArg) const; }; } // namespace Wifi } // namespace OHOS diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp index e5c106e..a79d565 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -28,6 +28,7 @@ #include "define.h" #include "wifi_dumper.h" #include "wifi_common_util.h" +#include "wifi_protect_manager.h" DEFINE_WIFILOG_LABEL("WifiDeviceServiceImpl"); namespace OHOS { @@ -642,6 +643,12 @@ ErrCode WifiDeviceServiceImpl::GetDeviceMacAddress(std::string &result) return WIFI_OPT_SUCCESS; } +bool WifiDeviceServiceImpl::SetLowLatencyMode(bool enabled) +{ + WIFI_LOGI("SetLowLatencyMode"); + return WifiProtectManager::GetInstance().SetLowLatencyMode(enabled); +} + ErrCode WifiDeviceServiceImpl::CheckCanEnableWifi(void) { if (WifiPermissionUtils::VerifySetWifiInfoPermission() == PERMISSION_DENIED) { diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h index c960dd1..4429e53 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -100,6 +100,8 @@ public: ErrCode GetDeviceMacAddress(std::string &result) override; + bool SetLowLatencyMode(bool enabled) override; + int32_t Dump(int32_t fd, const std::vector& args) override; private: diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp index 58575f3..1330434 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -65,6 +65,7 @@ void WifiDeviceStub::InitHandleMap() handleFuncMap[WIFI_SVR_CMD_GET_SUPPORTED_FEATURES] = &WifiDeviceStub::OnGetSupportedFeatures; handleFuncMap[WIFI_SVR_CMD_GET_DERVICE_MAC_ADD] = &WifiDeviceStub::OnGetDeviceMacAdd; handleFuncMap[WIFI_SVR_CMD_IS_WIFI_CONNECTED] = &WifiDeviceStub::OnIsWifiConnected; + handleFuncMap[WIFI_SVR_CMD_SET_LOW_LATENCY_MODE] = &WifiDeviceStub::OnSetLowLatencyMode; return; } @@ -611,5 +612,14 @@ void WifiDeviceStub::OnGetDeviceMacAdd(uint32_t code, MessageParcel &data, Messa return; } + +void WifiDeviceStub::OnSetLowLatencyMode(uint32_t code, MessageParcel &data, MessageParcel &reply) +{ + WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); + + bool enabled = data.ReadBool(); + reply.WriteInt32(0); + reply.WriteBool(SetLowLatencyMode(enabled)); +} } // namespace Wifi } // namespace OHOS \ No newline at end of file diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.h index 0d3163a..81fd681 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #ifndef OHOS_WIFI_DEVICE_STUB_H #define OHOS_WIFI_DEVICE_STUB_H @@ -65,6 +66,7 @@ private: void OnGetSupportedFeatures(uint32_t code, MessageParcel &data, MessageParcel &reply); void OnGetDeviceMacAdd(uint32_t code, MessageParcel &data, MessageParcel &reply); void OnIsWifiConnected(uint32_t code, MessageParcel &data, MessageParcel &reply); + void OnSetLowLatencyMode(uint32_t code, MessageParcel &data, MessageParcel &reply); private: void ReadWifiDeviceConfig(MessageParcel &data, WifiDeviceConfig &config); diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_cfg.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_cfg.cpp new file mode 100755 index 0000000..9ab497d --- /dev/null +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_cfg.cpp @@ -0,0 +1,793 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "wifi_hid2d_cfg.h" +#include +#include +#include "wifi_logger.h" + +DEFINE_WIFILOG_P2P_LABEL("WifiHid2dCfg"); +namespace OHOS { +namespace Wifi { +static constexpr int INVALID_VALUE_OR_TYPE = -1; +static constexpr int INDEX_START = 0; +static constexpr int INDEX_LENGTH = 1; +static constexpr int INDEX_VALUE = 2; +static constexpr int TYPE_VERSION = 1; +static constexpr int TYPE_P2P_CHANNEL_OPT = 2; +static constexpr int TYPE_DBDC = 3; +static constexpr int TYPE_CSA = 4; +static constexpr int TYPE_RADAR_DETECT = 5; +static constexpr int TYPE_CREATE_DFS_CHANNEL = 6; +static constexpr int TYPE_CREATE_INDOOR_CHANNEL = 7; +static constexpr int TYPE_CURRENT_STA_CHANNEL = 8; +static constexpr int TYPE_CURRENT_AP_IS_PORTAL = 9; +static constexpr int TYPE_CURRENT_AP_SSID = 10; +static constexpr int TYPE_CURRENT_AP_BSSID = 11; +static constexpr int TYPE_CURRENT_STA_HAS_INTERNET = 12; +static constexpr int TYPE_P2P_SUPPORT_CHANNEL = 13; +static constexpr int TYPE_CURRENT_AP_PASSWORD = 14; +static constexpr int TYPE_CURRENT_AP_SECURITY_TYPE = 15; +static constexpr int TYPE_CURRENT_AP_ROUTE_TYPE = 16; +static constexpr int TYPE_DEVICE_TYPE = 17; +static constexpr int TYPE_CURRENT_SESSION_ID_TYPE = 18; +static constexpr int TYPE_STA_STATE_FOR_CALLBACK = 1; +static constexpr int TYPE_STA_CHANNEL_FOR_CALLBACK = 2; +static constexpr int TYPE_AP_SSID_FOR_CALLBACK = 3; +static constexpr int TYPE_AP_BSSID_FOR_CALLBACK = 4; +static constexpr int LENGTH_OFFSET = 1; +static constexpr int VALUE_OFFSET = 2; +static constexpr int NORMAL_TYPE_LENGTH = 1; // Most scenes of length(length) in Tlv is 1 +static constexpr int TYPE_AND_LENGTH = 2; // Most scenes of length(type + length) is 2 +static constexpr int TYPICAL_TLV_LENGTH = 3; // Most scenes of length(tpye + length +value) is 3 +static constexpr int MAX_SSID_LENGTH = 32; +static constexpr int MAX_PASSWORD_LENGTH = 64; +static constexpr int BSSID_LENGTH = 6; +static constexpr int BYTE_MASK = 0xFF; +static constexpr int MAX_BYTES = 255; +static constexpr int THE_NUM_FROM_CH1_TO_CH11 = 11; +static constexpr int DBAC_VERSION = 2; +static constexpr int SESSION_ID_LENGTH = 20; +static constexpr int CHANNEL_12 = 12; + +DeviceWifiInfo::DeviceWifiInfo() +{ + m_version = DBAC_VERSION; + m_isChooseP2pChannelOpt = false; + m_isSupportDbdc = false; + m_isSupportCsa = false; + m_isP2pSupportRadarDetect = false; + m_isP2pSupportDfsChannel = false; + m_isP2pSupportIndoorChannel = false; + m_isPortalAp = false; + m_staChannel = 0; + m_currentApSsid = ""; + m_currentApBssid = ""; + m_isCurrentApHasInternet = false; + m_pwd = ""; + m_sessionId = ""; + m_securityType = INVALID_VALUE_OR_TYPE; + m_routerType = INVALID_VALUE_OR_TYPE; + m_deviceType = DeviceClass::Default; +} + +DeviceWifiInfo::~DeviceWifiInfo() +{ +} + +DeviceClass DeviceWifiInfo::GetDeviceClass() +{ + /* Read from configuration items */ + return DeviceClass::Default; +} + +void DeviceWifiInfo::UpdateDeviceCapability() +{ + m_isChooseP2pChannelOpt = false; + m_isSupportDbdc = false; + m_isSupportCsa = false; + m_isP2pSupportRadarDetect = false; + m_isP2pSupportDfsChannel = false; + m_isP2pSupportIndoorChannel = false; + m_deviceType = GetDeviceClass(); +} + +void DeviceWifiInfo::ResetWifiDeviceCfg() +{ + m_staChannel = 0; + m_currentApSsid = ""; + m_currentApBssid = ""; + m_isCurrentApHasInternet = false; + m_pwd = ""; + m_isPortalAp = false; + m_securityType = INVALID_VALUE_OR_TYPE; + m_routerType = INVALID_VALUE_OR_TYPE; +} + +int DeviceWifiInfo::GetVersion() +{ + WIFI_LOGI("GetVersion : %{public}d ", m_version); + return m_version; +} + +void DeviceWifiInfo::SetVerison(int version) +{ + if (version <= 0) { + return; + } + m_version = version; +} + +bool DeviceWifiInfo::GetCapsOfChooseP2pChannelOpt() +{ + return m_isChooseP2pChannelOpt; +} + +void DeviceWifiInfo::SetCapsOfChooseP2pChannelOpt(bool isEnabled) +{ + m_isChooseP2pChannelOpt = isEnabled; +} + +bool DeviceWifiInfo::GetCapsOfDbdc() +{ + return m_isSupportDbdc; +} + +void DeviceWifiInfo::SetCapsOfDbdc(bool isSupportDbdc) +{ + m_isSupportDbdc = isSupportDbdc; +} + +bool DeviceWifiInfo::GetCapsOfCsa() +{ + return m_isSupportCsa; +} + +void DeviceWifiInfo::SetCapsOfCsa(bool isSupportCsa) +{ + m_isSupportCsa = isSupportCsa; +} + +bool DeviceWifiInfo::GetCapsOfP2pRadarDetect() +{ + return m_isP2pSupportRadarDetect; +} + +void DeviceWifiInfo::SetCapsOfP2pRadarDetect(bool isP2pSupportRadarDetect) +{ + m_isP2pSupportRadarDetect = isP2pSupportRadarDetect; +} + +bool DeviceWifiInfo::GetCapsOfP2pDfsChannel() { + return m_isP2pSupportDfsChannel; +} + +void DeviceWifiInfo::SetCapsOfP2pDfsChannel(bool isP2pSupportDfsChannel) +{ + m_isP2pSupportDfsChannel = isP2pSupportDfsChannel; +} + +bool DeviceWifiInfo::GetCapsOfP2pIndoorChannel() +{ + return m_isP2pSupportIndoorChannel; +} + +void DeviceWifiInfo::SetCapsOfP2pIndoorChannel(bool isP2pSupportIndoorChannel) +{ + m_isP2pSupportIndoorChannel = isP2pSupportIndoorChannel; +} + +void DeviceWifiInfo::SetStaChannel(int channel) +{ + WIFI_LOGI("Set sta channel: %{public}d ", channel); + if (channel < 0) { + return; + } + m_staChannel = channel; +} + +int DeviceWifiInfo::GetStaChannel() +{ + return m_staChannel; +} + +bool DeviceWifiInfo::GetApType() +{ + return m_isPortalAp; +} + +void DeviceWifiInfo::SetApType(bool isPortalAp) +{ + m_isPortalAp = isPortalAp; +} + +std::string DeviceWifiInfo::GetCurrentApSsid() +{ + return m_currentApSsid; +} + +void DeviceWifiInfo::SetCurrentApSsid(const std::string& ssid) +{ + m_currentApSsid = ssid; +} + +std::string DeviceWifiInfo::GetCurrentApBssid() { + return m_currentApBssid; +} + +void DeviceWifiInfo::SetCurrentApBssid(const std::string& bssid) +{ + m_currentApBssid = bssid; +} + +void DeviceWifiInfo::SetCurrentApHasInternet(bool hasInternet) +{ + m_isCurrentApHasInternet = hasInternet; +} + +bool DeviceWifiInfo::GetCurrentApHasInternet() +{ + return m_isCurrentApHasInternet; +} + +std::vector DeviceWifiInfo::GetP2pSupportChannel() +{ + return m_P2pSupportChannelList; +} + +void DeviceWifiInfo::SetP2pSupportChannel(std::vector& channels) +{ + if (channels.empty()) { + return; + } + m_P2pSupportChannelList = channels; +} + +std::string DeviceWifiInfo::GetApPwd() +{ + return m_pwd; +} + +void DeviceWifiInfo::SetApPwd(const std::string& pwd) +{ + m_pwd = pwd; +} + +int DeviceWifiInfo::GetApSecurityType() +{ + return m_securityType; +} + +void DeviceWifiInfo::SetApSecurityType(int securityType) +{ + m_securityType = securityType; +} + +int DeviceWifiInfo::GetRouterType() +{ + return m_routerType; +} + +std::string DeviceWifiInfo::GenerateSessionId() +{ + constexpr int sessionIdSize = 20; + constexpr int hexMaxNum = 15; + std::random_device rd; + std::mt19937 gen(rd()); + std::uniform_int_distribution<> dis(0, hexMaxNum); + + std::stringstream ss; + ss << std::hex; + for (int i = 0; i != sessionIdSize; ++i) { + ss << dis(gen); + } + m_sessionId = ss.str(); + return m_sessionId; +} + +std::string DeviceWifiInfo::GetSessionId() +{ + return m_sessionId; +} + +void DeviceWifiInfo::SetSessionId(std::string sessionId) +{ + m_sessionId = sessionId; +} + +void DeviceWifiInfo::ClearSessionId() +{ + m_sessionId = ""; +} + +void DeviceWifiInfo::SetRouteType(int routerType) +{ + m_routerType = routerType; +} + +DeviceClass DeviceWifiInfo::GetDeviceType() +{ + return m_deviceType; +} + +void DeviceWifiInfo::SetDeviceType(DeviceClass deviceType) +{ + m_deviceType = deviceType; +} + +int DeviceWifiInfo::GetValueFromType(int type) +{ + int value = INVALID_VALUE_OR_TYPE; + switch (type) { + case TYPE_VERSION: + value = GetVersion(); + break; + case TYPE_P2P_CHANNEL_OPT: + value = GetCapsOfChooseP2pChannelOpt() ? 1 : 0; + break; + case TYPE_DBDC: + value = GetCapsOfDbdc() ? 1 : 0; + break; + case TYPE_CSA: + value = GetCapsOfCsa() ? 1 : 0; + break; + case TYPE_RADAR_DETECT: + value = GetCapsOfP2pRadarDetect() ? 1 : 0; + break; + case TYPE_CREATE_DFS_CHANNEL: + value = GetCapsOfP2pDfsChannel() ? 1 : 0; + break; + case TYPE_CREATE_INDOOR_CHANNEL: + value = GetCapsOfP2pIndoorChannel() ? 1 : 0; + break; + case TYPE_CURRENT_STA_CHANNEL: + value = GetStaChannel(); + break; + case TYPE_CURRENT_AP_IS_PORTAL: + value = GetApType() ? 1 : 0; + break; + default: + WIFI_LOGI("GetValueFromType invalid type = %{public}d", type); + break; + } + return value; +} + +void DeviceWifiInfo::SetDeviceCfg(int type, int inputValue) +{ + switch (type) { + case TYPE_VERSION: + SetVerison(inputValue); + break; + case TYPE_P2P_CHANNEL_OPT: + SetCapsOfChooseP2pChannelOpt(inputValue == 1); + break; + case TYPE_DBDC: + SetCapsOfDbdc(inputValue == 1); + break; + case TYPE_CSA: + SetCapsOfCsa(inputValue == 1); + break; + case TYPE_RADAR_DETECT: + SetCapsOfP2pRadarDetect(inputValue == 1); + break; + case TYPE_CREATE_DFS_CHANNEL: + SetCapsOfP2pDfsChannel(inputValue == 1); + break; + case TYPE_CREATE_INDOOR_CHANNEL: + SetCapsOfP2pIndoorChannel(inputValue == 1); + break; + case TYPE_CURRENT_STA_CHANNEL: + SetStaChannel(inputValue); + break; + case TYPE_CURRENT_AP_IS_PORTAL: + SetApType(inputValue == 1); + break; + default: + WIFI_LOGI("SetDeviceCfg invalid type = %{public}d", type); + break; + } +} + +WifiHid2dCfg::WifiHid2dCfg() +{ +} + +WifiHid2dCfg::~WifiHid2dCfg() +{ +} + +WifiHid2dCfg& WifiHid2dCfg::GetInstance() +{ + static WifiHid2dCfg inst; + return inst; +} + +DeviceWifiInfo WifiHid2dCfg::m_selfDeviceInfo; +DeviceWifiInfo WifiHid2dCfg::m_peerDeviceInfo; + +DeviceWifiInfo& WifiHid2dCfg::GetSelfDeviceCfgInfo() +{ + return m_selfDeviceInfo; +} + +DeviceWifiInfo& WifiHid2dCfg::GetPeerDeviceCfgInfo() +{ + return m_peerDeviceInfo; +} + +std::string WifiHid2dCfg::ParseStringFromByteArray(char* data, int dataLen, int index, int maxLength) +{ + if (data == nullptr || dataLen < index + INDEX_VALUE) { + return ""; + } + int length = data[index + INDEX_LENGTH] & BYTE_MASK; + if (length > maxLength + 1) { /* +1 for the end character '\0' of the C-style string */ + WIFI_LOGE("invalid length = %{public}d", length); + return ""; + } + + char* ssidArray = new char[maxLength + 1]; /* +1 for the end character '\0' of the C-style string */ + if (ssidArray == nullptr) { + return ""; + } + if (memcpy_s(ssidArray, maxLength + 1, data + index + INDEX_VALUE, length) != EOK) { + WIFI_LOGE("parse string from byte array memcpy_s failed!"); + delete[] ssidArray; + return ""; + } + + int needCopylen = FindIndexFromByteArray(ssidArray, maxLength + 1, 0); + std::string s(needCopylen + 1, '\0'); + for (int i = 0; i <= needCopylen && i < maxLength + 1; ++i) { + s[i] = ssidArray[i]; + } + delete[] ssidArray; + return s; +} + +/** 2.4g channel count from channel 1 to channel 11 */ +void WifiHid2dCfg::ParseP2pSupportChannelFromByteArray(char* data, int dataLen, + int index, std::vector& p2pSupportChannels) +{ + if (data == nullptr || dataLen < (index + INDEX_VALUE)) { + return; + } + + int length = data[index + LENGTH_OFFSET] & BYTE_MASK; + if (dataLen < (index + length)) { + return; + } + // To save space, channels 1 to 11 are not carried when the peer information is obtained. + // channels 1 to 11 are supported by all countries, p2pSupportChannels should include it + int i = 0; + for (i = 0; i < THE_NUM_FROM_CH1_TO_CH11; i++) { + p2pSupportChannels.emplace_back(i + 1); + } + for (int j = 0; j < data[index + LENGTH_OFFSET]; j++) { + p2pSupportChannels.emplace_back(data[index + VALUE_OFFSET + j] & BYTE_MASK); + } + std::sort(p2pSupportChannels.begin(), p2pSupportChannels.end()); +} + +void WifiHid2dCfg::HandlePeerApPassword() +{ +} + +void WifiHid2dCfg::HandleTlvData(int type, char* cfgData, int cfgDataLen, int index) +{ + std::vector p2pSupportChannels; + switch (type) { + case TYPE_CURRENT_AP_SSID: + m_peerDeviceInfo.SetCurrentApSsid(ParseStringFromByteArray(cfgData, cfgDataLen, index, MAX_SSID_LENGTH)); + break; + case TYPE_CURRENT_AP_BSSID: + unsigned char macAddr[BSSID_LENGTH]; + if (memcpy_s(macAddr, BSSID_LENGTH, cfgData + index + INDEX_VALUE, BSSID_LENGTH) != EOK) { + return; + } + m_peerDeviceInfo.SetCurrentApBssid(MacArrayToStr(macAddr)); + break; + case TYPE_CURRENT_STA_HAS_INTERNET: + m_peerDeviceInfo.SetCurrentApHasInternet((cfgData[index + VALUE_OFFSET] & BYTE_MASK) == 0x01); + break; + case TYPE_P2P_SUPPORT_CHANNEL: + ParseP2pSupportChannelFromByteArray(cfgData, cfgDataLen, index, p2pSupportChannels); + m_peerDeviceInfo.SetP2pSupportChannel(p2pSupportChannels); + break; + case TYPE_CURRENT_AP_PASSWORD: + m_peerDeviceInfo.SetApPwd(ParseStringFromByteArray(cfgData, cfgDataLen, index, MAX_PASSWORD_LENGTH)); + break; + case TYPE_CURRENT_AP_SECURITY_TYPE: + m_peerDeviceInfo.SetApSecurityType(cfgData[index + VALUE_OFFSET] & BYTE_MASK); + break; + case TYPE_CURRENT_AP_ROUTE_TYPE: + m_peerDeviceInfo.SetRouteType(cfgData[index + VALUE_OFFSET] & BYTE_MASK); + break; + case TYPE_DEVICE_TYPE: + m_peerDeviceInfo.SetDeviceType(DeviceClass(cfgData[index + VALUE_OFFSET] & BYTE_MASK)); + break; + case TYPE_CURRENT_SESSION_ID_TYPE: + m_peerDeviceInfo.SetSessionId(ParseStringFromByteArray(cfgData, cfgDataLen, index, SESSION_ID_LENGTH)); + break; + default: + WIFI_LOGE("handle tlv data invalid type = %{public}d", type); + return; + } +} + +int WifiHid2dCfg::ParsePeerDeviceCfgInfo(PeerCfgType cfgType, char* cfgData, int cfgDataLen) +{ + if (cfgData == nullptr || cfgDataLen == 0) { + return INVALID_VALUE_OR_TYPE; + } + if (cfgType != PeerCfgType::TYPE_OF_SET_PEER_CONFIG) { + return INVALID_VALUE_OR_TYPE; + } + m_peerDeviceInfo.ResetWifiDeviceCfg(); + int length = cfgData[INDEX_START] & BYTE_MASK; + if (cfgDataLen != length) { + return INVALID_VALUE_OR_TYPE; + } + + WIFI_LOGI("parse peer device cfg length = %{public}d", length); + for (int i = 1; i < length;) { + if ((i + LENGTH_OFFSET) >= length) { + break; + } + int valueLength = cfgData[i + LENGTH_OFFSET] & BYTE_MASK; + if ((i + valueLength + TYPE_AND_LENGTH) > length) { + break; + } + int type = cfgData[i]; + int valueIndex = i + VALUE_OFFSET; + if (type > 0 && type <= TYPE_CURRENT_AP_IS_PORTAL && valueIndex < length) { + m_peerDeviceInfo.SetDeviceCfg(type, cfgData[valueIndex] & BYTE_MASK); + i += valueLength + TYPE_AND_LENGTH; + continue; + } + HandleTlvData(type, cfgData, cfgDataLen, i); + i += valueLength + TYPE_AND_LENGTH; + } + + if (m_peerDeviceInfo.GetApSecurityType() != INVALID_VALUE_OR_TYPE) { + HandlePeerApPassword(); + } + return 0; +} + +int WifiHid2dCfg::ParsePeerDeviceStaChanngeInfo(PeerCfgType cfgType, char* cfgData, int cfgDataLen) +{ + if (cfgData == nullptr || cfgDataLen == 0) { + return INVALID_VALUE_OR_TYPE; + } + if (cfgType != PeerCfgType::TYPE_OF_SET_PEER_STATE_CHANGE) { + return INVALID_VALUE_OR_TYPE; + } + if (cfgDataLen != cfgData[0]) { + return INVALID_VALUE_OR_TYPE; + } + for (int i = 1; i < cfgDataLen;) { + int type = cfgData[i]; + switch (type) { + case TYPE_STA_STATE_FOR_CALLBACK: + case TYPE_STA_CHANNEL_FOR_CALLBACK: + case TYPE_AP_SSID_FOR_CALLBACK: + case TYPE_AP_BSSID_FOR_CALLBACK: + default: + break; + } + i += (cfgData[i + LENGTH_OFFSET] & BYTE_MASK) + TYPE_AND_LENGTH; + } + return 0; +} + +int WifiHid2dCfg::FindIndexFromByteArray(char* data, int dataLen, int value) +{ + if (data == nullptr) { + return 0; + } + int i = 0; + for (i = 0; i < dataLen; i++) { + if (data[i] == value) { + return i; + } + } + return i; +} + +int WifiHid2dCfg::SetBssidByte(int typeBssidValue, char* dataArray, int dataArrayLen, int offset) +{ + if (dataArray == nullptr) { + return 0; + } + int length = INDEX_VALUE + BSSID_LENGTH; + if (dataArrayLen < (offset + length)) { + return 0; + } + dataArray[offset] = (char)typeBssidValue; + std::string bssid = m_selfDeviceInfo.GetCurrentApBssid(); + dataArray[offset + INDEX_LENGTH] = BSSID_LENGTH; + + unsigned char macByteAddr[BSSID_LENGTH] = { 0 }; + if (!bssid.empty()) { + if (MacStrToArray(bssid, macByteAddr) != EOK) { + return 0; + } + } + + if (memcpy_s(dataArray + offset + INDEX_VALUE, dataArrayLen - (offset + INDEX_VALUE), + macByteAddr, BSSID_LENGTH) != EOK) { + return 0; + } + return length; +} + +int WifiHid2dCfg::SetP2pSupportChannelByte(char* dataArray, int dataArrayLen, int offset) +{ + if (dataArray == nullptr || dataArrayLen < (offset + INDEX_LENGTH)) { + return 0; + } + std::vector p2pSupportChannelList = m_selfDeviceInfo.GetP2pSupportChannel(); + if (p2pSupportChannelList.empty() || (p2pSupportChannelList.size() - THE_NUM_FROM_CH1_TO_CH11 <= 0)) { + WIFI_LOGI("Channel list is invalid."); + return 0; + } + dataArray[offset] = TYPE_P2P_SUPPORT_CHANNEL; + int length = p2pSupportChannelList.size() - THE_NUM_FROM_CH1_TO_CH11; + dataArray[offset + INDEX_LENGTH] = (char)length; + if (dataArrayLen < (offset + length + INDEX_VALUE)) { + return 0; + } + int index = 0; + for (int channel : p2pSupportChannelList) { + // To save space, channels 1 to 11 are not carried when exchanging information with the peer device for + // Channels 1 to 11 are supported by all countries and dataArray should not contains channel 1 to 11 + if (channel >= CHANNEL_12) { + dataArray[offset + INDEX_VALUE + index] = (char)channel; + index++; + } + } + return length + VALUE_OFFSET; +} + +int WifiHid2dCfg::BuildTlvForIntVal(int type, int Value, char* tlvData, int tlvDataLen, int offset) +{ + if (tlvData == nullptr) { + return 0; + } + if (tlvDataLen <= (offset + INDEX_VALUE)) { + return 0; + } + tlvData[offset] = (char)type; + tlvData[offset + INDEX_LENGTH] = NORMAL_TYPE_LENGTH; + tlvData[offset + INDEX_VALUE] = (char)Value; + return TYPICAL_TLV_LENGTH; +} + +int WifiHid2dCfg::BuildTlvForStrVal(int type, std::string value, char* tlvData, int tlvDataLen, int offset) +{ + if (tlvData == nullptr) { + return 0; + } + if (value.empty() || (type == TYPE_CURRENT_AP_PASSWORD && value.length() > MAX_PASSWORD_LENGTH) || + (type == TYPE_CURRENT_AP_SSID && value.length() > MAX_SSID_LENGTH)) { + tlvData[offset] = (char)type; + tlvData[offset + LENGTH_OFFSET] = (char)NORMAL_TYPE_LENGTH; + tlvData[offset + VALUE_OFFSET] = 0; + return TYPICAL_TLV_LENGTH; + } + + /* +1 for the end character '\0' of the C-style string */ + if (tlvDataLen < offset + value.length() + 1) { + return 0; + } + tlvData[offset] = (char)type; + /* +1 for the end character '\0' of the C-style string */ + tlvData[offset + LENGTH_OFFSET] = (char)value.length() + 1; + if (memcpy_s(tlvData + offset + VALUE_OFFSET, tlvDataLen - (offset + VALUE_OFFSET), + value.c_str(), value.length() + 1) != EOK) { + return 0; + } + return tlvData[offset + LENGTH_OFFSET] + TYPE_AND_LENGTH; +} + +void WifiHid2dCfg::HandlePeerStaStateChange(char* data, int dataLen, int index) +{ + if (data == nullptr || dataLen <= (index + INDEX_VALUE)) { + return; + } + if (data[index + INDEX_VALUE] == 0) { // 0 : disconnect + m_peerDeviceInfo.ResetWifiDeviceCfg(); + } +} + +void WifiHid2dCfg::GetSelfDeviceCfg(SelfCfgType cfgType, char cfgInfo[CFG_DATA_MAX_BYTES], int& getDatValidLen) +{ + getDatValidLen = 0; + if ((cfgType != SelfCfgType::TYPE_OF_GET_SELF_CONFIG && + cfgType != SelfCfgType::TYPE_OF_GET_SELF_CONFIG_WITH_PASSWORD)) { + return; + } + + char* totalCfgInfo = new char[MAX_BYTES]; + if (totalCfgInfo == nullptr) { + return; + } + if (memset_s(totalCfgInfo, MAX_BYTES, 0, MAX_BYTES) != EOK) { + delete[] totalCfgInfo; + return; + } + + int i = 1; + int position = 1; + for (i = 1; i <= TYPE_CURRENT_AP_IS_PORTAL; i++) { + position += BuildTlvForIntVal(i, m_selfDeviceInfo.GetValueFromType(i), totalCfgInfo, MAX_BYTES, position); + } + + std::string ssid = m_selfDeviceInfo.GetCurrentApSsid(); + position += BuildTlvForStrVal(TYPE_CURRENT_AP_SSID, ssid, totalCfgInfo, MAX_BYTES, position); + + position += SetBssidByte(TYPE_CURRENT_AP_BSSID, totalCfgInfo, MAX_BYTES, position); + + position += BuildTlvForIntVal(TYPE_CURRENT_STA_HAS_INTERNET, m_selfDeviceInfo.GetCurrentApHasInternet() ? 1 : 0, + totalCfgInfo, MAX_BYTES, position); + + position += SetP2pSupportChannelByte(totalCfgInfo, MAX_BYTES, position); + if (cfgType == SelfCfgType::TYPE_OF_GET_SELF_CONFIG_WITH_PASSWORD) { + std::string pwd = m_selfDeviceInfo.GetApPwd(); + position += BuildTlvForStrVal(TYPE_CURRENT_AP_PASSWORD, pwd, totalCfgInfo, MAX_BYTES, position); + position += BuildTlvForIntVal(TYPE_CURRENT_AP_SECURITY_TYPE, m_selfDeviceInfo.GetApSecurityType(), + totalCfgInfo, MAX_BYTES, position); + } + + position += BuildTlvForIntVal(TYPE_CURRENT_AP_ROUTE_TYPE, m_selfDeviceInfo.GetRouterType(), + totalCfgInfo, MAX_BYTES, position); + + position += BuildTlvForIntVal(TYPE_DEVICE_TYPE, static_cast(m_selfDeviceInfo.GetDeviceType()), + totalCfgInfo, MAX_BYTES, position); + + std::string sessionID = m_selfDeviceInfo.GenerateSessionId(); + position += BuildTlvForStrVal(TYPE_CURRENT_SESSION_ID_TYPE, sessionID, totalCfgInfo, MAX_BYTES, position); + + totalCfgInfo[INDEX_START] = (char)position; + getDatValidLen = totalCfgInfo[INDEX_START] & BYTE_MASK; + WIFI_LOGI("self device cfg length = %{public}d", getDatValidLen); + if (getDatValidLen <= 0) { + getDatValidLen = 0; + delete[] totalCfgInfo; + return; + } + if (memcpy_s(cfgInfo, CFG_DATA_MAX_BYTES, totalCfgInfo, getDatValidLen) != EOK) { + WIFI_LOGI("GetSelfDeviceCfg memcpy_s failed!"); + getDatValidLen = 0; + } + delete[] totalCfgInfo; +} + +int WifiHid2dCfg::Hid2dSetPeerWifiCfgInfo(PeerCfgType cfgType, char cfgInfo[CFG_DATA_MAX_BYTES], int setDataValidLen) +{ + WIFI_LOGI("Hid2dSetPeerWifiCfgInfo cfgType = %{public}d", cfgType); + if (cfgType == PeerCfgType::TYPE_OF_SET_PEER_CONFIG) { + return ParsePeerDeviceCfgInfo(cfgType, cfgInfo, setDataValidLen); + } + else if (cfgType == PeerCfgType::TYPE_OF_SET_PEER_STATE_CHANGE) { + return ParsePeerDeviceStaChanngeInfo(cfgType, cfgInfo, setDataValidLen); + } else { + return INVALID_VALUE_OR_TYPE; + } +} +} // namespace Wifi +} // namespace OHOS \ No newline at end of file diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_cfg.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_cfg.h new file mode 100755 index 0000000..01ad87f --- /dev/null +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_cfg.h @@ -0,0 +1,256 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OHOS_WIFI_HID2D_CFG_H +#define OHOS_WIFI_HID2D_CFG_H + +#include +#include +#include "wifi_common_util.h" +#include "wifi_hid2d_msg.h" + +namespace OHOS { +namespace Wifi { +enum class DeviceType { + /** phone device type id */ + DEVICE_TYPE_PHONE_ID = 0, + /** pad device type id */ + DEVICE_TYPE_PAD_ID = 1, + /** pad tv type id */ + DEVICE_TYPE_TV_ID = 2, + /** pad pc type id */ + DEVICE_TYPE_PC_ID = 3, + /** pad display type id */ + DEVICE_TYPE_DISPLAY_ID = 4, + /** pad car type id */ + DEVICE_TYPE_CAR_ID = 5, +}; + +enum class DeviceClass { + Default, + TABLET, + TV, + CAR +}; + +class DeviceWifiInfo { +public: + DeviceWifiInfo(); + + ~DeviceWifiInfo(); + + DeviceClass GetDeviceClass(); + + void UpdateDeviceCapability(); + + void ResetWifiDeviceCfg(); + + int GetVersion(); + + void SetVerison(int version); + + bool GetCapsOfChooseP2pChannelOpt(); + + void SetCapsOfChooseP2pChannelOpt(bool isEnabled); + + bool GetCapsOfDbdc(); + + void SetCapsOfDbdc(bool isSupportDbdc); + + bool GetCapsOfCsa(); + + void SetCapsOfCsa(bool isSupportCsa); + + bool GetCapsOfP2pRadarDetect(); + + void SetCapsOfP2pRadarDetect(bool isP2pSupportRadarDetect); + + bool GetCapsOfP2pDfsChannel(); + + void SetCapsOfP2pDfsChannel(bool isP2pSupportDfsChannel); + + bool GetCapsOfP2pIndoorChannel(); + + void SetCapsOfP2pIndoorChannel(bool isP2pSupportIndoorChannel); + + void SetStaChannel(int channel); + + int GetStaChannel(); + + bool GetApType(); + + void SetApType(bool isPortalAp); + + std::string GetCurrentApSsid(); + + void SetCurrentApSsid(const std::string& ssid); + + std::string GetCurrentApBssid(); + + void SetCurrentApBssid(const std::string& bssid); + + void SetCurrentApHasInternet(bool hasInternet); + + bool GetCurrentApHasInternet(); + + std::vector GetP2pSupportChannel(); + + void SetP2pSupportChannel(std::vector& channels); + + std::string GetApPwd(); + + void SetApPwd(const std::string& pwd); + + int GetApSecurityType(); + + void SetApSecurityType(int securityType); + + int GetRouterType(); + + std::string GenerateSessionId(); + + std::string GetSessionId(); + + /** + * set SessionId of current cast service + * + * @param sessionId input sessionId generated by p2p go + */ + void SetSessionId(std::string sessionId); + + /** + * clear SessionId of current cast service + */ + void ClearSessionId(); + + void SetRouteType(int routerType); + + DeviceClass GetDeviceType(); + + /** + * set Go or Gc device type + * + * @param deviceType input Go or Gc device type + */ + void SetDeviceType(DeviceClass deviceType); + + /** + * get device config value from type + * + * @param type device wifi config type + * @return the type value + */ + int GetValueFromType(int type); + + /** + * set device config info according type + * + * @param type device wifi config type + * @param inputValue the value of type + */ + void SetDeviceCfg(int type, int inputValue); + +private: + int m_version; // dual band adaptive concurrent + bool m_isChooseP2pChannelOpt; + bool m_isSupportDbdc; + bool m_isSupportCsa; + bool m_isP2pSupportRadarDetect; + bool m_isP2pSupportDfsChannel; + bool m_isP2pSupportIndoorChannel; + bool m_isPortalAp; + int m_staChannel; + std::string m_currentApSsid; + std::string m_currentApBssid; + bool m_isCurrentApHasInternet; + std::vector m_P2pSupportChannelList; + std::string m_pwd; + std::string m_sessionId; + int m_securityType; + int m_routerType; + DeviceClass m_deviceType; +}; + +class WifiHid2dCfg { +public: + static WifiHid2dCfg& GetInstance(); + + DeviceWifiInfo& GetSelfDeviceCfgInfo(); + + DeviceWifiInfo& GetPeerDeviceCfgInfo(); + + /** + * get self device configuration in TLV format:type + length + value + * + * @param cfgType self wifi configuration type + * @param cfgInfo configuration information + * @param getDatValidLen configuration valid length + */ + void GetSelfDeviceCfg(SelfCfgType cfgType, char cfgInfo[CFG_DATA_MAX_BYTES], int& getDatValidLen); + + /** + * set peer wifi p2p config info + * + * @param cfgType self wifi configuration type + * @param cfgData byte array + * @param setDataValidLen the valid length of "cfgData" + * @return 0: success, -1: fail + */ + int Hid2dSetPeerWifiCfgInfo(PeerCfgType cfgType, char cfgInfo[CFG_DATA_MAX_BYTES], int setDataValidLen); + +private: + WifiHid2dCfg(); + + ~WifiHid2dCfg(); + + std::string ParseStringFromByteArray(char* data, int dataLen, int index, int maxLength); + + /** 2.4g channel count from channel 1 to channel 11 */ + void ParseP2pSupportChannelFromByteArray(char* data, int dataLen, int index, std::vector& p2pSupportChannels); + + void HandlePeerApPassword(); + + void HandleTlvData(int type, char* cfgData, int cfgDataLen, int index); + + int ParsePeerDeviceCfgInfo(PeerCfgType cfgType, char* cfgData, int cfgDataLen); + + int ParsePeerDeviceStaChanngeInfo(PeerCfgType cfgType, char* cfgData, int cfgDataLen); + + /** + * find the value of index in byte array + * + * @param data byte array + * @param value intput the value to find index + * @return index in byte array + */ + int FindIndexFromByteArray(char* data, int dataLen, int value); + + int SetBssidByte(int typeBssidValue, char* dataArray, int dataArrayLen, int offset); + + int SetP2pSupportChannelByte(char* dataArray, int dataArrayLen, int offset); + + int BuildTlvForIntVal(int type, int Value, char* tlvData, int tlvDataLen, int offset); + + int BuildTlvForStrVal(int type, std::string value, char* tlvData, int tlvDataLen, int offset); + + void HandlePeerStaStateChange(char* data, int dataLen, int index); + +private: + static DeviceWifiInfo m_selfDeviceInfo; + static DeviceWifiInfo m_peerDeviceInfo; +}; +} // namespace Wifi +} // namespace OHOS +#endif \ No newline at end of file diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_service_utils.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_service_utils.cpp new file mode 100755 index 0000000..a8e493f --- /dev/null +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_service_utils.cpp @@ -0,0 +1,123 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "wifi_hid2d_service_utils.h" +#include +#include +#include "dhcp_define.h" +#include "wifi_logger.h" + +DEFINE_WIFILOG_P2P_LABEL("Hid2dIpPool"); +namespace OHOS { +namespace Wifi { +std::list IpPool::ipList; +std::map IpPool::mapGcMacToAllocIp; +const std::string PATTERN_IP = "^(([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.){3}([01]?\\d\\d?|2[0-4]\\d|25[0-5])$"; +std::shared_mutex g_ipPoolMutex; + +std::atomic_int SharedLinkManager::sharedLinkCount(0); + +bool IpPool::InitIpPool(const std::string& serverIp) +{ + std::unique_lock guard(g_ipPoolMutex); + + if (!ipList.empty()) { + return true; + } + + std::string hostIp = serverIp.empty() ? IP_V4_DEFAULT : serverIp; + if (!IsValidIp(hostIp)) { + return false; + } + + std::string serverIpHead = hostIp.substr(0, hostIp.find_last_of("\\.")); + ipList.clear(); + mapGcMacToAllocIp.clear(); + for (int i = HID2D_IPPOOL_START; i <= HID2D_IPPOOL_END; ++i) { + ipList.emplace_back(serverIpHead + "." + std::to_string(i)); + } + return true; +} + +std::string IpPool::GetIp(const std::string& gcMac) +{ + std::unique_lock guard(g_ipPoolMutex); + + std::string ip = ""; + if (ipList.empty()) { + WIFI_LOGE("Alloc ip failed!"); + return ip; + } + ip = ipList.front(); + ipList.pop_front(); + mapGcMacToAllocIp[gcMac] = ip; + return ip; +} + +void IpPool::ReleaseIp(const std::string& gcMac) +{ + std::unique_lock guard(g_ipPoolMutex); + + auto iter = mapGcMacToAllocIp.find(gcMac); + if (iter == mapGcMacToAllocIp.end()) { + return; + } + + if (std::find(ipList.begin(), ipList.end(), iter->second) != ipList.end()) { + return; + } + if (IsValidIp(iter->second)) { + ipList.emplace_back(iter->second); + mapGcMacToAllocIp.erase(iter); + } +} + +bool IpPool::IsValidIp(const std::string& ip) +{ + if (ip.empty()) { + return false; + } + return std::regex_match(ip, std::regex(PATTERN_IP)); +} + +void SharedLinkManager::IncreaseSharedLink() +{ + WIFI_LOGI("Increase shared link %{public}d -> %{public}d", sharedLinkCount.load(), sharedLinkCount.load() + 1); + ++sharedLinkCount; +} + +void SharedLinkManager::DecreaseSharedLink() +{ + if (sharedLinkCount == 0) { + WIFI_LOGE("Decrease error for sharedLinkCount == 0!"); + return; + } + WIFI_LOGI("Decrease shared link %{public}d -> %{public}d", sharedLinkCount.load(), sharedLinkCount.load() - 1); + --sharedLinkCount; +} + +void SharedLinkManager::SetSharedLinkCount(int count) +{ + WIFI_LOGI("Set sharedLinkCount: %{public}d", count); + sharedLinkCount = count; +} + +int SharedLinkManager::GetSharedLinkCount() +{ + WIFI_LOGI("Get sharedLinkCount: %{public}d", sharedLinkCount.load()); + return sharedLinkCount; +} +} // namespace Wifi +} // namespace OHOS \ No newline at end of file diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_service_utils.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_service_utils.h new file mode 100755 index 0000000..5cae549 --- /dev/null +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_service_utils.h @@ -0,0 +1,55 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OHOS_WIFI_HID2D_SERVICE_UTILS_H +#define OHOS_WIFI_HID2D_SERVICE_UTILS_H + +#include +#include +#include +#include + +namespace OHOS { +namespace Wifi { +class IpPool { +public: + static bool InitIpPool(const std::string& serverIp); + static std::string GetIp(const std::string& gcMac); + static void ReleaseIp(const std::string& gcMac); + +private: + static bool IsValidIp(const std::string& ip); + + static std::list ipList; + static std::map mapGcMacToAllocIp; + static constexpr int HID2D_IPPOOL_START = 3; + static constexpr int HID2D_IPPOOL_END = 75; +}; + +const int SHARED_LINKE_COUNT_ON_DISCONNECTED = 0; +const int SHARED_LINKE_COUNT_ON_CONNECTED = 1; +class SharedLinkManager { +public: + static void IncreaseSharedLink(); + static void DecreaseSharedLink(); + static void SetSharedLinkCount(int count); + static int GetSharedLinkCount(); + +private: + static std::atomic_int sharedLinkCount; +}; +} // namespace Wifi +} // namespace OHOS +#endif \ No newline at end of file diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher.cpp index 0dd7dec..5481eb8 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -266,6 +266,8 @@ void WifiInternalEventDispatcher::Exit() void WifiInternalEventDispatcher::DealStaCallbackMsg( WifiInternalEventDispatcher &instance, const WifiEventCallbackMsg &msg) { + WIFI_LOGI("WifiInternalEventDispatcher:: Deal Sta Event Callback Msg: %{public}d", msg.msgCode); + switch (msg.msgCode) { case WIFI_CBK_MSG_STATE_CHANGE: WifiInternalEventDispatcher::PublishWifiStateChangedEvent(msg.msgData); @@ -314,6 +316,8 @@ void WifiInternalEventDispatcher::DealStaCallbackMsg( void WifiInternalEventDispatcher::DealScanCallbackMsg( WifiInternalEventDispatcher &instance, const WifiEventCallbackMsg &msg) { + WIFI_LOGI("WifiInternalEventDispatcher:: Deal Scan Event Callback Msg: %{public}d", msg.msgCode); + switch (msg.msgCode) { case WIFI_CBK_MSG_SCAN_STATE_CHANGE: WifiCommonEventHelper::PublishScanStateChangedEvent(msg.msgData, "OnScanStateChanged"); @@ -418,6 +422,8 @@ void WifiInternalEventDispatcher::InvokeHotspotCallbacks(const WifiEventCallback void WifiInternalEventDispatcher::DealHotspotCallbackMsg( WifiInternalEventDispatcher &instance, const WifiEventCallbackMsg &msg) { + WIFI_LOGI("WifiInternalEventDispatcher:: Deal Hotspot Event Callback Msg: %{public}d", msg.msgCode); + auto callback = instance.GetSingleHotspotCallback(); if (callback != nullptr) { switch (msg.msgCode) { @@ -456,6 +462,7 @@ void WifiInternalEventDispatcher::SendP2pCallbackMsg(sptr &cal if (callback == nullptr) { return; } + switch (msg.msgCode) { case WIFI_CBK_MSG_P2P_STATE_CHANGE: callback->OnP2pStateChanged(msg.msgData); @@ -491,6 +498,8 @@ void WifiInternalEventDispatcher::SendP2pCallbackMsg(sptr &cal void WifiInternalEventDispatcher::DealP2pCallbackMsg( WifiInternalEventDispatcher &instance, const WifiEventCallbackMsg &msg) { + WIFI_LOGI("WifiInternalEventDispatcher:: Deal P2P Event Callback Msg: %{public}d", msg.msgCode); + auto callback = instance.GetSingleP2pCallback(); if (callback != nullptr) { SendP2pCallbackMsg(callback, msg); diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/BUILD.gn b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/BUILD.gn index be26697..e1dc0e9 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/BUILD.gn +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/BUILD.gn @@ -24,6 +24,7 @@ ohos_shared_library("wifi_p2p_service") { "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state.cpp", "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp", "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_broadcast_helper.cpp", + "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_service_utils.cpp", "authorizing_negotiation_request_state.cpp", "group_formed_state.cpp", "group_negotiation_state.cpp", diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.cpp index a04399a..f5d66c6 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "group_formed_state.h" #include "wifi_p2p_hal_interface.h" #include "p2p_state_machine.h" @@ -100,6 +101,7 @@ bool GroupFormedState::ProcessCmdConnect(const InternalMessage &msg) const p2pStateMachine.SwitchState(&p2pStateMachine.p2pInvitationRequestState); return EXECUTED; } + bool GroupFormedState::ProcessProvDiscEvt(const InternalMessage &msg) const { WifiP2pTempDiscEvent procDisc; @@ -142,6 +144,7 @@ bool GroupFormedState::ProcessGroupStartedEvt(const InternalMessage &msg) const WIFI_LOGI("recv CMD: %{public}d", msg.GetMessageName()); return EXECUTED; } + bool GroupFormedState::ProcessCmdDiscoverPeer(const InternalMessage &msg) const { WIFI_LOGI("recv CMD: %{public}d", msg.GetMessageName()); @@ -204,12 +207,11 @@ bool GroupFormedState::ProcessDisconnectEvt(const InternalMessage &msg) const } device.SetP2pDeviceStatus(P2pDeviceStatus::PDS_AVAILABLE); - - deviceManager.UpdateDeviceStatus(device); - groupManager.UpdateCurrGroupClient(device); - + deviceManager.UpdateDeviceStatus(device); // used for peers change event querying device infos + groupManager.RemoveCurrGroupClient(device); p2pStateMachine.BroadcastP2pPeersChanged(); p2pStateMachine.BroadcastP2pConnectionChanged(); + deviceManager.RemoveDevice(device); return EXECUTED; } diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.h index aad1b16..e88daec 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #ifndef OHOS_P2P_GROUP_FORMED_STATE_H #define OHOS_P2P_GROUP_FORMED_STATE_H diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.cpp index bbe98ef..2d60278 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -129,6 +129,7 @@ bool GroupNegotiationState::ProcessGroupStartedEvt(InternalMessage &msg) const WIFI_LOGD("fail:No GO device information is found."); } } + SharedLinkManager::SetSharedLinkCount(SHARED_LINKE_COUNT_ON_CONNECTED); p2pStateMachine.ChangeConnectedStatus(P2pConnectedState::P2P_CONNECTED); p2pStateMachine.SwitchState(&p2pStateMachine.p2pGroupFormedState); return EXECUTED; diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/ip2p_service.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/ip2p_service.h index e7bd8f5..cec0674 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/ip2p_service.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/ip2p_service.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,12 +12,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #ifndef OHOS_IP2P_SERVICE_H #define OHOS_IP2P_SERVICE_H #include "wifi_errcode.h" #include "wifi_msg.h" #include "ip2p_service_callbacks.h" +#include "wifi_hid2d_msg.h" namespace OHOS { namespace Wifi { @@ -216,6 +218,23 @@ public: * @return ErrCode - operate result */ virtual ErrCode SetP2pWfdInfo(const WifiP2pWfdInfo &wfdInfo) = 0; + + /** + * @Description Create hid2d group, used on the GO side. + * + * @param frequency - frequency + * @param type - frequency type + * @return ErrCode - operate result + */ + virtual ErrCode Hid2dCreateGroup(const int frequency, FreqType type) = 0; + + /** + * @Description Connect to a specified group using hid2d, used on the GC side. + * + * @param config - connection parameters + * @return ErrCode - operate result + */ + virtual ErrCode Hid2dConnect(const Hid2dConnectConfig& config) = 0; }; } // namespace Wifi } // namespace OHOS diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_define.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_define.h index fc46384..e56b8a7 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_define.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_define.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #ifndef OHOS_WIFI_P2P_DEFINE_H #define OHOS_WIFI_P2P_DEFINE_H @@ -107,6 +108,8 @@ enum class P2P_STATE_MACHINE_CMD { CMD_SET_DEVICE_NAME, /* set device name */ CMD_SET_WFD_INFO, /* set wifi-display info */ CMD_CANCEL_CONNECT, /* cancel connect */ + CMD_HID2D_CREATE_GROUP, /* hid2d create group */ + CMD_HID2D_CONNECT, /* monitor to state machine */ WPA_CONNECTED_EVENT = 100, // result of connect diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabled_state.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabled_state.cpp index b01290f..5b0f6ee 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabled_state.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabled_state.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "p2p_enabled_state.h" #include #include "wifi_logger.h" @@ -48,6 +49,7 @@ void P2pEnabledState::GoInState() static_cast(P2P_STATE_MACHINE_CMD::CMD_START_LISTEN), defaultPeriodTime, defaultIntervalTime); } } else { + WIFI_LOGE("P2pSettingsInitialization Failed, Start Disable P2P!"); p2pStateMachine.SendMessage(static_cast(P2P_STATE_MACHINE_CMD::CMD_P2P_DISABLE)); } } @@ -101,7 +103,7 @@ void P2pEnabledState::Init() } bool P2pEnabledState::ProcessCmdDisable(InternalMessage &msg) const { - WIFI_LOGI("recv CMD: %{public}d", msg.GetMessageName()); + WIFI_LOGI("P2P ProcessCmdDisable recv CMD: %{public}d", msg.GetMessageName()); p2pStateMachine.BroadcastP2pStatusChanged(P2pState::P2P_STATE_CLOSING); WifiP2PHalInterface::GetInstance().P2pStopFind(); p2pStateMachine.BroadcastP2pDiscoveryChanged(false); @@ -137,7 +139,7 @@ bool P2pEnabledState::ProcessCmdStartListen(InternalMessage &msg) const } bool P2pEnabledState::ProcessCmdStopListen(InternalMessage &msg) const { - WIFI_LOGI("recv CMD: %{public}d", msg.GetMessageName()); + WIFI_LOGI("P2P ProcessCmdStopListen recv CMD: %{public}d", msg.GetMessageName()); if (WifiP2PHalInterface::GetInstance().P2pConfigureListen(false, 0, 0)) { WIFI_LOGE("p2p configure to stop listen failed."); p2pStateMachine.BroadcastActionResult(P2pActionCallback::StopP2pListen, WIFI_OPT_FAILED); @@ -153,13 +155,13 @@ bool P2pEnabledState::ProcessCmdStopListen(InternalMessage &msg) const } bool P2pEnabledState::ProcessCmdDiscPeer(InternalMessage &msg) const { - WIFI_LOGI("recv CMD: %{public}d", msg.GetMessageName()); + WIFI_LOGI("P2P ProcessCmdDiscPeer recv CMD: %{public}d", msg.GetMessageName()); p2pStateMachine.HandlerDiscoverPeers(); return EXECUTED; } bool P2pEnabledState::ProcessCmdStopDiscPeer(InternalMessage &msg) const { - WIFI_LOGI("recv CMD: %{public}d", msg.GetMessageName()); + WIFI_LOGI("P2P ProcessCmdStopDiscPeer recv CMD: %{public}d", msg.GetMessageName()); WifiErrorNo retCode = WifiP2PHalInterface::GetInstance().P2pStopFind(); if (retCode == WifiErrorNo::WIFI_IDL_OPT_OK) { p2pStateMachine.BroadcastActionResult(P2pActionCallback::StopDiscoverDevices, ErrCode::WIFI_OPT_SUCCESS); @@ -207,7 +209,7 @@ bool P2pEnabledState::ProcessDeviceLostEvt(InternalMessage &msg) const } bool P2pEnabledState::ProcessFindStoppedEvt(InternalMessage &msg) const { - WIFI_LOGI("recv event: %{public}d", msg.GetMessageName()); + WIFI_LOGI("P2P ProcessFindStoppedEvt recv event: %{public}d", msg.GetMessageName()); p2pStateMachine.BroadcastP2pDiscoveryChanged(false); return EXECUTED; } @@ -255,10 +257,15 @@ bool P2pEnabledState::P2pConfigInitialization() WIFI_LOGE("Failed to set the SSID prefix"); } - retCode = WifiP2PHalInterface::GetInstance().SetP2pDeviceType(deviceManager.GetThisDevice().GetPrimaryDeviceType()); - if (retCode == WifiErrorNo::WIFI_IDL_OPT_FAILED) { - WIFI_LOGE("Failed to set the device type."); - result = false; + std::string primaryDeviceType = deviceManager.GetThisDevice().GetPrimaryDeviceType(); + if (!primaryDeviceType.empty()) { + retCode = WifiP2PHalInterface::GetInstance().SetP2pDeviceType(primaryDeviceType); + if (retCode == WifiErrorNo::WIFI_IDL_OPT_FAILED) { + WIFI_LOGE("Failed to set the device type."); + result = false; + } + } else { + WIFI_LOGE("Primary device type is empty!!!"); } std::string secDeviceType = deviceManager.GetThisDevice().GetSecondaryDeviceType(); @@ -290,15 +297,15 @@ bool P2pEnabledState::P2pConfigInitialization() } deviceManager.GetThisDevice().SetDeviceAddress(deviceAddr); - p2pStateMachine.UpdateGroupInfoToWpa(); return result; } bool P2pEnabledState::P2pSettingsInitialization() { - bool result = P2pConfigInitialization(); + WIFI_LOGI("Start P2pSettingsInitialization"); + bool result = P2pConfigInitialization(); p2pStateMachine.UpdateOwnDevice(P2pDeviceStatus::PDS_AVAILABLE); WifiErrorNo retCode = WifiP2PHalInterface::GetInstance().P2pFlush(); @@ -327,9 +334,7 @@ bool P2pEnabledState::P2pSettingsInitialization() result = false; } groupManager.UpdateGroupsNetwork(wpaGroups); - p2pStateMachine.UpdatePersistentGroups(); - return result; } @@ -375,7 +380,7 @@ bool P2pEnabledState::ProcessCmdDelLocalService(InternalMessage &msg) const bool P2pEnabledState::ProcessCmdDiscServices(InternalMessage &msg) const { - WIFI_LOGI("recv CMD: %{public}d", msg.GetMessageName()); + WIFI_LOGI("P2P ProcessCmdDiscServices recv CMD: %{public}d", msg.GetMessageName()); p2pStateMachine.CancelSupplicantSrvDiscReq(); std::string reqId; WifiP2pServiceRequest request; @@ -408,7 +413,7 @@ bool P2pEnabledState::ProcessCmdDiscServices(InternalMessage &msg) const bool P2pEnabledState::ProcessCmdStopDiscServices(InternalMessage &msg) const { - WIFI_LOGI("recv CMD: %{public}d", msg.GetMessageName()); + WIFI_LOGI("P2P ProcessCmdStopDiscServices recv CMD: %{public}d", msg.GetMessageName()); WifiErrorNo retCode = WifiP2PHalInterface::GetInstance().P2pStopFind(); if (retCode == WifiErrorNo::WIFI_IDL_OPT_OK) { p2pStateMachine.BroadcastActionResult(P2pActionCallback::StopDiscoverServices, ErrCode::WIFI_OPT_SUCCESS); @@ -544,7 +549,7 @@ bool P2pEnabledState::ProcessCmdSetDeviceName(InternalMessage &msg) const } bool P2pEnabledState::ProcessCmdSetWfdInfo(InternalMessage &msg) const { - WIFI_LOGI("recv CMD: %{public}d", msg.GetMessageName()); + WIFI_LOGI("P2P ProcessCmdSetWfdInfo recv CMD: %{public}d", msg.GetMessageName()); WifiP2pWfdInfo wfdInfo; if (!msg.GetMessageObj(wfdInfo)) { WIFI_LOGE("Failed to obtain wfd information."); @@ -567,7 +572,7 @@ bool P2pEnabledState::ProcessCmdSetWfdInfo(InternalMessage &msg) const bool P2pEnabledState::ProcessCmdCancelConnect(InternalMessage &msg) const { - WIFI_LOGI("recv CMD: %{public}d", msg.GetMessageName()); + WIFI_LOGI("P2P ProcessCmdCancelConnect recv CMD: %{public}d", msg.GetMessageName()); p2pStateMachine.BroadcastActionResult(P2pActionCallback::P2pDisConnect, ErrCode::WIFI_OPT_FAILED); return EXECUTED; } diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.cpp index 7feea73..b45f971 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "p2p_group_operating_state.h" #include "wifi_p2p_hal_interface.h" #include "p2p_state_machine.h" @@ -29,6 +30,7 @@ P2pGroupOperatingState::P2pGroupOperatingState(P2pStateMachine &stateMachine, Wi groupManager(groupMgr), deviceManager(deviceMgr) {} + void P2pGroupOperatingState::GoInState() { WIFI_LOGI(" GoInState"); @@ -56,6 +58,8 @@ void P2pGroupOperatingState::Init() std::make_pair(P2P_STATE_MACHINE_CMD::CMD_REMOVE_GROUP, &P2pGroupOperatingState::ProcessCmdRemoveGroup)); mProcessFunMap.insert( std::make_pair(P2P_STATE_MACHINE_CMD::CMD_DELETE_GROUP, &P2pGroupOperatingState::ProcessCmdDeleteGroup)); + mProcessFunMap.insert(std::make_pair(P2P_STATE_MACHINE_CMD::CMD_HID2D_CREATE_GROUP, + &P2pGroupOperatingState::ProcessCmdHid2dCreateGroup)); } bool P2pGroupOperatingState::ProcessCmdCreateGroup(const InternalMessage &msg) const @@ -108,6 +112,7 @@ bool P2pGroupOperatingState::ProcessCmdCreateGroup(const InternalMessage &msg) c } return EXECUTED; } + bool P2pGroupOperatingState::ProcessGroupStartedEvt(const InternalMessage &msg) const { p2pStateMachine.StopTimer(static_cast(P2P_STATE_MACHINE_CMD::CREATE_GROUP_TIMED_OUT)); @@ -155,6 +160,7 @@ bool P2pGroupOperatingState::ProcessGroupStartedEvt(const InternalMessage &msg) } else { p2pStateMachine.StartDhcpClient(); } + SharedLinkManager::SetSharedLinkCount(SHARED_LINKE_COUNT_ON_CONNECTED); p2pStateMachine.ChangeConnectedStatus(P2pConnectedState::P2P_CONNECTED); p2pStateMachine.SwitchState(&p2pStateMachine.p2pGroupFormedState); return EXECUTED; @@ -166,6 +172,7 @@ bool P2pGroupOperatingState::ProcessCreateGroupTimeOut(const InternalMessage &ms p2pStateMachine.SwitchState(&p2pStateMachine.p2pIdleState); return EXECUTED; } + bool P2pGroupOperatingState::ProcessGroupRemovedEvt(const InternalMessage &msg) const { WIFI_LOGI("recv event: %{public}d", msg.GetMessageName()); @@ -190,10 +197,12 @@ bool P2pGroupOperatingState::ProcessGroupRemovedEvt(const InternalMessage &msg) } WifiP2pGroupInfo invalidGroup; groupManager.SetCurrentGroup(invalidGroup); + SharedLinkManager::SetSharedLinkCount(SHARED_LINKE_COUNT_ON_DISCONNECTED); p2pStateMachine.ChangeConnectedStatus(P2pConnectedState::P2P_DISCONNECTED); p2pStateMachine.SwitchState(&p2pStateMachine.p2pIdleState); return EXECUTED; } + bool P2pGroupOperatingState::ProcessCmdDisable(const InternalMessage &msg) const { /** @@ -202,6 +211,7 @@ bool P2pGroupOperatingState::ProcessCmdDisable(const InternalMessage &msg) const p2pStateMachine.DelayMessage(&msg); return ProcessCmdRemoveGroup(msg); } + bool P2pGroupOperatingState::ProcessCmdRemoveGroup(const InternalMessage &msg) const { /** @@ -248,6 +258,7 @@ bool P2pGroupOperatingState::ProcessCmdRemoveGroup(const InternalMessage &msg) c } return EXECUTED; } + bool P2pGroupOperatingState::ProcessCmdDeleteGroup(const InternalMessage &msg) const { /** @@ -285,6 +296,27 @@ bool P2pGroupOperatingState::ProcessCmdDeleteGroup(const InternalMessage &msg) c return EXECUTED; } +bool P2pGroupOperatingState::ProcessCmdHid2dCreateGroup(const InternalMessage &msg) const +{ + WifiErrorNo ret = WIFI_IDL_OPT_FAILED; + int freq = 0; + msg.GetMessageObj(freq); + WIFI_LOGI("Create a hid2d group, frequency: %{public}d.", freq); + ret = WifiP2PHalInterface::GetInstance().GroupAdd(true, PERSISTENT_NET_ID, freq); + if (WifiErrorNo::WIFI_IDL_OPT_FAILED == ret) { + WIFI_LOGE("p2p configure to CreateGroup failed."); + p2pStateMachine.BroadcastActionResult(P2pActionCallback::CreateHid2dGroup, WIFI_OPT_FAILED); + p2pStateMachine.SwitchState(&p2pStateMachine.p2pIdleState); + } else { + const int cgTimedOut = 5000; + WIFI_LOGI("p2p configure hid2d group successful."); + p2pStateMachine.MessageExecutedLater( + static_cast(P2P_STATE_MACHINE_CMD::CREATE_GROUP_TIMED_OUT), cgTimedOut); + p2pStateMachine.BroadcastActionResult(P2pActionCallback::CreateHid2dGroup, WIFI_OPT_SUCCESS); + } + return EXECUTED; +} + bool P2pGroupOperatingState::ExecuteStateMsg(InternalMessage *msg) { if (msg == nullptr) { diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.h index 53fac3c..1a7dceb 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #ifndef OHOS_P2P_GROUP_OPERATING_STATE_H #define OHOS_P2P_GROUP_OPERATING_STATE_H @@ -120,6 +121,13 @@ private: */ virtual bool ProcessCmdDeleteGroup(const InternalMessage &msg) const; + /** + * @Description Process the hid2d create group command received by the state machine + * @param msg - Message body sent by the state machine + * @return - bool true:handle false:not handle + */ + virtual bool ProcessCmdHid2dCreateGroup(const InternalMessage &msg) const; + private: using ProcessFun = bool (P2pGroupOperatingState::*)(const InternalMessage &msg) const; std::map mProcessFunMap; diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.cpp index 37abb4c..ab68904 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "p2p_idle_state.h" #include "wifi_p2p_hal_interface.h" #include "p2p_state_machine.h" @@ -64,6 +65,10 @@ void P2pIdleState::Init() std::make_pair(P2P_STATE_MACHINE_CMD::P2P_EVENT_GROUP_STARTED, &P2pIdleState::ProcessGroupStartedEvt)); mProcessFunMap.insert(std::make_pair( P2P_STATE_MACHINE_CMD::P2P_EVENT_INVITATION_RECEIVED, &P2pIdleState::ProcessInvitationReceivedEvt)); + mProcessFunMap.insert(std::make_pair(P2P_STATE_MACHINE_CMD::CMD_HID2D_CREATE_GROUP, + &P2pIdleState::ProcessCmdHid2dCreateGroup)); + mProcessFunMap.insert( + std::make_pair(P2P_STATE_MACHINE_CMD::CMD_HID2D_CONNECT, &P2pIdleState::ProcessCmdHid2dConnect)); } bool P2pIdleState::ProcessCmdStopDiscPeer(InternalMessage &msg) const @@ -131,6 +136,23 @@ bool P2pIdleState::ProcessCmdConnect(InternalMessage &msg) const return EXECUTED; } +bool P2pIdleState::ProcessCmdHid2dConnect(InternalMessage &msg) const +{ + WIFI_LOGI("Idle state hid2d connect recv CMD: %{public}d", msg.GetMessageName()); + + Hid2dConnectConfig config; + if (!msg.GetMessageObj(config)) { + WIFI_LOGE("Hid2d connect:Failed to obtain config info."); + return EXECUTED; + } + if (WifiErrorNo::WIFI_IDL_OPT_OK != + WifiP2PHalInterface::GetInstance().Hid2dConnect(config)) { + WIFI_LOGE("Hid2d Connection failed."); + p2pStateMachine.BroadcastActionResult(P2pActionCallback::Hid2dConnect, ErrCode::WIFI_OPT_FAILED); + } + return EXECUTED; +} + bool P2pIdleState::ProcessProvDiscPbcReqEvt(InternalMessage &msg) const { WIFI_LOGI("recv CMD: %{public}d", msg.GetMessageName()); @@ -246,6 +268,7 @@ bool P2pIdleState::ProcessGroupStartedEvt(InternalMessage &msg) const return EXECUTED; } } + SharedLinkManager::SetSharedLinkCount(SHARED_LINKE_COUNT_ON_CONNECTED); p2pStateMachine.ChangeConnectedStatus(P2pConnectedState::P2P_CONNECTED); p2pStateMachine.SwitchState(&p2pStateMachine.p2pGroupFormedState); return EXECUTED; @@ -310,6 +333,13 @@ bool P2pIdleState::ProcessInvitationReceivedEvt(InternalMessage &msg) const return EXECUTED; } +bool P2pIdleState::ProcessCmdHid2dCreateGroup(InternalMessage &msg) const +{ + p2pStateMachine.DelayMessage(&msg); + p2pStateMachine.SwitchState(&p2pStateMachine.p2pGroupOperatingState); + return EXECUTED; +} + bool P2pIdleState::ExecuteStateMsg(InternalMessage *msg) { if (msg == nullptr) { diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.h index cb5494c..4edde5c 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #ifndef OHOS_P2P_IDLE_STATE_H #define OHOS_P2P_IDLE_STATE_H @@ -147,6 +148,20 @@ private: */ virtual bool ProcessInvitationReceivedEvt(InternalMessage &msg) const; + /** + * @Description Process the hid2d create group command received by the state machine + * @param msg - Message body sent by the state machine + * @return - bool true:handle false:not handle + */ + virtual bool ProcessCmdHid2dCreateGroup(InternalMessage &msg) const; + + /** + * @Description Process the hid2d connect command received by the state machine + * @param msg - Message body sent by the state machine + * @return - bool true:handle false:not handle + */ + virtual bool ProcessCmdHid2dConnect(InternalMessage &msg) const; + private: using ProcessFun = bool (P2pIdleState::*)(InternalMessage &msg) const; std::map mProcessFunMap; diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_interface.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_interface.cpp index c06e3bd..f356b0f 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_interface.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_interface.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "p2p_interface.h" #include "wifi_internal_msg.h" #include "wifi_logger.h" @@ -194,5 +195,15 @@ ErrCode P2pInterface::RegisterP2pServiceCallbacks(const IP2pServiceCallbacks &ca { return p2pService.RegisterP2pServiceCallbacks(callbacks); } + +ErrCode P2pInterface::Hid2dCreateGroup(const int frequency, FreqType type) +{ + return p2pService.Hid2dCreateGroup(frequency, type); +} + +ErrCode P2pInterface::Hid2dConnect(const Hid2dConnectConfig& config) +{ + return p2pService.Hid2dConnect(config); +} } // namespace Wifi } // namespace OHOS diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_interface.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_interface.h index 4bb2fc3..08f97b0 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_interface.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_interface.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #ifndef OHOS_P2P_INTERFACE_H #define OHOS_P2P_INTERFACE_H @@ -45,6 +46,7 @@ public: * @Description Construct a new P2pInterface object. */ P2pInterface(); + /** * @Description Destroy the P2pInterface object. */ @@ -56,37 +58,44 @@ public: * @return - ErrCode */ virtual ErrCode EnableP2p() override; + /** * @Description - Disable the P2P mode. * @return - ErrCode */ virtual ErrCode DisableP2p() override; + /** * @Description - Start P2P device discovery. * @return - ErrCode */ virtual ErrCode DiscoverDevices() override; + /** * @Description - Stop P2P device discovery. * @return - ErrCode */ virtual ErrCode StopDiscoverDevices() override; + /** * @Description - Start P2P services discovery. * @return - ErrCode */ virtual ErrCode DiscoverServices() override; + /** * @Description - Stop P2P services discovery. * @return - ErrCode */ virtual ErrCode StopDiscoverServices() override; + /** * @Description - Register local P2P service. * @param srvInfo - local service information * @return - ErrCode */ virtual ErrCode PutLocalP2pService(const WifiP2pServiceInfo &srvInfo) override; + /** * @Description - Delete local P2P service. * @param srvInfo - local service information @@ -109,39 +118,46 @@ public: * @return - ErrCode */ virtual ErrCode StartP2pListen(int period, int interval) override; + /** * @Description - Stop the P2P listening. * @return - ErrCode */ virtual ErrCode StopP2pListen() override; + /** * @Description - Create a P2P group. * @param config - config for creating group * @return - ErrCode */ virtual ErrCode FormGroup(const WifiP2pConfig &config) override; + /** * @Description - Remove the current P2P group. * @return - ErrCode */ virtual ErrCode RemoveGroup() override; + /** * @Description - Delete a persistent group. * @param group - specified group * @return - ErrCode */ virtual ErrCode DeleteGroup(const WifiP2pGroupInfo &group) override; + /** * @Description - Connect to a P2P device. * @param config - config for connection * @return - ErrCode */ virtual ErrCode P2pConnect(const WifiP2pConfig &config) override; + /** * @Description - Disconnect. * @return - ErrCode */ virtual ErrCode P2pDisConnect() override; + /** * @Description - Set this device name. * @@ -149,7 +165,7 @@ public: * @return ErrCode */ virtual ErrCode SetP2pDeviceName(const std::string &devName) override; - + /** * @Description - Query P2P connection information. * @param linkedInfo - object that stores connection information @@ -170,48 +186,56 @@ public: * @return - ErrCode */ virtual ErrCode GetCurrentGroup(WifiP2pGroupInfo &group) override; + /** * @Description - Obtain the P2P status. * @param status - object that stores P2P status * @return - ErrCode */ virtual ErrCode GetP2pEnableStatus(int &status) override; + /** * @Description - Obtain the P2P discovery status. * @param status - object that stores discovery status * @return - ErrCode */ virtual ErrCode GetP2pDiscoverStatus(int &status) override; + /** * @Description - Obtain the P2P connection status. * @param status - object that stores connection status * @return - ErrCode */ virtual ErrCode GetP2pConnectedStatus(int &status) override; + /** * @Description - Query the information about the found devices. * @param devices - list of queryed device * @return - ErrCode */ virtual ErrCode QueryP2pDevices(std::vector &devices) override; + /** * @Description - Query the information about own device. * @param device - own device * @return - ErrCode */ virtual ErrCode QueryP2pLocalDevice(WifiP2pDevice &device) override; + /** * @Description - Obtain information about all groups. * @param groups - list of group information * @return - ErrCode */ virtual ErrCode QueryP2pGroups(std::vector &groups) override; + /** * @Description - Query the information about the found services. * @param services - list of service information * @return - ErrCode */ virtual ErrCode QueryP2pServices(std::vector &services) override; + /** * @Description - Register all callbacks provided by the P2P. * @param callbacks - all callbacks added @@ -219,8 +243,25 @@ public: */ virtual ErrCode RegisterP2pServiceCallbacks(const IP2pServiceCallbacks &callbacks) override; + /** + * @Description Create hid2d group, used on the GO side. + * + * @param frequency - frequency + * @param type - frequency type + * @return ErrCode - operate result + */ + virtual ErrCode Hid2dCreateGroup(const int frequency, FreqType type) override; + + /** + * @Description Connect to a specified group using hid2d, used on the GC side. + * + * @param config - connection parameters + * @return ErrCode - operate result + */ + virtual ErrCode Hid2dConnect(const Hid2dConnectConfig& config) override; + private: - WifiP2pGroupManager groupManager; /* group manager */ + WifiP2pGroupManager groupManager; /* group manager */ WifiP2pDeviceManager deviceMgr; /* device manager */ WifiP2pServiceManager svrMgr; diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_monitor.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_monitor.cpp index b409db5..0399bcd 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_monitor.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_monitor.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -101,7 +101,7 @@ void P2pMonitor::MessageToStateMachine( if (setMonitorIface.count(iface) > 0) { auto iter = mapHandler.find(iface); if (iter != mapHandler.end()) { - WIFI_LOGI("P2p Monitor event: iface [%{private}s], eventID [%{public}d]", + WIFI_LOGI("P2p Monitor event: iface [%{public}s], eventID [%{public}d]", iface.c_str(), static_cast(msgName)); const auto &handler = iter->second; diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp index fa30520..90d63ba 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "p2p_state_machine.h" #include @@ -30,6 +31,7 @@ DEFINE_WIFILOG_P2P_LABEL("P2pStateMachine"); namespace OHOS { namespace Wifi { +bool P2pStateMachine::m_isNeedDhcp = true; P2pStateMachine::P2pStateMachine(P2pMonitor &monitor, WifiP2pGroupManager &groupMgr, WifiP2pDeviceManager &setDeviceMgr, WifiP2pServiceManager &setSvrMgr, AuthorizingNegotiationRequestState &authorizingNegotiationRequestState, @@ -515,6 +517,7 @@ void P2pStateMachine::NotifyUserInvitationSentMessage(const std::string &pin, co dialog.SetButton("OK", event, nullptr); AbstractUI::GetInstance().ShowAlerDialog(dialog); } + void P2pStateMachine::NotifyUserProvDiscShowPinRequestMessage(const std::string &pin, const std::string &peerAddress) { WIFI_LOGI("P2pStateMachine::NotifyUserProvDiscShowPinRequestMessage enter"); @@ -534,6 +537,7 @@ void P2pStateMachine::NotifyUserProvDiscShowPinRequestMessage(const std::string dialog.SetButton("accepts", acceptEvent, nullptr); AbstractUI::GetInstance().ShowAlerDialog(dialog); } + void P2pStateMachine::NotifyUserInvitationReceivedMessage() { WIFI_LOGI("P2pStateMachine::NotifyUserInvitationReceivedMessage enter"); @@ -683,7 +687,7 @@ P2pStateMachine::DhcpResultNotify::~DhcpResultNotify() void P2pStateMachine::DhcpResultNotify::OnSuccess(int status, const std::string &ifname, DhcpResult &result) { - WIFI_LOGI("Enter DhcpResultNotify::OnSuccess, status: %{public}d, ifname: %{public}s", status, ifname.c_str()); + WIFI_LOGI("Enter P2P DhcpResultNotify::OnSuccess, status: %{public}d, ifname: %{public}s", status, ifname.c_str()); WifiP2pLinkedInfo p2pInfo; WifiSettings::GetInstance().GetP2pInfo(p2pInfo); WIFI_LOGI("Set GO IP: %{private}s", result.strServer.c_str()); @@ -707,12 +711,16 @@ void P2pStateMachine::DhcpResultNotify::OnFailed(int status, const std::string & void P2pStateMachine::DhcpResultNotify::OnSerExitNotify(const std::string& ifname) { - WIFI_LOGD("Dhcp exit notify.ifname:%{public}s.", ifname.c_str()); - pP2pStateMachine->SendMessage(static_cast(P2P_STATE_MACHINE_CMD::CMD_P2P_DISABLE)); + WIFI_LOGI("Dhcp exit notify.ifname:%{public}s!", ifname.c_str()); } void P2pStateMachine::StartDhcpClient() { + if (!GetIsNeedDhcp()) { + WIFI_LOGI("The service of this time does not need DHCP."); + return; + } + if (pDhcpService.get() == nullptr) { WIFI_LOGE("pDhcpService is nullptr, cannot start dhcp client."); return; @@ -902,5 +910,17 @@ void P2pStateMachine::UpdateGroupInfoToWpa() const } return; } + +bool P2pStateMachine::GetIsNeedDhcp() const +{ + WIFI_LOGI("Get need dhcp flag %{public}d", (int)m_isNeedDhcp); + return m_isNeedDhcp; +} + +void P2pStateMachine::SetIsNeedDhcp(bool isNeedDhcp) +{ + WIFI_LOGI("Set need dhcp flag %{public}d", (int)isNeedDhcp); + m_isNeedDhcp = isNeedDhcp; +} } // namespace Wifi } // namespace OHOS diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.h index 1a64433..fa601ca 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -40,6 +40,7 @@ #include "p2p_inviting_state.h" #include "provision_discovery_state.h" #include "abstract_ui.h" +#include "wifi_hid2d_service_utils.h" namespace OHOS { namespace Wifi { @@ -132,6 +133,12 @@ public: */ virtual void RegisterP2pServiceCallbacks(const IP2pServiceCallbacks &callback); + /** + * @Description - Set is need dhcp. + * @param isNeedDhcp - true: need, false: not need + */ + void SetIsNeedDhcp(bool isNeedDhcp); + private: /** * @Description Handle event of CMD_DEVICE_DISCOVERS @@ -273,6 +280,12 @@ private: */ virtual void UpdateGroupInfoToWpa() const; + /** + * @Description Get is need dhcp. + * + */ + bool GetIsNeedDhcp() const; + private: /** * @Description - Broadcast state change event. @@ -393,6 +406,7 @@ private: P2pIdleState &p2pIdleState; P2pInvitingState &p2pInvitingState; ProvisionDiscoveryState &p2pProvisionDiscoveryState; + static bool m_isNeedDhcp; }; } // namespace Wifi } // namespace OHOS diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_manager.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_manager.h index a26ddd5..8e7de10 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_manager.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_manager.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #ifndef OHOS_P2P_GROUP_MANAGER_H #define OHOS_P2P_GROUP_MANAGER_H @@ -34,34 +35,40 @@ public: * @return None */ WifiP2pGroupManager(); + /** * @Description Destroy the WifiP2pGroupManager object. * @param None * @return None */ virtual ~WifiP2pGroupManager() = default; + /** * @Description - Reads the stored group information during initialization. * @param None * @return None */ virtual void Initialize(); + /** * @Description - Stores and serializes the current group information. */ virtual void StashGroups(); + /** * @Description - Adding a P2P group. * @param group - P2P group to be added * @return true: adding succeeded false: adding failed */ virtual bool AddGroup(const WifiP2pGroupInfo &group); + /** * @Description - Remove a P2P group. * @param group - P2P group to be removed * @return true: delete successfully false: delete failed */ virtual bool RemoveGroup(const WifiP2pGroupInfo &group); + /** * @Description - Clear all P2P groups. * @param None @@ -83,6 +90,7 @@ public: * @return - int number of clients in the group */ virtual int RemoveClientFromGroup(int networkId, const std::string &deviceAddress); + /** * @Description - Obtaining all groups. * @param None @@ -96,12 +104,14 @@ public: * @return - int -1:not found >=0：network ID of the corresponding group */ virtual int GetNetworkIdFromClients(const WifiP2pDevice &device); + /** * @Description Get the network id of the group owner profile with the specified p2p device address. * @param device - P2P devices to be matched * @return int -1: not found >=0: network ID of the P2P device */ virtual int GetGroupNetworkId(const WifiP2pDevice &device); + /** * @Description Get the network id of the group owner profile with the specified p2p device address and the ssid. @@ -110,30 +120,35 @@ public: * @return int -1: not found >=0: network ID of the P2P device */ virtual int GetGroupNetworkId(const WifiP2pDevice &device, const std::string &ssid); + /** * @Description Get the group owner mac address with the specified networkId. * @param netId - specifies the network ID of the group * @return std::string not null: MAC address of the group owner null: not found */ virtual std::string GetGroupOwnerAddr(int netId); + /** * @Description Specifies whether the group with networkId is included in the group list. * @param netId - specifies the network ID of a group * @return true:contains false:not contains */ virtual bool IsInclude(int netId); + /** * @Description Store P2P group connection information. * * @param linkedInfo - group connection information */ virtual void SaveP2pInfo(const WifiP2pLinkedInfo &linkedInfo); + /** * @Description Get P2P group connection information. * * @return const WifiP2pLinkedInfo& group connection information */ virtual const WifiP2pLinkedInfo &GetP2pInfo() const; + /** * @Description Obtain the group information from the WPA, match and update the network ID. * @@ -150,20 +165,29 @@ public: { currentGroup.AddClientDevice(device); } + + inline void RemoveCurrGroupClient(const WifiP2pDevice &device) + { + currentGroup.RemoveClientDevice(device); + } + inline void SetCurrentGroup(const WifiP2pGroupInfo &group) { currentGroup = group; RefreshCurrentGroupFromGroups(); } + inline const WifiP2pGroupInfoProxy &GetCurrentGroup() const { return currentGroup; } + private: /** * @Description - Synchronize from the current group to all registry groups. */ void RefreshGroupsFromCurrentGroup(); + /** * @Description - From all record groups, update to the current group in use. */ diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service.cpp index fc001c2..dbd58c9 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "wifi_p2p_service.h" #include "wifi_settings.h" #include "wifi_errcode.h" @@ -70,12 +71,14 @@ ErrCode WifiP2pService::DiscoverServices() p2pStateMachine.SendMessage(static_cast(P2P_STATE_MACHINE_CMD::CMD_DISCOVER_SERVICES)); return ErrCode::WIFI_OPT_SUCCESS; } + ErrCode WifiP2pService::StopDiscoverServices() { WIFI_LOGI("StopDiscoverServices"); p2pStateMachine.SendMessage(static_cast(P2P_STATE_MACHINE_CMD::CMD_STOP_DISCOVER_SERVICES)); return ErrCode::WIFI_OPT_SUCCESS; } + ErrCode WifiP2pService::PutLocalP2pService(const WifiP2pServiceInfo &srvInfo) { WIFI_LOGI("PutLocalP2pService"); @@ -83,6 +86,7 @@ ErrCode WifiP2pService::PutLocalP2pService(const WifiP2pServiceInfo &srvInfo) p2pStateMachine.SendMessage(static_cast(P2P_STATE_MACHINE_CMD::CMD_PUT_LOCAL_SERVICE), info); return ErrCode::WIFI_OPT_SUCCESS; } + ErrCode WifiP2pService::DeleteLocalP2pService(const WifiP2pServiceInfo &srvInfo) { WIFI_LOGI("DeleteLocalP2pService"); @@ -112,6 +116,7 @@ ErrCode WifiP2pService::StopP2pListen() p2pStateMachine.SendMessage(static_cast(P2P_STATE_MACHINE_CMD::CMD_STOP_LISTEN)); return ErrCode::WIFI_OPT_SUCCESS; } + ErrCode WifiP2pService::FormGroup(const WifiP2pConfig &config) { WIFI_LOGI("FormGroup"); @@ -146,6 +151,7 @@ ErrCode WifiP2pService::P2pConnect(const WifiP2pConfig &config) WpsInfo wps; wps.SetWpsMethod(WpsMethod::WPS_METHOD_PBC); configInternal.SetWpsInfo(wps); + p2pStateMachine.SetIsNeedDhcp(true); const std::any info = configInternal; p2pStateMachine.SendMessage(static_cast(P2P_STATE_MACHINE_CMD::CMD_CONNECT), info); @@ -174,6 +180,7 @@ ErrCode WifiP2pService::SetP2pWfdInfo(const WifiP2pWfdInfo &wfdInfo) p2pStateMachine.SendMessage(static_cast(P2P_STATE_MACHINE_CMD::CMD_SET_WFD_INFO), wfdInfo); return ErrCode::WIFI_OPT_SUCCESS; } + ErrCode WifiP2pService::QueryP2pLinkedInfo(WifiP2pLinkedInfo &linkedInfo) { WIFI_LOGI("QueryP2pLinkedInfo"); @@ -257,5 +264,28 @@ void WifiP2pService::UnRegisterP2pServiceCallbacks() IP2pServiceCallbacks callbacks = {}; RegisterP2pServiceCallbacks(callbacks); } + +ErrCode WifiP2pService::Hid2dCreateGroup(const int frequency, FreqType type) +{ + WIFI_LOGI("Create hid2d group"); + const std::any info = frequency; + p2pStateMachine.SendMessage(static_cast(P2P_STATE_MACHINE_CMD::CMD_HID2D_CREATE_GROUP), info); + return ErrCode::WIFI_OPT_SUCCESS; +} + +ErrCode WifiP2pService::Hid2dConnect(const Hid2dConnectConfig& config) +{ + WIFI_LOGI("Hid2dConnect"); + + bool isNeedDhcp = true; + if (config.GetDhcpMode() == DhcpMode::CONNECT_GO_NODHCP || + config.GetDhcpMode() == DhcpMode::CONNECT_AP_NODHCP) { + isNeedDhcp = false; + } + p2pStateMachine.SetIsNeedDhcp(isNeedDhcp); + const std::any info = config; + p2pStateMachine.SendMessage(static_cast(P2P_STATE_MACHINE_CMD::CMD_HID2D_CONNECT), info); + return ErrCode::WIFI_OPT_SUCCESS; +} } // namespace Wifi } // namespace OHOS diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service.h index 0d159f8..14517fc 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #ifndef OHOS_P2P_SERVICE_H #define OHOS_P2P_SERVICE_H @@ -202,6 +203,23 @@ public: */ virtual ErrCode SetP2pWfdInfo(const WifiP2pWfdInfo &wfdInfo) override; + /** + * @Description Create hid2d group, used on the GO side. + * + * @param frequency - frequency + * @param type - frequency type + * @return ErrCode - operate result + */ + virtual ErrCode Hid2dCreateGroup(const int frequency, FreqType type) override; + + /** + * @Description Connect to a specified group using hid2d, used on the GC side. + * + * @param config - connection parameters + * @return ErrCode - operate result + */ + virtual ErrCode Hid2dConnect(const Hid2dConnectConfig& config) override; + private: /** * @Description - P2P state machine deregistration event callback. diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp index 0106c92..3150b12 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "wifi_p2p_service_impl.h" #include #include "wifi_permission_utils.h" @@ -23,6 +24,9 @@ #include "wifi_logger.h" #include "define.h" #include "wifi_dumper.h" +#include "wifi_hid2d_service_utils.h" +#include "if_config.h" +#include "wifi_hid2d_cfg.h" DEFINE_WIFILOG_P2P_LABEL("WifiP2pServiceImpl"); @@ -642,6 +646,153 @@ ErrCode WifiP2pServiceImpl::SetP2pWfdInfo(const WifiP2pWfdInfo &wfdInfo) return pService->SetP2pWfdInfo(wfdInfo); } +ErrCode WifiP2pServiceImpl::Hid2dRequestGcIp(const std::string& gcMac, std::string& ipAddr) +{ + WIFI_LOGI("Hid2dRequestGcIp"); + + WifiP2pGroupInfo group; + ErrCode ret = GetCurrentGroup(group); + if (ret != WIFI_OPT_SUCCESS) { + WIFI_LOGI("Apply IP get current group failed!"); + } + + IpPool::InitIpPool(group.GetGoIpAddress()); + ipAddr = IpPool::GetIp(gcMac); + return WIFI_OPT_SUCCESS; +} + +ErrCode WifiP2pServiceImpl::Hid2dSharedlinkIncrease() +{ + WIFI_LOGI("Hid2dSharedlinkIncrease"); + int status = static_cast(P2pConnectedState::P2P_DISCONNECTED); + ErrCode ret = GetP2pConnectedStatus(status); + if (ret != WIFI_OPT_SUCCESS) { + WIFI_LOGI("Hid2dSharedlinkIncrease get P2P connect status error!"); + return ret; + } + SharedLinkManager::IncreaseSharedLink(); + return WIFI_OPT_SUCCESS; +} + +ErrCode WifiP2pServiceImpl::Hid2dSharedlinkDecrease() +{ + WIFI_LOGI("Hid2dSharedlinkDecrease"); + SharedLinkManager::DecreaseSharedLink(); + if (SharedLinkManager::GetSharedLinkCount() == 0) { + WIFI_LOGI("Shared link count == 0, remove group!"); + RemoveGroup(); + } + return WIFI_OPT_SUCCESS; +} + +ErrCode WifiP2pServiceImpl::Hid2dCreateGroup(const int frequency, FreqType type) +{ + WIFI_LOGI("Hid2dCreateGroup"); + if (WifiPermissionUtils::VerifyGetWifiDirectDevicePermission() == PERMISSION_DENIED) { + WIFI_LOGE("FormGroup:VerifyGetWifiDirectDevicePermission PERMISSION_DENIED!"); + return WIFI_OPT_PERMISSION_DENIED; + } + + if (!IsP2pServiceRunning()) { + WIFI_LOGE("P2pService is not runing!"); + return WIFI_OPT_P2P_NOT_OPENED; + } + + IP2pService *pService = WifiServiceManager::GetInstance().GetP2pServiceInst(); + if (pService == nullptr) { + WIFI_LOGE("Get P2P service failed!"); + return WIFI_OPT_P2P_NOT_OPENED; + } + return pService->Hid2dCreateGroup(frequency, type); +} + +ErrCode WifiP2pServiceImpl::Hid2dRemoveGcGroup(const std::string& gcIfName) +{ + WIFI_LOGI("Hid2dRemoveGcGroup:, gcIfName: %{public}s", gcIfName.c_str()); + // TO Imple: delete by interface + return RemoveGroup(); +} + +ErrCode WifiP2pServiceImpl::Hid2dConnect(const Hid2dConnectConfig& config) +{ + WIFI_LOGI("Hid2dConnect"); + if (WifiPermissionUtils::VerifyGetWifiDirectDevicePermission() == PERMISSION_DENIED) { + WIFI_LOGE("Hid2dConnect:VerifyGetWifiDirectDevicePermission PERMISSION_DENIED!"); + return WIFI_OPT_PERMISSION_DENIED; + } + + if (!IsP2pServiceRunning()) { + WIFI_LOGE("P2pService is not runing!"); + return WIFI_OPT_P2P_NOT_OPENED; + } + + IP2pService *pService = WifiServiceManager::GetInstance().GetP2pServiceInst(); + if (pService == nullptr) { + WIFI_LOGE("Get P2P service failed!"); + return WIFI_OPT_P2P_NOT_OPENED; + } + return pService->Hid2dConnect(config); +} + +ErrCode WifiP2pServiceImpl::Hid2dConfigIPAddr(const std::string& ifName, const IpAddrInfo& ipInfo) +{ + WIFI_LOGI("Hid2dConfigIPAddr, ifName: %{public}s", ifName.c_str()); + IfConfig::GetInstance().AddIpAddr(ifName, ipInfo.ip, ipInfo.netmask, IpType::IPTYPE_IPV4); + return WIFI_OPT_SUCCESS; +} + +ErrCode WifiP2pServiceImpl::Hid2dReleaseIPAddr(const std::string& ifName) +{ + WIFI_LOGI("Hid2dReleaseIPAddr"); + IfConfig::GetInstance().FlushIpAddr(ifName, IpType::IPTYPE_IPV4); + return WIFI_OPT_SUCCESS; +} + +ErrCode WifiP2pServiceImpl::Hid2dGetRecommendChannel(const RecommendChannelRequest& request, + RecommendChannelResponse& response) +{ + WIFI_LOGI("Hid2dGetRecommendChannel"); + + /* + * channel: 36, 40, 44, 48, 52, 56, 60, 64, 149, 153, 157, 161, 165 + * center frequency: 5180, 5200, 5220, 5240, 5260, 5280, 5300, 5320, 5745, 5765, 5785, 5805, 5825 + */ + constexpr int defaultRecommendFrequency = 5180; + response.status = RecommendStatus::RS_SUCCESS; + response.centerFreq2 = defaultRecommendFrequency; + return WIFI_OPT_SUCCESS; +} + +ErrCode WifiP2pServiceImpl::Hid2dGetChannelListFor5G(std::vector& vecChannelList) +{ + WIFI_LOGI("Hid2dGetChannelListFor5G"); + + std::vector temp5Glist = {36, 40, 44, 48, 52, 56, 60, 64, 149, 153, 157, 161, 165}; + vecChannelList.clear(); + std::swap(temp5Glist, vecChannelList); + return WIFI_OPT_SUCCESS; +} + +ErrCode WifiP2pServiceImpl::Hid2dGetSelfWifiCfgInfo(SelfCfgType cfgType, + char cfgData[CFG_DATA_MAX_BYTES], int* getDatValidLen) +{ + WIFI_LOGI("Hid2dGetSelfWifiCfgInfo"); + WifiHid2dCfg::GetInstance().GetSelfDeviceCfg(cfgType, cfgData, *getDatValidLen); + return (*getDatValidLen == 0) ? WIFI_OPT_FAILED : WIFI_OPT_SUCCESS; +} + +ErrCode WifiP2pServiceImpl::Hid2dSetPeerWifiCfgInfo(PeerCfgType cfgType, + char cfgData[CFG_DATA_MAX_BYTES], int setDataValidLen) +{ + WIFI_LOGI("Hid2dSetPeerWifiCfgInfo"); + int ret = WifiHid2dCfg::GetInstance().Hid2dSetPeerWifiCfgInfo(cfgType, cfgData, setDataValidLen); + if (ret != 0) { + WIFI_LOGE("set peer wifi cfg info failed: %{public}d", ret); + return WIFI_OPT_FAILED; + } + return WIFI_OPT_SUCCESS; +} + void WifiP2pServiceImpl::SaBasicDump(std::string& result) { result.append("P2P enable status: "); diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.h index 525d87b..dc57a9e 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #ifndef OHOS_WIFI_P2P_SERVICE_IMPL_H #define OHOS_WIFI_P2P_SERVICE_IMPL_H @@ -254,6 +255,111 @@ public: */ ErrCode SetP2pWfdInfo(const WifiP2pWfdInfo &wfdInfo) override; + /** + * @Description Request an IP address to the Gc from the IP address pool, used on the GO side. + * + * @param gcMac - gc mac address + * @param ipAddr - applied ip address + * @return ErrCode - operate result + */ + ErrCode Hid2dRequestGcIp(const std::string& gcMac, std::string& ipAddr) override; + + /** + * @Description Increase(+1) hid2d shared link reference counting + * + * @return ErrCode - operate result + */ + ErrCode Hid2dSharedlinkIncrease() override; + + /** + * @Description Decrease(-1) hid2d shared link reference counting + * + * @return ErrCode - operate result + */ + ErrCode Hid2dSharedlinkDecrease() override; + + /** + * @Description Create hid2d group, used on the GO side. + * + * @param frequency - frequency + * @param type - frequency type + * @return ErrCode - operate result + */ + ErrCode Hid2dCreateGroup(const int frequency, FreqType type) override; + + /** + * @Description The GC side actively disconnects from the GO, used on the GC side. + * + * @param gcIfName - network interface name + * @return ErrCode - operate result + */ + ErrCode Hid2dRemoveGcGroup(const std::string& gcIfName) override; + + /** + * @Description Connect to a specified group using hid2d, used on the GC side. + * + * @param config - connection parameters + * @return ErrCode - operate result + */ + ErrCode Hid2dConnect(const Hid2dConnectConfig& config) override; + + /** + * @Description Configuring IP addresses for P2P network interfaces, used on the GC side. + * + * @param ifName - network interface name + * @param ipInfo - IP infos + * @return ErrCode - operate result + */ + ErrCode Hid2dConfigIPAddr(const std::string& ifName, const IpAddrInfo& ipInfo) override; + + /** + * @Description Clear IP address when the P2P connection is disconnected, used on the GC side. + * + * @param ifName - network interface name + * @return ErrCode - operate result + */ + ErrCode Hid2dReleaseIPAddr(const std::string& ifName) override; + + /** + * @Description Obtain the recommended channel and bandwidth for link setup + * + * @param request - request data + * @param response - response result + * @return ErrCode - operate result + */ + ErrCode Hid2dGetRecommendChannel(const RecommendChannelRequest& request, + RecommendChannelResponse& response) override; + + /** + * @Description get 5G channel list + * + * @param vecChannelList - result for channel list + * @return ErrCode - operate result + */ + ErrCode Hid2dGetChannelListFor5G(std::vector& vecChannelList) override; + + /** + * @Description get the self wifi configuration information + * + * @param cfgType - configuration type + * @param cfgData - the queried data of wifi configuration + * @param getDatValidLen - the valid data length in the array `cfgData` + * @return ErrCode - operate result + */ + ErrCode Hid2dGetSelfWifiCfgInfo(SelfCfgType cfgType, + char cfgData[CFG_DATA_MAX_BYTES], int* getDatValidLen) override; + + /** + * @Description set the peer wifi configuration information + * + * @param cfgType - configuration type + * @param cfgData - the wifi configuration data to be set + * @param setDataValidLen - the valid data length in the array `cfgData` + * @return ErrCode - operate result + */ + ErrCode Hid2dSetPeerWifiCfgInfo(PeerCfgType cfgType, + char cfgData[CFG_DATA_MAX_BYTES], int setDataValidLen) override; + /** * @Description dump p2p information * diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.cpp index 764bce2..72236e8 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -61,6 +61,18 @@ void WifiP2pStub::InitHandleMap() handleFuncMap[WIFI_SVR_CMD_GET_SUPPORTED_FEATURES] = &WifiP2pStub::OnGetSupportedFeatures; handleFuncMap[WIFI_SVR_CMD_P2P_SET_DEVICE_NAME] = &WifiP2pStub::OnSetP2pDeviceName; handleFuncMap[WIFI_SVR_CMD_P2P_SET_WFD_INFO] = &WifiP2pStub::OnSetP2pWfdInfo; + handleFuncMap[WIFI_SVR_CMD_P2P_HID2D_APPLY_IP] = &WifiP2pStub::OnHid2dRequestGcIp; + handleFuncMap[WIFI_SVR_CMD_P2P_HID2D_SHARED_LINK_INCREASE] = &WifiP2pStub::OnHid2dSharedlinkIncrease; + handleFuncMap[WIFI_SVR_CMD_P2P_HID2D_SHARED_LINK_DECREASE] = &WifiP2pStub::OnHid2dSharedlinkDecrease; + handleFuncMap[WIFI_SVR_CMD_P2P_HID2D_CREATE_GROUP] = &WifiP2pStub::OnHid2dCreateGroup; + handleFuncMap[WIFI_SVR_CMD_P2P_HID2D_REMOVE_GC_GROUP] = &WifiP2pStub::OnHid2dRemoveGcGroup; + handleFuncMap[WIFI_SVR_CMD_P2P_HID2D_CONNECT] = &WifiP2pStub::OnHid2dConnect; + handleFuncMap[WIFI_SVR_CMD_P2P_HID2D_CONFIG_IP] = &WifiP2pStub::OnHid2dConfigIPAddr; + handleFuncMap[WIFI_SVR_CMD_P2P_HID2D_RELEASE_IP] = &WifiP2pStub::OnHid2dReleaseIPAddr; + handleFuncMap[WIFI_SVR_CMD_GET_P2P_RECOMMENDED_CHANNEL] = &WifiP2pStub::OnHid2dGetRecommendChannel; + handleFuncMap[WIFI_SVR_CMD_GET_5G_CHANNEL_LIST] = &WifiP2pStub::OnHid2dGetChannelListFor5G; + handleFuncMap[WIFI_SVR_CMD_GET_SELF_WIFI_CFG] = &WifiP2pStub::OnHid2dGetSelfWifiCfgInfo; + handleFuncMap[WIFI_SVR_CMD_SET_PEER_WIFI_CFG] = &WifiP2pStub::OnHid2dSetPeerWifiCfgInfo; return; } @@ -557,6 +569,7 @@ void WifiP2pStub::OnGetSupportedFeatures( return; } + void WifiP2pStub::OnSetP2pDeviceName(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) { WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); @@ -567,6 +580,7 @@ void WifiP2pStub::OnSetP2pDeviceName(uint32_t code, MessageParcel &data, Message return; } + void WifiP2pStub::OnSetP2pWfdInfo(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) { WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); @@ -579,9 +593,194 @@ void WifiP2pStub::OnSetP2pWfdInfo(uint32_t code, MessageParcel &data, MessagePar int ret = SetP2pWfdInfo(wfdInfo); reply.WriteInt32(0); reply.WriteInt32(ret); - return; } + +void WifiP2pStub::OnHid2dRequestGcIp(uint32_t code, MessageParcel &data, + MessageParcel &reply, MessageOption &option) +{ + WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); + + std::string gcMac = data.ReadCString(); + std::string ipAddr; + int ret = Hid2dRequestGcIp(gcMac, ipAddr); + reply.WriteInt32(0); + reply.WriteInt32(ret); + if (ret == WIFI_OPT_SUCCESS) { + reply.WriteCString(ipAddr.c_str()); + } +} + +void WifiP2pStub::OnHid2dSharedlinkIncrease(uint32_t code, MessageParcel &data, + MessageParcel &reply, MessageOption &option) +{ + WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); + + int ret = Hid2dSharedlinkIncrease(); + reply.WriteInt32(0); + reply.WriteInt32(ret); +} + +void WifiP2pStub::OnHid2dSharedlinkDecrease(uint32_t code, MessageParcel &data, + MessageParcel &reply, MessageOption &option) +{ + WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); + int ret = Hid2dSharedlinkDecrease(); + reply.WriteInt32(0); + reply.WriteInt32(ret); +} + +void WifiP2pStub::OnHid2dCreateGroup(uint32_t code, MessageParcel &data, + MessageParcel &reply, MessageOption &option) +{ + WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); + + int frequency = data.ReadInt32(); + int type = data.ReadInt32(); + int ret = Hid2dCreateGroup(frequency, FreqType(type)); + reply.WriteInt32(0); + reply.WriteInt32(ret); +} + +void WifiP2pStub::OnHid2dRemoveGcGroup(uint32_t code, MessageParcel &data, + MessageParcel &reply, MessageOption &option) +{ + WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); + + std::string gcIfName = data.ReadCString(); + int ret = Hid2dRemoveGcGroup(gcIfName); + reply.WriteInt32(0); + reply.WriteInt32(ret); +} + +void WifiP2pStub::OnHid2dConnect(uint32_t code, MessageParcel &data, + MessageParcel &reply, MessageOption &option) +{ + WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); + + Hid2dConnectConfig config; + config.SetSsid(data.ReadCString()); + config.SetBssid(data.ReadCString()); + config.SetPreSharedKey(data.ReadCString()); + config.SetFrequency(data.ReadInt32()); + config.SetDhcpMode(DhcpMode(data.ReadInt32())); + + int ret = Hid2dConnect(config); + reply.WriteInt32(0); + reply.WriteInt32(ret); +} + +void WifiP2pStub::OnHid2dConfigIPAddr(uint32_t code, MessageParcel &data, + MessageParcel &reply, MessageOption &option) +{ + WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); + + IpAddrInfo ipInfo; + std::string ifName = data.ReadCString(); + ipInfo.ip = data.ReadCString(); + ipInfo.gateway = data.ReadCString(); + ipInfo.netmask = data.ReadCString(); + int ret = Hid2dConfigIPAddr(ifName, ipInfo); + reply.WriteInt32(0); + reply.WriteInt32(ret); +} + +void WifiP2pStub::OnHid2dReleaseIPAddr(uint32_t code, MessageParcel &data, + MessageParcel &reply, MessageOption &option) +{ + WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); + + std::string ifName = data.ReadCString(); + int ret = Hid2dReleaseIPAddr(ifName); + reply.WriteInt32(0); + reply.WriteInt32(ret); +} + +void WifiP2pStub::OnHid2dGetRecommendChannel( + uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) +{ + WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); + RecommendChannelRequest request; + RecommendChannelResponse response; + request.remoteIfName = data.ReadCString(); + request.remoteIfMode = data.ReadInt32(); + request.localIfName = data.ReadCString(); + request.localIfMode = data.ReadInt32(); + request.prefBand = data.ReadInt32(); + request.prefBandwidth = PreferBandwidth(data.ReadInt32()); + ErrCode ret = Hid2dGetRecommendChannel(request, response); + reply.WriteInt32(0); + reply.WriteInt32(ret); + if (ret == WIFI_OPT_SUCCESS) { + reply.WriteInt32(static_cast(response.status)); + reply.WriteInt32(response.index); + reply.WriteInt32(response.centerFreq); + reply.WriteInt32(response.centerFreq1); + reply.WriteInt32(response.centerFreq2); + reply.WriteInt32(response.bandwidth); + } +} + +void WifiP2pStub::OnHid2dGetChannelListFor5G( + uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) +{ + WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); + + std::vector vecChannelList; + ErrCode ret = Hid2dGetChannelListFor5G(vecChannelList); + reply.WriteInt32(0); + reply.WriteInt32(ret); + if (ret == WIFI_OPT_SUCCESS) { + reply.WriteInt32((int)vecChannelList.size()); + for (auto& channel : vecChannelList) { + reply.WriteInt32(channel); + } + } +} + +void WifiP2pStub::OnHid2dGetSelfWifiCfgInfo( + uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) +{ + WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); + + int cfgType = data.ReadInt32(); + int len = 0; + char cfgData[CFG_DATA_MAX_BYTES]; + if (memset_s(cfgData, CFG_DATA_MAX_BYTES, 0, CFG_DATA_MAX_BYTES) != EOK) { + WIFI_LOGE("`%{public}s` memset_s failed!", __func__); + } + ErrCode ret = Hid2dGetSelfWifiCfgInfo(SelfCfgType(cfgType), cfgData, &len); + reply.WriteInt32(0); + reply.WriteInt32(ret); + reply.WriteInt32(len); + if (ret == WIFI_OPT_SUCCESS && len > 0) { + reply.WriteBuffer(cfgData, len); + } +} + +void WifiP2pStub::OnHid2dSetPeerWifiCfgInfo( + uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) +{ + WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); + + char cfgData[CFG_DATA_MAX_BYTES]; + if (memset_s(cfgData, CFG_DATA_MAX_BYTES, 0, CFG_DATA_MAX_BYTES) != EOK) { + WIFI_LOGE("`%{public}s` memset_s failed!", __func__); + } + int cfgType = data.ReadInt32(); + int len = data.ReadInt32(); + const char *dataBuffer = (const char *)data.ReadBuffer(len); + if (memcpy_s(cfgData, CFG_DATA_MAX_BYTES, dataBuffer, len) != EOK) { + WIFI_LOGE("`%{public}s` memcpy_s failed!", __func__); + reply.WriteInt32(0); + reply.WriteInt32(WIFI_OPT_FAILED); + return; + } + ErrCode ret = Hid2dSetPeerWifiCfgInfo(PeerCfgType(cfgType), cfgData, len); + reply.WriteInt32(0); + reply.WriteInt32(ret); +} + bool WifiP2pStub::IsSingleCallback() const { return mSingleCallback; diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.h index 7eba7cd..93c91a8 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -71,6 +71,18 @@ private: void OnGetSupportedFeatures(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option); void OnSetP2pDeviceName(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option); void OnSetP2pWfdInfo(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option); + void OnHid2dRequestGcIp(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option); + void OnHid2dSharedlinkIncrease(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option); + void OnHid2dSharedlinkDecrease(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option); + void OnHid2dCreateGroup(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option); + void OnHid2dRemoveGcGroup(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option); + void OnHid2dConnect(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option); + void OnHid2dConfigIPAddr(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option); + void OnHid2dReleaseIPAddr(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option); + void OnHid2dGetRecommendChannel(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option); + void OnHid2dGetChannelListFor5G(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option); + void OnHid2dGetSelfWifiCfgInfo(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option); + void OnHid2dSetPeerWifiCfgInfo(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option); void ReadWifiP2pServiceInfo(MessageParcel &data, WifiP2pServiceInfo &info); void ReadWifiP2pServiceRequest(MessageParcel &data, WifiP2pDevice &device, WifiP2pServiceRequest &request); void WriteWifiP2pServiceInfo(MessageParcel &reply, const WifiP2pServiceInfo &info); diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_protect.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_protect.cpp index f129aa9..e753140 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_protect.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_protect.cpp @@ -1,80 +1,80 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "wifi_protect.h" - -namespace OHOS { -namespace Wifi { -WifiProtect::WifiProtect( - const WifiProtectType &protectType, const WifiProtectMode &protectMode, const std::string &name) - : mName(name), - mType(protectType), - mMode(protectMode), - mAcqTimestamp(0) -{} - -WifiProtect::WifiProtect(const std::string &name) - : mName(name), - mType(WifiProtectType::WIFI_PROTECT_COMMON), - mMode(WifiProtectMode::WIFI_PROTECT_FULL), - mAcqTimestamp(0) -{} - -WifiProtect::WifiProtect() - : mName(""), - mType(WifiProtectType::WIFI_PROTECT_COMMON), - mMode(WifiProtectMode::WIFI_PROTECT_FULL), - mAcqTimestamp(0) -{} - -WifiProtect::~WifiProtect() -{} - -void WifiProtect::SetProtectType(const WifiProtectType &protectType) -{ - mType = protectType; -} - -WifiProtectType WifiProtect::GetProtectType() const -{ - return mType; -} - -void WifiProtect::SetProtectMode(const WifiProtectMode &protectMode) -{ - mMode = protectMode; -} - -WifiProtectMode WifiProtect::GetProtectMode() const -{ - return mMode; -} - -void WifiProtect::SetName(const std::string &name) -{ - mName = name; -} - -std::string WifiProtect::GetName() const -{ - return mName; -} - -long WifiProtect::GetAcqTimestamp() const -{ - return mAcqTimestamp; -} -} // namespace Wifi +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "wifi_protect.h" + +namespace OHOS { +namespace Wifi { +WifiProtect::WifiProtect( + const WifiProtectType &protectType, const WifiProtectMode &protectMode, const std::string &name) + : mName(name), + mType(protectType), + mMode(protectMode), + mAcqTimestamp(0) +{} + +WifiProtect::WifiProtect(const std::string &name) + : mName(name), + mType(WifiProtectType::WIFI_PROTECT_COMMON), + mMode(WifiProtectMode::WIFI_PROTECT_FULL), + mAcqTimestamp(0) +{} + +WifiProtect::WifiProtect() + : mName(""), + mType(WifiProtectType::WIFI_PROTECT_COMMON), + mMode(WifiProtectMode::WIFI_PROTECT_FULL), + mAcqTimestamp(0) +{} + +WifiProtect::~WifiProtect() +{} + +void WifiProtect::SetProtectType(const WifiProtectType &protectType) +{ + mType = protectType; +} + +WifiProtectType WifiProtect::GetProtectType() const +{ + return mType; +} + +void WifiProtect::SetProtectMode(const WifiProtectMode &protectMode) +{ + mMode = protectMode; +} + +WifiProtectMode WifiProtect::GetProtectMode() const +{ + return mMode; +} + +void WifiProtect::SetName(const std::string &name) +{ + mName = name; +} + +std::string WifiProtect::GetName() const +{ + return mName; +} + +long WifiProtect::GetAcqTimestamp() const +{ + return mAcqTimestamp; +} +} // namespace Wifi } // namespace OHOS \ No newline at end of file diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_protect.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_protect.h index b8bcfbb..d469dc4 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_protect.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_protect.h @@ -1,112 +1,112 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef OHOS_WIFIPROTECT_H -#define OHOS_WIFIPROTECT_H - -#include -#include "wifi_msg.h" - -namespace OHOS { -namespace Wifi { -class WifiProtect { -public: - /** - * @Description Construct a new Wifi Protect object - * - * @param protectType - protect type - * @param protectMode - protect mode - * @param name - protect name, which is a unique identifier - */ - WifiProtect(const WifiProtectType &protectType, const WifiProtectMode &protectMode, const std::string &name); - - /** - * @Description Construct a new Wifi Full Protect object - * - * @param tag - protect name, which is a unique identifier - */ - explicit WifiProtect(const std::string &name); - - /** - * @Description Construct a new Default Wifi Protect object - * - */ - WifiProtect(); - - /** - * @Description Destroy the Wifi Protect object - * - */ - ~WifiProtect(); - - /** - * @Description Set the Tag object - * - * @param tag - protect name - */ - void SetName(const std::string &name); - - /** - * @Description Get the Tag object - * - * @return std::string - Wifi protect Tag - */ - std::string GetName() const; - - /** - * @Description Set the Protect Type object - * - * @param protectType - protect type - */ - void SetProtectType(const WifiProtectType &protectType); - - /** - * @Description Get the Protect Type object - * - * @return WifiProtectType - protect type - */ - WifiProtectType GetProtectType() const; - - /** - * @Description Set the Protect Mode object - * - * @param protectMode - protect mode - */ - void SetProtectMode(const WifiProtectMode &protectMode); - - /** - * @Description Get the Protect Mode object - * - * @return WifiProtectMode - protect mode - */ - WifiProtectMode GetProtectMode() const; - - /** - * @Description Get the Acq Timestamp - * - * @return long - timestamp - */ - long GetAcqTimestamp() const; - -private: - std::string mName; - /* not used: int mUid; */ - WifiProtectType mType; - WifiProtectMode mMode; - long mAcqTimestamp; -}; -} // namespace Wifi -} // namespace OHOS -#endif +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OHOS_WIFIPROTECT_H +#define OHOS_WIFIPROTECT_H + +#include +#include "wifi_msg.h" + +namespace OHOS { +namespace Wifi { +class WifiProtect { +public: + /** + * @Description Construct a new Wifi Protect object + * + * @param protectType - protect type + * @param protectMode - protect mode + * @param name - protect name, which is a unique identifier + */ + WifiProtect(const WifiProtectType &protectType, const WifiProtectMode &protectMode, const std::string &name); + + /** + * @Description Construct a new Wifi Full Protect object + * + * @param tag - protect name, which is a unique identifier + */ + explicit WifiProtect(const std::string &name); + + /** + * @Description Construct a new Default Wifi Protect object + * + */ + WifiProtect(); + + /** + * @Description Destroy the Wifi Protect object + * + */ + ~WifiProtect(); + + /** + * @Description Set the Tag object + * + * @param tag - protect name + */ + void SetName(const std::string &name); + + /** + * @Description Get the Tag object + * + * @return std::string - Wifi protect Tag + */ + std::string GetName() const; + + /** + * @Description Set the Protect Type object + * + * @param protectType - protect type + */ + void SetProtectType(const WifiProtectType &protectType); + + /** + * @Description Get the Protect Type object + * + * @return WifiProtectType - protect type + */ + WifiProtectType GetProtectType() const; + + /** + * @Description Set the Protect Mode object + * + * @param protectMode - protect mode + */ + void SetProtectMode(const WifiProtectMode &protectMode); + + /** + * @Description Get the Protect Mode object + * + * @return WifiProtectMode - protect mode + */ + WifiProtectMode GetProtectMode() const; + + /** + * @Description Get the Acq Timestamp + * + * @return long - timestamp + */ + long GetAcqTimestamp() const; + +private: + std::string mName; + /* not used: int mUid; */ + WifiProtectType mType; + WifiProtectMode mMode; + long mAcqTimestamp; +}; +} // namespace Wifi +} // namespace OHOS +#endif diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_protect_manager.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_protect_manager.cpp index 2358575..1131c23 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_protect_manager.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_protect_manager.cpp @@ -1,276 +1,276 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "wifi_protect_manager.h" -#include "wifi_log.h" -#include "wifi_chip_hal_interface.h" -#include "wifi_supplicant_hal_interface.h" - -#undef LOG_TAG -#define LOG_TAG "OHWIFI_MANAGER_LOCK_MANAGER" - -namespace OHOS { -namespace Wifi { -WifiProtectManager::WifiProtectManager() -{ - mWifiConnected = false; - mScreenOn = false; - mForceHiPerfMode = false; - mForceLowLatencyMode = false; - mCurrentOpMode = WifiProtectMode::WIFI_PROTECT_NO_HELD; - mFullHighPerfProtectsAcquired = 0; - mFullHighPerfProtectsReleased = 0; - mFullLowLatencyProtectsAcquired = 0; - mFullLowLatencyProtectsReleased = 0; - mWifiProtects.clear(); -} - -WifiProtectManager::~WifiProtectManager() -{} - -WifiProtectManager &WifiProtectManager::GetInstance() -{ - static WifiProtectManager instance; - return instance; -} - -bool WifiProtectManager::IsValidProtectMode(WifiProtectMode &protectMode) -{ - if (protectMode != WifiProtectMode::WIFI_PROTECT_FULL && protectMode != WifiProtectMode::WIFI_PROTECT_SCAN_ONLY && - protectMode != WifiProtectMode::WIFI_PROTECT_FULL_HIGH_PERF && - protectMode != WifiProtectMode::WIFI_PROTECT_FULL_LOW_LATENCY) { - return false; - } - - return true; -} - -WifiProtectMode WifiProtectManager::GetNearlyProtectMode() -{ - /* If Wifi Client is not connected, then all protects are not effective */ - if (!mWifiConnected) { - return WifiProtectMode::WIFI_PROTECT_NO_HELD; - } - - /* Check if mode is forced to hi-perf */ - if (mForceHiPerfMode) { - return WifiProtectMode::WIFI_PROTECT_FULL_HIGH_PERF; - } - - /* Check if mode is forced to low-latency */ - if (mForceLowLatencyMode) { - return WifiProtectMode::WIFI_PROTECT_FULL_LOW_LATENCY; - } - - if (mFullHighPerfProtectsAcquired > mFullHighPerfProtectsReleased) { - return WifiProtectMode::WIFI_PROTECT_FULL_HIGH_PERF; - } - - return WifiProtectMode::WIFI_PROTECT_NO_HELD; -} - -bool WifiProtectManager::InitWifiProtect(const WifiProtectType &protectType, const std::string &protectName) -{ - WifiProtect* pProtect = new WifiProtect(protectType, WifiProtectMode::WIFI_PROTECT_FULL, protectName); - mWifiProtects.push_back(pProtect); - return true; -} - -bool WifiProtectManager::GetWifiProtect(const WifiProtectMode &protectMode, const std::string name) -{ - bool isAlreadyExist = false; - - std::vector::iterator itor = mWifiProtects.begin(); - while (itor != mWifiProtects.end()) { - if ((*itor)->GetName() == name) { - LOGD("old name = %{public}s, and new Name = %{public}s", - (*itor)->GetName().c_str(), - (*itor)->GetName().c_str()); - isAlreadyExist = true; - break; - } - itor++; - } - - if (isAlreadyExist) { - LOGD("attempted to add a protect when already holding one"); - return false; - } - - WifiProtect *pProtect = new WifiProtect(name); - if (pProtect == nullptr) { - LOGE("Wifi protect pointer is null."); - return false; - } - pProtect->SetProtectMode(protectMode); - return AddProtect(pProtect); -} - -bool WifiProtectManager::ChangeToPerfMode(bool isEnabled) -{ - mForceHiPerfMode = isEnabled; - mForceLowLatencyMode = false; - if (!ChangeWifiPowerMode()) { - LOGE("Failed to force hi-perf mode, returning to normal mode"); - mForceHiPerfMode = false; - return false; - } - - return true; -} -void WifiProtectManager::HandleScreenStateChanged(bool screenOn) -{ - mScreenOn = screenOn; -} - -void WifiProtectManager::UpdateWifiClientConnected(bool isConnected) -{ - mWifiConnected = isConnected; -} - -bool WifiProtectManager::AddProtect(WifiProtect *pProtect) -{ - mWifiProtects.push_back(pProtect); - switch (pProtect->GetProtectMode()) { - case WifiProtectMode::WIFI_PROTECT_FULL_HIGH_PERF: - if (mWifiConnected) { - ++mFullHighPerfProtectsAcquired; - } - break; - case WifiProtectMode::WIFI_PROTECT_FULL_LOW_LATENCY: - ++mFullLowLatencyProtectsAcquired; - break; - default: - break; - } - - ChangeWifiPowerMode(); - LOGD("GetWifiProtect finished!"); - return true; -} - -bool WifiProtectManager::PutWifiProtect(const std::string &name) -{ - WifiProtect *pWifiProtect = RemoveProtect(name); - if (pWifiProtect == nullptr) { - /* attempting to release a protect that does not exist. */ - return false; - } - - switch (pWifiProtect->GetProtectMode()) { - case WifiProtectMode::WIFI_PROTECT_FULL_HIGH_PERF: - if (mWifiConnected) { - ++mFullHighPerfProtectsReleased; - } - break; - case WifiProtectMode::WIFI_PROTECT_FULL_LOW_LATENCY: - ++mFullLowLatencyProtectsReleased; - break; - default: - break; - } - - /* Recalculate the operating mode */ - ChangeWifiPowerMode(); - LOGD("PutWifiProtect finished!"); - - delete pWifiProtect; - pWifiProtect = nullptr; - return true; -} - -WifiProtect *WifiProtectManager::RemoveProtect(const std::string &name) -{ - WifiProtect *pProtect = nullptr; - std::vector::iterator itor = mWifiProtects.begin(); - while (itor != mWifiProtects.end()) { - if ((*itor)->GetName() == name) { - pProtect = *itor; - itor = mWifiProtects.erase(itor); - break; - } - itor++; - } - return pProtect; -} - -bool WifiProtectManager::ChangeWifiPowerMode() -{ - WifiProtectMode newProtectMode = GetNearlyProtectMode(); - if (newProtectMode == mCurrentOpMode) { - /* No action is needed */ - return true; - } - - /* Otherwise, we need to change current mode, first reset it to normal */ - switch (mCurrentOpMode) { - case WifiProtectMode::WIFI_PROTECT_FULL_HIGH_PERF: - if (!WifiSupplicantHalInterface::GetInstance().SetPowerSave(true)) { - LOGE("Failed to reset the OpMode from hi-perf to Normal"); - return false; - } - break; - case WifiProtectMode::WIFI_PROTECT_FULL_LOW_LATENCY: - - break; - case WifiProtectMode::WIFI_PROTECT_NO_HELD: - default: - /* No action */ - break; - } - - /* Set the current mode, before we attempt to set the new mode */ - mCurrentOpMode = WifiProtectMode::WIFI_PROTECT_NO_HELD; - - /* Now switch to the new opMode */ - switch (newProtectMode) { - case WifiProtectMode::WIFI_PROTECT_FULL_HIGH_PERF: - if (!WifiSupplicantHalInterface::GetInstance().SetPowerSave(false)) { - LOGE("Failed to set the OpMode to hi-perf"); - return false; - } - break; - case WifiProtectMode::WIFI_PROTECT_FULL_LOW_LATENCY: - if (!SetLowLatencyMode(true)) { - LOGE("Failed to set the OpMode to low-latency"); - return false; - } - break; - case WifiProtectMode::WIFI_PROTECT_NO_HELD: - /* No action */ - break; - default: - /* Invalid mode, don't change currentOpMode , and exit with error */ - LOGE("Invalid new opMode: %{public}d", (int)newProtectMode); - return false; - } - - /* Now set the mode to the new value */ - mCurrentOpMode = newProtectMode; - return true; -} - -bool WifiProtectManager::SetLowLatencyMode(bool enabled) -{ - /* Only set power save mode */ - if (!WifiSupplicantHalInterface::GetInstance().SetPowerSave(!enabled)) { - LOGE("Failed to set power save mode"); - return false; - } - - return true; -} -} // namespace Wifi +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "wifi_protect_manager.h" +#include "wifi_log.h" +#include "wifi_chip_hal_interface.h" +#include "wifi_supplicant_hal_interface.h" + +#undef LOG_TAG +#define LOG_TAG "OHWIFI_MANAGER_LOCK_MANAGER" + +namespace OHOS { +namespace Wifi { +WifiProtectManager::WifiProtectManager() +{ + mWifiConnected = false; + mScreenOn = false; + mForceHiPerfMode = false; + mForceLowLatencyMode = false; + mCurrentOpMode = WifiProtectMode::WIFI_PROTECT_NO_HELD; + mFullHighPerfProtectsAcquired = 0; + mFullHighPerfProtectsReleased = 0; + mFullLowLatencyProtectsAcquired = 0; + mFullLowLatencyProtectsReleased = 0; + mWifiProtects.clear(); +} + +WifiProtectManager::~WifiProtectManager() +{} + +WifiProtectManager &WifiProtectManager::GetInstance() +{ + static WifiProtectManager instance; + return instance; +} + +bool WifiProtectManager::IsValidProtectMode(WifiProtectMode &protectMode) +{ + if (protectMode != WifiProtectMode::WIFI_PROTECT_FULL && protectMode != WifiProtectMode::WIFI_PROTECT_SCAN_ONLY && + protectMode != WifiProtectMode::WIFI_PROTECT_FULL_HIGH_PERF && + protectMode != WifiProtectMode::WIFI_PROTECT_FULL_LOW_LATENCY) { + return false; + } + + return true; +} + +WifiProtectMode WifiProtectManager::GetNearlyProtectMode() +{ + /* If Wifi Client is not connected, then all protects are not effective */ + if (!mWifiConnected) { + return WifiProtectMode::WIFI_PROTECT_NO_HELD; + } + + /* Check if mode is forced to hi-perf */ + if (mForceHiPerfMode) { + return WifiProtectMode::WIFI_PROTECT_FULL_HIGH_PERF; + } + + /* Check if mode is forced to low-latency */ + if (mForceLowLatencyMode) { + return WifiProtectMode::WIFI_PROTECT_FULL_LOW_LATENCY; + } + + if (mFullHighPerfProtectsAcquired > mFullHighPerfProtectsReleased) { + return WifiProtectMode::WIFI_PROTECT_FULL_HIGH_PERF; + } + + return WifiProtectMode::WIFI_PROTECT_NO_HELD; +} + +bool WifiProtectManager::InitWifiProtect(const WifiProtectType &protectType, const std::string &protectName) +{ + WifiProtect* pProtect = new WifiProtect(protectType, WifiProtectMode::WIFI_PROTECT_FULL, protectName); + mWifiProtects.push_back(pProtect); + return true; +} + +bool WifiProtectManager::GetWifiProtect(const WifiProtectMode &protectMode, const std::string name) +{ + bool isAlreadyExist = false; + + std::vector::iterator itor = mWifiProtects.begin(); + while (itor != mWifiProtects.end()) { + if ((*itor)->GetName() == name) { + LOGD("old name = %{public}s, and new Name = %{public}s", + (*itor)->GetName().c_str(), + (*itor)->GetName().c_str()); + isAlreadyExist = true; + break; + } + itor++; + } + + if (isAlreadyExist) { + LOGD("attempted to add a protect when already holding one"); + return false; + } + + WifiProtect *pProtect = new WifiProtect(name); + if (pProtect == nullptr) { + LOGE("Wifi protect pointer is null."); + return false; + } + pProtect->SetProtectMode(protectMode); + return AddProtect(pProtect); +} + +bool WifiProtectManager::ChangeToPerfMode(bool isEnabled) +{ + mForceHiPerfMode = isEnabled; + mForceLowLatencyMode = false; + if (!ChangeWifiPowerMode()) { + LOGE("Failed to force hi-perf mode, returning to normal mode"); + mForceHiPerfMode = false; + return false; + } + + return true; +} +void WifiProtectManager::HandleScreenStateChanged(bool screenOn) +{ + mScreenOn = screenOn; +} + +void WifiProtectManager::UpdateWifiClientConnected(bool isConnected) +{ + mWifiConnected = isConnected; +} + +bool WifiProtectManager::AddProtect(WifiProtect *pProtect) +{ + mWifiProtects.push_back(pProtect); + switch (pProtect->GetProtectMode()) { + case WifiProtectMode::WIFI_PROTECT_FULL_HIGH_PERF: + if (mWifiConnected) { + ++mFullHighPerfProtectsAcquired; + } + break; + case WifiProtectMode::WIFI_PROTECT_FULL_LOW_LATENCY: + ++mFullLowLatencyProtectsAcquired; + break; + default: + break; + } + + ChangeWifiPowerMode(); + LOGD("GetWifiProtect finished!"); + return true; +} + +bool WifiProtectManager::PutWifiProtect(const std::string &name) +{ + WifiProtect *pWifiProtect = RemoveProtect(name); + if (pWifiProtect == nullptr) { + /* attempting to release a protect that does not exist. */ + return false; + } + + switch (pWifiProtect->GetProtectMode()) { + case WifiProtectMode::WIFI_PROTECT_FULL_HIGH_PERF: + if (mWifiConnected) { + ++mFullHighPerfProtectsReleased; + } + break; + case WifiProtectMode::WIFI_PROTECT_FULL_LOW_LATENCY: + ++mFullLowLatencyProtectsReleased; + break; + default: + break; + } + + /* Recalculate the operating mode */ + ChangeWifiPowerMode(); + LOGD("PutWifiProtect finished!"); + + delete pWifiProtect; + pWifiProtect = nullptr; + return true; +} + +WifiProtect *WifiProtectManager::RemoveProtect(const std::string &name) +{ + WifiProtect *pProtect = nullptr; + std::vector::iterator itor = mWifiProtects.begin(); + while (itor != mWifiProtects.end()) { + if ((*itor)->GetName() == name) { + pProtect = *itor; + itor = mWifiProtects.erase(itor); + break; + } + itor++; + } + return pProtect; +} + +bool WifiProtectManager::ChangeWifiPowerMode() +{ + WifiProtectMode newProtectMode = GetNearlyProtectMode(); + if (newProtectMode == mCurrentOpMode) { + /* No action is needed */ + return true; + } + + /* Otherwise, we need to change current mode, first reset it to normal */ + switch (mCurrentOpMode) { + case WifiProtectMode::WIFI_PROTECT_FULL_HIGH_PERF: + if (!WifiSupplicantHalInterface::GetInstance().SetPowerSave(true)) { + LOGE("Failed to reset the OpMode from hi-perf to Normal"); + return false; + } + break; + case WifiProtectMode::WIFI_PROTECT_FULL_LOW_LATENCY: + + break; + case WifiProtectMode::WIFI_PROTECT_NO_HELD: + default: + /* No action */ + break; + } + + /* Set the current mode, before we attempt to set the new mode */ + mCurrentOpMode = WifiProtectMode::WIFI_PROTECT_NO_HELD; + + /* Now switch to the new opMode */ + switch (newProtectMode) { + case WifiProtectMode::WIFI_PROTECT_FULL_HIGH_PERF: + if (!WifiSupplicantHalInterface::GetInstance().SetPowerSave(false)) { + LOGE("Failed to set the OpMode to hi-perf"); + return false; + } + break; + case WifiProtectMode::WIFI_PROTECT_FULL_LOW_LATENCY: + if (!SetLowLatencyMode(true)) { + LOGE("Failed to set the OpMode to low-latency"); + return false; + } + break; + case WifiProtectMode::WIFI_PROTECT_NO_HELD: + /* No action */ + break; + default: + /* Invalid mode, don't change currentOpMode , and exit with error */ + LOGE("Invalid new opMode: %{public}d", (int)newProtectMode); + return false; + } + + /* Now set the mode to the new value */ + mCurrentOpMode = newProtectMode; + return true; +} + +bool WifiProtectManager::SetLowLatencyMode(bool enabled) +{ + /* Only set power save mode */ + if (!WifiSupplicantHalInterface::GetInstance().SetPowerSave(!enabled)) { + LOGE("Failed to set power save mode"); + return false; + } + + return true; +} +} // namespace Wifi } // namespace OHOS \ No newline at end of file diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_protect_manager.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_protect_manager.h index 439cf50..bd3f110 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_protect_manager.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_protect_manager.h @@ -1,122 +1,129 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef OHOS_WIFI_PROTECT_MANAGER_H -#define OHOS_WIFI_PROTECT_MANAGER_H - -#include -#include "wifi_protect.h" -#include "wifi_msg.h" - -namespace OHOS { -namespace Wifi { -class WifiProtectManager { -public: - ~WifiProtectManager(); - static WifiProtectManager &GetInstance(); - - /** - * @Description Validate that the protect mode is valid - * - * @param protectMode - The protect mode to verify - * @return true - valid - * @return false - invalid - */ - static bool IsValidProtectMode(WifiProtectMode &protectMode); - - /** - * @Description Get the nearly protect type currently held by the WifiProtectManager - * - * @return WifiProtectMode - currently held protect - */ - WifiProtectMode GetNearlyProtectMode(); - - /** - * @Description Create a Wifi Protect. - * - * @param protectMode - representation of the Wifi Protect type - * @param protectName - represent the protect name - * @return true - create the protect success - * @return false - create protect failed - */ - bool InitWifiProtect(const WifiProtectType &protectType, const std::string &protectName); - - /** - * @Description Allowing a calling app to acquire a Wifi Protect in the supplied mode - * - * @param protectMode - representation of the Wifi Protect type - * @param name - represent the protect - * @return true - acquired the protect success - * @return false - acquired protect failed - */ - bool GetWifiProtect(const WifiProtectMode &protectMode, const std::string name); - - /** - * @Description Applications to release a WiFi Wake protect - * - * @param name - represent the protect - * @return true - put protect success - * @return false - put failed, the caller did not hold this protect - */ - bool PutWifiProtect(const std::string &name); - - /** - * @Description Set hi-perf mode protect state - * - * @param isEnabled - True to force hi-perf mode, false to leave it up to acquired wifiProtects - * @return true - success - * @return false - failed - */ - bool ChangeToPerfMode(bool isEnabled); - - /** - * @Description Handler for screen state (on/off) changes - * - * @param screenOn - screen on/off state - */ - void HandleScreenStateChanged(bool screenOn); - - /** - * @Description Handler for Wifi Client mode state changes - * - * @param isConnected - wifi client connect state - */ - void UpdateWifiClientConnected(bool isConnected); - -private: - WifiProtectManager(); - bool AddProtect(WifiProtect *pProtect); - bool ReleaseProtect(const std::string &name); - WifiProtect *RemoveProtect(const std::string &name); - bool ChangeWifiPowerMode(); - bool SetLowLatencyMode(bool enabled); - -private: - std::vector mWifiProtects; - WifiProtectMode mCurrentOpMode; - int mFullHighPerfProtectsAcquired; - int mFullHighPerfProtectsReleased; - int mFullLowLatencyProtectsAcquired; - int mFullLowLatencyProtectsReleased; - /* Not used: long mCurrentSessionStartTimeMs; */ - bool mWifiConnected; - bool mScreenOn; - bool mForceHiPerfMode; - bool mForceLowLatencyMode; -}; -} // namespace Wifi -} // namespace OHOS - +/* + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OHOS_WIFI_PROTECT_MANAGER_H +#define OHOS_WIFI_PROTECT_MANAGER_H + +#include +#include "wifi_protect.h" +#include "wifi_msg.h" + +namespace OHOS { +namespace Wifi { +class WifiProtectManager { +public: + ~WifiProtectManager(); + static WifiProtectManager &GetInstance(); + + /** + * @Description Validate that the protect mode is valid + * + * @param protectMode - The protect mode to verify + * @return true - valid + * @return false - invalid + */ + static bool IsValidProtectMode(WifiProtectMode &protectMode); + + /** + * @Description Get the nearly protect type currently held by the WifiProtectManager + * + * @return WifiProtectMode - currently held protect + */ + WifiProtectMode GetNearlyProtectMode(); + + /** + * @Description Create a Wifi Protect. + * + * @param protectMode - representation of the Wifi Protect type + * @param protectName - represent the protect name + * @return true - create the protect success + * @return false - create protect failed + */ + bool InitWifiProtect(const WifiProtectType &protectType, const std::string &protectName); + + /** + * @Description Allowing a calling app to acquire a Wifi Protect in the supplied mode + * + * @param protectMode - representation of the Wifi Protect type + * @param name - represent the protect + * @return true - acquired the protect success + * @return false - acquired protect failed + */ + bool GetWifiProtect(const WifiProtectMode &protectMode, const std::string name); + + /** + * @Description Applications to release a WiFi Wake protect + * + * @param name - represent the protect + * @return true - put protect success + * @return false - put failed, the caller did not hold this protect + */ + bool PutWifiProtect(const std::string &name); + + /** + * @Description Set hi-perf mode protect state + * + * @param isEnabled - True to force hi-perf mode, false to leave it up to acquired wifiProtects + * @return true - success + * @return false - failed + */ + bool ChangeToPerfMode(bool isEnabled); + + /** + * @Description Handler for screen state (on/off) changes + * + * @param screenOn - screen on/off state + */ + void HandleScreenStateChanged(bool screenOn); + + /** + * @Description Handler for Wifi Client mode state changes + * + * @param isConnected - wifi client connect state + */ + void UpdateWifiClientConnected(bool isConnected); + + /** + * @Description set low latency mode + * + * @param enabled - true: enable low latency, false: disable low latency + * @return bool - operate result + */ + bool SetLowLatencyMode(bool enabled); + +private: + WifiProtectManager(); + bool AddProtect(WifiProtect *pProtect); + bool ReleaseProtect(const std::string &name); + WifiProtect *RemoveProtect(const std::string &name); + bool ChangeWifiPowerMode(); + +private: + std::vector mWifiProtects; + WifiProtectMode mCurrentOpMode; + int mFullHighPerfProtectsAcquired; + int mFullHighPerfProtectsReleased; + int mFullLowLatencyProtectsAcquired; + int mFullLowLatencyProtectsReleased; + /* Not used: long mCurrentSessionStartTimeMs; */ + bool mWifiConnected; + bool mScreenOn; + bool mForceHiPerfMode; + bool mForceLowLatencyMode; +}; +} // namespace Wifi +} // namespace OHOS + #endif \ No newline at end of file diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface.cpp index 8d1cd59..dc077c5 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -63,30 +63,29 @@ ErrCode ScanInterface::Init() ErrCode ScanInterface::UnInit() { WIFI_LOGI("Enter ScanInterface::UnInit.\n"); - + CHECK_NULL_AND_RETURN(pScanService, WIFI_OPT_FAILED); pScanService->UnInitScanService(); - return WIFI_OPT_SUCCESS; } ErrCode ScanInterface::Scan(bool externFlag) { WIFI_LOGI("Enter ScanInterface::Scan\n"); - + CHECK_NULL_AND_RETURN(pScanService, WIFI_OPT_FAILED); return pScanService->Scan(externFlag); } ErrCode ScanInterface::ScanWithParam(const WifiScanParams &wifiScanParams) { WIFI_LOGI("Enter ScanInterface::ScanWithParam\n"); - + CHECK_NULL_AND_RETURN(pScanService, WIFI_OPT_FAILED); return pScanService->ScanWithParam(wifiScanParams); } ErrCode ScanInterface::DisableScan(bool disable) { WIFI_LOGI("Enter ScanInterface::DisableScan"); - + CHECK_NULL_AND_RETURN(pScanService, WIFI_OPT_FAILED); return pScanService->DisableScan(disable); } @@ -98,6 +97,7 @@ ErrCode ScanInterface::OnScreenStateChanged(int screenState) WIFI_LOGE("screenState param is error"); return WIFI_OPT_INVALID_PARAM; } + CHECK_NULL_AND_RETURN(pScanService, WIFI_OPT_FAILED); pScanService->HandleScreenStatusChanged(); return WIFI_OPT_SUCCESS; } @@ -105,7 +105,7 @@ ErrCode ScanInterface::OnScreenStateChanged(int screenState) ErrCode ScanInterface::OnClientModeStatusChanged(int staStatus) { WIFI_LOGI("Enter ScanInterface::OnClientModeStatusChanged\n"); - + CHECK_NULL_AND_RETURN(pScanService, WIFI_OPT_FAILED); pScanService->HandleStaStatusChanged(staStatus); pScanService->SetStaCurrentTime(); return WIFI_OPT_SUCCESS; @@ -113,19 +113,15 @@ ErrCode ScanInterface::OnClientModeStatusChanged(int staStatus) ErrCode ScanInterface::OnAppRunningModeChanged(ScanMode appRunMode) { - WIFI_LOGI("Enter ScanInterface::OnAppRunningModeChanged\n"); - - WIFI_LOGD("appRunMode=%{public}d", static_cast(appRunMode)); - + WIFI_LOGI("Enter ScanInterface::OnAppRunningModeChanged, appRunMode=%{public}d\n", static_cast(appRunMode)); return WIFI_OPT_SUCCESS; } ErrCode ScanInterface::OnMovingFreezeStateChange() { LOGI("Enter ScanInterface::OnMovingFreezeStateChange"); - + CHECK_NULL_AND_RETURN(pScanService, WIFI_OPT_FAILED); pScanService->HandleMovingFreezeChanged(); - return WIFI_OPT_SUCCESS; } @@ -137,6 +133,7 @@ ErrCode ScanInterface::OnCustomControlStateChanged(int customScene, int customSc WIFI_LOGE("screenState param is error"); return WIFI_OPT_INVALID_PARAM; } + CHECK_NULL_AND_RETURN(pScanService, WIFI_OPT_FAILED); pScanService->HandleCustomStatusChanged(customScene, customSceneStatus); return WIFI_OPT_SUCCESS; } @@ -144,7 +141,7 @@ ErrCode ScanInterface::OnCustomControlStateChanged(int customScene, int customSc ErrCode ScanInterface::OnGetCustomSceneState(std::map& sceneMap) const { WIFI_LOGI("Enter ScanInterface::OnGetCustomSceneState\n"); - + CHECK_NULL_AND_RETURN(pScanService, WIFI_OPT_FAILED); pScanService->HandleGetCustomSceneState(sceneMap); return WIFI_OPT_SUCCESS; } @@ -152,7 +149,7 @@ ErrCode ScanInterface::OnGetCustomSceneState(std::map& sceneMap) co ErrCode ScanInterface::OnControlStrategyChanged() { WIFI_LOGI("Enter ScanInterface::OnControlStrategyChanged\n"); - + CHECK_NULL_AND_RETURN(pScanService, WIFI_OPT_FAILED); pScanService->ClearScanControlValue(); pScanService->GetScanControlInfo(); pScanService->SystemScanProcess(true); diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn index 2744bf4..3a18bc5 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2021 Huawei Device Co., Ltd. +# Copyright (C) 2021-2022 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -21,9 +21,9 @@ ohos_shared_library("wifi_sta_service") { "../common/message_queue.cpp", "../common/state.cpp", "../common/state_machine.cpp", - "./net_conf/if_config.cpp", "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log/log_helper.c", "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/http_request.cpp", + "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp", "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp", "sta_auto_connect_service.cpp", "sta_interface.cpp", diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_define.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_define.h index 0ee332c..73cf0f6 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_define.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_define.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #ifndef OHOS_STA_DEFINE_H #define OHOS_STA_DEFINE_H @@ -76,13 +77,6 @@ const int NETWORK_5G_BAND = 2; #define BAND_2_G 1 #define BAND_5_G 2 -typedef enum EnumStaIpType { - IPTYPE_IPV4, - IPTYPE_IPV6, - IPTYPE_MIX, - IPTYPE_BUTT, -} StaIpType; - typedef enum EnumStaNetState { NETWORK_STATE_UNKNOWN, NETWORK_STATE_WORKING, diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.cpp index 2bdf289..8b7f6c0 100755 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "sta_interface.h" #include "sta_service.h" #include "wifi_logger.h" @@ -70,6 +71,7 @@ ErrCode StaInterface::EnableWifi() ErrCode StaInterface::DisableWifi() { LOGD("Enter StaInterface::DisableWifi.\n"); + CHECK_NULL_AND_RETURN(pStaService, WIFI_OPT_FAILED); if (pStaService->DisableWifi() != WIFI_OPT_SUCCESS) { LOGD("DisableWifi failed.\n"); return WIFI_OPT_FAILED; @@ -80,6 +82,7 @@ ErrCode StaInterface::DisableWifi() ErrCode StaInterface::ConnectToNetwork(int networkId) { LOGD("Enter StaInterface::Connect.\n"); + CHECK_NULL_AND_RETURN(pStaService, WIFI_OPT_FAILED); if (pStaService->ConnectToNetwork(networkId) != WIFI_OPT_SUCCESS) { LOGD("ConnectTo failed.\n"); return WIFI_OPT_FAILED; @@ -90,6 +93,7 @@ ErrCode StaInterface::ConnectToNetwork(int networkId) ErrCode StaInterface::ConnectToDevice(const WifiDeviceConfig &config) { LOGD("Enter StaInterface::Connect.\n"); + CHECK_NULL_AND_RETURN(pStaService, WIFI_OPT_FAILED); if (pStaService->ConnectToDevice(config) != WIFI_OPT_SUCCESS) { LOGD("ConnectTo failed.\n"); return WIFI_OPT_FAILED; @@ -100,6 +104,7 @@ ErrCode StaInterface::ConnectToDevice(const WifiDeviceConfig &config) ErrCode StaInterface::ReConnect() { LOGD("Enter StaInterface::ReConnect.\n"); + CHECK_NULL_AND_RETURN(pStaService, WIFI_OPT_FAILED); if (pStaService->ReConnect() != WIFI_OPT_SUCCESS) { LOGD("ReConnect failed.\n"); return WIFI_OPT_FAILED; @@ -110,6 +115,7 @@ ErrCode StaInterface::ReConnect() ErrCode StaInterface::ReAssociate() { LOGD("Enter StaInterface::ReAssociate.\n"); + CHECK_NULL_AND_RETURN(pStaService, WIFI_OPT_FAILED); if (pStaService->ReAssociate() != WIFI_OPT_SUCCESS) { LOGD("ReAssociate failed.\n"); return WIFI_OPT_FAILED; @@ -120,6 +126,7 @@ ErrCode StaInterface::ReAssociate() ErrCode StaInterface::Disconnect() { LOGD("Enter StaInterface::Disconnect.\n"); + CHECK_NULL_AND_RETURN(pStaService, WIFI_OPT_FAILED); if (pStaService->Disconnect() != WIFI_OPT_SUCCESS) { LOGD("Disconnect failed.\n"); return WIFI_OPT_FAILED; @@ -130,6 +137,7 @@ ErrCode StaInterface::Disconnect() int StaInterface::AddDeviceConfig(const WifiDeviceConfig &config) { LOGD("Enter StaInterface::AddDeviceConfig.\n"); + CHECK_NULL_AND_RETURN(pStaService, WIFI_OPT_FAILED); return pStaService->AddDeviceConfig(config); } @@ -142,6 +150,7 @@ int StaInterface::UpdateDeviceConfig(const WifiDeviceConfig &config) ErrCode StaInterface::RemoveDevice(int networkId) { LOGD("Enter StaInterface::RemoveDeviceConfig.\n"); + CHECK_NULL_AND_RETURN(pStaService, WIFI_OPT_FAILED); if (pStaService->RemoveDevice(networkId) != WIFI_OPT_SUCCESS) { LOGD("RemoveDeviceConfig failed.\n"); return WIFI_OPT_FAILED; @@ -152,7 +161,7 @@ ErrCode StaInterface::RemoveDevice(int networkId) ErrCode StaInterface::RemoveAllDevice() { WIFI_LOGD("Enter StaInterface::RemoveAllDevice.\n"); - + CHECK_NULL_AND_RETURN(pStaService, WIFI_OPT_FAILED); if (pStaService->RemoveAllDevice() != WIFI_OPT_SUCCESS) { WIFI_LOGD("RemoveAllDevice failed.\n"); return WIFI_OPT_FAILED; @@ -162,18 +171,21 @@ ErrCode StaInterface::RemoveAllDevice() ErrCode StaInterface::EnableDeviceConfig(int networkId, bool attemptEnable) { LOGD("Enter StaInterface::EnableDeviceConfig.\n"); + CHECK_NULL_AND_RETURN(pStaService, WIFI_OPT_FAILED); return pStaService->EnableDeviceConfig(networkId, attemptEnable); } ErrCode StaInterface::DisableDeviceConfig(int networkId) { LOGD("Enter StaInterface::DisableDeviceConfig.\n"); + CHECK_NULL_AND_RETURN(pStaService, WIFI_OPT_FAILED); return pStaService->DisableDeviceConfig(networkId); } ErrCode StaInterface::StartWps(const WpsConfig &config) { LOGD("Enter StaInterface::StartWps.\n"); + CHECK_NULL_AND_RETURN(pStaService, WIFI_OPT_FAILED); if (pStaService->StartWps(config) != WIFI_OPT_SUCCESS) { LOGD("StartWps failed.\n"); return WIFI_OPT_FAILED; @@ -184,6 +196,7 @@ ErrCode StaInterface::StartWps(const WpsConfig &config) ErrCode StaInterface::CancelWps() { LOGD("Enter StaInterface::CancelWps.\n"); + CHECK_NULL_AND_RETURN(pStaService, WIFI_OPT_FAILED); if (pStaService->CancelWps() != WIFI_OPT_SUCCESS) { LOGD("CancelWps failed.\n"); return WIFI_OPT_FAILED; @@ -194,6 +207,7 @@ ErrCode StaInterface::CancelWps() ErrCode StaInterface::ConnectivityManager(const std::vector &scanInfos) { LOGI("Enter Connection management.\n"); + CHECK_NULL_AND_RETURN(pStaService, WIFI_OPT_FAILED); if (pStaService->AutoConnectService(scanInfos) != WIFI_OPT_SUCCESS) { LOGD("ConnectivityManager failed.\n"); return WIFI_OPT_FAILED; @@ -204,6 +218,7 @@ ErrCode StaInterface::ConnectivityManager(const std::vector &scan ErrCode StaInterface::SetCountryCode(const std::string &countryCode) { LOGD("Enter StaInterface::SetCountryCode.\n"); + CHECK_NULL_AND_RETURN(pStaService, WIFI_OPT_FAILED); if (pStaService->SetCountryCode(countryCode) != WIFI_OPT_SUCCESS) { LOGD("SetCountryCode failed.\n"); return WIFI_OPT_FAILED; diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp index 3bf2772..f8828d8 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -72,7 +72,8 @@ void StaMonitor::SetStateMachine(StaStateMachine *paraStaStateMachine) pStaStateMachine = paraStaStateMachine; return; } -void StaMonitor::OnConnectChangedCallBack(int status, int networkId,const std::string &bssid) + +void StaMonitor::OnConnectChangedCallBack(int status, int networkId, const std::string &bssid) { WIFI_LOGI("OnConnectChangedCallBack() status:%{public}d,networkId=%{public}d,bssid=%{private}s", status, @@ -88,6 +89,12 @@ void StaMonitor::OnConnectChangedCallBack(int status, int networkId,const std::s break; } case WPA_CB_DISCONNECTED: { + WifiLinkedInfo linkedInfo; + pStaStateMachine->GetLinkedInfo(linkedInfo); + if ((linkedInfo.connState == ConnState::DISCONNECTED) && (linkedInfo.bssid != bssid)) { + WIFI_LOGI("Sta ignored the disconnect event for bssid is mismatch!"); + break; + } pStaStateMachine->SendMessage(WIFI_SVR_CMD_STA_NETWORK_DISCONNECTION_EVENT); break; } diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp index d0a901e..4161bef 100755 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "sta_state_machine.h" #include #include "log_helper.h" @@ -1860,18 +1861,21 @@ StaStateMachine::DhcpResultNotify::~DhcpResultNotify() void StaStateMachine::DhcpResultNotify::OnSuccess(int status, const std::string &ifname, DhcpResult &result) { - LOGI("Enter DhcpResultNotify::OnSuccess. ifname=[%s] status=[%d]\n", ifname.c_str(), status); + LOGI("Enter Sta DhcpResultNotify::OnSuccess. ifname=[%{public}s] status=[%d]\n", ifname.c_str(), status); + if ((pStaStateMachine->linkedInfo.detailedState == DetailedState::DISCONNECTING) || (pStaStateMachine->linkedInfo.detailedState == DetailedState::DISCONNECTED)) { return; } - WIFI_LOGD("iptype=%d, ip=%s, gateway=%s, subnet=%s, serverAddress=%s, leaseDuration=%d", + WIFI_LOGD("iptype=%{public}d, ip=%{private}s, gateway=%{private}s, \ + subnet=%{private}s, serverAddress=%{private}s, leaseDuration=%d", result.iptype, result.strYourCli.c_str(), result.strRouter1.c_str(), result.strSubnet.c_str(), result.strServer.c_str(), result.uLeaseTime); + IpInfo ipInfo; WifiSettings::GetInstance().GetIpInfo(ipInfo); if (!((IpTools::ConvertIpv4Address(result.strYourCli) == ipInfo.ipAddress) && @@ -1892,16 +1896,15 @@ void StaStateMachine::DhcpResultNotify::OnSuccess(int status, const std::string WifiSettings::GetInstance().SaveLinkedInfo(pStaStateMachine->linkedInfo); } - IfConfig::GetInstance().SetIfAddr(result, result.iptype); + IfConfig::GetInstance().SetIfDnsAndRoute(result, result.iptype); if (pStaStateMachine->getIpSucNum == 0 || pStaStateMachine->isRoam) { pStaStateMachine->SaveLinkstate(ConnState::CONNECTED, DetailedState::CONNECTED); pStaStateMachine->staCallback.OnStaConnChanged( OperateResState::CONNECT_AP_CONNECTED, pStaStateMachine->linkedInfo); /* Wait for the network adapter information to take effect. */ sleep(SLEEPTIME); - - /* Check whether the Internet access is normal by send http. */ - pStaStateMachine->pNetcheck->SignalNetCheckThread(); + /* Check whether the Internet access is normal by send http. */ + pStaStateMachine->pNetcheck->SignalNetCheckThread(); } } pStaStateMachine->getIpSucNum++; @@ -1956,6 +1959,11 @@ void StaStateMachine::SaveLinkstate(ConnState state, DetailedState detailState) WifiSettings::GetInstance().SaveLinkedInfo(linkedInfo); } +int StaStateMachine::GetLinkedInfo(WifiLinkedInfo& linkedInfo) +{ + return WifiSettings::GetInstance().GetLinkedInfo(linkedInfo); +} + ErrCode StaStateMachine::DisableNetwork(int networkId) { if (WifiStaHalInterface::GetInstance().DisableNetwork(networkId) != WIFI_IDL_OPT_OK) { @@ -1971,7 +1979,6 @@ ErrCode StaStateMachine::DisableNetwork(int networkId) return WIFI_OPT_SUCCESS; } - void StaStateMachine::SetOperationalMode(int mode) { SendMessage(WIFI_SVR_CMD_STA_OPERATIONAL_MODE, mode, 0); diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h index 53aa254..b877dc2 100755 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -350,6 +350,14 @@ public: */ ErrCode ConvertDeviceCfg(const WifiDeviceConfig &config) const; + /** + * @Description Get linked info. + * + * @param linkedInfo - linked info + * @return int - operation result + */ + int GetLinkedInfo(WifiLinkedInfo& linkedInfo); + private: /** * @Description Destruct state. diff --git a/services/wifi_standard/wifi_hal/etc/init/BUILD.gn b/services/wifi_standard/wifi_hal/etc/init/BUILD.gn index dc0c717..9e1db89 100755 --- a/services/wifi_standard/wifi_hal/etc/init/BUILD.gn +++ b/services/wifi_standard/wifi_hal/etc/init/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2021 Huawei Device Co., Ltd. +# Copyright (C) 2021-2022 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -16,6 +16,7 @@ import("//build/ohos.gni") group("etc") { deps = [ ":hostapd.conf", + ":p2p_supplicant.conf", ":wifi_hal_service.rc", ":wpa_supplicant.conf", ] @@ -45,3 +46,10 @@ ohos_prebuilt_etc("hostapd.conf") { part_name = "wifi_standard" subsystem_name = "communication" } + +ohos_prebuilt_etc("p2p_supplicant.conf") { + source = "p2p_supplicant.conf" + relative_install_dir = "wifi" + part_name = "wifi_standard" + subsystem_name = "communication" +} diff --git a/services/wifi_standard/wifi_hal/etc/init/p2p_supplicant.conf b/services/wifi_standard/wifi_hal/etc/init/p2p_supplicant.conf new file mode 100755 index 0000000..37ceb04 --- /dev/null +++ b/services/wifi_standard/wifi_hal/etc/init/p2p_supplicant.conf @@ -0,0 +1,26 @@ +# Copyright (C) 2022 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +ctrl_interface=udp +device_name=p2p_ohos +manufacturer=ohos +device_type=10-0050F204-5 +config_methods=virtual_push_button physical_display keypad +p2p_listen_reg_class=81 +p2p_listen_channel=1 +p2p_oper_reg_class=81 +p2p_oper_channel=1 +p2p_go_intent=0 +persistent_reconnect=1 +serial_number=0123456789ABCDEF +p2p_ssid_postfix=-ohos diff --git a/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c b/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c index db75e53..827f3ba 100644 --- a/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c +++ b/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,12 +12,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "wifi_hal_ap_interface.h" #include #include #include "wifi_hal_module_manage.h" #include "wifi_hal_common_func.h" #include "wifi_log.h" +#include "wifi_wpa_hal.h" #include "wifi_hostapd_hal.h" #undef LOG_TAG @@ -27,25 +29,6 @@ static const char *g_serviceName = "hostapd"; static const char *g_startCmd = "hostapd /data/misc/wifi/wpa_supplicant/hostapd.conf"; -static int ExcuteStaCmd(const char *szCmd) -{ - int ret = system(szCmd); - if (ret == -1) { - LOGE("system cmd %{public}s failed!", szCmd); - } else { - if (WIFEXITED(ret)) { - if (WEXITSTATUS(ret) == 0) { - return 0; - } - LOGE("system cmd %{public}s failed, return status %{public}d", szCmd, WEXITSTATUS(ret)); - } else { - LOGE("system cmd %{public}s failed", szCmd); - } - } - - return -1; -} - WifiErrorNo StartSoftAp(void) { LOGD("Ready to start hostapd"); @@ -76,13 +59,13 @@ WifiErrorNo StartHostapd(void) return -1; } - ExcuteStaCmd(szCmd); + ExcuteCmd(szCmd); } ModuleManageRetCode ret = StartModule(g_serviceName, g_startCmd); if (ret == MM_SUCCESS) { return WIFI_HAL_SUCCESS; } - + LOGE("start hostapd failed!"); return WIFI_HAL_FAILED; } diff --git a/services/wifi_standard/wifi_hal/wifi_hal_callback.c b/services/wifi_standard/wifi_hal/wifi_hal_callback.c index 2a2bfa9..04c6361 100644 --- a/services/wifi_standard/wifi_hal/wifi_hal_callback.c +++ b/services/wifi_standard/wifi_hal/wifi_hal_callback.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -44,7 +44,6 @@ static void EmitEventCallbackMsg(WifiHalEventCallbackMsg *pCbkMsg, WifiHalEvent return; } - void WifiHalCbNotifyScanEnd(int status) { LOGD("Get Scan status: %{public}d, and begin push notify message", status); diff --git a/services/wifi_standard/wifi_hal/wifi_hal_crpc_p2p.c b/services/wifi_standard/wifi_hal/wifi_hal_crpc_p2p.c index 3114818..9965c3c 100644 --- a/services/wifi_standard/wifi_hal/wifi_hal_crpc_p2p.c +++ b/services/wifi_standard/wifi_hal/wifi_hal_crpc_p2p.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -899,4 +899,27 @@ int RpcP2pAddNetwork(RpcServer *server, Context *context) } WriteEnd(context); return 0; +} + +int RpcP2pHid2dConnect(RpcServer *server, Context *context) +{ + if (server == NULL || context == NULL) { + return -1; + } + + Hid2dConnectInfo info; + if (memset_s(&info, sizeof(info), 0, sizeof(info)) != EOK) { + return -1; + } + if (ReadStr(context, info.ssid, sizeof(info.ssid)) != 0 || + ReadStr(context, info.bssid, sizeof(info.bssid)) != 0 || + ReadStr(context, info.passphrase, sizeof(info.passphrase)) != 0 || + ReadInt(context, &info.frequency) < 0) { + return -1; + } + WifiErrorNo err = P2pHid2dConnect(&info); + WriteBegin(context, 0); + WriteInt(context, err); + WriteEnd(context); + return 0; } \ No newline at end of file diff --git a/services/wifi_standard/wifi_hal/wifi_hal_crpc_p2p.h b/services/wifi_standard/wifi_hal/wifi_hal_crpc_p2p.h index da6cd33..5da0ac6 100644 --- a/services/wifi_standard/wifi_hal/wifi_hal_crpc_p2p.h +++ b/services/wifi_standard/wifi_hal/wifi_hal_crpc_p2p.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -425,6 +425,15 @@ int RpcP2pGetGroupConfig(RpcServer *server, Context *context); */ int RpcP2pAddNetwork(RpcServer *server, Context *context); +/** + * @Description P2P Connect. + * + * @param server - Pointer to the global structure of the communication server. + * @param context - Pointer to the global communication context structure of the server. + * @return int - 0 Success, -1 Failed. + */ +int RpcP2pHid2dConnect(RpcServer *server, Context *context); + #ifdef __cplusplus } #endif diff --git a/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.c b/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.c index 870aef2..52a6ec1 100644 --- a/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.c +++ b/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "wifi_hal_crpc_server.h" #include "wifi_hal_crpc_base.h" #include "wifi_hal_crpc_chip.h" @@ -235,6 +236,7 @@ static int InitRpcFuncMapP2p(void) ret += PushRpcFunc("P2pSetGroupConfig", RpcP2pSetGroupConfig); ret += PushRpcFunc("P2pGetGroupConfig", RpcP2pGetGroupConfig); ret += PushRpcFunc("P2pAddNetwork", RpcP2pAddNetwork); + ret += PushRpcFunc("P2pHid2dConnect", RpcP2pHid2dConnect); return ret; } diff --git a/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c b/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c index 4614a33..4fabeb3 100644 --- a/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c +++ b/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "wifi_wpa_hal.h" #include #include @@ -740,9 +741,11 @@ static int WpaCliAddIface(WifiWpaInterface *p, const AddInterfaceArgv *argv) StrSafeCopy(info->name, sizeof(info->name), argv->name); char cmd[WPA_CMD_BUF_LEN] = {0}; char buf[WPA_CMD_REPLY_BUF_SMALL_LEN] = {0}; + LOGI("WpaCliAddIface CMD: %{public}s", cmd); if (snprintf_s(cmd, sizeof(cmd), sizeof(cmd) - 1, "INTERFACE_ADD %s\t%s", argv->name, argv->confName) < 0 || WpaCliCmd(cmd, buf, sizeof(buf)) != 0) { free(info); + LOGI("WpaCliAddIface buf: %{public}s", buf); return -1; } info->num += 1; @@ -826,3 +829,22 @@ WpaCtrl *GetWpaCtrl(void) } return &g_wpaInterface->wpaCtrl; } + +int ExcuteCmd(const char *szCmd) +{ + int ret = system(szCmd); + if (ret == -1) { + LOGE("system cmd %{public}s failed!", szCmd); + } else { + if (WIFEXITED(ret)) { + if (WEXITSTATUS(ret) == 0) { + return 0; + } + LOGE("system cmd %{public}s failed, return status %{public}d", szCmd, WEXITSTATUS(ret)); + } else { + LOGE("system cmd %{public}s failed", szCmd); + } + } + + return -1; +} diff --git a/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.h b/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.h index 73c6ab3..64e6ace 100644 --- a/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.h +++ b/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,8 +12,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #ifndef WIFI_WPA_HAL_H #define WIFI_WPA_HAL_H + #include #include #include @@ -26,6 +28,7 @@ extern "C" { #endif #define WIFI_CONF_FILE_PATH_LEN 256 +#define BUFF_SIZE 1024 typedef struct AddInterfaceArgv { char name[WIFI_IFACE_NAME_MAXLEN]; @@ -55,6 +58,7 @@ struct stWifiWpaInterface { WifiWpaInterface *GetWifiWapGlobalInterface(void); void ReleaseWpaGlobalInterface(void); WpaCtrl *GetWpaCtrl(void); +int ExcuteCmd(const char *szCmd); #ifdef __cplusplus } diff --git a/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal/wifi_p2p_hal.c b/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal/wifi_p2p_hal.c index 136d411..730ba4d 100644 --- a/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal/wifi_p2p_hal.c +++ b/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal/wifi_p2p_hal.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -191,6 +191,7 @@ static P2pSupplicantErrCode WpaP2pCliCmdSetWpsDeviceType(WifiWpaP2pInterface *th LOGE("snprintf err"); return P2P_SUP_ERRCODE_FAILED; } + LOGI("Set device type CMD: %{public}s", cmd); if (WpaCliCmd(cmd, buf, sizeof(buf)) != 0) { LOGE("set device_type command failed!"); return P2P_SUP_ERRCODE_FAILED; @@ -1226,6 +1227,32 @@ static P2pSupplicantErrCode WpaP2pCliCmdAddNetwork(WifiWpaP2pInterface *this, in return P2P_SUP_ERRCODE_SUCCESS; } +static P2pSupplicantErrCode WpaP2pHid2dCliCmdConnect(WifiWpaP2pInterface *this, Hid2dConnectInfo *info) +{ + if (this == NULL || info == NULL) { + return P2P_SUP_ERRCODE_INVALID; + } + + char buf[P2P_REPLY_BUF_SMALL_LENGTH] = {0}; + char cmd[P2P_CMD_BUF_LENGTH] = {0}; + if (snprintf_s(cmd, sizeof(cmd), sizeof(cmd) - 1, "IFNAME=%s MAGICLINK \"%s\"\n%s\n\"%s\"\n%d", this->ifName, + info->ssid, info->bssid, info->passphrase, info->frequency) < 0) { + LOGE("hid2d connect snprintf err"); + return P2P_SUP_ERRCODE_FAILED; + } + + LOGI("hid2d_connect, frequency = %{public}d", info->frequency); + if (WpaCliCmd(cmd, buf, sizeof(buf)) != 0) { + LOGE("hid2d_connect command failed!"); + return P2P_SUP_ERRCODE_FAILED; + } + if (strncmp(buf, "FAIL", strlen("FAIL")) == 0) { + LOGE("P2p hid2d_connect return %{public}s", buf); + return P2P_SUP_ERRCODE_FAILED; + } + return P2P_SUP_ERRCODE_SUCCESS; +} + static void InitGlobalWpaP2pFunc(void) { g_wpaP2pInterface->wpaP2pCliCmdSetWpsName = WpaP2pCliCmdSetWpsName; @@ -1264,6 +1291,7 @@ static void InitGlobalWpaP2pFunc(void) g_wpaP2pInterface->wpaP2pCliCmdSetGroupConfig = WpaP2pCliCmdSetGroupConfig; g_wpaP2pInterface->wpaP2pCliCmdGetGroupConfig = WpaP2pCliCmdGetGroupConfig; g_wpaP2pInterface->wpaP2pCliCmdAddNetwork = WpaP2pCliCmdAddNetwork; + g_wpaP2pInterface->wpaP2pCliCmdHid2dConnect = WpaP2pHid2dCliCmdConnect; return; } diff --git a/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal/wifi_p2p_hal.h b/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal/wifi_p2p_hal.h index 8f02755..c984cbc 100644 --- a/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal/wifi_p2p_hal.h +++ b/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal/wifi_p2p_hal.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -76,6 +76,7 @@ struct stWifiWpaP2pInterface { P2pSupplicantErrCode (*wpaP2pCliCmdSetGroupConfig)(WifiWpaP2pInterface *p, const P2pWpaGroupConfigArgv *argv); P2pSupplicantErrCode (*wpaP2pCliCmdGetGroupConfig)(WifiWpaP2pInterface *p, P2pWpaGroupConfigArgv *argv); P2pSupplicantErrCode (*wpaP2pCliCmdAddNetwork)(WifiWpaP2pInterface *p, int *networkId); + P2pSupplicantErrCode (*wpaP2pCliCmdHid2dConnect)(WifiWpaP2pInterface *p, Hid2dConnectInfo *info); }; typedef struct stWifiWpaP2pGroupInterface WifiWpaP2pGroupInterface; diff --git a/services/wifi_standard/wifi_hal/wifi_hal_p2p_interface.c b/services/wifi_standard/wifi_hal/wifi_hal_p2p_interface.c index 53f2623..e8f9b60 100644 --- a/services/wifi_standard/wifi_hal/wifi_hal_p2p_interface.c +++ b/services/wifi_standard/wifi_hal/wifi_hal_p2p_interface.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -33,6 +33,21 @@ static int g_p2pSupplicantConnectEvent = 0; static WifiErrorNo P2pStartSupplicant(void) { + LOGD("Start p2p supplicant"); + const char *p2pConf = "/data/misc/wifi/wpa_supplicant/p2p_supplicant.conf"; + if ((access(p2pConf, F_OK)) != -1) { + LOGD("p2p configure file %{public}s is exist.", p2pConf); + } else { + char szcpCmd[BUFF_SIZE] = {0}; + const char *cpP2pConfCmd = "cp /system/etc/wifi/p2p_supplicant.conf /data/misc/wifi/wpa_supplicant"; + int iRet = snprintf_s(szcpCmd, sizeof(szcpCmd), sizeof(szcpCmd) - 1, "%s", cpP2pConfCmd); + if (iRet < 0) { + return WIFI_HAL_FAILED; + } + + ExcuteCmd(szcpCmd); + } + ModuleManageRetCode ret = StartModule(g_wpaSupplicantP2p, g_systemCmdWpaP2pStart); if (ret == MM_SUCCESS) { return WIFI_HAL_SUCCESS; @@ -995,3 +1010,22 @@ WifiErrorNo P2pAddNetwork(int *networkId) } return WIFI_HAL_SUCCESS; } + +WifiErrorNo P2pHid2dConnect(Hid2dConnectInfo *info) +{ + if (info == NULL) { + LOGE("P2pHid2dConnect, info is NULL"); + return WIFI_HAL_FAILED; + } + LOGD("P2pHid2dConnect"); + WifiWpaP2pInterface *pMainIfc = GetWifiWapP2pInterface(); + if (pMainIfc == NULL) { + return WIFI_HAL_SUPPLICANT_NOT_INIT; + } + P2pSupplicantErrCode ret = pMainIfc->wpaP2pCliCmdHid2dConnect(pMainIfc, info); + if (ret != P2P_SUP_ERRCODE_SUCCESS) { + LOGE("wpaP2pHid2dCliCmdConnect fail, ret = %{public}d", ret); + return ConvertP2pErrCode(ret); + } + return WIFI_HAL_SUCCESS; +} \ No newline at end of file diff --git a/services/wifi_standard/wifi_hal/wifi_hal_p2p_interface.h b/services/wifi_standard/wifi_hal/wifi_hal_p2p_interface.h index 3815239..bcaf1dd 100644 --- a/services/wifi_standard/wifi_hal/wifi_hal_p2p_interface.h +++ b/services/wifi_standard/wifi_hal/wifi_hal_p2p_interface.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -418,6 +418,14 @@ WifiErrorNo P2pGetGroupConfig(int networkId, HidlP2pGroupConfig *pConfig, int si */ WifiErrorNo P2pAddNetwork(int *networkId); +/** + * @Description Connect + * + * @param info - connection information + * @return WifiErrorNo + */ +WifiErrorNo P2pHid2dConnect(Hid2dConnectInfo *info); + #ifdef __cplusplus } #endif diff --git a/services/wifi_standard/wifi_hal/wifi_hal_p2p_struct.h b/services/wifi_standard/wifi_hal/wifi_hal_p2p_struct.h index 58ca3f4..84e4b9e 100644 --- a/services/wifi_standard/wifi_hal/wifi_hal_p2p_struct.h +++ b/services/wifi_standard/wifi_hal/wifi_hal_p2p_struct.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -145,6 +145,13 @@ typedef struct P2pWpaGroupConfigArgv { char value[WIFI_P2P_GROUP_CONFIG_VALUE_LENGTH]; /* set network value */ } P2pWpaGroupConfigArgv; +typedef struct Hid2dConnectInfo { + char ssid[WIFI_SSID_LENGTH]; + char bssid[WIFI_BSSID_LENGTH]; + char passphrase[WIFI_P2P_PASSWORD_SIZE]; + int frequency; +} Hid2dConnectInfo; + #ifdef __cplusplus } #endif diff --git a/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c b/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c index b848cf6..60f31d0 100644 --- a/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c +++ b/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "wifi_hal_sta_interface.h" #include "securec.h" #include "wifi_hal_adapter.h" @@ -22,32 +23,13 @@ #undef LOG_TAG #define LOG_TAG "WifiHalStaInterface" -#define BUFF_SIZE 1024 + #define WPA_CMD_STOP_LENG 64 #define WPA_TRY_CONNECT_SLEEP_TIME (100 * 1000) /* 100ms */ static const char *g_serviceName = "wpa_supplicant"; static const char *g_startCmd = "wpa_supplicant -iglan0 -g/data/misc/wifi/sockets"; -static int ExcuteStaCmd(const char *szCmd) -{ - int ret = system(szCmd); - if (ret == -1) { - LOGE("system cmd %{public}s failed!", szCmd); - } else { - if (WIFEXITED(ret)) { - if (WEXITSTATUS(ret) == 0) { - return 0; - } - LOGE("system cmd %{public}s failed, return status %{public}d", szCmd, WEXITSTATUS(ret)); - } else { - LOGE("system cmd %{public}s failed", szCmd); - } - } - - return -1; -} - static WifiErrorNo AddWpaIface(int staNo) { WifiWpaInterface *pWpaInterface = GetWifiWapGlobalInterface(); @@ -160,9 +142,10 @@ WifiErrorNo ForceStop(void) WifiErrorNo StartSupplicant(void) { + LOGD("Start supplicant"); const char *wpaConf = "/data/misc/wifi/wpa_supplicant/wpa_supplicant.conf"; if ((access(wpaConf, F_OK)) != -1) { - LOGD("wpa configure file %{private}s is exist.", wpaConf); + LOGD("wpa configure file %{public}s is exist.", wpaConf); } else { char szcpCmd[BUFF_SIZE] = {0}; const char *cpWpaConfCmd = "cp /system/etc/wifi/wpa_supplicant.conf /data/misc/wifi/wpa_supplicant"; @@ -171,7 +154,7 @@ WifiErrorNo StartSupplicant(void) return WIFI_HAL_FAILED; } - ExcuteStaCmd(szcpCmd); + ExcuteCmd(szcpCmd); } ModuleManageRetCode ret = StartModule(g_serviceName, g_startCmd); @@ -184,6 +167,7 @@ WifiErrorNo StartSupplicant(void) WifiErrorNo StopSupplicant(void) { + LOGD("Stop supplicant"); ModuleManageRetCode ret = StopModule(g_serviceName); if (ret == MM_FAILED) { LOGE("stop wpa_supplicant failed!"); diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/mock_wifi_hal_service.c b/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/mock_wifi_hal_service.c index 741de69..ccdd105 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/mock_wifi_hal_service.c +++ b/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/mock_wifi_hal_service.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -760,4 +760,8 @@ WifiErrorNo P2pAddNetwork(int *networkId) return WIFI_HAL_SUCCESS; } +WifiErrorNo P2pHid2dConnect(Hid2dConnectInfo *info) +{ + return WIFI_HAL_SUCCESS; +} /*--------------- wifi_hal_p2p_interface.h end---------------------------*/ diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn index ccd322e..ff68257 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2021 Huawei Device Co., Ltd. +# Copyright (C) 2021-2022 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -32,6 +32,7 @@ ohos_unittest("WifiApServiceTest") { "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log/log_helper.c", "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/base_address.cpp", "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/dhcpd_interface.cpp", + "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp", "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.cpp", "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.cpp", "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp", diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager_test.cpp b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager_test.cpp index 0ef574f..7b9bac6 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager_test.cpp +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager_test.cpp @@ -52,10 +52,6 @@ public: { return mApNatManager.WriteDataToFile(fileName, content); } - bool WrapExecCommand(const std::vector &vecCommandArg) - { - return mApNatManager.ExecCommand(vecCommandArg); - } public: std::string ifc1 = "wlan1"; @@ -138,16 +134,5 @@ HWTEST_F(WifiApNatManager_test, WriteDataToFile_SUCCESS, TestSize.Level1) MockSystemInterface::SetMockFlag(false); } -HWTEST_F(WifiApNatManager_test, ExecCommand_SUCCESS, TestSize.Level1) -{ - MockSystemInterface::SetMockFlag(true); - std::vector str; - EXPECT_CALL(MockSystemInterface::GetInstance(), system(_)).WillOnce(Return(true)).WillRepeatedly(Return(-1)); - - EXPECT_TRUE(WrapExecCommand(str)); - EXPECT_FALSE(WrapExecCommand(str)); - - MockSystemInterface::SetMockFlag(false); -} } // namespace Wifi } // namespace OHOS \ No newline at end of file diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn index 185555d..f9fdd98 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2021 Huawei Device Co., Ltd. +# Copyright (C) 2021-2022 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -25,6 +25,7 @@ ohos_unittest("wifi_p2p_test") { module_out_path = "wifi_standard/p2p_test" sources = [ "./Mock/mock_wifi_p2p_hal_interface.cpp", + "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hid2d_msg.cpp", "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_msg.cpp", "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp", "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp", @@ -43,6 +44,7 @@ ohos_unittest("wifi_p2p_test") { "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state.cpp", "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp", "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_broadcast_helper.cpp", + "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_service_utils.cpp", "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/authorizing_negotiation_request_state.cpp", "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.cpp", "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.cpp", @@ -109,14 +111,6 @@ ohos_unittest("wifi_p2p_test") { "wifi_p2p_upnp_service_info_test.cpp", "wifi_p2p_upnp_service_request_test.cpp", "wifi_p2p_upnp_service_response_test.cpp", - - #"//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/samples/test_all/mock_ui/system_ui.cpp", - #"//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/samples/test_all/libaxprintf/xprint.c", - #"//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/samples/test_all/libaxprintf/log.c", - #"//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/samples/test_all/mock_ui/alert_dialog.cpp", - #"//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/samples/test_all/mock_ui/handle_message.cpp", - #"//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/samples/test_all/mock_ui/tcp_client.cpp", - #"//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/samples/test_all/mock_ui/tcp_server.cpp", ] include_dirs = [ @@ -140,17 +134,12 @@ ohos_unittest("wifi_p2p_test") { "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface", "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include", "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/interfaces", - - #"//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/samples/test_all/libaxprintf", - #"//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/samples/test_all/mock_ui", "//third_party/googletest/googlemock/include", "//third_party/googletest/googletest/include", ] deps = [ "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service:dhcp_manager_service", - - #"//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/samples/test_all:all_test", "//third_party/googletest:gmock_main", "//utils/native/base:utils", ] diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_hal_interface.h b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_hal_interface.h index 871acea..b942b5e 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_hal_interface.h +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_hal_interface.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -23,6 +23,7 @@ #include "wifi_error_no.h" #include "wifi_idl_struct.h" #include "wifi_p2p_event_callback.h" +#include "wifi_hid2d_msg.h" namespace OHOS { namespace Wifi { @@ -79,6 +80,7 @@ public: virtual WifiErrorNo P2pAddNetwork(int &networkId) const = 0; virtual WifiErrorNo SetPersistentReconnect(int mode) const = 0; virtual WifiErrorNo SetP2pSecondaryDeviceType(const std::string &type) = 0; + virtual WifiErrorNo Hid2dConnect(const Hid2dConnectConfig &config) const = 0; }; class WifiP2PHalInterface : public MockWifiP2PHalInterface { @@ -136,6 +138,7 @@ public: MOCK_CONST_METHOD1(P2pAddNetwork, WifiErrorNo(int &networkId)); MOCK_CONST_METHOD1(SetPersistentReconnect, WifiErrorNo(int mode)); MOCK_METHOD1(SetP2pSecondaryDeviceType, WifiErrorNo(const std::string &type)); + MOCK_CONST_METHOD1(Hid2dConnect, WifiErrorNo(const Hid2dConnectConfig &config)); }; } // namespace Wifi } // namespace OHOS diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_if_config.h b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_if_config.h index 0d27463..baf0a4d 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_if_config.h +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_if_config.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -20,10 +20,17 @@ namespace OHOS { namespace Wifi { +typedef enum IpType { + IPTYPE_IPV4, + IPTYPE_IPV6, + IPTYPE_MIX, + IPTYPE_BUTT, +} IpType; + class MockIfConfig { public: virtual ~MockIfConfig() = default; - virtual int SetIfAddr(const DhcpResult &dhcpInfo, int ipType) = 0; + virtual int SetIfDnsAndRoute(const DhcpResult &dhcpInfo, int ipType) = 0; virtual void SetProxy(bool isAuto, const std::string &proxy, const std::string &port, const std::string &noProxys, const std::string &pac) = 0; virtual void FlushIpAddr(const std::string &ifName, const int &ipType) = 0; @@ -34,7 +41,7 @@ public: IfConfig() = default; ~IfConfig() = default; static IfConfig &GetInstance(void); - MOCK_METHOD2(SetIfAddr, int(const DhcpResult &dhcpInfo, int ipType)); + MOCK_METHOD2(SetIfDnsAndRoute, int(const DhcpResult &dhcpInfo, int ipType)); MOCK_METHOD5(SetProxy, void(bool isAuto, const std::string &proxy, const std::string &port, const std::string &noProxys, const std::string &pac)); MOCK_METHOD2(FlushIpAddr, void(const std::string &ifName, const int &ipType)); diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine_test.cpp b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine_test.cpp index 99f252e..dd34250 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine_test.cpp +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -24,6 +24,7 @@ #include "mock_if_config.h" #include #include "internal_message.h" +#include "mock_if_config.h" using ::testing::_; using ::testing::AtLeast; @@ -1062,7 +1063,7 @@ public: EXPECT_CALL(WifiSettings::GetInstance(), SaveIpInfo(_)).Times(AtLeast(0)); ; EXPECT_CALL(WifiSettings::GetInstance(), SaveLinkedInfo(_)).Times(AtLeast(0)); - EXPECT_CALL(IfConfig::GetInstance(), SetIfAddr(_, _)).Times(AtLeast(0)); + EXPECT_CALL(IfConfig::GetInstance(), SetIfDnsAndRoute(_, _)).Times(AtLeast(0)); EXPECT_CALL(WifiManager::GetInstance(), DealStaConnChanged(_, _)).Times(AtLeast(0)); EXPECT_TRUE(pStaStateMachine->ConfigStaticIpAddress(staticIpAddress)); } @@ -1075,7 +1076,7 @@ public: pStaStateMachine->getIpSucNum = 1; pStaStateMachine->isRoam = false; StaticIpAddress staticIpAddress; - EXPECT_CALL(IfConfig::GetInstance(), SetIfAddr(_, _)).Times(AtLeast(0)); + EXPECT_CALL(IfConfig::GetInstance(), SetIfDnsAndRoute(_, _)).Times(AtLeast(0)); EXPECT_CALL(WifiSettings::GetInstance(), SaveIpInfo(_)).Times(AtLeast(0)); EXPECT_CALL(WifiSettings::GetInstance(), SaveLinkedInfo(_)).Times(AtLeast(0)); EXPECT_CALL(WifiManager::GetInstance(), DealStaConnChanged(_, _)).Times(AtLeast(0)); @@ -1092,7 +1093,7 @@ public: StaticIpAddress staticIpAddress; EXPECT_CALL(WifiSettings::GetInstance(), SaveIpInfo(_)).Times(AtLeast(0)); EXPECT_CALL(WifiSettings::GetInstance(), SaveLinkedInfo(_)).Times(AtLeast(0)); - EXPECT_CALL(IfConfig::GetInstance(), SetIfAddr(_, _)).Times(AtLeast(0)); + EXPECT_CALL(IfConfig::GetInstance(), SetIfDnsAndRoute(_, _)).Times(AtLeast(0)); EXPECT_CALL(WifiManager::GetInstance(), DealStaConnChanged(_, _)).Times(AtLeast(0)); EXPECT_TRUE(pStaStateMachine->ConfigStaticIpAddress(staticIpAddress)); } @@ -1105,7 +1106,7 @@ public: pStaStateMachine->isRoam = false; EXPECT_CALL(WifiSettings::GetInstance(), SaveIpInfo(_)).Times(AtLeast(0)); EXPECT_CALL(WifiSettings::GetInstance(), SaveLinkedInfo(_)).Times(AtLeast(0)); - EXPECT_CALL(IfConfig::GetInstance(), SetIfAddr(_, _)).Times(AtLeast(0)); + EXPECT_CALL(IfConfig::GetInstance(), SetIfDnsAndRoute(_, _)).Times(AtLeast(0)); EXPECT_FALSE(pStaStateMachine->ConfigStaticIpAddress(staticIpAddress)); } diff --git a/utils/inc/wifi_common_util.h b/utils/inc/wifi_common_util.h index c141c32..3806816 100755 --- a/utils/inc/wifi_common_util.h +++ b/utils/inc/wifi_common_util.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -17,6 +17,7 @@ #define OHOS_WIFI_COMMON_UTIL_H #include +#include #include "securec.h" #ifndef WIFI_MAC_LEN @@ -85,6 +86,15 @@ int Ip2Number(const std::string& strIp); * @return string - string IP address */ std::string Number2Ip(int intIp); + +/** + * @Description Splitting strings by delimiter + * + * @param str - Input string + * @param delim - Split delimiter + * @return std::vector - Split result + */ +std::vector StrSplit(const std::string& str, const std::string& delim); } // namespace Wifi } // namespace OHOS #endif \ No newline at end of file diff --git a/utils/src/wifi_common_util.cpp b/utils/src/wifi_common_util.cpp index 6177f72..5bbf005 100755 --- a/utils/src/wifi_common_util.cpp +++ b/utils/src/wifi_common_util.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -15,6 +15,8 @@ #include "wifi_common_util.h" #include +#include +#include namespace OHOS { namespace Wifi { @@ -164,5 +166,13 @@ std::string Number2Ip(int intIp) ip.append(std::to_string(intIp & 0x000000ff)); return ip; } + +std::vector StrSplit(const std::string& str, const std::string& delim) { + std::regex re(delim); + std::sregex_token_iterator + first{ str.begin(), str.end(), re, -1 }, + last; + return { first, last }; +} } // namespace Wifi } // namespace OHOS \ No newline at end of file -- Gitee From a2407b0de50d90ffe76a0b18f9e22aa7d09d14ac Mon Sep 17 00:00:00 2001 From: z00588131 Date: Sat, 15 Jan 2022 11:03:10 +0000 Subject: [PATCH 019/491] feat(*): Wifi module componentization Signed-off-by: z00588131 --- bundle.json | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) create mode 100755 bundle.json diff --git a/bundle.json b/bundle.json new file mode 100755 index 0000000..b9db3e9 --- /dev/null +++ b/bundle.json @@ -0,0 +1,102 @@ +{ + "name": "@ohos/communication_wifi", + "version": "3.1.0", + "description": "The WLAN module provides basic WLAN functions, peer-to-peer (P2P) connection, and WLAN notification, enabling your application to communicate with other devices through a WLAN.", + "homePage": "https://gitee.com/openharmony", + "license": "Apache License 2.0", + "repository": "https://gitee.com/openharmony/communication_wifi", + "domain": "os", + "language": "", + "publishAs": "code-segment", + "private": false, + "scripts": {}, + "tags": [ + "foundation" + ], + "keywords": [ + "communication", + "wifi" + ], + "envs": [], + "dirs": [], + "author": { + "name": "", + "email": "", + "url": "" + }, + "contributors": [ + { + "name": "", + "email": "", + "url": "" + } + ], + "segment": { + "destPath": "foundation/communication/wifi" + }, + "component": { + "name": "wifi", + "subsystem": "communication", + "syscap": [ + "SystemCapability.Communication.WiFi" + ], + "features": [], + "adapted_system_type": [ + "standard" + ], + "rom": "", + "ram": "", + "deps": { + "components": [ + "ipc", + "ces_standard", + "hiviewdfx_hilog_native" + ], + "third_party": [ + "wpa_supplicant", + "node", + "bounds_checking_function", + "googletest", + "openssl" + ] + }, + "build": { + "sub_component": [ + "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard:wifi_sdk", + "//foundation/communication/wifi/interfaces/innerkits/native_cpp/napi:wifi" + ], + "inner_kits": [ + { + "header" : { + "header_base": [ + "//foundation/communication/wifi/interfaces/innerkits/native_c", + "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/include" + ], + "header_files": [ + "wifi_device.h", + "wifi_hotspot.h", + "wifi_p2p.h", + "wifi_scan.h", + "wifi_hid2d.h" + ] + }, + "name" : "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard:wifi_sdk" + } + ], + "test": [ + "//foundation/communication/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan:unittest", + "//foundation/communication/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta:unittest", + "//foundation/communication/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap:unittest", + "//foundation/communication/wifi/tests/wifi_standard/wifi_framework/dhcp_manage/mgr_service:unittest", + "//foundation/communication/wifi/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_client:unittest", + "//foundation/communication/wifi/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest:unittest", + "//foundation/communication/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test:unittest", + "//foundation/communication/wifi/tests/wifi_standard/ipc_framework/cRPC/unittest:unittest", + "//foundation/communication/wifi/tests/wifi_standard/wifi_framework/common/unittest:unittest", + "//foundation/communication/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest:unittest", + "//foundation/communication/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest:unittest", + "//foundation/communication/wifi/tests/wifi_standard/wifi_hal/unittest:unittest" + ] + } + } +} \ No newline at end of file -- Gitee From 0978a87f5ea427c9d027f40ce17c605767d579a4 Mon Sep 17 00:00:00 2001 From: Zhangfeng Date: Mon, 17 Jan 2022 12:02:40 +0000 Subject: [PATCH 020/491] fix(*): update d.ts file and fix P2P problem Signed-off-by: z00588131 --- interfaces/kits/jskits/@ohos.wifi.d.ts | 603 ++++++++++++++---- .../wifi_manage/wifi_p2p_service_impl.cpp | 4 + .../wifi_manage/wifi_sta/sta_monitor.cpp | 14 +- 3 files changed, 476 insertions(+), 145 deletions(-) diff --git a/interfaces/kits/jskits/@ohos.wifi.d.ts b/interfaces/kits/jskits/@ohos.wifi.d.ts index 760c5f0..cc24ede 100755 --- a/interfaces/kits/jskits/@ohos.wifi.d.ts +++ b/interfaces/kits/jskits/@ohos.wifi.d.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -342,143 +342,328 @@ declare namespace wifi { function getStations(): Array; /** - * Defines the EventListener class and provides functions to subscribe or unsubscribe the Wi-Fi events. + * Obtains information about a P2P connection. * + * @return Returns the P2P connection information. + * @since 8 + */ + function getP2pLinkedInfo(): Promise; + function getP2pLinkedInfo(callback: AsyncCallback): void; + + /** + * Obtains information about the current group. + * + * @return Returns the current group information. + * @since 8 + */ + function getCurrentGroup(): Promise; + function getCurrentGroup(callback: AsyncCallback): void; + + /** + * Obtains the information about the found devices. + * + * @return Returns the found devices list. + * @since 8 + */ + function getP2pDevices(): Promise; + function getP2pDevices(callback: AsyncCallback): void; + + /** + * Creates a P2P group. + * + * @return Returns {@code true} if the scanning is successful; returns {@code false} otherwise. + * @since 8 + */ + function createGroup(config: WifiP2PConfig): boolean; + + /** + * Removes a P2P group. + * + * @return Returns {@code true} if the scanning is successful; returns {@code false} otherwise. + * @since 8 + */ + function removeGroup(): boolean; + + /** + * Initiates a P2P connection to a device with the specified configuration. + * + * @return Returns {@code true} if the scanning is successful; returns {@code false} otherwise. + * @since 8 + */ + function p2pConnect(config: WifiP2PConfig): boolean; + + /** + * Disconnects a P2P connection. + * + * @return Returns {@code true} if the scanning is successful; returns {@code false} otherwise. + * @since 8 + */ + function p2pDisconnect(): boolean; + + /** + * Discovers Wi-Fi P2P devices. + * + * @return Returns {@code true} if the scanning is successful; returns {@code false} otherwise. + * @since 8 + */ + function startDiscoverDevices(): boolean; + + /** + * Stops discovering Wi-Fi P2P devices. + * + * @return Returns {@code true} if the scanning is successful; returns {@code false} otherwise. + * @since 8 + */ + function stopDiscoveryDevices(): boolean; + + /** + * Enables P2P listening. + * + *

After P2P listening is enabled, your application can listen for and respond to requests from other devices. + * + * @return Returns {@code true} if the scanning is successful; returns {@code false} otherwise. + * @since 8 + */ + function startListen(): boolean; + + /** + * Disables P2P listening. + * + *

After P2P listening is disabled, your application cannot listen for requests from other devices. + * + * @return Returns {@code true} if the scanning is successful; returns {@code false} otherwise. + * @since 8 + */ + function stopListen(): boolean; + + /** + * Deletes the persistent P2P group with the specified network ID. + * + * @return Returns {@code true} if the scanning is successful; returns {@code false} otherwise. + * @since 8 + */ + function deletePersistentGroup(netId: number): boolean; + + /** + * Sets the name of the Wi-Fi P2P device. + * + * @return Returns {@code true} if the scanning is successful; returns {@code false} otherwise. + * @since 8 + */ + function setDeviceName(devName: string): boolean; + + /** + * Subscribe Wi-Fi status change events. + * + * @return Returns 0: inactive, 1: active, 2: activating, 3: deactivating * @since 7 - * @SysCap SystemCapability.Communication.WiFi - * @devices phone, tablet, tv, wearable, car */ - export class EventListener { - /** - * Subscribe Wi-Fi status change events. - * - * @return Returns 0: inactive, 1: active, 2: activating, 3: deactivating - * @since 7 - * @permission {@code ohos.permission.GET_WIFI_INFO} - */ - on(type: "wifiStateChange", callback: Callback): void; - - /** - * Unsubscribe Wi-Fi status change events. - * - *

All callback functions will be deregistered If there is no specific callback parameter.

- * - * @since 7 - * @permission {@code ohos.permission.GET_WIFI_INFO} - */ - off(type: "wifiStateChange", callback?: Callback): void; - - /** - * Subscribe Wi-Fi connection change events. - * - * @return Returns 0: disconnected, 1: connected - * @since 7 - * @permission {@code ohos.permission.GET_WIFI_INFO} - */ - on(type: "wifiConnectionChange", callback: Callback): void; - - /** - * Unsubscribe Wi-Fi connection change events. - * - *

All callback functions will be deregistered If there is no specific callback parameter.

- * - * @since 7 - * @permission {@code ohos.permission.GET_WIFI_INFO} - */ - off(type: "wifiConnectionChange", callback?: Callback): void; - - /** - * Subscribe Wi-Fi scan status change events. - * - * @return Returns 0: scan fail, 1: scan success - * @since 7 - * @permission {@code ohos.permission.GET_WIFI_INFO} - */ - on(type: "wifiScanStateChange", callback: Callback): void; - - /** - * Unsubscribe Wi-Fi scan status change events. - * - *

All callback functions will be deregistered If there is no specific callback parameter.

- * - * @since 7 - * @permission {@code ohos.permission.GET_WIFI_INFO} - */ - off(type: "wifiScanStateChange", callback?: Callback): void; - - /** - * Subscribe Wi-Fi rssi change events. - * - * @return Returns RSSI value in dBm - * @since 7 - * @permission {@code ohos.permission.GET_WIFI_INFO} - */ - on(type: "wifiRssiChange", callback: Callback): void; - - /** - * Unsubscribe Wi-Fi rssi change events. - * - *

All callback functions will be deregistered If there is no specific callback parameter.

- * - * @since 7 - * @permission {@code ohos.permission.GET_WIFI_INFO} - */ - off(type: "wifiRssiChange", callback?: Callback): void; + function on(type: "wifiStateChange", callback: Callback): void; - /** - * Subscribe Wi-Fi hotspot state change events. - * - * @return Returns 0: inactive, 1: active, 2: activating, 3: deactivating - * @since 7 - */ - on(type: "hotspotStateChange", callback: Callback): void; - - /** - * Unsubscribe Wi-Fi hotspot state change events. - * - *

All callback functions will be deregistered If there is no specific callback parameter.

- * - * @since 7 - */ - off(type: "hotspotStateChange", callback?: Callback): void; - - /** - * Subscribe Wi-Fi hotspot sta join events. - * - * @return Returns StationInfo - * @since 7 - * @systemapi Hide this for inner system use. - */ - on(type: "hotspotStaJoin", callback: Callback): void; - - /** - * Unsubscribe Wi-Fi hotspot sta join events. - * - *

All callback functions will be deregistered If there is no specific callback parameter.

- * - * @since 7 - * @systemapi Hide this for inner system use. - */ - off(type: "hotspotStaJoin", callback?: Callback): void; - - /** - * Subscribe Wi-Fi hotspot sta leave events. - * - * @return Returns {@link #StationInfo} object - * @since 7 - * @systemapi Hide this for inner system use. - */ - on(type: "hotspotStaLeave", callback: Callback): void; - - /** - * Unsubscribe Wi-Fi hotspot sta leave events. - * - * @return Returns {@link #StationInfo} object - * @since 7 - * @systemapi Hide this for inner system use. - */ - off(type: "hotspotStaLeave", callback?: Callback): void; - } + /** + * Unsubscribe Wi-Fi status change events. + * + *

All callback functions will be deregistered If there is no specific callback parameter.

+ * + * @since 7 + */ + function off(type: "wifiStateChange", callback?: Callback): void; + + /** + * Subscribe Wi-Fi connection change events. + * + * @return Returns 0: disconnected, 1: connected + * @since 7 + */ + function on(type: "wifiConnectionChange", callback: Callback): void; + + /** + * Unsubscribe Wi-Fi connection change events. + * + *

All callback functions will be deregistered If there is no specific callback parameter.

+ * + * @since 7 + */ + function off(type: "wifiConnectionChange", callback?: Callback): void; + + /** + * Subscribe Wi-Fi scan status change events. + * + * @return Returns 0: scan fail, 1: scan success + * @since 7 + */ + function on(type: "wifiScanStateChange", callback: Callback): void; + + /** + * Unsubscribe Wi-Fi scan status change events. + * + *

All callback functions will be deregistered If there is no specific callback parameter.

+ * + * @since 7 + */ + function off(type: "wifiScanStateChange", callback?: Callback): void; + + /** + * Subscribe Wi-Fi rssi change events. + * + * @return Returns RSSI value in dBm + * @since 7 + */ + function on(type: "wifiRssiChange", callback: Callback): void; + + /** + * Unsubscribe Wi-Fi rssi change events. + * + *

All callback functions will be deregistered If there is no specific callback parameter.

+ * + * @since 7 + */ + function off(type: "wifiRssiChange", callback?: Callback): void; + + /** + * Subscribe Wi-Fi hotspot state change events. + * + * @return Returns 0: inactive, 1: active, 2: activating, 3: deactivating + * @since 7 + */ + function on(type: "hotspotStateChange", callback: Callback): void; + + /** + * Unsubscribe Wi-Fi hotspot state change events. + * + *

All callback functions will be deregistered If there is no specific callback parameter.

+ * + * @since 7 + */ + function off(type: "hotspotStateChange", callback?: Callback): void; + + /** + * Subscribe Wi-Fi hotspot sta join events. + * + * @return Returns StationInfo + * @since 7 + * @systemapi Hide this for inner system use. + */ + function on(type: "hotspotStaJoin", callback: Callback): void; + + /** + * Unsubscribe Wi-Fi hotspot sta join events. + * + *

All callback functions will be deregistered If there is no specific callback parameter.

+ * + * @since 7 + * @systemapi Hide this for inner system use. + */ + function off(type: "hotspotStaJoin", callback?: Callback): void; + + /** + * Subscribe Wi-Fi hotspot sta leave events. + * + * @return Returns {@link #StationInfo} object + * @since 7 + * @systemapi Hide this for inner system use. + */ + function on(type: "hotspotStaLeave", callback: Callback): void; + + /** + * Unsubscribe Wi-Fi hotspot sta leave events. + * + * @return Returns {@link #StationInfo} object + * @since 7 + * @systemapi Hide this for inner system use. + */ + function off(type: "hotspotStaLeave", callback?: Callback): void; + + /** + * Subscribe P2P status change events. + * + * @return Returns 1: idle, 2: starting, 3:started, 4: closing, 5: closed + * @since 8 + */ + function on(type: "p2pStateChange", callback: Callback): void; + + /** + * Unsubscribe P2P status change events. + * + * @since 8 + */ + function off(type: "p2pStateChange", callback?: Callback): void; + + /** + * Subscribe P2P connection change events. + * + * @return Returns WifiP2pLinkedInfo + * @since 8 + */ + function on(type: "p2pConnectionChange", callback: AsyncCallback): void; + + /** + * Unsubscribe P2P connection change events. + * + * @since 8 + */ + function off(type: "p2pConnectionChange", callback?: AsyncCallback): void; + + /** + * Subscribe P2P local device change events. + * + * @return Returns WifiP2pDevice + * @since 8 + */ + function on(type: "p2pDeviceChange", callback: AsyncCallback): void; + + /** + * Unsubscribe P2P local device change events. + * + * @return Returns WifiP2pDevice + * @since 8 + */ + function off(type: "p2pDeviceChange", callback?: AsyncCallback): void; + + /** + * Subscribe P2P peer device change events. + * + * @return Returns WifiP2pDevice[] + * @since 8 + */ + function on(type: "p2pPeerDeviceChange", callback: AsyncCallback): void; + + /** + * Unsubscribe P2P peer device change events. + * + * @since 8 + */ + function off(type: "p2pPeerDeviceChange", callback?: AsyncCallback): void; + + /** + * Subscribe P2P persistent group change events. + * + * @return Returns void + * @since 8 + */ + function on(type: "p2pPersistentGroupChange", callback: Callback): void; + + /** + * Unsubscribe P2P persistent group change events. + * + * @since 8 + */ + function off(type: "p2pPersistentGroupChange", callback?: Callback): void; + + /** + * Subscribe P2P discovery events. + * + * @return Returns 0: initial state, 1: discovery succeeded + * @since 8 + */ + function on(type: "p2pDiscoveryChange", callback: Callback): void; + + /** + * Unsubscribe P2P discovery events. + * + * @since 8 + */ + function off(type: "p2pDiscoveryChange", callback?: Callback): void; /** * Wi-Fi device configuration information. @@ -537,11 +722,20 @@ declare namespace wifi { * @since 6 */ enum WifiSecurityType { - WIFI_SEC_TYPE_INVALID = 0, /* Invalid security type */ - WIFI_SEC_TYPE_OPEN = 1, /* Open */ - WIFI_SEC_TYPE_WEP = 2, /* Wired Equivalent Privacy (WEP) */ - WIFI_SEC_TYPE_PSK = 3, /* Pre-shared key (PSK) */ - WIFI_SEC_TYPE_SAE = 4, /* Simultaneous Authentication of Equals (SAE) */ + /** Invalid security type */ + WIFI_SEC_TYPE_INVALID = 0, + + /** Open */ + WIFI_SEC_TYPE_OPEN = 1, + + /** Wired Equivalent Privacy (WEP) */ + WIFI_SEC_TYPE_WEP = 2, + + /** Pre-shared key (PSK) */ + WIFI_SEC_TYPE_PSK = 3, + + /** Simultaneous Authentication of Equals (SAE) */ + WIFI_SEC_TYPE_SAE = 4, } /** @@ -742,6 +936,137 @@ declare namespace wifi { /** Failed to set up the Wi-Fi connection. */ UNKNOWN } + + /** + * P2P device information. + * + * @since 8 + */ + interface WifiP2pDevice { + /** Device name */ + deviceName: string; + + /** Device mac address */ + deviceAddress: string; + + /** Primary device type */ + primaryDeviceType: number; + + /** Device status */ + devStatus: P2pDeviceStatus; + + /** Device group capability */ + groupCapability: number; + } + + /** + * P2P config. + * + * @since 8 + */ + interface WifiP2PConfig { + /** Device mac address */ + deviceAddress: string; + + /** + * Specifies whether the P2P group of this {@code WifiP2pConfig} instance is persistent + * -1: temporary, -2: persistent + */ + netId: number; + + /* The passphrase of this {@code WifiP2pConfig} instance */ + passphrase: string; + /** Group name */ + + groupName: string; + + /** Group owner band */ + goBand: GroupOwnerBand; + } + + /** + * P2P group information. + * + * @since 8 + */ + interface WifiP2pGroupInfo { + /** Indicates whether it is group owner */ + isP2pGo: boolean; + + /** Group owner information */ + ownerInfo: WifiP2pDevice; + + /** The group passphrase */ + passphrase: string; + + /** Interface name */ + interface: string; + + /** Group name */ + groupName: string; + + /** Network ID */ + networkId: number; + + /** Frequency */ + frequency: number; + + /** Client list */ + clientDevices: WifiP2pDevice[]; + + /** Group owner IP address */ + goIpAddress: string; + } + + /** + * P2P connection status. + * + * @since 8 + */ + enum P2pConnectState { + DISCONNECTED = 0, + CONNECTED = 1, + } + + /** + * P2P linked information. + * + * @since 8 + */ + interface WifiP2pLinkedInfo { + /** Connection status */ + connectState: P2pConnectState; + + /** Indicates whether it is group owner */ + isGroupOwner: boolean; + + /** Group owner address */ + groupOwnerAddr: string; + } + + /** + * P2P device status. + * + * @since 8 + */ + enum P2pDeviceStatus { + CONNECTED = 0, + INVITED = 1, + FAILED = 2, + AVAILABLE = 3, + UNAVAILABLE = 4, + } + + /** + * P2P group owner band. + * + * @since 8 + */ + enum GroupOwnerBand { + GO_BAND_AUTO = 0, + GO_BAND_2GHZ = 1, + GO_BAND_5GHZ = 2, + } } export default wifi; diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp index 3150b12..7e9d945 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp @@ -670,6 +670,10 @@ ErrCode WifiP2pServiceImpl::Hid2dSharedlinkIncrease() WIFI_LOGI("Hid2dSharedlinkIncrease get P2P connect status error!"); return ret; } + if (status != static_cast(P2pConnectedState::P2P_CONNECTED)) { + WIFI_LOGE("Hid2dSharedlinkIncrease P2P not in connected state!"); + return WIFI_OPT_FAILED; + } SharedLinkManager::IncreaseSharedLink(); return WIFI_OPT_SUCCESS; } diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp index f8828d8..ac040d9 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp @@ -83,18 +83,20 @@ void StaMonitor::OnConnectChangedCallBack(int status, int networkId, const std:: WIFI_LOGE("The statemachine pointer is null."); return; } + + WifiLinkedInfo linkedInfo; + pStaStateMachine->GetLinkedInfo(linkedInfo); + /* P2P affects STA, causing problems or incorrect data updates */ + if ((linkedInfo.connState == ConnState::CONNECTED) && (linkedInfo.bssid != bssid)) { + WIFI_LOGI("Sta ignored the event for bssid is mismatch!"); + return; + } switch (status) { case WPA_CB_CONNECTED: { pStaStateMachine->OnNetworkConnectionEvent(networkId, bssid); break; } case WPA_CB_DISCONNECTED: { - WifiLinkedInfo linkedInfo; - pStaStateMachine->GetLinkedInfo(linkedInfo); - if ((linkedInfo.connState == ConnState::DISCONNECTED) && (linkedInfo.bssid != bssid)) { - WIFI_LOGI("Sta ignored the disconnect event for bssid is mismatch!"); - break; - } pStaStateMachine->SendMessage(WIFI_SVR_CMD_STA_NETWORK_DISCONNECTION_EVENT); break; } -- Gitee From 38249a56d21b4df8ad60c56f728d5eea4618b01a Mon Sep 17 00:00:00 2001 From: bayanxing Date: Wed, 19 Jan 2022 23:32:35 +0800 Subject: [PATCH 021/491] feat: add p2p js api. Signed-off-by: bayanxing --- .../native_cpp/napi/wifi_napi_entry.cpp | 15 + .../native_cpp/napi/wifi_napi_event.cpp | 18 + .../native_cpp/napi/wifi_napi_p2p.cpp | 397 ++++++++++++++++++ .../innerkits/native_cpp/napi/wifi_napi_p2p.h | 51 +++ .../wifi_standard/include/wifi_p2p.h | 2 +- .../wifi_standard/interfaces/wifi_msg.h | 2 + 6 files changed, 484 insertions(+), 1 deletion(-) diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_entry.cpp b/interfaces/innerkits/native_cpp/napi/wifi_napi_entry.cpp index 31c53cb..2422066 100755 --- a/interfaces/innerkits/native_cpp/napi/wifi_napi_entry.cpp +++ b/interfaces/innerkits/native_cpp/napi/wifi_napi_entry.cpp @@ -77,6 +77,21 @@ static napi_value Init(napi_env env, napi_value exports) { DECLARE_NAPI_FUNCTION("setHotspotConfig", SetHotspotConfig), DECLARE_NAPI_FUNCTION("getHotspotConfig", GetHotspotConfig), DECLARE_NAPI_FUNCTION("getStations", GetStations), + DECLARE_NAPI_FUNCTION("enableP2p", EnableP2p), + DECLARE_NAPI_FUNCTION("disableP2p", DisableP2p), + DECLARE_NAPI_FUNCTION("getP2pLinkedInfo", GetP2pLinkedInfo), + DECLARE_NAPI_FUNCTION("getCurrentGroup", GetCurrentGroup), + DECLARE_NAPI_FUNCTION("getP2pDevices", GetP2pDevices), + DECLARE_NAPI_FUNCTION("createGroup", CreateGroup), + DECLARE_NAPI_FUNCTION("removeGroup", RemoveGroup), + DECLARE_NAPI_FUNCTION("p2pConnect", P2pConnect), + DECLARE_NAPI_FUNCTION("p2pDisConnect", P2pDisConnect), + DECLARE_NAPI_FUNCTION("startDiscoverDevices", StartDiscoverDevices), + DECLARE_NAPI_FUNCTION("stopDiscoverDevices", StopDiscoverDevices), + DECLARE_NAPI_FUNCTION("startP2pListen", StartP2pListen), + DECLARE_NAPI_FUNCTION("stopP2pListen", StopP2pListen), + DECLARE_NAPI_FUNCTION("deletePersistentGroup", DeletePersistentGroup), + DECLARE_NAPI_FUNCTION("setP2pDeviceName", SetP2pDeviceName) }; NAPI_CALL(env, napi_define_properties(env, exports, sizeof(desc) / sizeof(napi_property_descriptor), desc)); diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_event.cpp b/interfaces/innerkits/native_cpp/napi/wifi_napi_event.cpp index 7a1a5a4..64782c8 100755 --- a/interfaces/innerkits/native_cpp/napi/wifi_napi_event.cpp +++ b/interfaces/innerkits/native_cpp/napi/wifi_napi_event.cpp @@ -31,6 +31,12 @@ const std::string WIFI_EVENT_TYPE_RSSI_STATE = "wifiRssiChange"; const std::string WIFI_EVENT_TYPE_HOTSPOT_STATE = "hotspotStateChange"; const std::string WIFI_EVENT_TYPE_AP_STA_JOIN = "hotspotStaJoin"; const std::string WIFI_EVENT_TYPE_AP_STA_LEAVE = "hotspotStaLeave"; +const std::string WIFI_EVENT_TYPE_P2P_DEVICES_STATE = "p2pDevicesChange"; +const std::string WIFI_EVENT_TYPE_P2P_STATE = "p2pStateChange"; +const std::string WIFI_EVENT_TYPE_P2P_CONN_STATE = "p2pConnStateChange"; +const std::string WIFI_EVENT_TYPE_P2P_PEER_DISCOVERY_STATE = "p2pPeerDiscoveryStateChange"; +const std::string WIFI_EVENT_TYPE_P2P_CURRENT_DEVICE_STATE = "p2pCurrentDeviceChange"; +const std::string WIFI_EVENT_TYPE_P2P_GROUP_STATE = "p2pGroupStateChange"; const std::string WIFI_USUAL_EVENT_POWER_STATE = "usual.event.wifi.POWER_STATE"; const std::string WIFI_USUAL_EVENT_CONN_STATE = "usual.event.wifi.CONN_STATE"; @@ -39,6 +45,12 @@ const std::string WIFI_USUAL_EVENT_RSSI_STATE = "usual.event.wifi.RSSI_VALUE"; const std::string WIFI_USUAL_EVENT_HOTSPOT_STATE = "usual.event.wifi.HOTSPOT_STATE"; const std::string WIFI_USUAL_EVENT_AP_STA_JOIN = "usual.event.wifi.WIFI_HS_STA_JOIN"; const std::string WIFI_USUAL_EVENT_AP_STA_LEAVE = "usual.event.wifi.WIFI_HS_STA_LEAVE"; +const std::string WIFI_USUAL_EVENT_P2P_DEVICES_CHANGE = "usual.event.wifi.p2p.DEVICES_CHANGE"; +const std::string WIFI_USUAL_EVENT_P2P_STATE_CHANGE = "usual.event.wifi.p2p.STATE_CHANGE"; +const std::string WIFI_USUAL_EVENT_P2P_CONN_STATE_CHANGE = "usual.event.wifi.p2p.CONN_STATE_CHANGE"; +const std::string WIFI_USUAL_EVENT_P2P_PEER_DISCOVERY_STATE_CHANG = "usual.event.wifi.p2p.PEER_DISCOVERY_STATE_CHANGE"; +const std::string WIFI_USUAL_EVENT_P2P_CURRENT_DEVICE_STATE_CHANGE = "usual.event.wifi.p2p.CURRENT_DEVICE_CHANGE"; +const std::string WIFI_USUAL_EVENT_P2P_GROUP_STATE_CHANGE = "usual.event.wifi.p2p.GROUP_STATE_CHANGED"; std::shared_mutex g_regInfoMutex; static std::map g_eventRegisterInfo; @@ -49,6 +61,12 @@ static std::map g_mapEventTypeToUsualEvent = { { WIFI_EVENT_TYPE_SCAN_STATE, WIFI_USUAL_EVENT_SCAN_STATE }, { WIFI_EVENT_TYPE_RSSI_STATE, WIFI_USUAL_EVENT_RSSI_STATE }, { WIFI_EVENT_TYPE_HOTSPOT_STATE, WIFI_USUAL_EVENT_HOTSPOT_STATE }, + { WIFI_EVENT_TYPE_P2P_DEVICES_STATE, WIFI_USUAL_EVENT_P2P_DEVICES_CHANGE }, + { WIFI_EVENT_TYPE_P2P_STATE, WIFI_USUAL_EVENT_P2P_STATE_CHANGE }, + { WIFI_EVENT_TYPE_P2P_CONN_STATE, WIFI_USUAL_EVENT_P2P_CONN_STATE_CHANGE }, + { WIFI_EVENT_TYPE_P2P_PEER_DISCOVERY_STATE, WIFI_USUAL_EVENT_P2P_PEER_DISCOVERY_STATE_CHANG }, + { WIFI_EVENT_TYPE_P2P_CURRENT_DEVICE_STATE, WIFI_USUAL_EVENT_P2P_CURRENT_DEVICE_STATE_CHANGE }, + { WIFI_EVENT_TYPE_P2P_GROUP_STATE, WIFI_USUAL_EVENT_P2P_GROUP_STATE_CHANGE } }; static std::map g_mapUserDefinedEventProcessFunc = {}; diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_p2p.cpp b/interfaces/innerkits/native_cpp/napi/wifi_napi_p2p.cpp index f62b96a..8fa4f34 100755 --- a/interfaces/innerkits/native_cpp/napi/wifi_napi_p2p.cpp +++ b/interfaces/innerkits/native_cpp/napi/wifi_napi_p2p.cpp @@ -18,6 +18,403 @@ namespace OHOS { namespace Wifi { +DEFINE_WIFILOG_LABEL("WifiNAPIP2p"); +std::unique_ptr wifiP2pPtr = WifiP2p::GetInstance(WIFI_P2P_ABILITY_ID); + +napi_value EnableP2p(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + NAPI_ASSERT(env, wifiP2pPtr != nullptr, "[NAPI] Wifi p2p instance is null."); + + ErrCode ret = wifiP2pPtr->EnableP2p(); + napi_value result; + napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); + return result; +} + +napi_value DisableP2p(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + NAPI_ASSERT(env, wifiP2pPtr != nullptr, "[NAPI] Wifi p2p instance is null."); + + ErrCode ret = wifiP2pPtr->DisableP2p(); + napi_value result; + napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); + return result; +} + +static void DeviceInfoToJs(const napi_env& env, const WifiP2pDevice& device, napi_value& result) +{ + SetValueUtf8String(env, "deviceName", device.GetDeviceName().c_str(), result); + SetValueUtf8String(env, "macAddress", device.GetDeviceAddress().c_str(), result); + SetValueUtf8String(env, "primaryDeviceType", device.GetPrimaryDeviceType().c_str(), result); + SetValueUtf8String(env, "secondaryDeviceType", device.GetSecondaryDeviceType().c_str(), result); + SetValueInt32(env, "status", static_cast(device.GetP2pDeviceStatus()), result); + SetValueUnsignedInt32(env, "supportWpsConfigMethods", device.GetWpsConfigMethod(), result); + SetValueInt32(env, "deviceCapabilitys", device.GetDeviceCapabilitys(), result); + SetValueInt32(env, "groupCapabilitys", device.GetGroupCapabilitys(), result); +} + +static void WfdInfoToJs(const napi_env& env, const WifiP2pWfdInfo& wfdInfo, napi_value& result) +{ + SetValueBool(env, "wfdEnabled", wfdInfo.GetWfdEnabled(), result); + SetValueInt32(env, "deviceInfo", wfdInfo.GetDeviceInfo(), result); + SetValueInt32(env, "ctrlPort", wfdInfo.GetCtrlPort(), result); + SetValueInt32(env, "maxThroughput", wfdInfo.GetMaxThroughput(), result); +} + +static bool DeviceInfosToJs(const napi_env& env, + const std::vector& vecDevices, napi_value& arrayResult) +{ + uint32_t idx = 0; + for (auto& each : vecDevices) { + napi_value eachObj; + napi_create_object(env, &eachObj); + DeviceInfoToJs(env, each, eachObj); + WifiP2pWfdInfo info = each.GetWfdInfo(); + napi_value wfdInfo; + napi_create_object(env, &wfdInfo); + WfdInfoToJs(env, info, wfdInfo); + napi_set_named_property(env, eachObj, "wfdInfo", wfdInfo); + napi_status status = napi_set_element(env, arrayResult, idx++, eachObj); + if (status != napi_ok) { + WIFI_LOGE("wifi napi set element error: %{public}d, idx: %{public}d", status, idx - 1); + return false; + } + } + return true; +} + +static bool GroupInfosToJs(const napi_env& env, WifiP2pGroupInfo& groupInfo, napi_value& result) +{ + SetValueBool(env, "isP2pGroupOwner", groupInfo.IsGroupOwner(), result); + SetValueUtf8String(env, "passphrase", groupInfo.GetPassphrase().c_str(), result); + SetValueUtf8String(env, "interface", groupInfo.GetInterface().c_str(), result); + SetValueUtf8String(env, "groupName", groupInfo.GetGroupName().c_str(), result); + SetValueInt32(env, "networkId", groupInfo.GetNetworkId(), result); + SetValueInt32(env, "frequency", groupInfo.GetFrequency(), result); + SetValueBool(env, "isP2pPersistent", groupInfo.IsPersistent(), result); + SetValueInt32(env, "groupStatus", static_cast(groupInfo.GetP2pGroupStatus()), result); + SetValueUtf8String(env, "goIpAddress", groupInfo.GetGoIpAddress().c_str(), result); + + WifiP2pDevice ownerDevice = groupInfo.GetOwner(); + napi_value owner; + napi_create_object(env, &owner); + DeviceInfoToJs(env, ownerDevice, owner); + napi_status status = napi_set_named_property(env, result, "owner", owner); + if (status != napi_ok) { + WIFI_LOGE("napi_set_named_property owner fail"); + return false; + } + if (!groupInfo.IsClientDevicesEmpty()) { + const std::vector& vecDevices = groupInfo.GetClientDevices(); + napi_value devices; + napi_create_array_with_length(env, vecDevices.size(), &devices); + if (!DeviceInfosToJs(env, vecDevices, devices)) { + return false; + } + status = napi_set_named_property(env, result, "clientDevices", devices); + if (status != napi_ok) { + WIFI_LOGE("napi_set_named_property clientDevices fail"); + return false; + } + } + return true; +} + +napi_value GetCurrentGroup(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + size_t argc = 2; + napi_value argv[argc]; + napi_value thisVar = nullptr; + void *data = nullptr; + NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data)); + + P2pGroupInfoAsyncContext *asyncContext = new P2pGroupInfoAsyncContext(env); + NAPI_ASSERT(env, asyncContext != nullptr, "asyncContext is null."); + napi_create_string_latin1(env, "getCurrentGroup", NAPI_AUTO_LENGTH, &asyncContext->resourceName); + + asyncContext->executeFunc = [&](void* data) -> void { + P2pGroupInfoAsyncContext *context = static_cast(data); + TRACE_FUNC_CALL_NAME("wifiP2pPtr->GetCurrentGroup"); + context->isSuccess = (wifiP2pPtr->GetCurrentGroup(context->groupInfo) == WIFI_OPT_SUCCESS); + }; + + asyncContext->completeFunc = [&](void* data) -> void { + P2pGroupInfoAsyncContext *context = static_cast(data); + napi_create_object(context->env, &context->result); + context->isSuccess = GroupInfosToJs(context->env, context->groupInfo, context->result); + WIFI_LOGI("Push get current group result to client"); + }; + + size_t nonCallbackArgNum = 0; + return DoAsyncWork(env, asyncContext, argc, argv, nonCallbackArgNum); +} + +napi_value StartP2pListen(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + size_t argc = 2; + napi_value argv[argc]; + napi_value thisVar; + NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); + + napi_valuetype valueType; + napi_valuetype value2Type; + napi_typeof(env, argv[0], &valueType); + napi_typeof(env, argv[1], &value2Type); + NAPI_ASSERT(env, valueType == napi_number, "Wrong argument 1 type. napi_number expected."); + NAPI_ASSERT(env, value2Type == napi_object, "Wrong argument 2 type. napi_number expected."); + + NAPI_ASSERT(env, wifiP2pPtr != nullptr, "[NAPI] Wifi p2p instance is null."); + int period; + int interval; + napi_get_value_int32(env, argv[0], &period); + napi_get_value_int32(env, argv[1], &interval); + ErrCode ret = wifiP2pPtr->StartP2pListen(period, interval); + napi_value result; + napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); + return result; +} + +napi_value StopP2pListen(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + NAPI_ASSERT(env, wifiP2pPtr != nullptr, "[NAPI] Wifi p2p instance is null."); + + ErrCode ret = wifiP2pPtr->StopP2pListen(); + napi_value result; + napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); + return result; +} + +napi_value DeletePersistentGroup(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + size_t argc = 1; + napi_value argv[argc]; + napi_value thisVar; + NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); + + napi_valuetype valueType; + napi_typeof(env, argv[0], &valueType); + NAPI_ASSERT(env, valueType == napi_number, "Wrong argument type. napi_number expected."); + + NAPI_ASSERT(env, wifiP2pPtr != nullptr, "[NAPI] Wifi p2p instance is null."); + WifiP2pGroupInfo groupInfo; + int netId = -999; + napi_get_value_int32(env, argv[0], &netId); + groupInfo.SetNetworkId(netId); + ErrCode ret = wifiP2pPtr->DeleteGroup(groupInfo); + napi_value result; + napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); + return result; +} + +napi_value StartDiscoverDevices(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + NAPI_ASSERT(env, wifiP2pPtr != nullptr, "[NAPI] Wifi p2p instance is null."); + + ErrCode ret = wifiP2pPtr->DiscoverDevices(); + napi_value result; + napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); + return result; +} + +napi_value StopDiscoverDevices(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + NAPI_ASSERT(env, wifiP2pPtr != nullptr, "[NAPI] Wifi p2p instance is null."); + + ErrCode ret = wifiP2pPtr->StopDiscoverDevices(); + napi_value result; + napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); + return result; +} + +napi_value GetP2pDevices(napi_env env, napi_callback_info info) +{ + size_t argc = 2; + napi_value argv[argc]; + napi_value thisVar = nullptr; + void *data = nullptr; + NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data)); + NAPI_ASSERT(env, wifiP2pPtr != nullptr, "Wifi p2p instance is null."); + + QueryP2pDeviceAsyncContext *asyncContext = new QueryP2pDeviceAsyncContext(env); + NAPI_ASSERT(env, asyncContext != nullptr, "asyncContext is null."); + napi_create_string_latin1(env, "queryP2pDevices", NAPI_AUTO_LENGTH, &asyncContext->resourceName); + + asyncContext->executeFunc = [&](void* data) -> void { + QueryP2pDeviceAsyncContext *context = static_cast(data); + context->isSuccess = (wifiP2pPtr->QueryP2pDevices(context->vecP2pDevices) == WIFI_OPT_SUCCESS); + WIFI_LOGI("GetP2pDeviceList, size: %{public}zu", context->vecP2pDevices.size()); + }; + + asyncContext->completeFunc = [&](void* data) -> void { + QueryP2pDeviceAsyncContext *context = static_cast(data); + napi_create_array_with_length(context->env, context->vecP2pDevices.size(), &context->result); + context->isSuccess = DeviceInfosToJs(context->env, context->vecP2pDevices, context->result); + WIFI_LOGI("Push P2p Device List to client"); + }; + + size_t nonCallbackArgNum = 0; + return DoAsyncWork(env, asyncContext, argc, argv, nonCallbackArgNum); +} + +napi_value SetP2pDeviceName(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + size_t argc = 1; + napi_value argv[1]; + napi_value thisVar; + NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); + NAPI_ASSERT(env, argc == 1, "Wrong number of arguments"); + + napi_valuetype valueType; + napi_typeof(env, argv[0], &valueType); + NAPI_ASSERT(env, valueType == napi_string, "Wrong argument type. napi_number expected."); + + NAPI_ASSERT(env, wifiP2pPtr != nullptr, "Wifi p2p instance is null."); + + char name[64] = {0}; + size_t typeLen = 0; + napi_get_value_string_utf8(env, argv[0], name, sizeof(name), &typeLen); + ErrCode ret = wifiP2pPtr->SetP2pDeviceName(name); + napi_value result; + napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); + return result; +} + +static void JsObjToP2pConfig(const napi_env& env, const napi_value& object, WifiP2pConfig& config) +{ + std::string address = ""; + int netId = -1; + std::string passphrase = ""; + int groupOwnerIntent = -1; + std::string groupName = ""; + int band = static_cast(GroupOwnerBand::GO_BAND_AUTO); + JsObjectToString(env, object, "macAddress", WIFI_MAC_LENGTH + 1, address); + JsObjectToInt(env, object, "goBand", band); + JsObjectToInt(env, object, "netId", netId); + JsObjectToString(env, object, "passphrase", MAX_PASSPHRASE_LENGTH + 1, passphrase); + JsObjectToInt(env, object, "groupOwnerIntent", groupOwnerIntent); + JsObjectToString(env, object, "groupName", DEVICE_NAME_LENGTH + 1, groupName); + config.SetDeviceAddress(address); + config.SetGoBand(static_cast(band)); + config.SetNetId(netId); + config.SetPassphrase(passphrase); + config.SetGroupOwnerIntent(groupOwnerIntent); + config.SetGroupName(groupName); +} + +napi_value P2pConnect(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + size_t argc = 1; + napi_value argv[argc]; + napi_value thisVar; + NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); + + napi_valuetype valueType; + napi_typeof(env, argv[0], &valueType); + NAPI_ASSERT(env, valueType == napi_object, "Wrong argument type. Object expected."); + + NAPI_ASSERT(env, wifiP2pPtr != nullptr, "[NAPI] Wifi p2p instance is null."); + WifiP2pConfig config; + JsObjToP2pConfig(env, argv[0], config); + ErrCode ret = wifiP2pPtr->P2pConnect(config); + if (ret != WIFI_OPT_SUCCESS) { + WIFI_LOGE("Connect to device fail: %{public}d", ret); + } + napi_value result; + napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); + return result; +} + +napi_value P2pDisConnect(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + NAPI_ASSERT(env, wifiP2pPtr != nullptr, "[NAPI] Wifi p2p instance is null."); + + ErrCode ret = wifiP2pPtr->P2pDisConnect(); + napi_value result; + napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); + return result; +} + +napi_value CreateGroup(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + size_t argc = 1; + napi_value argv[1]; + napi_value thisVar; + NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); + + napi_valuetype valueType; + napi_typeof(env, argv[0], &valueType); + NAPI_ASSERT(env, valueType == napi_object, "Wrong argument type. Object expected."); + + NAPI_ASSERT(env, wifiP2pPtr != nullptr, "[NAPI] Wifi p2p instance is null."); + WifiP2pConfig config; + JsObjToP2pConfig(env, argv[0], config); + + ErrCode ret = wifiP2pPtr->FormGroup(config); + napi_value result; + napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); + return result; +} + +napi_value RemoveGroup(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + NAPI_ASSERT(env, wifiP2pPtr != nullptr, "[NAPI] Wifi p2p instance is null."); + + ErrCode ret = wifiP2pPtr->RemoveGroup(); + napi_value result; + napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); + return result; +} + +static void LinkedInfoToJs(const napi_env& env, WifiP2pLinkedInfo& linkedInfo, napi_value& result) +{ + SetValueInt32(env, "connectState", static_cast(linkedInfo.GetConnectState()), result); + SetValueBool(env, "isP2pGroupOwner", linkedInfo.IsGroupOwner(), result); + SetValueUtf8String(env, "groupOwnerAddress", linkedInfo.GetGroupOwnerAddress().c_str(), result); +} + +napi_value GetP2pLinkedInfo(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + size_t argc = 2; + napi_value argv[argc]; + napi_value thisVar = nullptr; + void *data = nullptr; + NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data)); + NAPI_ASSERT(env, wifiP2pPtr != nullptr, "Wifi p2p instance is null."); + + P2pLinkedInfoAsyncContext *asyncContext = new P2pLinkedInfoAsyncContext(env); + NAPI_ASSERT(env, asyncContext != nullptr, "asyncContext is null."); + napi_create_string_latin1(env, "queryP2pLinkedInfo", NAPI_AUTO_LENGTH, &asyncContext->resourceName); + + asyncContext->executeFunc = [&](void* data) -> void { + P2pLinkedInfoAsyncContext *context = static_cast(data); + TRACE_FUNC_CALL_NAME("wifiP2pPtr->QueryP2pLinkedInfo"); + context->isSuccess = (wifiP2pPtr->QueryP2pLinkedInfo(context->linkedInfo) == WIFI_OPT_SUCCESS); + }; + + asyncContext->completeFunc = [&](void* data) -> void { + P2pLinkedInfoAsyncContext *context = static_cast(data); + napi_create_object(context->env, &context->result); + LinkedInfoToJs(context->env, context->linkedInfo, context->result); + WIFI_LOGI("Push get linkedInfo result to client"); + }; + + size_t nonCallbackArgNum = 0; + return DoAsyncWork(env, asyncContext, argc, argv, nonCallbackArgNum); +} } // namespace Wifi } // namespace OHOS diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_p2p.h b/interfaces/innerkits/native_cpp/napi/wifi_napi_p2p.h index e007891..c7eeb58 100755 --- a/interfaces/innerkits/native_cpp/napi/wifi_napi_p2p.h +++ b/interfaces/innerkits/native_cpp/napi/wifi_napi_p2p.h @@ -17,10 +17,61 @@ #define WIFI_NAPI_P2P_H_ #include "wifi_napi_utils.h" +#include "wifi_p2p.h" namespace OHOS { namespace Wifi { +napi_value EnableP2p(napi_env env, napi_callback_info info); +napi_value DisableP2p(napi_env env, napi_callback_info info); +napi_value GetP2pLinkedInfo(napi_env env, napi_callback_info info); +napi_value GetCurrentGroup(napi_env env, napi_callback_info info); +napi_value GetP2pDevices(napi_env env, napi_callback_info info); +napi_value CreateGroup(napi_env env, napi_callback_info info); +napi_value RemoveGroup(napi_env env, napi_callback_info info); +napi_value P2pConnect(napi_env env, napi_callback_info info); +napi_value P2pDisConnect(napi_env env, napi_callback_info info); +napi_value StartDiscoverDevices(napi_env env, napi_callback_info info); +napi_value StopDiscoverDevices(napi_env env, napi_callback_info info); +napi_value StartP2pListen(napi_env env, napi_callback_info info); +napi_value StopP2pListen(napi_env env, napi_callback_info info); +napi_value DeletePersistentGroup(napi_env env, napi_callback_info info); +napi_value SetP2pDeviceName(napi_env env, napi_callback_info info); +class QueryP2pDeviceAsyncContext : public AsyncContext { +public: + std::vector vecP2pDevices; + + QueryP2pDeviceAsyncContext(napi_env env, napi_async_work work = nullptr, napi_deferred deferred = nullptr) + : AsyncContext(env, work, deferred) {} + + QueryP2pDeviceAsyncContext() = delete; + + ~QueryP2pDeviceAsyncContext() override {} +}; + +class P2pLinkedInfoAsyncContext : public AsyncContext { +public: + WifiP2pLinkedInfo linkedInfo; + + P2pLinkedInfoAsyncContext(napi_env env, napi_async_work work = nullptr, napi_deferred deferred = nullptr) + : AsyncContext(env, work, deferred) {} + + P2pLinkedInfoAsyncContext() = delete; + + ~P2pLinkedInfoAsyncContext() override {} +}; + +class P2pGroupInfoAsyncContext : public AsyncContext { +public: + WifiP2pGroupInfo groupInfo; + + P2pGroupInfoAsyncContext(napi_env env, napi_async_work work = nullptr, napi_deferred deferred = nullptr) + : AsyncContext(env, work, deferred) {} + + P2pGroupInfoAsyncContext() = delete; + + ~P2pGroupInfoAsyncContext() override {} +}; } // namespace Wifi } // namespace OHOS diff --git a/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_p2p.h b/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_p2p.h index e0b25ce..6fb8ccf 100644 --- a/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_p2p.h +++ b/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_p2p.h @@ -16,7 +16,7 @@ #define OHOS_WIFI_P2P_H #include "wifi_errcode.h" -#include "wifi_p2p_msg.h" +#include "wifi_msg.h" #include "i_wifi_p2p_callback.h" namespace OHOS { diff --git a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_msg.h b/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_msg.h index 4cf1a46..0d78b16 100755 --- a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_msg.h +++ b/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_msg.h @@ -35,6 +35,8 @@ namespace Wifi { #define IPV4_ADDRESS_TYPE 0 #define IPV6_ADDRESS_TYPE 1 #define DEVICE_NAME_LENGTH 32 +#define WIFI_MAC_LENGTH 17 +#define MAX_PASSPHRASE_LENGTH 63 enum class SupplicantState { DISCONNECTED = 0, -- Gitee From 6489a137d96b31c21c92442c92fe3cb5fc0dfc78 Mon Sep 17 00:00:00 2001 From: zero-cyc Date: Thu, 20 Jan 2022 17:51:09 +0800 Subject: [PATCH 022/491] chenlien@huawei.com Signed-off-by: zero-cyc Change-Id: Ibd1aa072b51c6488c570f9ecc4f8c68909d604ac --- interfaces/innerkits/native_cpp/napi/wifi_napi_event.h | 1 - .../native_cpp/wifi_standard/c_adapter/wifi_c_event.cpp | 1 - 2 files changed, 2 deletions(-) diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_event.h b/interfaces/innerkits/native_cpp/napi/wifi_napi_event.h index 19b583e..f3a4238 100755 --- a/interfaces/innerkits/native_cpp/napi/wifi_napi_event.h +++ b/interfaces/innerkits/native_cpp/napi/wifi_napi_event.h @@ -21,7 +21,6 @@ #include #include "napi/native_api.h" #include "common_event_manager.h" -#include "common_event.h" namespace OHOS { namespace Wifi { diff --git a/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_event.cpp b/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_event.cpp index 5286418..da3a699 100755 --- a/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_event.cpp +++ b/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_event.cpp @@ -18,7 +18,6 @@ #include "native_c/wifi_scan_info.h" #include "wifi_logger.h" #include "common_event_manager.h" -#include "common_event.h" #include DEFINE_WIFILOG_LABEL("WifiCEvent"); -- Gitee From bf02a8ad1c9d2446c769c8836da4cc3baaf6c737 Mon Sep 17 00:00:00 2001 From: z00588131 Date: Thu, 20 Jan 2022 13:41:42 +0000 Subject: [PATCH 023/491] fix(*): 1. hid2d code optimize and fix problem; 2. update bundle.json file Signed-off-by: z00588131 --- bundle.json | 19 ++++++++++++++----- .../wifi_standard/c_adapter/wifi_c_p2p.cpp | 3 ++- .../common/net_helper/if_config.cpp | 2 ++ .../wifi_manage/wifi_hid2d_service_utils.cpp | 18 +++++++++++++++--- .../wifi_manage/wifi_hid2d_service_utils.h | 1 + .../wifi_manage/wifi_p2p/BUILD.gn | 1 + .../wifi_p2p/group_formed_state.cpp | 1 + .../wifi_p2p/p2p_group_operating_state.cpp | 9 ++++++--- .../wifi_manage/wifi_p2p/test/BUILD.gn | 1 + 9 files changed, 43 insertions(+), 12 deletions(-) diff --git a/bundle.json b/bundle.json index b9db3e9..fae05e5 100755 --- a/bundle.json +++ b/bundle.json @@ -35,7 +35,7 @@ "destPath": "foundation/communication/wifi" }, "component": { - "name": "wifi", + "name": "wifi_standard", "subsystem": "communication", "syscap": [ "SystemCapability.Communication.WiFi" @@ -68,10 +68,19 @@ "inner_kits": [ { "header" : { - "header_base": [ - "//foundation/communication/wifi/interfaces/innerkits/native_c", - "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/include" - ], + "header_base": "//foundation/communication/wifi/interfaces/innerkits/native_c", + "header_files": [ + "wifi_device.h", + "wifi_hotspot.h", + "wifi_p2p.h", + "wifi_hid2d.h" + ] + }, + "name" : "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard:wifi_sdk" + }, + { + "header" : { + "header_base": "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/include", "header_files": [ "wifi_device.h", "wifi_hotspot.h", diff --git a/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_p2p.cpp b/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_p2p.cpp index 481d4e6..70b07fd 100755 --- a/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_p2p.cpp +++ b/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_p2p.cpp @@ -345,8 +345,9 @@ public: if (!devices.empty()) { devicePtr = new WifiP2pDevice[(int)devices.size()]; } + WifiP2pDevice *p = devicePtr; for (auto& each : devices) { - if (ConvertP2PDeviceCppToC(each, devicePtr++) != OHOS::Wifi::WIFI_OPT_SUCCESS) { + if (ConvertP2PDeviceCppToC(each, p++) != OHOS::Wifi::WIFI_OPT_SUCCESS) { WIFI_LOGE("peers changed convert p2p device failed!"); return; } diff --git a/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp b/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp index 3662167..4da4c54 100755 --- a/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp +++ b/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp @@ -143,6 +143,8 @@ void IfConfig::SetNetDns(const std::string& ifName, const std::string& dns1, con */ void IfConfig::FlushIpAddr(const std::string& ifName, const int& ipType) { + LOGI("Flush IP, ifName: %{public}s", ifName.c_str()); + if (ipType != static_cast(IpType::IPTYPE_IPV4)) { return; } diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_service_utils.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_service_utils.cpp index a8e493f..24a9a33 100755 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_service_utils.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_service_utils.cpp @@ -31,8 +31,9 @@ std::atomic_int SharedLinkManager::sharedLinkCount(0); bool IpPool::InitIpPool(const std::string& serverIp) { - std::unique_lock guard(g_ipPoolMutex); + WIFI_LOGI("Init ip pool"); + std::unique_lock guard(g_ipPoolMutex); if (!ipList.empty()) { return true; } @@ -53,8 +54,9 @@ bool IpPool::InitIpPool(const std::string& serverIp) std::string IpPool::GetIp(const std::string& gcMac) { - std::unique_lock guard(g_ipPoolMutex); + WIFI_LOGI("Get ip, gcMac: %{public}s", gcMac.c_str()); + std::unique_lock guard(g_ipPoolMutex); std::string ip = ""; if (ipList.empty()) { WIFI_LOGE("Alloc ip failed!"); @@ -68,8 +70,9 @@ std::string IpPool::GetIp(const std::string& gcMac) void IpPool::ReleaseIp(const std::string& gcMac) { - std::unique_lock guard(g_ipPoolMutex); + WIFI_LOGI("Release ip, gcMac: %{public}s", gcMac.c_str()); + std::unique_lock guard(g_ipPoolMutex); auto iter = mapGcMacToAllocIp.find(gcMac); if (iter == mapGcMacToAllocIp.end()) { return; @@ -84,6 +87,15 @@ void IpPool::ReleaseIp(const std::string& gcMac) } } +void IpPool::ReleaseIpPool() +{ + WIFI_LOGI("Release ip pool"); + + std::unique_lock guard(g_ipPoolMutex); + mapGcMacToAllocIp.clear(); + ipList.clear(); +} + bool IpPool::IsValidIp(const std::string& ip) { if (ip.empty()) { diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_service_utils.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_service_utils.h index 5cae549..b364fe6 100755 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_service_utils.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_service_utils.h @@ -28,6 +28,7 @@ public: static bool InitIpPool(const std::string& serverIp); static std::string GetIp(const std::string& gcMac); static void ReleaseIp(const std::string& gcMac); + static void ReleaseIpPool(); private: static bool IsValidIp(const std::string& ip); diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/BUILD.gn b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/BUILD.gn index e1dc0e9..1f316fa 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/BUILD.gn +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/BUILD.gn @@ -17,6 +17,7 @@ ohos_shared_library("wifi_p2p_service") { install_enable = true sources = [ "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/dhcpd_interface.cpp", + "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp", "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp", "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/handler.cpp", "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/internal_message.cpp", diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.cpp index f5d66c6..f923fcb 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.cpp @@ -206,6 +206,7 @@ bool GroupFormedState::ProcessDisconnectEvt(const InternalMessage &msg) const return EXECUTED; } + IpPool::ReleaseIp(device.GetDeviceAddress()); device.SetP2pDeviceStatus(P2pDeviceStatus::PDS_AVAILABLE); deviceManager.UpdateDeviceStatus(device); // used for peers change event querying device infos groupManager.RemoveCurrGroupClient(device); diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.cpp index b45f971..5b15e17 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.cpp @@ -17,6 +17,7 @@ #include "wifi_p2p_hal_interface.h" #include "p2p_state_machine.h" #include "wifi_logger.h" +#include "if_config.h" DEFINE_WIFILOG_P2P_LABEL("P2pGroupOperatingState"); @@ -175,7 +176,7 @@ bool P2pGroupOperatingState::ProcessCreateGroupTimeOut(const InternalMessage &ms bool P2pGroupOperatingState::ProcessGroupRemovedEvt(const InternalMessage &msg) const { - WIFI_LOGI("recv event: %{public}d", msg.GetMessageName()); + WIFI_LOGI("recv group remove event: %{public}d", msg.GetMessageName()); if (groupManager.GetCurrentGroup().IsPersistent()) { groupManager.StashGroups(); WifiP2pGroupInfo copy = groupManager.GetCurrentGroup(); @@ -184,6 +185,10 @@ bool P2pGroupOperatingState::ProcessGroupRemovedEvt(const InternalMessage &msg) groupManager.SetCurrentGroup(copy); groupManager.StashGroups(); } + p2pStateMachine.ChangeConnectedStatus(P2pConnectedState::P2P_DISCONNECTED); + IpPool::ReleaseIpPool(); + IfConfig::GetInstance().FlushIpAddr(groupManager.GetCurrentGroup().GetInterface(), IpType::IPTYPE_IPV4); + SharedLinkManager::SetSharedLinkCount(SHARED_LINKE_COUNT_ON_DISCONNECTED); if (groupManager.GetCurrentGroup().IsGroupOwner()) { if (!p2pStateMachine.StopDhcpServer()) { WIFI_LOGW("failed to stop Dhcp server."); @@ -197,8 +202,6 @@ bool P2pGroupOperatingState::ProcessGroupRemovedEvt(const InternalMessage &msg) } WifiP2pGroupInfo invalidGroup; groupManager.SetCurrentGroup(invalidGroup); - SharedLinkManager::SetSharedLinkCount(SHARED_LINKE_COUNT_ON_DISCONNECTED); - p2pStateMachine.ChangeConnectedStatus(P2pConnectedState::P2P_DISCONNECTED); p2pStateMachine.SwitchState(&p2pStateMachine.p2pIdleState); return EXECUTED; } diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn index f9fdd98..0aa944f 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn +++ b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn @@ -32,6 +32,7 @@ ohos_unittest("wifi_p2p_test") { "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log/log_helper.c", "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/base_address.cpp", "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/dhcpd_interface.cpp", + "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp", "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp", "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.cpp", "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.cpp", -- Gitee From f786a0c47227f91bc489a4f64bf1617750c905d8 Mon Sep 17 00:00:00 2001 From: zhangfanfan2 Date: Sat, 22 Jan 2022 02:34:45 +0000 Subject: [PATCH 024/491] =?UTF-8?q?feat:=20=E5=BA=94=E7=94=A8=E6=94=AF?= =?UTF-8?q?=E6=8C=8164=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit close: #I4RRLK Signed-off-by: zff --- services/wifi_standard/wifi_hal/wifi_hal_module_manage.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/services/wifi_standard/wifi_hal/wifi_hal_module_manage.c b/services/wifi_standard/wifi_hal/wifi_hal_module_manage.c index e7fcf3e..412b081 100755 --- a/services/wifi_standard/wifi_hal/wifi_hal_module_manage.c +++ b/services/wifi_standard/wifi_hal/wifi_hal_module_manage.c @@ -86,7 +86,11 @@ static void *WpaThreadMain(void *p) const char *startCmd = (const char *)p; struct StWpaMainParam param = {0}; SplitCmdString(startCmd, ¶m); +#ifdef __aarch64__ + void *handleLibWpa = dlopen("/system/lib64/libwpa.z.so", RTLD_NOW | RTLD_LOCAL); +#else void *handleLibWpa = dlopen("/system/lib/libwpa.z.so", RTLD_NOW | RTLD_LOCAL); +#endif if (handleLibWpa == NULL) { LOGE("dlopen libwpa failed."); return NULL; -- Gitee From 1a7e2603efcf1bb66f3ba93bef853ce513b45c2e Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Tue, 25 Jan 2022 06:20:01 +0000 Subject: [PATCH 025/491] fix(*): 1. update p2p_supplicant.conf file; 2. power consumption optimize Signed-off-by: zhangfeng --- services/wifi_standard/ipc_framework/cRPC/src/server.c | 4 ++-- services/wifi_standard/wifi_hal/etc/init/p2p_supplicant.conf | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/services/wifi_standard/ipc_framework/cRPC/src/server.c b/services/wifi_standard/ipc_framework/cRPC/src/server.c index c30e29d..97e4258 100644 --- a/services/wifi_standard/ipc_framework/cRPC/src/server.c +++ b/services/wifi_standard/ipc_framework/cRPC/src/server.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -199,7 +199,7 @@ int RunRpcLoop(RpcServer *server) EventLoop *loop = server->loop; while (!loop->stop) { BeforeLoop(server); - int retval = epoll_wait(loop->epfd, loop->epEvents, loop->setSize, 1); /* wait 1ms */ + int retval = epoll_wait(loop->epfd, loop->epEvents, loop->setSize, -1); for (int i = 0; i < retval; ++i) { struct epoll_event *e = loop->epEvents + i; int fd = e->data.fd; diff --git a/services/wifi_standard/wifi_hal/etc/init/p2p_supplicant.conf b/services/wifi_standard/wifi_hal/etc/init/p2p_supplicant.conf index 37ceb04..e7df567 100755 --- a/services/wifi_standard/wifi_hal/etc/init/p2p_supplicant.conf +++ b/services/wifi_standard/wifi_hal/etc/init/p2p_supplicant.conf @@ -24,3 +24,5 @@ p2p_go_intent=0 persistent_reconnect=1 serial_number=0123456789ABCDEF p2p_ssid_postfix=-ohos +p2p_go_ht40=1 +p2p_go_vht=1 -- Gitee From d18332c1c010564bbffd100cce55da25c6ae6372 Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Wed, 26 Jan 2022 07:12:53 +0000 Subject: [PATCH 026/491] fix(*): Js module multi thread problem fix Signed-off-by: zhangfeng --- README.md | 27 +- README_zh.md | 29 +- .../native_cpp/napi/wifi_napi_device.cpp | 14 +- .../native_cpp/napi/wifi_napi_entry.cpp | 27 +- .../native_cpp/napi/wifi_napi_event.cpp | 701 ++++++++++-------- .../native_cpp/napi/wifi_napi_event.h | 121 +-- .../native_cpp/napi/wifi_napi_p2p.cpp | 52 +- .../innerkits/native_cpp/napi/wifi_napi_p2p.h | 2 +- .../native_cpp/napi/wifi_napi_utils.cpp | 16 +- .../native_cpp/napi/wifi_napi_utils.h | 8 +- interfaces/kits/jskits/@ohos.wifi.d.ts | 26 +- 11 files changed, 546 insertions(+), 477 deletions(-) diff --git a/README.md b/README.md index 8109dfc..c1c3304 100755 --- a/README.md +++ b/README.md @@ -157,14 +157,19 @@ import wf from '@ohos.wifi'; // Import the @ohos.wifi class. ```js // Start a scan. var isScanSuccess = wf.scan(); // true - + // Wait for some time. - + // Obtain the scan result. - wf.getScanInfos(result => { - var num = Object.keys(result).length; - console.info("wifi scan result mum: " + num); - for (var i = 0; i < num; ++i) { + wf.getScanInfos((err, result) => { + if (err) { + console.error("get scan info error"); + return; + } + + var len = Object.keys(result).length; + console.log("get scan info number: " + len); + for (var i = 0; i < len; ++i) { console.info("ssid: " + result[i].ssid); console.info("bssid: " + result[i].bssid); console.info("securityType: " + result[i].securityType); @@ -173,7 +178,7 @@ import wf from '@ohos.wifi'; // Import the @ohos.wifi class. console.info("frequency: " + result[i].frequency); console.info("timestamp: " + result[i].timestamp); } - }) + }); ``` @@ -190,13 +195,19 @@ Set up a WLAN connection. "isHiddenSsid":false, "securityType":3, } + Method 1: // Add a hotspot configuration. - wf.addDeviceConfig(config, (result) => { + wf.addDeviceConfig(config, (err, result) => { + if (err) { + console.error("add device config error"); + return; + } console.info("config id: " + result); // Set up a WLAN based on the hotspot configuration ID. wf.connectToNetwork(result); }); + Method 2: // Set up a WLAN by calling connectToDevice with the hotspot configuration passed. wf.connectToDevice(config); diff --git a/README_zh.md b/README_zh.md index 0dffea0..e2ab448 100755 --- a/README_zh.md +++ b/README_zh.md @@ -157,14 +157,19 @@ import wf from '@ohos.wifi'; // 导入js接口类 ```js // 调用WLAN扫描接口 var isScanSuccess = wf.scan(); // true - + // 延迟一定时间 - + // 获取扫描结果 - wf.getScanInfos(result => { - var num = Object.keys(result).length; - console.info("wifi scan result mum: " + num); - for (var i = 0; i < num; ++i) { + wf.getScanInfos((err, result) => { + if (err) { + console.error("get scan info error"); + return; + } + + var len = Object.keys(result).length; + console.log("get scan info number: " + len); + for (var i = 0; i < len; ++i) { console.info("ssid: " + result[i].ssid); console.info("bssid: " + result[i].bssid); console.info("securityType: " + result[i].securityType); @@ -173,7 +178,7 @@ import wf from '@ohos.wifi'; // 导入js接口类 console.info("frequency: " + result[i].frequency); console.info("timestamp: " + result[i].timestamp); } - }) + }); ``` @@ -190,14 +195,18 @@ import wf from '@ohos.wifi'; // 导入js接口类 "isHiddenSsid":false, "securityType":3, } - 方式一： + 方式一: // 添加配置 - wf.addDeviceConfig(config, (result) => { + wf.addDeviceConfig(config, (err, result) => { + if (err) { + console.error("add device config error"); + return; + } console.info("config id: " + result); // 通过配置id连接WLAN wf.connectToNetwork(result); }); - 方式二： + 方式二: // 通过配置信息直接连接WLAN wf.connectToDevice(config); ``` diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_device.cpp b/interfaces/innerkits/native_cpp/napi/wifi_napi_device.cpp index ed34861..4354ae7 100755 --- a/interfaces/innerkits/native_cpp/napi/wifi_napi_device.cpp +++ b/interfaces/innerkits/native_cpp/napi/wifi_napi_device.cpp @@ -96,7 +96,7 @@ static SecTypeJs SecurityTypeNativeToJs(const WifiSecurity& cppSecurityType) return jsSecurityType; } -static bool NativeScanInfosToJsObj(const napi_env& env, +static ErrCode NativeScanInfosToJsObj(const napi_env& env, const std::vector& vecScnIanfos, napi_value& arrayResult) { uint32_t idx = 0; @@ -115,10 +115,10 @@ static bool NativeScanInfosToJsObj(const napi_env& env, napi_status status = napi_set_element(env, arrayResult, idx++, eachObj); if (status != napi_ok) { WIFI_LOGE("Wifi napi set element error: %{public}d, idx: %{public}d", status, idx - 1); - return false; + return WIFI_OPT_FAILED; } } - return true; + return WIFI_OPT_SUCCESS; } napi_value GetScanInfos(napi_env env, napi_callback_info info) @@ -138,14 +138,14 @@ napi_value GetScanInfos(napi_env env, napi_callback_info info) asyncContext->executeFunc = [&](void* data) -> void { ScanInfoAsyncContext *context = static_cast(data); TRACE_FUNC_CALL_NAME("wifiScanPtr->GetScanInfoList"); - context->isSuccess = (wifiScanPtr->GetScanInfoList(context->vecScanInfos) == WIFI_OPT_SUCCESS); + context->errorCode = wifiScanPtr->GetScanInfoList(context->vecScanInfos); WIFI_LOGI("GetScanInfoList, size: %{public}zu", context->vecScanInfos.size()); }; asyncContext->completeFunc = [&](void* data) -> void { ScanInfoAsyncContext *context = static_cast(data); napi_create_array_with_length(context->env, context->vecScanInfos.size(), &context->result); - context->isSuccess = NativeScanInfosToJsObj(context->env, context->vecScanInfos, context->result); + context->errorCode = NativeScanInfosToJsObj(context->env, context->vecScanInfos, context->result); WIFI_LOGI("Push scan info list to client"); }; @@ -223,7 +223,7 @@ napi_value AddDeviceConfig(napi_env env, napi_callback_info info) if (context->addResult < 0 || ret != WIFI_OPT_SUCCESS) { context->addResult = -1; } - context->isSuccess = (ret == WIFI_OPT_SUCCESS); + context->errorCode = ret; }; asyncContext->completeFunc = [&](void* data) -> void { @@ -425,7 +425,7 @@ napi_value GetLinkedInfo(napi_env env, napi_callback_info info) asyncContext->executeFunc = [&](void* data) -> void { LinkedInfoAsyncContext *context = static_cast(data); TRACE_FUNC_CALL_NAME("wifiDevicePtr->GetLinkedInfo"); - context->isSuccess = (wifiDevicePtr->GetLinkedInfo(context->linkedInfo) == WIFI_OPT_SUCCESS); + context->errorCode = wifiDevicePtr->GetLinkedInfo(context->linkedInfo); }; asyncContext->completeFunc = [&](void* data) -> void { diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_entry.cpp b/interfaces/innerkits/native_cpp/napi/wifi_napi_entry.cpp index 2422066..0afcac0 100755 --- a/interfaces/innerkits/native_cpp/napi/wifi_napi_entry.cpp +++ b/interfaces/innerkits/native_cpp/napi/wifi_napi_entry.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -22,26 +22,6 @@ namespace OHOS { namespace Wifi { #ifndef ENABLE_NAPI_COMPATIBLE -DEFINE_WIFILOG_LABEL("WifiNAPIEntry"); -/* - * Event class initialization function - */ -static void InitEventClass(napi_env& env, napi_value& exports) { - const char className[] = "EventListener"; - napi_property_descriptor properties[] = { - DECLARE_NAPI_FUNCTION("on", On), - DECLARE_NAPI_FUNCTION("off", Off), - }; - - napi_value eventListenerClass = nullptr; - napi_define_class(env, className, sizeof(className), EventListenerConstructor, nullptr, - sizeof(properties) / sizeof(napi_property_descriptor), properties, &eventListenerClass); - napi_status status = napi_set_named_property(env, exports, "EventListener", eventListenerClass); - if (status != napi_ok) { - WIFI_LOGE("Init event class set property error."); - } -} - /* * Module initialization function */ @@ -91,11 +71,12 @@ static napi_value Init(napi_env env, napi_value exports) { DECLARE_NAPI_FUNCTION("startP2pListen", StartP2pListen), DECLARE_NAPI_FUNCTION("stopP2pListen", StopP2pListen), DECLARE_NAPI_FUNCTION("deletePersistentGroup", DeletePersistentGroup), - DECLARE_NAPI_FUNCTION("setP2pDeviceName", SetP2pDeviceName) + DECLARE_NAPI_FUNCTION("setP2pDeviceName", SetP2pDeviceName), + DECLARE_NAPI_FUNCTION("on", On), + DECLARE_NAPI_FUNCTION("off", Off), }; NAPI_CALL(env, napi_define_properties(env, exports, sizeof(desc) / sizeof(napi_property_descriptor), desc)); - InitEventClass(env, exports); return exports; } diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_event.cpp b/interfaces/innerkits/native_cpp/napi/wifi_napi_event.cpp index 64782c8..e863c08 100755 --- a/interfaces/innerkits/native_cpp/napi/wifi_napi_event.cpp +++ b/interfaces/innerkits/native_cpp/napi/wifi_napi_event.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -14,347 +14,296 @@ */ #include "wifi_napi_event.h" -#include +#include #include "wifi_napi_utils.h" +#include "wifi_device.h" +#include "wifi_scan.h" +#include "wifi_p2p.h" #include "wifi_logger.h" -using namespace OHOS::EventFwk; - namespace OHOS { namespace Wifi { DEFINE_WIFILOG_LABEL("WifiNAPIEvent"); -const std::string WIFI_EVENT_TYPE_POWER_STATE = "wifiStateChange"; -const std::string WIFI_EVENT_TYPE_CONN_STATE = "wifiConnectionChange"; -const std::string WIFI_EVENT_TYPE_SCAN_STATE = "wifiScanStateChange"; -const std::string WIFI_EVENT_TYPE_RSSI_STATE = "wifiRssiChange"; -const std::string WIFI_EVENT_TYPE_HOTSPOT_STATE = "hotspotStateChange"; -const std::string WIFI_EVENT_TYPE_AP_STA_JOIN = "hotspotStaJoin"; -const std::string WIFI_EVENT_TYPE_AP_STA_LEAVE = "hotspotStaLeave"; -const std::string WIFI_EVENT_TYPE_P2P_DEVICES_STATE = "p2pDevicesChange"; -const std::string WIFI_EVENT_TYPE_P2P_STATE = "p2pStateChange"; -const std::string WIFI_EVENT_TYPE_P2P_CONN_STATE = "p2pConnStateChange"; -const std::string WIFI_EVENT_TYPE_P2P_PEER_DISCOVERY_STATE = "p2pPeerDiscoveryStateChange"; -const std::string WIFI_EVENT_TYPE_P2P_CURRENT_DEVICE_STATE = "p2pCurrentDeviceChange"; -const std::string WIFI_EVENT_TYPE_P2P_GROUP_STATE = "p2pGroupStateChange"; - -const std::string WIFI_USUAL_EVENT_POWER_STATE = "usual.event.wifi.POWER_STATE"; -const std::string WIFI_USUAL_EVENT_CONN_STATE = "usual.event.wifi.CONN_STATE"; -const std::string WIFI_USUAL_EVENT_SCAN_STATE = "usual.event.wifi.SCAN_STATE"; -const std::string WIFI_USUAL_EVENT_RSSI_STATE = "usual.event.wifi.RSSI_VALUE"; -const std::string WIFI_USUAL_EVENT_HOTSPOT_STATE = "usual.event.wifi.HOTSPOT_STATE"; -const std::string WIFI_USUAL_EVENT_AP_STA_JOIN = "usual.event.wifi.WIFI_HS_STA_JOIN"; -const std::string WIFI_USUAL_EVENT_AP_STA_LEAVE = "usual.event.wifi.WIFI_HS_STA_LEAVE"; -const std::string WIFI_USUAL_EVENT_P2P_DEVICES_CHANGE = "usual.event.wifi.p2p.DEVICES_CHANGE"; -const std::string WIFI_USUAL_EVENT_P2P_STATE_CHANGE = "usual.event.wifi.p2p.STATE_CHANGE"; -const std::string WIFI_USUAL_EVENT_P2P_CONN_STATE_CHANGE = "usual.event.wifi.p2p.CONN_STATE_CHANGE"; -const std::string WIFI_USUAL_EVENT_P2P_PEER_DISCOVERY_STATE_CHANG = "usual.event.wifi.p2p.PEER_DISCOVERY_STATE_CHANGE"; -const std::string WIFI_USUAL_EVENT_P2P_CURRENT_DEVICE_STATE_CHANGE = "usual.event.wifi.p2p.CURRENT_DEVICE_CHANGE"; -const std::string WIFI_USUAL_EVENT_P2P_GROUP_STATE_CHANGE = "usual.event.wifi.p2p.GROUP_STATE_CHANGED"; - -std::shared_mutex g_regInfoMutex; -static std::map g_eventRegisterInfo; - -static std::map g_mapEventTypeToUsualEvent = { - { WIFI_EVENT_TYPE_POWER_STATE, WIFI_USUAL_EVENT_POWER_STATE }, - { WIFI_EVENT_TYPE_CONN_STATE, WIFI_USUAL_EVENT_CONN_STATE }, - { WIFI_EVENT_TYPE_SCAN_STATE, WIFI_USUAL_EVENT_SCAN_STATE }, - { WIFI_EVENT_TYPE_RSSI_STATE, WIFI_USUAL_EVENT_RSSI_STATE }, - { WIFI_EVENT_TYPE_HOTSPOT_STATE, WIFI_USUAL_EVENT_HOTSPOT_STATE }, - { WIFI_EVENT_TYPE_P2P_DEVICES_STATE, WIFI_USUAL_EVENT_P2P_DEVICES_CHANGE }, - { WIFI_EVENT_TYPE_P2P_STATE, WIFI_USUAL_EVENT_P2P_STATE_CHANGE }, - { WIFI_EVENT_TYPE_P2P_CONN_STATE, WIFI_USUAL_EVENT_P2P_CONN_STATE_CHANGE }, - { WIFI_EVENT_TYPE_P2P_PEER_DISCOVERY_STATE, WIFI_USUAL_EVENT_P2P_PEER_DISCOVERY_STATE_CHANG }, - { WIFI_EVENT_TYPE_P2P_CURRENT_DEVICE_STATE, WIFI_USUAL_EVENT_P2P_CURRENT_DEVICE_STATE_CHANGE }, - { WIFI_EVENT_TYPE_P2P_GROUP_STATE, WIFI_USUAL_EVENT_P2P_GROUP_STATE_CHANGE } +const std::string EVENT_STA_POWER_STATE_CHANGE = "wifiStateChange"; +const std::string EVENT_STA_CONN_STATE_CHANGE = "wifiConnectionChange"; +const std::string EVENT_STA_SCAN_STATE_CHANGE = "wifiScanStateChange"; +const std::string EVENT_STA_RSSI_STATE_CHANGE = "wifiRssiChange"; +const std::string EVENT_HOTSPOT_STATE_CHANGE = "hotspotStateChange"; +const std::string EVENT_HOTSPOT_STA_JOIN = "hotspotStaJoin"; +const std::string EVENT_HOTSPOT_STA_LEAVE = "hotspotStaLeave"; +const std::string EVENT_P2P_STATE_CHANGE = "p2pStateChange"; +const std::string EVENT_P2P_CONN_STATE_CHANGE = "p2pConnectionChange"; +const std::string EVENT_P2P_DEVICE_STATE_CHANGE = "p2pDeviceChange"; +const std::string EVENT_P2P_PERSISTENT_GROUP_CHANGE = "p2pPersistentGroupChange"; +const std::string EVENT_P2P_PEER_DEVICE_CHANGE = "p2pPeerDeviceChange"; +const std::string EVENT_P2P_DISCOVERY_CHANGE = "p2pPeerDeviceChange"; + +static std::set g_supportEventList = { + EVENT_STA_POWER_STATE_CHANGE, + EVENT_STA_CONN_STATE_CHANGE, + EVENT_STA_SCAN_STATE_CHANGE, + EVENT_STA_RSSI_STATE_CHANGE, + EVENT_HOTSPOT_STATE_CHANGE, + EVENT_HOTSPOT_STA_JOIN, + EVENT_HOTSPOT_STA_LEAVE, + EVENT_P2P_STATE_CHANGE, + EVENT_P2P_CONN_STATE_CHANGE, + EVENT_P2P_DEVICE_STATE_CHANGE, + EVENT_P2P_PERSISTENT_GROUP_CHANGE, + EVENT_P2P_PEER_DEVICE_CHANGE, + EVENT_P2P_DISCOVERY_CHANGE, }; -static std::map g_mapUserDefinedEventProcessFunc = {}; +void NapiEvent::EventNotify(AsyncEventData *asyncEvent) +{ + WIFI_LOGI("Enter wifi event notify"); + uv_loop_s* loop = nullptr; + napi_get_uv_event_loop(asyncEvent->env, &loop); + + uv_work_t* work = new uv_work_t; + if (work == nullptr) { + WIFI_LOGE("uv_work_t work is null."); + delete asyncEvent; + asyncEvent = nullptr; + return; + } -class EventRegisterInfo { -public: - explicit EventRegisterInfo(EventManager* context) : m_context(context) { + WIFI_LOGI("Get the event loop, napi_env: %{public}p", asyncEvent->env); + work->data = asyncEvent; + uv_queue_work( + loop, + work, + [](uv_work_t* work) {}, + [](uv_work_t* work, int status) { + AsyncEventData *asyncData = static_cast(work->data); + if (asyncData == nullptr) { + WIFI_LOGE("asyncData is null."); + return; + } + WIFI_LOGI("Napi event uv_queue_work, env: %{public}p, status: %{public}d", asyncData->env, status); + napi_handle_scope scope = nullptr; + napi_open_handle_scope(asyncData->env, &scope); + if (scope == nullptr) { + WIFI_LOGE("scope is nullptr"); + napi_close_handle_scope(asyncData->env, scope); + return; + } + napi_value undefine; + napi_get_undefined(asyncData->env, &undefine); + napi_value handler = nullptr; + napi_get_reference_value(asyncData->env, asyncData->callbackRef, &handler); + + WIFI_LOGI("Push event to js, env: %{public}p, ref : %{public}p", asyncData->env, &asyncData->callbackRef); + if (napi_call_function(asyncData->env, nullptr, handler, 1, &asyncData->jsEvent, &undefine) != napi_ok) { + WIFI_LOGE("Report event to Js failed"); + } + napi_close_handle_scope(asyncData->env, scope); + if (asyncData != nullptr) { + delete asyncData; + asyncData = nullptr; + } + if (work != nullptr) { + delete work; + work = nullptr; + } + } + ); +} + +bool NapiEvent::CheckIsRegister(const std::string& type) +{ + return g_eventRegisterInfo.find(type) != g_eventRegisterInfo.end(); +} + +napi_value NapiEvent::CreateResult(const napi_env& env, int value) { + napi_value result; + napi_create_int32(env, value, &result); + return result; +} + +napi_value NapiEvent::CreateResult(const napi_env& env, const StationInfo& info) +{ + napi_value result; + napi_create_object(env, &result); + SetValueUtf8String(env, "name", info.deviceName.c_str(), result); + SetValueUtf8String(env, "macAddress", info.bssid.c_str(), result); + SetValueUtf8String(env, "ipAddress", info.ipAddr.c_str(), result); + return result; +} + +napi_value NapiEvent::CreateResult(const napi_env& env, const WifiP2pDevice& device) +{ + napi_value result; + napi_create_object(env, &result); + SetValueUtf8String(env, "deviceName", device.GetDeviceName().c_str(), result); + SetValueUtf8String(env, "deviceAddress", device.GetDeviceAddress().c_str(), result); + SetValueUtf8String(env, "primaryDeviceType", device.GetPrimaryDeviceType().c_str(), result); + SetValueInt32(env, "devStatus", static_cast(device.GetP2pDeviceStatus()), result); + SetValueInt32(env, "groupCapability", device.GetGroupCapabilitys(), result); + return result; +} + +napi_value NapiEvent::CreateResult(const napi_env& env, const std::vector& devices) +{ + uint32_t idx = 0; + napi_value arrayResult; + napi_create_array_with_length(env, devices.size(), &arrayResult); + for (auto& each : devices) { + if (napi_set_element(env, arrayResult, idx++, CreateResult(env, each)) != napi_ok) { + WIFI_LOGE("Array result set element error, idx: %{public}d", idx - 1); + } } + return arrayResult; +} + +napi_value NapiEvent::CreateResult(const napi_env& env, const WifiP2pLinkedInfo& info) +{ + napi_value result; + napi_create_object(env, &result); + SetValueInt32(env, "connectState", static_cast(info.GetConnectState()), result); + SetValueBool(env, "isGroupOwner", info.IsGroupOwner(), result); + SetValueUtf8String(env, "groupOwnerAddr", info.GetGroupOwnerAddress().c_str(), result); + return result; +} + +napi_value NapiEvent::NapiEvent::CreateResult(const napi_env& env, napi_value placehoders) +{ + return placehoders == nullptr ? UndefinedNapiValue(env) : placehoders; +} - EventRegisterInfo() { +class WifiNapiDeviceEventCallback : public IWifiDeviceCallBack, public NapiEvent { +public: + WifiNapiDeviceEventCallback() { } - virtual ~EventRegisterInfo() { + virtual ~WifiNapiDeviceEventCallback() { } - std::set& GetHandlersCb() { - return m_handlersCb; +public: + void OnWifiStateChanged(int state) override { + WIFI_LOGI("sta received state changed event: %{public}d", state); + CheckAndNotify(EVENT_STA_POWER_STATE_CHANGE, state); } - void SetSubscriber(std::shared_ptr& subscriber) { - m_subscriber = subscriber; + void OnWifiConnectionChanged(int state, const WifiLinkedInfo &info) override { + WIFI_LOGI("sta received connection changed event: %{public}d", state); + CheckAndNotify(EVENT_STA_CONN_STATE_CHANGE, state); } - std::shared_ptr GetSubscriber() { - return m_subscriber; + void OnWifiRssiChanged(int rssi) override { + WIFI_LOGI("sta received rssi changed event: %{public}d", rssi); + CheckAndNotify(EVENT_STA_RSSI_STATE_CHANGE, rssi); } - void SetContext(EventManager* context) { - m_context = context; + void OnWifiWpsStateChanged(int state, const std::string &pinCode) override { } - EventManager* GetContext() { - return m_context; + void OnStreamChanged(int direction) override { } -private: - std::set m_handlersCb; - std::shared_ptr m_subscriber; - EventManager *m_context; + OHOS::sptr AsObject() override { + return nullptr; + } }; -void Event::SetName(std::string& name) { - m_name = name; -} - -std::string Event::GetName() { - return m_name; -} - -napi_env Event::GetEnv() { - return m_env; -} - -napi_value WifiCommonEvent::PackResult() { - napi_value result; - napi_create_int32(GetEnv(), m_value, &result); - return result; -} - -static bool GetUsualEventByEventType(const std::string& type, std::string& usual) { - std::map::const_iterator it = g_mapEventTypeToUsualEvent.find(type); - if (it == g_mapEventTypeToUsualEvent.end()) { - return false; +class WifiNapiScanEventCallback : public IWifiScanCallback, public NapiEvent { +public: + WifiNapiScanEventCallback() { } - usual = it->second; - return true; -} -static bool GetEventTypeByUsualEvent(const std::string& usual, std::string& type) { - for (auto& each : g_mapEventTypeToUsualEvent) { - if (each.second == usual) { - type = each.first; - return true; - } + virtual ~WifiNapiScanEventCallback() { } - return false; -} - -static bool IsEventTypeExist(const std::string& type) { - return g_mapEventTypeToUsualEvent.find(type) != g_mapEventTypeToUsualEvent.end(); -} -void WifiEventSubscriber::OnReceiveEvent(const CommonEventData& data) { - std::string event = data.GetWant().GetAction(); - int code = data.GetCode(); - WIFI_LOGI("Received event: %{public}s, value: %{public}d", event.c_str(), code); - - std::string type; - if (!GetEventTypeByUsualEvent(event, type)) { - WIFI_LOGI("Received event: %{public}s is ignored", event.c_str()); - return; +public: + void OnWifiScanStateChanged(int state) override { + WIFI_LOGI("scan received state changed event: %{public}d", state); + CheckAndNotify(EVENT_STA_SCAN_STATE_CHANGE, state); } - EventManager *manager = nullptr; - { - std::shared_lock guard(g_regInfoMutex); - std::map::iterator it = g_eventRegisterInfo.find(type); - if (it == g_eventRegisterInfo.end()) { - WIFI_LOGE("No register info for event: %{public}s", type.c_str()); - return; - } - manager = it->second.GetContext(); - if (manager == nullptr) { - WIFI_LOGE("Context is null"); - return; - } + OHOS::sptr AsObject() override { + return nullptr; } +}; - std::map::iterator iter = g_mapUserDefinedEventProcessFunc.find(type); - if (iter != g_mapUserDefinedEventProcessFunc.end()) { - WIFI_LOGI("Has user-defined func for event: %{public}s", type.c_str()); - iter->second(manager->GetEnv(), type, data); - } else { - WIFI_LOGI("Use default policy to process event: %{public}s", type.c_str()); - WifiCommonEvent commonEvent(manager->GetEnv(), type, code); - if (!manager->Send(commonEvent)) { - WIFI_LOGE("Send event error"); - } +class WifiNapiHotspotEventCallback : public IWifiHotspotCallback, public NapiEvent { +public: + WifiNapiHotspotEventCallback() { } -} - -EventManager::EventManager(napi_env env, napi_value thisVar) : m_env(env) { - m_thisVarRef = nullptr; - napi_create_reference(env, thisVar, 1, &m_thisVarRef); -} -EventManager::~EventManager() {} - -bool EventManager::Send(Event& event) { - WIFI_LOGI("Report event: %{public}s", event.GetName().c_str()); - - napi_handle_scope scope = nullptr; - napi_open_handle_scope(m_env, &scope); - - std::shared_lock guard(g_regInfoMutex); - std::map::iterator it = g_eventRegisterInfo.find(event.GetName()); - if (it == g_eventRegisterInfo.end()) { - WIFI_LOGE("Event receive owner not exits: %{public}s", event.GetName().c_str()); - return false; - } - - bool result = true; - napi_value thisVar = nullptr; - napi_get_reference_value(m_env, m_thisVarRef, &thisVar); - for (auto& each : it->second.GetHandlersCb()) { - napi_value undefine; - napi_value handler = nullptr; - napi_get_undefined(m_env, &undefine); - napi_get_reference_value(m_env, each, &handler); - napi_value jsEvent = event.PackResult(); - if (napi_call_function(m_env, thisVar, handler, 1, &jsEvent, &undefine) != napi_ok) { - WIFI_LOGE("Report event failed"); - result = false; - } + virtual ~WifiNapiHotspotEventCallback() { } - napi_close_handle_scope(m_env, scope); - return result; -} -bool EventManager::SubscribeServiceEvent(const std::string& event) { - MatchingSkills matchingSkills; - matchingSkills.AddEvent(event); - CommonEventSubscribeInfo subscriberInfo(matchingSkills); - std::shared_ptr subscriber = std::make_shared(subscriberInfo); - if (subscriber == nullptr) { - WIFI_LOGE("subscriber is null."); - return false; - } - WIFI_LOGI("Subscribe event -> %{public}s", event.c_str()); - bool result = CommonEventManager::SubscribeCommonEvent(subscriber); - if (result) { - g_eventRegisterInfo[m_eventType].SetSubscriber(subscriber); - } else { - WIFI_LOGE("Subscribe service event error: %{public}s", event.c_str()); +public: + void OnHotspotStateChanged(int state) override { + WIFI_LOGI("Hotspot received state changed event: %{public}d", state); + CheckAndNotify(EVENT_HOTSPOT_STATE_CHANGE, state); } - return result; -} -bool EventManager::UnsubscribeServiceEvent(const std::string& event) { - bool result = CommonEventManager::UnSubscribeCommonEvent(g_eventRegisterInfo[m_eventType].GetSubscriber()); - if (!result) { - WIFI_LOGE("Unsubscribe service event error: %{public}s", event.c_str()); + void OnHotspotStaJoin(const StationInfo &info) override { + WIFI_LOGI("Hotspot received sta join event"); + CheckAndNotify(EVENT_HOTSPOT_STA_JOIN, info); } - return result; -} -bool EventManager::SubscribeEvent(const std::string& name, napi_value handler) { - WIFI_LOGI("Subscribe event: %{public}s", name.c_str()); + void OnHotspotStaLeave(const StationInfo &info) override { + WIFI_LOGI("Hotspot received sta leave event"); + CheckAndNotify(EVENT_HOTSPOT_STA_LEAVE, info); + } - if (!IsEventTypeExist(name)) { - WIFI_LOGE("Subscribe event is not a valid event: %{public}s", name.c_str()); - return false; + OHOS::sptr AsObject() override { + return nullptr; } - SetEventType(name); - std::unique_lock guard(g_regInfoMutex); - std::map::iterator it = g_eventRegisterInfo.find(name); - if (it == g_eventRegisterInfo.end()) { - std::string usualEvent; - GetUsualEventByEventType(name, usualEvent); - bool result = SubscribeServiceEvent(usualEvent); - if (!result) { - WIFI_LOGE("Service register event failed: %{public}s", name.c_str()); - return false; - } +}; - EventRegisterInfo regInfo(this); - g_eventRegisterInfo[name] = regInfo; +class WifiNapiP2pEventCallback : public IWifiP2pCallback, public NapiEvent { +public: + WifiNapiP2pEventCallback() { } - if (g_eventRegisterInfo[name].GetContext() != this) { - WIFI_LOGW("Subscribe event context changed!"); - g_eventRegisterInfo[name].SetContext(this); + virtual ~WifiNapiP2pEventCallback() { } - napi_ref handlerRef = nullptr; - napi_create_reference(m_env, handler, 1, &handlerRef); - g_eventRegisterInfo[name].GetHandlersCb().insert(handlerRef); - return true; -} +public: + void OnP2pStateChanged(int state) override { + WIFI_LOGI("received p2p state changed event: %{public}d", state); + CheckAndNotify(EVENT_P2P_STATE_CHANGE, state); + } -void EventManager::DeleteHanderRef(std::set& setRefs, napi_value handler) { - for (auto& each : setRefs) { - napi_value handlerTemp = nullptr; - napi_get_reference_value(m_env, each, &handlerTemp); - bool isEqual = false; - napi_strict_equals(m_env, handlerTemp, handler, &isEqual); - if (isEqual) { - napi_delete_reference(m_env, each); - setRefs.erase(each); - return; - } + void OnP2pPersistentGroupsChanged(void) override { + WIFI_LOGI("received persistent group changed event"); + CheckAndNotify(EVENT_P2P_PERSISTENT_GROUP_CHANGE, nullptr); } -} -void EventManager::DeleteAllHanderRef(std::set& setRefs) { - for (auto& each : setRefs) { - napi_delete_reference(m_env, each); + void OnP2pThisDeviceChanged(const WifiP2pDevice& device) override { + WIFI_LOGI("received this device changed event"); + CheckAndNotify(EVENT_P2P_DEVICE_STATE_CHANGE, device); } - setRefs.clear(); -} -bool EventManager::UnsubscribeEvent(const std::string& name, napi_value handler) { - WIFI_LOGI("Unsubscribe event: %{public}s", name.c_str()); + void OnP2pPeersChanged(const std::vector& devices) override { + WIFI_LOGI("received peers changed event: %{public}d", (int)devices.size()); + CheckAndNotify(EVENT_P2P_PEER_DEVICE_CHANGE, devices); + } - if (!IsEventTypeExist(name)) { - WIFI_LOGE("Unsubscribe event is not a valid event: %{public}s", name.c_str()); - return false; + void OnP2pServicesChanged(const std::vector& srvInfo) override { } - bool isNeedUnsubscribe = false; - std::unique_lock guard(g_regInfoMutex); - std::map::iterator it = g_eventRegisterInfo.find(name); - if (it == g_eventRegisterInfo.end()) { - WIFI_LOGE("Unsubscribe event is not subscribe: %{public}s", name.c_str()); - return false; + void OnP2pConnectionChanged(const WifiP2pLinkedInfo& info) override { + WIFI_LOGI("received connection changed event"); + CheckAndNotify(EVENT_P2P_CONN_STATE_CHANGE, info); } - if (handler != nullptr) { - DeleteHanderRef(it->second.GetHandlersCb(), handler); - } else { - WIFI_LOGW("All callback is unsubscribe for event: %{public}s", name.c_str()); - DeleteAllHanderRef(it->second.GetHandlersCb()); - } - /* No one subscribes event now */ - if (it->second.GetHandlersCb().empty()) { - isNeedUnsubscribe = true; - } - - SetEventType(name); - if (isNeedUnsubscribe) { - std::string usualEvent; - GetUsualEventByEventType(name, usualEvent); - bool result = UnsubscribeServiceEvent(usualEvent); - g_eventRegisterInfo.erase(name); - if (!result) { - WIFI_LOGE("Service unregister event failed: %{public}s", name.c_str()); - return false; - } + + void OnP2pDiscoveryChanged(bool isChange) override { + WIFI_LOGI("received discovery state changed event"); + CheckAndNotify(EVENT_P2P_DISCOVERY_CHANGE, (int)isChange); } - return true; -} -void EventManager::SetEventType(const std::string& type) { - m_eventType = type; -} + void OnP2pActionResult(P2pActionCallback action, ErrCode code) override { + } -napi_env EventManager::GetEnv() { - return m_env; -} + OHOS::sptr AsObject() override { + return nullptr; + } +}; napi_value On(napi_env env, napi_callback_info cbinfo) { TRACE_FUNC_CALL; @@ -373,16 +322,10 @@ napi_value On(napi_env env, napi_callback_info cbinfo) { napi_typeof(env, argv[1], &handler); NAPI_ASSERT(env, handler == napi_function, "type mismatch for parameter 2"); - EventManager *manager = nullptr; - napi_status status = napi_unwrap(env, thisVar, (void**)&manager); - if (status == napi_ok && manager != nullptr) { - char type[64] = {0}; - size_t typeLen = 0; - napi_get_value_string_utf8(env, argv[0], type, sizeof(type), &typeLen); - manager->SubscribeEvent(type, argv[1]); - } else { - WIFI_LOGE("On unwrap class failed"); - } + char type[64] = {0}; + size_t typeLen = 0; + napi_get_value_string_utf8(env, argv[0], type, sizeof(type), &typeLen); + EventRegister::GetInstance().Register(env, type, argv[1]); napi_value result = nullptr; napi_get_undefined(env, &result); return result; @@ -408,42 +351,164 @@ napi_value Off(napi_env env, napi_callback_info cbinfo) { NAPI_ASSERT(env, handler == napi_function, "type mismatch for parameter 2"); } - EventManager *manager = nullptr; - napi_status status = napi_unwrap(env, thisVar, (void**)&manager); - if (status == napi_ok && manager != nullptr) { - char type[64] = {0}; - size_t typeLen = 0; - napi_get_value_string_utf8(env, argv[0], type, sizeof(type), &typeLen); - manager->UnsubscribeEvent(type, argc >= requireArgcWithCb ? argv[1] : nullptr); - } else { - WIFI_LOGE("Off unwrap class failed"); - } + char type[64] = {0}; + size_t typeLen = 0; + napi_get_value_string_utf8(env, argv[0], type, sizeof(type), &typeLen); + EventRegister::GetInstance().Unregister(env, type, argc >= requireArgcWithCb ? argv[1] : nullptr); napi_value result = nullptr; napi_get_undefined(env, &result); return result; } -napi_value EventListenerConstructor(napi_env env, napi_callback_info cbinfo) { - WIFI_LOGI("Event listener constructor"); - napi_value thisVar = nullptr; - void* data = nullptr; - napi_get_cb_info(env, cbinfo, nullptr, nullptr, &thisVar, &data); +sptr wifiDeviceCallback = + sptr(new (std::nothrow) WifiNapiDeviceEventCallback()); - EventManager *eventManager = new EventManager(env, thisVar); - if (eventManager == nullptr) { - WIFI_LOGE("Init listener constructor failed"); - return nullptr; +sptr wifiScanCallback = + sptr(new (std::nothrow) WifiNapiScanEventCallback()); + +sptr wifiHotspotCallback = + sptr(new (std::nothrow) WifiNapiHotspotEventCallback()); + +sptr wifiP2pCallback = + sptr(new (std::nothrow) WifiNapiP2pEventCallback()); + +bool EventRegister::isEventRegistered = false; + +ErrCode EventRegister::RegisterWifiEvents() +{ + std::unique_ptr wifiStaPtr = WifiDevice::GetInstance(WIFI_DEVICE_ABILITY_ID); + if (wifiStaPtr == nullptr) { + WIFI_LOGE("Register sta event get instance failed!"); + return WIFI_OPT_FAILED; + } + ErrCode ret = wifiStaPtr->RegisterCallBack(wifiDeviceCallback); + if (ret != WIFI_OPT_SUCCESS) { + WIFI_LOGE("Register sta event failed!"); + return ret; + } + + std::unique_ptr wifiScanPtr = WifiScan::GetInstance(WIFI_SCAN_ABILITY_ID); + if (wifiScanPtr == nullptr) { + WIFI_LOGE("Register scan event get instance failed!"); + return WIFI_OPT_FAILED; + } + ret = wifiScanPtr->RegisterCallBack(wifiScanCallback); + if (ret != WIFI_OPT_SUCCESS) { + WIFI_LOGE("Register scan event failed!"); + return ret; + } + + std::unique_ptr wifiHotspotPtr = WifiHotspot::GetInstance(WIFI_HOTSPOT_ABILITY_ID); + if (wifiHotspotPtr == nullptr) { + WIFI_LOGE("Register hotspot event get instance failed!"); + return WIFI_OPT_FAILED; + } + ret = wifiHotspotPtr->RegisterCallBack(wifiHotspotCallback); + if (ret != WIFI_OPT_SUCCESS) { + WIFI_LOGE("Register hotspot event failed!"); + return ret; + } + + std::unique_ptr wifiP2pPtr = WifiP2p::GetInstance(WIFI_P2P_ABILITY_ID); + if (wifiP2pPtr == nullptr) { + WIFI_LOGE("Register p2p event get instance failed!"); + return WIFI_OPT_FAILED; + } + ret = wifiP2pPtr->RegisterCallBack(wifiP2pCallback); + if (ret != WIFI_OPT_SUCCESS) { + WIFI_LOGE("Register p2p event failed!"); + return ret; + } + return ret; +} + +EventRegister& EventRegister::GetInstance() +{ + static EventRegister inst; + return inst; +} + +bool EventRegister::IsEventSupport(const std::string& type) +{ + return g_supportEventList.find(type) != g_supportEventList.end(); +} + +void EventRegister::Register(const napi_env& env, const std::string& type, napi_value handler) +{ + WIFI_LOGI("Register event: %{public}s, env: %{public}p", type.c_str(), env); + + if (!IsEventSupport(type)) { + WIFI_LOGE("Register type error or not support!"); + return; + } + std::unique_lock guard(g_regInfoMutex); + if (!isEventRegistered) { + if (RegisterWifiEvents() != WIFI_OPT_SUCCESS) { + return; + } + isEventRegistered = true; + } + napi_ref handlerRef = nullptr; + napi_create_reference(env, handler, 1, &handlerRef); + RegObj regObj(env, handlerRef); + auto iter = g_eventRegisterInfo.find(type); + if (iter == g_eventRegisterInfo.end()) { + g_eventRegisterInfo[type] = std::vector{regObj}; + } else { + iter->second.emplace_back(regObj); + } +} + +void EventRegister::DeleteRegisterObj(std::vector& vecRegObjs, napi_value& handler) +{ + auto iter = vecRegObjs.begin(); + for (; iter != vecRegObjs.end();) { + napi_value handlerTemp = nullptr; + napi_get_reference_value(iter->m_regEnv, iter->m_regHanderRef, &handlerTemp); + bool isEqual = false; + napi_strict_equals(iter->m_regEnv, handlerTemp, handler, &isEqual); + if (isEqual) { + napi_delete_reference(iter->m_regEnv, iter->m_regHanderRef); + WIFI_LOGI("Delete register object ref."); + iter = vecRegObjs.erase(iter); + } else { + ++iter; + } + } +} + +void EventRegister::DeleteAllRegisterObj(std::vector& vecRegObjs) +{ + for (auto& each : vecRegObjs) { + napi_delete_reference(each.m_regEnv, each.m_regHanderRef); + } + vecRegObjs.clear(); +} + +void EventRegister::Unregister(const napi_env& env, const std::string& type, napi_value handler) +{ + WIFI_LOGI("Unregister event: %{public}s, env: %{public}p", type.c_str(), env); + + if (!IsEventSupport(type)) { + WIFI_LOGE("Unregister type error or not support!"); + return; + } + + std::unique_lock guard(g_regInfoMutex); + auto iter = g_eventRegisterInfo.find(type); + if (iter == g_eventRegisterInfo.end()) { + WIFI_LOGE("Unregister type not registered!"); + return; + } + if (handler != nullptr) { + DeleteRegisterObj(iter->second, handler); + } else { + WIFI_LOGW("All callback is unsubscribe for event: %{public}s", type.c_str()); + DeleteAllRegisterObj(iter->second); + } + if (iter->second.empty()) { + g_eventRegisterInfo.erase(iter); } - napi_wrap( - env, thisVar, eventManager, - [](napi_env env, void* data, void* hint) { - WIFI_LOGI("Event listener destructor"); - EventManager *eventManager = (EventManager *)data; - delete eventManager; - eventManager = nullptr; - }, - nullptr, nullptr); - return thisVar; } } // namespace Wifi } // namespace OHOS diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_event.h b/interfaces/innerkits/native_cpp/napi/wifi_napi_event.h index f3a4238..1928a21 100755 --- a/interfaces/innerkits/native_cpp/napi/wifi_napi_event.h +++ b/interfaces/innerkits/native_cpp/napi/wifi_napi_event.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -20,85 +20,102 @@ #include #include #include "napi/native_api.h" -#include "common_event_manager.h" +#include "wifi_errcode.h" +#include +#include "wifi_hotspot.h" namespace OHOS { namespace Wifi { - -typedef void (*UserDefinedEventProcessFunc)(const napi_env& env, const std::string& type, - const OHOS::EventFwk::CommonEventData& data); - -class Event { +class AsyncEventData { public: - Event(napi_env env, std::string& name) : m_env(env), m_name(name) { + napi_env env; + napi_ref callbackRef; + napi_value jsEvent; + + explicit AsyncEventData(napi_env e, napi_ref r, napi_value v) { + env = e; + callbackRef = r; + jsEvent = v; } - virtual ~Event() { - } - - virtual napi_value PackResult() = 0; - - void SetName(std::string& name); + AsyncEventData() = delete; - std::string GetName(); - - napi_env GetEnv(); - -private: - napi_env m_env; - std::string m_name; + virtual ~AsyncEventData() { + } }; -class WifiCommonEvent: public Event { +class RegObj { public: - WifiCommonEvent(napi_env env, std::string& name, int value) : Event(env, name), m_value(value) { + RegObj() : m_regEnv(0), m_regHanderRef(nullptr) { + } + explicit RegObj(const napi_env& env, const napi_ref& ref) { + m_regEnv = env; + m_regHanderRef = ref; } - virtual napi_value PackResult(); + ~RegObj() { + } -private: - int m_value; + napi_env m_regEnv; + napi_ref m_regHanderRef; }; -class WifiEventSubscriber : public OHOS::EventFwk::CommonEventSubscriber { -public: - explicit WifiEventSubscriber(const OHOS::EventFwk::CommonEventSubscribeInfo &subscribeInfo) : - CommonEventSubscriber(subscribeInfo) { - } +static std::shared_mutex g_regInfoMutex; +static std::map> g_eventRegisterInfo; - virtual ~WifiEventSubscriber() { +class NapiEvent { +public: + bool CheckIsRegister(const std::string& type); + napi_value CreateResult(const napi_env& env, int value); + napi_value CreateResult(const napi_env& env, const StationInfo& info); + napi_value CreateResult(const napi_env& env, napi_value placehoders); + napi_value CreateResult(const napi_env& env, const WifiP2pDevice& device); + napi_value CreateResult(const napi_env& env, const std::vector& devices); + napi_value CreateResult(const napi_env& env, const WifiP2pLinkedInfo& info); + void EventNotify(AsyncEventData *asyncEvent); + + template + void CheckAndNotify(const std::string& type, const T& obj) { + std::shared_lock guard(g_regInfoMutex); + if (!CheckIsRegister(type)) { + return; + } + + std::vector& vecObj = g_eventRegisterInfo[type]; + for (auto& each : vecObj) { + napi_value result = CreateResult(each.m_regEnv, obj); + AsyncEventData *asyncEvent = new AsyncEventData(each.m_regEnv, each.m_regHanderRef, result); + if (asyncEvent == nullptr) { + return; + } + EventNotify(asyncEvent); + } } - - virtual void OnReceiveEvent(const OHOS::EventFwk::CommonEventData &data) override; }; -class EventRegisterInfo; -class EventManager { +class EventRegister { public: - EventManager(napi_env env, napi_value thisVar); - virtual ~EventManager(); + EventRegister() { + } + ~EventRegister() { + } - bool Send(Event& event); - bool SubscribeEvent(const std::string& name, napi_value handler); - bool UnsubscribeEvent(const std::string& name, napi_value handler); - napi_env GetEnv(); + static EventRegister& GetInstance(); -private: - bool SubscribeServiceEvent(const std::string& event); - bool UnsubscribeServiceEvent(const std::string& event); - void DeleteHanderRef(std::set& setRefs, napi_value handler); - void DeleteAllHanderRef(std::set& setRefs); - void SetEventType(const std::string& type); + void Register(const napi_env& env, const std::string& type, napi_value handler); + void Unregister(const napi_env& env, const std::string& type, napi_value handler); private: - napi_env m_env; - napi_ref m_thisVarRef; - std::string m_eventType; + ErrCode RegisterWifiEvents(); + bool IsEventSupport(const std::string& type); + void DeleteRegisterObj(std::vector& vecRegObjs, napi_value& handler); + void DeleteAllRegisterObj(std::vector& vecRegObjs); + + static bool isEventRegistered; }; napi_value On(napi_env env, napi_callback_info cbinfo); napi_value Off(napi_env env, napi_callback_info cbinfo); -napi_value EventListenerConstructor(napi_env env, napi_callback_info cbinfo); } // namespace Wifi } // namespace OHOS diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_p2p.cpp b/interfaces/innerkits/native_cpp/napi/wifi_napi_p2p.cpp index 8fa4f34..443b76f 100755 --- a/interfaces/innerkits/native_cpp/napi/wifi_napi_p2p.cpp +++ b/interfaces/innerkits/native_cpp/napi/wifi_napi_p2p.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -25,7 +25,7 @@ std::unique_ptr wifiP2pPtr = WifiP2p::GetInstance(WIFI_P2P_ABILITY_ID); napi_value EnableP2p(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; - NAPI_ASSERT(env, wifiP2pPtr != nullptr, "[NAPI] Wifi p2p instance is null."); + NAPI_ASSERT(env, wifiP2pPtr != nullptr, "Wifi p2p instance is null."); ErrCode ret = wifiP2pPtr->EnableP2p(); napi_value result; @@ -36,7 +36,7 @@ napi_value EnableP2p(napi_env env, napi_callback_info info) napi_value DisableP2p(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; - NAPI_ASSERT(env, wifiP2pPtr != nullptr, "[NAPI] Wifi p2p instance is null."); + NAPI_ASSERT(env, wifiP2pPtr != nullptr, "Wifi p2p instance is null."); ErrCode ret = wifiP2pPtr->DisableP2p(); napi_value result; @@ -64,7 +64,7 @@ static void WfdInfoToJs(const napi_env& env, const WifiP2pWfdInfo& wfdInfo, napi SetValueInt32(env, "maxThroughput", wfdInfo.GetMaxThroughput(), result); } -static bool DeviceInfosToJs(const napi_env& env, +static ErrCode DeviceInfosToJs(const napi_env& env, const std::vector& vecDevices, napi_value& arrayResult) { uint32_t idx = 0; @@ -80,13 +80,13 @@ static bool DeviceInfosToJs(const napi_env& env, napi_status status = napi_set_element(env, arrayResult, idx++, eachObj); if (status != napi_ok) { WIFI_LOGE("wifi napi set element error: %{public}d, idx: %{public}d", status, idx - 1); - return false; + return WIFI_OPT_FAILED; } } - return true; + return WIFI_OPT_SUCCESS; } -static bool GroupInfosToJs(const napi_env& env, WifiP2pGroupInfo& groupInfo, napi_value& result) +static ErrCode GroupInfosToJs(const napi_env& env, WifiP2pGroupInfo& groupInfo, napi_value& result) { SetValueBool(env, "isP2pGroupOwner", groupInfo.IsGroupOwner(), result); SetValueUtf8String(env, "passphrase", groupInfo.GetPassphrase().c_str(), result); @@ -105,22 +105,22 @@ static bool GroupInfosToJs(const napi_env& env, WifiP2pGroupInfo& groupInfo, nap napi_status status = napi_set_named_property(env, result, "owner", owner); if (status != napi_ok) { WIFI_LOGE("napi_set_named_property owner fail"); - return false; + return WIFI_OPT_FAILED; } if (!groupInfo.IsClientDevicesEmpty()) { const std::vector& vecDevices = groupInfo.GetClientDevices(); napi_value devices; napi_create_array_with_length(env, vecDevices.size(), &devices); - if (!DeviceInfosToJs(env, vecDevices, devices)) { - return false; + if (DeviceInfosToJs(env, vecDevices, devices) != WIFI_OPT_SUCCESS) { + return WIFI_OPT_FAILED; } status = napi_set_named_property(env, result, "clientDevices", devices); if (status != napi_ok) { WIFI_LOGE("napi_set_named_property clientDevices fail"); - return false; + return WIFI_OPT_FAILED; } } - return true; + return WIFI_OPT_SUCCESS; } napi_value GetCurrentGroup(napi_env env, napi_callback_info info) @@ -139,13 +139,13 @@ napi_value GetCurrentGroup(napi_env env, napi_callback_info info) asyncContext->executeFunc = [&](void* data) -> void { P2pGroupInfoAsyncContext *context = static_cast(data); TRACE_FUNC_CALL_NAME("wifiP2pPtr->GetCurrentGroup"); - context->isSuccess = (wifiP2pPtr->GetCurrentGroup(context->groupInfo) == WIFI_OPT_SUCCESS); + context->errorCode = wifiP2pPtr->GetCurrentGroup(context->groupInfo); }; asyncContext->completeFunc = [&](void* data) -> void { P2pGroupInfoAsyncContext *context = static_cast(data); napi_create_object(context->env, &context->result); - context->isSuccess = GroupInfosToJs(context->env, context->groupInfo, context->result); + context->errorCode = GroupInfosToJs(context->env, context->groupInfo, context->result); WIFI_LOGI("Push get current group result to client"); }; @@ -168,7 +168,7 @@ napi_value StartP2pListen(napi_env env, napi_callback_info info) NAPI_ASSERT(env, valueType == napi_number, "Wrong argument 1 type. napi_number expected."); NAPI_ASSERT(env, value2Type == napi_object, "Wrong argument 2 type. napi_number expected."); - NAPI_ASSERT(env, wifiP2pPtr != nullptr, "[NAPI] Wifi p2p instance is null."); + NAPI_ASSERT(env, wifiP2pPtr != nullptr, "Wifi p2p instance is null."); int period; int interval; napi_get_value_int32(env, argv[0], &period); @@ -182,7 +182,7 @@ napi_value StartP2pListen(napi_env env, napi_callback_info info) napi_value StopP2pListen(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; - NAPI_ASSERT(env, wifiP2pPtr != nullptr, "[NAPI] Wifi p2p instance is null."); + NAPI_ASSERT(env, wifiP2pPtr != nullptr, "Wifi p2p instance is null."); ErrCode ret = wifiP2pPtr->StopP2pListen(); napi_value result; @@ -202,7 +202,7 @@ napi_value DeletePersistentGroup(napi_env env, napi_callback_info info) napi_typeof(env, argv[0], &valueType); NAPI_ASSERT(env, valueType == napi_number, "Wrong argument type. napi_number expected."); - NAPI_ASSERT(env, wifiP2pPtr != nullptr, "[NAPI] Wifi p2p instance is null."); + NAPI_ASSERT(env, wifiP2pPtr != nullptr, "Wifi p2p instance is null."); WifiP2pGroupInfo groupInfo; int netId = -999; napi_get_value_int32(env, argv[0], &netId); @@ -216,7 +216,7 @@ napi_value DeletePersistentGroup(napi_env env, napi_callback_info info) napi_value StartDiscoverDevices(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; - NAPI_ASSERT(env, wifiP2pPtr != nullptr, "[NAPI] Wifi p2p instance is null."); + NAPI_ASSERT(env, wifiP2pPtr != nullptr, "Wifi p2p instance is null."); ErrCode ret = wifiP2pPtr->DiscoverDevices(); napi_value result; @@ -227,7 +227,7 @@ napi_value StartDiscoverDevices(napi_env env, napi_callback_info info) napi_value StopDiscoverDevices(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; - NAPI_ASSERT(env, wifiP2pPtr != nullptr, "[NAPI] Wifi p2p instance is null."); + NAPI_ASSERT(env, wifiP2pPtr != nullptr, "Wifi p2p instance is null."); ErrCode ret = wifiP2pPtr->StopDiscoverDevices(); napi_value result; @@ -250,14 +250,14 @@ napi_value GetP2pDevices(napi_env env, napi_callback_info info) asyncContext->executeFunc = [&](void* data) -> void { QueryP2pDeviceAsyncContext *context = static_cast(data); - context->isSuccess = (wifiP2pPtr->QueryP2pDevices(context->vecP2pDevices) == WIFI_OPT_SUCCESS); + context->errorCode = wifiP2pPtr->QueryP2pDevices(context->vecP2pDevices); WIFI_LOGI("GetP2pDeviceList, size: %{public}zu", context->vecP2pDevices.size()); }; asyncContext->completeFunc = [&](void* data) -> void { QueryP2pDeviceAsyncContext *context = static_cast(data); napi_create_array_with_length(context->env, context->vecP2pDevices.size(), &context->result); - context->isSuccess = DeviceInfosToJs(context->env, context->vecP2pDevices, context->result); + context->errorCode = DeviceInfosToJs(context->env, context->vecP2pDevices, context->result); WIFI_LOGI("Push P2p Device List to client"); }; @@ -323,7 +323,7 @@ napi_value P2pConnect(napi_env env, napi_callback_info info) napi_typeof(env, argv[0], &valueType); NAPI_ASSERT(env, valueType == napi_object, "Wrong argument type. Object expected."); - NAPI_ASSERT(env, wifiP2pPtr != nullptr, "[NAPI] Wifi p2p instance is null."); + NAPI_ASSERT(env, wifiP2pPtr != nullptr, "Wifi p2p instance is null."); WifiP2pConfig config; JsObjToP2pConfig(env, argv[0], config); ErrCode ret = wifiP2pPtr->P2pConnect(config); @@ -338,7 +338,7 @@ napi_value P2pConnect(napi_env env, napi_callback_info info) napi_value P2pDisConnect(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; - NAPI_ASSERT(env, wifiP2pPtr != nullptr, "[NAPI] Wifi p2p instance is null."); + NAPI_ASSERT(env, wifiP2pPtr != nullptr, "Wifi p2p instance is null."); ErrCode ret = wifiP2pPtr->P2pDisConnect(); napi_value result; @@ -358,7 +358,7 @@ napi_value CreateGroup(napi_env env, napi_callback_info info) napi_typeof(env, argv[0], &valueType); NAPI_ASSERT(env, valueType == napi_object, "Wrong argument type. Object expected."); - NAPI_ASSERT(env, wifiP2pPtr != nullptr, "[NAPI] Wifi p2p instance is null."); + NAPI_ASSERT(env, wifiP2pPtr != nullptr, "Wifi p2p instance is null."); WifiP2pConfig config; JsObjToP2pConfig(env, argv[0], config); @@ -371,7 +371,7 @@ napi_value CreateGroup(napi_env env, napi_callback_info info) napi_value RemoveGroup(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; - NAPI_ASSERT(env, wifiP2pPtr != nullptr, "[NAPI] Wifi p2p instance is null."); + NAPI_ASSERT(env, wifiP2pPtr != nullptr, "Wifi p2p instance is null."); ErrCode ret = wifiP2pPtr->RemoveGroup(); napi_value result; @@ -403,7 +403,7 @@ napi_value GetP2pLinkedInfo(napi_env env, napi_callback_info info) asyncContext->executeFunc = [&](void* data) -> void { P2pLinkedInfoAsyncContext *context = static_cast(data); TRACE_FUNC_CALL_NAME("wifiP2pPtr->QueryP2pLinkedInfo"); - context->isSuccess = (wifiP2pPtr->QueryP2pLinkedInfo(context->linkedInfo) == WIFI_OPT_SUCCESS); + context->errorCode = wifiP2pPtr->QueryP2pLinkedInfo(context->linkedInfo); }; asyncContext->completeFunc = [&](void* data) -> void { diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_p2p.h b/interfaces/innerkits/native_cpp/napi/wifi_napi_p2p.h index c7eeb58..db359f4 100755 --- a/interfaces/innerkits/native_cpp/napi/wifi_napi_p2p.h +++ b/interfaces/innerkits/native_cpp/napi/wifi_napi_p2p.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_utils.cpp b/interfaces/innerkits/native_cpp/napi/wifi_napi_utils.cpp index a93b9c5..3677e26 100755 --- a/interfaces/innerkits/native_cpp/napi/wifi_napi_utils.cpp +++ b/interfaces/innerkits/native_cpp/napi/wifi_napi_utils.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -236,15 +236,19 @@ static napi_value DoCallBackAsyncWork(const napi_env& env, AsyncContext *asyncCo napi_get_undefined(env, &undefine); napi_value callback; context->completeFunc(data); - if (context->isSuccess) { + constexpr int ARGS_TWO = 2; + napi_value result[ARGS_TWO] = {nullptr}; + napi_create_uint32(env, context->errorCode, &result[0]); + result[1] = context->result; + if (context->errorCode == ERR_CODE_SUCCESS) { napi_get_reference_value(env, context->callback[0], &callback); - napi_call_function(env, nullptr, callback, 1, &context->result, &undefine); + napi_call_function(env, nullptr, callback, ARGS_TWO, result, &undefine); } else { if (context->callback[1]) { napi_get_reference_value(env, context->callback[1], &callback); - napi_call_function(env, nullptr, callback, 1, &context->result, &undefine); + napi_call_function(env, nullptr, callback, ARGS_TWO, result, &undefine); } else { - WIFI_LOGE("Get scan info callback func is null"); + WIFI_LOGE("Get callback func[1] is null"); } } if (context->callback[0] != nullptr) { @@ -283,7 +287,7 @@ static napi_value DoPromiseAsyncWork(const napi_env& env, AsyncContext *asyncCon } AsyncContext *context = (AsyncContext *)data; context->completeFunc(data); - if (context->isSuccess) { + if (context->errorCode == ERR_CODE_SUCCESS) { napi_resolve_deferred(context->env, context->deferred, context->result); } else { napi_reject_deferred(context->env, context->deferred, context->result); diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_utils.h b/interfaces/innerkits/native_cpp/napi/wifi_napi_utils.h index 3364788..e5d23b1 100755 --- a/interfaces/innerkits/native_cpp/napi/wifi_napi_utils.h +++ b/interfaces/innerkits/native_cpp/napi/wifi_napi_utils.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -40,6 +40,8 @@ private: #define TRACE_FUNC_CALL TraceFuncCall func(__func__) #define TRACE_FUNC_CALL_NAME(name) TraceFuncCall funcName(name) +constexpr int ERR_CODE_SUCCESS = 0; + class AsyncContext { public: napi_env env; @@ -50,7 +52,7 @@ public: std::function completeFunc; napi_value resourceName; napi_value result; - bool isSuccess; + int errorCode; AsyncContext(napi_env e, napi_async_work w = nullptr, napi_deferred d = nullptr) { @@ -60,7 +62,7 @@ public: executeFunc = nullptr; completeFunc = nullptr; result = nullptr; - isSuccess = false; + errorCode = ERR_CODE_SUCCESS; } AsyncContext() = delete; diff --git a/interfaces/kits/jskits/@ohos.wifi.d.ts b/interfaces/kits/jskits/@ohos.wifi.d.ts index cc24ede..a503f80 100755 --- a/interfaces/kits/jskits/@ohos.wifi.d.ts +++ b/interfaces/kits/jskits/@ohos.wifi.d.ts @@ -393,12 +393,12 @@ declare namespace wifi { function p2pConnect(config: WifiP2PConfig): boolean; /** - * Disconnects a P2P connection. + * Canceling a P2P connection. * * @return Returns {@code true} if the scanning is successful; returns {@code false} otherwise. * @since 8 */ - function p2pDisconnect(): boolean; + function p2pCancelConnect(): boolean; /** * Discovers Wi-Fi P2P devices. @@ -416,26 +416,6 @@ declare namespace wifi { */ function stopDiscoveryDevices(): boolean; - /** - * Enables P2P listening. - * - *

After P2P listening is enabled, your application can listen for and respond to requests from other devices. - * - * @return Returns {@code true} if the scanning is successful; returns {@code false} otherwise. - * @since 8 - */ - function startListen(): boolean; - - /** - * Disables P2P listening. - * - *

After P2P listening is disabled, your application cannot listen for requests from other devices. - * - * @return Returns {@code true} if the scanning is successful; returns {@code false} otherwise. - * @since 8 - */ - function stopListen(): boolean; - /** * Deletes the persistent P2P group with the specified network ID. * @@ -950,7 +930,7 @@ declare namespace wifi { deviceAddress: string; /** Primary device type */ - primaryDeviceType: number; + primaryDeviceType: string; /** Device status */ devStatus: P2pDeviceStatus; -- Gitee From f44843760838a306234242aeffefd47ac2c5deb2 Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Thu, 27 Jan 2022 10:41:58 +0000 Subject: [PATCH 027/491] 1. disable module componentization boundle file; 2. revert power consumption optimize Signed-off-by: zhangfeng --- bundle.json | 111 ------------------ .../ipc_framework/cRPC/src/server.c | 2 +- 2 files changed, 1 insertion(+), 112 deletions(-) delete mode 100755 bundle.json diff --git a/bundle.json b/bundle.json deleted file mode 100755 index fae05e5..0000000 --- a/bundle.json +++ /dev/null @@ -1,111 +0,0 @@ -{ - "name": "@ohos/communication_wifi", - "version": "3.1.0", - "description": "The WLAN module provides basic WLAN functions, peer-to-peer (P2P) connection, and WLAN notification, enabling your application to communicate with other devices through a WLAN.", - "homePage": "https://gitee.com/openharmony", - "license": "Apache License 2.0", - "repository": "https://gitee.com/openharmony/communication_wifi", - "domain": "os", - "language": "", - "publishAs": "code-segment", - "private": false, - "scripts": {}, - "tags": [ - "foundation" - ], - "keywords": [ - "communication", - "wifi" - ], - "envs": [], - "dirs": [], - "author": { - "name": "", - "email": "", - "url": "" - }, - "contributors": [ - { - "name": "", - "email": "", - "url": "" - } - ], - "segment": { - "destPath": "foundation/communication/wifi" - }, - "component": { - "name": "wifi_standard", - "subsystem": "communication", - "syscap": [ - "SystemCapability.Communication.WiFi" - ], - "features": [], - "adapted_system_type": [ - "standard" - ], - "rom": "", - "ram": "", - "deps": { - "components": [ - "ipc", - "ces_standard", - "hiviewdfx_hilog_native" - ], - "third_party": [ - "wpa_supplicant", - "node", - "bounds_checking_function", - "googletest", - "openssl" - ] - }, - "build": { - "sub_component": [ - "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard:wifi_sdk", - "//foundation/communication/wifi/interfaces/innerkits/native_cpp/napi:wifi" - ], - "inner_kits": [ - { - "header" : { - "header_base": "//foundation/communication/wifi/interfaces/innerkits/native_c", - "header_files": [ - "wifi_device.h", - "wifi_hotspot.h", - "wifi_p2p.h", - "wifi_hid2d.h" - ] - }, - "name" : "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard:wifi_sdk" - }, - { - "header" : { - "header_base": "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/include", - "header_files": [ - "wifi_device.h", - "wifi_hotspot.h", - "wifi_p2p.h", - "wifi_scan.h", - "wifi_hid2d.h" - ] - }, - "name" : "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard:wifi_sdk" - } - ], - "test": [ - "//foundation/communication/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan:unittest", - "//foundation/communication/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta:unittest", - "//foundation/communication/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap:unittest", - "//foundation/communication/wifi/tests/wifi_standard/wifi_framework/dhcp_manage/mgr_service:unittest", - "//foundation/communication/wifi/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_client:unittest", - "//foundation/communication/wifi/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest:unittest", - "//foundation/communication/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test:unittest", - "//foundation/communication/wifi/tests/wifi_standard/ipc_framework/cRPC/unittest:unittest", - "//foundation/communication/wifi/tests/wifi_standard/wifi_framework/common/unittest:unittest", - "//foundation/communication/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest:unittest", - "//foundation/communication/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest:unittest", - "//foundation/communication/wifi/tests/wifi_standard/wifi_hal/unittest:unittest" - ] - } - } -} \ No newline at end of file diff --git a/services/wifi_standard/ipc_framework/cRPC/src/server.c b/services/wifi_standard/ipc_framework/cRPC/src/server.c index 97e4258..0317354 100644 --- a/services/wifi_standard/ipc_framework/cRPC/src/server.c +++ b/services/wifi_standard/ipc_framework/cRPC/src/server.c @@ -199,7 +199,7 @@ int RunRpcLoop(RpcServer *server) EventLoop *loop = server->loop; while (!loop->stop) { BeforeLoop(server); - int retval = epoll_wait(loop->epfd, loop->epEvents, loop->setSize, -1); + int retval = epoll_wait(loop->epfd, loop->epEvents, loop->setSize, 1); for (int i = 0; i < retval; ++i) { struct epoll_event *e = loop->epEvents + i; int fd = e->data.fd; -- Gitee From 39b4e79b98cae7f032c794d05d67652df5f232bc Mon Sep 17 00:00:00 2001 From: 17764556280 Date: Sun, 30 Jan 2022 14:37:45 +0800 Subject: [PATCH 028/491] modify bms part Signed-off-by: 17764556280 --- .../wifi_framework/dhcp_manage/mgr_service/BUILD.gn | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/mgr_service/BUILD.gn b/tests/wifi_standard/wifi_framework/dhcp_manage/mgr_service/BUILD.gn index 2e84991..1b427f6 100644 --- a/tests/wifi_standard/wifi_framework/dhcp_manage/mgr_service/BUILD.gn +++ b/tests/wifi_standard/wifi_framework/dhcp_manage/mgr_service/BUILD.gn @@ -18,6 +18,7 @@ import("//foundation/appexecfwk/standard/appexecfwk.gni") SUBSYSTEM_DIR = "//foundation/communication" module_output_path = "wifi_standard/dhcp_manage_test" +even_path = "//base/notification/ces_standard" config("module_private_config") { visibility = [ ":*" ] -- Gitee From c4463d1f15e229d3bdfaed1a2b2e4589c42621db Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Sun, 30 Jan 2022 09:07:07 +0000 Subject: [PATCH 029/491] =?UTF-8?q?#I4SKEV:=20wifi=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E9=83=A8=E4=BB=B6=E5=8C=96=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangfeng Change-Id: I779d9bd9640e6d44c45c8a15ad2fc987e63ea679 --- OAT.xml | 6 +- bundle.json | 133 ++++++++++++++++++ interfaces/innerkits/native_cpp/napi/BUILD.gn | 4 +- ohos.build | 101 ------------- 4 files changed, 139 insertions(+), 105 deletions(-) create mode 100755 bundle.json delete mode 100755 ohos.build diff --git a/OAT.xml b/OAT.xml index 7210120..56456f7 100755 --- a/OAT.xml +++ b/OAT.xml @@ -1,5 +1,5 @@ - - 1125 + 1120 libwifi_device_ability.z.so diff --git a/services/wifi_standard/sa_profile/1127.xml b/services/wifi_standard/sa_profile/1121.xml similarity index 96% rename from services/wifi_standard/sa_profile/1127.xml rename to services/wifi_standard/sa_profile/1121.xml index 4ab0910..df798c7 100644 --- a/services/wifi_standard/sa_profile/1127.xml +++ b/services/wifi_standard/sa_profile/1121.xml @@ -16,7 +16,7 @@ wifi_manager_service - 1127 + 1121 libwifi_hotspot_ability.z.so diff --git a/services/wifi_standard/sa_profile/1128.xml b/services/wifi_standard/sa_profile/1123.xml similarity index 96% rename from services/wifi_standard/sa_profile/1128.xml rename to services/wifi_standard/sa_profile/1123.xml index 1441306..d73a5b2 100644 --- a/services/wifi_standard/sa_profile/1128.xml +++ b/services/wifi_standard/sa_profile/1123.xml @@ -16,7 +16,7 @@ wifi_manager_service - 1128 + 1123 libwifi_p2p_ability.z.so diff --git a/services/wifi_standard/sa_profile/1126.xml b/services/wifi_standard/sa_profile/1124.xml similarity index 96% rename from services/wifi_standard/sa_profile/1126.xml rename to services/wifi_standard/sa_profile/1124.xml index b32b6a3..eb2f218 100644 --- a/services/wifi_standard/sa_profile/1126.xml +++ b/services/wifi_standard/sa_profile/1124.xml @@ -16,7 +16,7 @@ wifi_manager_service - 1126 + 1124 libwifi_scan_ability.z.so diff --git a/services/wifi_standard/sa_profile/BUILD.gn b/services/wifi_standard/sa_profile/BUILD.gn index 3fdebc4..8cf6218 100644 --- a/services/wifi_standard/sa_profile/BUILD.gn +++ b/services/wifi_standard/sa_profile/BUILD.gn @@ -15,10 +15,10 @@ import("//build/ohos/sa_profile/sa_profile.gni") ohos_sa_profile("wifi_standard_sa_profile") { sources = [ - "1125.xml", - "1126.xml", - "1127.xml", - "1128.xml", + "1120.xml", + "1121.xml", + "1123.xml", + "1124.xml", ] part_name = "wifi_standard" } -- Gitee From 6b3af15015ad7c9ad8cb74ce57038834f19e31e2 Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Tue, 12 Apr 2022 07:29:06 +0000 Subject: [PATCH 081/491] #I52B6D Use independent account for Wifi process Signed-off-by: zhangfeng Change-Id: Ibe8fb3bc6770c3a1d359b1f1f0672b943fea3f57 --- .../wifi_standard/etc/init/wifi_standard.cfg | 6 ++--- .../wifi_standard/etc/init/wifi_standard.rc | 22 ------------------- .../wifi_hal/etc/init/wifi_hal_service.cfg | 4 ++-- .../wifi_hal/etc/init/wifi_hal_service.rc | 20 ----------------- 4 files changed, 5 insertions(+), 47 deletions(-) delete mode 100644 services/wifi_standard/etc/init/wifi_standard.rc delete mode 100644 services/wifi_standard/wifi_hal/etc/init/wifi_hal_service.rc diff --git a/services/wifi_standard/etc/init/wifi_standard.cfg b/services/wifi_standard/etc/init/wifi_standard.cfg index fe5675e..1c464da 100644 --- a/services/wifi_standard/etc/init/wifi_standard.cfg +++ b/services/wifi_standard/etc/init/wifi_standard.cfg @@ -3,15 +3,15 @@ "name" : "services:wifi_manager_service", "cmds" : [ "mkdir /data/dhcp", - "chown system system /data/dhcp" + "chown wifi wifi /data/dhcp" ] } ], "services" : [{ "name" : "wifi_manager_service", "path" : ["/system/bin/sa_main", "/system/profile/wifi_manager_service.xml"], - "uid" : "system", - "gid" : ["system", "shell"], + "uid" : "wifi", + "gid" : ["wifi", "shell"], "caps" : ["CAP_CHOWN", "CAP_NET_ADMIN", "CAP_NET_BIND_SERVICE", "CAP_NET_RAW"], "jobs" : { "on-start" : "services:wifi_manager_service" diff --git a/services/wifi_standard/etc/init/wifi_standard.rc b/services/wifi_standard/etc/init/wifi_standard.rc deleted file mode 100644 index d03d2db..0000000 --- a/services/wifi_standard/etc/init/wifi_standard.rc +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright (C) 2021 Huawei Device Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -on post-fs-data - mkdir /data/dhcp - start wifi_manager_service - -service wifi_manager_service /system/bin/sa_main /system/profile/wifi_manager_service.xml - class z_core - user root - group root shell - seclabel u:r:wifi_manager_service:s0 \ No newline at end of file diff --git a/services/wifi_standard/wifi_hal/etc/init/wifi_hal_service.cfg b/services/wifi_standard/wifi_hal/etc/init/wifi_hal_service.cfg index 2dbd9e4..908ea33 100644 --- a/services/wifi_standard/wifi_hal/etc/init/wifi_hal_service.cfg +++ b/services/wifi_standard/wifi_hal/etc/init/wifi_hal_service.cfg @@ -3,8 +3,8 @@ "name" : "wifi_hal_service", "path" : ["/system/bin/wifi_hal_service"], "caps" : ["CAP_CHOWN", "CAP_NET_ADMIN", "CAP_NET_BIND_SERVICE", "CAP_NET_RAW"], - "uid" : "system", - "gid" : ["system", "shell"] + "uid" : "wifi", + "gid" : ["wifi", "shell"] } ] } diff --git a/services/wifi_standard/wifi_hal/etc/init/wifi_hal_service.rc b/services/wifi_standard/wifi_hal/etc/init/wifi_hal_service.rc deleted file mode 100644 index 6727a09..0000000 --- a/services/wifi_standard/wifi_hal/etc/init/wifi_hal_service.rc +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (C) 2021 Huawei Device Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -on post-fs-data - start wifi_hal_service - -service wifi_hal_service /system/bin/wifi_hal_service - user root - group root shell - seclabel u:r:wifi_hal_service:s0 \ No newline at end of file -- Gitee From 8346addbc7e520018172283bde4009e2e468f5c6 Mon Sep 17 00:00:00 2001 From: sin_dzzeng <13277932042@163.com> Date: Thu, 14 Apr 2022 17:01:23 +0800 Subject: [PATCH 082/491] =?UTF-8?q?=E9=9A=94=E7=A6=BBNAT=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: sin_dzzeng <13277932042@163.com> --- .../wifi_manage/wifi_ap/ap_started_state.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.cpp b/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.cpp index 1ef6964..29f4b02 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.cpp +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.cpp @@ -71,11 +71,10 @@ void ApStartedState::GoInState() } WIFI_LOGE("Singleton version has not nat and use %{public}s.", AP_INTF); - if (0) { - if (EnableInterfaceNat() == false) { - m_ApStateMachine.SwitchState(&m_ApStateMachine.m_ApIdleState); - return; - } + + if (EnableInterfaceNat() == false) { + m_ApStateMachine.SwitchState(&m_ApStateMachine.m_ApIdleState); + return; } m_ApStateMachine.OnApStateChange(ApState::AP_STATE_STARTED); } @@ -225,18 +224,22 @@ void ApStartedState::StopMonitor() const bool ApStartedState::EnableInterfaceNat() const { +#ifdef SUPPORT_NAT if (!mApNatManager.EnableInterfaceNat(true, IN_INTERFACE, OUT_INTERFACE)) { WIFI_LOGE("set nat failed."); return false; } +#endif return true; } bool ApStartedState::DisableInterfaceNat() const { +#ifdef SUPPORT_NAT if (!mApNatManager.EnableInterfaceNat(false, IN_INTERFACE, OUT_INTERFACE)) { WIFI_LOGE("remove NAT config failed."); } +#endif return true; } -- Gitee From 9c164ee303b8351db31771a35fb2ad488c571700 Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Thu, 21 Apr 2022 09:11:11 +0000 Subject: [PATCH 083/491] Signed-off-by: zhangfeng Change-Id: I00efb8805c8b6217e4f93f64fea9198e92a45ef3 --- OAT.xml | 5 +- LICENSE => dhcp/LICENSE | 0 dhcp/bundle.json | 78 ++++++++ dhcp/dhcp.gni | 19 ++ .../native_cpp}/include/dhcp_define.h | 0 .../native_cpp/include/dhcp_service_api.h | 29 +++ .../interfaces/i_dhcp_client_service.h | 0 .../interfaces/i_dhcp_result_notify.h | 0 .../interfaces/i_dhcp_server_service.h | 0 .../native_cpp}/interfaces/i_dhcp_service.h | 0 .../services}/dhcp_client/BUILD.gn | 23 +-- .../services}/dhcp_client/include/dhcp_api.h | 0 .../dhcp_client/include/dhcp_client.h | 0 .../dhcp_client/include/dhcp_define.h | 0 .../dhcp_client/include/dhcp_function.h | 0 .../services}/dhcp_client/include/dhcp_ipv4.h | 0 .../dhcp_client/include/dhcp_options.h | 0 .../dhcp_client/include/dhcp_socket.h | 0 .../services}/dhcp_client/src/dhcp_api.cpp | 0 .../services}/dhcp_client/src/dhcp_client.c | 0 .../services}/dhcp_client/src/dhcp_function.c | 0 .../services}/dhcp_client/src/dhcp_ipv4.c | 0 .../services}/dhcp_client/src/dhcp_main.c | 0 .../services}/dhcp_client/src/dhcp_options.c | 0 .../services}/dhcp_client/src/dhcp_socket.c | 0 .../services}/dhcp_server/BUILD.gn | 8 +- .../dhcp_server/etc/dhcpd.conf.sample | 0 .../services}/dhcp_server/etc/dhcpd_mini.conf | 0 .../dhcp_server/include/address_utils.h | 0 .../dhcp_server/include/common_util.h | 0 .../dhcp_server/include/dhcp_address_pool.h | 0 .../dhcp_server/include/dhcp_argument.h | 0 .../dhcp_server/include/dhcp_binding.h | 0 .../dhcp_server/include/dhcp_config.h | 0 .../dhcp_server/include/dhcp_define.h | 0 .../services}/dhcp_server/include/dhcp_ipv4.h | 0 .../dhcp_server/include/dhcp_logger.h | 0 .../dhcp_server/include/dhcp_message.h | 0 .../dhcp_server/include/dhcp_option.h | 0 .../dhcp_server/include/dhcp_server.h | 0 .../dhcp_server/include/hash_table.h | 0 .../services}/dhcp_server/src/address_utils.c | 0 .../services}/dhcp_server/src/common_util.c | 0 .../dhcp_server/src/dhcp_address_pool.c | 0 .../services}/dhcp_server/src/dhcp_argument.c | 0 .../services}/dhcp_server/src/dhcp_binding.c | 0 .../services}/dhcp_server/src/dhcp_config.c | 0 .../services}/dhcp_server/src/dhcp_dhcpd.c | 0 .../services}/dhcp_server/src/dhcp_option.c | 0 .../services}/dhcp_server/src/dhcp_server.c | 0 .../services}/dhcp_server/src/hash_table.c | 0 .../services}/mgr_service/BUILD.gn | 23 ++- .../include/dhcp_client_service_impl.h | 0 .../include/dhcp_event_subscriber.h | 0 .../services}/mgr_service/include/dhcp_func.h | 0 .../mgr_service/include/dhcp_server_service.h | 0 .../mgr_service/include/dhcp_service.h | 0 .../src/dhcp_client_service_impl.cpp | 0 .../mgr_service/src/dhcp_event_subscriber.cpp | 0 .../services}/mgr_service/src/dhcp_func.cpp | 0 .../mgr_service/src/dhcp_server_service.cpp | 0 .../mgr_service/src/dhcp_service.cpp | 2 +- .../mgr_service/src/dhcp_service_api.cpp | 34 ++++ .../tests/services}/dhcp_client/BUILD.gn | 26 +-- .../dhcp_client/dhcp_client_test.cpp | 0 .../dhcp_client/dhcp_function_test.cpp | 0 .../services}/dhcp_client/dhcp_ipv4_test.cpp | 0 .../services}/dhcp_client/dhcp_main_test.cpp | 0 .../dhcp_client/dhcp_options_test.cpp | 0 .../dhcp_client/dhcp_socket_test.cpp | 0 .../services}/dhcp_client/global_test.cpp | 0 .../tests/services}/dhcp_client/global_test.h | 0 .../dhcp_client/mock_custom_func.cpp | 0 .../services}/dhcp_client/mock_custom_func.h | 0 .../dhcp_client/mock_system_func.cpp | 0 .../services}/dhcp_client/mock_system_func.h | 0 .../services}/dhcp_server/unittest/BUILD.gn | 30 +-- .../unittest/address_utils_test.cpp | 0 .../dhcp_server/unittest/common_util_test.cpp | 0 .../unittest/dhcp_address_pool_test.cpp | 0 .../unittest/dhcp_argument_test.cpp | 0 .../unittest/dhcp_binding_test.cpp | 0 .../dhcp_server/unittest/dhcp_config_test.cpp | 0 .../dhcp_server/unittest/dhcp_message_sim.cpp | 0 .../dhcp_server/unittest/dhcp_message_sim.h | 0 .../dhcp_server/unittest/dhcp_option_test.cpp | 0 .../dhcp_server/unittest/dhcp_server_test.cpp | 0 .../dhcp_server/unittest/hash_table_test.cpp | 0 .../dhcp_server/unittest/system_func_mock.cpp | 0 .../dhcp_server/unittest/system_func_mock.h | 0 .../tests/services}/mgr_service/BUILD.gn | 27 +-- .../mgr_service/dhcp_client_service_test.cpp | 0 .../services}/mgr_service/dhcp_func_test.cpp | 0 .../mgr_service/dhcp_manage_test.cpp | 0 .../mgr_service/dhcp_result_notify.cpp | 0 .../mgr_service/dhcp_result_notify.h | 0 .../mgr_service/dhcp_server_service_test.cpp | 0 .../mgr_service/dhcp_service_test.cpp | 0 .../services}/mgr_service/global_test.cpp | 0 .../tests/services}/mgr_service/global_test.h | 0 .../mgr_service/mock_system_func.cpp | 0 .../services}/mgr_service/mock_system_func.h | 0 .../wifi_standard/wifi_framework/BUILD.gn | 43 ----- .../wifi_manage/wifi_p2p/test/BUILD.gn | 162 ---------------- .../wifi_manage/wifi_scan/BUILD.gn | 101 ---------- .gitattributes => wifi/.gitattributes | 0 wifi/LICENSE | 177 ++++++++++++++++++ README.md => wifi/README.md | 0 README_zh.md => wifi/README_zh.md | 0 .../application}/wifi_direct_demo/README.md | 0 .../wifi_direct_demo/build.gradle | 0 .../wifi_direct_demo/entry/.gitignore | 0 .../wifi_direct_demo/entry/build.gradle | 0 .../wifi_direct_demo/entry/proguard-rules.pro | 0 .../entry/src/main/config.json | 0 .../entry/src/main/ets/MainAbility/app.ets | 0 .../main/ets/MainAbility/common/LogUtil.ets | 0 .../ets/MainAbility/common/StorageUtil.ets | 0 .../main/ets/MainAbility/model/BaseModel.ets | 0 .../model/wifiModeImpl/WifiEntity.ets | 0 .../model/wifiModeImpl/WifiModel.ets | 0 .../component/dialog/customPromptDialog.ets | 0 .../pages/component/dialog/inputComponent.ets | 0 .../src/main/ets/MainAbility/pages/index.ets | 0 .../ets/MainAbility/res/image/ic_phone.svg | 0 .../ets/MainAbility/res/image/ic_right.svg | 0 .../main/resources/base/element/string.json | 0 .../main/resources/base/media/ic_loading.gif | Bin .../src/main/resources/base/media/icon.png | Bin .../wifi_direct_demo/figures/img.png | Bin .../wifi_direct_demo/gradle.properties | 0 .../application}/wifi_direct_demo/gradlew | 0 .../application}/wifi_direct_demo/gradlew.bat | 0 .../wifi_direct_demo/package.json | 0 .../wifi_direct_demo/settings.gradle | 0 bundle.json => wifi/bundle.json | 60 +++--- .../figures}/en-us_image_0000001115710400.png | Bin .../figures}/zh-cn_image_0000001115710400.png | Bin hisysevent.yaml => wifi/hisysevent.yaml | 0 .../innerkits/native_c/station_info.h | 0 .../innerkits/native_c/wifi_device.h | 0 .../innerkits/native_c/wifi_device_config.h | 0 .../innerkits/native_c/wifi_error_code.h | 0 .../innerkits/native_c/wifi_event.h | 0 .../innerkits/native_c/wifi_hid2d.h | 0 .../innerkits/native_c/wifi_hotspot.h | 0 .../innerkits/native_c/wifi_hotspot_config.h | 0 .../innerkits/native_c/wifi_linked_info.h | 0 .../interfaces}/innerkits/native_c/wifi_p2p.h | 0 .../innerkits/native_c/wifi_p2p_config.h | 0 .../innerkits/native_c/wifi_scan_info.h | 0 .../innerkits/native_cpp/napi/BUILD.gn | 33 ++-- .../native_cpp/napi/wifi_napi_device.cpp | 0 .../native_cpp/napi/wifi_napi_device.h | 0 .../native_cpp/napi/wifi_napi_entry.cpp | 0 .../native_cpp/napi/wifi_napi_event.cpp | 0 .../native_cpp/napi/wifi_napi_event.h | 0 .../native_cpp/napi/wifi_napi_hotspot.cpp | 0 .../native_cpp/napi/wifi_napi_hotspot.h | 0 .../native_cpp/napi/wifi_napi_p2p.cpp | 0 .../innerkits/native_cpp/napi/wifi_napi_p2p.h | 0 .../native_cpp/napi/wifi_napi_utils.cpp | 0 .../native_cpp/napi/wifi_napi_utils.h | 0 .../native_cpp/wifi_standard/BUILD.gn | 33 ++-- .../wifi_standard/c_adapter/wifi_c_device.cpp | 0 .../wifi_standard/c_adapter/wifi_c_event.cpp | 0 .../wifi_standard/c_adapter/wifi_c_hid2d.cpp | 0 .../c_adapter/wifi_c_hotspot.cpp | 0 .../wifi_standard/c_adapter/wifi_c_p2p.cpp | 0 .../wifi_standard/c_adapter/wifi_c_utils.cpp | 0 .../wifi_standard/c_adapter/wifi_c_utils.h | 0 .../wifi_standard/include/wifi_device.h | 2 +- .../wifi_standard/include/wifi_hid2d.h | 0 .../wifi_standard/include/wifi_hotspot.h | 0 .../wifi_standard/include/wifi_p2p.h | 0 .../wifi_standard/include/wifi_scan.h | 0 .../wifi_standard/interfaces/define.h | 0 .../wifi_standard/interfaces/i_wifi_device.h | 0 .../interfaces/i_wifi_device_callback.h | 0 .../wifi_standard/interfaces/i_wifi_hotspot.h | 0 .../interfaces/i_wifi_hotspot_callback.h | 0 .../wifi_standard/interfaces/i_wifi_p2p.h | 0 .../interfaces/i_wifi_p2p_callback.h | 0 .../wifi_standard/interfaces/i_wifi_scan.h | 0 .../interfaces/i_wifi_scan_callback.h | 0 .../wifi_standard/interfaces/wifi_ap_msg.h | 0 .../wifi_standard/interfaces/wifi_errcode.h | 0 .../wifi_standard/interfaces/wifi_hid2d_msg.h | 0 .../wifi_standard/interfaces/wifi_msg.h | 0 .../wifi_standard/interfaces/wifi_p2p_msg.h | 0 .../wifi_standard/interfaces/wifi_scan_msg.h | 0 .../wifi_standard/src/wifi_device.cpp | 0 .../src/wifi_device_callback_stub.cpp | 0 .../src/wifi_device_callback_stub.h | 0 .../wifi_standard/src/wifi_device_impl.cpp | 0 .../wifi_standard/src/wifi_device_impl.h | 0 .../wifi_standard/src/wifi_device_proxy.cpp | 0 .../wifi_standard/src/wifi_device_proxy.h | 0 .../wifi_standard/src/wifi_hid2d.cpp | 0 .../wifi_standard/src/wifi_hid2d_msg.cpp | 0 .../wifi_standard/src/wifi_hotspot.cpp | 0 .../src/wifi_hotspot_callback_stub.cpp | 0 .../src/wifi_hotspot_callback_stub.h | 0 .../wifi_standard/src/wifi_hotspot_impl.cpp | 0 .../wifi_standard/src/wifi_hotspot_impl.h | 0 .../wifi_standard/src/wifi_hotspot_proxy.cpp | 0 .../wifi_standard/src/wifi_hotspot_proxy.h | 0 .../wifi_standard/src/wifi_logger.h | 0 .../native_cpp/wifi_standard/src/wifi_p2p.cpp | 0 .../src/wifi_p2p_callback_stub.cpp | 0 .../src/wifi_p2p_callback_stub.h | 0 .../wifi_standard/src/wifi_p2p_impl.cpp | 0 .../wifi_standard/src/wifi_p2p_impl.h | 0 .../wifi_standard/src/wifi_p2p_msg.cpp | 0 .../wifi_standard/src/wifi_p2p_proxy.cpp | 0 .../wifi_standard/src/wifi_p2p_proxy.h | 0 .../wifi_standard/src/wifi_scan.cpp | 0 .../src/wifi_scan_callback_stub.cpp | 0 .../src/wifi_scan_callback_stub.h | 0 .../wifi_standard/src/wifi_scan_impl.cpp | 0 .../wifi_standard/src/wifi_scan_impl.h | 0 .../wifi_standard/src/wifi_scan_proxy.cpp | 0 .../wifi_standard/src/wifi_scan_proxy.h | 0 .../interfaces}/kits/jskits/@ohos.wifi.d.ts | 0 .../kits/jskits/@ohos.wifiext.d.ts | 0 .../services}/wifi_standard/etc/init/BUILD.gn | 2 +- .../wifi_standard/etc/init/wifi_standard.cfg | 0 .../wifi_standard/ipc_framework/cRPC/BUILD.gn | 9 +- .../ipc_framework/cRPC/include/client.h | 0 .../ipc_framework/cRPC/include/common.h | 0 .../ipc_framework/cRPC/include/context.h | 0 .../ipc_framework/cRPC/include/evloop.h | 0 .../ipc_framework/cRPC/include/hash_table.h | 0 .../ipc_framework/cRPC/include/log.h | 0 .../ipc_framework/cRPC/include/net.h | 0 .../ipc_framework/cRPC/include/serial.h | 0 .../ipc_framework/cRPC/include/server.h | 0 .../ipc_framework/cRPC/src/client.c | 0 .../ipc_framework/cRPC/src/context.c | 0 .../ipc_framework/cRPC/src/evloop.c | 0 .../ipc_framework/cRPC/src/hash_table.c | 0 .../ipc_framework/cRPC/src/net.c | 0 .../ipc_framework/cRPC/src/serial.c | 0 .../ipc_framework/cRPC/src/server.c | 0 .../wifi_standard/sa_profile/1120.xml | 0 .../wifi_standard/sa_profile/1121.xml | 0 .../wifi_standard/sa_profile/1123.xml | 0 .../wifi_standard/sa_profile/1124.xml | 0 .../wifi_standard/sa_profile/BUILD.gn | 4 +- .../wifi_standard/wifi_framework/BUILD.gn | 36 ++++ .../common/config/wifi_config_country_freqs.h | 0 .../common/config/wifi_config_file_impl.h | 0 .../common/config/wifi_config_file_spec.cpp | 0 .../common/config/wifi_config_file_spec.h | 0 .../common/config/wifi_settings.cpp | 0 .../common/config/wifi_settings.h | 0 .../common/include/permission_def.h | 0 .../common/include/wifi_internal_msg.h | 0 .../wifi_framework/common/log/log_helper.c | 0 .../wifi_framework/common/log/log_helper.h | 0 .../wifi_framework/common/log/wifi_log.h | 0 .../wifi_framework/common/log/wifi_log_tags.h | 0 .../wifi_framework/common/log/wifi_logger.h | 0 .../common/net_helper/base_address.cpp | 0 .../common/net_helper/base_address.h | 0 .../common/net_helper/dhcpd_interface.cpp | 0 .../common/net_helper/dhcpd_interface.h | 0 .../common/net_helper/http_request.cpp | 0 .../common/net_helper/http_request.h | 0 .../common/net_helper/if_config.cpp | 0 .../common/net_helper/if_config.h | 0 .../common/net_helper/ip_tools.cpp | 0 .../common/net_helper/ip_tools.h | 0 .../common/net_helper/ipv4_address.cpp | 0 .../common/net_helper/ipv4_address.h | 0 .../common/net_helper/ipv6_address.cpp | 0 .../common/net_helper/ipv6_address.h | 0 .../common/net_helper/mac_address.cpp | 0 .../common/net_helper/mac_address.h | 0 .../common/net_helper/network_interface.cpp | 0 .../common/net_helper/network_interface.h | 0 .../common/utils/wifi_common_event_helper.cpp | 0 .../common/utils/wifi_common_event_helper.h | 0 .../common/utils/wifi_global_func.cpp | 0 .../common/utils/wifi_global_func.h | 0 .../wifi_framework/wifi_manage/BUILD.gn | 107 +++++------ .../wifi_manage/common/handler.cpp | 0 .../wifi_manage/common/handler.h | 0 .../wifi_manage/common/internal_message.cpp | 0 .../wifi_manage/common/internal_message.h | 0 .../wifi_manage/common/message_queue.cpp | 0 .../wifi_manage/common/message_queue.h | 0 .../wifi_manage/common/state.cpp | 0 .../wifi_framework/wifi_manage/common/state.h | 0 .../wifi_manage/common/state_machine.cpp | 0 .../wifi_manage/common/state_machine.h | 0 .../common/wifi_broadcast_helper.cpp | 0 .../common/wifi_broadcast_helper.h | 0 .../common/wifi_permission_helper.cpp | 0 .../common/wifi_permission_helper.h | 0 .../common/wifi_permission_utils.cpp | 0 .../common/wifi_permission_utils.h | 0 .../wifi_manage/idl_client/BUILD.gn | 53 +++--- .../idl_client/idl_interface/i_wifi.c | 0 .../idl_client/idl_interface/i_wifi.h | 0 .../idl_client/idl_interface/i_wifi_chip.c | 0 .../idl_client/idl_interface/i_wifi_chip.h | 0 .../i_wifi_chip_event_callback.h | 0 .../idl_interface/i_wifi_event_callback.h | 0 .../idl_interface/i_wifi_event_p2p_callback.h | 0 .../idl_interface/i_wifi_hotspot_iface.c | 0 .../idl_interface/i_wifi_hotspot_iface.h | 0 .../idl_client/idl_interface/i_wifi_iface.c | 0 .../idl_client/idl_interface/i_wifi_iface.h | 0 .../idl_interface/i_wifi_p2p_iface.c | 0 .../idl_interface/i_wifi_p2p_iface.h | 0 .../idl_interface/i_wifi_public_func.c | 0 .../idl_interface/i_wifi_public_func.h | 0 .../idl_interface/i_wifi_sta_iface.c | 0 .../idl_interface/i_wifi_sta_iface.h | 0 .../idl_client/idl_interface/i_wifi_struct.h | 0 .../idl_interface/i_wifi_supplicant_iface.c | 0 .../idl_interface/i_wifi_supplicant_iface.h | 0 .../idl_client/supplicant_event_callback.h | 0 .../idl_client/wifi_ap_event_callback.h | 0 .../idl_client/wifi_ap_hal_interface.cpp | 0 .../idl_client/wifi_ap_hal_interface.h | 0 .../idl_client/wifi_base_hal_interface.cpp | 0 .../idl_client/wifi_base_hal_interface.h | 0 .../idl_client/wifi_chip_event_callback.h | 0 .../idl_client/wifi_chip_hal_interface.cpp | 0 .../idl_client/wifi_chip_hal_interface.h | 0 .../wifi_manage/idl_client/wifi_error_no.h | 0 .../idl_client/wifi_event_callback.h | 0 .../idl_client/wifi_idl_client.cpp | 0 .../wifi_manage/idl_client/wifi_idl_client.h | 0 .../wifi_manage/idl_client/wifi_idl_define.h | 0 .../idl_client/wifi_idl_inner_interface.cpp | 0 .../idl_client/wifi_idl_inner_interface.h | 0 .../wifi_manage/idl_client/wifi_idl_struct.h | 0 .../idl_client/wifi_p2p_event_callback.h | 0 .../idl_client/wifi_p2p_hal_interface.cpp | 0 .../idl_client/wifi_p2p_hal_interface.h | 0 .../wifi_manage/idl_client/wifi_scan_param.h | 0 .../idl_client/wifi_sta_hal_interface.cpp | 0 .../idl_client/wifi_sta_hal_interface.h | 0 .../wifi_manage/idl_client/wifi_sta_request.h | 0 .../wifi_supplicant_hal_interface.cpp | 0 .../wifi_supplicant_hal_interface.h | 0 .../wifi_manage/wifi_ap/BUILD.gn | 53 +++--- .../wifi_manage/wifi_ap/ap_config_use.cpp | 0 .../wifi_manage/wifi_ap/ap_config_use.h | 0 .../wifi_manage/wifi_ap/ap_define.h | 2 +- .../wifi_manage/wifi_ap/ap_idle_state.cpp | 0 .../wifi_manage/wifi_ap/ap_idle_state.h | 0 .../wifi_manage/wifi_ap/ap_interface.cpp | 0 .../wifi_manage/wifi_ap/ap_interface.h | 0 .../wifi_manage/wifi_ap/ap_macro.h | 0 .../wifi_manage/wifi_ap/ap_monitor.cpp | 2 +- .../wifi_manage/wifi_ap/ap_monitor.h | 0 .../wifi_manage/wifi_ap/ap_root_state.cpp | 0 .../wifi_manage/wifi_ap/ap_root_state.h | 0 .../wifi_manage/wifi_ap/ap_service.cpp | 0 .../wifi_manage/wifi_ap/ap_service.h | 0 .../wifi_manage/wifi_ap/ap_started_state.cpp | 2 +- .../wifi_manage/wifi_ap/ap_started_state.h | 0 .../wifi_manage/wifi_ap/ap_state_machine.cpp | 2 +- .../wifi_manage/wifi_ap/ap_state_machine.h | 0 .../wifi_ap/ap_stations_manager.cpp | 0 .../wifi_manage/wifi_ap/ap_stations_manager.h | 0 .../wifi_manage/wifi_ap/i_ap_service.h | 0 .../wifi_ap/i_ap_service_callbacks.h | 0 .../wifi_ap/wifi_ap_nat_manager.cpp | 0 .../wifi_manage/wifi_ap/wifi_ap_nat_manager.h | 0 .../wifi_manage/wifi_auth_center.cpp | 0 .../wifi_manage/wifi_auth_center.h | 0 .../wifi_manage/wifi_config_center.cpp | 0 .../wifi_manage/wifi_config_center.h | 0 .../wifi_device_callback_proxy.cpp | 0 .../wifi_manage/wifi_device_callback_proxy.h | 0 .../wifi_device_death_recipient.cpp | 0 .../wifi_manage/wifi_device_death_recipient.h | 0 .../wifi_manage/wifi_device_service_impl.cpp | 0 .../wifi_manage/wifi_device_service_impl.h | 0 .../wifi_manage/wifi_device_stub.cpp | 0 .../wifi_manage/wifi_device_stub.h | 0 .../wifi_manage/wifi_dumper.cpp | 0 .../wifi_framework/wifi_manage/wifi_dumper.h | 0 .../wifi_manage/wifi_hid2d_cfg.cpp | 0 .../wifi_manage/wifi_hid2d_cfg.h | 0 .../wifi_manage/wifi_hid2d_service_utils.cpp | 0 .../wifi_manage/wifi_hid2d_service_utils.h | 0 .../wifi_hotspot_callback_proxy.cpp | 0 .../wifi_manage/wifi_hotspot_callback_proxy.h | 0 .../wifi_hotspot_death_recipient.cpp | 0 .../wifi_hotspot_death_recipient.h | 0 .../wifi_manage/wifi_hotspot_service_impl.cpp | 0 .../wifi_manage/wifi_hotspot_service_impl.h | 0 .../wifi_manage/wifi_hotspot_stub.cpp | 0 .../wifi_manage/wifi_hotspot_stub.h | 0 .../wifi_internal_event_dispatcher.cpp | 0 .../wifi_internal_event_dispatcher.h | 0 .../wifi_manage/wifi_manager.cpp | 0 .../wifi_framework/wifi_manage/wifi_manager.h | 0 .../wifi_manage/wifi_net_agent.cpp | 0 .../wifi_manage/wifi_net_agent.h | 0 .../wifi_manage/wifi_p2p/BUILD.gn | 62 +++--- .../wifi_manage/wifi_p2p/abstract_ui.h | 0 .../authorizing_negotiation_request_state.cpp | 0 .../authorizing_negotiation_request_state.h | 0 .../wifi_p2p/group_formed_state.cpp | 0 .../wifi_manage/wifi_p2p/group_formed_state.h | 0 .../wifi_p2p/group_negotiation_state.cpp | 0 .../wifi_p2p/group_negotiation_state.h | 0 .../wifi_p2p/invitation_received_state.cpp | 0 .../wifi_p2p/invitation_received_state.h | 0 .../wifi_p2p/invitation_request_state.cpp | 0 .../wifi_p2p/invitation_request_state.h | 0 .../wifi_manage/wifi_p2p/ip2p_service.h | 0 .../wifi_p2p/ip2p_service_callbacks.h | 0 .../wifi_p2p/p2p_default_state.cpp | 0 .../wifi_manage/wifi_p2p/p2p_default_state.h | 0 .../wifi_manage/wifi_p2p/p2p_define.h | 0 .../wifi_p2p/p2p_disabled_state.cpp | 0 .../wifi_manage/wifi_p2p/p2p_disabled_state.h | 0 .../wifi_p2p/p2p_disabling_state.cpp | 0 .../wifi_p2p/p2p_disabling_state.h | 0 .../wifi_p2p/p2p_enabled_state.cpp | 0 .../wifi_manage/wifi_p2p/p2p_enabled_state.h | 0 .../wifi_p2p/p2p_enabling_state.cpp | 0 .../wifi_manage/wifi_p2p/p2p_enabling_state.h | 0 .../wifi_p2p/p2p_group_formation_state.cpp | 0 .../wifi_p2p/p2p_group_formation_state.h | 0 .../wifi_p2p/p2p_group_join_state.cpp | 0 .../wifi_p2p/p2p_group_join_state.h | 0 .../wifi_p2p/p2p_group_operating_state.cpp | 0 .../wifi_p2p/p2p_group_operating_state.h | 0 .../wifi_manage/wifi_p2p/p2p_idle_state.cpp | 0 .../wifi_manage/wifi_p2p/p2p_idle_state.h | 0 .../wifi_manage/wifi_p2p/p2p_interface.cpp | 0 .../wifi_manage/wifi_p2p/p2p_interface.h | 0 .../wifi_p2p/p2p_inviting_state.cpp | 0 .../wifi_manage/wifi_p2p/p2p_inviting_state.h | 0 .../wifi_manage/wifi_p2p/p2p_macro.h | 0 .../wifi_manage/wifi_p2p/p2p_monitor.cpp | 0 .../wifi_manage/wifi_p2p/p2p_monitor.h | 0 .../wifi_p2p/p2p_state_machine.cpp | 0 .../wifi_manage/wifi_p2p/p2p_state_machine.h | 0 .../wifi_p2p/provision_discovery_state.cpp | 0 .../wifi_p2p/provision_discovery_state.h | 0 .../wifi_p2p/wifi_p2p_device_manager.cpp | 0 .../wifi_p2p/wifi_p2p_device_manager.h | 0 .../wifi_p2p/wifi_p2p_dns_sd_service_info.cpp | 0 .../wifi_p2p/wifi_p2p_dns_sd_service_info.h | 0 .../wifi_p2p_dns_sd_service_request.cpp | 0 .../wifi_p2p_dns_sd_service_request.h | 0 .../wifi_p2p_dns_sd_service_response.cpp | 0 .../wifi_p2p_dns_sd_service_response.h | 0 .../wifi_p2p/wifi_p2p_dns_txt_record.cpp | 0 .../wifi_p2p/wifi_p2p_dns_txt_record.h | 0 .../wifi_p2p/wifi_p2p_group_info_proxy.cpp | 0 .../wifi_p2p/wifi_p2p_group_info_proxy.h | 0 .../wifi_p2p/wifi_p2p_group_manager.cpp | 0 .../wifi_p2p/wifi_p2p_group_manager.h | 0 .../wifi_manage/wifi_p2p/wifi_p2p_service.cpp | 0 .../wifi_manage/wifi_p2p/wifi_p2p_service.h | 0 .../wifi_p2p/wifi_p2p_service_manager.cpp | 0 .../wifi_p2p/wifi_p2p_service_manager.h | 0 .../wifi_p2p_service_request_list.cpp | 0 .../wifi_p2p/wifi_p2p_service_request_list.h | 0 .../wifi_p2p_service_response_list.cpp | 0 .../wifi_p2p/wifi_p2p_service_response_list.h | 0 .../wifi_p2p/wifi_p2p_temp_disc_event.cpp | 0 .../wifi_p2p/wifi_p2p_temp_disc_event.h | 0 .../wifi_p2p/wifi_p2p_upnp_service_info.cpp | 0 .../wifi_p2p/wifi_p2p_upnp_service_info.h | 0 .../wifi_p2p_upnp_service_request.cpp | 0 .../wifi_p2p/wifi_p2p_upnp_service_request.h | 0 .../wifi_p2p_upnp_service_response.cpp | 0 .../wifi_p2p/wifi_p2p_upnp_service_response.h | 0 .../wifi_manage/wifi_p2p_callback_proxy.cpp | 0 .../wifi_manage/wifi_p2p_callback_proxy.h | 0 .../wifi_manage/wifi_p2p_death_recipient.cpp | 0 .../wifi_manage/wifi_p2p_death_recipient.h | 0 .../wifi_manage/wifi_p2p_service_impl.cpp | 0 .../wifi_manage/wifi_p2p_service_impl.h | 0 .../wifi_manage/wifi_p2p_stub.cpp | 0 .../wifi_manage/wifi_p2p_stub.h | 0 .../wifi_manage/wifi_protect.cpp | 0 .../wifi_framework/wifi_manage/wifi_protect.h | 0 .../wifi_manage/wifi_protect_manager.cpp | 0 .../wifi_manage/wifi_protect_manager.h | 0 .../wifi_manage/wifi_scan/BUILD.gn | 53 +++--- .../wifi_manage/wifi_scan/iscan_service.h | 0 .../wifi_scan/iscan_service_callbacks.h | 0 .../wifi_manage/wifi_scan/scan_common.h | 0 .../wifi_manage/wifi_scan/scan_interface.cpp | 0 .../wifi_manage/wifi_scan/scan_interface.h | 0 .../wifi_manage/wifi_scan/scan_monitor.cpp | 0 .../wifi_manage/wifi_scan/scan_monitor.h | 0 .../wifi_manage/wifi_scan/scan_service.cpp | 0 .../wifi_manage/wifi_scan/scan_service.h | 0 .../wifi_scan/scan_state_machine.cpp | 0 .../wifi_scan/scan_state_machine.h | 0 .../wifi_manage/wifi_scan_callback_proxy.cpp | 0 .../wifi_manage/wifi_scan_callback_proxy.h | 0 .../wifi_manage/wifi_scan_death_recipient.cpp | 0 .../wifi_manage/wifi_scan_death_recipient.h | 0 .../wifi_manage/wifi_scan_service_impl.cpp | 0 .../wifi_manage/wifi_scan_service_impl.h | 0 .../wifi_manage/wifi_scan_stub.cpp | 0 .../wifi_manage/wifi_scan_stub.h | 0 .../wifi_manage/wifi_service_manager.cpp | 0 .../wifi_manage/wifi_service_manager.h | 0 .../wifi_manage/wifi_sta/BUILD.gn | 70 +++---- .../wifi_manage/wifi_sta/ista_service.h | 0 .../wifi_sta/sta_auto_connect_service.cpp | 0 .../wifi_sta/sta_auto_connect_service.h | 0 .../wifi_manage/wifi_sta/sta_define.h | 0 .../wifi_sta/sta_device_appraisal.h | 0 .../wifi_manage/wifi_sta/sta_interface.cpp | 0 .../wifi_manage/wifi_sta/sta_interface.h | 0 .../wifi_manage/wifi_sta/sta_monitor.cpp | 0 .../wifi_manage/wifi_sta/sta_monitor.h | 0 .../wifi_sta/sta_network_check.cpp | 0 .../wifi_manage/wifi_sta/sta_network_check.h | 0 .../wifi_sta/sta_saved_device_appraisal.cpp | 0 .../wifi_sta/sta_saved_device_appraisal.h | 0 .../wifi_manage/wifi_sta/sta_service.cpp | 0 .../wifi_manage/wifi_sta/sta_service.h | 0 .../wifi_sta/sta_service_callback.h | 0 .../wifi_sta/sta_state_machine.cpp | 0 .../wifi_manage/wifi_sta/sta_state_machine.h | 0 .../services}/wifi_standard/wifi_hal/BUILD.gn | 28 +-- .../wifi_hal/common/wifi_hal_common_func.c | 0 .../wifi_hal/common/wifi_hal_common_func.h | 0 .../wifi_standard/wifi_hal/common/wifi_log.h | 0 .../wifi_standard/wifi_hal/etc/init/BUILD.gn | 8 +- .../etc/init/default_conf/hostapd.conf | 0 .../wifi_hal/etc/init/hostapd.conf | 0 .../wifi_hal/etc/init/p2p_supplicant.conf | 0 .../wifi_hal/etc/init/wifi_hal_service.cfg | 0 .../wifi_hal/etc/init/wpa_supplicant.conf | 0 .../services}/wifi_standard/wifi_hal/main.c | 0 .../wifi_standard/wifi_hal/wifi_hal_adapter.c | 0 .../wifi_standard/wifi_hal/wifi_hal_adapter.h | 0 .../wifi_hal/wifi_hal_ap_interface.c | 0 .../wifi_hal/wifi_hal_ap_interface.h | 0 .../wifi_hal/wifi_hal_base_interface.c | 0 .../wifi_hal/wifi_hal_base_interface.h | 0 .../wifi_hal/wifi_hal_callback.c | 0 .../wifi_hal/wifi_hal_callback.h | 0 .../wifi_hal/wifi_hal_chip_interface.c | 0 .../wifi_hal/wifi_hal_chip_interface.h | 0 .../wifi_standard/wifi_hal/wifi_hal_crpc_ap.c | 0 .../wifi_standard/wifi_hal/wifi_hal_crpc_ap.h | 0 .../wifi_hal/wifi_hal_crpc_base.c | 0 .../wifi_hal/wifi_hal_crpc_base.h | 0 .../wifi_hal/wifi_hal_crpc_chip.c | 0 .../wifi_hal/wifi_hal_crpc_chip.h | 0 .../wifi_hal/wifi_hal_crpc_common.c | 0 .../wifi_hal/wifi_hal_crpc_common.h | 0 .../wifi_hal/wifi_hal_crpc_p2p.c | 0 .../wifi_hal/wifi_hal_crpc_p2p.h | 0 .../wifi_hal/wifi_hal_crpc_server.c | 0 .../wifi_hal/wifi_hal_crpc_server.h | 0 .../wifi_hal/wifi_hal_crpc_sta.c | 0 .../wifi_hal/wifi_hal_crpc_sta.h | 0 .../wifi_hal/wifi_hal_crpc_supplicant.c | 0 .../wifi_hal/wifi_hal_crpc_supplicant.h | 0 .../wifi_standard/wifi_hal/wifi_hal_define.h | 0 .../hostapd_hal/wifi_hostapd_hal.c | 2 +- .../hostapd_hal/wifi_hostapd_hal.h | 0 .../wpa_supplicant_hal/wifi_wpa_common.c | 0 .../wpa_supplicant_hal/wifi_wpa_common.h | 0 .../wpa_supplicant_hal/wifi_wpa_hal.c | 0 .../wpa_supplicant_hal/wifi_wpa_hal.h | 0 .../wpa_p2p_hal/wifi_p2p_hal.c | 0 .../wpa_p2p_hal/wifi_p2p_hal.h | 0 .../wpa_sta_hal/wifi_supplicant_hal.c | 0 .../wpa_sta_hal/wifi_supplicant_hal.h | 0 .../wifi_hal/wifi_hal_module_manage.c | 0 .../wifi_hal/wifi_hal_module_manage.h | 0 .../wifi_hal/wifi_hal_p2p_interface.c | 0 .../wifi_hal/wifi_hal_p2p_interface.h | 0 .../wifi_hal/wifi_hal_p2p_struct.h | 0 .../wifi_hal/wifi_hal_sta_interface.c | 0 .../wifi_hal/wifi_hal_sta_interface.h | 0 .../wifi_standard/wifi_hal/wifi_hal_struct.h | 0 .../wifi_hal/wifi_hal_vendor_interface.c | 0 .../wifi_hal/wifi_hal_vendor_interface.h | 0 .../ipc_framework/cRPC/unittest/BUILD.gn | 18 +- .../cRPC/unittest/context_test.cpp | 0 .../cRPC/unittest/context_test.h | 0 .../cRPC/unittest/hash_table_test.cpp | 0 .../cRPC/unittest/hash_table_test.h | 0 .../ipc_framework/cRPC/unittest/net_test.cpp | 0 .../ipc_framework/cRPC/unittest/net_test.h | 0 .../cRPC/unittest/rpc_test_main.cpp | 0 .../cRPC/unittest/serial_test.cpp | 0 .../ipc_framework/cRPC/unittest/serial_test.h | 0 .../wifi_framework/common/unittest/BUILD.gn | 40 ++-- .../common/unittest/common_test.cpp | 0 .../common/unittest/wifi_config_file_test.cpp | 0 .../common/unittest/wifi_config_file_test.h | 0 .../common/unittest/wifi_global_func_test.cpp | 0 .../common/unittest/wifi_global_func_test.h | 0 .../common/unittest/wifi_ip_tools_test.cpp | 0 .../common/unittest/wifi_ip_tools_test.h | 0 .../common/unittest/wifi_log_helper_test.cpp | 0 .../common/unittest/wifi_log_helper_test.h | 0 .../unittest/wifi_network_interface_test.cpp | 0 .../unittest/wifi_network_interface_test.h | 0 .../wifi_manage/idl_client/unittest/BUILD.gn | 106 +++++------ .../unittest/idl_client_test_main.cpp | 0 .../unittest/mock_wifi_hal_service.c | 0 .../unittest/wifi_ap_hal_interface_test.cpp | 0 .../unittest/wifi_ap_hal_interface_test.h | 0 .../unittest/wifi_base_hal_interface_test.cpp | 0 .../unittest/wifi_base_hal_interface_test.h | 0 .../unittest/wifi_chip_hal_interface_test.cpp | 0 .../unittest/wifi_chip_hal_interface_test.h | 0 .../unittest/wifi_idl_client_test.cpp | 0 .../unittest/wifi_idl_client_test.h | 0 .../unittest/wifi_idl_interface_test.cpp | 0 .../unittest/wifi_idl_interface_test.h | 0 .../unittest/wifi_p2p_hal_interface_test.cpp | 0 .../unittest/wifi_p2p_hal_interface_test.h | 0 .../unittest/wifi_sta_hal_interface_test.cpp | 0 .../unittest/wifi_sta_hal_interface_test.h | 0 .../wifi_supplicant_hal_interface_test.cpp | 0 .../wifi_supplicant_hal_interface_test.h | 0 .../wifi_manage/unittest/BUILD.gn | 70 +++---- .../unittest/wifi_auth_center_test.cpp | 0 .../unittest/wifi_auth_center_test.h | 0 .../unittest/wifi_config_center_test.cpp | 0 .../unittest/wifi_config_center_test.h | 0 .../wifi_internal_event_dispatcher_test.cpp | 0 .../wifi_internal_event_dispatcher_test.h | 0 .../wifi_manage/unittest/wifi_manage_test.cpp | 0 .../unittest/wifi_manager_service_test.cpp | 0 .../unittest/wifi_manager_service_test.h | 0 .../unittest/wifi_mock_p2p_service.cpp | 0 .../unittest/wifi_mock_p2p_service.h | 0 .../unittest/wifi_service_manager_test.cpp | 0 .../unittest/wifi_service_manager_test.h | 0 .../wifi_manage/wifi_ap/BUILD.gn | 88 ++++----- .../wifi_ap/Mock/mock_ap_config_use.h | 4 +- .../wifi_ap/Mock/mock_ap_idle_state.h | 0 .../wifi_ap/Mock/mock_ap_monitor.h | 0 .../wifi_ap/Mock/mock_ap_root_state.h | 0 .../wifi_ap/Mock/mock_ap_service.h | 0 .../wifi_ap/Mock/mock_ap_started_state.h | 0 .../wifi_ap/Mock/mock_ap_state_machine.h | 0 .../wifi_ap/Mock/mock_ap_stations_manager.h | 0 .../wifi_ap/Mock/mock_network_interface.cpp | 0 .../wifi_ap/Mock/mock_network_interface.h | 0 .../wifi_manage/wifi_ap/Mock/mock_pendant.h | 0 .../wifi_ap/Mock/mock_system_interface.cpp | 0 .../wifi_ap/Mock/mock_system_interface.h | 0 .../Mock/mock_wifi_ap_hal_interface.cpp | 0 .../wifi_ap/Mock/mock_wifi_ap_hal_interface.h | 0 .../wifi_ap/Mock/mock_wifi_ap_nat_manager.h | 0 .../wifi_ap/Mock/mock_wifi_settings.cpp | 0 .../wifi_ap/Mock/mock_wifi_settings.h | 6 +- .../wifi_ap/Mock/operator_overload.cpp | 0 .../wifi_ap/Mock/operator_overload.h | 0 .../wifi_ap/ap_config_use_test.cpp | 0 .../wifi_ap/ap_idle_state_test.cpp | 0 .../wifi_manage/wifi_ap/ap_monitor_test.cpp | 0 .../wifi_ap/ap_root_state_test.cpp | 0 .../wifi_manage/wifi_ap/ap_service_test.cpp | 0 .../wifi_ap/ap_started_state_test.cpp | 2 +- .../wifi_ap/ap_state_machine_test.cpp | 0 .../wifi_ap/ap_stations_manager_test.cpp | 0 .../wifi_manage/wifi_ap/global_test.cpp | 0 .../wifi_manage/wifi_ap/global_test.h | 0 .../wifi_ap/wifi_ap_nat_manager_test.cpp | 0 .../wifi_ap/wifi_ap_service_test.cpp | 0 .../wifi_manage/wifi_ap/wifi_ap_test.cpp | 0 .../wifi_manage/wifi_p2p/test/BUILD.gn | 163 ++++++++++++++++ ...ck_authorizing_negotiation_request_state.h | 0 .../test/Mock/mock_group_formed_state.h | 0 .../test/Mock/mock_group_negotiation_state.h | 0 .../Mock/mock_invitation_recelved_state.h | 0 .../test/Mock/mock_invitation_request_state.h | 0 .../test/Mock/mock_p2p_default_state.h | 0 .../test/Mock/mock_p2p_disabled_state.h | 0 .../test/Mock/mock_p2p_disabling_state.h | 0 .../test/Mock/mock_p2p_enabled_state.h | 0 .../test/Mock/mock_p2p_enabling_state.h | 0 .../Mock/mock_p2p_group_formation_state.h | 0 .../test/Mock/mock_p2p_group_join_state.h | 0 .../Mock/mock_p2p_group_operating_state.h | 0 .../wifi_p2p/test/Mock/mock_p2p_idle_state.h | 0 .../test/Mock/mock_p2p_inviting_state.h | 0 .../wifi_p2p/test/Mock/mock_p2p_monitor.h | 0 .../test/Mock/mock_p2p_state_machine.h | 0 .../Mock/mock_provision_discovery_state.h | 0 .../Mock/mock_wifi_p2p_device_manager.cpp | 0 .../test/Mock/mock_wifi_p2p_device_manager.h | 0 .../test/Mock/mock_wifi_p2p_hal_interface.cpp | 0 .../test/Mock/mock_wifi_p2p_hal_interface.h | 0 .../wifi_p2p/test/Mock/mock_wifi_settings.cpp | 0 .../wifi_p2p/test/Mock/mock_wifi_settings.h | 0 ...orizing_negotiation_request_state_test.cpp | 0 .../wifi_manage/wifi_p2p/test/global_test.cpp | 0 .../wifi_manage/wifi_p2p/test/global_test.h | 0 .../wifi_p2p/test/group_formed_state_test.cpp | 0 .../test/group_negotiation_state_test.cpp | 0 .../test/invitation_recelved_state_test.cpp | 0 .../test/invitation_request_state_test.cpp | 0 .../wifi_p2p/test/mock_p2p_pendant.h | 0 .../wifi_p2p/test/p2p_default_state_test.cpp | 0 .../wifi_p2p/test/p2p_disabled_state_test.cpp | 0 .../test/p2p_disabling_state_test.cpp | 0 .../wifi_p2p/test/p2p_enabled_state_test.cpp | 0 .../wifi_p2p/test/p2p_enabling_state_test.cpp | 0 .../test/p2p_group_formation_state_test.cpp | 0 .../test/p2p_group_join_state_test.cpp | 0 .../test/p2p_group_operating_state_test.cpp | 0 .../wifi_p2p/test/p2p_idle_state_test.cpp | 0 .../wifi_p2p/test/p2p_inviting_state_test.cpp | 0 .../wifi_p2p/test/p2p_monitor_test.cpp | 0 .../wifi_p2p/test/p2p_state_machine_test.cpp | 0 .../test/provision_discovery_state_test.cpp | 0 .../test/wifi_p2p_device_manager_test.cpp | 0 .../wifi_p2p_dns_sd_service_info_test.cpp | 0 .../wifi_p2p_dns_sd_service_request_test.cpp | 0 .../wifi_p2p_dns_sd_service_response_test.cpp | 0 .../test/wifi_p2p_group_info_proxy_test.cpp | 0 .../test/wifi_p2p_group_manager_test.cpp | 0 .../test/wifi_p2p_service_manager_test.cpp | 0 .../wifi_p2p_service_request_list_test.cpp | 0 .../wifi_p2p_service_response_list_test.cpp | 0 .../wifi_p2p/test/wifi_p2p_service_test.cpp | 0 .../wifi_p2p/test/wifi_p2p_test_entry.cpp | 0 .../test/wifi_p2p_upnp_service_info_test.cpp | 0 .../wifi_p2p_upnp_service_request_test.cpp | 0 .../wifi_p2p_upnp_service_response_test.cpp | 0 .../wifi_manage/wifi_scan/BUILD.gn | 101 ++++++++++ .../wifi_scan/Mock/mock_scan_service.cpp | 0 .../wifi_scan/Mock/mock_scan_service.h | 0 .../Mock/mock_scan_state_machine.cpp | 0 .../wifi_scan/Mock/mock_scan_state_machine.h | 0 .../wifi_scan/Mock/mock_wifi_manager.cpp | 0 .../wifi_scan/Mock/mock_wifi_manager.h | 0 .../wifi_scan/Mock/mock_wifi_settings.cpp | 0 .../wifi_scan/Mock/mock_wifi_settings.h | 0 .../Mock/mock_wifi_sta_hal_interface.cpp | 0 .../Mock/mock_wifi_sta_hal_interface.h | 0 .../mock_wifi_supplicant_hal_interface.cpp | 0 .../Mock/mock_wifi_supplicant_hal_interface.h | 0 .../wifi_manage/wifi_scan/global_test.cpp | 0 .../wifi_manage/wifi_scan/global_test.h | 0 .../wifi_scan/scan_interface_test.cpp | 0 .../wifi_scan/scan_monitor_test.cpp | 0 .../wifi_scan/scan_service_test.cpp | 0 .../wifi_scan/scan_state_machine_test.cpp | 0 .../wifi_manage/wifi_scan/wifi_scan_test.cpp | 0 .../wifi_manage/wifi_sta/BUILD.gn | 91 ++++----- .../wifi_sta/Mock/mock_device_appraisal.h | 0 .../wifi_sta/Mock/mock_dhcp_service.cpp | 0 .../wifi_sta/Mock/mock_dhcp_service.h | 0 .../wifi_sta/Mock/mock_if_config.cpp | 0 .../wifi_sta/Mock/mock_if_config.h | 0 .../wifi_sta/Mock/mock_mac_address.cpp | 0 .../wifi_sta/Mock/mock_mac_address.h | 0 .../Mock/mock_sta_auto_connect_service.cpp | 0 .../Mock/mock_sta_auto_connect_service.h | 0 .../wifi_sta/Mock/mock_sta_monitor.h | 0 .../wifi_sta/Mock/mock_sta_network_check.cpp | 0 .../wifi_sta/Mock/mock_sta_network_check.h | 0 .../wifi_sta/Mock/mock_sta_service.h | 0 .../wifi_sta/Mock/mock_sta_state_machine.cpp | 0 .../wifi_sta/Mock/mock_sta_state_machine.h | 0 .../Mock/mock_wifi_chip_hal_interface.cpp | 0 .../Mock/mock_wifi_chip_hal_interface.h | 0 .../wifi_sta/Mock/mock_wifi_manager.cpp | 0 .../wifi_sta/Mock/mock_wifi_manager.h | 0 .../wifi_sta/Mock/mock_wifi_settings.cpp | 0 .../wifi_sta/Mock/mock_wifi_settings.h | 2 +- .../Mock/mock_wifi_sta_hal_interface.cpp | 0 .../Mock/mock_wifi_sta_hal_interface.h | 0 .../mock_wifi_supplicant_hal_interface.cpp | 0 .../Mock/mock_wifi_supplicant_hal_interface.h | 0 .../wifi_manage/wifi_sta/global_test.cpp | 0 .../wifi_manage/wifi_sta/global_test.h | 0 .../sta_auto_connect_service_test.cpp | 0 .../wifi_sta/sta_interface_test.cpp | 0 .../wifi_manage/wifi_sta/sta_monitor_test.cpp | 0 .../wifi_sta/sta_network_check_test.cpp | 0 .../sta_saved_device_appraisal_test.cpp | 0 .../wifi_manage/wifi_sta/sta_service_test.cpp | 0 .../wifi_sta/sta_state_machine_test.cpp | 0 .../wifi_manage/wifi_sta/wifi_sta_test.cpp | 0 .../wifi_standard/wifi_hal/unittest/BUILD.gn | 77 ++++---- .../wifi_hal/unittest/mock_wpa_ctrl.cpp | 0 .../wifi_hal/unittest/mock_wpa_ctrl.h | 0 .../wifi_hal/unittest/wifi_hal_adapter_test.h | 0 .../unittest/wifi_hal_ap_interface_test.cpp | 0 .../unittest/wifi_hal_ap_interface_test.h | 0 .../unittest/wifi_hal_base_interface_test.cpp | 0 .../unittest/wifi_hal_base_interface_test.h | 0 .../unittest/wifi_hal_chip_interface_test.cpp | 0 .../unittest/wifi_hal_chip_interface_test.h | 0 .../wifi_hal_crpc_server_add_test.cpp | 0 .../unittest/wifi_hal_crpc_server_add_test.h | 0 .../unittest/wifi_hal_crpc_server_test.cpp | 0 .../unittest/wifi_hal_crpc_server_test.h | 0 .../unittest/wifi_hal_hostapd_test.cpp | 0 .../wifi_hal/unittest/wifi_hal_hostapd_test.h | 0 .../unittest/wifi_hal_p2p_interface_test.cpp | 0 .../unittest/wifi_hal_p2p_interface_test.h | 0 .../unittest/wifi_hal_sta_interface_test.cpp | 0 .../unittest/wifi_hal_sta_interface_test.h | 0 .../wifi_hal/unittest/wifi_hal_test.cpp | 0 .../wifi_hal/unittest/wifi_hal_vendor.conf | 0 .../unittest/wifi_hal_vendor_interface_test.c | 0 .../unittest/wifi_hal_wpa_p2p_test.cpp | 0 .../wifi_hal/unittest/wifi_hal_wpa_p2p_test.h | 0 .../unittest/wifi_hal_wpa_sta_test.cpp | 0 .../wifi_hal/unittest/wifi_hal_wpa_sta_test.h | 0 {utils => wifi/utils}/inc/wifi_common_util.h | 0 {utils => wifi/utils}/inc/wifi_hisysevent.h | 0 {utils => wifi/utils}/src/BUILD.gn | 7 +- .../utils}/src/wifi_common_util.cpp | 0 {utils => wifi/utils}/src/wifi_hisysevent.cpp | 0 wifi.gni => wifi/wifi.gni | 8 +- 829 files changed, 1278 insertions(+), 915 deletions(-) rename LICENSE => dhcp/LICENSE (100%) create mode 100644 dhcp/bundle.json create mode 100644 dhcp/dhcp.gni rename {services/wifi_standard/wifi_framework/dhcp_manage/mgr_service => dhcp/interfaces/innerkits/native_cpp}/include/dhcp_define.h (100%) create mode 100644 dhcp/interfaces/innerkits/native_cpp/include/dhcp_service_api.h rename {services/wifi_standard/wifi_framework/dhcp_manage/mgr_service => dhcp/interfaces/innerkits/native_cpp}/interfaces/i_dhcp_client_service.h (100%) rename {services/wifi_standard/wifi_framework/dhcp_manage/mgr_service => dhcp/interfaces/innerkits/native_cpp}/interfaces/i_dhcp_result_notify.h (100%) rename {services/wifi_standard/wifi_framework/dhcp_manage/mgr_service => dhcp/interfaces/innerkits/native_cpp}/interfaces/i_dhcp_server_service.h (100%) rename {services/wifi_standard/wifi_framework/dhcp_manage/mgr_service => dhcp/interfaces/innerkits/native_cpp}/interfaces/i_dhcp_service.h (100%) rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_client/BUILD.gn (56%) rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_client/include/dhcp_api.h (100%) rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_client/include/dhcp_client.h (100%) rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_client/include/dhcp_define.h (100%) rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_client/include/dhcp_function.h (100%) rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_client/include/dhcp_ipv4.h (100%) rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_client/include/dhcp_options.h (100%) rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_client/include/dhcp_socket.h (100%) rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_client/src/dhcp_api.cpp (100%) rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_client/src/dhcp_client.c (100%) rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_client/src/dhcp_function.c (100%) rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_client/src/dhcp_ipv4.c (100%) rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_client/src/dhcp_main.c (100%) rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_client/src/dhcp_options.c (100%) rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_client/src/dhcp_socket.c (100%) rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_server/BUILD.gn (87%) rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_server/etc/dhcpd.conf.sample (100%) rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_server/etc/dhcpd_mini.conf (100%) rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_server/include/address_utils.h (100%) rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_server/include/common_util.h (100%) rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_server/include/dhcp_address_pool.h (100%) rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_server/include/dhcp_argument.h (100%) rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_server/include/dhcp_binding.h (100%) rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_server/include/dhcp_config.h (100%) rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_server/include/dhcp_define.h (100%) rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_server/include/dhcp_ipv4.h (100%) rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_server/include/dhcp_logger.h (100%) rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_server/include/dhcp_message.h (100%) rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_server/include/dhcp_option.h (100%) rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_server/include/dhcp_server.h (100%) rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_server/include/hash_table.h (100%) rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_server/src/address_utils.c (100%) rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_server/src/common_util.c (100%) rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_server/src/dhcp_address_pool.c (100%) rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_server/src/dhcp_argument.c (100%) rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_server/src/dhcp_binding.c (100%) rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_server/src/dhcp_config.c (100%) rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_server/src/dhcp_dhcpd.c (100%) rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_server/src/dhcp_option.c (100%) rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_server/src/dhcp_server.c (100%) rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_server/src/hash_table.c (100%) rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/mgr_service/BUILD.gn (58%) rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/mgr_service/include/dhcp_client_service_impl.h (100%) rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/mgr_service/include/dhcp_event_subscriber.h (100%) rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/mgr_service/include/dhcp_func.h (100%) rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/mgr_service/include/dhcp_server_service.h (100%) rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/mgr_service/include/dhcp_service.h (100%) rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/mgr_service/src/dhcp_client_service_impl.cpp (100%) rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/mgr_service/src/dhcp_event_subscriber.cpp (100%) rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/mgr_service/src/dhcp_func.cpp (100%) rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/mgr_service/src/dhcp_server_service.cpp (100%) rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/mgr_service/src/dhcp_service.cpp (99%) create mode 100644 dhcp/services/mgr_service/src/dhcp_service_api.cpp rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/dhcp_client/BUILD.gn (67%) rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/dhcp_client/dhcp_client_test.cpp (100%) rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/dhcp_client/dhcp_function_test.cpp (100%) rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/dhcp_client/dhcp_ipv4_test.cpp (100%) rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/dhcp_client/dhcp_main_test.cpp (100%) rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/dhcp_client/dhcp_options_test.cpp (100%) rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/dhcp_client/dhcp_socket_test.cpp (100%) rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/dhcp_client/global_test.cpp (100%) rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/dhcp_client/global_test.h (100%) rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/dhcp_client/mock_custom_func.cpp (100%) rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/dhcp_client/mock_custom_func.h (100%) rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/dhcp_client/mock_system_func.cpp (100%) rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/dhcp_client/mock_system_func.h (100%) rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/dhcp_server/unittest/BUILD.gn (60%) rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/dhcp_server/unittest/address_utils_test.cpp (100%) rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/dhcp_server/unittest/common_util_test.cpp (100%) rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/dhcp_server/unittest/dhcp_address_pool_test.cpp (100%) rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/dhcp_server/unittest/dhcp_argument_test.cpp (100%) rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/dhcp_server/unittest/dhcp_binding_test.cpp (100%) rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/dhcp_server/unittest/dhcp_config_test.cpp (100%) rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/dhcp_server/unittest/dhcp_message_sim.cpp (100%) rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/dhcp_server/unittest/dhcp_message_sim.h (100%) rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/dhcp_server/unittest/dhcp_option_test.cpp (100%) rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/dhcp_server/unittest/dhcp_server_test.cpp (100%) rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/dhcp_server/unittest/hash_table_test.cpp (100%) rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/dhcp_server/unittest/system_func_mock.cpp (100%) rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/dhcp_server/unittest/system_func_mock.h (100%) rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/mgr_service/BUILD.gn (67%) rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/mgr_service/dhcp_client_service_test.cpp (100%) rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/mgr_service/dhcp_func_test.cpp (100%) rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/mgr_service/dhcp_manage_test.cpp (100%) rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/mgr_service/dhcp_result_notify.cpp (100%) rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/mgr_service/dhcp_result_notify.h (100%) rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/mgr_service/dhcp_server_service_test.cpp (100%) rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/mgr_service/dhcp_service_test.cpp (100%) rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/mgr_service/global_test.cpp (100%) rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/mgr_service/global_test.h (100%) rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/mgr_service/mock_system_func.cpp (100%) rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/mgr_service/mock_system_func.h (100%) delete mode 100644 services/wifi_standard/wifi_framework/BUILD.gn delete mode 100644 tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn delete mode 100644 tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn rename .gitattributes => wifi/.gitattributes (100%) create mode 100644 wifi/LICENSE rename README.md => wifi/README.md (100%) rename README_zh.md => wifi/README_zh.md (100%) rename {application => wifi/application}/wifi_direct_demo/README.md (100%) rename {application => wifi/application}/wifi_direct_demo/build.gradle (100%) rename {application => wifi/application}/wifi_direct_demo/entry/.gitignore (100%) rename {application => wifi/application}/wifi_direct_demo/entry/build.gradle (100%) rename {application => wifi/application}/wifi_direct_demo/entry/proguard-rules.pro (100%) rename {application => wifi/application}/wifi_direct_demo/entry/src/main/config.json (100%) rename {application => wifi/application}/wifi_direct_demo/entry/src/main/ets/MainAbility/app.ets (100%) rename {application => wifi/application}/wifi_direct_demo/entry/src/main/ets/MainAbility/common/LogUtil.ets (100%) rename {application => wifi/application}/wifi_direct_demo/entry/src/main/ets/MainAbility/common/StorageUtil.ets (100%) rename {application => wifi/application}/wifi_direct_demo/entry/src/main/ets/MainAbility/model/BaseModel.ets (100%) rename {application => wifi/application}/wifi_direct_demo/entry/src/main/ets/MainAbility/model/wifiModeImpl/WifiEntity.ets (100%) rename {application => wifi/application}/wifi_direct_demo/entry/src/main/ets/MainAbility/model/wifiModeImpl/WifiModel.ets (100%) rename {application => wifi/application}/wifi_direct_demo/entry/src/main/ets/MainAbility/pages/component/dialog/customPromptDialog.ets (100%) rename {application => wifi/application}/wifi_direct_demo/entry/src/main/ets/MainAbility/pages/component/dialog/inputComponent.ets (100%) rename {application => wifi/application}/wifi_direct_demo/entry/src/main/ets/MainAbility/pages/index.ets (100%) rename {application => wifi/application}/wifi_direct_demo/entry/src/main/ets/MainAbility/res/image/ic_phone.svg (100%) rename {application => wifi/application}/wifi_direct_demo/entry/src/main/ets/MainAbility/res/image/ic_right.svg (100%) rename {application => wifi/application}/wifi_direct_demo/entry/src/main/resources/base/element/string.json (100%) rename {application => wifi/application}/wifi_direct_demo/entry/src/main/resources/base/media/ic_loading.gif (100%) rename {application => wifi/application}/wifi_direct_demo/entry/src/main/resources/base/media/icon.png (100%) rename {application => wifi/application}/wifi_direct_demo/figures/img.png (100%) rename {application => wifi/application}/wifi_direct_demo/gradle.properties (100%) rename {application => wifi/application}/wifi_direct_demo/gradlew (100%) rename {application => wifi/application}/wifi_direct_demo/gradlew.bat (100%) rename {application => wifi/application}/wifi_direct_demo/package.json (100%) rename {application => wifi/application}/wifi_direct_demo/settings.gradle (100%) rename bundle.json => wifi/bundle.json (48%) rename {figures => wifi/figures}/en-us_image_0000001115710400.png (100%) rename {figures => wifi/figures}/zh-cn_image_0000001115710400.png (100%) rename hisysevent.yaml => wifi/hisysevent.yaml (100%) rename {interfaces => wifi/interfaces}/innerkits/native_c/station_info.h (100%) rename {interfaces => wifi/interfaces}/innerkits/native_c/wifi_device.h (100%) rename {interfaces => wifi/interfaces}/innerkits/native_c/wifi_device_config.h (100%) rename {interfaces => wifi/interfaces}/innerkits/native_c/wifi_error_code.h (100%) rename {interfaces => wifi/interfaces}/innerkits/native_c/wifi_event.h (100%) rename {interfaces => wifi/interfaces}/innerkits/native_c/wifi_hid2d.h (100%) rename {interfaces => wifi/interfaces}/innerkits/native_c/wifi_hotspot.h (100%) rename {interfaces => wifi/interfaces}/innerkits/native_c/wifi_hotspot_config.h (100%) rename {interfaces => wifi/interfaces}/innerkits/native_c/wifi_linked_info.h (100%) rename {interfaces => wifi/interfaces}/innerkits/native_c/wifi_p2p.h (100%) rename {interfaces => wifi/interfaces}/innerkits/native_c/wifi_p2p_config.h (100%) rename {interfaces => wifi/interfaces}/innerkits/native_c/wifi_scan_info.h (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/napi/BUILD.gn (67%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/napi/wifi_napi_device.cpp (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/napi/wifi_napi_device.h (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/napi/wifi_napi_entry.cpp (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/napi/wifi_napi_event.cpp (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/napi/wifi_napi_event.h (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/napi/wifi_napi_hotspot.cpp (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/napi/wifi_napi_hotspot.h (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/napi/wifi_napi_p2p.cpp (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/napi/wifi_napi_p2p.h (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/napi/wifi_napi_utils.cpp (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/napi/wifi_napi_utils.h (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/BUILD.gn (79%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_device.cpp (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_event.cpp (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_hid2d.cpp (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_hotspot.cpp (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_p2p.cpp (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_utils.cpp (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_utils.h (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/include/wifi_device.h (99%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/include/wifi_hid2d.h (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/include/wifi_hotspot.h (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/include/wifi_p2p.h (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/include/wifi_scan.h (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/interfaces/define.h (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_device.h (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_device_callback.h (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_hotspot.h (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_hotspot_callback.h (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_p2p.h (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_p2p_callback.h (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_scan.h (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_scan_callback.h (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/interfaces/wifi_ap_msg.h (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/interfaces/wifi_errcode.h (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/interfaces/wifi_hid2d_msg.h (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/interfaces/wifi_msg.h (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/interfaces/wifi_p2p_msg.h (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/interfaces/wifi_scan_msg.h (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_device.cpp (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_device_callback_stub.cpp (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_device_callback_stub.h (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_device_impl.cpp (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_device_impl.h (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy.cpp (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy.h (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_hid2d.cpp (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_hid2d_msg.cpp (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_hotspot.cpp (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_callback_stub.cpp (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_callback_stub.h (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_impl.cpp (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_impl.h (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_proxy.cpp (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_proxy.h (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_logger.h (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_p2p.cpp (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_p2p_callback_stub.cpp (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_p2p_callback_stub.h (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_p2p_impl.cpp (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_p2p_impl.h (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_p2p_msg.cpp (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_p2p_proxy.cpp (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_p2p_proxy.h (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_scan.cpp (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_scan_callback_stub.cpp (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_scan_callback_stub.h (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_scan_impl.cpp (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_scan_impl.h (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_scan_proxy.cpp (100%) rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_scan_proxy.h (100%) rename {interfaces => wifi/interfaces}/kits/jskits/@ohos.wifi.d.ts (100%) rename {interfaces => wifi/interfaces}/kits/jskits/@ohos.wifiext.d.ts (100%) rename {services => wifi/services}/wifi_standard/etc/init/BUILD.gn (96%) rename {services => wifi/services}/wifi_standard/etc/init/wifi_standard.cfg (100%) rename {services => wifi/services}/wifi_standard/ipc_framework/cRPC/BUILD.gn (88%) rename {services => wifi/services}/wifi_standard/ipc_framework/cRPC/include/client.h (100%) rename {services => wifi/services}/wifi_standard/ipc_framework/cRPC/include/common.h (100%) rename {services => wifi/services}/wifi_standard/ipc_framework/cRPC/include/context.h (100%) rename {services => wifi/services}/wifi_standard/ipc_framework/cRPC/include/evloop.h (100%) rename {services => wifi/services}/wifi_standard/ipc_framework/cRPC/include/hash_table.h (100%) rename {services => wifi/services}/wifi_standard/ipc_framework/cRPC/include/log.h (100%) rename {services => wifi/services}/wifi_standard/ipc_framework/cRPC/include/net.h (100%) rename {services => wifi/services}/wifi_standard/ipc_framework/cRPC/include/serial.h (100%) rename {services => wifi/services}/wifi_standard/ipc_framework/cRPC/include/server.h (100%) rename {services => wifi/services}/wifi_standard/ipc_framework/cRPC/src/client.c (100%) rename {services => wifi/services}/wifi_standard/ipc_framework/cRPC/src/context.c (100%) rename {services => wifi/services}/wifi_standard/ipc_framework/cRPC/src/evloop.c (100%) rename {services => wifi/services}/wifi_standard/ipc_framework/cRPC/src/hash_table.c (100%) rename {services => wifi/services}/wifi_standard/ipc_framework/cRPC/src/net.c (100%) rename {services => wifi/services}/wifi_standard/ipc_framework/cRPC/src/serial.c (100%) rename {services => wifi/services}/wifi_standard/ipc_framework/cRPC/src/server.c (100%) rename {services => wifi/services}/wifi_standard/sa_profile/1120.xml (100%) rename {services => wifi/services}/wifi_standard/sa_profile/1121.xml (100%) rename {services => wifi/services}/wifi_standard/sa_profile/1123.xml (100%) rename {services => wifi/services}/wifi_standard/sa_profile/1124.xml (100%) rename {services => wifi/services}/wifi_standard/sa_profile/BUILD.gn (90%) create mode 100644 wifi/services/wifi_standard/wifi_framework/BUILD.gn rename {services => wifi/services}/wifi_standard/wifi_framework/common/config/wifi_config_country_freqs.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/common/config/wifi_config_file_impl.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/common/config/wifi_settings.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/common/config/wifi_settings.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/common/include/permission_def.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/common/include/wifi_internal_msg.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/common/log/log_helper.c (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/common/log/log_helper.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/common/log/wifi_log.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/common/log/wifi_log_tags.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/common/log/wifi_logger.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/common/net_helper/base_address.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/common/net_helper/base_address.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/common/net_helper/dhcpd_interface.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/common/net_helper/dhcpd_interface.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/common/net_helper/http_request.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/common/net_helper/http_request.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/common/net_helper/if_config.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/common/net_helper/if_config.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/common/net_helper/ip_tools.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/common/net_helper/ipv4_address.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/common/net_helper/ipv4_address.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/common/net_helper/ipv6_address.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/common/net_helper/ipv6_address.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/common/net_helper/mac_address.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/common/net_helper/network_interface.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/common/net_helper/network_interface.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/common/utils/wifi_common_event_helper.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/common/utils/wifi_common_event_helper.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/common/utils/wifi_global_func.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/BUILD.gn (58%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/common/handler.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/common/handler.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/common/internal_message.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/common/internal_message.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/common/message_queue.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/common/message_queue.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/common/state.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/common/state.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/common/state_machine.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/common/wifi_broadcast_helper.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/common/wifi_broadcast_helper.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_helper.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_helper.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_utils.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_utils.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/BUILD.gn (50%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi.c (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_chip.c (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_chip.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_chip_event_callback.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_event_callback.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_event_p2p_callback.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_hotspot_iface.c (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_hotspot_iface.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_iface.c (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_iface.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_p2p_iface.c (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_p2p_iface.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_public_func.c (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_public_func.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.c (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_struct.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_supplicant_iface.c (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_supplicant_iface.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/supplicant_event_callback.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_ap_event_callback.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_ap_hal_interface.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_ap_hal_interface.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_base_hal_interface.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_base_hal_interface.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_chip_event_callback.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_chip_hal_interface.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_chip_hal_interface.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_error_no.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_event_callback.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_define.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_struct.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_p2p_event_callback.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_p2p_hal_interface.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_p2p_hal_interface.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_scan_param.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_sta_hal_interface.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_sta_hal_interface.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_sta_request.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_supplicant_hal_interface.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_supplicant_hal_interface.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn (38%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_define.h (98%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_idle_state.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_idle_state.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_interface.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_interface.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_macro.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor.cpp (99%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_root_state.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_root_state.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.cpp (99%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine.cpp (99%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/i_ap_service.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/i_ap_service_callbacks.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_auth_center.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_auth_center.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_device_callback_proxy.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_device_callback_proxy.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_device_death_recipient.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_device_death_recipient.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_dumper.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_dumper.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_cfg.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_cfg.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_service_utils.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_service_utils.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_callback_proxy.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_callback_proxy.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_death_recipient.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_death_recipient.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_manager.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_net_agent.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_net_agent.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/BUILD.gn (44%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/abstract_ui.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/authorizing_negotiation_request_state.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/authorizing_negotiation_request_state.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_received_state.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_received_state.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_request_state.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_request_state.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/ip2p_service.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/ip2p_service_callbacks.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_default_state.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_default_state.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_define.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_disabled_state.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_disabled_state.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_disabling_state.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_disabling_state.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabled_state.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabled_state.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabling_state.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabling_state.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_formation_state.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_formation_state.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_join_state.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_join_state.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_interface.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_interface.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_inviting_state.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_inviting_state.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_macro.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_monitor.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_monitor.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/provision_discovery_state.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/provision_discovery_state.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_device_manager.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_device_manager.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_info.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_info.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_request.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_request.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_response.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_response.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_txt_record.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_txt_record.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_info_proxy.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_info_proxy.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_manager.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_manager.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_manager.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_manager.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_request_list.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_request_list.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_response_list.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_response_list.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_temp_disc_event.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_temp_disc_event.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_info.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_info.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_request.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_request.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_response.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_response.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_callback_proxy.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_callback_proxy.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_death_recipient.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_death_recipient.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_protect.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_protect.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_protect_manager.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_protect_manager.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn (34%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/iscan_service.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/iscan_service_callbacks.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_common.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_monitor.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_monitor.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_scan_callback_proxy.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_scan_callback_proxy.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_scan_death_recipient.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_scan_death_recipient.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_scan_service_impl.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_scan_service_impl.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_scan_stub.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_scan_stub.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn (32%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/ista_service.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_define.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_device_appraisal.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service_callback.h (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp (100%) rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h (100%) rename {services => wifi/services}/wifi_standard/wifi_hal/BUILD.gn (66%) rename {services => wifi/services}/wifi_standard/wifi_hal/common/wifi_hal_common_func.c (100%) rename {services => wifi/services}/wifi_standard/wifi_hal/common/wifi_hal_common_func.h (100%) rename {services => wifi/services}/wifi_standard/wifi_hal/common/wifi_log.h (100%) rename {services => wifi/services}/wifi_standard/wifi_hal/etc/init/BUILD.gn (92%) rename {services => wifi/services}/wifi_standard/wifi_hal/etc/init/default_conf/hostapd.conf (100%) rename {services => wifi/services}/wifi_standard/wifi_hal/etc/init/hostapd.conf (100%) rename {services => wifi/services}/wifi_standard/wifi_hal/etc/init/p2p_supplicant.conf (100%) rename {services => wifi/services}/wifi_standard/wifi_hal/etc/init/wifi_hal_service.cfg (100%) rename {services => wifi/services}/wifi_standard/wifi_hal/etc/init/wpa_supplicant.conf (100%) rename {services => wifi/services}/wifi_standard/wifi_hal/main.c (100%) rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_adapter.c (100%) rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_adapter.h (100%) rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_ap_interface.c (100%) rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_ap_interface.h (100%) rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_base_interface.c (100%) rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_base_interface.h (100%) rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_callback.c (100%) rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_callback.h (100%) rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_chip_interface.c (100%) rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_chip_interface.h (100%) rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_crpc_ap.c (100%) rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_crpc_ap.h (100%) rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_crpc_base.c (100%) rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_crpc_base.h (100%) rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_crpc_chip.c (100%) rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_crpc_chip.h (100%) rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_crpc_common.c (100%) rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_crpc_common.h (100%) rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_crpc_p2p.c (100%) rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_crpc_p2p.h (100%) rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_crpc_server.c (100%) rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_crpc_server.h (100%) rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_crpc_sta.c (100%) rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_crpc_sta.h (100%) rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_crpc_supplicant.c (100%) rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_crpc_supplicant.h (100%) rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_define.h (100%) rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.c (99%) rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.h (100%) rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_common.c (100%) rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_common.h (100%) rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c (100%) rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.h (100%) rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal/wifi_p2p_hal.c (100%) rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal/wifi_p2p_hal.h (100%) rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c (100%) rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.h (100%) rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_module_manage.c (100%) rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_module_manage.h (100%) rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_p2p_interface.c (100%) rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_p2p_interface.h (100%) rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_p2p_struct.h (100%) rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_sta_interface.c (100%) rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_sta_interface.h (100%) rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_struct.h (100%) rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_vendor_interface.c (100%) rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_vendor_interface.h (100%) rename {tests => wifi/tests}/wifi_standard/ipc_framework/cRPC/unittest/BUILD.gn (74%) rename {tests => wifi/tests}/wifi_standard/ipc_framework/cRPC/unittest/context_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/ipc_framework/cRPC/unittest/context_test.h (100%) rename {tests => wifi/tests}/wifi_standard/ipc_framework/cRPC/unittest/hash_table_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/ipc_framework/cRPC/unittest/hash_table_test.h (100%) rename {tests => wifi/tests}/wifi_standard/ipc_framework/cRPC/unittest/net_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/ipc_framework/cRPC/unittest/net_test.h (100%) rename {tests => wifi/tests}/wifi_standard/ipc_framework/cRPC/unittest/rpc_test_main.cpp (100%) rename {tests => wifi/tests}/wifi_standard/ipc_framework/cRPC/unittest/serial_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/ipc_framework/cRPC/unittest/serial_test.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/common/unittest/BUILD.gn (59%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/common/unittest/common_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/common/unittest/wifi_config_file_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/common/unittest/wifi_config_file_test.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/common/unittest/wifi_global_func_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/common/unittest/wifi_global_func_test.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/common/unittest/wifi_ip_tools_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/common/unittest/wifi_ip_tools_test.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/common/unittest/wifi_log_helper_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/common/unittest/wifi_log_helper_test.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/common/unittest/wifi_network_interface_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/common/unittest/wifi_network_interface_test.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/BUILD.gn (51%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/idl_client_test_main.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/mock_wifi_hal_service.c (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_ap_hal_interface_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_ap_hal_interface_test.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_base_hal_interface_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_base_hal_interface_test.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_chip_hal_interface_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_chip_hal_interface_test.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_idl_client_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_idl_client_test.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_idl_interface_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_idl_interface_test.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_p2p_hal_interface_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_p2p_hal_interface_test.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_sta_hal_interface_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_sta_hal_interface_test.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_supplicant_hal_interface_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_supplicant_hal_interface_test.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn (61%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_auth_center_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_auth_center_test.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_config_center_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_config_center_test.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_internal_event_dispatcher_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_internal_event_dispatcher_test.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manage_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manager_service_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manager_service_test.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_mock_p2p_service.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_mock_p2p_service.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_service_manager_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_service_manager_test.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn (31%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_config_use.h (96%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_idle_state.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_monitor.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_root_state.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_service.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_started_state.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_state_machine.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_stations_manager.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_network_interface.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_network_interface.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_pendant.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_system_interface.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_system_interface.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_ap_hal_interface.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_ap_hal_interface.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_ap_nat_manager.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_settings.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_settings.h (91%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/operator_overload.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/operator_overload.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_idle_state_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_root_state_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state_test.cpp (99%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/global_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/global_test.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_service_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_test.cpp (100%) create mode 100644 wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_authorizing_negotiation_request_state.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_group_formed_state.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_group_negotiation_state.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_invitation_recelved_state.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_invitation_request_state.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_default_state.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_disabled_state.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_disabling_state.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_enabled_state.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_enabling_state.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_group_formation_state.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_group_join_state.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_group_operating_state.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_idle_state.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_inviting_state.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_monitor.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_state_machine.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_provision_discovery_state.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_device_manager.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_device_manager.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_hal_interface.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_hal_interface.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_settings.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_settings.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/authorizing_negotiation_request_state_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/global_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/global_test.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/group_formed_state_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/group_negotiation_state_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/invitation_recelved_state_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/invitation_request_state_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/mock_p2p_pendant.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_default_state_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_disabled_state_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_disabling_state_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_enabled_state_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_enabling_state_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_group_formation_state_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_group_join_state_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_group_operating_state_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_idle_state_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_inviting_state_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_monitor_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_state_machine_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/provision_discovery_state_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_device_manager_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_dns_sd_service_info_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_dns_sd_service_request_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_dns_sd_service_response_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_group_info_proxy_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_group_manager_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_manager_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_request_list_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_response_list_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_test_entry.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_upnp_service_info_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_upnp_service_request_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_upnp_service_response_test.cpp (100%) create mode 100644 wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_service.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_service.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_state_machine.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_state_machine.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_manager.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_manager.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_settings.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_settings.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_sta_hal_interface.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_sta_hal_interface.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_supplicant_hal_interface.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_supplicant_hal_interface.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/global_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/global_test.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_monitor_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/wifi_scan_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn (37%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_device_appraisal.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_dhcp_service.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_dhcp_service.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_if_config.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_if_config.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_mac_address.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_mac_address.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_auto_connect_service.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_auto_connect_service.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_monitor.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_network_check.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_network_check.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_service.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_state_machine.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_state_machine.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_chip_hal_interface.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_chip_hal_interface.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_manager.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_manager.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_settings.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_settings.h (99%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_sta_hal_interface.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_sta_hal_interface.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_supplicant_hal_interface.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_supplicant_hal_interface.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/global_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/global_test.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/wifi_sta_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_hal/unittest/BUILD.gn (56%) rename {tests => wifi/tests}/wifi_standard/wifi_hal/unittest/mock_wpa_ctrl.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_hal/unittest/mock_wpa_ctrl.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_hal/unittest/wifi_hal_adapter_test.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_hal/unittest/wifi_hal_ap_interface_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_hal/unittest/wifi_hal_ap_interface_test.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_hal/unittest/wifi_hal_base_interface_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_hal/unittest/wifi_hal_base_interface_test.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_hal/unittest/wifi_hal_chip_interface_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_hal/unittest/wifi_hal_chip_interface_test.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_add_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_add_test.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_test.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_hal/unittest/wifi_hal_hostapd_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_hal/unittest/wifi_hal_hostapd_test.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_hal/unittest/wifi_hal_p2p_interface_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_hal/unittest/wifi_hal_p2p_interface_test.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_hal/unittest/wifi_hal_sta_interface_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_hal/unittest/wifi_hal_sta_interface_test.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_hal/unittest/wifi_hal_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_hal/unittest/wifi_hal_vendor.conf (100%) rename {tests => wifi/tests}/wifi_standard/wifi_hal/unittest/wifi_hal_vendor_interface_test.c (100%) rename {tests => wifi/tests}/wifi_standard/wifi_hal/unittest/wifi_hal_wpa_p2p_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_hal/unittest/wifi_hal_wpa_p2p_test.h (100%) rename {tests => wifi/tests}/wifi_standard/wifi_hal/unittest/wifi_hal_wpa_sta_test.cpp (100%) rename {tests => wifi/tests}/wifi_standard/wifi_hal/unittest/wifi_hal_wpa_sta_test.h (100%) rename {utils => wifi/utils}/inc/wifi_common_util.h (100%) rename {utils => wifi/utils}/inc/wifi_hisysevent.h (100%) rename {utils => wifi/utils}/src/BUILD.gn (90%) rename {utils => wifi/utils}/src/wifi_common_util.cpp (100%) rename {utils => wifi/utils}/src/wifi_hisysevent.cpp (100%) rename wifi.gni => wifi/wifi.gni (75%) diff --git a/OAT.xml b/OAT.xml index 7d561c5..7c2e5c7 100644 --- a/OAT.xml +++ b/OAT.xml @@ -21,8 +21,8 @@ - - + + @@ -45,7 +45,6 @@ - diff --git a/LICENSE b/dhcp/LICENSE similarity index 100% rename from LICENSE rename to dhcp/LICENSE diff --git a/dhcp/bundle.json b/dhcp/bundle.json new file mode 100644 index 0000000..46e74f2 --- /dev/null +++ b/dhcp/bundle.json @@ -0,0 +1,78 @@ +{ + "name": "@ohos/communication_wifi", + "version": "3.1.0", + "description": "The DHCP module provides DHCP client and DHCP service, used to obtain, assign and manage IP address.", + "homePage": "https://gitee.com/openharmony", + "license": "Apache License 2.0", + "repository": "https://gitee.com/openharmony/communication_wifi", + "domain": "os", + "language": "", + "publishAs": "code-segment", + "private": false, + "scripts": {}, + "tags": [ + "foundation" + ], + "keywords": [ + "communication", + "dhcp" + ], + "envs": [], + "dirs": [], + "author": { + "name": "", + "email": "", + "url": "" + }, + "contributors": [ + { + "name": "", + "email": "", + "url": "" + } + ], + "segment": { + "destPath": "foundation/communication/wifi/dhcp" + }, + "component": { + "name": "dhcp", + "subsystem": "communication", + "syscap": [ + ], + "features": [ + ], + "adapted_system_type": [ + "standard" + ], + "rom": "", + "ram": "", + "deps": { + "components": [ + "ipc", + "ces_standard", + "hiviewdfx_hilog_native", + "hisysevent_native" + ], + "third_party": [ + "wpa_supplicant", + "node", + "bounds_checking_function", + "googletest", + "openssl" + ] + }, + "build": { + "sub_component": [ + "//foundation/communication/wifi/dhcp/services/mgr_service:dhcp_manager_service", + "//foundation/communication/wifi/dhcp/services/dhcp_client:dhcp_client_service", + "//foundation/communication/wifi/dhcp/services/dhcp_server:dhcp_server" + ], + "inner_kits": [ + ], + "test": [ + ] + }, + "hisysevent_config": [ + ] + } +} diff --git a/dhcp/dhcp.gni b/dhcp/dhcp.gni new file mode 100644 index 0000000..49b97c3 --- /dev/null +++ b/dhcp/dhcp.gni @@ -0,0 +1,19 @@ +# Copyright (c) 2022 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +SUBSYSTEM_DIR = "//foundation/communication" +WIFI_ROOT_DIR = "$SUBSYSTEM_DIR/wifi/wifi" +DHCP_ROOT_DIR = "$SUBSYSTEM_DIR/wifi/dhcp" + +declare_args() { +} diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include/dhcp_define.h b/dhcp/interfaces/innerkits/native_cpp/include/dhcp_define.h similarity index 100% rename from services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include/dhcp_define.h rename to dhcp/interfaces/innerkits/native_cpp/include/dhcp_define.h diff --git a/dhcp/interfaces/innerkits/native_cpp/include/dhcp_service_api.h b/dhcp/interfaces/innerkits/native_cpp/include/dhcp_service_api.h new file mode 100644 index 0000000..ddeeb20 --- /dev/null +++ b/dhcp/interfaces/innerkits/native_cpp/include/dhcp_service_api.h @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OHOS_DHCP_SERVICE_API_H +#define OHOS_DHCP_SERVICE_API_H + +#include "i_dhcp_service.h" + +namespace OHOS { +namespace Wifi { +class DhcpServiceApi { +public: + static std::unique_ptr GetInstance(); +}; +} // namespace Wifi +} // namespace OHOS +#endif diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/interfaces/i_dhcp_client_service.h b/dhcp/interfaces/innerkits/native_cpp/interfaces/i_dhcp_client_service.h similarity index 100% rename from services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/interfaces/i_dhcp_client_service.h rename to dhcp/interfaces/innerkits/native_cpp/interfaces/i_dhcp_client_service.h diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/interfaces/i_dhcp_result_notify.h b/dhcp/interfaces/innerkits/native_cpp/interfaces/i_dhcp_result_notify.h similarity index 100% rename from services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/interfaces/i_dhcp_result_notify.h rename to dhcp/interfaces/innerkits/native_cpp/interfaces/i_dhcp_result_notify.h diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/interfaces/i_dhcp_server_service.h b/dhcp/interfaces/innerkits/native_cpp/interfaces/i_dhcp_server_service.h similarity index 100% rename from services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/interfaces/i_dhcp_server_service.h rename to dhcp/interfaces/innerkits/native_cpp/interfaces/i_dhcp_server_service.h diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/interfaces/i_dhcp_service.h b/dhcp/interfaces/innerkits/native_cpp/interfaces/i_dhcp_service.h similarity index 100% rename from services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/interfaces/i_dhcp_service.h rename to dhcp/interfaces/innerkits/native_cpp/interfaces/i_dhcp_service.h diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/BUILD.gn b/dhcp/services/dhcp_client/BUILD.gn similarity index 56% rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/BUILD.gn rename to dhcp/services/dhcp_client/BUILD.gn index ab41006..92ca029 100644 --- a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/BUILD.gn +++ b/dhcp/services/dhcp_client/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2021 Huawei Device Co., Ltd. +# Copyright (C) 2021-2022 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -13,24 +13,25 @@ import("//build/ohos.gni") import("//foundation/appexecfwk/standard/appexecfwk.gni") +import("//foundation/communication/wifi/dhcp/dhcp.gni") ################################################################################ ohos_executable("dhcp_client_service") { install_enable = true sources = [ - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_api.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_client.c", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_function.c", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_ipv4.c", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_main.c", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_options.c", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_socket.c", + "$DHCP_ROOT_DIR/services/dhcp_client/src/dhcp_api.cpp", + "$DHCP_ROOT_DIR/services/dhcp_client/src/dhcp_client.c", + "$DHCP_ROOT_DIR/services/dhcp_client/src/dhcp_function.c", + "$DHCP_ROOT_DIR/services/dhcp_client/src/dhcp_ipv4.c", + "$DHCP_ROOT_DIR/services/dhcp_client/src/dhcp_main.c", + "$DHCP_ROOT_DIR/services/dhcp_client/src/dhcp_options.c", + "$DHCP_ROOT_DIR/services/dhcp_client/src/dhcp_socket.c", ] include_dirs = [ - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", + "$DHCP_ROOT_DIR/services/dhcp_client/include", "//utils/native/base/include", "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", @@ -52,6 +53,6 @@ ohos_executable("dhcp_client_service") { ] defines = [] - part_name = "wifi_standard" + part_name = "dhcp" subsystem_name = "communication" } diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/include/dhcp_api.h b/dhcp/services/dhcp_client/include/dhcp_api.h similarity index 100% rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/include/dhcp_api.h rename to dhcp/services/dhcp_client/include/dhcp_api.h diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/include/dhcp_client.h b/dhcp/services/dhcp_client/include/dhcp_client.h similarity index 100% rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/include/dhcp_client.h rename to dhcp/services/dhcp_client/include/dhcp_client.h diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/include/dhcp_define.h b/dhcp/services/dhcp_client/include/dhcp_define.h similarity index 100% rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/include/dhcp_define.h rename to dhcp/services/dhcp_client/include/dhcp_define.h diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/include/dhcp_function.h b/dhcp/services/dhcp_client/include/dhcp_function.h similarity index 100% rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/include/dhcp_function.h rename to dhcp/services/dhcp_client/include/dhcp_function.h diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/include/dhcp_ipv4.h b/dhcp/services/dhcp_client/include/dhcp_ipv4.h similarity index 100% rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/include/dhcp_ipv4.h rename to dhcp/services/dhcp_client/include/dhcp_ipv4.h diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/include/dhcp_options.h b/dhcp/services/dhcp_client/include/dhcp_options.h similarity index 100% rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/include/dhcp_options.h rename to dhcp/services/dhcp_client/include/dhcp_options.h diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/include/dhcp_socket.h b/dhcp/services/dhcp_client/include/dhcp_socket.h similarity index 100% rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/include/dhcp_socket.h rename to dhcp/services/dhcp_client/include/dhcp_socket.h diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_api.cpp b/dhcp/services/dhcp_client/src/dhcp_api.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_api.cpp rename to dhcp/services/dhcp_client/src/dhcp_api.cpp diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_client.c b/dhcp/services/dhcp_client/src/dhcp_client.c similarity index 100% rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_client.c rename to dhcp/services/dhcp_client/src/dhcp_client.c diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_function.c b/dhcp/services/dhcp_client/src/dhcp_function.c similarity index 100% rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_function.c rename to dhcp/services/dhcp_client/src/dhcp_function.c diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_ipv4.c b/dhcp/services/dhcp_client/src/dhcp_ipv4.c similarity index 100% rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_ipv4.c rename to dhcp/services/dhcp_client/src/dhcp_ipv4.c diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_main.c b/dhcp/services/dhcp_client/src/dhcp_main.c similarity index 100% rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_main.c rename to dhcp/services/dhcp_client/src/dhcp_main.c diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_options.c b/dhcp/services/dhcp_client/src/dhcp_options.c similarity index 100% rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_options.c rename to dhcp/services/dhcp_client/src/dhcp_options.c diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_socket.c b/dhcp/services/dhcp_client/src/dhcp_socket.c similarity index 100% rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_socket.c rename to dhcp/services/dhcp_client/src/dhcp_socket.c diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/BUILD.gn b/dhcp/services/dhcp_server/BUILD.gn similarity index 87% rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/BUILD.gn rename to dhcp/services/dhcp_server/BUILD.gn index 111d95e..d2c83b0 100644 --- a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/BUILD.gn +++ b/dhcp/services/dhcp_server/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2021 Huawei Device Co., Ltd. +# Copyright (C) 2021-2022 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -12,6 +12,8 @@ # limitations under the License. import("//build/ohos.gni") +import("//foundation/communication/wifi/dhcp/dhcp.gni") + ohos_executable("dhcp_server") { install_enable = true dhcp_hilog_enable = true @@ -31,7 +33,7 @@ ohos_executable("dhcp_server") { include_dirs = [ "include", "include/common", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/include", + "$DHCP_ROOT_DIR/services/dhcp_client/include", "//utils/native/base/include", ] @@ -45,6 +47,6 @@ ohos_executable("dhcp_server") { defines += [ "DHCP_HILOG_ENABLE" ] } - part_name = "wifi_standard" + part_name = "dhcp" subsystem_name = "communication" } diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/etc/dhcpd.conf.sample b/dhcp/services/dhcp_server/etc/dhcpd.conf.sample similarity index 100% rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/etc/dhcpd.conf.sample rename to dhcp/services/dhcp_server/etc/dhcpd.conf.sample diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/etc/dhcpd_mini.conf b/dhcp/services/dhcp_server/etc/dhcpd_mini.conf similarity index 100% rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/etc/dhcpd_mini.conf rename to dhcp/services/dhcp_server/etc/dhcpd_mini.conf diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/address_utils.h b/dhcp/services/dhcp_server/include/address_utils.h similarity index 100% rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/address_utils.h rename to dhcp/services/dhcp_server/include/address_utils.h diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/common_util.h b/dhcp/services/dhcp_server/include/common_util.h similarity index 100% rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/common_util.h rename to dhcp/services/dhcp_server/include/common_util.h diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/dhcp_address_pool.h b/dhcp/services/dhcp_server/include/dhcp_address_pool.h similarity index 100% rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/dhcp_address_pool.h rename to dhcp/services/dhcp_server/include/dhcp_address_pool.h diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/dhcp_argument.h b/dhcp/services/dhcp_server/include/dhcp_argument.h similarity index 100% rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/dhcp_argument.h rename to dhcp/services/dhcp_server/include/dhcp_argument.h diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/dhcp_binding.h b/dhcp/services/dhcp_server/include/dhcp_binding.h similarity index 100% rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/dhcp_binding.h rename to dhcp/services/dhcp_server/include/dhcp_binding.h diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/dhcp_config.h b/dhcp/services/dhcp_server/include/dhcp_config.h similarity index 100% rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/dhcp_config.h rename to dhcp/services/dhcp_server/include/dhcp_config.h diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/dhcp_define.h b/dhcp/services/dhcp_server/include/dhcp_define.h similarity index 100% rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/dhcp_define.h rename to dhcp/services/dhcp_server/include/dhcp_define.h diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/dhcp_ipv4.h b/dhcp/services/dhcp_server/include/dhcp_ipv4.h similarity index 100% rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/dhcp_ipv4.h rename to dhcp/services/dhcp_server/include/dhcp_ipv4.h diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/dhcp_logger.h b/dhcp/services/dhcp_server/include/dhcp_logger.h similarity index 100% rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/dhcp_logger.h rename to dhcp/services/dhcp_server/include/dhcp_logger.h diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/dhcp_message.h b/dhcp/services/dhcp_server/include/dhcp_message.h similarity index 100% rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/dhcp_message.h rename to dhcp/services/dhcp_server/include/dhcp_message.h diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/dhcp_option.h b/dhcp/services/dhcp_server/include/dhcp_option.h similarity index 100% rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/dhcp_option.h rename to dhcp/services/dhcp_server/include/dhcp_option.h diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/dhcp_server.h b/dhcp/services/dhcp_server/include/dhcp_server.h similarity index 100% rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/dhcp_server.h rename to dhcp/services/dhcp_server/include/dhcp_server.h diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/hash_table.h b/dhcp/services/dhcp_server/include/hash_table.h similarity index 100% rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/hash_table.h rename to dhcp/services/dhcp_server/include/hash_table.h diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/address_utils.c b/dhcp/services/dhcp_server/src/address_utils.c similarity index 100% rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/address_utils.c rename to dhcp/services/dhcp_server/src/address_utils.c diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/common_util.c b/dhcp/services/dhcp_server/src/common_util.c similarity index 100% rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/common_util.c rename to dhcp/services/dhcp_server/src/common_util.c diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_address_pool.c b/dhcp/services/dhcp_server/src/dhcp_address_pool.c similarity index 100% rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_address_pool.c rename to dhcp/services/dhcp_server/src/dhcp_address_pool.c diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_argument.c b/dhcp/services/dhcp_server/src/dhcp_argument.c similarity index 100% rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_argument.c rename to dhcp/services/dhcp_server/src/dhcp_argument.c diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_binding.c b/dhcp/services/dhcp_server/src/dhcp_binding.c similarity index 100% rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_binding.c rename to dhcp/services/dhcp_server/src/dhcp_binding.c diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_config.c b/dhcp/services/dhcp_server/src/dhcp_config.c similarity index 100% rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_config.c rename to dhcp/services/dhcp_server/src/dhcp_config.c diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_dhcpd.c b/dhcp/services/dhcp_server/src/dhcp_dhcpd.c similarity index 100% rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_dhcpd.c rename to dhcp/services/dhcp_server/src/dhcp_dhcpd.c diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_option.c b/dhcp/services/dhcp_server/src/dhcp_option.c similarity index 100% rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_option.c rename to dhcp/services/dhcp_server/src/dhcp_option.c diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_server.c b/dhcp/services/dhcp_server/src/dhcp_server.c similarity index 100% rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_server.c rename to dhcp/services/dhcp_server/src/dhcp_server.c diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/hash_table.c b/dhcp/services/dhcp_server/src/hash_table.c similarity index 100% rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/hash_table.c rename to dhcp/services/dhcp_server/src/hash_table.c diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/BUILD.gn b/dhcp/services/mgr_service/BUILD.gn similarity index 58% rename from services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/BUILD.gn rename to dhcp/services/mgr_service/BUILD.gn index b68e530..6938b61 100644 --- a/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/BUILD.gn +++ b/dhcp/services/mgr_service/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2021 Huawei Device Co., Ltd. +# Copyright (C) 2021-2022 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -13,23 +13,26 @@ import("//build/ohos.gni") import("//foundation/appexecfwk/standard/appexecfwk.gni") +import("//foundation/communication/wifi/dhcp/dhcp.gni") ################################################################################ ohos_shared_library("dhcp_manager_service") { install_enable = true sources = [ - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/src/dhcp_client_service_impl.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/src/dhcp_event_subscriber.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/src/dhcp_func.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/src/dhcp_server_service.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/src/dhcp_service.cpp", + "$DHCP_ROOT_DIR/services/mgr_service/src/dhcp_client_service_impl.cpp", + "$DHCP_ROOT_DIR/services/mgr_service/src/dhcp_event_subscriber.cpp", + "$DHCP_ROOT_DIR/services/mgr_service/src/dhcp_func.cpp", + "$DHCP_ROOT_DIR/services/mgr_service/src/dhcp_server_service.cpp", + "$DHCP_ROOT_DIR/services/mgr_service/src/dhcp_service.cpp", + "$DHCP_ROOT_DIR/services/mgr_service/src/dhcp_service_api.cpp", ] include_dirs = [ - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/interfaces", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", + "$DHCP_ROOT_DIR/services/mgr_service/include", + "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/interfaces", + "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/include", "//utils/native/base/include", "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", @@ -55,6 +58,6 @@ ohos_shared_library("dhcp_manager_service") { "-Wl,-E", ] - part_name = "wifi_standard" + part_name = "dhcp" subsystem_name = "communication" } diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include/dhcp_client_service_impl.h b/dhcp/services/mgr_service/include/dhcp_client_service_impl.h similarity index 100% rename from services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include/dhcp_client_service_impl.h rename to dhcp/services/mgr_service/include/dhcp_client_service_impl.h diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include/dhcp_event_subscriber.h b/dhcp/services/mgr_service/include/dhcp_event_subscriber.h similarity index 100% rename from services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include/dhcp_event_subscriber.h rename to dhcp/services/mgr_service/include/dhcp_event_subscriber.h diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include/dhcp_func.h b/dhcp/services/mgr_service/include/dhcp_func.h similarity index 100% rename from services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include/dhcp_func.h rename to dhcp/services/mgr_service/include/dhcp_func.h diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include/dhcp_server_service.h b/dhcp/services/mgr_service/include/dhcp_server_service.h similarity index 100% rename from services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include/dhcp_server_service.h rename to dhcp/services/mgr_service/include/dhcp_server_service.h diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include/dhcp_service.h b/dhcp/services/mgr_service/include/dhcp_service.h similarity index 100% rename from services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include/dhcp_service.h rename to dhcp/services/mgr_service/include/dhcp_service.h diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/src/dhcp_client_service_impl.cpp b/dhcp/services/mgr_service/src/dhcp_client_service_impl.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/src/dhcp_client_service_impl.cpp rename to dhcp/services/mgr_service/src/dhcp_client_service_impl.cpp diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/src/dhcp_event_subscriber.cpp b/dhcp/services/mgr_service/src/dhcp_event_subscriber.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/src/dhcp_event_subscriber.cpp rename to dhcp/services/mgr_service/src/dhcp_event_subscriber.cpp diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/src/dhcp_func.cpp b/dhcp/services/mgr_service/src/dhcp_func.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/src/dhcp_func.cpp rename to dhcp/services/mgr_service/src/dhcp_func.cpp diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/src/dhcp_server_service.cpp b/dhcp/services/mgr_service/src/dhcp_server_service.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/src/dhcp_server_service.cpp rename to dhcp/services/mgr_service/src/dhcp_server_service.cpp diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/src/dhcp_service.cpp b/dhcp/services/mgr_service/src/dhcp_service.cpp similarity index 99% rename from services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/src/dhcp_service.cpp rename to dhcp/services/mgr_service/src/dhcp_service.cpp index e93f707..ad667f9 100644 --- a/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/src/dhcp_service.cpp +++ b/dhcp/services/mgr_service/src/dhcp_service.cpp @@ -212,4 +212,4 @@ int DhcpService::InitServerService() return DHCP_OPT_SUCCESS; } } // namespace Wifi -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/dhcp/services/mgr_service/src/dhcp_service_api.cpp b/dhcp/services/mgr_service/src/dhcp_service_api.cpp new file mode 100644 index 0000000..9e878d9 --- /dev/null +++ b/dhcp/services/mgr_service/src/dhcp_service_api.cpp @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "dhcp_service_api.h" +#include "dhcp_service.h" +#include "wifi_logger.h" + +DEFINE_WIFILOG_DHCP_LABEL("DhcpServiceApi"); + +namespace OHOS { +namespace Wifi { +std::unique_ptr DhcpServiceApi::GetInstance() +{ + std::unique_ptr service = std::unique_ptr(); + if (service == nullptr) { + WIFI_LOGI("DhcpApi GetInstance is null"); + } + return service; +} + +} // namespace Wifi +} // namespace OHOS diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/BUILD.gn b/dhcp/tests/services/dhcp_client/BUILD.gn similarity index 67% rename from tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/BUILD.gn rename to dhcp/tests/services/dhcp_client/BUILD.gn index ee7b983..9968ec3 100644 --- a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/BUILD.gn +++ b/dhcp/tests/services/dhcp_client/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2021 Huawei Device Co., Ltd. +# Copyright (C) 2021-2022 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -13,29 +13,29 @@ import("//build/test.gni") import("//foundation/appexecfwk/standard/appexecfwk.gni") +import("//foundation/communication/wifi/dhcp/dhcp.gni") ################################################################################ -SUBSYSTEM_DIR = "//foundation/communication" module_output_path = "wifi_standard/dhcp_client_test" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ "//utils/native/base/include", - "$SUBSYSTEM_DIR/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/test", + "$DHCP_ROOT_DIR/services/dhcp_client/include", ] } ohos_unittest("dhcp_client_unittest") { module_out_path = module_output_path sources = [ - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_api.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_client.c", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_function.c", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_ipv4.c", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_options.c", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_socket.c", + "$DHCP_ROOT_DIR/services/dhcp_client/src/dhcp_api.cpp", + "$DHCP_ROOT_DIR/services/dhcp_client/src/dhcp_client.c", + "$DHCP_ROOT_DIR/services/dhcp_client/src/dhcp_function.c", + "$DHCP_ROOT_DIR/services/dhcp_client/src/dhcp_ipv4.c", + "$DHCP_ROOT_DIR/services/dhcp_client/src/dhcp_options.c", + "$DHCP_ROOT_DIR/services/dhcp_client/src/dhcp_socket.c", "dhcp_client_test.cpp", "dhcp_function_test.cpp", "dhcp_ipv4_test.cpp", @@ -49,9 +49,9 @@ ohos_unittest("dhcp_client_unittest") { include_dirs = [ "//third_party/googletest/googlemock/include", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/test", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/include", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log", + "$DHCP_ROOT_DIR/services/dhcp_client/test", + "$DHCP_ROOT_DIR/services/dhcp_client/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", "//utils/native/base/include", "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", @@ -94,7 +94,7 @@ ohos_unittest("dhcp_client_unittest") { ] configs = [ ":module_private_config" ] - part_name = "wifi_standard" + part_name = "dhcp" subsystem_name = "communication" testonly = true } diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/dhcp_client_test.cpp b/dhcp/tests/services/dhcp_client/dhcp_client_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/dhcp_client_test.cpp rename to dhcp/tests/services/dhcp_client/dhcp_client_test.cpp diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/dhcp_function_test.cpp b/dhcp/tests/services/dhcp_client/dhcp_function_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/dhcp_function_test.cpp rename to dhcp/tests/services/dhcp_client/dhcp_function_test.cpp diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/dhcp_ipv4_test.cpp b/dhcp/tests/services/dhcp_client/dhcp_ipv4_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/dhcp_ipv4_test.cpp rename to dhcp/tests/services/dhcp_client/dhcp_ipv4_test.cpp diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/dhcp_main_test.cpp b/dhcp/tests/services/dhcp_client/dhcp_main_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/dhcp_main_test.cpp rename to dhcp/tests/services/dhcp_client/dhcp_main_test.cpp diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/dhcp_options_test.cpp b/dhcp/tests/services/dhcp_client/dhcp_options_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/dhcp_options_test.cpp rename to dhcp/tests/services/dhcp_client/dhcp_options_test.cpp diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/dhcp_socket_test.cpp b/dhcp/tests/services/dhcp_client/dhcp_socket_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/dhcp_socket_test.cpp rename to dhcp/tests/services/dhcp_client/dhcp_socket_test.cpp diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/global_test.cpp b/dhcp/tests/services/dhcp_client/global_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/global_test.cpp rename to dhcp/tests/services/dhcp_client/global_test.cpp diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/global_test.h b/dhcp/tests/services/dhcp_client/global_test.h similarity index 100% rename from tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/global_test.h rename to dhcp/tests/services/dhcp_client/global_test.h diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/mock_custom_func.cpp b/dhcp/tests/services/dhcp_client/mock_custom_func.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/mock_custom_func.cpp rename to dhcp/tests/services/dhcp_client/mock_custom_func.cpp diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/mock_custom_func.h b/dhcp/tests/services/dhcp_client/mock_custom_func.h similarity index 100% rename from tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/mock_custom_func.h rename to dhcp/tests/services/dhcp_client/mock_custom_func.h diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/mock_system_func.cpp b/dhcp/tests/services/dhcp_client/mock_system_func.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/mock_system_func.cpp rename to dhcp/tests/services/dhcp_client/mock_system_func.cpp diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/mock_system_func.h b/dhcp/tests/services/dhcp_client/mock_system_func.h similarity index 100% rename from tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/mock_system_func.h rename to dhcp/tests/services/dhcp_client/mock_system_func.h diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/BUILD.gn b/dhcp/tests/services/dhcp_server/unittest/BUILD.gn similarity index 60% rename from tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/BUILD.gn rename to dhcp/tests/services/dhcp_server/unittest/BUILD.gn index 91f42af..7ab8961 100644 --- a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/BUILD.gn +++ b/dhcp/tests/services/dhcp_server/unittest/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2021 Huawei Device Co., Ltd. +# Copyright (C) 2021-2022 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -12,15 +12,15 @@ # limitations under the License. import("//build/test.gni") +import("//foundation/communication/wifi/dhcp/dhcp.gni") -SUBSYSTEM_DIR = "//foundation/communication/wifi" -module_output_path = "wifi_standard/dhcp_server_test" +module_output_path = "dhcp/dhcp_server_test" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ "//utils/native/base/include", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include", + "$DHCP_ROOT_DIR/services/dhcp_server/include", ] } @@ -28,15 +28,15 @@ ohos_unittest("dhcp_server_unittest") { module_out_path = module_output_path dhcp_hilog_enable = true sources = [ - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/address_utils.c", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/common_util.c", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_address_pool.c", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_argument.c", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_binding.c", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_config.c", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_option.c", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_server.c", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/hash_table.c", + "$DHCP_ROOT_DIR/services/dhcp_server/src/address_utils.c", + "$DHCP_ROOT_DIR/services/dhcp_server/src/common_util.c", + "$DHCP_ROOT_DIR/services/dhcp_server/src/dhcp_address_pool.c", + "$DHCP_ROOT_DIR/services/dhcp_server/src/dhcp_argument.c", + "$DHCP_ROOT_DIR/services/dhcp_server/src/dhcp_binding.c", + "$DHCP_ROOT_DIR/services/dhcp_server/src/dhcp_config.c", + "$DHCP_ROOT_DIR/services/dhcp_server/src/dhcp_option.c", + "$DHCP_ROOT_DIR/services/dhcp_server/src/dhcp_server.c", + "$DHCP_ROOT_DIR/services/dhcp_server/src/hash_table.c", "address_utils_test.cpp", "common_util_test.cpp", "dhcp_address_pool_test.cpp", @@ -54,7 +54,7 @@ ohos_unittest("dhcp_server_unittest") { "//utils/native/base/include", "//third_party/googletest/googlemock/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include", + "$DHCP_ROOT_DIR/services/dhcp_server/include", ] defines = [ "__OHOS__" ] @@ -85,7 +85,7 @@ ohos_unittest("dhcp_server_unittest") { defines += [ "DHCP_HILOG_ENABLE" ] } - part_name = "wifi_standard" + part_name = "dhcp" subsystem_name = "communication" testonly = true } diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/address_utils_test.cpp b/dhcp/tests/services/dhcp_server/unittest/address_utils_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/address_utils_test.cpp rename to dhcp/tests/services/dhcp_server/unittest/address_utils_test.cpp diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/common_util_test.cpp b/dhcp/tests/services/dhcp_server/unittest/common_util_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/common_util_test.cpp rename to dhcp/tests/services/dhcp_server/unittest/common_util_test.cpp diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/dhcp_address_pool_test.cpp b/dhcp/tests/services/dhcp_server/unittest/dhcp_address_pool_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/dhcp_address_pool_test.cpp rename to dhcp/tests/services/dhcp_server/unittest/dhcp_address_pool_test.cpp diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/dhcp_argument_test.cpp b/dhcp/tests/services/dhcp_server/unittest/dhcp_argument_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/dhcp_argument_test.cpp rename to dhcp/tests/services/dhcp_server/unittest/dhcp_argument_test.cpp diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/dhcp_binding_test.cpp b/dhcp/tests/services/dhcp_server/unittest/dhcp_binding_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/dhcp_binding_test.cpp rename to dhcp/tests/services/dhcp_server/unittest/dhcp_binding_test.cpp diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/dhcp_config_test.cpp b/dhcp/tests/services/dhcp_server/unittest/dhcp_config_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/dhcp_config_test.cpp rename to dhcp/tests/services/dhcp_server/unittest/dhcp_config_test.cpp diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/dhcp_message_sim.cpp b/dhcp/tests/services/dhcp_server/unittest/dhcp_message_sim.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/dhcp_message_sim.cpp rename to dhcp/tests/services/dhcp_server/unittest/dhcp_message_sim.cpp diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/dhcp_message_sim.h b/dhcp/tests/services/dhcp_server/unittest/dhcp_message_sim.h similarity index 100% rename from tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/dhcp_message_sim.h rename to dhcp/tests/services/dhcp_server/unittest/dhcp_message_sim.h diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/dhcp_option_test.cpp b/dhcp/tests/services/dhcp_server/unittest/dhcp_option_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/dhcp_option_test.cpp rename to dhcp/tests/services/dhcp_server/unittest/dhcp_option_test.cpp diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/dhcp_server_test.cpp b/dhcp/tests/services/dhcp_server/unittest/dhcp_server_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/dhcp_server_test.cpp rename to dhcp/tests/services/dhcp_server/unittest/dhcp_server_test.cpp diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/hash_table_test.cpp b/dhcp/tests/services/dhcp_server/unittest/hash_table_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/hash_table_test.cpp rename to dhcp/tests/services/dhcp_server/unittest/hash_table_test.cpp diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/system_func_mock.cpp b/dhcp/tests/services/dhcp_server/unittest/system_func_mock.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/system_func_mock.cpp rename to dhcp/tests/services/dhcp_server/unittest/system_func_mock.cpp diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/system_func_mock.h b/dhcp/tests/services/dhcp_server/unittest/system_func_mock.h similarity index 100% rename from tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/system_func_mock.h rename to dhcp/tests/services/dhcp_server/unittest/system_func_mock.h diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/mgr_service/BUILD.gn b/dhcp/tests/services/mgr_service/BUILD.gn similarity index 67% rename from tests/wifi_standard/wifi_framework/dhcp_manage/mgr_service/BUILD.gn rename to dhcp/tests/services/mgr_service/BUILD.gn index 1b427f6..53f8c72 100644 --- a/tests/wifi_standard/wifi_framework/dhcp_manage/mgr_service/BUILD.gn +++ b/dhcp/tests/services/mgr_service/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2021 Huawei Device Co., Ltd. +# Copyright (C) 2021-2022 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -13,10 +13,10 @@ import("//build/test.gni") import("//foundation/appexecfwk/standard/appexecfwk.gni") +import("//foundation/communication/wifi/dhcp/dhcp.gni") ################################################################################ -SUBSYSTEM_DIR = "//foundation/communication" module_output_path = "wifi_standard/dhcp_manage_test" even_path = "//base/notification/ces_standard" @@ -24,18 +24,18 @@ config("module_private_config") { visibility = [ ":*" ] include_dirs = [ "//utils/native/base/include", - "$SUBSYSTEM_DIR/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/test", + "$DHCP_ROOT_DIR/services/mgr_service/include", ] } ohos_unittest("dhcp_manage_unittest") { module_out_path = module_output_path sources = [ - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/src/dhcp_client_service_impl.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/src/dhcp_event_subscriber.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/src/dhcp_func.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/src/dhcp_server_service.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/src/dhcp_service.cpp", + "$DHCP_ROOT_DIR/services/mgr_service/src/dhcp_client_service_impl.cpp", + "$DHCP_ROOT_DIR/services/mgr_service/src/dhcp_event_subscriber.cpp", + "$DHCP_ROOT_DIR/services/mgr_service/src/dhcp_func.cpp", + "$DHCP_ROOT_DIR/services/mgr_service/src/dhcp_server_service.cpp", + "$DHCP_ROOT_DIR/services/mgr_service/src/dhcp_service.cpp", "dhcp_client_service_test.cpp", "dhcp_func_test.cpp", "dhcp_manage_test.cpp", @@ -48,10 +48,11 @@ ohos_unittest("dhcp_manage_unittest") { include_dirs = [ "//third_party/googletest/googlemock/include", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/test", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/interfaces", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log", + "$DHCP_ROOT_DIR/services/mgr_service/test", + "$DHCP_ROOT_DIR/services/mgr_service/include", + "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/include", + "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/interfaces", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", "//utils/native/base/include", "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", @@ -97,7 +98,7 @@ ohos_unittest("dhcp_manage_unittest") { ] configs = [ ":module_private_config" ] - part_name = "wifi_standard" + part_name = "dhcp" subsystem_name = "communication" } diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/mgr_service/dhcp_client_service_test.cpp b/dhcp/tests/services/mgr_service/dhcp_client_service_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/dhcp_manage/mgr_service/dhcp_client_service_test.cpp rename to dhcp/tests/services/mgr_service/dhcp_client_service_test.cpp diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/mgr_service/dhcp_func_test.cpp b/dhcp/tests/services/mgr_service/dhcp_func_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/dhcp_manage/mgr_service/dhcp_func_test.cpp rename to dhcp/tests/services/mgr_service/dhcp_func_test.cpp diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/mgr_service/dhcp_manage_test.cpp b/dhcp/tests/services/mgr_service/dhcp_manage_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/dhcp_manage/mgr_service/dhcp_manage_test.cpp rename to dhcp/tests/services/mgr_service/dhcp_manage_test.cpp diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/mgr_service/dhcp_result_notify.cpp b/dhcp/tests/services/mgr_service/dhcp_result_notify.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/dhcp_manage/mgr_service/dhcp_result_notify.cpp rename to dhcp/tests/services/mgr_service/dhcp_result_notify.cpp diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/mgr_service/dhcp_result_notify.h b/dhcp/tests/services/mgr_service/dhcp_result_notify.h similarity index 100% rename from tests/wifi_standard/wifi_framework/dhcp_manage/mgr_service/dhcp_result_notify.h rename to dhcp/tests/services/mgr_service/dhcp_result_notify.h diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/mgr_service/dhcp_server_service_test.cpp b/dhcp/tests/services/mgr_service/dhcp_server_service_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/dhcp_manage/mgr_service/dhcp_server_service_test.cpp rename to dhcp/tests/services/mgr_service/dhcp_server_service_test.cpp diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/mgr_service/dhcp_service_test.cpp b/dhcp/tests/services/mgr_service/dhcp_service_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/dhcp_manage/mgr_service/dhcp_service_test.cpp rename to dhcp/tests/services/mgr_service/dhcp_service_test.cpp diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/mgr_service/global_test.cpp b/dhcp/tests/services/mgr_service/global_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/dhcp_manage/mgr_service/global_test.cpp rename to dhcp/tests/services/mgr_service/global_test.cpp diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/mgr_service/global_test.h b/dhcp/tests/services/mgr_service/global_test.h similarity index 100% rename from tests/wifi_standard/wifi_framework/dhcp_manage/mgr_service/global_test.h rename to dhcp/tests/services/mgr_service/global_test.h diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/mgr_service/mock_system_func.cpp b/dhcp/tests/services/mgr_service/mock_system_func.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/dhcp_manage/mgr_service/mock_system_func.cpp rename to dhcp/tests/services/mgr_service/mock_system_func.cpp diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/mgr_service/mock_system_func.h b/dhcp/tests/services/mgr_service/mock_system_func.h similarity index 100% rename from tests/wifi_standard/wifi_framework/dhcp_manage/mgr_service/mock_system_func.h rename to dhcp/tests/services/mgr_service/mock_system_func.h diff --git a/services/wifi_standard/wifi_framework/BUILD.gn b/services/wifi_standard/wifi_framework/BUILD.gn deleted file mode 100644 index fe2de5a..0000000 --- a/services/wifi_standard/wifi_framework/BUILD.gn +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright (C) 2021 Huawei Device Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import("//build/ohos.gni") - -group("wifi_system_ability") { - deps = [ - "//foundation/communication/wifi/services/wifi_standard/sa_profile:wifi_standard_sa_profile", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage:wifi_device_ability", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage:wifi_hotspot_ability", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage:wifi_p2p_ability", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage:wifi_scan_ability", - ] -} - -group("wifi_manage") { - deps = [ - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap:wifi_ap_service", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p:wifi_p2p_service", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan:wifi_scan_service", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta:wifi_sta_service", - ] -} - -group("dhcp_manage") { - deps = [ - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client:dhcp_client_service", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server:dhcp_server", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service:dhcp_manager_service", - ] -} diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn deleted file mode 100644 index 1240eaf..0000000 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn +++ /dev/null @@ -1,162 +0,0 @@ -# Copyright (C) 2021-2022 Huawei Device Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import("//build/test.gni") -SUBSYSTEM_DIR = "//foundation/communication" -config("module_private_config") { - visibility = [ ":*" ] - include_dirs = [ - "//utils/native/base/include", - "$SUBSYSTEM_DIR/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test", - ] -} - -ohos_unittest("wifi_p2p_test") { - module_out_path = "wifi_standard/p2p_test" - sources = [ - "./Mock/mock_wifi_p2p_hal_interface.cpp", - "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hid2d_msg.cpp", - "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_msg.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log/log_helper.c", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/base_address.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/dhcpd_interface.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/network_interface.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/handler.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/internal_message.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_broadcast_helper.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_service_utils.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/authorizing_negotiation_request_state.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_received_state.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_request_state.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_default_state.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_disabled_state.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_disabling_state.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabled_state.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabling_state.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_formation_state.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_join_state.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_inviting_state.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_monitor.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/provision_discovery_state.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_device_manager.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_info.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_request.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_response.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_txt_record.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_info_proxy.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_manager.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_manager.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_request_list.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_response_list.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_temp_disc_event.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_info.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_request.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_response.cpp", - "authorizing_negotiation_request_state_test.cpp", - "global_test.cpp", - "group_formed_state_test.cpp", - "group_negotiation_state_test.cpp", - "invitation_recelved_state_test.cpp", - "invitation_request_state_test.cpp", - "p2p_default_state_test.cpp", - "p2p_disabled_state_test.cpp", - "p2p_disabling_state_test.cpp", - "p2p_enabled_state_test.cpp", - "p2p_enabling_state_test.cpp", - "p2p_group_formation_state_test.cpp", - "p2p_group_join_state_test.cpp", - "p2p_group_operating_state_test.cpp", - "p2p_idle_state_test.cpp", - "p2p_inviting_state_test.cpp", - "p2p_monitor_test.cpp", - "p2p_state_machine_test.cpp", - "provision_discovery_state_test.cpp", - "wifi_p2p_device_manager_test.cpp", - "wifi_p2p_dns_sd_service_info_test.cpp", - "wifi_p2p_dns_sd_service_request_test.cpp", - "wifi_p2p_dns_sd_service_response_test.cpp", - "wifi_p2p_group_info_proxy_test.cpp", - "wifi_p2p_group_manager_test.cpp", - "wifi_p2p_service_manager_test.cpp", - "wifi_p2p_service_request_list_test.cpp", - "wifi_p2p_service_response_list_test.cpp", - "wifi_p2p_service_test.cpp", - "wifi_p2p_test_entry.cpp", - "wifi_p2p_upnp_service_info_test.cpp", - "wifi_p2p_upnp_service_request_test.cpp", - "wifi_p2p_upnp_service_response_test.cpp", - ] - - include_dirs = [ - "./", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p", - "./Mock", - "//utils/native/base/include", - "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", - "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces", - "//foundation/communication/wifi/services/wifi_standard/ipc_framework/cRPC/include", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/include", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/config", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/utils", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/include", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/interfaces", - "//third_party/googletest/googlemock/include", - "//third_party/googletest/googletest/include", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta", - ] - - deps = [ - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service:dhcp_manager_service", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", - "//third_party/googletest:gmock_main", - "//utils/native/base:utils", - ] - external_deps = [ - "hiviewdfx_hilog_native:libhilog", - "ipc:ipc_core", - "netmanager_base:net_conn_manager_if", - ] - part_name = "wifi_standard" - subsystem_name = "communication" -} - -group("unittest") { - testonly = true - deps = [] - deps += [ ":wifi_p2p_test" ] -} diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn deleted file mode 100644 index ab4f861..0000000 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright (C) 2021 Huawei Device Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import("//build/test.gni") -SUBSYSTEM_DIR = "//foundation/communication" -module_output_path = "wifi_standard/scan_test" - -config("module_private_config") { - visibility = [ ":*" ] - include_dirs = [ - "//utils/native/base/include", - "$SUBSYSTEM_DIR/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan", - ] -} - -ohos_unittest("wifi_scan_unittest") { - module_out_path = module_output_path - sources = [ - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log/log_helper.c", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/base_address.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/network_interface.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/handler.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/internal_message.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_monitor.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine.cpp", - "Mock/mock_scan_service.cpp", - "Mock/mock_scan_state_machine.cpp", - "Mock/mock_wifi_manager.cpp", - "Mock/mock_wifi_settings.cpp", - "Mock/mock_wifi_sta_hal_interface.cpp", - "Mock/mock_wifi_supplicant_hal_interface.cpp", - "global_test.cpp", - "scan_interface_test.cpp", - "scan_monitor_test.cpp", - "scan_service_test.cpp", - "scan_state_machine_test.cpp", - "wifi_scan_test.cpp", - ] - - include_dirs = [ - "//utils/native/base/include", - "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces", - "//foundation/communication/wifi/services/wifi_standard/sdk/include", - "//foundation/communication/wifi/services/wifi_standard/ipc_framework/cRPC/include", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/include", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/config", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/utils", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan", - "//foundation/communication/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/net_conf", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta", - "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", - "//foundation/communication/wifi/services/wifi_standard/depends/include/hardware/libhardware/include", - "//foundation/communication/wifi/services/wifi_standard/depends/include/system/core/include", - "//foundation/communication/wifi/services/wifi_standard/depends/include/frameworks/native/include", - "//foundation/communication/wifi/services/wifi_standard/depends/include/system/core/libutils/include", - "//foundation/communication/wifi/services/wifi_standard/depends/include/system/core/base/include", - "//foundation/communication/wifi/services/wifi_standard/depends/include/system/libbase/include", - "//foundation/communication/wifi/services/wifi_standard/depends/include/system/core/libnetutils/include/netutils", - "//third_party/googletest/googlemock/include", - "//third_party/googletest/googletest/include", - ] - deps = [ - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", - "//third_party/googletest:gmock_main", - "//utils/native/base:utils", - ] - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] - part_name = "wifi_standard" - subsystem_name = "communication" -} - -group("unittest") { - testonly = true - deps = [ ":wifi_scan_unittest" ] -} diff --git a/.gitattributes b/wifi/.gitattributes similarity index 100% rename from .gitattributes rename to wifi/.gitattributes diff --git a/wifi/LICENSE b/wifi/LICENSE new file mode 100644 index 0000000..4947287 --- /dev/null +++ b/wifi/LICENSE @@ -0,0 +1,177 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS \ No newline at end of file diff --git a/README.md b/wifi/README.md similarity index 100% rename from README.md rename to wifi/README.md diff --git a/README_zh.md b/wifi/README_zh.md similarity index 100% rename from README_zh.md rename to wifi/README_zh.md diff --git a/application/wifi_direct_demo/README.md b/wifi/application/wifi_direct_demo/README.md similarity index 100% rename from application/wifi_direct_demo/README.md rename to wifi/application/wifi_direct_demo/README.md diff --git a/application/wifi_direct_demo/build.gradle b/wifi/application/wifi_direct_demo/build.gradle similarity index 100% rename from application/wifi_direct_demo/build.gradle rename to wifi/application/wifi_direct_demo/build.gradle diff --git a/application/wifi_direct_demo/entry/.gitignore b/wifi/application/wifi_direct_demo/entry/.gitignore similarity index 100% rename from application/wifi_direct_demo/entry/.gitignore rename to wifi/application/wifi_direct_demo/entry/.gitignore diff --git a/application/wifi_direct_demo/entry/build.gradle b/wifi/application/wifi_direct_demo/entry/build.gradle similarity index 100% rename from application/wifi_direct_demo/entry/build.gradle rename to wifi/application/wifi_direct_demo/entry/build.gradle diff --git a/application/wifi_direct_demo/entry/proguard-rules.pro b/wifi/application/wifi_direct_demo/entry/proguard-rules.pro similarity index 100% rename from application/wifi_direct_demo/entry/proguard-rules.pro rename to wifi/application/wifi_direct_demo/entry/proguard-rules.pro diff --git a/application/wifi_direct_demo/entry/src/main/config.json b/wifi/application/wifi_direct_demo/entry/src/main/config.json similarity index 100% rename from application/wifi_direct_demo/entry/src/main/config.json rename to wifi/application/wifi_direct_demo/entry/src/main/config.json diff --git a/application/wifi_direct_demo/entry/src/main/ets/MainAbility/app.ets b/wifi/application/wifi_direct_demo/entry/src/main/ets/MainAbility/app.ets similarity index 100% rename from application/wifi_direct_demo/entry/src/main/ets/MainAbility/app.ets rename to wifi/application/wifi_direct_demo/entry/src/main/ets/MainAbility/app.ets diff --git a/application/wifi_direct_demo/entry/src/main/ets/MainAbility/common/LogUtil.ets b/wifi/application/wifi_direct_demo/entry/src/main/ets/MainAbility/common/LogUtil.ets similarity index 100% rename from application/wifi_direct_demo/entry/src/main/ets/MainAbility/common/LogUtil.ets rename to wifi/application/wifi_direct_demo/entry/src/main/ets/MainAbility/common/LogUtil.ets diff --git a/application/wifi_direct_demo/entry/src/main/ets/MainAbility/common/StorageUtil.ets b/wifi/application/wifi_direct_demo/entry/src/main/ets/MainAbility/common/StorageUtil.ets similarity index 100% rename from application/wifi_direct_demo/entry/src/main/ets/MainAbility/common/StorageUtil.ets rename to wifi/application/wifi_direct_demo/entry/src/main/ets/MainAbility/common/StorageUtil.ets diff --git a/application/wifi_direct_demo/entry/src/main/ets/MainAbility/model/BaseModel.ets b/wifi/application/wifi_direct_demo/entry/src/main/ets/MainAbility/model/BaseModel.ets similarity index 100% rename from application/wifi_direct_demo/entry/src/main/ets/MainAbility/model/BaseModel.ets rename to wifi/application/wifi_direct_demo/entry/src/main/ets/MainAbility/model/BaseModel.ets diff --git a/application/wifi_direct_demo/entry/src/main/ets/MainAbility/model/wifiModeImpl/WifiEntity.ets b/wifi/application/wifi_direct_demo/entry/src/main/ets/MainAbility/model/wifiModeImpl/WifiEntity.ets similarity index 100% rename from application/wifi_direct_demo/entry/src/main/ets/MainAbility/model/wifiModeImpl/WifiEntity.ets rename to wifi/application/wifi_direct_demo/entry/src/main/ets/MainAbility/model/wifiModeImpl/WifiEntity.ets diff --git a/application/wifi_direct_demo/entry/src/main/ets/MainAbility/model/wifiModeImpl/WifiModel.ets b/wifi/application/wifi_direct_demo/entry/src/main/ets/MainAbility/model/wifiModeImpl/WifiModel.ets similarity index 100% rename from application/wifi_direct_demo/entry/src/main/ets/MainAbility/model/wifiModeImpl/WifiModel.ets rename to wifi/application/wifi_direct_demo/entry/src/main/ets/MainAbility/model/wifiModeImpl/WifiModel.ets diff --git a/application/wifi_direct_demo/entry/src/main/ets/MainAbility/pages/component/dialog/customPromptDialog.ets b/wifi/application/wifi_direct_demo/entry/src/main/ets/MainAbility/pages/component/dialog/customPromptDialog.ets similarity index 100% rename from application/wifi_direct_demo/entry/src/main/ets/MainAbility/pages/component/dialog/customPromptDialog.ets rename to wifi/application/wifi_direct_demo/entry/src/main/ets/MainAbility/pages/component/dialog/customPromptDialog.ets diff --git a/application/wifi_direct_demo/entry/src/main/ets/MainAbility/pages/component/dialog/inputComponent.ets b/wifi/application/wifi_direct_demo/entry/src/main/ets/MainAbility/pages/component/dialog/inputComponent.ets similarity index 100% rename from application/wifi_direct_demo/entry/src/main/ets/MainAbility/pages/component/dialog/inputComponent.ets rename to wifi/application/wifi_direct_demo/entry/src/main/ets/MainAbility/pages/component/dialog/inputComponent.ets diff --git a/application/wifi_direct_demo/entry/src/main/ets/MainAbility/pages/index.ets b/wifi/application/wifi_direct_demo/entry/src/main/ets/MainAbility/pages/index.ets similarity index 100% rename from application/wifi_direct_demo/entry/src/main/ets/MainAbility/pages/index.ets rename to wifi/application/wifi_direct_demo/entry/src/main/ets/MainAbility/pages/index.ets diff --git a/application/wifi_direct_demo/entry/src/main/ets/MainAbility/res/image/ic_phone.svg b/wifi/application/wifi_direct_demo/entry/src/main/ets/MainAbility/res/image/ic_phone.svg similarity index 100% rename from application/wifi_direct_demo/entry/src/main/ets/MainAbility/res/image/ic_phone.svg rename to wifi/application/wifi_direct_demo/entry/src/main/ets/MainAbility/res/image/ic_phone.svg diff --git a/application/wifi_direct_demo/entry/src/main/ets/MainAbility/res/image/ic_right.svg b/wifi/application/wifi_direct_demo/entry/src/main/ets/MainAbility/res/image/ic_right.svg similarity index 100% rename from application/wifi_direct_demo/entry/src/main/ets/MainAbility/res/image/ic_right.svg rename to wifi/application/wifi_direct_demo/entry/src/main/ets/MainAbility/res/image/ic_right.svg diff --git a/application/wifi_direct_demo/entry/src/main/resources/base/element/string.json b/wifi/application/wifi_direct_demo/entry/src/main/resources/base/element/string.json similarity index 100% rename from application/wifi_direct_demo/entry/src/main/resources/base/element/string.json rename to wifi/application/wifi_direct_demo/entry/src/main/resources/base/element/string.json diff --git a/application/wifi_direct_demo/entry/src/main/resources/base/media/ic_loading.gif b/wifi/application/wifi_direct_demo/entry/src/main/resources/base/media/ic_loading.gif similarity index 100% rename from application/wifi_direct_demo/entry/src/main/resources/base/media/ic_loading.gif rename to wifi/application/wifi_direct_demo/entry/src/main/resources/base/media/ic_loading.gif diff --git a/application/wifi_direct_demo/entry/src/main/resources/base/media/icon.png b/wifi/application/wifi_direct_demo/entry/src/main/resources/base/media/icon.png similarity index 100% rename from application/wifi_direct_demo/entry/src/main/resources/base/media/icon.png rename to wifi/application/wifi_direct_demo/entry/src/main/resources/base/media/icon.png diff --git a/application/wifi_direct_demo/figures/img.png b/wifi/application/wifi_direct_demo/figures/img.png similarity index 100% rename from application/wifi_direct_demo/figures/img.png rename to wifi/application/wifi_direct_demo/figures/img.png diff --git a/application/wifi_direct_demo/gradle.properties b/wifi/application/wifi_direct_demo/gradle.properties similarity index 100% rename from application/wifi_direct_demo/gradle.properties rename to wifi/application/wifi_direct_demo/gradle.properties diff --git a/application/wifi_direct_demo/gradlew b/wifi/application/wifi_direct_demo/gradlew similarity index 100% rename from application/wifi_direct_demo/gradlew rename to wifi/application/wifi_direct_demo/gradlew diff --git a/application/wifi_direct_demo/gradlew.bat b/wifi/application/wifi_direct_demo/gradlew.bat similarity index 100% rename from application/wifi_direct_demo/gradlew.bat rename to wifi/application/wifi_direct_demo/gradlew.bat diff --git a/application/wifi_direct_demo/package.json b/wifi/application/wifi_direct_demo/package.json similarity index 100% rename from application/wifi_direct_demo/package.json rename to wifi/application/wifi_direct_demo/package.json diff --git a/application/wifi_direct_demo/settings.gradle b/wifi/application/wifi_direct_demo/settings.gradle similarity index 100% rename from application/wifi_direct_demo/settings.gradle rename to wifi/application/wifi_direct_demo/settings.gradle diff --git a/bundle.json b/wifi/bundle.json similarity index 48% rename from bundle.json rename to wifi/bundle.json index fbbecf7..e56d3ba 100644 --- a/bundle.json +++ b/wifi/bundle.json @@ -32,10 +32,10 @@ } ], "segment": { - "destPath": "foundation/communication/wifi" + "destPath": "foundation/communication/wifi/wifi" }, "component": { - "name": "wifi_standard", + "name": "wifi", "subsystem": "communication", "syscap": [ "SystemCapability.Communication.WiFi.STA", @@ -45,8 +45,8 @@ "SystemCapability.Communication.WiFi.HotspotExt" ], "features": [ - "wifi_standard_feature_with_p2p", - "wifi_standard_feature_with_ap_intf" + "wifi_feature_with_p2p", + "wifi_feature_with_ap_intf" ], "adapted_system_type": [ "standard" @@ -71,33 +71,29 @@ }, "build": { "sub_component": [ - "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard:wifi_sdk", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework:wifi_manage", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework:dhcp_manage", - "//foundation/communication/wifi/services/wifi_standard/wifi_hal:wifi_hal", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework:wifi_system_ability", - "//foundation/communication/wifi/services/wifi_standard/sa_profile:wifi_standard_sa_profile", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage:wifi_device_ability", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage:wifi_scan_ability", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage:wifi_hotspot_ability", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage:wifi_p2p_ability", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan:wifi_scan_service", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta:wifi_sta_service", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap:wifi_ap_service", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p:wifi_p2p_service", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service:dhcp_manager_service", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client:dhcp_client_service", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server:dhcp_server", - "//foundation/communication/wifi/utils/src:wifi_utils", - "//foundation/communication/wifi/interfaces/innerkits/native_cpp/napi:wifi_native_js", - "//foundation/communication/wifi/interfaces/innerkits/native_cpp/napi:wifi" + "//foundation/communication/wifi/wifi/interfaces/innerkits/native_cpp/wifi_standard:wifi_sdk", + "//foundation/communication/wifi/wifi/services/wifi_standard/wifi_framework:wifi_manage", + "//foundation/communication/wifi/wifi/services/wifi_standard/wifi_hal:wifi_hal", + "//foundation/communication/wifi/wifi/services/wifi_standard/wifi_framework:wifi_system_ability", + "//foundation/communication/wifi/wifi/services/wifi_standard/sa_profile:wifi_standard_sa_profile", + "//foundation/communication/wifi/wifi/services/wifi_standard/wifi_framework/wifi_manage:wifi_device_ability", + "//foundation/communication/wifi/wifi/services/wifi_standard/wifi_framework/wifi_manage:wifi_scan_ability", + "//foundation/communication/wifi/wifi/services/wifi_standard/wifi_framework/wifi_manage:wifi_hotspot_ability", + "//foundation/communication/wifi/wifi/services/wifi_standard/wifi_framework/wifi_manage:wifi_p2p_ability", + "//foundation/communication/wifi/wifi/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", + "//foundation/communication/wifi/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", + "//foundation/communication/wifi/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan:wifi_scan_service", + "//foundation/communication/wifi/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta:wifi_sta_service", + "//foundation/communication/wifi/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap:wifi_ap_service", + "//foundation/communication/wifi/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p:wifi_p2p_service", + "//foundation/communication/wifi/wifi/utils/src:wifi_utils", + "//foundation/communication/wifi/wifi/interfaces/innerkits/native_cpp/napi:wifi_native_js", + "//foundation/communication/wifi/wifi/interfaces/innerkits/native_cpp/napi:wifi" ], "inner_kits": [ { "header" : { - "header_base": "//foundation/communication/wifi/interfaces/innerkits/native_c", + "header_base": "//foundation/communication/wifi/wifi/interfaces/innerkits/native_c", "header_files": [ "wifi_device.h", "wifi_hotspot.h", @@ -105,11 +101,11 @@ "wifi_hid2d.h" ] }, - "name" : "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard:wifi_sdk" + "name" : "//foundation/communication/wifi/wifi/interfaces/innerkits/native_cpp/wifi_standard:wifi_sdk" }, { "header" : { - "header_base": "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/include", + "header_base": "//foundation/communication/wifi/wifi/interfaces/innerkits/native_cpp/wifi_standard/include", "header_files": [ "wifi_device.h", "wifi_hotspot.h", @@ -118,14 +114,14 @@ "wifi_hid2d.h" ] }, - "name" : "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard:wifi_sdk" + "name" : "//foundation/communication/wifi/wifi/interfaces/innerkits/native_cpp/wifi_standard:wifi_sdk" } ], "test": [ ] }, "hisysevent_config": [ - "//foundation/communication/wifi/hisysevent.yaml" + "//foundation/communication/wifi/wifi/hisysevent.yaml" ] } -} \ No newline at end of file +} diff --git a/figures/en-us_image_0000001115710400.png b/wifi/figures/en-us_image_0000001115710400.png similarity index 100% rename from figures/en-us_image_0000001115710400.png rename to wifi/figures/en-us_image_0000001115710400.png diff --git a/figures/zh-cn_image_0000001115710400.png b/wifi/figures/zh-cn_image_0000001115710400.png similarity index 100% rename from figures/zh-cn_image_0000001115710400.png rename to wifi/figures/zh-cn_image_0000001115710400.png diff --git a/hisysevent.yaml b/wifi/hisysevent.yaml similarity index 100% rename from hisysevent.yaml rename to wifi/hisysevent.yaml diff --git a/interfaces/innerkits/native_c/station_info.h b/wifi/interfaces/innerkits/native_c/station_info.h similarity index 100% rename from interfaces/innerkits/native_c/station_info.h rename to wifi/interfaces/innerkits/native_c/station_info.h diff --git a/interfaces/innerkits/native_c/wifi_device.h b/wifi/interfaces/innerkits/native_c/wifi_device.h similarity index 100% rename from interfaces/innerkits/native_c/wifi_device.h rename to wifi/interfaces/innerkits/native_c/wifi_device.h diff --git a/interfaces/innerkits/native_c/wifi_device_config.h b/wifi/interfaces/innerkits/native_c/wifi_device_config.h similarity index 100% rename from interfaces/innerkits/native_c/wifi_device_config.h rename to wifi/interfaces/innerkits/native_c/wifi_device_config.h diff --git a/interfaces/innerkits/native_c/wifi_error_code.h b/wifi/interfaces/innerkits/native_c/wifi_error_code.h similarity index 100% rename from interfaces/innerkits/native_c/wifi_error_code.h rename to wifi/interfaces/innerkits/native_c/wifi_error_code.h diff --git a/interfaces/innerkits/native_c/wifi_event.h b/wifi/interfaces/innerkits/native_c/wifi_event.h similarity index 100% rename from interfaces/innerkits/native_c/wifi_event.h rename to wifi/interfaces/innerkits/native_c/wifi_event.h diff --git a/interfaces/innerkits/native_c/wifi_hid2d.h b/wifi/interfaces/innerkits/native_c/wifi_hid2d.h similarity index 100% rename from interfaces/innerkits/native_c/wifi_hid2d.h rename to wifi/interfaces/innerkits/native_c/wifi_hid2d.h diff --git a/interfaces/innerkits/native_c/wifi_hotspot.h b/wifi/interfaces/innerkits/native_c/wifi_hotspot.h similarity index 100% rename from interfaces/innerkits/native_c/wifi_hotspot.h rename to wifi/interfaces/innerkits/native_c/wifi_hotspot.h diff --git a/interfaces/innerkits/native_c/wifi_hotspot_config.h b/wifi/interfaces/innerkits/native_c/wifi_hotspot_config.h similarity index 100% rename from interfaces/innerkits/native_c/wifi_hotspot_config.h rename to wifi/interfaces/innerkits/native_c/wifi_hotspot_config.h diff --git a/interfaces/innerkits/native_c/wifi_linked_info.h b/wifi/interfaces/innerkits/native_c/wifi_linked_info.h similarity index 100% rename from interfaces/innerkits/native_c/wifi_linked_info.h rename to wifi/interfaces/innerkits/native_c/wifi_linked_info.h diff --git a/interfaces/innerkits/native_c/wifi_p2p.h b/wifi/interfaces/innerkits/native_c/wifi_p2p.h similarity index 100% rename from interfaces/innerkits/native_c/wifi_p2p.h rename to wifi/interfaces/innerkits/native_c/wifi_p2p.h diff --git a/interfaces/innerkits/native_c/wifi_p2p_config.h b/wifi/interfaces/innerkits/native_c/wifi_p2p_config.h similarity index 100% rename from interfaces/innerkits/native_c/wifi_p2p_config.h rename to wifi/interfaces/innerkits/native_c/wifi_p2p_config.h diff --git a/interfaces/innerkits/native_c/wifi_scan_info.h b/wifi/interfaces/innerkits/native_c/wifi_scan_info.h similarity index 100% rename from interfaces/innerkits/native_c/wifi_scan_info.h rename to wifi/interfaces/innerkits/native_c/wifi_scan_info.h diff --git a/interfaces/innerkits/native_cpp/napi/BUILD.gn b/wifi/interfaces/innerkits/native_cpp/napi/BUILD.gn similarity index 67% rename from interfaces/innerkits/native_cpp/napi/BUILD.gn rename to wifi/interfaces/innerkits/native_cpp/napi/BUILD.gn index e369235..dd1e5d0 100644 --- a/interfaces/innerkits/native_cpp/napi/BUILD.gn +++ b/wifi/interfaces/innerkits/native_cpp/napi/BUILD.gn @@ -12,6 +12,7 @@ # limitations under the License. import("//build/ohos.gni") +import("//foundation/communication/wifi/wifi/wifi.gni") ohos_shared_library("wifi") { install_enable = true @@ -19,13 +20,13 @@ ohos_shared_library("wifi") { "//third_party/node/src", "//native_engine", "//utils/native/base/include", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log", - "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", + "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", - "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/include", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper", + "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", "//foundation/aafwk/standard/frameworks/kits/appkit/native/ability_runtime/context", - "//foundation/communication/wifi/utils/inc", + "$WIFI_ROOT_DIR/utils/inc", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include", ] @@ -38,18 +39,18 @@ ohos_shared_library("wifi") { "wifi_napi_utils.cpp", ] deps = [ + "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard:wifi_sdk", + "$WIFI_ROOT_DIR/utils/src:wifi_utils", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//foundation/aafwk/standard/frameworks/kits/appkit:app_context", "//foundation/ace/napi:ace_napi", - "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard:wifi_sdk", - "//foundation/communication/wifi/utils/src:wifi_utils", "//utils/native/base:utils", ] external_deps = [ "ipc:ipc_core" ] relative_install_dir = "module" - part_name = "wifi_standard" + part_name = "wifi" subsystem_name = "communication" } @@ -59,13 +60,13 @@ ohos_shared_library("wifi_native_js") { "//third_party/node/src", "//native_engine", "//utils/native/base/include", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log", - "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", + "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", - "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/include", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper", + "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", "//foundation/aafwk/standard/frameworks/kits/appkit/native/ability_runtime/context", - "//foundation/communication/wifi/utils/inc", + "$WIFI_ROOT_DIR/utils/inc", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include", ] @@ -78,11 +79,11 @@ ohos_shared_library("wifi_native_js") { "wifi_napi_utils.cpp", ] deps = [ + "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard:wifi_sdk", + "$WIFI_ROOT_DIR/utils/src:wifi_utils", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//foundation/aafwk/standard/frameworks/kits/appkit:app_context", "//foundation/ace/napi:ace_napi", - "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard:wifi_sdk", - "//foundation/communication/wifi/utils/src:wifi_utils", "//utils/native/base:utils", ] @@ -91,6 +92,6 @@ ohos_shared_library("wifi_native_js") { external_deps = [ "ipc:ipc_core" ] relative_install_dir = "module" - part_name = "wifi_standard" + part_name = "wifi" subsystem_name = "communication" } diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_device.cpp b/wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_device.cpp similarity index 100% rename from interfaces/innerkits/native_cpp/napi/wifi_napi_device.cpp rename to wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_device.cpp diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_device.h b/wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_device.h similarity index 100% rename from interfaces/innerkits/native_cpp/napi/wifi_napi_device.h rename to wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_device.h diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_entry.cpp b/wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_entry.cpp similarity index 100% rename from interfaces/innerkits/native_cpp/napi/wifi_napi_entry.cpp rename to wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_entry.cpp diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_event.cpp b/wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_event.cpp similarity index 100% rename from interfaces/innerkits/native_cpp/napi/wifi_napi_event.cpp rename to wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_event.cpp diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_event.h b/wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_event.h similarity index 100% rename from interfaces/innerkits/native_cpp/napi/wifi_napi_event.h rename to wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_event.h diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_hotspot.cpp b/wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_hotspot.cpp similarity index 100% rename from interfaces/innerkits/native_cpp/napi/wifi_napi_hotspot.cpp rename to wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_hotspot.cpp diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_hotspot.h b/wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_hotspot.h similarity index 100% rename from interfaces/innerkits/native_cpp/napi/wifi_napi_hotspot.h rename to wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_hotspot.h diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_p2p.cpp b/wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_p2p.cpp similarity index 100% rename from interfaces/innerkits/native_cpp/napi/wifi_napi_p2p.cpp rename to wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_p2p.cpp diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_p2p.h b/wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_p2p.h similarity index 100% rename from interfaces/innerkits/native_cpp/napi/wifi_napi_p2p.h rename to wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_p2p.h diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_utils.cpp b/wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_utils.cpp similarity index 100% rename from interfaces/innerkits/native_cpp/napi/wifi_napi_utils.cpp rename to wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_utils.cpp diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_utils.h b/wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_utils.h similarity index 100% rename from interfaces/innerkits/native_cpp/napi/wifi_napi_utils.h rename to wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_utils.h diff --git a/interfaces/innerkits/native_cpp/wifi_standard/BUILD.gn b/wifi/interfaces/innerkits/native_cpp/wifi_standard/BUILD.gn similarity index 79% rename from interfaces/innerkits/native_cpp/wifi_standard/BUILD.gn rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/BUILD.gn index 5123f74..a9cf4f6 100644 --- a/interfaces/innerkits/native_cpp/wifi_standard/BUILD.gn +++ b/wifi/interfaces/innerkits/native_cpp/wifi_standard/BUILD.gn @@ -12,6 +12,7 @@ # limitations under the License. import("//build/ohos.gni") +import("//foundation/communication/wifi/wifi/wifi.gni") ################################################################################ @@ -23,15 +24,16 @@ config("wifi_sdk_header") { "//foundation/ace/ace_engine/frameworks/base/utils", "//foundation/ace/ace_engine/frameworks", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", - "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/include", - "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log/", + "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/include", + "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log/", "//foundation/distributedschedule/samgr/adapter/interfaces/innerkits/include", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/include", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include", - "//foundation/communication/wifi/interfaces/innerkits", - "//foundation/communication/wifi/utils/inc", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", + "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/include", + "$DHCP_ROOT_DIR/services/mgr_service/include", + "$WIFI_ROOT_DIR/interfaces/innerkits", + "$WIFI_ROOT_DIR/utils/inc", ] } @@ -50,7 +52,7 @@ config("wifi_sdk_config") { } ohos_source_set("wifi_device_proxy_impl") { - part_name = "wifi_standard" + part_name = "wifi" sources = [ "src/wifi_device_impl.cpp", "src/wifi_device_proxy.cpp", @@ -65,7 +67,7 @@ ohos_source_set("wifi_device_proxy_impl") { } ohos_source_set("wifi_hotspot_proxy_impl") { - part_name = "wifi_standard" + part_name = "wifi" sources = [ "src/wifi_hotspot_impl.cpp", "src/wifi_hotspot_proxy.cpp", @@ -80,7 +82,7 @@ ohos_source_set("wifi_hotspot_proxy_impl") { } ohos_source_set("wifi_scan_proxy_impl") { - part_name = "wifi_standard" + part_name = "wifi" sources = [ "src/wifi_scan_impl.cpp", "src/wifi_scan_proxy.cpp", @@ -95,7 +97,7 @@ ohos_source_set("wifi_scan_proxy_impl") { } ohos_source_set("wifi_p2p_proxy_impl") { - part_name = "wifi_standard" + part_name = "wifi" sources = [ "src/wifi_p2p_impl.cpp", "src/wifi_p2p_proxy.cpp", @@ -111,7 +113,6 @@ ohos_source_set("wifi_p2p_proxy_impl") { ohos_shared_library("wifi_sdk") { install_enable = true - sources = [ "c_adapter/wifi_c_device.cpp", "c_adapter/wifi_c_event.cpp", @@ -137,12 +138,12 @@ ohos_shared_library("wifi_sdk") { ":wifi_hotspot_proxy_impl", ":wifi_p2p_proxy_impl", ":wifi_scan_proxy_impl", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", + "$WIFI_ROOT_DIR/utils/src:wifi_utils", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//base/notification/ces_standard/frameworks/core:cesfwk_core", "//base/notification/ces_standard/frameworks/native:cesfwk_innerkits", "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", - "//foundation/communication/wifi/utils/src:wifi_utils", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/bounds_checking_function:libsec_static", "//utils/native/base:utils", @@ -165,6 +166,6 @@ ohos_shared_library("wifi_sdk") { ":wifi_sdk_header", ] - part_name = "wifi_standard" + part_name = "wifi" subsystem_name = "communication" } diff --git a/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_device.cpp b/wifi/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_device.cpp similarity index 100% rename from interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_device.cpp rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_device.cpp diff --git a/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_event.cpp b/wifi/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_event.cpp similarity index 100% rename from interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_event.cpp rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_event.cpp diff --git a/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_hid2d.cpp b/wifi/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_hid2d.cpp similarity index 100% rename from interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_hid2d.cpp rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_hid2d.cpp diff --git a/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_hotspot.cpp b/wifi/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_hotspot.cpp similarity index 100% rename from interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_hotspot.cpp rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_hotspot.cpp diff --git a/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_p2p.cpp b/wifi/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_p2p.cpp similarity index 100% rename from interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_p2p.cpp rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_p2p.cpp diff --git a/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_utils.cpp b/wifi/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_utils.cpp similarity index 100% rename from interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_utils.cpp rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_utils.cpp diff --git a/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_utils.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_utils.h similarity index 100% rename from interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_utils.h rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_utils.h diff --git a/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_device.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_device.h similarity index 99% rename from interfaces/innerkits/native_cpp/wifi_standard/include/wifi_device.h rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_device.h index 95874b2..275f155 100644 --- a/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_device.h +++ b/wifi/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_device.h @@ -271,4 +271,4 @@ public: }; } // namespace Wifi } // namespace OHOS -#endif \ No newline at end of file +#endif diff --git a/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_hid2d.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_hid2d.h similarity index 100% rename from interfaces/innerkits/native_cpp/wifi_standard/include/wifi_hid2d.h rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_hid2d.h diff --git a/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_hotspot.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_hotspot.h similarity index 100% rename from interfaces/innerkits/native_cpp/wifi_standard/include/wifi_hotspot.h rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_hotspot.h diff --git a/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_p2p.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_p2p.h similarity index 100% rename from interfaces/innerkits/native_cpp/wifi_standard/include/wifi_p2p.h rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_p2p.h diff --git a/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_scan.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_scan.h similarity index 100% rename from interfaces/innerkits/native_cpp/wifi_standard/include/wifi_scan.h rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_scan.h diff --git a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/define.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/define.h similarity index 100% rename from interfaces/innerkits/native_cpp/wifi_standard/interfaces/define.h rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/define.h diff --git a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_device.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_device.h similarity index 100% rename from interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_device.h rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_device.h diff --git a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_device_callback.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_device_callback.h similarity index 100% rename from interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_device_callback.h rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_device_callback.h diff --git a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_hotspot.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_hotspot.h similarity index 100% rename from interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_hotspot.h rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_hotspot.h diff --git a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_hotspot_callback.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_hotspot_callback.h similarity index 100% rename from interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_hotspot_callback.h rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_hotspot_callback.h diff --git a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_p2p.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_p2p.h similarity index 100% rename from interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_p2p.h rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_p2p.h diff --git a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_p2p_callback.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_p2p_callback.h similarity index 100% rename from interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_p2p_callback.h rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_p2p_callback.h diff --git a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_scan.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_scan.h similarity index 100% rename from interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_scan.h rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_scan.h diff --git a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_scan_callback.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_scan_callback.h similarity index 100% rename from interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_scan_callback.h rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_scan_callback.h diff --git a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_ap_msg.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_ap_msg.h similarity index 100% rename from interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_ap_msg.h rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_ap_msg.h diff --git a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_errcode.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_errcode.h similarity index 100% rename from interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_errcode.h rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_errcode.h diff --git a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_hid2d_msg.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_hid2d_msg.h similarity index 100% rename from interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_hid2d_msg.h rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_hid2d_msg.h diff --git a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_msg.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_msg.h similarity index 100% rename from interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_msg.h rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_msg.h diff --git a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_p2p_msg.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_p2p_msg.h similarity index 100% rename from interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_p2p_msg.h rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_p2p_msg.h diff --git a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_scan_msg.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_scan_msg.h similarity index 100% rename from interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_scan_msg.h rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_scan_msg.h diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device.cpp b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device.cpp similarity index 100% rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device.cpp rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device.cpp diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_callback_stub.cpp b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_callback_stub.cpp similarity index 100% rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_callback_stub.cpp rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_callback_stub.cpp diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_callback_stub.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_callback_stub.h similarity index 100% rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_callback_stub.h rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_callback_stub.h diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_impl.cpp b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_impl.cpp similarity index 100% rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_impl.cpp rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_impl.cpp diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_impl.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_impl.h similarity index 100% rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_impl.h rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_impl.h diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy.cpp b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy.cpp similarity index 100% rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy.cpp rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy.cpp diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy.h similarity index 100% rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy.h rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy.h diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hid2d.cpp b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hid2d.cpp similarity index 100% rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hid2d.cpp rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hid2d.cpp diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hid2d_msg.cpp b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hid2d_msg.cpp similarity index 100% rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hid2d_msg.cpp rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hid2d_msg.cpp diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot.cpp b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot.cpp similarity index 100% rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot.cpp rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot.cpp diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_callback_stub.cpp b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_callback_stub.cpp similarity index 100% rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_callback_stub.cpp rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_callback_stub.cpp diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_callback_stub.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_callback_stub.h similarity index 100% rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_callback_stub.h rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_callback_stub.h diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_impl.cpp b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_impl.cpp similarity index 100% rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_impl.cpp rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_impl.cpp diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_impl.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_impl.h similarity index 100% rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_impl.h rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_impl.h diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_proxy.cpp b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_proxy.cpp similarity index 100% rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_proxy.cpp rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_proxy.cpp diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_proxy.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_proxy.h similarity index 100% rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_proxy.h rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_proxy.h diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_logger.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_logger.h similarity index 100% rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_logger.h rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_logger.h diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p.cpp b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p.cpp similarity index 100% rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p.cpp rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p.cpp diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_callback_stub.cpp b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_callback_stub.cpp similarity index 100% rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_callback_stub.cpp rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_callback_stub.cpp diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_callback_stub.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_callback_stub.h similarity index 100% rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_callback_stub.h rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_callback_stub.h diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_impl.cpp b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_impl.cpp similarity index 100% rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_impl.cpp rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_impl.cpp diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_impl.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_impl.h similarity index 100% rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_impl.h rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_impl.h diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_msg.cpp b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_msg.cpp similarity index 100% rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_msg.cpp rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_msg.cpp diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_proxy.cpp b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_proxy.cpp similarity index 100% rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_proxy.cpp rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_proxy.cpp diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_proxy.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_proxy.h similarity index 100% rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_proxy.h rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_proxy.h diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan.cpp b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan.cpp similarity index 100% rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan.cpp rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan.cpp diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_callback_stub.cpp b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_callback_stub.cpp similarity index 100% rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_callback_stub.cpp rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_callback_stub.cpp diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_callback_stub.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_callback_stub.h similarity index 100% rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_callback_stub.h rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_callback_stub.h diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_impl.cpp b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_impl.cpp similarity index 100% rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_impl.cpp rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_impl.cpp diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_impl.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_impl.h similarity index 100% rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_impl.h rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_impl.h diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_proxy.cpp b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_proxy.cpp similarity index 100% rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_proxy.cpp rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_proxy.cpp diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_proxy.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_proxy.h similarity index 100% rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_proxy.h rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_proxy.h diff --git a/interfaces/kits/jskits/@ohos.wifi.d.ts b/wifi/interfaces/kits/jskits/@ohos.wifi.d.ts similarity index 100% rename from interfaces/kits/jskits/@ohos.wifi.d.ts rename to wifi/interfaces/kits/jskits/@ohos.wifi.d.ts diff --git a/interfaces/kits/jskits/@ohos.wifiext.d.ts b/wifi/interfaces/kits/jskits/@ohos.wifiext.d.ts similarity index 100% rename from interfaces/kits/jskits/@ohos.wifiext.d.ts rename to wifi/interfaces/kits/jskits/@ohos.wifiext.d.ts diff --git a/services/wifi_standard/etc/init/BUILD.gn b/wifi/services/wifi_standard/etc/init/BUILD.gn similarity index 96% rename from services/wifi_standard/etc/init/BUILD.gn rename to wifi/services/wifi_standard/etc/init/BUILD.gn index 26badeb..7fb5b20 100644 --- a/services/wifi_standard/etc/init/BUILD.gn +++ b/wifi/services/wifi_standard/etc/init/BUILD.gn @@ -20,6 +20,6 @@ group("etc") { ohos_prebuilt_etc("wifi_standard.cfg") { source = "wifi_standard.cfg" relative_install_dir = "init" - part_name = "wifi_standard" + part_name = "wifi" subsystem_name = "communication" } diff --git a/services/wifi_standard/etc/init/wifi_standard.cfg b/wifi/services/wifi_standard/etc/init/wifi_standard.cfg similarity index 100% rename from services/wifi_standard/etc/init/wifi_standard.cfg rename to wifi/services/wifi_standard/etc/init/wifi_standard.cfg diff --git a/services/wifi_standard/ipc_framework/cRPC/BUILD.gn b/wifi/services/wifi_standard/ipc_framework/cRPC/BUILD.gn similarity index 88% rename from services/wifi_standard/ipc_framework/cRPC/BUILD.gn rename to wifi/services/wifi_standard/ipc_framework/cRPC/BUILD.gn index ffc2fe0..e69d404 100644 --- a/services/wifi_standard/ipc_framework/cRPC/BUILD.gn +++ b/wifi/services/wifi_standard/ipc_framework/cRPC/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2021 Huawei Device Co., Ltd. +# Copyright (C) 2021-2022 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -12,6 +12,7 @@ # limitations under the License. import("//build/ohos.gni") +import("//foundation/communication/wifi/wifi/wifi.gni") ohos_static_library("crpc_server") { sources = [ @@ -34,7 +35,7 @@ ohos_static_library("crpc_server") { "//utils/native/base:utils", ] subsystem_name = "communication" - part_name = "wifi_standard" + part_name = "wifi" } ohos_static_library("crpc_client") { @@ -48,7 +49,7 @@ ohos_static_library("crpc_client") { "include", "//utils/native/base/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", ] cflags_cc = [ "-fno-rtti" ] deps = [ @@ -56,7 +57,7 @@ ohos_static_library("crpc_client") { "//utils/native/base:utils", ] subsystem_name = "communication" - part_name = "wifi_standard" + part_name = "wifi" } group("ipc_framework") { diff --git a/services/wifi_standard/ipc_framework/cRPC/include/client.h b/wifi/services/wifi_standard/ipc_framework/cRPC/include/client.h similarity index 100% rename from services/wifi_standard/ipc_framework/cRPC/include/client.h rename to wifi/services/wifi_standard/ipc_framework/cRPC/include/client.h diff --git a/services/wifi_standard/ipc_framework/cRPC/include/common.h b/wifi/services/wifi_standard/ipc_framework/cRPC/include/common.h similarity index 100% rename from services/wifi_standard/ipc_framework/cRPC/include/common.h rename to wifi/services/wifi_standard/ipc_framework/cRPC/include/common.h diff --git a/services/wifi_standard/ipc_framework/cRPC/include/context.h b/wifi/services/wifi_standard/ipc_framework/cRPC/include/context.h similarity index 100% rename from services/wifi_standard/ipc_framework/cRPC/include/context.h rename to wifi/services/wifi_standard/ipc_framework/cRPC/include/context.h diff --git a/services/wifi_standard/ipc_framework/cRPC/include/evloop.h b/wifi/services/wifi_standard/ipc_framework/cRPC/include/evloop.h similarity index 100% rename from services/wifi_standard/ipc_framework/cRPC/include/evloop.h rename to wifi/services/wifi_standard/ipc_framework/cRPC/include/evloop.h diff --git a/services/wifi_standard/ipc_framework/cRPC/include/hash_table.h b/wifi/services/wifi_standard/ipc_framework/cRPC/include/hash_table.h similarity index 100% rename from services/wifi_standard/ipc_framework/cRPC/include/hash_table.h rename to wifi/services/wifi_standard/ipc_framework/cRPC/include/hash_table.h diff --git a/services/wifi_standard/ipc_framework/cRPC/include/log.h b/wifi/services/wifi_standard/ipc_framework/cRPC/include/log.h similarity index 100% rename from services/wifi_standard/ipc_framework/cRPC/include/log.h rename to wifi/services/wifi_standard/ipc_framework/cRPC/include/log.h diff --git a/services/wifi_standard/ipc_framework/cRPC/include/net.h b/wifi/services/wifi_standard/ipc_framework/cRPC/include/net.h similarity index 100% rename from services/wifi_standard/ipc_framework/cRPC/include/net.h rename to wifi/services/wifi_standard/ipc_framework/cRPC/include/net.h diff --git a/services/wifi_standard/ipc_framework/cRPC/include/serial.h b/wifi/services/wifi_standard/ipc_framework/cRPC/include/serial.h similarity index 100% rename from services/wifi_standard/ipc_framework/cRPC/include/serial.h rename to wifi/services/wifi_standard/ipc_framework/cRPC/include/serial.h diff --git a/services/wifi_standard/ipc_framework/cRPC/include/server.h b/wifi/services/wifi_standard/ipc_framework/cRPC/include/server.h similarity index 100% rename from services/wifi_standard/ipc_framework/cRPC/include/server.h rename to wifi/services/wifi_standard/ipc_framework/cRPC/include/server.h diff --git a/services/wifi_standard/ipc_framework/cRPC/src/client.c b/wifi/services/wifi_standard/ipc_framework/cRPC/src/client.c similarity index 100% rename from services/wifi_standard/ipc_framework/cRPC/src/client.c rename to wifi/services/wifi_standard/ipc_framework/cRPC/src/client.c diff --git a/services/wifi_standard/ipc_framework/cRPC/src/context.c b/wifi/services/wifi_standard/ipc_framework/cRPC/src/context.c similarity index 100% rename from services/wifi_standard/ipc_framework/cRPC/src/context.c rename to wifi/services/wifi_standard/ipc_framework/cRPC/src/context.c diff --git a/services/wifi_standard/ipc_framework/cRPC/src/evloop.c b/wifi/services/wifi_standard/ipc_framework/cRPC/src/evloop.c similarity index 100% rename from services/wifi_standard/ipc_framework/cRPC/src/evloop.c rename to wifi/services/wifi_standard/ipc_framework/cRPC/src/evloop.c diff --git a/services/wifi_standard/ipc_framework/cRPC/src/hash_table.c b/wifi/services/wifi_standard/ipc_framework/cRPC/src/hash_table.c similarity index 100% rename from services/wifi_standard/ipc_framework/cRPC/src/hash_table.c rename to wifi/services/wifi_standard/ipc_framework/cRPC/src/hash_table.c diff --git a/services/wifi_standard/ipc_framework/cRPC/src/net.c b/wifi/services/wifi_standard/ipc_framework/cRPC/src/net.c similarity index 100% rename from services/wifi_standard/ipc_framework/cRPC/src/net.c rename to wifi/services/wifi_standard/ipc_framework/cRPC/src/net.c diff --git a/services/wifi_standard/ipc_framework/cRPC/src/serial.c b/wifi/services/wifi_standard/ipc_framework/cRPC/src/serial.c similarity index 100% rename from services/wifi_standard/ipc_framework/cRPC/src/serial.c rename to wifi/services/wifi_standard/ipc_framework/cRPC/src/serial.c diff --git a/services/wifi_standard/ipc_framework/cRPC/src/server.c b/wifi/services/wifi_standard/ipc_framework/cRPC/src/server.c similarity index 100% rename from services/wifi_standard/ipc_framework/cRPC/src/server.c rename to wifi/services/wifi_standard/ipc_framework/cRPC/src/server.c diff --git a/services/wifi_standard/sa_profile/1120.xml b/wifi/services/wifi_standard/sa_profile/1120.xml similarity index 100% rename from services/wifi_standard/sa_profile/1120.xml rename to wifi/services/wifi_standard/sa_profile/1120.xml diff --git a/services/wifi_standard/sa_profile/1121.xml b/wifi/services/wifi_standard/sa_profile/1121.xml similarity index 100% rename from services/wifi_standard/sa_profile/1121.xml rename to wifi/services/wifi_standard/sa_profile/1121.xml diff --git a/services/wifi_standard/sa_profile/1123.xml b/wifi/services/wifi_standard/sa_profile/1123.xml similarity index 100% rename from services/wifi_standard/sa_profile/1123.xml rename to wifi/services/wifi_standard/sa_profile/1123.xml diff --git a/services/wifi_standard/sa_profile/1124.xml b/wifi/services/wifi_standard/sa_profile/1124.xml similarity index 100% rename from services/wifi_standard/sa_profile/1124.xml rename to wifi/services/wifi_standard/sa_profile/1124.xml diff --git a/services/wifi_standard/sa_profile/BUILD.gn b/wifi/services/wifi_standard/sa_profile/BUILD.gn similarity index 90% rename from services/wifi_standard/sa_profile/BUILD.gn rename to wifi/services/wifi_standard/sa_profile/BUILD.gn index 8cf6218..35c2b0c 100644 --- a/services/wifi_standard/sa_profile/BUILD.gn +++ b/wifi/services/wifi_standard/sa_profile/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2021 Huawei Device Co., Ltd. +# Copyright (C) 2021-2022 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -20,5 +20,5 @@ ohos_sa_profile("wifi_standard_sa_profile") { "1123.xml", "1124.xml", ] - part_name = "wifi_standard" + part_name = "wifi" } diff --git a/wifi/services/wifi_standard/wifi_framework/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/BUILD.gn new file mode 100644 index 0000000..64cb67a --- /dev/null +++ b/wifi/services/wifi_standard/wifi_framework/BUILD.gn @@ -0,0 +1,36 @@ +# Copyright (C) 2021-2022 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import("//build/ohos.gni") +import("//foundation/communication/wifi/wifi/wifi.gni") + +group("wifi_system_ability") { + deps = [ + "$WIFI_ROOT_DIR/services/wifi_standard/sa_profile:wifi_standard_sa_profile", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_device_ability", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_hotspot_ability", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_p2p_ability", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_scan_ability", + ] +} + +group("wifi_manage") { + deps = [ + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap:wifi_ap_service", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p:wifi_p2p_service", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan:wifi_scan_service", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta:wifi_sta_service", + ] +} diff --git a/services/wifi_standard/wifi_framework/common/config/wifi_config_country_freqs.h b/wifi/services/wifi_standard/wifi_framework/common/config/wifi_config_country_freqs.h similarity index 100% rename from services/wifi_standard/wifi_framework/common/config/wifi_config_country_freqs.h rename to wifi/services/wifi_standard/wifi_framework/common/config/wifi_config_country_freqs.h diff --git a/services/wifi_standard/wifi_framework/common/config/wifi_config_file_impl.h b/wifi/services/wifi_standard/wifi_framework/common/config/wifi_config_file_impl.h similarity index 100% rename from services/wifi_standard/wifi_framework/common/config/wifi_config_file_impl.h rename to wifi/services/wifi_standard/wifi_framework/common/config/wifi_config_file_impl.h diff --git a/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp b/wifi/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp rename to wifi/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp diff --git a/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.h b/wifi/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.h similarity index 100% rename from services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.h rename to wifi/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.h diff --git a/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp b/wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp rename to wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp diff --git a/services/wifi_standard/wifi_framework/common/config/wifi_settings.h b/wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.h similarity index 100% rename from services/wifi_standard/wifi_framework/common/config/wifi_settings.h rename to wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.h diff --git a/services/wifi_standard/wifi_framework/common/include/permission_def.h b/wifi/services/wifi_standard/wifi_framework/common/include/permission_def.h similarity index 100% rename from services/wifi_standard/wifi_framework/common/include/permission_def.h rename to wifi/services/wifi_standard/wifi_framework/common/include/permission_def.h diff --git a/services/wifi_standard/wifi_framework/common/include/wifi_internal_msg.h b/wifi/services/wifi_standard/wifi_framework/common/include/wifi_internal_msg.h similarity index 100% rename from services/wifi_standard/wifi_framework/common/include/wifi_internal_msg.h rename to wifi/services/wifi_standard/wifi_framework/common/include/wifi_internal_msg.h diff --git a/services/wifi_standard/wifi_framework/common/log/log_helper.c b/wifi/services/wifi_standard/wifi_framework/common/log/log_helper.c similarity index 100% rename from services/wifi_standard/wifi_framework/common/log/log_helper.c rename to wifi/services/wifi_standard/wifi_framework/common/log/log_helper.c diff --git a/services/wifi_standard/wifi_framework/common/log/log_helper.h b/wifi/services/wifi_standard/wifi_framework/common/log/log_helper.h similarity index 100% rename from services/wifi_standard/wifi_framework/common/log/log_helper.h rename to wifi/services/wifi_standard/wifi_framework/common/log/log_helper.h diff --git a/services/wifi_standard/wifi_framework/common/log/wifi_log.h b/wifi/services/wifi_standard/wifi_framework/common/log/wifi_log.h similarity index 100% rename from services/wifi_standard/wifi_framework/common/log/wifi_log.h rename to wifi/services/wifi_standard/wifi_framework/common/log/wifi_log.h diff --git a/services/wifi_standard/wifi_framework/common/log/wifi_log_tags.h b/wifi/services/wifi_standard/wifi_framework/common/log/wifi_log_tags.h similarity index 100% rename from services/wifi_standard/wifi_framework/common/log/wifi_log_tags.h rename to wifi/services/wifi_standard/wifi_framework/common/log/wifi_log_tags.h diff --git a/services/wifi_standard/wifi_framework/common/log/wifi_logger.h b/wifi/services/wifi_standard/wifi_framework/common/log/wifi_logger.h similarity index 100% rename from services/wifi_standard/wifi_framework/common/log/wifi_logger.h rename to wifi/services/wifi_standard/wifi_framework/common/log/wifi_logger.h diff --git a/services/wifi_standard/wifi_framework/common/net_helper/base_address.cpp b/wifi/services/wifi_standard/wifi_framework/common/net_helper/base_address.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/common/net_helper/base_address.cpp rename to wifi/services/wifi_standard/wifi_framework/common/net_helper/base_address.cpp diff --git a/services/wifi_standard/wifi_framework/common/net_helper/base_address.h b/wifi/services/wifi_standard/wifi_framework/common/net_helper/base_address.h similarity index 100% rename from services/wifi_standard/wifi_framework/common/net_helper/base_address.h rename to wifi/services/wifi_standard/wifi_framework/common/net_helper/base_address.h diff --git a/services/wifi_standard/wifi_framework/common/net_helper/dhcpd_interface.cpp b/wifi/services/wifi_standard/wifi_framework/common/net_helper/dhcpd_interface.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/common/net_helper/dhcpd_interface.cpp rename to wifi/services/wifi_standard/wifi_framework/common/net_helper/dhcpd_interface.cpp diff --git a/services/wifi_standard/wifi_framework/common/net_helper/dhcpd_interface.h b/wifi/services/wifi_standard/wifi_framework/common/net_helper/dhcpd_interface.h similarity index 100% rename from services/wifi_standard/wifi_framework/common/net_helper/dhcpd_interface.h rename to wifi/services/wifi_standard/wifi_framework/common/net_helper/dhcpd_interface.h diff --git a/services/wifi_standard/wifi_framework/common/net_helper/http_request.cpp b/wifi/services/wifi_standard/wifi_framework/common/net_helper/http_request.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/common/net_helper/http_request.cpp rename to wifi/services/wifi_standard/wifi_framework/common/net_helper/http_request.cpp diff --git a/services/wifi_standard/wifi_framework/common/net_helper/http_request.h b/wifi/services/wifi_standard/wifi_framework/common/net_helper/http_request.h similarity index 100% rename from services/wifi_standard/wifi_framework/common/net_helper/http_request.h rename to wifi/services/wifi_standard/wifi_framework/common/net_helper/http_request.h diff --git a/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp b/wifi/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp rename to wifi/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp diff --git a/services/wifi_standard/wifi_framework/common/net_helper/if_config.h b/wifi/services/wifi_standard/wifi_framework/common/net_helper/if_config.h similarity index 100% rename from services/wifi_standard/wifi_framework/common/net_helper/if_config.h rename to wifi/services/wifi_standard/wifi_framework/common/net_helper/if_config.h diff --git a/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp b/wifi/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp rename to wifi/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp diff --git a/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.h b/wifi/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.h similarity index 100% rename from services/wifi_standard/wifi_framework/common/net_helper/ip_tools.h rename to wifi/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.h diff --git a/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.cpp b/wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.cpp rename to wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.cpp diff --git a/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.h b/wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.h similarity index 100% rename from services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.h rename to wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.h diff --git a/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.cpp b/wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.cpp rename to wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.cpp diff --git a/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.h b/wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.h similarity index 100% rename from services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.h rename to wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.h diff --git a/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp b/wifi/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp rename to wifi/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp diff --git a/services/wifi_standard/wifi_framework/common/net_helper/mac_address.h b/wifi/services/wifi_standard/wifi_framework/common/net_helper/mac_address.h similarity index 100% rename from services/wifi_standard/wifi_framework/common/net_helper/mac_address.h rename to wifi/services/wifi_standard/wifi_framework/common/net_helper/mac_address.h diff --git a/services/wifi_standard/wifi_framework/common/net_helper/network_interface.cpp b/wifi/services/wifi_standard/wifi_framework/common/net_helper/network_interface.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/common/net_helper/network_interface.cpp rename to wifi/services/wifi_standard/wifi_framework/common/net_helper/network_interface.cpp diff --git a/services/wifi_standard/wifi_framework/common/net_helper/network_interface.h b/wifi/services/wifi_standard/wifi_framework/common/net_helper/network_interface.h similarity index 100% rename from services/wifi_standard/wifi_framework/common/net_helper/network_interface.h rename to wifi/services/wifi_standard/wifi_framework/common/net_helper/network_interface.h diff --git a/services/wifi_standard/wifi_framework/common/utils/wifi_common_event_helper.cpp b/wifi/services/wifi_standard/wifi_framework/common/utils/wifi_common_event_helper.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/common/utils/wifi_common_event_helper.cpp rename to wifi/services/wifi_standard/wifi_framework/common/utils/wifi_common_event_helper.cpp diff --git a/services/wifi_standard/wifi_framework/common/utils/wifi_common_event_helper.h b/wifi/services/wifi_standard/wifi_framework/common/utils/wifi_common_event_helper.h similarity index 100% rename from services/wifi_standard/wifi_framework/common/utils/wifi_common_event_helper.h rename to wifi/services/wifi_standard/wifi_framework/common/utils/wifi_common_event_helper.h diff --git a/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp b/wifi/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp rename to wifi/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp diff --git a/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.h b/wifi/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.h similarity index 100% rename from services/wifi_standard/wifi_framework/common/utils/wifi_global_func.h rename to wifi/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn similarity index 58% rename from services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn index df64b05..9e6c25a 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn @@ -15,7 +15,7 @@ import("//build/ohos.gni") import("//build/ohos/sa_profile/sa_profile.gni") import("//build/ohos_var.gni") import("//foundation/appexecfwk/standard/appexecfwk.gni") -import("//foundation/communication/wifi/wifi.gni") +import("//foundation/communication/wifi/wifi/wifi.gni") ################################################################################ @@ -26,24 +26,25 @@ config("wifi_manager_service_header") { "//foundation/ace/ace_engine/frameworks/base/utils", "//foundation/ace/ace_engine/frameworks", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk/", - "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces", - "//foundation/communication/wifi/services/wifi_standard/ipc_framework/cRPC/include", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/include", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/utils", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/config", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/interfaces", - "//foundation/communication/wifi/utils/inc", + "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces", + "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p", + "$DHCP_ROOT_DIR/services/mgr_service/include", + "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/include", + "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/interfaces", + "$WIFI_ROOT_DIR/utils/inc", "${aafwk_path}/interfaces/innerkits/want/include", "${aafwk_path}/interfaces/innerkits/want/include/ohos/aafwk/content", "//foundation/appexecfwk/adapter/interfaces/innerkits/appexecfwk_base/include", @@ -73,7 +74,7 @@ config("wifi_manager_service_config") { } ohos_source_set("wifi_scan_service_impl") { - part_name = "wifi_standard" + part_name = "wifi" sources = [ "wifi_scan_callback_proxy.cpp", "wifi_scan_death_recipient.cpp", @@ -88,7 +89,7 @@ ohos_source_set("wifi_scan_service_impl") { external_deps = [ "ipc:ipc_core" ] } ohos_source_set("wifi_device_service_impl") { - part_name = "wifi_standard" + part_name = "wifi" sources = [ "wifi_device_callback_proxy.cpp", "wifi_device_death_recipient.cpp", @@ -102,7 +103,7 @@ ohos_source_set("wifi_device_service_impl") { ":wifi_manager_service_header", ] - if (wifi_standard_feature_with_p2p) { + if (wifi_feature_with_p2p) { defines = [ "WIFI_SUPPORT_P2P" ] } @@ -110,7 +111,7 @@ ohos_source_set("wifi_device_service_impl") { external_deps = [ "ipc:ipc_core" ] } ohos_source_set("wifi_hotspot_service_impl") { - part_name = "wifi_standard" + part_name = "wifi" sources = [ "wifi_hotspot_callback_proxy.cpp", "wifi_hotspot_death_recipient.cpp", @@ -125,11 +126,11 @@ ohos_source_set("wifi_hotspot_service_impl") { external_deps = [ "ipc:ipc_core" ] } ohos_source_set("wifi_p2p_service_impl") { - part_name = "wifi_standard" + part_name = "wifi" sources = [ - "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hid2d_msg.cpp", - "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_msg.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp", + "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hid2d_msg.cpp", + "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_msg.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp", "wifi_hid2d_cfg.cpp", "wifi_hid2d_service_utils.cpp", "wifi_p2p_callback_proxy.cpp", @@ -152,19 +153,19 @@ ohos_source_set("wifi_p2p_service_impl") { ohos_shared_library("wifi_manager_service") { install_enable = true sources = [ - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log/log_helper.c", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/base_address.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/network_interface.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/utils/wifi_common_event_helper.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_helper.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_utils.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log/log_helper.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/base_address.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/network_interface.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils/wifi_common_event_helper.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_helper.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_utils.cpp", "wifi_auth_center.cpp", "wifi_config_center.cpp", "wifi_dumper.cpp", @@ -175,13 +176,13 @@ ohos_shared_library("wifi_manager_service") { ] deps = [ + "$WIFI_ROOT_DIR/services/wifi_standard/etc/init:etc", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", + "$WIFI_ROOT_DIR/utils/src:wifi_utils", "${aafwk_path}/interfaces/innerkits/base:base", "${aafwk_path}/interfaces/innerkits/want:want", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//foundation/communication/netmanager_base/services/netmanagernative:netsys_native_manager", - "//foundation/communication/wifi/services/wifi_standard/etc/init:etc", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", - "//foundation/communication/wifi/utils/src:wifi_utils", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//utils/native/base:utils", ] @@ -195,7 +196,7 @@ ohos_shared_library("wifi_manager_service") { "netmanager_base:net_conn_manager_if", ] - part_name = "wifi_standard" + part_name = "wifi" subsystem_name = "communication" } ohos_shared_library("wifi_device_ability") { @@ -203,15 +204,15 @@ ohos_shared_library("wifi_device_ability") { deps = [ ":wifi_device_service_impl", ":wifi_manager_service", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", + "$WIFI_ROOT_DIR/utils/src:wifi_utils", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", - "//foundation/communication/wifi/utils/src:wifi_utils", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//utils/native/base:utils", ] external_deps = [ "ipc:ipc_core" ] - part_name = "wifi_standard" + part_name = "wifi" subsystem_name = "communication" } ohos_shared_library("wifi_scan_ability") { @@ -219,14 +220,14 @@ ohos_shared_library("wifi_scan_ability") { deps = [ ":wifi_manager_service", ":wifi_scan_service_impl", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//utils/native/base:utils", ] external_deps = [ "ipc:ipc_core" ] - part_name = "wifi_standard" + part_name = "wifi" subsystem_name = "communication" } ohos_shared_library("wifi_hotspot_ability") { @@ -234,14 +235,14 @@ ohos_shared_library("wifi_hotspot_ability") { deps = [ ":wifi_hotspot_service_impl", ":wifi_manager_service", + "$WIFI_ROOT_DIR/utils/src:wifi_utils", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//foundation/communication/wifi/utils/src:wifi_utils", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//utils/native/base:utils", ] external_deps = [ "ipc:ipc_core" ] - part_name = "wifi_standard" + part_name = "wifi" subsystem_name = "communication" } ohos_shared_library("wifi_p2p_ability") { @@ -249,13 +250,13 @@ ohos_shared_library("wifi_p2p_ability") { deps = [ ":wifi_manager_service", ":wifi_p2p_service_impl", + "$WIFI_ROOT_DIR/utils/src:wifi_utils", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//foundation/communication/wifi/utils/src:wifi_utils", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//utils/native/base:utils", ] external_deps = [ "ipc:ipc_core" ] - part_name = "wifi_standard" + part_name = "wifi" subsystem_name = "communication" } diff --git a/services/wifi_standard/wifi_framework/wifi_manage/common/handler.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/handler.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/common/handler.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/common/handler.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/common/handler.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/handler.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/common/handler.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/common/handler.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/common/internal_message.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/internal_message.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/common/internal_message.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/common/internal_message.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/common/internal_message.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/internal_message.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/common/internal_message.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/common/internal_message.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/common/state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/common/state.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/common/state.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/common/state.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_broadcast_helper.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_broadcast_helper.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/common/wifi_broadcast_helper.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_broadcast_helper.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_broadcast_helper.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_broadcast_helper.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/common/wifi_broadcast_helper.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_broadcast_helper.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_helper.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_helper.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_helper.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_helper.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_helper.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_helper.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_helper.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_helper.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_utils.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_utils.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_utils.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_utils.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_utils.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_utils.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_utils.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_utils.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/BUILD.gn similarity index 50% rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/BUILD.gn rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/BUILD.gn index 08e9068..42c04af 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/BUILD.gn @@ -12,22 +12,23 @@ # limitations under the License. import("//build/ohos.gni") +import("//foundation/communication/wifi/wifi/wifi.gni") config("wifi_fw_common_header") { include_dirs = [ "idl_interface", "//utils/native/base/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", - "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces", - "//foundation/communication/wifi/services/wifi_standard/sdk/include", - "//foundation/communication/wifi/services/wifi_standard/ipc_framework/cRPC/include", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/include", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/config", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/utils", - "//foundation/communication/wifi/services/wifi_standard/ipc_framework/interface", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client", + "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces", + "$WIFI_ROOT_DIR/services/wifi_standard/sdk/include", + "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils", + "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/interface", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client", ] } @@ -46,8 +47,8 @@ config("wifi_idl_cxx_config") { } ohos_source_set("wifi_utils") { - part_name = "wifi_standard" - sources = [ "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp" ] + part_name = "wifi" + sources = [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp" ] configs = [ ":wifi_idl_cxx_config", @@ -56,15 +57,15 @@ ohos_source_set("wifi_utils") { } ohos_source_set("net_helper") { - part_name = "wifi_standard" + part_name = "wifi" sources = [ - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/base_address.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/http_request.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/network_interface.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/base_address.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/http_request.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/network_interface.cpp", ] configs = [ @@ -74,8 +75,8 @@ ohos_source_set("net_helper") { } ohos_source_set("log_helper") { - part_name = "wifi_standard" - sources = [ "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log/log_helper.c" ] + part_name = "wifi" + sources = [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log/log_helper.c" ] configs = [ ":wifi_fw_common_header" ] } @@ -83,8 +84,8 @@ ohos_source_set("log_helper") { ohos_shared_library("wifi_idl_client") { install_enable = true sources = [ - "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hid2d_msg.cpp", - "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_msg.cpp", + "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hid2d_msg.cpp", + "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_msg.cpp", "idl_interface/i_wifi.c", "idl_interface/i_wifi_chip.c", "idl_interface/i_wifi_hotspot_iface.c", @@ -109,7 +110,7 @@ ohos_shared_library("wifi_idl_client") { ":log_helper", ":net_helper", ":wifi_utils", - "//foundation/communication/wifi/services/wifi_standard/ipc_framework/cRPC:crpc_client", + "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC:crpc_client", "//utils/native/base:utils", ] @@ -124,6 +125,6 @@ ohos_shared_library("wifi_idl_client") { "-Wl,-E", ] - part_name = "wifi_standard" + part_name = "wifi" subsystem_name = "communication" } diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi.c b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi.c similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi.c rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi.c diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_chip.c b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_chip.c similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_chip.c rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_chip.c diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_chip.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_chip.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_chip.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_chip.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_chip_event_callback.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_chip_event_callback.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_chip_event_callback.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_chip_event_callback.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_event_callback.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_event_callback.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_event_callback.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_event_callback.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_event_p2p_callback.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_event_p2p_callback.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_event_p2p_callback.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_event_p2p_callback.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_hotspot_iface.c b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_hotspot_iface.c similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_hotspot_iface.c rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_hotspot_iface.c diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_hotspot_iface.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_hotspot_iface.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_hotspot_iface.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_hotspot_iface.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_iface.c b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_iface.c similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_iface.c rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_iface.c diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_iface.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_iface.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_iface.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_iface.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_p2p_iface.c b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_p2p_iface.c similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_p2p_iface.c rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_p2p_iface.c diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_p2p_iface.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_p2p_iface.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_p2p_iface.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_p2p_iface.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_public_func.c b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_public_func.c similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_public_func.c rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_public_func.c diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_public_func.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_public_func.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_public_func.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_public_func.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.c b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.c similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.c rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.c diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_struct.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_struct.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_struct.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_struct.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_supplicant_iface.c b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_supplicant_iface.c similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_supplicant_iface.c rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_supplicant_iface.c diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_supplicant_iface.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_supplicant_iface.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_supplicant_iface.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_supplicant_iface.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/supplicant_event_callback.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/supplicant_event_callback.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/supplicant_event_callback.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/supplicant_event_callback.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_ap_event_callback.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_ap_event_callback.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_ap_event_callback.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_ap_event_callback.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_ap_hal_interface.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_ap_hal_interface.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_ap_hal_interface.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_ap_hal_interface.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_ap_hal_interface.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_ap_hal_interface.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_ap_hal_interface.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_ap_hal_interface.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_base_hal_interface.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_base_hal_interface.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_base_hal_interface.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_base_hal_interface.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_base_hal_interface.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_base_hal_interface.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_base_hal_interface.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_base_hal_interface.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_chip_event_callback.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_chip_event_callback.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_chip_event_callback.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_chip_event_callback.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_chip_hal_interface.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_chip_hal_interface.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_chip_hal_interface.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_chip_hal_interface.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_chip_hal_interface.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_chip_hal_interface.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_chip_hal_interface.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_chip_hal_interface.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_error_no.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_error_no.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_error_no.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_error_no.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_event_callback.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_event_callback.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_event_callback.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_event_callback.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_define.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_define.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_define.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_define.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_struct.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_struct.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_struct.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_struct.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_p2p_event_callback.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_p2p_event_callback.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_p2p_event_callback.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_p2p_event_callback.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_p2p_hal_interface.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_p2p_hal_interface.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_p2p_hal_interface.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_p2p_hal_interface.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_p2p_hal_interface.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_p2p_hal_interface.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_p2p_hal_interface.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_p2p_hal_interface.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_scan_param.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_scan_param.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_scan_param.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_scan_param.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_sta_hal_interface.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_sta_hal_interface.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_sta_hal_interface.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_sta_hal_interface.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_sta_hal_interface.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_sta_hal_interface.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_sta_hal_interface.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_sta_hal_interface.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_sta_request.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_sta_request.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_sta_request.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_sta_request.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_supplicant_hal_interface.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_supplicant_hal_interface.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_supplicant_hal_interface.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_supplicant_hal_interface.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_supplicant_hal_interface.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_supplicant_hal_interface.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_supplicant_hal_interface.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_supplicant_hal_interface.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn similarity index 38% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn index a34de40..7be2357 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2021 Huawei Device Co., Ltd. +# Copyright (C) 2021-2022 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -12,18 +12,18 @@ # limitations under the License. import("//build/ohos.gni") -import("//foundation/communication/wifi/wifi.gni") +import("//foundation/communication/wifi/wifi/wifi.gni") ohos_shared_library("wifi_ap_service") { install_enable = true sources = [ + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/dhcpd_interface.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp", "../common/handler.cpp", "../common/internal_message.cpp", "../common/message_queue.cpp", "../common/state.cpp", "../common/state_machine.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/dhcpd_interface.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp", "ap_config_use.cpp", "ap_idle_state.cpp", "ap_interface.cpp", @@ -37,24 +37,26 @@ ohos_shared_library("wifi_ap_service") { ] include_dirs = [ - "//foundation/communication/wifi/services/wifi_standard/ipc_framework/interface", + "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/interface", "//utils/native/base/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", - "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces", - "//foundation/communication/wifi/services/wifi_standard/ipc_framework/cRPC/include", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/include", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/config", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/utils", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/include", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/interfaces", + "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces", + "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface", + "$DHCP_ROOT_DIR/services/mgr_service/include", + "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/include", + "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/interfaces", + "$WIFI_ROOT_DIR/utils/inc", ] cflags_cc = [ @@ -70,14 +72,15 @@ ohos_shared_library("wifi_ap_service") { external_deps = [ "hiviewdfx_hilog_native:libhilog" ] deps = [ - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service:dhcp_manager_service", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", + "$DHCP_ROOT_DIR/services/mgr_service:dhcp_manager_service", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", + "$WIFI_ROOT_DIR/utils/src:wifi_utils", "//utils/native/base:utils", ] - defines = [ "AP_INTF=\"$wifi_standard_feature_with_ap_intf\"" ] + defines = [ "AP_INTF=\"$wifi_feature_with_ap_intf\"" ] - part_name = "wifi_standard" + part_name = "wifi" subsystem_name = "communication" } diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_define.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_define.h similarity index 98% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_define.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_define.h index 3a832bf..54c7c54 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_define.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_define.h @@ -54,4 +54,4 @@ enum class ApStatemachineEvent { using HandlerMethod = void(ApStatemachineEvent, int, int, const std::any &); } } // namespace OHOS -#endif /* OHOS_AP_DEFINE_H */ \ No newline at end of file +#endif /* OHOS_AP_DEFINE_H */ diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_idle_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_idle_state.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_idle_state.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_idle_state.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_idle_state.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_idle_state.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_idle_state.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_idle_state.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_interface.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_interface.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_interface.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_interface.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_interface.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_interface.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_interface.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_interface.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_macro.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_macro.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_macro.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_macro.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor.cpp similarity index 99% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor.cpp index a3b9277..8d6e28a 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor.cpp @@ -132,4 +132,4 @@ void ApMonitor::UnregisterHandler(const std::string &iface) } } } // namespace Wifi -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_root_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_root_state.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_root_state.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_root_state.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_root_state.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_root_state.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_root_state.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_root_state.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.cpp similarity index 99% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.cpp index 29f4b02..1c01a7e 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.cpp @@ -343,4 +343,4 @@ void ApStartedState::ProcessCmdDisconnectStation(InternalMessage &msg) const m_ApStateMachine.m_ApStationsManager.DisConnectStation(staInfo); } } // namespace Wifi -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine.cpp similarity index 99% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine.cpp index 4fa82b5..6c2cd08 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine.cpp @@ -170,4 +170,4 @@ void ApStateMachine::RegisterEventHandler() m_ApStationsManager.RegisterEventHandler(std::bind(&ApStateMachine::BroadCastStationChange, this, _1, _2)); } } // namespace Wifi -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/i_ap_service.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/i_ap_service.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/i_ap_service.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/i_ap_service.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/i_ap_service_callbacks.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/i_ap_service_callbacks.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/i_ap_service_callbacks.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/i_ap_service_callbacks.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_auth_center.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_auth_center.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_auth_center.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_auth_center.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_auth_center.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_auth_center.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_auth_center.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_auth_center.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_callback_proxy.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_callback_proxy.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_device_callback_proxy.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_callback_proxy.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_callback_proxy.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_callback_proxy.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_device_callback_proxy.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_callback_proxy.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_death_recipient.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_death_recipient.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_device_death_recipient.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_death_recipient.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_death_recipient.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_death_recipient.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_device_death_recipient.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_death_recipient.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_dumper.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_dumper.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_dumper.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_dumper.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_dumper.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_dumper.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_dumper.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_dumper.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_cfg.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_cfg.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_cfg.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_cfg.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_cfg.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_cfg.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_cfg.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_cfg.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_service_utils.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_service_utils.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_service_utils.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_service_utils.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_service_utils.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_service_utils.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_service_utils.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_service_utils.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_callback_proxy.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_callback_proxy.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_callback_proxy.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_callback_proxy.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_callback_proxy.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_callback_proxy.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_callback_proxy.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_callback_proxy.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_death_recipient.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_death_recipient.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_death_recipient.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_death_recipient.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_death_recipient.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_death_recipient.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_death_recipient.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_death_recipient.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_net_agent.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_net_agent.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_net_agent.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_net_agent.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_net_agent.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_net_agent.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_net_agent.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_net_agent.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/BUILD.gn similarity index 44% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/BUILD.gn rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/BUILD.gn index 703232f..945fc1e 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/BUILD.gn @@ -12,20 +12,21 @@ # limitations under the License. import("//build/ohos.gni") +import("//foundation/communication/wifi/wifi/wifi.gni") ohos_shared_library("wifi_p2p_service") { install_enable = true sources = [ - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/dhcpd_interface.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/handler.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/internal_message.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_broadcast_helper.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_service_utils.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/dhcpd_interface.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/handler.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/internal_message.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/state.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_broadcast_helper.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_service_utils.cpp", "authorizing_negotiation_request_state.cpp", "group_formed_state.cpp", "group_negotiation_state.cpp", @@ -66,22 +67,23 @@ ohos_shared_library("wifi_p2p_service") { "./", "//utils/native/base/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", - "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces", - "//foundation/communication/wifi/services/wifi_standard/ipc_framework/cRPC/include", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/include", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/config", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/utils", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/include", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/interfaces", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta", + "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces", + "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface", + "$DHCP_ROOT_DIR/services/mgr_service/include", + "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/include", + "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/interfaces", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta", ] cflags_cc = [ @@ -106,12 +108,12 @@ ohos_shared_library("wifi_p2p_service") { ] deps = [ - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service:dhcp_manager_service", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", + "$DHCP_ROOT_DIR/services/mgr_service:dhcp_manager_service", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", "//utils/native/base:utils", ] - part_name = "wifi_standard" + part_name = "wifi" subsystem_name = "communication" } diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/abstract_ui.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/abstract_ui.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/abstract_ui.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/abstract_ui.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/authorizing_negotiation_request_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/authorizing_negotiation_request_state.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/authorizing_negotiation_request_state.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/authorizing_negotiation_request_state.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/authorizing_negotiation_request_state.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/authorizing_negotiation_request_state.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/authorizing_negotiation_request_state.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/authorizing_negotiation_request_state.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_received_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_received_state.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_received_state.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_received_state.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_received_state.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_received_state.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_received_state.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_received_state.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_request_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_request_state.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_request_state.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_request_state.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_request_state.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_request_state.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_request_state.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_request_state.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/ip2p_service.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/ip2p_service.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/ip2p_service.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/ip2p_service.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/ip2p_service_callbacks.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/ip2p_service_callbacks.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/ip2p_service_callbacks.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/ip2p_service_callbacks.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_default_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_default_state.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_default_state.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_default_state.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_default_state.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_default_state.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_default_state.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_default_state.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_define.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_define.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_define.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_define.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_disabled_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_disabled_state.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_disabled_state.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_disabled_state.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_disabled_state.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_disabled_state.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_disabled_state.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_disabled_state.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_disabling_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_disabling_state.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_disabling_state.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_disabling_state.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_disabling_state.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_disabling_state.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_disabling_state.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_disabling_state.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabled_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabled_state.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabled_state.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabled_state.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabled_state.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabled_state.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabled_state.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabled_state.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabling_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabling_state.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabling_state.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabling_state.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabling_state.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabling_state.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabling_state.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabling_state.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_formation_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_formation_state.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_formation_state.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_formation_state.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_formation_state.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_formation_state.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_formation_state.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_formation_state.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_join_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_join_state.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_join_state.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_join_state.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_join_state.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_join_state.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_join_state.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_join_state.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_interface.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_interface.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_interface.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_interface.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_interface.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_interface.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_interface.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_interface.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_inviting_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_inviting_state.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_inviting_state.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_inviting_state.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_inviting_state.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_inviting_state.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_inviting_state.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_inviting_state.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_macro.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_macro.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_macro.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_macro.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_monitor.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_monitor.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_monitor.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_monitor.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_monitor.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_monitor.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_monitor.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_monitor.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/provision_discovery_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/provision_discovery_state.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/provision_discovery_state.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/provision_discovery_state.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/provision_discovery_state.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/provision_discovery_state.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/provision_discovery_state.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/provision_discovery_state.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_device_manager.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_device_manager.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_device_manager.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_device_manager.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_device_manager.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_device_manager.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_device_manager.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_device_manager.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_info.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_info.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_info.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_info.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_info.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_info.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_info.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_info.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_request.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_request.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_request.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_request.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_request.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_request.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_request.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_request.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_response.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_response.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_response.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_response.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_response.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_response.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_response.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_response.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_txt_record.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_txt_record.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_txt_record.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_txt_record.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_txt_record.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_txt_record.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_txt_record.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_txt_record.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_info_proxy.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_info_proxy.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_info_proxy.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_info_proxy.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_info_proxy.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_info_proxy.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_info_proxy.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_info_proxy.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_manager.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_manager.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_manager.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_manager.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_manager.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_manager.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_manager.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_manager.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_manager.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_manager.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_manager.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_manager.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_manager.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_manager.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_manager.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_manager.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_request_list.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_request_list.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_request_list.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_request_list.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_request_list.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_request_list.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_request_list.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_request_list.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_response_list.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_response_list.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_response_list.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_response_list.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_response_list.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_response_list.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_response_list.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_response_list.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_temp_disc_event.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_temp_disc_event.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_temp_disc_event.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_temp_disc_event.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_temp_disc_event.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_temp_disc_event.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_temp_disc_event.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_temp_disc_event.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_info.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_info.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_info.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_info.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_info.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_info.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_info.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_info.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_request.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_request.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_request.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_request.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_request.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_request.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_request.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_request.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_response.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_response.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_response.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_response.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_response.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_response.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_response.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_response.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_callback_proxy.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_callback_proxy.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_callback_proxy.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_callback_proxy.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_callback_proxy.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_callback_proxy.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_callback_proxy.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_callback_proxy.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_death_recipient.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_death_recipient.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_death_recipient.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_death_recipient.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_death_recipient.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_death_recipient.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_death_recipient.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_death_recipient.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_protect.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_protect.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_protect.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_protect.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_protect.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_protect.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_protect.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_protect.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_protect_manager.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_protect_manager.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_protect_manager.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_protect_manager.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_protect_manager.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_protect_manager.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_protect_manager.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_protect_manager.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn similarity index 34% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn index caa661a..509ec19 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2021 Huawei Device Co., Ltd. +# Copyright (C) 2021-2022 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -12,16 +12,17 @@ # limitations under the License. import("//build/ohos.gni") +import("//foundation/communication/wifi/wifi/wifi.gni") ohos_shared_library("wifi_scan_service") { install_enable = true sources = [ + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log/log_helper.c", "../common/handler.cpp", "../common/internal_message.cpp", "../common/message_queue.cpp", "../common/state.cpp", "../common/state_machine.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log/log_helper.c", "scan_interface.cpp", "scan_monitor.cpp", "scan_service.cpp", @@ -30,33 +31,33 @@ ohos_shared_library("wifi_scan_service") { include_dirs = [ "//utils/native/base/include", - "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces", - "//foundation/communication/wifi/services/wifi_standard/ipc_framework/interface", - "//foundation/communication/wifi/services/wifi_standard/ipc_framework/cRPC/include", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/include", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/config", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/utils", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/net_conf", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta", + "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces", + "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/interface", + "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/net_conf", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", - "//foundation/communication/wifi/services/wifi_standard/depends/include/hardware/libhardware/include", - "//foundation/communication/wifi/services/wifi_standard/depends/include/system/core/include", - "//foundation/communication/wifi/services/wifi_standard/depends/include/frameworks/native/include", - "//foundation/communication/wifi/services/wifi_standard/depends/include/system/core/libutils/include", - "//foundation/communication/wifi/services/wifi_standard/depends/include/system/core/base/include", - "//foundation/communication/wifi/services/wifi_standard/depends/include/system/libbase/include", + "$WIFI_ROOT_DIR/services/wifi_standard/depends/include/hardware/libhardware/include", + "$WIFI_ROOT_DIR/services/wifi_standard/depends/include/system/core/include", + "$WIFI_ROOT_DIR/services/wifi_standard/depends/include/frameworks/native/include", + "$WIFI_ROOT_DIR/services/wifi_standard/depends/include/system/core/libutils/include", + "$WIFI_ROOT_DIR/services/wifi_standard/depends/include/system/core/base/include", + "$WIFI_ROOT_DIR/services/wifi_standard/depends/include/system/libbase/include", ] deps = [ - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", "//utils/native/base:utils", ] @@ -71,6 +72,6 @@ ohos_shared_library("wifi_scan_service") { "-Wl,-E", ] - part_name = "wifi_standard" + part_name = "wifi" subsystem_name = "communication" } diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/iscan_service.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/iscan_service.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/iscan_service.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/iscan_service.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/iscan_service_callbacks.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/iscan_service_callbacks.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/iscan_service_callbacks.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/iscan_service_callbacks.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_common.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_common.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_common.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_common.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_monitor.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_monitor.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_monitor.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_monitor.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_monitor.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_monitor.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_monitor.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_monitor.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_callback_proxy.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_callback_proxy.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_callback_proxy.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_callback_proxy.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_callback_proxy.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_callback_proxy.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_callback_proxy.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_callback_proxy.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_death_recipient.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_death_recipient.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_death_recipient.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_death_recipient.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_death_recipient.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_death_recipient.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_death_recipient.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_death_recipient.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_service_impl.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_service_impl.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_service_impl.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_service_impl.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_service_impl.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_service_impl.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_service_impl.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_stub.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_stub.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_stub.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_stub.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_stub.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_stub.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_stub.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_stub.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn similarity index 32% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn index 402f902..f4d8196 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn @@ -12,19 +12,20 @@ # limitations under the License. import("//build/ohos.gni") +import("//foundation/communication/wifi/wifi/wifi.gni") ohos_shared_library("wifi_sta_service") { install_enable = true sources = [ + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log/log_helper.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/http_request.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp", "../common/handler.cpp", "../common/internal_message.cpp", "../common/message_queue.cpp", "../common/state.cpp", "../common/state_machine.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log/log_helper.c", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/http_request.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp", "sta_auto_connect_service.cpp", "sta_interface.cpp", "sta_monitor.cpp", @@ -34,34 +35,35 @@ ohos_shared_library("wifi_sta_service") { "sta_state_machine.cpp", ] include_dirs = [ - "//foundation/communication/wifi/services/wifi_standard/sdk/include", + "$WIFI_ROOT_DIR/services/wifi_standard/sdk/include", "//utils/native/base/include", - "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces", - "//foundation/communication/wifi/services/wifi_standard/ipc_framework/interface", - "//foundation/communication/wifi/services/wifi_standard/ipc_framework/cRPC/include", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/include", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/utils", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/config", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/net_conf", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta", + "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces", + "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/interface", + "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/net_conf", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", - "//foundation/communication/wifi/services/wifi_standard/depends/include/hardware/libhardware/include", - "//foundation/communication/wifi/services/wifi_standard/depends/include/system/core/include", - "//foundation/communication/wifi/services/wifi_standard/depends/include/frameworks/native/include", - "//foundation/communication/wifi/services/wifi_standard/depends/include/system/core/libutils/include", - "//foundation/communication/wifi/services/wifi_standard/depends/include/system/core/base/include", - "//foundation/communication/wifi/services/wifi_standard/depends/include/system/libbase/include", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/interfaces", + "$WIFI_ROOT_DIR/services/wifi_standard/depends/include/hardware/libhardware/include", + "$WIFI_ROOT_DIR/services/wifi_standard/depends/include/system/core/include", + "$WIFI_ROOT_DIR/services/wifi_standard/depends/include/frameworks/native/include", + "$WIFI_ROOT_DIR/services/wifi_standard/depends/include/system/core/libutils/include", + "$WIFI_ROOT_DIR/services/wifi_standard/depends/include/system/core/base/include", + "$WIFI_ROOT_DIR/services/wifi_standard/depends/include/system/libbase/include", + "$DHCP_ROOT_DIR/services/mgr_service/include", + "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/include", + "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/interfaces", "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", - "//foundation/communication/wifi/utils/inc", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage", + "$WIFI_ROOT_DIR/utils/inc", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage", ] cflags_cc = [ @@ -75,10 +77,10 @@ ohos_shared_library("wifi_sta_service") { ] deps = [ - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service:dhcp_manager_service", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", - "//foundation/communication/wifi/utils/src:wifi_utils", + "$DHCP_ROOT_DIR/services/mgr_service:dhcp_manager_service", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", + "$WIFI_ROOT_DIR/utils/src:wifi_utils", "//utils/native/base:utils", ] @@ -87,6 +89,6 @@ ohos_shared_library("wifi_sta_service") { "netmanager_base:net_conn_manager_if", ] - part_name = "wifi_standard" + part_name = "wifi" subsystem_name = "communication" } diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/ista_service.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/ista_service.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/ista_service.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/ista_service.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_define.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_define.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_define.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_define.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_device_appraisal.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_device_appraisal.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_device_appraisal.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_device_appraisal.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service_callback.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service_callback.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service_callback.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service_callback.h diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h similarity index 100% rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h diff --git a/services/wifi_standard/wifi_hal/BUILD.gn b/wifi/services/wifi_standard/wifi_hal/BUILD.gn similarity index 66% rename from services/wifi_standard/wifi_hal/BUILD.gn rename to wifi/services/wifi_standard/wifi_hal/BUILD.gn index f420d6c..f101142 100644 --- a/services/wifi_standard/wifi_hal/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_hal/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2021 Huawei Device Co., Ltd. +# Copyright (C) 2021-2022 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -12,7 +12,7 @@ # limitations under the License. import("//build/ohos.gni") -import("//foundation/communication/wifi/wifi.gni") +import("//foundation/communication/wifi/wifi/wifi.gni") ohos_executable("wifi_hal_service") { install_enable = true @@ -45,14 +45,14 @@ ohos_executable("wifi_hal_service") { include_dirs = [ "//utils/native/base/include", - "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces", - "//foundation/communication/wifi/services/wifi_standard/ipc_framework/cRPC/include", - "//foundation/communication/wifi/services/wifi_standard/wifi_hal", - "//foundation/communication/wifi/services/wifi_standard/wifi_hal/common", - "//foundation/communication/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal", - "//foundation/communication/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal", - "//foundation/communication/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal", - "//foundation/communication/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal", + "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces", + "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/common", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", "//third_party/wpa_supplicant/wpa_supplicant-2.9_standard/src/", "//third_party/bounds_checking_function/include/", @@ -61,21 +61,21 @@ ohos_executable("wifi_hal_service") { ] deps = [ + "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC:crpc_server", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/etc/init:etc", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//drivers/peripheral/wlan/hal:wifi_hal", - "//foundation/communication/wifi/services//wifi_standard/wifi_hal/etc/init:etc", - "//foundation/communication/wifi/services/wifi_standard/ipc_framework/cRPC:crpc_server", "//third_party/wpa_supplicant/wpa_supplicant-2.9_standard:wpa_client", "//utils/native/base:utils", ] cflags_cc = [ "-fno-rtti" ] - defines = [ "AP_INTF=\"$wifi_standard_feature_with_ap_intf\"" ] + defines = [ "AP_INTF=\"$wifi_feature_with_ap_intf\"" ] if (product_name == "rk3568") { defines += [ "PRODUCT_RK" ] } - part_name = "wifi_standard" + part_name = "wifi" subsystem_name = "communication" } diff --git a/services/wifi_standard/wifi_hal/common/wifi_hal_common_func.c b/wifi/services/wifi_standard/wifi_hal/common/wifi_hal_common_func.c similarity index 100% rename from services/wifi_standard/wifi_hal/common/wifi_hal_common_func.c rename to wifi/services/wifi_standard/wifi_hal/common/wifi_hal_common_func.c diff --git a/services/wifi_standard/wifi_hal/common/wifi_hal_common_func.h b/wifi/services/wifi_standard/wifi_hal/common/wifi_hal_common_func.h similarity index 100% rename from services/wifi_standard/wifi_hal/common/wifi_hal_common_func.h rename to wifi/services/wifi_standard/wifi_hal/common/wifi_hal_common_func.h diff --git a/services/wifi_standard/wifi_hal/common/wifi_log.h b/wifi/services/wifi_standard/wifi_hal/common/wifi_log.h similarity index 100% rename from services/wifi_standard/wifi_hal/common/wifi_log.h rename to wifi/services/wifi_standard/wifi_hal/common/wifi_log.h diff --git a/services/wifi_standard/wifi_hal/etc/init/BUILD.gn b/wifi/services/wifi_standard/wifi_hal/etc/init/BUILD.gn similarity index 92% rename from services/wifi_standard/wifi_hal/etc/init/BUILD.gn rename to wifi/services/wifi_standard/wifi_hal/etc/init/BUILD.gn index ce46f1a..5618b74 100644 --- a/services/wifi_standard/wifi_hal/etc/init/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_hal/etc/init/BUILD.gn @@ -25,14 +25,14 @@ group("etc") { ohos_prebuilt_etc("wifi_hal_service.cfg") { source = "wifi_hal_service.cfg" relative_install_dir = "init" - part_name = "wifi_standard" + part_name = "wifi" subsystem_name = "communication" } ohos_prebuilt_etc("wpa_supplicant.conf") { source = "wpa_supplicant.conf" relative_install_dir = "wifi" - part_name = "wifi_standard" + part_name = "wifi" subsystem_name = "communication" } @@ -42,13 +42,13 @@ ohos_prebuilt_etc("hostapd.conf") { source = "default_conf/hostapd.conf" } relative_install_dir = "wifi" - part_name = "wifi_standard" + part_name = "wifi" subsystem_name = "communication" } ohos_prebuilt_etc("p2p_supplicant.conf") { source = "p2p_supplicant.conf" relative_install_dir = "wifi" - part_name = "wifi_standard" + part_name = "wifi" subsystem_name = "communication" } diff --git a/services/wifi_standard/wifi_hal/etc/init/default_conf/hostapd.conf b/wifi/services/wifi_standard/wifi_hal/etc/init/default_conf/hostapd.conf similarity index 100% rename from services/wifi_standard/wifi_hal/etc/init/default_conf/hostapd.conf rename to wifi/services/wifi_standard/wifi_hal/etc/init/default_conf/hostapd.conf diff --git a/services/wifi_standard/wifi_hal/etc/init/hostapd.conf b/wifi/services/wifi_standard/wifi_hal/etc/init/hostapd.conf similarity index 100% rename from services/wifi_standard/wifi_hal/etc/init/hostapd.conf rename to wifi/services/wifi_standard/wifi_hal/etc/init/hostapd.conf diff --git a/services/wifi_standard/wifi_hal/etc/init/p2p_supplicant.conf b/wifi/services/wifi_standard/wifi_hal/etc/init/p2p_supplicant.conf similarity index 100% rename from services/wifi_standard/wifi_hal/etc/init/p2p_supplicant.conf rename to wifi/services/wifi_standard/wifi_hal/etc/init/p2p_supplicant.conf diff --git a/services/wifi_standard/wifi_hal/etc/init/wifi_hal_service.cfg b/wifi/services/wifi_standard/wifi_hal/etc/init/wifi_hal_service.cfg similarity index 100% rename from services/wifi_standard/wifi_hal/etc/init/wifi_hal_service.cfg rename to wifi/services/wifi_standard/wifi_hal/etc/init/wifi_hal_service.cfg diff --git a/services/wifi_standard/wifi_hal/etc/init/wpa_supplicant.conf b/wifi/services/wifi_standard/wifi_hal/etc/init/wpa_supplicant.conf similarity index 100% rename from services/wifi_standard/wifi_hal/etc/init/wpa_supplicant.conf rename to wifi/services/wifi_standard/wifi_hal/etc/init/wpa_supplicant.conf diff --git a/services/wifi_standard/wifi_hal/main.c b/wifi/services/wifi_standard/wifi_hal/main.c similarity index 100% rename from services/wifi_standard/wifi_hal/main.c rename to wifi/services/wifi_standard/wifi_hal/main.c diff --git a/services/wifi_standard/wifi_hal/wifi_hal_adapter.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_adapter.c similarity index 100% rename from services/wifi_standard/wifi_hal/wifi_hal_adapter.c rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_adapter.c diff --git a/services/wifi_standard/wifi_hal/wifi_hal_adapter.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_adapter.h similarity index 100% rename from services/wifi_standard/wifi_hal/wifi_hal_adapter.h rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_adapter.h diff --git a/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c similarity index 100% rename from services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c diff --git a/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.h similarity index 100% rename from services/wifi_standard/wifi_hal/wifi_hal_ap_interface.h rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.h diff --git a/services/wifi_standard/wifi_hal/wifi_hal_base_interface.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_base_interface.c similarity index 100% rename from services/wifi_standard/wifi_hal/wifi_hal_base_interface.c rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_base_interface.c diff --git a/services/wifi_standard/wifi_hal/wifi_hal_base_interface.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_base_interface.h similarity index 100% rename from services/wifi_standard/wifi_hal/wifi_hal_base_interface.h rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_base_interface.h diff --git a/services/wifi_standard/wifi_hal/wifi_hal_callback.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_callback.c similarity index 100% rename from services/wifi_standard/wifi_hal/wifi_hal_callback.c rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_callback.c diff --git a/services/wifi_standard/wifi_hal/wifi_hal_callback.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_callback.h similarity index 100% rename from services/wifi_standard/wifi_hal/wifi_hal_callback.h rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_callback.h diff --git a/services/wifi_standard/wifi_hal/wifi_hal_chip_interface.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_chip_interface.c similarity index 100% rename from services/wifi_standard/wifi_hal/wifi_hal_chip_interface.c rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_chip_interface.c diff --git a/services/wifi_standard/wifi_hal/wifi_hal_chip_interface.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_chip_interface.h similarity index 100% rename from services/wifi_standard/wifi_hal/wifi_hal_chip_interface.h rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_chip_interface.h diff --git a/services/wifi_standard/wifi_hal/wifi_hal_crpc_ap.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_ap.c similarity index 100% rename from services/wifi_standard/wifi_hal/wifi_hal_crpc_ap.c rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_ap.c diff --git a/services/wifi_standard/wifi_hal/wifi_hal_crpc_ap.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_ap.h similarity index 100% rename from services/wifi_standard/wifi_hal/wifi_hal_crpc_ap.h rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_ap.h diff --git a/services/wifi_standard/wifi_hal/wifi_hal_crpc_base.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_base.c similarity index 100% rename from services/wifi_standard/wifi_hal/wifi_hal_crpc_base.c rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_base.c diff --git a/services/wifi_standard/wifi_hal/wifi_hal_crpc_base.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_base.h similarity index 100% rename from services/wifi_standard/wifi_hal/wifi_hal_crpc_base.h rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_base.h diff --git a/services/wifi_standard/wifi_hal/wifi_hal_crpc_chip.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_chip.c similarity index 100% rename from services/wifi_standard/wifi_hal/wifi_hal_crpc_chip.c rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_chip.c diff --git a/services/wifi_standard/wifi_hal/wifi_hal_crpc_chip.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_chip.h similarity index 100% rename from services/wifi_standard/wifi_hal/wifi_hal_crpc_chip.h rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_chip.h diff --git a/services/wifi_standard/wifi_hal/wifi_hal_crpc_common.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_common.c similarity index 100% rename from services/wifi_standard/wifi_hal/wifi_hal_crpc_common.c rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_common.c diff --git a/services/wifi_standard/wifi_hal/wifi_hal_crpc_common.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_common.h similarity index 100% rename from services/wifi_standard/wifi_hal/wifi_hal_crpc_common.h rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_common.h diff --git a/services/wifi_standard/wifi_hal/wifi_hal_crpc_p2p.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_p2p.c similarity index 100% rename from services/wifi_standard/wifi_hal/wifi_hal_crpc_p2p.c rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_p2p.c diff --git a/services/wifi_standard/wifi_hal/wifi_hal_crpc_p2p.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_p2p.h similarity index 100% rename from services/wifi_standard/wifi_hal/wifi_hal_crpc_p2p.h rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_p2p.h diff --git a/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.c similarity index 100% rename from services/wifi_standard/wifi_hal/wifi_hal_crpc_server.c rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.c diff --git a/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.h similarity index 100% rename from services/wifi_standard/wifi_hal/wifi_hal_crpc_server.h rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.h diff --git a/services/wifi_standard/wifi_hal/wifi_hal_crpc_sta.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_sta.c similarity index 100% rename from services/wifi_standard/wifi_hal/wifi_hal_crpc_sta.c rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_sta.c diff --git a/services/wifi_standard/wifi_hal/wifi_hal_crpc_sta.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_sta.h similarity index 100% rename from services/wifi_standard/wifi_hal/wifi_hal_crpc_sta.h rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_sta.h diff --git a/services/wifi_standard/wifi_hal/wifi_hal_crpc_supplicant.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_supplicant.c similarity index 100% rename from services/wifi_standard/wifi_hal/wifi_hal_crpc_supplicant.c rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_supplicant.c diff --git a/services/wifi_standard/wifi_hal/wifi_hal_crpc_supplicant.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_supplicant.h similarity index 100% rename from services/wifi_standard/wifi_hal/wifi_hal_crpc_supplicant.h rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_supplicant.h diff --git a/services/wifi_standard/wifi_hal/wifi_hal_define.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_define.h similarity index 100% rename from services/wifi_standard/wifi_hal/wifi_hal_define.h rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_define.h diff --git a/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.c similarity index 99% rename from services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.c rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.c index b1680ac..27ac14f 100644 --- a/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.c @@ -702,4 +702,4 @@ void ReleaseHostapdDev(void) free(g_hostapdHalDev); g_hostapdHalDev = NULL; } -} \ No newline at end of file +} diff --git a/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.h similarity index 100% rename from services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.h rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.h diff --git a/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_common.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_common.c similarity index 100% rename from services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_common.c rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_common.c diff --git a/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_common.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_common.h similarity index 100% rename from services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_common.h rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_common.h diff --git a/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c similarity index 100% rename from services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c diff --git a/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.h similarity index 100% rename from services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.h rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.h diff --git a/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal/wifi_p2p_hal.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal/wifi_p2p_hal.c similarity index 100% rename from services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal/wifi_p2p_hal.c rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal/wifi_p2p_hal.c diff --git a/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal/wifi_p2p_hal.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal/wifi_p2p_hal.h similarity index 100% rename from services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal/wifi_p2p_hal.h rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal/wifi_p2p_hal.h diff --git a/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c similarity index 100% rename from services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c diff --git a/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.h similarity index 100% rename from services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.h rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.h diff --git a/services/wifi_standard/wifi_hal/wifi_hal_module_manage.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module_manage.c similarity index 100% rename from services/wifi_standard/wifi_hal/wifi_hal_module_manage.c rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_module_manage.c diff --git a/services/wifi_standard/wifi_hal/wifi_hal_module_manage.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module_manage.h similarity index 100% rename from services/wifi_standard/wifi_hal/wifi_hal_module_manage.h rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_module_manage.h diff --git a/services/wifi_standard/wifi_hal/wifi_hal_p2p_interface.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_p2p_interface.c similarity index 100% rename from services/wifi_standard/wifi_hal/wifi_hal_p2p_interface.c rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_p2p_interface.c diff --git a/services/wifi_standard/wifi_hal/wifi_hal_p2p_interface.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_p2p_interface.h similarity index 100% rename from services/wifi_standard/wifi_hal/wifi_hal_p2p_interface.h rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_p2p_interface.h diff --git a/services/wifi_standard/wifi_hal/wifi_hal_p2p_struct.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_p2p_struct.h similarity index 100% rename from services/wifi_standard/wifi_hal/wifi_hal_p2p_struct.h rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_p2p_struct.h diff --git a/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c similarity index 100% rename from services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c diff --git a/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.h similarity index 100% rename from services/wifi_standard/wifi_hal/wifi_hal_sta_interface.h rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.h diff --git a/services/wifi_standard/wifi_hal/wifi_hal_struct.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_struct.h similarity index 100% rename from services/wifi_standard/wifi_hal/wifi_hal_struct.h rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_struct.h diff --git a/services/wifi_standard/wifi_hal/wifi_hal_vendor_interface.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_vendor_interface.c similarity index 100% rename from services/wifi_standard/wifi_hal/wifi_hal_vendor_interface.c rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_vendor_interface.c diff --git a/services/wifi_standard/wifi_hal/wifi_hal_vendor_interface.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_vendor_interface.h similarity index 100% rename from services/wifi_standard/wifi_hal/wifi_hal_vendor_interface.h rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_vendor_interface.h diff --git a/tests/wifi_standard/ipc_framework/cRPC/unittest/BUILD.gn b/wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/BUILD.gn similarity index 74% rename from tests/wifi_standard/ipc_framework/cRPC/unittest/BUILD.gn rename to wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/BUILD.gn index 6967280..a2e45a0 100644 --- a/tests/wifi_standard/ipc_framework/cRPC/unittest/BUILD.gn +++ b/wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2021 Huawei Device Co., Ltd. +# Copyright (C) 2021-2022 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -12,24 +12,24 @@ # limitations under the License. import("//build/test.gni") -SUBSYSTEM_DIR = "//foundation/communication/wifi" +import("//foundation/communication/wifi/wifi/wifi.gni") module_output_path = "wifi_standard/crpc_test" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ "//utils/native/base/include", - "$SUBSYSTEM_DIR/tests/wifi_standard/ipc_framework/cRPC/unittest", + "$WIFI_ROOT_DIR/tests/wifi_standard/ipc_framework/cRPC/unittest", ] } ohos_unittest("crpc_unittest") { module_out_path = module_output_path sources = [ - "$SUBSYSTEM_DIR/services/wifi_standard/ipc_framework/cRPC/src/context.c", - "$SUBSYSTEM_DIR/services/wifi_standard/ipc_framework/cRPC/src/hash_table.c", - "$SUBSYSTEM_DIR/services/wifi_standard/ipc_framework/cRPC/src/net.c", - "$SUBSYSTEM_DIR/services/wifi_standard/ipc_framework/cRPC/src/serial.c", + "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/src/context.c", + "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/src/hash_table.c", + "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/src/net.c", + "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/src/serial.c", "context_test.cpp", "hash_table_test.cpp", "net_test.cpp", @@ -38,7 +38,7 @@ ohos_unittest("crpc_unittest") { ] include_dirs = [ - "$SUBSYSTEM_DIR/services/wifi_standard/ipc_framework/cRPC/include", + "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", ] @@ -54,7 +54,7 @@ ohos_unittest("crpc_unittest") { external_deps = [ "hiviewdfx_hilog_native:libhilog" ] configs = [ ":module_private_config" ] - part_name = "wifi_standard" + part_name = "wifi" subsystem_name = "communication" testonly = true } diff --git a/tests/wifi_standard/ipc_framework/cRPC/unittest/context_test.cpp b/wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/context_test.cpp similarity index 100% rename from tests/wifi_standard/ipc_framework/cRPC/unittest/context_test.cpp rename to wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/context_test.cpp diff --git a/tests/wifi_standard/ipc_framework/cRPC/unittest/context_test.h b/wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/context_test.h similarity index 100% rename from tests/wifi_standard/ipc_framework/cRPC/unittest/context_test.h rename to wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/context_test.h diff --git a/tests/wifi_standard/ipc_framework/cRPC/unittest/hash_table_test.cpp b/wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/hash_table_test.cpp similarity index 100% rename from tests/wifi_standard/ipc_framework/cRPC/unittest/hash_table_test.cpp rename to wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/hash_table_test.cpp diff --git a/tests/wifi_standard/ipc_framework/cRPC/unittest/hash_table_test.h b/wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/hash_table_test.h similarity index 100% rename from tests/wifi_standard/ipc_framework/cRPC/unittest/hash_table_test.h rename to wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/hash_table_test.h diff --git a/tests/wifi_standard/ipc_framework/cRPC/unittest/net_test.cpp b/wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/net_test.cpp similarity index 100% rename from tests/wifi_standard/ipc_framework/cRPC/unittest/net_test.cpp rename to wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/net_test.cpp diff --git a/tests/wifi_standard/ipc_framework/cRPC/unittest/net_test.h b/wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/net_test.h similarity index 100% rename from tests/wifi_standard/ipc_framework/cRPC/unittest/net_test.h rename to wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/net_test.h diff --git a/tests/wifi_standard/ipc_framework/cRPC/unittest/rpc_test_main.cpp b/wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/rpc_test_main.cpp similarity index 100% rename from tests/wifi_standard/ipc_framework/cRPC/unittest/rpc_test_main.cpp rename to wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/rpc_test_main.cpp diff --git a/tests/wifi_standard/ipc_framework/cRPC/unittest/serial_test.cpp b/wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/serial_test.cpp similarity index 100% rename from tests/wifi_standard/ipc_framework/cRPC/unittest/serial_test.cpp rename to wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/serial_test.cpp diff --git a/tests/wifi_standard/ipc_framework/cRPC/unittest/serial_test.h b/wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/serial_test.h similarity index 100% rename from tests/wifi_standard/ipc_framework/cRPC/unittest/serial_test.h rename to wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/serial_test.h diff --git a/tests/wifi_standard/wifi_framework/common/unittest/BUILD.gn b/wifi/tests/wifi_standard/wifi_framework/common/unittest/BUILD.gn similarity index 59% rename from tests/wifi_standard/wifi_framework/common/unittest/BUILD.gn rename to wifi/tests/wifi_standard/wifi_framework/common/unittest/BUILD.gn index 81d472a..6339ee7 100644 --- a/tests/wifi_standard/wifi_framework/common/unittest/BUILD.gn +++ b/wifi/tests/wifi_standard/wifi_framework/common/unittest/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2021 Huawei Device Co., Ltd. +# Copyright (C) 2021-2022 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -12,30 +12,30 @@ # limitations under the License. import("//build/test.gni") -SUBSYSTEM_DIR = "//foundation/communication/wifi" +import("//foundation/communication/wifi/wifi/wifi.gni") module_output_path = "wifi_standard/common_test" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ "//utils/native/base/include", - "$SUBSYSTEM_DIR/tests/wifi_standard/wifi_framework/common/unittest", + "$WIFI_ROOT_DIR/tests/wifi_standard/wifi_framework/common/unittest", ] } ohos_unittest("common_unittest") { module_out_path = module_output_path sources = [ - "$SUBSYSTEM_DIR/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_msg.cpp", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/log/log_helper.c", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/net_helper/base_address.cpp", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.cpp", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.cpp", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/net_helper/network_interface.cpp", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp", + "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_msg.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log/log_helper.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/base_address.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/network_interface.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp", "common_test.cpp", "wifi_config_file_test.cpp", "wifi_global_func_test.cpp", @@ -46,12 +46,12 @@ ohos_unittest("common_unittest") { include_dirs = [ "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/include", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/net_helper", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/utils", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/log", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/config", - "$SUBSYSTEM_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config", + "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces", ] deps = [ "//utils/native/base:utils" ] @@ -64,7 +64,7 @@ ohos_unittest("common_unittest") { external_deps = [ "hiviewdfx_hilog_native:libhilog" ] configs = [ ":module_private_config" ] - part_name = "wifi_standard" + part_name = "wifi" subsystem_name = "communication" testonly = true } diff --git a/tests/wifi_standard/wifi_framework/common/unittest/common_test.cpp b/wifi/tests/wifi_standard/wifi_framework/common/unittest/common_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/common/unittest/common_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/common/unittest/common_test.cpp diff --git a/tests/wifi_standard/wifi_framework/common/unittest/wifi_config_file_test.cpp b/wifi/tests/wifi_standard/wifi_framework/common/unittest/wifi_config_file_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/common/unittest/wifi_config_file_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/common/unittest/wifi_config_file_test.cpp diff --git a/tests/wifi_standard/wifi_framework/common/unittest/wifi_config_file_test.h b/wifi/tests/wifi_standard/wifi_framework/common/unittest/wifi_config_file_test.h similarity index 100% rename from tests/wifi_standard/wifi_framework/common/unittest/wifi_config_file_test.h rename to wifi/tests/wifi_standard/wifi_framework/common/unittest/wifi_config_file_test.h diff --git a/tests/wifi_standard/wifi_framework/common/unittest/wifi_global_func_test.cpp b/wifi/tests/wifi_standard/wifi_framework/common/unittest/wifi_global_func_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/common/unittest/wifi_global_func_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/common/unittest/wifi_global_func_test.cpp diff --git a/tests/wifi_standard/wifi_framework/common/unittest/wifi_global_func_test.h b/wifi/tests/wifi_standard/wifi_framework/common/unittest/wifi_global_func_test.h similarity index 100% rename from tests/wifi_standard/wifi_framework/common/unittest/wifi_global_func_test.h rename to wifi/tests/wifi_standard/wifi_framework/common/unittest/wifi_global_func_test.h diff --git a/tests/wifi_standard/wifi_framework/common/unittest/wifi_ip_tools_test.cpp b/wifi/tests/wifi_standard/wifi_framework/common/unittest/wifi_ip_tools_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/common/unittest/wifi_ip_tools_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/common/unittest/wifi_ip_tools_test.cpp diff --git a/tests/wifi_standard/wifi_framework/common/unittest/wifi_ip_tools_test.h b/wifi/tests/wifi_standard/wifi_framework/common/unittest/wifi_ip_tools_test.h similarity index 100% rename from tests/wifi_standard/wifi_framework/common/unittest/wifi_ip_tools_test.h rename to wifi/tests/wifi_standard/wifi_framework/common/unittest/wifi_ip_tools_test.h diff --git a/tests/wifi_standard/wifi_framework/common/unittest/wifi_log_helper_test.cpp b/wifi/tests/wifi_standard/wifi_framework/common/unittest/wifi_log_helper_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/common/unittest/wifi_log_helper_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/common/unittest/wifi_log_helper_test.cpp diff --git a/tests/wifi_standard/wifi_framework/common/unittest/wifi_log_helper_test.h b/wifi/tests/wifi_standard/wifi_framework/common/unittest/wifi_log_helper_test.h similarity index 100% rename from tests/wifi_standard/wifi_framework/common/unittest/wifi_log_helper_test.h rename to wifi/tests/wifi_standard/wifi_framework/common/unittest/wifi_log_helper_test.h diff --git a/tests/wifi_standard/wifi_framework/common/unittest/wifi_network_interface_test.cpp b/wifi/tests/wifi_standard/wifi_framework/common/unittest/wifi_network_interface_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/common/unittest/wifi_network_interface_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/common/unittest/wifi_network_interface_test.cpp diff --git a/tests/wifi_standard/wifi_framework/common/unittest/wifi_network_interface_test.h b/wifi/tests/wifi_standard/wifi_framework/common/unittest/wifi_network_interface_test.h similarity index 100% rename from tests/wifi_standard/wifi_framework/common/unittest/wifi_network_interface_test.h rename to wifi/tests/wifi_standard/wifi_framework/common/unittest/wifi_network_interface_test.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/BUILD.gn b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/BUILD.gn similarity index 51% rename from tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/BUILD.gn rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/BUILD.gn index 188a037..4bef436 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/BUILD.gn +++ b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2021 Huawei Device Co., Ltd. +# Copyright (C) 2021-2022 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -12,39 +12,39 @@ # limitations under the License. import("//build/test.gni") -SUBSYSTEM_DIR = "//foundation/communication/wifi" +import("//foundation/communication/wifi/wifi/wifi.gni") module_output_path = "wifi_standard/idl_client_test" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ "//utils/native/base/include", - "$SUBSYSTEM_DIR/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest", + "$WIFI_ROOT_DIR/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest", ] } ohos_unittest("idl_client_unittest") { module_out_path = module_output_path sources = [ - "$SUBSYSTEM_DIR/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_msg.cpp", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi.c", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_chip.c", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_hotspot_iface.c", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_iface.c", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_p2p_iface.c", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_public_func.c", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.c", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_supplicant_iface.c", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_ap_hal_interface.cpp", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_base_hal_interface.cpp", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_chip_hal_interface.cpp", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.cpp", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_p2p_hal_interface.cpp", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_sta_hal_interface.cpp", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_supplicant_hal_interface.cpp", + "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_msg.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_chip.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_hotspot_iface.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_iface.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_p2p_iface.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_public_func.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_supplicant_iface.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_ap_hal_interface.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_base_hal_interface.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_chip_hal_interface.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_p2p_hal_interface.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_sta_hal_interface.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_supplicant_hal_interface.cpp", "idl_client_test_main.cpp", "wifi_ap_hal_interface_test.cpp", "wifi_base_hal_interface_test.cpp", @@ -57,22 +57,22 @@ ohos_unittest("idl_client_unittest") { ] include_dirs = [ - "$SUBSYSTEM_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces", - "$SUBSYSTEM_DIR/services/wifi_standard/ipc_framework/cRPC/include", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/include", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/config", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/net_helper", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/utils", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/log", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface", + "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces", + "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface", "//utils/native/base/include", "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", ] deps = [ - "$SUBSYSTEM_DIR/services/wifi_standard/ipc_framework/cRPC:crpc_client", + "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC:crpc_client", "//utils/native/base:utils", ] @@ -84,7 +84,7 @@ ohos_unittest("idl_client_unittest") { external_deps = [ "hiviewdfx_hilog_native:libhilog" ] configs = [ ":module_private_config" ] - part_name = "wifi_standard" + part_name = "wifi" subsystem_name = "communication" testonly = true } @@ -92,34 +92,34 @@ ohos_unittest("idl_client_unittest") { ohos_unittest("mock_wifi_hal_service") { module_out_path = module_output_path sources = [ - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/log/log_helper.c", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/common/wifi_hal_common_func.c", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/main.c", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_adapter.c", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_callback.c", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_ap.c", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_base.c", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_chip.c", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_common.c", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_p2p.c", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.c", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_sta.c", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_supplicant.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log/log_helper.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/common/wifi_hal_common_func.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/main.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_adapter.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_callback.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_ap.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_base.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_chip.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_common.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_p2p.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_sta.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_supplicant.c", "mock_wifi_hal_service.c", ] include_dirs = [ "//utils/native/base/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", - "$SUBSYSTEM_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces", - "$SUBSYSTEM_DIR/services/wifi_standard/ipc_framework/cRPC/include", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/common", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/log", + "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces", + "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/common", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", ] deps = [ - "$SUBSYSTEM_DIR/services/wifi_standard/ipc_framework/cRPC:crpc_server", + "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC:crpc_server", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//utils/native/base:utils", ] @@ -128,7 +128,7 @@ ohos_unittest("mock_wifi_hal_service") { defines = [] - part_name = "wifi_standard" + part_name = "wifi" subsystem_name = "communication" testonly = true } diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/idl_client_test_main.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/idl_client_test_main.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/idl_client_test_main.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/idl_client_test_main.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/mock_wifi_hal_service.c b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/mock_wifi_hal_service.c similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/mock_wifi_hal_service.c rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/mock_wifi_hal_service.c diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_ap_hal_interface_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_ap_hal_interface_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_ap_hal_interface_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_ap_hal_interface_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_ap_hal_interface_test.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_ap_hal_interface_test.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_ap_hal_interface_test.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_ap_hal_interface_test.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_base_hal_interface_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_base_hal_interface_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_base_hal_interface_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_base_hal_interface_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_base_hal_interface_test.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_base_hal_interface_test.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_base_hal_interface_test.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_base_hal_interface_test.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_chip_hal_interface_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_chip_hal_interface_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_chip_hal_interface_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_chip_hal_interface_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_chip_hal_interface_test.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_chip_hal_interface_test.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_chip_hal_interface_test.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_chip_hal_interface_test.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_idl_client_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_idl_client_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_idl_client_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_idl_client_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_idl_client_test.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_idl_client_test.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_idl_client_test.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_idl_client_test.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_idl_interface_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_idl_interface_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_idl_interface_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_idl_interface_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_idl_interface_test.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_idl_interface_test.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_idl_interface_test.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_idl_interface_test.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_p2p_hal_interface_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_p2p_hal_interface_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_p2p_hal_interface_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_p2p_hal_interface_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_p2p_hal_interface_test.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_p2p_hal_interface_test.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_p2p_hal_interface_test.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_p2p_hal_interface_test.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_sta_hal_interface_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_sta_hal_interface_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_sta_hal_interface_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_sta_hal_interface_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_sta_hal_interface_test.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_sta_hal_interface_test.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_sta_hal_interface_test.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_sta_hal_interface_test.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_supplicant_hal_interface_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_supplicant_hal_interface_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_supplicant_hal_interface_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_supplicant_hal_interface_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_supplicant_hal_interface_test.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_supplicant_hal_interface_test.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_supplicant_hal_interface_test.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_supplicant_hal_interface_test.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn similarity index 61% rename from tests/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn index 74fabca..3e5a200 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn +++ b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2021 Huawei Device Co., Ltd. +# Copyright (C) 2021-2022 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -13,34 +13,34 @@ import("//build/test.gni") import("//foundation/appexecfwk/standard/appexecfwk.gni") +import("//foundation/communication/wifi/wifi/wifi.gni") ################################################################################ -SUBSYSTEM_DIR = "//foundation/communication/wifi" module_output_path = "wifi_standard/manager_test" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ "//utils/native/base/include", - "$SUBSYSTEM_DIR/tests/wifi_standard/wifi_framework/wifi_manage/unittest", + "$WIFI_ROOT_DIR/tests/wifi_standard/wifi_framework/wifi_manage/unittest", ] } ohos_unittest("manager_unittest") { module_out_path = module_output_path sources = [ - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/utils/wifi_common_event_helper.cpp", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_helper.cpp", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_utils.cpp", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_auth_center.cpp", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.cpp", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher.cpp", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_net_agent.cpp", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils/wifi_common_event_helper.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_helper.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_utils.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_auth_center.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_net_agent.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.cpp", "wifi_auth_center_test.cpp", "wifi_config_center_test.cpp", "wifi_internal_event_dispatcher_test.cpp", @@ -50,22 +50,22 @@ ohos_unittest("manager_unittest") { ] include_dirs = [ - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/common", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/include", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/net_helper", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/utils", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/log", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/config", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_aware", - "$SUBSYSTEM_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface", - "$SUBSYSTEM_DIR/services/wifi_standard/ipc_framework/cRPC/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_aware", + "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface", + "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", "//utils/native/base/include", "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", @@ -79,15 +79,15 @@ ohos_unittest("manager_unittest") { "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include", "//base/security/access_token/interfaces/innerkits/accesstoken/include", "//foundation/communication/netmanager_base/services/netmanagernative/include/netsys", - "//foundation/communication/wifi/utils/inc", + "$WIFI_ROOT_DIR/utils/inc", ] deps = [ - "$SUBSYSTEM_DIR/services/wifi_standard/ipc_framework/cRPC:crpc_client", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", + "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC:crpc_client", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", + "$WIFI_ROOT_DIR/utils/src:wifi_utils", "${aafwk_path}/interfaces/innerkits/base:base", "${aafwk_path}/interfaces/innerkits/want:want", - "//foundation/communication/wifi/utils/src:wifi_utils", "//utils/native/base:utils", ] @@ -105,7 +105,7 @@ ohos_unittest("manager_unittest") { ] configs = [ ":module_private_config" ] - part_name = "wifi_standard" + part_name = "wifi" subsystem_name = "communication" testonly = true } diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_auth_center_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_auth_center_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_auth_center_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_auth_center_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_auth_center_test.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_auth_center_test.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_auth_center_test.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_auth_center_test.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_config_center_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_config_center_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_config_center_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_config_center_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_config_center_test.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_config_center_test.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_config_center_test.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_config_center_test.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_internal_event_dispatcher_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_internal_event_dispatcher_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_internal_event_dispatcher_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_internal_event_dispatcher_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_internal_event_dispatcher_test.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_internal_event_dispatcher_test.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_internal_event_dispatcher_test.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_internal_event_dispatcher_test.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manage_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manage_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manage_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manage_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manager_service_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manager_service_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manager_service_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manager_service_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manager_service_test.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manager_service_test.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manager_service_test.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manager_service_test.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_mock_p2p_service.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_mock_p2p_service.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_mock_p2p_service.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_mock_p2p_service.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_mock_p2p_service.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_mock_p2p_service.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_mock_p2p_service.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_mock_p2p_service.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_service_manager_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_service_manager_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_service_manager_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_service_manager_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_service_manager_test.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_service_manager_test.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_service_manager_test.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_service_manager_test.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn similarity index 31% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn index ff68257..cbe49b8 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn +++ b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn @@ -12,45 +12,45 @@ # limitations under the License. import("//build/test.gni") -SUBSYSTEM_DIR = "//foundation/communication" +import("//foundation/communication/wifi/wifi/wifi.gni") config("module_private_config") { visibility = [ ":*" ] include_dirs = [ "//utils/native/base/include", - "$SUBSYSTEM_DIR/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap", ] } ohos_unittest("WifiApServiceTest") { module_out_path = "wifi_standard/ap_test" sources = [ + "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_msg.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log/log_helper.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/base_address.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/dhcpd_interface.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/handler.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/internal_message.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/state.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_idle_state.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_root_state.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager.cpp", "./Mock/mock_network_interface.cpp", "./Mock/mock_system_interface.cpp", "./Mock/mock_wifi_ap_hal_interface.cpp", "./Mock/mock_wifi_settings.cpp", "./Mock/operator_overload.cpp", - "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_msg.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log/log_helper.c", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/base_address.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/dhcpd_interface.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/handler.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/internal_message.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_idle_state.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_root_state.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager.cpp", "ap_config_use_test.cpp", "ap_idle_state_test.cpp", "ap_monitor_test.cpp", @@ -69,21 +69,23 @@ ohos_unittest("WifiApServiceTest") { "./Mock/", "//utils/native/base/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", - "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces", - "//foundation/communication/wifi/services/wifi_standard/ipc_framework/cRPC/include", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/include", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/config", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/utils", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/include", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/interfaces", + "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces", + "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface", + "$WIFI_ROOT_DIR/utils/inc", + "$DHCP_ROOT_DIR/services/mgr_service/include", + "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/include", + "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/interfaces", "//third_party/googletest/googlemock/include", "//third_party/googletest/googletest/include", ] @@ -94,12 +96,14 @@ ohos_unittest("WifiApServiceTest") { "--coverage", ] deps = [ - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service:dhcp_manager_service", + "$DHCP_ROOT_DIR/services/mgr_service:dhcp_manager_service", + "$WIFI_ROOT_DIR/utils/src:wifi_utils", "//third_party/googletest:gmock_main", "//utils/native/base:utils", ] external_deps = [ "hiviewdfx_hilog_native:libhilog" ] - part_name = "wifi_standard" + defines = [ "AP_INTF=\"$wifi_feature_with_ap_intf\"" ] + part_name = "wifi" subsystem_name = "communication" } group("unittest") { diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_config_use.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_config_use.h similarity index 96% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_config_use.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_config_use.h index 5484ac3..97c07dc 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_config_use.h +++ b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_config_use.h @@ -32,7 +32,9 @@ public: MOCK_CONST_METHOD1(IsValid5GHz, bool(int freq)); MOCK_CONST_METHOD2(CheckBandChannel, void(HotspotConfig &apConfig, const ChannelsTable &validChanTable)); MOCK_CONST_METHOD1(TransformFrequencyIntoChannel, int(int freq)); +private: + using ApConfigUse::CheckBandChannel; }; } // namespace Wifi } // namespace OHOS -#endif \ No newline at end of file +#endif diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_idle_state.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_idle_state.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_idle_state.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_idle_state.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_monitor.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_monitor.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_monitor.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_monitor.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_root_state.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_root_state.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_root_state.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_root_state.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_service.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_service.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_service.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_service.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_started_state.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_started_state.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_started_state.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_started_state.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_state_machine.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_state_machine.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_state_machine.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_state_machine.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_stations_manager.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_stations_manager.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_stations_manager.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_stations_manager.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_network_interface.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_network_interface.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_network_interface.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_network_interface.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_network_interface.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_network_interface.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_network_interface.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_network_interface.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_pendant.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_pendant.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_pendant.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_pendant.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_system_interface.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_system_interface.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_system_interface.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_system_interface.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_system_interface.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_system_interface.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_system_interface.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_system_interface.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_ap_hal_interface.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_ap_hal_interface.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_ap_hal_interface.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_ap_hal_interface.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_ap_hal_interface.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_ap_hal_interface.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_ap_hal_interface.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_ap_hal_interface.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_ap_nat_manager.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_ap_nat_manager.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_ap_nat_manager.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_ap_nat_manager.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_settings.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_settings.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_settings.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_settings.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_settings.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_settings.h similarity index 91% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_settings.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_settings.h index 436c904..6a6baea 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_settings.h +++ b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_settings.h @@ -51,6 +51,8 @@ public: virtual int GetValidChannels(ChannelsTable &channelsInfo) = 0; virtual int ClearValidChannels() = 0; virtual int GetApMaxConnNum() = 0; + virtual int SyncHotspotConfig() = 0; + virtual int SetDefaultFrequenciesByCountryBand(const BandType band, std::vector &frequencies) = 0; }; class WifiSettings : public MockWifiSettings { @@ -76,7 +78,9 @@ public: MOCK_METHOD1(GetValidChannels, int(ChannelsTable &channelsInfo)); MOCK_METHOD0(ClearValidChannels, int()); MOCK_METHOD0(GetApMaxConnNum, int()); + MOCK_METHOD0(SyncHotspotConfig, int()); + MOCK_METHOD2(SetDefaultFrequenciesByCountryBand, int(const BandType band, std::vector &frequencies)); }; } /* namespace Wifi */ } /* namespace OHOS */ -#endif \ No newline at end of file +#endif diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/operator_overload.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/operator_overload.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/operator_overload.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/operator_overload.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/operator_overload.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/operator_overload.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/operator_overload.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/operator_overload.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_idle_state_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_idle_state_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_idle_state_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_idle_state_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_root_state_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_root_state_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_root_state_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_root_state_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state_test.cpp similarity index 99% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state_test.cpp index 401da0a..3ec1870 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state_test.cpp +++ b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state_test.cpp @@ -492,4 +492,4 @@ HWTEST_F(ApStartedState_test, ExecuteStateMsg_FAILED, TestSize.Level1) EXPECT_FALSE(pApStartedState->ExecuteStateMsg(nullptr)); } } // namespace Wifi -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/global_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/global_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/global_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/global_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/global_test.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/global_test.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/global_test.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/global_test.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_service_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_service_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_service_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_service_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn new file mode 100644 index 0000000..4dbeb6c --- /dev/null +++ b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn @@ -0,0 +1,163 @@ +# Copyright (C) 2021-2022 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import("//build/test.gni") +import("//foundation/communication/wifi/wifi/wifi.gni") +config("module_private_config") { + visibility = [ ":*" ] + include_dirs = [ + "//utils/native/base/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test", + ] +} + +ohos_unittest("wifi_p2p_test") { + module_out_path = "wifi_standard/p2p_test" + sources = [ + "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hid2d_msg.cpp", + "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_msg.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log/log_helper.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/base_address.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/dhcpd_interface.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/network_interface.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/handler.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/internal_message.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/state.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_broadcast_helper.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_service_utils.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/authorizing_negotiation_request_state.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_received_state.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_request_state.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_default_state.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_disabled_state.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_disabling_state.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabled_state.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabling_state.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_formation_state.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_join_state.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_inviting_state.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_monitor.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/provision_discovery_state.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_device_manager.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_info.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_request.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_response.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_txt_record.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_info_proxy.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_manager.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_manager.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_request_list.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_response_list.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_temp_disc_event.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_info.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_request.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_response.cpp", + "./Mock/mock_wifi_p2p_hal_interface.cpp", + "authorizing_negotiation_request_state_test.cpp", + "global_test.cpp", + "group_formed_state_test.cpp", + "group_negotiation_state_test.cpp", + "invitation_recelved_state_test.cpp", + "invitation_request_state_test.cpp", + "p2p_default_state_test.cpp", + "p2p_disabled_state_test.cpp", + "p2p_disabling_state_test.cpp", + "p2p_enabled_state_test.cpp", + "p2p_enabling_state_test.cpp", + "p2p_group_formation_state_test.cpp", + "p2p_group_join_state_test.cpp", + "p2p_group_operating_state_test.cpp", + "p2p_idle_state_test.cpp", + "p2p_inviting_state_test.cpp", + "p2p_monitor_test.cpp", + "p2p_state_machine_test.cpp", + "provision_discovery_state_test.cpp", + "wifi_p2p_device_manager_test.cpp", + "wifi_p2p_dns_sd_service_info_test.cpp", + "wifi_p2p_dns_sd_service_request_test.cpp", + "wifi_p2p_dns_sd_service_response_test.cpp", + "wifi_p2p_group_info_proxy_test.cpp", + "wifi_p2p_group_manager_test.cpp", + "wifi_p2p_service_manager_test.cpp", + "wifi_p2p_service_request_list_test.cpp", + "wifi_p2p_service_response_list_test.cpp", + "wifi_p2p_service_test.cpp", + "wifi_p2p_test_entry.cpp", + "wifi_p2p_upnp_service_info_test.cpp", + "wifi_p2p_upnp_service_request_test.cpp", + "wifi_p2p_upnp_service_response_test.cpp", + ] + + include_dirs = [ + "./", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p", + "./Mock", + "//utils/native/base/include", + "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", + "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces", + "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface", + "$DHCP_ROOT_DIR/services/mgr_service/include", + "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/include", + "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/interfaces", + "//third_party/googletest/googlemock/include", + "//third_party/googletest/googletest/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta", + ] + + deps = [ + "$DHCP_ROOT_DIR/services/mgr_service:dhcp_manager_service", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", + "//third_party/googletest:gmock_main", + "//utils/native/base:utils", + ] + external_deps = [ + "hiviewdfx_hilog_native:libhilog", + "ipc:ipc_core", + "netmanager_base:net_conn_manager_if", + ] + part_name = "wifi" + subsystem_name = "communication" +} + +group("unittest") { + testonly = true + deps = [] + deps += [ ":wifi_p2p_test" ] +} diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_authorizing_negotiation_request_state.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_authorizing_negotiation_request_state.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_authorizing_negotiation_request_state.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_authorizing_negotiation_request_state.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_group_formed_state.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_group_formed_state.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_group_formed_state.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_group_formed_state.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_group_negotiation_state.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_group_negotiation_state.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_group_negotiation_state.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_group_negotiation_state.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_invitation_recelved_state.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_invitation_recelved_state.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_invitation_recelved_state.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_invitation_recelved_state.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_invitation_request_state.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_invitation_request_state.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_invitation_request_state.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_invitation_request_state.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_default_state.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_default_state.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_default_state.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_default_state.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_disabled_state.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_disabled_state.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_disabled_state.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_disabled_state.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_disabling_state.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_disabling_state.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_disabling_state.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_disabling_state.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_enabled_state.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_enabled_state.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_enabled_state.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_enabled_state.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_enabling_state.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_enabling_state.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_enabling_state.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_enabling_state.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_group_formation_state.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_group_formation_state.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_group_formation_state.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_group_formation_state.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_group_join_state.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_group_join_state.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_group_join_state.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_group_join_state.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_group_operating_state.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_group_operating_state.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_group_operating_state.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_group_operating_state.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_idle_state.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_idle_state.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_idle_state.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_idle_state.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_inviting_state.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_inviting_state.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_inviting_state.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_inviting_state.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_monitor.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_monitor.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_monitor.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_monitor.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_state_machine.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_state_machine.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_state_machine.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_state_machine.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_provision_discovery_state.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_provision_discovery_state.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_provision_discovery_state.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_provision_discovery_state.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_device_manager.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_device_manager.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_device_manager.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_device_manager.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_device_manager.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_device_manager.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_device_manager.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_device_manager.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_hal_interface.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_hal_interface.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_hal_interface.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_hal_interface.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_hal_interface.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_hal_interface.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_hal_interface.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_hal_interface.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_settings.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_settings.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_settings.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_settings.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_settings.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_settings.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_settings.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_settings.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/authorizing_negotiation_request_state_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/authorizing_negotiation_request_state_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/authorizing_negotiation_request_state_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/authorizing_negotiation_request_state_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/global_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/global_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/global_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/global_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/global_test.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/global_test.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/global_test.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/global_test.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/group_formed_state_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/group_formed_state_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/group_formed_state_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/group_formed_state_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/group_negotiation_state_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/group_negotiation_state_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/group_negotiation_state_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/group_negotiation_state_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/invitation_recelved_state_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/invitation_recelved_state_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/invitation_recelved_state_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/invitation_recelved_state_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/invitation_request_state_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/invitation_request_state_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/invitation_request_state_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/invitation_request_state_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/mock_p2p_pendant.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/mock_p2p_pendant.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/mock_p2p_pendant.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/mock_p2p_pendant.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_default_state_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_default_state_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_default_state_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_default_state_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_disabled_state_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_disabled_state_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_disabled_state_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_disabled_state_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_disabling_state_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_disabling_state_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_disabling_state_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_disabling_state_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_enabled_state_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_enabled_state_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_enabled_state_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_enabled_state_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_enabling_state_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_enabling_state_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_enabling_state_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_enabling_state_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_group_formation_state_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_group_formation_state_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_group_formation_state_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_group_formation_state_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_group_join_state_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_group_join_state_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_group_join_state_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_group_join_state_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_group_operating_state_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_group_operating_state_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_group_operating_state_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_group_operating_state_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_idle_state_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_idle_state_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_idle_state_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_idle_state_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_inviting_state_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_inviting_state_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_inviting_state_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_inviting_state_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_monitor_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_monitor_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_monitor_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_monitor_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_state_machine_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_state_machine_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_state_machine_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_state_machine_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/provision_discovery_state_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/provision_discovery_state_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/provision_discovery_state_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/provision_discovery_state_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_device_manager_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_device_manager_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_device_manager_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_device_manager_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_dns_sd_service_info_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_dns_sd_service_info_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_dns_sd_service_info_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_dns_sd_service_info_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_dns_sd_service_request_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_dns_sd_service_request_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_dns_sd_service_request_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_dns_sd_service_request_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_dns_sd_service_response_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_dns_sd_service_response_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_dns_sd_service_response_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_dns_sd_service_response_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_group_info_proxy_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_group_info_proxy_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_group_info_proxy_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_group_info_proxy_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_group_manager_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_group_manager_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_group_manager_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_group_manager_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_manager_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_manager_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_manager_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_manager_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_request_list_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_request_list_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_request_list_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_request_list_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_response_list_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_response_list_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_response_list_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_response_list_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_test_entry.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_test_entry.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_test_entry.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_test_entry.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_upnp_service_info_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_upnp_service_info_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_upnp_service_info_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_upnp_service_info_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_upnp_service_request_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_upnp_service_request_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_upnp_service_request_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_upnp_service_request_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_upnp_service_response_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_upnp_service_response_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_upnp_service_response_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_upnp_service_response_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn new file mode 100644 index 0000000..673ae37 --- /dev/null +++ b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn @@ -0,0 +1,101 @@ +# Copyright (C) 2021-2022 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import("//build/test.gni") +import("//foundation/communication/wifi/wifi/wifi.gni") +module_output_path = "wifi_standard/scan_test" + +config("module_private_config") { + visibility = [ ":*" ] + include_dirs = [ + "//utils/native/base/include", + "$WIFI_ROOT_DIR/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan", + ] +} + +ohos_unittest("wifi_scan_unittest") { + module_out_path = module_output_path + sources = [ + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log/log_helper.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/base_address.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/network_interface.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/handler.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/internal_message.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/state.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_monitor.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine.cpp", + "Mock/mock_scan_service.cpp", + "Mock/mock_scan_state_machine.cpp", + "Mock/mock_wifi_manager.cpp", + "Mock/mock_wifi_settings.cpp", + "Mock/mock_wifi_sta_hal_interface.cpp", + "Mock/mock_wifi_supplicant_hal_interface.cpp", + "global_test.cpp", + "scan_interface_test.cpp", + "scan_monitor_test.cpp", + "scan_service_test.cpp", + "scan_state_machine_test.cpp", + "wifi_scan_test.cpp", + ] + + include_dirs = [ + "//utils/native/base/include", + "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces", + "$WIFI_ROOT_DIR/services/wifi_standard/sdk/include", + "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan", + "$WIFI_ROOT_DIR/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/net_conf", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta", + "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", + "$WIFI_ROOT_DIR/services/wifi_standard/depends/include/hardware/libhardware/include", + "$WIFI_ROOT_DIR/services/wifi_standard/depends/include/system/core/include", + "$WIFI_ROOT_DIR/services/wifi_standard/depends/include/frameworks/native/include", + "$WIFI_ROOT_DIR/services/wifi_standard/depends/include/system/core/libutils/include", + "$WIFI_ROOT_DIR/services/wifi_standard/depends/include/system/core/base/include", + "$WIFI_ROOT_DIR/services/wifi_standard/depends/include/system/libbase/include", + "$WIFI_ROOT_DIR/services/wifi_standard/depends/include/system/core/libnetutils/include/netutils", + "//third_party/googletest/googlemock/include", + "//third_party/googletest/googletest/include", + ] + deps = [ + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", + "//third_party/googletest:gmock_main", + "//utils/native/base:utils", + ] + external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + part_name = "wifi" + subsystem_name = "communication" +} + +group("unittest") { + testonly = true + deps = [ ":wifi_scan_unittest" ] +} diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_service.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_service.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_service.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_service.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_service.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_service.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_service.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_service.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_state_machine.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_state_machine.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_state_machine.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_state_machine.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_state_machine.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_state_machine.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_state_machine.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_state_machine.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_manager.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_manager.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_manager.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_manager.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_manager.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_manager.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_manager.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_manager.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_settings.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_settings.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_settings.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_settings.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_settings.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_settings.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_settings.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_settings.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_sta_hal_interface.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_sta_hal_interface.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_sta_hal_interface.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_sta_hal_interface.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_sta_hal_interface.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_sta_hal_interface.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_sta_hal_interface.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_sta_hal_interface.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_supplicant_hal_interface.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_supplicant_hal_interface.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_supplicant_hal_interface.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_supplicant_hal_interface.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_supplicant_hal_interface.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_supplicant_hal_interface.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_supplicant_hal_interface.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_supplicant_hal_interface.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/global_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/global_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/global_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/global_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/global_test.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/global_test.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/global_test.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/global_test.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_monitor_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_monitor_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_monitor_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_monitor_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/wifi_scan_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/wifi_scan_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/wifi_scan_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/wifi_scan_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn similarity index 37% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn index ad38308..baf4e7a 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn +++ b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -SUBSYSTEM_DIR = "//foundation/communication" +import("//foundation/communication/wifi/wifi/wifi.gni") module_output_path = "wifi_standard/sta_test" defines = [] @@ -22,28 +22,28 @@ config("module_private_config") { visibility = [ ":*" ] include_dirs = [ "//utils/native/base/include", - "$SUBSYSTEM_DIR/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta", + "$WIFI_ROOT_DIR/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta", ] } ohos_unittest("wifi_sta_unittest") { module_out_path = module_output_path sources = [ - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log/log_helper.c", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/http_request.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/handler.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/internal_message.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log/log_helper.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/http_request.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/handler.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/internal_message.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/state.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp", "Mock/mock_dhcp_service.cpp", "Mock/mock_if_config.cpp", "Mock/mock_mac_address.cpp", @@ -69,28 +69,29 @@ ohos_unittest("wifi_sta_unittest") { include_dirs = [ "./", "./Mock", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/net_conf", - "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/include", - "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces", - "//foundation/communication/wifi/services/wifi_standard/interface", - "//foundation/communication/wifi/services/wifi_standard/ipc_framework/cRPC/include", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/include", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/config", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/utils", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_aware", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta", - "//foundation/communication/wifi/services/wifi_standard/ipc_framework/cRPC/include", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/interfaces", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/net_conf", + "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/include", + "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces", + "$WIFI_ROOT_DIR/services/wifi_standard/interface", + "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_aware", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta", + "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", + "$DHCP_ROOT_DIR/services/mgr_service/include", + "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/include", + "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/interfaces", "//third_party/googletest/googlemock/include", "//third_party/googletest/googletest/include", "//base/notification/ces_standard/cesfwk/kits/native/include", @@ -102,14 +103,14 @@ ohos_unittest("wifi_sta_unittest") { "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk/", "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content/", "//foundation/aafwk/aafwk_lite/interfaces/kits/want_lite/", - "//foundation/communication/wifi/utils/inc", + "$WIFI_ROOT_DIR/utils/inc", ] deps = [ - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service:dhcp_manager_service", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", - "//foundation/communication/wifi/utils/src:wifi_utils", + "$DHCP_ROOT_DIR/services/mgr_service:dhcp_manager_service", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", + "$WIFI_ROOT_DIR/utils/src:wifi_utils", "//third_party/googletest:gmock_main", "//utils/native/base:utils", ] @@ -117,7 +118,7 @@ ohos_unittest("wifi_sta_unittest") { "hiviewdfx_hilog_native:libhilog", "netmanager_base:net_conn_manager_if", ] - part_name = "wifi_standard" + part_name = "wifi" subsystem_name = "communication" } diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_device_appraisal.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_device_appraisal.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_device_appraisal.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_device_appraisal.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_dhcp_service.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_dhcp_service.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_dhcp_service.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_dhcp_service.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_dhcp_service.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_dhcp_service.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_dhcp_service.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_dhcp_service.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_if_config.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_if_config.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_if_config.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_if_config.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_if_config.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_if_config.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_if_config.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_if_config.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_mac_address.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_mac_address.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_mac_address.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_mac_address.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_mac_address.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_mac_address.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_mac_address.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_mac_address.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_auto_connect_service.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_auto_connect_service.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_auto_connect_service.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_auto_connect_service.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_auto_connect_service.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_auto_connect_service.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_auto_connect_service.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_auto_connect_service.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_monitor.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_monitor.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_monitor.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_monitor.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_network_check.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_network_check.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_network_check.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_network_check.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_network_check.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_network_check.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_network_check.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_network_check.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_service.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_service.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_service.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_service.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_state_machine.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_state_machine.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_state_machine.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_state_machine.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_state_machine.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_state_machine.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_state_machine.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_state_machine.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_chip_hal_interface.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_chip_hal_interface.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_chip_hal_interface.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_chip_hal_interface.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_chip_hal_interface.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_chip_hal_interface.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_chip_hal_interface.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_chip_hal_interface.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_manager.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_manager.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_manager.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_manager.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_manager.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_manager.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_manager.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_manager.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_settings.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_settings.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_settings.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_settings.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_settings.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_settings.h similarity index 99% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_settings.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_settings.h index eb1aa29..d0fff62 100644 --- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_settings.h +++ b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_settings.h @@ -118,4 +118,4 @@ public: } // namespace OHOS } // namespace Wifi -#endif \ No newline at end of file +#endif diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_sta_hal_interface.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_sta_hal_interface.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_sta_hal_interface.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_sta_hal_interface.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_sta_hal_interface.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_sta_hal_interface.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_sta_hal_interface.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_sta_hal_interface.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_supplicant_hal_interface.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_supplicant_hal_interface.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_supplicant_hal_interface.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_supplicant_hal_interface.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_supplicant_hal_interface.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_supplicant_hal_interface.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_supplicant_hal_interface.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_supplicant_hal_interface.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/global_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/global_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/global_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/global_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/global_test.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/global_test.h similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/global_test.h rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/global_test.h diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine_test.cpp diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/wifi_sta_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/wifi_sta_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/wifi_sta_test.cpp rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/wifi_sta_test.cpp diff --git a/tests/wifi_standard/wifi_hal/unittest/BUILD.gn b/wifi/tests/wifi_standard/wifi_hal/unittest/BUILD.gn similarity index 56% rename from tests/wifi_standard/wifi_hal/unittest/BUILD.gn rename to wifi/tests/wifi_standard/wifi_hal/unittest/BUILD.gn index fd62c0c..fb1a94f 100644 --- a/tests/wifi_standard/wifi_hal/unittest/BUILD.gn +++ b/wifi/tests/wifi_standard/wifi_hal/unittest/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2021 Huawei Device Co., Ltd. +# Copyright (C) 2021-2022 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -12,43 +12,43 @@ # limitations under the License. import("//build/test.gni") -SUBSYSTEM_DIR = "//foundation/communication/wifi" +import("//foundation/communication/wifi/wifi/wifi.gni") module_output_path = "wifi_standard/wifi_hal_test" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ "//utils/native/base/include", - "$SUBSYSTEM_DIR/tests/wifi_standard/wifi_hal/unittest", + "$WIFI_ROOT_DIR/tests/wifi_standard/wifi_hal/unittest", ] } ohos_unittest("wifi_hal_unittest") { module_out_path = module_output_path sources = [ - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/common/wifi_hal_common_func.c", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_adapter.c", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_base_interface.c", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_callback.c", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_chip_interface.c", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_ap.c", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_base.c", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_chip.c", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_common.c", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_p2p.c", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.c", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_sta.c", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_supplicant.c", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.c", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_common.c", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal/wifi_p2p_hal.c", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_module_manage.c", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_p2p_interface.c", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_vendor_interface.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/common/wifi_hal_common_func.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_adapter.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_base_interface.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_callback.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_chip_interface.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_ap.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_base.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_chip.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_common.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_p2p.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_sta.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_supplicant.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_common.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal/wifi_p2p_hal.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_module_manage.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_p2p_interface.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_vendor_interface.c", "mock_wpa_ctrl.cpp", "wifi_hal_ap_interface_test.cpp", "wifi_hal_base_interface_test.cpp", @@ -65,13 +65,13 @@ ohos_unittest("wifi_hal_unittest") { include_dirs = [ "//utils/native/base/include", - "$SUBSYSTEM_DIR/services/wifi_standard/ipc_framework/cRPC/include", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/common", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal", + "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/common", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", "//third_party/wpa_supplicant/wpa_supplicant-2.9_standard/src/", "//third_party/bounds_checking_function/include/", @@ -80,7 +80,7 @@ ohos_unittest("wifi_hal_unittest") { ] deps = [ - "$SUBSYSTEM_DIR/services/wifi_standard/ipc_framework/cRPC:crpc_server", + "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC:crpc_server", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//drivers/peripheral/wlan/hal:wifi_hal", "//utils/native/base:utils", @@ -93,8 +93,9 @@ ohos_unittest("wifi_hal_unittest") { external_deps = [ "hiviewdfx_hilog_native:libhilog" ] configs = [ ":module_private_config" ] + defines = [ "AP_INTF=\"$wifi_feature_with_ap_intf\"" ] - part_name = "wifi_standard" + part_name = "wifi" subsystem_name = "communication" testonly = true } @@ -109,13 +110,13 @@ ohos_shared_library("WifiHalVendorTest") { include_dirs = [ "//utils/native/base/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal", - "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/common", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/common", ] deps = [ "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//utils/native/base:utils", ] - part_name = "wifi_standard" + part_name = "wifi" subsystem_name = "communication" } diff --git a/tests/wifi_standard/wifi_hal/unittest/mock_wpa_ctrl.cpp b/wifi/tests/wifi_standard/wifi_hal/unittest/mock_wpa_ctrl.cpp similarity index 100% rename from tests/wifi_standard/wifi_hal/unittest/mock_wpa_ctrl.cpp rename to wifi/tests/wifi_standard/wifi_hal/unittest/mock_wpa_ctrl.cpp diff --git a/tests/wifi_standard/wifi_hal/unittest/mock_wpa_ctrl.h b/wifi/tests/wifi_standard/wifi_hal/unittest/mock_wpa_ctrl.h similarity index 100% rename from tests/wifi_standard/wifi_hal/unittest/mock_wpa_ctrl.h rename to wifi/tests/wifi_standard/wifi_hal/unittest/mock_wpa_ctrl.h diff --git a/tests/wifi_standard/wifi_hal/unittest/wifi_hal_adapter_test.h b/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_adapter_test.h similarity index 100% rename from tests/wifi_standard/wifi_hal/unittest/wifi_hal_adapter_test.h rename to wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_adapter_test.h diff --git a/tests/wifi_standard/wifi_hal/unittest/wifi_hal_ap_interface_test.cpp b/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_ap_interface_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_hal/unittest/wifi_hal_ap_interface_test.cpp rename to wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_ap_interface_test.cpp diff --git a/tests/wifi_standard/wifi_hal/unittest/wifi_hal_ap_interface_test.h b/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_ap_interface_test.h similarity index 100% rename from tests/wifi_standard/wifi_hal/unittest/wifi_hal_ap_interface_test.h rename to wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_ap_interface_test.h diff --git a/tests/wifi_standard/wifi_hal/unittest/wifi_hal_base_interface_test.cpp b/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_base_interface_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_hal/unittest/wifi_hal_base_interface_test.cpp rename to wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_base_interface_test.cpp diff --git a/tests/wifi_standard/wifi_hal/unittest/wifi_hal_base_interface_test.h b/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_base_interface_test.h similarity index 100% rename from tests/wifi_standard/wifi_hal/unittest/wifi_hal_base_interface_test.h rename to wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_base_interface_test.h diff --git a/tests/wifi_standard/wifi_hal/unittest/wifi_hal_chip_interface_test.cpp b/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_chip_interface_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_hal/unittest/wifi_hal_chip_interface_test.cpp rename to wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_chip_interface_test.cpp diff --git a/tests/wifi_standard/wifi_hal/unittest/wifi_hal_chip_interface_test.h b/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_chip_interface_test.h similarity index 100% rename from tests/wifi_standard/wifi_hal/unittest/wifi_hal_chip_interface_test.h rename to wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_chip_interface_test.h diff --git a/tests/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_add_test.cpp b/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_add_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_add_test.cpp rename to wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_add_test.cpp diff --git a/tests/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_add_test.h b/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_add_test.h similarity index 100% rename from tests/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_add_test.h rename to wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_add_test.h diff --git a/tests/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_test.cpp b/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_test.cpp rename to wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_test.cpp diff --git a/tests/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_test.h b/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_test.h similarity index 100% rename from tests/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_test.h rename to wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_test.h diff --git a/tests/wifi_standard/wifi_hal/unittest/wifi_hal_hostapd_test.cpp b/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_hostapd_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_hal/unittest/wifi_hal_hostapd_test.cpp rename to wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_hostapd_test.cpp diff --git a/tests/wifi_standard/wifi_hal/unittest/wifi_hal_hostapd_test.h b/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_hostapd_test.h similarity index 100% rename from tests/wifi_standard/wifi_hal/unittest/wifi_hal_hostapd_test.h rename to wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_hostapd_test.h diff --git a/tests/wifi_standard/wifi_hal/unittest/wifi_hal_p2p_interface_test.cpp b/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_p2p_interface_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_hal/unittest/wifi_hal_p2p_interface_test.cpp rename to wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_p2p_interface_test.cpp diff --git a/tests/wifi_standard/wifi_hal/unittest/wifi_hal_p2p_interface_test.h b/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_p2p_interface_test.h similarity index 100% rename from tests/wifi_standard/wifi_hal/unittest/wifi_hal_p2p_interface_test.h rename to wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_p2p_interface_test.h diff --git a/tests/wifi_standard/wifi_hal/unittest/wifi_hal_sta_interface_test.cpp b/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_sta_interface_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_hal/unittest/wifi_hal_sta_interface_test.cpp rename to wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_sta_interface_test.cpp diff --git a/tests/wifi_standard/wifi_hal/unittest/wifi_hal_sta_interface_test.h b/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_sta_interface_test.h similarity index 100% rename from tests/wifi_standard/wifi_hal/unittest/wifi_hal_sta_interface_test.h rename to wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_sta_interface_test.h diff --git a/tests/wifi_standard/wifi_hal/unittest/wifi_hal_test.cpp b/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_hal/unittest/wifi_hal_test.cpp rename to wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_test.cpp diff --git a/tests/wifi_standard/wifi_hal/unittest/wifi_hal_vendor.conf b/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_vendor.conf similarity index 100% rename from tests/wifi_standard/wifi_hal/unittest/wifi_hal_vendor.conf rename to wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_vendor.conf diff --git a/tests/wifi_standard/wifi_hal/unittest/wifi_hal_vendor_interface_test.c b/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_vendor_interface_test.c similarity index 100% rename from tests/wifi_standard/wifi_hal/unittest/wifi_hal_vendor_interface_test.c rename to wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_vendor_interface_test.c diff --git a/tests/wifi_standard/wifi_hal/unittest/wifi_hal_wpa_p2p_test.cpp b/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_wpa_p2p_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_hal/unittest/wifi_hal_wpa_p2p_test.cpp rename to wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_wpa_p2p_test.cpp diff --git a/tests/wifi_standard/wifi_hal/unittest/wifi_hal_wpa_p2p_test.h b/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_wpa_p2p_test.h similarity index 100% rename from tests/wifi_standard/wifi_hal/unittest/wifi_hal_wpa_p2p_test.h rename to wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_wpa_p2p_test.h diff --git a/tests/wifi_standard/wifi_hal/unittest/wifi_hal_wpa_sta_test.cpp b/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_wpa_sta_test.cpp similarity index 100% rename from tests/wifi_standard/wifi_hal/unittest/wifi_hal_wpa_sta_test.cpp rename to wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_wpa_sta_test.cpp diff --git a/tests/wifi_standard/wifi_hal/unittest/wifi_hal_wpa_sta_test.h b/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_wpa_sta_test.h similarity index 100% rename from tests/wifi_standard/wifi_hal/unittest/wifi_hal_wpa_sta_test.h rename to wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_wpa_sta_test.h diff --git a/utils/inc/wifi_common_util.h b/wifi/utils/inc/wifi_common_util.h similarity index 100% rename from utils/inc/wifi_common_util.h rename to wifi/utils/inc/wifi_common_util.h diff --git a/utils/inc/wifi_hisysevent.h b/wifi/utils/inc/wifi_hisysevent.h similarity index 100% rename from utils/inc/wifi_hisysevent.h rename to wifi/utils/inc/wifi_hisysevent.h diff --git a/utils/src/BUILD.gn b/wifi/utils/src/BUILD.gn similarity index 90% rename from utils/src/BUILD.gn rename to wifi/utils/src/BUILD.gn index d7e133d..d924396 100644 --- a/utils/src/BUILD.gn +++ b/wifi/utils/src/BUILD.gn @@ -12,13 +12,14 @@ # limitations under the License. import("//build/ohos.gni") +import("//foundation/communication/wifi/wifi/wifi.gni") ohos_shared_library("wifi_utils") { install_enable = true include_dirs = [ - "//foundation/communication/wifi/utils/inc", + "$WIFI_ROOT_DIR/utils/inc", "//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include", - "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include/bundlemgr/", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include/bundlemgr/", ] @@ -52,6 +53,6 @@ ohos_shared_library("wifi_utils") { "-Wl,-E", ] - part_name = "wifi_standard" + part_name = "wifi" subsystem_name = "communication" } diff --git a/utils/src/wifi_common_util.cpp b/wifi/utils/src/wifi_common_util.cpp similarity index 100% rename from utils/src/wifi_common_util.cpp rename to wifi/utils/src/wifi_common_util.cpp diff --git a/utils/src/wifi_hisysevent.cpp b/wifi/utils/src/wifi_hisysevent.cpp similarity index 100% rename from utils/src/wifi_hisysevent.cpp rename to wifi/utils/src/wifi_hisysevent.cpp diff --git a/wifi.gni b/wifi/wifi.gni similarity index 75% rename from wifi.gni rename to wifi/wifi.gni index b89364c..18350aa 100644 --- a/wifi.gni +++ b/wifi/wifi.gni @@ -11,7 +11,11 @@ # See the License for the specific language governing permissions and # limitations under the License. +SUBSYSTEM_DIR = "//foundation/communication" +WIFI_ROOT_DIR = "$SUBSYSTEM_DIR/wifi/wifi" +DHCP_ROOT_DIR = "$SUBSYSTEM_DIR/wifi/dhcp" + declare_args() { - wifi_standard_feature_with_p2p = true - wifi_standard_feature_with_ap_intf = "wlan0" + wifi_feature_with_p2p = true + wifi_feature_with_ap_intf = "wlan0" } -- Gitee From 6687eaa5b76d355a3ad603291b072bda2b2fc73d Mon Sep 17 00:00:00 2001 From: fanchao Date: Thu, 21 Apr 2022 23:33:03 -0700 Subject: [PATCH 084/491] Add WiFi static ip config function. Signed-off-by: fanchao --- .../native_cpp/napi/wifi_napi_device.cpp | 47 ++++++++++++++++++- .../native_cpp/napi/wifi_napi_utils.cpp | 18 +++++++ .../native_cpp/napi/wifi_napi_utils.h | 1 + 3 files changed, 65 insertions(+), 1 deletion(-) diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_device.cpp b/interfaces/innerkits/native_cpp/napi/wifi_napi_device.cpp index 5b8bd40..800203d 100644 --- a/interfaces/innerkits/native_cpp/napi/wifi_napi_device.cpp +++ b/interfaces/innerkits/native_cpp/napi/wifi_napi_device.cpp @@ -187,6 +187,46 @@ static void ProcessPassphrase(const SecTypeJs& securityType, WifiDeviceConfig& c } } +napi_value ConfigStaticIp(const napi_env& env, const napi_value& object, WifiDeviceConfig& cppConfig) +{ + bool hasProperty = false; + JsObjectToInt(env, object, "prefixLength", cppConfig.wifiIpConfig.staticIpAddress.ipAddress.prefixLength); + NAPI_CALL(env, napi_has_named_property(env, object, "staticIp", &hasProperty)); + if (!hasProperty) { + WIFI_LOGE("Js has no property: staticIp."); + return UndefinedNapiValue(env); + } + napi_value staticIp; + napi_value dnsServers; + napi_value primaryDns; + napi_value secondDns; + napi_get_named_property(env, object, "staticIp", &staticIp); + JsObjectToUint(env, staticIp, "ipAddress", + cppConfig.wifiIpConfig.staticIpAddress.ipAddress.address.addressIpv4); + cppConfig.wifiIpConfig.staticIpAddress.ipAddress.address.family = 0; + JsObjectToUint(env, staticIp, "gateway", cppConfig.wifiIpConfig.staticIpAddress.gateway.addressIpv4); + + NAPI_CALL(env, napi_has_named_property(env, staticIp, "dnsServers", &hasProperty)); + if (!hasProperty) { + WIFI_LOGE("Js has no property: dnsServers."); + return UndefinedNapiValue(env); + } + uint32_t arrayLength = 0; + const int DNS_NUM = 2; + napi_get_named_property(env, staticIp, "dnsServers", &dnsServers); + napi_get_array_length(env, dnsServers, &arrayLength); + if (arrayLength != DNS_NUM) { + WIFI_LOGE("It needs two dns servers."); + return UndefinedNapiValue(env); + } + napi_get_element(env, dnsServers, 0, &primaryDns); + napi_get_element(env, dnsServers, 1, &secondDns); + napi_get_value_uint32(env, primaryDns, &cppConfig.wifiIpConfig.staticIpAddress.dnsServer1.addressIpv4); + napi_get_value_uint32(env, secondDns, &cppConfig.wifiIpConfig.staticIpAddress.dnsServer2.addressIpv4); + + return UndefinedNapiValue(env); +} + static void JsObjToDeviceConfig(const napi_env& env, const napi_value& object, WifiDeviceConfig& cppConfig) { JsObjectToString(env, object, "ssid", 33, cppConfig.ssid); /* 33: ssid max length is 32 + '\0' */ @@ -204,7 +244,12 @@ static void JsObjToDeviceConfig(const napi_env& env, const napi_value& object, W /* "randomMacAddr" is not supported currently */ int ipType = static_cast(AssignIpMethod::UNASSIGNED); JsObjectToInt(env, object, "ipType", ipType); - /* "staticIp" is not supported currently */ + if (AssignIpMethod(ipType) == AssignIpMethod::DHCP) { + cppConfig.wifiIpConfig.assignMethod = AssignIpMethod::DHCP; + } else if (AssignIpMethod(ipType) == AssignIpMethod::STATIC) { + cppConfig.wifiIpConfig.assignMethod = AssignIpMethod::STATIC; + ConfigStaticIp(env, object, cppConfig); + } } napi_value AddDeviceConfig(napi_env env, napi_callback_info info) diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_utils.cpp b/interfaces/innerkits/native_cpp/napi/wifi_napi_utils.cpp index 960c91b..802c756 100644 --- a/interfaces/innerkits/native_cpp/napi/wifi_napi_utils.cpp +++ b/interfaces/innerkits/native_cpp/napi/wifi_napi_utils.cpp @@ -100,6 +100,24 @@ napi_value JsObjectToInt(const napi_env& env, const napi_value& object, const ch return UndefinedNapiValue(env); } +napi_value JsObjectToUint(const napi_env& env, const napi_value& object, const char* fieldStr, uint32_t& fieldRef) +{ + bool hasProperty = false; + NAPI_CALL(env, napi_has_named_property(env, object, fieldStr, &hasProperty)); + if (hasProperty) { + napi_value field; + napi_valuetype valueType; + + napi_get_named_property(env, object, fieldStr, &field); + NAPI_CALL(env, napi_typeof(env, field, &valueType)); + NAPI_ASSERT(env, valueType == napi_number, "Wrong argument type. Number expected."); + napi_get_value_uint32(env, field, &fieldRef); + } else { + WIFI_LOGW("Js to int no property: %{public}s", fieldStr); + } + return UndefinedNapiValue(env); +} + napi_value JsObjectToBool(const napi_env& env, const napi_value& object, const char* fieldStr, bool& fieldRef) { bool hasProperty = false; diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_utils.h b/interfaces/innerkits/native_cpp/napi/wifi_napi_utils.h index e5d23b1..2c19d2d 100644 --- a/interfaces/innerkits/native_cpp/napi/wifi_napi_utils.h +++ b/interfaces/innerkits/native_cpp/napi/wifi_napi_utils.h @@ -76,6 +76,7 @@ napi_value UndefinedNapiValue(const napi_env& env); napi_value JsObjectToString(const napi_env& env, const napi_value& object, const char* fieldStr, const int bufLen, std::string& fieldRef); napi_value JsObjectToInt(const napi_env& env, const napi_value& object, const char* fieldStr, int& fieldRef); +napi_value JsObjectToUint(const napi_env& env, const napi_value& object, const char* fieldStr, uint32_t& fieldRef); napi_value JsObjectToBool(const napi_env& env, const napi_value& object, const char* fieldStr, bool& fieldRef); napi_status SetValueUtf8String(const napi_env& env, const char* fieldStr, const char* str, napi_value& result); napi_status SetValueInt32(const napi_env& env, const char* fieldStr, const int intValue, napi_value& result); -- Gitee From 6ebff6f2b9086f6847225c79100d8854c8af1c42 Mon Sep 17 00:00:00 2001 From: zhangxiao72 Date: Fri, 22 Apr 2022 16:11:50 +0800 Subject: [PATCH 085/491] =?UTF-8?q?ace=5Fengine=E3=80=81napi=20=E9=83=A8?= =?UTF-8?q?=E4=BB=B6=E5=90=8D=E4=BB=93=E5=90=8D=E5=92=8C=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E5=90=8D=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Idde9e789b2a523487182bd6bb6cff14f053227aa Signed-off-by: zhangxiao72 --- wifi/interfaces/innerkits/native_cpp/napi/BUILD.gn | 4 ++-- wifi/interfaces/innerkits/native_cpp/wifi_standard/BUILD.gn | 4 ++-- .../wifi_standard/wifi_framework/wifi_manage/BUILD.gn | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/wifi/interfaces/innerkits/native_cpp/napi/BUILD.gn b/wifi/interfaces/innerkits/native_cpp/napi/BUILD.gn index dd1e5d0..076ba25 100644 --- a/wifi/interfaces/innerkits/native_cpp/napi/BUILD.gn +++ b/wifi/interfaces/innerkits/native_cpp/napi/BUILD.gn @@ -43,7 +43,7 @@ ohos_shared_library("wifi") { "$WIFI_ROOT_DIR/utils/src:wifi_utils", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//foundation/aafwk/standard/frameworks/kits/appkit:app_context", - "//foundation/ace/napi:ace_napi", + "//foundation/arkui/napi:ace_napi", "//utils/native/base:utils", ] @@ -83,7 +83,7 @@ ohos_shared_library("wifi_native_js") { "$WIFI_ROOT_DIR/utils/src:wifi_utils", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//foundation/aafwk/standard/frameworks/kits/appkit:app_context", - "//foundation/ace/napi:ace_napi", + "//foundation/arkui/napi:ace_napi", "//utils/native/base:utils", ] diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/BUILD.gn b/wifi/interfaces/innerkits/native_cpp/wifi_standard/BUILD.gn index a9cf4f6..098523d 100644 --- a/wifi/interfaces/innerkits/native_cpp/wifi_standard/BUILD.gn +++ b/wifi/interfaces/innerkits/native_cpp/wifi_standard/BUILD.gn @@ -21,8 +21,8 @@ config("wifi_sdk_header") { "//utils/native/base/include", "//utils/system/safwk/native/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", - "//foundation/ace/ace_engine/frameworks/base/utils", - "//foundation/ace/ace_engine/frameworks", + "//foundation/arkui/ace_engine/frameworks/base/utils", + "//foundation/arkui/ace_engine/frameworks", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/include", "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces", diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn index 9e6c25a..3898ebc 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn @@ -23,8 +23,8 @@ config("wifi_manager_service_header") { include_dirs = [ "//utils/native/base/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", - "//foundation/ace/ace_engine/frameworks/base/utils", - "//foundation/ace/ace_engine/frameworks", + "//foundation/arkui/ace_engine/frameworks/base/utils", + "//foundation/arkui/ace_engine/frameworks", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk/", "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces", "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", -- Gitee From 0426cc9ff6277777427fdf9279eca54d4915ca99 Mon Sep 17 00:00:00 2001 From: junyi233 Date: Fri, 22 Apr 2022 16:29:40 +0800 Subject: [PATCH 086/491] =?UTF-8?q?=E9=83=A8=E4=BB=B6=E5=8C=965.0=E9=9C=80?= =?UTF-8?q?=E6=B1=82=E5=8C=85=E7=AE=A1=E7=90=86=E4=BE=9D=E8=B5=96=E6=95=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: junyi233 --- dhcp/services/dhcp_client/BUILD.gn | 7 ++-- dhcp/services/mgr_service/BUILD.gn | 11 +++--- dhcp/tests/services/dhcp_client/BUILD.gn | 7 ++-- dhcp/tests/services/mgr_service/BUILD.gn | 7 ++-- .../innerkits/native_cpp/napi/BUILD.gn | 12 ++++--- .../wifi_framework/wifi_manage/BUILD.gn | 34 +++++++++++++------ .../wifi_manage/unittest/BUILD.gn | 8 ++--- wifi/utils/src/BUILD.gn | 4 +-- 8 files changed, 49 insertions(+), 41 deletions(-) diff --git a/dhcp/services/dhcp_client/BUILD.gn b/dhcp/services/dhcp_client/BUILD.gn index 92ca029..36f8e2b 100644 --- a/dhcp/services/dhcp_client/BUILD.gn +++ b/dhcp/services/dhcp_client/BUILD.gn @@ -12,7 +12,6 @@ # limitations under the License. import("//build/ohos.gni") -import("//foundation/appexecfwk/standard/appexecfwk.gni") import("//foundation/communication/wifi/dhcp/dhcp.gni") ################################################################################ @@ -33,14 +32,11 @@ ohos_executable("dhcp_client_service") { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", "$DHCP_ROOT_DIR/services/dhcp_client/include", "//utils/native/base/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", "//third_party/openssl/include", ] deps = [ - "${aafwk_path}/interfaces/innerkits/base:base", - "${aafwk_path}/interfaces/innerkits/want:want", "//third_party/openssl:libcrypto_static", "//utils/native/base:utils", ] @@ -48,7 +44,10 @@ ohos_executable("dhcp_client_service") { cflags_cc = [ "-fno-rtti" ] external_deps = [ + "ability_base:want", + "bundle_framework:appexecfwk_base", "ces_standard:cesfwk_innerkits", + "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", ] defines = [] diff --git a/dhcp/services/mgr_service/BUILD.gn b/dhcp/services/mgr_service/BUILD.gn index 6938b61..51149c2 100644 --- a/dhcp/services/mgr_service/BUILD.gn +++ b/dhcp/services/mgr_service/BUILD.gn @@ -12,7 +12,6 @@ # limitations under the License. import("//build/ohos.gni") -import("//foundation/appexecfwk/standard/appexecfwk.gni") import("//foundation/communication/wifi/dhcp/dhcp.gni") ################################################################################ @@ -34,15 +33,10 @@ ohos_shared_library("dhcp_manager_service") { "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/interfaces", "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/include", "//utils/native/base/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", ] - deps = [ - "${aafwk_path}/interfaces/innerkits/base:base", - "${aafwk_path}/interfaces/innerkits/want:want", - "//utils/native/base:utils", - ] + deps = [ "//utils/native/base:utils" ] cflags_cc = [ "-std=c++17", @@ -50,7 +44,10 @@ ohos_shared_library("dhcp_manager_service") { ] external_deps = [ + "ability_base:want", + "bundle_framework:appexecfwk_base", "ces_standard:cesfwk_innerkits", + "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", ] ldflags = [ diff --git a/dhcp/tests/services/dhcp_client/BUILD.gn b/dhcp/tests/services/dhcp_client/BUILD.gn index 9968ec3..9693994 100644 --- a/dhcp/tests/services/dhcp_client/BUILD.gn +++ b/dhcp/tests/services/dhcp_client/BUILD.gn @@ -12,7 +12,6 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/appexecfwk/standard/appexecfwk.gni") import("//foundation/communication/wifi/dhcp/dhcp.gni") ################################################################################ @@ -53,14 +52,11 @@ ohos_unittest("dhcp_client_unittest") { "$DHCP_ROOT_DIR/services/dhcp_client/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", "//utils/native/base/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", "//third_party/openssl/include", ] deps = [ - "${aafwk_path}/interfaces/innerkits/base:base", - "${aafwk_path}/interfaces/innerkits/want:want", "//third_party/googletest:gmock_main", "//third_party/openssl:libcrypto_static", "//utils/native/base:utils", @@ -89,7 +85,10 @@ ohos_unittest("dhcp_client_unittest") { ] external_deps = [ + "ability_base:want", + "bundle_framework:appexecfwk_base", "ces_standard:cesfwk_innerkits", + "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", ] configs = [ ":module_private_config" ] diff --git a/dhcp/tests/services/mgr_service/BUILD.gn b/dhcp/tests/services/mgr_service/BUILD.gn index 53f8c72..91bd557 100644 --- a/dhcp/tests/services/mgr_service/BUILD.gn +++ b/dhcp/tests/services/mgr_service/BUILD.gn @@ -12,7 +12,6 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/appexecfwk/standard/appexecfwk.gni") import("//foundation/communication/wifi/dhcp/dhcp.gni") ################################################################################ @@ -54,7 +53,6 @@ ohos_unittest("dhcp_manage_unittest") { "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/interfaces", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", "//utils/native/base/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", "${even_path}/cesfwk/kits/native/include", "${even_path}/cesfwk/innerkits/include", @@ -62,8 +60,6 @@ ohos_unittest("dhcp_manage_unittest") { ] deps = [ - "${aafwk_path}/interfaces/innerkits/base:base", - "${aafwk_path}/interfaces/innerkits/want:want", "//third_party/googletest:gmock_main", "//utils/native/base:utils", ] @@ -93,7 +89,10 @@ ohos_unittest("dhcp_manage_unittest") { ] external_deps = [ + "ability_base:want", + "bundle_framework:appexecfwk_base", "ces_standard:cesfwk_innerkits", + "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", ] configs = [ ":module_private_config" ] diff --git a/wifi/interfaces/innerkits/native_cpp/napi/BUILD.gn b/wifi/interfaces/innerkits/native_cpp/napi/BUILD.gn index dd1e5d0..a5696d8 100644 --- a/wifi/interfaces/innerkits/native_cpp/napi/BUILD.gn +++ b/wifi/interfaces/innerkits/native_cpp/napi/BUILD.gn @@ -27,7 +27,6 @@ ohos_shared_library("wifi") { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", "//foundation/aafwk/standard/frameworks/kits/appkit/native/ability_runtime/context", "$WIFI_ROOT_DIR/utils/inc", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include", ] sources = [ @@ -47,7 +46,10 @@ ohos_shared_library("wifi") { "//utils/native/base:utils", ] - external_deps = [ "ipc:ipc_core" ] + external_deps = [ + "bundle_framework:appexecfwk_base", + "ipc:ipc_core", + ] relative_install_dir = "module" part_name = "wifi" @@ -67,7 +69,6 @@ ohos_shared_library("wifi_native_js") { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", "//foundation/aafwk/standard/frameworks/kits/appkit/native/ability_runtime/context", "$WIFI_ROOT_DIR/utils/inc", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include", ] sources = [ @@ -89,7 +90,10 @@ ohos_shared_library("wifi_native_js") { defines = [ "ENABLE_NAPI_COMPATIBLE" ] - external_deps = [ "ipc:ipc_core" ] + external_deps = [ + "bundle_framework:appexecfwk_base", + "ipc:ipc_core", + ] relative_install_dir = "module" part_name = "wifi" diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn index 9e6c25a..5677b2a 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn @@ -14,7 +14,6 @@ import("//build/ohos.gni") import("//build/ohos/sa_profile/sa_profile.gni") import("//build/ohos_var.gni") -import("//foundation/appexecfwk/standard/appexecfwk.gni") import("//foundation/communication/wifi/wifi/wifi.gni") ################################################################################ @@ -45,12 +44,8 @@ config("wifi_manager_service_header") { "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/include", "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/interfaces", "$WIFI_ROOT_DIR/utils/inc", - "${aafwk_path}/interfaces/innerkits/want/include", - "${aafwk_path}/interfaces/innerkits/want/include/ohos/aafwk/content", "//foundation/appexecfwk/adapter/interfaces/innerkits/appexecfwk_base/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", "//foundation/aafwk/standard/interfaces/innerkits/base/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include", "//base/security/access_token/interfaces/innerkits/accesstoken/include", "//foundation/communication/netmanager_base/services/netmanagernative/include/netsys", ] @@ -86,7 +81,12 @@ ohos_source_set("wifi_scan_service_impl") { ":wifi_manager_service_header", ] - external_deps = [ "ipc:ipc_core" ] + external_deps = [ + "ability_base:want", + "bundle_framework:appexecfwk_base", + "eventhandler:libeventhandler", + "ipc:ipc_core", + ] } ohos_source_set("wifi_device_service_impl") { part_name = "wifi" @@ -108,7 +108,12 @@ ohos_source_set("wifi_device_service_impl") { } deps = [ ":wifi_p2p_service_impl" ] - external_deps = [ "ipc:ipc_core" ] + external_deps = [ + "ability_base:want", + "bundle_framework:appexecfwk_base", + "eventhandler:libeventhandler", + "ipc:ipc_core", + ] } ohos_source_set("wifi_hotspot_service_impl") { part_name = "wifi" @@ -123,7 +128,12 @@ ohos_source_set("wifi_hotspot_service_impl") { ":wifi_manager_service_header", ] - external_deps = [ "ipc:ipc_core" ] + external_deps = [ + "ability_base:want", + "bundle_framework:appexecfwk_base", + "eventhandler:libeventhandler", + "ipc:ipc_core", + ] } ohos_source_set("wifi_p2p_service_impl") { part_name = "wifi" @@ -146,6 +156,9 @@ ohos_source_set("wifi_p2p_service_impl") { deps = [ "//foundation/communication/netmanager_base/services/netmanagernative:netsys_native_manager" ] external_deps = [ + "ability_base:want", + "bundle_framework:appexecfwk_base", + "eventhandler:libeventhandler", "ipc:ipc_core", "netmanager_base:net_conn_manager_if", ] @@ -179,8 +192,6 @@ ohos_shared_library("wifi_manager_service") { "$WIFI_ROOT_DIR/services/wifi_standard/etc/init:etc", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", "$WIFI_ROOT_DIR/utils/src:wifi_utils", - "${aafwk_path}/interfaces/innerkits/base:base", - "${aafwk_path}/interfaces/innerkits/want:want", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//foundation/communication/netmanager_base/services/netmanagernative:netsys_native_manager", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", @@ -190,8 +201,11 @@ ohos_shared_library("wifi_manager_service") { configs = [ ":wifi_manager_service_header" ] external_deps = [ + "ability_base:want", "access_token:libaccesstoken_sdk", + "bundle_framework:appexecfwk_base", "ces_standard:cesfwk_innerkits", + "eventhandler:libeventhandler", "ipc:ipc_core", "netmanager_base:net_conn_manager_if", ] diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn index 3e5a200..f939e2d 100644 --- a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn +++ b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn @@ -12,7 +12,6 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/appexecfwk/standard/appexecfwk.gni") import("//foundation/communication/wifi/wifi/wifi.gni") ################################################################################ @@ -74,9 +73,7 @@ ohos_unittest("manager_unittest") { "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content", "//foundation/aafwk/standard/interfaces/innerkits/want/include", "//foundation/appexecfwk/adapter/interfaces/innerkits/appexecfwk_base/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", "//foundation/aafwk/standard/interfaces/innerkits/base/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include", "//base/security/access_token/interfaces/innerkits/accesstoken/include", "//foundation/communication/netmanager_base/services/netmanagernative/include/netsys", "$WIFI_ROOT_DIR/utils/inc", @@ -86,8 +83,6 @@ ohos_unittest("manager_unittest") { "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC:crpc_client", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", "$WIFI_ROOT_DIR/utils/src:wifi_utils", - "${aafwk_path}/interfaces/innerkits/base:base", - "${aafwk_path}/interfaces/innerkits/want:want", "//utils/native/base:utils", ] @@ -97,8 +92,11 @@ ohos_unittest("manager_unittest") { ] external_deps = [ + "ability_base:want", "access_token:libaccesstoken_sdk", + "bundle_framework:appexecfwk_base", "ces_standard:cesfwk_innerkits", + "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "netmanager_base:net_conn_manager_if", diff --git a/wifi/utils/src/BUILD.gn b/wifi/utils/src/BUILD.gn index d924396..62493b4 100644 --- a/wifi/utils/src/BUILD.gn +++ b/wifi/utils/src/BUILD.gn @@ -20,8 +20,6 @@ ohos_shared_library("wifi_utils") { "$WIFI_ROOT_DIR/utils/inc", "//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include/bundlemgr/", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include/bundlemgr/", ] sources = [ @@ -32,13 +30,13 @@ ohos_shared_library("wifi_utils") { deps = [ "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//utils/native/base:utils", ] external_deps = [ "bundle_framework:appexecfwk_base", + "bundle_framework:appexecfwk_core", "hisysevent_native:libhisysevent", "ipc:ipc_core", ] -- Gitee From 9e9eb03aa0d22194800f2b8fc7992e2a4bb7b813 Mon Sep 17 00:00:00 2001 From: liqiang Date: Thu, 21 Apr 2022 10:46:06 +0800 Subject: [PATCH 087/491] IssueNo:https://gitee.com/openharmony/notification_ces_standard/issues/I53O6Y Description:ces_standard change to common_event_service Sig: SIG_ApplicationFramework Feature or Bugfix:Feature Binary Source:No Signed-off-by: liqiang Change-Id: Iceb2c2e1f87d89a529f677aa7a7ac50b4e135b87 --- dhcp/services/dhcp_client/BUILD.gn | 2 +- dhcp/services/mgr_service/BUILD.gn | 2 +- dhcp/tests/services/dhcp_client/BUILD.gn | 2 +- dhcp/tests/services/mgr_service/BUILD.gn | 6 +++--- wifi/interfaces/innerkits/native_cpp/wifi_standard/BUILD.gn | 4 ++-- .../wifi_standard/wifi_framework/wifi_manage/BUILD.gn | 2 +- .../wifi_framework/wifi_manage/unittest/BUILD.gn | 6 +++--- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dhcp/services/dhcp_client/BUILD.gn b/dhcp/services/dhcp_client/BUILD.gn index 36f8e2b..a70002c 100644 --- a/dhcp/services/dhcp_client/BUILD.gn +++ b/dhcp/services/dhcp_client/BUILD.gn @@ -46,7 +46,7 @@ ohos_executable("dhcp_client_service") { external_deps = [ "ability_base:want", "bundle_framework:appexecfwk_base", - "ces_standard:cesfwk_innerkits", + "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", ] diff --git a/dhcp/services/mgr_service/BUILD.gn b/dhcp/services/mgr_service/BUILD.gn index 51149c2..543616c 100644 --- a/dhcp/services/mgr_service/BUILD.gn +++ b/dhcp/services/mgr_service/BUILD.gn @@ -46,7 +46,7 @@ ohos_shared_library("dhcp_manager_service") { external_deps = [ "ability_base:want", "bundle_framework:appexecfwk_base", - "ces_standard:cesfwk_innerkits", + "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", ] diff --git a/dhcp/tests/services/dhcp_client/BUILD.gn b/dhcp/tests/services/dhcp_client/BUILD.gn index 9693994..8a61e94 100644 --- a/dhcp/tests/services/dhcp_client/BUILD.gn +++ b/dhcp/tests/services/dhcp_client/BUILD.gn @@ -87,7 +87,7 @@ ohos_unittest("dhcp_client_unittest") { external_deps = [ "ability_base:want", "bundle_framework:appexecfwk_base", - "ces_standard:cesfwk_innerkits", + "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", ] diff --git a/dhcp/tests/services/mgr_service/BUILD.gn b/dhcp/tests/services/mgr_service/BUILD.gn index 91bd557..cca9432 100644 --- a/dhcp/tests/services/mgr_service/BUILD.gn +++ b/dhcp/tests/services/mgr_service/BUILD.gn @@ -17,7 +17,7 @@ import("//foundation/communication/wifi/dhcp/dhcp.gni") ################################################################################ module_output_path = "wifi_standard/dhcp_manage_test" -even_path = "//base/notification/ces_standard" +even_path = "//base/notification/common_event_service" config("module_private_config") { visibility = [ ":*" ] @@ -56,7 +56,7 @@ ohos_unittest("dhcp_manage_unittest") { "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", "${even_path}/cesfwk/kits/native/include", "${even_path}/cesfwk/innerkits/include", - "//base/notification/ces_standard/frameworks/core/include", + "//base/notification/common_event_service/frameworks/core/include", ] deps = [ @@ -91,7 +91,7 @@ ohos_unittest("dhcp_manage_unittest") { external_deps = [ "ability_base:want", "bundle_framework:appexecfwk_base", - "ces_standard:cesfwk_innerkits", + "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", ] diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/BUILD.gn b/wifi/interfaces/innerkits/native_cpp/wifi_standard/BUILD.gn index a9cf4f6..3f3240f 100644 --- a/wifi/interfaces/innerkits/native_cpp/wifi_standard/BUILD.gn +++ b/wifi/interfaces/innerkits/native_cpp/wifi_standard/BUILD.gn @@ -141,8 +141,8 @@ ohos_shared_library("wifi_sdk") { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", "$WIFI_ROOT_DIR/utils/src:wifi_utils", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//base/notification/ces_standard/frameworks/core:cesfwk_core", - "//base/notification/ces_standard/frameworks/native:cesfwk_innerkits", + "//base/notification/common_event_service/frameworks/core:cesfwk_core", + "//base/notification/common_event_service/frameworks/native:cesfwk_innerkits", "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/bounds_checking_function:libsec_static", diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn index 5677b2a..82c7d90 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn @@ -204,7 +204,7 @@ ohos_shared_library("wifi_manager_service") { "ability_base:want", "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", - "ces_standard:cesfwk_innerkits", + "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", "ipc:ipc_core", "netmanager_base:net_conn_manager_if", diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn index f939e2d..d006d7c 100644 --- a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn +++ b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn @@ -68,8 +68,8 @@ ohos_unittest("manager_unittest") { "//utils/native/base/include", "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", - "//base/notification/ces_standard/cesfwk/innerkits/include", - "//base/notification/ces_standard/cesfwk/kits/native/include", + "//base/notification/common_event_service/cesfwk/innerkits/include", + "//base/notification/common_event_service/cesfwk/kits/native/include", "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content", "//foundation/aafwk/standard/interfaces/innerkits/want/include", "//foundation/appexecfwk/adapter/interfaces/innerkits/appexecfwk_base/include", @@ -95,7 +95,7 @@ ohos_unittest("manager_unittest") { "ability_base:want", "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", - "ces_standard:cesfwk_innerkits", + "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", -- Gitee From b83fb64f0803bb1fbc4c4822542892777da68199 Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Mon, 25 Apr 2022 07:33:58 +0000 Subject: [PATCH 088/491] #I54KZI File location adjustment Signed-off-by: zhangfeng --- dhcp/LICENSE => LICENSE | 0 wifi/README.md => README.md | 0 wifi/README_zh.md => README_zh.md | 0 wifi/.gitattributes | 15 --- wifi/LICENSE | 177 ------------------------------ 5 files changed, 192 deletions(-) rename dhcp/LICENSE => LICENSE (100%) rename wifi/README.md => README.md (100%) rename wifi/README_zh.md => README_zh.md (100%) delete mode 100644 wifi/.gitattributes delete mode 100644 wifi/LICENSE diff --git a/dhcp/LICENSE b/LICENSE similarity index 100% rename from dhcp/LICENSE rename to LICENSE diff --git a/wifi/README.md b/README.md similarity index 100% rename from wifi/README.md rename to README.md diff --git a/wifi/README_zh.md b/README_zh.md similarity index 100% rename from wifi/README_zh.md rename to README_zh.md diff --git a/wifi/.gitattributes b/wifi/.gitattributes deleted file mode 100644 index 51c63e2..0000000 --- a/wifi/.gitattributes +++ /dev/null @@ -1,15 +0,0 @@ -*.tgz filter=lfs diff=lfs merge=lfs -text -*.trp filter=lfs diff=lfs merge=lfs -text -*.apk filter=lfs diff=lfs merge=lfs -text -*.jar filter=lfs diff=lfs merge=lfs -text -*.mp4 filter=lfs diff=lfs merge=lfs -text -*.zip filter=lfs diff=lfs merge=lfs -text -*.asm filter=lfs diff=lfs merge=lfs -text -*.8svn filter=lfs diff=lfs merge=lfs -text -*.9svn filter=lfs diff=lfs merge=lfs -text -*.dylib filter=lfs diff=lfs merge=lfs -text -*.exe filter=lfs diff=lfs merge=lfs -text -*.a filter=lfs diff=lfs merge=lfs -text -*.so filter=lfs diff=lfs merge=lfs -text -*.bin filter=lfs diff=lfs merge=lfs -text -*.dll filter=lfs diff=lfs merge=lfs -text diff --git a/wifi/LICENSE b/wifi/LICENSE deleted file mode 100644 index 4947287..0000000 --- a/wifi/LICENSE +++ /dev/null @@ -1,177 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS \ No newline at end of file -- Gitee From 98f5d2620584ca9ed6c5e5f9f3bff070d14c82ee Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Mon, 25 Apr 2022 07:42:49 +0000 Subject: [PATCH 089/491] #I52JS5 Conditional check optimization Signed-off-by: zhangfeng --- dhcp/services/dhcp_server/src/dhcp_server.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dhcp/services/dhcp_server/src/dhcp_server.c b/dhcp/services/dhcp_server/src/dhcp_server.c index 61ea140..f4da3f9 100644 --- a/dhcp/services/dhcp_server/src/dhcp_server.c +++ b/dhcp/services/dhcp_server/src/dhcp_server.c @@ -269,7 +269,7 @@ int ReceiveDhcpMessage(int sock, PDhcpMsgInfo msgInfo) LOGE("receive error, %d", errno); return RET_FAILED; } - if (rsize > (int)sizeof(DhcpMsgInfo) || rsize < DHCP_MSG_HEADER_SIZE) { + if (rsize > (int)sizeof(DhcpMessage) || rsize < DHCP_MSG_HEADER_SIZE) { LOGW("message length error, received %d bytes.", rsize); return RET_FAILED; } @@ -1710,4 +1710,4 @@ int FreeServerContext(PDhcpServerContext ctx) ctx = NULL; } return RET_SUCCESS; -} \ No newline at end of file +} -- Gitee From 685f9a2720511a44a69e53812cbb8508312b4b7e Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Mon, 25 Apr 2022 12:34:44 +0000 Subject: [PATCH 090/491] move the position of figures dir Signed-off-by: zhangfeng --- .../en-us_image_0000001115710400.png | Bin .../zh-cn_image_0000001115710400.png | Bin 2 files changed, 0 insertions(+), 0 deletions(-) rename {wifi/figures => figures}/en-us_image_0000001115710400.png (100%) rename {wifi/figures => figures}/zh-cn_image_0000001115710400.png (100%) diff --git a/wifi/figures/en-us_image_0000001115710400.png b/figures/en-us_image_0000001115710400.png similarity index 100% rename from wifi/figures/en-us_image_0000001115710400.png rename to figures/en-us_image_0000001115710400.png diff --git a/wifi/figures/zh-cn_image_0000001115710400.png b/figures/zh-cn_image_0000001115710400.png similarity index 100% rename from wifi/figures/zh-cn_image_0000001115710400.png rename to figures/zh-cn_image_0000001115710400.png -- Gitee From fdf422553b19800a642d293bf693eb12a1c3e433 Mon Sep 17 00:00:00 2001 From: zhangxiao72 Date: Thu, 28 Apr 2022 10:31:35 +0800 Subject: [PATCH 091/491] =?UTF-8?q?ace=5Fengine=E3=80=81napi=20=E9=83=A8?= =?UTF-8?q?=E4=BB=B6=E5=90=8D=E4=BB=93=E5=90=8D=E5=92=8C=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E5=90=8D=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I37b3781e078dc8ab2b10b05f31494537f0366950 Signed-off-by: zhangxiao72 --- .../wifi_framework/wifi_manage/wifi_sta/BUILD.gn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn index baf4e7a..f3475e7 100644 --- a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn +++ b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn @@ -98,8 +98,8 @@ ohos_unittest("wifi_sta_unittest") { "//utils/native/base/include", "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", - "//foundation/ace/ace_engine/frameworks/base/utils", - "//foundation/ace/ace_engine/frameworks", + "//foundation/arkui/ace_engine/frameworks/base/utils", + "//foundation/arkui/ace_engine/frameworks", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk/", "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content/", "//foundation/aafwk/aafwk_lite/interfaces/kits/want_lite/", -- Gitee From c3d0ec71804e41156244e74f30f694ac7f616c67 Mon Sep 17 00:00:00 2001 From: zhouke Date: Thu, 28 Apr 2022 11:28:38 +0800 Subject: [PATCH 092/491] =?UTF-8?q?=E8=A7=A3=E5=86=B3dhcp=E8=AE=BE?= =?UTF-8?q?=E7=BD=AEip=E6=97=B6=EF=BC=8C=E6=9C=AA=E8=80=83=E8=99=91?= =?UTF-8?q?=E5=AD=90=E7=BD=91=E6=8E=A9=E7=A0=81=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhouke --- .../dhcp_client/include/dhcp_function.h | 2 +- dhcp/services/dhcp_client/src/dhcp_function.c | 55 +++++++++---------- dhcp/services/dhcp_client/src/dhcp_ipv4.c | 3 +- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/dhcp/services/dhcp_client/include/dhcp_function.h b/dhcp/services/dhcp_client/include/dhcp_function.h index 76bc90f..cc3da5a 100644 --- a/dhcp/services/dhcp_client/include/dhcp_function.h +++ b/dhcp/services/dhcp_client/include/dhcp_function.h @@ -30,7 +30,7 @@ bool Ip6StrConToChar(const char *strIp, uint8_t chIp[], size_t chlen); const char *MacChConToMacStr(const unsigned char *pChMac, size_t chLen, char *pStrMac, size_t strLen); int GetLocalInterface(const char *ifname, int *ifindex, unsigned char *hwaddr, uint32_t *ifaddr4); int GetLocalIp(const char *ifname, uint32_t *ifaddr4); -int SetLocalInterface(const char *ifname, uint32_t ifaddr4); +int SetLocalInterface(const char *ifname, uint32_t ipAddr, uint32_t netMask); int InitPidfile(const char *pidDir, const char *pidFile, pid_t pid); pid_t GetPID(const char *pidFile); int CreateDirs(const char *dirs, int mode); diff --git a/dhcp/services/dhcp_client/src/dhcp_function.c b/dhcp/services/dhcp_client/src/dhcp_function.c index 6b8c2df..d477053 100644 --- a/dhcp/services/dhcp_client/src/dhcp_function.c +++ b/dhcp/services/dhcp_client/src/dhcp_function.c @@ -272,58 +272,57 @@ int GetLocalIp(const char *ifname, uint32_t *ifaddr4) return DHCP_OPT_SUCCESS; } -int SetLocalInterface(const char *ifname, uint32_t ifaddr4) +int SetIpOrMask(const char *ifname, int fd, uint32_t netAddr, unsigned long cmd) { - if ((ifname == NULL) || (strlen(ifname) == 0)) { - LOGE("SetLocalInterface() failed, ifname == NULL or \"\"!"); + struct ifreq ifr; + struct sockaddr_in sin; + if (memset_s(&ifr, sizeof(struct ifreq), 0, sizeof(struct ifreq)) != EOK) { return DHCP_OPT_FAILED; } - char *cIp = Ip4IntConToStr(ifaddr4, true); - if (cIp == NULL) { - LOGE("SetLocalInterface() %{public}s failed, Ip4IntConToStr addr4:%{private}u failed!", ifname, ifaddr4); + if (strncpy_s(ifr.ifr_name, sizeof(ifr.ifr_name), ifname, strlen(ifname)) != EOK) { return DHCP_OPT_FAILED; } - LOGI("SetLocalInterface() %{public}s, ifaddr4:%{private}u -> %{private}s.", ifname, ifaddr4, cIp); - free(cIp); - cIp = NULL; - - int fd; - struct ifreq ifr; - struct sockaddr_in sin; - if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) { - LOGE("SetLocalInterface() ifname:%{public}s failed, socket error:%{public}d!", ifname, errno); + if (memset_s(&sin, sizeof(struct sockaddr_in), 0, sizeof(struct sockaddr_in)) != EOK) { + return DHCP_OPT_FAILED; + } + sin.sin_family = AF_INET; + sin.sin_addr.s_addr = netAddr; + if (memcpy_s(&ifr.ifr_addr, sizeof(ifr.ifr_addr), &sin, sizeof(struct sockaddr)) != EOK) { return DHCP_OPT_FAILED; } - if (memset_s(&ifr, sizeof(ifr), 0, sizeof(ifr)) != EOK) { - close(fd); + if (ioctl(fd, cmd, &ifr) < 0) { + LOGE("SetIpOrMask() %{public}s failed, %{public}ld!", ifname, cmd); return DHCP_OPT_FAILED; } - if (strncpy_s(ifr.ifr_name, sizeof(ifr.ifr_name), ifname, strlen(ifname)) != EOK) { - close(fd); + return DHCP_OPT_SUCCESS; +} + +int SetLocalInterface(const char *ifname, uint32_t ipAddr, uint32_t netMask) +{ + if ((ifname == NULL) || (strlen(ifname) == 0)) { + LOGE("SetLocalInterface() failed, ifname == NULL or \"\"!"); return DHCP_OPT_FAILED; } + LOGI("SetLocalInterface() %{public}s, ipAddr:%{private}u mask %{private}u.", ifname, ipAddr, netMask); - if (memset_s(&sin, sizeof(sin), 0, sizeof(sin)) != EOK) { - close(fd); + int fd; + if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) { + LOGE("SetLocalInterface() ifname:%{public}s failed, socket error:%{public}d!", ifname, errno); return DHCP_OPT_FAILED; } - sin.sin_family = AF_INET; - sin.sin_addr.s_addr = htonl(ifaddr4); - if (memcpy_s(&ifr.ifr_addr, sizeof(ifr.ifr_addr), &sin, sizeof(struct sockaddr)) != EOK) { + + if (SetIpOrMask(ifname, fd, ipAddr, SIOCSIFADDR) != DHCP_OPT_SUCCESS) { close(fd); return DHCP_OPT_FAILED; } - /* Similar to the system command: ifconfig ifname ifaddr4. */ - if (ioctl(fd, SIOCSIFADDR, &ifr) < 0) { - LOGE("SetLocalInterface() %{public}s failed, SIOCSIFADDR err:%{public}d!", ifname, errno); + if (SetIpOrMask(ifname, fd, netMask, SIOCSIFNETMASK) != DHCP_OPT_SUCCESS) { close(fd); return DHCP_OPT_FAILED; } - close(fd); return DHCP_OPT_SUCCESS; } diff --git a/dhcp/services/dhcp_client/src/dhcp_ipv4.c b/dhcp/services/dhcp_client/src/dhcp_ipv4.c index 87a451b..1ec65ab 100644 --- a/dhcp/services/dhcp_client/src/dhcp_ipv4.c +++ b/dhcp/services/dhcp_client/src/dhcp_ipv4.c @@ -843,7 +843,8 @@ static int SyncDhcpResult(const struct DhcpPacket *packet, struct DhcpResult *re } /* Set the specified client process interface network info. */ - if (SetLocalInterface(g_cltCnf->ifaceName, ntohl(g_requestedIp4)) != DHCP_OPT_SUCCESS) { + if (SetLocalInterface(g_cltCnf->ifaceName, inet_addr(result->strYiaddr), inet_addr(result->strOptSubnet)) + != DHCP_OPT_SUCCESS) { LOGE("SyncDhcpResult() error, SetLocalInterface yiaddr:%{private}s failed!", result->strYiaddr); return DHCP_OPT_FAILED; } -- Gitee From 2aa15cec39ae1aa1a5f7c3fd4b274f3f8523b895 Mon Sep 17 00:00:00 2001 From: liqiang Date: Thu, 5 May 2022 21:35:21 +0800 Subject: [PATCH 093/491] IssueNo:https://gitee.com/openharmony/communication_wifi/issues/I55XY4 Description:adapt ces component modification Sig: SIG_ApplicationFramework Feature or Bugfix:Feature Binary Source:No Signed-off-by: liqiang Change-Id: Iabcdf657062e4dcff7901e66f9ccbf40aae42cfc --- .../interfaces/innerkits/native_cpp/wifi_standard/BUILD.gn | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/BUILD.gn b/wifi/interfaces/innerkits/native_cpp/wifi_standard/BUILD.gn index 19e09dd..1f15c1f 100644 --- a/wifi/interfaces/innerkits/native_cpp/wifi_standard/BUILD.gn +++ b/wifi/interfaces/innerkits/native_cpp/wifi_standard/BUILD.gn @@ -141,15 +141,16 @@ ohos_shared_library("wifi_sdk") { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", "$WIFI_ROOT_DIR/utils/src:wifi_utils", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//base/notification/common_event_service/frameworks/core:cesfwk_core", - "//base/notification/common_event_service/frameworks/native:cesfwk_innerkits", "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/bounds_checking_function:libsec_static", "//utils/native/base:utils", ] - external_deps = [ "ipc:ipc_core" ] + external_deps = [ + "common_event_service:cesfwk_innerkits", + "ipc:ipc_core", + ] cflags_cc = [ "-std=c++17", -- Gitee From 502675f7075b884682e65094f505ed7d72b2e3da Mon Sep 17 00:00:00 2001 From: renwei Date: Fri, 6 May 2022 12:29:26 +0800 Subject: [PATCH 094/491] add secon cfg Signed-off-by: renwei Change-Id: Ibbcaa68ce0c01eb5968af33aae5d8472a324ff76 --- wifi/services/wifi_standard/etc/init/wifi_standard.cfg | 3 ++- .../wifi_standard/wifi_hal/etc/init/wifi_hal_service.cfg | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/wifi/services/wifi_standard/etc/init/wifi_standard.cfg b/wifi/services/wifi_standard/etc/init/wifi_standard.cfg index 1c464da..b8d9fad 100644 --- a/wifi/services/wifi_standard/etc/init/wifi_standard.cfg +++ b/wifi/services/wifi_standard/etc/init/wifi_standard.cfg @@ -15,7 +15,8 @@ "caps" : ["CAP_CHOWN", "CAP_NET_ADMIN", "CAP_NET_BIND_SERVICE", "CAP_NET_RAW"], "jobs" : { "on-start" : "services:wifi_manager_service" - } + }, + "secon" : "u:r:wifi_manager_service:s0" } ] } diff --git a/wifi/services/wifi_standard/wifi_hal/etc/init/wifi_hal_service.cfg b/wifi/services/wifi_standard/wifi_hal/etc/init/wifi_hal_service.cfg index 908ea33..22db872 100644 --- a/wifi/services/wifi_standard/wifi_hal/etc/init/wifi_hal_service.cfg +++ b/wifi/services/wifi_standard/wifi_hal/etc/init/wifi_hal_service.cfg @@ -4,7 +4,8 @@ "path" : ["/system/bin/wifi_hal_service"], "caps" : ["CAP_CHOWN", "CAP_NET_ADMIN", "CAP_NET_BIND_SERVICE", "CAP_NET_RAW"], "uid" : "wifi", - "gid" : ["wifi", "shell"] + "gid" : ["wifi", "shell"], + "secon" : "u:r:wifi_hal_service:s0" } ] } -- Gitee From fab468910f974af2e1102e3f929bdf9cd630877f Mon Sep 17 00:00:00 2001 From: fangdong7 Date: Sat, 7 May 2022 09:13:38 +0000 Subject: [PATCH 095/491] fix: Extended timeout threshold Signed-off-by: fangdong7 --- .../wifi_framework/wifi_manage/wifi_p2p/p2p_define.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_define.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_define.h index 52116c7..0ee1210 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_define.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_define.h @@ -28,7 +28,7 @@ const std::string P2P_INTERFACE("wlan0"); const std::string P2P_INTERFACE("p2p0"); #endif /* The timeout interval of enable p2p */ -constexpr long ENABLE_P2P_TIMED_OUT__INTERVAL = 5000; +constexpr long ENABLE_P2P_TIMED_OUT__INTERVAL = 15000; /* The time of clears service requests processed in records. */ constexpr long REMOVE_SERVICE_REQUEST_RECORD = 3000; -- Gitee From f488da25acc4e3093146a01ad57f051380720bf4 Mon Sep 17 00:00:00 2001 From: junxinlu Date: Sat, 7 May 2022 20:27:43 +0800 Subject: [PATCH 096/491] adapter dhcp component to L1 Signed-off-by: junxinlu --- dhcp/BUILD.gn | 27 +++ dhcp/dhcp_lite.gni | 19 ++ .../native_cpp/include/dhcp_define.h | 5 + dhcp/services/dhcp_client/BUILD.gn | 112 +++++++----- .../dhcp_client/include/dhcp_define.h | 4 +- dhcp/services/dhcp_client/src/dhcp_api.cpp | 14 +- dhcp/services/dhcp_client/src/dhcp_ipv4.c | 6 +- dhcp/services/dhcp_server/BUILD.gn | 108 +++++++---- .../dhcp_server/include/dhcp_logger.h | 6 +- dhcp/services/mgr_service/BUILD.gn | 129 +++++++++----- .../include/dhcp_client_service_impl.h | 22 ++- .../include/dhcp_event_subscriber.h | 15 +- dhcp/services/mgr_service/include/dhcp_func.h | 10 +- .../src/dhcp_client_service_impl.cpp | 168 +++++++++++++++++- .../mgr_service/src/dhcp_event_subscriber.cpp | 7 +- dhcp/services/mgr_service/src/dhcp_func.cpp | 54 +++++- 16 files changed, 568 insertions(+), 138 deletions(-) create mode 100644 dhcp/BUILD.gn create mode 100644 dhcp/dhcp_lite.gni diff --git a/dhcp/BUILD.gn b/dhcp/BUILD.gn new file mode 100644 index 0000000..127487d --- /dev/null +++ b/dhcp/BUILD.gn @@ -0,0 +1,27 @@ +# Copyright (C) 2022 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if (defined(ohos_lite)) { + import("//build/lite/config/component/lite_component.gni") + import("//foundation/communication/wifi/dhcp/dhcp_lite.gni") + + lite_component("dhcp") { + deps = [ + "$DHCP_ROOT_DIR/services/dhcp_client:dhcp_client_service", + "$DHCP_ROOT_DIR/services/dhcp_server:dhcp_server", + "$DHCP_ROOT_DIR/services/mgr_service:dhcp_manager_service", + ] + + features = [] + } +} diff --git a/dhcp/dhcp_lite.gni b/dhcp/dhcp_lite.gni new file mode 100644 index 0000000..49b97c3 --- /dev/null +++ b/dhcp/dhcp_lite.gni @@ -0,0 +1,19 @@ +# Copyright (c) 2022 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +SUBSYSTEM_DIR = "//foundation/communication" +WIFI_ROOT_DIR = "$SUBSYSTEM_DIR/wifi/wifi" +DHCP_ROOT_DIR = "$SUBSYSTEM_DIR/wifi/dhcp" + +declare_args() { +} diff --git a/dhcp/interfaces/innerkits/native_cpp/include/dhcp_define.h b/dhcp/interfaces/innerkits/native_cpp/include/dhcp_define.h index 7e96bba..f419f05 100644 --- a/dhcp/interfaces/innerkits/native_cpp/include/dhcp_define.h +++ b/dhcp/interfaces/innerkits/native_cpp/include/dhcp_define.h @@ -67,8 +67,13 @@ const std::string EVENT_DATA_IPV6("ipv6"); const std::string DHCP_WORK_DIR("/data/dhcp/"); const std::string DHCP_CLIENT_PID_FILETYPE(".pid"); const std::string DHCP_RESULT_FILETYPE(".result"); +#ifdef OHOS_ARCH_LITE +const std::string DHCP_CLIENT_FILE("/bin/dhcp_client_service"); +const std::string DHCP_SERVER_FILE("/bin/dhcp_server"); +#else const std::string DHCP_CLIENT_FILE("/system/bin/dhcp_client_service"); const std::string DHCP_SERVER_FILE("/system/bin/dhcp_server"); +#endif const std::string DHCP_SERVER_CONFIG_FILE("/data/dhcp/etc/dhcpd.conf"); const std::string DHCP_SERVER_CONFIG_DIR("/data/dhcp/etc/"); const std::string DHCP_SERVER_LEASES_FILE("/data/dhcp/dhcpd_lease.lease"); diff --git a/dhcp/services/dhcp_client/BUILD.gn b/dhcp/services/dhcp_client/BUILD.gn index a70002c..54c6ce3 100644 --- a/dhcp/services/dhcp_client/BUILD.gn +++ b/dhcp/services/dhcp_client/BUILD.gn @@ -11,47 +11,79 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//build/ohos.gni") -import("//foundation/communication/wifi/dhcp/dhcp.gni") +if (defined(ohos_lite)) { + import("//build/lite/config/component/lite_component.gni") + import("//foundation/communication/wifi/dhcp/dhcp_lite.gni") +} else { + import("//build/ohos.gni") + import("//foundation/communication/wifi/dhcp/dhcp.gni") +} ################################################################################ -ohos_executable("dhcp_client_service") { - install_enable = true - sources = [ - "$DHCP_ROOT_DIR/services/dhcp_client/src/dhcp_api.cpp", - "$DHCP_ROOT_DIR/services/dhcp_client/src/dhcp_client.c", - "$DHCP_ROOT_DIR/services/dhcp_client/src/dhcp_function.c", - "$DHCP_ROOT_DIR/services/dhcp_client/src/dhcp_ipv4.c", - "$DHCP_ROOT_DIR/services/dhcp_client/src/dhcp_main.c", - "$DHCP_ROOT_DIR/services/dhcp_client/src/dhcp_options.c", - "$DHCP_ROOT_DIR/services/dhcp_client/src/dhcp_socket.c", - ] - - include_dirs = [ - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", - "$DHCP_ROOT_DIR/services/dhcp_client/include", - "//utils/native/base/include", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", - "//third_party/openssl/include", - ] - - deps = [ - "//third_party/openssl:libcrypto_static", - "//utils/native/base:utils", - ] - - cflags_cc = [ "-fno-rtti" ] - - external_deps = [ - "ability_base:want", - "bundle_framework:appexecfwk_base", - "common_event_service:cesfwk_innerkits", - "eventhandler:libeventhandler", - "hiviewdfx_hilog_native:libhilog", - ] - defines = [] - - part_name = "dhcp" - subsystem_name = "communication" +local_base_sources = [ + "$DHCP_ROOT_DIR/services/dhcp_client/src/dhcp_api.cpp", + "$DHCP_ROOT_DIR/services/dhcp_client/src/dhcp_client.c", + "$DHCP_ROOT_DIR/services/dhcp_client/src/dhcp_function.c", + "$DHCP_ROOT_DIR/services/dhcp_client/src/dhcp_ipv4.c", + "$DHCP_ROOT_DIR/services/dhcp_client/src/dhcp_main.c", + "$DHCP_ROOT_DIR/services/dhcp_client/src/dhcp_options.c", + "$DHCP_ROOT_DIR/services/dhcp_client/src/dhcp_socket.c", +] + +local_base_include_dirs = [ + "$DHCP_ROOT_DIR/services/dhcp_client/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", +] + +if (defined(ohos_lite)) { + executable("dhcp_client_service") { + sources = local_base_sources + + include_dirs = local_base_include_dirs + include_dirs += [ + "//base/hiviewdfx/hilog_lite/interfaces/native/innerkits", + "//third_party/bounds_checking_function/include", + ] + + deps = [ + "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", + "//third_party/bounds_checking_function:libsec_shared", + ] + defines = [ + "_GNU_SOURCE", + "OHOS_ARCH_LITE", + ] + } +} else { + ohos_executable("dhcp_client_service") { + install_enable = true + sources = local_base_sources + + include_dirs = local_base_include_dirs + include_dirs += [ + "//utils/native/base/include", + "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", + "//third_party/openssl/include", + ] + + deps = [ + "//third_party/openssl:libcrypto_static", + "//utils/native/base:utils", + ] + + cflags_cc = [ "-fno-rtti" ] + + external_deps = [ + "ability_base:want", + "bundle_framework:appexecfwk_base", + "common_event_service:cesfwk_innerkits", + "eventhandler:libeventhandler", + "hiviewdfx_hilog_native:libhilog", + ] + defines = [] + + part_name = "dhcp" + subsystem_name = "communication" + } } diff --git a/dhcp/services/dhcp_client/include/dhcp_define.h b/dhcp/services/dhcp_client/include/dhcp_define.h index 2aa154b..6c8c5c0 100644 --- a/dhcp/services/dhcp_client/include/dhcp_define.h +++ b/dhcp/services/dhcp_client/include/dhcp_define.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -15,7 +15,7 @@ #ifndef OHOS_DHCP_DEFINE_H #define OHOS_DHCP_DEFINE_H - +#include #include #include #include diff --git a/dhcp/services/dhcp_client/src/dhcp_api.cpp b/dhcp/services/dhcp_client/src/dhcp_api.cpp index 76e3a97..5fd3073 100644 --- a/dhcp/services/dhcp_client/src/dhcp_api.cpp +++ b/dhcp/services/dhcp_client/src/dhcp_api.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -14,6 +14,17 @@ */ #include "dhcp_api.h" +#ifdef OHOS_ARCH_LITE +static bool PublishDhcpEvent(const char *action, const int code, const char *data) +{ + return true; +} + +bool PublishDhcpIpv4ResultEvent(const int code, const char *data, const char *ifname) +{ + return true; +} +#else #include "securec.h" #include "common_event.h" #include "common_event_data.h" @@ -58,3 +69,4 @@ bool PublishDhcpIpv4ResultEvent(const int code, const char *data, const char *if } return PublishDhcpEvent(strAction, code, data); } +#endif diff --git a/dhcp/services/dhcp_client/src/dhcp_ipv4.c b/dhcp/services/dhcp_client/src/dhcp_ipv4.c index 87a451b..f305584 100644 --- a/dhcp/services/dhcp_client/src/dhcp_ipv4.c +++ b/dhcp/services/dhcp_client/src/dhcp_ipv4.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -28,8 +28,8 @@ #include #include #include -#include -#include +#include +#include #include "securec.h" #include "dhcp_client.h" diff --git a/dhcp/services/dhcp_server/BUILD.gn b/dhcp/services/dhcp_server/BUILD.gn index d2c83b0..184fa93 100644 --- a/dhcp/services/dhcp_server/BUILD.gn +++ b/dhcp/services/dhcp_server/BUILD.gn @@ -11,42 +11,78 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//build/ohos.gni") -import("//foundation/communication/wifi/dhcp/dhcp.gni") - -ohos_executable("dhcp_server") { - install_enable = true - dhcp_hilog_enable = true - sources = [ - "src/address_utils.c", - "src/common_util.c", - "src/dhcp_address_pool.c", - "src/dhcp_argument.c", - "src/dhcp_binding.c", - "src/dhcp_config.c", - "src/dhcp_dhcpd.c", - "src/dhcp_option.c", - "src/dhcp_server.c", - "src/hash_table.c", - ] - - include_dirs = [ - "include", - "include/common", - "$DHCP_ROOT_DIR/services/dhcp_client/include", - "//utils/native/base/include", - ] - - deps = [ "//utils/native/base:utils" ] - - cflags_cc = [ "-fno-rtti" ] - - defines = [ "__OHOS__" ] - if (dhcp_hilog_enable) { - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] - defines += [ "DHCP_HILOG_ENABLE" ] +if (defined(ohos_lite)) { + import("//build/lite/config/component/lite_component.gni") + import("//foundation/communication/wifi/dhcp/dhcp_lite.gni") +} else { + import("//build/ohos.gni") + import("//foundation/communication/wifi/dhcp/dhcp.gni") +} + +local_base_sources = [ + "src/address_utils.c", + "src/common_util.c", + "src/dhcp_address_pool.c", + "src/dhcp_argument.c", + "src/dhcp_binding.c", + "src/dhcp_config.c", + "src/dhcp_dhcpd.c", + "src/dhcp_option.c", + "src/dhcp_server.c", + "src/hash_table.c", +] + +local_base_include_dirs = [ + "include", + "include/common", + "$DHCP_ROOT_DIR/services/dhcp_client/include", +] + +dhcp_hilog_enable = true + +if (defined(ohos_lite)) { + executable("dhcp_server") { + sources = local_base_sources + + include_dirs = local_base_include_dirs + include_dirs += [ + "//base/hiviewdfx/hilog_lite/interfaces/native/innerkits", + "//third_party/bounds_checking_function/include", + ] + + deps = [ "//third_party/bounds_checking_function:libsec_shared" ] + + cflags_cc = [ "-fno-rtti" ] + + defines = [ + "__OHOS__", + "_GNU_SOURCE", + "OHOS_ARCH_LITE", + ] + if (dhcp_hilog_enable) { + deps += [ "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared" ] + defines += [ "DHCP_HILOG_ENABLE" ] + } } +} else { + ohos_executable("dhcp_server") { + install_enable = true + sources = local_base_sources + + include_dirs = local_base_include_dirs + include_dirs += [ "//utils/native/base/include" ] + + deps = [ "//utils/native/base:utils" ] - part_name = "dhcp" - subsystem_name = "communication" + cflags_cc = [ "-fno-rtti" ] + + defines = [ "__OHOS__" ] + if (dhcp_hilog_enable) { + external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + defines += [ "DHCP_HILOG_ENABLE" ] + } + + part_name = "dhcp" + subsystem_name = "communication" + } } diff --git a/dhcp/services/dhcp_server/include/dhcp_logger.h b/dhcp/services/dhcp_server/include/dhcp_logger.h index f519b8d..1aa8820 100644 --- a/dhcp/services/dhcp_server/include/dhcp_logger.h +++ b/dhcp/services/dhcp_server/include/dhcp_logger.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -17,7 +17,11 @@ #define OHOS_DHCP_LOGGER_H #ifdef DHCP_HILOG_ENABLE +#ifdef OHOS_ARCH_LITE +#include "hilog/log.h" +#else #include "hilog/log_c.h" +#endif #undef LOG_TAG #define LOG_TAG "DhcpServer" diff --git a/dhcp/services/mgr_service/BUILD.gn b/dhcp/services/mgr_service/BUILD.gn index 543616c..956e760 100644 --- a/dhcp/services/mgr_service/BUILD.gn +++ b/dhcp/services/mgr_service/BUILD.gn @@ -11,50 +11,93 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//build/ohos.gni") -import("//foundation/communication/wifi/dhcp/dhcp.gni") +if (defined(ohos_lite)) { + import("//build/lite/config/component/lite_component.gni") + import("//foundation/communication/wifi/dhcp/dhcp_lite.gni") +} else { + import("//build/ohos.gni") + import("//foundation/communication/wifi/dhcp/dhcp.gni") +} ################################################################################ -ohos_shared_library("dhcp_manager_service") { - install_enable = true - sources = [ - "$DHCP_ROOT_DIR/services/mgr_service/src/dhcp_client_service_impl.cpp", - "$DHCP_ROOT_DIR/services/mgr_service/src/dhcp_event_subscriber.cpp", - "$DHCP_ROOT_DIR/services/mgr_service/src/dhcp_func.cpp", - "$DHCP_ROOT_DIR/services/mgr_service/src/dhcp_server_service.cpp", - "$DHCP_ROOT_DIR/services/mgr_service/src/dhcp_service.cpp", - "$DHCP_ROOT_DIR/services/mgr_service/src/dhcp_service_api.cpp", - ] - - include_dirs = [ - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", - "$DHCP_ROOT_DIR/services/mgr_service/include", - "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/interfaces", - "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/include", - "//utils/native/base/include", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", - ] - - deps = [ "//utils/native/base:utils" ] - - cflags_cc = [ - "-std=c++17", - "-Wall", - ] - - external_deps = [ - "ability_base:want", - "bundle_framework:appexecfwk_base", - "common_event_service:cesfwk_innerkits", - "eventhandler:libeventhandler", - "hiviewdfx_hilog_native:libhilog", - ] - ldflags = [ - "-fPIC", - "-Wl,-E", - ] - - part_name = "dhcp" - subsystem_name = "communication" +local_base_sources = [ + "$DHCP_ROOT_DIR/services/mgr_service/src/dhcp_client_service_impl.cpp", + "$DHCP_ROOT_DIR/services/mgr_service/src/dhcp_event_subscriber.cpp", + "$DHCP_ROOT_DIR/services/mgr_service/src/dhcp_func.cpp", + "$DHCP_ROOT_DIR/services/mgr_service/src/dhcp_server_service.cpp", + "$DHCP_ROOT_DIR/services/mgr_service/src/dhcp_service.cpp", + "$DHCP_ROOT_DIR/services/mgr_service/src/dhcp_service_api.cpp", +] + +local_base_include_dirs = [ + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", + "$DHCP_ROOT_DIR/services/mgr_service/include", + "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/interfaces", + "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/include", +] + +if (defined(ohos_lite)) { + shared_library("dhcp_manager_service") { + sources = local_base_sources + + include_dirs = local_base_include_dirs + include_dirs += [ + "//base/hiviewdfx/hilog_lite/interfaces/native/innerkits", + "//third_party/bounds_checking_function/include", + ] + + deps = [ + "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", + "//third_party/bounds_checking_function:libsec_shared", + ] + + defines = [ + "_GNU_SOURCE", + "OHOS_ARCH_LITE", + ] + configs -= [ "//build/lite/config:language_cpp" ] + cflags_cc = [ + "-fPIC", + "-std=c++17", + "-Wall", + ] + ldflags = [ + "-fPIC", + "-Wl,-E", + ] + } +} else { + ohos_shared_library("dhcp_manager_service") { + install_enable = true + sources = local_base_sources + + include_dirs = local_base_include_dirs + include_dirs += [ + "//utils/native/base/include", + "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", + ] + + deps = [ "//utils/native/base:utils" ] + + cflags_cc = [ + "-std=c++17", + "-Wall", + ] + + external_deps = [ + "ability_base:want", + "bundle_framework:appexecfwk_base", + "common_event_service:cesfwk_innerkits", + "eventhandler:libeventhandler", + "hiviewdfx_hilog_native:libhilog", + ] + ldflags = [ + "-fPIC", + "-Wl,-E", + ] + + part_name = "dhcp" + subsystem_name = "communication" + } } diff --git a/dhcp/services/mgr_service/include/dhcp_client_service_impl.h b/dhcp/services/mgr_service/include/dhcp_client_service_impl.h index 39919b8..1c620bb 100644 --- a/dhcp/services/mgr_service/include/dhcp_client_service_impl.h +++ b/dhcp/services/mgr_service/include/dhcp_client_service_impl.h @@ -190,6 +190,23 @@ private: * */ void RunDhcpResultHandleThreadFunc(); +#ifdef OHOS_ARCH_LITE + /** + * @Description : Dhcp recv msg threads execution function. + * + * @param ifname - interface name, eg:wlan0 [in] + */ + void RunDhcpRecvMsgThreadFunc(const std::string& ifname); + + /** + * @Description : Handle dhcp packet info. + * + * @param ifname - interface name, eg:wlan0 [in] + * @param packetResult - dhcp packet result [in] + * @param success - get success is true, get failed is false [in] + */ + void DhcpPacketInfoHandle(const std::string& ifname, struct DhcpPacketResult &packetResult, bool success = true); +#endif /** * @Description : Fork child process function for start or stop dhcp process. * @@ -240,7 +257,10 @@ private: std::mutex mResultNotifyMutex; bool isExitDhcpResultHandleThread; std::thread *pDhcpResultHandleThread; - +#ifdef OHOS_ARCH_LITE + std::mutex mRecvMsgThreadMutex; + std::map m_mapDhcpRecvMsgThread; +#endif std::map> m_mapDhcpResultNotify; std::map> m_mapEventSubscriber; }; diff --git a/dhcp/services/mgr_service/include/dhcp_event_subscriber.h b/dhcp/services/mgr_service/include/dhcp_event_subscriber.h index 56f6145..9ddd5a5 100644 --- a/dhcp/services/mgr_service/include/dhcp_event_subscriber.h +++ b/dhcp/services/mgr_service/include/dhcp_event_subscriber.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -17,6 +17,18 @@ #define OHOS_DHCP_EVENT_SUBSCRIBER_H #include +#ifdef OHOS_ARCH_LITE +namespace OHOS { +namespace Wifi { +class DhcpEventSubscriber { +public: + explicit DhcpEventSubscriber() + {} + + ~DhcpEventSubscriber() + {} +}; +#else #include "common_event_subscriber.h" #include "common_event_data.h" @@ -35,6 +47,7 @@ public: private: std::mutex onReceivedLock_; }; +#endif } // namespace Wifi } // namespace OHOS #endif \ No newline at end of file diff --git a/dhcp/services/mgr_service/include/dhcp_func.h b/dhcp/services/mgr_service/include/dhcp_func.h index ceead5d..1302844 100644 --- a/dhcp/services/mgr_service/include/dhcp_func.h +++ b/dhcp/services/mgr_service/include/dhcp_func.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -26,11 +26,12 @@ #include "dhcp_define.h" +#ifndef OHOS_ARCH_LITE #include "common_event_subscriber.h" #include "common_event.h" #include "common_event_data.h" #include "common_event_manager.h" - +#endif namespace OHOS { namespace Wifi { @@ -62,13 +63,16 @@ public: static int CreateDirs(const std::string dirs, int mode = DIR_DEFAULT_MODE); static bool SplitString( const std::string src, const std::string delim, const int count, std::vector &splits); - +#ifdef OHOS_ARCH_LITE + static int GetDhcpPacketResult(const std::string& filename, struct DhcpPacketResult &result); +#else static bool SubscribeDhcpCommonEvent( const std::shared_ptr &subscriber); static bool UnsubscribeDhcpCommonEvent( const std::shared_ptr &subscriber); static bool PublishDhcpEvent(const std::string action, const int code, const std::string data); +#endif }; } // namespace Wifi } // namespace OHOS diff --git a/dhcp/services/mgr_service/src/dhcp_client_service_impl.cpp b/dhcp/services/mgr_service/src/dhcp_client_service_impl.cpp index 5d6997b..9f21a64 100644 --- a/dhcp/services/mgr_service/src/dhcp_client_service_impl.cpp +++ b/dhcp/services/mgr_service/src/dhcp_client_service_impl.cpp @@ -18,6 +18,7 @@ #include #include #include +#include #include "dhcp_func.h" #include "securec.h" @@ -34,7 +35,9 @@ DhcpClientServiceImpl::DhcpClientServiceImpl() { isExitDhcpResultHandleThread = false; pDhcpResultHandleThread = nullptr; - +#ifdef OHOS_ARCH_LITE + m_mapDhcpRecvMsgThread.clear(); +#endif if (!m_mapDhcpResultNotify.empty()) { ReleaseResultNotifyMemory(); m_mapDhcpResultNotify.clear(); @@ -95,6 +98,16 @@ void DhcpClientServiceImpl::ExitDhcpMgrThread() ReleaseResultNotifyMemory(); m_mapDhcpResultNotify.clear(); } +#ifdef OHOS_ARCH_LITE + if (!m_mapDhcpRecvMsgThread.empty()) { + WIFI_LOGE("ExitDhcpMgrThread() error, m_mapDhcpRecvMsgThread is not empty!"); + for (auto &mapThread : m_mapDhcpRecvMsgThread) { + int nStatus = GetDhcpStatus(mapThread.first); + WIFI_LOGE("ExitDhcpMgrThread() ifname:%{public}s, status:%{public}d!", + (mapThread.first).c_str(), nStatus); + } + } +#endif } void DhcpClientServiceImpl::CheckTimeout() @@ -198,6 +211,7 @@ int DhcpClientServiceImpl::SubscribeDhcpEvent(const std::string &strAction) WIFI_LOGE("SubscribeDhcpEvent error, strAction is empty!"); return DHCP_OPT_ERROR; } +#ifndef OHOS_ARCH_LITE auto iterSubscriber = m_mapEventSubscriber.find(strAction); if (iterSubscriber == m_mapEventSubscriber.end()) { EventFwk::MatchingSkills matchingSkills; @@ -219,6 +233,7 @@ int DhcpClientServiceImpl::SubscribeDhcpEvent(const std::string &strAction) return DHCP_OPT_FAILED; } WIFI_LOGI("SubscribeDhcpEvent %{public}s success", strAction.c_str()); +#endif return DHCP_OPT_SUCCESS; } @@ -238,10 +253,12 @@ int DhcpClientServiceImpl::UnsubscribeDhcpEvent(const std::string &strAction) WIFI_LOGE("UnsubscribeDhcpEvent mapEventSubscriber %{public}s nullptr!", strAction.c_str()); return DHCP_OPT_FAILED; } +#ifndef OHOS_ARCH_LITE if (!DhcpFunc::UnsubscribeDhcpCommonEvent(m_mapEventSubscriber[strAction])) { WIFI_LOGE("UnsubscribeDhcpEvent UnsubscribeDhcpCommonEvent %{public}s failed!", strAction.c_str()); return DHCP_OPT_FAILED; } +#endif m_mapEventSubscriber.erase(iterSubscriber); WIFI_LOGI("UnsubscribeDhcpEvent %{public}s success", strAction.c_str()); return DHCP_OPT_SUCCESS; @@ -249,6 +266,7 @@ int DhcpClientServiceImpl::UnsubscribeDhcpEvent(const std::string &strAction) int DhcpClientServiceImpl::UnsubscribeAllDhcpEvent() { +#ifndef OHOS_ARCH_LITE for (auto& e : m_mapEventSubscriber) { if (e.second != nullptr) { if (!DhcpFunc::UnsubscribeDhcpCommonEvent(e.second)) { @@ -257,6 +275,7 @@ int DhcpClientServiceImpl::UnsubscribeAllDhcpEvent() } } } +#endif m_mapEventSubscriber.clear(); WIFI_LOGI("UnsubscribeDhcpEvent all dhcp event success!"); return DHCP_OPT_SUCCESS; @@ -278,6 +297,114 @@ void DhcpClientServiceImpl::RunDhcpResultHandleThreadFunc() WIFI_LOGI("DhcpClientServiceImpl::RunDhcpResultHandleThreadFunc() end!"); } +#ifdef OHOS_ARCH_LITE +void DhcpClientServiceImpl::RunDhcpRecvMsgThreadFunc(const std::string &ifname) +{ + if (ifname.empty()) { + WIFI_LOGE("DhcpClientServiceImpl::RunDhcpRecvMsgThreadFunc() error, ifname is empty!"); + return; + } + + struct DhcpPacketResult result; + std::string strResultFile = DHCP_WORK_DIR + ifname + DHCP_RESULT_FILETYPE; + for (; ;) { + /* Check break condition. */ + auto iter = this->m_mapDhcpInfo.find(ifname); + if ((iter != this->m_mapDhcpInfo.end()) && ((iter->second).clientRunStatus) != 1) { + WIFI_LOGI("RunDhcpRecvMsgThreadFunc() Status != 1, need break, ifname:%{public}s.", ifname.c_str()); + break; + } + + /* Check dhcp result file is or not exist. */ + if (!DhcpFunc::IsExistFile(strResultFile)) { + usleep(SLEEP_TIME_200_MS); + continue; + } + + if (memset_s(&result, sizeof(result), 0, sizeof(result)) != EOK) { + return; + } + int nGetRet = DhcpFunc::GetDhcpPacketResult(strResultFile, result); + if (nGetRet == DHCP_OPT_SUCCESS) { + /* Get success, add or reload dhcp packet info. */ + this->DhcpPacketInfoHandle(ifname, result); + usleep(SLEEP_TIME_500_MS); + } else if (nGetRet == DHCP_OPT_FAILED) { + /* Get failed, print dhcp packet info. */ + this->DhcpPacketInfoHandle(ifname, result, false); + usleep(SLEEP_TIME_500_MS); + } else { + /* Get null, continue get dhcp packet info. */ + WIFI_LOGI("RunDhcpRecvMsgThreadFunc() GetDhcpPacketResult NULL, ifname:%{public}s.", ifname.c_str()); + usleep(SLEEP_TIME_200_MS); + } + + continue; + } +} + +void DhcpClientServiceImpl::DhcpPacketInfoHandle( + const std::string &ifname, struct DhcpPacketResult &packetResult, bool success) +{ + if (ifname.empty()) { + WIFI_LOGE("DhcpClientServiceImpl::DhcpPacketInfoHandle() error, ifname is empty!"); + return; + } + + DhcpResult result; + auto iterResult = m_mapDhcpResult.find(ifname); + if (!success) { + /* get failed */ + if (iterResult != m_mapDhcpResult.end()) { + iterResult->second = result; + } else { + m_mapDhcpResult.emplace(std::make_pair(ifname, result)); + } + return; + } + + /* Check dhcp result add time */ + if ((iterResult != m_mapDhcpResult.end()) && ((iterResult->second).uAddTime == packetResult.uAddTime)) { + return; + } + WIFI_LOGI("DhcpPacketInfoHandle() DhcpResult %{public}s old %{public}u no equal new %{public}u, need update...", + ifname.c_str(), (iterResult->second).uAddTime, packetResult.uAddTime); + + /* get success, add or reload dhcp packet info */ + auto iterInfo = m_mapDhcpInfo.find(ifname); + if (iterInfo != m_mapDhcpInfo.end()) { + m_mapDhcpInfo[ifname].serverIp = packetResult.strOptServerId; + WIFI_LOGI("DhcpPacketInfoHandle() m_mapDhcpInfo find ifname:%{public}s.", ifname.c_str()); + } + + result.iptype = 0; + result.isOptSuc = true; + result.strYourCli = packetResult.strYiaddr; + result.strServer = packetResult.strOptServerId; + result.strSubnet = packetResult.strOptSubnet; + result.strDns1 = packetResult.strOptDns1; + result.strDns2 = packetResult.strOptDns2; + result.strRouter1 = packetResult.strOptRouter1; + result.strRouter2 = packetResult.strOptRouter2; + result.strVendor = packetResult.strOptVendor; + result.uLeaseTime = packetResult.uOptLeasetime; + result.uAddTime = packetResult.uAddTime; + result.uGetTime = (uint32_t)time(NULL); + + if (iterResult != m_mapDhcpResult.end()) { + iterResult->second = result; + } else { + m_mapDhcpResult.emplace(std::make_pair(ifname, result)); + } + WIFI_LOGI("DhcpPacketInfoHandle %{public}s, type:%{public}d, opt:%{public}d, cli:%{public}s, server:%{public}s, " + "strSubnet:%{public}s, strDns1:%{public}s, strDns2:%{public}s, strRouter1:%{public}s, strRouter2:%{public}s, " + "strVendor:%{public}s, uLeaseTime:%{public}u, uAddTime:%{public}u, uGetTime:%{public}u.", + ifname.c_str(), result.iptype, result.isOptSuc, result.strYourCli.c_str(), result.strServer.c_str(), + result.strSubnet.c_str(), result.strDns1.c_str(), result.strDns2.c_str(), result.strRouter1.c_str(), + result.strRouter2.c_str(), result.strVendor.c_str(), result.uLeaseTime, result.uAddTime, result.uGetTime); +} +#endif + int DhcpClientServiceImpl::ForkExecChildProcess(const std::string &ifname, bool bIpv6, bool bStart) { if (bIpv6) { @@ -314,6 +441,21 @@ int DhcpClientServiceImpl::ForkExecParentProcess(const std::string &ifname, bool { std::string strAction = OHOS::Wifi::COMMON_EVENT_DHCP_GET_IPV4 + "." + ifname; if (bStart) { +#ifdef OHOS_ARCH_LITE + /* check and new receive dhcp packet msg thread */ + std::unique_lock lock(mRecvMsgThreadMutex); + auto iterRecvMsgThread = m_mapDhcpRecvMsgThread.find(ifname); + if (iterRecvMsgThread != m_mapDhcpRecvMsgThread.end()) { + WIFI_LOGE("ForkExecParentProcess() RecvMsgThread exist ifname:%{public}s, need erase!", ifname.c_str()); + return DHCP_OPT_FAILED; + } + std::thread *pThread = new std::thread(&DhcpClientServiceImpl::RunDhcpRecvMsgThreadFunc, this, ifname); + if (pThread == nullptr) { + WIFI_LOGE("ForkExecParentProcess() init pThread failed, ifname:%{public}s.", ifname.c_str()); + return DHCP_OPT_FAILED; + } + m_mapDhcpRecvMsgThread.emplace(std::make_pair(ifname, pThread)); +#endif /* normal started, update dhcp client service running status */ auto iter = DhcpClientServiceImpl::m_mapDhcpInfo.find(ifname); if (iter != DhcpClientServiceImpl::m_mapDhcpInfo.end()) { @@ -332,6 +474,10 @@ int DhcpClientServiceImpl::ForkExecParentProcess(const std::string &ifname, bool return DHCP_OPT_FAILED; } } else { + /* Unsubscribe dhcp event. */ + if (UnsubscribeDhcpEvent(strAction) != DHCP_OPT_SUCCESS) { + WIFI_LOGI("ForkExecParentProcess() UnsubscribeDhcpEvent ifname:%{public}s failed.", ifname.c_str()); + } auto iter = DhcpClientServiceImpl::m_mapDhcpInfo.find(ifname); if (iter != DhcpClientServiceImpl::m_mapDhcpInfo.end()) { /* not start */ @@ -343,10 +489,22 @@ int DhcpClientServiceImpl::ForkExecParentProcess(const std::string &ifname, bool DhcpClientServiceImpl::m_mapDhcpResult.erase(iterResult); WIFI_LOGI("ForkExecParentProcess() m_mapDhcpResult erase ifname:%{public}s success.", ifname.c_str()); } - } - /* Unsubscribe dhcp event. */ - if (UnsubscribeDhcpEvent(strAction) != DHCP_OPT_SUCCESS) { - return DHCP_OPT_FAILED; +#ifdef OHOS_ARCH_LITE + std::unique_lock lock(mRecvMsgThreadMutex); + auto iterRecvMsgThreadMap = m_mapDhcpRecvMsgThread.find(ifname); + if (iterRecvMsgThreadMap == m_mapDhcpRecvMsgThread.end()) { + WIFI_LOGI("ForkExecParentProcess() RecvMsgThread already del ifname:%{public}s.", ifname.c_str()); + return DHCP_OPT_SUCCESS; + } + if (iterRecvMsgThreadMap->second != nullptr) { + iterRecvMsgThreadMap->second->join(); + delete iterRecvMsgThreadMap->second; + iterRecvMsgThreadMap->second = nullptr; + WIFI_LOGI("ForkExecParentProcess() destroy RecvThread success, ifname:%{public}s.", ifname.c_str()); + } + WIFI_LOGI("ForkExecParentProcess() m_mapDhcpRecvMsgThread erase ifname:%{public}s.", ifname.c_str()); + m_mapDhcpRecvMsgThread.erase(iterRecvMsgThreadMap); +#endif } } return DHCP_OPT_SUCCESS; diff --git a/dhcp/services/mgr_service/src/dhcp_event_subscriber.cpp b/dhcp/services/mgr_service/src/dhcp_event_subscriber.cpp index ac1d585..c191546 100644 --- a/dhcp/services/mgr_service/src/dhcp_event_subscriber.cpp +++ b/dhcp/services/mgr_service/src/dhcp_event_subscriber.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -15,6 +15,10 @@ #include "dhcp_event_subscriber.h" +#ifdef OHOS_ARCH_LITE +namespace OHOS { +namespace Wifi { +#else #include "wifi_logger.h" #include "dhcp_client_service_impl.h" @@ -35,5 +39,6 @@ void DhcpEventSubscriber::OnReceiveEvent(const OHOS::EventFwk::CommonEventData & return; } } +#endif } // namespace Wifi } // namespace OHOS \ No newline at end of file diff --git a/dhcp/services/mgr_service/src/dhcp_func.cpp b/dhcp/services/mgr_service/src/dhcp_func.cpp index d57c48e..bf4f233 100644 --- a/dhcp/services/mgr_service/src/dhcp_func.cpp +++ b/dhcp/services/mgr_service/src/dhcp_func.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -20,6 +20,7 @@ #include #include #include +#include #include "securec.h" #include "wifi_logger.h" @@ -475,6 +476,55 @@ int DhcpFunc::FormatString(struct DhcpPacketResult &result) return 0; } +#ifdef OHOS_ARCH_LITE +int DhcpFunc::GetDhcpPacketResult(const std::string& filename, struct DhcpPacketResult &result) +{ + FILE *pFile = fopen(filename.c_str(), "r"); + if (pFile == nullptr) { + WIFI_LOGE("GetDhcpPacketResult() fopen %{public}s fail, err:%{public}s!", filename.c_str(), strerror(errno)); + return DHCP_OPT_FAILED; + } + + char strIpFlag[DHCP_NUM_EIGHT]; + if (memset_s(strIpFlag, sizeof(strIpFlag), 0, sizeof(strIpFlag)) != EOK) { + fclose(pFile); + return DHCP_OPT_FAILED; + } + /* Format: IpFlag AddTime cliIp servIp subnet dns1 dns2 router1 router2 vendor lease */ + int nRes = fscanf_s(pFile, "%s %u %s %s %s %s %s %s %s %s %u\n", strIpFlag, DHCP_NUM_EIGHT, &result.uAddTime, + result.strYiaddr, INET_ADDRSTRLEN, result.strOptServerId, INET_ADDRSTRLEN, result.strOptSubnet, INET_ADDRSTRLEN, + result.strOptDns1, INET_ADDRSTRLEN, result.strOptDns2, INET_ADDRSTRLEN, result.strOptRouter1, INET_ADDRSTRLEN, + result.strOptRouter2, INET_ADDRSTRLEN, result.strOptVendor, DHCP_FILE_MAX_BYTES, &result.uOptLeasetime); + if (nRes == EOF) { + WIFI_LOGE("GetDhcpPacketResult() fscanf %{public}s err:%{public}s!", filename.c_str(), strerror(errno)); + fclose(pFile); + return DHCP_OPT_FAILED; + } else if (nRes == 0) { + WIFI_LOGW("GetDhcpPacketResult() fscanf file:%{public}s nRes:0 NULL!", filename.c_str()); + fclose(pFile); + return DHCP_OPT_NULL; + } else if (nRes != EVENT_DATA_NUM) { + WIFI_LOGE("GetDhcpPacketResult() fscanf file:%{public}s nRes:%{public}d ERROR!", filename.c_str(), nRes); + fclose(pFile); + return DHCP_OPT_FAILED; + } + + if (fclose(pFile) != 0) { + WIFI_LOGE("GetDhcpPacketResult() fclose file:%{public}s failed, error:%{public}s!", + filename.c_str(), strerror(errno)); + return DHCP_OPT_FAILED; + } + + /* Format dhcp packet result */ + if (FormatString(result) != 0) { + WIFI_LOGE("GetDhcpPacketResult() file:%{public}s failed, FormatString result error!", filename.c_str()); + return DHCP_OPT_FAILED; + } + + return DHCP_OPT_SUCCESS; +} +#endif + int DhcpFunc::InitPidfile(const std::string& piddir, const std::string& pidfile) { if (piddir.empty() || pidfile.empty()) { @@ -651,6 +701,7 @@ bool DhcpFunc::SplitString( return true; } +#ifndef OHOS_ARCH_LITE bool DhcpFunc::SubscribeDhcpCommonEvent( const std::shared_ptr &subscriber) { @@ -680,5 +731,6 @@ bool DhcpFunc::PublishDhcpEvent(const std::string action, const int code, const action.c_str(), code, data.c_str()); return DHCP_OPT_SUCCESS; } +#endif } // namespace Wifi } // namespace OHOS \ No newline at end of file -- Gitee From 4debe4e90db5b27e9ecc9b7b9ebf5d05446a8deb Mon Sep 17 00:00:00 2001 From: junxinlu Date: Mon, 9 May 2022 17:02:14 +0800 Subject: [PATCH 097/491] adapter wifi hal to L1 Signed-off-by: junxinlu --- .../wifi_standard/ipc_framework/cRPC/BUILD.gn | 138 +++++++---- .../ipc_framework/cRPC/include/log.h | 6 +- .../ipc_framework/cRPC/src/client.c | 6 +- .../ipc_framework/cRPC/src/serial.c | 6 +- .../wifi_framework/common/log/wifi_log.h | 4 + .../wifi_framework/common/log/wifi_logger.h | 6 +- .../common/net_helper/if_config.cpp | 171 +++++++++++++- .../common/net_helper/if_config.h | 22 ++ .../common/utils/wifi_common_event_helper.cpp | 8 + .../common/utils/wifi_common_event_helper.h | 2 + .../common/wifi_permission_helper.cpp | 6 + .../common/wifi_permission_utils.cpp | 61 ++++- .../common/wifi_permission_utils.h | 2 +- .../wifi_manage/idl_client/BUILD.gn | 219 +++++++++++------- wifi/services/wifi_standard/wifi_hal/BUILD.gn | 164 ++++++++----- .../wifi_standard/wifi_hal/common/wifi_log.h | 7 +- .../wifi_standard/wifi_hal/etc/init/BUILD.gn | 77 +++--- .../wifi_standard/wifi_hal/wifi_hal_adapter.c | 5 + .../wifi_hal/wifi_hal_ap_interface.c | 8 + .../wifi_hal/wifi_hal_chip_interface.c | 3 +- .../wifi_hal/wifi_hal_module_manage.c | 4 + wifi/utils/inc/wifi_common_util.h | 2 + wifi/utils/src/BUILD.gn | 115 +++++---- wifi/utils/src/wifi_common_util.cpp | 4 + 24 files changed, 778 insertions(+), 268 deletions(-) diff --git a/wifi/services/wifi_standard/ipc_framework/cRPC/BUILD.gn b/wifi/services/wifi_standard/ipc_framework/cRPC/BUILD.gn index e69d404..66ebd0d 100644 --- a/wifi/services/wifi_standard/ipc_framework/cRPC/BUILD.gn +++ b/wifi/services/wifi_standard/ipc_framework/cRPC/BUILD.gn @@ -11,53 +11,103 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//build/ohos.gni") -import("//foundation/communication/wifi/wifi/wifi.gni") +crpc_server_sources = [ + "./src/context.c", + "./src/evloop.c", + "./src/hash_table.c", + "./src/net.c", + "./src/serial.c", + "./src/server.c", +] -ohos_static_library("crpc_server") { - sources = [ - "./src/context.c", - "./src/evloop.c", - "./src/hash_table.c", - "./src/net.c", - "./src/serial.c", - "./src/server.c", - ] +crpc_client_sources = [ + "./src/client.c", + "./src/context.c", + "./src/net.c", + "./src/serial.c", +] - include_dirs = [ - "include", - "//utils/native/base/include", - "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", - ] - cflags_cc = [ "-fno-rtti" ] - deps = [ - "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//utils/native/base:utils", - ] - subsystem_name = "communication" - part_name = "wifi" -} +if (defined(ohos_lite)) { + import("//build/lite/config/component/lite_component.gni") + import("//foundation/communication/wifi/wifi/wifi_lite.gni") -ohos_static_library("crpc_client") { - sources = [ - "./src/client.c", - "./src/context.c", - "./src/net.c", - "./src/serial.c", - ] - include_dirs = [ - "include", - "//utils/native/base/include", - "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", - ] - cflags_cc = [ "-fno-rtti" ] - deps = [ - "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//utils/native/base:utils", - ] - subsystem_name = "communication" - part_name = "wifi" + static_library("crpc_server") { + sources = crpc_server_sources + + include_dirs = [ + "include", + "//base/hiviewdfx/hilog_lite/interfaces/native/innerkits", + "//third_party/bounds_checking_function/include", + ] + + deps = [ + "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", + "//third_party/bounds_checking_function:libsec_shared", + ] + cflags_c = [ + "-fPIC", + "-std=c99", + ] + defines = [ "OHOS_ARCH_LITE" ] + } + + static_library("crpc_client") { + sources = crpc_client_sources + include_dirs = [ + "include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", + "//base/hiviewdfx/hilog_lite/interfaces/native/innerkits", + "//third_party/bounds_checking_function/include", + ] + + deps = [ + "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", + "//third_party/bounds_checking_function:libsec_shared", + ] + configs -= [ "//build/lite/config:language_c" ] + cflags_c = [ + "-fPIC", + "-std=c99", + ] + defines = [ "OHOS_ARCH_LITE" ] + } +} else { + import("//build/ohos.gni") + import("//foundation/communication/wifi/wifi/wifi.gni") + + ohos_static_library("crpc_server") { + sources = crpc_server_sources + + include_dirs = [ + "include", + "//utils/native/base/include", + "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", + ] + cflags_cc = [ "-fno-rtti" ] + deps = [ + "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", + "//utils/native/base:utils", + ] + subsystem_name = "communication" + part_name = "wifi" + } + + ohos_static_library("crpc_client") { + sources = crpc_client_sources + include_dirs = [ + "include", + "//utils/native/base/include", + "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", + ] + cflags_cc = [ "-fno-rtti" ] + deps = [ + "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", + "//utils/native/base:utils", + ] + subsystem_name = "communication" + part_name = "wifi" + } } group("ipc_framework") { diff --git a/wifi/services/wifi_standard/ipc_framework/cRPC/include/log.h b/wifi/services/wifi_standard/ipc_framework/cRPC/include/log.h index 8d22ad4..fc0bef5 100644 --- a/wifi/services/wifi_standard/ipc_framework/cRPC/include/log.h +++ b/wifi/services/wifi_standard/ipc_framework/cRPC/include/log.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,7 +16,11 @@ #ifndef CPRC_WIFI_LOG_H #define CPRC_WIFI_LOG_H +#ifdef OHOS_ARCH_LITE +#include "hilog/log.h" +#else #include "hilog/log_c.h" +#endif #undef LOG_TAG #define LOG_TAG "WifiCrpc" diff --git a/wifi/services/wifi_standard/ipc_framework/cRPC/src/client.c b/wifi/services/wifi_standard/ipc_framework/cRPC/src/client.c index 1519f53..fe520e1 100644 --- a/wifi/services/wifi_standard/ipc_framework/cRPC/src/client.c +++ b/wifi/services/wifi_standard/ipc_framework/cRPC/src/client.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -24,7 +24,11 @@ const int FD_CHECK_TIMEOUT = 1000; /* poll wait time, units: ms */ const int CLIENT_STATE_IDLE = 0; const int CLIENT_STATE_DEAL_REPLY = 1; const int CLIENT_STATE_EXIT = 2; +#ifdef OHOS_ARCH_LITE +#define TMP_BUFF_SIZE 16 +#else const int TMP_BUFF_SIZE = 16; +#endif static void *RpcClientThreadDeal(void *arg); diff --git a/wifi/services/wifi_standard/ipc_framework/cRPC/src/serial.c b/wifi/services/wifi_standard/ipc_framework/cRPC/src/serial.c index a6cd54a..f6baf72 100644 --- a/wifi/services/wifi_standard/ipc_framework/cRPC/src/serial.c +++ b/wifi/services/wifi_standard/ipc_framework/cRPC/src/serial.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -15,7 +15,11 @@ #include #include "serial.h" +#ifdef OHOS_ARCH_LITE +#define TMP_CHAR_LEN 64 +#else const int TMP_CHAR_LEN = 64; +#endif const int HIGH_TWO_BIT = 16; const int ALPHA_NUM_MAX = 10; diff --git a/wifi/services/wifi_standard/wifi_framework/common/log/wifi_log.h b/wifi/services/wifi_standard/wifi_framework/common/log/wifi_log.h index 48ed36f..24f3002 100644 --- a/wifi/services/wifi_standard/wifi_framework/common/log/wifi_log.h +++ b/wifi/services/wifi_standard/wifi_framework/common/log/wifi_log.h @@ -16,7 +16,11 @@ #ifndef OHOS_WIFI_LOG_H #define OHOS_WIFI_LOG_H +#ifdef OHOS_ARCH_LITE +#include "hilog/log.h" +#else #include "hilog/log_c.h" +#endif #undef LOG_TAG #define LOG_TAG "WifiFrameWork" diff --git a/wifi/services/wifi_standard/wifi_framework/common/log/wifi_logger.h b/wifi/services/wifi_standard/wifi_framework/common/log/wifi_logger.h index 92d8051..69e4746 100644 --- a/wifi/services/wifi_standard/wifi_framework/common/log/wifi_logger.h +++ b/wifi/services/wifi_standard/wifi_framework/common/log/wifi_logger.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -15,8 +15,12 @@ #ifndef OHOS_WIFI_LOGGER_H #define OHOS_WIFI_LOGGER_H +#ifdef OHOS_ARCH_LITE +#include "hilog/log.h" +#else #include "hilog/log_c.h" #include "hilog/log_cpp.h" +#endif #include "wifi_log_tags.h" namespace OHOS { diff --git a/wifi/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp b/wifi/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp index d825d3b..e84065c 100644 --- a/wifi/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp +++ b/wifi/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp @@ -34,6 +34,12 @@ const std::string SYSTEM_COMMAND_IP = "/system/bin/ip"; const int SYSTEM_COMMAND_ERR = -1; const int SYSTEM_NOT_EXECUTED = 127; const int RECEIVE_BUFFER_LEN = 64; +#ifdef OHOS_ARCH_LITE +const std::string SYSTEM_COMMAND_NDC = "/system/bin/ndc"; +const std::string IFNAME = "wlan0"; +const int IPV6_SUFFIX_LEN = 3; +const int MAX_IFNAME_LEN = 13; +#endif IfConfig &IfConfig::GetInstance() { @@ -257,5 +263,168 @@ bool IfConfig::GetIpAddr(const std::string& ifName, std::string& ipAddr) close(fd); return true; } + +#ifdef OHOS_ARCH_LITE +/** + * @Description : Set the network card routing, DNS + * @Return success:0 failed:-1 + */ +int IfConfig::SetIfDnsAndRoute(const DhcpResult &dhcpResult, int ipType) +{ + LOGD("ipType=%d, ip=%s, gateway=%s, subnet=%s, strDns1=%s, strDns2=%s", + dhcpResult.iptype, + dhcpResult.strYourCli.c_str(), + dhcpResult.strSubnet.c_str(), + dhcpResult.strRouter1.c_str(), + dhcpResult.strDns1.c_str(), + dhcpResult.strDns2.c_str()); + SetNetDns(IFNAME, dhcpResult.strDns1, dhcpResult.strDns2); + AddIfRoute(IFNAME, dhcpResult.strYourCli, dhcpResult.strSubnet, dhcpResult.strRouter1, ipType); + LOGI("set dns and route finished!"); + return 0; +} + +/** + * @Description : Set DNS + * @Return None + */ +void IfConfig::SetNetDns(const std::string& ifName, const std::string& dns1, const std::string& dns2) +{ + std::vector ipRouteCmd; + ipRouteCmd.clear(); + ipRouteCmd.push_back(SYSTEM_COMMAND_NDC); + ipRouteCmd.push_back("resolver"); + ipRouteCmd.push_back("setnetdns"); + ipRouteCmd.push_back(ifName); + ipRouteCmd.push_back(""); + ipRouteCmd.push_back(dns1); + ipRouteCmd.push_back(dns2); + ExecCommand(ipRouteCmd); + + return; +} + +/** + * @Description : Add Route + * @Return None + */ +void IfConfig::AddIfRoute(const std::string &ifName, const std::string &ipAddr, const std::string &mask, + const std::string &gateWay, const int &ipType) +{ + if (ipType == static_cast(IpType::IPTYPE_IPV4)) { + AddIpv4Route(ifName, ipAddr, mask, gateWay); + } else { + AddIpv6Route(ifName, ipAddr, mask, gateWay); + } + return; +} + +/** + * @Description : set Ipv4 Route + * @Return None + */ +void IfConfig::AddIpv4Route( + const std::string &ifName, const std::string &ipAddr, const std::string &mask, const std::string &gateWay) +{ + LOGI("Enter AddIpv4Route, ifName is %{public}s, ipAddr is %{private}s, mask is %s, gateWay is %{private}s", + ifName.c_str(), + ipAddr.c_str(), + mask.c_str(), + gateWay.c_str()); + + struct rtentry route; + if (memset_s(&route, sizeof(route), 0, sizeof(route)) != EOK) { + LOGE("memset_s route info failed!"); + return; + } + + struct sockaddr_in *addr = reinterpret_cast(&route.rt_gateway); + addr->sin_family = AF_INET; + if (inet_aton(gateWay.c_str(), &(addr->sin_addr)) < 0) { + LOGE("inet_aton error\n"); + return; + } + addr = reinterpret_cast(&route.rt_dst); + addr->sin_family = AF_INET; + addr->sin_addr.s_addr = INADDR_ANY; + addr = reinterpret_cast(&route.rt_genmask); + addr->sin_family = AF_INET; + addr->sin_addr.s_addr = INADDR_ANY; + char strIfName[MAX_IFNAME_LEN + 1] = {0}; + if (strcpy_s(strIfName, sizeof(strIfName), ifName.c_str()) != EOK) { + LOGE("strcpy_s error\n"); + return; + } + route.rt_dev = strIfName; + route.rt_flags = RTF_UP | RTF_GATEWAY; + route.rt_metric = 0; + + int fd = socket(AF_INET, SOCK_DGRAM, 0); + if (fd < 0) { + LOGE("socket error\n"); + return; + } + if (ioctl(fd, SIOCADDRT, &route) < 0) { + LOGE("ioctl SIOCADDRT error"); + } + close(fd); + return; +} + +/** + * @Description : set Ipv6 Route + * @Return None + */ +void IfConfig::AddIpv6Route( + const std::string &ifName, const std::string &ipAddr, const std::string &mask, const std::string &gateWay) +{ + std::vector ipRouteCmd; + ipRouteCmd.clear(); + ipRouteCmd.push_back(SYSTEM_COMMAND_IP); + ipRouteCmd.push_back("-6 rule add"); + ipRouteCmd.push_back("fwmark"); + ipRouteCmd.push_back("0x0/0xffff"); + ipRouteCmd.push_back("lookup"); + ipRouteCmd.push_back("254"); + ipRouteCmd.push_back("prio"); + ipRouteCmd.push_back("17000"); + ExecCommand(ipRouteCmd); + // Add routing network segment + ipRouteCmd.clear(); + ipRouteCmd.push_back(SYSTEM_COMMAND_IP); + ipRouteCmd.push_back("-6 route add"); + ipRouteCmd.push_back(mask + ipAddr.substr(ipAddr.length() - IPV6_SUFFIX_LEN, ipAddr.length())); + ipRouteCmd.push_back("dev"); + ipRouteCmd.push_back(ifName); + ipRouteCmd.push_back("table"); + ipRouteCmd.push_back("254"); + ExecCommand(ipRouteCmd); + // Delete the default gateway + ipRouteCmd.clear(); + ipRouteCmd.push_back(SYSTEM_COMMAND_IP); + ipRouteCmd.push_back("-6 route del default"); + ipRouteCmd.push_back("dev"); + ipRouteCmd.push_back(ifName); + ipRouteCmd.push_back("table"); + ipRouteCmd.push_back("254"); + ExecCommand(ipRouteCmd); + // Add the default gateway + ipRouteCmd.clear(); + ipRouteCmd.push_back(SYSTEM_COMMAND_IP); + ipRouteCmd.push_back("-6 route add default"); + ipRouteCmd.push_back("via"); + ipRouteCmd.push_back(gateWay); + ipRouteCmd.push_back("dev"); + ipRouteCmd.push_back(ifName); + ipRouteCmd.push_back("table"); + ipRouteCmd.push_back("254"); + ExecCommand(ipRouteCmd); + // Flush routing cache + ipRouteCmd.clear(); + ipRouteCmd.push_back(SYSTEM_COMMAND_IP); + ipRouteCmd.push_back("-6 route flush cache"); + ExecCommand(ipRouteCmd); +} +#endif } // namespace Wifi -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/common/net_helper/if_config.h b/wifi/services/wifi_standard/wifi_framework/common/net_helper/if_config.h index 0d383c9..854d62d 100644 --- a/wifi/services/wifi_standard/wifi_framework/common/net_helper/if_config.h +++ b/wifi/services/wifi_standard/wifi_framework/common/net_helper/if_config.h @@ -46,6 +46,28 @@ public: bool GetIpAddr(const std::string& ifName, std::string& ipAddr); +#ifdef OHOS_ARCH_LITE + /** + * @Description : Set the If Addr object + * + * @param dhcpInfo - dhcp information[in] + * @param ipType - ip type[in] + * @return int + */ + int SetIfDnsAndRoute(const DhcpResult &dhcpInfo, int ipType); + + void SetNetDns(const std::string &ifName, const std::string &dns1, const std::string &dns2); + + void AddIfRoute(const std::string &ifName, const std::string &ipAddr, const std::string &mask, + const std::string &gateWay, const int &ipType); + + void AddIpv4Route( + const std::string &ifName, const std::string &ipAddr, const std::string &mask, const std::string &gateWay); + + void AddIpv6Route( + const std::string &ifName, const std::string &ipAddr, const std::string &mask, const std::string &gateWay); +#endif + private: /** * @Description : Use synchronous mode to execute the command, the current thread will be blocked diff --git a/wifi/services/wifi_standard/wifi_framework/common/utils/wifi_common_event_helper.cpp b/wifi/services/wifi_standard/wifi_framework/common/utils/wifi_common_event_helper.cpp index e48ad68..e8a83e1 100644 --- a/wifi/services/wifi_standard/wifi_framework/common/utils/wifi_common_event_helper.cpp +++ b/wifi/services/wifi_standard/wifi_framework/common/utils/wifi_common_event_helper.cpp @@ -14,12 +14,16 @@ */ #include "wifi_common_event_helper.h" +#ifndef OHOS_ARCH_LITE #include "common_event_manager.h" #include "common_event.h" #include "common_event_data.h" +#endif #include "wifi_logger.h" +#ifndef OHOS_ARCH_LITE using namespace OHOS::EventFwk; +#endif DEFINE_WIFILOG_LABEL("WifiCommonEventHelper"); namespace OHOS { namespace Wifi { @@ -27,6 +31,7 @@ bool WifiCommonEventHelper::PublishEvent(const std::string &eventAction, const i const std::vector &permissions) { WIFI_LOGD("publish event[%{public}s], code:%{public}d", eventAction.c_str(), code); +#ifndef OHOS_ARCH_LITE Want want; want.SetAction(eventAction); CommonEventData commonData; @@ -46,12 +51,14 @@ bool WifiCommonEventHelper::PublishEvent(const std::string &eventAction, const i WIFI_LOGE("failed to publish event[%{public}s], code:%{public}d", eventAction.c_str(), code); return false; } +#endif return true; } bool WifiCommonEventHelper::PublishEvent(const std::string &eventAction, const int &code, const std::string &data) { WIFI_LOGD("publish event[%{public}s], code:%{public}d", eventAction.c_str(), code); +#ifndef OHOS_ARCH_LITE Want want; want.SetAction(eventAction); CommonEventData commonData; @@ -62,6 +69,7 @@ bool WifiCommonEventHelper::PublishEvent(const std::string &eventAction, const i WIFI_LOGE("failed to publish event[%{public}s], code:%{public}d", eventAction.c_str(), code); return false; } +#endif return true; } diff --git a/wifi/services/wifi_standard/wifi_framework/common/utils/wifi_common_event_helper.h b/wifi/services/wifi_standard/wifi_framework/common/utils/wifi_common_event_helper.h index d663fb2..4709cd3 100644 --- a/wifi/services/wifi_standard/wifi_framework/common/utils/wifi_common_event_helper.h +++ b/wifi/services/wifi_standard/wifi_framework/common/utils/wifi_common_event_helper.h @@ -17,7 +17,9 @@ #define OHOS_WIFI_COMMON_EVENT_HELPER_H #include +#ifndef OHOS_ARCH_LITE #include "common_event_subscriber.h" +#endif namespace OHOS { namespace Wifi { diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_helper.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_helper.cpp index 32b50b0..e059468 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_helper.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_helper.cpp @@ -17,8 +17,10 @@ #include #include #include "wifi_log.h" +#ifndef OHOS_ARCH_LITE #include "ipc_skeleton.h" #include "accesstoken_kit.h" +#endif #undef LOG_TAG #define LOG_TAG "OHWIFI_MANAGER_PERMISSION_HELPER" @@ -159,6 +161,9 @@ IsGranted WifiPermissionHelper::MockVerifyPermission(const std::string &permissi int WifiPermissionHelper::VerifyPermission(const std::string &permissionName, const int &pid, const int &uid) { +#ifdef OHOS_ARCH_LITE + return PERMISSION_GRANTED; +#else auto callerToken = IPCSkeleton::GetCallingTokenID(); auto tokenType = Security::AccessToken::AccessTokenKit::GetTokenTypeFlag(callerToken); if (tokenType == Security::AccessToken::ATokenTypeEnum::TOKEN_NATIVE) { @@ -177,6 +182,7 @@ int WifiPermissionHelper::VerifyPermission(const std::string &permissionName, co LOGE("callerToken=0x%{public}x has invalid token type=%{public}d", pid, tokenType); return PERMISSION_DENIED; +#endif } int WifiPermissionHelper::VerifySetWifiInfoPermission(const int &pid, const int &uid) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_utils.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_utils.cpp index 46d541b..4448017 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_utils.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_utils.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -13,11 +13,69 @@ * limitations under the License. */ #include "wifi_permission_utils.h" +#ifndef OHOS_ARCH_LITE #include "ipc_skeleton.h" +#endif #include "wifi_auth_center.h" namespace OHOS { namespace Wifi { +#ifdef OHOS_ARCH_LITE +int WifiPermissionUtils::VerifySetWifiInfoPermission() +{ + return PERMISSION_GRANTED; +} + +int WifiPermissionUtils::VerifyGetWifiInfoPermission() +{ + return PERMISSION_GRANTED; +} + +int WifiPermissionUtils::VerifyWifiConnectionPermission() +{ + return PERMISSION_GRANTED; +} + +int WifiPermissionUtils::VerifyGetScanInfosPermission() +{ + return PERMISSION_GRANTED; +} + +int WifiPermissionUtils::VerifyGetWifiLocalMacPermission() +{ + return PERMISSION_GRANTED; +} + +int WifiPermissionUtils::VerifySetWifiConfigPermission() +{ + return PERMISSION_GRANTED; +} + +int WifiPermissionUtils::VerifyGetWifiConfigPermission() +{ + return PERMISSION_GRANTED; +} + +int WifiPermissionUtils::VerifyGetWifiDirectDevicePermission() +{ + return PERMISSION_GRANTED; +} + +int WifiPermissionUtils::VerifyManageWifiHotspotPermission() +{ + return PERMISSION_GRANTED; +} + +int WifiPermissionUtils::VerifyGetWifiPeersMacPermission() +{ + return PERMISSION_GRANTED; +} + +int WifiPermissionUtils::VerifyGetWifiInfoInternalPermission() +{ + return PERMISSION_GRANTED; +} +#else int WifiPermissionUtils::VerifySetWifiInfoPermission() { return WifiAuthCenter::GetInstance().VerifySetWifiInfoPermission( @@ -83,5 +141,6 @@ int WifiPermissionUtils::VerifyGetWifiInfoInternalPermission() return WifiAuthCenter::GetInstance().VerifyGetWifiInfoInternalPermission( IPCSkeleton::GetCallingPid(), IPCSkeleton::GetCallingUid()); } +#endif } // namespace Wifi } // namespace OHOS \ No newline at end of file diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_utils.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_utils.h index 83dd098..439c0c6 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_utils.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_utils.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/BUILD.gn index 42c04af..42ad8b7 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/BUILD.gn @@ -11,14 +11,17 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//build/ohos.gni") -import("//foundation/communication/wifi/wifi/wifi.gni") +if (defined(ohos_lite)) { + import("//build/lite/config/component/lite_component.gni") + import("//foundation/communication/wifi/wifi/wifi_lite.gni") +} else { + import("//build/ohos.gni") + import("//foundation/communication/wifi/wifi/wifi.gni") +} config("wifi_fw_common_header") { include_dirs = [ "idl_interface", - "//utils/native/base/include", - "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces", "$WIFI_ROOT_DIR/services/wifi_standard/sdk/include", "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", @@ -30,6 +33,17 @@ config("wifi_fw_common_header") { "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/interface", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client", ] + if (defined(ohos_lite)) { + include_dirs += [ + "//base/hiviewdfx/hilog_lite/interfaces/native/innerkits", + "//third_party/bounds_checking_function/include", + ] + } else { + include_dirs += [ + "//utils/native/base/include", + "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", + ] + } } config("wifi_idl_cxx_config") { @@ -46,85 +60,130 @@ config("wifi_idl_cxx_config") { } } -ohos_source_set("wifi_utils") { - part_name = "wifi" - sources = [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp" ] - - configs = [ - ":wifi_idl_cxx_config", - ":wifi_fw_common_header", - ] -} - -ohos_source_set("net_helper") { - part_name = "wifi" - sources = [ - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/base_address.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/http_request.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/network_interface.cpp", - ] - - configs = [ - ":wifi_idl_cxx_config", - ":wifi_fw_common_header", - ] -} - -ohos_source_set("log_helper") { - part_name = "wifi" - sources = [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log/log_helper.c" ] - - configs = [ ":wifi_fw_common_header" ] -} - -ohos_shared_library("wifi_idl_client") { - install_enable = true - sources = [ - "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hid2d_msg.cpp", - "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_msg.cpp", - "idl_interface/i_wifi.c", - "idl_interface/i_wifi_chip.c", - "idl_interface/i_wifi_hotspot_iface.c", - "idl_interface/i_wifi_iface.c", - "idl_interface/i_wifi_p2p_iface.c", - "idl_interface/i_wifi_public_func.c", - "idl_interface/i_wifi_sta_iface.c", - "idl_interface/i_wifi_supplicant_iface.c", - "wifi_ap_hal_interface.cpp", - "wifi_base_hal_interface.cpp", - "wifi_chip_hal_interface.cpp", - "wifi_idl_client.cpp", - "wifi_idl_inner_interface.cpp", - "wifi_p2p_hal_interface.cpp", - "wifi_sta_hal_interface.cpp", - "wifi_supplicant_hal_interface.cpp", - ] +net_helper_sources = [ + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/base_address.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/http_request.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/network_interface.cpp", +] + +idl_client_sources = [ + "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hid2d_msg.cpp", + "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_msg.cpp", + "idl_interface/i_wifi.c", + "idl_interface/i_wifi_chip.c", + "idl_interface/i_wifi_hotspot_iface.c", + "idl_interface/i_wifi_iface.c", + "idl_interface/i_wifi_p2p_iface.c", + "idl_interface/i_wifi_public_func.c", + "idl_interface/i_wifi_sta_iface.c", + "idl_interface/i_wifi_supplicant_iface.c", + "wifi_ap_hal_interface.cpp", + "wifi_base_hal_interface.cpp", + "wifi_chip_hal_interface.cpp", + "wifi_idl_client.cpp", + "wifi_idl_inner_interface.cpp", + "wifi_p2p_hal_interface.cpp", + "wifi_sta_hal_interface.cpp", + "wifi_supplicant_hal_interface.cpp", +] + +if (defined(ohos_lite)) { + shared_library("wifi_idl_client") { + sources = net_helper_sources + sources += idl_client_sources + sources += [ + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log/log_helper.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp", + ] + + configs += [ + ":wifi_idl_cxx_config", + ":wifi_fw_common_header", + ] + + deps = [ + "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC:crpc_client", + "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", + "//third_party/bounds_checking_function:libsec_shared", + ] + + defines = [ "OHOS_ARCH_LITE" ] + configs -= [ + "//build/lite/config:language_cpp", + "//build/lite/config:language_c", + ] + cflags_c = [ + "-std=c99", + "-fPIC", + ] + cflags_cc = [ + "-std=c++17", + "-fno-rtti", + "-fPIC", + ] + ldflags = [ + "-fPIC", + "-Wl,-E", + ] + } +} else { + ohos_source_set("wifi_utils") { + part_name = "wifi" + sources = [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp" ] + + configs = [ + ":wifi_idl_cxx_config", + ":wifi_fw_common_header", + ] + } - configs = [ ":wifi_fw_common_header" ] + ohos_source_set("net_helper") { + part_name = "wifi" + sources = net_helper_sources - deps = [ - ":log_helper", - ":net_helper", - ":wifi_utils", - "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC:crpc_client", - "//utils/native/base:utils", - ] + configs = [ + ":wifi_idl_cxx_config", + ":wifi_fw_common_header", + ] + } - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] - cflags_cc = [ - "-std=c++17", - "-fno-rtti", - ] + ohos_source_set("log_helper") { + part_name = "wifi" + sources = [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log/log_helper.c" ] - ldflags = [ - "-fPIC", - "-Wl,-E", - ] + configs = [ ":wifi_fw_common_header" ] + } - part_name = "wifi" - subsystem_name = "communication" + ohos_shared_library("wifi_idl_client") { + install_enable = true + sources = idl_client_sources + + configs = [ ":wifi_fw_common_header" ] + + deps = [ + ":log_helper", + ":net_helper", + ":wifi_utils", + "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC:crpc_client", + "//utils/native/base:utils", + ] + + external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + cflags_cc = [ + "-std=c++17", + "-fno-rtti", + ] + + ldflags = [ + "-fPIC", + "-Wl,-E", + ] + + part_name = "wifi" + subsystem_name = "communication" + } } diff --git a/wifi/services/wifi_standard/wifi_hal/BUILD.gn b/wifi/services/wifi_standard/wifi_hal/BUILD.gn index f101142..a32e785 100644 --- a/wifi/services/wifi_standard/wifi_hal/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_hal/BUILD.gn @@ -11,72 +11,116 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//build/ohos.gni") -import("//foundation/communication/wifi/wifi/wifi.gni") +if (defined(ohos_lite)) { + import("//build/lite/config/component/lite_component.gni") + import("//foundation/communication/wifi/wifi/wifi_lite.gni") +} else { + import("//build/ohos.gni") + import("//foundation/communication/wifi/wifi/wifi.gni") +} + +local_base_sources = [ + "common/wifi_hal_common_func.c", + "main.c", + "wifi_hal_adapter.c", + "wifi_hal_ap_interface.c", + "wifi_hal_base_interface.c", + "wifi_hal_callback.c", + "wifi_hal_chip_interface.c", + "wifi_hal_crpc_ap.c", + "wifi_hal_crpc_base.c", + "wifi_hal_crpc_chip.c", + "wifi_hal_crpc_common.c", + "wifi_hal_crpc_p2p.c", + "wifi_hal_crpc_server.c", + "wifi_hal_crpc_sta.c", + "wifi_hal_crpc_supplicant.c", + "wifi_hal_module/hostapd_hal/wifi_hostapd_hal.c", + "wifi_hal_module/wpa_supplicant_hal/wifi_wpa_common.c", + "wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c", + "wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal/wifi_p2p_hal.c", + "wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c", + "wifi_hal_module_manage.c", + "wifi_hal_p2p_interface.c", + "wifi_hal_sta_interface.c", + "wifi_hal_vendor_interface.c", +] + +local_base_include_dirs = [ + "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces", + "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/common", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal", +] + +if (defined(ohos_lite)) { + executable("wifi_hal_service") { + sources = local_base_sources + + include_dirs = local_base_include_dirs + include_dirs += [ + "//base/hiviewdfx/hilog_lite/interfaces/native/innerkits", + "//third_party/bounds_checking_function/include", + "//third_party/wpa_supplicant/wpa_supplicant-2.9/src", -ohos_executable("wifi_hal_service") { - install_enable = true - sources = [ - "common/wifi_hal_common_func.c", - "main.c", - "wifi_hal_adapter.c", - "wifi_hal_ap_interface.c", - "wifi_hal_base_interface.c", - "wifi_hal_callback.c", - "wifi_hal_chip_interface.c", - "wifi_hal_crpc_ap.c", - "wifi_hal_crpc_base.c", - "wifi_hal_crpc_chip.c", - "wifi_hal_crpc_common.c", - "wifi_hal_crpc_p2p.c", - "wifi_hal_crpc_server.c", - "wifi_hal_crpc_sta.c", - "wifi_hal_crpc_supplicant.c", - "wifi_hal_module/hostapd_hal/wifi_hostapd_hal.c", - "wifi_hal_module/wpa_supplicant_hal/wifi_wpa_common.c", - "wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c", - "wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal/wifi_p2p_hal.c", - "wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c", - "wifi_hal_module_manage.c", - "wifi_hal_p2p_interface.c", - "wifi_hal_sta_interface.c", - "wifi_hal_vendor_interface.c", - ] + #"//drivers/peripheral/wlan/interfaces/include/", + #"//drivers/peripheral/wlan/client/include/", + ] - include_dirs = [ - "//utils/native/base/include", - "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces", - "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/common", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal", - "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", - "//third_party/wpa_supplicant/wpa_supplicant-2.9_standard/src/", - "//third_party/bounds_checking_function/include/", - "//drivers/peripheral/wlan/interfaces/include/", - "//drivers/peripheral/wlan/client/include/", - ] + deps = [ + "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC:crpc_server", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/etc/init:etc", + "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", - deps = [ - "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC:crpc_server", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/etc/init:etc", - "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//drivers/peripheral/wlan/hal:wifi_hal", - "//third_party/wpa_supplicant/wpa_supplicant-2.9_standard:wpa_client", - "//utils/native/base:utils", - ] + #"//drivers/peripheral/wlan/hal:wifi_hal", + "//third_party/bounds_checking_function:libsec_shared", + "//third_party/wpa_supplicant/wpa_supplicant-2.9:wpa_supplicant", + ] - cflags_cc = [ "-fno-rtti" ] - defines = [ "AP_INTF=\"$wifi_feature_with_ap_intf\"" ] - if (product_name == "rk3568") { - defines += [ "PRODUCT_RK" ] + cflags_cc = [ "-fno-rtti" ] + defines = [ + "OHOS_ARCH_LITE", + "AP_INTF=\"$wifi_feature_with_ap_intf\"", + ] + ldflags = [ "-lwpa_client" ] } +} else { + ohos_executable("wifi_hal_service") { + install_enable = true + sources = local_base_sources - part_name = "wifi" - subsystem_name = "communication" + include_dirs = local_base_include_dirs + include_dirs += [ + "//utils/native/base/include", + "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", + "//third_party/wpa_supplicant/wpa_supplicant-2.9_standard/src/", + "//third_party/bounds_checking_function/include/", + "//drivers/peripheral/wlan/interfaces/include/", + "//drivers/peripheral/wlan/client/include/", + ] + + deps = [ + "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC:crpc_server", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/etc/init:etc", + "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", + "//drivers/peripheral/wlan/hal:wifi_hal", + "//third_party/wpa_supplicant/wpa_supplicant-2.9_standard:wpa_client", + "//utils/native/base:utils", + ] + + cflags_cc = [ "-fno-rtti" ] + defines = [ "AP_INTF=\"$wifi_feature_with_ap_intf\"" ] + if (product_name == "rk3568") { + defines += [ "PRODUCT_RK" ] + } + + part_name = "wifi" + subsystem_name = "communication" + } } group("wifi_hal") { diff --git a/wifi/services/wifi_standard/wifi_hal/common/wifi_log.h b/wifi/services/wifi_standard/wifi_hal/common/wifi_log.h index afa33ff..f7fab4f 100644 --- a/wifi/services/wifi_standard/wifi_hal/common/wifi_log.h +++ b/wifi/services/wifi_standard/wifi_hal/common/wifi_log.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,8 +16,11 @@ #ifndef OHOS_WIFI_LOG_H #define OHOS_WIFI_LOG_H - +#ifdef OHOS_ARCH_LITE +#include "hilog/log.h" +#else #include "hilog/log_c.h" +#endif #undef LOG_TAG #define LOG_TAG "WifiHalService" diff --git a/wifi/services/wifi_standard/wifi_hal/etc/init/BUILD.gn b/wifi/services/wifi_standard/wifi_hal/etc/init/BUILD.gn index 5618b74..93992ff 100644 --- a/wifi/services/wifi_standard/wifi_hal/etc/init/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_hal/etc/init/BUILD.gn @@ -11,44 +11,57 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//build/ohos.gni") +if (defined(ohos_lite)) { + import("//build/lite/config/component/lite_component.gni") +} else { + import("//build/ohos.gni") +} group("etc") { - deps = [ - ":hostapd.conf", - ":p2p_supplicant.conf", - ":wifi_hal_service.cfg", - ":wpa_supplicant.conf", - ] + deps = [ ":wpa_supplicant.conf" ] + if (!defined(ohos_lite)) { + deps += [ + ":hostapd.conf", + ":p2p_supplicant.conf", + ":wifi_hal_service.cfg", + ] + } } -ohos_prebuilt_etc("wifi_hal_service.cfg") { - source = "wifi_hal_service.cfg" - relative_install_dir = "init" - part_name = "wifi" - subsystem_name = "communication" -} +if (defined(ohos_lite)) { + copy("wpa_supplicant.conf") { + sources = [ "wpa_supplicant.conf" ] + outputs = [ "$root_out_dir/system/etc/wifi/wpa_supplicant.conf" ] + } +} else { + ohos_prebuilt_etc("wifi_hal_service.cfg") { + source = "wifi_hal_service.cfg" + relative_install_dir = "init" + part_name = "wifi" + subsystem_name = "communication" + } -ohos_prebuilt_etc("wpa_supplicant.conf") { - source = "wpa_supplicant.conf" - relative_install_dir = "wifi" - part_name = "wifi" - subsystem_name = "communication" -} + ohos_prebuilt_etc("wpa_supplicant.conf") { + source = "wpa_supplicant.conf" + relative_install_dir = "wifi" + part_name = "wifi" + subsystem_name = "communication" + } -ohos_prebuilt_etc("hostapd.conf") { - source = "hostapd.conf" - if (product_name == "rk3568") { - source = "default_conf/hostapd.conf" + ohos_prebuilt_etc("hostapd.conf") { + source = "hostapd.conf" + if (product_name == "rk3568") { + source = "default_conf/hostapd.conf" + } + relative_install_dir = "wifi" + part_name = "wifi" + subsystem_name = "communication" } - relative_install_dir = "wifi" - part_name = "wifi" - subsystem_name = "communication" -} -ohos_prebuilt_etc("p2p_supplicant.conf") { - source = "p2p_supplicant.conf" - relative_install_dir = "wifi" - part_name = "wifi" - subsystem_name = "communication" + ohos_prebuilt_etc("p2p_supplicant.conf") { + source = "p2p_supplicant.conf" + relative_install_dir = "wifi" + part_name = "wifi" + subsystem_name = "communication" + } } diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_adapter.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_adapter.c index 28c0e00..3db5031 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_adapter.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_adapter.c @@ -155,8 +155,13 @@ int ExcuteCmd(const char *szCmd) int CopyConfigFile(const char* configName) { +#ifdef OHOS_ARCH_LITE +#define PATH_NUM 2 +#define BUFF_SIZE 256 +#else const int PATH_NUM = 2; const int BUFF_SIZE = 256; +#endif char buf[BUFF_SIZE] = {0}; if (snprintf_s(buf, sizeof(buf), sizeof(buf) - 1, "/data/misc/wifi/wpa_supplicant/%s", configName) < 0) { LOGE("snprintf_s dest dir failed."); diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c index 26357c6..25a253b 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c @@ -16,9 +16,13 @@ #include "wifi_hal_ap_interface.h" #include #include +#ifdef OHOS_ARCH_LITE +#include "wifi_hal_adapter.h" +#else #include "wifi_hal.h" #include "wifi_hal_adapter.h" #include "wifi_hal_ap_feature.h" +#endif #include "wifi_hal_module_manage.h" #include "wifi_hal_common_func.h" #include "wifi_log.h" @@ -273,6 +277,9 @@ static int32_t ConvertToNl80211Band(int32_t band) WifiErrorNo GetValidFrequenciesForBand(int32_t band, int *frequencies, int32_t *size) { +#ifdef OHOS_ARCH_LITE + return WIFI_HAL_FAILED; +#else int32_t ret; uint32_t count = 0; struct IWiFi *wifi = NULL; @@ -317,4 +324,5 @@ WifiErrorNo GetValidFrequenciesForBand(int32_t band, int *frequencies, int32_t * } return (ret == 0) ? WIFI_HAL_SUCCESS : WIFI_HAL_FAILED; +#endif } diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_chip_interface.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_chip_interface.c index 6bf5673..9cb0696 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_chip_interface.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_chip_interface.c @@ -55,7 +55,8 @@ WifiErrorNo CreateIface(int32_t type, WifiIface *iface) return WIFI_HAL_FAILED; } const int bufferSize = 8; - char name[bufferSize] = {0}; + char name[bufferSize]; + (void)memset_s(name, bufferSize, 0, bufferSize); if (strcpy_s(iface->name, sizeof(iface->name), name) != EOK) { return WIFI_HAL_FAILED; } diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module_manage.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module_manage.c index 25369fe..0fa0125 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module_manage.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module_manage.c @@ -86,10 +86,14 @@ static void *WpaThreadMain(void *p) const char *startCmd = (const char *)p; struct StWpaMainParam param = {0}; SplitCmdString(startCmd, ¶m); +#ifdef OHOS_ARCH_LITE + void *handleLibWpa = dlopen("libwpa.so", RTLD_NOW | RTLD_LOCAL); +#else #ifdef __aarch64__ void *handleLibWpa = dlopen("/system/lib64/libwpa.z.so", RTLD_NOW | RTLD_LOCAL); #else void *handleLibWpa = dlopen("/system/lib/libwpa.z.so", RTLD_NOW | RTLD_LOCAL); +#endif #endif if (handleLibWpa == NULL) { LOGE("dlopen libwpa failed."); diff --git a/wifi/utils/inc/wifi_common_util.h b/wifi/utils/inc/wifi_common_util.h index cdc73c7..8d6f8d5 100644 --- a/wifi/utils/inc/wifi_common_util.h +++ b/wifi/utils/inc/wifi_common_util.h @@ -96,6 +96,7 @@ std::string Number2Ip(int intIp); */ std::vector StrSplit(const std::string& str, const std::string& delim); +#ifndef OHOS_ARCH_LITE /** * @Description get bundle name, it can only be obtained at the interfaces layer. * @@ -109,6 +110,7 @@ std::string GetBundleName(); * @return bool - Returns true for yes, false for no. */ bool IsSystemApp(); +#endif } // namespace Wifi } // namespace OHOS #endif \ No newline at end of file diff --git a/wifi/utils/src/BUILD.gn b/wifi/utils/src/BUILD.gn index 62493b4..a4acc64 100644 --- a/wifi/utils/src/BUILD.gn +++ b/wifi/utils/src/BUILD.gn @@ -11,46 +11,77 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//build/ohos.gni") -import("//foundation/communication/wifi/wifi/wifi.gni") - -ohos_shared_library("wifi_utils") { - install_enable = true - include_dirs = [ - "$WIFI_ROOT_DIR/utils/inc", - "//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", - ] - - sources = [ - "wifi_common_util.cpp", - "wifi_hisysevent.cpp", - ] - - deps = [ - "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", - "//utils/native/base:utils", - ] - - external_deps = [ - "bundle_framework:appexecfwk_base", - "bundle_framework:appexecfwk_core", - "hisysevent_native:libhisysevent", - "ipc:ipc_core", - ] - - cflags_cc = [ - "-std=c++17", - "-fno-rtti", - ] - - ldflags = [ - "-fPIC", - "-Wl,-E", - ] - - part_name = "wifi" - subsystem_name = "communication" +if (defined(ohos_lite)) { + import("//build/lite/config/component/lite_component.gni") + import("//foundation/communication/wifi/wifi/wifi_lite.gni") + + shared_library("wifi_utils") { + include_dirs = [ + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", + "$WIFI_ROOT_DIR/utils/inc", + "//base/hiviewdfx/hilog_lite/interfaces/native/innerkits", + "//third_party/bounds_checking_function/include", + ] + + sources = [ "wifi_common_util.cpp" ] + + deps = [ + "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", + "//third_party/bounds_checking_function:libsec_shared", + ] + + cflags_cc = [ + "-std=c++17", + "-fno-rtti", + ] + ldflags = [ + "-fPIC", + "-Wl,-E", + ] + defines = [ "OHOS_ARCH_LITE" ] + } +} else { + import("//build/ohos.gni") + import("//foundation/communication/wifi/wifi/wifi.gni") + + ohos_shared_library("wifi_utils") { + install_enable = true + include_dirs = [ + "$WIFI_ROOT_DIR/utils/inc", + "//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", + ] + + sources = [ + "wifi_common_util.cpp", + "wifi_hisysevent.cpp", + ] + + deps = [ + "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", + "//foundation/aafwk/standard/interfaces/innerkits/want:want", + "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "//utils/native/base:utils", + ] + + external_deps = [ + "bundle_framework:appexecfwk_base", + "bundle_framework:appexecfwk_core", + "hisysevent_native:libhisysevent", + "ipc:ipc_core", + ] + + cflags_cc = [ + "-std=c++17", + "-fno-rtti", + ] + + ldflags = [ + "-fPIC", + "-Wl,-E", + ] + + part_name = "wifi" + subsystem_name = "communication" + } } diff --git a/wifi/utils/src/wifi_common_util.cpp b/wifi/utils/src/wifi_common_util.cpp index 0cbb331..b19c45f 100644 --- a/wifi/utils/src/wifi_common_util.cpp +++ b/wifi/utils/src/wifi_common_util.cpp @@ -17,11 +17,13 @@ #include #include #include +#ifndef OHOS_ARCH_LITE #include "bundle_mgr_interface.h" #include "if_system_ability_manager.h" #include "ipc_skeleton.h" #include "iservice_registry.h" #include "system_ability_definition.h" +#endif #include "wifi_logger.h" namespace OHOS { @@ -182,6 +184,7 @@ std::vector StrSplit(const std::string& str, const std::string& del return { first, last }; } +#ifndef OHOS_ARCH_LITE sptr GetBundleManager() { sptr systemManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); @@ -222,5 +225,6 @@ bool IsSystemApp() WIFI_LOGI("Is system App uid[%{public}d]: %{public}d", uid, isSysApp); return isSysApp; } +#endif } // namespace Wifi } // namespace OHOS \ No newline at end of file -- Gitee From bee2ee5d93b90192e62a749c856f1f9023c0fd63 Mon Sep 17 00:00:00 2001 From: junxinlu Date: Mon, 9 May 2022 19:37:31 +0800 Subject: [PATCH 098/491] adapter wifi service to L1 Signed-off-by: junxinlu --- wifi/BUILD.gn | 28 + wifi/bundle.json | 19 +- wifi/interfaces/innerkits/BUILD.gn | 32 + .../native_cpp/wifi_standard/BUILD.gn | 340 +++-- .../wifi_standard/include/wifi_device.h | 4 + .../include/wifi_ipc_lite_adapter.h | 35 + .../wifi_standard/include/wifi_scan.h | 4 + .../wifi_standard/interfaces/i_wifi_device.h | 12 + .../interfaces/i_wifi_device_callback.h | 8 + .../wifi_standard/interfaces/i_wifi_scan.h | 14 +- .../interfaces/i_wifi_scan_callback.h | 10 +- .../src/wifi_device_callback_stub_lite.cpp | 213 +++ .../src/wifi_device_callback_stub_lite.h | 52 + .../wifi_standard/src/wifi_device_impl.cpp | 30 +- .../wifi_standard/src/wifi_device_impl.h | 8 + .../wifi_standard/src/wifi_device_proxy.h | 35 +- .../src/wifi_device_proxy_lite.cpp | 1226 +++++++++++++++++ .../wifi_standard/src/wifi_logger.h | 4 + .../wifi_standard/src/wifi_scan.cpp | 2 + .../src/wifi_scan_callback_stub.h | 24 +- .../src/wifi_scan_callback_stub_lite.cpp | 95 ++ .../wifi_standard/src/wifi_scan_impl.cpp | 26 +- .../wifi_standard/src/wifi_scan_impl.h | 8 + .../wifi_standard/src/wifi_scan_proxy.h | 25 + .../src/wifi_scan_proxy_lite.cpp | 420 ++++++ .../wifi_standard/wifi_framework/BUILD.gn | 35 +- .../wifi_framework/wifi_manage/BUILD.gn | 615 +++++---- .../wifi_manage/wifi_device_callback_proxy.h | 16 + .../wifi_device_callback_proxy_lite.cpp | 129 ++ .../wifi_manage/wifi_device_feature_lite.cpp | 112 ++ .../wifi_manage/wifi_device_service_impl.cpp | 34 +- .../wifi_manage/wifi_device_service_impl.h | 30 + .../wifi_manage/wifi_device_stub_lite.cpp | 577 ++++++++ .../wifi_manage/wifi_device_stub_lite.h | 82 ++ .../wifi_internal_event_dispatcher_lite.cpp | 243 ++++ .../wifi_internal_event_dispatcher_lite.h | 103 ++ .../wifi_manage/wifi_manager.cpp | 63 + .../wifi_framework/wifi_manage/wifi_manager.h | 29 + .../wifi_manage/wifi_sa_service_lite.c | 96 ++ .../wifi_manage/wifi_scan/BUILD.gn | 148 +- .../wifi_manage/wifi_scan_callback_proxy.h | 15 + .../wifi_scan_callback_proxy_lite.cpp | 59 + .../wifi_manage/wifi_scan_feature_lite.cpp | 112 ++ .../wifi_manage/wifi_scan_service_impl.cpp | 29 + .../wifi_manage/wifi_scan_service_impl.h | 28 +- .../wifi_manage/wifi_scan_stub_lite.cpp | 259 ++++ .../wifi_manage/wifi_scan_stub_lite.h | 49 + .../wifi_manage/wifi_service_main_lite.c | 39 + .../wifi_manage/wifi_service_manager.cpp | 41 + .../wifi_manage/wifi_service_manager.h | 20 + .../wifi_manage/wifi_sta/BUILD.gn | 187 ++- .../wifi_sta/sta_state_machine.cpp | 28 +- .../wifi_manage/wifi_sta/sta_state_machine.h | 4 + wifi/wifi_lite.gni | 21 + 54 files changed, 5323 insertions(+), 554 deletions(-) create mode 100644 wifi/BUILD.gn create mode 100644 wifi/interfaces/innerkits/BUILD.gn create mode 100644 wifi/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_ipc_lite_adapter.h create mode 100644 wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_callback_stub_lite.cpp create mode 100644 wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_callback_stub_lite.h create mode 100644 wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy_lite.cpp create mode 100644 wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_callback_stub_lite.cpp create mode 100644 wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_proxy_lite.cpp create mode 100644 wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_callback_proxy_lite.cpp create mode 100644 wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_feature_lite.cpp create mode 100644 wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub_lite.cpp create mode 100644 wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub_lite.h create mode 100644 wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher_lite.cpp create mode 100644 wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher_lite.h create mode 100644 wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sa_service_lite.c create mode 100644 wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_callback_proxy_lite.cpp create mode 100644 wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_feature_lite.cpp create mode 100644 wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_stub_lite.cpp create mode 100644 wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_stub_lite.h create mode 100644 wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_main_lite.c create mode 100644 wifi/wifi_lite.gni diff --git a/wifi/BUILD.gn b/wifi/BUILD.gn new file mode 100644 index 0000000..83bd465 --- /dev/null +++ b/wifi/BUILD.gn @@ -0,0 +1,28 @@ +# Copyright (C) 2022-2022 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if (defined(ohos_lite)) { + import("//build/lite/config/component/lite_component.gni") + import("//foundation/communication/wifi/wifi/wifi_lite.gni") + + lite_component("wifi") { + deps = [ + "$WIFI_ROOT_DIR/interfaces/innerkits:wifi_kits", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework:wifi_manage", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework:wifi_system_ability", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal:wifi_hal", + "$WIFI_ROOT_DIR/utils/src:wifi_utils", + ] + features = [] + } +} diff --git a/wifi/bundle.json b/wifi/bundle.json index e56d3ba..e16866a 100644 --- a/wifi/bundle.json +++ b/wifi/bundle.json @@ -71,24 +71,11 @@ }, "build": { "sub_component": [ - "//foundation/communication/wifi/wifi/interfaces/innerkits/native_cpp/wifi_standard:wifi_sdk", + "//foundation/communication/wifi/wifi/interfaces/innerkits:wifi_kits", "//foundation/communication/wifi/wifi/services/wifi_standard/wifi_framework:wifi_manage", - "//foundation/communication/wifi/wifi/services/wifi_standard/wifi_hal:wifi_hal", "//foundation/communication/wifi/wifi/services/wifi_standard/wifi_framework:wifi_system_ability", - "//foundation/communication/wifi/wifi/services/wifi_standard/sa_profile:wifi_standard_sa_profile", - "//foundation/communication/wifi/wifi/services/wifi_standard/wifi_framework/wifi_manage:wifi_device_ability", - "//foundation/communication/wifi/wifi/services/wifi_standard/wifi_framework/wifi_manage:wifi_scan_ability", - "//foundation/communication/wifi/wifi/services/wifi_standard/wifi_framework/wifi_manage:wifi_hotspot_ability", - "//foundation/communication/wifi/wifi/services/wifi_standard/wifi_framework/wifi_manage:wifi_p2p_ability", - "//foundation/communication/wifi/wifi/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", - "//foundation/communication/wifi/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", - "//foundation/communication/wifi/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan:wifi_scan_service", - "//foundation/communication/wifi/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta:wifi_sta_service", - "//foundation/communication/wifi/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap:wifi_ap_service", - "//foundation/communication/wifi/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p:wifi_p2p_service", - "//foundation/communication/wifi/wifi/utils/src:wifi_utils", - "//foundation/communication/wifi/wifi/interfaces/innerkits/native_cpp/napi:wifi_native_js", - "//foundation/communication/wifi/wifi/interfaces/innerkits/native_cpp/napi:wifi" + "//foundation/communication/wifi/wifi/services/wifi_standard/wifi_hal:wifi_hal", + "//foundation/communication/wifi/wifi/utils/src:wifi_utils" ], "inner_kits": [ { diff --git a/wifi/interfaces/innerkits/BUILD.gn b/wifi/interfaces/innerkits/BUILD.gn new file mode 100644 index 0000000..b2f8e1a --- /dev/null +++ b/wifi/interfaces/innerkits/BUILD.gn @@ -0,0 +1,32 @@ +# Copyright (C) 2022-2022 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if (defined(ohos_lite)) { + import("//build/lite/config/component/lite_component.gni") + import("//foundation/communication/wifi/wifi/wifi_lite.gni") +} else { + import("//build/ohos.gni") + import("//foundation/communication/wifi/wifi/wifi.gni") +} + +group("wifi_kits") { + deps = [ + "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard:wifi_sdk", + ] + if (!defined(ohos_lite)) { + deps += [ + "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/napi:wifi", + "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/napi:wifi_native_js", + ] + } +} diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/BUILD.gn b/wifi/interfaces/innerkits/native_cpp/wifi_standard/BUILD.gn index 1f15c1f..1bd94bd 100644 --- a/wifi/interfaces/innerkits/native_cpp/wifi_standard/BUILD.gn +++ b/wifi/interfaces/innerkits/native_cpp/wifi_standard/BUILD.gn @@ -11,162 +11,220 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//build/ohos.gni") -import("//foundation/communication/wifi/wifi/wifi.gni") - -################################################################################ - -config("wifi_sdk_header") { - include_dirs = [ - "//utils/native/base/include", - "//utils/system/safwk/native/include", - "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", - "//foundation/arkui/ace_engine/frameworks/base/utils", - "//foundation/arkui/ace_engine/frameworks", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", - "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/include", - "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log/", - "//foundation/distributedschedule/samgr/adapter/interfaces/innerkits/include", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", - "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/include", - "$DHCP_ROOT_DIR/services/mgr_service/include", - "$WIFI_ROOT_DIR/interfaces/innerkits", - "$WIFI_ROOT_DIR/utils/inc", - ] -} +if (defined(ohos_lite)) { + import("//build/lite/config/component/lite_component.gni") + import("//foundation/communication/wifi/wifi/wifi_lite.gni") + + shared_library("wifi_sdk") { + sources = [ + "c_adapter/wifi_c_device.cpp", + "c_adapter/wifi_c_utils.cpp", + "src/wifi_device.cpp", + "src/wifi_device_callback_stub_lite.cpp", + "src/wifi_device_impl.cpp", + "src/wifi_device_proxy_lite.cpp", + "src/wifi_scan.cpp", + "src/wifi_scan_callback_stub_lite.cpp", + "src/wifi_scan_impl.cpp", + "src/wifi_scan_proxy_lite.cpp", + ] + + include_dirs = [ + "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/include", + "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log/", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", + "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/include", + "$DHCP_ROOT_DIR/services/mgr_service/include", + "$WIFI_ROOT_DIR/interfaces/innerkits", + "$WIFI_ROOT_DIR/utils/inc", + "//base/hiviewdfx/hilog_lite/interfaces/native/innerkits", + "//foundation/communication/ipc_lite/interfaces/kits", + "//foundation/distributedschedule/samgr_lite/interfaces/innerkits/registry", + "//foundation/distributedschedule/samgr_lite/interfaces/innerkits/samgr", + "//third_party/bounds_checking_function/include", + "//utils/native/lite/include", + ] + + deps = [ + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", + "$WIFI_ROOT_DIR/utils/src:wifi_utils", + "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", + "//foundation/communication/ipc_lite:liteipc_adapter", + "//foundation/distributedschedule/samgr_lite/samgr:samgr", + "//third_party/bounds_checking_function:libsec_shared", + ] + + configs -= [ "//build/lite/config:language_cpp" ] + cflags_cc = [ + "-std=c++17", + "-fno-rtti", + ] + defines = [ "OHOS_ARCH_LITE" ] + ldflags = [ + "-fPIC", + "-Wl,-E", + ] + } +} else { + import("//build/ohos.gni") + import("//foundation/communication/wifi/wifi/wifi.gni") + + ################################################################################ + + config("wifi_sdk_header") { + include_dirs = [ + "//utils/native/base/include", + "//utils/system/safwk/native/include", + "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", + "//foundation/arkui/ace_engine/frameworks/base/utils", + "//foundation/arkui/ace_engine/frameworks", + "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", + "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/include", + "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log/", + "//foundation/distributedschedule/samgr/adapter/interfaces/innerkits/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", + "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/include", + "$DHCP_ROOT_DIR/services/mgr_service/include", + "$WIFI_ROOT_DIR/interfaces/innerkits", + "$WIFI_ROOT_DIR/utils/inc", + ] + } -config("wifi_sdk_config") { - visibility = [ "//:*" ] - include_dirs = [ ":wifi_fw_common_header" ] + config("wifi_sdk_config") { + visibility = [ "//:*" ] + include_dirs = [ ":wifi_fw_common_header" ] - cflags = [ - "-std=c++17", - "-fno-rtti", - ] + cflags = [ + "-std=c++17", + "-fno-rtti", + ] - if (target_cpu == "arm") { - cflags += [ "-DBINDER_IPC_32BIT" ] + if (target_cpu == "arm") { + cflags += [ "-DBINDER_IPC_32BIT" ] + } } -} -ohos_source_set("wifi_device_proxy_impl") { - part_name = "wifi" - sources = [ - "src/wifi_device_impl.cpp", - "src/wifi_device_proxy.cpp", - ] + ohos_source_set("wifi_device_proxy_impl") { + part_name = "wifi" + sources = [ + "src/wifi_device_impl.cpp", + "src/wifi_device_proxy.cpp", + ] - configs = [ - ":wifi_sdk_config", - ":wifi_sdk_header", - ] + configs = [ + ":wifi_sdk_config", + ":wifi_sdk_header", + ] - external_deps = [ "ipc:ipc_core" ] -} + external_deps = [ "ipc:ipc_core" ] + } -ohos_source_set("wifi_hotspot_proxy_impl") { - part_name = "wifi" - sources = [ - "src/wifi_hotspot_impl.cpp", - "src/wifi_hotspot_proxy.cpp", - ] + ohos_source_set("wifi_hotspot_proxy_impl") { + part_name = "wifi" + sources = [ + "src/wifi_hotspot_impl.cpp", + "src/wifi_hotspot_proxy.cpp", + ] - configs = [ - ":wifi_sdk_config", - ":wifi_sdk_header", - ] + configs = [ + ":wifi_sdk_config", + ":wifi_sdk_header", + ] - external_deps = [ "ipc:ipc_core" ] -} + external_deps = [ "ipc:ipc_core" ] + } -ohos_source_set("wifi_scan_proxy_impl") { - part_name = "wifi" - sources = [ - "src/wifi_scan_impl.cpp", - "src/wifi_scan_proxy.cpp", - ] + ohos_source_set("wifi_scan_proxy_impl") { + part_name = "wifi" + sources = [ + "src/wifi_scan_impl.cpp", + "src/wifi_scan_proxy.cpp", + ] - configs = [ - ":wifi_sdk_config", - ":wifi_sdk_header", - ] + configs = [ + ":wifi_sdk_config", + ":wifi_sdk_header", + ] - external_deps = [ "ipc:ipc_core" ] -} + external_deps = [ "ipc:ipc_core" ] + } -ohos_source_set("wifi_p2p_proxy_impl") { - part_name = "wifi" - sources = [ - "src/wifi_p2p_impl.cpp", - "src/wifi_p2p_proxy.cpp", - ] + ohos_source_set("wifi_p2p_proxy_impl") { + part_name = "wifi" + sources = [ + "src/wifi_p2p_impl.cpp", + "src/wifi_p2p_proxy.cpp", + ] - configs = [ - ":wifi_sdk_config", - ":wifi_sdk_header", - ] + configs = [ + ":wifi_sdk_config", + ":wifi_sdk_header", + ] - external_deps = [ "ipc:ipc_core" ] -} + external_deps = [ "ipc:ipc_core" ] + } -ohos_shared_library("wifi_sdk") { - install_enable = true - sources = [ - "c_adapter/wifi_c_device.cpp", - "c_adapter/wifi_c_event.cpp", - "c_adapter/wifi_c_hid2d.cpp", - "c_adapter/wifi_c_hotspot.cpp", - "c_adapter/wifi_c_p2p.cpp", - "c_adapter/wifi_c_utils.cpp", - "src/wifi_device.cpp", - "src/wifi_device_callback_stub.cpp", - "src/wifi_hid2d.cpp", - "src/wifi_hid2d_msg.cpp", - "src/wifi_hotspot.cpp", - "src/wifi_hotspot_callback_stub.cpp", - "src/wifi_p2p.cpp", - "src/wifi_p2p_callback_stub.cpp", - "src/wifi_p2p_msg.cpp", - "src/wifi_scan.cpp", - "src/wifi_scan_callback_stub.cpp", - ] - - deps = [ - ":wifi_device_proxy_impl", - ":wifi_hotspot_proxy_impl", - ":wifi_p2p_proxy_impl", - ":wifi_scan_proxy_impl", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", - "$WIFI_ROOT_DIR/utils/src:wifi_utils", - "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", - "//third_party/bounds_checking_function:libsec_static", - "//utils/native/base:utils", - ] - - external_deps = [ - "common_event_service:cesfwk_innerkits", - "ipc:ipc_core", - ] - - cflags_cc = [ - "-std=c++17", - "-fno-rtti", - ] - - ldflags = [ - "-fPIC", - "-Wl,-E", - ] - - configs = [ - ":wifi_sdk_config", - ":wifi_sdk_header", - ] - - part_name = "wifi" - subsystem_name = "communication" + ohos_shared_library("wifi_sdk") { + install_enable = true + sources = [ + "c_adapter/wifi_c_device.cpp", + "c_adapter/wifi_c_event.cpp", + "c_adapter/wifi_c_hid2d.cpp", + "c_adapter/wifi_c_hotspot.cpp", + "c_adapter/wifi_c_p2p.cpp", + "c_adapter/wifi_c_utils.cpp", + "src/wifi_device.cpp", + "src/wifi_device_callback_stub.cpp", + "src/wifi_hid2d.cpp", + "src/wifi_hid2d_msg.cpp", + "src/wifi_hotspot.cpp", + "src/wifi_hotspot_callback_stub.cpp", + "src/wifi_p2p.cpp", + "src/wifi_p2p_callback_stub.cpp", + "src/wifi_p2p_msg.cpp", + "src/wifi_scan.cpp", + "src/wifi_scan_callback_stub.cpp", + ] + + deps = [ + ":wifi_device_proxy_impl", + ":wifi_hotspot_proxy_impl", + ":wifi_p2p_proxy_impl", + ":wifi_scan_proxy_impl", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", + "$WIFI_ROOT_DIR/utils/src:wifi_utils", + "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", + "//foundation/aafwk/standard/interfaces/innerkits/want:want", + "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "//third_party/bounds_checking_function:libsec_static", + "//utils/native/base:utils", + ] + + external_deps = [ + "common_event_service:cesfwk_innerkits", + "ipc:ipc_core", + ] + + cflags_cc = [ + "-std=c++17", + "-fno-rtti", + ] + + ldflags = [ + "-fPIC", + "-Wl,-E", + ] + + configs = [ + ":wifi_sdk_config", + ":wifi_sdk_header", + ] + + part_name = "wifi" + subsystem_name = "communication" + } } diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_device.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_device.h index 275f155..b09d378 100644 --- a/wifi/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_device.h +++ b/wifi/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_device.h @@ -185,7 +185,11 @@ public: * @param callback - IWifiDeviceCallBack object * @return ErrCode - operation result */ +#ifdef OHOS_ARCH_LITE + virtual ErrCode RegisterCallBack(const std::shared_ptr &callback) = 0; +#else virtual ErrCode RegisterCallBack(const sptr &callback) = 0; +#endif /** * @Description Get the signal level object. diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_ipc_lite_adapter.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_ipc_lite_adapter.h new file mode 100644 index 0000000..8149748 --- /dev/null +++ b/wifi/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_ipc_lite_adapter.h @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OHOS_WIFI_IPC_LITE_ADAPTER_H +#define OHOS_WIFI_IPC_LITE_ADAPTER_H + +#define WIFI_SERVICE_LITE "wifisrvlite" +#define WIFI_FEATURE_DEVICE "wifidevice" +#define WIFI_FEATRUE_SCAN "wifiscan" + +#define IPC_DATA_SIZE_BIG 2048 +#define IPC_DATA_SIZE_MID 512 +#define IPC_DATA_SIZE_SMALL 256 +#define MAX_IPC_OBJ_COUNT 5 + +struct IpcOwner { + int funcId; + int exception; + int retCode; + void *variable; +}; + +#endif \ No newline at end of file diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_scan.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_scan.h index 1b71a35..a32a270 100644 --- a/wifi/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_scan.h +++ b/wifi/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_scan.h @@ -53,7 +53,11 @@ public: */ virtual ErrCode GetScanInfoList(std::vector &result) = 0; +#ifdef OHOS_ARCH_LITE + virtual ErrCode RegisterCallBack(const std::shared_ptr &callback) = 0; +#else virtual ErrCode RegisterCallBack(const sptr &callback) = 0; +#endif /** * @Description Get supported features diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_device.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_device.h index 5e35e09..fa36743 100644 --- a/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_device.h +++ b/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_device.h @@ -16,15 +16,21 @@ #define OHOS_I_WIFI_DEVICE_H #include "wifi_errcode.h" +#ifndef OHOS_ARCH_LITE #include "iremote_broker.h" #include "message_parcel.h" #include "message_option.h" +#endif #include "i_wifi_device_callback.h" #include "wifi_errcode.h" namespace OHOS { namespace Wifi { +#ifdef OHOS_ARCH_LITE +class IWifiDevice { +#else class IWifiDevice : public IRemoteBroker { +#endif public: virtual ~IWifiDevice() {} @@ -240,7 +246,11 @@ public: * @param callback - IWifiDeviceCallBack object * @return ErrCode - operation result */ +#ifdef OHOS_ARCH_LITE + virtual ErrCode RegisterCallBack(const std::shared_ptr &callback) = 0; +#else virtual ErrCode RegisterCallBack(const sptr &callback) = 0; +#endif /** * @Description Get the Signal Level object @@ -276,8 +286,10 @@ public: */ virtual bool SetLowLatencyMode(bool enabled) = 0; +#ifndef OHOS_ARCH_LITE public: DECLARE_INTERFACE_DESCRIPTOR(u"ohos.wifi.IWifiDeviceService"); +#endif }; } // namespace Wifi } // namespace OHOS diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_device_callback.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_device_callback.h index 87e86c9..58ce9e2 100644 --- a/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_device_callback.h +++ b/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_device_callback.h @@ -16,17 +16,23 @@ #define OHOS_I_WIFI_DEVICE_CALLBACK_H #include +#ifndef OHOS_ARCH_LITE #include #include #include "message_parcel.h" #include "message_option.h" +#endif #include "wifi_msg.h" #include "define.h" namespace OHOS { namespace Wifi { +#ifdef OHOS_ARCH_LITE +class IWifiDeviceCallBack { +#else class IWifiDeviceCallBack : public IRemoteBroker { +#endif public: /** * @Description Deal wifi state change message @@ -65,8 +71,10 @@ public: */ virtual void OnStreamChanged(int direction) = 0; +#ifndef OHOS_ARCH_LITE public: DECLARE_INTERFACE_DESCRIPTOR(u"ohos.wifi.IWifiDeviceCallBack"); +#endif }; } // namespace Wifi } // namespace OHOS diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_scan.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_scan.h index 105b1f7..6cc16ec 100644 --- a/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_scan.h +++ b/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_scan.h @@ -16,20 +16,28 @@ #ifndef I_WIFI_SCAN_H #define I_WIFI_SCAN_H +#ifdef OHOS_ARCH_LITE +#include "iproxy_client.h" +#else #include #include -#include "wifi_errcode.h" #include "message_parcel.h" #include "message_option.h" +#endif #include "wifi_scan_msg.h" #include "wifi_errcode.h" #include "i_wifi_scan_callback.h" namespace OHOS { namespace Wifi { +#ifdef OHOS_ARCH_LITE +class IWifiScan { +public: +#else class IWifiScan : public IRemoteBroker { public: DECLARE_INTERFACE_DESCRIPTOR(u"ohos.wifi.IWifiScan"); +#endif virtual ~IWifiScan() {} @@ -72,7 +80,11 @@ public: */ virtual ErrCode GetScanInfoList(std::vector &result) = 0; +#ifdef OHOS_ARCH_LITE + virtual ErrCode RegisterCallBack(const std::shared_ptr &callback) = 0; +#else virtual ErrCode RegisterCallBack(const sptr &callback) = 0; +#endif /** * @Description Get supported features diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_scan_callback.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_scan_callback.h index 56051bc..a7f13e5 100644 --- a/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_scan_callback.h +++ b/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_scan_callback.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,22 +16,30 @@ #define OHOS_I_WIFI_SCAN_CALLBACK_H #include +#ifndef OHOS_ARCH_LITE #include #include #include "message_parcel.h" #include "message_option.h" +#endif #include "wifi_errcode.h" #include "wifi_msg.h" #include "define.h" namespace OHOS { namespace Wifi { +#ifdef OHOS_ARCH_LITE +class IWifiScanCallback { +#else class IWifiScanCallback : public IRemoteBroker { +#endif public: virtual void OnWifiScanStateChanged(int state) = 0; +#ifndef OHOS_ARCH_LITE public: DECLARE_INTERFACE_DESCRIPTOR(u"ohos.wifi.IWifiScanCallback"); +#endif }; } // namespace Wifi } // namespace OHOS diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_callback_stub_lite.cpp b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_callback_stub_lite.cpp new file mode 100644 index 0000000..14f6b7d --- /dev/null +++ b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_callback_stub_lite.cpp @@ -0,0 +1,213 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#include "wifi_device_callback_stub_lite.h" +#include "define.h" +#include "wifi_logger.h" +#include "wifi_msg.h" +#include "wifi_errcode.h" + +DEFINE_WIFILOG_LABEL("WifiDeviceCallBackStub"); +namespace OHOS { +namespace Wifi { +WifiDeviceCallBackStub::WifiDeviceCallBackStub() : callback_(nullptr), mRemoteDied(false) +{} + +WifiDeviceCallBackStub::~WifiDeviceCallBackStub() +{} + +int WifiDeviceCallBackStub::OnRemoteRequest(uint32_t code, IpcIo *data) +{ + WIFI_LOGD("OnRemoteRequest code:%{public}u!", code); + if (mRemoteDied || data == nullptr) { + WIFI_LOGD("Failed to %{public}s,mRemoteDied:%{public}d data:%{public}d!", + __func__, mRemoteDied, data == nullptr); + return -1; + } + + int exception = IpcIoPopInt32(data); + if (exception) { + WIFI_LOGE("WifiDeviceCallBackStub::OnRemoteRequest, got exception: %{public}d!", exception); + return WIFI_OPT_FAILED; + } + int ret = -1; + switch (code) { + case WIFI_CBK_CMD_STATE_CHANGE: { + ret = RemoteOnWifiStateChanged(code, data); + break; + } + case WIFI_CBK_CMD_CONNECTION_CHANGE: { + ret = RemoteOnWifiConnectionChanged(code, data); + break; + } + case WIFI_CBK_CMD_RSSI_CHANGE: { + ret = RemoteOnWifiRssiChanged(code, data); + break; + } + case WIFI_CBK_CMD_WPS_STATE_CHANGE: { + ret = RemoteOnWifiWpsStateChanged(code, data); + break; + } + case WIFI_CBK_CMD_STREAM_DIRECTION: { + ret = RemoteOnStreamChanged(code, data); + break; + } + default: { + ret = -1; + break; + } + } + return ret; +} + +void WifiDeviceCallBackStub::RegisterUserCallBack(const std::shared_ptr &callBack) +{ + if (callBack == nullptr) { + WIFI_LOGD("RegisterUserCallBack:callBack is nullptr!"); + return; + } + callback_ = callBack; +} + +bool WifiDeviceCallBackStub::IsRemoteDied() const +{ + return mRemoteDied; +} + +void WifiDeviceCallBackStub::SetRemoteDied(bool val) +{ + mRemoteDied = val; +} + +void WifiDeviceCallBackStub::OnWifiStateChanged(int state) +{ + WIFI_LOGD("WifiDeviceCallBackStub::OnWifiStateChanged"); + + if (callback_) { + callback_->OnWifiStateChanged(state); + } +} + +void WifiDeviceCallBackStub::OnWifiConnectionChanged(int state, const WifiLinkedInfo &info) +{ + WIFI_LOGD("WifiDeviceCallBackStub::OnWifiConnectionChanged"); + if (callback_) { + callback_->OnWifiConnectionChanged(state, info); + } +} + +void WifiDeviceCallBackStub::OnWifiRssiChanged(int rssi) +{ + WIFI_LOGD("WifiDeviceCallBackStub::OnWifiRssiChanged"); + if (callback_) { + callback_->OnWifiRssiChanged(rssi); + } +} + +void WifiDeviceCallBackStub::OnWifiWpsStateChanged(int state, const std::string &pinCode) +{ + WIFI_LOGD("WifiDeviceCallBackStub::OnWifiWpsStateChanged"); + if (callback_) { + callback_->OnWifiWpsStateChanged(state, pinCode); + } +} + +void WifiDeviceCallBackStub::OnStreamChanged(int direction) +{ + WIFI_LOGD("WifiDeviceCallBackStub::OnStreamChanged"); + if (callback_) { + callback_->OnStreamChanged(direction); + } +} + +int WifiDeviceCallBackStub::RemoteOnWifiStateChanged(uint32_t code, IpcIo *data) +{ + WIFI_LOGD("run %{public}s code %{public}u", __func__, code); + int state = IpcIoPopInt32(data); + OnWifiStateChanged(state); + return 0; +} + +int WifiDeviceCallBackStub::RemoteOnWifiConnectionChanged(uint32_t code, IpcIo *data) +{ + WIFI_LOGD("run %{public}s code %{public}u", __func__, code); + size_t readLen; + int state = IpcIoPopInt32(data); + WifiLinkedInfo info; + info.networkId = IpcIoPopInt32(data); + info.ssid = (char *)IpcIoPopString(data, &readLen); + info.bssid = (char *)IpcIoPopString(data, &readLen); + info.rssi = IpcIoPopInt32(data); + info.band = IpcIoPopInt32(data); + info.frequency = IpcIoPopInt32(data); + info.linkSpeed = IpcIoPopInt32(data); + info.macAddress = (char *)IpcIoPopString(data, &readLen); + info.ipAddress = IpcIoPopInt32(data); + int tmpConnState = IpcIoPopInt32(data); + if (tmpConnState >= 0 && tmpConnState <= int(ConnState::UNKNOWN)) { + info.connState = ConnState(tmpConnState); + } else { + info.connState = ConnState::UNKNOWN; + } + info.ifHiddenSSID = IpcIoPopBool(data); + info.rxLinkSpeed = IpcIoPopInt32(data); + info.txLinkSpeed = IpcIoPopInt32(data); + info.chload = IpcIoPopInt32(data); + info.snr = IpcIoPopInt32(data); + info.isDataRestricted = IpcIoPopInt32(data); + info.portalUrl = (char *)IpcIoPopString(data, &readLen); + int tmpState = IpcIoPopInt32(data); + if (tmpState >= 0 && tmpState <= int(SupplicantState::INVALID)) { + info.supplicantState = SupplicantState(tmpState); + } else { + info.supplicantState = SupplicantState::INVALID; + } + + int tmpDetailState = IpcIoPopInt32(data); + if (tmpDetailState >= 0 && tmpDetailState <= int(DetailedState::INVALID)) { + info.detailedState = DetailedState(tmpDetailState); + } else { + info.detailedState = DetailedState::INVALID; + } + OnWifiConnectionChanged(state, info); + return 0; +} + +int WifiDeviceCallBackStub::RemoteOnWifiRssiChanged(uint32_t code, IpcIo *data) +{ + WIFI_LOGD("run %{public}s code %{public}u", __func__, code); + int rssi = IpcIoPopInt32(data); + OnWifiRssiChanged(rssi); + return 0; +} + +int WifiDeviceCallBackStub::RemoteOnWifiWpsStateChanged(uint32_t code, IpcIo *data) +{ + WIFI_LOGD("run %{public}s code %{public}u", __func__, code); + size_t readLen; + int state = IpcIoPopInt32(data); + std::string pinCode = (char *)IpcIoPopString(data, &readLen); + OnWifiWpsStateChanged(state, pinCode); + return 0; +} + +int WifiDeviceCallBackStub::RemoteOnStreamChanged(uint32_t code, IpcIo *data) +{ + WIFI_LOGD("run %{public}s code %{public}u", __func__, code); + int direction = IpcIoPopInt32(data); + OnStreamChanged(direction); + return 0; +} +} // namespace Wifi +} // namespace OHOS diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_callback_stub_lite.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_callback_stub_lite.h new file mode 100644 index 0000000..fdb35b6 --- /dev/null +++ b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_callback_stub_lite.h @@ -0,0 +1,52 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#ifndef OHOS_WIFI_DEVICE_CALLBACK_STUB_LITE_H +#define OHOS_WIFI_DEVICE_CALLBACK_STUB_LITE_H + +#include "serializer.h" +#include "i_wifi_device_callback.h" + +namespace OHOS { +namespace Wifi { +class WifiDeviceCallBackStub : public IWifiDeviceCallBack { +public: + WifiDeviceCallBackStub(); + virtual ~WifiDeviceCallBackStub(); + + int OnRemoteRequest(uint32_t code, IpcIo *data); + + void OnWifiStateChanged(int state) override; + void OnWifiConnectionChanged(int state, const WifiLinkedInfo &info) override; + void OnWifiRssiChanged(int rssi) override; + void OnWifiWpsStateChanged(int state, const std::string &pinCode) override; + void OnStreamChanged(int direction) override; + void RegisterUserCallBack(const std::shared_ptr &callBack); + bool IsRemoteDied() const; + void SetRemoteDied(bool val); + +private: + int RemoteOnWifiStateChanged(uint32_t code, IpcIo *data); + int RemoteOnWifiConnectionChanged(uint32_t code, IpcIo *data); + int RemoteOnWifiRssiChanged(uint32_t code, IpcIo *data); + int RemoteOnWifiWpsStateChanged(uint32_t code, IpcIo *data); + int RemoteOnStreamChanged(uint32_t code, IpcIo *data); + + std::shared_ptr callback_; + + bool mRemoteDied; +}; +} // namespace Wifi +} // namespace OHOS +#endif diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_impl.cpp b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_impl.cpp index c361853..8585c5d 100644 --- a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_impl.cpp +++ b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_impl.cpp @@ -13,7 +13,9 @@ * limitations under the License. */ #include "wifi_device_impl.h" +#ifndef OHOS_ARCH_LITE #include "iservice_registry.h" +#endif #include "wifi_logger.h" DEFINE_WIFILOG_LABEL("WifiDeviceImpl"); @@ -28,14 +30,31 @@ namespace Wifi { } \ } while (0) -WifiDeviceImpl::WifiDeviceImpl(int systemAbilityId) : systemAbilityId_(systemAbilityId) +WifiDeviceImpl::WifiDeviceImpl(int systemAbilityId) : systemAbilityId_(systemAbilityId), client_(nullptr) {} WifiDeviceImpl::~WifiDeviceImpl() -{} +{ +#ifdef OHOS_ARCH_LITE + WifiDeviceProxy::ReleaseInstance(); +#endif +} bool WifiDeviceImpl::Init() { +#ifdef OHOS_ARCH_LITE + WifiDeviceProxy *deviceProxy = WifiDeviceProxy::GetInstance(); + if (deviceProxy == nullptr) { + WIFI_LOGE("get wifi device proxy failed."); + return false; + } + if (deviceProxy->Init() != WIFI_OPT_SUCCESS) { + WIFI_LOGE("wifi device proxy init failed."); + WifiDeviceProxy::ReleaseInstance(); + return false; + } + client_ = deviceProxy; +#else sptr sa_mgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); if (sa_mgr == nullptr) { WIFI_LOGE("failed to get SystemAbilityManager"); @@ -52,12 +71,11 @@ bool WifiDeviceImpl::Init() if (client_ == nullptr) { client_ = new (std::nothrow) WifiDeviceProxy(object); } - if (client_ == nullptr) { WIFI_LOGE("wifi device init failed. %{public}d", systemAbilityId_); return false; } - +#endif return true; } @@ -223,7 +241,11 @@ ErrCode WifiDeviceImpl::GetSignalLevel(const int &rssi, const int &band, int &le return client_->GetSignalLevel(rssi, band, level); } +#ifdef OHOS_ARCH_LITE +ErrCode WifiDeviceImpl::RegisterCallBack(const std::shared_ptr &callback) +#else ErrCode WifiDeviceImpl::RegisterCallBack(const sptr &callback) +#endif { RETURN_IF_FAIL(client_); return client_->RegisterCallBack(callback); diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_impl.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_impl.h index ea7533b..398d601 100644 --- a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_impl.h +++ b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_impl.h @@ -184,7 +184,11 @@ public: * @param callback - IWifiDeviceCallBack object * @return ErrCode - operation result */ +#ifdef OHOS_ARCH_LITE + ErrCode RegisterCallBack(const std::shared_ptr &callback) override; +#else ErrCode RegisterCallBack(const sptr &callback) override; +#endif /** * @Description Get the Signal Level object @@ -285,7 +289,11 @@ public: private: int systemAbilityId_; +#ifdef OHOS_ARCH_LITE + IWifiDevice *client_; +#else sptr client_; +#endif }; } // namespace Wifi } // namespace OHOS diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy.h index 5fadca4..bd0b9e5 100644 --- a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy.h +++ b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy.h @@ -15,16 +15,30 @@ #ifndef OHOS_WIFI_DEVICE_PROXY_H #define OHOS_WIFI_DEVICE_PROXY_H -#include "i_wifi_device.h" +#ifdef OHOS_ARCH_LITE +#include "iproxy_client.h" +#include "serializer.h" +#else #include "iremote_proxy.h" +#endif +#include "i_wifi_device.h" #include "wifi_errcode.h" #include "wifi_msg.h" namespace OHOS { namespace Wifi { +#ifdef OHOS_ARCH_LITE +class WifiDeviceProxy : public IWifiDevice { +public: + static WifiDeviceProxy *GetInstance(void); + static void ReleaseInstance(void); + explicit WifiDeviceProxy(); + ErrCode Init(void); +#else class WifiDeviceProxy : public IRemoteProxy, public IRemoteObject::DeathRecipient { public: explicit WifiDeviceProxy(const sptr &impl); +#endif ~WifiDeviceProxy(); /** @@ -238,7 +252,11 @@ public: * @param callback - IWifiDeviceCallBack object * @return ErrCode - operation result */ +#ifdef OHOS_ARCH_LITE + ErrCode RegisterCallBack(const std::shared_ptr &callback) override; +#else ErrCode RegisterCallBack(const sptr &callback) override; +#endif /** * @Description Get the Signal Level object @@ -274,6 +292,19 @@ public: */ bool SetLowLatencyMode(bool enabled) override; +#ifdef OHOS_ARCH_LITE + /** + * @Description Handle remote object died event. + */ + void OnRemoteDied(void); +private: + static WifiDeviceProxy *g_instance; + IClientProxy *remote_ = nullptr; + SvcIdentity svcIdentity_ = { 0 }; + bool remoteDied_; + void WriteIpAddress(IpcIo &req, const WifiIpAddress &address); + void WriteDeviceConfig(const WifiDeviceConfig &config, IpcIo &req); +#else /** * @Description Handle remote object died event. * @param remoteObject remote object. @@ -287,8 +318,8 @@ private: void WriteDeviceConfig(const WifiDeviceConfig &config, MessageParcel &data); void ParseDeviceConfigs(MessageParcel &reply, std::vector &result); static BrokerDelegator g_delegator; - bool mRemoteDied; +#endif }; } // namespace Wifi } // namespace OHOS diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy_lite.cpp b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy_lite.cpp new file mode 100644 index 0000000..c73bb92 --- /dev/null +++ b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy_lite.cpp @@ -0,0 +1,1226 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "wifi_device_proxy.h" +#include "define.h" +#include "liteipc_adapter.h" +#include "serializer.h" +#include "samgr_lite.h" +#include "wifi_ipc_lite_adapter.h" +#include "wifi_device_callback_stub_lite.h" +#include "wifi_logger.h" + +DEFINE_WIFILOG_LABEL("WifiDeviceProxyLite"); + +namespace OHOS { +namespace Wifi { +static WifiDeviceCallBackStub g_deviceCallBackStub; +static void ReadIpAddress(IpcIo *reply, WifiIpAddress &address) +{ + constexpr int MAX_SIZE = 256; + address.family = IpcIoPopInt32(reply); + address.addressIpv4 = IpcIoPopInt32(reply); + int size = IpcIoPopInt32(reply); + if (size > MAX_SIZE) { + WIFI_LOGE("Read IP address size error: %{public}d", size); + return; + } + for (int i = 0; i < size; i++) { + address.addressIpv6.push_back(IpcIoPopInt8(reply)); + } + return; +} + +static void ParseDeviceConfigs(IpcIo *reply, std::vector &result) +{ + size_t readLen; + constexpr int MAX_DEVICE_CONFIG_SIZE = 1024; + int retSize = IpcIoPopInt32(reply); + if (retSize > MAX_DEVICE_CONFIG_SIZE) { + WIFI_LOGE("Parse device config size error: %{public}d", retSize); + return; + } + for (int i = 0; i < retSize; ++i) { + WifiDeviceConfig config; + config.networkId = IpcIoPopInt32(reply); + config.status = IpcIoPopInt32(reply); + config.bssid = (char *)IpcIoPopString(reply, &readLen); + config.ssid = (char *)IpcIoPopString(reply, &readLen); + config.band = IpcIoPopInt32(reply); + config.channel = IpcIoPopInt32(reply); + config.frequency = IpcIoPopInt32(reply); + config.level = IpcIoPopInt32(reply); + config.isPasspoint = IpcIoPopBool(reply); + config.isEphemeral = IpcIoPopBool(reply); + config.preSharedKey = (char *)IpcIoPopString(reply, &readLen); + config.keyMgmt = (char *)IpcIoPopString(reply, &readLen); + for (int j = 0; j < WEPKEYS_SIZE; j++) { + config.wepKeys[j] = (char *)IpcIoPopString(reply, &readLen); + } + config.wepTxKeyIndex = IpcIoPopInt32(reply); + config.priority = IpcIoPopInt32(reply); + config.hiddenSSID = IpcIoPopBool(reply); + config.wifiIpConfig.assignMethod = AssignIpMethod(IpcIoPopInt32(reply)); + ReadIpAddress(reply, config.wifiIpConfig.staticIpAddress.ipAddress.address); + config.wifiIpConfig.staticIpAddress.ipAddress.prefixLength = IpcIoPopInt32(reply); + config.wifiIpConfig.staticIpAddress.ipAddress.flags = IpcIoPopInt32(reply); + config.wifiIpConfig.staticIpAddress.ipAddress.scope = IpcIoPopInt32(reply); + ReadIpAddress(reply, config.wifiIpConfig.staticIpAddress.gateway); + ReadIpAddress(reply, config.wifiIpConfig.staticIpAddress.dnsServer1); + ReadIpAddress(reply, config.wifiIpConfig.staticIpAddress.dnsServer2); + config.wifiIpConfig.staticIpAddress.domains = (char *)IpcIoPopString(reply, &readLen); + config.wifiEapConfig.eap = (char *)IpcIoPopString(reply, &readLen); + config.wifiEapConfig.identity = (char *)IpcIoPopString(reply, &readLen); + config.wifiEapConfig.password = (char *)IpcIoPopString(reply, &readLen); + config.wifiProxyconfig.configureMethod = ConfigureProxyMethod(IpcIoPopInt32(reply)); + config.wifiProxyconfig.autoProxyConfig.pacWebAddress = (char *)IpcIoPopString(reply, &readLen); + config.wifiProxyconfig.manualProxyConfig.serverHostName = (char *)IpcIoPopString(reply, &readLen); + config.wifiProxyconfig.manualProxyConfig.serverPort = IpcIoPopInt32(reply); + config.wifiProxyconfig.manualProxyConfig.exclusionObjectList = (char *)IpcIoPopString(reply, &readLen); + config.wifiPrivacySetting = WifiPrivacyConfig(IpcIoPopInt32(reply)); + + result.emplace_back(config); + } +} + +static void ReadLinkedInfo(IpcIo *reply, WifiLinkedInfo &info) +{ + size_t readLen; + info.networkId = IpcIoPopInt32(reply); + info.ssid = (char *)IpcIoPopString(reply, &readLen); + info.bssid = (char *)IpcIoPopString(reply, &readLen); + info.rssi = IpcIoPopInt32(reply); + info.band = IpcIoPopInt32(reply); + info.frequency = IpcIoPopInt32(reply); + info.linkSpeed = IpcIoPopInt32(reply); + info.macAddress = (char *)IpcIoPopString(reply, &readLen); + info.ipAddress = IpcIoPopInt32(reply); + int tmpConnState = IpcIoPopInt32(reply); + if ((tmpConnState >= 0) && (tmpConnState <= (int)ConnState::UNKNOWN)) { + info.connState = ConnState(tmpConnState); + } else { + info.connState = ConnState::UNKNOWN; + } + info.ifHiddenSSID = IpcIoPopBool(reply); + info.rxLinkSpeed = IpcIoPopInt32(reply); + info.txLinkSpeed = IpcIoPopInt32(reply); + info.chload = IpcIoPopInt32(reply); + info.snr = IpcIoPopInt32(reply); + info.isDataRestricted = IpcIoPopInt32(reply); + info.portalUrl = (char *)IpcIoPopString(reply, &readLen); + + int tmpState = IpcIoPopInt32(reply); + if ((tmpState >= 0) && (tmpState <= (int)SupplicantState::INVALID)) { + info.supplicantState = (SupplicantState)tmpState; + } else { + info.supplicantState = SupplicantState::INVALID; + } + + int tmpDetailState = IpcIoPopInt32(reply); + if ((tmpDetailState >= 0) && (tmpDetailState <= (int)DetailedState::INVALID)) { + info.detailedState = (DetailedState)tmpDetailState; + } else { + info.detailedState = DetailedState::INVALID; + } +} + +static void ReadDhcpInfo(IpcIo *reply, IpInfo &info) +{ + info.ipAddress = IpcIoPopInt32(reply); + info.gateway = IpcIoPopInt32(reply); + info.netmask = IpcIoPopInt32(reply); + info.primaryDns = IpcIoPopInt32(reply); + info.secondDns = IpcIoPopInt32(reply); + info.serverIp = IpcIoPopInt32(reply); + info.leaseDuration = IpcIoPopInt32(reply); +} + +static int IpcCallback(void *owner, int code, IpcIo *reply) +{ + if (code != 0 || owner == nullptr || reply == nullptr) { + WIFI_LOGE("Callback error, code:%{public}d, owner:%{public}d, reply:%{public}d", + code, owner == nullptr, reply == nullptr); + return LITEIPC_EINVAL; + } + + struct IpcOwner *data = (struct IpcOwner *)owner; + data->exception = IpcIoPopInt32(reply); + data->retCode = IpcIoPopInt32(reply); + if (data->exception != 0 || data->retCode != WIFI_OPT_SUCCESS) { + return LITEIPC_OK; + } + + switch (data->funcId) { + case WIFI_SVR_CMD_ADD_DEVICE_CONFIG: + case WIFI_SVR_CMD_UPDATE_DEVICE_CONFIG: + case WIFI_SVR_CMD_GET_WIFI_STATE: + case WIFI_SVR_CMD_GET_SIGNAL_LEVEL: { + *((int32_t *)data->variable) = IpcIoPopInt32(reply); + break; + } + case WIFI_SVR_CMD_IS_WIFI_CONNECTED: + case WIFI_SVR_CMD_IS_WIFI_ACTIVE: + case WIFI_SVR_CMD_SET_LOW_LATENCY_MODE: { + *((bool *)data->variable) = IpcIoPopBool(reply); + break; + } + case WIFI_SVR_CMD_GET_COUNTRY_CODE: + case WIFI_SVR_CMD_GET_DERVICE_MAC_ADD: { + size_t readLen = 0; + *((std::string *)data->variable) = (char *)IpcIoPopString(reply, &readLen); + break; + } + case WIFI_SVR_CMD_GET_SUPPORTED_FEATURES: { + *((int64_t *)data->variable) = IpcIoPopInt64(reply); + break; + } + case WIFI_SVR_CMD_GET_DEVICE_CONFIGS: { + ParseDeviceConfigs(reply, *((std::vector *)data->variable)); + break; + } + case WIFI_SVR_CMD_GET_LINKED_INFO: { + ReadLinkedInfo(reply, *((WifiLinkedInfo *)data->variable)); + break; + } + case WIFI_SVR_CMD_GET_DHCP_INFO: { + ReadDhcpInfo(reply, *((IpInfo *)data->variable)); + break; + } + default: + break; + } + + return LITEIPC_OK; +} + +static int AsyncCallback(const IpcContext *ipcContext, void *ipcMsg, IpcIo *data, void *arg) +{ + if (ipcMsg == nullptr || data == nullptr) { + WIFI_LOGE("AsyncCallback error, msg:%{public}d, data:%{public}d", + ipcMsg == nullptr, data == nullptr); + return LITEIPC_EINVAL; + } + + uint32_t code; + int codeRet = GetCode(ipcMsg, &code); + if (codeRet == LITEIPC_OK) { + return g_deviceCallBackStub.OnRemoteRequest(code, data); + } + return LITEIPC_EINVAL; +} + +static int OnRemoteSrvDied(const IpcContext *context, void *ipcMsg, IpcIo *data, void *arg) +{ + WIFI_LOGE("%{public}s called.", __func__); + WifiDeviceProxy *client = WifiDeviceProxy::GetInstance(); + if (client != nullptr) { + client->OnRemoteDied(); + } + return LITEIPC_OK; +} + +WifiDeviceProxy *WifiDeviceProxy::g_instance = nullptr; +WifiDeviceProxy::WifiDeviceProxy() : remoteDied_(false) +{} + +WifiDeviceProxy::~WifiDeviceProxy() +{} + +WifiDeviceProxy *WifiDeviceProxy::GetInstance(void) +{ + if (g_instance != nullptr) { + return g_instance; + } + + WifiDeviceProxy *tempInstance = new(std::nothrow) WifiDeviceProxy(); + g_instance = tempInstance; + return g_instance; +} + +void WifiDeviceProxy::ReleaseInstance(void) +{ + if (g_instance != nullptr) { + delete g_instance; + g_instance = nullptr; + } +} + +ErrCode WifiDeviceProxy::Init() +{ + IUnknown *iUnknown = SAMGR_GetInstance()->GetFeatureApi(WIFI_SERVICE_LITE, WIFI_FEATURE_DEVICE); + if (iUnknown == nullptr) { + WIFI_LOGE("GetFeatureApi failed."); + return WIFI_OPT_FAILED; + } + IClientProxy *proxy = nullptr; + int result = iUnknown->QueryInterface(iUnknown, CLIENT_PROXY_VER, reinterpret_cast(&proxy)); + if (result != 0) { + WIFI_LOGE("QueryInterface failed."); + return WIFI_OPT_FAILED; + } + remote_ = proxy; + + // Register SA Death Callback + uint32_t deadId = 0; + svcIdentity_ = SAMGR_GetRemoteIdentity(WIFI_SERVICE_LITE, WIFI_FEATURE_DEVICE); + result = RegisterDeathCallback(nullptr, svcIdentity_, OnRemoteSrvDied, nullptr, &deadId); + if (result != 0) { + WIFI_LOGE("Register SA Death Callback failed, errorCode[%d]", result); + } + return WIFI_OPT_SUCCESS; +} + +ErrCode WifiDeviceProxy::EnableWifi() +{ + if (remoteDied_ || remote_ == nullptr) { + WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + __func__, remoteDied_, remote_ == nullptr); + return WIFI_OPT_FAILED; + } + + IpcIo req; + char data[IPC_DATA_SIZE_SMALL]; + struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; + + IpcIoInit(&req, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); + IpcIoPushInt32(&req, 0); + owner.funcId = WIFI_SVR_CMD_ENABLE_WIFI; + int error = remote_->Invoke(remote_, WIFI_SVR_CMD_ENABLE_WIFI, &req, &owner, IpcCallback); + if (error != EC_SUCCESS) { + WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", WIFI_SVR_CMD_ENABLE_WIFI, error); + return WIFI_OPT_FAILED; + } + + if (owner.exception) { + return WIFI_OPT_FAILED; + } + return ErrCode(owner.retCode); +} + +ErrCode WifiDeviceProxy::DisableWifi() +{ + if (remoteDied_ || remote_ == nullptr) { + WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + __func__, remoteDied_, remote_ == nullptr); + return WIFI_OPT_FAILED; + } + + IpcIo req; + char data[IPC_DATA_SIZE_SMALL]; + struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; + + IpcIoInit(&req, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); + IpcIoPushInt32(&req, 0); + owner.funcId = WIFI_SVR_CMD_DISABLE_WIFI; + int error = remote_->Invoke(remote_, WIFI_SVR_CMD_DISABLE_WIFI, &req, &owner, IpcCallback); + if (error != EC_SUCCESS) { + WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", WIFI_SVR_CMD_DISABLE_WIFI, error); + return WIFI_OPT_FAILED; + } + + if (owner.exception) { + return WIFI_OPT_FAILED; + } + return ErrCode(owner.retCode); +} + +ErrCode WifiDeviceProxy::InitWifiProtect(const WifiProtectType &protectType, const std::string &protectName) +{ + if (remoteDied_ || remote_ == nullptr) { + WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + __func__, remoteDied_, remote_ == nullptr); + return WIFI_OPT_FAILED; + } + + IpcIo req; + char data[IPC_DATA_SIZE_SMALL]; + struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; + + IpcIoInit(&req, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); + IpcIoPushInt32(&req, 0); + IpcIoPushInt32(&req, (int)protectType); + IpcIoPushString(&req, protectName.c_str()); + owner.funcId = WIFI_SVR_CMD_INIT_WIFI_PROTECT; + int error = remote_->Invoke(remote_, WIFI_SVR_CMD_INIT_WIFI_PROTECT, &req, &owner, IpcCallback); + if (error != EC_SUCCESS) { + WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", WIFI_SVR_CMD_INIT_WIFI_PROTECT, error); + return ErrCode(error); + } + + if (owner.exception) { + return WIFI_OPT_FAILED; + } + return ErrCode(owner.retCode); +} + +ErrCode WifiDeviceProxy::GetWifiProtectRef(const WifiProtectMode &protectMode, const std::string &protectName) +{ + if (remoteDied_ || remote_ == nullptr) { + WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + __func__, remoteDied_, remote_ == nullptr); + return WIFI_OPT_FAILED; + } + + IpcIo req; + char data[IPC_DATA_SIZE_SMALL]; + struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; + + IpcIoInit(&req, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); + IpcIoPushInt32(&req, 0); + IpcIoPushInt32(&req, (int)protectMode); + IpcIoPushString(&req, protectName.c_str()); + owner.funcId = WIFI_SVR_CMD_GET_WIFI_PROTECT; + int error = remote_->Invoke(remote_, WIFI_SVR_CMD_GET_WIFI_PROTECT, &req, &owner, IpcCallback); + if (error != EC_SUCCESS) { + WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", WIFI_SVR_CMD_GET_WIFI_PROTECT, error); + return ErrCode(error); + } + + if (owner.exception) { + return WIFI_OPT_FAILED; + } + return ErrCode(owner.retCode); +} + +ErrCode WifiDeviceProxy::PutWifiProtectRef(const std::string &protectName) +{ + if (remoteDied_ || remote_ == nullptr) { + WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + __func__, remoteDied_, remote_ == nullptr); + return WIFI_OPT_FAILED; + } + + IpcIo req; + char data[IPC_DATA_SIZE_SMALL]; + struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; + + IpcIoInit(&req, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); + IpcIoPushInt32(&req, 0); + IpcIoPushString(&req, protectName.c_str()); + owner.funcId = WIFI_SVR_CMD_PUT_WIFI_PROTECT; + int error = remote_->Invoke(remote_, WIFI_SVR_CMD_PUT_WIFI_PROTECT, &req, &owner, IpcCallback); + if (error != EC_SUCCESS) { + WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", WIFI_SVR_CMD_PUT_WIFI_PROTECT, error); + return ErrCode(error); + } + + if (owner.exception) { + return WIFI_OPT_FAILED; + } + return ErrCode(owner.retCode); +} + +void WifiDeviceProxy::WriteIpAddress(IpcIo &req, const WifiIpAddress &address) +{ + IpcIoPushInt32(&req, address.family); + IpcIoPushInt32(&req, address.addressIpv4); + int size = address.addressIpv6.size(); + IpcIoPushInt32(&req, size); + for (int i = 0; i < size; i++) { + IpcIoPushInt8(&req, address.addressIpv6[i]); + } + return; +} + +void WifiDeviceProxy::WriteDeviceConfig(const WifiDeviceConfig &config, IpcIo &req) +{ + IpcIoPushInt32(&req, config.networkId); + IpcIoPushInt32(&req, config.status); + IpcIoPushString(&req, config.bssid.c_str()); + IpcIoPushString(&req, config.ssid.c_str()); + IpcIoPushInt32(&req, config.band); + IpcIoPushInt32(&req, config.channel); + IpcIoPushInt32(&req, config.frequency); + IpcIoPushInt32(&req, config.level); + IpcIoPushBool(&req, config.isPasspoint); + IpcIoPushBool(&req, config.isEphemeral); + IpcIoPushString(&req, config.preSharedKey.c_str()); + IpcIoPushString(&req, config.keyMgmt.c_str()); + for (int i = 0; i < WEPKEYS_SIZE; i++) { + IpcIoPushString(&req, config.wepKeys[i].c_str()); + } + IpcIoPushInt32(&req, config.wepTxKeyIndex); + IpcIoPushInt32(&req, config.priority); + IpcIoPushBool(&req, config.hiddenSSID); + IpcIoPushInt32(&req, (int)config.wifiIpConfig.assignMethod); + WriteIpAddress(req, config.wifiIpConfig.staticIpAddress.ipAddress.address); + IpcIoPushInt32(&req, config.wifiIpConfig.staticIpAddress.ipAddress.prefixLength); + IpcIoPushInt32(&req, config.wifiIpConfig.staticIpAddress.ipAddress.flags); + IpcIoPushInt32(&req, config.wifiIpConfig.staticIpAddress.ipAddress.scope); + WriteIpAddress(req, config.wifiIpConfig.staticIpAddress.gateway); + WriteIpAddress(req, config.wifiIpConfig.staticIpAddress.dnsServer1); + WriteIpAddress(req, config.wifiIpConfig.staticIpAddress.dnsServer2); + IpcIoPushString(&req, config.wifiIpConfig.staticIpAddress.domains.c_str()); + IpcIoPushString(&req, config.wifiEapConfig.eap.c_str()); + IpcIoPushString(&req, config.wifiEapConfig.identity.c_str()); + IpcIoPushString(&req, config.wifiEapConfig.password.c_str()); + IpcIoPushInt32(&req, (int)config.wifiProxyconfig.configureMethod); + IpcIoPushString(&req, config.wifiProxyconfig.autoProxyConfig.pacWebAddress.c_str()); + IpcIoPushString(&req, config.wifiProxyconfig.manualProxyConfig.serverHostName.c_str()); + IpcIoPushInt32(&req, config.wifiProxyconfig.manualProxyConfig.serverPort); + IpcIoPushString(&req, config.wifiProxyconfig.manualProxyConfig.exclusionObjectList.c_str()); + IpcIoPushInt32(&req, (int)config.wifiPrivacySetting); +} + +ErrCode WifiDeviceProxy::AddDeviceConfig(const WifiDeviceConfig &config, int &result) +{ + if (remoteDied_ || remote_ == nullptr) { + WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + __func__, remoteDied_, remote_ == nullptr); + return WIFI_OPT_FAILED; + } + + IpcIo req; + char data[IPC_DATA_SIZE_BIG]; + struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; + + IpcIoInit(&req, data, IPC_DATA_SIZE_BIG, MAX_IPC_OBJ_COUNT); + IpcIoPushInt32(&req, 0); + WriteDeviceConfig(config, req); + owner.variable = &result; + owner.funcId = WIFI_SVR_CMD_ADD_DEVICE_CONFIG; + int error = remote_->Invoke(remote_, WIFI_SVR_CMD_ADD_DEVICE_CONFIG, &req, &owner, IpcCallback); + if (error != EC_SUCCESS) { + WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", WIFI_SVR_CMD_ADD_DEVICE_CONFIG, error); + return WIFI_OPT_FAILED; + } + + if (owner.exception) { + return WIFI_OPT_FAILED; + } + return ErrCode(owner.retCode); +} + +ErrCode WifiDeviceProxy::UpdateDeviceConfig(const WifiDeviceConfig &config, int &result) +{ + if (remoteDied_ || remote_ == nullptr) { + WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + __func__, remoteDied_, remote_ == nullptr); + return WIFI_OPT_FAILED; + } + + IpcIo req; + char data[IPC_DATA_SIZE_BIG]; + struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; + + IpcIoInit(&req, data, IPC_DATA_SIZE_BIG, MAX_IPC_OBJ_COUNT); + IpcIoPushInt32(&req, 0); + WriteDeviceConfig(config, req); + owner.variable = &result; + owner.funcId = WIFI_SVR_CMD_UPDATE_DEVICE_CONFIG; + int error = remote_->Invoke(remote_, WIFI_SVR_CMD_UPDATE_DEVICE_CONFIG, &req, &owner, IpcCallback); + if (error != EC_SUCCESS) { + WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", WIFI_SVR_CMD_UPDATE_DEVICE_CONFIG, error); + return WIFI_OPT_FAILED; + } + + if (owner.exception) { + return WIFI_OPT_FAILED; + } + return ErrCode(owner.retCode); +} + +ErrCode WifiDeviceProxy::RemoveDevice(int networkId) +{ + if (remoteDied_ || remote_ == nullptr) { + WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + __func__, remoteDied_, remote_ == nullptr); + return WIFI_OPT_FAILED; + } + + IpcIo req; + char data[IPC_DATA_SIZE_SMALL]; + struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; + + IpcIoInit(&req, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); + IpcIoPushInt32(&req, 0); + IpcIoPushInt32(&req, networkId); + owner.funcId = WIFI_SVR_CMD_REMOVE_DEVICE_CONFIG; + int error = remote_->Invoke(remote_, WIFI_SVR_CMD_REMOVE_DEVICE_CONFIG, &req, &owner, IpcCallback); + if (error != EC_SUCCESS) { + WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", WIFI_SVR_CMD_REMOVE_DEVICE_CONFIG, error); + return WIFI_OPT_FAILED; + } + + if (owner.exception) { + return WIFI_OPT_FAILED; + } + return ErrCode(owner.retCode); +} + +ErrCode WifiDeviceProxy::RemoveAllDevice() +{ + if (remoteDied_ || remote_ == nullptr) { + WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + __func__, remoteDied_, remote_ == nullptr); + return WIFI_OPT_FAILED; + } + + IpcIo req; + char data[IPC_DATA_SIZE_SMALL]; + struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; + + IpcIoInit(&req, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); + IpcIoPushInt32(&req, 0); + owner.funcId = WIFI_SVR_CMD_REMOVE_ALL_DEVICE_CONFIG; + int error = remote_->Invoke(remote_, WIFI_SVR_CMD_REMOVE_ALL_DEVICE_CONFIG, &req, &owner, IpcCallback); + if (error != EC_SUCCESS) { + WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", WIFI_SVR_CMD_REMOVE_ALL_DEVICE_CONFIG, error); + return WIFI_OPT_FAILED; + } + + if (owner.exception) { + return WIFI_OPT_FAILED; + } + return ErrCode(owner.retCode); +} + +ErrCode WifiDeviceProxy::GetDeviceConfigs(std::vector &result) +{ + if (remoteDied_ || remote_ == nullptr) { + WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + __func__, remoteDied_, remote_ == nullptr); + return WIFI_OPT_FAILED; + } + + IpcIo req; + char data[IPC_DATA_SIZE_SMALL]; + struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; + + IpcIoInit(&req, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); + IpcIoPushInt32(&req, 0); + owner.variable = &result; + owner.funcId = WIFI_SVR_CMD_GET_DEVICE_CONFIGS; + int error = remote_->Invoke(remote_, WIFI_SVR_CMD_GET_DEVICE_CONFIGS, &req, &owner, IpcCallback); + if (error != EC_SUCCESS) { + WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", WIFI_SVR_CMD_GET_DEVICE_CONFIGS, error); + return WIFI_OPT_FAILED; + } + + if (owner.exception) { + return WIFI_OPT_FAILED; + } + + return ErrCode(owner.retCode); +} + +ErrCode WifiDeviceProxy::EnableDeviceConfig(int networkId, bool attemptEnable) +{ + if (remoteDied_ || remote_ == nullptr) { + WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + __func__, remoteDied_, remote_ == nullptr); + return WIFI_OPT_FAILED; + } + + IpcIo req; + char data[IPC_DATA_SIZE_SMALL]; + struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; + + IpcIoInit(&req, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); + IpcIoPushInt32(&req, 0); + IpcIoPushInt32(&req, networkId); + IpcIoPushInt32(&req, attemptEnable); + owner.funcId = WIFI_SVR_CMD_ENABLE_DEVICE; + int error = remote_->Invoke(remote_, WIFI_SVR_CMD_ENABLE_DEVICE, &req, &owner, IpcCallback); + if (error != EC_SUCCESS) { + WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", WIFI_SVR_CMD_ENABLE_DEVICE, error); + return WIFI_OPT_FAILED; + } + + if (owner.exception) { + return WIFI_OPT_FAILED; + } + return ErrCode(owner.retCode); +} + +ErrCode WifiDeviceProxy::DisableDeviceConfig(int networkId) +{ + if (remoteDied_ || remote_ == nullptr) { + WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + __func__, remoteDied_, remote_ == nullptr); + return WIFI_OPT_FAILED; + } + + IpcIo req; + char data[IPC_DATA_SIZE_SMALL]; + struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; + + IpcIoInit(&req, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); + IpcIoPushInt32(&req, 0); + IpcIoPushInt32(&req, networkId); + owner.funcId = WIFI_SVR_CMD_DISABLE_DEVICE; + int error = remote_->Invoke(remote_, WIFI_SVR_CMD_DISABLE_DEVICE, &req, &owner, IpcCallback); + if (error != EC_SUCCESS) { + WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", WIFI_SVR_CMD_DISABLE_DEVICE, error); + return WIFI_OPT_FAILED; + } + + if (owner.exception) { + return WIFI_OPT_FAILED; + } + return ErrCode(owner.retCode); +} + +ErrCode WifiDeviceProxy::ConnectToNetwork(int networkId) +{ + if (remoteDied_ || remote_ == nullptr) { + WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + __func__, remoteDied_, remote_ == nullptr); + return WIFI_OPT_FAILED; + } + + IpcIo req; + char data[IPC_DATA_SIZE_SMALL]; + struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; + + IpcIoInit(&req, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); + IpcIoPushInt32(&req, 0); + IpcIoPushInt32(&req, networkId); + owner.funcId = WIFI_SVR_CMD_CONNECT_TO; + int error = remote_->Invoke(remote_, WIFI_SVR_CMD_CONNECT_TO, &req, &owner, IpcCallback); + if (error != EC_SUCCESS) { + WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", WIFI_SVR_CMD_CONNECT_TO, error); + return WIFI_OPT_FAILED; + } + + if (owner.exception) { + return WIFI_OPT_FAILED; + } + return ErrCode(owner.retCode); +} + +ErrCode WifiDeviceProxy::ConnectToDevice(const WifiDeviceConfig &config) +{ + if (remoteDied_ || remote_ == nullptr) { + WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + __func__, remoteDied_, remote_ == nullptr); + return WIFI_OPT_FAILED; + } + + IpcIo req; + char data[IPC_DATA_SIZE_BIG]; + struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; + + IpcIoInit(&req, data, IPC_DATA_SIZE_BIG, MAX_IPC_OBJ_COUNT); + IpcIoPushInt32(&req, 0); + WriteDeviceConfig(config, req); + owner.funcId = WIFI_SVR_CMD_CONNECT2_TO; + int error = remote_->Invoke(remote_, WIFI_SVR_CMD_CONNECT2_TO, &req, &owner, IpcCallback); + if (error != EC_SUCCESS) { + WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", WIFI_SVR_CMD_CONNECT2_TO, error); + return WIFI_OPT_FAILED; + } + + if (owner.exception) { + return WIFI_OPT_FAILED; + } + return ErrCode(owner.retCode); +} + +bool WifiDeviceProxy::IsConnected() +{ + if (remoteDied_ || remote_ == nullptr) { + WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + __func__, remoteDied_, remote_ == nullptr); + return WIFI_OPT_FAILED; + } + + bool result = false; + IpcIo req; + char data[IPC_DATA_SIZE_SMALL]; + struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; + + IpcIoInit(&req, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); + IpcIoPushInt32(&req, 0); + owner.variable = &result; + owner.funcId = WIFI_SVR_CMD_IS_WIFI_CONNECTED; + int error = remote_->Invoke(remote_, WIFI_SVR_CMD_IS_WIFI_CONNECTED, &req, &owner, IpcCallback); + if (error != EC_SUCCESS) { + WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", WIFI_SVR_CMD_IS_WIFI_CONNECTED, error); + return WIFI_OPT_FAILED; + } + + if (owner.exception) { + return false; + } + return result; +} + +ErrCode WifiDeviceProxy::ReConnect() +{ + if (remoteDied_ || remote_ == nullptr) { + WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + __func__, remoteDied_, remote_ == nullptr); + return WIFI_OPT_FAILED; + } + + IpcIo req; + char data[IPC_DATA_SIZE_SMALL]; + struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; + + IpcIoInit(&req, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); + IpcIoPushInt32(&req, 0); + owner.funcId = WIFI_SVR_CMD_RECONNECT; + int error = remote_->Invoke(remote_, WIFI_SVR_CMD_RECONNECT, &req, &owner, IpcCallback); + if (error != EC_SUCCESS) { + WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", WIFI_SVR_CMD_RECONNECT, error); + return WIFI_OPT_FAILED; + } + + if (owner.exception) { + return WIFI_OPT_FAILED; + } + return ErrCode(owner.retCode); +} + +ErrCode WifiDeviceProxy::ReAssociate(void) +{ + if (remoteDied_ || remote_ == nullptr) { + WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + __func__, remoteDied_, remote_ == nullptr); + return WIFI_OPT_FAILED; + } + + IpcIo req; + char data[IPC_DATA_SIZE_SMALL]; + struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; + + IpcIoInit(&req, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); + IpcIoPushInt32(&req, 0); + owner.funcId = WIFI_SVR_CMD_REASSOCIATE; + int error = remote_->Invoke(remote_, WIFI_SVR_CMD_REASSOCIATE, &req, &owner, IpcCallback); + if (error != EC_SUCCESS) { + WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", WIFI_SVR_CMD_REASSOCIATE, error); + return WIFI_OPT_FAILED; + } + + if (owner.exception) { + return WIFI_OPT_FAILED; + } + return ErrCode(owner.retCode); +} + +ErrCode WifiDeviceProxy::Disconnect(void) +{ + if (remoteDied_ || remote_ == nullptr) { + WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + __func__, remoteDied_, remote_ == nullptr); + return WIFI_OPT_FAILED; + } + + IpcIo req; + char data[IPC_DATA_SIZE_SMALL]; + struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; + + IpcIoInit(&req, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); + IpcIoPushInt32(&req, 0); + owner.funcId = WIFI_SVR_CMD_DISCONNECT; + int error = remote_->Invoke(remote_, WIFI_SVR_CMD_DISCONNECT, &req, &owner, IpcCallback); + if (error != EC_SUCCESS) { + WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", WIFI_SVR_CMD_DISCONNECT, error); + return WIFI_OPT_FAILED; + } + + if (owner.exception) { + return WIFI_OPT_FAILED; + } + return ErrCode(owner.retCode); +} + +ErrCode WifiDeviceProxy::StartWps(const WpsConfig &config) +{ + if (remoteDied_ || remote_ == nullptr) { + WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + __func__, remoteDied_, remote_ == nullptr); + return WIFI_OPT_FAILED; + } + + IpcIo req; + char data[IPC_DATA_SIZE_SMALL]; + struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; + + IpcIoInit(&req, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); + IpcIoPushInt32(&req, 0); + IpcIoPushInt32(&req, static_cast(config.setup)); + IpcIoPushString(&req, config.pin.c_str()); + IpcIoPushString(&req, config.bssid.c_str()); + owner.funcId = WIFI_SVR_CMD_START_WPS; + int error = remote_->Invoke(remote_, WIFI_SVR_CMD_START_WPS, &req, &owner, IpcCallback); + if (error != EC_SUCCESS) { + WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", WIFI_SVR_CMD_START_WPS, error); + return WIFI_OPT_FAILED; + } + + if (owner.exception) { + return WIFI_OPT_FAILED; + } + return ErrCode(owner.retCode); +} + +ErrCode WifiDeviceProxy::CancelWps(void) +{ + if (remoteDied_ || remote_ == nullptr) { + WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + __func__, remoteDied_, remote_ == nullptr); + return WIFI_OPT_FAILED; + } + + IpcIo req; + char data[IPC_DATA_SIZE_SMALL]; + struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; + + IpcIoInit(&req, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); + IpcIoPushInt32(&req, 0); + owner.funcId = WIFI_SVR_CMD_CANCEL_WPS; + int error = remote_->Invoke(remote_, WIFI_SVR_CMD_CANCEL_WPS, &req, &owner, IpcCallback); + if (error != EC_SUCCESS) { + WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", WIFI_SVR_CMD_CANCEL_WPS, error); + return WIFI_OPT_FAILED; + } + + if (owner.exception) { + return WIFI_OPT_FAILED; + } + return ErrCode(owner.retCode); +} + +ErrCode WifiDeviceProxy::IsWifiActive(bool &bActive) +{ + if (remoteDied_ || remote_ == nullptr) { + WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + __func__, remoteDied_, remote_ == nullptr); + return WIFI_OPT_FAILED; + } + + IpcIo req; + char data[IPC_DATA_SIZE_SMALL]; + struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; + + IpcIoInit(&req, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); + IpcIoPushInt32(&req, 0); + owner.variable = &bActive; + owner.funcId = WIFI_SVR_CMD_IS_WIFI_ACTIVE; + int error = remote_->Invoke(remote_, WIFI_SVR_CMD_IS_WIFI_ACTIVE, &req, &owner, IpcCallback); + if (error != EC_SUCCESS) { + WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", WIFI_SVR_CMD_IS_WIFI_ACTIVE, error); + return WIFI_OPT_FAILED; + } + + if (owner.exception) { + return WIFI_OPT_FAILED; + } + return ErrCode(owner.retCode); +} + +ErrCode WifiDeviceProxy::GetWifiState(int &state) +{ + if (remoteDied_ || remote_ == nullptr) { + WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + __func__, remoteDied_, remote_ == nullptr); + return WIFI_OPT_FAILED; + } + + IpcIo req; + char data[IPC_DATA_SIZE_SMALL]; + struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; + + IpcIoInit(&req, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); + IpcIoPushInt32(&req, 0); + owner.variable = &state; + owner.funcId = WIFI_SVR_CMD_GET_WIFI_STATE; + int error = remote_->Invoke(remote_, WIFI_SVR_CMD_GET_WIFI_STATE, &req, &owner, IpcCallback); + if (error != EC_SUCCESS) { + WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", WIFI_SVR_CMD_GET_WIFI_STATE, error); + return WIFI_OPT_FAILED; + } + + if (owner.exception) { + return WIFI_OPT_FAILED; + } + return ErrCode(owner.retCode); +} + +ErrCode WifiDeviceProxy::GetLinkedInfo(WifiLinkedInfo &info) +{ + if (remoteDied_ || remote_ == nullptr) { + WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + __func__, remoteDied_, remote_ == nullptr); + return WIFI_OPT_FAILED; + } + + IpcIo req; + char data[IPC_DATA_SIZE_SMALL]; + struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; + + IpcIoInit(&req, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); + IpcIoPushInt32(&req, 0); + owner.variable = &info; + owner.funcId = WIFI_SVR_CMD_GET_LINKED_INFO; + int error = remote_->Invoke(remote_, WIFI_SVR_CMD_GET_LINKED_INFO, &req, &owner, IpcCallback); + if (error != EC_SUCCESS) { + WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", WIFI_SVR_CMD_GET_LINKED_INFO, error); + return WIFI_OPT_FAILED; + } + + if (owner.exception) { + return WIFI_OPT_FAILED; + } + return ErrCode(owner.retCode); +} + +ErrCode WifiDeviceProxy::GetIpInfo(IpInfo &info) +{ + if (remoteDied_ || remote_ == nullptr) { + WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + __func__, remoteDied_, remote_ == nullptr); + return WIFI_OPT_FAILED; + } + + IpcIo req; + char data[IPC_DATA_SIZE_SMALL]; + struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; + + IpcIoInit(&req, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); + IpcIoPushInt32(&req, 0); + owner.variable = &info; + owner.funcId = WIFI_SVR_CMD_GET_DHCP_INFO; + int error = remote_->Invoke(remote_, WIFI_SVR_CMD_GET_DHCP_INFO, &req, &owner, IpcCallback); + if (error != EC_SUCCESS) { + WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", WIFI_SVR_CMD_GET_DHCP_INFO, error); + return WIFI_OPT_FAILED; + } + + if (owner.exception) { + return WIFI_OPT_FAILED; + } + return ErrCode(owner.retCode); +} + +ErrCode WifiDeviceProxy::SetCountryCode(const std::string &countryCode) +{ + if (remoteDied_ || remote_ == nullptr) { + WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + __func__, remoteDied_, remote_ == nullptr); + return WIFI_OPT_FAILED; + } + + IpcIo req; + char data[IPC_DATA_SIZE_SMALL]; + struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; + + IpcIoInit(&req, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); + IpcIoPushInt32(&req, 0); + IpcIoPushString(&req, countryCode.c_str()); + owner.funcId = WIFI_SVR_CMD_SET_COUNTRY_CODE; + int error = remote_->Invoke(remote_, WIFI_SVR_CMD_SET_COUNTRY_CODE, &req, &owner, IpcCallback); + if (error != EC_SUCCESS) { + WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", WIFI_SVR_CMD_SET_COUNTRY_CODE, error); + return WIFI_OPT_FAILED; + } + + if (owner.exception) { + return WIFI_OPT_FAILED; + } + return ErrCode(owner.retCode); +} + +ErrCode WifiDeviceProxy::GetCountryCode(std::string &countryCode) +{ + if (remoteDied_ || remote_ == nullptr) { + WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + __func__, remoteDied_, remote_ == nullptr); + return WIFI_OPT_FAILED; + } + + IpcIo req; + char data[IPC_DATA_SIZE_SMALL]; + struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; + + IpcIoInit(&req, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); + IpcIoPushInt32(&req, 0); + owner.variable = &countryCode; + owner.funcId = WIFI_SVR_CMD_GET_COUNTRY_CODE; + int error = remote_->Invoke(remote_, WIFI_SVR_CMD_GET_COUNTRY_CODE, &req, &owner, IpcCallback); + if (error != EC_SUCCESS) { + WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", WIFI_SVR_CMD_GET_COUNTRY_CODE, error); + return WIFI_OPT_FAILED; + } + + if (owner.exception) { + return WIFI_OPT_FAILED; + } + return ErrCode(owner.retCode); +} + +ErrCode WifiDeviceProxy::RegisterCallBack(const std::shared_ptr &callback) +{ + if (remoteDied_ || remote_ == nullptr) { + WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + __func__, remoteDied_, remote_ == nullptr); + return WIFI_OPT_FAILED; + } + WIFI_LOGD("RegisterCallBack start!"); + int ret = RegisterIpcCallback(AsyncCallback, ONCE, IPC_WAIT_FOREVER, &svcIdentity_, nullptr); + if (ret != 0) { + WIFI_LOGE("[WifiScanProxy] RegisterIpcCallback failed"); + return WIFI_OPT_FAILED; + } + + IpcIo req; + char data[IPC_DATA_SIZE_SMALL]; + struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; + + IpcIoInit(&req, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); + IpcIoPushInt32(&req, 0); + IpcIoPushSvc(&req, &svcIdentity_); + + owner.funcId = WIFI_SVR_CMD_REGISTER_CALLBACK_CLIENT; + int error = remote_->Invoke(remote_, WIFI_SVR_CMD_REGISTER_CALLBACK_CLIENT, &req, &owner, IpcCallback); + if (error != EC_SUCCESS) { + WIFI_LOGE("Set Attr(%{public}d) failed, code is %{public}d", WIFI_SVR_CMD_REGISTER_CALLBACK_CLIENT, error); + return WIFI_OPT_FAILED; + } + + if (owner.exception) { + return WIFI_OPT_FAILED; + } + g_deviceCallBackStub.RegisterUserCallBack(callback); + return ErrCode(owner.retCode); +} + +ErrCode WifiDeviceProxy::GetSignalLevel(const int &rssi, const int &band, int &level) +{ + if (remoteDied_ || remote_ == nullptr) { + WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + __func__, remoteDied_, remote_ == nullptr); + return WIFI_OPT_FAILED; + } + + IpcIo req; + char data[IPC_DATA_SIZE_SMALL]; + struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; + + IpcIoInit(&req, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); + IpcIoPushInt32(&req, 0); + IpcIoPushInt32(&req, rssi); + IpcIoPushInt32(&req, band); + owner.variable = &level; + owner.funcId = WIFI_SVR_CMD_GET_SIGNAL_LEVEL; + int error = remote_->Invoke(remote_, WIFI_SVR_CMD_GET_SIGNAL_LEVEL, &req, &owner, IpcCallback); + if (error != EC_SUCCESS) { + WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", WIFI_SVR_CMD_GET_SIGNAL_LEVEL, error); + return WIFI_OPT_FAILED; + } + + if (owner.exception) { + return WIFI_OPT_FAILED; + } + return ErrCode(owner.retCode); +} + +ErrCode WifiDeviceProxy::GetSupportedFeatures(long &features) +{ + if (remoteDied_ || remote_ == nullptr) { + WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + __func__, remoteDied_, remote_ == nullptr); + return WIFI_OPT_FAILED; + } + + IpcIo req; + char data[IPC_DATA_SIZE_SMALL]; + struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; + + IpcIoInit(&req, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); + IpcIoPushInt32(&req, 0); + owner.variable = &features; + owner.funcId = WIFI_SVR_CMD_GET_SUPPORTED_FEATURES; + int error = remote_->Invoke(remote_, WIFI_SVR_CMD_GET_SUPPORTED_FEATURES, &req, &owner, IpcCallback); + if (error != EC_SUCCESS) { + WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", WIFI_SVR_CMD_GET_SUPPORTED_FEATURES, error); + return WIFI_OPT_FAILED; + } + + if (owner.exception) { + return WIFI_OPT_FAILED; + } + return ErrCode(owner.retCode); +} + +ErrCode WifiDeviceProxy::GetDeviceMacAddress(std::string &result) +{ + if (remoteDied_ || remote_ == nullptr) { + WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + __func__, remoteDied_, remote_ == nullptr); + return WIFI_OPT_FAILED; + } + + IpcIo req; + char data[IPC_DATA_SIZE_SMALL]; + struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; + + IpcIoInit(&req, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); + IpcIoPushInt32(&req, 0); + owner.variable = &result; + owner.funcId = WIFI_SVR_CMD_GET_DERVICE_MAC_ADD; + int error = remote_->Invoke(remote_, WIFI_SVR_CMD_GET_DERVICE_MAC_ADD, &req, &owner, IpcCallback); + if (error != EC_SUCCESS) { + WIFI_LOGE("Set Attr(%{public}d) failed", WIFI_SVR_CMD_GET_DERVICE_MAC_ADD); + return WIFI_OPT_FAILED; + } + + if (owner.exception) { + return WIFI_OPT_FAILED; + } + return ErrCode(owner.retCode); +} + +bool WifiDeviceProxy::SetLowLatencyMode(bool enabled) +{ + if (remoteDied_ || remote_ == nullptr) { + WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + __func__, remoteDied_, remote_ == nullptr); + return WIFI_OPT_FAILED; + } + + bool result = false; + IpcIo req; + char data[IPC_DATA_SIZE_SMALL]; + struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; + + IpcIoInit(&req, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); + IpcIoPushInt32(&req, 0); + IpcIoPushBool(&req, enabled); + owner.variable = &result; + owner.funcId = WIFI_SVR_CMD_SET_LOW_LATENCY_MODE; + int error = remote_->Invoke(remote_, WIFI_SVR_CMD_SET_LOW_LATENCY_MODE, &req, &owner, IpcCallback); + if (error != EC_SUCCESS) { + WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", WIFI_SVR_CMD_SET_LOW_LATENCY_MODE, error); + return WIFI_OPT_FAILED; + } + + if (owner.exception) { + return WIFI_OPT_FAILED; + } + return result; +} + +void WifiDeviceProxy::OnRemoteDied(void) +{ + WIFI_LOGD("Remote service is died!"); + remoteDied_ = true; + g_deviceCallBackStub.SetRemoteDied(true); +} +} // namespace Wifi +} // namespace OHOS \ No newline at end of file diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_logger.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_logger.h index d2f3995..8ff810e 100644 --- a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_logger.h +++ b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_logger.h @@ -16,8 +16,12 @@ #ifndef OHOS_WIFI_LOGGER_H #define OHOS_WIFI_LOGGER_H +#ifdef OHOS_ARCH_LITE +#include "hilog/log.h" +#else #include "hilog/log_c.h" #include "hilog/log_cpp.h" +#endif namespace OHOS { namespace Wifi { diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan.cpp b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan.cpp index c733d22..24f59b2 100644 --- a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan.cpp +++ b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan.cpp @@ -13,7 +13,9 @@ * limitations under the License. */ #include "wifi_scan.h" +#ifndef OHOS_ARCH_LITE #include "iremote_broker.h" +#endif #include "wifi_logger.h" #include "wifi_scan_impl.h" diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_callback_stub.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_callback_stub.h index c9a51dc..fc50709 100644 --- a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_callback_stub.h +++ b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_callback_stub.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -15,26 +15,46 @@ #ifndef OHOS_I_WIFI_SCAN_CALLBACK_STUB_H #define OHOS_I_WIFI_SCAN_CALLBACK_STUB_H +#ifdef OHOS_ARCH_LITE +#include "serializer.h" +#else #include "iremote_stub.h" +#endif #include "i_wifi_scan_callback.h" namespace OHOS { namespace Wifi { +#ifdef OHOS_ARCH_LITE +class WifiScanCallbackStub : public IWifiScanCallback { +#else class WifiScanCallbackStub : public IRemoteStub { +#endif public: WifiScanCallbackStub(); virtual ~WifiScanCallbackStub(); - +#ifdef OHOS_ARCH_LITE + int OnRemoteRequest(uint32_t code, IpcIo *data); +#else virtual int OnRemoteRequest( uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) override; +#endif void OnWifiScanStateChanged(int state) override; +#ifdef OHOS_ARCH_LITE + void RegisterCallBack(const std::shared_ptr &userCallback); +#else void RegisterCallBack(const sptr &userCallback); +#endif bool IsRemoteDied() const; void SetRemoteDied(bool val); private: +#ifdef OHOS_ARCH_LITE + int RemoteOnWifiScanStateChanged(uint32_t code, IpcIo *data); + std::shared_ptr userCallback_; +#else int RemoteOnWifiScanStateChanged(uint32_t code, MessageParcel &data, MessageParcel &reply); sptr userCallback_; +#endif bool mRemoteDied; }; diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_callback_stub_lite.cpp b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_callback_stub_lite.cpp new file mode 100644 index 0000000..6e5f739 --- /dev/null +++ b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_callback_stub_lite.cpp @@ -0,0 +1,95 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "wifi_scan_callback_stub.h" +#include "define.h" +#include "wifi_errcode.h" +#include "wifi_logger.h" +#include "wifi_msg.h" + +DEFINE_WIFILOG_SCAN_LABEL("WifiScanCallbackStubLite"); +namespace OHOS { +namespace Wifi { +WifiScanCallbackStub::WifiScanCallbackStub() : userCallback_(nullptr), mRemoteDied(false) +{} + +WifiScanCallbackStub::~WifiScanCallbackStub() +{} + +int WifiScanCallbackStub::OnRemoteRequest(uint32_t code, IpcIo *data) +{ + WIFI_LOGD("OnRemoteRequest code:%{public}u!", code); + if (mRemoteDied || data == nullptr) { + WIFI_LOGD("Failed to %{public}s,mRemoteDied:%{public}d data:%{public}d!", + __func__, mRemoteDied, data == nullptr); + return -1; + } + + int exception = IpcIoPopInt32(data); + if (exception) { + WIFI_LOGD("OnRemoteRequest exception! %{public}d!", exception); + return WIFI_OPT_FAILED; + } + int ret; + switch (code) { + case WIFI_CBK_CMD_SCAN_STATE_CHANGE: { + WIFI_LOGD("OnRemoteRequest code:%{public}u", code); + ret = RemoteOnWifiScanStateChanged(code, data); + break; + } + default: { + ret = -1; + } + } + return ret; +} + +void WifiScanCallbackStub::RegisterCallBack(const std::shared_ptr &userCallback) +{ + if (userCallback_ != nullptr) { + WIFI_LOGD("Callback has registered!"); + return; + } + userCallback_ = userCallback; +} + +bool WifiScanCallbackStub::IsRemoteDied() const +{ + return mRemoteDied; +} + +void WifiScanCallbackStub::SetRemoteDied(bool val) +{ + mRemoteDied = val; +} + +void WifiScanCallbackStub::OnWifiScanStateChanged(int state) +{ + WIFI_LOGD("OnWifiScanStateChanged,state:%{public}d", state); + + if (userCallback_) { + userCallback_->OnWifiScanStateChanged(state); + } +} + +int WifiScanCallbackStub::RemoteOnWifiScanStateChanged(uint32_t code, IpcIo *data) +{ + WIFI_LOGD("run %{public}s code %{public}u", __func__, code); + int stateCode = IpcIoPopInt32(data); + OnWifiScanStateChanged(stateCode); + return 0; +} +} // namespace Wifi +} // namespace OHOS diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_impl.cpp b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_impl.cpp index 9b25955..4300855 100644 --- a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_impl.cpp +++ b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_impl.cpp @@ -15,7 +15,9 @@ #include "wifi_scan_impl.h" #include "i_wifi_scan.h" +#ifndef OHOS_ARCH_LITE #include "iservice_registry.h" +#endif #include "wifi_logger.h" #include "wifi_scan_proxy.h" @@ -35,10 +37,27 @@ WifiScanImpl::WifiScanImpl(int systemAbilityId) : systemAbilityId_(systemAbility {} WifiScanImpl::~WifiScanImpl() -{} +{ +#ifdef OHOS_ARCH_LITE + WifiScanProxy::ReleaseInstance(); +#endif +} bool WifiScanImpl::Init() { +#ifdef OHOS_ARCH_LITE + WifiScanProxy *scanProxy = WifiScanProxy::GetInstance(); + if (scanProxy == nullptr) { + WIFI_LOGE("get wifi scan proxy failed."); + return false; + } + if (scanProxy->Init() != WIFI_OPT_SUCCESS) { + WIFI_LOGE("wifi scan proxy init failed."); + WifiScanProxy::ReleaseInstance(); + return false; + } + client_ = scanProxy; +#else sptr sa_mgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); if (sa_mgr == nullptr) { WIFI_LOGE("failed to get SystemAbilityManager"); @@ -57,6 +76,7 @@ bool WifiScanImpl::Init() WIFI_LOGE("wifi scan init failed. %{public}d", systemAbilityId_); return false; } +#endif return true; } @@ -90,7 +110,11 @@ ErrCode WifiScanImpl::GetScanInfoList(std::vector &result) return client_->GetScanInfoList(result); } +#ifdef OHOS_ARCH_LITE +ErrCode WifiScanImpl::RegisterCallBack(const std::shared_ptr &callback) +#else ErrCode WifiScanImpl::RegisterCallBack(const sptr &callback) +#endif { RETURN_IF_FAIL(client_); return client_->RegisterCallBack(callback); diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_impl.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_impl.h index 349613b..fcfbac7 100644 --- a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_impl.h +++ b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_impl.h @@ -50,7 +50,11 @@ public: */ virtual ErrCode GetScanInfoList(std::vector &result) override; +#ifdef OHOS_ARCH_LITE + virtual ErrCode RegisterCallBack(const std::shared_ptr &callback) override; +#else virtual ErrCode RegisterCallBack(const sptr &callback) override; +#endif /** * @Description Get supported features @@ -87,7 +91,11 @@ public: private: int systemAbilityId_; +#ifdef OHOS_ARCH_LITE + IWifiScan *client_; +#else sptr client_; +#endif }; } // namespace Wifi } // namespace OHOS diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_proxy.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_proxy.h index a582b50..8d3d206 100644 --- a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_proxy.h +++ b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_proxy.h @@ -16,16 +16,28 @@ #ifndef WIFI_SCAN_PROXY #define WIFI_SCAN_PROXY +#ifdef OHOS_ARCH_LITE +#include "iproxy_client.h" +#else #include +#endif #include "i_wifi_scan.h" #include "wifi_errcode.h" #include "wifi_scan_msg.h" namespace OHOS { namespace Wifi { +#ifdef OHOS_ARCH_LITE +class WifiScanProxy : public IWifiScan { +public:static WifiScanProxy *GetInstance(void); + static void ReleaseInstance(void); + explicit WifiScanProxy(void); + ErrCode Init(void); +#else class WifiScanProxy : public IRemoteProxy, public IRemoteObject::DeathRecipient { public: explicit WifiScanProxy(const sptr &remote); +#endif virtual ~WifiScanProxy(); /** @@ -67,7 +79,11 @@ public: */ virtual ErrCode GetScanInfoList(std::vector &result) override; +#ifdef OHOS_ARCH_LITE + virtual ErrCode RegisterCallBack(const std::shared_ptr &callback) override; +#else virtual ErrCode RegisterCallBack(const sptr &callback) override; +#endif /** * @Description Get supported features @@ -77,10 +93,19 @@ public: */ ErrCode GetSupportedFeatures(long &features) override; +#ifdef OHOS_ARCH_LITE + void OnRemoteDied(void); +private: + static WifiScanProxy *g_instance; + IClientProxy *remote_ = nullptr; + SvcIdentity svcIdentity_ = { 0 }; + bool remoteDied_; +#else void OnRemoteDied(const wptr& remoteObject) override; private: static BrokerDelegator g_delegator; bool mRemoteDied; +#endif }; } // namespace Wifi } // namespace OHOS diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_proxy_lite.cpp b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_proxy_lite.cpp new file mode 100644 index 0000000..098a87d --- /dev/null +++ b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_proxy_lite.cpp @@ -0,0 +1,420 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "wifi_scan_proxy.h" +#include "define.h" +#include "liteipc_adapter.h" +#include "serializer.h" +#include "samgr_lite.h" +#include "wifi_ipc_lite_adapter.h" +#include "wifi_logger.h" +#include "wifi_scan_callback_stub.h" + +DEFINE_WIFILOG_SCAN_LABEL("WifiScanProxyLite"); +namespace OHOS { +namespace Wifi { +static WifiScanCallbackStub g_wifiScanCallbackStub; + +static ErrCode ParseScanInfos(IpcIo *reply, std::vector &infos) +{ + constexpr int MAX_SIZE = 4096; + int tmpsize = IpcIoPopInt32(reply); + if (tmpsize > MAX_SIZE) { + WIFI_LOGE("Scan info size exceeds maximum allowed size: %{public}d", tmpsize); + return WIFI_OPT_FAILED; + } + + unsigned int readLen; + for (int i = 0; i < tmpsize; ++i) { + WifiScanInfo info; + info.bssid = (char *)IpcIoPopString(reply, &readLen); + info.ssid = (char *)IpcIoPopString(reply, &readLen); + info.capabilities = (char *)IpcIoPopString(reply, &readLen); + info.frequency = IpcIoPopInt32(reply); + info.rssi = IpcIoPopInt32(reply); + info.timestamp = IpcIoPopInt64(reply); + info.band = IpcIoPopInt32(reply); + info.securityType = static_cast(IpcIoPopInt32(reply)); + info.channelWidth = static_cast(IpcIoPopInt32(reply)); + info.centerFrequency0 = IpcIoPopInt32(reply); + info.centerFrequency1 = IpcIoPopInt32(reply); + info.features = IpcIoPopInt64(reply); + + constexpr int IE_SIZE_MAX = 256; + int ieSize = IpcIoPopInt32(reply); + if (ieSize > IE_SIZE_MAX) { + WIFI_LOGE("ie size error: %{public}d", ieSize); + return WIFI_OPT_FAILED; + } + for (int m = 0; m < ieSize; ++m) { + WifiInfoElem tempWifiInfoElem; + tempWifiInfoElem.id = IpcIoPopInt32(reply); + int contentSize = IpcIoPopInt32(reply); + for (int n = 0; n < contentSize; n++) { + char tempChar = static_cast(IpcIoPopInt8(reply)); + tempWifiInfoElem.content.emplace_back(tempChar); + } + info.infoElems.emplace_back(tempWifiInfoElem); + } + infos.emplace_back(info); + } + return WIFI_OPT_SUCCESS; +} + +static int IpcCallback(void *owner, int code, IpcIo *reply) +{ + if (code != 0 || owner == nullptr || reply == nullptr) { + WIFI_LOGE("Callback error, code:%{public}d, owner:%{public}d, reply:%{public}d", + code, owner == nullptr, reply == nullptr); + return LITEIPC_EINVAL; + } + + struct IpcOwner *data = (struct IpcOwner *)owner; + data->exception = IpcIoPopInt32(reply); + data->retCode = IpcIoPopInt32(reply); + if (data->exception != 0 || data->retCode != WIFI_OPT_SUCCESS) { + return LITEIPC_OK; + } + + switch (data->funcId) { + case WIFI_SVR_CMD_IS_SCAN_ALWAYS_ACTIVE: { + *((bool *)data->variable) = IpcIoPopBool(reply); + break; + } + case WIFI_SVR_CMD_GET_SUPPORTED_FEATURES: { + *((int64_t *)data->variable) = IpcIoPopInt64(reply); + break; + } + case WIFI_SVR_CMD_GET_SCAN_INFO_LIST: { + data->retCode = ParseScanInfos(reply, *((std::vector *)data->variable)); + break; + } + default: + break; + } + return LITEIPC_OK; +} + +static int AsyncCallback(const IpcContext *ipcContext, void *ipcMsg, IpcIo *data, void *arg) +{ + if (ipcMsg == nullptr || data == nullptr) { + WIFI_LOGE("AsyncCallback error, msg:%{public}d, data:%{public}d", + ipcMsg == nullptr, data == nullptr); + return LITEIPC_EINVAL; + } + + uint32_t code; + int codeRet = GetCode(ipcMsg, &code); + if (codeRet == LITEIPC_OK) { + return g_wifiScanCallbackStub.OnRemoteRequest(code, data); + } + return LITEIPC_EINVAL; +} + +static int OnRemoteSrvDied(const IpcContext *context, void *ipcMsg, IpcIo *data, void *arg) +{ + WIFI_LOGE("%{public}s called.", __func__); + WifiScanProxy *client = WifiScanProxy::GetInstance(); + if (client != nullptr) { + client->OnRemoteDied(); + } + return LITEIPC_OK; +} + +WifiScanProxy *WifiScanProxy::g_instance = nullptr; +WifiScanProxy::WifiScanProxy() : remote_(nullptr), remoteDied_(false) +{} + +WifiScanProxy::~WifiScanProxy() +{} + +WifiScanProxy *WifiScanProxy::GetInstance(void) +{ + if (g_instance != nullptr) { + return g_instance; + } + + WifiScanProxy *tempInstance = new(std::nothrow) WifiScanProxy(); + g_instance = tempInstance; + return g_instance; +} + +void WifiScanProxy::ReleaseInstance(void) +{ + if (g_instance != nullptr) { + delete g_instance; + g_instance = nullptr; + } +} + +ErrCode WifiScanProxy::Init(void) +{ + IUnknown *iUnknown = SAMGR_GetInstance()->GetFeatureApi(WIFI_SERVICE_LITE, WIFI_FEATRUE_SCAN); + if (iUnknown == nullptr) { + WIFI_LOGE("GetFeatureApi failed."); + return WIFI_OPT_FAILED; + } + IClientProxy *proxy = nullptr; + int result = iUnknown->QueryInterface(iUnknown, CLIENT_PROXY_VER, reinterpret_cast(&proxy)); + if (result != 0) { + WIFI_LOGE("QueryInterface failed."); + return WIFI_OPT_FAILED; + } + remote_ = proxy; + + // Register SA Death Callback + uint32_t deadId = 0; + svcIdentity_ = SAMGR_GetRemoteIdentity(WIFI_SERVICE_LITE, WIFI_FEATRUE_SCAN); + result = RegisterDeathCallback(nullptr, svcIdentity_, OnRemoteSrvDied, nullptr, &deadId); + if (result != 0) { + WIFI_LOGE("Register SA Death Callback failed, errorCode[%d]", result); + } + return WIFI_OPT_SUCCESS; +} + +ErrCode WifiScanProxy::SetScanControlInfo(const ScanControlInfo &info) +{ + if (remoteDied_ || remote_ == nullptr) { + WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + __func__, remoteDied_, remote_ == nullptr); + return WIFI_OPT_FAILED; + } + + IpcIo request; + char data[IPC_DATA_SIZE_BIG]; + struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; + + IpcIoInit(&request, data, IPC_DATA_SIZE_BIG, MAX_IPC_OBJ_COUNT); + IpcIoPushInt32(&request, 0); + IpcIoPushInt32(&request, info.scanForbidList.size()); + for (auto iter = info.scanForbidList.begin(); iter != info.scanForbidList.end(); iter++) { + IpcIoPushInt32(&request, iter->scanScene); + IpcIoPushInt32(&request, static_cast(iter->scanMode)); + IpcIoPushInt32(&request, iter->forbidTime); + IpcIoPushInt32(&request, iter->forbidCount); + } + + IpcIoPushInt32(&request, info.scanIntervalList.size()); + for (auto iter2 = info.scanIntervalList.begin(); iter2 != info.scanIntervalList.end(); iter2++) { + IpcIoPushInt32(&request, iter2->scanScene); + IpcIoPushInt32(&request, static_cast(iter2->scanMode)); + IpcIoPushBool(&request, iter2->isSingle); + IpcIoPushInt32(&request, static_cast(iter2->intervalMode)); + IpcIoPushInt32(&request, iter2->interval); + IpcIoPushInt32(&request, iter2->count); + } + + owner.funcId = WIFI_SVR_CMD_SET_SCAN_CONTROL_INFO; + int error = remote_->Invoke(remote_, WIFI_SVR_CMD_SET_SCAN_CONTROL_INFO, &request, &owner, IpcCallback); + if (error != EC_SUCCESS) { + WIFI_LOGW("Set Attr(%{public}d) failed", WIFI_SVR_CMD_SET_SCAN_CONTROL_INFO); + return WIFI_OPT_FAILED; + } + + if (owner.exception) { + return WIFI_OPT_FAILED; + } + return ErrCode(owner.retCode); +} + +ErrCode WifiScanProxy::Scan() +{ + if (remoteDied_ || remote_ == nullptr) { + WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + __func__, remoteDied_, remote_ == nullptr); + return WIFI_OPT_FAILED; + } + + IpcIo request; + char data[IPC_DATA_SIZE_SMALL]; + struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; + + IpcIoInit(&request, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); + IpcIoPushInt32(&request, 0); + + owner.funcId = WIFI_SVR_CMD_FULL_SCAN; + int error = remote_->Invoke(remote_, WIFI_SVR_CMD_FULL_SCAN, &request, &owner, IpcCallback); + if (error != EC_SUCCESS) { + WIFI_LOGW("Set Attr(%{public}d) failed", WIFI_SVR_CMD_FULL_SCAN); + return WIFI_OPT_FAILED; + } + + if (owner.exception) { + return WIFI_OPT_FAILED; + } + return ErrCode(owner.retCode); +} + +ErrCode WifiScanProxy::AdvanceScan(const WifiScanParams ¶ms) +{ + if (remoteDied_ || remote_ == nullptr) { + WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + __func__, remoteDied_, remote_ == nullptr); + return WIFI_OPT_FAILED; + } + + IpcIo request; + char data[IPC_DATA_SIZE_MID]; + struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; + + IpcIoInit(&request, data, IPC_DATA_SIZE_MID, MAX_IPC_OBJ_COUNT); + IpcIoPushInt32(&request, 0); + IpcIoPushString(&request, params.ssid.c_str()); + IpcIoPushString(&request, params.bssid.c_str()); + IpcIoPushInt32(&request, params.freqs.size()); + for (std::size_t i = 0; i < params.freqs.size(); i++) { + IpcIoPushInt32(&request, params.freqs[i]); + } + IpcIoPushInt32(&request, params.band); + + owner.funcId = WIFI_SVR_CMD_SPECIFIED_PARAMS_SCAN; + int error = remote_->Invoke(remote_, WIFI_SVR_CMD_SPECIFIED_PARAMS_SCAN, &request, &owner, IpcCallback); + if (error != EC_SUCCESS) { + WIFI_LOGW("Set Attr(%{public}d) failed", WIFI_SVR_CMD_SPECIFIED_PARAMS_SCAN); + return WIFI_OPT_FAILED; + } + + if (owner.exception) { + return WIFI_OPT_FAILED; + } + + return ErrCode(owner.retCode); +} + +ErrCode WifiScanProxy::IsWifiClosedScan(bool &bOpen) +{ + if (remoteDied_ || remote_ == nullptr) { + WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + __func__, remoteDied_, remote_ == nullptr); + return WIFI_OPT_FAILED; + } + + IpcIo request; + char data[IPC_DATA_SIZE_SMALL]; + struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; + + IpcIoInit(&request, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); + IpcIoPushInt32(&request, 0); + owner.variable = &bOpen; + owner.funcId = WIFI_SVR_CMD_IS_SCAN_ALWAYS_ACTIVE; + int error = remote_->Invoke(remote_, WIFI_SVR_CMD_IS_SCAN_ALWAYS_ACTIVE, &request, &owner, IpcCallback); + if (error != EC_SUCCESS) { + WIFI_LOGW("Set Attr(%{public}d) failed", WIFI_SVR_CMD_IS_SCAN_ALWAYS_ACTIVE); + return WIFI_OPT_FAILED; + } + + if (owner.exception) { + return WIFI_OPT_FAILED; + } + return ErrCode(owner.retCode); +} + +ErrCode WifiScanProxy::GetScanInfoList(std::vector &result) +{ + if (remoteDied_ || remote_ == nullptr) { + WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + __func__, remoteDied_, remote_ == nullptr); + return WIFI_OPT_FAILED; + } + + IpcIo request; + char data[IPC_DATA_SIZE_SMALL]; + struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; + + IpcIoInit(&request, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); + IpcIoPushInt32(&request, 0); + owner.variable = &result; + owner.funcId = WIFI_SVR_CMD_GET_SCAN_INFO_LIST; + int error = remote_->Invoke(remote_, WIFI_SVR_CMD_GET_SCAN_INFO_LIST, &request, &owner, IpcCallback); + if (error != EC_SUCCESS) { + WIFI_LOGW("Set Attr(%{public}d) failed", WIFI_SVR_CMD_GET_SCAN_INFO_LIST); + return WIFI_OPT_FAILED; + } + + if (owner.exception) { + return WIFI_OPT_FAILED; + } + return ErrCode(owner.retCode); +} + +ErrCode WifiScanProxy::RegisterCallBack(const std::shared_ptr &callback) +{ + if (remoteDied_ || remote_ == nullptr) { + WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + __func__, remoteDied_, remote_ == nullptr); + return WIFI_OPT_FAILED; + } + WIFI_LOGD("RegisterCallBack start!"); + int ret = RegisterIpcCallback(AsyncCallback, ONCE, IPC_WAIT_FOREVER, &svcIdentity_, nullptr); + if (ret != 0) { + WIFI_LOGE("[WifiScanProxy] RegisterIpcCallback failed"); + return WIFI_OPT_FAILED; + } + IpcIo request; + char data[IPC_DATA_SIZE_SMALL]; + struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; + + IpcIoInit(&request, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); + IpcIoPushInt32(&request, 0); + IpcIoPushSvc(&request, &svcIdentity_); + + owner.funcId = WIFI_SVR_CMD_REGISTER_SCAN_CALLBACK; + int error = remote_->Invoke(remote_, WIFI_SVR_CMD_REGISTER_SCAN_CALLBACK, &request, &owner, IpcCallback); + if (error != EC_SUCCESS) { + WIFI_LOGE("RegisterCallBack failed, error code is %{public}d", error); + return WIFI_OPT_FAILED; + } + g_wifiScanCallbackStub.RegisterCallBack(callback); + ret = owner.exception; + WIFI_LOGD("RegisterCallBack is finished: result=%{public}d", ret); + return WIFI_OPT_SUCCESS; +} + +ErrCode WifiScanProxy::GetSupportedFeatures(long &features) +{ + if (remoteDied_ || remote_ == nullptr) { + WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + __func__, remoteDied_, remote_ == nullptr); + return WIFI_OPT_FAILED; + } + + IpcIo request; + char data[IPC_DATA_SIZE_SMALL]; + struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; + + IpcIoInit(&request, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); + IpcIoPushInt32(&request, 0); + owner.variable = &features; + owner.funcId = WIFI_SVR_CMD_GET_SUPPORTED_FEATURES; + int error = remote_->Invoke(remote_, WIFI_SVR_CMD_GET_SUPPORTED_FEATURES, &request, &owner, IpcCallback); + if (error != EC_SUCCESS) { + WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", WIFI_SVR_CMD_GET_SUPPORTED_FEATURES, error); + return ErrCode(error); + } + + if (owner.exception) { + return WIFI_OPT_FAILED; + } + return ErrCode(owner.retCode); +} + +void WifiScanProxy::OnRemoteDied(void) +{ + WIFI_LOGD("Remote service is died!"); + remoteDied_ = true; + g_wifiScanCallbackStub.SetRemoteDied(true); +} +} // namespace Wifi +} // namespace OHOS \ No newline at end of file diff --git a/wifi/services/wifi_standard/wifi_framework/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/BUILD.gn index 64cb67a..13ad499 100644 --- a/wifi/services/wifi_standard/wifi_framework/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/BUILD.gn @@ -11,26 +11,39 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//build/ohos.gni") -import("//foundation/communication/wifi/wifi/wifi.gni") +if (defined(ohos_lite)) { + import("//build/lite/config/component/lite_component.gni") + import("//foundation/communication/wifi/wifi/wifi_lite.gni") +} else { + import("//build/ohos.gni") + import("//foundation/communication/wifi/wifi/wifi.gni") +} group("wifi_system_ability") { - deps = [ - "$WIFI_ROOT_DIR/services/wifi_standard/sa_profile:wifi_standard_sa_profile", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_device_ability", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_hotspot_ability", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_p2p_ability", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_scan_ability", - ] + if (defined(ohos_lite)) { + deps = [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_service_base" ] + } else { + deps = [ + "$WIFI_ROOT_DIR/services/wifi_standard/sa_profile:wifi_standard_sa_profile", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_device_ability", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_hotspot_ability", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_p2p_ability", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_scan_ability", + ] + } } group("wifi_manage") { deps = [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap:wifi_ap_service", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p:wifi_p2p_service", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan:wifi_scan_service", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta:wifi_sta_service", ] + if (!defined(ohos_lite)) { + deps += [ + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap:wifi_ap_service", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p:wifi_p2p_service", + ] + } } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn index 9468904..0877e4e 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn @@ -11,266 +11,405 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//build/ohos.gni") -import("//build/ohos/sa_profile/sa_profile.gni") -import("//build/ohos_var.gni") -import("//foundation/communication/wifi/wifi/wifi.gni") +if (defined(ohos_lite)) { + import("//build/lite/config/component/lite_component.gni") + import("//foundation/communication/wifi/wifi/wifi_lite.gni") +} else { + import("//build/ohos.gni") + import("//build/ohos/sa_profile/sa_profile.gni") + import("//build/ohos_var.gni") + import("//foundation/communication/wifi/wifi/wifi.gni") +} ################################################################################ -config("wifi_manager_service_header") { - include_dirs = [ - "//utils/native/base/include", - "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", - "//foundation/arkui/ace_engine/frameworks/base/utils", - "//foundation/arkui/ace_engine/frameworks", - "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk/", - "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces", - "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p", - "$DHCP_ROOT_DIR/services/mgr_service/include", - "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/include", - "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/interfaces", - "$WIFI_ROOT_DIR/utils/inc", - "//foundation/appexecfwk/adapter/interfaces/innerkits/appexecfwk_base/include", - "//foundation/aafwk/standard/interfaces/innerkits/base/include", - "//base/security/access_token/interfaces/innerkits/accesstoken/include", - "//foundation/communication/netmanager_base/services/netmanagernative/include/netsys", - ] -} +if (defined(ohos_lite)) { + shared_library("wifi_service_base") { + sources = [ + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log/log_helper.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/base_address.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/network_interface.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils/wifi_common_event_helper.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_helper.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_utils.cpp", + "wifi_auth_center.cpp", + "wifi_config_center.cpp", + "wifi_device_callback_proxy_lite.cpp", + "wifi_device_service_impl.cpp", + "wifi_device_stub_lite.cpp", + "wifi_dumper.cpp", + "wifi_internal_event_dispatcher_lite.cpp", + "wifi_manager.cpp", + "wifi_protect.cpp", + "wifi_protect_manager.cpp", + "wifi_scan_callback_proxy_lite.cpp", + "wifi_scan_service_impl.cpp", + "wifi_scan_stub_lite.cpp", + "wifi_service_manager.cpp", + ] -config("wifi_manager_service_config") { - visibility = [ "//:*" ] - include_dirs = [ ":wifi_fw_common_header" ] + include_dirs = [ + "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/include", + "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces", + "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan", + "$DHCP_ROOT_DIR/services/mgr_service/include", + "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/include", + "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/interfaces", + "$WIFI_ROOT_DIR/utils/inc", + "//base/hiviewdfx/hilog_lite/interfaces/native/innerkits", + "//foundation/communication/ipc_lite/interfaces/kits", + "//foundation/distributedschedule/samgr_lite/interfaces/innerkits/registry", + "//foundation/distributedschedule/samgr_lite/interfaces/innerkits/samgr", + "//third_party/bounds_checking_function/include", + "//utils/native/lite/include", + ] - cflags = [ - "-std=c++17", - "-fno-rtti", - ] - if (target_cpu == "arm") { - cflags += [ "-DBINDER_IPC_32BIT" ] + deps = [ + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", + "$WIFI_ROOT_DIR/utils/src:wifi_utils", + "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", + "//foundation/communication/ipc_lite:liteipc_adapter", + "//foundation/distributedschedule/samgr_lite/samgr:samgr", + "//third_party/bounds_checking_function:libsec_shared", + ] + + defines = [ "OHOS_ARCH_LITE" ] + cflags_cc = [ + "-std=c++17", + "-fno-rtti", + ] } - if (product_name == "rk3568") { - defines = [ "PRODUCT_RK" ] + executable("wifi_manager_service") { + sources = [ + "wifi_device_feature_lite.cpp", + "wifi_sa_service_lite.c", + "wifi_scan_feature_lite.cpp", + "wifi_service_main_lite.c", + ] + + include_dirs = [ + "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/include", + "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces", + "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan", + "$DHCP_ROOT_DIR/services/mgr_service/include", + "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/include", + "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/interfaces", + "$WIFI_ROOT_DIR/utils/inc", + "//base/hiviewdfx/hilog_lite/interfaces/native/innerkits", + "//foundation/communication/ipc_lite/interfaces/kits", + "//foundation/distributedschedule/samgr_lite/interfaces/innerkits/registry", + "//foundation/distributedschedule/samgr_lite/interfaces/innerkits/samgr", + "//third_party/bounds_checking_function/include", + "//utils/native/lite/include", + ] + + deps = [ + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_service_base", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", + "$WIFI_ROOT_DIR/utils/src:wifi_utils", + "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", + "//foundation/communication/ipc_lite:liteipc_adapter", + "//foundation/distributedschedule/samgr_lite/samgr:samgr", + "//third_party/bounds_checking_function:libsec_shared", + ] + + defines = [ "OHOS_ARCH_LITE" ] + cflags_cc = [ + "-std=c++17", + "-fno-rtti", + ] + } +} else { + config("wifi_manager_service_header") { + include_dirs = [ + "//utils/native/base/include", + "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", + "//foundation/arkui/ace_engine/frameworks/base/utils", + "//foundation/arkui/ace_engine/frameworks", + "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk/", + "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces", + "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p", + "$DHCP_ROOT_DIR/services/mgr_service/include", + "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/include", + "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/interfaces", + "$WIFI_ROOT_DIR/utils/inc", + "//foundation/appexecfwk/adapter/interfaces/innerkits/appexecfwk_base/include", + "//foundation/aafwk/standard/interfaces/innerkits/base/include", + "//base/security/access_token/interfaces/innerkits/accesstoken/include", + "//foundation/communication/netmanager_base/services/netmanagernative/include/netsys", + ] } -} -ohos_source_set("wifi_scan_service_impl") { - part_name = "wifi" - sources = [ - "wifi_scan_callback_proxy.cpp", - "wifi_scan_death_recipient.cpp", - "wifi_scan_service_impl.cpp", - "wifi_scan_stub.cpp", - ] - configs = [ - ":wifi_manager_service_config", - ":wifi_manager_service_header", - ] + config("wifi_manager_service_config") { + visibility = [ "//:*" ] + include_dirs = [ ":wifi_fw_common_header" ] - external_deps = [ - "ability_base:want", - "bundle_framework:appexecfwk_base", - "eventhandler:libeventhandler", - "ipc:ipc_core", - ] -} -ohos_source_set("wifi_device_service_impl") { - part_name = "wifi" - sources = [ - "wifi_device_callback_proxy.cpp", - "wifi_device_death_recipient.cpp", - "wifi_device_service_impl.cpp", - "wifi_device_stub.cpp", - "wifi_protect.cpp", - "wifi_protect_manager.cpp", - ] - configs = [ - ":wifi_manager_service_config", - ":wifi_manager_service_header", - ] + cflags = [ + "-std=c++17", + "-fno-rtti", + ] + if (target_cpu == "arm") { + cflags += [ "-DBINDER_IPC_32BIT" ] + } - if (wifi_feature_with_p2p) { - defines = [ "WIFI_SUPPORT_P2P" ] + if (product_name == "rk3568") { + defines = [ "PRODUCT_RK" ] + } } - deps = [ ":wifi_p2p_service_impl" ] - external_deps = [ - "ability_base:want", - "bundle_framework:appexecfwk_base", - "eventhandler:libeventhandler", - "ipc:ipc_core", - ] -} -ohos_source_set("wifi_hotspot_service_impl") { - part_name = "wifi" - sources = [ - "wifi_hotspot_callback_proxy.cpp", - "wifi_hotspot_death_recipient.cpp", - "wifi_hotspot_service_impl.cpp", - "wifi_hotspot_stub.cpp", - ] - configs = [ - ":wifi_manager_service_config", - ":wifi_manager_service_header", - ] + ohos_source_set("wifi_scan_service_impl") { + part_name = "wifi" + sources = [ + "wifi_scan_callback_proxy.cpp", + "wifi_scan_death_recipient.cpp", + "wifi_scan_service_impl.cpp", + "wifi_scan_stub.cpp", + ] + configs = [ + ":wifi_manager_service_config", + ":wifi_manager_service_header", + ] - external_deps = [ - "ability_base:want", - "bundle_framework:appexecfwk_base", - "eventhandler:libeventhandler", - "ipc:ipc_core", - ] -} -ohos_source_set("wifi_p2p_service_impl") { - part_name = "wifi" - sources = [ - "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hid2d_msg.cpp", - "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_msg.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp", - "wifi_hid2d_cfg.cpp", - "wifi_hid2d_service_utils.cpp", - "wifi_p2p_callback_proxy.cpp", - "wifi_p2p_death_recipient.cpp", - "wifi_p2p_service_impl.cpp", - "wifi_p2p_stub.cpp", - ] - configs = [ - ":wifi_manager_service_config", - ":wifi_manager_service_header", - ] + external_deps = [ + "ability_base:want", + "bundle_framework:appexecfwk_base", + "eventhandler:libeventhandler", + "ipc:ipc_core", + ] + } + ohos_source_set("wifi_device_service_impl") { + part_name = "wifi" + sources = [ + "wifi_device_callback_proxy.cpp", + "wifi_device_death_recipient.cpp", + "wifi_device_service_impl.cpp", + "wifi_device_stub.cpp", + "wifi_protect.cpp", + "wifi_protect_manager.cpp", + ] + configs = [ + ":wifi_manager_service_config", + ":wifi_manager_service_header", + ] - deps = [ "//foundation/communication/netmanager_base/services/netmanagernative:netsys_native_manager" ] + if (wifi_feature_with_p2p) { + defines = [ "FEATURE_P2P_SUPPORT" ] + } - external_deps = [ - "ability_base:want", - "bundle_framework:appexecfwk_base", - "eventhandler:libeventhandler", - "ipc:ipc_core", - "netmanager_base:net_conn_manager_if", - ] -} -ohos_shared_library("wifi_manager_service") { - install_enable = true - sources = [ - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log/log_helper.c", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/base_address.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/network_interface.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils/wifi_common_event_helper.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_helper.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_utils.cpp", - "wifi_auth_center.cpp", - "wifi_config_center.cpp", - "wifi_dumper.cpp", - "wifi_internal_event_dispatcher.cpp", - "wifi_manager.cpp", - "wifi_net_agent.cpp", - "wifi_service_manager.cpp", - ] + deps = [ ":wifi_p2p_service_impl" ] + external_deps = [ + "ability_base:want", + "bundle_framework:appexecfwk_base", + "eventhandler:libeventhandler", + "ipc:ipc_core", + ] + } + ohos_source_set("wifi_hotspot_service_impl") { + part_name = "wifi" + sources = [ + "wifi_hotspot_callback_proxy.cpp", + "wifi_hotspot_death_recipient.cpp", + "wifi_hotspot_service_impl.cpp", + "wifi_hotspot_stub.cpp", + ] + configs = [ + ":wifi_manager_service_config", + ":wifi_manager_service_header", + ] - deps = [ - "$WIFI_ROOT_DIR/services/wifi_standard/etc/init:etc", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", - "$WIFI_ROOT_DIR/utils/src:wifi_utils", - "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//foundation/communication/netmanager_base/services/netmanagernative:netsys_native_manager", - "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", - "//utils/native/base:utils", - ] + external_deps = [ + "ability_base:want", + "bundle_framework:appexecfwk_base", + "eventhandler:libeventhandler", + "ipc:ipc_core", + ] + defines = [ "FEATURE_AP_SUPPORT" ] + } + ohos_source_set("wifi_p2p_service_impl") { + part_name = "wifi" + sources = [ + "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hid2d_msg.cpp", + "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_msg.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp", + "wifi_hid2d_cfg.cpp", + "wifi_hid2d_service_utils.cpp", + "wifi_p2p_callback_proxy.cpp", + "wifi_p2p_death_recipient.cpp", + "wifi_p2p_service_impl.cpp", + "wifi_p2p_stub.cpp", + ] + configs = [ + ":wifi_manager_service_config", + ":wifi_manager_service_header", + ] - configs = [ ":wifi_manager_service_header" ] + deps = [ "//foundation/communication/netmanager_base/services/netmanagernative:netsys_native_manager" ] - external_deps = [ - "ability_base:want", - "access_token:libaccesstoken_sdk", - "bundle_framework:appexecfwk_base", - "common_event_service:cesfwk_innerkits", - "eventhandler:libeventhandler", - "ipc:ipc_core", - "netmanager_base:net_conn_manager_if", - ] + external_deps = [ + "ability_base:want", + "bundle_framework:appexecfwk_base", + "eventhandler:libeventhandler", + "ipc:ipc_core", + "netmanager_base:net_conn_manager_if", + ] + defines = [ "FEATURE_P2P_SUPPORT" ] + } + ohos_shared_library("wifi_manager_service") { + install_enable = true + sources = [ + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log/log_helper.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/base_address.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/network_interface.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils/wifi_common_event_helper.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_helper.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_utils.cpp", + "wifi_auth_center.cpp", + "wifi_config_center.cpp", + "wifi_dumper.cpp", + "wifi_internal_event_dispatcher.cpp", + "wifi_manager.cpp", + "wifi_net_agent.cpp", + "wifi_service_manager.cpp", + ] - part_name = "wifi" - subsystem_name = "communication" -} -ohos_shared_library("wifi_device_ability") { - install_enable = true - deps = [ - ":wifi_device_service_impl", - ":wifi_manager_service", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", - "$WIFI_ROOT_DIR/utils/src:wifi_utils", - "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", - "//utils/native/base:utils", - ] + deps = [ + "$WIFI_ROOT_DIR/services/wifi_standard/etc/init:etc", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", + "$WIFI_ROOT_DIR/utils/src:wifi_utils", + "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", + "//foundation/communication/netmanager_base/services/netmanagernative:netsys_native_manager", + "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", + "//utils/native/base:utils", + ] - external_deps = [ "ipc:ipc_core" ] - part_name = "wifi" - subsystem_name = "communication" -} -ohos_shared_library("wifi_scan_ability") { - install_enable = true - deps = [ - ":wifi_manager_service", - ":wifi_scan_service_impl", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", - "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", - "//utils/native/base:utils", - ] + configs = [ ":wifi_manager_service_header" ] - external_deps = [ "ipc:ipc_core" ] - part_name = "wifi" - subsystem_name = "communication" -} -ohos_shared_library("wifi_hotspot_ability") { - install_enable = true - deps = [ - ":wifi_hotspot_service_impl", - ":wifi_manager_service", - "$WIFI_ROOT_DIR/utils/src:wifi_utils", - "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", - "//utils/native/base:utils", - ] + external_deps = [ + "ability_base:want", + "access_token:libaccesstoken_sdk", + "bundle_framework:appexecfwk_base", + "common_event_service:cesfwk_innerkits", + "eventhandler:libeventhandler", + "ipc:ipc_core", + "netmanager_base:net_conn_manager_if", + ] + defines = [ + "FEATURE_AP_SUPPORT", + "FEATURE_P2P_SUPPORT", + ] - external_deps = [ "ipc:ipc_core" ] - part_name = "wifi" - subsystem_name = "communication" -} -ohos_shared_library("wifi_p2p_ability") { - install_enable = true - deps = [ - ":wifi_manager_service", - ":wifi_p2p_service_impl", - "$WIFI_ROOT_DIR/utils/src:wifi_utils", - "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", - "//utils/native/base:utils", - ] + part_name = "wifi" + subsystem_name = "communication" + } + ohos_shared_library("wifi_device_ability") { + install_enable = true + deps = [ + ":wifi_device_service_impl", + ":wifi_manager_service", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", + "$WIFI_ROOT_DIR/utils/src:wifi_utils", + "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", + "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", + "//utils/native/base:utils", + ] - external_deps = [ "ipc:ipc_core" ] - part_name = "wifi" - subsystem_name = "communication" + external_deps = [ "ipc:ipc_core" ] + part_name = "wifi" + subsystem_name = "communication" + } + ohos_shared_library("wifi_scan_ability") { + install_enable = true + deps = [ + ":wifi_manager_service", + ":wifi_scan_service_impl", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", + "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", + "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", + "//utils/native/base:utils", + ] + + external_deps = [ "ipc:ipc_core" ] + part_name = "wifi" + subsystem_name = "communication" + } + ohos_shared_library("wifi_hotspot_ability") { + install_enable = true + deps = [ + ":wifi_hotspot_service_impl", + ":wifi_manager_service", + "$WIFI_ROOT_DIR/utils/src:wifi_utils", + "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", + "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", + "//utils/native/base:utils", + ] + + external_deps = [ "ipc:ipc_core" ] + part_name = "wifi" + subsystem_name = "communication" + } + ohos_shared_library("wifi_p2p_ability") { + install_enable = true + deps = [ + ":wifi_manager_service", + ":wifi_p2p_service_impl", + "$WIFI_ROOT_DIR/utils/src:wifi_utils", + "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", + "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", + "//utils/native/base:utils", + ] + + external_deps = [ "ipc:ipc_core" ] + part_name = "wifi" + subsystem_name = "communication" + } } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_callback_proxy.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_callback_proxy.h index 6f16006..910ddfd 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_callback_proxy.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_callback_proxy.h @@ -16,16 +16,27 @@ #define OHOS_WIFI_DEVICE_CALLBACK_PROXY_H #include "i_wifi_device_callback.h" +#ifdef OHOS_ARCH_LITE +#include "serializer.h" +#else #include "iremote_proxy.h" +#endif #include "wifi_msg.h" namespace OHOS { namespace Wifi { +#ifdef OHOS_ARCH_LITE +class WifiDeviceCallBackProxy : public IWifiDeviceCallBack { +public: + explicit WifiDeviceCallBackProxy(SvcIdentity *sid); + virtual ~WifiDeviceCallBackProxy(); +#else class WifiDeviceCallBackProxy : public IRemoteProxy { public: explicit WifiDeviceCallBackProxy(const sptr &remote); virtual ~WifiDeviceCallBackProxy() {} +#endif /** * @Description Deal wifi state change message @@ -65,7 +76,12 @@ public: void OnStreamChanged(int direction) override; private: +#ifdef OHOS_ARCH_LITE + SvcIdentity *sid_; + static const int DEFAULT_IPC_SIZE = 128; +#else static inline BrokerDelegator g_delegator; +#endif }; } // namespace Wifi } // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_callback_proxy_lite.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_callback_proxy_lite.cpp new file mode 100644 index 0000000..3c7b8ba --- /dev/null +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_callback_proxy_lite.cpp @@ -0,0 +1,129 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "wifi_device_callback_proxy.h" +#include "define.h" +#include "liteipc_adapter.h" +#include "wifi_logger.h" + +DEFINE_WIFILOG_LABEL("WifiDeviceCallBackProxy"); + +namespace OHOS { +namespace Wifi { +WifiDeviceCallBackProxy::WifiDeviceCallBackProxy(SvcIdentity *sid) : sid_(sid) +{} + +WifiDeviceCallBackProxy::~WifiDeviceCallBackProxy() +{ + if (sid_ != nullptr) { +#ifdef __LINUX__ + BinderRelease(sid_->ipcContext, sid_->handle); +#endif + free(sid_); + sid_ = nullptr; + } +} + +void WifiDeviceCallBackProxy::OnWifiStateChanged(int state) +{ + WIFI_LOGD("WifiDeviceCallBackProxy::OnWifiStateChanged"); + IpcIo data; + uint8_t buff[DEFAULT_IPC_SIZE]; + IpcIoInit(&data, buff, DEFAULT_IPC_SIZE, 0); + IpcIoPushInt32(&data, 0); + IpcIoPushInt32(&data, state); + int ret = Transact(nullptr, *sid_, WIFI_CBK_CMD_STATE_CHANGE, &data, nullptr, LITEIPC_FLAG_ONEWAY, nullptr); + if (ret != LITEIPC_OK) { + WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", WIFI_CBK_CMD_STATE_CHANGE, ret); + } +} + +void WifiDeviceCallBackProxy::OnWifiConnectionChanged(int state, const WifiLinkedInfo &info) +{ + WIFI_LOGD("WifiDeviceCallBackProxy::OnWifiConnectionChanged"); + IpcIo data; + uint8_t buff[DEFAULT_IPC_SIZE]; + IpcIoInit(&data, buff, DEFAULT_IPC_SIZE, 0); + IpcIoPushInt32(&data, 0); + IpcIoPushInt32(&data, state); + IpcIoPushInt32(&data, info.networkId); + IpcIoPushString(&data, info.ssid.c_str()); + IpcIoPushString(&data, info.bssid.c_str()); + IpcIoPushInt32(&data, info.rssi); + IpcIoPushInt32(&data, info.band); + IpcIoPushInt32(&data, info.frequency); + IpcIoPushInt32(&data, info.linkSpeed); + IpcIoPushString(&data, info.macAddress.c_str()); + IpcIoPushInt32(&data, info.ipAddress); + IpcIoPushInt32(&data, (int)info.connState); + IpcIoPushBool(&data, info.ifHiddenSSID); + IpcIoPushInt32(&data, info.rxLinkSpeed); + IpcIoPushInt32(&data, info.txLinkSpeed); + IpcIoPushInt32(&data, info.chload); + IpcIoPushInt32(&data, info.snr); + IpcIoPushInt32(&data, info.isDataRestricted); + IpcIoPushString(&data, info.portalUrl.c_str()); + IpcIoPushInt32(&data, (int)info.supplicantState); + IpcIoPushInt32(&data, (int)info.detailedState); + int ret = Transact(nullptr, *sid_, WIFI_CBK_CMD_CONNECTION_CHANGE, &data, nullptr, LITEIPC_FLAG_ONEWAY, nullptr); + if (ret != LITEIPC_OK) { + WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", WIFI_CBK_CMD_CONNECTION_CHANGE, ret); + } +} + +void WifiDeviceCallBackProxy::OnWifiRssiChanged(int rssi) +{ + WIFI_LOGD("WifiDeviceCallBackProxy::OnWifiRssiChanged"); + IpcIo data; + uint8_t buff[DEFAULT_IPC_SIZE]; + IpcIoInit(&data, buff, DEFAULT_IPC_SIZE, 0); + IpcIoPushInt32(&data, 0); + IpcIoPushInt32(&data, rssi); + int ret = Transact(nullptr, *sid_, WIFI_CBK_CMD_RSSI_CHANGE, &data, nullptr, LITEIPC_FLAG_ONEWAY, nullptr); + if (ret != LITEIPC_OK) { + WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", WIFI_CBK_CMD_RSSI_CHANGE, ret); + } +} + +void WifiDeviceCallBackProxy::OnWifiWpsStateChanged(int state, const std::string &pinCode) +{ + WIFI_LOGD("WifiDeviceCallBackProxy::OnWifiWpsStateChanged"); + IpcIo data; + uint8_t buff[DEFAULT_IPC_SIZE]; + IpcIoInit(&data, buff, DEFAULT_IPC_SIZE, 0); + IpcIoPushInt32(&data, 0); + IpcIoPushInt32(&data, state); + IpcIoPushString(&data, pinCode.c_str()); + int ret = Transact(nullptr, *sid_, WIFI_CBK_CMD_WPS_STATE_CHANGE, &data, nullptr, LITEIPC_FLAG_ONEWAY, nullptr); + if (ret != LITEIPC_OK) { + WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", WIFI_CBK_CMD_WPS_STATE_CHANGE, ret); + } +} + +void WifiDeviceCallBackProxy::OnStreamChanged(int direction) +{ + WIFI_LOGD("WifiDeviceCallBackProxy::OnStreamChanged"); + IpcIo data; + uint8_t buff[DEFAULT_IPC_SIZE]; + IpcIoInit(&data, buff, DEFAULT_IPC_SIZE, 0); + IpcIoPushInt32(&data, 0); + IpcIoPushInt32(&data, direction); + int ret = Transact(nullptr, *sid_, WIFI_CBK_CMD_STREAM_DIRECTION, &data, nullptr, LITEIPC_FLAG_ONEWAY, nullptr); + if (ret != LITEIPC_OK) { + WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", WIFI_CBK_CMD_STREAM_DIRECTION, ret); + } +} +} // namespace Wifi +} // namespace OHOS \ No newline at end of file diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_feature_lite.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_feature_lite.cpp new file mode 100644 index 0000000..1086030 --- /dev/null +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_feature_lite.cpp @@ -0,0 +1,112 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include + +#include "iproxy_server.h" +#include "ohos_errno.h" +#include "ohos_init.h" +#include "samgr_lite.h" +#include "service.h" +#include "wifi_device_service_impl.h" +#include "wifi_log.h" +#include "wifi_ipc_lite_adapter.h" + +using namespace OHOS::Wifi; + +static std::shared_ptr g_devServiceImpl = WifiDeviceServiceImpl::GetInstance(); + +typedef struct WifiDeviceApi { + INHERIT_SERVER_IPROXY; +} WifiDeviceApi; + +typedef struct WifiDeviceFeature { + INHERIT_FEATURE; + INHERIT_IUNKNOWNENTRY(WifiDeviceApi); + Identity identity; + Service *parent; +} WifiDeviceFeature; + +static const char *GetName(Feature *feature) +{ + return WIFI_FEATURE_DEVICE; +} + +static void OnInitialize(Feature *feature, Service *parent, Identity identity) +{ + if (feature != NULL) { + WifiDeviceFeature *deviceFeature = (WifiDeviceFeature *)feature; + deviceFeature->identity = identity; + deviceFeature->parent = parent; + } + if (g_devServiceImpl != NULL) { + g_devServiceImpl->OnStart(); + } +} + +static void OnStop(Feature *feature, Identity identity) +{ + if (g_devServiceImpl != NULL) { + g_devServiceImpl->OnStop(); + } + if (feature != NULL) { + WifiDeviceFeature *deviceFeature = (WifiDeviceFeature *)feature; + deviceFeature->identity.queueId = NULL; + deviceFeature->identity.featureId = -1; + deviceFeature->identity.serviceId = -1; + } +} + +static BOOL OnMessage(Feature *feature, Request *request) +{ + return TRUE; +} + +static int Invoke(IServerProxy *proxy, int funcId, void *origin, IpcIo *req, IpcIo *reply) +{ + LOGI("[WifiDeviceFeature] begin to call Invoke, funcId is %{public}d", funcId); + if (g_devServiceImpl != NULL) { + return g_devServiceImpl->OnRemoteRequest(funcId, req, reply); + } + return EC_FAILURE; +} + +static WifiDeviceFeature g_devFeature = { + .GetName = GetName, + .OnInitialize = OnInitialize, + .OnStop = OnStop, + .OnMessage = OnMessage, + SERVER_IPROXY_IMPL_BEGIN, + .Invoke = Invoke, + IPROXY_END, + .identity = {-1, -1, NULL}, +}; + +static void Init(void) +{ + LOGI("[WifiDeviceFeature] Init start."); + BOOL ret = SAMGR_GetInstance()->RegisterFeature(WIFI_SERVICE_LITE, (Feature *)&g_devFeature); + if (ret == FALSE) { + LOGE("[WifiDeviceFeature] register feature fail."); + return; + } + ret = SAMGR_GetInstance()->RegisterFeatureApi(WIFI_SERVICE_LITE, + WIFI_FEATURE_DEVICE, GET_IUNKNOWN(g_devFeature)); + if (ret == FALSE) { + LOGE("[WifiDeviceFeature] register feature api fail."); + } +} +SYSEX_FEATURE_INIT(Init); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp index 62f81bc..c8844d7 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp @@ -16,12 +16,18 @@ #include "wifi_device_service_impl.h" #include #include +#ifndef OHOS_ARCH_LITE #include +#endif #include "wifi_permission_utils.h" #include "wifi_internal_msg.h" #include "wifi_auth_center.h" #include "wifi_config_center.h" +#ifdef OHOS_ARCH_LITE +#include "wifi_internal_event_dispatcher_lite.h" +#else #include "wifi_internal_event_dispatcher.h" +#endif #include "wifi_manager.h" #include "wifi_service_manager.h" #include "wifi_protect_manager.h" @@ -35,15 +41,24 @@ DEFINE_WIFILOG_LABEL("WifiDeviceServiceImpl"); namespace OHOS { namespace Wifi { std::mutex WifiDeviceServiceImpl::g_instanceLock; +#ifdef OHOS_ARCH_LITE +std::shared_ptr WifiDeviceServiceImpl::g_instance; +std::shared_ptr WifiDeviceServiceImpl::GetInstance() +#else sptr WifiDeviceServiceImpl::g_instance; const bool REGISTER_RESULT = SystemAbility::MakeAndRegisterAbility(WifiDeviceServiceImpl::GetInstance().GetRefPtr()); sptr WifiDeviceServiceImpl::GetInstance() +#endif { if (g_instance == nullptr) { std::lock_guard autoLock(g_instanceLock); if (g_instance == nullptr) { +#ifdef OHOS_ARCH_LITE + auto service = std::make_shared(); +#else auto service = new (std::nothrow) WifiDeviceServiceImpl; +#endif g_instance = service; } } @@ -51,7 +66,12 @@ sptr WifiDeviceServiceImpl::GetInstance() } WifiDeviceServiceImpl::WifiDeviceServiceImpl() +#ifdef OHOS_ARCH_LITE + : mPublishFlag(false), mState(ServiceRunningState::STATE_NOT_START) + +#else : SystemAbility(WIFI_DEVICE_ABILITY_ID, true), mPublishFlag(false), mState(ServiceRunningState::STATE_NOT_START) +#endif {} WifiDeviceServiceImpl::~WifiDeviceServiceImpl() @@ -83,7 +103,11 @@ void WifiDeviceServiceImpl::OnStop() bool WifiDeviceServiceImpl::Init() { if (!mPublishFlag) { +#ifdef OHOS_ARCH_LITE + bool ret = true; +#else bool ret = Publish(WifiDeviceServiceImpl::GetInstance()); +#endif if (!ret) { WIFI_LOGE("Failed to publish sta service!"); return false; @@ -110,7 +134,7 @@ ErrCode WifiDeviceServiceImpl::EnableWifi() } } -#ifdef WIFI_SUPPORT_P2P +#ifdef FEATURE_P2P_SUPPORT sptr p2pService = WifiP2pServiceImpl::GetInstance(); if (p2pService != nullptr && p2pService->EnableP2p() != WIFI_OPT_SUCCESS) { WIFI_LOGE("Enable P2p failed!"); @@ -177,7 +201,7 @@ ErrCode WifiDeviceServiceImpl::DisableWifi() } } -#ifdef WIFI_SUPPORT_P2P +#ifdef FEATURE_P2P_SUPPORT sptr p2pService = WifiP2pServiceImpl::GetInstance(); if (p2pService != nullptr && p2pService->DisableP2p() != WIFI_OPT_SUCCESS) { WIFI_LOGE("Disable P2p failed!"); @@ -704,7 +728,11 @@ ErrCode WifiDeviceServiceImpl::GetCountryCode(std::string &countryCode) return WIFI_OPT_SUCCESS; } +#ifdef OHOS_ARCH_LITE +ErrCode WifiDeviceServiceImpl::RegisterCallBack(const std::shared_ptr &callback) +#else ErrCode WifiDeviceServiceImpl::RegisterCallBack(const sptr &callback) +#endif { WIFI_LOGI("RegisterCallBack"); if (callback == nullptr) { @@ -887,6 +915,7 @@ void WifiDeviceServiceImpl::SaBasicDump(std::string& result) result += "\n"; } +#ifndef OHOS_ARCH_LITE int32_t WifiDeviceServiceImpl::Dump(int32_t fd, const std::vector& args) { std::vector vecArgs; @@ -903,5 +932,6 @@ int32_t WifiDeviceServiceImpl::Dump(int32_t fd, const std::vector GetInstance(); + + void OnStart(); + void OnStop(); +#else static sptr GetInstance(); void OnStart() override; void OnStop() override; +#endif ErrCode EnableWifi() override; @@ -89,7 +109,11 @@ public: ErrCode GetCountryCode(std::string &countryCode) override; +#ifdef OHOS_ARCH_LITE + ErrCode RegisterCallBack(const std::shared_ptr &callback) override; +#else ErrCode RegisterCallBack(const sptr &callback) override; +#endif ErrCode GetSignalLevel(const int &rssi, const int &band, int &level) override; @@ -99,7 +123,9 @@ public: bool SetLowLatencyMode(bool enabled) override; +#ifndef OHOS_ARCH_LITE int32_t Dump(int32_t fd, const std::vector& args) override; +#endif private: bool Init(); @@ -118,7 +144,11 @@ private: static constexpr int WEP_KEY_LEN2 = 13; static constexpr int WEP_KEY_LEN3 = 16; +#ifdef OHOS_ARCH_LITE + static std::shared_ptr g_instance; +#else static sptr g_instance; +#endif static std::mutex g_instanceLock; bool mPublishFlag; ServiceRunningState mState; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub_lite.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub_lite.cpp new file mode 100644 index 0000000..ee5007a --- /dev/null +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub_lite.cpp @@ -0,0 +1,577 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "wifi_device_stub_lite.h" +#include "define.h" +#include "liteipc_adapter.h" +#include "wifi_device_callback_proxy.h" +#include "wifi_errcode.h" +#include "wifi_logger.h" +#include "wifi_msg.h" + +DEFINE_WIFILOG_LABEL("WifiDeviceStubLite"); + +namespace OHOS { +namespace Wifi { +WifiDeviceStub::WifiDeviceStub() +{ + InitHandleMap(); +} + +WifiDeviceStub::~WifiDeviceStub() +{} + +void WifiDeviceStub::ReadIpAddress(IpcIo *req, WifiIpAddress &address) +{ + constexpr int MAX_LIMIT_SIZE = 1024; + address.family = IpcIoPopInt32(req); + address.addressIpv4 = IpcIoPopInt32(req); + int size = IpcIoPopInt32(req); + if (size > MAX_LIMIT_SIZE) { + WIFI_LOGE("Read ip address parameter error: %{public}d", size); + return; + } + for (int i = 0; i < size; i++) { + address.addressIpv6.push_back(IpcIoPopInt8(req)); + } +} + +void WifiDeviceStub::ReadWifiDeviceConfig(IpcIo *req, WifiDeviceConfig &config) +{ + size_t size; + config.networkId = IpcIoPopInt32(req); + config.status = IpcIoPopInt32(req); + config.bssid = (char *)IpcIoPopString(req, &size); + config.ssid = (char *)IpcIoPopString(req, &size); + config.band = IpcIoPopInt32(req); + config.channel = IpcIoPopInt32(req); + config.frequency = IpcIoPopInt32(req); + config.level = IpcIoPopInt32(req); + config.isPasspoint = IpcIoPopBool(req); + config.isEphemeral = IpcIoPopBool(req); + config.preSharedKey = (char *)IpcIoPopString(req, &size); + config.keyMgmt = (char *)IpcIoPopString(req, &size); + for (int i = 0; i < WEPKEYS_SIZE; i++) { + config.wepKeys[i] = (char *)IpcIoPopString(req, &size); + } + config.wepTxKeyIndex = IpcIoPopInt32(req); + config.priority = IpcIoPopInt32(req); + config.hiddenSSID = IpcIoPopBool(req); + config.wifiIpConfig.assignMethod = AssignIpMethod(IpcIoPopInt32(req)); + ReadIpAddress(req, config.wifiIpConfig.staticIpAddress.ipAddress.address); + config.wifiIpConfig.staticIpAddress.ipAddress.prefixLength = IpcIoPopInt32(req); + config.wifiIpConfig.staticIpAddress.ipAddress.flags = IpcIoPopInt32(req); + config.wifiIpConfig.staticIpAddress.ipAddress.scope = IpcIoPopInt32(req); + ReadIpAddress(req, config.wifiIpConfig.staticIpAddress.gateway); + ReadIpAddress(req, config.wifiIpConfig.staticIpAddress.dnsServer1); + ReadIpAddress(req, config.wifiIpConfig.staticIpAddress.dnsServer2); + config.wifiIpConfig.staticIpAddress.domains = (char *)IpcIoPopString(req, &size); + config.wifiEapConfig.eap = (char *)IpcIoPopString(req, &size); + config.wifiEapConfig.identity = (char *)IpcIoPopString(req, &size); + config.wifiEapConfig.password = (char *)IpcIoPopString(req, &size); + config.wifiProxyconfig.configureMethod = ConfigureProxyMethod(IpcIoPopInt32(req)); + config.wifiProxyconfig.autoProxyConfig.pacWebAddress = (char *)IpcIoPopString(req, &size); + config.wifiProxyconfig.manualProxyConfig.serverHostName = (char *)IpcIoPopString(req, &size); + config.wifiProxyconfig.manualProxyConfig.serverPort = IpcIoPopInt32(req); + config.wifiProxyconfig.manualProxyConfig.exclusionObjectList = (char *)IpcIoPopString(req, &size); + config.wifiPrivacySetting = WifiPrivacyConfig(IpcIoPopInt32(req)); +} + +void WifiDeviceStub::WriteIpAddress(IpcIo *reply, const WifiIpAddress &address) +{ + IpcIoPushInt32(reply, address.family); + IpcIoPushInt32(reply, address.addressIpv4); + int size = address.addressIpv6.size(); + IpcIoPushInt32(reply, size); + for (int i = 0; i < size; i++) { + IpcIoPushInt8(reply, address.addressIpv6[i]); + } +} + +void WifiDeviceStub::WriteWifiDeviceConfig(IpcIo *reply, const WifiDeviceConfig &config) +{ + IpcIoPushInt32(reply, config.networkId); + IpcIoPushInt32(reply, config.status); + IpcIoPushString(reply, config.bssid.c_str()); + IpcIoPushString(reply, config.ssid.c_str()); + IpcIoPushInt32(reply, config.band); + IpcIoPushInt32(reply, config.channel); + IpcIoPushInt32(reply, config.frequency); + IpcIoPushInt32(reply, config.level); + IpcIoPushBool(reply, config.isPasspoint); + IpcIoPushBool(reply, config.isEphemeral); + IpcIoPushString(reply, config.preSharedKey.c_str()); + IpcIoPushString(reply, config.keyMgmt.c_str()); + for (int j = 0; j < WEPKEYS_SIZE; j++) { + IpcIoPushString(reply, config.wepKeys[j].c_str()); + } + IpcIoPushInt32(reply, config.wepTxKeyIndex); + IpcIoPushInt32(reply, config.priority); + IpcIoPushBool(reply, config.hiddenSSID); + IpcIoPushInt32(reply, (int)config.wifiIpConfig.assignMethod); + WriteIpAddress(reply, config.wifiIpConfig.staticIpAddress.ipAddress.address); + IpcIoPushInt32(reply, config.wifiIpConfig.staticIpAddress.ipAddress.prefixLength); + IpcIoPushInt32(reply, config.wifiIpConfig.staticIpAddress.ipAddress.flags); + IpcIoPushInt32(reply, config.wifiIpConfig.staticIpAddress.ipAddress.scope); + WriteIpAddress(reply, config.wifiIpConfig.staticIpAddress.gateway); + WriteIpAddress(reply, config.wifiIpConfig.staticIpAddress.dnsServer1); + WriteIpAddress(reply, config.wifiIpConfig.staticIpAddress.dnsServer2); + IpcIoPushString(reply, config.wifiIpConfig.staticIpAddress.domains.c_str()); + IpcIoPushString(reply, config.wifiEapConfig.eap.c_str()); + IpcIoPushString(reply, config.wifiEapConfig.identity.c_str()); + IpcIoPushString(reply, config.wifiEapConfig.password.c_str()); + IpcIoPushInt32(reply, (int)config.wifiProxyconfig.configureMethod); + IpcIoPushString(reply, config.wifiProxyconfig.autoProxyConfig.pacWebAddress.c_str()); + IpcIoPushString(reply, config.wifiProxyconfig.manualProxyConfig.serverHostName.c_str()); + IpcIoPushInt32(reply, config.wifiProxyconfig.manualProxyConfig.serverPort); + IpcIoPushString(reply, config.wifiProxyconfig.manualProxyConfig.exclusionObjectList.c_str()); + IpcIoPushInt32(reply, (int)config.wifiPrivacySetting); +} + +void WifiDeviceStub::OnEnableWifi(uint32_t code, IpcIo *req, IpcIo *reply) +{ + WIFI_LOGD("run %{public}s code %{public}u", __func__, code); + ErrCode ret = EnableWifi(); + IpcIoPushInt32(reply, 0); + IpcIoPushInt32(reply, ret); +} + +void WifiDeviceStub::OnDisableWifi(uint32_t code, IpcIo *req, IpcIo *reply) +{ + WIFI_LOGD("run %{public}s code %{public}u", __func__, code); + ErrCode ret = DisableWifi(); + IpcIoPushInt32(reply, 0); + IpcIoPushInt32(reply, ret); +} + +void WifiDeviceStub::OnInitWifiProtect(uint32_t code, IpcIo *req, IpcIo *reply) +{ + WIFI_LOGD("run %{public}s code %{public}u", __func__, code); + size_t size; + WifiProtectType protectType = (WifiProtectType)IpcIoPopInt32(req); + std::string protectName = (char *)IpcIoPopString(req, &size); + ErrCode ret = InitWifiProtect(protectType, protectName); + IpcIoPushInt32(reply, 0); + IpcIoPushInt32(reply, ret); +} + +void WifiDeviceStub::OnGetWifiProtectRef(uint32_t code, IpcIo *req, IpcIo *reply) +{ + WIFI_LOGD("run %{public}s code %{public}u", __func__, code); + size_t size; + WifiProtectMode protectMode = (WifiProtectMode)IpcIoPopInt32(req); + std::string protectName = (char *)IpcIoPopString(req, &size); + ErrCode ret = GetWifiProtectRef(protectMode, protectName); + IpcIoPushInt32(reply, 0); + IpcIoPushInt32(reply, ret); +} + +void WifiDeviceStub::OnPutWifiProtectRef(uint32_t code, IpcIo *req, IpcIo *reply) +{ + WIFI_LOGD("run %{public}s code %{public}u", __func__, code); + size_t size; + std::string protectName = (char *)IpcIoPopString(req, &size); + ErrCode ret = PutWifiProtectRef(protectName); + IpcIoPushInt32(reply, 0); + IpcIoPushInt32(reply, ret); +} + +void WifiDeviceStub::OnAddDeviceConfig(uint32_t code, IpcIo *req, IpcIo *reply) +{ + WIFI_LOGD("run %{public}s code %{public}u", __func__, code); + WifiDeviceConfig config; + ReadWifiDeviceConfig(req, config); + + int result = INVALID_NETWORK_ID; + ErrCode ret = AddDeviceConfig(config, result); + + IpcIoPushInt32(reply, 0); + IpcIoPushInt32(reply, ret); + if (ret == WIFI_OPT_SUCCESS) { + IpcIoPushInt32(reply, result); + } +} + +void WifiDeviceStub::OnUpdateDeviceConfig(uint32_t code, IpcIo *req, IpcIo *reply) +{ + WIFI_LOGD("run %{public}s code %{public}u", __func__, code); + WifiDeviceConfig config; + ReadWifiDeviceConfig(req, config); + int result = INVALID_NETWORK_ID; + ErrCode ret = UpdateDeviceConfig(config, result); + IpcIoPushInt32(reply, 0); + IpcIoPushInt32(reply, ret); + if (ret == WIFI_OPT_SUCCESS) { + IpcIoPushInt32(reply, result); + } +} + +void WifiDeviceStub::OnRemoveDevice(uint32_t code, IpcIo *req, IpcIo *reply) +{ + WIFI_LOGD("run %{public}s code %{public}u", __func__, code); + int networkId = IpcIoPopInt32(req); + ErrCode ret = RemoveDevice(networkId); + IpcIoPushInt32(reply, 0); + IpcIoPushInt32(reply, ret); +} + +void WifiDeviceStub::OnRemoveAllDevice(uint32_t code, IpcIo *req, IpcIo *reply) +{ + WIFI_LOGD("run %{public}s code %{public}u", __func__, code); + ErrCode ret = RemoveAllDevice(); + IpcIoPushInt32(reply, 0); + IpcIoPushInt32(reply, ret); +} + +void WifiDeviceStub::OnGetDeviceConfigs(uint32_t code, IpcIo *req, IpcIo *reply) +{ + WIFI_LOGD("run %{public}s code %{public}u", __func__, code); + std::vector result; + ErrCode ret = GetDeviceConfigs(result); + IpcIoPushInt32(reply, 0); + IpcIoPushInt32(reply, ret); + + if (ret == WIFI_OPT_SUCCESS) { + unsigned int size = result.size(); + IpcIoPushInt32(reply, size); + for (unsigned int i = 0; i < size; ++i) { + WriteWifiDeviceConfig(reply, result[i]); + } + } +} + +void WifiDeviceStub::OnEnableDeviceConfig(uint32_t code, IpcIo *req, IpcIo *reply) +{ + WIFI_LOGD("run %{public}s code %{public}u", __func__, code); + int networkId = IpcIoPopInt32(req); + bool attemptEnable = IpcIoPopBool(req); + ErrCode ret = EnableDeviceConfig(networkId, attemptEnable); + IpcIoPushInt32(reply, 0); + IpcIoPushInt32(reply, ret); +} + +void WifiDeviceStub::OnDisableDeviceConfig(uint32_t code, IpcIo *req, IpcIo *reply) +{ + WIFI_LOGD("run %{public}s code %{public}u", __func__, code); + int networkId = IpcIoPopInt32(req); + ErrCode ret = DisableDeviceConfig(networkId); + IpcIoPushInt32(reply, 0); + IpcIoPushInt32(reply, ret); +} + +void WifiDeviceStub::OnConnectTo(uint32_t code, IpcIo *req, IpcIo *reply) +{ + WIFI_LOGD("run %{public}s code %{public}u", __func__, code); + int networkId = IpcIoPopInt32(req); + ErrCode ret = ConnectToNetwork(networkId); + IpcIoPushInt32(reply, 0); + IpcIoPushInt32(reply, ret); +} + +void WifiDeviceStub::OnConnect2To(uint32_t code, IpcIo *req, IpcIo *reply) +{ + WIFI_LOGD("run %{public}s code %{public}u", __func__, code); + WifiDeviceConfig config; + ReadWifiDeviceConfig(req, config); + ErrCode ret = ConnectToDevice(config); + IpcIoPushInt32(reply, 0); + IpcIoPushInt32(reply, ret); +} + +void WifiDeviceStub::OnIsWifiConnected(uint32_t code, IpcIo *req, IpcIo *reply) +{ + WIFI_LOGD("run %{public}s code %{public}u", __func__, code); + IpcIoPushInt32(reply, 0); + IpcIoPushInt32(reply, WIFI_OPT_SUCCESS); + IpcIoPushBool(reply, IsConnected()); +} + +void WifiDeviceStub::OnReConnect(uint32_t code, IpcIo *req, IpcIo *reply) +{ + WIFI_LOGD("run %{public}s code %{public}u", __func__, code); + ErrCode ret = ReConnect(); + IpcIoPushInt32(reply, 0); + IpcIoPushInt32(reply, ret); +} + +void WifiDeviceStub::OnReAssociate(uint32_t code, IpcIo *req, IpcIo *reply) +{ + WIFI_LOGD("run %{public}s code %{public}u", __func__, code); + ErrCode ret = ReAssociate(); + IpcIoPushInt32(reply, 0); + IpcIoPushInt32(reply, ret); +} + +void WifiDeviceStub::OnDisconnect(uint32_t code, IpcIo *req, IpcIo *reply) +{ + WIFI_LOGD("run %{public}s code %{public}u", __func__, code); + ErrCode ret = Disconnect(); + IpcIoPushInt32(reply, 0); + IpcIoPushInt32(reply, ret); +} + +void WifiDeviceStub::OnStartWps(uint32_t code, IpcIo *req, IpcIo *reply) +{ + WIFI_LOGD("run %{public}s code %{public}u", __func__, code); + size_t size; + WpsConfig config; + config.setup = SetupMethod(IpcIoPopInt32(req)); + config.pin = (char *)IpcIoPopString(req, &size); + config.bssid = (char *)IpcIoPopString(req, &size); + + ErrCode ret = StartWps(config); + IpcIoPushInt32(reply, 0); + IpcIoPushInt32(reply, ret); +} + +void WifiDeviceStub::OnCancelWps(uint32_t code, IpcIo *req, IpcIo *reply) +{ + WIFI_LOGD("run %{public}s code %{public}u", __func__, code); + ErrCode ret = CancelWps(); + IpcIoPushInt32(reply, 0); + IpcIoPushInt32(reply, ret); +} + +void WifiDeviceStub::OnIsWifiActive(uint32_t code, IpcIo *req, IpcIo *reply) +{ + WIFI_LOGD("run %{public}s code %{public}u", __func__, code); + bool bActive = false; + ErrCode ret = IsWifiActive(bActive); + IpcIoPushInt32(reply, 0); + IpcIoPushInt32(reply, ret); + if (ret == WIFI_OPT_SUCCESS) { + IpcIoPushBool(reply, bActive); + } +} + +void WifiDeviceStub::OnGetWifiState(uint32_t code, IpcIo *req, IpcIo *reply) +{ + WIFI_LOGD("run %{public}s code %{public}u", __func__, code); + int state = 0; + ErrCode ret = GetWifiState(state); + IpcIoPushInt32(reply, 0); + IpcIoPushInt32(reply, ret); + if (ret == WIFI_OPT_SUCCESS) { + IpcIoPushInt32(reply, state); + } +} + +void WifiDeviceStub::OnGetLinkedInfo(uint32_t code, IpcIo *req, IpcIo *reply) +{ + WIFI_LOGD("run %{public}s code %{public}u", __func__, code); + WifiLinkedInfo wifiInfo; + ErrCode ret = GetLinkedInfo(wifiInfo); + IpcIoPushInt32(reply, 0); + IpcIoPushInt32(reply, ret); + + if (ret == WIFI_OPT_SUCCESS) { + IpcIoPushInt32(reply, wifiInfo.networkId); + IpcIoPushString(reply, wifiInfo.ssid.c_str()); + IpcIoPushString(reply, wifiInfo.bssid.c_str()); + IpcIoPushInt32(reply, wifiInfo.rssi); + IpcIoPushInt32(reply, wifiInfo.band); + IpcIoPushInt32(reply, wifiInfo.frequency); + IpcIoPushInt32(reply, wifiInfo.linkSpeed); + IpcIoPushString(reply, wifiInfo.macAddress.c_str()); + IpcIoPushInt32(reply, wifiInfo.ipAddress); + IpcIoPushInt32(reply, (int)wifiInfo.connState); + IpcIoPushBool(reply, wifiInfo.ifHiddenSSID); + IpcIoPushInt32(reply, wifiInfo.rxLinkSpeed); + IpcIoPushInt32(reply, wifiInfo.txLinkSpeed); + IpcIoPushInt32(reply, wifiInfo.chload); + IpcIoPushInt32(reply, wifiInfo.snr); + IpcIoPushInt32(reply, wifiInfo.isDataRestricted); + IpcIoPushString(reply, wifiInfo.portalUrl.c_str()); + IpcIoPushInt32(reply, (int)wifiInfo.supplicantState); + IpcIoPushInt32(reply, (int)wifiInfo.detailedState); + } +} + +void WifiDeviceStub::OnGetIpInfo(uint32_t code, IpcIo *req, IpcIo *reply) +{ + WIFI_LOGD("run %{public}s code %{public}u", __func__, code); + IpInfo info; + ErrCode ret = GetIpInfo(info); + IpcIoPushInt32(reply, 0); + IpcIoPushInt32(reply, ret); + + if (ret == WIFI_OPT_SUCCESS) { + IpcIoPushInt32(reply, info.ipAddress); + IpcIoPushInt32(reply, info.gateway); + IpcIoPushInt32(reply, info.netmask); + IpcIoPushInt32(reply, info.primaryDns); + IpcIoPushInt32(reply, info.secondDns); + IpcIoPushInt32(reply, info.serverIp); + IpcIoPushInt32(reply, info.leaseDuration); + } +} + +void WifiDeviceStub::OnSetCountryCode(uint32_t code, IpcIo *req, IpcIo *reply) +{ + WIFI_LOGD("run %{public}s code %{public}u", __func__, code); + size_t size; + std::string countrycode = (char *)IpcIoPopString(req, &size); + ErrCode ret = SetCountryCode(countrycode); + IpcIoPushInt32(reply, 0); + IpcIoPushInt32(reply, ret); +} + +void WifiDeviceStub::OnGetCountryCode(uint32_t code, IpcIo *req, IpcIo *reply) +{ + WIFI_LOGD("run %{public}s code %{public}u", __func__, code); + std::string countryCode; + ErrCode ret = GetCountryCode(countryCode); + IpcIoPushInt32(reply, 0); + IpcIoPushInt32(reply, ret); + + if (ret == WIFI_OPT_SUCCESS) { + IpcIoPushString(reply, countryCode.c_str()); + } +} + +void WifiDeviceStub::OnRegisterCallBack(uint32_t code, IpcIo *req, IpcIo *reply) +{ + WIFI_LOGD("run %{public}s code %{public}u", __func__, code); + ErrCode ret = WIFI_OPT_FAILED; + SvcIdentity *sid = IpcIoPopSvc(req); + if (sid == nullptr) { + WIFI_LOGE("sid is null"); + IpcIoPushInt32(reply, 0); + IpcIoPushInt32(reply, ret); + return; + } +#ifdef __LINUX__ + BinderAcquire(sid->ipcContext, sid->handle); +#endif + + callback_ = std::make_shared(sid); + WIFI_LOGD("create new WifiDeviceCallbackProxy!"); + ret = RegisterCallBack(callback_); + + IpcIoPushInt32(reply, 0); + IpcIoPushInt32(reply, ret); +} + +void WifiDeviceStub::OnGetSignalLevel(uint32_t code, IpcIo *req, IpcIo *reply) +{ + WIFI_LOGD("run %{public}s code %{public}u", __func__, code); + int rssi = IpcIoPopInt32(req); + int band = IpcIoPopInt32(req); + int level = 0; + ErrCode ret = GetSignalLevel(rssi, band, level); + IpcIoPushInt32(reply, 0); + IpcIoPushInt32(reply, ret); + if (ret == WIFI_OPT_SUCCESS) { + IpcIoPushInt32(reply, level); + } +} + +void WifiDeviceStub::OnGetSupportedFeatures(uint32_t code, IpcIo *req, IpcIo *reply) +{ + WIFI_LOGD("run %{public}s code %{public}u", __func__, code); + long features = 0; + int ret = GetSupportedFeatures(features); + IpcIoPushInt32(reply, 0); + IpcIoPushInt32(reply, ret); + + if (ret == WIFI_OPT_SUCCESS) { + IpcIoPushInt64(reply, features); + } +} + +void WifiDeviceStub::OnGetDeviceMacAdd(uint32_t code, IpcIo *req, IpcIo *reply) +{ + WIFI_LOGD("run %{public}s code %{public}u", __func__, code); + std::string strMacAddr; + ErrCode ret = GetDeviceMacAddress(strMacAddr); + IpcIoPushInt32(reply, 0); + IpcIoPushInt32(reply, ret); + if (ret == WIFI_OPT_SUCCESS) { + IpcIoPushString(reply, strMacAddr.c_str()); + } +} + +void WifiDeviceStub::OnSetLowLatencyMode(uint32_t code, IpcIo *req, IpcIo *reply) +{ + WIFI_LOGD("run %{public}s code %{public}u", __func__, code); + + bool enabled = IpcIoPopBool(req); + IpcIoPushInt32(reply, 0); + IpcIoPushInt32(reply, WIFI_OPT_SUCCESS); + IpcIoPushBool(reply, SetLowLatencyMode(enabled)); +} + +void WifiDeviceStub::InitHandleMap() +{ + handleFuncMap_[WIFI_SVR_CMD_ENABLE_WIFI] = &WifiDeviceStub::OnEnableWifi; + handleFuncMap_[WIFI_SVR_CMD_DISABLE_WIFI] = &WifiDeviceStub::OnDisableWifi; + handleFuncMap_[WIFI_SVR_CMD_INIT_WIFI_PROTECT] = &WifiDeviceStub::OnInitWifiProtect; + handleFuncMap_[WIFI_SVR_CMD_GET_WIFI_PROTECT] = &WifiDeviceStub::OnGetWifiProtectRef; + handleFuncMap_[WIFI_SVR_CMD_PUT_WIFI_PROTECT] = &WifiDeviceStub::OnPutWifiProtectRef; + handleFuncMap_[WIFI_SVR_CMD_ADD_DEVICE_CONFIG] = &WifiDeviceStub::OnAddDeviceConfig; + handleFuncMap_[WIFI_SVR_CMD_UPDATE_DEVICE_CONFIG] = &WifiDeviceStub::OnUpdateDeviceConfig; + handleFuncMap_[WIFI_SVR_CMD_REMOVE_DEVICE_CONFIG] = &WifiDeviceStub::OnRemoveDevice; + handleFuncMap_[WIFI_SVR_CMD_REMOVE_ALL_DEVICE_CONFIG] = &WifiDeviceStub::OnRemoveAllDevice; + handleFuncMap_[WIFI_SVR_CMD_GET_DEVICE_CONFIGS] = &WifiDeviceStub::OnGetDeviceConfigs; + handleFuncMap_[WIFI_SVR_CMD_ENABLE_DEVICE] = &WifiDeviceStub::OnEnableDeviceConfig; + handleFuncMap_[WIFI_SVR_CMD_DISABLE_DEVICE] = &WifiDeviceStub::OnDisableDeviceConfig; + handleFuncMap_[WIFI_SVR_CMD_CONNECT_TO] = &WifiDeviceStub::OnConnectTo; + handleFuncMap_[WIFI_SVR_CMD_CONNECT2_TO] = &WifiDeviceStub::OnConnect2To; + handleFuncMap_[WIFI_SVR_CMD_RECONNECT] = &WifiDeviceStub::OnReConnect; + handleFuncMap_[WIFI_SVR_CMD_REASSOCIATE] = &WifiDeviceStub::OnReAssociate; + handleFuncMap_[WIFI_SVR_CMD_DISCONNECT] = &WifiDeviceStub::OnDisconnect; + handleFuncMap_[WIFI_SVR_CMD_START_WPS] = &WifiDeviceStub::OnStartWps; + handleFuncMap_[WIFI_SVR_CMD_CANCEL_WPS] = &WifiDeviceStub::OnCancelWps; + handleFuncMap_[WIFI_SVR_CMD_IS_WIFI_ACTIVE] = &WifiDeviceStub::OnIsWifiActive; + handleFuncMap_[WIFI_SVR_CMD_GET_WIFI_STATE] = &WifiDeviceStub::OnGetWifiState; + handleFuncMap_[WIFI_SVR_CMD_GET_LINKED_INFO] = &WifiDeviceStub::OnGetLinkedInfo; + handleFuncMap_[WIFI_SVR_CMD_GET_DHCP_INFO] = &WifiDeviceStub::OnGetIpInfo; + handleFuncMap_[WIFI_SVR_CMD_SET_COUNTRY_CODE] = &WifiDeviceStub::OnSetCountryCode; + handleFuncMap_[WIFI_SVR_CMD_GET_COUNTRY_CODE] = &WifiDeviceStub::OnGetCountryCode; + handleFuncMap_[WIFI_SVR_CMD_REGISTER_CALLBACK_CLIENT] = &WifiDeviceStub::OnRegisterCallBack; + handleFuncMap_[WIFI_SVR_CMD_GET_SIGNAL_LEVEL] = &WifiDeviceStub::OnGetSignalLevel; + handleFuncMap_[WIFI_SVR_CMD_GET_SUPPORTED_FEATURES] = &WifiDeviceStub::OnGetSupportedFeatures; + handleFuncMap_[WIFI_SVR_CMD_GET_DERVICE_MAC_ADD] = &WifiDeviceStub::OnGetDeviceMacAdd; + handleFuncMap_[WIFI_SVR_CMD_IS_WIFI_CONNECTED] = &WifiDeviceStub::OnIsWifiConnected; + handleFuncMap_[WIFI_SVR_CMD_SET_LOW_LATENCY_MODE] = &WifiDeviceStub::OnSetLowLatencyMode; +} + +int WifiDeviceStub::OnRemoteRequest(uint32_t code, IpcIo *req, IpcIo *reply) +{ + WIFI_LOGD("run: %{public}s code: %{public}u", __func__, code); + if (req == nullptr || reply == nullptr) { + WIFI_LOGD("req:%{public}d, reply:%{public}d", req == nullptr, reply == nullptr); + return LITEIPC_EINVAL; + } + int exception = IpcIoPopInt32(req); + if (exception) { + IpcIoPushInt32(reply, 0); + IpcIoPushInt32(reply, WIFI_OPT_NOT_SUPPORTED); + return WIFI_OPT_FAILED; + } + + HandleFuncMap::iterator iter = handleFuncMap_.find(code); + if (iter == handleFuncMap_.end()) { + WIFI_LOGI("not find function to deal, code %{public}u", code); + IpcIoPushInt32(reply, 0); + IpcIoPushInt32(reply, WIFI_OPT_NOT_SUPPORTED); + } else { + (this->*(iter->second))(code, req, reply); + } + + return 0; +} +} // namespace Wifi +} // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub_lite.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub_lite.h new file mode 100644 index 0000000..9372ef0 --- /dev/null +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub_lite.h @@ -0,0 +1,82 @@ +/* + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OHOS_WIFI_DEVICE_STUB_LITE_H +#define OHOS_WIFI_DEVICE_STUB_LITE_H + +#include +#include "i_wifi_device.h" +#include "i_wifi_device_callback.h" +#include "serializer.h" + +namespace OHOS { +namespace Wifi { +class WifiDeviceStub : public IWifiDevice { +public: + WifiDeviceStub(); + virtual ~WifiDeviceStub(); + + using HandleFunc = void (WifiDeviceStub::*)(uint32_t code, IpcIo *req, IpcIo *reply); + using HandleFuncMap = std::map; + + virtual int OnRemoteRequest(uint32_t code, IpcIo *req, IpcIo *reply); + +private: + void InitHandleMap(); + void OnEnableWifi(uint32_t code, IpcIo *req, IpcIo *reply); + void OnDisableWifi(uint32_t code, IpcIo *req, IpcIo *reply); + void OnInitWifiProtect(uint32_t code, IpcIo *req, IpcIo *reply); + void OnGetWifiProtectRef(uint32_t code, IpcIo *req, IpcIo *reply); + void OnPutWifiProtectRef(uint32_t code, IpcIo *req, IpcIo *reply); + void OnAddDeviceConfig(uint32_t code, IpcIo *req, IpcIo *reply); + void OnUpdateDeviceConfig(uint32_t code, IpcIo *req, IpcIo *reply); + void OnRemoveDevice(uint32_t code, IpcIo *req, IpcIo *reply); + void OnRemoveAllDevice(uint32_t code, IpcIo *req, IpcIo *reply); + void OnGetDeviceConfigs(uint32_t code, IpcIo *req, IpcIo *reply); + void OnEnableDeviceConfig(uint32_t code, IpcIo *req, IpcIo *reply); + void OnDisableDeviceConfig(uint32_t code, IpcIo *req, IpcIo *reply); + void OnConnectTo(uint32_t code, IpcIo *req, IpcIo *reply); + void OnConnect2To(uint32_t code, IpcIo *req, IpcIo *reply); + void OnReConnect(uint32_t code, IpcIo *req, IpcIo *reply); + void OnReAssociate(uint32_t code, IpcIo *req, IpcIo *reply); + void OnDisconnect(uint32_t code, IpcIo *req, IpcIo *reply); + void OnStartWps(uint32_t code, IpcIo *req, IpcIo *reply); + void OnCancelWps(uint32_t code, IpcIo *req, IpcIo *reply); + void OnIsWifiActive(uint32_t code, IpcIo *req, IpcIo *reply); + void OnGetWifiState(uint32_t code, IpcIo *req, IpcIo *reply); + void OnGetLinkedInfo(uint32_t code, IpcIo *req, IpcIo *reply); + void OnGetIpInfo(uint32_t code, IpcIo *req, IpcIo *reply); + void OnSetCountryCode(uint32_t code, IpcIo *req, IpcIo *reply); + void OnGetCountryCode(uint32_t code, IpcIo *req, IpcIo *reply); + void OnRegisterCallBack(uint32_t code, IpcIo *req, IpcIo *reply); + void OnGetSignalLevel(uint32_t code, IpcIo *req, IpcIo *reply); + void OnGetSupportedFeatures(uint32_t code, IpcIo *req, IpcIo *reply); + void OnGetDeviceMacAdd(uint32_t code, IpcIo *req, IpcIo *reply); + void OnIsWifiConnected(uint32_t code, IpcIo *req, IpcIo *reply); + void OnSetLowLatencyMode(uint32_t code, IpcIo *req, IpcIo *reply); + +private: + void ReadWifiDeviceConfig(IpcIo *req, WifiDeviceConfig &config); + void ReadIpAddress(IpcIo *req, WifiIpAddress &address); + void WriteWifiDeviceConfig(IpcIo *reply, const WifiDeviceConfig &config); + void WriteIpAddress(IpcIo *reply, const WifiIpAddress &address); + +private: + HandleFuncMap handleFuncMap_; + std::shared_ptr callback_; +}; +} // namespace Wifi +} // namespace OHOS +#endif \ No newline at end of file diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher_lite.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher_lite.cpp new file mode 100644 index 0000000..e48de30 --- /dev/null +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher_lite.cpp @@ -0,0 +1,243 @@ +/* + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "wifi_internal_event_dispatcher_lite.h" +#include "wifi_logger.h" +#include "wifi_permission_helper.h" +#include "wifi_errcode.h" +#include "wifi_common_event_helper.h" + +DEFINE_WIFILOG_LABEL("WifiInternalEventDispatcher"); + +namespace OHOS { +namespace Wifi { +WifiInternalEventDispatcher &WifiInternalEventDispatcher::GetInstance() +{ + static WifiInternalEventDispatcher gWifiEventBroadcast; + return gWifiEventBroadcast; +} + +WifiInternalEventDispatcher::WifiInternalEventDispatcher() : mRunFlag(true) +{} + +WifiInternalEventDispatcher::~WifiInternalEventDispatcher() +{} + +int WifiInternalEventDispatcher::Init() +{ + /* first init system notify service client here ! */ + + mBroadcastThread = std::thread(WifiInternalEventDispatcher::Run, std::ref(*this)); + return 0; +} + +int WifiInternalEventDispatcher::SendSystemNotifyMsg() /* parameters */ +{ + return 0; +} + +int WifiInternalEventDispatcher::SetSingleStaCallback(const std::shared_ptr &callback) +{ + mStaSingleCallback = callback; + return 0; +} + +std::shared_ptr WifiInternalEventDispatcher::GetSingleStaCallback() const +{ + return mStaSingleCallback; +} + +int WifiInternalEventDispatcher::SetSingleScanCallback(const std::shared_ptr &callback) +{ + mScanSingleCallback = callback; + return 0; +} + +std::shared_ptr WifiInternalEventDispatcher::GetSingleScanCallback() const +{ + return mScanSingleCallback; +} + +int WifiInternalEventDispatcher::AddBroadCastMsg(const WifiEventCallbackMsg &msg) +{ + WIFI_LOGD("WifiInternalEventDispatcher::AddBroadCastMsg, msgcode %{public}d", msg.msgCode); + { + std::unique_lock lock(mMutex); + mEventQue.push_back(msg); + } + mCondition.notify_one(); + return 0; +} + +void WifiInternalEventDispatcher::Exit() +{ + if (!mRunFlag) { + return; + } + mRunFlag = false; + mCondition.notify_one(); + if (mBroadcastThread.joinable()) { + mBroadcastThread.join(); + } +} + +void WifiInternalEventDispatcher::DealStaCallbackMsg( + WifiInternalEventDispatcher &instance, const WifiEventCallbackMsg &msg) +{ + WIFI_LOGI("WifiInternalEventDispatcher:: Deal Sta Event Callback Msg: %{public}d", msg.msgCode); + + switch (msg.msgCode) { + case WIFI_CBK_MSG_STATE_CHANGE: + WifiInternalEventDispatcher::PublishWifiStateChangedEvent(msg.msgData); + break; + case WIFI_CBK_MSG_CONNECTION_CHANGE: + WifiInternalEventDispatcher::PublishConnStateChangedEvent(msg.msgData, msg.linkInfo); + break; + case WIFI_CBK_MSG_RSSI_CHANGE: + WifiInternalEventDispatcher::PublishRssiValueChangedEvent(msg.msgData); + break; + case WIFI_CBK_MSG_STREAM_DIRECTION: + break; + case WIFI_CBK_MSG_WPS_STATE_CHANGE: + break; + default: + break; + } + + auto callback = instance.GetSingleStaCallback(); + if (callback != nullptr) { + switch (msg.msgCode) { + case WIFI_CBK_MSG_STATE_CHANGE: + callback->OnWifiStateChanged(msg.msgData); + break; + case WIFI_CBK_MSG_CONNECTION_CHANGE: + callback->OnWifiConnectionChanged(msg.msgData, msg.linkInfo); + break; + case WIFI_CBK_MSG_RSSI_CHANGE: + callback->OnWifiRssiChanged(msg.msgData); + break; + case WIFI_CBK_MSG_STREAM_DIRECTION: + callback->OnStreamChanged(msg.msgData); + break; + case WIFI_CBK_MSG_WPS_STATE_CHANGE: + callback->OnWifiWpsStateChanged(msg.msgData, msg.pinCode); + break; + default: + WIFI_LOGI("UnKnown msgcode %{public}d", msg.msgCode); + break; + } + } + return; +} + +void WifiInternalEventDispatcher::DealScanCallbackMsg( + WifiInternalEventDispatcher &instance, const WifiEventCallbackMsg &msg) +{ + WIFI_LOGI("WifiInternalEventDispatcher:: Deal Scan Event Callback Msg: %{public}d", msg.msgCode); + + switch (msg.msgCode) { + case WIFI_CBK_MSG_SCAN_STATE_CHANGE: + WifiCommonEventHelper::PublishScanStateChangedEvent(msg.msgData, "OnScanStateChanged"); + break; + default: + WIFI_LOGI("UnKnown msgcode %{public}d", msg.msgCode); + break; + } + + auto callback = instance.GetSingleScanCallback(); + if (callback != nullptr) { + switch (msg.msgCode) { + case WIFI_CBK_MSG_SCAN_STATE_CHANGE: + callback->OnWifiScanStateChanged(msg.msgData); + break; + default: + break; + } + } + return; +} + +void WifiInternalEventDispatcher::PublishConnStateChangedEvent(int state, const WifiLinkedInfo &info) +{ + std::string eventData = "Other"; + switch (state) { + case int(OHOS::Wifi::ConnState::CONNECTING): + eventData = "Connecting"; + break; + case int(OHOS::Wifi::ConnState::CONNECTED): + eventData = "ApConnected"; + break; + case int(OHOS::Wifi::ConnState::DISCONNECTING): + eventData = "Disconnecting"; + break; + case int(OHOS::Wifi::ConnState::DISCONNECTED): + eventData = "Disconnected"; + break; + default: { + eventData = "UnknownState"; + break; + } + } + if (!WifiCommonEventHelper::PublishConnStateChangedEvent(state, eventData)) { + WIFI_LOGE("failed to publish connection state changed event!"); + return; + } + WIFI_LOGD("publish connection state changed event."); +} + +void WifiInternalEventDispatcher::PublishRssiValueChangedEvent(int state) +{ + if (!WifiCommonEventHelper::PublishRssiValueChangedEvent(state, "OnRssiValueChanged")) { + WIFI_LOGE("failed to publish rssi value changed event!"); + return; + } + WIFI_LOGD("publish rssi value changed event."); +} + +void WifiInternalEventDispatcher::PublishWifiStateChangedEvent(int state) +{ + if (!WifiCommonEventHelper::PublishPowerStateChangeEvent(state, "OnWifiPowerStateChanged")) { + WIFI_LOGE("failed to publish wifi state changed event!"); + return; + } + WIFI_LOGD("publish wifi state changed event."); +} + +void WifiInternalEventDispatcher::Run(WifiInternalEventDispatcher &instance) +{ + while (instance.mRunFlag) { + std::unique_lock lock(instance.mMutex); + while (instance.mEventQue.empty() && instance.mRunFlag) { + instance.mCondition.wait(lock); + } + if (!instance.mRunFlag) { + break; + } + WifiEventCallbackMsg msg = instance.mEventQue.front(); + instance.mEventQue.pop_front(); + lock.unlock(); + WIFI_LOGD("WifiInternalEventDispatcher::Run broad cast a msg %{public}d", msg.msgCode); + if (msg.msgCode >= WIFI_CBK_MSG_STATE_CHANGE && msg.msgCode <= WIFI_CBK_MSG_WPS_STATE_CHANGE) { + DealStaCallbackMsg(instance, msg); + } else if (msg.msgCode == WIFI_CBK_MSG_SCAN_STATE_CHANGE) { + DealScanCallbackMsg(instance, msg); + } else { + WIFI_LOGI("UnKnown msgcode %{public}d", msg.msgCode); + } + } + return; +} +} // namespace Wifi +} // namespace OHOS \ No newline at end of file diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher_lite.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher_lite.h new file mode 100644 index 0000000..bcb1672 --- /dev/null +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher_lite.h @@ -0,0 +1,103 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OHOS_WIFI_INTERNAL_EVENT_DISPATCHER_LITE_H +#define OHOS_WIFI_INTERNAL_EVENT_DISPATCHER_LITE_H + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "wifi_internal_msg.h" +#include "i_wifi_device_callback.h" +#include "i_wifi_scan_callback.h" + +namespace OHOS { +namespace Wifi { +class WifiInternalEventDispatcher { +public: + WifiInternalEventDispatcher(); + ~WifiInternalEventDispatcher(); + + /** + * @Description Init WifiInternalEventDispatcher object + * + * @return int - init result, when 0 means success, other means some fails happened + */ + int Init(); + + /** + * @Description Send system motify message + * + * @return int - init result, when 0 means success, other means some fails happened + */ + int SendSystemNotifyMsg(void); + + /** + * @Description Add broadcast events to the internal event broadcast queue + * + * @param msg - callback msg + * @return int - 0 success + */ + int AddBroadCastMsg(const WifiEventCallbackMsg &msg); + + /** + * @Description Exit event broadcast thread + * + */ + void Exit(); + + /** + * @Description Event broadcast thread processing function + * 1. Obtain broadcast events from the internal event queue + * mEventQue + * 2. Send broadcast events to handles in the application + * registration list one by one. The BpWifiCallbackService + * method will eventually be called + * + * @param p WifiInternalEventDispatcher this Object + * @return void* - nullptr, not care this now + */ + static void Run(WifiInternalEventDispatcher &instance); + + static WifiInternalEventDispatcher &GetInstance(); + int SetSingleStaCallback(const std::shared_ptr &callback); + std::shared_ptr GetSingleStaCallback() const; + int SetSingleScanCallback(const std::shared_ptr &callback); + std::shared_ptr GetSingleScanCallback() const; +private: + static void DealStaCallbackMsg(WifiInternalEventDispatcher &pInstance, const WifiEventCallbackMsg &msg); + static void DealScanCallbackMsg(WifiInternalEventDispatcher &pInstance, const WifiEventCallbackMsg &msg); + static void PublishConnStateChangedEvent(int state, const WifiLinkedInfo &info); + static void PublishWifiStateChangedEvent(int state); + static void PublishRssiValueChangedEvent(int state); +private: + std::thread mBroadcastThread; + std::atomic mRunFlag; + std::mutex mMutex; + std::condition_variable mCondition; + std::deque mEventQue; + std::shared_ptr mStaSingleCallback; + std::shared_ptr mScanSingleCallback; +}; +} // namespace Wifi +} // namespace OHOS +#endif diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp index 9c47f21..d5bb5e8 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp @@ -20,7 +20,12 @@ #include "wifi_chip_hal_interface.h" #include "wifi_auth_center.h" #include "wifi_config_center.h" +#ifdef OHOS_ARCH_LITE +#include +#include "wifi_internal_event_dispatcher_lite.h" +#else #include "wifi_internal_event_dispatcher.h" +#endif #include "wifi_service_manager.h" #include "wifi_settings.h" #include "wifi_common_event_helper.h" @@ -89,6 +94,40 @@ void WifiManager::AutoStartStaService(void) return; } +#ifdef OHOS_ARCH_LITE +void WifiManager::AutoStartStaServiceThread(void) +{ + DIR *dir = nullptr; + struct dirent *dent = nullptr; + int currentWaitTime = 0; + const int sleepTime = 1; + const int maxWaitTimes = 10; + + dir = opendir("/sys/class/net"); + if (dir == nullptr) { + AutoStartStaService(); + return; + } + while (currentWaitTime < maxWaitTimes) { + while ((dent = readdir(dir)) != nullptr) { + if (dent->d_name[0] == '.') { + continue; + } + if (strncmp(dent->d_name, "wlan", strlen("wlan")) == 0) { + closedir(dir); + AutoStartStaService(); + return; + } + } + sleep(sleepTime); + currentWaitTime++; + } + closedir(dir); + AutoStartStaService(); +} +#endif + +#ifdef FEATURE_P2P_SUPPORT void WifiManager::AutoStartP2pService(void) { WifiOprMidState p2pState = WifiConfigCenter::GetInstance().GetP2pMidState(); @@ -126,6 +165,7 @@ void WifiManager::AutoStartP2pService(void) } return; } +#endif void WifiManager::AutoStartScanService(void) { @@ -170,8 +210,12 @@ int WifiManager::Init() mInitStatus = INIT_OK; InitStaCallback(); InitScanCallback(); +#ifdef FEATURE_AP_SUPPORT InitApCallback(); +#endif +#ifdef FEATURE_P2P_SUPPORT InitP2pCallback(); +#endif if (!WifiConfigCenter::GetInstance().GetSupportedBandChannel()) { WIFI_LOGE("Failed to get current chip supported band and channel!"); } @@ -183,8 +227,15 @@ int WifiManager::Init() } if (WifiConfigCenter::GetInstance().GetStaLastRunState()) { /* Automatic startup upon startup */ WIFI_LOGE("AutoStartStaApService"); +#ifdef FEATURE_P2P_SUPPORT AutoStartP2pService(); +#endif +#ifdef OHOS_ARCH_LITE + std::thread startStaSrvThread(WifiManager::AutoStartStaServiceThread); + startStaSrvThread.detach(); +#else AutoStartStaService(); +#endif } else { /** * The sta service automatically starts upon startup. After the sta @@ -254,6 +305,7 @@ void WifiManager::CloseStaService(void) return; } +#ifdef FEATURE_AP_SUPPORT void WifiManager::CloseApService(void) { WIFI_LOGD("close ap service"); @@ -266,6 +318,7 @@ void WifiManager::CloseApService(void) WifiInternalEventDispatcher::GetInstance().AddBroadCastMsg(cbMsg); return; } +#endif void WifiManager::CloseScanService(void) { @@ -275,6 +328,7 @@ void WifiManager::CloseScanService(void) return; } +#ifdef FEATURE_P2P_SUPPORT void WifiManager::CloseP2pService(void) { WIFI_LOGD("close p2p service"); @@ -287,6 +341,7 @@ void WifiManager::CloseP2pService(void) WifiInternalEventDispatcher::GetInstance().AddBroadCastMsg(cbMsg); return; } +#endif void WifiManager::DealCloseServiceMsg(WifiManager &manager) { @@ -307,12 +362,16 @@ void WifiManager::DealCloseServiceMsg(WifiManager &manager) case WifiCloseServiceCode::SCAN_SERVICE_CLOSE: CloseScanService(); break; +#ifdef FEATURE_AP_SUPPORT case WifiCloseServiceCode::AP_SERVICE_CLOSE: CloseApService(); break; +#endif +#ifdef FEATURE_P2P_SUPPORT case WifiCloseServiceCode::P2P_SERVICE_CLOSE: CloseP2pService(); break; +#endif case WifiCloseServiceCode::SERVICE_THREAD_EXIT: WIFI_LOGD("DealCloseServiceMsg thread exit!"); return; @@ -577,6 +636,7 @@ void WifiManager::DealScanInfoNotify(std::vector &results) } } +#ifdef FEATURE_AP_SUPPORT void WifiManager::InitApCallback(void) { mApCallback.OnApStateChangedEvent = DealApStateChanged; @@ -625,7 +685,9 @@ void WifiManager::DealApGetStaLeave(const StationInfo &info) WifiCommonEventHelper::PublishApStaLeaveEvent(0, "ApStaLeaved"); return; } +#endif +#ifdef FEATURE_P2P_SUPPORT void WifiManager::InitP2pCallback(void) { mP2pCallback.OnP2pStateChangedEvent = DealP2pStateChanged; @@ -727,6 +789,7 @@ void WifiManager::DealP2pActionResult(P2pActionCallback action, ErrCode code) WifiInternalEventDispatcher::GetInstance().AddBroadCastMsg(cbMsg); return; } +#endif } // namespace Wifi } // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.h index 25f390e..fa08416 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.h @@ -26,8 +26,12 @@ #include "wifi_internal_msg.h" #include "sta_service_callback.h" #include "iscan_service_callbacks.h" +#ifdef FEATURE_AP_SUPPORT #include "i_ap_service_callbacks.h" +#endif +#ifdef FEATURE_P2P_SUPPORT #include "ip2p_service_callbacks.h" +#endif namespace OHOS { namespace Wifi { @@ -90,19 +94,23 @@ public: */ IScanSerivceCallbacks GetScanCallback(void); +#ifdef FEATURE_AP_SUPPORT /** * @Description Get the ap callback object. * * @return IApServiceCallbacks - return mApCallback */ IApServiceCallbacks GetApCallback(void); +#endif +#ifdef FEATURE_P2P_SUPPORT /** * @Description Get the p2p callback object. * * @return IP2pServiceCallbacks - return mP2pCallback */ IP2pServiceCallbacks GetP2pCallback(void); +#endif /** * @Description Get supported features @@ -125,14 +133,22 @@ private: void PushServiceCloseMsg(WifiCloseServiceCode code); void InitStaCallback(void); void InitScanCallback(void); +#ifdef FEATURE_AP_SUPPORT void InitApCallback(void); +#endif +#ifdef FEATURE_P2P_SUPPORT void InitP2pCallback(void); +#endif InitStatus GetInitStatus(); static void DealCloseServiceMsg(WifiManager &manager); static void CloseStaService(void); +#ifdef FEATURE_AP_SUPPORT static void CloseApService(void); +#endif static void CloseScanService(void); +#ifdef FEATURE_P2P_SUPPORT static void CloseP2pService(void); +#endif static void DealStaOpenRes(OperateResState state); static void DealStaCloseRes(OperateResState state); static void DealStaConnChanged(OperateResState state, const WifiLinkedInfo &info); @@ -145,9 +161,12 @@ private: static void DealScanCloseRes(void); static void DealScanFinished(int state); static void DealScanInfoNotify(std::vector &results); +#ifdef FEATURE_AP_SUPPORT static void DealApStateChanged(ApState bState); static void DealApGetStaJoin(const StationInfo &info); static void DealApGetStaLeave(const StationInfo &info); +#endif +#ifdef FEATURE_P2P_SUPPORT static void DealP2pStateChanged(P2pState bState); static void DealP2pPeersChanged(const std::vector &vPeers); static void DealP2pServiceChanged(const std::vector &vServices); @@ -156,9 +175,15 @@ private: static void DealP2pDiscoveryChanged(bool bState); static void DealP2pGroupsChanged(void); static void DealP2pActionResult(P2pActionCallback action, ErrCode code); +#endif static void AutoStartStaService(void); +#ifdef FEATURE_P2P_SUPPORT static void AutoStartP2pService(void); +#endif static void AutoStartScanService(void); +#ifdef OHOS_ARCH_LITE + static void AutoStartStaServiceThread(void); +#endif private: std::thread mCloseServiceThread; @@ -167,8 +192,12 @@ private: std::deque mEventQue; StaServiceCallback mStaCallback; IScanSerivceCallbacks mScanCallback; +#ifdef FEATURE_AP_SUPPORT IApServiceCallbacks mApCallback; +#endif +#ifdef FEATURE_P2P_SUPPORT IP2pServiceCallbacks mP2pCallback; +#endif InitStatus mInitStatus; long mSupportedFeatures; }; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sa_service_lite.c b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sa_service_lite.c new file mode 100644 index 0000000..5a37319 --- /dev/null +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sa_service_lite.c @@ -0,0 +1,96 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include + +#include "iproxy_server.h" +#include "ohos_errno.h" +#include "ohos_init.h" +#include "samgr_lite.h" +#include "service.h" +#include "wifi_ipc_lite_adapter.h" +#include "wifi_log.h" + +static const int STACK_SIZE = 0x800; +static const int QUEUE_SIZE = 20; + +typedef struct WifiSaInterface { + INHERIT_SERVER_IPROXY; +} WifiSaInterface; + +typedef struct WifiSaService { + INHERIT_SERVICE; + INHERIT_IUNKNOWNENTRY(WifiSaInterface); + Identity identity; +} WifiSaService; + +static const char *GetName(Service *service) +{ + return WIFI_SERVICE_LITE; +} + +static BOOL Initialize(Service *service, Identity identity) +{ + if (service == NULL) { + return FALSE; + } + WifiSaService *wifiService = (WifiSaService *)service; + wifiService->identity = identity; + return TRUE; +} + +static BOOL MessageHandle(Service *service, Request *msg) +{ + return TRUE; +} + +static TaskConfig GetTaskConfig(Service *service) +{ + TaskConfig config = {LEVEL_HIGH, PRI_NORMAL, STACK_SIZE, QUEUE_SIZE, SINGLE_TASK}; + return config; +} + +static int Invoke(IServerProxy *proxy, int funcId, void *origin, IpcIo *req, IpcIo *reply) +{ + LOGI("[WifiSaServer] begin to call Invoke, funcId is %{public}d", funcId); + return EC_SUCCESS; +} + +static WifiSaService g_wifiSaService = { + .GetName = GetName, + .Initialize = Initialize, + .MessageHandle = MessageHandle, + .GetTaskConfig = GetTaskConfig, + SERVER_IPROXY_IMPL_BEGIN, + .Invoke = Invoke, + IPROXY_END, +}; + +static void Init(void) +{ + LOGI("[WifiSaServer] Init start."); + BOOL ret; + ret = SAMGR_GetInstance()->RegisterService((Service *)&g_wifiSaService); + if (ret == FALSE) { + LOGE("[WifiSaServer] register service fail."); + return; + } + ret = SAMGR_GetInstance()->RegisterDefaultFeatureApi(WIFI_SERVICE_LITE, GET_IUNKNOWN(g_wifiSaService)); + if (ret == FALSE) { + LOGE("[WifiSaServer] register default api fail."); + } +} +SYSEX_SERVICE_INIT(Init); \ No newline at end of file diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn index 509ec19..a9fe9dc 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn @@ -11,67 +11,101 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//build/ohos.gni") -import("//foundation/communication/wifi/wifi/wifi.gni") +if (defined(ohos_lite)) { + import("//build/lite/config/component/lite_component.gni") + import("//foundation/communication/wifi/wifi/wifi_lite.gni") +} else { + import("//build/ohos.gni") + import("//foundation/communication/wifi/wifi/wifi.gni") +} + +local_base_sources = [ + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log/log_helper.c", + "../common/handler.cpp", + "../common/internal_message.cpp", + "../common/message_queue.cpp", + "../common/state.cpp", + "../common/state_machine.cpp", + "scan_interface.cpp", + "scan_monitor.cpp", + "scan_service.cpp", + "scan_state_machine.cpp", +] + +local_base_include_dirs = [ + "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces", + "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/interface", + "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/net_conf", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta", +] + +if (defined(ohos_lite)) { + shared_library("wifi_scan_service") { + sources = local_base_sources + include_dirs = local_base_include_dirs + include_dirs += [ + "//base/hiviewdfx/hilog_lite/interfaces/native/innerkits", + "//third_party/bounds_checking_function/include", + ] + + deps = [ + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_service_base", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", + "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", + "//third_party/bounds_checking_function:libsec_shared", + ] -ohos_shared_library("wifi_scan_service") { - install_enable = true - sources = [ - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log/log_helper.c", - "../common/handler.cpp", - "../common/internal_message.cpp", - "../common/message_queue.cpp", - "../common/state.cpp", - "../common/state_machine.cpp", - "scan_interface.cpp", - "scan_monitor.cpp", - "scan_service.cpp", - "scan_state_machine.cpp", - ] + defines = [ "OHOS_ARCH_LITE" ] + configs -= [ "//build/lite/config:language_cpp" ] + cflags_cc = [ + "-std=c++17", + "-fno-rtti", + ] + ldflags = [ + "-fPIC", + "-Wl,-E", + ] + } +} else { + ohos_shared_library("wifi_scan_service") { + install_enable = true + sources = local_base_sources - include_dirs = [ - "//utils/native/base/include", - "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces", - "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/interface", - "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/net_conf", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta", - "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", - "$WIFI_ROOT_DIR/services/wifi_standard/depends/include/hardware/libhardware/include", - "$WIFI_ROOT_DIR/services/wifi_standard/depends/include/system/core/include", - "$WIFI_ROOT_DIR/services/wifi_standard/depends/include/frameworks/native/include", - "$WIFI_ROOT_DIR/services/wifi_standard/depends/include/system/core/libutils/include", - "$WIFI_ROOT_DIR/services/wifi_standard/depends/include/system/core/base/include", - "$WIFI_ROOT_DIR/services/wifi_standard/depends/include/system/libbase/include", - ] + include_dirs = local_base_include_dirs + include_dirs += [ + "//utils/native/base/include", + "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", + ] - deps = [ - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", - "//utils/native/base:utils", - ] + deps = [ + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", + "//utils/native/base:utils", + ] - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] - cflags_cc = [ - "-std=c++17", - "-fno-rtti", - ] + external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + cflags_cc = [ + "-std=c++17", + "-fno-rtti", + ] - ldflags = [ - "-fPIC", - "-Wl,-E", - ] + ldflags = [ + "-fPIC", + "-Wl,-E", + ] - part_name = "wifi" - subsystem_name = "communication" + part_name = "wifi" + subsystem_name = "communication" + } } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_callback_proxy.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_callback_proxy.h index 23df160..1bc3cec 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_callback_proxy.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_callback_proxy.h @@ -16,20 +16,35 @@ #define OHOS_I_WIFI_SCAN_CALLBACK_PROXY_H #include "i_wifi_scan_callback.h" +#ifdef OHOS_ARCH_LITE +#include "serializer.h" +#else #include "iremote_proxy.h" +#endif namespace OHOS { namespace Wifi { +#ifdef OHOS_ARCH_LITE +class WifiScanCallbackProxy : public IWifiScanCallback { +public: + explicit WifiScanCallbackProxy(SvcIdentity *sid); +#else class WifiScanCallbackProxy : public IRemoteProxy { public: explicit WifiScanCallbackProxy(const sptr &impl); +#endif virtual ~WifiScanCallbackProxy(); void OnWifiScanStateChanged(int state) override; private: +#ifdef OHOS_ARCH_LITE + SvcIdentity *sid_; + static const int DEFAULT_IPC_SIZE = 128; +#else static inline BrokerDelegator g_delegator; +#endif }; } // namespace Wifi } // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_callback_proxy_lite.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_callback_proxy_lite.cpp new file mode 100644 index 0000000..e062653 --- /dev/null +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_callback_proxy_lite.cpp @@ -0,0 +1,59 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "wifi_scan_callback_proxy.h" +#include "define.h" +#include "liteipc_adapter.h" +#include "wifi_logger.h" + +DEFINE_WIFILOG_SCAN_LABEL("WifiScanCallbackProxyLite"); + +namespace OHOS { +namespace Wifi { +WifiScanCallbackProxy::WifiScanCallbackProxy(SvcIdentity *sid) : sid_(sid) +{} + +WifiScanCallbackProxy::~WifiScanCallbackProxy() +{ + if (sid_ != nullptr) { +#ifdef __LINUX__ + BinderRelease(sid_->ipcContext, sid_->handle); +#endif + free(sid_); + sid_ = nullptr; + } +} + +void WifiScanCallbackProxy::OnWifiScanStateChanged(int state) +{ + WIFI_LOGD("OnWifiScanStateChanged, state:%{public}d", state); + IpcIo data; + uint8_t buff[DEFAULT_IPC_SIZE]; + IpcIoInit(&data, buff, DEFAULT_IPC_SIZE, 0); + IpcIoPushInt32(&data, 0); + IpcIoPushInt32(&data, state); + int ret = Transact(nullptr, *sid_, WIFI_CBK_CMD_SCAN_STATE_CHANGE, &data, nullptr, LITEIPC_FLAG_ONEWAY, nullptr); + switch (ret) { + case LITEIPC_OK: + WIFI_LOGD("OnWifiScanStateChanged callback sucessed!"); + break; + default: { + WIFI_LOGE("OnWifiScanStateChanged,connect done failed, error: %{public}d!", ret); + break; + } + } +} +} // namespace Wifi +} // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_feature_lite.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_feature_lite.cpp new file mode 100644 index 0000000..b2ba42e --- /dev/null +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_feature_lite.cpp @@ -0,0 +1,112 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include + +#include "iproxy_server.h" +#include "ohos_errno.h" +#include "ohos_init.h" +#include "samgr_lite.h" +#include "service.h" +#include "wifi_log.h" +#include "wifi_ipc_lite_adapter.h" +#include "wifi_scan_service_impl.h" + +using namespace OHOS::Wifi; + +static std::shared_ptr g_scanServiceImpl = WifiScanServiceImpl::GetInstance(); + +typedef struct WifiScanApi { + INHERIT_SERVER_IPROXY; +} WifiScanApi; + +typedef struct WifiScanFeature { + INHERIT_FEATURE; + INHERIT_IUNKNOWNENTRY(WifiScanApi); + Identity identity; + Service *parent; +} WifiScanFeature; + +static const char *GetName(Feature *feature) +{ + return WIFI_FEATRUE_SCAN; +} + +static void OnInitialize(Feature *feature, Service *parent, Identity identity) +{ + if (feature != NULL) { + WifiScanFeature *scanFeature = (WifiScanFeature *)feature; + scanFeature->identity = identity; + scanFeature->parent = parent; + } + if (g_scanServiceImpl != NULL) { + g_scanServiceImpl->OnStart(); + } +} + +static void OnStop(Feature *feature, Identity identity) +{ + if (g_scanServiceImpl != NULL) { + g_scanServiceImpl->OnStop(); + } + if (feature != NULL) { + WifiScanFeature *scanFeature = (WifiScanFeature *)feature; + scanFeature->identity.queueId = NULL; + scanFeature->identity.featureId = -1; + scanFeature->identity.serviceId = -1; + } +} + +static BOOL OnMessage(Feature *feature, Request *request) +{ + return TRUE; +} + +static int Invoke(IServerProxy *proxy, int funcId, void *origin, IpcIo *req, IpcIo *reply) +{ + LOGI("[WifiScanFeature] begin to call Invoke, funcId is %{public}d", funcId); + if (g_scanServiceImpl != NULL) { + return g_scanServiceImpl->OnRemoteRequest(funcId, req, reply); + } + return EC_FAILURE; +} + +static WifiScanFeature g_scanFeature = { + .GetName = GetName, + .OnInitialize = OnInitialize, + .OnStop = OnStop, + .OnMessage = OnMessage, + SERVER_IPROXY_IMPL_BEGIN, + .Invoke = Invoke, + IPROXY_END, + .identity = {-1, -1, NULL}, +}; + +static void Init(void) +{ + LOGI("[WifiScanFeature] Init start."); + BOOL ret = SAMGR_GetInstance()->RegisterFeature(WIFI_SERVICE_LITE, (Feature *)&g_scanFeature); + if (ret == FALSE) { + LOGE("[WifiScanFeature] register feature fail."); + return; + } + ret = SAMGR_GetInstance()->RegisterFeatureApi(WIFI_SERVICE_LITE, + WIFI_FEATRUE_SCAN, GET_IUNKNOWN(g_scanFeature)); + if (ret == FALSE) { + LOGE("[WifiScanFeature] register feature api fail."); + } +} +SYSEX_FEATURE_INIT(Init); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_service_impl.cpp index 5ed7ad4..2954dd1 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_service_impl.cpp @@ -14,13 +14,19 @@ */ #include "wifi_scan_service_impl.h" +#ifndef OHOS_ARCH_LITE #include +#endif #include "define.h" #include "permission_def.h" #include "wifi_auth_center.h" #include "wifi_config_center.h" #include "wifi_dumper.h" +#ifdef OHOS_ARCH_LITE +#include "wifi_internal_event_dispatcher_lite.h" +#else #include "wifi_internal_event_dispatcher.h" +#endif #include "wifi_internal_msg.h" #include "wifi_logger.h" #include "wifi_manager.h" @@ -33,14 +39,23 @@ DEFINE_WIFILOG_SCAN_LABEL("WifiScanServiceImpl"); namespace OHOS { namespace Wifi { std::mutex WifiScanServiceImpl::g_instanceLock; +#ifdef OHOS_ARCH_LITE +std::shared_ptr WifiScanServiceImpl::g_instance; +std::shared_ptr WifiScanServiceImpl::GetInstance() +#else sptr WifiScanServiceImpl::g_instance; const bool REGISTER_RESULT = SystemAbility::MakeAndRegisterAbility(WifiScanServiceImpl::GetInstance().GetRefPtr()); sptr WifiScanServiceImpl::GetInstance() +#endif { if (g_instance == nullptr) { std::lock_guard autoLock(g_instanceLock); if (g_instance == nullptr) { +#ifdef OHOS_ARCH_LITE + auto service = std::make_shared(); +#else auto service = new (std::nothrow) WifiScanServiceImpl; +#endif g_instance = service; } } @@ -48,7 +63,11 @@ sptr WifiScanServiceImpl::GetInstance() } WifiScanServiceImpl::WifiScanServiceImpl() +#ifdef OHOS_ARCH_LITE + : mPublishFlag(false), mState(ServiceRunningState::STATE_NOT_START) +#else : SystemAbility(WIFI_SCAN_ABILITY_ID, true), mPublishFlag(false), mState(ServiceRunningState::STATE_NOT_START) +#endif {} WifiScanServiceImpl::~WifiScanServiceImpl() @@ -80,7 +99,11 @@ void WifiScanServiceImpl::OnStop() bool WifiScanServiceImpl::Init() { if (!mPublishFlag) { +#ifdef OHOS_ARCH_LITE + bool ret = true; +#else bool ret = Publish(WifiScanServiceImpl::GetInstance()); +#endif if (!ret) { WIFI_LOGE("Failed to publish scan service!"); return false; @@ -204,7 +227,11 @@ ErrCode WifiScanServiceImpl::GetScanInfoList(std::vector &result) return WIFI_OPT_SUCCESS; } +#ifdef OHOS_ARCH_LITE +ErrCode WifiScanServiceImpl::RegisterCallBack(const std::shared_ptr &callback) +#else ErrCode WifiScanServiceImpl::RegisterCallBack(const sptr &callback) +#endif { WIFI_LOGI("WifiScanServiceImpl::RegisterCallBack!"); WifiInternalEventDispatcher::GetInstance().SetSingleScanCallback(callback); @@ -244,6 +271,7 @@ void WifiScanServiceImpl::SaBasicDump(std::string& result) result += strRunning + "\n"; } +#ifndef OHOS_ARCH_LITE int32_t WifiScanServiceImpl::Dump(int32_t fd, const std::vector& args) { std::vector vecArgs; @@ -260,5 +288,6 @@ int32_t WifiScanServiceImpl::Dump(int32_t fd, const std::vector& } return ERR_OK; } +#endif } // namespace Wifi } // namespace OHOS \ No newline at end of file diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_service_impl.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_service_impl.h index b46ecf9..3098998 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_service_impl.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_service_impl.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,9 +16,13 @@ #ifndef OHOS_WIFI_SCAN_SERVICE_H #define OHOS_WIFI_SCAN_SERVICE_H +#ifdef OHOS_ARCH_LITE +#include "wifi_scan_stub_lite.h" +#else #include "system_ability.h" #include "wifi_scan_stub.h" #include "iremote_object.h" +#endif namespace OHOS { namespace Wifi { @@ -26,26 +30,44 @@ enum ServiceRunningState { STATE_NOT_START, STATE_RUNNING }; + +#ifdef OHOS_ARCH_LITE +class WifiScanServiceImpl : public WifiScanStub { +#else class WifiScanServiceImpl : public SystemAbility, public WifiScanStub { DECLARE_SYSTEM_ABILITY(WifiScanServiceImpl); +#endif public: WifiScanServiceImpl(); virtual ~WifiScanServiceImpl(); +#ifdef OHOS_ARCH_LITE + static std::shared_ptr GetInstance(); + + void OnStart(); + void OnStop(); +#else static sptr GetInstance(); void OnStart() override; void OnStop() override; +#endif ErrCode SetScanControlInfo(const ScanControlInfo &info) override; ErrCode Scan() override; ErrCode AdvanceScan(const WifiScanParams ¶ms) override; ErrCode IsWifiClosedScan(bool &bOpen) override; ErrCode GetScanInfoList(std::vector &result) override; +#ifdef OHOS_ARCH_LITE + ErrCode RegisterCallBack(const std::shared_ptr &callback) override; +#else ErrCode RegisterCallBack(const sptr &callback) override; +#endif ErrCode GetSupportedFeatures(long &features) override; +#ifndef OHOS_ARCH_LITE int32_t Dump(int32_t fd, const std::vector& args) override; +#endif private: bool Init(); @@ -53,7 +75,11 @@ private: static void SaBasicDump(std::string& result); private: +#ifdef OHOS_ARCH_LITE + static std::shared_ptr g_instance; +#else static sptr g_instance; +#endif static std::mutex g_instanceLock; bool mPublishFlag = false; ServiceRunningState mState; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_stub_lite.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_stub_lite.cpp new file mode 100644 index 0000000..8ef9648 --- /dev/null +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_stub_lite.cpp @@ -0,0 +1,259 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "wifi_scan_stub_lite.h" +#include "define.h" +#include "liteipc_adapter.h" +#include "wifi_logger.h" +#include "wifi_msg.h" +#include "wifi_scan_callback_proxy.h" + +DEFINE_WIFILOG_SCAN_LABEL("WifiScanStubLite"); + +namespace OHOS { +namespace Wifi { +WifiScanStub::WifiScanStub() : callback_(nullptr) +{} + +WifiScanStub::~WifiScanStub() +{} + +int WifiScanStub::OnRemoteRequest(uint32_t code, IpcIo *req, IpcIo *reply) +{ + WIFI_LOGD("WifiScanStub::OnRemoteRequest,code:%{public}u", code); + if (req == nullptr || reply == nullptr) { + WIFI_LOGD("req:%{public}d, reply:%{public}d", req == nullptr, reply == nullptr); + return LITEIPC_EINVAL; + } + + int exception = IpcIoPopInt32(req); + if (exception) { + return WIFI_OPT_FAILED; + } + + int ret = -1; + switch (code) { + case WIFI_SVR_CMD_SET_SCAN_CONTROL_INFO: { + ret = OnSetScanControlInfo(code, req, reply); + break; + } + case WIFI_SVR_CMD_FULL_SCAN: { + ret = OnScan(code, req, reply); + break; + } + case WIFI_SVR_CMD_SPECIFIED_PARAMS_SCAN: { + ret = OnScanByParams(code, req, reply); + break; + } + case WIFI_SVR_CMD_IS_SCAN_ALWAYS_ACTIVE: { + ret = OnIsWifiClosedScan(code, req, reply); + break; + } + case WIFI_SVR_CMD_GET_SCAN_INFO_LIST: { + ret = OnGetScanInfoList(code, req, reply); + break; + } + case WIFI_SVR_CMD_REGISTER_SCAN_CALLBACK: { + ret = OnRegisterCallBack(code, req, reply); + break; + } + case WIFI_SVR_CMD_GET_SUPPORTED_FEATURES: { + ret = OnGetSupportedFeatures(code, req, reply); + break; + } + default: { + ret = -1; + } + } + return ret; +} + +std::shared_ptr WifiScanStub::GetCallback() const +{ + return callback_; +} + +int WifiScanStub::OnSetScanControlInfo(uint32_t code, IpcIo *req, IpcIo *reply) +{ + WIFI_LOGD("WifiScanStub run %{public}s code %{public}u", __func__, code); + constexpr int MAX_SIZE = 1024; + ScanControlInfo info; + int forbidListSize = IpcIoPopInt32(req); + if (forbidListSize > MAX_SIZE) { + IpcIoPushInt32(reply, 0); + IpcIoPushInt32(reply, WIFI_OPT_INVALID_PARAM); + return WIFI_OPT_INVALID_PARAM; + } + for (int i = 0; i < forbidListSize; i++) { + ScanForbidMode scanForbidMode; + scanForbidMode.scanScene = IpcIoPopInt32(req); + scanForbidMode.scanMode = static_cast(IpcIoPopInt32(req)); + scanForbidMode.forbidTime = IpcIoPopInt32(req); + scanForbidMode.forbidCount = IpcIoPopInt32(req); + info.scanForbidList.push_back(scanForbidMode); + } + + int intervalSize = IpcIoPopInt32(req); + if (intervalSize > MAX_SIZE) { + IpcIoPushInt32(reply, 0); + IpcIoPushInt32(reply, WIFI_OPT_INVALID_PARAM); + return WIFI_OPT_INVALID_PARAM; + } + for (int i = 0; i < intervalSize; i++) { + ScanIntervalMode scanIntervalMode; + scanIntervalMode.scanScene = IpcIoPopInt32(req); + scanIntervalMode.scanMode = static_cast(IpcIoPopInt32(req)); + scanIntervalMode.isSingle = IpcIoPopBool(req); + scanIntervalMode.intervalMode = static_cast(IpcIoPopInt32(req)); + scanIntervalMode.interval = IpcIoPopInt32(req); + scanIntervalMode.count = IpcIoPopInt32(req); + info.scanIntervalList.push_back(scanIntervalMode); + } + + ErrCode ret = SetScanControlInfo(info); + IpcIoPushInt32(reply, 0); + IpcIoPushInt32(reply, ret); + + return ret; +} + +int WifiScanStub::OnScan(uint32_t code, IpcIo *req, IpcIo *reply) +{ + WIFI_LOGD("WifiScanStub run %{public}s code %{public}u", __func__, code); + ErrCode ret = Scan(); + IpcIoPushInt32(reply, 0); + IpcIoPushInt32(reply, ret); + + return ret; +} + +int WifiScanStub::OnScanByParams(uint32_t code, IpcIo *req, IpcIo *reply) +{ + WIFI_LOGD("WifiScanStub run %{public}s code %{public}u", __func__, code); + size_t readLen; + constexpr int MAX_FREQS_SIZE = 512; + WifiScanParams params; + params.ssid = (char *)IpcIoPopString(req, &readLen); + params.bssid = (char *)IpcIoPopString(req, &readLen); + int size = IpcIoPopInt32(req); + if (size > MAX_FREQS_SIZE) { + IpcIoPushInt32(reply, 0); + IpcIoPushInt32(reply, WIFI_OPT_INVALID_PARAM); + return WIFI_OPT_INVALID_PARAM; + } + for (int i = 0; i < size; i++) { + int tmp = IpcIoPopInt32(req); + params.freqs.push_back(tmp); + } + params.band = IpcIoPopInt32(req); + + ErrCode ret = AdvanceScan(params); + IpcIoPushInt32(reply, 0); + IpcIoPushInt32(reply, ret); + + return ret; +} + +int WifiScanStub::OnIsWifiClosedScan(uint32_t code, IpcIo *req, IpcIo *reply) +{ + WIFI_LOGD("WifiScanStub run %{public}s code %{public}u", __func__, code); + bool bOpen = false; + ErrCode ret = IsWifiClosedScan(bOpen); + IpcIoPushInt32(reply, 0); + IpcIoPushInt32(reply, ret); + if (ret == WIFI_OPT_SUCCESS) { + IpcIoPushBool(reply, bOpen); + } + return ret; +} + +int WifiScanStub::OnGetScanInfoList(uint32_t code, IpcIo *req, IpcIo *reply) +{ + WIFI_LOGD("WifiScanStub run %{public}s code %{public}u", __func__, code); + std::vector result; + ErrCode ret = GetScanInfoList(result); + IpcIoPushInt32(reply, 0); + IpcIoPushInt32(reply, ret); + if (ret != WIFI_OPT_SUCCESS) { + return ret; + } + + unsigned int size = result.size(); + IpcIoPushInt32(reply, size); + for (unsigned int i = 0; i < size; ++i) { + IpcIoPushString(reply, result[i].bssid.c_str()); + IpcIoPushString(reply, result[i].ssid.c_str()); + IpcIoPushString(reply, result[i].capabilities.c_str()); + IpcIoPushInt32(reply, result[i].frequency); + IpcIoPushInt32(reply, result[i].rssi); + IpcIoPushInt64(reply, result[i].timestamp); + IpcIoPushInt32(reply, result[i].band); + IpcIoPushInt32(reply, static_cast(result[i].securityType)); + IpcIoPushInt32(reply, static_cast(result[i].channelWidth)); + IpcIoPushInt32(reply, result[i].centerFrequency0); + IpcIoPushInt32(reply, result[i].centerFrequency1); + IpcIoPushInt64(reply, result[i].features); + IpcIoPushInt32(reply, result[i].infoElems.size()); + for (unsigned int m = 0; m < result[i].infoElems.size(); ++m) { + IpcIoPushInt32(reply, result[i].infoElems[m].id); + IpcIoPushInt32(reply, result[i].infoElems[m].content.size()); + for (unsigned int n = 0; n < result[i].infoElems[m].content.size(); ++n) { + IpcIoPushInt8(reply, result[i].infoElems[m].content[n]); + } + } + } + return ret; +} + +int WifiScanStub::OnRegisterCallBack(uint32_t code, IpcIo *req, IpcIo *reply) +{ + WIFI_LOGD("run %{public}s code %{public}u", __func__, code); + ErrCode ret = WIFI_OPT_FAILED; + SvcIdentity *sid = IpcIoPopSvc(req); + if (sid == nullptr) { + WIFI_LOGE("sid is null"); + IpcIoPushInt32(reply, 0); + IpcIoPushInt32(reply, ret); + return ret; + } +#ifdef __LINUX__ + BinderAcquire(sid->ipcContext, sid->handle); +#endif + + callback_ = std::make_shared(sid); + WIFI_LOGD("create new WifiScanCallbackProxy!"); + ret = RegisterCallBack(callback_); + + IpcIoPushInt32(reply, 0); + IpcIoPushInt32(reply, ret); + return 0; +} + +int WifiScanStub::OnGetSupportedFeatures(uint32_t code, IpcIo *req, IpcIo *reply) +{ + WIFI_LOGD("WifiScanStub run %{public}s code %{public}u", __func__, code); + long features = 0; + int ret = GetSupportedFeatures(features); + IpcIoPushInt32(reply, 0); + IpcIoPushInt32(reply, ret); + + if (ret == WIFI_OPT_SUCCESS) { + IpcIoPushInt64(reply, features); + } + + return ret; +} +} // namespace Wifi +} // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_stub_lite.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_stub_lite.h new file mode 100644 index 0000000..c2c6b59 --- /dev/null +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_stub_lite.h @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OHOS_WIFI_SCAN_STUB_LITE_H +#define OHOS_WIFI_SCAN_STUB_LITE_H + +#include +#include "i_wifi_scan.h" +#include "i_wifi_scan_callback.h" +#include "serializer.h" + +namespace OHOS { +namespace Wifi { +class WifiScanStub : public IWifiScan { +public: + WifiScanStub(); + virtual ~WifiScanStub() override; + + virtual int OnRemoteRequest(uint32_t code, IpcIo *req, IpcIo *reply); + +protected: + std::shared_ptr GetCallback() const; + +private: + int OnSetScanControlInfo(uint32_t code, IpcIo *req, IpcIo *reply); + int OnScan(uint32_t code, IpcIo *req, IpcIo *reply); + int OnScanByParams(uint32_t code, IpcIo *req, IpcIo *reply); + int OnIsWifiClosedScan(uint32_t code, IpcIo *req, IpcIo *reply); + int OnGetScanInfoList(uint32_t code, IpcIo *req, IpcIo *reply); + int OnRegisterCallBack(uint32_t code, IpcIo *req, IpcIo *reply); + int OnGetSupportedFeatures(uint32_t code, IpcIo *req, IpcIo *reply); + + std::shared_ptr callback_; +}; +} // namespace Wifi +} // namespace OHOS +#endif diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_main_lite.c b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_main_lite.c new file mode 100644 index 0000000..f386fe1 --- /dev/null +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_main_lite.c @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include "samgr_lite.h" +#include "wifi_log.h" + +#undef LOG_TAG +#define LOG_TAG "wifi_service_main_lite" + +#define SLEEP_TIME 1 + +void __attribute__((weak)) OHOS_SystemInit(void) +{ +#ifdef __LINUX__ + sleep(SLEEP_TIME); // delay start to make sure register success +#endif + SAMGR_Bootstrap(); +}; + +int main(int argc, char *argv[]) +{ + LOGD("Wifi service system init enter"); + OHOS_SystemInit(); + LOGD("Wifi service system init exit"); + pause(); +} diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.cpp index 40a6f06..2952899 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.cpp @@ -36,11 +36,27 @@ WifiServiceManager::~WifiServiceManager() int WifiServiceManager::Init() { +#ifdef OHOS_ARCH_LITE + mServiceDllMap.insert(std::make_pair(WIFI_SERVICE_STA, "libwifi_sta_service.so")); + mServiceDllMap.insert(std::make_pair(WIFI_SERVICE_SCAN, "libwifi_scan_service.so")); +#ifdef FEATURE_AP_SUPPORT + mServiceDllMap.insert(std::make_pair(WIFI_SERVICE_AP, "libwifi_ap_service.so")); +#endif +#ifdef FEATURE_P2P_SUPPORT + mServiceDllMap.insert(std::make_pair(WIFI_SERVICE_P2P, "libwifi_p2p_service.so")); +#endif + mServiceDllMap.insert(std::make_pair(WIFI_SERVICE_AWARE, "libwifi_aware_service.so")); +#else mServiceDllMap.insert(std::make_pair(WIFI_SERVICE_STA, "libwifi_sta_service.z.so")); mServiceDllMap.insert(std::make_pair(WIFI_SERVICE_SCAN, "libwifi_scan_service.z.so")); +#ifdef FEATURE_AP_SUPPORT mServiceDllMap.insert(std::make_pair(WIFI_SERVICE_AP, "libwifi_ap_service.z.so")); +#endif +#ifdef FEATURE_P2P_SUPPORT mServiceDllMap.insert(std::make_pair(WIFI_SERVICE_P2P, "libwifi_p2p_service.z.so")); +#endif mServiceDllMap.insert(std::make_pair(WIFI_SERVICE_AWARE, "libwifi_aware_service.z.so")); +#endif return 0; } @@ -116,6 +132,7 @@ int WifiServiceManager::LoadScanService(const std::string &dlname, bool bCreate) return 0; } +#ifdef FEATURE_AP_SUPPORT int WifiServiceManager::LoadApService(const std::string &dlname, bool bCreate) { if (mApServiceHandle.handle != nullptr) { @@ -139,7 +156,9 @@ int WifiServiceManager::LoadApService(const std::string &dlname, bool bCreate) } return 0; } +#endif +#ifdef FEATURE_P2P_SUPPORT int WifiServiceManager::LoadP2pService(const std::string &dlname, bool bCreate) { if (mP2pServiceHandle.handle != nullptr) { @@ -163,6 +182,8 @@ int WifiServiceManager::LoadP2pService(const std::string &dlname, bool bCreate) } return 0; } +#endif + int WifiServiceManager::CheckAndEnforceService(const std::string &name, bool bCreate) { WIFI_LOGD("WifiServiceManager::CheckAndEnforceService name: %{public}s", name.c_str()); @@ -179,12 +200,16 @@ int WifiServiceManager::CheckAndEnforceService(const std::string &name, bool bCr if (name == WIFI_SERVICE_SCAN) { return LoadScanService(dlname, bCreate); } +#ifdef FEATURE_AP_SUPPORT if (name == WIFI_SERVICE_AP) { return LoadApService(dlname, bCreate); } +#endif +#ifdef FEATURE_P2P_SUPPORT if (name == WIFI_SERVICE_P2P) { return LoadP2pService(dlname, bCreate); } +#endif return -1; } @@ -216,6 +241,7 @@ IScanService *WifiServiceManager::GetScanServiceInst() return mScanServiceHandle.pService; } +#ifdef FEATURE_AP_SUPPORT IApService *WifiServiceManager::GetApServiceInst() { if (mApServiceHandle.handle == nullptr) { @@ -229,7 +255,9 @@ IApService *WifiServiceManager::GetApServiceInst() } return mApServiceHandle.pService; } +#endif +#ifdef FEATURE_P2P_SUPPORT IP2pService *WifiServiceManager::GetP2pServiceInst() { if (mP2pServiceHandle.handle == nullptr) { @@ -243,6 +271,7 @@ IP2pService *WifiServiceManager::GetP2pServiceInst() } return mP2pServiceHandle.pService; } +#endif int WifiServiceManager::UnloadStaService(bool bPreLoad) { @@ -276,6 +305,7 @@ int WifiServiceManager::UnloadScanService(bool bPreLoad) return 0; } +#ifdef FEATURE_AP_SUPPORT int WifiServiceManager::UnloadApService(bool bPreLoad) { if (mApServiceHandle.handle == nullptr) { @@ -291,7 +321,9 @@ int WifiServiceManager::UnloadApService(bool bPreLoad) } return 0; } +#endif +#ifdef FEATURE_P2P_SUPPORT int WifiServiceManager::UnloadP2pService(bool bPreLoad) { if (mP2pServiceHandle.handle == nullptr) { @@ -307,6 +339,7 @@ int WifiServiceManager::UnloadP2pService(bool bPreLoad) } return 0; } +#endif int WifiServiceManager::UnloadService(const std::string &name) { @@ -319,12 +352,16 @@ int WifiServiceManager::UnloadService(const std::string &name) if (name == WIFI_SERVICE_SCAN) { return UnloadScanService(bPreLoad); } +#ifdef FEATURE_AP_SUPPORT if (name == WIFI_SERVICE_AP) { return UnloadApService(bPreLoad); } +#endif +#ifdef FEATURE_P2P_SUPPORT if (name == WIFI_SERVICE_P2P) { return UnloadP2pService(bPreLoad); } +#endif return -1; } @@ -333,8 +370,12 @@ void WifiServiceManager::UninstallAllService() WIFI_LOGD("WifiServiceManager::UninstallAllService"); UnloadStaService(false); UnloadScanService(false); +#ifdef FEATURE_AP_SUPPORT UnloadApService(false); +#endif +#ifdef FEATURE_P2P_SUPPORT UnloadP2pService(false); +#endif return; } } // namespace Wifi diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.h index 95a3027..e5077b8 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.h @@ -22,8 +22,12 @@ #include "ista_service.h" #include "iscan_service.h" +#ifdef FEATURE_AP_SUPPORT #include "i_ap_service.h" +#endif +#ifdef FEATURE_P2P_SUPPORT #include "ip2p_service.h" +#endif namespace OHOS { namespace Wifi { @@ -63,6 +67,7 @@ struct ScanServiceHandle { } }; +#ifdef FEATURE_AP_SUPPORT struct ApServiceHandle { void *handle; IApService *(*create)(); @@ -80,7 +85,9 @@ struct ApServiceHandle { pService = nullptr; } }; +#endif +#ifdef FEATURE_P2P_SUPPORT struct P2pServiceHandle { void *handle; IP2pService *(*create)(); @@ -98,6 +105,7 @@ struct P2pServiceHandle { pService = nullptr; } }; +#endif class WifiServiceManager { public: @@ -141,19 +149,23 @@ public: */ IScanService *GetScanServiceInst(void); +#ifdef FEATURE_AP_SUPPORT /** * @Description Get the Ap Service Inst object * * @return IApService* - ap service pointer, if ap not supported, nullptr is returned */ IApService *GetApServiceInst(void); +#endif +#ifdef FEATURE_P2P_SUPPORT /** * @Description Get the P2P Service Inst object * * @return IP2pService* - p2p service pointer, if p2p not supported, nullptr is returned */ IP2pService *GetP2pServiceInst(void); +#endif /** * @Description unload a feature service @@ -176,18 +188,26 @@ private: int UnloadStaService(bool bPreLoad); int LoadScanService(const std::string &dlname, bool bCreate); int UnloadScanService(bool bPreLoad); +#ifdef FEATURE_AP_SUPPORT int LoadApService(const std::string &dlname, bool bCreate); int UnloadApService(bool bPreLoad); +#endif +#ifdef FEATURE_P2P_SUPPORT int LoadP2pService(const std::string &dlname, bool bCreate); int UnloadP2pService(bool bPreLoad); +#endif private: std::mutex mMutex; std::unordered_map mServiceDllMap; StaServiceHandle mStaServiceHandle; ScanServiceHandle mScanServiceHandle; +#ifdef FEATURE_AP_SUPPORT ApServiceHandle mApServiceHandle; +#endif +#ifdef FEATURE_P2P_SUPPORT P2pServiceHandle mP2pServiceHandle; +#endif }; } // namespace Wifi } // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn index f4d8196..6607b3d 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn @@ -11,84 +11,123 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//build/ohos.gni") -import("//foundation/communication/wifi/wifi/wifi.gni") +if (defined(ohos_lite)) { + import("//build/lite/config/component/lite_component.gni") + import("//foundation/communication/wifi/wifi/wifi_lite.gni") +} else { + import("//build/ohos.gni") + import("//foundation/communication/wifi/wifi/wifi.gni") +} + +local_base_sources = [ + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log/log_helper.c", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/http_request.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp", + "../common/handler.cpp", + "../common/internal_message.cpp", + "../common/message_queue.cpp", + "../common/state.cpp", + "../common/state_machine.cpp", + "sta_auto_connect_service.cpp", + "sta_interface.cpp", + "sta_monitor.cpp", + "sta_network_check.cpp", + "sta_saved_device_appraisal.cpp", + "sta_service.cpp", + "sta_state_machine.cpp", +] + +local_base_include_dirs = [ + "$WIFI_ROOT_DIR/services/wifi_standard/sdk/include", + "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces", + "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/interface", + "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/net_conf", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta", + "$DHCP_ROOT_DIR/services/mgr_service/include", + "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/include", + "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/interfaces", + "$WIFI_ROOT_DIR/utils/inc", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage", +] + +if (defined(ohos_lite)) { + shared_library("wifi_sta_service") { + sources = local_base_sources + + include_dirs = local_base_include_dirs + include_dirs += [ + "//base/hiviewdfx/hilog_lite/interfaces/native/innerkits", + "//third_party/bounds_checking_function/include", + ] + + deps = [ + "$DHCP_ROOT_DIR/services/mgr_service:dhcp_manager_service", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_service_base", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", + "$WIFI_ROOT_DIR/utils/src:wifi_utils", + "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", + "//third_party/bounds_checking_function:libsec_shared", + ] + + configs -= [ "//build/lite/config:language_cpp" ] + cflags_cc = [ + "-std=c++17", + "-fno-rtti", + ] + + defines = [ "OHOS_ARCH_LITE" ] + ldflags = [ + "-fPIC", + "-Wl,-E", + ] + } +} else { + ohos_shared_library("wifi_sta_service") { + install_enable = true + sources = local_base_sources -ohos_shared_library("wifi_sta_service") { - install_enable = true - sources = [ - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log/log_helper.c", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/http_request.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp", - "../common/handler.cpp", - "../common/internal_message.cpp", - "../common/message_queue.cpp", - "../common/state.cpp", - "../common/state_machine.cpp", - "sta_auto_connect_service.cpp", - "sta_interface.cpp", - "sta_monitor.cpp", - "sta_network_check.cpp", - "sta_saved_device_appraisal.cpp", - "sta_service.cpp", - "sta_state_machine.cpp", - ] - include_dirs = [ - "$WIFI_ROOT_DIR/services/wifi_standard/sdk/include", - "//utils/native/base/include", - "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces", - "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/interface", - "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/net_conf", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta", - "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", - "$WIFI_ROOT_DIR/services/wifi_standard/depends/include/hardware/libhardware/include", - "$WIFI_ROOT_DIR/services/wifi_standard/depends/include/system/core/include", - "$WIFI_ROOT_DIR/services/wifi_standard/depends/include/frameworks/native/include", - "$WIFI_ROOT_DIR/services/wifi_standard/depends/include/system/core/libutils/include", - "$WIFI_ROOT_DIR/services/wifi_standard/depends/include/system/core/base/include", - "$WIFI_ROOT_DIR/services/wifi_standard/depends/include/system/libbase/include", - "$DHCP_ROOT_DIR/services/mgr_service/include", - "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/include", - "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/interfaces", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", - "$WIFI_ROOT_DIR/utils/inc", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage", - ] + include_dirs = local_base_include_dirs + include_dirs += [ + "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", + "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", + "//utils/native/base/include", + ] - cflags_cc = [ - "-std=c++17", - "-fno-rtti", - ] + cflags_cc = [ + "-std=c++17", + "-fno-rtti", + ] - ldflags = [ - "-fPIC", - "-Wl,-E", - ] + ldflags = [ + "-fPIC", + "-Wl,-E", + ] - deps = [ - "$DHCP_ROOT_DIR/services/mgr_service:dhcp_manager_service", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", - "$WIFI_ROOT_DIR/utils/src:wifi_utils", - "//utils/native/base:utils", - ] + deps = [ + "$DHCP_ROOT_DIR/services/mgr_service:dhcp_manager_service", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", + "$WIFI_ROOT_DIR/utils/src:wifi_utils", + "//utils/native/base:utils", + ] - external_deps = [ - "hiviewdfx_hilog_native:libhilog", - "netmanager_base:net_conn_manager_if", - ] + external_deps = [ + "hiviewdfx_hilog_native:libhilog", + "netmanager_base:net_conn_manager_if", + ] - part_name = "wifi" - subsystem_name = "communication" + part_name = "wifi" + subsystem_name = "communication" + } } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp index 20aaea5..b474894 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp @@ -131,7 +131,9 @@ ErrCode StaStateMachine::InitStaStateMachine() return WIFI_OPT_FAILED; } pNetcheck->InitNetCheckThread(); +#ifndef OHOS_ARCH_LITE NetSupplierInfo = std::make_unique().release(); +#endif return WIFI_OPT_SUCCESS; } @@ -396,8 +398,10 @@ void StaStateMachine::StartWifiProcess() } else { WIFI_LOGI("GetStaDeviceMacAddress failed!"); } +#ifndef OHOS_ARCH_LITE WifiNetAgent::GetInstance().RegisterNetSupplier(); WifiNetAgent::GetInstance().RegisterNetSupplierCallback(staCallback); +#endif /* Initialize Connection Information. */ InitWifiLinkedInfo(); InitLastWifiLinkedInfo(); @@ -510,7 +514,9 @@ bool StaStateMachine::WpaStartedState::ExecuteStateMsg(InternalMessage *msg) void StaStateMachine::StopWifiProcess() { WIFI_LOGD("Enter StaStateMachine::StopWifiProcess.\n"); +#ifndef OHOS_ARCH_LITE WifiNetAgent::GetInstance().UnregisterNetSupplier(); +#endif WifiSettings::GetInstance().SetWifiState(static_cast(WifiState::DISABLING)); staCallback.OnStaCloseRes(OperateResState::CLOSE_WIFI_CLOSING); StopTimer(static_cast(CMD_SIGNAL_POLL)); @@ -524,6 +530,9 @@ void StaStateMachine::StopWifiProcess() IpInfo ipInfo; WifiSettings::GetInstance().SaveIpInfo(ipInfo); +#ifdef OHOS_ARCH_LITE + IfConfig::GetInstance().FlushIpAddr(IF_NAME, IPTYPE_IPV4); +#endif /* clear connection information. */ InitWifiLinkedInfo(); @@ -675,6 +684,7 @@ void StaStateMachine::DealSignalPollResult(InternalMessage *msg) if (staCallback.OnStaRssiLevelChanged != nullptr) { staCallback.OnStaRssiLevelChanged(linkedInfo.rssi); } +#ifndef OHOS_ARCH_LITE if (NetSupplierInfo != nullptr) { NetSupplierInfo->isAvailable_ = true; NetSupplierInfo->isRoaming_ = isRoam; @@ -682,6 +692,7 @@ void StaStateMachine::DealSignalPollResult(InternalMessage *msg) NetSupplierInfo->frequency_ = linkedInfo.frequency; WifiNetAgent::GetInstance().UpdateNetSupplierInfo(NetSupplierInfo); } +#endif lastSignalLevel = currentSignalLevel; } } else { @@ -799,13 +810,13 @@ void StaStateMachine::DealConnectionEvent(InternalMessage *msg) SyncAllDeviceConfigs(); wpsState = SetupMethod::INVALID; } - +#ifndef OHOS_ARCH_LITE if (NetSupplierInfo != nullptr) { NetSupplierInfo->isAvailable_ = true; NetSupplierInfo->isRoaming_ = isRoam; WifiNetAgent::GetInstance().UpdateNetSupplierInfo(NetSupplierInfo); } - +#endif /* Callback result to InterfaceService. */ staCallback.OnStaConnChanged(OperateResState::CONNECT_OBTAINING_IP, linkedInfo); @@ -823,10 +834,12 @@ void StaStateMachine::DealDisconnectEvent(InternalMessage *msg) if (wpsState != SetupMethod::INVALID) { return; } +#ifndef OHOS_ARCH_LITE if (NetSupplierInfo != nullptr) { NetSupplierInfo->isAvailable_ = false; WifiNetAgent::GetInstance().UpdateNetSupplierInfo(NetSupplierInfo); } +#endif StopTimer(static_cast(CMD_SIGNAL_POLL)); pNetcheck->StopNetCheckThread(); if (currentTpType == IPTYPE_IPV4) { @@ -840,6 +853,9 @@ void StaStateMachine::DealDisconnectEvent(InternalMessage *msg) IpInfo ipInfo; WifiSettings::GetInstance().SaveIpInfo(ipInfo); +#ifdef OHOS_ARCH_LITE + IfConfig::GetInstance().FlushIpAddr(IF_NAME, IPTYPE_IPV4); +#endif /* Initialize connection informatoin. */ InitWifiLinkedInfo(); if (lastLinkedInfo.detailedState == DetailedState::CONNECTING) { @@ -1413,10 +1429,12 @@ void StaStateMachine::DisConnectProcess() staCallback.OnStaConnChanged(OperateResState::DISCONNECT_DISCONNECTING, linkedInfo); if (WifiStaHalInterface::GetInstance().Disconnect() == WIFI_IDL_OPT_OK) { WIFI_LOGI("Disconnect() succeed!"); +#ifndef OHOS_ARCH_LITE if (NetSupplierInfo != nullptr) { NetSupplierInfo->isAvailable_ = false; WifiNetAgent::GetInstance().UpdateNetSupplierInfo(NetSupplierInfo); } +#endif /* Save connection information to WifiSettings. */ SaveLinkstate(ConnState::DISCONNECTED, DetailedState::DISCONNECTED); DisableNetwork(linkedInfo.networkId); @@ -1929,6 +1947,7 @@ void StaStateMachine::DhcpResultNotify::OnSuccess(int status, const std::string pStaStateMachine->linkedInfo.isDataRestricted = (result.strVendor.find("ANDROID_METERED") == std::string::npos) ? 0 : 1; WifiSettings::GetInstance().SaveLinkedInfo(pStaStateMachine->linkedInfo); +#ifndef OHOS_ARCH_LITE WIFI_LOGI("Update NetLink info, strYourCli=%{public}s, strSubnet=%{public}s, \ strRouter1=%{public}s, strDns1=%{public}s, strDns2=%{public}s", IpAnonymize(result.strYourCli).c_str(), IpAnonymize(result.strSubnet).c_str(), @@ -1936,8 +1955,11 @@ void StaStateMachine::DhcpResultNotify::OnSuccess(int status, const std::string IpAnonymize(result.strDns2).c_str()); WifiNetAgent::GetInstance().UpdateNetLinkInfo(result.strYourCli, result.strSubnet, result.strRouter1, result.strDns1, result.strDns2); +#endif } - +#ifdef OHOS_ARCH_LITE + IfConfig::GetInstance().SetIfDnsAndRoute(result, result.iptype); +#endif if (pStaStateMachine->getIpSucNum == 0 || pStaStateMachine->isRoam) { pStaStateMachine->SaveLinkstate(ConnState::CONNECTED, DetailedState::CONNECTED); pStaStateMachine->staCallback.OnStaConnChanged( diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h index 2e555ae..d4e3bc2 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h @@ -29,7 +29,9 @@ #include "sta_service_callback.h" #include "i_dhcp_service.h" #include "sta_define.h" +#ifndef OHOS_ARCH_LITE #include "wifi_net_agent.h" +#endif namespace OHOS { namespace Wifi { @@ -626,7 +628,9 @@ private: private: StaSmHandleFuncMap staSmHandleFuncMap; StaServiceCallback staCallback; +#ifndef OHOS_ARCH_LITE sptr NetSupplierInfo; +#endif int lastNetworkId; int operationalMode; diff --git a/wifi/wifi_lite.gni b/wifi/wifi_lite.gni new file mode 100644 index 0000000..d739c4f --- /dev/null +++ b/wifi/wifi_lite.gni @@ -0,0 +1,21 @@ +# Copyright (c) 2022 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +SUBSYSTEM_DIR = "//foundation/communication" +WIFI_ROOT_DIR = "$SUBSYSTEM_DIR/wifi/wifi" +DHCP_ROOT_DIR = "$SUBSYSTEM_DIR/wifi/dhcp" + +declare_args() { + wifi_feature_with_p2p = false + wifi_feature_with_ap_intf = "wlan0" +} -- Gitee From 4a5031e509a226c7be4eec2610e2a78e17197e51 Mon Sep 17 00:00:00 2001 From: junxinlu Date: Thu, 12 May 2022 16:18:00 +0800 Subject: [PATCH 099/491] modify max wait time to 30 seconds to auto start service Signed-off-by: junxinlu --- wifi/BUILD.gn | 2 +- wifi/interfaces/innerkits/BUILD.gn | 2 +- .../native_cpp/wifi_standard/src/wifi_device_proxy_lite.cpp | 4 ++-- .../wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/wifi/BUILD.gn b/wifi/BUILD.gn index 83bd465..4cd4e1a 100644 --- a/wifi/BUILD.gn +++ b/wifi/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2022-2022 Huawei Device Co., Ltd. +# Copyright (C) 2022 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/wifi/interfaces/innerkits/BUILD.gn b/wifi/interfaces/innerkits/BUILD.gn index b2f8e1a..2dfd762 100644 --- a/wifi/interfaces/innerkits/BUILD.gn +++ b/wifi/interfaces/innerkits/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2022-2022 Huawei Device Co., Ltd. +# Copyright (C) 2022 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy_lite.cpp b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy_lite.cpp index c73bb92..51cbd16 100644 --- a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy_lite.cpp +++ b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy_lite.cpp @@ -1074,7 +1074,7 @@ ErrCode WifiDeviceProxy::RegisterCallBack(const std::shared_ptr Date: Fri, 13 May 2022 10:49:41 +0800 Subject: [PATCH 100/491] =?UTF-8?q?foudation=E7=BB=9D=E5=AF=B9=E8=B7=AF?= =?UTF-8?q?=E5=BE=84=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: shiqichang Change-Id: Iba736c7428118cefa196904c647bdbb741f10242 --- wifi/interfaces/innerkits/native_cpp/napi/BUILD.gn | 8 ++++---- .../innerkits/native_cpp/wifi_standard/BUILD.gn | 2 +- .../wifi_standard/wifi_framework/wifi_manage/BUILD.gn | 2 +- .../wifi_framework/wifi_manage/unittest/BUILD.gn | 6 +++--- .../wifi_framework/wifi_manage/wifi_sta/BUILD.gn | 2 +- wifi/wifi.gni | 4 ++++ wifi/wifi_lite.gni | 3 +++ 7 files changed, 17 insertions(+), 10 deletions(-) diff --git a/wifi/interfaces/innerkits/native_cpp/napi/BUILD.gn b/wifi/interfaces/innerkits/native_cpp/napi/BUILD.gn index 2d47a8d..e8e128d 100644 --- a/wifi/interfaces/innerkits/native_cpp/napi/BUILD.gn +++ b/wifi/interfaces/innerkits/native_cpp/napi/BUILD.gn @@ -25,7 +25,7 @@ ohos_shared_library("wifi") { "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/ability_runtime/context", + "${aakits_path}/appkit/native/ability_runtime/context", "$WIFI_ROOT_DIR/utils/inc", ] @@ -40,8 +40,8 @@ ohos_shared_library("wifi") { deps = [ "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard:wifi_sdk", "$WIFI_ROOT_DIR/utils/src:wifi_utils", + "${aakits_path}/appkit:app_context", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//foundation/aafwk/standard/frameworks/kits/appkit:app_context", "//foundation/arkui/napi:ace_napi", "//utils/native/base:utils", ] @@ -67,7 +67,7 @@ ohos_shared_library("wifi_native_js") { "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/ability_runtime/context", + "${aakits_path}/appkit/native/ability_runtime/context", "$WIFI_ROOT_DIR/utils/inc", ] @@ -82,8 +82,8 @@ ohos_shared_library("wifi_native_js") { deps = [ "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard:wifi_sdk", "$WIFI_ROOT_DIR/utils/src:wifi_utils", + "${aakits_path}/appkit:app_context", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//foundation/aafwk/standard/frameworks/kits/appkit:app_context", "//foundation/arkui/napi:ace_napi", "//utils/native/base:utils", ] diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/BUILD.gn b/wifi/interfaces/innerkits/native_cpp/wifi_standard/BUILD.gn index 1bd94bd..1dc1ef2 100644 --- a/wifi/interfaces/innerkits/native_cpp/wifi_standard/BUILD.gn +++ b/wifi/interfaces/innerkits/native_cpp/wifi_standard/BUILD.gn @@ -197,8 +197,8 @@ if (defined(ohos_lite)) { ":wifi_scan_proxy_impl", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", "$WIFI_ROOT_DIR/utils/src:wifi_utils", + "${aainnerkits_path}/want:want", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/bounds_checking_function:libsec_static", "//utils/native/base:utils", diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn index 0877e4e..5d49ae6 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn @@ -177,7 +177,7 @@ if (defined(ohos_lite)) { "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/interfaces", "$WIFI_ROOT_DIR/utils/inc", "//foundation/appexecfwk/adapter/interfaces/innerkits/appexecfwk_base/include", - "//foundation/aafwk/standard/interfaces/innerkits/base/include", + "${aainnerkits_path}/base/include", "//base/security/access_token/interfaces/innerkits/accesstoken/include", "//foundation/communication/netmanager_base/services/netmanagernative/include/netsys", ] diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn index d006d7c..0535e84 100644 --- a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn +++ b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn @@ -70,10 +70,10 @@ ohos_unittest("manager_unittest") { "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", "//base/notification/common_event_service/cesfwk/innerkits/include", "//base/notification/common_event_service/cesfwk/kits/native/include", - "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content", - "//foundation/aafwk/standard/interfaces/innerkits/want/include", + "${aainnerkits_path}/want/include/ohos/aafwk/content", + "${aainnerkits_path}/want/include", "//foundation/appexecfwk/adapter/interfaces/innerkits/appexecfwk_base/include", - "//foundation/aafwk/standard/interfaces/innerkits/base/include", + "${aainnerkits_path}/base/include", "//base/security/access_token/interfaces/innerkits/accesstoken/include", "//foundation/communication/netmanager_base/services/netmanagernative/include/netsys", "$WIFI_ROOT_DIR/utils/inc", diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn index f3475e7..0db4fdd 100644 --- a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn +++ b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn @@ -101,7 +101,7 @@ ohos_unittest("wifi_sta_unittest") { "//foundation/arkui/ace_engine/frameworks/base/utils", "//foundation/arkui/ace_engine/frameworks", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk/", - "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content/", + "${aainnerkits_path}/want/include/ohos/aafwk/content/", "//foundation/aafwk/aafwk_lite/interfaces/kits/want_lite/", "$WIFI_ROOT_DIR/utils/inc", ] diff --git a/wifi/wifi.gni b/wifi/wifi.gni index 18350aa..f335af4 100644 --- a/wifi/wifi.gni +++ b/wifi/wifi.gni @@ -11,6 +11,10 @@ # See the License for the specific language governing permissions and # limitations under the License. +aaservices_path = "//foundation/aafwk/standard/services" +aainnerkits_path = "//foundation/aafwk/standard/interfaces/innerkits" +aakits_path = "//foundation/aafwk/standard/frameworks/kits" + SUBSYSTEM_DIR = "//foundation/communication" WIFI_ROOT_DIR = "$SUBSYSTEM_DIR/wifi/wifi" DHCP_ROOT_DIR = "$SUBSYSTEM_DIR/wifi/dhcp" diff --git a/wifi/wifi_lite.gni b/wifi/wifi_lite.gni index d739c4f..f1fb71f 100644 --- a/wifi/wifi_lite.gni +++ b/wifi/wifi_lite.gni @@ -11,6 +11,9 @@ # See the License for the specific language governing permissions and # limitations under the License. +aaservices_path = "//foundation/aafwk/standard/services" +aainnerkits_path = "//foundation/aafwk/standard/interfaces/innerkits" + SUBSYSTEM_DIR = "//foundation/communication" WIFI_ROOT_DIR = "$SUBSYSTEM_DIR/wifi/wifi" DHCP_ROOT_DIR = "$SUBSYSTEM_DIR/wifi/dhcp" -- Gitee From 789328afdca2811b2ccc6fec0802cea3d1332768 Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Wed, 11 May 2022 13:12:27 +0000 Subject: [PATCH 101/491] Feat(AP): #I4U9AV Support Ap for router Signed-off-by: zhangfeng --- wifi/interfaces/innerkits/BUILD.gn | 3 +- .../innerkits/native_cpp/napi/BUILD.gn | 36 ++++ .../native_cpp/napi/wifi_ext_napi_entry.cpp | 53 ++++++ .../native_cpp/napi/wifi_ext_napi_hotspot.cpp | 169 ++++++++++++++++++ .../native_cpp/napi/wifi_ext_napi_hotspot.h | 55 ++++++ .../wifi_standard/include/wifi_hotspot.h | 33 +++- .../wifi_standard/interfaces/define.h | 3 + .../wifi_standard/interfaces/i_wifi_hotspot.h | 30 +++- .../wifi_standard/interfaces/wifi_ap_msg.h | 10 +- .../interfaces/wifi_common_msg.h | 27 +++ .../wifi_standard/src/wifi_hotspot_impl.cpp | 26 ++- .../wifi_standard/src/wifi_hotspot_impl.h | 30 +++- .../wifi_standard/src/wifi_hotspot_proxy.cpp | 108 ++++++++++- .../wifi_standard/src/wifi_hotspot_proxy.h | 30 +++- .../common/config/wifi_settings.cpp | 15 +- .../common/config/wifi_settings.h | 17 ++ .../wifi_framework/wifi_manage/BUILD.gn | 3 + .../common/wifi_permission_helper.cpp | 11 +- .../common/wifi_permission_helper.h | 11 +- .../common/wifi_permission_utils.cpp | 11 ++ .../common/wifi_permission_utils.h | 1 + .../idl_interface/i_wifi_hotspot_iface.c | 42 ++++- .../idl_interface/i_wifi_hotspot_iface.h | 15 ++ .../idl_interface/i_wifi_supplicant_iface.c | 2 +- .../idl_client/wifi_ap_hal_interface.cpp | 10 ++ .../idl_client/wifi_ap_hal_interface.h | 16 ++ .../idl_client/wifi_idl_client.cpp | 12 ++ .../wifi_manage/idl_client/wifi_idl_client.h | 16 ++ .../wifi_manage/wifi_ap/ap_interface.cpp | 15 ++ .../wifi_manage/wifi_ap/ap_interface.h | 24 +++ .../wifi_manage/wifi_ap/ap_service.cpp | 29 +++ .../wifi_manage/wifi_ap/ap_service.h | 24 +++ .../wifi_manage/wifi_ap/ap_started_state.cpp | 15 +- .../wifi_manage/wifi_ap/ap_started_state.h | 6 + .../wifi_manage/wifi_ap/i_ap_service.h | 5 +- .../wifi_manage/wifi_auth_center.cpp | 10 +- .../wifi_manage/wifi_auth_center.h | 11 +- .../wifi_manage/wifi_hotspot_service_impl.cpp | 69 ++++++- .../wifi_manage/wifi_hotspot_service_impl.h | 31 +++- .../wifi_manage/wifi_hotspot_stub.cpp | 48 ++++- .../wifi_manage/wifi_hotspot_stub.h | 5 +- wifi/services/wifi_standard/wifi_hal/BUILD.gn | 2 + .../wifi_hal/hdi/wifi_hdi_ap_instance.c | 69 +++++++ .../wifi_hal/hdi/wifi_hdi_ap_instance.h | 34 ++++ .../wifi_hal/wifi_hal_ap_interface.c | 77 ++++---- .../wifi_hal/wifi_hal_ap_interface.h | 17 +- .../wifi_standard/wifi_hal/wifi_hal_crpc_ap.c | 32 ++++ .../wifi_standard/wifi_hal/wifi_hal_crpc_ap.h | 19 ++ .../wifi_hal/wifi_hal_crpc_server.c | 2 + 49 files changed, 1268 insertions(+), 71 deletions(-) create mode 100644 wifi/interfaces/innerkits/native_cpp/napi/wifi_ext_napi_entry.cpp create mode 100644 wifi/interfaces/innerkits/native_cpp/napi/wifi_ext_napi_hotspot.cpp create mode 100644 wifi/interfaces/innerkits/native_cpp/napi/wifi_ext_napi_hotspot.h create mode 100644 wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_common_msg.h create mode 100644 wifi/services/wifi_standard/wifi_hal/hdi/wifi_hdi_ap_instance.c create mode 100644 wifi/services/wifi_standard/wifi_hal/hdi/wifi_hdi_ap_instance.h diff --git a/wifi/interfaces/innerkits/BUILD.gn b/wifi/interfaces/innerkits/BUILD.gn index b2f8e1a..45e67be 100644 --- a/wifi/interfaces/innerkits/BUILD.gn +++ b/wifi/interfaces/innerkits/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2022-2022 Huawei Device Co., Ltd. +# Copyright (C) 2022 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -27,6 +27,7 @@ group("wifi_kits") { deps += [ "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/napi:wifi", "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/napi:wifi_native_js", + "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/napi:wifiext", ] } } diff --git a/wifi/interfaces/innerkits/native_cpp/napi/BUILD.gn b/wifi/interfaces/innerkits/native_cpp/napi/BUILD.gn index 2d47a8d..5c75a6e 100644 --- a/wifi/interfaces/innerkits/native_cpp/napi/BUILD.gn +++ b/wifi/interfaces/innerkits/native_cpp/napi/BUILD.gn @@ -56,6 +56,42 @@ ohos_shared_library("wifi") { subsystem_name = "communication" } +ohos_shared_library("wifiext") { + install_enable = true + include_dirs = [ + "//third_party/node/src", + "//native_engine", + "//utils/native/base/include", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", + "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces", + "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", + "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/include", + "//foundation/aafwk/standard/frameworks/kits/appkit/native/ability_runtime/context", + ] + + sources = [ + "wifi_ext_napi_entry.cpp", + "wifi_ext_napi_hotspot.cpp", + "wifi_napi_utils.cpp", + ] + deps = [ + "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard:wifi_sdk", + "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", + "//foundation/aafwk/standard/frameworks/kits/appkit:app_context", + "//foundation/arkui/napi:ace_napi", + "//utils/native/base:utils", + ] + + external_deps = [ + "bundle_framework:appexecfwk_base", + "ipc:ipc_core", + ] + + relative_install_dir = "module" + part_name = "wifi" + subsystem_name = "communication" +} + ohos_shared_library("wifi_native_js") { install_enable = true include_dirs = [ diff --git a/wifi/interfaces/innerkits/native_cpp/napi/wifi_ext_napi_entry.cpp b/wifi/interfaces/innerkits/native_cpp/napi/wifi_ext_napi_entry.cpp new file mode 100644 index 0000000..109fd38 --- /dev/null +++ b/wifi/interfaces/innerkits/native_cpp/napi/wifi_ext_napi_entry.cpp @@ -0,0 +1,53 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "wifi_ext_napi_hotspot.h" +#include "wifi_logger.h" + +namespace OHOS { +namespace Wifi { +/* + * Module initialization function + */ +static napi_value Init(napi_env env, napi_value exports) +{ + napi_property_descriptor desc[] = { + DECLARE_NAPI_FUNCTION("enableHotspot", EnableHotspot), + DECLARE_NAPI_FUNCTION("disableHotspot", DisableHotspot), + DECLARE_NAPI_FUNCTION("getSupportedPowerModel", GetSupportedPowerModel), + DECLARE_NAPI_FUNCTION("getPowerModel", GetPowerModel), + DECLARE_NAPI_FUNCTION("setPowerModel", SetPowerModel), + }; + + NAPI_CALL(env, napi_define_properties(env, exports, sizeof(desc) / sizeof(napi_property_descriptor), desc)); + return exports; +} + +static napi_module wifiExtJsModule = { + .nm_version = 1, + .nm_flags = 0, + .nm_filename = NULL, + .nm_register_func = Init, + .nm_modname = "wifiext", + .nm_priv = ((void *)0), + .reserved = { 0 } +}; + +extern "C" __attribute__((constructor)) void RegisterModule(void) +{ + napi_module_register(&wifiExtJsModule); +} +} // namespace Wifi +} // namespace OHOS diff --git a/wifi/interfaces/innerkits/native_cpp/napi/wifi_ext_napi_hotspot.cpp b/wifi/interfaces/innerkits/native_cpp/napi/wifi_ext_napi_hotspot.cpp new file mode 100644 index 0000000..31d34cb --- /dev/null +++ b/wifi/interfaces/innerkits/native_cpp/napi/wifi_ext_napi_hotspot.cpp @@ -0,0 +1,169 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "wifi_ext_napi_hotspot.h" +#include "wifi_logger.h" + +namespace OHOS { +namespace Wifi { +DEFINE_WIFILOG_LABEL("WifiExtNAPIHotspot"); + +std::unique_ptr GetHotspotInstance() +{ + return WifiHotspot::GetInstance(WIFI_HOTSPOT_ABILITY_ID); +} + +napi_value EnableHotspot(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + std::unique_ptr hotspot = GetHotspotInstance(); + NAPI_ASSERT(env, hotspot != nullptr, "Wifi hotspot instance is null."); + ErrCode ret = hotspot->EnableHotspot(ServiceType::WIFI_EXT); + if (ret != WIFI_OPT_SUCCESS) { + WIFI_LOGE("Enable hotspot error: %{public}d", ret); + } + napi_value result; + napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); + return result; +} + +napi_value DisableHotspot(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + std::unique_ptr hotspot = GetHotspotInstance(); + NAPI_ASSERT(env, hotspot != nullptr, "Wifi hotspot instance is null."); + ErrCode ret = hotspot->DisableHotspot(ServiceType::WIFI_EXT); + if (ret != WIFI_OPT_SUCCESS) { + WIFI_LOGE("Disable hotspot error: %{public}d", ret); + } + napi_value result; + napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); + return result; +} + +static ErrCode NativePowerModelListToJsObj(const napi_env& env, + const std::set& setPowerModelList, napi_value& arrayResult) +{ + uint32_t idx = 0; + for (auto& each : setPowerModelList) { + napi_value result; + napi_create_int32(env, static_cast(each), &result); + napi_status status = napi_set_element(env, arrayResult, idx++, result); + if (status != napi_ok) { + WIFI_LOGE("Wifi napi set element error: %{public}d, idx: %{public}d", status, idx - 1); + return WIFI_OPT_FAILED; + } + } + return WIFI_OPT_SUCCESS; +} + +napi_value GetSupportedPowerModel(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + size_t argc = 1; + napi_value argv[argc]; + napi_value thisVar = nullptr; + void *data = nullptr; + NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data)); + + PowerModelListAsyncContext *asyncContext = new PowerModelListAsyncContext(env); + NAPI_ASSERT(env, asyncContext != nullptr, "asyncContext is null."); + napi_create_string_latin1(env, "getSupportedPowerModel", NAPI_AUTO_LENGTH, &asyncContext->resourceName); + + asyncContext->executeFunc = [&](void* data) -> void { + PowerModelListAsyncContext *context = static_cast(data); + std::unique_ptr hotspot = GetHotspotInstance(); + if (hotspot == nullptr) { + WIFI_LOGE("hotspot instance is null."); + return; + } + TRACE_FUNC_CALL_NAME("hotspot->GetSupportedPowerModel"); + context->errorCode = hotspot->GetSupportedPowerModel(context->setPowerModelList); + }; + + asyncContext->completeFunc = [&](void* data) -> void { + PowerModelListAsyncContext *context = static_cast(data); + napi_create_array_with_length(context->env, context->setPowerModelList.size(), &context->result); + NativePowerModelListToJsObj(context->env, context->setPowerModelList, context->result); + WIFI_LOGI("Push power model list to client"); + }; + + size_t nonCallbackArgNum = 0; + return DoAsyncWork(env, asyncContext, argc, argv, nonCallbackArgNum); +} + +napi_value GetPowerModel(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + size_t argc = 1; + napi_value argv[argc]; + napi_value thisVar = nullptr; + void *data = nullptr; + NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data)); + + PowerModelAsyncContext *asyncContext = new PowerModelAsyncContext(env); + NAPI_ASSERT(env, asyncContext != nullptr, "asyncContext is null."); + napi_create_string_latin1(env, "getPowerModel", NAPI_AUTO_LENGTH, &asyncContext->resourceName); + + asyncContext->executeFunc = [&](void* data) -> void { + PowerModelAsyncContext *context = static_cast(data); + std::unique_ptr hotspot = GetHotspotInstance(); + if (hotspot == nullptr) { + WIFI_LOGE("hotspot instance is null."); + return; + } + TRACE_FUNC_CALL_NAME("hotspot->GetPowerModel"); + context->errorCode = hotspot->GetPowerModel(context->powerModel); + }; + + asyncContext->completeFunc = [&](void* data) -> void { + PowerModelAsyncContext *context = static_cast(data); + napi_create_int32(context->env, static_cast(context->powerModel), &context->result); + WIFI_LOGI("Push power model result to client"); + }; + + size_t nonCallbackArgNum = 0; + return DoAsyncWork(env, asyncContext, argc, argv, nonCallbackArgNum); +} + +napi_value SetPowerModel(napi_env env, napi_callback_info info) +{ + TRACE_FUNC_CALL; + size_t argc = 1; + napi_value argv[1]; + napi_value thisVar; + NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL)); + NAPI_ASSERT(env, argc == 1, "Wrong number of arguments"); + + napi_valuetype valueType; + napi_typeof(env, argv[0], &valueType); + NAPI_ASSERT(env, valueType == napi_number, "Wrong argument type. napi_number expected."); + + int model = -1; + napi_get_value_int32(env, argv[0], &model); + + std::unique_ptr hotspot = GetHotspotInstance(); + NAPI_ASSERT(env, hotspot != nullptr, "Wifi hotspot instance is null."); + + ErrCode ret = hotspot->SetPowerModel(static_cast(model)); + if (ret != WIFI_OPT_SUCCESS) { + WIFI_LOGE("Set power model error: %{public}d", ret); + } + napi_value result; + napi_get_boolean(env, ret == WIFI_OPT_SUCCESS, &result); + return result; +} +} // namespace Wifi +} // namespace OHOS diff --git a/wifi/interfaces/innerkits/native_cpp/napi/wifi_ext_napi_hotspot.h b/wifi/interfaces/innerkits/native_cpp/napi/wifi_ext_napi_hotspot.h new file mode 100644 index 0000000..5703226 --- /dev/null +++ b/wifi/interfaces/innerkits/native_cpp/napi/wifi_ext_napi_hotspot.h @@ -0,0 +1,55 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef WIFI_EXT_NAPI_HOTSPOT_H_ +#define WIFI_EXT_NAPI_HOTSPOT_H_ + +#include +#include "wifi_napi_utils.h" +#include "wifi_hotspot.h" + +namespace OHOS { +namespace Wifi { +napi_value EnableHotspot(napi_env env, napi_callback_info info); +napi_value DisableHotspot(napi_env env, napi_callback_info info); +napi_value GetSupportedPowerModel(napi_env env, napi_callback_info info); +napi_value GetPowerModel(napi_env env, napi_callback_info info); +napi_value SetPowerModel(napi_env env, napi_callback_info info); + +class PowerModelAsyncContext : public AsyncContext { +public: + PowerModel powerModel; + + PowerModelAsyncContext(napi_env env, napi_async_work work = nullptr, napi_deferred deferred = nullptr) + : AsyncContext(env, work, deferred) {} + + PowerModelAsyncContext() = delete; + ~PowerModelAsyncContext() override {} +}; + +class PowerModelListAsyncContext : public AsyncContext { +public: + std::set setPowerModelList; + + PowerModelListAsyncContext(napi_env env, napi_async_work work = nullptr, napi_deferred deferred = nullptr) + : AsyncContext(env, work, deferred) {} + + PowerModelListAsyncContext() = delete; + ~PowerModelListAsyncContext() override {} +}; +} // namespace Wifi +} // namespace OHOS + +#endif diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_hotspot.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_hotspot.h index fdcdeea..dd9b1ee 100644 --- a/wifi/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_hotspot.h +++ b/wifi/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_hotspot.h @@ -16,10 +16,9 @@ #ifndef OHOS_WIFI_HOTSPOT_H #define OHOS_WIFI_HOTSPOT_H +#include #include #include -#include - #include "wifi_errcode.h" #include "wifi_ap_msg.h" #include "i_wifi_hotspot_callback.h" @@ -84,16 +83,18 @@ public: /** * @Description Enable Hotspot * + * @param type - service type * @return ErrCode - operation result */ - virtual ErrCode EnableHotspot(void) = 0; + virtual ErrCode EnableHotspot(const ServiceType type = ServiceType::DEFAULT) = 0; /** * @Description Disable Hotspot * + * @param type - service type * @return ErrCode - operation result */ - virtual ErrCode DisableHotspot(void) = 0; + virtual ErrCode DisableHotspot(const ServiceType type = ServiceType::DEFAULT) = 0; /** * @Description Get the Block Lists object @@ -160,6 +161,30 @@ public: * @return false - unsupported */ virtual bool IsFeatureSupported(long feature) = 0; + + /** + * @Description Get supported power model list + * + * @param setPowerModelList - supported power model list + * @return ErrCode - operation result + */ + virtual ErrCode GetSupportedPowerModel(std::set& setPowerModelList) = 0; + + /** + * @Description Get power model + * + * @param model - current power model + * @return ErrCode - operation result + */ + virtual ErrCode GetPowerModel(PowerModel& model) = 0; + + /** + * @Description Get supported power model list + * + * @param model - the model to be set + * @return ErrCode - operation result + */ + virtual ErrCode SetPowerModel(const PowerModel& model) = 0; }; } // namespace Wifi } // namespace OHOS diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/define.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/define.h index f0e9b1f..9172825 100644 --- a/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/define.h +++ b/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/define.h @@ -72,6 +72,9 @@ #define WIFI_SVR_CMD_GET_VALID_BANDS 0X110E /* get current valid frequency according band */ #define WIFI_SVR_CMD_GET_VALID_CHANNELS 0X110F /* get current valid channels associated with the band */ #define WIFI_SVR_CMD_REGISTER_HOTSPOT_CALLBACK 0X1110 /* register scan callback */ +#define WIFI_SVR_CMD_GET_SUPPORTED_POWER_MODEL 0X1111 /* get supported power model */ +#define WIFI_SVR_CMD_GET_POWER_MODEL 0X1112 /* get power model */ +#define WIFI_SVR_CMD_SET_POWER_MODEL 0X1113 /* set power model */ /* -------------p2p module message define----------------- */ #define WIFI_SVR_CMD_P2P_ENABLE 0x2000 /* open p2p */ diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_hotspot.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_hotspot.h index 2dec319..6d5822d 100644 --- a/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_hotspot.h +++ b/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_hotspot.h @@ -83,16 +83,18 @@ public: /** * @Description Enable Hotspot * + * @param type - service type * @return ErrCode - operation result */ - virtual ErrCode EnableHotspot(void) = 0; + virtual ErrCode EnableHotspot(const ServiceType type = ServiceType::DEFAULT) = 0; /** * @Description Disable Hotspot * + * @param type - service type * @return ErrCode - operation result */ - virtual ErrCode DisableHotspot(void) = 0; + virtual ErrCode DisableHotspot(const ServiceType type = ServiceType::DEFAULT) = 0; /** * @Description Get the Block Lists object @@ -150,6 +152,30 @@ public: * @return ErrCode - operation result */ virtual ErrCode GetSupportedFeatures(long &features) = 0; + + /** + * @Description Get supported power model list + * + * @param setPowerModelList - supported power model list + * @return ErrCode - operation result + */ + virtual ErrCode GetSupportedPowerModel(std::set& setPowerModelList) = 0; + + /** + * @Description Get power model + * + * @param model - current power model + * @return ErrCode - operation result + */ + virtual ErrCode GetPowerModel(PowerModel& model) = 0; + + /** + * @Description Get supported power model list + * + * @param model - the model to be set + * @return ErrCode - operation result + */ + virtual ErrCode SetPowerModel(const PowerModel& model) = 0; public: DECLARE_INTERFACE_DESCRIPTOR(u"ohos.wifi.IWifiHotspotService"); }; diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_ap_msg.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_ap_msg.h index 6b63bd6..4bc093e 100644 --- a/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_ap_msg.h +++ b/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_ap_msg.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,7 +16,9 @@ #ifndef OHOS_WIFI_AP_MSG_H #define OHOS_WIFI_AP_MSG_H #include +#include #include +#include "wifi_common_msg.h" namespace OHOS { namespace Wifi { @@ -50,6 +52,12 @@ enum class BandType { BAND_ANY = 3 /* Dual-mode frequency band */ }; +enum class PowerModel { + SLEEPING = 0, /* Sleeping model. */ + GENERAL = 1, /* General model. */ + THROUGH_WALL = 2, /* Through wall model. */ +}; + struct HotspotConfig { HotspotConfig() { diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_common_msg.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_common_msg.h new file mode 100644 index 0000000..db96583 --- /dev/null +++ b/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_common_msg.h @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OHOS_WIFI_COMMON_MSG_H +#define OHOS_WIFI_COMMON_MSG_H + +namespace OHOS { +namespace Wifi { +enum class ServiceType { + DEFAULT = 0, + WIFI_EXT = 1, +}; +} // namespace Wifi +} // namespace OHOS +#endif \ No newline at end of file diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_impl.cpp b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_impl.cpp index e23f102..f87c3a0 100644 --- a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_impl.cpp +++ b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_impl.cpp @@ -102,16 +102,16 @@ ErrCode WifiHotspotImpl::DisassociateSta(const StationInfo &info) return client_->DisassociateSta(info); } -ErrCode WifiHotspotImpl::EnableHotspot(void) +ErrCode WifiHotspotImpl::EnableHotspot(const ServiceType type) { RETURN_IF_FAIL(client_); - return client_->EnableHotspot(); + return client_->EnableHotspot(type); } -ErrCode WifiHotspotImpl::DisableHotspot(void) +ErrCode WifiHotspotImpl::DisableHotspot(const ServiceType type) { RETURN_IF_FAIL(client_); - return client_->DisableHotspot(); + return client_->DisableHotspot(type); } ErrCode WifiHotspotImpl::GetBlockLists(std::vector &infos) @@ -165,5 +165,23 @@ bool WifiHotspotImpl::IsFeatureSupported(long feature) } return ((tmpFeatures & feature) == feature); } + +ErrCode WifiHotspotImpl::GetSupportedPowerModel(std::set& setPowerModelList) +{ + RETURN_IF_FAIL(client_); + return client_->GetSupportedPowerModel(setPowerModelList); +} + +ErrCode WifiHotspotImpl::GetPowerModel(PowerModel& model) +{ + RETURN_IF_FAIL(client_); + return client_->GetPowerModel(model); +} + +ErrCode WifiHotspotImpl::SetPowerModel(const PowerModel& model) +{ + RETURN_IF_FAIL(client_); + return client_->SetPowerModel(model); +} } // namespace Wifi } // namespace OHOS \ No newline at end of file diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_impl.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_impl.h index d4f7c30..8f986c9 100644 --- a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_impl.h +++ b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_impl.h @@ -78,16 +78,18 @@ public: /** * @Description Enable Hotspot * + * @param type - service type * @return ErrCode - operation result */ - ErrCode EnableHotspot(void) override; + ErrCode EnableHotspot(const ServiceType type = ServiceType::DEFAULT) override; /** * @Description Disable Hotspot * + * @param type - service type * @return ErrCode - operation result */ - ErrCode DisableHotspot(void) override; + ErrCode DisableHotspot(const ServiceType type = ServiceType::DEFAULT) override; /** * @Description Get the Block Lists object @@ -154,6 +156,30 @@ public: * @return false - unsupported */ bool IsFeatureSupported(long feature) override; + + /** + * @Description Get supported power model list + * + * @param setPowerModelList - supported power model list + * @return ErrCode - operation result + */ + ErrCode GetSupportedPowerModel(std::set& setPowerModelList) override; + + /** + * @Description Get power model + * + * @param model - current power model + * @return ErrCode - operation result + */ + ErrCode GetPowerModel(PowerModel& model) override; + + /** + * @Description Get supported power model list + * + * @param model - the model to be set + * @return ErrCode - operation result + */ + ErrCode SetPowerModel(const PowerModel& model) override; private: int systemAbilityId_; sptr client_; diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_proxy.cpp b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_proxy.cpp index dfa010e..c125922 100644 --- a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_proxy.cpp +++ b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_proxy.cpp @@ -250,7 +250,7 @@ ErrCode WifiHotspotProxy::DisassociateSta(const StationInfo &info) return ErrCode(reply.ReadInt32()); } -ErrCode WifiHotspotProxy::EnableHotspot(void) +ErrCode WifiHotspotProxy::EnableHotspot(const ServiceType type) { MessageOption option; MessageParcel data; @@ -260,6 +260,7 @@ ErrCode WifiHotspotProxy::EnableHotspot(void) return WIFI_OPT_FAILED; } data.WriteInt32(0); + data.WriteInt32(static_cast(type)); int error = Remote()->SendRequest(WIFI_SVR_CMD_ENABLE_WIFI_AP, data, reply, option); if (error != ERR_NONE) { WIFI_LOGE("Set Attr(%{public}d) failed", WIFI_SVR_CMD_ENABLE_WIFI_AP); @@ -274,7 +275,7 @@ ErrCode WifiHotspotProxy::EnableHotspot(void) return ErrCode(reply.ReadInt32()); } -ErrCode WifiHotspotProxy::DisableHotspot(void) +ErrCode WifiHotspotProxy::DisableHotspot(const ServiceType type) { if (mRemoteDied) { WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); @@ -288,6 +289,7 @@ ErrCode WifiHotspotProxy::DisableHotspot(void) return WIFI_OPT_FAILED; } data.WriteInt32(0); + data.WriteInt32(static_cast(type)); int error = Remote()->SendRequest(WIFI_SVR_CMD_DISABLE_WIFI_AP, data, reply, option); if (error != ERR_NONE) { WIFI_LOGE("Set Attr(%{public}d) failed", WIFI_SVR_CMD_DISABLE_WIFI_AP); @@ -555,6 +557,108 @@ ErrCode WifiHotspotProxy::GetSupportedFeatures(long &features) return WIFI_OPT_SUCCESS; } +ErrCode WifiHotspotProxy::GetSupportedPowerModel(std::set& setPowerModelList) +{ + if (mRemoteDied) { + WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + return WIFI_OPT_FAILED; + } + MessageOption option; + MessageParcel data; + MessageParcel reply; + if (!data.WriteInterfaceToken(GetDescriptor())) { + WIFI_LOGE("Write interface token error: %{public}s", __func__); + return WIFI_OPT_FAILED; + } + data.WriteInt32(0); + int error = Remote()->SendRequest(WIFI_SVR_CMD_GET_SUPPORTED_POWER_MODEL, data, reply, option); + if (error != ERR_NONE) { + WIFI_LOGE("Set Attr(%{public}d) failed", WIFI_SVR_CMD_GET_SUPPORTED_POWER_MODEL); + return WIFI_OPT_FAILED; + } + + int exception = reply.ReadInt32(); + if (exception) { + return WIFI_OPT_FAILED; + } + int err = reply.ReadInt32(); + if (err != WIFI_OPT_SUCCESS) { + return ErrCode(err); + } + + constexpr int MAX_SIZE = 32; + int size = reply.ReadInt32(); + if (size > MAX_SIZE) { + WIFI_LOGE("size error: %{public}d", size); + return WIFI_OPT_FAILED; + } + for (int i = 0; i < size; i++) { + int val = reply.ReadInt32(); + setPowerModelList.insert(PowerModel(val)); + } + return WIFI_OPT_SUCCESS; +} + +ErrCode WifiHotspotProxy::GetPowerModel(PowerModel& model) +{ + if (mRemoteDied) { + WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + return WIFI_OPT_FAILED; + } + MessageOption option; + MessageParcel data; + MessageParcel reply; + if (!data.WriteInterfaceToken(GetDescriptor())) { + WIFI_LOGE("Write interface token error: %{public}s", __func__); + return WIFI_OPT_FAILED; + } + data.WriteInt32(0); + int error = Remote()->SendRequest(WIFI_SVR_CMD_GET_POWER_MODEL, data, reply, option); + if (error != ERR_NONE) { + WIFI_LOGE("Set Attr(%{public}d) failed", WIFI_SVR_CMD_GET_POWER_MODEL); + return WIFI_OPT_FAILED; + } + + int exception = reply.ReadInt32(); + if (exception) { + return WIFI_OPT_FAILED; + } + int err = reply.ReadInt32(); + if (err != WIFI_OPT_SUCCESS) { + return ErrCode(err); + } + model = PowerModel(reply.ReadInt32()); + return WIFI_OPT_SUCCESS; +} + +ErrCode WifiHotspotProxy::SetPowerModel(const PowerModel& model) +{ + if (mRemoteDied) { + WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + return WIFI_OPT_FAILED; + } + MessageOption option; + MessageParcel data; + MessageParcel reply; + if (!data.WriteInterfaceToken(GetDescriptor())) { + WIFI_LOGE("Write interface token error: %{public}s", __func__); + return WIFI_OPT_FAILED; + } + data.WriteInt32(0); + data.WriteInt32(static_cast(model)); + int error = Remote()->SendRequest(WIFI_SVR_CMD_SET_POWER_MODEL, data, reply, option); + if (error != ERR_NONE) { + WIFI_LOGE("Set Attr(%{public}d) failed", WIFI_SVR_CMD_SET_POWER_MODEL); + return WIFI_OPT_FAILED; + } + + int exception = reply.ReadInt32(); + if (exception) { + return WIFI_OPT_FAILED; + } + return ErrCode(reply.ReadInt32()); +} + void WifiHotspotProxy::OnRemoteDied(const wptr& remoteObject) { WIFI_LOGD("Remote service is died!"); diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_proxy.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_proxy.h index 9aed1e0..c5e87e3 100644 --- a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_proxy.h +++ b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_proxy.h @@ -80,16 +80,18 @@ public: /** * @Description Enable Hotspot * + * @param type - service type * @return ErrCode - operation result */ - ErrCode EnableHotspot(void) override; + ErrCode EnableHotspot(const ServiceType type = ServiceType::DEFAULT) override; /** * @Description Disable Hotspot * + * @param type - service type * @return ErrCode - operation result */ - ErrCode DisableHotspot(void) override; + ErrCode DisableHotspot(const ServiceType type = ServiceType::DEFAULT) override; /** * @Description Get the Block Lists object @@ -154,6 +156,30 @@ public: */ void OnRemoteDied(const wptr& remoteObject) override; + /** + * @Description Get supported power model list + * + * @param setPowerModelList - supported power model list + * @return ErrCode - operation result + */ + ErrCode GetSupportedPowerModel(std::set& setPowerModelList) override; + + /** + * @Description Get power model + * + * @param model - current power model + * @return ErrCode - operation result + */ + ErrCode GetPowerModel(PowerModel& model) override; + + /** + * @Description Get supported power model list + * + * @param model - the model to be set + * @return ErrCode - operation result + */ + ErrCode SetPowerModel(const PowerModel& model) override; + private: static BrokerDelegator g_delegator; diff --git a/wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp b/wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp index 0cb7ea9..17ee00d 100644 --- a/wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp +++ b/wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp @@ -544,7 +544,6 @@ bool WifiSettings::AddRandomMac(WifiStoreRandomMac &randomMacInfo) return isConnected; } - int WifiSettings::SetCountryCode(const std::string &countryCode) { std::unique_lock lock(mStaMutex); @@ -742,6 +741,20 @@ int WifiSettings::ClearValidChannels() return 0; } +int WifiSettings::SetPowerModel(const PowerModel& model) +{ + std::unique_lock lock(mInfoMutex); + powerModel = model; + return 0; +} + +int WifiSettings::GetPowerModel(PowerModel& model) +{ + std::unique_lock lock(mInfoMutex); + model = powerModel; + return 0; +} + int WifiSettings::SetP2pState(int state) { mP2pState = state; diff --git a/wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.h b/wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.h index 2df4c08..ef7d859 100644 --- a/wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.h +++ b/wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.h @@ -516,6 +516,22 @@ public: */ int ClearValidChannels(); + /** + * @Description Get supported power model list + * + * @param model - the model to be set + * @return ErrCode - operation result + */ + int SetPowerModel(const PowerModel& model); + + /** + * @Description Get power model + * + * @param model - current power model + * @return ErrCode - operation result + */ + int GetPowerModel(PowerModel& model); + /** * @Description set the p2p state * @@ -1049,6 +1065,7 @@ private: int mNoChargerPlugModeState; /* 1 on 2 off */ WifiConfig mWifiConfig; std::pair mBssidToTimeoutTime; + PowerModel powerModel = PowerModel::GENERAL; std::mutex mStaMutex; std::mutex mApMutex; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn index 0877e4e..64829b3 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn @@ -297,6 +297,7 @@ if (defined(ohos_lite)) { ] defines = [ "FEATURE_P2P_SUPPORT" ] } + ohos_shared_library("wifi_manager_service") { install_enable = true sources = [ @@ -346,6 +347,8 @@ if (defined(ohos_lite)) { defines = [ "FEATURE_AP_SUPPORT", "FEATURE_P2P_SUPPORT", + + # "PERMISSION_ALWAYS_GRANT", ] part_name = "wifi" diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_helper.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_helper.cpp index e059468..2210916 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_helper.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_helper.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -38,6 +38,7 @@ static PermissionDef g_wifiPermissions[] = { {"ohos.permission.GET_WIFI_LOCAL_MAC", USER_GRANT, NOT_RESTRICTED}, {"ohos.permission.LOCATION", USER_GRANT, NOT_RESTRICTED}, {"ohos.permission.GET_P2P_DEVICE_LOCATION", USER_GRANT, NOT_RESTRICTED}, + {"ohos.permission.MANAGE_WIFI_HOTSPOT_EXT", USER_GRANT, NOT_RESTRICTED}, }; static int g_wifiPermissionSize = sizeof(g_wifiPermissions) / sizeof(PermissionDef); @@ -273,5 +274,13 @@ int WifiPermissionHelper::VerifyGetWifiInfoInternalPermission(const int &pid, co } return PERMISSION_GRANTED; } + +int WifiPermissionHelper::VerifyManageWifiHotspotExtPermission(const int &pid, const int &uid) +{ + if (VerifyPermission("ohos.permission.MANAGE_WIFI_HOTSPOT_EXT", pid, uid) == PERMISSION_DENIED) { + return PERMISSION_DENIED; + } + return PERMISSION_GRANTED; +} } // namespace Wifi } // namespace OHOS \ No newline at end of file diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_helper.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_helper.h index f7f9eed..bbef84a 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_helper.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_helper.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -169,6 +169,15 @@ public: * @return int */ static int VerifyGetWifiInfoInternalPermission(const int &pid, const int &uid); + + /** + * @Description : Verify manage wifi hotspot extend permission. + * + * @param pid - Process ID.[in] + * @param uid - User ID.[in] + * @return int + */ + static int VerifyManageWifiHotspotExtPermission(const int &pid, const int &uid); }; } // namespace Wifi } // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_utils.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_utils.cpp index 4448017..86ebcb3 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_utils.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_utils.cpp @@ -75,6 +75,11 @@ int WifiPermissionUtils::VerifyGetWifiInfoInternalPermission() { return PERMISSION_GRANTED; } + +int WifiPermissionUtils::VerifyManageWifiHotspotExtPermission() +{ + return PERMISSION_GRANTED; +} #else int WifiPermissionUtils::VerifySetWifiInfoPermission() { @@ -141,6 +146,12 @@ int WifiPermissionUtils::VerifyGetWifiInfoInternalPermission() return WifiAuthCenter::GetInstance().VerifyGetWifiInfoInternalPermission( IPCSkeleton::GetCallingPid(), IPCSkeleton::GetCallingUid()); } + +int WifiPermissionUtils::VerifyManageWifiHotspotExtPermission() +{ + return WifiAuthCenter::GetInstance().VerifyManageWifiHotspotPermission( + IPCSkeleton::GetCallingPid(), IPCSkeleton::GetCallingUid()); +} #endif } // namespace Wifi } // namespace OHOS \ No newline at end of file diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_utils.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_utils.h index 439c0c6..2b593ac 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_utils.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_utils.h @@ -33,6 +33,7 @@ public: static int VerifyManageWifiHotspotPermission(); static int VerifyGetWifiPeersMacPermission(); static int VerifyGetWifiInfoInternalPermission(); + static int VerifyManageWifiHotspotExtPermission(); }; } // namespace Wifi } // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_hotspot_iface.c b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_hotspot_iface.c index a04cdb0..96b11c8 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_hotspot_iface.c +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_hotspot_iface.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -283,3 +283,43 @@ WifiErrorNo RegisterAsscociatedEvent(IWifiApEventCallback callback) UnlockRpcClient(client); return result; } + +WifiErrorNo WpaSetPowerModel(const int model) +{ + RpcClient *client = GetSupplicantRpcClient(); + LockRpcClient(client); + Context *context = client->context; + WriteBegin(context, 0); + WriteFunc(context, "WpaSetPowerModel"); + WriteInt(context, model); + WriteEnd(context); + if (RpcClientCall(client, "WpaSetPowerModel") != WIFI_IDL_OPT_OK) { + return WIFI_IDL_OPT_FAILED; + } + int result = WIFI_IDL_OPT_FAILED; + ReadInt(context, &result); + ReadClientEnd(client); + UnlockRpcClient(client); + return result; +} + +WifiErrorNo WpaGetPowerModel(int* model) +{ + RpcClient *client = GetSupplicantRpcClient(); + LockRpcClient(client); + Context *context = client->context; + WriteBegin(context, 0); + WriteFunc(context, "WpaGetPowerModel"); + WriteEnd(context); + if (RpcClientCall(client, "WpaGetPowerModel") != WIFI_IDL_OPT_OK) { + return WIFI_IDL_OPT_FAILED; + } + int result = WIFI_IDL_OPT_FAILED; + ReadInt(context, &result); + if (result == WIFI_IDL_OPT_OK) { + ReadInt(context, model); + } + ReadClientEnd(client); + UnlockRpcClient(client); + return result; +} diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_hotspot_iface.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_hotspot_iface.h index ec99f1d..ebbe753 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_hotspot_iface.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_hotspot_iface.h @@ -133,6 +133,21 @@ WifiErrorNo DisconnectStaByMac(const char *mac); */ WifiErrorNo RegisterAsscociatedEvent(IWifiApEventCallback callback); +/** + * @Description Get supported power model list + * + * @param model - the model to be set + * @return ErrCode - operation result + */ +WifiErrorNo WpaSetPowerModel(const int model); + +/** + * @Description Get power model + * + * @param model - current power model + * @return ErrCode - operation result + */ +WifiErrorNo WpaGetPowerModel(int* model); #ifdef __cplusplus } #endif diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_supplicant_iface.c b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_supplicant_iface.c index b6e96ed..b3eb042 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_supplicant_iface.c +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_supplicant_iface.c @@ -296,4 +296,4 @@ WifiErrorNo WpaGetCountryCode(char *countryCode, int codeSize) return WIFI_IDL_OPT_FAILED; } return result; -} \ No newline at end of file +} diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_ap_hal_interface.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_ap_hal_interface.cpp index 95320a2..6ce0337 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_ap_hal_interface.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_ap_hal_interface.cpp @@ -101,5 +101,15 @@ const IWifiApMonitorEventCallback &WifiApHalInterface::GetApCallbackInst(void) c { return mApCallback; } + +WifiErrorNo WifiApHalInterface::GetPowerModel(int& model) const +{ + return mIdlClient->ReqGetPowerModel(model); +} + +WifiErrorNo WifiApHalInterface::SetPowerModel(const int& model) const +{ + return mIdlClient->ReqSetPowerModel(model); +} } // namespace Wifi } // namespace OHOS \ No newline at end of file diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_ap_hal_interface.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_ap_hal_interface.h index b46c678..7adbcbc 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_ap_hal_interface.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_ap_hal_interface.h @@ -132,6 +132,22 @@ public: */ const IWifiApMonitorEventCallback &GetApCallbackInst(void) const; + /** + * @Description Get power mode. + * + * @param model + * @return WifiErrorNo + */ + WifiErrorNo GetPowerModel(int& model) const; + + /** + * @Description Set power mode. + * + * @param model + * @return WifiErrorNo + */ + WifiErrorNo SetPowerModel(const int& model) const; + private: IWifiApMonitorEventCallback mApCallback; }; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp index dea75ad..2b5e700 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp @@ -827,6 +827,18 @@ WifiErrorNo WifiIdlClient::ReqDisconnectStaByMac(const std::string &mac) return DisassociateSta((unsigned char *)mac.c_str(), strlen(mac.c_str())); } +WifiErrorNo WifiIdlClient::ReqGetPowerModel(int& model) +{ + CHECK_CLIENT_NOT_NULL; + return WpaGetPowerModel(&model); +} + +WifiErrorNo WifiIdlClient::ReqSetPowerModel(const int& model) +{ + CHECK_CLIENT_NOT_NULL; + return WpaSetPowerModel(model); +} + WifiErrorNo WifiIdlClient::GetWifiChipObject(int id, IWifiChip &chip) { CHECK_CLIENT_NOT_NULL; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.h index ef22f67..7dfca1c 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.h @@ -424,6 +424,22 @@ public: */ WifiErrorNo ReqDisconnectStaByMac(const std::string &mac); + /** + * @Description Request get the power mode. + * + * @param mode - The mode of power. + * @return WifiErrorNo + */ + WifiErrorNo ReqGetPowerModel(int& model); + + /** + * @Description Request set the power mode. + * + * @param mode - The mode to set. + * @return WifiErrorNo + */ + WifiErrorNo ReqSetPowerModel(const int& model); + /* ************************** ChipMode interface **************************** */ /** diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_interface.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_interface.cpp index 9fbe3c0..fa5ddc4 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_interface.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_interface.cpp @@ -90,5 +90,20 @@ ErrCode ApInterface::RegisterApServiceCallbacks(const IApServiceCallbacks &callb { return m_ApService.RegisterApServiceCallbacks(callbacks); } + +ErrCode ApInterface::GetSupportedPowerModel(std::set& setPowerModelList) +{ + return m_ApService.GetSupportedPowerModel(setPowerModelList); +} + +ErrCode ApInterface::GetPowerModel(PowerModel& model) +{ + return m_ApService.GetPowerModel(model); +} + +ErrCode ApInterface::SetPowerModel(const PowerModel& model) +{ + return m_ApService.SetPowerModel(model); +} } // namespace Wifi } // namespace OHOS \ No newline at end of file diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_interface.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_interface.h index 2d5c6e7..7c390ef 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_interface.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_interface.h @@ -112,6 +112,30 @@ public: */ virtual ErrCode GetValidChannels(BandType band, std::vector &validchannel) override; + /** + * @Description Get supported power model list + * + * @param setPowerModelList - supported power model list + * @return ErrCode - operation result + */ + virtual ErrCode GetSupportedPowerModel(std::set& setPowerModelList) override; + + /** + * @Description Get power model + * + * @param model - current power model + * @return ErrCode - operation result + */ + virtual ErrCode GetPowerModel(PowerModel& model) override; + + /** + * @Description Get supported power model list + * + * @param model - the model to be set + * @return ErrCode - operation result + */ + virtual ErrCode SetPowerModel(const PowerModel& model) override; + private: ApRootState m_ApRootState; ApStartedState m_ApStartedState; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.cpp index 97960a7..3fbced8 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.cpp @@ -18,6 +18,7 @@ #include "ap_state_machine.h" #include "wifi_logger.h" #include "wifi_settings.h" +#include "wifi_ap_hal_interface.h" DEFINE_WIFILOG_HOTSPOT_LABEL("WifiApService"); namespace OHOS { @@ -155,5 +156,33 @@ ErrCode ApService::RegisterApServiceCallbacks(const IApServiceCallbacks &callbac return ErrCode::WIFI_OPT_SUCCESS; } +ErrCode ApService::GetSupportedPowerModel(std::set& setPowerModelList) +{ + LOGI("ApService::GetSupportedPowerModel"); + /* All modes are currently supported */ + setPowerModelList.insert(PowerModel::SLEEPING); + setPowerModelList.insert(PowerModel::GENERAL); + setPowerModelList.insert(PowerModel::THROUGH_WALL); + return ErrCode::WIFI_OPT_SUCCESS; +} + +ErrCode ApService::GetPowerModel(PowerModel& model) +{ + WifiSettings::GetInstance().GetPowerModel(model); + LOGI("ApService::GetPowerModel, model=[%{public}d]", static_cast(model)); + return ErrCode::WIFI_OPT_SUCCESS; +} + +ErrCode ApService::SetPowerModel(const PowerModel& model) +{ + LOGI("Enter ApService::SetPowerModel, model=[%d]", static_cast(model)); + if (WifiApHalInterface::GetInstance().SetPowerModel(static_cast(model)) != WIFI_IDL_OPT_OK) { + LOGE("SetPowerModel() failed!"); + return WIFI_OPT_FAILED; + } + LOGI("SetPowerModel() succeed!"); + WifiSettings::GetInstance().SetPowerModel(model); + return ErrCode::WIFI_OPT_SUCCESS; +} } // namespace Wifi } // namespace OHOS \ No newline at end of file diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.h index b649d83..716543a 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.h @@ -117,6 +117,30 @@ public: */ ErrCode RegisterApServiceCallbacks(const IApServiceCallbacks &callbacks); + /** + * @Description Get supported power model list + * + * @param setPowerModelList - supported power model list + * @return ErrCode - operation result + */ + ErrCode GetSupportedPowerModel(std::set& setPowerModelList); + + /** + * @Description Get power model + * + * @param model - current power model + * @return ErrCode - operation result + */ + ErrCode GetPowerModel(PowerModel& model); + + /** + * @Description Get supported power model list + * + * @param model - the model to be set + * @return ErrCode - operation result + */ + ErrCode SetPowerModel(const PowerModel& model); + private: ApStateMachine &m_ApStateMachine; }; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.cpp index 1c01a7e..dc1ec95 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -76,6 +76,7 @@ void ApStartedState::GoInState() m_ApStateMachine.SwitchState(&m_ApStateMachine.m_ApIdleState); return; } + UpdatePowerMode(); m_ApStateMachine.OnApStateChange(ApState::AP_STATE_STARTED); } @@ -342,5 +343,17 @@ void ApStartedState::ProcessCmdDisconnectStation(InternalMessage &msg) const staInfo.ipAddr = msg.GetStringFromMessage(); m_ApStateMachine.m_ApStationsManager.DisConnectStation(staInfo); } + +void ApStartedState::UpdatePowerMode() const +{ + WIFI_LOGI("UpdatePowerMode."); + int model = -1; + if (WifiApHalInterface::GetInstance().GetPowerModel(model) != WIFI_IDL_OPT_OK) { + LOGE("GetPowerModel() failed!"); + return; + } + LOGI("SetPowerModel(): %{public}d.", model); + WifiSettings::GetInstance().SetPowerModel(PowerModel(model)); +} } // namespace Wifi } // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.h index 71164bf..a4c65ec 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.h @@ -209,6 +209,12 @@ private: */ void ProcessCmdDisconnectStation(InternalMessage &msg) const; + /** + * @Description update the power mode. + * @return None + */ + void UpdatePowerMode() const; + /** * @Description Initialization. * @param None diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/i_ap_service.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/i_ap_service.h index db88d4d..56b1594 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/i_ap_service.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/i_ap_service.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -37,6 +37,9 @@ public: virtual ErrCode GetStationList(std::vector &result) = 0; virtual ErrCode GetValidBands(std::vector &bands) = 0; virtual ErrCode GetValidChannels(BandType band, std::vector &validchannel) = 0; + virtual ErrCode GetSupportedPowerModel(std::set& setPowerModelList) = 0; + virtual ErrCode GetPowerModel(PowerModel& model) = 0; + virtual ErrCode SetPowerModel(const PowerModel& model) = 0; /** * @Description - Registers all callbacks provided by the P2P service. diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_auth_center.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_auth_center.cpp index 29f1d65..e0311f1 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_auth_center.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_auth_center.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -136,5 +136,13 @@ int WifiAuthCenter::VerifyGetWifiInfoInternalPermission(const int &pid, const in } return WifiPermissionHelper::VerifyGetWifiInfoInternalPermission(pid, uid); } + +int WifiAuthCenter::VerifyManageWifiHotspotExtPermission(const int &pid, const int &uid) +{ + if (g_permissinAlwaysGrant) { + return PERMISSION_GRANTED; + } + return WifiPermissionHelper::VerifyManageWifiHotspotExtPermission(pid, uid); +} } // namespace Wifi } // namespace OHOS \ No newline at end of file diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_auth_center.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_auth_center.h index 61c1e29..962117e 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_auth_center.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_auth_center.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -149,6 +149,15 @@ public: */ int VerifyGetWifiInfoInternalPermission(const int &pid, const int &uid); + /** + * @Description : Verify manage wifi hotspot extend permission. + * + * @param pid - Process ID.[in] + * @param uid - User ID.[in] + * @return int - PERMISSION_DENIED or PERMISSION_GRANTED + */ + int VerifyManageWifiHotspotExtPermission(const int &pid, const int &uid); + private: /* system auth service client */ }; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp index 9867c89..7e98299 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp @@ -248,9 +248,15 @@ ErrCode WifiHotspotServiceImpl::DisassociateSta(const StationInfo &info) return pService->DisconnetStation(info); } -ErrCode WifiHotspotServiceImpl::CheckCanEnableHotspot(void) +int WifiHotspotServiceImpl::CheckOperHotspotSwitchPermission(const ServiceType type) { - if (WifiPermissionUtils::VerifyManageWifiHotspotPermission() == PERMISSION_DENIED) { + return (type == ServiceType::WIFI_EXT) ? PERMISSION_GRANTED : + WifiPermissionUtils::VerifyManageWifiHotspotPermission(); +} + +ErrCode WifiHotspotServiceImpl::CheckCanEnableHotspot(const ServiceType type) +{ + if (CheckOperHotspotSwitchPermission(type) == PERMISSION_DENIED) { WIFI_LOGE("EnableHotspot:VerifyManageWifiHotspotPermission PERMISSION_DENIED!"); return WIFI_OPT_PERMISSION_DENIED; } @@ -266,10 +272,10 @@ ErrCode WifiHotspotServiceImpl::CheckCanEnableHotspot(void) return WIFI_OPT_SUCCESS; } -ErrCode WifiHotspotServiceImpl::EnableHotspot(void) +ErrCode WifiHotspotServiceImpl::EnableHotspot(const ServiceType type) { WIFI_LOGI("EnableHotspot"); - ErrCode errCode = CheckCanEnableHotspot(); + ErrCode errCode = CheckCanEnableHotspot(type); if (errCode != WIFI_OPT_SUCCESS) { return errCode; } @@ -316,11 +322,11 @@ ErrCode WifiHotspotServiceImpl::EnableHotspot(void) return errCode; } -ErrCode WifiHotspotServiceImpl::DisableHotspot(void) +ErrCode WifiHotspotServiceImpl::DisableHotspot(const ServiceType type) { WIFI_LOGI("DisableHotspot"); - if (WifiPermissionUtils::VerifyManageWifiHotspotPermission() == PERMISSION_DENIED) { - WIFI_LOGE("DisableHotspot:VerifyManageWifiHotspotPermission PERMISSION_DENIED!"); + if (CheckOperHotspotSwitchPermission(type) == PERMISSION_DENIED) { + WIFI_LOGE("EnableHotspot:VerifyManageWifiHotspotPermission PERMISSION_DENIED!"); return WIFI_OPT_PERMISSION_DENIED; } @@ -499,6 +505,55 @@ ErrCode WifiHotspotServiceImpl::GetSupportedFeatures(long &features) return WIFI_OPT_SUCCESS; } +ErrCode WifiHotspotServiceImpl::GetSupportedPowerModel(std::set& setPowerModelList) +{ + if (WifiPermissionUtils::VerifyGetWifiInfoPermission() == PERMISSION_DENIED) { + WIFI_LOGE("GetSupportedPowerModel:VerifyGetWifiInfoPermission() PERMISSION_DENIED!"); + return WIFI_OPT_PERMISSION_DENIED; + } + + if (!IsApServiceRunning()) { + return WIFI_OPT_AP_NOT_OPENED; + } + IApService *pService = WifiServiceManager::GetInstance().GetApServiceInst(); + if (pService == nullptr) { + return WIFI_OPT_AP_NOT_OPENED; + } + pService->GetSupportedPowerModel(setPowerModelList); + return WIFI_OPT_SUCCESS; +} + +ErrCode WifiHotspotServiceImpl::GetPowerModel(PowerModel& model) +{ + if (WifiPermissionUtils::VerifyGetWifiInfoPermission() == PERMISSION_DENIED) { + WIFI_LOGE("GetPowerModel:VerifyGetWifiInfoPermission() PERMISSION_DENIED!"); + return WIFI_OPT_PERMISSION_DENIED; + } + + if (!IsApServiceRunning()) { + return WIFI_OPT_AP_NOT_OPENED; + } + IApService *pService = WifiServiceManager::GetInstance().GetApServiceInst(); + if (pService == nullptr) { + return WIFI_OPT_AP_NOT_OPENED; + } + pService->GetPowerModel(model); + return WIFI_OPT_SUCCESS; +} + +ErrCode WifiHotspotServiceImpl::SetPowerModel(const PowerModel& model) +{ + if (!IsApServiceRunning()) { + return WIFI_OPT_AP_NOT_OPENED; + } + IApService *pService = WifiServiceManager::GetInstance().GetApServiceInst(); + if (pService == nullptr) { + return WIFI_OPT_AP_NOT_OPENED; + } + pService->SetPowerModel(model); + return WIFI_OPT_SUCCESS; +} + void WifiHotspotServiceImpl::ConfigInfoDump(std::string& result) { HotspotConfig config; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.h index 760c1a1..f1d89e0 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.h @@ -92,14 +92,14 @@ public: * * @return ErrCode - operation result */ - ErrCode EnableHotspot(void) override; + ErrCode EnableHotspot(const ServiceType type = ServiceType::DEFAULT) override; /** * @Description Disable Hotspot * * @return ErrCode - operation result */ - ErrCode DisableHotspot(void) override; + ErrCode DisableHotspot(const ServiceType type = ServiceType::DEFAULT) override; /** * @Description Get the Block Lists object @@ -158,6 +158,30 @@ public: */ ErrCode GetSupportedFeatures(long &features) override; + /** + * @Description Get supported power model list + * + * @param setPowerModelList - supported power model list + * @return ErrCode - operation result + */ + ErrCode GetSupportedPowerModel(std::set& setPowerModelList) override; + + /** + * @Description Get power model + * + * @param model - current power model + * @return ErrCode - operation result + */ + ErrCode GetPowerModel(PowerModel& model) override; + + /** + * @Description Get supported power model list + * + * @param model - the model to be set + * @return ErrCode - operation result + */ + ErrCode SetPowerModel(const PowerModel& model) override; + /** * @Description dump p2p information * @@ -169,7 +193,8 @@ public: private: bool Init(); - ErrCode CheckCanEnableHotspot(void); + ErrCode CheckCanEnableHotspot(const ServiceType type); + int CheckOperHotspotSwitchPermission(const ServiceType type); bool IsApServiceRunning(); static void SaBasicDump(std::string& result); static void ConfigInfoDump(std::string& result); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.cpp index 66cc1a1..754b2c9 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.cpp @@ -49,6 +49,9 @@ void WifiHotspotStub::InitHandleMap() handleFuncMap[WIFI_SVR_CMD_GET_VALID_CHANNELS] = &WifiHotspotStub::OnGetValidChannels; handleFuncMap[WIFI_SVR_CMD_REGISTER_HOTSPOT_CALLBACK] = &WifiHotspotStub::OnRegisterCallBack; handleFuncMap[WIFI_SVR_CMD_GET_SUPPORTED_FEATURES] = &WifiHotspotStub::OnGetSupportedFeatures; + handleFuncMap[WIFI_SVR_CMD_GET_SUPPORTED_POWER_MODEL] = &WifiHotspotStub::OnGetSupportedPowerModel; + handleFuncMap[WIFI_SVR_CMD_GET_POWER_MODEL] = &WifiHotspotStub::OnGetPowerModel; + handleFuncMap[WIFI_SVR_CMD_SET_POWER_MODEL] = &WifiHotspotStub::OnSetPowerModel; return; } @@ -214,7 +217,8 @@ void WifiHotspotStub::OnGetValidChannels( void WifiHotspotStub::OnEnableWifiAp(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) { WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); - ErrCode ret = EnableHotspot(); + int32_t serviceType = data.ReadInt32(); + ErrCode ret = EnableHotspot(ServiceType(serviceType)); reply.WriteInt32(0); reply.WriteInt32(ret); @@ -224,7 +228,8 @@ void WifiHotspotStub::OnEnableWifiAp(uint32_t code, MessageParcel &data, Message void WifiHotspotStub::OnDisableWifiAp(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) { WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); - ErrCode ret = DisableHotspot(); + int32_t serviceType = data.ReadInt32(); + ErrCode ret = DisableHotspot(ServiceType(serviceType)); reply.WriteInt32(0); reply.WriteInt32(ret); @@ -330,5 +335,44 @@ void WifiHotspotStub::OnGetSupportedFeatures( return; } + +void WifiHotspotStub::OnGetSupportedPowerModel(uint32_t code, MessageParcel &data, + MessageParcel &reply, MessageOption &option) +{ + WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); + std::set setPowerModelList; + ErrCode ret = GetSupportedPowerModel(setPowerModelList); + reply.WriteInt32(0); + reply.WriteInt32(ret); + if (ret == WIFI_OPT_SUCCESS) { + int size = setPowerModelList.size(); + reply.WriteInt32(size); + for (auto &powerModel : setPowerModelList) { + reply.WriteInt32(static_cast(powerModel)); + } + } + return; +} + +void WifiHotspotStub::OnGetPowerModel(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) +{ + WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); + PowerModel model; + ErrCode ret = GetPowerModel(model); + reply.WriteInt32(0); + reply.WriteInt32(ret); + reply.WriteInt32(static_cast(model)); + return; +} + +void WifiHotspotStub::OnSetPowerModel(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) +{ + WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); + PowerModel model = PowerModel(data.ReadInt32()); + ErrCode ret = SetPowerModel(model); + reply.WriteInt32(0); + reply.WriteInt32(ret); + return; +} } // namespace Wifi } // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.h index c963af1..f0c98e3 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -54,6 +54,9 @@ private: void OnGetValidChannels(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option); void OnRegisterCallBack(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option); void OnGetSupportedFeatures(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option); + void OnGetSupportedPowerModel(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option); + void OnGetPowerModel(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option); + void OnSetPowerModel(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option); private: HandleFuncMap handleFuncMap; diff --git a/wifi/services/wifi_standard/wifi_hal/BUILD.gn b/wifi/services/wifi_standard/wifi_hal/BUILD.gn index a32e785..2f85f78 100644 --- a/wifi/services/wifi_standard/wifi_hal/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_hal/BUILD.gn @@ -21,6 +21,7 @@ if (defined(ohos_lite)) { local_base_sources = [ "common/wifi_hal_common_func.c", + "hdi/wifi_hdi_ap_instance.c", "main.c", "wifi_hal_adapter.c", "wifi_hal_ap_interface.c", @@ -55,6 +56,7 @@ local_base_include_dirs = [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/hdi", ] if (defined(ohos_lite)) { diff --git a/wifi/services/wifi_standard/wifi_hal/hdi/wifi_hdi_ap_instance.c b/wifi/services/wifi_standard/wifi_hal/hdi/wifi_hdi_ap_instance.c new file mode 100644 index 0000000..a4aaf69 --- /dev/null +++ b/wifi/services/wifi_standard/wifi_hal/hdi/wifi_hdi_ap_instance.c @@ -0,0 +1,69 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "wifi_hdi_ap_instance.h" +#include "wifi_hal_define.h" +#include "wifi_log.h" + +#undef LOG_TAG +#define LOG_TAG "WifiHdiInstance" + +#ifndef OHOS_ARCH_LITE +WifiErrorNo HdiGetAp(struct IWiFi **wifi, struct IWiFiAp **apFeature) +{ + if (wifi == NULL || apFeature == NULL) { + return WIFI_HAL_FAILED; + } + + LOGD("HdiGetAp"); + int32_t ret; + ret = WifiConstruct(wifi); + if (ret != 0 || *wifi == NULL) { + LOGE("%{public}s WifiConstruct failed", __func__); + return WIFI_HAL_FAILED; + } + + ret = (*wifi)->start(*wifi); + if (ret != 0) { + (void)WifiDestruct(wifi); + LOGE("%{public}s start failed", __func__); + return WIFI_HAL_FAILED; + } + + ret = (*wifi)->createFeature(PROTOCOL_80211_IFTYPE_AP, (struct IWiFiBaseFeature **)apFeature); + if (ret != 0 || *apFeature == NULL) { + (void)(*wifi)->stop(*wifi); + (void)WifiDestruct(wifi); + LOGE("%{public}s createFeature failed", __func__); + return WIFI_HAL_FAILED; + } + return WIFI_HAL_SUCCESS; +} + +WifiErrorNo HdiReleaseAp(struct IWiFi *wifi, struct IWiFiAp *apFeature) +{ + if (wifi == NULL) { + return WIFI_HAL_FAILED; + } + + LOGD("HdiReleaseAp"); + if (apFeature != NULL) { + (void)wifi->destroyFeature((struct IWiFiBaseFeature *)apFeature); + } + (void)wifi->stop(wifi); + (void)WifiDestruct(&wifi); + return WIFI_HAL_SUCCESS; +} +#endif diff --git a/wifi/services/wifi_standard/wifi_hal/hdi/wifi_hdi_ap_instance.h b/wifi/services/wifi_standard/wifi_hal/hdi/wifi_hdi_ap_instance.h new file mode 100644 index 0000000..5c63697 --- /dev/null +++ b/wifi/services/wifi_standard/wifi_hal/hdi/wifi_hdi_ap_instance.h @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OHOS_HDI_INSTANCE_H +#define OHOS_HDI_INSTANCE_H + +#include "wifi_hal.h" +#include "wifi_hal_ap_feature.h" +#include "wifi_hal_define.h" + +#ifdef __cplusplus +extern "C" { +#endif + +WifiErrorNo HdiGetAp(struct IWiFi **wifi, struct IWiFiAp **apFeature); + +WifiErrorNo HdiReleaseAp(struct IWiFi *wifi, struct IWiFiAp *apFeature); + +#ifdef __cplusplus +} +#endif +#endif \ No newline at end of file diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c index 25a253b..139473e 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c @@ -19,9 +19,9 @@ #ifdef OHOS_ARCH_LITE #include "wifi_hal_adapter.h" #else -#include "wifi_hal.h" #include "wifi_hal_adapter.h" -#include "wifi_hal_ap_feature.h" +#include "wifi_hdi_ap_instance.h" + #endif #include "wifi_hal_module_manage.h" #include "wifi_hal_common_func.h" @@ -280,49 +280,66 @@ WifiErrorNo GetValidFrequenciesForBand(int32_t band, int *frequencies, int32_t * #ifdef OHOS_ARCH_LITE return WIFI_HAL_FAILED; #else - int32_t ret; uint32_t count = 0; struct IWiFi *wifi = NULL; struct IWiFiAp *apFeature = NULL; - - if (frequencies == NULL || size == NULL) { - LOGE("GetValidFrequenciesForBand frequencies or size is NULL"); - return WIFI_HAL_FAILED; - } - LOGD("GetValidFrequenciesForBand"); - - ret = WifiConstruct(&wifi); - if (ret != 0 || wifi == NULL) { - LOGE("%{public}s WifiConstruct failed", __func__); + WifiErrorNo ret = HdiGetAp(&wifi, &apFeature); + if (ret != WIFI_HAL_SUCCESS) { return WIFI_HAL_FAILED; } - ret = wifi->start(wifi); + ret = apFeature->baseFeature.getValidFreqsWithBand((struct IWiFiBaseFeature *)apFeature, + ConvertToNl80211Band(band), frequencies, *size, &count); + *size = count; if (ret != 0) { - (void)WifiDestruct(&wifi); - LOGE("%{public}s start failed", __func__); - return WIFI_HAL_FAILED; + LOGE("%{public}s failed", __func__); } + HdiReleaseAp(wifi, apFeature); + return (ret == 0) ? WIFI_HAL_SUCCESS : WIFI_HAL_FAILED; +#endif +} + +WifiErrorNo WifiSetPowerModel(const int mode) +{ +#ifdef OHOS_ARCH_LITE + return WIFI_HAL_FAILED; +#else + LOGD("WifiSetPowerModel: %{public}d", mode); - ret = wifi->createFeature(PROTOCOL_80211_IFTYPE_AP, (struct IWiFiBaseFeature **)&apFeature); - if (ret != 0 || apFeature == NULL) { - (void)wifi->stop(wifi); - (void)WifiDestruct(&wifi); - LOGE("%{public}s createFeature failed", __func__); + struct IWiFi *wifi = NULL; + struct IWiFiAp *apFeature = NULL; + WifiErrorNo ret = HdiGetAp(&wifi, &apFeature); + if (ret != WIFI_HAL_SUCCESS) { return WIFI_HAL_FAILED; } + ret = wifi->setPowerMode(apFeature->baseFeature.ifName, mode); + if (ret != 0) { + LOGE("%{public}s failed", __func__); + } + HdiReleaseAp(wifi, apFeature); + return (ret == 0) ? WIFI_HAL_SUCCESS : WIFI_HAL_FAILED; +#endif +} - ret = apFeature->baseFeature.getValidFreqsWithBand((struct IWiFiBaseFeature *)apFeature, - ConvertToNl80211Band(band), frequencies, *size, &count); - *size = count; +WifiErrorNo WifiGetPowerModel(int* mode) +{ +#ifdef OHOS_ARCH_LITE + return WIFI_HAL_FAILED; +#else + LOGD("WifiGetPowerModel"); - (void)wifi->destroyFeature((struct IWiFiBaseFeature *)apFeature); - (void)wifi->stop(wifi); - (void)WifiDestruct(&wifi); + struct IWiFi *wifi = NULL; + struct IWiFiAp *apFeature = NULL; + WifiErrorNo ret = HdiGetAp(&wifi, &apFeature); + if (ret != WIFI_HAL_SUCCESS) { + return WIFI_HAL_FAILED; + } + ret = wifi->getPowerMode(apFeature->baseFeature.ifName, (uint8_t *)mode); if (ret != 0) { LOGE("%{public}s failed", __func__); } - + LOGD("getPowerModel: %{public}d", *mode); + HdiReleaseAp(wifi, apFeature); return (ret == 0) ? WIFI_HAL_SUCCESS : WIFI_HAL_FAILED; #endif -} +} \ No newline at end of file diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.h index bb18367..a9b96a0 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.h +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -135,6 +135,21 @@ WifiErrorNo DisassociateSta(const unsigned char *mac, int lenMac); */ WifiErrorNo GetValidFrequenciesForBand(int32_t band, int *frequencies, int32_t *size); +/** + * @Description Set the power mode. + * + * @param mode - power mode. + * @return WifiErrorNo + */ +WifiErrorNo WifiSetPowerModel(const int mode); + +/** + * @Description Get the power mode. + * + * @param mode - power mode. + * @return WifiErrorNo + */ +WifiErrorNo WifiGetPowerModel(int* mode); #ifdef __cplusplus } #endif diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_ap.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_ap.c index 6678d71..29094ad 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_ap.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_ap.c @@ -223,3 +223,35 @@ int RpcGetValidFrequenciesForBand(RpcServer *server, Context *context) frequencies = NULL; return 0; } + +int RpcSetPowerModel(RpcServer *server, Context *context) +{ + if (server == NULL || context == NULL) { + return -1; + } + int mode = -1; + if (ReadInt(context, &mode) < 0) { + return -1; + } + WifiErrorNo err = WifiSetPowerModel(mode); + WriteBegin(context, 0); + WriteInt(context, err); + WriteEnd(context); + return 0; +} + +int RpcGetPowerModel(RpcServer *server, Context *context) +{ + if (server == NULL || context == NULL) { + return -1; + } + int mode = -1; + WifiErrorNo err = WifiGetPowerModel(&mode); + WriteBegin(context, 0); + WriteInt(context, err); + if (err == WIFI_HAL_SUCCESS) { + WriteInt(context, mode); + } + WriteEnd(context); + return 0; +} diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_ap.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_ap.h index b8027a9..c3f8ac4 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_ap.h +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_ap.h @@ -112,6 +112,25 @@ int RpcDisassociateSta(RpcServer *server, Context *context); */ int RpcGetValidFrequenciesForBand(RpcServer *server, Context *context); +/** + * @Description Parse the context to obtain data. Call the corresponding function + * SetPowerModel and assemble the function to obtain data. + * + * @param server - Pointer to the global structure of the communication server. + * @param context - Pointer to the global communication context structure of the server. + * @return int - 0 Success, -1 Failed. + */ +int RpcSetPowerModel(RpcServer *server, Context *context); + +/** + * @Description Parse the context to obtain data. Call the corresponding function + * GetPowerModel and assemble the function to obtain data. + * + * @param server - Pointer to the global structure of the communication server. + * @param context - Pointer to the global communication context structure of the server. + * @return int - 0 Success, -1 Failed. + */ +int RpcGetPowerModel(RpcServer *server, Context *context); #ifdef __cplusplus } #endif diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.c index ff12aed..5606363 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.c @@ -176,6 +176,8 @@ static int InitRpcFuncMapAp(void) ret += PushRpcFunc("DelMacFilter", RpcDelMacFilter); ret += PushRpcFunc("DisassociateSta", RpcDisassociateSta); ret += PushRpcFunc("GetValidFrequenciesForBand", RpcGetValidFrequenciesForBand); + ret += PushRpcFunc("WpaSetPowerModel", RpcSetPowerModel); + ret += PushRpcFunc("WpaGetPowerModel", RpcGetPowerModel); return ret; } -- Gitee From c26bd154c4a4f9e21f2493aa307cdba498367a71 Mon Sep 17 00:00:00 2001 From: z00588131 Date: Fri, 13 May 2022 11:47:36 +0000 Subject: [PATCH 102/491] fix compile problem Signed-off-by: z00588131 --- wifi/services/wifi_standard/wifi_hal/hdi/wifi_hdi_ap_instance.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_hal/hdi/wifi_hdi_ap_instance.c b/wifi/services/wifi_standard/wifi_hal/hdi/wifi_hdi_ap_instance.c index a4aaf69..f9523ef 100644 --- a/wifi/services/wifi_standard/wifi_hal/hdi/wifi_hdi_ap_instance.c +++ b/wifi/services/wifi_standard/wifi_hal/hdi/wifi_hdi_ap_instance.c @@ -13,6 +13,7 @@ * limitations under the License. */ +#ifndef OHOS_ARCH_LITE #include "wifi_hdi_ap_instance.h" #include "wifi_hal_define.h" #include "wifi_log.h" @@ -20,7 +21,6 @@ #undef LOG_TAG #define LOG_TAG "WifiHdiInstance" -#ifndef OHOS_ARCH_LITE WifiErrorNo HdiGetAp(struct IWiFi **wifi, struct IWiFiAp **apFeature) { if (wifi == NULL || apFeature == NULL) { -- Gitee From e0f45112b45ee47ed4f96c5aadbd81c3d01e939f Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Sun, 15 May 2022 19:17:43 +0800 Subject: [PATCH 103/491] bugfix from master Signed-off-by: yanxiaotao --- .../include/dhcp_define.h | 0 .../include/dhcp_service_api.h | 0 .../interfaces/i_dhcp_client_service.h | 0 .../interfaces/i_dhcp_result_notify.h | 0 .../interfaces/i_dhcp_server_service.h | 0 .../interfaces/i_dhcp_service.h | 0 .../services/dhcp_client/BUILD.gn | 0 .../services/dhcp_client/dhcp_client_test.cpp | 0 .../dhcp_client/dhcp_function_test.cpp | 0 .../services/dhcp_client/dhcp_ipv4_test.cpp | 0 .../services/dhcp_client/dhcp_main_test.cpp | 0 .../dhcp_client/dhcp_options_test.cpp | 0 .../services/dhcp_client/dhcp_socket_test.cpp | 0 .../services/dhcp_client/global_test.cpp | 0 .../services/dhcp_client/global_test.h | 0 .../services/dhcp_client/mock_custom_func.cpp | 0 .../services/dhcp_client/mock_custom_func.h | 0 .../services/dhcp_client/mock_system_func.cpp | 0 .../services/dhcp_client/mock_system_func.h | 0 .../services/dhcp_server/unittest/BUILD.gn | 0 .../unittest/address_utils_test.cpp | 0 .../dhcp_server/unittest/common_util_test.cpp | 0 .../unittest/dhcp_address_pool_test.cpp | 0 .../unittest/dhcp_argument_test.cpp | 0 .../unittest/dhcp_binding_test.cpp | 0 .../dhcp_server/unittest/dhcp_config_test.cpp | 0 .../dhcp_server/unittest/dhcp_message_sim.cpp | 0 .../dhcp_server/unittest/dhcp_message_sim.h | 0 .../dhcp_server/unittest/dhcp_option_test.cpp | 0 .../dhcp_server/unittest/dhcp_server_test.cpp | 0 .../dhcp_server/unittest/hash_table_test.cpp | 0 .../dhcp_server/unittest/system_func_mock.cpp | 0 .../dhcp_server/unittest/system_func_mock.h | 0 .../services/mgr_service/BUILD.gn | 0 .../mgr_service/dhcp_client_service_test.cpp | 0 .../services/mgr_service/dhcp_func_test.cpp | 0 .../services/mgr_service/dhcp_manage_test.cpp | 0 .../mgr_service/dhcp_result_notify.cpp | 0 .../services/mgr_service/dhcp_result_notify.h | 0 .../mgr_service/dhcp_server_service_test.cpp | 0 .../mgr_service/dhcp_service_test.cpp | 0 .../services/mgr_service/global_test.cpp | 0 .../services/mgr_service/global_test.h | 0 .../services/mgr_service/mock_system_func.cpp | 0 .../services/mgr_service/mock_system_func.h | 0 .../innerkits => frameworks}/BUILD.gn | 0 .../js}/napi/BUILD.gn | 0 .../js}/napi/wifi_ext_napi_entry.cpp | 0 .../js}/napi/wifi_ext_napi_hotspot.cpp | 0 .../js}/napi/wifi_ext_napi_hotspot.h | 0 .../js}/napi/wifi_napi_device.cpp | 0 .../js}/napi/wifi_napi_device.h | 0 .../js}/napi/wifi_napi_entry.cpp | 0 .../js}/napi/wifi_napi_event.cpp | 0 .../js}/napi/wifi_napi_event.h | 0 .../js}/napi/wifi_napi_hotspot.cpp | 0 .../js}/napi/wifi_napi_hotspot.h | 0 .../js}/napi/wifi_napi_p2p.cpp | 0 .../js}/napi/wifi_napi_p2p.h | 0 .../js}/napi/wifi_napi_utils.cpp | 0 .../js}/napi/wifi_napi_utils.h | 0 .../native}/BUILD.gn | 0 .../native}/c_adapter/wifi_c_device.cpp | 0 .../native}/c_adapter/wifi_c_event.cpp | 0 .../native}/c_adapter/wifi_c_hid2d.cpp | 0 .../native}/c_adapter/wifi_c_hotspot.cpp | 0 .../native}/c_adapter/wifi_c_p2p.cpp | 0 .../native}/c_adapter/wifi_c_utils.cpp | 0 .../native}/c_adapter/wifi_c_utils.h | 0 .../native}/include/wifi_device.h | 0 .../native}/include/wifi_hid2d.h | 0 .../native}/include/wifi_hotspot.h | 0 .../native}/include/wifi_ipc_lite_adapter.h | 0 .../native}/include/wifi_p2p.h | 0 .../native}/include/wifi_scan.h | 0 .../native}/interfaces/define.h | 0 .../native}/interfaces/i_wifi_device.h | 0 .../interfaces/i_wifi_device_callback.h | 0 .../native}/interfaces/i_wifi_hotspot.h | 0 .../interfaces/i_wifi_hotspot_callback.h | 0 .../native}/interfaces/i_wifi_p2p.h | 0 .../native}/interfaces/i_wifi_p2p_callback.h | 0 .../native}/interfaces/i_wifi_scan.h | 0 .../native}/interfaces/i_wifi_scan_callback.h | 0 .../native}/interfaces/wifi_ap_msg.h | 0 .../native}/interfaces/wifi_common_msg.h | 0 .../native}/interfaces/wifi_errcode.h | 0 .../native}/interfaces/wifi_hid2d_msg.h | 0 .../native}/interfaces/wifi_msg.h | 0 .../native}/interfaces/wifi_p2p_msg.h | 0 .../native}/interfaces/wifi_scan_msg.h | 0 .../native}/src/wifi_device.cpp | 0 .../native}/src/wifi_device_callback_stub.cpp | 0 .../native}/src/wifi_device_callback_stub.h | 0 .../src/wifi_device_callback_stub_lite.cpp | 0 .../src/wifi_device_callback_stub_lite.h | 0 .../native}/src/wifi_device_impl.cpp | 0 .../native}/src/wifi_device_impl.h | 0 .../native}/src/wifi_device_proxy.cpp | 0 .../native}/src/wifi_device_proxy.h | 0 .../native}/src/wifi_device_proxy_lite.cpp | 0 .../native}/src/wifi_hid2d.cpp | 0 .../native}/src/wifi_hid2d_msg.cpp | 0 .../native}/src/wifi_hotspot.cpp | 0 .../src/wifi_hotspot_callback_stub.cpp | 0 .../native}/src/wifi_hotspot_callback_stub.h | 0 .../native}/src/wifi_hotspot_impl.cpp | 0 .../native}/src/wifi_hotspot_impl.h | 0 .../native}/src/wifi_hotspot_proxy.cpp | 0 .../native}/src/wifi_hotspot_proxy.h | 0 .../native}/src/wifi_logger.h | 0 .../native}/src/wifi_p2p.cpp | 0 .../native}/src/wifi_p2p_callback_stub.cpp | 0 .../native}/src/wifi_p2p_callback_stub.h | 0 .../native}/src/wifi_p2p_impl.cpp | 0 .../native}/src/wifi_p2p_impl.h | 0 .../native}/src/wifi_p2p_msg.cpp | 0 .../native}/src/wifi_p2p_proxy.cpp | 0 .../native}/src/wifi_p2p_proxy.h | 0 .../native}/src/wifi_scan.cpp | 0 .../native}/src/wifi_scan_callback_stub.cpp | 0 .../native}/src/wifi_scan_callback_stub.h | 0 .../src/wifi_scan_callback_stub_lite.cpp | 0 .../native}/src/wifi_scan_impl.cpp | 0 .../native}/src/wifi_scan_impl.h | 0 .../native}/src/wifi_scan_proxy.cpp | 0 .../native}/src/wifi_scan_proxy.h | 0 .../native}/src/wifi_scan_proxy_lite.cpp | 0 .../native_c => kits/c}/station_info.h | 0 .../native_c => kits/c}/wifi_device.h | 0 .../native_c => kits/c}/wifi_device_config.h | 0 .../native_c => kits/c}/wifi_error_code.h | 0 .../native_c => kits/c}/wifi_event.h | 0 .../native_c => kits/c}/wifi_hid2d.h | 0 .../native_c => kits/c}/wifi_hotspot.h | 0 .../native_c => kits/c}/wifi_hotspot_config.h | 0 .../native_c => kits/c}/wifi_linked_info.h | 0 .../{innerkits/native_c => kits/c}/wifi_p2p.h | 0 .../native_c => kits/c}/wifi_p2p_config.h | 0 .../native_c => kits/c}/wifi_scan_info.h | 0 wifi/interfaces/kits/jskits/@ohos.wifi.d.ts | 1332 ----------------- .../interfaces/kits/jskits/@ohos.wifiext.d.ts | 102 -- .../ipc_framework/cRPC/unittest/BUILD.gn | 0 .../cRPC/unittest/context_test.cpp | 0 .../cRPC/unittest/context_test.h | 0 .../cRPC/unittest/hash_table_test.cpp | 0 .../cRPC/unittest/hash_table_test.h | 0 .../ipc_framework/cRPC/unittest/net_test.cpp | 0 .../ipc_framework/cRPC/unittest/net_test.h | 0 .../cRPC/unittest/rpc_test_main.cpp | 0 .../cRPC/unittest/serial_test.cpp | 0 .../ipc_framework/cRPC/unittest/serial_test.h | 0 .../wifi_framework/common/unittest/BUILD.gn | 0 .../common/unittest/common_test.cpp | 0 .../common/unittest/wifi_config_file_test.cpp | 0 .../common/unittest/wifi_config_file_test.h | 0 .../common/unittest/wifi_global_func_test.cpp | 0 .../common/unittest/wifi_global_func_test.h | 0 .../common/unittest/wifi_ip_tools_test.cpp | 0 .../common/unittest/wifi_ip_tools_test.h | 0 .../common/unittest/wifi_log_helper_test.cpp | 0 .../common/unittest/wifi_log_helper_test.h | 0 .../unittest/wifi_network_interface_test.cpp | 0 .../unittest/wifi_network_interface_test.h | 0 .../wifi_manage/idl_client/unittest/BUILD.gn | 0 .../unittest/idl_client_test_main.cpp | 0 .../unittest/mock_wifi_hal_service.c | 0 .../unittest/wifi_ap_hal_interface_test.cpp | 0 .../unittest/wifi_ap_hal_interface_test.h | 0 .../unittest/wifi_base_hal_interface_test.cpp | 0 .../unittest/wifi_base_hal_interface_test.h | 0 .../unittest/wifi_chip_hal_interface_test.cpp | 0 .../unittest/wifi_chip_hal_interface_test.h | 0 .../unittest/wifi_idl_client_test.cpp | 0 .../unittest/wifi_idl_client_test.h | 0 .../unittest/wifi_idl_interface_test.cpp | 0 .../unittest/wifi_idl_interface_test.h | 0 .../unittest/wifi_p2p_hal_interface_test.cpp | 0 .../unittest/wifi_p2p_hal_interface_test.h | 0 .../unittest/wifi_sta_hal_interface_test.cpp | 0 .../unittest/wifi_sta_hal_interface_test.h | 0 .../wifi_supplicant_hal_interface_test.cpp | 0 .../wifi_supplicant_hal_interface_test.h | 0 .../wifi_manage/unittest/BUILD.gn | 0 .../unittest/wifi_auth_center_test.cpp | 0 .../unittest/wifi_auth_center_test.h | 0 .../unittest/wifi_config_center_test.cpp | 0 .../unittest/wifi_config_center_test.h | 0 .../wifi_internal_event_dispatcher_test.cpp | 0 .../wifi_internal_event_dispatcher_test.h | 0 .../wifi_manage/unittest/wifi_manage_test.cpp | 0 .../unittest/wifi_manager_service_test.cpp | 0 .../unittest/wifi_manager_service_test.h | 0 .../unittest/wifi_mock_p2p_service.cpp | 0 .../unittest/wifi_mock_p2p_service.h | 0 .../unittest/wifi_service_manager_test.cpp | 0 .../unittest/wifi_service_manager_test.h | 0 .../wifi_manage/wifi_ap/BUILD.gn | 0 .../wifi_ap/Mock/mock_ap_config_use.h | 0 .../wifi_ap/Mock/mock_ap_idle_state.h | 0 .../wifi_ap/Mock/mock_ap_monitor.h | 0 .../wifi_ap/Mock/mock_ap_root_state.h | 0 .../wifi_ap/Mock/mock_ap_service.h | 0 .../wifi_ap/Mock/mock_ap_started_state.h | 0 .../wifi_ap/Mock/mock_ap_state_machine.h | 0 .../wifi_ap/Mock/mock_ap_stations_manager.h | 0 .../wifi_ap/Mock/mock_network_interface.cpp | 0 .../wifi_ap/Mock/mock_network_interface.h | 0 .../wifi_manage/wifi_ap/Mock/mock_pendant.h | 0 .../wifi_ap/Mock/mock_system_interface.cpp | 0 .../wifi_ap/Mock/mock_system_interface.h | 0 .../Mock/mock_wifi_ap_hal_interface.cpp | 0 .../wifi_ap/Mock/mock_wifi_ap_hal_interface.h | 0 .../wifi_ap/Mock/mock_wifi_ap_nat_manager.h | 0 .../wifi_ap/Mock/mock_wifi_settings.cpp | 0 .../wifi_ap/Mock/mock_wifi_settings.h | 0 .../wifi_ap/Mock/operator_overload.cpp | 0 .../wifi_ap/Mock/operator_overload.h | 0 .../wifi_ap/ap_config_use_test.cpp | 0 .../wifi_ap/ap_idle_state_test.cpp | 0 .../wifi_manage/wifi_ap/ap_monitor_test.cpp | 0 .../wifi_ap/ap_root_state_test.cpp | 0 .../wifi_manage/wifi_ap/ap_service_test.cpp | 0 .../wifi_ap/ap_started_state_test.cpp | 0 .../wifi_ap/ap_state_machine_test.cpp | 0 .../wifi_ap/ap_stations_manager_test.cpp | 0 .../wifi_manage/wifi_ap/global_test.cpp | 0 .../wifi_manage/wifi_ap/global_test.h | 0 .../wifi_ap/wifi_ap_nat_manager_test.cpp | 0 .../wifi_ap/wifi_ap_service_test.cpp | 0 .../wifi_manage/wifi_ap/wifi_ap_test.cpp | 0 .../wifi_manage/wifi_p2p/test/BUILD.gn | 0 ...ck_authorizing_negotiation_request_state.h | 0 .../test/Mock/mock_group_formed_state.h | 0 .../test/Mock/mock_group_negotiation_state.h | 0 .../Mock/mock_invitation_recelved_state.h | 0 .../test/Mock/mock_invitation_request_state.h | 0 .../test/Mock/mock_p2p_default_state.h | 0 .../test/Mock/mock_p2p_disabled_state.h | 0 .../test/Mock/mock_p2p_disabling_state.h | 0 .../test/Mock/mock_p2p_enabled_state.h | 0 .../test/Mock/mock_p2p_enabling_state.h | 0 .../Mock/mock_p2p_group_formation_state.h | 0 .../test/Mock/mock_p2p_group_join_state.h | 0 .../Mock/mock_p2p_group_operating_state.h | 0 .../wifi_p2p/test/Mock/mock_p2p_idle_state.h | 0 .../test/Mock/mock_p2p_inviting_state.h | 0 .../wifi_p2p/test/Mock/mock_p2p_monitor.h | 0 .../test/Mock/mock_p2p_state_machine.h | 0 .../Mock/mock_provision_discovery_state.h | 0 .../Mock/mock_wifi_p2p_device_manager.cpp | 0 .../test/Mock/mock_wifi_p2p_device_manager.h | 0 .../test/Mock/mock_wifi_p2p_hal_interface.cpp | 0 .../test/Mock/mock_wifi_p2p_hal_interface.h | 0 .../wifi_p2p/test/Mock/mock_wifi_settings.cpp | 0 .../wifi_p2p/test/Mock/mock_wifi_settings.h | 0 ...orizing_negotiation_request_state_test.cpp | 0 .../wifi_manage/wifi_p2p/test/global_test.cpp | 0 .../wifi_manage/wifi_p2p/test/global_test.h | 0 .../wifi_p2p/test/group_formed_state_test.cpp | 0 .../test/group_negotiation_state_test.cpp | 0 .../test/invitation_recelved_state_test.cpp | 0 .../test/invitation_request_state_test.cpp | 0 .../wifi_p2p/test/mock_p2p_pendant.h | 0 .../wifi_p2p/test/p2p_default_state_test.cpp | 0 .../wifi_p2p/test/p2p_disabled_state_test.cpp | 0 .../test/p2p_disabling_state_test.cpp | 0 .../wifi_p2p/test/p2p_enabled_state_test.cpp | 0 .../wifi_p2p/test/p2p_enabling_state_test.cpp | 0 .../test/p2p_group_formation_state_test.cpp | 0 .../test/p2p_group_join_state_test.cpp | 0 .../test/p2p_group_operating_state_test.cpp | 0 .../wifi_p2p/test/p2p_idle_state_test.cpp | 0 .../wifi_p2p/test/p2p_inviting_state_test.cpp | 0 .../wifi_p2p/test/p2p_monitor_test.cpp | 0 .../wifi_p2p/test/p2p_state_machine_test.cpp | 0 .../test/provision_discovery_state_test.cpp | 0 .../test/wifi_p2p_device_manager_test.cpp | 0 .../wifi_p2p_dns_sd_service_info_test.cpp | 0 .../wifi_p2p_dns_sd_service_request_test.cpp | 0 .../wifi_p2p_dns_sd_service_response_test.cpp | 0 .../test/wifi_p2p_group_info_proxy_test.cpp | 0 .../test/wifi_p2p_group_manager_test.cpp | 0 .../test/wifi_p2p_service_manager_test.cpp | 0 .../wifi_p2p_service_request_list_test.cpp | 0 .../wifi_p2p_service_response_list_test.cpp | 0 .../wifi_p2p/test/wifi_p2p_service_test.cpp | 0 .../wifi_p2p/test/wifi_p2p_test_entry.cpp | 0 .../test/wifi_p2p_upnp_service_info_test.cpp | 0 .../wifi_p2p_upnp_service_request_test.cpp | 0 .../wifi_p2p_upnp_service_response_test.cpp | 0 .../wifi_manage/wifi_scan/BUILD.gn | 0 .../wifi_scan/Mock/mock_scan_service.cpp | 0 .../wifi_scan/Mock/mock_scan_service.h | 0 .../Mock/mock_scan_state_machine.cpp | 0 .../wifi_scan/Mock/mock_scan_state_machine.h | 0 .../wifi_scan/Mock/mock_wifi_manager.cpp | 0 .../wifi_scan/Mock/mock_wifi_manager.h | 0 .../wifi_scan/Mock/mock_wifi_settings.cpp | 0 .../wifi_scan/Mock/mock_wifi_settings.h | 0 .../Mock/mock_wifi_sta_hal_interface.cpp | 0 .../Mock/mock_wifi_sta_hal_interface.h | 0 .../mock_wifi_supplicant_hal_interface.cpp | 0 .../Mock/mock_wifi_supplicant_hal_interface.h | 0 .../wifi_manage/wifi_scan/global_test.cpp | 0 .../wifi_manage/wifi_scan/global_test.h | 0 .../wifi_scan/scan_interface_test.cpp | 0 .../wifi_scan/scan_monitor_test.cpp | 0 .../wifi_scan/scan_service_test.cpp | 0 .../wifi_scan/scan_state_machine_test.cpp | 0 .../wifi_manage/wifi_scan/wifi_scan_test.cpp | 0 .../wifi_manage/wifi_sta/BUILD.gn | 0 .../wifi_sta/Mock/mock_device_appraisal.h | 0 .../wifi_sta/Mock/mock_dhcp_service.cpp | 0 .../wifi_sta/Mock/mock_dhcp_service.h | 0 .../wifi_sta/Mock/mock_if_config.cpp | 0 .../wifi_sta/Mock/mock_if_config.h | 0 .../wifi_sta/Mock/mock_mac_address.cpp | 0 .../wifi_sta/Mock/mock_mac_address.h | 0 .../Mock/mock_sta_auto_connect_service.cpp | 0 .../Mock/mock_sta_auto_connect_service.h | 0 .../wifi_sta/Mock/mock_sta_monitor.h | 0 .../wifi_sta/Mock/mock_sta_network_check.cpp | 0 .../wifi_sta/Mock/mock_sta_network_check.h | 0 .../wifi_sta/Mock/mock_sta_service.h | 0 .../wifi_sta/Mock/mock_sta_state_machine.cpp | 0 .../wifi_sta/Mock/mock_sta_state_machine.h | 0 .../Mock/mock_wifi_chip_hal_interface.cpp | 0 .../Mock/mock_wifi_chip_hal_interface.h | 0 .../wifi_sta/Mock/mock_wifi_manager.cpp | 0 .../wifi_sta/Mock/mock_wifi_manager.h | 0 .../wifi_sta/Mock/mock_wifi_settings.cpp | 0 .../wifi_sta/Mock/mock_wifi_settings.h | 0 .../Mock/mock_wifi_sta_hal_interface.cpp | 0 .../Mock/mock_wifi_sta_hal_interface.h | 0 .../mock_wifi_supplicant_hal_interface.cpp | 0 .../Mock/mock_wifi_supplicant_hal_interface.h | 0 .../wifi_manage/wifi_sta/global_test.cpp | 0 .../wifi_manage/wifi_sta/global_test.h | 0 .../sta_auto_connect_service_test.cpp | 0 .../wifi_sta/sta_interface_test.cpp | 0 .../wifi_manage/wifi_sta/sta_monitor_test.cpp | 0 .../wifi_sta/sta_network_check_test.cpp | 0 .../sta_saved_device_appraisal_test.cpp | 0 .../wifi_manage/wifi_sta/sta_service_test.cpp | 0 .../wifi_sta/sta_state_machine_test.cpp | 0 .../wifi_manage/wifi_sta/wifi_sta_test.cpp | 0 .../wifi_standard/wifi_hal/unittest/BUILD.gn | 0 .../wifi_hal/unittest/mock_wpa_ctrl.cpp | 0 .../wifi_hal/unittest/mock_wpa_ctrl.h | 0 .../wifi_hal/unittest/wifi_hal_adapter_test.h | 0 .../unittest/wifi_hal_ap_interface_test.cpp | 0 .../unittest/wifi_hal_ap_interface_test.h | 0 .../unittest/wifi_hal_base_interface_test.cpp | 0 .../unittest/wifi_hal_base_interface_test.h | 0 .../unittest/wifi_hal_chip_interface_test.cpp | 0 .../unittest/wifi_hal_chip_interface_test.h | 0 .../wifi_hal_crpc_server_add_test.cpp | 0 .../unittest/wifi_hal_crpc_server_add_test.h | 0 .../unittest/wifi_hal_crpc_server_test.cpp | 0 .../unittest/wifi_hal_crpc_server_test.h | 0 .../unittest/wifi_hal_hostapd_test.cpp | 0 .../wifi_hal/unittest/wifi_hal_hostapd_test.h | 0 .../unittest/wifi_hal_p2p_interface_test.cpp | 0 .../unittest/wifi_hal_p2p_interface_test.h | 0 .../unittest/wifi_hal_sta_interface_test.cpp | 0 .../unittest/wifi_hal_sta_interface_test.h | 0 .../wifi_hal/unittest/wifi_hal_test.cpp | 0 .../wifi_hal/unittest/wifi_hal_vendor.conf | 0 .../unittest/wifi_hal_vendor_interface_test.c | 0 .../unittest/wifi_hal_wpa_p2p_test.cpp | 0 .../wifi_hal/unittest/wifi_hal_wpa_p2p_test.h | 0 .../unittest/wifi_hal_wpa_sta_test.cpp | 0 .../wifi_hal/unittest/wifi_hal_wpa_sta_test.h | 0 374 files changed, 1434 deletions(-) rename dhcp/interfaces/{innerkits/native_cpp => inner_api}/include/dhcp_define.h (100%) rename dhcp/interfaces/{innerkits/native_cpp => inner_api}/include/dhcp_service_api.h (100%) rename dhcp/interfaces/{innerkits/native_cpp => inner_api}/interfaces/i_dhcp_client_service.h (100%) rename dhcp/interfaces/{innerkits/native_cpp => inner_api}/interfaces/i_dhcp_result_notify.h (100%) rename dhcp/interfaces/{innerkits/native_cpp => inner_api}/interfaces/i_dhcp_server_service.h (100%) rename dhcp/interfaces/{innerkits/native_cpp => inner_api}/interfaces/i_dhcp_service.h (100%) rename dhcp/{tests => test}/services/dhcp_client/BUILD.gn (100%) rename dhcp/{tests => test}/services/dhcp_client/dhcp_client_test.cpp (100%) rename dhcp/{tests => test}/services/dhcp_client/dhcp_function_test.cpp (100%) rename dhcp/{tests => test}/services/dhcp_client/dhcp_ipv4_test.cpp (100%) rename dhcp/{tests => test}/services/dhcp_client/dhcp_main_test.cpp (100%) rename dhcp/{tests => test}/services/dhcp_client/dhcp_options_test.cpp (100%) rename dhcp/{tests => test}/services/dhcp_client/dhcp_socket_test.cpp (100%) rename dhcp/{tests => test}/services/dhcp_client/global_test.cpp (100%) rename dhcp/{tests => test}/services/dhcp_client/global_test.h (100%) rename dhcp/{tests => test}/services/dhcp_client/mock_custom_func.cpp (100%) rename dhcp/{tests => test}/services/dhcp_client/mock_custom_func.h (100%) rename dhcp/{tests => test}/services/dhcp_client/mock_system_func.cpp (100%) rename dhcp/{tests => test}/services/dhcp_client/mock_system_func.h (100%) rename dhcp/{tests => test}/services/dhcp_server/unittest/BUILD.gn (100%) rename dhcp/{tests => test}/services/dhcp_server/unittest/address_utils_test.cpp (100%) rename dhcp/{tests => test}/services/dhcp_server/unittest/common_util_test.cpp (100%) rename dhcp/{tests => test}/services/dhcp_server/unittest/dhcp_address_pool_test.cpp (100%) rename dhcp/{tests => test}/services/dhcp_server/unittest/dhcp_argument_test.cpp (100%) rename dhcp/{tests => test}/services/dhcp_server/unittest/dhcp_binding_test.cpp (100%) rename dhcp/{tests => test}/services/dhcp_server/unittest/dhcp_config_test.cpp (100%) rename dhcp/{tests => test}/services/dhcp_server/unittest/dhcp_message_sim.cpp (100%) rename dhcp/{tests => test}/services/dhcp_server/unittest/dhcp_message_sim.h (100%) rename dhcp/{tests => test}/services/dhcp_server/unittest/dhcp_option_test.cpp (100%) rename dhcp/{tests => test}/services/dhcp_server/unittest/dhcp_server_test.cpp (100%) rename dhcp/{tests => test}/services/dhcp_server/unittest/hash_table_test.cpp (100%) rename dhcp/{tests => test}/services/dhcp_server/unittest/system_func_mock.cpp (100%) rename dhcp/{tests => test}/services/dhcp_server/unittest/system_func_mock.h (100%) rename dhcp/{tests => test}/services/mgr_service/BUILD.gn (100%) rename dhcp/{tests => test}/services/mgr_service/dhcp_client_service_test.cpp (100%) rename dhcp/{tests => test}/services/mgr_service/dhcp_func_test.cpp (100%) rename dhcp/{tests => test}/services/mgr_service/dhcp_manage_test.cpp (100%) rename dhcp/{tests => test}/services/mgr_service/dhcp_result_notify.cpp (100%) rename dhcp/{tests => test}/services/mgr_service/dhcp_result_notify.h (100%) rename dhcp/{tests => test}/services/mgr_service/dhcp_server_service_test.cpp (100%) rename dhcp/{tests => test}/services/mgr_service/dhcp_service_test.cpp (100%) rename dhcp/{tests => test}/services/mgr_service/global_test.cpp (100%) rename dhcp/{tests => test}/services/mgr_service/global_test.h (100%) rename dhcp/{tests => test}/services/mgr_service/mock_system_func.cpp (100%) rename dhcp/{tests => test}/services/mgr_service/mock_system_func.h (100%) rename wifi/{interfaces/innerkits => frameworks}/BUILD.gn (100%) rename wifi/{interfaces/innerkits/native_cpp => frameworks/js}/napi/BUILD.gn (100%) rename wifi/{interfaces/innerkits/native_cpp => frameworks/js}/napi/wifi_ext_napi_entry.cpp (100%) rename wifi/{interfaces/innerkits/native_cpp => frameworks/js}/napi/wifi_ext_napi_hotspot.cpp (100%) rename wifi/{interfaces/innerkits/native_cpp => frameworks/js}/napi/wifi_ext_napi_hotspot.h (100%) rename wifi/{interfaces/innerkits/native_cpp => frameworks/js}/napi/wifi_napi_device.cpp (100%) rename wifi/{interfaces/innerkits/native_cpp => frameworks/js}/napi/wifi_napi_device.h (100%) rename wifi/{interfaces/innerkits/native_cpp => frameworks/js}/napi/wifi_napi_entry.cpp (100%) rename wifi/{interfaces/innerkits/native_cpp => frameworks/js}/napi/wifi_napi_event.cpp (100%) rename wifi/{interfaces/innerkits/native_cpp => frameworks/js}/napi/wifi_napi_event.h (100%) rename wifi/{interfaces/innerkits/native_cpp => frameworks/js}/napi/wifi_napi_hotspot.cpp (100%) rename wifi/{interfaces/innerkits/native_cpp => frameworks/js}/napi/wifi_napi_hotspot.h (100%) rename wifi/{interfaces/innerkits/native_cpp => frameworks/js}/napi/wifi_napi_p2p.cpp (100%) rename wifi/{interfaces/innerkits/native_cpp => frameworks/js}/napi/wifi_napi_p2p.h (100%) rename wifi/{interfaces/innerkits/native_cpp => frameworks/js}/napi/wifi_napi_utils.cpp (100%) rename wifi/{interfaces/innerkits/native_cpp => frameworks/js}/napi/wifi_napi_utils.h (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/BUILD.gn (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/c_adapter/wifi_c_device.cpp (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/c_adapter/wifi_c_event.cpp (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/c_adapter/wifi_c_hid2d.cpp (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/c_adapter/wifi_c_hotspot.cpp (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/c_adapter/wifi_c_p2p.cpp (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/c_adapter/wifi_c_utils.cpp (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/c_adapter/wifi_c_utils.h (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/include/wifi_device.h (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/include/wifi_hid2d.h (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/include/wifi_hotspot.h (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/include/wifi_ipc_lite_adapter.h (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/include/wifi_p2p.h (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/include/wifi_scan.h (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/interfaces/define.h (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/interfaces/i_wifi_device.h (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/interfaces/i_wifi_device_callback.h (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/interfaces/i_wifi_hotspot.h (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/interfaces/i_wifi_hotspot_callback.h (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/interfaces/i_wifi_p2p.h (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/interfaces/i_wifi_p2p_callback.h (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/interfaces/i_wifi_scan.h (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/interfaces/i_wifi_scan_callback.h (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/interfaces/wifi_ap_msg.h (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/interfaces/wifi_common_msg.h (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/interfaces/wifi_errcode.h (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/interfaces/wifi_hid2d_msg.h (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/interfaces/wifi_msg.h (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/interfaces/wifi_p2p_msg.h (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/interfaces/wifi_scan_msg.h (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/src/wifi_device.cpp (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/src/wifi_device_callback_stub.cpp (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/src/wifi_device_callback_stub.h (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/src/wifi_device_callback_stub_lite.cpp (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/src/wifi_device_callback_stub_lite.h (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/src/wifi_device_impl.cpp (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/src/wifi_device_impl.h (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/src/wifi_device_proxy.cpp (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/src/wifi_device_proxy.h (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/src/wifi_device_proxy_lite.cpp (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/src/wifi_hid2d.cpp (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/src/wifi_hid2d_msg.cpp (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/src/wifi_hotspot.cpp (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/src/wifi_hotspot_callback_stub.cpp (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/src/wifi_hotspot_callback_stub.h (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/src/wifi_hotspot_impl.cpp (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/src/wifi_hotspot_impl.h (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/src/wifi_hotspot_proxy.cpp (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/src/wifi_hotspot_proxy.h (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/src/wifi_logger.h (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/src/wifi_p2p.cpp (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/src/wifi_p2p_callback_stub.cpp (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/src/wifi_p2p_callback_stub.h (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/src/wifi_p2p_impl.cpp (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/src/wifi_p2p_impl.h (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/src/wifi_p2p_msg.cpp (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/src/wifi_p2p_proxy.cpp (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/src/wifi_p2p_proxy.h (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/src/wifi_scan.cpp (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/src/wifi_scan_callback_stub.cpp (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/src/wifi_scan_callback_stub.h (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/src/wifi_scan_callback_stub_lite.cpp (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/src/wifi_scan_impl.cpp (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/src/wifi_scan_impl.h (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/src/wifi_scan_proxy.cpp (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/src/wifi_scan_proxy.h (100%) rename wifi/{interfaces/innerkits/native_cpp/wifi_standard => frameworks/native}/src/wifi_scan_proxy_lite.cpp (100%) rename wifi/interfaces/{innerkits/native_c => kits/c}/station_info.h (100%) rename wifi/interfaces/{innerkits/native_c => kits/c}/wifi_device.h (100%) rename wifi/interfaces/{innerkits/native_c => kits/c}/wifi_device_config.h (100%) rename wifi/interfaces/{innerkits/native_c => kits/c}/wifi_error_code.h (100%) rename wifi/interfaces/{innerkits/native_c => kits/c}/wifi_event.h (100%) rename wifi/interfaces/{innerkits/native_c => kits/c}/wifi_hid2d.h (100%) rename wifi/interfaces/{innerkits/native_c => kits/c}/wifi_hotspot.h (100%) rename wifi/interfaces/{innerkits/native_c => kits/c}/wifi_hotspot_config.h (100%) rename wifi/interfaces/{innerkits/native_c => kits/c}/wifi_linked_info.h (100%) rename wifi/interfaces/{innerkits/native_c => kits/c}/wifi_p2p.h (100%) rename wifi/interfaces/{innerkits/native_c => kits/c}/wifi_p2p_config.h (100%) rename wifi/interfaces/{innerkits/native_c => kits/c}/wifi_scan_info.h (100%) delete mode 100644 wifi/interfaces/kits/jskits/@ohos.wifi.d.ts delete mode 100644 wifi/interfaces/kits/jskits/@ohos.wifiext.d.ts rename wifi/{tests => test}/wifi_standard/ipc_framework/cRPC/unittest/BUILD.gn (100%) rename wifi/{tests => test}/wifi_standard/ipc_framework/cRPC/unittest/context_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/ipc_framework/cRPC/unittest/context_test.h (100%) rename wifi/{tests => test}/wifi_standard/ipc_framework/cRPC/unittest/hash_table_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/ipc_framework/cRPC/unittest/hash_table_test.h (100%) rename wifi/{tests => test}/wifi_standard/ipc_framework/cRPC/unittest/net_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/ipc_framework/cRPC/unittest/net_test.h (100%) rename wifi/{tests => test}/wifi_standard/ipc_framework/cRPC/unittest/rpc_test_main.cpp (100%) rename wifi/{tests => test}/wifi_standard/ipc_framework/cRPC/unittest/serial_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/ipc_framework/cRPC/unittest/serial_test.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/common/unittest/BUILD.gn (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/common/unittest/common_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/common/unittest/wifi_config_file_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/common/unittest/wifi_config_file_test.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/common/unittest/wifi_global_func_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/common/unittest/wifi_global_func_test.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/common/unittest/wifi_ip_tools_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/common/unittest/wifi_ip_tools_test.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/common/unittest/wifi_log_helper_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/common/unittest/wifi_log_helper_test.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/common/unittest/wifi_network_interface_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/common/unittest/wifi_network_interface_test.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/BUILD.gn (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/idl_client_test_main.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/mock_wifi_hal_service.c (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_ap_hal_interface_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_ap_hal_interface_test.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_base_hal_interface_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_base_hal_interface_test.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_chip_hal_interface_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_chip_hal_interface_test.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_idl_client_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_idl_client_test.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_idl_interface_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_idl_interface_test.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_p2p_hal_interface_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_p2p_hal_interface_test.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_sta_hal_interface_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_sta_hal_interface_test.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_supplicant_hal_interface_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_supplicant_hal_interface_test.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_auth_center_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_auth_center_test.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_config_center_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_config_center_test.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_internal_event_dispatcher_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_internal_event_dispatcher_test.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manage_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manager_service_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manager_service_test.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_mock_p2p_service.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_mock_p2p_service.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_service_manager_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_service_manager_test.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_config_use.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_idle_state.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_monitor.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_root_state.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_service.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_started_state.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_state_machine.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_stations_manager.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_network_interface.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_network_interface.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_pendant.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_system_interface.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_system_interface.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_ap_hal_interface.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_ap_hal_interface.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_ap_nat_manager.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_settings.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_settings.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/operator_overload.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/operator_overload.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_idle_state_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_root_state_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/global_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/global_test.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_service_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_authorizing_negotiation_request_state.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_group_formed_state.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_group_negotiation_state.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_invitation_recelved_state.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_invitation_request_state.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_default_state.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_disabled_state.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_disabling_state.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_enabled_state.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_enabling_state.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_group_formation_state.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_group_join_state.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_group_operating_state.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_idle_state.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_inviting_state.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_monitor.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_state_machine.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_provision_discovery_state.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_device_manager.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_device_manager.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_hal_interface.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_hal_interface.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_settings.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_settings.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/authorizing_negotiation_request_state_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/global_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/global_test.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/group_formed_state_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/group_negotiation_state_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/invitation_recelved_state_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/invitation_request_state_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/mock_p2p_pendant.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_default_state_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_disabled_state_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_disabling_state_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_enabled_state_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_enabling_state_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_group_formation_state_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_group_join_state_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_group_operating_state_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_idle_state_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_inviting_state_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_monitor_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_state_machine_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/provision_discovery_state_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_device_manager_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_dns_sd_service_info_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_dns_sd_service_request_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_dns_sd_service_response_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_group_info_proxy_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_group_manager_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_manager_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_request_list_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_response_list_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_test_entry.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_upnp_service_info_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_upnp_service_request_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_upnp_service_response_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_service.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_service.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_state_machine.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_state_machine.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_manager.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_manager.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_settings.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_settings.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_sta_hal_interface.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_sta_hal_interface.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_supplicant_hal_interface.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_supplicant_hal_interface.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/global_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/global_test.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_monitor_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/wifi_scan_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_device_appraisal.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_dhcp_service.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_dhcp_service.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_if_config.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_if_config.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_mac_address.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_mac_address.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_auto_connect_service.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_auto_connect_service.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_monitor.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_network_check.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_network_check.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_service.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_state_machine.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_state_machine.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_chip_hal_interface.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_chip_hal_interface.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_manager.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_manager.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_settings.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_settings.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_sta_hal_interface.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_sta_hal_interface.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_supplicant_hal_interface.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_supplicant_hal_interface.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/global_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/global_test.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/wifi_sta_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_hal/unittest/BUILD.gn (100%) rename wifi/{tests => test}/wifi_standard/wifi_hal/unittest/mock_wpa_ctrl.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_hal/unittest/mock_wpa_ctrl.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_hal/unittest/wifi_hal_adapter_test.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_hal/unittest/wifi_hal_ap_interface_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_hal/unittest/wifi_hal_ap_interface_test.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_hal/unittest/wifi_hal_base_interface_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_hal/unittest/wifi_hal_base_interface_test.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_hal/unittest/wifi_hal_chip_interface_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_hal/unittest/wifi_hal_chip_interface_test.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_add_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_add_test.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_test.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_hal/unittest/wifi_hal_hostapd_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_hal/unittest/wifi_hal_hostapd_test.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_hal/unittest/wifi_hal_p2p_interface_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_hal/unittest/wifi_hal_p2p_interface_test.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_hal/unittest/wifi_hal_sta_interface_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_hal/unittest/wifi_hal_sta_interface_test.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_hal/unittest/wifi_hal_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_hal/unittest/wifi_hal_vendor.conf (100%) rename wifi/{tests => test}/wifi_standard/wifi_hal/unittest/wifi_hal_vendor_interface_test.c (100%) rename wifi/{tests => test}/wifi_standard/wifi_hal/unittest/wifi_hal_wpa_p2p_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_hal/unittest/wifi_hal_wpa_p2p_test.h (100%) rename wifi/{tests => test}/wifi_standard/wifi_hal/unittest/wifi_hal_wpa_sta_test.cpp (100%) rename wifi/{tests => test}/wifi_standard/wifi_hal/unittest/wifi_hal_wpa_sta_test.h (100%) diff --git a/dhcp/interfaces/innerkits/native_cpp/include/dhcp_define.h b/dhcp/interfaces/inner_api/include/dhcp_define.h similarity index 100% rename from dhcp/interfaces/innerkits/native_cpp/include/dhcp_define.h rename to dhcp/interfaces/inner_api/include/dhcp_define.h diff --git a/dhcp/interfaces/innerkits/native_cpp/include/dhcp_service_api.h b/dhcp/interfaces/inner_api/include/dhcp_service_api.h similarity index 100% rename from dhcp/interfaces/innerkits/native_cpp/include/dhcp_service_api.h rename to dhcp/interfaces/inner_api/include/dhcp_service_api.h diff --git a/dhcp/interfaces/innerkits/native_cpp/interfaces/i_dhcp_client_service.h b/dhcp/interfaces/inner_api/interfaces/i_dhcp_client_service.h similarity index 100% rename from dhcp/interfaces/innerkits/native_cpp/interfaces/i_dhcp_client_service.h rename to dhcp/interfaces/inner_api/interfaces/i_dhcp_client_service.h diff --git a/dhcp/interfaces/innerkits/native_cpp/interfaces/i_dhcp_result_notify.h b/dhcp/interfaces/inner_api/interfaces/i_dhcp_result_notify.h similarity index 100% rename from dhcp/interfaces/innerkits/native_cpp/interfaces/i_dhcp_result_notify.h rename to dhcp/interfaces/inner_api/interfaces/i_dhcp_result_notify.h diff --git a/dhcp/interfaces/innerkits/native_cpp/interfaces/i_dhcp_server_service.h b/dhcp/interfaces/inner_api/interfaces/i_dhcp_server_service.h similarity index 100% rename from dhcp/interfaces/innerkits/native_cpp/interfaces/i_dhcp_server_service.h rename to dhcp/interfaces/inner_api/interfaces/i_dhcp_server_service.h diff --git a/dhcp/interfaces/innerkits/native_cpp/interfaces/i_dhcp_service.h b/dhcp/interfaces/inner_api/interfaces/i_dhcp_service.h similarity index 100% rename from dhcp/interfaces/innerkits/native_cpp/interfaces/i_dhcp_service.h rename to dhcp/interfaces/inner_api/interfaces/i_dhcp_service.h diff --git a/dhcp/tests/services/dhcp_client/BUILD.gn b/dhcp/test/services/dhcp_client/BUILD.gn similarity index 100% rename from dhcp/tests/services/dhcp_client/BUILD.gn rename to dhcp/test/services/dhcp_client/BUILD.gn diff --git a/dhcp/tests/services/dhcp_client/dhcp_client_test.cpp b/dhcp/test/services/dhcp_client/dhcp_client_test.cpp similarity index 100% rename from dhcp/tests/services/dhcp_client/dhcp_client_test.cpp rename to dhcp/test/services/dhcp_client/dhcp_client_test.cpp diff --git a/dhcp/tests/services/dhcp_client/dhcp_function_test.cpp b/dhcp/test/services/dhcp_client/dhcp_function_test.cpp similarity index 100% rename from dhcp/tests/services/dhcp_client/dhcp_function_test.cpp rename to dhcp/test/services/dhcp_client/dhcp_function_test.cpp diff --git a/dhcp/tests/services/dhcp_client/dhcp_ipv4_test.cpp b/dhcp/test/services/dhcp_client/dhcp_ipv4_test.cpp similarity index 100% rename from dhcp/tests/services/dhcp_client/dhcp_ipv4_test.cpp rename to dhcp/test/services/dhcp_client/dhcp_ipv4_test.cpp diff --git a/dhcp/tests/services/dhcp_client/dhcp_main_test.cpp b/dhcp/test/services/dhcp_client/dhcp_main_test.cpp similarity index 100% rename from dhcp/tests/services/dhcp_client/dhcp_main_test.cpp rename to dhcp/test/services/dhcp_client/dhcp_main_test.cpp diff --git a/dhcp/tests/services/dhcp_client/dhcp_options_test.cpp b/dhcp/test/services/dhcp_client/dhcp_options_test.cpp similarity index 100% rename from dhcp/tests/services/dhcp_client/dhcp_options_test.cpp rename to dhcp/test/services/dhcp_client/dhcp_options_test.cpp diff --git a/dhcp/tests/services/dhcp_client/dhcp_socket_test.cpp b/dhcp/test/services/dhcp_client/dhcp_socket_test.cpp similarity index 100% rename from dhcp/tests/services/dhcp_client/dhcp_socket_test.cpp rename to dhcp/test/services/dhcp_client/dhcp_socket_test.cpp diff --git a/dhcp/tests/services/dhcp_client/global_test.cpp b/dhcp/test/services/dhcp_client/global_test.cpp similarity index 100% rename from dhcp/tests/services/dhcp_client/global_test.cpp rename to dhcp/test/services/dhcp_client/global_test.cpp diff --git a/dhcp/tests/services/dhcp_client/global_test.h b/dhcp/test/services/dhcp_client/global_test.h similarity index 100% rename from dhcp/tests/services/dhcp_client/global_test.h rename to dhcp/test/services/dhcp_client/global_test.h diff --git a/dhcp/tests/services/dhcp_client/mock_custom_func.cpp b/dhcp/test/services/dhcp_client/mock_custom_func.cpp similarity index 100% rename from dhcp/tests/services/dhcp_client/mock_custom_func.cpp rename to dhcp/test/services/dhcp_client/mock_custom_func.cpp diff --git a/dhcp/tests/services/dhcp_client/mock_custom_func.h b/dhcp/test/services/dhcp_client/mock_custom_func.h similarity index 100% rename from dhcp/tests/services/dhcp_client/mock_custom_func.h rename to dhcp/test/services/dhcp_client/mock_custom_func.h diff --git a/dhcp/tests/services/dhcp_client/mock_system_func.cpp b/dhcp/test/services/dhcp_client/mock_system_func.cpp similarity index 100% rename from dhcp/tests/services/dhcp_client/mock_system_func.cpp rename to dhcp/test/services/dhcp_client/mock_system_func.cpp diff --git a/dhcp/tests/services/dhcp_client/mock_system_func.h b/dhcp/test/services/dhcp_client/mock_system_func.h similarity index 100% rename from dhcp/tests/services/dhcp_client/mock_system_func.h rename to dhcp/test/services/dhcp_client/mock_system_func.h diff --git a/dhcp/tests/services/dhcp_server/unittest/BUILD.gn b/dhcp/test/services/dhcp_server/unittest/BUILD.gn similarity index 100% rename from dhcp/tests/services/dhcp_server/unittest/BUILD.gn rename to dhcp/test/services/dhcp_server/unittest/BUILD.gn diff --git a/dhcp/tests/services/dhcp_server/unittest/address_utils_test.cpp b/dhcp/test/services/dhcp_server/unittest/address_utils_test.cpp similarity index 100% rename from dhcp/tests/services/dhcp_server/unittest/address_utils_test.cpp rename to dhcp/test/services/dhcp_server/unittest/address_utils_test.cpp diff --git a/dhcp/tests/services/dhcp_server/unittest/common_util_test.cpp b/dhcp/test/services/dhcp_server/unittest/common_util_test.cpp similarity index 100% rename from dhcp/tests/services/dhcp_server/unittest/common_util_test.cpp rename to dhcp/test/services/dhcp_server/unittest/common_util_test.cpp diff --git a/dhcp/tests/services/dhcp_server/unittest/dhcp_address_pool_test.cpp b/dhcp/test/services/dhcp_server/unittest/dhcp_address_pool_test.cpp similarity index 100% rename from dhcp/tests/services/dhcp_server/unittest/dhcp_address_pool_test.cpp rename to dhcp/test/services/dhcp_server/unittest/dhcp_address_pool_test.cpp diff --git a/dhcp/tests/services/dhcp_server/unittest/dhcp_argument_test.cpp b/dhcp/test/services/dhcp_server/unittest/dhcp_argument_test.cpp similarity index 100% rename from dhcp/tests/services/dhcp_server/unittest/dhcp_argument_test.cpp rename to dhcp/test/services/dhcp_server/unittest/dhcp_argument_test.cpp diff --git a/dhcp/tests/services/dhcp_server/unittest/dhcp_binding_test.cpp b/dhcp/test/services/dhcp_server/unittest/dhcp_binding_test.cpp similarity index 100% rename from dhcp/tests/services/dhcp_server/unittest/dhcp_binding_test.cpp rename to dhcp/test/services/dhcp_server/unittest/dhcp_binding_test.cpp diff --git a/dhcp/tests/services/dhcp_server/unittest/dhcp_config_test.cpp b/dhcp/test/services/dhcp_server/unittest/dhcp_config_test.cpp similarity index 100% rename from dhcp/tests/services/dhcp_server/unittest/dhcp_config_test.cpp rename to dhcp/test/services/dhcp_server/unittest/dhcp_config_test.cpp diff --git a/dhcp/tests/services/dhcp_server/unittest/dhcp_message_sim.cpp b/dhcp/test/services/dhcp_server/unittest/dhcp_message_sim.cpp similarity index 100% rename from dhcp/tests/services/dhcp_server/unittest/dhcp_message_sim.cpp rename to dhcp/test/services/dhcp_server/unittest/dhcp_message_sim.cpp diff --git a/dhcp/tests/services/dhcp_server/unittest/dhcp_message_sim.h b/dhcp/test/services/dhcp_server/unittest/dhcp_message_sim.h similarity index 100% rename from dhcp/tests/services/dhcp_server/unittest/dhcp_message_sim.h rename to dhcp/test/services/dhcp_server/unittest/dhcp_message_sim.h diff --git a/dhcp/tests/services/dhcp_server/unittest/dhcp_option_test.cpp b/dhcp/test/services/dhcp_server/unittest/dhcp_option_test.cpp similarity index 100% rename from dhcp/tests/services/dhcp_server/unittest/dhcp_option_test.cpp rename to dhcp/test/services/dhcp_server/unittest/dhcp_option_test.cpp diff --git a/dhcp/tests/services/dhcp_server/unittest/dhcp_server_test.cpp b/dhcp/test/services/dhcp_server/unittest/dhcp_server_test.cpp similarity index 100% rename from dhcp/tests/services/dhcp_server/unittest/dhcp_server_test.cpp rename to dhcp/test/services/dhcp_server/unittest/dhcp_server_test.cpp diff --git a/dhcp/tests/services/dhcp_server/unittest/hash_table_test.cpp b/dhcp/test/services/dhcp_server/unittest/hash_table_test.cpp similarity index 100% rename from dhcp/tests/services/dhcp_server/unittest/hash_table_test.cpp rename to dhcp/test/services/dhcp_server/unittest/hash_table_test.cpp diff --git a/dhcp/tests/services/dhcp_server/unittest/system_func_mock.cpp b/dhcp/test/services/dhcp_server/unittest/system_func_mock.cpp similarity index 100% rename from dhcp/tests/services/dhcp_server/unittest/system_func_mock.cpp rename to dhcp/test/services/dhcp_server/unittest/system_func_mock.cpp diff --git a/dhcp/tests/services/dhcp_server/unittest/system_func_mock.h b/dhcp/test/services/dhcp_server/unittest/system_func_mock.h similarity index 100% rename from dhcp/tests/services/dhcp_server/unittest/system_func_mock.h rename to dhcp/test/services/dhcp_server/unittest/system_func_mock.h diff --git a/dhcp/tests/services/mgr_service/BUILD.gn b/dhcp/test/services/mgr_service/BUILD.gn similarity index 100% rename from dhcp/tests/services/mgr_service/BUILD.gn rename to dhcp/test/services/mgr_service/BUILD.gn diff --git a/dhcp/tests/services/mgr_service/dhcp_client_service_test.cpp b/dhcp/test/services/mgr_service/dhcp_client_service_test.cpp similarity index 100% rename from dhcp/tests/services/mgr_service/dhcp_client_service_test.cpp rename to dhcp/test/services/mgr_service/dhcp_client_service_test.cpp diff --git a/dhcp/tests/services/mgr_service/dhcp_func_test.cpp b/dhcp/test/services/mgr_service/dhcp_func_test.cpp similarity index 100% rename from dhcp/tests/services/mgr_service/dhcp_func_test.cpp rename to dhcp/test/services/mgr_service/dhcp_func_test.cpp diff --git a/dhcp/tests/services/mgr_service/dhcp_manage_test.cpp b/dhcp/test/services/mgr_service/dhcp_manage_test.cpp similarity index 100% rename from dhcp/tests/services/mgr_service/dhcp_manage_test.cpp rename to dhcp/test/services/mgr_service/dhcp_manage_test.cpp diff --git a/dhcp/tests/services/mgr_service/dhcp_result_notify.cpp b/dhcp/test/services/mgr_service/dhcp_result_notify.cpp similarity index 100% rename from dhcp/tests/services/mgr_service/dhcp_result_notify.cpp rename to dhcp/test/services/mgr_service/dhcp_result_notify.cpp diff --git a/dhcp/tests/services/mgr_service/dhcp_result_notify.h b/dhcp/test/services/mgr_service/dhcp_result_notify.h similarity index 100% rename from dhcp/tests/services/mgr_service/dhcp_result_notify.h rename to dhcp/test/services/mgr_service/dhcp_result_notify.h diff --git a/dhcp/tests/services/mgr_service/dhcp_server_service_test.cpp b/dhcp/test/services/mgr_service/dhcp_server_service_test.cpp similarity index 100% rename from dhcp/tests/services/mgr_service/dhcp_server_service_test.cpp rename to dhcp/test/services/mgr_service/dhcp_server_service_test.cpp diff --git a/dhcp/tests/services/mgr_service/dhcp_service_test.cpp b/dhcp/test/services/mgr_service/dhcp_service_test.cpp similarity index 100% rename from dhcp/tests/services/mgr_service/dhcp_service_test.cpp rename to dhcp/test/services/mgr_service/dhcp_service_test.cpp diff --git a/dhcp/tests/services/mgr_service/global_test.cpp b/dhcp/test/services/mgr_service/global_test.cpp similarity index 100% rename from dhcp/tests/services/mgr_service/global_test.cpp rename to dhcp/test/services/mgr_service/global_test.cpp diff --git a/dhcp/tests/services/mgr_service/global_test.h b/dhcp/test/services/mgr_service/global_test.h similarity index 100% rename from dhcp/tests/services/mgr_service/global_test.h rename to dhcp/test/services/mgr_service/global_test.h diff --git a/dhcp/tests/services/mgr_service/mock_system_func.cpp b/dhcp/test/services/mgr_service/mock_system_func.cpp similarity index 100% rename from dhcp/tests/services/mgr_service/mock_system_func.cpp rename to dhcp/test/services/mgr_service/mock_system_func.cpp diff --git a/dhcp/tests/services/mgr_service/mock_system_func.h b/dhcp/test/services/mgr_service/mock_system_func.h similarity index 100% rename from dhcp/tests/services/mgr_service/mock_system_func.h rename to dhcp/test/services/mgr_service/mock_system_func.h diff --git a/wifi/interfaces/innerkits/BUILD.gn b/wifi/frameworks/BUILD.gn similarity index 100% rename from wifi/interfaces/innerkits/BUILD.gn rename to wifi/frameworks/BUILD.gn diff --git a/wifi/interfaces/innerkits/native_cpp/napi/BUILD.gn b/wifi/frameworks/js/napi/BUILD.gn similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/napi/BUILD.gn rename to wifi/frameworks/js/napi/BUILD.gn diff --git a/wifi/interfaces/innerkits/native_cpp/napi/wifi_ext_napi_entry.cpp b/wifi/frameworks/js/napi/wifi_ext_napi_entry.cpp similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/napi/wifi_ext_napi_entry.cpp rename to wifi/frameworks/js/napi/wifi_ext_napi_entry.cpp diff --git a/wifi/interfaces/innerkits/native_cpp/napi/wifi_ext_napi_hotspot.cpp b/wifi/frameworks/js/napi/wifi_ext_napi_hotspot.cpp similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/napi/wifi_ext_napi_hotspot.cpp rename to wifi/frameworks/js/napi/wifi_ext_napi_hotspot.cpp diff --git a/wifi/interfaces/innerkits/native_cpp/napi/wifi_ext_napi_hotspot.h b/wifi/frameworks/js/napi/wifi_ext_napi_hotspot.h similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/napi/wifi_ext_napi_hotspot.h rename to wifi/frameworks/js/napi/wifi_ext_napi_hotspot.h diff --git a/wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_device.cpp b/wifi/frameworks/js/napi/wifi_napi_device.cpp similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_device.cpp rename to wifi/frameworks/js/napi/wifi_napi_device.cpp diff --git a/wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_device.h b/wifi/frameworks/js/napi/wifi_napi_device.h similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_device.h rename to wifi/frameworks/js/napi/wifi_napi_device.h diff --git a/wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_entry.cpp b/wifi/frameworks/js/napi/wifi_napi_entry.cpp similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_entry.cpp rename to wifi/frameworks/js/napi/wifi_napi_entry.cpp diff --git a/wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_event.cpp b/wifi/frameworks/js/napi/wifi_napi_event.cpp similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_event.cpp rename to wifi/frameworks/js/napi/wifi_napi_event.cpp diff --git a/wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_event.h b/wifi/frameworks/js/napi/wifi_napi_event.h similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_event.h rename to wifi/frameworks/js/napi/wifi_napi_event.h diff --git a/wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_hotspot.cpp b/wifi/frameworks/js/napi/wifi_napi_hotspot.cpp similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_hotspot.cpp rename to wifi/frameworks/js/napi/wifi_napi_hotspot.cpp diff --git a/wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_hotspot.h b/wifi/frameworks/js/napi/wifi_napi_hotspot.h similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_hotspot.h rename to wifi/frameworks/js/napi/wifi_napi_hotspot.h diff --git a/wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_p2p.cpp b/wifi/frameworks/js/napi/wifi_napi_p2p.cpp similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_p2p.cpp rename to wifi/frameworks/js/napi/wifi_napi_p2p.cpp diff --git a/wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_p2p.h b/wifi/frameworks/js/napi/wifi_napi_p2p.h similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_p2p.h rename to wifi/frameworks/js/napi/wifi_napi_p2p.h diff --git a/wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_utils.cpp b/wifi/frameworks/js/napi/wifi_napi_utils.cpp similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_utils.cpp rename to wifi/frameworks/js/napi/wifi_napi_utils.cpp diff --git a/wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_utils.h b/wifi/frameworks/js/napi/wifi_napi_utils.h similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_utils.h rename to wifi/frameworks/js/napi/wifi_napi_utils.h diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/BUILD.gn b/wifi/frameworks/native/BUILD.gn similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/BUILD.gn rename to wifi/frameworks/native/BUILD.gn diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_device.cpp b/wifi/frameworks/native/c_adapter/wifi_c_device.cpp similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_device.cpp rename to wifi/frameworks/native/c_adapter/wifi_c_device.cpp diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_event.cpp b/wifi/frameworks/native/c_adapter/wifi_c_event.cpp similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_event.cpp rename to wifi/frameworks/native/c_adapter/wifi_c_event.cpp diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_hid2d.cpp b/wifi/frameworks/native/c_adapter/wifi_c_hid2d.cpp similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_hid2d.cpp rename to wifi/frameworks/native/c_adapter/wifi_c_hid2d.cpp diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_hotspot.cpp b/wifi/frameworks/native/c_adapter/wifi_c_hotspot.cpp similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_hotspot.cpp rename to wifi/frameworks/native/c_adapter/wifi_c_hotspot.cpp diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_p2p.cpp b/wifi/frameworks/native/c_adapter/wifi_c_p2p.cpp similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_p2p.cpp rename to wifi/frameworks/native/c_adapter/wifi_c_p2p.cpp diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_utils.cpp b/wifi/frameworks/native/c_adapter/wifi_c_utils.cpp similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_utils.cpp rename to wifi/frameworks/native/c_adapter/wifi_c_utils.cpp diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_utils.h b/wifi/frameworks/native/c_adapter/wifi_c_utils.h similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_utils.h rename to wifi/frameworks/native/c_adapter/wifi_c_utils.h diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_device.h b/wifi/frameworks/native/include/wifi_device.h similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_device.h rename to wifi/frameworks/native/include/wifi_device.h diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_hid2d.h b/wifi/frameworks/native/include/wifi_hid2d.h similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_hid2d.h rename to wifi/frameworks/native/include/wifi_hid2d.h diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_hotspot.h b/wifi/frameworks/native/include/wifi_hotspot.h similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_hotspot.h rename to wifi/frameworks/native/include/wifi_hotspot.h diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_ipc_lite_adapter.h b/wifi/frameworks/native/include/wifi_ipc_lite_adapter.h similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_ipc_lite_adapter.h rename to wifi/frameworks/native/include/wifi_ipc_lite_adapter.h diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_p2p.h b/wifi/frameworks/native/include/wifi_p2p.h similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_p2p.h rename to wifi/frameworks/native/include/wifi_p2p.h diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_scan.h b/wifi/frameworks/native/include/wifi_scan.h similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_scan.h rename to wifi/frameworks/native/include/wifi_scan.h diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/define.h b/wifi/frameworks/native/interfaces/define.h similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/define.h rename to wifi/frameworks/native/interfaces/define.h diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_device.h b/wifi/frameworks/native/interfaces/i_wifi_device.h similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_device.h rename to wifi/frameworks/native/interfaces/i_wifi_device.h diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_device_callback.h b/wifi/frameworks/native/interfaces/i_wifi_device_callback.h similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_device_callback.h rename to wifi/frameworks/native/interfaces/i_wifi_device_callback.h diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_hotspot.h b/wifi/frameworks/native/interfaces/i_wifi_hotspot.h similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_hotspot.h rename to wifi/frameworks/native/interfaces/i_wifi_hotspot.h diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_hotspot_callback.h b/wifi/frameworks/native/interfaces/i_wifi_hotspot_callback.h similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_hotspot_callback.h rename to wifi/frameworks/native/interfaces/i_wifi_hotspot_callback.h diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_p2p.h b/wifi/frameworks/native/interfaces/i_wifi_p2p.h similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_p2p.h rename to wifi/frameworks/native/interfaces/i_wifi_p2p.h diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_p2p_callback.h b/wifi/frameworks/native/interfaces/i_wifi_p2p_callback.h similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_p2p_callback.h rename to wifi/frameworks/native/interfaces/i_wifi_p2p_callback.h diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_scan.h b/wifi/frameworks/native/interfaces/i_wifi_scan.h similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_scan.h rename to wifi/frameworks/native/interfaces/i_wifi_scan.h diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_scan_callback.h b/wifi/frameworks/native/interfaces/i_wifi_scan_callback.h similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_scan_callback.h rename to wifi/frameworks/native/interfaces/i_wifi_scan_callback.h diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_ap_msg.h b/wifi/frameworks/native/interfaces/wifi_ap_msg.h similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_ap_msg.h rename to wifi/frameworks/native/interfaces/wifi_ap_msg.h diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_common_msg.h b/wifi/frameworks/native/interfaces/wifi_common_msg.h similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_common_msg.h rename to wifi/frameworks/native/interfaces/wifi_common_msg.h diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_errcode.h b/wifi/frameworks/native/interfaces/wifi_errcode.h similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_errcode.h rename to wifi/frameworks/native/interfaces/wifi_errcode.h diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_hid2d_msg.h b/wifi/frameworks/native/interfaces/wifi_hid2d_msg.h similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_hid2d_msg.h rename to wifi/frameworks/native/interfaces/wifi_hid2d_msg.h diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_msg.h b/wifi/frameworks/native/interfaces/wifi_msg.h similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_msg.h rename to wifi/frameworks/native/interfaces/wifi_msg.h diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_p2p_msg.h b/wifi/frameworks/native/interfaces/wifi_p2p_msg.h similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_p2p_msg.h rename to wifi/frameworks/native/interfaces/wifi_p2p_msg.h diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_scan_msg.h b/wifi/frameworks/native/interfaces/wifi_scan_msg.h similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_scan_msg.h rename to wifi/frameworks/native/interfaces/wifi_scan_msg.h diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device.cpp b/wifi/frameworks/native/src/wifi_device.cpp similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device.cpp rename to wifi/frameworks/native/src/wifi_device.cpp diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_callback_stub.cpp b/wifi/frameworks/native/src/wifi_device_callback_stub.cpp similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_callback_stub.cpp rename to wifi/frameworks/native/src/wifi_device_callback_stub.cpp diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_callback_stub.h b/wifi/frameworks/native/src/wifi_device_callback_stub.h similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_callback_stub.h rename to wifi/frameworks/native/src/wifi_device_callback_stub.h diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_callback_stub_lite.cpp b/wifi/frameworks/native/src/wifi_device_callback_stub_lite.cpp similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_callback_stub_lite.cpp rename to wifi/frameworks/native/src/wifi_device_callback_stub_lite.cpp diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_callback_stub_lite.h b/wifi/frameworks/native/src/wifi_device_callback_stub_lite.h similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_callback_stub_lite.h rename to wifi/frameworks/native/src/wifi_device_callback_stub_lite.h diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_impl.cpp b/wifi/frameworks/native/src/wifi_device_impl.cpp similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_impl.cpp rename to wifi/frameworks/native/src/wifi_device_impl.cpp diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_impl.h b/wifi/frameworks/native/src/wifi_device_impl.h similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_impl.h rename to wifi/frameworks/native/src/wifi_device_impl.h diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy.cpp b/wifi/frameworks/native/src/wifi_device_proxy.cpp similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy.cpp rename to wifi/frameworks/native/src/wifi_device_proxy.cpp diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy.h b/wifi/frameworks/native/src/wifi_device_proxy.h similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy.h rename to wifi/frameworks/native/src/wifi_device_proxy.h diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy_lite.cpp b/wifi/frameworks/native/src/wifi_device_proxy_lite.cpp similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy_lite.cpp rename to wifi/frameworks/native/src/wifi_device_proxy_lite.cpp diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hid2d.cpp b/wifi/frameworks/native/src/wifi_hid2d.cpp similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hid2d.cpp rename to wifi/frameworks/native/src/wifi_hid2d.cpp diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hid2d_msg.cpp b/wifi/frameworks/native/src/wifi_hid2d_msg.cpp similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hid2d_msg.cpp rename to wifi/frameworks/native/src/wifi_hid2d_msg.cpp diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot.cpp b/wifi/frameworks/native/src/wifi_hotspot.cpp similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot.cpp rename to wifi/frameworks/native/src/wifi_hotspot.cpp diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_callback_stub.cpp b/wifi/frameworks/native/src/wifi_hotspot_callback_stub.cpp similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_callback_stub.cpp rename to wifi/frameworks/native/src/wifi_hotspot_callback_stub.cpp diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_callback_stub.h b/wifi/frameworks/native/src/wifi_hotspot_callback_stub.h similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_callback_stub.h rename to wifi/frameworks/native/src/wifi_hotspot_callback_stub.h diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_impl.cpp b/wifi/frameworks/native/src/wifi_hotspot_impl.cpp similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_impl.cpp rename to wifi/frameworks/native/src/wifi_hotspot_impl.cpp diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_impl.h b/wifi/frameworks/native/src/wifi_hotspot_impl.h similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_impl.h rename to wifi/frameworks/native/src/wifi_hotspot_impl.h diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_proxy.cpp b/wifi/frameworks/native/src/wifi_hotspot_proxy.cpp similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_proxy.cpp rename to wifi/frameworks/native/src/wifi_hotspot_proxy.cpp diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_proxy.h b/wifi/frameworks/native/src/wifi_hotspot_proxy.h similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_proxy.h rename to wifi/frameworks/native/src/wifi_hotspot_proxy.h diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_logger.h b/wifi/frameworks/native/src/wifi_logger.h similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_logger.h rename to wifi/frameworks/native/src/wifi_logger.h diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p.cpp b/wifi/frameworks/native/src/wifi_p2p.cpp similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p.cpp rename to wifi/frameworks/native/src/wifi_p2p.cpp diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_callback_stub.cpp b/wifi/frameworks/native/src/wifi_p2p_callback_stub.cpp similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_callback_stub.cpp rename to wifi/frameworks/native/src/wifi_p2p_callback_stub.cpp diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_callback_stub.h b/wifi/frameworks/native/src/wifi_p2p_callback_stub.h similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_callback_stub.h rename to wifi/frameworks/native/src/wifi_p2p_callback_stub.h diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_impl.cpp b/wifi/frameworks/native/src/wifi_p2p_impl.cpp similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_impl.cpp rename to wifi/frameworks/native/src/wifi_p2p_impl.cpp diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_impl.h b/wifi/frameworks/native/src/wifi_p2p_impl.h similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_impl.h rename to wifi/frameworks/native/src/wifi_p2p_impl.h diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_msg.cpp b/wifi/frameworks/native/src/wifi_p2p_msg.cpp similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_msg.cpp rename to wifi/frameworks/native/src/wifi_p2p_msg.cpp diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_proxy.cpp b/wifi/frameworks/native/src/wifi_p2p_proxy.cpp similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_proxy.cpp rename to wifi/frameworks/native/src/wifi_p2p_proxy.cpp diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_proxy.h b/wifi/frameworks/native/src/wifi_p2p_proxy.h similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_proxy.h rename to wifi/frameworks/native/src/wifi_p2p_proxy.h diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan.cpp b/wifi/frameworks/native/src/wifi_scan.cpp similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan.cpp rename to wifi/frameworks/native/src/wifi_scan.cpp diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_callback_stub.cpp b/wifi/frameworks/native/src/wifi_scan_callback_stub.cpp similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_callback_stub.cpp rename to wifi/frameworks/native/src/wifi_scan_callback_stub.cpp diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_callback_stub.h b/wifi/frameworks/native/src/wifi_scan_callback_stub.h similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_callback_stub.h rename to wifi/frameworks/native/src/wifi_scan_callback_stub.h diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_callback_stub_lite.cpp b/wifi/frameworks/native/src/wifi_scan_callback_stub_lite.cpp similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_callback_stub_lite.cpp rename to wifi/frameworks/native/src/wifi_scan_callback_stub_lite.cpp diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_impl.cpp b/wifi/frameworks/native/src/wifi_scan_impl.cpp similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_impl.cpp rename to wifi/frameworks/native/src/wifi_scan_impl.cpp diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_impl.h b/wifi/frameworks/native/src/wifi_scan_impl.h similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_impl.h rename to wifi/frameworks/native/src/wifi_scan_impl.h diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_proxy.cpp b/wifi/frameworks/native/src/wifi_scan_proxy.cpp similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_proxy.cpp rename to wifi/frameworks/native/src/wifi_scan_proxy.cpp diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_proxy.h b/wifi/frameworks/native/src/wifi_scan_proxy.h similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_proxy.h rename to wifi/frameworks/native/src/wifi_scan_proxy.h diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_proxy_lite.cpp b/wifi/frameworks/native/src/wifi_scan_proxy_lite.cpp similarity index 100% rename from wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_proxy_lite.cpp rename to wifi/frameworks/native/src/wifi_scan_proxy_lite.cpp diff --git a/wifi/interfaces/innerkits/native_c/station_info.h b/wifi/interfaces/kits/c/station_info.h similarity index 100% rename from wifi/interfaces/innerkits/native_c/station_info.h rename to wifi/interfaces/kits/c/station_info.h diff --git a/wifi/interfaces/innerkits/native_c/wifi_device.h b/wifi/interfaces/kits/c/wifi_device.h similarity index 100% rename from wifi/interfaces/innerkits/native_c/wifi_device.h rename to wifi/interfaces/kits/c/wifi_device.h diff --git a/wifi/interfaces/innerkits/native_c/wifi_device_config.h b/wifi/interfaces/kits/c/wifi_device_config.h similarity index 100% rename from wifi/interfaces/innerkits/native_c/wifi_device_config.h rename to wifi/interfaces/kits/c/wifi_device_config.h diff --git a/wifi/interfaces/innerkits/native_c/wifi_error_code.h b/wifi/interfaces/kits/c/wifi_error_code.h similarity index 100% rename from wifi/interfaces/innerkits/native_c/wifi_error_code.h rename to wifi/interfaces/kits/c/wifi_error_code.h diff --git a/wifi/interfaces/innerkits/native_c/wifi_event.h b/wifi/interfaces/kits/c/wifi_event.h similarity index 100% rename from wifi/interfaces/innerkits/native_c/wifi_event.h rename to wifi/interfaces/kits/c/wifi_event.h diff --git a/wifi/interfaces/innerkits/native_c/wifi_hid2d.h b/wifi/interfaces/kits/c/wifi_hid2d.h similarity index 100% rename from wifi/interfaces/innerkits/native_c/wifi_hid2d.h rename to wifi/interfaces/kits/c/wifi_hid2d.h diff --git a/wifi/interfaces/innerkits/native_c/wifi_hotspot.h b/wifi/interfaces/kits/c/wifi_hotspot.h similarity index 100% rename from wifi/interfaces/innerkits/native_c/wifi_hotspot.h rename to wifi/interfaces/kits/c/wifi_hotspot.h diff --git a/wifi/interfaces/innerkits/native_c/wifi_hotspot_config.h b/wifi/interfaces/kits/c/wifi_hotspot_config.h similarity index 100% rename from wifi/interfaces/innerkits/native_c/wifi_hotspot_config.h rename to wifi/interfaces/kits/c/wifi_hotspot_config.h diff --git a/wifi/interfaces/innerkits/native_c/wifi_linked_info.h b/wifi/interfaces/kits/c/wifi_linked_info.h similarity index 100% rename from wifi/interfaces/innerkits/native_c/wifi_linked_info.h rename to wifi/interfaces/kits/c/wifi_linked_info.h diff --git a/wifi/interfaces/innerkits/native_c/wifi_p2p.h b/wifi/interfaces/kits/c/wifi_p2p.h similarity index 100% rename from wifi/interfaces/innerkits/native_c/wifi_p2p.h rename to wifi/interfaces/kits/c/wifi_p2p.h diff --git a/wifi/interfaces/innerkits/native_c/wifi_p2p_config.h b/wifi/interfaces/kits/c/wifi_p2p_config.h similarity index 100% rename from wifi/interfaces/innerkits/native_c/wifi_p2p_config.h rename to wifi/interfaces/kits/c/wifi_p2p_config.h diff --git a/wifi/interfaces/innerkits/native_c/wifi_scan_info.h b/wifi/interfaces/kits/c/wifi_scan_info.h similarity index 100% rename from wifi/interfaces/innerkits/native_c/wifi_scan_info.h rename to wifi/interfaces/kits/c/wifi_scan_info.h diff --git a/wifi/interfaces/kits/jskits/@ohos.wifi.d.ts b/wifi/interfaces/kits/jskits/@ohos.wifi.d.ts deleted file mode 100644 index 4ea5cdc..0000000 --- a/wifi/interfaces/kits/jskits/@ohos.wifi.d.ts +++ /dev/null @@ -1,1332 +0,0 @@ -/* - * Copyright (C) 2021-2022 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { AsyncCallback, Callback } from './basic'; - -/** - * Provides methods to operate or manage Wi-Fi. - * - * @since 6 - * @import import wifi from '@ohos.wifi'; - */ -declare namespace wifi { - /** - * Enables Wi-Fi. - * - * @return Returns {@code true} if the operation is successful, returns {@code false} otherwise. - * - * @since 6 - * @syscap SystemCapability.Communication.WiFi.STA - * @permission ohos.permission.SET_WIFI_INFO and ohos.permission.MANAGE_WIFI_CONNECTION - * @systemapi Hide this for inner system use. - */ - function enableWifi(): boolean; - - /** - * Disables Wi-Fi. - * - * @return Returns {@code true} if the operation is successful, returns {@code false} otherwise. - * - * @since 6 - * @syscap SystemCapability.Communication.WiFi.STA - * @permission ohos.permission.SET_WIFI_INFO and ohos.permission.MANAGE_WIFI_CONNECTION - * @systemapi Hide this for inner system use. - */ - function disableWifi(): boolean; - - /** - * Queries the Wi-Fi status - * - * @return Returns {@code true} if the Wi-Fi is active, returns {@code false} otherwise. - * - * @since 6 - * @syscap SystemCapability.Communication.WiFi.STA - * @permission ohos.permission.GET_WIFI_INFO - */ - function isWifiActive(): boolean; - - /** - * Scans Wi-Fi hotspots. - * - *

This API works in asynchronous mode.

- * - * @return Returns {@code true} if the scanning is successful, returns {@code false} otherwise. - * - * @since 6 - * @syscap SystemCapability.Communication.WiFi.STA - * @permission ohos.permission.SET_WIFI_INFO and ohos.permission.LOCATION - */ - function scan(): boolean; - - /** - * Obtains the hotspot information that scanned. - * - * @return Returns information about scanned Wi-Fi hotspots if any. - * - * @since 6 - * @syscap SystemCapability.Communication.WiFi.STA - * @permission ohos.permission.GET_WIFI_INFO and (ohos.permission.GET_WIFI_PEERS_MAC or ohos.permission.LOCATION) - */ - function getScanInfos(): Promise>; - function getScanInfos(callback: AsyncCallback>): void; - - /** - * Adds Wi-Fi connection configuration to the device. - * - *

The configuration will be updated when the configuration is added.

- * - * @param config Indicates the device configuration for connection to the Wi-Fi network. - * @return Returns {@code networkId} if the configuration is added; returns {@code -1} otherwise. - * - * @since 6 - * @syscap SystemCapability.Communication.WiFi.STA - * @permission ohos.permission.SET_WIFI_INFO and ohos.permission.SET_WIFI_CONFIG - * @systemapi Hide this for inner system use. - */ - function addDeviceConfig(config: WifiDeviceConfig): Promise; - function addDeviceConfig(config: WifiDeviceConfig, callback: AsyncCallback): void; - - /** - * Adds a specified untrusted hotspot configuration. - * - *

This method adds one configuration at a time. After this configuration is added, - * your device will determine whether to connect to the hotspot. - * - * @return Returns {@code true} if the untrusted hotspot configuration is added, returns {@code false} otherwise. - * @since 7 - * @syscap SystemCapability.Communication.WiFi.STA - * @permission ohos.permission.SET_WIFI_INFO - */ - function addUntrustedConfig(config: WifiDeviceConfig): Promise; - function addUntrustedConfig(config: WifiDeviceConfig, callback: AsyncCallback): void; - - /** - * Removes a specified untrusted hotspot configuration. - * - *

This method removes one configuration at a time. - * - * @return Returns {@code true} if the untrusted hotspot configuration is removed, returns {@code false} otherwise. - * @since 7 - * @syscap SystemCapability.Communication.WiFi.STA - * @permission ohos.permission.SET_WIFI_INFO - */ - function removeUntrustedConfig(config: WifiDeviceConfig): Promise; - function removeUntrustedConfig(config: WifiDeviceConfig, callback: AsyncCallback): void; - - /** - * Connects to Wi-Fi network. - * - * @param networkId ID of the connected network. - * @return Returns {@code true} if the network connection is successful, returns {@code false} otherwise. - * - * @since 6 - * @syscap SystemCapability.Communication.WiFi.STA - * @permission ohos.permission.MANAGE_WIFI_CONNECTION - * @systemapi Hide this for inner system use. - */ - function connectToNetwork(networkId: number): boolean; - - /** - * Connects to Wi-Fi network. - * - * @param config Indicates the device configuration for connection to the Wi-Fi network. - * @return Returns {@code true} if the network connection is successful, returns {@code false} otherwise. - * - * @since 6 - * @syscap SystemCapability.Communication.WiFi.STA - * @permission ohos.permission.SET_WIFI_INFO and ohos.permission.SET_WIFI_CONFIG and - * ohos.permission.MANAGE_WIFI_CONNECTION - * @systemapi Hide this for inner system use. - */ - function connectToDevice(config: WifiDeviceConfig): boolean; - - /** - * Disconnects Wi-Fi network. - * - * @return Returns {@code true} for disconnecting network success, returns {@code false} otherwise. - * - * @since 6 - * @syscap SystemCapability.Communication.WiFi.STA - * @permission ohos.permission.SET_WIFI_INFO and ohos.permission.MANAGE_WIFI_CONNECTION - * @systemapi Hide this for inner system use. - */ - function disconnect(): boolean; - - /** - * Calculates the Wi-Fi signal level based on the Wi-Fi RSSI and frequency band. - * - * @param rssi Indicates the Wi-Fi RSSI. - * @band Indicates the Wi-Fi frequency band. - * @return Returns Wi-Fi signal level ranging from 0 to 4. - * - * @since 6 - * @syscap SystemCapability.Communication.WiFi.STA - * @permission ohos.permission.GET_WIFI_INFO - */ - function getSignalLevel(rssi: number, band: number): number; - - /** - * Obtains information about a Wi-Fi connection. - * - * @return Returns the Wi-Fi connection information. - * @since 6 - * @syscap SystemCapability.Communication.WiFi.STA - * @permission ohos.permission.GET_WIFI_INFO - */ - function getLinkedInfo(): Promise; - function getLinkedInfo(callback: AsyncCallback): void; - - /** - * Checks whether a Wi-Fi connection has been set up. - * - * @return Returns {@code true} if a Wi-Fi connection has been set up, returns {@code false} otherwise. - * @since 7 - * @syscap SystemCapability.Communication.WiFi.STA - * @permission ohos.permission.GET_WIFI_INFO - */ - function isConnected(): boolean; - - /** - * Obtains the features supported by this device. - * - *

To check whether this device supports a specified feature. - * - * @return Returns the features supported by this device. - * @since 7 - * @syscap SystemCapability.Communication.WiFi.Core - * @permission ohos.permission.GET_WIFI_INFO - * @systemapi Hide this for inner system use. - */ - function getSupportedFeatures(): number; - - /** - * Checks whether this device supports a specified feature. - * - * @param featureId Indicates the ID of the feature. - * @return Returns {@code true} if this device supports the specified feature, returns {@code false} otherwise. - * @since 7 - * @syscap SystemCapability.Communication.WiFi.Core - * @permission ohos.permission.GET_WIFI_INFO - */ - function isFeatureSupported(featureId: number): boolean; - - /** - * Obtains the MAC address of a Wi-Fi device. Wi-Fi must be enabled. - * - *

The MAC address is unique and cannot be changed. - * - * @return Returns the MAC address of the Wi-Fi device. - * @since 7 - * @syscap SystemCapability.Communication.WiFi.STA - * @permission ohos.permission.GET_WIFI_LOCAL_MAC and ohos.permission.GET_WIFI_INFO - * @systemapi Hide this for inner system use. - */ - function getDeviceMacAddress(): string[]; - - /** - * Obtains the IP information of a Wi-Fi connection. - * - *

The IP information includes the host IP address, gateway address, and DNS information. - * - * @return Returns the IP information of the Wi-Fi connection. - * @since 7 - * @syscap SystemCapability.Communication.WiFi.STA - * @permission ohos.permission.GET_WIFI_INFO - */ - function getIpInfo(): IpInfo; - - /** - * Obtains the country code of this device. - * - * @return Returns the country code of this device. - * @since 7 - * @syscap SystemCapability.Communication.WiFi.Core - * @permission ohos.permission.GET_WIFI_INFO - */ - function getCountryCode(): string; - - /** - * Re-associates to current network. - * - * @return {@code true} if the Wi-Fi network is re-associate successfully. - * @since 7 - * @syscap SystemCapability.Communication.WiFi.STA - * @permission ohos.permission.SET_WIFI_INFO and ohos.permission.MANAGE_WIFI_CONNECTION - * @systemapi Hide this for inner system use. - */ - function reassociate(): boolean; - - /** - * Re-connects to current network. - * - * @return {@code true} if the Wi-Fi network is re-connect successfully. - * @since 7 - * @syscap SystemCapability.Communication.WiFi.STA - * @permission ohos.permission.SET_WIFI_INFO and ohos.permission.MANAGE_WIFI_CONNECTION - * @systemapi Hide this for inner system use. - */ - function reconnect(): boolean; - - /** - * Obtains the list of all existing Wi-Fi configurations. - * - *

You can obtain only the Wi-Fi configurations you created on your own application. - * - * @return Returns the list of all existing Wi-Fi configurations you created on your application. - * @since 7 - * @syscap SystemCapability.Communication.WiFi.STA - * @permission ohos.permission.GET_WIFI_INFO and ohos.permission.LOCATION and ohos.permission.GET_WIFI_CONFIG - * @systemapi Hide this for inner system use. - */ - function getDeviceConfigs(): Array; - - /** - * Updates the specified Wi-Fi configuration. - * - * @param config Indicates the Wi-Fi configuration to update. - * - * @return Returns the network ID in the updated Wi-Fi configuration if the update is successful; - * returns {@code -1} if the specified Wi-Fi configuration is not contained in the list. - * @since 7 - * @syscap SystemCapability.Communication.WiFi.STA - * @permission ohos.permission.SET_WIFI_INFO and ohos.permission.SET_WIFI_CONFIG - * @systemapi Hide this for inner system use. - */ - function updateNetwork(config: WifiDeviceConfig): number; - - /** - * Disables a specified network. - * - *

The disabled network will not be associated with again. - * - * @param netId Identifies the network to disable. - * @return Returns {@code true} if the specified network is disabled, returns {@code false} otherwise. - * @since 7 - * @syscap SystemCapability.Communication.WiFi.STA - * @permission ohos.permission.SET_WIFI_INFO and ohos.permission.MANAGE_WIFI_CONNECTION - * @systemapi Hide this for inner system use. - */ - function disableNetwork(netId: number): boolean; - - /** - * Removes all the saved Wi-Fi configurations. - * - * @return Returns {@code true} if all the saved Wi-Fi configurations are removed; - * returns {@code false} otherwise. - * @since 7 - * @syscap SystemCapability.Communication.WiFi.STA - * @permission ohos.permission.SET_WIFI_INFO and ohos.permission.MANAGE_WIFI_CONNECTION - * @systemapi Hide this for inner system use. - */ - function removeAllNetwork(): boolean; - - /** - * Deletes a Wi-Fi network with a specified ID. - * - *

After a Wi-Fi network is deleted, its configuration will be deleted from the list of Wi-Fi configurations. - * If the Wi-Fi network is being connected, the connection will be interrupted. - * The application can only delete Wi-Fi networks it has created. - * - * @param id Indicates the ID of the Wi-Fi network, - * which can be obtained using the {@link #addDeviceConfig} or {@link #getLinkedInfo} method. - * @return Returns {@code true} if the Wi-Fi network is deleted successfully, returns {@code false} otherwise. - * @since 7 - * @syscap SystemCapability.Communication.WiFi.STA - * @permission ohos.permission.SET_WIFI_INFO and ohos.permission.MANAGE_WIFI_CONNECTION - * @systemapi Hide this for inner system use. - */ - function removeDevice(id: number): boolean; - - /** - * Enables a Wi-Fi hotspot. - * - *

This method is asynchronous. After the Wi-Fi hotspot is enabled, Wi-Fi may be disabled. - * - * @return Returns {@code true} if this method is called successfully, returns {@code false} otherwise. - * @since 7 - * @syscap SystemCapability.Communication.WiFi.AP.Core - * @permission ohos.permission.MANAGE_WIFI_HOTSPOT - * @systemapi Hide this for inner system use. - */ - function enableHotspot(): boolean; - - /** - * Disables a Wi-Fi hotspot. - * - *

This method is asynchronous. If Wi-Fi is enabled after the Wi-Fi hotspot is disabled, Wi-Fi may be re-enabled. - * - * @return Returns {@code true} if this method is called successfully, returns {@code false} otherwise. - * @since 7 - * @syscap SystemCapability.Communication.WiFi.AP.Core - * @permission ohos.permission.MANAGE_WIFI_HOTSPOT - * @systemapi Hide this for inner system use. - */ - function disableHotspot(): boolean; - - /** - * Checks whether a device serving as a Wi-Fi hotspot supports both the 2.4 GHz and 5 GHz Wi-Fi. - * - * @return Returns {@code true} if the method is called successfully, returns {@code false} otherwise. - * @since 7 - * @syscap SystemCapability.Communication.WiFi.AP.Core - * @permission ohos.permission.GET_WIFI_INFO and ohos.permission.MANAGE_WIFI_HOTSPOT - * @systemapi Hide this for inner system use. - */ - function isHotspotDualBandSupported(): boolean; - - /** - * Checks whether Wi-Fi hotspot is active on a device. - * - * @return Returns {@code true} if Wi-Fi hotspot is enabled, returns {@code false} otherwise. - * @since 7 - * @syscap SystemCapability.Communication.WiFi.AP.Core - * @permission ohos.permission.GET_WIFI_INFO - * @systemapi Hide this for inner system use. - */ - function isHotspotActive(): boolean; - - /** - * Sets the hotspot for a device. - * - *

Only OPEN and WPA2 PSK hotspots can be configured. - * - * @param config Indicates the Wi-Fi hotspot configuration. - * The SSID and {@code securityType} must be available and correct. - * If {@code securityType} is not {@code open}, {@code preSharedKey} must be available and correct. - * @return Returns {@code true} if the method is called successfully, returns {@code false} otherwise. - * @since 7 - * @syscap SystemCapability.Communication.WiFi.AP.Core - * @permission ohos.permission.SET_WIFI_INFO and ohos.permission.GET_WIFI_CONFIG - * @systemapi Hide this for inner system use. - */ - function setHotspotConfig(config: HotspotConfig): boolean; - - /** - * Obtains the Wi-Fi hotspot configuration. - * - * @return Returns the configuration of an existing or enabled Wi-Fi hotspot. - * @since 7 - * @syscap SystemCapability.Communication.WiFi.AP.Core - * @permission ohos.permission.GET_WIFI_INFO and ohos.permission.GET_WIFI_CONFIG - * @systemapi Hide this for inner system use. - */ - function getHotspotConfig(): HotspotConfig; - - /** - * Obtains the list of clients that are connected to a Wi-Fi hotspot. - * - *

This method can only be used on a device that serves as a Wi-Fi hotspot. - * - * @return Returns the list of clients that are connected to the Wi-Fi hotspot. - * @since 7 - * @syscap SystemCapability.Communication.WiFi.AP.Core - * @permission ohos.permission.GET_WIFI_INFO and ohos.permission.LOCATION and ohos.permission.MANAGE_WIFI_HOTSPOT - * @systemapi Hide this for inner system use. - */ - function getStations(): Array; - - /** - * Obtains information about a P2P connection. - * - * @return Returns the P2P connection information. - * @since 8 - * @syscap SystemCapability.Communication.WiFi.P2P - * @permission ohos.permission.GET_WIFI_INFO - */ - function getP2pLinkedInfo(): Promise; - function getP2pLinkedInfo(callback: AsyncCallback): void; - - /** - * Obtains information about the current group. - * - * @return Returns the current group information. - * @since 8 - * @syscap SystemCapability.Communication.WiFi.P2P - * @permission ohos.permission.GET_WIFI_INFO and ohos.permission.LOCATION - */ - function getCurrentGroup(): Promise; - function getCurrentGroup(callback: AsyncCallback): void; - - /** - * Obtains the information about the found devices. - * - * @return Returns the found devices list. - * @since 8 - * @syscap SystemCapability.Communication.WiFi.P2P - * @permission ohos.permission.GET_WIFI_INFO and ohos.permission.LOCATION - */ - function getP2pPeerDevices(): Promise; - function getP2pPeerDevices(callback: AsyncCallback): void; - - /** - * Creates a P2P group. - * - * @param config Indicates the configuration for creating a group. - * @return Returns {@code true} if the operation is successful, returns {@code false} otherwise. - * @since 8 - * @syscap SystemCapability.Communication.WiFi.P2P - * @permission ohos.permission.GET_WIFI_INFO - */ - function createGroup(config: WifiP2PConfig): boolean; - - /** - * Removes a P2P group. - * - * @return Returns {@code true} if the operation is successful, returns {@code false} otherwise. - * @since 8 - * @syscap SystemCapability.Communication.WiFi.P2P - * @permission ohos.permission.GET_WIFI_INFO - */ - function removeGroup(): boolean; - - /** - * Initiates a P2P connection to a device with the specified configuration. - * - * @param config Indicates the configuration for connecting to a specific group. - * @return Returns {@code true} if the operation is successful, returns {@code false} otherwise. - * @since 8 - * @syscap SystemCapability.Communication.WiFi.P2P - * @permission ohos.permission.GET_WIFI_INFO and ohos.permission.LOCATION - */ - function p2pConnect(config: WifiP2PConfig): boolean; - - /** - * Canceling a P2P connection. - * - * @return Returns {@code true} if the operation is successful, returns {@code false} otherwise. - * @since 8 - * @syscap SystemCapability.Communication.WiFi.P2P - * @permission ohos.permission.GET_WIFI_INFO - */ - function p2pCancelConnect(): boolean; - - /** - * Discovers Wi-Fi P2P devices. - * - * @return Returns {@code true} if the operation is successful, returns {@code false} otherwise. - * @since 8 - * @syscap SystemCapability.Communication.WiFi.P2P - * @permission ohos.permission.GET_WIFI_INFO and ohos.permission.LOCATION - */ - function startDiscoverDevices(): boolean; - - /** - * Stops discovering Wi-Fi P2P devices. - * - * @return Returns {@code true} if the operation is successful, returns {@code false} otherwise. - * @since 8 - * @syscap SystemCapability.Communication.WiFi.P2P - * @permission ohos.permission.GET_WIFI_INFO - */ - function stopDiscoverDevices(): boolean; - - /** - * Deletes the persistent P2P group with the specified network ID. - * - * @param netId Indicates the network ID of the group to be deleted. - * @return Returns {@code true} if the operation is successful, returns {@code false} otherwise. - * @since 8 - * @syscap SystemCapability.Communication.WiFi.P2P - * @permission ohos.permission.SET_WIFI_INFO and ohos.permission.MANAGE_WIFI_CONNECTION - * @systemapi Hide this for inner system use. - */ - function deletePersistentGroup(netId: number): boolean; - - /** - * Sets the name of the Wi-Fi P2P device. - * - * @param devName Indicates the name to be set. - * @return Returns {@code true} if the operation is successful, returns {@code false} otherwise. - * @since 8 - * @syscap SystemCapability.Communication.WiFi.P2P - * @permission ohos.permission.SET_WIFI_INFO and ohos.permission.MANAGE_WIFI_CONNECTION - * @systemapi Hide this for inner system use. - */ - function setDeviceName(devName: string): boolean; - - /** - * Subscribe Wi-Fi status change events. - * - * @return Returns 0: inactive, 1: active, 2: activating, 3: deactivating - * @since 7 - * @syscap SystemCapability.Communication.WiFi.STA - * @permission ohos.permission.GET_WIFI_INFO - */ - function on(type: "wifiStateChange", callback: Callback): void; - - /** - * Unsubscribe Wi-Fi status change events. - * - *

All callback functions will be deregistered If there is no specific callback parameter.

- * - * @since 7 - * @syscap SystemCapability.Communication.WiFi.STA - * @permission ohos.permission.GET_WIFI_INFO - */ - function off(type: "wifiStateChange", callback?: Callback): void; - - /** - * Subscribe Wi-Fi connection change events. - * - * @return Returns 0: disconnected, 1: connected - * @since 7 - * @syscap SystemCapability.Communication.WiFi.STA - * @permission ohos.permission.GET_WIFI_INFO - */ - function on(type: "wifiConnectionChange", callback: Callback): void; - - /** - * Unsubscribe Wi-Fi connection change events. - * - *

All callback functions will be deregistered If there is no specific callback parameter.

- * - * @since 7 - * @syscap SystemCapability.Communication.WiFi.STA - * @permission ohos.permission.GET_WIFI_INFO - */ - function off(type: "wifiConnectionChange", callback?: Callback): void; - - /** - * Subscribe Wi-Fi scan status change events. - * - * @return Returns 0: scan fail, 1: scan success - * @since 7 - * @syscap SystemCapability.Communication.WiFi.STA - * @permission ohos.permission.GET_WIFI_INFO - */ - function on(type: "wifiScanStateChange", callback: Callback): void; - - /** - * Unsubscribe Wi-Fi scan status change events. - * - *

All callback functions will be deregistered If there is no specific callback parameter.

- * - * @since 7 - * @syscap SystemCapability.Communication.WiFi.STA - * @permission ohos.permission.GET_WIFI_INFO - */ - function off(type: "wifiScanStateChange", callback?: Callback): void; - - /** - * Subscribe Wi-Fi rssi change events. - * - * @return Returns RSSI value in dBm - * @since 7 - * @syscap SystemCapability.Communication.WiFi.STA - * @permission ohos.permission.GET_WIFI_INFO - */ - function on(type: "wifiRssiChange", callback: Callback): void; - - /** - * Unsubscribe Wi-Fi rssi change events. - * - *

All callback functions will be deregistered If there is no specific callback parameter.

- * - * @since 7 - * @syscap SystemCapability.Communication.WiFi.STA - * @permission ohos.permission.GET_WIFI_INFO - */ - function off(type: "wifiRssiChange", callback?: Callback): void; - - /** - * Subscribe Wi-Fi stream change events. - * - * @return Returns 0: stream none, 1: stream down, 2: stream up, 3: stream bidirectional - * @since 7 - * @syscap SystemCapability.Communication.WiFi.STA - * @permission ohos.permission.MANAGE_WIFI_CONNECTION - * @systemapi Hide this for inner system use. - */ - function on(type: "streamChange", callback: Callback): void; - - /** - * Unsubscribe Wi-Fi stream change events. - * - *

All callback functions will be deregistered If there is no specific callback parameter.

- * - * @since 7 - * @syscap SystemCapability.Communication.WiFi.STA - * @permission ohos.permission.MANAGE_WIFI_CONNECTION - * @systemapi Hide this for inner system use. - */ - function off(type: "streamChange", callback?: Callback): void; - - /** - * Subscribe Wi-Fi hotspot state change events. - * - * @return Returns 0: inactive, 1: active, 2: activating, 3: deactivating - * @since 7 - * @syscap SystemCapability.Communication.WiFi.AP.Core - * @permission ohos.permission.GET_WIFI_INFO - */ - function on(type: "hotspotStateChange", callback: Callback): void; - - /** - * Unsubscribe Wi-Fi hotspot state change events. - * - *

All callback functions will be deregistered If there is no specific callback parameter.

- * - * @since 7 - * @syscap SystemCapability.Communication.WiFi.AP.Core - * @permission ohos.permission.GET_WIFI_INFO - */ - function off(type: "hotspotStateChange", callback?: Callback): void; - - /** - * Subscribe Wi-Fi hotspot sta join events. - * - * @return Returns StationInfo - * @since 7 - * @syscap SystemCapability.Communication.WiFi.AP.Core - * @permission ohos.permission.MANAGE_WIFI_HOTSPOT - * @systemapi Hide this for inner system use. - */ - function on(type: "hotspotStaJoin", callback: Callback): void; - - /** - * Unsubscribe Wi-Fi hotspot sta join events. - * - *

All callback functions will be deregistered If there is no specific callback parameter.

- * - * @since 7 - * @syscap SystemCapability.Communication.WiFi.AP.Core - * @permission ohos.permission.MANAGE_WIFI_HOTSPOT - * @systemapi Hide this for inner system use. - */ - function off(type: "hotspotStaJoin", callback?: Callback): void; - - /** - * Subscribe Wi-Fi hotspot sta leave events. - * - * @return Returns {@link #StationInfo} object - * @since 7 - * @syscap SystemCapability.Communication.WiFi.AP.Core - * @permission ohos.permission.MANAGE_WIFI_HOTSPOT - * @systemapi Hide this for inner system use. - */ - function on(type: "hotspotStaLeave", callback: Callback): void; - - /** - * Unsubscribe Wi-Fi hotspot sta leave events. - * - * @return Returns {@link #StationInfo} object - * @since 7 - * @syscap SystemCapability.Communication.WiFi.AP.Core - * @permission ohos.permission.MANAGE_WIFI_HOTSPOT - * @systemapi Hide this for inner system use. - */ - function off(type: "hotspotStaLeave", callback?: Callback): void; - - /** - * Subscribe P2P status change events. - * - * @return Returns 1: idle, 2: starting, 3:started, 4: closing, 5: closed - * @since 8 - * @syscap SystemCapability.Communication.WiFi.P2P - * @permission ohos.permission.GET_WIFI_INFO - */ - function on(type: "p2pStateChange", callback: Callback): void; - - /** - * Unsubscribe P2P status change events. - * - * @since 8 - * @syscap SystemCapability.Communication.WiFi.P2P - * @permission ohos.permission.GET_WIFI_INFO - */ - function off(type: "p2pStateChange", callback?: Callback): void; - - /** - * Subscribe P2P connection change events. - * - * @return Returns WifiP2pLinkedInfo - * @since 8 - * @syscap SystemCapability.Communication.WiFi.P2P - * @permission ohos.permission.GET_WIFI_INFO - */ - function on(type: "p2pConnectionChange", callback: Callback): void; - - /** - * Unsubscribe P2P connection change events. - * - * @since 8 - * @syscap SystemCapability.Communication.WiFi.P2P - * @permission ohos.permission.GET_WIFI_INFO - */ - function off(type: "p2pConnectionChange", callback?: Callback): void; - - /** - * Subscribe P2P local device change events. - * - * @return Returns WifiP2pDevice - * @since 8 - * @syscap SystemCapability.Communication.WiFi.P2P - * @permission ohos.permission.GET_WIFI_INFO and ohos.permission.LOCATION - */ - function on(type: "p2pDeviceChange", callback: Callback): void; - - /** - * Unsubscribe P2P local device change events. - * - * @return Returns WifiP2pDevice - * @since 8 - * @syscap SystemCapability.Communication.WiFi.P2P - * @permission ohos.permission.LOCATION - */ - function off(type: "p2pDeviceChange", callback?: Callback): void; - - /** - * Subscribe P2P peer device change events. - * - * @return Returns WifiP2pDevice[] - * @since 8 - * @syscap SystemCapability.Communication.WiFi.P2P - * @permission ohos.permission.GET_WIFI_INFO and ohos.permission.LOCATION - */ - function on(type: "p2pPeerDeviceChange", callback: Callback): void; - - /** - * Unsubscribe P2P peer device change events. - * - * @since 8 - * @syscap SystemCapability.Communication.WiFi.P2P - * @permission ohos.permission.LOCATION - */ - function off(type: "p2pPeerDeviceChange", callback?: Callback): void; - - /** - * Subscribe P2P persistent group change events. - * - * @return Returns void - * @since 8 - * @syscap SystemCapability.Communication.WiFi.P2P - * @permission ohos.permission.GET_WIFI_INFO - */ - function on(type: "p2pPersistentGroupChange", callback: Callback): void; - - /** - * Unsubscribe P2P persistent group change events. - * - * @since 8 - * @syscap SystemCapability.Communication.WiFi.P2P - * @permission ohos.permission.GET_WIFI_INFO - */ - function off(type: "p2pPersistentGroupChange", callback?: Callback): void; - - /** - * Subscribe P2P discovery events. - * - * @return Returns 0: initial state, 1: discovery succeeded - * @since 8 - * @syscap SystemCapability.Communication.WiFi.P2P - * @permission ohos.permission.GET_WIFI_INFO - */ - function on(type: "p2pDiscoveryChange", callback: Callback): void; - - /** - * Unsubscribe P2P discovery events. - * - * @since 8 - * @syscap SystemCapability.Communication.WiFi.P2P - * @permission ohos.permission.GET_WIFI_INFO - */ - function off(type: "p2pDiscoveryChange", callback?: Callback): void; - - /** - * Wi-Fi device configuration information. - * - * @since 6 - * @syscap SystemCapability.Communication.WiFi.STA - */ - interface WifiDeviceConfig { - /** Wi-Fi SSID: the maximum length is 32 */ - ssid: string; - - /** Wi-Fi bssid(MAC): the length is 6 */ - bssid: string; - - /** Wi-Fi key: maximum length is 64 */ - preSharedKey: string; - - /** Hide SSID or not, false(default): not hide */ - isHiddenSsid: boolean; - - /** Security type: reference definition of WifiSecurityType */ - securityType: WifiSecurityType; - - /** The UID of the Wi-Fi configuration creator */ - /* @systemapi */ - creatorUid: number; - - /** Disable reason */ - /* @systemapi */ - disableReason: number; - - /** Allocated networkId */ - /* @systemapi */ - netId: number; - - /** Random mac type */ - /* @systemapi */ - randomMacType: number; - - /** Random mac address, the length is 6 */ - /* @systemapi */ - randomMacAddr: string; - - /** IP Type */ - /* @systemapi */ - ipType: IpType; - - /** IP config of static */ - /* @systemapi */ - staticIp: IpConfig; - } - - /** - * Wi-Fi IP configuration information. - * - * @since 7 - * @systemapi Hide this for inner system use. - * @syscap SystemCapability.Communication.WiFi.STA - */ - interface IpConfig { - ipAddress: number; - gateway: number; - dnsServers: number[]; - domains: Array; - } - - /** - * Describes the scanned Wi-Fi information. - * - * @since 6 - * @syscap SystemCapability.Communication.WiFi.STA - */ - interface WifiScanInfo { - /** Wi-Fi SSID: the maximum length is 32 */ - ssid: string; - - /** Wi-Fi bssid(MAC): the length is 6 */ - bssid: string; - - /** Hotspot capability */ - capabilities: string; - - /** Security type: reference definition of WifiSecurityType */ - securityType: WifiSecurityType; - - /** Received signal strength indicator (RSSI) */ - rssi: number; - - /** Frequency band, 1: 2.4G, 2: 5G */ - band: number; - - /** Frequency */ - frequency: number; - - /** Channel width */ - channelWidth: number; - - /** Time stamp */ - timestamp: number; - } - - /** - * Describes the wifi security type. - * - * @since 6 - * @syscap SystemCapability.Communication.WiFi.Core - */ - enum WifiSecurityType { - /** Invalid security type */ - WIFI_SEC_TYPE_INVALID = 0, - - /** Open */ - WIFI_SEC_TYPE_OPEN = 1, - - /** Wired Equivalent Privacy (WEP) */ - WIFI_SEC_TYPE_WEP = 2, - - /** Pre-shared key (PSK) */ - WIFI_SEC_TYPE_PSK = 3, - - /** Simultaneous Authentication of Equals (SAE) */ - WIFI_SEC_TYPE_SAE = 4, - } - - /** - * Wi-Fi connection information. - * - * @since 6 - * @syscap SystemCapability.Communication.WiFi.STA - */ - interface WifiLinkedInfo { - /** The SSID of the Wi-Fi hotspot */ - ssid: string; - - /** The BSSID of the Wi-Fi hotspot */ - bssid: string; - - /** The ID(uniquely identifies) of a Wi-Fi connection. */ - /* @systemapi */ - networkId: number; - - /** The RSSI(dBm) of a Wi-Fi access point. */ - rssi: number; - - /** The frequency band of a Wi-Fi access point. */ - band: number; - - /** The speed of a Wi-Fi access point. */ - linkSpeed: number; - - /** The frequency of a Wi-Fi access point. */ - frequency: number; - - /** Whether the SSID of the access point (AP) of this Wi-Fi connection is hidden. */ - isHidden: boolean; - - /** Whether this Wi-Fi connection restricts the data volume. */ - isRestricted: boolean; - - /** The load value of this Wi-Fi connection. A greater value indicates a higher load. */ - /* @systemapi */ - chload: number; - - /** The signal-to-noise ratio (SNR) of this Wi-Fi connection. */ - /* @systemapi */ - snr: number; - - /** The Wi-Fi MAC address of a device. */ - macAddress: string; - - /** The IP address of this Wi-Fi connection. */ - ipAddress: number; - - /** The state of the supplicant of this Wi-Fi connection. */ - /* @systemapi */ - suppState: SuppState; - - /** The state of this Wi-Fi connection. */ - connState: ConnState; - } - - /** - * Wi-Fi IP information. - * - * @since 7 - * @syscap SystemCapability.Communication.WiFi.STA - */ - interface IpInfo { - /** The IP address of the Wi-Fi connection */ - ipAddress: number; - - /** The gateway of the Wi-Fi connection */ - gateway: number; - - /** The network mask of the Wi-Fi connection */ - netmask: number; - - /** The primary DNS server IP address of the Wi-Fi connection */ - primaryDns: number; - - /** The secondary DNS server IP address of the Wi-Fi connection */ - secondDns: number; - - /** The DHCP server IP address of the Wi-Fi connection */ - serverIp: number; - - /** The IP address lease duration of the Wi-Fi connection */ - leaseDuration: number; - } - - /** - * Wi-Fi hotspot configuration information. - * - * @since 7 - * @systemapi Hide this for inner system use. - * @syscap SystemCapability.Communication.WiFi.AP.Core - */ - interface HotspotConfig { - /** The SSID of the Wi-Fi hotspot */ - ssid: string; - - /** The encryption mode of the Wi-Fi hotspot */ - securityType: WifiSecurityType; - - /** The frequency band of the Wi-Fi hotspot */ - band: number; - - /** The password of the Wi-Fi hotspot */ - preSharedKey: string; - - /** The maximum number of connections allowed by the Wi-Fi hotspot */ - maxConn: number; - } - - /** - * Wi-Fi station information. - * - * @since 7 - * @systemapi Hide this for inner system use. - * @syscap SystemCapability.Communication.WiFi.AP.Core - */ - interface StationInfo { - /** the network name of the Wi-Fi client */ - name: string; - - /** The MAC address of the Wi-Fi client */ - macAddress: string; - - /** The IP address of the Wi-Fi client */ - ipAddress: string; - } - - /** - * Wi-Fi IP type enumeration. - * - * @since 7 - * @systemapi Hide this for inner system use. - * @syscap SystemCapability.Communication.WiFi.STA - */ - enum IpType { - /** Use statically configured IP settings */ - STATIC, - - /** Use dynamically configured IP settings */ - DHCP, - - /** No IP details are assigned */ - UNKNOWN, - } - - /** - * The state of the supplicant enumeration. - * - * @since 6 - * @systemapi Hide this for inner system use. - * @syscap SystemCapability.Communication.WiFi.STA - */ - export enum SuppState { - /** The supplicant is not associated with or is disconnected from the AP. */ - DISCONNECTED, - - /** The network interface is disabled. */ - INTERFACE_DISABLED, - - /** The supplicant is disabled. */ - INACTIVE, - - /** The supplicant is scanning for a Wi-Fi connection. */ - SCANNING, - - /** The supplicant is authenticating with a specified AP. */ - AUTHENTICATING, - - /** The supplicant is associating with a specified AP. */ - ASSOCIATING, - - /** The supplicant is associated with a specified AP. */ - ASSOCIATED, - - /** The four-way handshake is ongoing. */ - FOUR_WAY_HANDSHAKE, - - /** The group handshake is ongoing. */ - GROUP_HANDSHAKE, - - /** All authentication is completed. */ - COMPLETED, - - /** Failed to establish a connection to the supplicant. */ - UNINITIALIZED, - - /** The supplicant is in an unknown or invalid state. */ - INVALID - } - - /** - * The state of Wi-Fi connection enumeration. - * - * @since 6 - * @syscap SystemCapability.Communication.WiFi.STA - */ - export enum ConnState { - /** The device is searching for an available AP. */ - SCANNING, - - /** The Wi-Fi connection is being set up. */ - CONNECTING, - - /** The Wi-Fi connection is being authenticated. */ - AUTHENTICATING, - - /** The IP address of the Wi-Fi connection is being obtained. */ - OBTAINING_IPADDR, - - /** The Wi-Fi connection has been set up. */ - CONNECTED, - - /** The Wi-Fi connection is being torn down. */ - DISCONNECTING, - - /** The Wi-Fi connection has been torn down. */ - DISCONNECTED, - - /** Failed to set up the Wi-Fi connection. */ - UNKNOWN - } - - /** - * P2P device information. - * - * @since 8 - * @syscap SystemCapability.Communication.WiFi.P2P - */ - interface WifiP2pDevice { - /** Device name */ - deviceName: string; - - /** Device mac address */ - deviceAddress: string; - - /** Primary device type */ - primaryDeviceType: string; - - /** Device status */ - deviceStatus: P2pDeviceStatus; - - /** Device group capabilitys */ - groupCapabilitys: number; - } - - /** - * P2P config. - * - * @since 8 - * @syscap SystemCapability.Communication.WiFi.P2P - */ - interface WifiP2PConfig { - /** Device mac address */ - deviceAddress: string; - - /** - * Group network ID. When creating a group, -1 indicates creates a temporary group, - * -2: indicates creates a persistent group - */ - netId: number; - - /* The passphrase of this {@code WifiP2pConfig} instance */ - passphrase: string; - - /** Group name */ - groupName: string; - - /** Group owner band */ - goBand: GroupOwnerBand; - } - - /** - * P2P group information. - * - * @since 8 - * @syscap SystemCapability.Communication.WiFi.P2P - */ - interface WifiP2pGroupInfo { - /** Indicates whether it is group owner */ - isP2pGo: boolean; - - /** Group owner information */ - ownerInfo: WifiP2pDevice; - - /** The group passphrase */ - passphrase: string; - - /** Interface name */ - interface: string; - - /** Group name */ - groupName: string; - - /** Network ID */ - networkId: number; - - /** Frequency */ - frequency: number; - - /** Client list */ - clientDevices: WifiP2pDevice[]; - - /** Group owner IP address */ - goIpAddress: string; - } - - /** - * P2P connection status. - * - * @since 8 - * @syscap SystemCapability.Communication.WiFi.P2P - */ - enum P2pConnectState { - DISCONNECTED = 0, - CONNECTED = 1, - } - - /** - * P2P linked information. - * - * @since 8 - * @syscap SystemCapability.Communication.WiFi.P2P - */ - interface WifiP2pLinkedInfo { - /** Connection status */ - connectState: P2pConnectState; - - /** Indicates whether it is group owner */ - isGroupOwner: boolean; - - /** Group owner address */ - groupOwnerAddr: string; - } - - /** - * P2P device status. - * - * @since 8 - * @syscap SystemCapability.Communication.WiFi.P2P - */ - enum P2pDeviceStatus { - CONNECTED = 0, - INVITED = 1, - FAILED = 2, - AVAILABLE = 3, - UNAVAILABLE = 4, - } - - /** - * P2P group owner band. - * - * @since 8 - * @syscap SystemCapability.Communication.WiFi.P2P - */ - enum GroupOwnerBand { - GO_BAND_AUTO = 0, - GO_BAND_2GHZ = 1, - GO_BAND_5GHZ = 2, - } -} - -export default wifi; diff --git a/wifi/interfaces/kits/jskits/@ohos.wifiext.d.ts b/wifi/interfaces/kits/jskits/@ohos.wifiext.d.ts deleted file mode 100644 index c881d0a..0000000 --- a/wifi/interfaces/kits/jskits/@ohos.wifiext.d.ts +++ /dev/null @@ -1,102 +0,0 @@ -/* - * Copyright (C) 2022 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { AsyncCallback, Callback } from './basic'; - -/** - * Provides extended methods to operate or manage Wi-Fi. - * - *

The APIs involved in this file are non-general APIs. - * These extended APIs are only used by some product types, such as routers. - * Common products should not use these APIs.

- * - * @since 8 - * @import import wifiext from '@ohos.wifiext'; - */ -declare namespace wifiext { - /** - * Enables a Wi-Fi hotspot. - * - * @return Returns {@code true} if this method is called successfully; returns {@code false} otherwise. - * @since 8 - * @permission ohos.permission.MANAGE_WIFI_HOTSPOT_EXT - * @syscap SystemCapability.Communication.WiFi.AP.Extension - */ - function enableHotspot(): boolean; - - /** - * Disables a Wi-Fi hotspot. - * - * @return Returns {@code true} if this method is called successfully; returns {@code false} otherwise. - * @since 8 - * @permission ohos.permission.MANAGE_WIFI_HOTSPOT_EXT - * @syscap SystemCapability.Communication.WiFi.AP.Extension - */ - function disableHotspot(): boolean; - - /** - * Obtains the supported power model. - * - * @return Returns the array of supported power model. - * - * @since 8 - * @permission ohos.permission.GET_WIFI_INFO - * @syscap SystemCapability.Communication.WiFi.AP.Extension - */ - function getSupportedPowerModel(): Promise>; - function getSupportedPowerModel(callback: AsyncCallback>): void; - - /** - * Obtains the current Wi-Fi power mode. - * - * @return Returns the current Wi-Fi power mode. If a value less than zero is returned, it indicates a failure. - * - * @since 8 - * @permission ohos.permission.GET_WIFI_INFO - * @syscap SystemCapability.Communication.WiFi.AP.Extension - */ - function getPowerModel (): Promise; - function getPowerModel (callback: AsyncCallback): void; - - /** - * Set the current Wi-Fi power mode. - * - * @return Returns {@code true} if the Wi-Fi is active; returns {@code false} otherwise. - * - * @since 8 - * @permission ohos.permission.MANAGE_WIFI_HOTSPOT_EXT - * @syscap SystemCapability.Communication.WiFi.AP.Extension - */ - function setPowerModel(model: PowerModel) : boolean - - /** - * The power model enumeration. - * - * @since 8 - * @syscap SystemCapability.Communication.WiFi.AP.Extension - */ - export enum PowerModel { - /** Sleeping model. */ - SLEEPING = 0, - - /** General model. */ - GENERAL = 1, - - /** Through wall model. */ - THROUGH_WALL = 2, - } -} - -export default wifiext; diff --git a/wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/BUILD.gn b/wifi/test/wifi_standard/ipc_framework/cRPC/unittest/BUILD.gn similarity index 100% rename from wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/BUILD.gn rename to wifi/test/wifi_standard/ipc_framework/cRPC/unittest/BUILD.gn diff --git a/wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/context_test.cpp b/wifi/test/wifi_standard/ipc_framework/cRPC/unittest/context_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/context_test.cpp rename to wifi/test/wifi_standard/ipc_framework/cRPC/unittest/context_test.cpp diff --git a/wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/context_test.h b/wifi/test/wifi_standard/ipc_framework/cRPC/unittest/context_test.h similarity index 100% rename from wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/context_test.h rename to wifi/test/wifi_standard/ipc_framework/cRPC/unittest/context_test.h diff --git a/wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/hash_table_test.cpp b/wifi/test/wifi_standard/ipc_framework/cRPC/unittest/hash_table_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/hash_table_test.cpp rename to wifi/test/wifi_standard/ipc_framework/cRPC/unittest/hash_table_test.cpp diff --git a/wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/hash_table_test.h b/wifi/test/wifi_standard/ipc_framework/cRPC/unittest/hash_table_test.h similarity index 100% rename from wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/hash_table_test.h rename to wifi/test/wifi_standard/ipc_framework/cRPC/unittest/hash_table_test.h diff --git a/wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/net_test.cpp b/wifi/test/wifi_standard/ipc_framework/cRPC/unittest/net_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/net_test.cpp rename to wifi/test/wifi_standard/ipc_framework/cRPC/unittest/net_test.cpp diff --git a/wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/net_test.h b/wifi/test/wifi_standard/ipc_framework/cRPC/unittest/net_test.h similarity index 100% rename from wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/net_test.h rename to wifi/test/wifi_standard/ipc_framework/cRPC/unittest/net_test.h diff --git a/wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/rpc_test_main.cpp b/wifi/test/wifi_standard/ipc_framework/cRPC/unittest/rpc_test_main.cpp similarity index 100% rename from wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/rpc_test_main.cpp rename to wifi/test/wifi_standard/ipc_framework/cRPC/unittest/rpc_test_main.cpp diff --git a/wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/serial_test.cpp b/wifi/test/wifi_standard/ipc_framework/cRPC/unittest/serial_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/serial_test.cpp rename to wifi/test/wifi_standard/ipc_framework/cRPC/unittest/serial_test.cpp diff --git a/wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/serial_test.h b/wifi/test/wifi_standard/ipc_framework/cRPC/unittest/serial_test.h similarity index 100% rename from wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/serial_test.h rename to wifi/test/wifi_standard/ipc_framework/cRPC/unittest/serial_test.h diff --git a/wifi/tests/wifi_standard/wifi_framework/common/unittest/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/common/unittest/BUILD.gn similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/common/unittest/BUILD.gn rename to wifi/test/wifi_standard/wifi_framework/common/unittest/BUILD.gn diff --git a/wifi/tests/wifi_standard/wifi_framework/common/unittest/common_test.cpp b/wifi/test/wifi_standard/wifi_framework/common/unittest/common_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/common/unittest/common_test.cpp rename to wifi/test/wifi_standard/wifi_framework/common/unittest/common_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/common/unittest/wifi_config_file_test.cpp b/wifi/test/wifi_standard/wifi_framework/common/unittest/wifi_config_file_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/common/unittest/wifi_config_file_test.cpp rename to wifi/test/wifi_standard/wifi_framework/common/unittest/wifi_config_file_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/common/unittest/wifi_config_file_test.h b/wifi/test/wifi_standard/wifi_framework/common/unittest/wifi_config_file_test.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/common/unittest/wifi_config_file_test.h rename to wifi/test/wifi_standard/wifi_framework/common/unittest/wifi_config_file_test.h diff --git a/wifi/tests/wifi_standard/wifi_framework/common/unittest/wifi_global_func_test.cpp b/wifi/test/wifi_standard/wifi_framework/common/unittest/wifi_global_func_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/common/unittest/wifi_global_func_test.cpp rename to wifi/test/wifi_standard/wifi_framework/common/unittest/wifi_global_func_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/common/unittest/wifi_global_func_test.h b/wifi/test/wifi_standard/wifi_framework/common/unittest/wifi_global_func_test.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/common/unittest/wifi_global_func_test.h rename to wifi/test/wifi_standard/wifi_framework/common/unittest/wifi_global_func_test.h diff --git a/wifi/tests/wifi_standard/wifi_framework/common/unittest/wifi_ip_tools_test.cpp b/wifi/test/wifi_standard/wifi_framework/common/unittest/wifi_ip_tools_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/common/unittest/wifi_ip_tools_test.cpp rename to wifi/test/wifi_standard/wifi_framework/common/unittest/wifi_ip_tools_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/common/unittest/wifi_ip_tools_test.h b/wifi/test/wifi_standard/wifi_framework/common/unittest/wifi_ip_tools_test.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/common/unittest/wifi_ip_tools_test.h rename to wifi/test/wifi_standard/wifi_framework/common/unittest/wifi_ip_tools_test.h diff --git a/wifi/tests/wifi_standard/wifi_framework/common/unittest/wifi_log_helper_test.cpp b/wifi/test/wifi_standard/wifi_framework/common/unittest/wifi_log_helper_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/common/unittest/wifi_log_helper_test.cpp rename to wifi/test/wifi_standard/wifi_framework/common/unittest/wifi_log_helper_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/common/unittest/wifi_log_helper_test.h b/wifi/test/wifi_standard/wifi_framework/common/unittest/wifi_log_helper_test.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/common/unittest/wifi_log_helper_test.h rename to wifi/test/wifi_standard/wifi_framework/common/unittest/wifi_log_helper_test.h diff --git a/wifi/tests/wifi_standard/wifi_framework/common/unittest/wifi_network_interface_test.cpp b/wifi/test/wifi_standard/wifi_framework/common/unittest/wifi_network_interface_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/common/unittest/wifi_network_interface_test.cpp rename to wifi/test/wifi_standard/wifi_framework/common/unittest/wifi_network_interface_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/common/unittest/wifi_network_interface_test.h b/wifi/test/wifi_standard/wifi_framework/common/unittest/wifi_network_interface_test.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/common/unittest/wifi_network_interface_test.h rename to wifi/test/wifi_standard/wifi_framework/common/unittest/wifi_network_interface_test.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/BUILD.gn similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/BUILD.gn rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/BUILD.gn diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/idl_client_test_main.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/idl_client_test_main.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/idl_client_test_main.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/idl_client_test_main.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/mock_wifi_hal_service.c b/wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/mock_wifi_hal_service.c similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/mock_wifi_hal_service.c rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/mock_wifi_hal_service.c diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_ap_hal_interface_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_ap_hal_interface_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_ap_hal_interface_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_ap_hal_interface_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_ap_hal_interface_test.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_ap_hal_interface_test.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_ap_hal_interface_test.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_ap_hal_interface_test.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_base_hal_interface_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_base_hal_interface_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_base_hal_interface_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_base_hal_interface_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_base_hal_interface_test.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_base_hal_interface_test.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_base_hal_interface_test.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_base_hal_interface_test.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_chip_hal_interface_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_chip_hal_interface_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_chip_hal_interface_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_chip_hal_interface_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_chip_hal_interface_test.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_chip_hal_interface_test.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_chip_hal_interface_test.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_chip_hal_interface_test.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_idl_client_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_idl_client_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_idl_client_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_idl_client_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_idl_client_test.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_idl_client_test.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_idl_client_test.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_idl_client_test.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_idl_interface_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_idl_interface_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_idl_interface_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_idl_interface_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_idl_interface_test.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_idl_interface_test.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_idl_interface_test.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_idl_interface_test.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_p2p_hal_interface_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_p2p_hal_interface_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_p2p_hal_interface_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_p2p_hal_interface_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_p2p_hal_interface_test.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_p2p_hal_interface_test.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_p2p_hal_interface_test.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_p2p_hal_interface_test.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_sta_hal_interface_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_sta_hal_interface_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_sta_hal_interface_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_sta_hal_interface_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_sta_hal_interface_test.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_sta_hal_interface_test.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_sta_hal_interface_test.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_sta_hal_interface_test.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_supplicant_hal_interface_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_supplicant_hal_interface_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_supplicant_hal_interface_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_supplicant_hal_interface_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_supplicant_hal_interface_test.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_supplicant_hal_interface_test.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_supplicant_hal_interface_test.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_supplicant_hal_interface_test.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_auth_center_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_auth_center_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_auth_center_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_auth_center_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_auth_center_test.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_auth_center_test.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_auth_center_test.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_auth_center_test.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_config_center_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_config_center_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_config_center_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_config_center_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_config_center_test.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_config_center_test.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_config_center_test.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_config_center_test.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_internal_event_dispatcher_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_internal_event_dispatcher_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_internal_event_dispatcher_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_internal_event_dispatcher_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_internal_event_dispatcher_test.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_internal_event_dispatcher_test.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_internal_event_dispatcher_test.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_internal_event_dispatcher_test.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manage_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manage_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manage_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manage_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manager_service_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manager_service_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manager_service_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manager_service_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manager_service_test.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manager_service_test.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manager_service_test.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manager_service_test.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_mock_p2p_service.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_mock_p2p_service.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_mock_p2p_service.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_mock_p2p_service.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_mock_p2p_service.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_mock_p2p_service.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_mock_p2p_service.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_mock_p2p_service.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_service_manager_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_service_manager_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_service_manager_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_service_manager_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_service_manager_test.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_service_manager_test.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_service_manager_test.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_service_manager_test.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_config_use.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_config_use.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_config_use.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_config_use.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_idle_state.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_idle_state.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_idle_state.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_idle_state.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_monitor.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_monitor.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_monitor.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_monitor.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_root_state.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_root_state.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_root_state.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_root_state.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_service.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_service.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_service.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_service.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_started_state.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_started_state.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_started_state.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_started_state.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_state_machine.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_state_machine.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_state_machine.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_state_machine.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_stations_manager.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_stations_manager.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_stations_manager.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_stations_manager.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_network_interface.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_network_interface.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_network_interface.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_network_interface.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_network_interface.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_network_interface.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_network_interface.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_network_interface.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_pendant.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_pendant.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_pendant.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_pendant.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_system_interface.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_system_interface.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_system_interface.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_system_interface.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_system_interface.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_system_interface.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_system_interface.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_system_interface.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_ap_hal_interface.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_ap_hal_interface.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_ap_hal_interface.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_ap_hal_interface.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_ap_hal_interface.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_ap_hal_interface.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_ap_hal_interface.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_ap_hal_interface.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_ap_nat_manager.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_ap_nat_manager.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_ap_nat_manager.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_ap_nat_manager.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_settings.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_settings.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_settings.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_settings.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_settings.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_settings.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_settings.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_settings.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/operator_overload.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/operator_overload.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/operator_overload.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/operator_overload.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/operator_overload.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/operator_overload.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/operator_overload.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/operator_overload.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_idle_state_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_idle_state_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_idle_state_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_idle_state_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_root_state_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_root_state_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_root_state_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_root_state_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/global_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/global_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/global_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/global_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/global_test.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/global_test.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/global_test.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/global_test.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_service_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_service_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_service_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_service_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_authorizing_negotiation_request_state.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_authorizing_negotiation_request_state.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_authorizing_negotiation_request_state.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_authorizing_negotiation_request_state.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_group_formed_state.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_group_formed_state.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_group_formed_state.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_group_formed_state.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_group_negotiation_state.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_group_negotiation_state.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_group_negotiation_state.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_group_negotiation_state.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_invitation_recelved_state.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_invitation_recelved_state.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_invitation_recelved_state.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_invitation_recelved_state.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_invitation_request_state.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_invitation_request_state.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_invitation_request_state.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_invitation_request_state.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_default_state.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_default_state.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_default_state.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_default_state.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_disabled_state.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_disabled_state.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_disabled_state.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_disabled_state.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_disabling_state.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_disabling_state.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_disabling_state.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_disabling_state.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_enabled_state.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_enabled_state.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_enabled_state.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_enabled_state.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_enabling_state.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_enabling_state.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_enabling_state.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_enabling_state.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_group_formation_state.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_group_formation_state.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_group_formation_state.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_group_formation_state.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_group_join_state.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_group_join_state.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_group_join_state.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_group_join_state.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_group_operating_state.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_group_operating_state.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_group_operating_state.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_group_operating_state.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_idle_state.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_idle_state.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_idle_state.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_idle_state.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_inviting_state.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_inviting_state.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_inviting_state.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_inviting_state.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_monitor.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_monitor.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_monitor.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_monitor.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_state_machine.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_state_machine.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_state_machine.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_state_machine.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_provision_discovery_state.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_provision_discovery_state.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_provision_discovery_state.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_provision_discovery_state.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_device_manager.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_device_manager.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_device_manager.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_device_manager.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_device_manager.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_device_manager.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_device_manager.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_device_manager.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_hal_interface.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_hal_interface.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_hal_interface.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_hal_interface.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_hal_interface.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_hal_interface.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_hal_interface.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_hal_interface.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_settings.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_settings.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_settings.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_settings.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_settings.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_settings.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_settings.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_settings.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/authorizing_negotiation_request_state_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/authorizing_negotiation_request_state_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/authorizing_negotiation_request_state_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/authorizing_negotiation_request_state_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/global_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/global_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/global_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/global_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/global_test.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/global_test.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/global_test.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/global_test.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/group_formed_state_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/group_formed_state_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/group_formed_state_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/group_formed_state_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/group_negotiation_state_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/group_negotiation_state_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/group_negotiation_state_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/group_negotiation_state_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/invitation_recelved_state_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/invitation_recelved_state_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/invitation_recelved_state_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/invitation_recelved_state_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/invitation_request_state_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/invitation_request_state_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/invitation_request_state_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/invitation_request_state_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/mock_p2p_pendant.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/mock_p2p_pendant.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/mock_p2p_pendant.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/mock_p2p_pendant.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_default_state_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_default_state_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_default_state_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_default_state_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_disabled_state_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_disabled_state_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_disabled_state_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_disabled_state_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_disabling_state_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_disabling_state_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_disabling_state_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_disabling_state_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_enabled_state_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_enabled_state_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_enabled_state_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_enabled_state_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_enabling_state_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_enabling_state_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_enabling_state_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_enabling_state_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_group_formation_state_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_group_formation_state_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_group_formation_state_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_group_formation_state_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_group_join_state_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_group_join_state_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_group_join_state_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_group_join_state_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_group_operating_state_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_group_operating_state_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_group_operating_state_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_group_operating_state_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_idle_state_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_idle_state_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_idle_state_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_idle_state_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_inviting_state_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_inviting_state_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_inviting_state_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_inviting_state_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_monitor_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_monitor_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_monitor_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_monitor_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_state_machine_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_state_machine_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_state_machine_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_state_machine_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/provision_discovery_state_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/provision_discovery_state_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/provision_discovery_state_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/provision_discovery_state_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_device_manager_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_device_manager_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_device_manager_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_device_manager_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_dns_sd_service_info_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_dns_sd_service_info_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_dns_sd_service_info_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_dns_sd_service_info_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_dns_sd_service_request_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_dns_sd_service_request_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_dns_sd_service_request_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_dns_sd_service_request_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_dns_sd_service_response_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_dns_sd_service_response_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_dns_sd_service_response_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_dns_sd_service_response_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_group_info_proxy_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_group_info_proxy_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_group_info_proxy_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_group_info_proxy_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_group_manager_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_group_manager_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_group_manager_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_group_manager_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_manager_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_manager_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_manager_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_manager_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_request_list_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_request_list_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_request_list_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_request_list_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_response_list_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_response_list_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_response_list_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_response_list_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_test_entry.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_test_entry.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_test_entry.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_test_entry.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_upnp_service_info_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_upnp_service_info_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_upnp_service_info_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_upnp_service_info_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_upnp_service_request_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_upnp_service_request_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_upnp_service_request_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_upnp_service_request_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_upnp_service_response_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_upnp_service_response_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_upnp_service_response_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_upnp_service_response_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_service.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_service.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_service.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_service.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_service.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_service.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_service.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_service.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_state_machine.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_state_machine.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_state_machine.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_state_machine.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_state_machine.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_state_machine.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_state_machine.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_state_machine.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_manager.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_manager.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_manager.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_manager.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_manager.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_manager.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_manager.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_manager.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_settings.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_settings.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_settings.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_settings.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_settings.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_settings.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_settings.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_settings.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_sta_hal_interface.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_sta_hal_interface.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_sta_hal_interface.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_sta_hal_interface.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_sta_hal_interface.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_sta_hal_interface.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_sta_hal_interface.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_sta_hal_interface.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_supplicant_hal_interface.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_supplicant_hal_interface.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_supplicant_hal_interface.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_supplicant_hal_interface.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_supplicant_hal_interface.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_supplicant_hal_interface.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_supplicant_hal_interface.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_supplicant_hal_interface.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/global_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/global_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/global_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/global_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/global_test.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/global_test.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/global_test.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/global_test.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_monitor_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_monitor_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_monitor_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_monitor_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/wifi_scan_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/wifi_scan_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/wifi_scan_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/wifi_scan_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_device_appraisal.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_device_appraisal.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_device_appraisal.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_device_appraisal.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_dhcp_service.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_dhcp_service.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_dhcp_service.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_dhcp_service.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_dhcp_service.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_dhcp_service.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_dhcp_service.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_dhcp_service.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_if_config.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_if_config.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_if_config.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_if_config.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_if_config.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_if_config.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_if_config.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_if_config.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_mac_address.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_mac_address.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_mac_address.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_mac_address.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_mac_address.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_mac_address.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_mac_address.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_mac_address.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_auto_connect_service.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_auto_connect_service.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_auto_connect_service.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_auto_connect_service.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_auto_connect_service.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_auto_connect_service.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_auto_connect_service.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_auto_connect_service.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_monitor.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_monitor.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_monitor.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_monitor.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_network_check.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_network_check.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_network_check.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_network_check.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_network_check.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_network_check.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_network_check.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_network_check.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_service.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_service.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_service.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_service.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_state_machine.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_state_machine.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_state_machine.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_state_machine.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_state_machine.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_state_machine.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_state_machine.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_state_machine.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_chip_hal_interface.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_chip_hal_interface.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_chip_hal_interface.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_chip_hal_interface.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_chip_hal_interface.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_chip_hal_interface.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_chip_hal_interface.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_chip_hal_interface.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_manager.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_manager.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_manager.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_manager.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_manager.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_manager.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_manager.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_manager.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_settings.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_settings.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_settings.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_settings.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_settings.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_settings.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_settings.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_settings.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_sta_hal_interface.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_sta_hal_interface.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_sta_hal_interface.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_sta_hal_interface.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_sta_hal_interface.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_sta_hal_interface.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_sta_hal_interface.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_sta_hal_interface.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_supplicant_hal_interface.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_supplicant_hal_interface.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_supplicant_hal_interface.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_supplicant_hal_interface.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_supplicant_hal_interface.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_supplicant_hal_interface.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_supplicant_hal_interface.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_supplicant_hal_interface.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/global_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/global_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/global_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/global_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/global_test.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/global_test.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/global_test.h rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/global_test.h diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/wifi_sta_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/wifi_sta_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/wifi_sta_test.cpp rename to wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/wifi_sta_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_hal/unittest/BUILD.gn b/wifi/test/wifi_standard/wifi_hal/unittest/BUILD.gn similarity index 100% rename from wifi/tests/wifi_standard/wifi_hal/unittest/BUILD.gn rename to wifi/test/wifi_standard/wifi_hal/unittest/BUILD.gn diff --git a/wifi/tests/wifi_standard/wifi_hal/unittest/mock_wpa_ctrl.cpp b/wifi/test/wifi_standard/wifi_hal/unittest/mock_wpa_ctrl.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_hal/unittest/mock_wpa_ctrl.cpp rename to wifi/test/wifi_standard/wifi_hal/unittest/mock_wpa_ctrl.cpp diff --git a/wifi/tests/wifi_standard/wifi_hal/unittest/mock_wpa_ctrl.h b/wifi/test/wifi_standard/wifi_hal/unittest/mock_wpa_ctrl.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_hal/unittest/mock_wpa_ctrl.h rename to wifi/test/wifi_standard/wifi_hal/unittest/mock_wpa_ctrl.h diff --git a/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_adapter_test.h b/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_adapter_test.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_adapter_test.h rename to wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_adapter_test.h diff --git a/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_ap_interface_test.cpp b/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_ap_interface_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_ap_interface_test.cpp rename to wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_ap_interface_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_ap_interface_test.h b/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_ap_interface_test.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_ap_interface_test.h rename to wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_ap_interface_test.h diff --git a/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_base_interface_test.cpp b/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_base_interface_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_base_interface_test.cpp rename to wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_base_interface_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_base_interface_test.h b/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_base_interface_test.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_base_interface_test.h rename to wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_base_interface_test.h diff --git a/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_chip_interface_test.cpp b/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_chip_interface_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_chip_interface_test.cpp rename to wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_chip_interface_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_chip_interface_test.h b/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_chip_interface_test.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_chip_interface_test.h rename to wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_chip_interface_test.h diff --git a/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_add_test.cpp b/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_add_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_add_test.cpp rename to wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_add_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_add_test.h b/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_add_test.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_add_test.h rename to wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_add_test.h diff --git a/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_test.cpp b/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_test.cpp rename to wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_test.h b/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_test.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_test.h rename to wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_test.h diff --git a/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_hostapd_test.cpp b/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_hostapd_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_hostapd_test.cpp rename to wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_hostapd_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_hostapd_test.h b/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_hostapd_test.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_hostapd_test.h rename to wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_hostapd_test.h diff --git a/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_p2p_interface_test.cpp b/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_p2p_interface_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_p2p_interface_test.cpp rename to wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_p2p_interface_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_p2p_interface_test.h b/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_p2p_interface_test.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_p2p_interface_test.h rename to wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_p2p_interface_test.h diff --git a/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_sta_interface_test.cpp b/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_sta_interface_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_sta_interface_test.cpp rename to wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_sta_interface_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_sta_interface_test.h b/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_sta_interface_test.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_sta_interface_test.h rename to wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_sta_interface_test.h diff --git a/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_test.cpp b/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_test.cpp rename to wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_vendor.conf b/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_vendor.conf similarity index 100% rename from wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_vendor.conf rename to wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_vendor.conf diff --git a/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_vendor_interface_test.c b/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_vendor_interface_test.c similarity index 100% rename from wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_vendor_interface_test.c rename to wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_vendor_interface_test.c diff --git a/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_wpa_p2p_test.cpp b/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_wpa_p2p_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_wpa_p2p_test.cpp rename to wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_wpa_p2p_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_wpa_p2p_test.h b/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_wpa_p2p_test.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_wpa_p2p_test.h rename to wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_wpa_p2p_test.h diff --git a/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_wpa_sta_test.cpp b/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_wpa_sta_test.cpp similarity index 100% rename from wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_wpa_sta_test.cpp rename to wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_wpa_sta_test.cpp diff --git a/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_wpa_sta_test.h b/wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_wpa_sta_test.h similarity index 100% rename from wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_wpa_sta_test.h rename to wifi/test/wifi_standard/wifi_hal/unittest/wifi_hal_wpa_sta_test.h -- Gitee From c85290ad0215808cb0cd1e47b2665f13a6f49855 Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Sun, 15 May 2022 19:30:12 +0800 Subject: [PATCH 104/491] bugfix from master 0515 Signed-off-by: yanxiaotao --- wifi/frameworks/js/napi/{ => inc}/wifi_ext_napi_hotspot.h | 0 wifi/frameworks/js/napi/{ => inc}/wifi_napi_device.h | 0 wifi/frameworks/js/napi/{ => inc}/wifi_napi_event.h | 0 wifi/frameworks/js/napi/{ => inc}/wifi_napi_hotspot.h | 0 wifi/frameworks/js/napi/{ => inc}/wifi_napi_p2p.h | 0 wifi/frameworks/js/napi/{ => inc}/wifi_napi_utils.h | 0 wifi/frameworks/js/napi/{ => src}/wifi_ext_napi_entry.cpp | 0 wifi/frameworks/js/napi/{ => src}/wifi_ext_napi_hotspot.cpp | 0 wifi/frameworks/js/napi/{ => src}/wifi_napi_device.cpp | 0 wifi/frameworks/js/napi/{ => src}/wifi_napi_entry.cpp | 0 wifi/frameworks/js/napi/{ => src}/wifi_napi_event.cpp | 0 wifi/frameworks/js/napi/{ => src}/wifi_napi_hotspot.cpp | 0 wifi/frameworks/js/napi/{ => src}/wifi_napi_p2p.cpp | 0 wifi/frameworks/js/napi/{ => src}/wifi_napi_utils.cpp | 0 14 files changed, 0 insertions(+), 0 deletions(-) rename wifi/frameworks/js/napi/{ => inc}/wifi_ext_napi_hotspot.h (100%) rename wifi/frameworks/js/napi/{ => inc}/wifi_napi_device.h (100%) rename wifi/frameworks/js/napi/{ => inc}/wifi_napi_event.h (100%) rename wifi/frameworks/js/napi/{ => inc}/wifi_napi_hotspot.h (100%) rename wifi/frameworks/js/napi/{ => inc}/wifi_napi_p2p.h (100%) rename wifi/frameworks/js/napi/{ => inc}/wifi_napi_utils.h (100%) rename wifi/frameworks/js/napi/{ => src}/wifi_ext_napi_entry.cpp (100%) rename wifi/frameworks/js/napi/{ => src}/wifi_ext_napi_hotspot.cpp (100%) rename wifi/frameworks/js/napi/{ => src}/wifi_napi_device.cpp (100%) rename wifi/frameworks/js/napi/{ => src}/wifi_napi_entry.cpp (100%) rename wifi/frameworks/js/napi/{ => src}/wifi_napi_event.cpp (100%) rename wifi/frameworks/js/napi/{ => src}/wifi_napi_hotspot.cpp (100%) rename wifi/frameworks/js/napi/{ => src}/wifi_napi_p2p.cpp (100%) rename wifi/frameworks/js/napi/{ => src}/wifi_napi_utils.cpp (100%) diff --git a/wifi/frameworks/js/napi/wifi_ext_napi_hotspot.h b/wifi/frameworks/js/napi/inc/wifi_ext_napi_hotspot.h similarity index 100% rename from wifi/frameworks/js/napi/wifi_ext_napi_hotspot.h rename to wifi/frameworks/js/napi/inc/wifi_ext_napi_hotspot.h diff --git a/wifi/frameworks/js/napi/wifi_napi_device.h b/wifi/frameworks/js/napi/inc/wifi_napi_device.h similarity index 100% rename from wifi/frameworks/js/napi/wifi_napi_device.h rename to wifi/frameworks/js/napi/inc/wifi_napi_device.h diff --git a/wifi/frameworks/js/napi/wifi_napi_event.h b/wifi/frameworks/js/napi/inc/wifi_napi_event.h similarity index 100% rename from wifi/frameworks/js/napi/wifi_napi_event.h rename to wifi/frameworks/js/napi/inc/wifi_napi_event.h diff --git a/wifi/frameworks/js/napi/wifi_napi_hotspot.h b/wifi/frameworks/js/napi/inc/wifi_napi_hotspot.h similarity index 100% rename from wifi/frameworks/js/napi/wifi_napi_hotspot.h rename to wifi/frameworks/js/napi/inc/wifi_napi_hotspot.h diff --git a/wifi/frameworks/js/napi/wifi_napi_p2p.h b/wifi/frameworks/js/napi/inc/wifi_napi_p2p.h similarity index 100% rename from wifi/frameworks/js/napi/wifi_napi_p2p.h rename to wifi/frameworks/js/napi/inc/wifi_napi_p2p.h diff --git a/wifi/frameworks/js/napi/wifi_napi_utils.h b/wifi/frameworks/js/napi/inc/wifi_napi_utils.h similarity index 100% rename from wifi/frameworks/js/napi/wifi_napi_utils.h rename to wifi/frameworks/js/napi/inc/wifi_napi_utils.h diff --git a/wifi/frameworks/js/napi/wifi_ext_napi_entry.cpp b/wifi/frameworks/js/napi/src/wifi_ext_napi_entry.cpp similarity index 100% rename from wifi/frameworks/js/napi/wifi_ext_napi_entry.cpp rename to wifi/frameworks/js/napi/src/wifi_ext_napi_entry.cpp diff --git a/wifi/frameworks/js/napi/wifi_ext_napi_hotspot.cpp b/wifi/frameworks/js/napi/src/wifi_ext_napi_hotspot.cpp similarity index 100% rename from wifi/frameworks/js/napi/wifi_ext_napi_hotspot.cpp rename to wifi/frameworks/js/napi/src/wifi_ext_napi_hotspot.cpp diff --git a/wifi/frameworks/js/napi/wifi_napi_device.cpp b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp similarity index 100% rename from wifi/frameworks/js/napi/wifi_napi_device.cpp rename to wifi/frameworks/js/napi/src/wifi_napi_device.cpp diff --git a/wifi/frameworks/js/napi/wifi_napi_entry.cpp b/wifi/frameworks/js/napi/src/wifi_napi_entry.cpp similarity index 100% rename from wifi/frameworks/js/napi/wifi_napi_entry.cpp rename to wifi/frameworks/js/napi/src/wifi_napi_entry.cpp diff --git a/wifi/frameworks/js/napi/wifi_napi_event.cpp b/wifi/frameworks/js/napi/src/wifi_napi_event.cpp similarity index 100% rename from wifi/frameworks/js/napi/wifi_napi_event.cpp rename to wifi/frameworks/js/napi/src/wifi_napi_event.cpp diff --git a/wifi/frameworks/js/napi/wifi_napi_hotspot.cpp b/wifi/frameworks/js/napi/src/wifi_napi_hotspot.cpp similarity index 100% rename from wifi/frameworks/js/napi/wifi_napi_hotspot.cpp rename to wifi/frameworks/js/napi/src/wifi_napi_hotspot.cpp diff --git a/wifi/frameworks/js/napi/wifi_napi_p2p.cpp b/wifi/frameworks/js/napi/src/wifi_napi_p2p.cpp similarity index 100% rename from wifi/frameworks/js/napi/wifi_napi_p2p.cpp rename to wifi/frameworks/js/napi/src/wifi_napi_p2p.cpp diff --git a/wifi/frameworks/js/napi/wifi_napi_utils.cpp b/wifi/frameworks/js/napi/src/wifi_napi_utils.cpp similarity index 100% rename from wifi/frameworks/js/napi/wifi_napi_utils.cpp rename to wifi/frameworks/js/napi/src/wifi_napi_utils.cpp -- Gitee From ae498c611579070f31ef3a4f39f467f6c43f3f1b Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Sun, 15 May 2022 22:07:02 +0800 Subject: [PATCH 105/491] bugfix from master 0515 Signed-off-by: yanxiaotao --- wifi/frameworks/native/c_adapter/{ => inc}/wifi_c_utils.h | 0 wifi/frameworks/native/c_adapter/{ => src}/wifi_c_device.cpp | 0 wifi/frameworks/native/c_adapter/{ => src}/wifi_c_event.cpp | 0 wifi/frameworks/native/c_adapter/{ => src}/wifi_c_hid2d.cpp | 0 wifi/frameworks/native/c_adapter/{ => src}/wifi_c_hotspot.cpp | 0 wifi/frameworks/native/c_adapter/{ => src}/wifi_c_p2p.cpp | 0 wifi/frameworks/native/c_adapter/{ => src}/wifi_c_utils.cpp | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename wifi/frameworks/native/c_adapter/{ => inc}/wifi_c_utils.h (100%) rename wifi/frameworks/native/c_adapter/{ => src}/wifi_c_device.cpp (100%) rename wifi/frameworks/native/c_adapter/{ => src}/wifi_c_event.cpp (100%) rename wifi/frameworks/native/c_adapter/{ => src}/wifi_c_hid2d.cpp (100%) rename wifi/frameworks/native/c_adapter/{ => src}/wifi_c_hotspot.cpp (100%) rename wifi/frameworks/native/c_adapter/{ => src}/wifi_c_p2p.cpp (100%) rename wifi/frameworks/native/c_adapter/{ => src}/wifi_c_utils.cpp (100%) diff --git a/wifi/frameworks/native/c_adapter/wifi_c_utils.h b/wifi/frameworks/native/c_adapter/inc/wifi_c_utils.h similarity index 100% rename from wifi/frameworks/native/c_adapter/wifi_c_utils.h rename to wifi/frameworks/native/c_adapter/inc/wifi_c_utils.h diff --git a/wifi/frameworks/native/c_adapter/wifi_c_device.cpp b/wifi/frameworks/native/c_adapter/src/wifi_c_device.cpp similarity index 100% rename from wifi/frameworks/native/c_adapter/wifi_c_device.cpp rename to wifi/frameworks/native/c_adapter/src/wifi_c_device.cpp diff --git a/wifi/frameworks/native/c_adapter/wifi_c_event.cpp b/wifi/frameworks/native/c_adapter/src/wifi_c_event.cpp similarity index 100% rename from wifi/frameworks/native/c_adapter/wifi_c_event.cpp rename to wifi/frameworks/native/c_adapter/src/wifi_c_event.cpp diff --git a/wifi/frameworks/native/c_adapter/wifi_c_hid2d.cpp b/wifi/frameworks/native/c_adapter/src/wifi_c_hid2d.cpp similarity index 100% rename from wifi/frameworks/native/c_adapter/wifi_c_hid2d.cpp rename to wifi/frameworks/native/c_adapter/src/wifi_c_hid2d.cpp diff --git a/wifi/frameworks/native/c_adapter/wifi_c_hotspot.cpp b/wifi/frameworks/native/c_adapter/src/wifi_c_hotspot.cpp similarity index 100% rename from wifi/frameworks/native/c_adapter/wifi_c_hotspot.cpp rename to wifi/frameworks/native/c_adapter/src/wifi_c_hotspot.cpp diff --git a/wifi/frameworks/native/c_adapter/wifi_c_p2p.cpp b/wifi/frameworks/native/c_adapter/src/wifi_c_p2p.cpp similarity index 100% rename from wifi/frameworks/native/c_adapter/wifi_c_p2p.cpp rename to wifi/frameworks/native/c_adapter/src/wifi_c_p2p.cpp diff --git a/wifi/frameworks/native/c_adapter/wifi_c_utils.cpp b/wifi/frameworks/native/c_adapter/src/wifi_c_utils.cpp similarity index 100% rename from wifi/frameworks/native/c_adapter/wifi_c_utils.cpp rename to wifi/frameworks/native/c_adapter/src/wifi_c_utils.cpp -- Gitee From f6f368dc23bf03d2300ac4cd3dd27ee317d05342 Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Sun, 15 May 2022 23:25:08 +0800 Subject: [PATCH 106/491] bugfix from master 0515 Signed-off-by: yanxiaotao --- dhcp/services/mgr_service/BUILD.gn | 4 +- wifi/BUILD.gn | 2 +- wifi/bundle.json | 10 ++-- wifi/frameworks/BUILD.gn | 8 +-- wifi/frameworks/js/napi/BUILD.gn | 54 +++++++++++-------- wifi/frameworks/native/BUILD.gn | 26 ++++----- .../native/c_adapter/inc/wifi_c_utils.h | 4 +- .../native/c_adapter/src/wifi_c_device.cpp | 10 ++-- .../native/c_adapter/src/wifi_c_event.cpp | 6 +-- .../native/c_adapter/src/wifi_c_hid2d.cpp | 6 +-- .../native/c_adapter/src/wifi_c_hotspot.cpp | 8 +-- .../native/c_adapter/src/wifi_c_p2p.cpp | 4 +- .../wifi_framework/wifi_manage/BUILD.gn | 26 ++++----- .../wifi_manage/idl_client/BUILD.gn | 6 +-- .../wifi_manage/wifi_ap/BUILD.gn | 6 +-- .../wifi_manage/wifi_p2p/BUILD.gn | 6 +-- .../wifi_manage/wifi_scan/BUILD.gn | 2 +- .../wifi_manage/wifi_sta/BUILD.gn | 6 +-- wifi/services/wifi_standard/wifi_hal/BUILD.gn | 2 +- 19 files changed, 102 insertions(+), 94 deletions(-) diff --git a/dhcp/services/mgr_service/BUILD.gn b/dhcp/services/mgr_service/BUILD.gn index 956e760..62e7597 100644 --- a/dhcp/services/mgr_service/BUILD.gn +++ b/dhcp/services/mgr_service/BUILD.gn @@ -33,8 +33,8 @@ local_base_sources = [ local_base_include_dirs = [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", "$DHCP_ROOT_DIR/services/mgr_service/include", - "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/interfaces", - "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/include", + "$DHCP_ROOT_DIR/interfaces/inner_api/interfaces", + "$DHCP_ROOT_DIR/interfaces/inner_api/include", ] if (defined(ohos_lite)) { diff --git a/wifi/BUILD.gn b/wifi/BUILD.gn index 4cd4e1a..e9ca078 100644 --- a/wifi/BUILD.gn +++ b/wifi/BUILD.gn @@ -17,7 +17,7 @@ if (defined(ohos_lite)) { lite_component("wifi") { deps = [ - "$WIFI_ROOT_DIR/interfaces/innerkits:wifi_kits", + "$WIFI_ROOT_DIR/frameworks/frameworks:wifi_kits", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework:wifi_manage", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework:wifi_system_ability", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal:wifi_hal", diff --git a/wifi/bundle.json b/wifi/bundle.json index e16866a..80cce2f 100644 --- a/wifi/bundle.json +++ b/wifi/bundle.json @@ -71,7 +71,7 @@ }, "build": { "sub_component": [ - "//foundation/communication/wifi/wifi/interfaces/innerkits:wifi_kits", + "//foundation/communication/wifi/wifi/frameworks:wifi_kits", "//foundation/communication/wifi/wifi/services/wifi_standard/wifi_framework:wifi_manage", "//foundation/communication/wifi/wifi/services/wifi_standard/wifi_framework:wifi_system_ability", "//foundation/communication/wifi/wifi/services/wifi_standard/wifi_hal:wifi_hal", @@ -80,7 +80,7 @@ "inner_kits": [ { "header" : { - "header_base": "//foundation/communication/wifi/wifi/interfaces/innerkits/native_c", + "header_base": "//foundation/communication/wifi/wifi/interfaces/kits/c", "header_files": [ "wifi_device.h", "wifi_hotspot.h", @@ -88,11 +88,11 @@ "wifi_hid2d.h" ] }, - "name" : "//foundation/communication/wifi/wifi/interfaces/innerkits/native_cpp/wifi_standard:wifi_sdk" + "name" : "//foundation/communication/wifi/wifi/frameworks/native:wifi_sdk" }, { "header" : { - "header_base": "//foundation/communication/wifi/wifi/interfaces/innerkits/native_cpp/wifi_standard/include", + "header_base": "//foundation/communication/wifi/wifi/frameworks/native/include", "header_files": [ "wifi_device.h", "wifi_hotspot.h", @@ -101,7 +101,7 @@ "wifi_hid2d.h" ] }, - "name" : "//foundation/communication/wifi/wifi/interfaces/innerkits/native_cpp/wifi_standard:wifi_sdk" + "name" : "//foundation/communication/wifi/wifi/frameworks/native:wifi_sdk" } ], "test": [ diff --git a/wifi/frameworks/BUILD.gn b/wifi/frameworks/BUILD.gn index 45e67be..74dec42 100644 --- a/wifi/frameworks/BUILD.gn +++ b/wifi/frameworks/BUILD.gn @@ -21,13 +21,13 @@ if (defined(ohos_lite)) { group("wifi_kits") { deps = [ - "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard:wifi_sdk", + "$WIFI_ROOT_DIR/frameworks/native:wifi_sdk", ] if (!defined(ohos_lite)) { deps += [ - "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/napi:wifi", - "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/napi:wifi_native_js", - "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/napi:wifiext", + "$WIFI_ROOT_DIR/frameworks/js/napi:wifi", + "$WIFI_ROOT_DIR/frameworks/js/napi:wifi_native_js", + "$WIFI_ROOT_DIR/frameworks/js/napi:wifiext", ] } } diff --git a/wifi/frameworks/js/napi/BUILD.gn b/wifi/frameworks/js/napi/BUILD.gn index 98b7b27..ec2557a 100644 --- a/wifi/frameworks/js/napi/BUILD.gn +++ b/wifi/frameworks/js/napi/BUILD.gn @@ -21,24 +21,26 @@ ohos_shared_library("wifi") { "//native_engine", "//utils/native/base/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", - "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces", + "$WIFI_ROOT_DIR/frameworks/native/interfaces", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", - "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/include", + "//base/security/access_token/interfaces/innerkits/accesstoken/include", + "$WIFI_ROOT_DIR/frameworks/native/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", "${aakits_path}/appkit/native/ability_runtime/context", "$WIFI_ROOT_DIR/utils/inc", + "$WIFI_ROOT_DIR/frameworks/js/napi/inc", ] sources = [ - "wifi_napi_device.cpp", - "wifi_napi_entry.cpp", - "wifi_napi_event.cpp", - "wifi_napi_hotspot.cpp", - "wifi_napi_p2p.cpp", - "wifi_napi_utils.cpp", + "src/wifi_napi_device.cpp", + "src/wifi_napi_entry.cpp", + "src/wifi_napi_event.cpp", + "src/wifi_napi_hotspot.cpp", + "src/wifi_napi_p2p.cpp", + "src/wifi_napi_utils.cpp", ] deps = [ - "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard:wifi_sdk", + "$WIFI_ROOT_DIR/frameworks/native:wifi_sdk", "$WIFI_ROOT_DIR/utils/src:wifi_utils", "${aakits_path}/appkit:app_context", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", @@ -63,19 +65,20 @@ ohos_shared_library("wifiext") { "//native_engine", "//utils/native/base/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", - "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", - "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/include", + "$WIFI_ROOT_DIR/frameworks/native/include", + "$WIFI_ROOT_DIR/frameworks/native/interfaces", + "$WIFI_ROOT_DIR/frameworks/js/napi/inc", "//foundation/aafwk/standard/frameworks/kits/appkit/native/ability_runtime/context", ] sources = [ - "wifi_ext_napi_entry.cpp", - "wifi_ext_napi_hotspot.cpp", - "wifi_napi_utils.cpp", + "src/wifi_ext_napi_entry.cpp", + "src/wifi_ext_napi_hotspot.cpp", + "src/wifi_napi_utils.cpp", ] deps = [ - "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard:wifi_sdk", + "$WIFI_ROOT_DIR/frameworks/native:wifi_sdk", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//foundation/aafwk/standard/frameworks/kits/appkit:app_context", "//foundation/arkui/napi:ace_napi", @@ -84,6 +87,7 @@ ohos_shared_library("wifiext") { external_deps = [ "bundle_framework:appexecfwk_base", + "access_token:libaccesstoken_sdk", "ipc:ipc_core", ] @@ -99,8 +103,11 @@ ohos_shared_library("wifi_native_js") { "//native_engine", "//utils/native/base/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", - "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces", + "$WIFI_ROOT_DIR/frameworks/js/napi/inc", + "$WIFI_ROOT_DIR/frameworks/native/include", + "$WIFI_ROOT_DIR/frameworks/native/interfaces", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", + "//base/security/access_token/interfaces/innerkits/accesstoken/include", "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", "${aakits_path}/appkit/native/ability_runtime/context", @@ -108,15 +115,15 @@ ohos_shared_library("wifi_native_js") { ] sources = [ - "wifi_napi_device.cpp", - "wifi_napi_entry.cpp", - "wifi_napi_event.cpp", - "wifi_napi_hotspot.cpp", - "wifi_napi_p2p.cpp", - "wifi_napi_utils.cpp", + "src/wifi_napi_device.cpp", + "src/wifi_napi_entry.cpp", + "src/wifi_napi_event.cpp", + "src/wifi_napi_hotspot.cpp", + "src/wifi_napi_p2p.cpp", + "src/wifi_napi_utils.cpp", ] deps = [ - "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard:wifi_sdk", + "$WIFI_ROOT_DIR/frameworks/native:wifi_sdk", "$WIFI_ROOT_DIR/utils/src:wifi_utils", "${aakits_path}/appkit:app_context", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", @@ -128,6 +135,7 @@ ohos_shared_library("wifi_native_js") { external_deps = [ "bundle_framework:appexecfwk_base", + "access_token:libaccesstoken_sdk", "ipc:ipc_core", ] diff --git a/wifi/frameworks/native/BUILD.gn b/wifi/frameworks/native/BUILD.gn index 1dc1ef2..b5d2a1e 100644 --- a/wifi/frameworks/native/BUILD.gn +++ b/wifi/frameworks/native/BUILD.gn @@ -30,14 +30,13 @@ if (defined(ohos_lite)) { ] include_dirs = [ - "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/include", - "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces", + "$WIFI_ROOT_DIR/frameworks/native/include", + "$WIFI_ROOT_DIR/frameworks/native/interfaces", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log/", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", - "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/include", + "$DHCP_ROOT_DIR/interfaces/inner_api/include", "$DHCP_ROOT_DIR/services/mgr_service/include", - "$WIFI_ROOT_DIR/interfaces/innerkits", "$WIFI_ROOT_DIR/utils/inc", "//base/hiviewdfx/hilog_lite/interfaces/native/innerkits", "//foundation/communication/ipc_lite/interfaces/kits", @@ -81,13 +80,14 @@ if (defined(ohos_lite)) { "//foundation/arkui/ace_engine/frameworks/base/utils", "//foundation/arkui/ace_engine/frameworks", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", - "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/include", - "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces", + "$WIFI_ROOT_DIR/frameworks/native/include", + "$WIFI_ROOT_DIR/frameworks/native/interfaces", + "$WIFI_ROOT_DIR/frameworks/native/c_adapter/inc", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log/", "//foundation/distributedschedule/samgr/adapter/interfaces/innerkits/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", - "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/include", + "$DHCP_ROOT_DIR/interfaces/inner_api/include", "$DHCP_ROOT_DIR/services/mgr_service/include", "$WIFI_ROOT_DIR/interfaces/innerkits", "$WIFI_ROOT_DIR/utils/inc", @@ -171,12 +171,12 @@ if (defined(ohos_lite)) { ohos_shared_library("wifi_sdk") { install_enable = true sources = [ - "c_adapter/wifi_c_device.cpp", - "c_adapter/wifi_c_event.cpp", - "c_adapter/wifi_c_hid2d.cpp", - "c_adapter/wifi_c_hotspot.cpp", - "c_adapter/wifi_c_p2p.cpp", - "c_adapter/wifi_c_utils.cpp", + "c_adapter/src/wifi_c_device.cpp", + "c_adapter/src/wifi_c_event.cpp", + "c_adapter/src/wifi_c_hid2d.cpp", + "c_adapter/src/wifi_c_hotspot.cpp", + "c_adapter/src/wifi_c_p2p.cpp", + "c_adapter/src/wifi_c_utils.cpp", "src/wifi_device.cpp", "src/wifi_device_callback_stub.cpp", "src/wifi_hid2d.cpp", diff --git a/wifi/frameworks/native/c_adapter/inc/wifi_c_utils.h b/wifi/frameworks/native/c_adapter/inc/wifi_c_utils.h index dde0e0c..fecfa0e 100644 --- a/wifi/frameworks/native/c_adapter/inc/wifi_c_utils.h +++ b/wifi/frameworks/native/c_adapter/inc/wifi_c_utils.h @@ -18,8 +18,8 @@ #include #include -#include "native_c/wifi_device_config.h" -#include "native_c/wifi_error_code.h" +#include "../../../interfaces/kits/c/wifi_device_config.h" +#include "../../../interfaces/kits/c/wifi_error_code.h" #include "wifi_errcode.h" #ifndef IPV4_ARRAY_LEN diff --git a/wifi/frameworks/native/c_adapter/src/wifi_c_device.cpp b/wifi/frameworks/native/c_adapter/src/wifi_c_device.cpp index bec7cb7..059270b 100644 --- a/wifi/frameworks/native/c_adapter/src/wifi_c_device.cpp +++ b/wifi/frameworks/native/c_adapter/src/wifi_c_device.cpp @@ -13,11 +13,11 @@ * limitations under the License. */ -#include "native_c/wifi_device.h" -#include "native_cpp/wifi_standard/include/wifi_device.h" -#include "native_cpp/wifi_standard/include/wifi_scan.h" -#include "native_c/wifi_scan_info.h" -#include "native_c/wifi_device_config.h" +#include "../../../interfaces/kits/c/wifi_device.h" +#include "../../include/wifi_device.h" +#include "../../include/wifi_scan.h" +#include "../../../interfaces/kits/c/wifi_scan_info.h" +#include "../../../interfaces/kits/c/wifi_device_config.h" #include "wifi_logger.h" #include "wifi_c_utils.h" #include "wifi_common_util.h" diff --git a/wifi/frameworks/native/c_adapter/src/wifi_c_event.cpp b/wifi/frameworks/native/c_adapter/src/wifi_c_event.cpp index 3d51605..3482df4 100644 --- a/wifi/frameworks/native/c_adapter/src/wifi_c_event.cpp +++ b/wifi/frameworks/native/c_adapter/src/wifi_c_event.cpp @@ -13,9 +13,9 @@ * limitations under the License. */ -#include "native_c/wifi_event.h" -#include "native_c/wifi_device.h" -#include "native_c/wifi_scan_info.h" +#include "../../../interfaces/kits/c/wifi_event.h" +#include "../../../interfaces/kits/c/wifi_device.h" +#include "../../../interfaces/kits/c/wifi_scan_info.h" #include "wifi_logger.h" #include "common_event_manager.h" #include diff --git a/wifi/frameworks/native/c_adapter/src/wifi_c_hid2d.cpp b/wifi/frameworks/native/c_adapter/src/wifi_c_hid2d.cpp index 54b1dac..424c843 100644 --- a/wifi/frameworks/native/c_adapter/src/wifi_c_hid2d.cpp +++ b/wifi/frameworks/native/c_adapter/src/wifi_c_hid2d.cpp @@ -13,13 +13,13 @@ * limitations under the License. */ -#include "native_c/wifi_hid2d.h" -#include "native_cpp/wifi_standard/include/wifi_hid2d.h" +#include "../../../interfaces/kits/c/wifi_hid2d.h" +#include "../../include/wifi_hid2d.h" #include "define.h" #include "wifi_logger.h" #include "wifi_c_utils.h" #include "wifi_common_util.h" -#include "native_c/wifi_device.h" +#include "../../../interfaces/kits/c/wifi_device.h" DEFINE_WIFILOG_LABEL("WifiCHid2d"); diff --git a/wifi/frameworks/native/c_adapter/src/wifi_c_hotspot.cpp b/wifi/frameworks/native/c_adapter/src/wifi_c_hotspot.cpp index 62418c6..b8aea46 100644 --- a/wifi/frameworks/native/c_adapter/src/wifi_c_hotspot.cpp +++ b/wifi/frameworks/native/c_adapter/src/wifi_c_hotspot.cpp @@ -13,10 +13,10 @@ * limitations under the License. */ -#include "native_c/wifi_hotspot.h" -#include "native_c/wifi_hotspot_config.h" -#include "native_c/wifi_device_config.h" -#include "native_cpp/wifi_standard/include/wifi_hotspot.h" +#include "../../../interfaces/kits/c/wifi_hotspot.h" +#include "../../../interfaces/kits/c/wifi_hotspot_config.h" +#include "../../../interfaces/kits/c/wifi_device_config.h" +#include "../../include/wifi_hotspot.h" #include "wifi_logger.h" #include "wifi_c_utils.h" #include "ip_tools.h" diff --git a/wifi/frameworks/native/c_adapter/src/wifi_c_p2p.cpp b/wifi/frameworks/native/c_adapter/src/wifi_c_p2p.cpp index 728b674..c244911 100644 --- a/wifi/frameworks/native/c_adapter/src/wifi_c_p2p.cpp +++ b/wifi/frameworks/native/c_adapter/src/wifi_c_p2p.cpp @@ -13,9 +13,9 @@ * limitations under the License. */ -#include "native_c/wifi_p2p.h" +#include "../../../interfaces/kits/c/wifi_p2p.h" #include "wifi_logger.h" -#include "native_cpp/wifi_standard/include/wifi_p2p.h" +#include "../../../frameworks/native/include/wifi_p2p.h" #include "wifi_c_utils.h" #include "wifi_common_util.h" diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn index e3568b7..2897311 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn @@ -56,8 +56,8 @@ if (defined(ohos_lite)) { ] include_dirs = [ - "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/include", - "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces", + "$WIFI_ROOT_DIR/frameworks/native/include", + "$WIFI_ROOT_DIR/frameworks/native/interfaces", "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", @@ -71,8 +71,8 @@ if (defined(ohos_lite)) { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan", "$DHCP_ROOT_DIR/services/mgr_service/include", - "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/include", - "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/interfaces", + "$DHCP_ROOT_DIR/interfaces/inner_api/include", + "$DHCP_ROOT_DIR/interfaces/inner_api/interfaces", "$WIFI_ROOT_DIR/utils/inc", "//base/hiviewdfx/hilog_lite/interfaces/native/innerkits", "//foundation/communication/ipc_lite/interfaces/kits", @@ -107,8 +107,8 @@ if (defined(ohos_lite)) { ] include_dirs = [ - "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/include", - "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces", + "$WIFI_ROOT_DIR/frameworks/native/include", + "$WIFI_ROOT_DIR/frameworks/native/interfaces", "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", @@ -122,8 +122,8 @@ if (defined(ohos_lite)) { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan", "$DHCP_ROOT_DIR/services/mgr_service/include", - "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/include", - "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/interfaces", + "$DHCP_ROOT_DIR/interfaces/inner_api/include", + "$DHCP_ROOT_DIR/interfaces/inner_api/interfaces", "$WIFI_ROOT_DIR/utils/inc", "//base/hiviewdfx/hilog_lite/interfaces/native/innerkits", "//foundation/communication/ipc_lite/interfaces/kits", @@ -157,7 +157,7 @@ if (defined(ohos_lite)) { "//foundation/arkui/ace_engine/frameworks/base/utils", "//foundation/arkui/ace_engine/frameworks", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk/", - "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces", + "$WIFI_ROOT_DIR/frameworks/native/interfaces", "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", @@ -173,8 +173,8 @@ if (defined(ohos_lite)) { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p", "$DHCP_ROOT_DIR/services/mgr_service/include", - "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/include", - "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/interfaces", + "$DHCP_ROOT_DIR/interfaces/inner_api/include", + "$DHCP_ROOT_DIR/interfaces/inner_api/interfaces", "$WIFI_ROOT_DIR/utils/inc", "//foundation/appexecfwk/adapter/interfaces/innerkits/appexecfwk_base/include", "${aainnerkits_path}/base/include", @@ -271,8 +271,8 @@ if (defined(ohos_lite)) { ohos_source_set("wifi_p2p_service_impl") { part_name = "wifi" sources = [ - "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hid2d_msg.cpp", - "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_msg.cpp", + "$WIFI_ROOT_DIR/frameworks/native/src/wifi_hid2d_msg.cpp", + "$WIFI_ROOT_DIR/frameworks/native/src/wifi_p2p_msg.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp", "wifi_hid2d_cfg.cpp", "wifi_hid2d_service_utils.cpp", diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/BUILD.gn index 42ad8b7..6024f16 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/BUILD.gn @@ -22,7 +22,7 @@ if (defined(ohos_lite)) { config("wifi_fw_common_header") { include_dirs = [ "idl_interface", - "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces", + "$WIFI_ROOT_DIR/frameworks/native/interfaces", "$WIFI_ROOT_DIR/services/wifi_standard/sdk/include", "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", @@ -71,8 +71,8 @@ net_helper_sources = [ ] idl_client_sources = [ - "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hid2d_msg.cpp", - "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_msg.cpp", + "$WIFI_ROOT_DIR/frameworks/native/src/wifi_hid2d_msg.cpp", + "$WIFI_ROOT_DIR/frameworks/native/src/wifi_p2p_msg.cpp", "idl_interface/i_wifi.c", "idl_interface/i_wifi_chip.c", "idl_interface/i_wifi_hotspot_iface.c", diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn index 7be2357..79157c4 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn @@ -40,7 +40,7 @@ ohos_shared_library("wifi_ap_service") { "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/interface", "//utils/native/base/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", - "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces", + "$WIFI_ROOT_DIR/frameworks/native/interfaces", "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", @@ -54,8 +54,8 @@ ohos_shared_library("wifi_ap_service") { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface", "$DHCP_ROOT_DIR/services/mgr_service/include", - "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/include", - "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/interfaces", + "$DHCP_ROOT_DIR/interfaces/inner_api/include", + "$DHCP_ROOT_DIR/interfaces/inner_api/interfaces", "$WIFI_ROOT_DIR/utils/inc", ] diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/BUILD.gn index 945fc1e..18701f1 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/BUILD.gn @@ -67,7 +67,7 @@ ohos_shared_library("wifi_p2p_service") { "./", "//utils/native/base/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", - "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces", + "$WIFI_ROOT_DIR/frameworks/native/interfaces", "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", @@ -81,8 +81,8 @@ ohos_shared_library("wifi_p2p_service") { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface", "$DHCP_ROOT_DIR/services/mgr_service/include", - "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/include", - "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/interfaces", + "$DHCP_ROOT_DIR/interfaces/inner_api/include", + "$DHCP_ROOT_DIR/interfaces/inner_api/interfaces", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta", ] diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn index a9fe9dc..4cf3673 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn @@ -33,7 +33,7 @@ local_base_sources = [ ] local_base_include_dirs = [ - "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces", + "$WIFI_ROOT_DIR/frameworks/native/interfaces", "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/interface", "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn index 6607b3d..98f4321 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn @@ -40,7 +40,7 @@ local_base_sources = [ local_base_include_dirs = [ "$WIFI_ROOT_DIR/services/wifi_standard/sdk/include", - "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces", + "$WIFI_ROOT_DIR/frameworks/native/interfaces", "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/interface", "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", @@ -55,8 +55,8 @@ local_base_include_dirs = [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/net_conf", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta", "$DHCP_ROOT_DIR/services/mgr_service/include", - "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/include", - "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/interfaces", + "$DHCP_ROOT_DIR/interfaces/inner_api/include", + "$DHCP_ROOT_DIR/interfaces/inner_api/interfaces", "$WIFI_ROOT_DIR/utils/inc", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage", ] diff --git a/wifi/services/wifi_standard/wifi_hal/BUILD.gn b/wifi/services/wifi_standard/wifi_hal/BUILD.gn index 2f85f78..411a9b6 100644 --- a/wifi/services/wifi_standard/wifi_hal/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_hal/BUILD.gn @@ -48,7 +48,7 @@ local_base_sources = [ ] local_base_include_dirs = [ - "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces", + "$WIFI_ROOT_DIR/frameworks/native/interfaces", "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/common", -- Gitee From d00c8eda5ea3b7cc7d29980e52f49c2493b7eed9 Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Mon, 16 May 2022 09:47:56 +0800 Subject: [PATCH 107/491] bugfix from master 0516 Signed-off-by: yanxiaotao --- wifi/frameworks/js/napi/BUILD.gn | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/wifi/frameworks/js/napi/BUILD.gn b/wifi/frameworks/js/napi/BUILD.gn index ec2557a..8278822 100644 --- a/wifi/frameworks/js/napi/BUILD.gn +++ b/wifi/frameworks/js/napi/BUILD.gn @@ -66,7 +66,7 @@ ohos_shared_library("wifiext") { "//utils/native/base/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", - "$WIFI_ROOT_DIR/frameworks/native/include", + "$WIFI_ROOT_DIR/frameworks/native/include", "$WIFI_ROOT_DIR/frameworks/native/interfaces", "$WIFI_ROOT_DIR/frameworks/js/napi/inc", "//foundation/aafwk/standard/frameworks/kits/appkit/native/ability_runtime/context", @@ -108,7 +108,6 @@ ohos_shared_library("wifi_native_js") { "$WIFI_ROOT_DIR/frameworks/native/interfaces", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", "//base/security/access_token/interfaces/innerkits/accesstoken/include", - "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", "${aakits_path}/appkit/native/ability_runtime/context", "$WIFI_ROOT_DIR/utils/inc", -- Gitee From bc8ace3f70cd58e85fceb49780d7137b2768c1cf Mon Sep 17 00:00:00 2001 From: dy_study Date: Mon, 16 May 2022 11:10:41 +0800 Subject: [PATCH 108/491] =?UTF-8?q?IssueNo:#I57IWN=20Description:ability?= =?UTF-8?q?=5Fbase=E7=9B=AE=E5=BD=95=E6=95=B4=E6=94=B9=E5=8F=8A=E5=91=A8?= =?UTF-8?q?=E8=BE=B9=E5=AD=90=E7=B3=BB=E7=BB=9F=E4=BE=9D=E8=B5=96=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=8C=96=20Sig:SIG=5FApplicationFramework=20Feature?= =?UTF-8?q?=20or=20Bugfix:Feature=20Binary=20Source:=20No?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: dy_study Change-Id: Ib5c1cb29b707943f0e5d3d1fb401c6e52a8910da --- wifi/interfaces/innerkits/native_cpp/wifi_standard/BUILD.gn | 2 +- .../services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn | 1 - .../wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn | 3 --- .../wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn | 2 +- wifi/utils/src/BUILD.gn | 2 +- 5 files changed, 3 insertions(+), 7 deletions(-) diff --git a/wifi/interfaces/innerkits/native_cpp/wifi_standard/BUILD.gn b/wifi/interfaces/innerkits/native_cpp/wifi_standard/BUILD.gn index 1dc1ef2..01959fc 100644 --- a/wifi/interfaces/innerkits/native_cpp/wifi_standard/BUILD.gn +++ b/wifi/interfaces/innerkits/native_cpp/wifi_standard/BUILD.gn @@ -197,7 +197,6 @@ if (defined(ohos_lite)) { ":wifi_scan_proxy_impl", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", "$WIFI_ROOT_DIR/utils/src:wifi_utils", - "${aainnerkits_path}/want:want", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/bounds_checking_function:libsec_static", @@ -205,6 +204,7 @@ if (defined(ohos_lite)) { ] external_deps = [ + "ability_base:want", "common_event_service:cesfwk_innerkits", "ipc:ipc_core", ] diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn index e3568b7..0fb1d7f 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn @@ -177,7 +177,6 @@ if (defined(ohos_lite)) { "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/interfaces", "$WIFI_ROOT_DIR/utils/inc", "//foundation/appexecfwk/adapter/interfaces/innerkits/appexecfwk_base/include", - "${aainnerkits_path}/base/include", "//base/security/access_token/interfaces/innerkits/accesstoken/include", "//foundation/communication/netmanager_base/services/netmanagernative/include/netsys", ] diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn index 0535e84..e31e9da 100644 --- a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn +++ b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn @@ -70,10 +70,7 @@ ohos_unittest("manager_unittest") { "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", "//base/notification/common_event_service/cesfwk/innerkits/include", "//base/notification/common_event_service/cesfwk/kits/native/include", - "${aainnerkits_path}/want/include/ohos/aafwk/content", - "${aainnerkits_path}/want/include", "//foundation/appexecfwk/adapter/interfaces/innerkits/appexecfwk_base/include", - "${aainnerkits_path}/base/include", "//base/security/access_token/interfaces/innerkits/accesstoken/include", "//foundation/communication/netmanager_base/services/netmanagernative/include/netsys", "$WIFI_ROOT_DIR/utils/inc", diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn index 0db4fdd..4a4a411 100644 --- a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn +++ b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn @@ -101,7 +101,6 @@ ohos_unittest("wifi_sta_unittest") { "//foundation/arkui/ace_engine/frameworks/base/utils", "//foundation/arkui/ace_engine/frameworks", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk/", - "${aainnerkits_path}/want/include/ohos/aafwk/content/", "//foundation/aafwk/aafwk_lite/interfaces/kits/want_lite/", "$WIFI_ROOT_DIR/utils/inc", ] @@ -115,6 +114,7 @@ ohos_unittest("wifi_sta_unittest") { "//utils/native/base:utils", ] external_deps = [ + "ability_base:want", "hiviewdfx_hilog_native:libhilog", "netmanager_base:net_conn_manager_if", ] diff --git a/wifi/utils/src/BUILD.gn b/wifi/utils/src/BUILD.gn index a4acc64..882ee49 100644 --- a/wifi/utils/src/BUILD.gn +++ b/wifi/utils/src/BUILD.gn @@ -59,12 +59,12 @@ if (defined(ohos_lite)) { deps = [ "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//utils/native/base:utils", ] external_deps = [ + "ability_base:want", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "hisysevent_native:libhisysevent", -- Gitee From 08b453547961f4655bad32b2d62fd7ba08c5e260 Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Tue, 17 May 2022 14:57:36 +0800 Subject: [PATCH 109/491] bugfix from master 0517 Signed-off-by: yanxiaotao --- wifi/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/BUILD.gn b/wifi/BUILD.gn index e9ca078..4d8179a 100644 --- a/wifi/BUILD.gn +++ b/wifi/BUILD.gn @@ -17,7 +17,7 @@ if (defined(ohos_lite)) { lite_component("wifi") { deps = [ - "$WIFI_ROOT_DIR/frameworks/frameworks:wifi_kits", + "$WIFI_ROOT_DIR/frameworks:wifi_kits", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework:wifi_manage", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework:wifi_system_ability", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal:wifi_hal", -- Gitee From 239ce894f68f6c11bb38e6afa783fb9ed6ab966c Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Tue, 17 May 2022 18:06:12 +0800 Subject: [PATCH 110/491] bugfix from master 0517 Signed-off-by: yanxiaotao --- wifi/frameworks/native/BUILD.gn | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/wifi/frameworks/native/BUILD.gn b/wifi/frameworks/native/BUILD.gn index b5d2a1e..6745e5b 100644 --- a/wifi/frameworks/native/BUILD.gn +++ b/wifi/frameworks/native/BUILD.gn @@ -17,8 +17,8 @@ if (defined(ohos_lite)) { shared_library("wifi_sdk") { sources = [ - "c_adapter/wifi_c_device.cpp", - "c_adapter/wifi_c_utils.cpp", + "c_adapter/src/wifi_c_device.cpp", + "c_adapter/src/wifi_c_utils.cpp", "src/wifi_device.cpp", "src/wifi_device_callback_stub_lite.cpp", "src/wifi_device_impl.cpp", @@ -32,6 +32,7 @@ if (defined(ohos_lite)) { include_dirs = [ "$WIFI_ROOT_DIR/frameworks/native/include", "$WIFI_ROOT_DIR/frameworks/native/interfaces", + "$WIFI_ROOT_DIR/frameworks/native/c_adapter/inc", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log/", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include", -- Gitee From f138ac08d952b1edb701dc6f83eddb932179e18e Mon Sep 17 00:00:00 2001 From: lujunxin Date: Wed, 18 May 2022 17:27:16 +0800 Subject: [PATCH 111/491] add wifi test code for L1 Signed-off-by: lujunxin --- wifi/BUILD.gn | 1 + wifi/test/wifi_client/BUILD.gn | 57 ++ wifi/test/wifi_client/wifi_client.cpp | 813 ++++++++++++++++++++++++++ 3 files changed, 871 insertions(+) create mode 100644 wifi/test/wifi_client/BUILD.gn create mode 100644 wifi/test/wifi_client/wifi_client.cpp diff --git a/wifi/BUILD.gn b/wifi/BUILD.gn index 4d8179a..77f5a1d 100644 --- a/wifi/BUILD.gn +++ b/wifi/BUILD.gn @@ -21,6 +21,7 @@ if (defined(ohos_lite)) { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework:wifi_manage", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework:wifi_system_ability", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal:wifi_hal", + "$WIFI_ROOT_DIR/test/wifi_client:wifi_client", "$WIFI_ROOT_DIR/utils/src:wifi_utils", ] features = [] diff --git a/wifi/test/wifi_client/BUILD.gn b/wifi/test/wifi_client/BUILD.gn new file mode 100644 index 0000000..51de659 --- /dev/null +++ b/wifi/test/wifi_client/BUILD.gn @@ -0,0 +1,57 @@ +# Copyright (C) 2022 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if (defined(ohos_lite)) { + import("//build/lite/config/component/lite_component.gni") + import("//foundation/communication/wifi/wifi/wifi_lite.gni") +} else { + import("//build/ohos.gni") + import("//foundation/communication/wifi/wifi/wifi.gni") +} + +local_base_sources = [ "$WIFI_ROOT_DIR/test/wifi_client/wifi_client.cpp" ] + +local_base_include_dirs = [ + "$WIFI_ROOT_DIR/frameworks/native/include", + "$WIFI_ROOT_DIR/frameworks/native/interfaces", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", +] + +if (defined(ohos_lite)) { + executable("wifi_client") { + sources = local_base_sources + include_dirs = local_base_include_dirs + include_dirs += [ "//third_party/bounds_checking_function/include" ] + deps = [ + "$WIFI_ROOT_DIR/frameworks/native:wifi_sdk", + "//third_party/bounds_checking_function:libsec_shared", + ] + defines = [ "OHOS_ARCH_LITE" ] + } +} else { + ohos_executable("wifi_client") { + install_enable = true + sources = local_base_sources + include_dirs = local_base_include_dirs + include_dirs += [ + "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", + "//utils/native/base/include", + ] + deps = [ + "$WIFI_ROOT_DIR/frameworks/native:wifi_sdk", + "//utils/native/base:utils", + ] + part_name = "wifi" + subsystem_name = "communication" + } +} diff --git a/wifi/test/wifi_client/wifi_client.cpp b/wifi/test/wifi_client/wifi_client.cpp new file mode 100644 index 0000000..fd9b1c7 --- /dev/null +++ b/wifi/test/wifi_client/wifi_client.cpp @@ -0,0 +1,813 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include +#include +#include +#include +#include + +#include "wifi_device.h" +#include "wifi_scan.h" + +#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0])) + +using namespace std; + +namespace OHOS { +namespace Wifi { +std::unique_ptr ptrWifiDevice = WifiDevice::GetInstance(WIFI_DEVICE_ABILITY_ID); +std::unique_ptr ptrWifiScan = WifiScan::GetInstance(WIFI_SCAN_ABILITY_ID); + +const int MAX_ARGS = 16; +const int BAND_2GHZ = 1; +const int BAND_5GHZ = 2; +const int CMD_IDX = 1; +const int ARG_IDX = 2; +const int MIN_WPA_LENGTH = 8; + +struct sta_cli_cmd { + const char *cmd; + void (*handler)(int argc, const char* argv[]); + const char *usage; +}; + +static void Log(const char *fmt, ...) +{ + va_list list; + va_start(list, fmt); + (void)vfprintf(stdout, fmt, list); + va_end(list); + fflush(stdout); +} + +#define Logd(fmt, ...) Log(fmt"\n", ##__VA_ARGS__) + +static void PrintLinkedInfo(const WifiLinkedInfo &linkedInfo) +{ + std::stringstream ss; + ss << "Linked info details:" << endl; + ss << " ssid:" << linkedInfo.ssid << endl; + ss << " bssid:" << linkedInfo.bssid << endl; + ss << " rssi:" << linkedInfo.rssi << endl; + ss << " band:" << linkedInfo.band << endl; + ss << " frequency:" << linkedInfo.frequency << endl; + ss << " linkSpeed:" << linkedInfo.linkSpeed << endl; + ss << " macAddress:" << linkedInfo.macAddress << endl; + ss << " ipAddress:" << linkedInfo.ipAddress << endl; + ss << " connState:" << static_cast(linkedInfo.connState) << endl; + ss << " ifHiddenSSID:" << linkedInfo.ifHiddenSSID << endl; + Logd("%s", ss.str().c_str()); +} + +static void PrintIpInfo(IpInfo &ipInfo) +{ + std::stringstream ss; + ss << "IP information:" << endl; + ss << " ipAddress:" << ipInfo.ipAddress << endl; + ss << " gateway:" << ipInfo.gateway << endl; + ss << " netmask:" << ipInfo.netmask << endl; + ss << " primaryDns:" << ipInfo.primaryDns << endl; + ss << " secondDns:" << ipInfo.secondDns << endl; + Logd("%s", ss.str().c_str()); +} + +static void PrintfDeviceConfigs(vector &configs) +{ + int idx = 0; + std::stringstream ss; + for (WifiDeviceConfig &config : configs) { + ss << "No. " << idx << " network id:" << config.networkId << endl; + ss << " ssid:" << config.ssid << endl; + ss << " bssid:" << config.bssid << endl; + ss << " keyMgmt:" << config.keyMgmt << endl; + ss << " status:" << config.status << endl; + idx++; + } + Logd("%s", ss.str().c_str()); +} + +static void PrintfScanResults(vector &scanInfos) +{ + Logd("%s total size:%u", __func__, scanInfos.size()); + int idx = 0; + std::stringstream ss; + for (WifiScanInfo &scanInfo : scanInfos) { + ss << "No. " << idx << " ssid:" << scanInfo.ssid << endl; + ss << " bssid:" << scanInfo.bssid << endl; + ss << " frequency:" << scanInfo.frequency << endl; + ss << " rssi:" << scanInfo.rssi << endl; + ss << " securityType:" << static_cast(scanInfo.securityType) << endl; + idx++; + } + Logd("%s", ss.str().c_str()); +} + +class WifiDeviceEventCallback : public IWifiDeviceCallBack { +public: + WifiDeviceEventCallback() + { + } + + virtual ~WifiDeviceEventCallback() + { + } + + void OnWifiStateChanged(int state) override + { + Logd("receive %s event, state:%d", __func__, state); + } + + void OnWifiConnectionChanged(int state, const WifiLinkedInfo &info) override + { + Logd("receive %s event, state:%d", __func__, state); + PrintLinkedInfo(info); + } + + void OnWifiRssiChanged(int rssi) override + { + Logd("receive %s event, rssi:%d", __func__, rssi); + } + + void OnWifiWpsStateChanged(int state, const std::string &pinCode) override + { + Logd("receive %s event, state:%d, pinCode:%s", __func__, state, pinCode.c_str()); + } + + void OnStreamChanged(int direction) override + { + Logd("receive %s event, direction:%d", __func__, direction); + } + +#ifndef OHOS_ARCH_LITE + OHOS::sptr AsObject() override + { + return nullptr; + } +#endif +}; + +class WifiScanEventCallback : public IWifiScanCallback { +public: + WifiScanEventCallback() + { + } + + virtual ~WifiScanEventCallback() + { + } + + void OnWifiScanStateChanged(int state) override + { + Logd("receive %s event, state:%d", __func__, state); + } + +#ifndef OHOS_ARCH_LITE + OHOS::sptr AsObject() override + { + return nullptr; + } +#endif +}; + +#ifdef OHOS_ARCH_LITE +static std::shared_ptr deviceCallback = std::make_shared(); +static std::shared_ptr scanCallback = std::make_shared(); +#else +static sptr deviceCallback = + sptr(new (std::nothrow)WifiDeviceEventCallback()); +static sptr scanCallback = + sptr(new (std::nothrow)WifiScanEventCallback()); +#endif + +static void RegisterDeviceEvents(void) +{ + if (ptrWifiDevice != nullptr) { + ErrCode ret = ptrWifiDevice->RegisterCallBack(deviceCallback); + if (ret == WIFI_OPT_SUCCESS) { + Logd("%s success", __func__); + } else { + Logd("%s failed", __func__); + } + } +} + +static void RegisterScanEvents(void) +{ + if (ptrWifiScan != nullptr) { + ErrCode ret = ptrWifiScan->RegisterCallBack(scanCallback); + if (ret == WIFI_OPT_SUCCESS) { + Logd("%s success", __func__); + } else { + Logd("%s failed", __func__); + } + } +} + +static void HelpCommand(const char *command); +static bool GetNetworkId(int argc, const char *argv[], int &nid) +{ + nid = -1; + for (int i = ARG_IDX; i < argc; i++) { + if (strncmp(argv[i], "nid=", strlen("nid=")) == 0) { + (void)sscanf_s(argv[i], "nid=%d", &nid); + } + } + if (nid < 0) { + HelpCommand(argv[CMD_IDX]); + return false; + } + return true; +} + +static bool GetDeviceConfig(int argc, const char *argv[], WifiDeviceConfig &config) +{ + string keyMgmt = ""; + config.ssid = ""; + config.preSharedKey = ""; + + for (int i = ARG_IDX; i < argc; i++) { + if (strncmp(argv[i], "ssid=", strlen("ssid=")) == 0) { + config.ssid = argv[i] + strlen("ssid="); + } else if (strncmp(argv[i], "pwd=", strlen("pwd=")) == 0) { + config.preSharedKey = argv[i] + strlen("pwd="); + } else if (strncmp(argv[i], "key_mgmt=", strlen("key_mgmt=")) == 0) { + keyMgmt = argv[i] + strlen("key_mgmt="); + } + } + if (config.ssid == "" || keyMgmt == "") { + HelpCommand(argv[CMD_IDX]); + return false; + } + if (keyMgmt != "open" && keyMgmt != "wpa" && keyMgmt != "wpa2") { + Logd("key_mgmt should be one of {open, wpa, wpa2}"); + return false; + } + if (keyMgmt != "open" && config.preSharedKey.length() < MIN_WPA_LENGTH) { + Logd("password length should be >= %d", MIN_WPA_LENGTH); + return false; + } + if (keyMgmt == "open") { + config.keyMgmt = "NONE"; + } else { + config.keyMgmt = "WPA-PSK"; + } + return true; +} + +static void HandleEnable(int argc, const char* argv[]) +{ + Logd("enter command handler:%s", argv[CMD_IDX]); + if (ptrWifiDevice != nullptr) { + ErrCode ret = ptrWifiDevice->EnableWifi(); + if (ret == WIFI_OPT_SUCCESS) { + Logd("%s success", __func__); + } else { + Logd("%s failed", __func__); + } + } +} + +static void HandleDisable(int argc, const char* argv[]) +{ + Logd("enter command handler:%s", argv[CMD_IDX]); + if (ptrWifiDevice != nullptr) { + ErrCode ret = ptrWifiDevice->DisableWifi(); + if (ret == WIFI_OPT_SUCCESS) { + Logd("%s success", __func__); + } else { + Logd("%s failed", __func__); + } + } +} + +static void HandleScan(int argc, const char* argv[]) +{ + Logd("enter command handler:%s", argv[CMD_IDX]); + if (ptrWifiScan != nullptr) { + ErrCode ret = ptrWifiScan->Scan(); + if (ret == WIFI_OPT_SUCCESS) { + Logd("%s success", __func__); + } else { + Logd("%s failed", __func__); + } + } +} + +static void HandleDisconnect(int argc, const char* argv[]) +{ + Logd("enter command handler:%s", argv[CMD_IDX]); + if (ptrWifiDevice != nullptr) { + ErrCode ret = ptrWifiDevice->Disconnect(); + if (ret == WIFI_OPT_SUCCESS) { + Logd("%s success", __func__); + } else { + Logd("%s failed", __func__); + } + } +} + +static void HandleGetStatus(int argc, const char* argv[]) +{ + Logd("enter command handler:%s", argv[CMD_IDX]); + if (ptrWifiDevice == nullptr) { + return; + } + + bool active; + ErrCode ret = ptrWifiDevice->IsWifiActive(active); + if (ret != WIFI_OPT_SUCCESS) { + Logd("IsWifiActive failed"); + return; + } + if (!active) { + Logd("wifi is disabled"); + return; + } + Logd("wifi is enabled"); +#ifndef OHOS_ARCH_LITE + bool connected = ptrWifiDevice->IsConnected(); + if (!connected) { + Logd("wifi is disconnected"); + return; + } + Logd("wifi is connected"); +#endif + WifiLinkedInfo linkedInfo; + ret = ptrWifiDevice->GetLinkedInfo(linkedInfo); + if (ret != WIFI_OPT_SUCCESS) { + Logd("GetLinkedInfo failed"); + return; + } + PrintLinkedInfo(linkedInfo); + if (linkedInfo.connState != ConnState::CONNECTED) { + return; + } + + IpInfo ipInfo; + ret = ptrWifiDevice->GetIpInfo(ipInfo); + if (ret != WIFI_OPT_SUCCESS) { + Logd("GetIpInfo failed"); + return; + } + PrintIpInfo(ipInfo); +} + +static void HandleGetConfigList(int argc, const char* argv[]) +{ + Logd("enter command handler:%s", argv[CMD_IDX]); + if (ptrWifiDevice != nullptr) { + vector configs; + ErrCode ret = ptrWifiDevice->GetDeviceConfigs(configs); + if (ret == WIFI_OPT_SUCCESS) { + Logd("%s success", __func__); + PrintfDeviceConfigs(configs); + } else { + Logd("%s failed", __func__); + } + } +} + +static void HandleGetScanResults(int argc, const char* argv[]) +{ + Logd("enter command handler:%s", argv[CMD_IDX]); + if (ptrWifiScan != nullptr) { + vector result; + ErrCode ret = ptrWifiScan->GetScanInfoList(result); + if (ret == WIFI_OPT_SUCCESS) { + Logd("%s success", __func__); + PrintfScanResults(result); + } else { + Logd("%s failed", __func__); + } + } +} + +static void HandleUpdateConfig(int argc, const char* argv[]) +{ + Logd("enter command handler:%s", argv[CMD_IDX]); + int nid; + WifiDeviceConfig config; + if (!GetDeviceConfig(argc, argv, config) || !GetNetworkId(argc, argv, nid)) { + return; + } + if (ptrWifiDevice != nullptr) { + int updatedId; + ErrCode ret = ptrWifiDevice->UpdateDeviceConfig(config, updatedId); + if (ret == WIFI_OPT_SUCCESS) { + Logd("%s success, nid=%d", __func__, updatedId); + } else { + Logd("%s failed", __func__); + } + } +} + +static void HandleAddConfig(int argc, const char* argv[]) +{ + Logd("enter command handler:%s", argv[CMD_IDX]); + WifiDeviceConfig config; + if (!GetDeviceConfig(argc, argv, config)) { + return; + } + if (ptrWifiDevice != nullptr) { + int nid; + ErrCode ret = ptrWifiDevice->AddDeviceConfig(config, nid); + if (ret == WIFI_OPT_SUCCESS) { + Logd("%s success, nid=%d", __func__, nid); + } else { + Logd("%s failed", __func__); + } + } +} + +static void HandleRemoveConfigs(int argc, const char* argv[]) +{ + Logd("enter command handler:%s", argv[CMD_IDX]); + if (ptrWifiDevice != nullptr) { + ErrCode ret = ptrWifiDevice->RemoveAllDevice(); + if (ret == WIFI_OPT_SUCCESS) { + Logd("%s success", __func__); + } else { + Logd("%s failed", __func__); + } + } +} + +static void HandleRemoveConfig(int argc, const char* argv[]) +{ + Logd("enter command handler:%s", argv[CMD_IDX]); + int nid; + if (!GetNetworkId(argc, argv, nid)) { + return; + } + if (ptrWifiDevice != nullptr) { + ErrCode ret = ptrWifiDevice->RemoveDevice(nid); + if (ret == WIFI_OPT_SUCCESS) { + Logd("%s success, nid=%d", __func__, nid); + } else { + Logd("%s failed", __func__); + } + } +} + +static void HandleConnectNetwork(int argc, const char* argv[]) +{ + Logd("enter command handler:%s", argv[CMD_IDX]); + int nid; + if (!GetNetworkId(argc, argv, nid)) { + return; + } + if (ptrWifiDevice != nullptr) { + ErrCode ret = ptrWifiDevice->ConnectToNetwork(nid); + if (ret == WIFI_OPT_SUCCESS) { + Logd("%s success, nid=%d", __func__, nid); + } else { + Logd("%s failed", __func__); + } + } +} + +static void HandleConnectDevice(int argc, const char* argv[]) +{ + Logd("enter command handler:%s", argv[CMD_IDX]); + WifiDeviceConfig config; + if (!GetDeviceConfig(argc, argv, config)) { + return; + } + if (ptrWifiDevice != nullptr) { + ErrCode ret = ptrWifiDevice->ConnectToDevice(config); + if (ret == WIFI_OPT_SUCCESS) { + Logd("%s success", __func__); + } else { + Logd("%s failed", __func__); + } + } +} + +static void HandleGetWifiState(int argc, const char* argv[]) +{ + Logd("enter command handler:%s", argv[CMD_IDX]); + if (ptrWifiDevice != nullptr) { + int state; + ErrCode ret = ptrWifiDevice->GetWifiState(state); + if (ret == WIFI_OPT_SUCCESS) { + Logd("%s success, wifi state:%d", __func__, state); + } else { + Logd("%s failed", __func__); + } + } +} + +static void HandleGetCountry(int argc, const char* argv[]) +{ + Logd("enter command handler:%s", argv[CMD_IDX]); + if (ptrWifiDevice != nullptr) { + string countryCode; + ErrCode ret = ptrWifiDevice->GetCountryCode(countryCode); + if (ret == WIFI_OPT_SUCCESS) { + Logd("%s success, countryCode: %s", __func__, countryCode.c_str()); + } else { + Logd("%s failed", __func__); + } + } +} + +static void HandleSetCountry(int argc, const char* argv[]) +{ + Logd("enter command handler:%s", argv[CMD_IDX]); + string code = ""; + for (int i = ARG_IDX; i < argc; i++) { + if (strncmp(argv[i], "code=", strlen("code=")) == 0) { + code = argv[i] + strlen("code="); + } + } + if (code == "") { + HelpCommand(argv[CMD_IDX]); + return; + } + if (ptrWifiDevice != nullptr) { + ErrCode ret = ptrWifiDevice->SetCountryCode(code); + if (ret == WIFI_OPT_SUCCESS) { + Logd("%s success, code=%s", __func__, code.c_str()); + } else { + Logd("%s failed", __func__); + } + } +} + +static void HandleGetSignalLevel(int argc, const char* argv[]) +{ + Logd("enter command handler:%s", argv[CMD_IDX]); + int rssi = 0; + string band = ""; + for (int i = ARG_IDX; i < argc; i++) { + if (strncmp(argv[i], "rssi=", strlen("rssi=")) == 0) { + (void)sscanf_s(argv[i], "rssi=%d", &rssi); + } else if (strncmp(argv[i], "band=", strlen("band=")) == 0) { + band = argv[i] + strlen("band="); + } + } + if (rssi >= 0 || (band != "2g" && band != "5g")) { + HelpCommand(argv[CMD_IDX]); + return; + } + if (ptrWifiDevice != nullptr) { + int level; + int bandType = (band == "2g" ? BAND_2GHZ : BAND_5GHZ); + ErrCode ret = ptrWifiDevice->GetSignalLevel(rssi, bandType, level); + if (ret == WIFI_OPT_SUCCESS) { + Logd("%s success, level=%d", __func__, level); + } else { + Logd("%s failed", __func__); + } + } +} + +static void HandleGetSupportedFeatures(int argc, const char* argv[]) +{ + Logd("enter command handler:%s", argv[CMD_IDX]); + if (ptrWifiDevice != nullptr) { + long features = 0L; + ErrCode ret = ptrWifiDevice->GetSupportedFeatures(features); + if (ret == WIFI_OPT_SUCCESS) { + Logd("%s success, features=0x%lx", __func__, features); + } else { + Logd("%s failed", __func__); + } + } +} + +static void HandleIsFeatureSupported(int argc, const char* argv[]) +{ + Logd("enter command handler:%s", argv[CMD_IDX]); + long feature = 0L; + for (int i = ARG_IDX; i < argc; i++) { + if (strncmp(argv[i], "feature=0x", strlen("feature=0x")) == 0) { + (void)sscanf_s(argv[i], "feature=0x%lx", &feature); + } + } + if (feature == 0) { + HelpCommand(argv[CMD_IDX]); + return; + } + if (ptrWifiDevice != nullptr) { + bool supported = ptrWifiDevice->IsFeatureSupported(feature); + Logd("%s feature:0x%lx, supported:%d", __func__, feature, supported); + } +} + +static void HandleEnableConfig(int argc, const char* argv[]) +{ + Logd("enter command handler:%s", argv[CMD_IDX]); + int nid = -1; + string disableOthers = ""; + for (int i = ARG_IDX; i < argc; i++) { + if (strncmp(argv[i], "nid=", strlen("nid=")) == 0) { + (void)sscanf_s(argv[i], "nid=%d", &nid); + } else if (strncmp(argv[i], "disableothers=", strlen("disableothers=")) == 0) { + disableOthers = argv[i] + strlen("disableothers="); + } + } + if (nid < 0 || (disableOthers != "true" && disableOthers != "false")) { + HelpCommand(argv[CMD_IDX]); + return; + } + if (ptrWifiDevice != nullptr) { + ErrCode ret = ptrWifiDevice->EnableDeviceConfig(nid, disableOthers == "true"); + if (ret == WIFI_OPT_SUCCESS) { + Logd("%s success, nid=%d", __func__, nid); + } else { + Logd("%s failed", __func__); + } + } +} + +static void HandleDisableConfig(int argc, const char* argv[]) +{ + Logd("enter command handler:%s", argv[CMD_IDX]); + int nid; + if (!GetNetworkId(argc, argv, nid)) { + return; + } + if (ptrWifiDevice != nullptr) { + ErrCode ret = ptrWifiDevice->DisableDeviceConfig(nid); + if (ret == WIFI_OPT_SUCCESS) { + Logd("%s success, nid=%d", __func__, nid); + } else { + Logd("%s failed", __func__); + } + } +} + +static void HandleReconnect(int argc, const char* argv[]) +{ + Logd("enter command handler:%s", argv[CMD_IDX]); + if (ptrWifiDevice != nullptr) { + ErrCode ret = ptrWifiDevice->ReConnect(); + if (ret == WIFI_OPT_SUCCESS) { + Logd("%s success", __func__); + } else { + Logd("%s failed", __func__); + } + } +} + +static void HandleReassociate(int argc, const char* argv[]) +{ + Logd("enter command handler:%s", argv[CMD_IDX]); + if (ptrWifiDevice != nullptr) { + ErrCode ret = ptrWifiDevice->ReAssociate(); + if (ret == WIFI_OPT_SUCCESS) { + Logd("%s success", __func__); + } else { + Logd("%s failed", __func__); + } + } +} + +static void HandleGetDeviceMac(int argc, const char* argv[]) +{ + Logd("enter command handler:%s", argv[CMD_IDX]); + if (ptrWifiDevice != nullptr) { + string mac; + ErrCode ret = ptrWifiDevice->GetDeviceMacAddress(mac); + if (ret == WIFI_OPT_SUCCESS) { + Logd("%s success, mac is %s:", __func__, mac.c_str()); + } else { + Logd("%s failed", __func__); + } + } +} + +static void ParseUserInput(std::string command); +static void HandleInteractive(int argc, const char* argv[]) +{ + string inputLine; + Logd("enter interactive mode! input quit to exit this mode"); + Logd("please input command:"); + RegisterDeviceEvents(); + RegisterScanEvents(); + + do { + getline(cin, inputLine); + if (inputLine == "quit") { + break; + } else { + ParseUserInput(inputLine); + Logd("please input command:"); + } + } while (true); +} + +static const struct sta_cli_cmd g_sta_cli_cmds[] = { + {"enable", HandleEnable, "enable"}, + {"disable", HandleDisable, "disable"}, + {"scan", HandleScan, "scan"}, + {"disconnect", HandleDisconnect, "disconnect nid=%d"}, + {"get_status", HandleGetStatus, "get_status"}, + {"get_config_list", HandleGetConfigList, "get_config_list"}, + {"get_scan_results", HandleGetScanResults, "get_scan_results"}, + {"update_config", HandleUpdateConfig, "update_config nid=%d ssid=%s pwd=%s key_mgmt=open/wpa/wpa2"}, + {"add_config", HandleAddConfig, "add_config ssid=%s pwd=%s key_mgmt=open/wpa/wpa2"}, + {"remove_configs", HandleRemoveConfigs, "remove_configs"}, + {"remove_config", HandleRemoveConfig, "remove_config nid=%d"}, + {"connect_network", HandleConnectNetwork, "connect_network nid=%d"}, + {"connect_device", HandleConnectDevice, "connect_device ssid=%s pwd=%s key_mgmt=open/wpa/wpa2"}, + {"get_wifi_state", HandleGetWifiState, "get_wifi_state"}, + {"set_country", HandleSetCountry, "set_country code=%s"}, + {"get_country", HandleGetCountry, "get_country"}, + {"get_signal_level", HandleGetSignalLevel, "get_signal_level rssi=%d band=2g/5g"}, + {"get_supported_features", HandleGetSupportedFeatures, "get_supported_features"}, + {"is_feature_supported", HandleIsFeatureSupported, "is_feature_supported feature=0x%x"}, + {"enable_config", HandleEnableConfig, "enable_config nid=%d disableothers=true/false"}, + {"disable_config", HandleDisableConfig, "disable_config nid=%d"}, + {"reconnect", HandleReconnect, "reconnect"}, + {"reassociate", HandleReassociate, "reassociate"}, + {"get_device_mac", HandleGetDeviceMac, "get_device_mac"}, + {"interactive", HandleInteractive, "interactive"} +}; + +static void HelpCommand(const char *command) +{ + int count = ARRAY_SIZE(g_sta_cli_cmds); + for (int i = 0; i < count; i++) { + if (strcmp(command, g_sta_cli_cmds[i].cmd) == 0) { + Logd("%s", g_sta_cli_cmds[i].usage); + return; + } + } + Logd("can not find command %s", command); +} + +static void Help(void) +{ + Logd("%s", "support command as follows:"); + int count = ARRAY_SIZE(g_sta_cli_cmds); + for (int i = 0; i < count; i++) { + Logd("%s", g_sta_cli_cmds[i].usage); + } +} + +static void HandleUserCommand(int argc, const char *argv[]) +{ + if (argc < ARG_IDX) { + Help(); + return; + } + + int count = ARRAY_SIZE(g_sta_cli_cmds); + for (int i = 0; i < count; i++) { + if (strcmp(g_sta_cli_cmds[i].cmd, argv[CMD_IDX]) == 0) { + if (g_sta_cli_cmds[i].handler != nullptr) { + g_sta_cli_cmds[i].handler(argc, argv); + } else { + Logd("no handler for command:%s", g_sta_cli_cmds[i].cmd); + } + return; + } + } + Help(); +} + +static void ParseUserInput(std::string command) +{ + int argc = 0; + const char* argv[MAX_ARGS] = { nullptr }; + vector cmdArgs; + + std::istringstream istr(command); + for (std::string s; istr >> s;) { + cmdArgs.push_back(s); + } + + argc = cmdArgs.size() + CMD_IDX; + if (argc > MAX_ARGS) { + argc = MAX_ARGS; + } + for (int i = CMD_IDX; i < argc; i++) { + argv[i] = cmdArgs[i - CMD_IDX].c_str(); + } + HandleUserCommand(argc, argv); + cmdArgs.clear(); +} +} +} + +int main(int argc, char *argv[]) +{ + OHOS::Wifi::HandleUserCommand(argc, const_cast(argv)); + return 0; +} -- Gitee From 7ec554280ec8dfeb156b0595f0125a6ebdb48fc3 Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Wed, 18 May 2022 20:38:02 +0800 Subject: [PATCH 112/491] bugfix from master 0518 Signed-off-by: yanxiaotao --- wifi/frameworks/js/napi/inc/wifi_napi_event.h | 1 + .../js/napi/src/wifi_napi_event.cpp | 70 +++++++++++++++++++ .../wifi_manage/wifi_hotspot_service_impl.cpp | 4 +- 3 files changed, 73 insertions(+), 2 deletions(-) diff --git a/wifi/frameworks/js/napi/inc/wifi_napi_event.h b/wifi/frameworks/js/napi/inc/wifi_napi_event.h index 9f44f69..9fc21ed 100644 --- a/wifi/frameworks/js/napi/inc/wifi_napi_event.h +++ b/wifi/frameworks/js/napi/inc/wifi_napi_event.h @@ -109,6 +109,7 @@ public: private: ErrCode RegisterWifiEvents(); bool IsEventSupport(const std::string& type); + int CheckPermission(const std::string& eventType); void DeleteRegisterObj(const napi_env& env, std::vector& vecRegObjs, napi_value& handler); void DeleteAllRegisterObj(const napi_env& env, std::vector& vecRegObjs); diff --git a/wifi/frameworks/js/napi/src/wifi_napi_event.cpp b/wifi/frameworks/js/napi/src/wifi_napi_event.cpp index 4b6a7fd..5755f4a 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_event.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_event.cpp @@ -55,6 +55,20 @@ static std::set g_supportEventList = { EVENT_P2P_DISCOVERY_CHANGE, }; +const std::string WIFI_PERMISSION_NULL = "ohos.permission.NULL"; +const std::string WIFI_PERMISSION_GET_WIFI_INFO = "ohos.permission.GET_WIFI_INFO"; +const std::string WIFI_PERMISSION_SET_WIFI_INFO = "ohos.permission.SET_WIFI_INFO"; +const std::string WIFI_PERMISSION_GET_WIFI_CONFIG = "ohos.permission.GET_WIFI_CONFIG"; +const std::string WIFI_PERMISSION_MANAGE_WIFI_CONNECTION = "ohos.permission.MANAGE_WIFI_CONNECTION"; +const std::string WIFI_PERMISSION_MANAGE_WIFI_HOTSPOT = "ohos.permission.MANAGE_WIFI_HOTSPOT"; +const std::string WIFI_PERMISSION_MANAGE_ENHANCER_WIFI = "ohos.permission.MANAGE_ENHANCER_WIFI"; +const std::string WIFI_PERMISSION_GET_WIFI_LOCAL_MAC = "ohos.permission.GET_WIFI_LOCAL_MAC"; +const std::string WIFI_PERMISSION_LOCATION = "ohos.permission.LOCATION"; +const std::string WIFI_PERMISSION_GET_P2P_DEVICE_LOCATION = "ohos.permission.GET_P2P_DEVICE_LOCATION"; +const std::string WIFI_PERMISSION_GET_WIFI_INFO_INTERNAL = "ohos.permission.GET_WIFI_INFO_INTERNAL"; +const int WIFI_NAPI_PERMISSION_DENIED = 0; +const int WIFI_NAPI_PERMISSION_GRANTED = 1; + void NapiEvent::EventNotify(AsyncEventData *asyncEvent) { WIFI_LOGI("Enter wifi event notify"); @@ -478,6 +492,54 @@ bool EventRegister::IsEventSupport(const std::string& type) return g_supportEventList.find(type) != g_supportEventList.end(); } +int EventRegister::CheckPermission(const std::string& eventType) +{ + auto callerToken = IPCSkeleton::GetCallingTokenID(); + auto tokenType = Security::AccessToken::AccessTokenKit::GetTokenTypeFlag(callerToken); + WIFI_LOGD("Enter CheckPermission, callerToken=%{public}x, tokenType=%{public}x, eventType=%{public}s!", + callerToken, tokenType, eventType.c_str()); + if (tokenType == Security::AccessToken::ATokenTypeEnum::TOKEN_NATIVE) { + return WIFI_NAPI_PERMISSION_GRANTED; + } + + if (tokenType != Security::AccessToken::ATokenTypeEnum::TOKEN_HAP) { + WIFI_LOGE("Invalid tokenType=%{public}x, permission denied!", tokenType); + return WIFI_NAPI_PERMISSION_DENIED; + } + + std::multimap *permissions = &g_EventPermissionMap; + size_t count = permissions->count(eventType); + if (count <= 0) { + WIFI_LOGE("Invalid tokenType=%{public}x, permission denied!", tokenType); + return WIFI_NAPI_PERMISSION_DENIED; + } + + std::string permissionName; + int hasPermission = 1; + std::multimap::iterator it = permissions->find(eventType); + for(size_t i = 0; i < count; i++) { + permissionName = (*(it++)).second; + int res = Security::AccessToken::AccessTokenKit::VerifyAccessToken(callerToken, permissionName); + if (permissionName.compare(WIFI_PERMISSION_GET_WIFI_INFO_INTERNAL) == 0) { + if (res == Security::AccessToken::PermissionState::PERMISSION_GRANTED) { + return WIFI_NAPI_PERMISSION_GRANTED; + } + /* NO permission */ + WIFI_LOGE("callerToken=0x%{public}x has no permission=%{public}s", + callerToken, permissionName.c_str()); + return WIFI_NAPI_PERMISSION_DENIED; + } + + if (res != Security::AccessToken::PermissionState::PERMISSION_GRANTED) { + WIFI_LOGW("callerToken=0x%{public}x has no permission=%{public}s", + callerToken, permissionName.c_str()); + hasPermission = 0; + } + } + + return ((hasPermission == 1) ? WIFI_NAPI_PERMISSION_GRANTED : WIFI_NAPI_PERMISSION_DENIED); +} + void EventRegister::Register(const napi_env& env, const std::string& type, napi_value handler) { WIFI_LOGI("Register event: %{public}s, env: %{private}p", type.c_str(), env); @@ -485,6 +547,10 @@ void EventRegister::Register(const napi_env& env, const std::string& type, napi_ WIFI_LOGE("Register type error or not support!"); return; } + if (CheckPermission(type) != WIFI_NAPI_PERMISSION_GRANTED) { + WIFI_LOGE("Register fail for NO permission!"); + return; + } std::unique_lock guard(g_regInfoMutex); if (!isEventRegistered) { if (RegisterWifiEvents() != WIFI_OPT_SUCCESS) { @@ -547,6 +613,10 @@ void EventRegister::Unregister(const napi_env& env, const std::string& type, nap WIFI_LOGE("Unregister type error or not support!"); return; } + if (CheckPermission(type) != WIFI_NAPI_PERMISSION_GRANTED) { + WIFI_LOGE("Unregister fail for NO permission!"); + return; + } std::unique_lock guard(g_regInfoMutex); auto iter = g_eventRegisterInfo.find(type); if (iter == g_eventRegisterInfo.end()) { diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp index 7e98299..a57fac6 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp @@ -145,8 +145,8 @@ ErrCode WifiHotspotServiceImpl::SetHotspotConfig(const HotspotConfig &config) return WIFI_OPT_PERMISSION_DENIED; } - if (WifiPermissionUtils::VerifySetWifiConfigPermission() == PERMISSION_DENIED) { - WIFI_LOGE("SetHotspotConfig:VerifySetWifiConfigPermission PERMISSION_DENIED!"); + if (WifiPermissionUtils::VerifyGetWifiConfigPermission() == PERMISSION_DENIED) { + WIFI_LOGE("SetHotspotConfig:VerifyGetWifiConfigPermission PERMISSION_DENIED!"); return WIFI_OPT_PERMISSION_DENIED; } -- Gitee From b5c7f8cc3813952f7ece545a221399c4f069da8d Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Wed, 18 May 2022 21:03:45 +0800 Subject: [PATCH 113/491] bugfix from master 0518 Signed-off-by: yanxiaotao --- wifi/frameworks/js/napi/src/wifi_napi_event.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/wifi/frameworks/js/napi/src/wifi_napi_event.cpp b/wifi/frameworks/js/napi/src/wifi_napi_event.cpp index 5755f4a..36cd30c 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_event.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_event.cpp @@ -494,6 +494,10 @@ bool EventRegister::IsEventSupport(const std::string& type) int EventRegister::CheckPermission(const std::string& eventType) { +#ifdef OHOS_ARCH_LITE + /* NO permission check for L1 */ + return WIFI_NAPI_PERMISSION_GRANTED; +#else auto callerToken = IPCSkeleton::GetCallingTokenID(); auto tokenType = Security::AccessToken::AccessTokenKit::GetTokenTypeFlag(callerToken); WIFI_LOGD("Enter CheckPermission, callerToken=%{public}x, tokenType=%{public}x, eventType=%{public}s!", @@ -510,7 +514,7 @@ int EventRegister::CheckPermission(const std::string& eventType) std::multimap *permissions = &g_EventPermissionMap; size_t count = permissions->count(eventType); if (count <= 0) { - WIFI_LOGE("Invalid tokenType=%{public}x, permission denied!", tokenType); + WIFI_LOGE("NO permission defined for tokenType=%{public}x !", tokenType); return WIFI_NAPI_PERMISSION_DENIED; } @@ -538,6 +542,7 @@ int EventRegister::CheckPermission(const std::string& eventType) } return ((hasPermission == 1) ? WIFI_NAPI_PERMISSION_GRANTED : WIFI_NAPI_PERMISSION_DENIED); +#endif } void EventRegister::Register(const napi_env& env, const std::string& type, napi_value handler) -- Gitee From aace5ac963efeafb15162582e0d6a80361e5f8c4 Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Wed, 18 May 2022 22:43:09 +0800 Subject: [PATCH 114/491] bugfix from master 0518 Signed-off-by: yanxiaotao --- wifi/frameworks/js/napi/BUILD.gn | 2 +- wifi/frameworks/js/napi/src/wifi_napi_event.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wifi/frameworks/js/napi/BUILD.gn b/wifi/frameworks/js/napi/BUILD.gn index 8278822..6044f6b 100644 --- a/wifi/frameworks/js/napi/BUILD.gn +++ b/wifi/frameworks/js/napi/BUILD.gn @@ -50,6 +50,7 @@ ohos_shared_library("wifi") { external_deps = [ "bundle_framework:appexecfwk_base", + "access_token:libaccesstoken_sdk", "ipc:ipc_core", ] @@ -87,7 +88,6 @@ ohos_shared_library("wifiext") { external_deps = [ "bundle_framework:appexecfwk_base", - "access_token:libaccesstoken_sdk", "ipc:ipc_core", ] diff --git a/wifi/frameworks/js/napi/src/wifi_napi_event.cpp b/wifi/frameworks/js/napi/src/wifi_napi_event.cpp index 36cd30c..84d1343 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_event.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_event.cpp @@ -521,7 +521,7 @@ int EventRegister::CheckPermission(const std::string& eventType) std::string permissionName; int hasPermission = 1; std::multimap::iterator it = permissions->find(eventType); - for(size_t i = 0; i < count; i++) { + for (size_t i = 0; i < count; i++) { permissionName = (*(it++)).second; int res = Security::AccessToken::AccessTokenKit::VerifyAccessToken(callerToken, permissionName); if (permissionName.compare(WIFI_PERMISSION_GET_WIFI_INFO_INTERNAL) == 0) { -- Gitee From d1b2498009d10e7645f39dd96d91eadef0d4b075 Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Wed, 18 May 2022 23:01:51 +0800 Subject: [PATCH 115/491] bugfix from master 0518 Signed-off-by: yanxiaotao --- wifi/frameworks/js/napi/BUILD.gn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wifi/frameworks/js/napi/BUILD.gn b/wifi/frameworks/js/napi/BUILD.gn index 6044f6b..06f258c 100644 --- a/wifi/frameworks/js/napi/BUILD.gn +++ b/wifi/frameworks/js/napi/BUILD.gn @@ -49,8 +49,8 @@ ohos_shared_library("wifi") { ] external_deps = [ + "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", - "access_token:libaccesstoken_sdk", "ipc:ipc_core", ] @@ -133,8 +133,8 @@ ohos_shared_library("wifi_native_js") { defines = [ "ENABLE_NAPI_COMPATIBLE" ] external_deps = [ + "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", - "access_token:libaccesstoken_sdk", "ipc:ipc_core", ] -- Gitee From cb348f552c18c1b9bfd40b21fe5a4023b69a9860 Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Wed, 18 May 2022 23:27:00 +0800 Subject: [PATCH 116/491] bugfix from master 0518 Signed-off-by: yanxiaotao --- wifi/frameworks/js/napi/BUILD.gn | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wifi/frameworks/js/napi/BUILD.gn b/wifi/frameworks/js/napi/BUILD.gn index 06f258c..e1b078c 100644 --- a/wifi/frameworks/js/napi/BUILD.gn +++ b/wifi/frameworks/js/napi/BUILD.gn @@ -49,7 +49,7 @@ ohos_shared_library("wifi") { ] external_deps = [ - "access_token:libaccesstoken_sdk", + "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", "ipc:ipc_core", ] @@ -133,7 +133,7 @@ ohos_shared_library("wifi_native_js") { defines = [ "ENABLE_NAPI_COMPATIBLE" ] external_deps = [ - "access_token:libaccesstoken_sdk", + "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", "ipc:ipc_core", ] @@ -141,4 +141,4 @@ ohos_shared_library("wifi_native_js") { relative_install_dir = "module" part_name = "wifi" subsystem_name = "communication" -} +} \ No newline at end of file -- Gitee From 6df9a6da9b6753ee5131ce02a043a0de16ebf4eb Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Wed, 18 May 2022 23:58:34 +0800 Subject: [PATCH 117/491] bugfix from master 0518 Signed-off-by: yanxiaotao --- wifi/frameworks/js/napi/src/wifi_napi_event.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/wifi/frameworks/js/napi/src/wifi_napi_event.cpp b/wifi/frameworks/js/napi/src/wifi_napi_event.cpp index 84d1343..cdc5801 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_event.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_event.cpp @@ -19,6 +19,7 @@ #include "wifi_device.h" #include "wifi_scan.h" #include "wifi_logger.h" +#include "ipc_skeleton.h" namespace OHOS { namespace Wifi { -- Gitee From 724406b51b0467f6fc18d70c77a260999245318c Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Thu, 19 May 2022 09:46:45 +0800 Subject: [PATCH 118/491] bugfix from master 0519 Signed-off-by: yanxiaotao --- wifi/frameworks/js/napi/src/wifi_napi_event.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/wifi/frameworks/js/napi/src/wifi_napi_event.cpp b/wifi/frameworks/js/napi/src/wifi_napi_event.cpp index cdc5801..cf27027 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_event.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_event.cpp @@ -20,6 +20,7 @@ #include "wifi_scan.h" #include "wifi_logger.h" #include "ipc_skeleton.h" +#include "accesstoken_kit.h" namespace OHOS { namespace Wifi { -- Gitee From 1805e2eca080a1e18937c1eba09eabecfff24442 Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Thu, 19 May 2022 10:14:03 +0800 Subject: [PATCH 119/491] bugfix from master 0519 Signed-off-by: yanxiaotao --- wifi/frameworks/js/napi/BUILD.gn | 2 +- .../js/napi/src/wifi_napi_event.cpp | 21 +++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/wifi/frameworks/js/napi/BUILD.gn b/wifi/frameworks/js/napi/BUILD.gn index e1b078c..c813cef 100644 --- a/wifi/frameworks/js/napi/BUILD.gn +++ b/wifi/frameworks/js/napi/BUILD.gn @@ -141,4 +141,4 @@ ohos_shared_library("wifi_native_js") { relative_install_dir = "module" part_name = "wifi" subsystem_name = "communication" -} \ No newline at end of file +} diff --git a/wifi/frameworks/js/napi/src/wifi_napi_event.cpp b/wifi/frameworks/js/napi/src/wifi_napi_event.cpp index cf27027..0d1aa65 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_event.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_event.cpp @@ -71,6 +71,27 @@ const std::string WIFI_PERMISSION_GET_WIFI_INFO_INTERNAL = "ohos.permission.GET_ const int WIFI_NAPI_PERMISSION_DENIED = 0; const int WIFI_NAPI_PERMISSION_GRANTED = 1; +std::multimap g_EventPermissionMap = { + { EVENT_STA_POWER_STATE_CHANGE, WIFI_PERMISSION_GET_WIFI_INFO }, + { EVENT_STA_CONN_STATE_CHANGE, WIFI_PERMISSION_GET_WIFI_INFO }, + { EVENT_STA_SCAN_STATE_CHANGE, WIFI_PERMISSION_GET_WIFI_INFO }, + { EVENT_STA_RSSI_STATE_CHANGE, WIFI_PERMISSION_GET_WIFI_INFO }, + { EVENT_HOTSPOT_STATE_CHANGE, WIFI_PERMISSION_GET_WIFI_INFO }, + { EVENT_HOTSPOT_STA_JOIN, WIFI_PERMISSION_MANAGE_WIFI_HOTSPOT }, + { EVENT_HOTSPOT_STA_LEAVE, WIFI_PERMISSION_MANAGE_WIFI_HOTSPOT }, + { EVENT_P2P_STATE_CHANGE, WIFI_PERMISSION_GET_WIFI_INFO }, + { EVENT_P2P_CONN_STATE_CHANGE, WIFI_PERMISSION_GET_WIFI_INFO }, + { EVENT_P2P_DEVICE_STATE_CHANGE, WIFI_PERMISSION_GET_WIFI_INFO }, + { EVENT_P2P_DEVICE_STATE_CHANGE, WIFI_PERMISSION_LOCATION }, + { EVENT_P2P_DEVICE_STATE_CHANGE, WIFI_PERMISSION_GET_WIFI_INFO_INTERNAL }, + { EVENT_P2P_PERSISTENT_GROUP_CHANGE, WIFI_PERMISSION_GET_WIFI_INFO }, + { EVENT_P2P_PEER_DEVICE_CHANGE, WIFI_PERMISSION_GET_WIFI_INFO }, + { EVENT_P2P_PEER_DEVICE_CHANGE, WIFI_PERMISSION_LOCATION }, + { EVENT_P2P_PEER_DEVICE_CHANGE, WIFI_PERMISSION_GET_WIFI_INFO_INTERNAL }, + { EVENT_P2P_DISCOVERY_CHANGE, WIFI_PERMISSION_GET_WIFI_INFO }, + { EVENT_STREAM_CHANGE, WIFI_PERMISSION_MANAGE_WIFI_CONNECTION }, +}; + void NapiEvent::EventNotify(AsyncEventData *asyncEvent) { WIFI_LOGI("Enter wifi event notify"); -- Gitee From 40b779cf48e1658767d38d1c2374928a054f8158 Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Thu, 19 May 2022 10:50:34 +0800 Subject: [PATCH 120/491] bugfix from master 0519 Signed-off-by: yanxiaotao --- wifi/frameworks/js/napi/src/wifi_napi_event.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/wifi/frameworks/js/napi/src/wifi_napi_event.cpp b/wifi/frameworks/js/napi/src/wifi_napi_event.cpp index 0d1aa65..185bc00 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_event.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_event.cpp @@ -517,10 +517,6 @@ bool EventRegister::IsEventSupport(const std::string& type) int EventRegister::CheckPermission(const std::string& eventType) { -#ifdef OHOS_ARCH_LITE - /* NO permission check for L1 */ - return WIFI_NAPI_PERMISSION_GRANTED; -#else auto callerToken = IPCSkeleton::GetCallingTokenID(); auto tokenType = Security::AccessToken::AccessTokenKit::GetTokenTypeFlag(callerToken); WIFI_LOGD("Enter CheckPermission, callerToken=%{public}x, tokenType=%{public}x, eventType=%{public}s!", @@ -565,7 +561,6 @@ int EventRegister::CheckPermission(const std::string& eventType) } return ((hasPermission == 1) ? WIFI_NAPI_PERMISSION_GRANTED : WIFI_NAPI_PERMISSION_DENIED); -#endif } void EventRegister::Register(const napi_env& env, const std::string& type, napi_value handler) -- Gitee From 0f5759f20b0a599ae096bf3ee07a250d5c9b6a94 Mon Sep 17 00:00:00 2001 From: shiqichang Date: Thu, 19 May 2022 10:30:40 +0800 Subject: [PATCH 121/491] =?UTF-8?q?aafwk=E7=BB=9D=E5=AF=B9=E8=B7=AF?= =?UTF-8?q?=E5=BE=84=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: shiqichang Change-Id: I1a65387ac2fb3ffc511b7d052698da09e3d50da3 --- wifi/frameworks/BUILD.gn | 4 +--- wifi/frameworks/js/napi/BUILD.gn | 12 ++++++------ wifi/wifi.gni | 4 +--- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/wifi/frameworks/BUILD.gn b/wifi/frameworks/BUILD.gn index 74dec42..113c244 100644 --- a/wifi/frameworks/BUILD.gn +++ b/wifi/frameworks/BUILD.gn @@ -20,9 +20,7 @@ if (defined(ohos_lite)) { } group("wifi_kits") { - deps = [ - "$WIFI_ROOT_DIR/frameworks/native:wifi_sdk", - ] + deps = [ "$WIFI_ROOT_DIR/frameworks/native:wifi_sdk" ] if (!defined(ohos_lite)) { deps += [ "$WIFI_ROOT_DIR/frameworks/js/napi:wifi", diff --git a/wifi/frameworks/js/napi/BUILD.gn b/wifi/frameworks/js/napi/BUILD.gn index 8278822..6e1fd05 100644 --- a/wifi/frameworks/js/napi/BUILD.gn +++ b/wifi/frameworks/js/napi/BUILD.gn @@ -26,7 +26,7 @@ ohos_shared_library("wifi") { "//base/security/access_token/interfaces/innerkits/accesstoken/include", "$WIFI_ROOT_DIR/frameworks/native/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", - "${aakits_path}/appkit/native/ability_runtime/context", + "${aafwk_kits_path}/appkit/native/ability_runtime/context", "$WIFI_ROOT_DIR/utils/inc", "$WIFI_ROOT_DIR/frameworks/js/napi/inc", ] @@ -42,7 +42,7 @@ ohos_shared_library("wifi") { deps = [ "$WIFI_ROOT_DIR/frameworks/native:wifi_sdk", "$WIFI_ROOT_DIR/utils/src:wifi_utils", - "${aakits_path}/appkit:app_context", + "${aafwk_kits_path}/appkit:app_context", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//foundation/arkui/napi:ace_napi", "//utils/native/base:utils", @@ -86,8 +86,8 @@ ohos_shared_library("wifiext") { ] external_deps = [ - "bundle_framework:appexecfwk_base", "access_token:libaccesstoken_sdk", + "bundle_framework:appexecfwk_base", "ipc:ipc_core", ] @@ -109,7 +109,7 @@ ohos_shared_library("wifi_native_js") { "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", "//base/security/access_token/interfaces/innerkits/accesstoken/include", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", - "${aakits_path}/appkit/native/ability_runtime/context", + "${aafwk_kits_path}/appkit/native/ability_runtime/context", "$WIFI_ROOT_DIR/utils/inc", ] @@ -124,7 +124,7 @@ ohos_shared_library("wifi_native_js") { deps = [ "$WIFI_ROOT_DIR/frameworks/native:wifi_sdk", "$WIFI_ROOT_DIR/utils/src:wifi_utils", - "${aakits_path}/appkit:app_context", + "${aafwk_kits_path}/appkit:app_context", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//foundation/arkui/napi:ace_napi", "//utils/native/base:utils", @@ -133,8 +133,8 @@ ohos_shared_library("wifi_native_js") { defines = [ "ENABLE_NAPI_COMPATIBLE" ] external_deps = [ - "bundle_framework:appexecfwk_base", "access_token:libaccesstoken_sdk", + "bundle_framework:appexecfwk_base", "ipc:ipc_core", ] diff --git a/wifi/wifi.gni b/wifi/wifi.gni index f335af4..84c926a 100644 --- a/wifi/wifi.gni +++ b/wifi/wifi.gni @@ -11,9 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -aaservices_path = "//foundation/aafwk/standard/services" -aainnerkits_path = "//foundation/aafwk/standard/interfaces/innerkits" -aakits_path = "//foundation/aafwk/standard/frameworks/kits" +aafwk_kits_path = "//foundation/aafwk/standard/frameworks/kits" SUBSYSTEM_DIR = "//foundation/communication" WIFI_ROOT_DIR = "$SUBSYSTEM_DIR/wifi/wifi" -- Gitee From 429e28bacbccbb84a7371dfb0eacda3a80f452be Mon Sep 17 00:00:00 2001 From: zhouke Date: Thu, 28 Apr 2022 11:28:38 +0800 Subject: [PATCH 122/491] =?UTF-8?q?=E8=A7=A3=E5=86=B3dhcp=E8=AE=BE?= =?UTF-8?q?=E7=BD=AEip=E6=97=B6=EF=BC=8C=E6=9C=AA=E8=80=83=E8=99=91?= =?UTF-8?q?=E5=AD=90=E7=BD=91=E6=8E=A9=E7=A0=81=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhouke --- .../dhcp_client/include/dhcp_function.h | 2 +- dhcp/services/dhcp_client/src/dhcp_function.c | 59 ++++++++++--------- dhcp/services/dhcp_client/src/dhcp_ipv4.c | 3 +- 3 files changed, 34 insertions(+), 30 deletions(-) diff --git a/dhcp/services/dhcp_client/include/dhcp_function.h b/dhcp/services/dhcp_client/include/dhcp_function.h index 76bc90f..cc3da5a 100644 --- a/dhcp/services/dhcp_client/include/dhcp_function.h +++ b/dhcp/services/dhcp_client/include/dhcp_function.h @@ -30,7 +30,7 @@ bool Ip6StrConToChar(const char *strIp, uint8_t chIp[], size_t chlen); const char *MacChConToMacStr(const unsigned char *pChMac, size_t chLen, char *pStrMac, size_t strLen); int GetLocalInterface(const char *ifname, int *ifindex, unsigned char *hwaddr, uint32_t *ifaddr4); int GetLocalIp(const char *ifname, uint32_t *ifaddr4); -int SetLocalInterface(const char *ifname, uint32_t ifaddr4); +int SetLocalInterface(const char *ifname, uint32_t ipAddr, uint32_t netMask); int InitPidfile(const char *pidDir, const char *pidFile, pid_t pid); pid_t GetPID(const char *pidFile); int CreateDirs(const char *dirs, int mode); diff --git a/dhcp/services/dhcp_client/src/dhcp_function.c b/dhcp/services/dhcp_client/src/dhcp_function.c index 6b8c2df..bc37084 100644 --- a/dhcp/services/dhcp_client/src/dhcp_function.c +++ b/dhcp/services/dhcp_client/src/dhcp_function.c @@ -272,58 +272,61 @@ int GetLocalIp(const char *ifname, uint32_t *ifaddr4) return DHCP_OPT_SUCCESS; } -int SetLocalInterface(const char *ifname, uint32_t ifaddr4) +int SetIpOrMask(const char *ifname, int fd, uint32_t netAddr, unsigned long cmd) { - if ((ifname == NULL) || (strlen(ifname) == 0)) { - LOGE("SetLocalInterface() failed, ifname == NULL or \"\"!"); + struct ifreq ifr; + struct sockaddr_in sin; + if (memset_s(&ifr, sizeof(struct ifreq), 0, sizeof(struct ifreq)) != EOK) { + LOGE("SetIpOrMask() failed, memset_s ifr error!"); return DHCP_OPT_FAILED; } - char *cIp = Ip4IntConToStr(ifaddr4, true); - if (cIp == NULL) { - LOGE("SetLocalInterface() %{public}s failed, Ip4IntConToStr addr4:%{private}u failed!", ifname, ifaddr4); + if (strncpy_s(ifr.ifr_name, sizeof(ifr.ifr_name), ifname, strlen(ifname)) != EOK) { + LOGE("SetIpOrMask() %{public}s failed, , strncpy_s ifr.ifr_name error!", ifname); return DHCP_OPT_FAILED; } - LOGI("SetLocalInterface() %{public}s, ifaddr4:%{private}u -> %{private}s.", ifname, ifaddr4, cIp); - free(cIp); - cIp = NULL; - int fd; - struct ifreq ifr; - struct sockaddr_in sin; - - if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) { - LOGE("SetLocalInterface() ifname:%{public}s failed, socket error:%{public}d!", ifname, errno); + if (memset_s(&sin, sizeof(struct sockaddr_in), 0, sizeof(struct sockaddr_in)) != EOK) { + LOGE("SetIpOrMask() failed, memset_s sin error!"); + return DHCP_OPT_FAILED; + } + sin.sin_family = AF_INET; + sin.sin_addr.s_addr = netAddr; + if (memcpy_s(&ifr.ifr_addr, sizeof(ifr.ifr_addr), &sin, sizeof(struct sockaddr)) != EOK) { + LOGE("SetIpOrMask() failed, memcpy_s ifr.ifr_addr error!"); return DHCP_OPT_FAILED; } - if (memset_s(&ifr, sizeof(ifr), 0, sizeof(ifr)) != EOK) { - close(fd); + if (ioctl(fd, cmd, &ifr) < 0) { + LOGE("SetIpOrMask() %{public}s failed, %{public}ld!", ifname, cmd); return DHCP_OPT_FAILED; } - if (strncpy_s(ifr.ifr_name, sizeof(ifr.ifr_name), ifname, strlen(ifname)) != EOK) { - close(fd); + return DHCP_OPT_SUCCESS; +} + +int SetLocalInterface(const char *ifname, uint32_t ipAddr, uint32_t netMask) +{ + if ((ifname == NULL) || (strlen(ifname) == 0)) { + LOGE("SetLocalInterface() failed, ifname == NULL or \"\"!"); return DHCP_OPT_FAILED; } + LOGI("SetLocalInterface() %{public}s, ipAddr:%{private}u mask %{private}u.", ifname, ipAddr, netMask); - if (memset_s(&sin, sizeof(sin), 0, sizeof(sin)) != EOK) { - close(fd); + int fd = socket(AF_INET, SOCK_DGRAM, 0); + if (fd < 0) { + LOGE("SetLocalInterface() ifname:%{public}s failed, socket error:%{public}d!", ifname, errno); return DHCP_OPT_FAILED; } - sin.sin_family = AF_INET; - sin.sin_addr.s_addr = htonl(ifaddr4); - if (memcpy_s(&ifr.ifr_addr, sizeof(ifr.ifr_addr), &sin, sizeof(struct sockaddr)) != EOK) { + + if (SetIpOrMask(ifname, fd, ipAddr, SIOCSIFADDR) != DHCP_OPT_SUCCESS) { close(fd); return DHCP_OPT_FAILED; } - /* Similar to the system command: ifconfig ifname ifaddr4. */ - if (ioctl(fd, SIOCSIFADDR, &ifr) < 0) { - LOGE("SetLocalInterface() %{public}s failed, SIOCSIFADDR err:%{public}d!", ifname, errno); + if (SetIpOrMask(ifname, fd, netMask, SIOCSIFNETMASK) != DHCP_OPT_SUCCESS) { close(fd); return DHCP_OPT_FAILED; } - close(fd); return DHCP_OPT_SUCCESS; } diff --git a/dhcp/services/dhcp_client/src/dhcp_ipv4.c b/dhcp/services/dhcp_client/src/dhcp_ipv4.c index 87a451b..1ec65ab 100644 --- a/dhcp/services/dhcp_client/src/dhcp_ipv4.c +++ b/dhcp/services/dhcp_client/src/dhcp_ipv4.c @@ -843,7 +843,8 @@ static int SyncDhcpResult(const struct DhcpPacket *packet, struct DhcpResult *re } /* Set the specified client process interface network info. */ - if (SetLocalInterface(g_cltCnf->ifaceName, ntohl(g_requestedIp4)) != DHCP_OPT_SUCCESS) { + if (SetLocalInterface(g_cltCnf->ifaceName, inet_addr(result->strYiaddr), inet_addr(result->strOptSubnet)) + != DHCP_OPT_SUCCESS) { LOGE("SyncDhcpResult() error, SetLocalInterface yiaddr:%{private}s failed!", result->strYiaddr); return DHCP_OPT_FAILED; } -- Gitee From fc51b843a35119f8e363008c6f0a0302a0b4e06c Mon Sep 17 00:00:00 2001 From: lujunxin Date: Thu, 19 May 2022 22:16:51 +0800 Subject: [PATCH 123/491] code optimization for L1 Signed-off-by: lujunxin --- .../src/dhcp_client_service_impl.cpp | 4 +- .../src/wifi_device_callback_stub_lite.cpp | 11 ++-- .../native/src/wifi_device_proxy_lite.cpp | 64 +++++++++---------- .../src/wifi_scan_callback_stub_lite.cpp | 8 +-- .../native/src/wifi_scan_proxy_lite.cpp | 18 +++--- .../wifi_manage/wifi_device_callback_proxy.h | 4 +- .../wifi_device_callback_proxy_lite.cpp | 7 +- .../wifi_manage/wifi_scan_callback_proxy.h | 4 +- 8 files changed, 60 insertions(+), 60 deletions(-) diff --git a/dhcp/services/mgr_service/src/dhcp_client_service_impl.cpp b/dhcp/services/mgr_service/src/dhcp_client_service_impl.cpp index 9f21a64..7877e08 100644 --- a/dhcp/services/mgr_service/src/dhcp_client_service_impl.cpp +++ b/dhcp/services/mgr_service/src/dhcp_client_service_impl.cpp @@ -396,8 +396,8 @@ void DhcpClientServiceImpl::DhcpPacketInfoHandle( } else { m_mapDhcpResult.emplace(std::make_pair(ifname, result)); } - WIFI_LOGI("DhcpPacketInfoHandle %{public}s, type:%{public}d, opt:%{public}d, cli:%{public}s, server:%{public}s, " - "strSubnet:%{public}s, strDns1:%{public}s, strDns2:%{public}s, strRouter1:%{public}s, strRouter2:%{public}s, " + WIFI_LOGI("DhcpPacketInfoHandle %{public}s, type:%{public}d, opt:%{public}d, cli:%{private}s, server:%{private}s, " + "strSubnet:%{private}s, Dns1:%{private}s, Dns2:%{private}s, strRouter1:%{private}s, strRouter2:%{private}s, " "strVendor:%{public}s, uLeaseTime:%{public}u, uAddTime:%{public}u, uGetTime:%{public}u.", ifname.c_str(), result.iptype, result.isOptSuc, result.strYourCli.c_str(), result.strServer.c_str(), result.strSubnet.c_str(), result.strDns1.c_str(), result.strDns2.c_str(), result.strRouter1.c_str(), diff --git a/wifi/frameworks/native/src/wifi_device_callback_stub_lite.cpp b/wifi/frameworks/native/src/wifi_device_callback_stub_lite.cpp index 14f6b7d..dccedbf 100644 --- a/wifi/frameworks/native/src/wifi_device_callback_stub_lite.cpp +++ b/wifi/frameworks/native/src/wifi_device_callback_stub_lite.cpp @@ -29,19 +29,19 @@ WifiDeviceCallBackStub::~WifiDeviceCallBackStub() int WifiDeviceCallBackStub::OnRemoteRequest(uint32_t code, IpcIo *data) { + int ret = WIFI_OPT_FAILED; WIFI_LOGD("OnRemoteRequest code:%{public}u!", code); if (mRemoteDied || data == nullptr) { - WIFI_LOGD("Failed to %{public}s,mRemoteDied:%{public}d data:%{public}d!", + WIFI_LOGE("Failed to %{public}s,mRemoteDied:%{public}d data:%{public}d!", __func__, mRemoteDied, data == nullptr); - return -1; + return ret; } int exception = IpcIoPopInt32(data); if (exception) { WIFI_LOGE("WifiDeviceCallBackStub::OnRemoteRequest, got exception: %{public}d!", exception); - return WIFI_OPT_FAILED; + return ret; } - int ret = -1; switch (code) { case WIFI_CBK_CMD_STATE_CHANGE: { ret = RemoteOnWifiStateChanged(code, data); @@ -64,8 +64,7 @@ int WifiDeviceCallBackStub::OnRemoteRequest(uint32_t code, IpcIo *data) break; } default: { - ret = -1; - break; + ret = WIFI_OPT_FAILED; } } return ret; diff --git a/wifi/frameworks/native/src/wifi_device_proxy_lite.cpp b/wifi/frameworks/native/src/wifi_device_proxy_lite.cpp index 51cbd16..c479b5c 100644 --- a/wifi/frameworks/native/src/wifi_device_proxy_lite.cpp +++ b/wifi/frameworks/native/src/wifi_device_proxy_lite.cpp @@ -158,7 +158,7 @@ static int IpcCallback(void *owner, int code, IpcIo *reply) struct IpcOwner *data = (struct IpcOwner *)owner; data->exception = IpcIoPopInt32(reply); data->retCode = IpcIoPopInt32(reply); - if (data->exception != 0 || data->retCode != WIFI_OPT_SUCCESS) { + if (data->exception != 0 || data->retCode != WIFI_OPT_SUCCESS || data->variable == nullptr) { return LITEIPC_OK; } @@ -285,7 +285,7 @@ ErrCode WifiDeviceProxy::Init() ErrCode WifiDeviceProxy::EnableWifi() { if (remoteDied_ || remote_ == nullptr) { - WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + WIFI_LOGE("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", __func__, remoteDied_, remote_ == nullptr); return WIFI_OPT_FAILED; } @@ -312,7 +312,7 @@ ErrCode WifiDeviceProxy::EnableWifi() ErrCode WifiDeviceProxy::DisableWifi() { if (remoteDied_ || remote_ == nullptr) { - WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + WIFI_LOGE("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", __func__, remoteDied_, remote_ == nullptr); return WIFI_OPT_FAILED; } @@ -339,7 +339,7 @@ ErrCode WifiDeviceProxy::DisableWifi() ErrCode WifiDeviceProxy::InitWifiProtect(const WifiProtectType &protectType, const std::string &protectName) { if (remoteDied_ || remote_ == nullptr) { - WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + WIFI_LOGE("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", __func__, remoteDied_, remote_ == nullptr); return WIFI_OPT_FAILED; } @@ -368,7 +368,7 @@ ErrCode WifiDeviceProxy::InitWifiProtect(const WifiProtectType &protectType, con ErrCode WifiDeviceProxy::GetWifiProtectRef(const WifiProtectMode &protectMode, const std::string &protectName) { if (remoteDied_ || remote_ == nullptr) { - WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + WIFI_LOGE("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", __func__, remoteDied_, remote_ == nullptr); return WIFI_OPT_FAILED; } @@ -397,7 +397,7 @@ ErrCode WifiDeviceProxy::GetWifiProtectRef(const WifiProtectMode &protectMode, c ErrCode WifiDeviceProxy::PutWifiProtectRef(const std::string &protectName) { if (remoteDied_ || remote_ == nullptr) { - WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + WIFI_LOGE("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", __func__, remoteDied_, remote_ == nullptr); return WIFI_OPT_FAILED; } @@ -477,7 +477,7 @@ void WifiDeviceProxy::WriteDeviceConfig(const WifiDeviceConfig &config, IpcIo &r ErrCode WifiDeviceProxy::AddDeviceConfig(const WifiDeviceConfig &config, int &result) { if (remoteDied_ || remote_ == nullptr) { - WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + WIFI_LOGE("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", __func__, remoteDied_, remote_ == nullptr); return WIFI_OPT_FAILED; } @@ -506,7 +506,7 @@ ErrCode WifiDeviceProxy::AddDeviceConfig(const WifiDeviceConfig &config, int &re ErrCode WifiDeviceProxy::UpdateDeviceConfig(const WifiDeviceConfig &config, int &result) { if (remoteDied_ || remote_ == nullptr) { - WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + WIFI_LOGE("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", __func__, remoteDied_, remote_ == nullptr); return WIFI_OPT_FAILED; } @@ -535,7 +535,7 @@ ErrCode WifiDeviceProxy::UpdateDeviceConfig(const WifiDeviceConfig &config, int ErrCode WifiDeviceProxy::RemoveDevice(int networkId) { if (remoteDied_ || remote_ == nullptr) { - WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + WIFI_LOGE("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", __func__, remoteDied_, remote_ == nullptr); return WIFI_OPT_FAILED; } @@ -563,7 +563,7 @@ ErrCode WifiDeviceProxy::RemoveDevice(int networkId) ErrCode WifiDeviceProxy::RemoveAllDevice() { if (remoteDied_ || remote_ == nullptr) { - WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + WIFI_LOGE("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", __func__, remoteDied_, remote_ == nullptr); return WIFI_OPT_FAILED; } @@ -590,7 +590,7 @@ ErrCode WifiDeviceProxy::RemoveAllDevice() ErrCode WifiDeviceProxy::GetDeviceConfigs(std::vector &result) { if (remoteDied_ || remote_ == nullptr) { - WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + WIFI_LOGE("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", __func__, remoteDied_, remote_ == nullptr); return WIFI_OPT_FAILED; } @@ -619,7 +619,7 @@ ErrCode WifiDeviceProxy::GetDeviceConfigs(std::vector &result) ErrCode WifiDeviceProxy::EnableDeviceConfig(int networkId, bool attemptEnable) { if (remoteDied_ || remote_ == nullptr) { - WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + WIFI_LOGE("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", __func__, remoteDied_, remote_ == nullptr); return WIFI_OPT_FAILED; } @@ -648,7 +648,7 @@ ErrCode WifiDeviceProxy::EnableDeviceConfig(int networkId, bool attemptEnable) ErrCode WifiDeviceProxy::DisableDeviceConfig(int networkId) { if (remoteDied_ || remote_ == nullptr) { - WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + WIFI_LOGE("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", __func__, remoteDied_, remote_ == nullptr); return WIFI_OPT_FAILED; } @@ -676,7 +676,7 @@ ErrCode WifiDeviceProxy::DisableDeviceConfig(int networkId) ErrCode WifiDeviceProxy::ConnectToNetwork(int networkId) { if (remoteDied_ || remote_ == nullptr) { - WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + WIFI_LOGE("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", __func__, remoteDied_, remote_ == nullptr); return WIFI_OPT_FAILED; } @@ -704,7 +704,7 @@ ErrCode WifiDeviceProxy::ConnectToNetwork(int networkId) ErrCode WifiDeviceProxy::ConnectToDevice(const WifiDeviceConfig &config) { if (remoteDied_ || remote_ == nullptr) { - WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + WIFI_LOGE("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", __func__, remoteDied_, remote_ == nullptr); return WIFI_OPT_FAILED; } @@ -732,7 +732,7 @@ ErrCode WifiDeviceProxy::ConnectToDevice(const WifiDeviceConfig &config) bool WifiDeviceProxy::IsConnected() { if (remoteDied_ || remote_ == nullptr) { - WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + WIFI_LOGE("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", __func__, remoteDied_, remote_ == nullptr); return WIFI_OPT_FAILED; } @@ -761,7 +761,7 @@ bool WifiDeviceProxy::IsConnected() ErrCode WifiDeviceProxy::ReConnect() { if (remoteDied_ || remote_ == nullptr) { - WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + WIFI_LOGE("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", __func__, remoteDied_, remote_ == nullptr); return WIFI_OPT_FAILED; } @@ -788,7 +788,7 @@ ErrCode WifiDeviceProxy::ReConnect() ErrCode WifiDeviceProxy::ReAssociate(void) { if (remoteDied_ || remote_ == nullptr) { - WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + WIFI_LOGE("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", __func__, remoteDied_, remote_ == nullptr); return WIFI_OPT_FAILED; } @@ -815,7 +815,7 @@ ErrCode WifiDeviceProxy::ReAssociate(void) ErrCode WifiDeviceProxy::Disconnect(void) { if (remoteDied_ || remote_ == nullptr) { - WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + WIFI_LOGE("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", __func__, remoteDied_, remote_ == nullptr); return WIFI_OPT_FAILED; } @@ -842,7 +842,7 @@ ErrCode WifiDeviceProxy::Disconnect(void) ErrCode WifiDeviceProxy::StartWps(const WpsConfig &config) { if (remoteDied_ || remote_ == nullptr) { - WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + WIFI_LOGE("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", __func__, remoteDied_, remote_ == nullptr); return WIFI_OPT_FAILED; } @@ -872,7 +872,7 @@ ErrCode WifiDeviceProxy::StartWps(const WpsConfig &config) ErrCode WifiDeviceProxy::CancelWps(void) { if (remoteDied_ || remote_ == nullptr) { - WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + WIFI_LOGE("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", __func__, remoteDied_, remote_ == nullptr); return WIFI_OPT_FAILED; } @@ -899,7 +899,7 @@ ErrCode WifiDeviceProxy::CancelWps(void) ErrCode WifiDeviceProxy::IsWifiActive(bool &bActive) { if (remoteDied_ || remote_ == nullptr) { - WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + WIFI_LOGE("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", __func__, remoteDied_, remote_ == nullptr); return WIFI_OPT_FAILED; } @@ -927,7 +927,7 @@ ErrCode WifiDeviceProxy::IsWifiActive(bool &bActive) ErrCode WifiDeviceProxy::GetWifiState(int &state) { if (remoteDied_ || remote_ == nullptr) { - WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + WIFI_LOGE("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", __func__, remoteDied_, remote_ == nullptr); return WIFI_OPT_FAILED; } @@ -955,7 +955,7 @@ ErrCode WifiDeviceProxy::GetWifiState(int &state) ErrCode WifiDeviceProxy::GetLinkedInfo(WifiLinkedInfo &info) { if (remoteDied_ || remote_ == nullptr) { - WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + WIFI_LOGE("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", __func__, remoteDied_, remote_ == nullptr); return WIFI_OPT_FAILED; } @@ -983,7 +983,7 @@ ErrCode WifiDeviceProxy::GetLinkedInfo(WifiLinkedInfo &info) ErrCode WifiDeviceProxy::GetIpInfo(IpInfo &info) { if (remoteDied_ || remote_ == nullptr) { - WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + WIFI_LOGE("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", __func__, remoteDied_, remote_ == nullptr); return WIFI_OPT_FAILED; } @@ -1011,7 +1011,7 @@ ErrCode WifiDeviceProxy::GetIpInfo(IpInfo &info) ErrCode WifiDeviceProxy::SetCountryCode(const std::string &countryCode) { if (remoteDied_ || remote_ == nullptr) { - WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + WIFI_LOGE("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", __func__, remoteDied_, remote_ == nullptr); return WIFI_OPT_FAILED; } @@ -1039,7 +1039,7 @@ ErrCode WifiDeviceProxy::SetCountryCode(const std::string &countryCode) ErrCode WifiDeviceProxy::GetCountryCode(std::string &countryCode) { if (remoteDied_ || remote_ == nullptr) { - WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + WIFI_LOGE("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", __func__, remoteDied_, remote_ == nullptr); return WIFI_OPT_FAILED; } @@ -1067,7 +1067,7 @@ ErrCode WifiDeviceProxy::GetCountryCode(std::string &countryCode) ErrCode WifiDeviceProxy::RegisterCallBack(const std::shared_ptr &callback) { if (remoteDied_ || remote_ == nullptr) { - WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + WIFI_LOGE("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", __func__, remoteDied_, remote_ == nullptr); return WIFI_OPT_FAILED; } @@ -1103,7 +1103,7 @@ ErrCode WifiDeviceProxy::RegisterCallBack(const std::shared_ptrexception = IpcIoPopInt32(reply); data->retCode = IpcIoPopInt32(reply); - if (data->exception != 0 || data->retCode != WIFI_OPT_SUCCESS) { + if (data->exception != 0 || data->retCode != WIFI_OPT_SUCCESS || data->variable == nullptr) { return LITEIPC_OK; } @@ -187,7 +187,7 @@ ErrCode WifiScanProxy::Init(void) ErrCode WifiScanProxy::SetScanControlInfo(const ScanControlInfo &info) { if (remoteDied_ || remote_ == nullptr) { - WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + WIFI_LOGE("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", __func__, remoteDied_, remote_ == nullptr); return WIFI_OPT_FAILED; } @@ -232,7 +232,7 @@ ErrCode WifiScanProxy::SetScanControlInfo(const ScanControlInfo &info) ErrCode WifiScanProxy::Scan() { if (remoteDied_ || remote_ == nullptr) { - WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + WIFI_LOGE("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", __func__, remoteDied_, remote_ == nullptr); return WIFI_OPT_FAILED; } @@ -260,7 +260,7 @@ ErrCode WifiScanProxy::Scan() ErrCode WifiScanProxy::AdvanceScan(const WifiScanParams ¶ms) { if (remoteDied_ || remote_ == nullptr) { - WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + WIFI_LOGE("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", __func__, remoteDied_, remote_ == nullptr); return WIFI_OPT_FAILED; } @@ -296,7 +296,7 @@ ErrCode WifiScanProxy::AdvanceScan(const WifiScanParams ¶ms) ErrCode WifiScanProxy::IsWifiClosedScan(bool &bOpen) { if (remoteDied_ || remote_ == nullptr) { - WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + WIFI_LOGE("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", __func__, remoteDied_, remote_ == nullptr); return WIFI_OPT_FAILED; } @@ -324,7 +324,7 @@ ErrCode WifiScanProxy::IsWifiClosedScan(bool &bOpen) ErrCode WifiScanProxy::GetScanInfoList(std::vector &result) { if (remoteDied_ || remote_ == nullptr) { - WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + WIFI_LOGE("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", __func__, remoteDied_, remote_ == nullptr); return WIFI_OPT_FAILED; } @@ -352,7 +352,7 @@ ErrCode WifiScanProxy::GetScanInfoList(std::vector &result) ErrCode WifiScanProxy::RegisterCallBack(const std::shared_ptr &callback) { if (remoteDied_ || remote_ == nullptr) { - WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + WIFI_LOGE("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", __func__, remoteDied_, remote_ == nullptr); return WIFI_OPT_FAILED; } @@ -385,7 +385,7 @@ ErrCode WifiScanProxy::RegisterCallBack(const std::shared_ptr ErrCode WifiScanProxy::GetSupportedFeatures(long &features) { if (remoteDied_ || remote_ == nullptr) { - WIFI_LOGD("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", + WIFI_LOGE("failed to %{public}s, remoteDied_: %{public}d, remote_: %{public}d", __func__, remoteDied_, remote_ == nullptr); return WIFI_OPT_FAILED; } @@ -417,4 +417,4 @@ void WifiScanProxy::OnRemoteDied(void) g_wifiScanCallbackStub.SetRemoteDied(true); } } // namespace Wifi -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_callback_proxy.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_callback_proxy.h index 910ddfd..98ebdc4 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_callback_proxy.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_callback_proxy.h @@ -78,11 +78,11 @@ public: private: #ifdef OHOS_ARCH_LITE SvcIdentity *sid_; - static const int DEFAULT_IPC_SIZE = 128; + static const int DEFAULT_IPC_SIZE = 256; #else static inline BrokerDelegator g_delegator; #endif }; } // namespace Wifi } // namespace OHOS -#endif \ No newline at end of file +#endif diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_callback_proxy_lite.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_callback_proxy_lite.cpp index 3c7b8ba..f72677d 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_callback_proxy_lite.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_callback_proxy_lite.cpp @@ -54,8 +54,9 @@ void WifiDeviceCallBackProxy::OnWifiConnectionChanged(int state, const WifiLinke { WIFI_LOGD("WifiDeviceCallBackProxy::OnWifiConnectionChanged"); IpcIo data; - uint8_t buff[DEFAULT_IPC_SIZE]; - IpcIoInit(&data, buff, DEFAULT_IPC_SIZE, 0); + constexpr int IPC_DATA_SIZE = 1024; + uint8_t buff[IPC_DATA_SIZE]; + IpcIoInit(&data, buff, IPC_DATA_SIZE, 0); IpcIoPushInt32(&data, 0); IpcIoPushInt32(&data, state); IpcIoPushInt32(&data, info.networkId); @@ -126,4 +127,4 @@ void WifiDeviceCallBackProxy::OnStreamChanged(int direction) } } } // namespace Wifi -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_callback_proxy.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_callback_proxy.h index 1bc3cec..77e6524 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_callback_proxy.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_callback_proxy.h @@ -41,11 +41,11 @@ public: private: #ifdef OHOS_ARCH_LITE SvcIdentity *sid_; - static const int DEFAULT_IPC_SIZE = 128; + static const int DEFAULT_IPC_SIZE = 256; #else static inline BrokerDelegator g_delegator; #endif }; } // namespace Wifi } // namespace OHOS -#endif \ No newline at end of file +#endif -- Gitee From 47810c09a33caba3f63b147c158ca0ac8798ffc7 Mon Sep 17 00:00:00 2001 From: Goldgom Date: Thu, 19 May 2022 14:32:20 +0000 Subject: [PATCH 124/491] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=B9=B6=E8=A7=84?= =?UTF-8?q?=E8=8C=83=E4=B8=AD=E6=96=87=E5=92=8C=E8=8B=B1=E6=96=87README=20?= =?UTF-8?q?Signed-off-by:=20=E9=92=B1=E6=B8=8A=E9=93=AD=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 +++- README_zh.md | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index c1c3304..0f6c0e9 100644 --- a/README.md +++ b/README.md @@ -216,5 +216,7 @@ Set up a WLAN connection. ## Repositories Involved -communication\_wifi +[DSoftBus](https://gitee.com/openharmony/docs/blob/master/en/readme/dsoftbus.md) + +**communication\_wifi** diff --git a/README_zh.md b/README_zh.md index e2ab448..5c984a2 100644 --- a/README_zh.md +++ b/README_zh.md @@ -214,7 +214,7 @@ import wf from '@ohos.wifi'; // 导入js接口类 ## 相关仓 -分布式软总线子系统 +[分布式软总线子系统](https://gitee.com/openharmony/docs/blob/master/zh-cn/readme/%E5%88%86%E5%B8%83%E5%BC%8F%E8%BD%AF%E6%80%BB%E7%BA%BF%E5%AD%90%E7%B3%BB%E7%BB%9F.md) -communication\_wifi +**communication\_wifi** -- Gitee From 224b9d0a7e08bdbba43a9ce0a28d361ce4c330ae Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Tue, 24 May 2022 02:43:53 +0000 Subject: [PATCH 125/491] fix code check issues Signed-off-by: zhangfeng Change-Id: I3f34135fecb201090d04a23f0a8ba9b54526b667 --- dhcp/services/dhcp_client/src/dhcp_main.c | 8 ++++++++ dhcp/services/mgr_service/src/dhcp_func.cpp | 3 +-- wifi/frameworks/js/napi/inc/wifi_ext_napi_hotspot.h | 2 +- wifi/frameworks/js/napi/src/wifi_ext_napi_hotspot.cpp | 4 ++-- .../wifi_framework/common/net_helper/ipv6_address.cpp | 6 +++++- .../wifi_framework/wifi_manage/wifi_hotspot_stub.cpp | 2 +- 6 files changed, 18 insertions(+), 7 deletions(-) diff --git a/dhcp/services/dhcp_client/src/dhcp_main.c b/dhcp/services/dhcp_client/src/dhcp_main.c index 7dd9beb..31a3dea 100644 --- a/dhcp/services/dhcp_client/src/dhcp_main.c +++ b/dhcp/services/dhcp_client/src/dhcp_main.c @@ -208,6 +208,10 @@ static int GetClientOption(int argc, char *argv[]) static int InitSpecifiedClientCfg(int argc, char *argv[]) { + if (argc < NUMBER_TWO + 1) { + LOGE("parameter error!"); + return DHCP_OPT_FAILED; + } g_cltCfg = GetDhcpClientCfg(); if ((strncpy_s(g_cltCfg->workDir, sizeof(g_cltCfg->workDir), WORKDIR, DIR_MAX_LEN - 1) != EOK) || (strncpy_s(g_cltCfg->ifaceName, sizeof(g_cltCfg->ifaceName), argv[NUMBER_TWO], INFNAME_SIZE - 1) != EOK)) { @@ -367,6 +371,10 @@ int main(int argc, char *argv[]) } /* Exec the specified client process ACTION. */ + if (argc < NUMBER_ONE + 1) { + LOGE("parameter number is error!"); + return EXIT_FAILURE; + } const char *cmdParam = argv[NUMBER_ONE]; int nExec = ExecClientProAction(cmdParam); if (nExec != 0) { diff --git a/dhcp/services/mgr_service/src/dhcp_func.cpp b/dhcp/services/mgr_service/src/dhcp_func.cpp index bf4f233..93a35e0 100644 --- a/dhcp/services/mgr_service/src/dhcp_func.cpp +++ b/dhcp/services/mgr_service/src/dhcp_func.cpp @@ -510,8 +510,7 @@ int DhcpFunc::GetDhcpPacketResult(const std::string& filename, struct DhcpPacket } if (fclose(pFile) != 0) { - WIFI_LOGE("GetDhcpPacketResult() fclose file:%{public}s failed, error:%{public}s!", - filename.c_str(), strerror(errno)); + WIFI_LOGE("GetDhcpPacketResult() fclose file:%{public}s failed!", filename.c_str()); return DHCP_OPT_FAILED; } diff --git a/wifi/frameworks/js/napi/inc/wifi_ext_napi_hotspot.h b/wifi/frameworks/js/napi/inc/wifi_ext_napi_hotspot.h index 5703226..cf76a2a 100644 --- a/wifi/frameworks/js/napi/inc/wifi_ext_napi_hotspot.h +++ b/wifi/frameworks/js/napi/inc/wifi_ext_napi_hotspot.h @@ -33,7 +33,7 @@ public: PowerModel powerModel; PowerModelAsyncContext(napi_env env, napi_async_work work = nullptr, napi_deferred deferred = nullptr) - : AsyncContext(env, work, deferred) {} + : AsyncContext(env, work, deferred), powerModel(PowerModel::GENERAL) {} PowerModelAsyncContext() = delete; ~PowerModelAsyncContext() override {} diff --git a/wifi/frameworks/js/napi/src/wifi_ext_napi_hotspot.cpp b/wifi/frameworks/js/napi/src/wifi_ext_napi_hotspot.cpp index 31d34cb..4a2e50f 100644 --- a/wifi/frameworks/js/napi/src/wifi_ext_napi_hotspot.cpp +++ b/wifi/frameworks/js/napi/src/wifi_ext_napi_hotspot.cpp @@ -78,7 +78,7 @@ napi_value GetSupportedPowerModel(napi_env env, napi_callback_info info) void *data = nullptr; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data)); - PowerModelListAsyncContext *asyncContext = new PowerModelListAsyncContext(env); + PowerModelListAsyncContext *asyncContext = new (std::nothrow) PowerModelListAsyncContext(env); NAPI_ASSERT(env, asyncContext != nullptr, "asyncContext is null."); napi_create_string_latin1(env, "getSupportedPowerModel", NAPI_AUTO_LENGTH, &asyncContext->resourceName); @@ -113,7 +113,7 @@ napi_value GetPowerModel(napi_env env, napi_callback_info info) void *data = nullptr; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data)); - PowerModelAsyncContext *asyncContext = new PowerModelAsyncContext(env); + PowerModelAsyncContext *asyncContext = new (std::nothrow) PowerModelAsyncContext(env); NAPI_ASSERT(env, asyncContext != nullptr, "asyncContext is null."); napi_create_string_latin1(env, "getPowerModel", NAPI_AUTO_LENGTH, &asyncContext->resourceName); diff --git a/wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.cpp b/wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.cpp index eaa5aed..ca6f507 100644 --- a/wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.cpp +++ b/wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -268,6 +268,10 @@ std::string Ipv6Address::GetRandomAddr(const std::string &ipv6Prefix, int prefix inet_pton(AF_INET6, resHex.c_str(), &rndAddr); struct in6_addr ipv6Addr = IN6ADDR_ANY_INIT; inet_pton(AF_INET6, ipv6Prefix.c_str(), &ipv6Addr); + if (prefixLength < 0 || (prefixLength / CHAR_BIT) >= sizeof(rndAddr.s6_addr)) { + LOGE("Get random address error: prefix"); + return ""; + } ipv6Addr.s6_addr[prefixLength / CHAR_BIT] |= rndAddr.s6_addr[prefixLength / CHAR_BIT]; for (int n = prefixLength / CHAR_BIT + 1; n < MAX_IPV6_PREFIX_LENGTH / CHAR_BIT; ++n) { ipv6Addr.s6_addr[n] = rndAddr.s6_addr[n]; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.cpp index 754b2c9..6dd9e25 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.cpp @@ -345,7 +345,7 @@ void WifiHotspotStub::OnGetSupportedPowerModel(uint32_t code, MessageParcel &dat reply.WriteInt32(0); reply.WriteInt32(ret); if (ret == WIFI_OPT_SUCCESS) { - int size = setPowerModelList.size(); + int size = (int)setPowerModelList.size(); reply.WriteInt32(size); for (auto &powerModel : setPowerModelList) { reply.WriteInt32(static_cast(powerModel)); -- Gitee From fb6a163e1b391a44da0757bd1b63ad8f345bb9a1 Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Tue, 24 May 2022 21:14:58 +0800 Subject: [PATCH 126/491] bugfix from master 0524 Signed-off-by: yanxiaotao --- wifi/frameworks/js/napi/src/wifi_napi_hotspot.cpp | 3 +++ .../wifi_manage/wifi_sta/sta_auto_connect_service.cpp | 2 ++ 2 files changed, 5 insertions(+) diff --git a/wifi/frameworks/js/napi/src/wifi_napi_hotspot.cpp b/wifi/frameworks/js/napi/src/wifi_napi_hotspot.cpp index 66ad7ad..8759993 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_hotspot.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_hotspot.cpp @@ -110,6 +110,9 @@ static bool GetHotspotconfigFromJs(const napi_env& env, const napi_value& object value = 0; JsObjectToInt(env, object, "band", value); config.SetBand(BandType(value)); // 1: 2.4G, 2: 5G + if (config.GetBand() == BAND_5GHZ) { + config.SetChannel(AP_CHANNEL_5G_DEFAULT); + } value = 0; JsObjectToString(env, object, "preSharedKey", 64, str); // 64: max length config.SetPreSharedKey(str); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp index 3a1a76e..435b07d 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp @@ -157,6 +157,7 @@ void StaAutoConnectService::ClearOvertimeBlockedBssid() { WIFI_LOGI("Enter StaAutoConnectService::ClearOvertimeBlockedBssid.\n"); if (blockedBssidMap.empty()) { + WIFI_LOGI("blockedBssidMap is empty !\n"); return; } bool updated = false; @@ -165,6 +166,7 @@ void StaAutoConnectService::ClearOvertimeBlockedBssid() BlockedBssidInfo status = iter->second; time_t now = time(0); int currentTimeStap = (int)now; + WIFI_LOGI("blockedFlag:%{public}d, currentTimeStap:%{public}d, blockedTime:%{public}d.\n"); if (status.blockedFlag && ((currentTimeStap - status.blockedTime) >= MAX_BSSID_BLOCKLIST_TIME)) { blockedBssidMap.erase(iter++); updated = true; -- Gitee From bfe84e87e8ebe684fc3c91d798a6623af7974154 Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Tue, 24 May 2022 21:23:33 +0800 Subject: [PATCH 127/491] bugfix from master 0524 Signed-off-by: yanxiaotao --- .../wifi_manage/wifi_sta/sta_auto_connect_service.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp index 435b07d..a4b0c8b 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp @@ -166,7 +166,8 @@ void StaAutoConnectService::ClearOvertimeBlockedBssid() BlockedBssidInfo status = iter->second; time_t now = time(0); int currentTimeStap = (int)now; - WIFI_LOGI("blockedFlag:%{public}d, currentTimeStap:%{public}d, blockedTime:%{public}d.\n"); + WIFI_LOGI("blockedFlag:%{public}d, currentTimeStap:%{public}d, blockedTime:%{public}d.\n", + status.blockedFlag, currentTimeStap, status.blockedTime); if (status.blockedFlag && ((currentTimeStap - status.blockedTime) >= MAX_BSSID_BLOCKLIST_TIME)) { blockedBssidMap.erase(iter++); updated = true; -- Gitee From 97ca8366bd4a9b47848ed49615161735a5afd0a2 Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Wed, 25 May 2022 07:52:26 +0800 Subject: [PATCH 128/491] bugfix from master 0524 Signed-off-by: yanxiaotao --- wifi/frameworks/js/napi/src/wifi_napi_hotspot.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/frameworks/js/napi/src/wifi_napi_hotspot.cpp b/wifi/frameworks/js/napi/src/wifi_napi_hotspot.cpp index 8759993..ddfb4a5 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_hotspot.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_hotspot.cpp @@ -110,7 +110,7 @@ static bool GetHotspotconfigFromJs(const napi_env& env, const napi_value& object value = 0; JsObjectToInt(env, object, "band", value); config.SetBand(BandType(value)); // 1: 2.4G, 2: 5G - if (config.GetBand() == BAND_5GHZ) { + if (config.GetBand() == BandType::BAND_5GHZ) { config.SetChannel(AP_CHANNEL_5G_DEFAULT); } value = 0; -- Gitee From 1a542ddf34a3c28f1565508639be1d657baa42c1 Mon Sep 17 00:00:00 2001 From: lujunxin Date: Wed, 25 May 2022 14:48:16 +0800 Subject: [PATCH 129/491] fix crash in arm64 version Signed-off-by: lujunxin --- dhcp/services/dhcp_server/src/dhcp_server.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dhcp/services/dhcp_server/src/dhcp_server.c b/dhcp/services/dhcp_server/src/dhcp_server.c index f4da3f9..ba138a6 100644 --- a/dhcp/services/dhcp_server/src/dhcp_server.c +++ b/dhcp/services/dhcp_server/src/dhcp_server.c @@ -495,8 +495,8 @@ static int ContinueReceive(PDhcpMsgInfo from, int recvRet) static int BeginLooper(PDhcpServerContext ctx) { - DhcpMsgInfo from; - DhcpMsgInfo reply; + DhcpMsgInfo from = { 0 }; + DhcpMsgInfo reply = { 0 }; ServerContext *srvIns = GetServerInstance(ctx); if (!srvIns) { LOGE("dhcp server context pointer is null."); -- Gitee From 4205d0acd3ccaa1e959afb4b38cef1560be5b477 Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Thu, 26 May 2022 17:53:48 +0800 Subject: [PATCH 130/491] bugfix from master 0526 Signed-off-by: yanxiaotao --- .../wifi_manage/wifi_scan/scan_service.cpp | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp index 8b4b883..3487d3d 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp @@ -561,10 +561,13 @@ bool ScanService::StoreFullScanInfo( const StoreScanConfig &scanConfig, const std::vector &scanInfoList) { WIFI_LOGI("Enter ScanService::StoreFullScanInfo.\n"); - /* Filtering result. */ WIFI_LOGI("scanConfig.scanTime is %" PRIu64 ".\n", scanConfig.scanTime); WIFI_LOGI("Receive %{public}d scan results.\n", (int)(scanInfoList.size())); + if (scanInfoList.size() == 0) { + /* Don't overwrite ScanInfoList */ + return true; + } std::vector storeInfoList; for (auto iter = scanInfoList.begin(); iter != scanInfoList.end(); ++iter) { @@ -585,6 +588,20 @@ bool ScanService::StoreFullScanInfo( storeInfoList.push_back(scanInfo); } + std::vector results; + int ret = WifiSettings::GetInstance().GetScanInfoList(results); + if (ret != 0) { + WIFI_LOGW("GetScanInfoList return error. \n"); + } + for (auto iter = results.begin(); iter != results.end(); ++iter) { + for (auto storedIter = storeInfoList.begin(); storedIter != storeInfoList.end(); ++storedIter) { + if (iter->bssid == storedIter->bssid) { + break; + } + } + storeInfoList.push_back(*iter); + } + if (WifiSettings::GetInstance().SaveScanInfoList(storeInfoList) != 0) { WIFI_LOGE("WifiSettings::GetInstance().SaveScanInfoList failed.\n"); return false; -- Gitee From ad03f9bfcb16ea53a2ad2fedd5eaa7ff43190fad Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Thu, 26 May 2022 23:13:31 +0800 Subject: [PATCH 131/491] bugfix from master 0526 Signed-off-by: yanxiaotao --- .../wifi_framework/wifi_manage/wifi_scan/scan_service.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp index 3487d3d..271e9cb 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp @@ -594,12 +594,16 @@ bool ScanService::StoreFullScanInfo( WIFI_LOGW("GetScanInfoList return error. \n"); } for (auto iter = results.begin(); iter != results.end(); ++iter) { + bool find = false; for (auto storedIter = storeInfoList.begin(); storedIter != storeInfoList.end(); ++storedIter) { if (iter->bssid == storedIter->bssid) { + find = true; break; } } - storeInfoList.push_back(*iter); + if (!find) { + storeInfoList.push_back(*iter); + } } if (WifiSettings::GetInstance().SaveScanInfoList(storeInfoList) != 0) { -- Gitee From 6b4045838c5349882a6011ecb40b8398492085d6 Mon Sep 17 00:00:00 2001 From: z00588131 Date: Fri, 27 May 2022 15:04:45 +0800 Subject: [PATCH 132/491] Solve warnings of clang compiler update to version-12 Signed-off-by: z00588131 --- .../wifi_standard/wifi_hal/wifi_hal_adapter.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_adapter.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_adapter.c index 3db5031..60a6c09 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_adapter.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_adapter.c @@ -29,6 +29,8 @@ WifiHalVendorInterface *g_wifiHalVendorInterface = NULL; #define MODULE_NAME_MAX_LEN 256 #define MODULE_CONFIG_FILE_PATH "/data/misc/wifi/wifi_hal_vendor.conf" +#define PATH_NUM 2 +#define BUFF_SIZE 256 static int ReadConfigModuleName(char *name, int size) { @@ -155,13 +157,6 @@ int ExcuteCmd(const char *szCmd) int CopyConfigFile(const char* configName) { -#ifdef OHOS_ARCH_LITE -#define PATH_NUM 2 -#define BUFF_SIZE 256 -#else - const int PATH_NUM = 2; - const int BUFF_SIZE = 256; -#endif char buf[BUFF_SIZE] = {0}; if (snprintf_s(buf, sizeof(buf), sizeof(buf) - 1, "/data/misc/wifi/wpa_supplicant/%s", configName) < 0) { LOGE("snprintf_s dest dir failed."); @@ -188,4 +183,4 @@ int CopyConfigFile(const char* configName) } LOGE("Copy config file failed: %{public}s", configName); return -1; -} \ No newline at end of file +} -- Gitee From 377c40631c1c5c38aef88c7557d948a90b27a400 Mon Sep 17 00:00:00 2001 From: lujunxin Date: Fri, 27 May 2022 16:23:38 +0800 Subject: [PATCH 133/491] fix type convert issue Signed-off-by: lujunxin --- wifi/frameworks/native/src/wifi_device_proxy_lite.cpp | 2 +- wifi/frameworks/native/src/wifi_scan_proxy_lite.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wifi/frameworks/native/src/wifi_device_proxy_lite.cpp b/wifi/frameworks/native/src/wifi_device_proxy_lite.cpp index c479b5c..30599a7 100644 --- a/wifi/frameworks/native/src/wifi_device_proxy_lite.cpp +++ b/wifi/frameworks/native/src/wifi_device_proxy_lite.cpp @@ -183,7 +183,7 @@ static int IpcCallback(void *owner, int code, IpcIo *reply) break; } case WIFI_SVR_CMD_GET_SUPPORTED_FEATURES: { - *((int64_t *)data->variable) = IpcIoPopInt64(reply); + *((long *)data->variable) = IpcIoPopInt64(reply); break; } case WIFI_SVR_CMD_GET_DEVICE_CONFIGS: { diff --git a/wifi/frameworks/native/src/wifi_scan_proxy_lite.cpp b/wifi/frameworks/native/src/wifi_scan_proxy_lite.cpp index ea06690..cdf3a4b 100644 --- a/wifi/frameworks/native/src/wifi_scan_proxy_lite.cpp +++ b/wifi/frameworks/native/src/wifi_scan_proxy_lite.cpp @@ -94,7 +94,7 @@ static int IpcCallback(void *owner, int code, IpcIo *reply) break; } case WIFI_SVR_CMD_GET_SUPPORTED_FEATURES: { - *((int64_t *)data->variable) = IpcIoPopInt64(reply); + *((long *)data->variable) = IpcIoPopInt64(reply); break; } case WIFI_SVR_CMD_GET_SCAN_INFO_LIST: { -- Gitee From ecc9192509e4531dd97dd9c5b5db15de30935c18 Mon Sep 17 00:00:00 2001 From: z00588131 Date: Fri, 27 May 2022 14:48:18 +0800 Subject: [PATCH 134/491] add wifi fuzzer testcases Signed-off-by: z00588131 --- wifi/bundle.json | 1 + .../fuzz_common_func/wifi_fuzz_common_func.h | 35 +++++++++++++ wifi/test/fuzztest/wifi_sta/BUILD.gn | 23 +++++++++ .../wifi_sta/adddeviceconfig_fuzzer/BUILD.gn | 50 +++++++++++++++++++ .../adddeviceconfig_fuzzer.cpp | 45 +++++++++++++++++ .../adddeviceconfig_fuzzer.h | 21 ++++++++ .../adddeviceconfig_fuzzer/corpus/init | 16 ++++++ .../adddeviceconfig_fuzzer/project.xml | 25 ++++++++++ .../wifi_sta/connecttodevice_fuzzer/BUILD.gn | 50 +++++++++++++++++++ .../connecttodevice_fuzzer.cpp | 45 +++++++++++++++++ .../connecttodevice_fuzzer.h | 21 ++++++++ .../connecttodevice_fuzzer/corpus/init | 16 ++++++ .../connecttodevice_fuzzer/project.xml | 25 ++++++++++ 13 files changed, 373 insertions(+) create mode 100755 wifi/test/fuzztest/fuzz_common_func/wifi_fuzz_common_func.h create mode 100755 wifi/test/fuzztest/wifi_sta/BUILD.gn create mode 100644 wifi/test/fuzztest/wifi_sta/adddeviceconfig_fuzzer/BUILD.gn create mode 100644 wifi/test/fuzztest/wifi_sta/adddeviceconfig_fuzzer/adddeviceconfig_fuzzer.cpp create mode 100644 wifi/test/fuzztest/wifi_sta/adddeviceconfig_fuzzer/adddeviceconfig_fuzzer.h create mode 100644 wifi/test/fuzztest/wifi_sta/adddeviceconfig_fuzzer/corpus/init create mode 100644 wifi/test/fuzztest/wifi_sta/adddeviceconfig_fuzzer/project.xml create mode 100644 wifi/test/fuzztest/wifi_sta/connecttodevice_fuzzer/BUILD.gn create mode 100644 wifi/test/fuzztest/wifi_sta/connecttodevice_fuzzer/connecttodevice_fuzzer.cpp create mode 100644 wifi/test/fuzztest/wifi_sta/connecttodevice_fuzzer/connecttodevice_fuzzer.h create mode 100644 wifi/test/fuzztest/wifi_sta/connecttodevice_fuzzer/corpus/init create mode 100644 wifi/test/fuzztest/wifi_sta/connecttodevice_fuzzer/project.xml diff --git a/wifi/bundle.json b/wifi/bundle.json index 80cce2f..bf7bcdb 100644 --- a/wifi/bundle.json +++ b/wifi/bundle.json @@ -105,6 +105,7 @@ } ], "test": [ + "//foundation/communication/wifi/wifi/test/fuzztest/wifi_sta:fuzztest" ] }, "hisysevent_config": [ diff --git a/wifi/test/fuzztest/fuzz_common_func/wifi_fuzz_common_func.h b/wifi/test/fuzztest/fuzz_common_func/wifi_fuzz_common_func.h new file mode 100755 index 0000000..6af1bb7 --- /dev/null +++ b/wifi/test/fuzztest/fuzz_common_func/wifi_fuzz_common_func.h @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef WIFI_FUZZ_COMMON_FUNC_H_ +#define WIFI_FUZZ_COMMON_FUNC_H_ + +#include + +namespace OHOS { +namespace Wifi { +inline uint16_t U16_AT(const uint8_t* data) +{ + return (data[0] << 8) | data[1]; +} + +inline uint32_t U32_AT(const uint8_t* data) +{ + return (data[0] << 24) | (data[1] << 16) | (data[2] << 8) | data[3]; +} +} // namespace Wifi +} // namespace OHOS +#endif + diff --git a/wifi/test/fuzztest/wifi_sta/BUILD.gn b/wifi/test/fuzztest/wifi_sta/BUILD.gn new file mode 100755 index 0000000..2f851f6 --- /dev/null +++ b/wifi/test/fuzztest/wifi_sta/BUILD.gn @@ -0,0 +1,23 @@ +# Copyright (C) 2022 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import("//build/test.gni") +group("fuzztest") { + testonly = true + deps = [] + + deps += [ + "adddeviceconfig_fuzzer:AddDeviceConfigFuzzTest", + "connecttodevice_fuzzer:ConnectToDeviceFuzzTest", + ] +} diff --git a/wifi/test/fuzztest/wifi_sta/adddeviceconfig_fuzzer/BUILD.gn b/wifi/test/fuzztest/wifi_sta/adddeviceconfig_fuzzer/BUILD.gn new file mode 100644 index 0000000..265a8f4 --- /dev/null +++ b/wifi/test/fuzztest/wifi_sta/adddeviceconfig_fuzzer/BUILD.gn @@ -0,0 +1,50 @@ +# Copyright (C) 2022 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +#####################hydra-fuzz################### +import("//build/config/features.gni") +import("//build/test.gni") +import("//foundation/communication/wifi/wifi/wifi.gni") +module_output_path = "wifi/wifi_sta" + +##############################fuzztest########################################## +ohos_fuzztest("AddDeviceConfigFuzzTest") { + module_out_path = module_output_path + fuzz_config_file = + "$WIFI_ROOT_DIR/test/fuzztest/wifi_sta/adddeviceconfig_fuzzer" + + include_dirs = [ + "$WIFI_ROOT_DIR/frameworks/native/include", + "$WIFI_ROOT_DIR/frameworks/native/interfaces", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", + "$WIFI_ROOT_DIR/test/fuzztest/fuzz_common_func", + ] + + cflags = [ + "-g", + "-O0", + "-Wno-unused-variable", + "-fno-omit-frame-pointer", + ] + sources = [ "adddeviceconfig_fuzzer.cpp" ] + + deps = [ + "$WIFI_ROOT_DIR/frameworks/native:wifi_sdk", + "//utils/native/base:utils", + ] + + external_deps = [ "ipc:ipc_core" ] + + part_name = "wifi" + subsystem_name = "communication" +} diff --git a/wifi/test/fuzztest/wifi_sta/adddeviceconfig_fuzzer/adddeviceconfig_fuzzer.cpp b/wifi/test/fuzztest/wifi_sta/adddeviceconfig_fuzzer/adddeviceconfig_fuzzer.cpp new file mode 100644 index 0000000..fcfa532 --- /dev/null +++ b/wifi/test/fuzztest/wifi_sta/adddeviceconfig_fuzzer/adddeviceconfig_fuzzer.cpp @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "adddeviceconfig_fuzzer.h" +#include "wifi_device.h" + +namespace OHOS { +namespace Wifi { + bool AddDeviceConfigFuzzerTest(const uint8_t* data, size_t size) + { + std::unique_ptr devicePtr = WifiDevice::GetInstance(WIFI_DEVICE_ABILITY_ID); + if (devicePtr == nullptr) { + return false; + } + + WifiDeviceConfig config; + int addResult; + config.ssid = std::string(reinterpret_cast(data), size); + config.bssid = std::string(reinterpret_cast(data), size); + config.preSharedKey = std::string(reinterpret_cast(data), size); + config.keyMgmt = std::string(reinterpret_cast(data), size); + devicePtr->AddDeviceConfig(config, addResult); + return true; + } +} // namespace Wifi +} // namespace OHOS + +/* Fuzzer entry point */ +extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) +{ + OHOS::Wifi::AddDeviceConfigFuzzerTest(data, size); + return 0; +} diff --git a/wifi/test/fuzztest/wifi_sta/adddeviceconfig_fuzzer/adddeviceconfig_fuzzer.h b/wifi/test/fuzztest/wifi_sta/adddeviceconfig_fuzzer/adddeviceconfig_fuzzer.h new file mode 100644 index 0000000..9ca90cc --- /dev/null +++ b/wifi/test/fuzztest/wifi_sta/adddeviceconfig_fuzzer/adddeviceconfig_fuzzer.h @@ -0,0 +1,21 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef WIFI_FUZZ_ADD_DEVICE_CONFIG_H_ +#define WIFI_FUZZ_ADD_DEVICE_CONFIG_H_ + +#define FUZZ_PROJECT_NAME "adddeviceconfig_fuzzer" + +#endif \ No newline at end of file diff --git a/wifi/test/fuzztest/wifi_sta/adddeviceconfig_fuzzer/corpus/init b/wifi/test/fuzztest/wifi_sta/adddeviceconfig_fuzzer/corpus/init new file mode 100644 index 0000000..088eee3 --- /dev/null +++ b/wifi/test/fuzztest/wifi_sta/adddeviceconfig_fuzzer/corpus/init @@ -0,0 +1,16 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +FUZZ \ No newline at end of file diff --git a/wifi/test/fuzztest/wifi_sta/adddeviceconfig_fuzzer/project.xml b/wifi/test/fuzztest/wifi_sta/adddeviceconfig_fuzzer/project.xml new file mode 100644 index 0000000..5e3b584 --- /dev/null +++ b/wifi/test/fuzztest/wifi_sta/adddeviceconfig_fuzzer/project.xml @@ -0,0 +1,25 @@ + + + + + + 1000 + + 300 + + 4096 + + diff --git a/wifi/test/fuzztest/wifi_sta/connecttodevice_fuzzer/BUILD.gn b/wifi/test/fuzztest/wifi_sta/connecttodevice_fuzzer/BUILD.gn new file mode 100644 index 0000000..3ecfdce --- /dev/null +++ b/wifi/test/fuzztest/wifi_sta/connecttodevice_fuzzer/BUILD.gn @@ -0,0 +1,50 @@ +# Copyright (C) 2022 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +#####################hydra-fuzz################### +import("//build/config/features.gni") +import("//build/test.gni") +import("//foundation/communication/wifi/wifi/wifi.gni") +module_output_path = "wifi/wifi_sta" + +##############################fuzztest########################################## +ohos_fuzztest("ConnectToDeviceFuzzTest") { + module_out_path = module_output_path + fuzz_config_file = + "$WIFI_ROOT_DIR/test/fuzztest/wifi_sta/connecttodevice_fuzzer" + + include_dirs = [ + "$WIFI_ROOT_DIR/frameworks/native/include", + "$WIFI_ROOT_DIR/frameworks/native/interfaces", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", + "$WIFI_ROOT_DIR/test/fuzztest/fuzz_common_func", + ] + + cflags = [ + "-g", + "-O0", + "-Wno-unused-variable", + "-fno-omit-frame-pointer", + ] + sources = [ "connecttodevice_fuzzer.cpp" ] + + deps = [ + "$WIFI_ROOT_DIR/frameworks/native:wifi_sdk", + "//utils/native/base:utils", + ] + + external_deps = [ "ipc:ipc_core" ] + + part_name = "wifi" + subsystem_name = "communication" +} diff --git a/wifi/test/fuzztest/wifi_sta/connecttodevice_fuzzer/connecttodevice_fuzzer.cpp b/wifi/test/fuzztest/wifi_sta/connecttodevice_fuzzer/connecttodevice_fuzzer.cpp new file mode 100644 index 0000000..ffe935d --- /dev/null +++ b/wifi/test/fuzztest/wifi_sta/connecttodevice_fuzzer/connecttodevice_fuzzer.cpp @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "connecttodevice_fuzzer.h" +#include "wifi_device.h" + +namespace OHOS { +namespace Wifi { + bool ConnectToDeviceFuzzerTest(const uint8_t* data, size_t size) + { + std::unique_ptr devicePtr = WifiDevice::GetInstance(WIFI_DEVICE_ABILITY_ID); + if (devicePtr == nullptr) { + return false; + } + + WifiDeviceConfig config; + config.ssid = std::string(reinterpret_cast(data), size); + config.bssid = std::string(reinterpret_cast(data), size); + config.preSharedKey = std::string(reinterpret_cast(data), size); + config.keyMgmt = std::string(reinterpret_cast(data), size); + devicePtr->ConnectToDevice(config); + return true; + } +} // namespace Wifi +} // namespace OHOS + +/* Fuzzer entry point */ +extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) +{ + OHOS::Wifi::ConnectToDeviceFuzzerTest(data, size); + return 0; +} + diff --git a/wifi/test/fuzztest/wifi_sta/connecttodevice_fuzzer/connecttodevice_fuzzer.h b/wifi/test/fuzztest/wifi_sta/connecttodevice_fuzzer/connecttodevice_fuzzer.h new file mode 100644 index 0000000..f1f7f20 --- /dev/null +++ b/wifi/test/fuzztest/wifi_sta/connecttodevice_fuzzer/connecttodevice_fuzzer.h @@ -0,0 +1,21 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef WIFI_FUZZ_CONNECT_TO_DEVICE_H_ +#define WIFI_FUZZ_CONNECT_TO_DEVICE_H_ + +#define FUZZ_PROJECT_NAME "connecttodevice_fuzzer" + +#endif diff --git a/wifi/test/fuzztest/wifi_sta/connecttodevice_fuzzer/corpus/init b/wifi/test/fuzztest/wifi_sta/connecttodevice_fuzzer/corpus/init new file mode 100644 index 0000000..088eee3 --- /dev/null +++ b/wifi/test/fuzztest/wifi_sta/connecttodevice_fuzzer/corpus/init @@ -0,0 +1,16 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +FUZZ \ No newline at end of file diff --git a/wifi/test/fuzztest/wifi_sta/connecttodevice_fuzzer/project.xml b/wifi/test/fuzztest/wifi_sta/connecttodevice_fuzzer/project.xml new file mode 100644 index 0000000..5e3b584 --- /dev/null +++ b/wifi/test/fuzztest/wifi_sta/connecttodevice_fuzzer/project.xml @@ -0,0 +1,25 @@ + + + + + + 1000 + + 300 + + 4096 + + -- Gitee From e9b2c06edbde759d6f06a3e9d5b0d8b1746a7232 Mon Sep 17 00:00:00 2001 From: y00316381 Date: Fri, 27 May 2022 20:12:26 +0800 Subject: [PATCH 135/491] bugfix from master Signed-off-by: y00316381 --- .../wifi_manage/wifi_scan/scan_service.cpp | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp index 271e9cb..b615c60 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp @@ -198,7 +198,7 @@ void ScanService::HandleInnerEventReport(ScanInnerEventType innerEvent) ErrCode ScanService::Scan(bool externFlag) { - WIFI_LOGI("Enter ScanService::Scan[%{public}d]\n", externFlag); + WIFI_LOGI("Enter ScanService::Scan, externFlag:%{public}d.\n", externFlag); if (!scanStartedFlag) { WIFI_LOGE("Scan service has not started.\n"); return WIFI_OPT_FAILED; @@ -1072,28 +1072,28 @@ ErrCode ScanService::AllowExternScan() WIFI_LOGI("Enter ScanService::AllowExternScan.\n"); int staScene = GetStaScene(); ScanMode scanMode = WifiSettings::GetInstance().GetAppRunningState(); - WIFI_LOGD("staScene is %{public}d, scanMode is %{public}d", staScene, (int)scanMode); + WIFI_LOGI("staScene is %{public}d, scanMode is %{public}d", staScene, (int)scanMode); if (!AllowExternScanByForbid(staScene, scanMode)) { - WIFI_LOGD("extern scan not allow by forbid mode"); + WIFI_LOGW("extern scan not allow by forbid mode"); return WIFI_OPT_FAILED; } int appId = 0; if (!AllowExternScanByInterval(appId, staScene, scanMode)) { - WIFI_LOGD("extern scan not allow by interval mode"); + WIFI_LOGW("extern scan not allow by interval mode"); return WIFI_OPT_FAILED; } if (!AllowScanByMovingFreeze()) { - WIFI_LOGD("extern scan not allow by moving freeze mode"); + WIFI_LOGW("extern scan not allow by moving freeze mode"); return WIFI_OPT_MOVING_FREEZE_CTRL; } if (!AllowScanByDisableScanCtrl()) { - WIFI_LOGD("extern scan not allow by disable scan control."); + WIFI_LOGW("extern scan not allow by disable scan control."); return WIFI_OPT_FAILED; } - WIFI_LOGD("extern scan has allowed"); + WIFI_LOGI("extern scan has allowed"); return WIFI_OPT_SUCCESS; } @@ -1225,7 +1225,7 @@ ErrCode ScanService::AllowScanByType(ScanType scanType) break; } - WIFI_LOGD("AllowScanByType ErrCode=%{public}d.", static_cast(allScanResult)); + WIFI_LOGW("AllowScanByType ErrCode=%{public}d.", static_cast(allScanResult)); return allScanResult; } @@ -1304,9 +1304,7 @@ ErrCode ScanService::ApplyTrustListPolicy(ScanType scanType) WIFI_LOGD("AllowScanByType failed."); } ResetToNonTrustMode(); - WIFI_LOGD("ResetToNonTrustMode"); - - WIFI_LOGD("apply trust list policy, ErrCode=%{public}d", static_cast(policyResult)); + WIFI_LOGI("apply trust list policy, ErrCode=%{public}d", static_cast(policyResult)); return policyResult; } @@ -1321,7 +1319,7 @@ ErrCode ScanService::ApplyScanPolices(ScanType type) ErrCode rlt = WIFI_OPT_SUCCESS; if (appPackageName.empty()) { rlt = AllowScanByType(type); - WIFI_LOGD("appPackageName empty, apply scan polices ErrCode=%{public}d.", static_cast(rlt)); + WIFI_LOGW("appPackageName empty, apply scan polices ErrCode=%{public}d.", static_cast(rlt)); if (scanResultBackup != -1 && rlt == WIFI_OPT_MOVING_FREEZE_CTRL) { mScanSerivceCallbacks.OnScanFinishEvent(scanResultBackup); } @@ -1644,6 +1642,7 @@ bool ScanService::GetHiddenNetworkSsidList(std::vector &hiddenNetwo } } + WIFI_LOGI("Find %{public}d hidden NetworkSsid.\n", hiddenNetworkSsid.size()); return true; } @@ -1717,6 +1716,7 @@ bool ScanService::AllowScanDuringStaScene(int staScene, ScanMode scanMode) time_t now = time(nullptr); if (now < 0) { + WIFI_LOGW("time return invalid!\n."); return false; } std::unique_lock lock(scanControlInfoMutex); @@ -1727,18 +1727,18 @@ bool ScanService::AllowScanDuringStaScene(int staScene, ScanMode scanMode) if (iter->scanScene == staScene && iter->scanMode == scanMode) { /* forbidCount=0 and forbidTime=0, directly forbid scan. */ if ((iter->forbidTime == 0) && (iter->forbidCount == 0)) { - WIFI_LOGD("Scan is forbidden by staScene."); + WIFI_LOGW("Scan is forbidden by staScene."); return false; } /* Unconditional scan control for forbidCount times */ if ((iter->forbidCount > 0) && (iter->forbidCount - staSceneForbidCount > 0)) { - WIFI_LOGD("Scan is forbidden in forbidCount."); + WIFI_LOGW("Scan is forbidden in forbidCount."); staSceneForbidCount++; return false; } /* Scan interval less than forbidTime, forbid scan. */ if ((iter->forbidTime > 0) && (now - staCurrentTime <= iter->forbidTime)) { - WIFI_LOGD("Scan is forbidden in forbidTime."); + WIFI_LOGW("Scan is forbidden in forbidTime."); return false; } } -- Gitee From 8b407d822d63656f8d128654a0566ea4590b247b Mon Sep 17 00:00:00 2001 From: y00316381 Date: Fri, 27 May 2022 20:34:04 +0800 Subject: [PATCH 136/491] bugfix from master Signed-off-by: y00316381 --- .../wifi_framework/wifi_manage/wifi_scan/scan_service.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp index b615c60..88a1a97 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp @@ -1642,7 +1642,7 @@ bool ScanService::GetHiddenNetworkSsidList(std::vector &hiddenNetwo } } - WIFI_LOGI("Find %{public}d hidden NetworkSsid.\n", hiddenNetworkSsid.size()); + WIFI_LOGI("Find %{public}lu hidden NetworkSsid.\n", hiddenNetworkSsid.size()); return true; } -- Gitee From 294fef0e4cb6761b021143f2d5512bb11aea0f95 Mon Sep 17 00:00:00 2001 From: y00316381 Date: Fri, 27 May 2022 20:50:53 +0800 Subject: [PATCH 137/491] bugfix from master Signed-off-by: y00316381 --- .../wifi_framework/wifi_manage/wifi_scan/scan_service.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp index 88a1a97..d14b512 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp @@ -1642,7 +1642,7 @@ bool ScanService::GetHiddenNetworkSsidList(std::vector &hiddenNetwo } } - WIFI_LOGI("Find %{public}lu hidden NetworkSsid.\n", hiddenNetworkSsid.size()); + WIFI_LOGI("Find %{public}u hidden NetworkSsid.\n", hiddenNetworkSsid.size()); return true; } -- Gitee From bf04c0ac66646daeb03fc7217c5efb4beea5bb32 Mon Sep 17 00:00:00 2001 From: y00316381 Date: Fri, 27 May 2022 21:07:02 +0800 Subject: [PATCH 138/491] bugfix from master Signed-off-by: y00316381 --- .../wifi_framework/wifi_manage/wifi_scan/scan_service.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp index d14b512..812334b 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp @@ -1642,7 +1642,7 @@ bool ScanService::GetHiddenNetworkSsidList(std::vector &hiddenNetwo } } - WIFI_LOGI("Find %{public}u hidden NetworkSsid.\n", hiddenNetworkSsid.size()); + WIFI_LOGI("Find %{public}d hidden NetworkSsid.\n", (int)hiddenNetworkSsid.size()); return true; } -- Gitee From d020d493fb36c33618b0e004188bee211cf3fb0a Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Sat, 28 May 2022 02:58:00 +0000 Subject: [PATCH 139/491] Code review issue fix - #I59P5Y Signed-off-by: zhangfeng Change-Id: Ie6a3fc6d702c189cdd2612edb9b5a4109e146609 --- .../js/napi/src/wifi_ext_napi_entry.cpp | 1 - .../common/include/permission_def.h | 1 - .../wifi_framework/common/log/wifi_log.h | 2 +- .../idl_client/wifi_ap_hal_interface.cpp | 15 +++++- .../idl_client/wifi_chip_hal_interface.cpp | 12 ++++- .../idl_client/wifi_p2p_hal_interface.cpp | 47 +++++++++++++++++++ .../idl_client/wifi_sta_hal_interface.cpp | 39 ++++++++++++++- .../wifi_supplicant_hal_interface.cpp | 12 ++++- 8 files changed, 122 insertions(+), 7 deletions(-) diff --git a/wifi/frameworks/js/napi/src/wifi_ext_napi_entry.cpp b/wifi/frameworks/js/napi/src/wifi_ext_napi_entry.cpp index 109fd38..127b8fc 100644 --- a/wifi/frameworks/js/napi/src/wifi_ext_napi_entry.cpp +++ b/wifi/frameworks/js/napi/src/wifi_ext_napi_entry.cpp @@ -14,7 +14,6 @@ */ #include "wifi_ext_napi_hotspot.h" -#include "wifi_logger.h" namespace OHOS { namespace Wifi { diff --git a/wifi/services/wifi_standard/wifi_framework/common/include/permission_def.h b/wifi/services/wifi_standard/wifi_framework/common/include/permission_def.h index 5706ee9..48d76e4 100644 --- a/wifi/services/wifi_standard/wifi_framework/common/include/permission_def.h +++ b/wifi/services/wifi_standard/wifi_framework/common/include/permission_def.h @@ -29,7 +29,6 @@ enum IsRestricted { RESTRICTED = 0, NOT_RESTRICTED = 1 }; enum IsGranted { PERMISSION_DENIED = 0, /* Not granted */ PERMISSION_GRANTED = 1, /* Granted */ - PERMISSION_FAILED = 2 /* Failed to judge permission */ }; typedef struct { diff --git a/wifi/services/wifi_standard/wifi_framework/common/log/wifi_log.h b/wifi/services/wifi_standard/wifi_framework/common/log/wifi_log.h index 24f3002..ac8516f 100644 --- a/wifi/services/wifi_standard/wifi_framework/common/log/wifi_log.h +++ b/wifi/services/wifi_standard/wifi_framework/common/log/wifi_log.h @@ -41,7 +41,7 @@ #ifndef CHECK_NULL_AND_RETURN #define CHECK_NULL_AND_RETURN(ptr, retValue) \ if (!(ptr)) { \ - WIFI_LOGI("Pointer %{public}s in %{public}s is NULL!", #ptr, __func__); \ + LOGI("Pointer %{public}s in %{public}s is NULL!", #ptr, __func__); \ return retValue; \ } #endif diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_ap_hal_interface.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_ap_hal_interface.cpp index 6ce0337..aa941da 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_ap_hal_interface.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_ap_hal_interface.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -40,46 +40,55 @@ WifiApHalInterface &WifiApHalInterface::GetInstance(void) WifiErrorNo WifiApHalInterface::StartAp(void) { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->StartAp(); } WifiErrorNo WifiApHalInterface::StopAp(void) { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->StopAp(); } WifiErrorNo WifiApHalInterface::SetSoftApConfig(const HotspotConfig &config) { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->SetSoftApConfig(config); } WifiErrorNo WifiApHalInterface::GetStationList(std::vector &result) { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->GetStationList(result); } WifiErrorNo WifiApHalInterface::AddBlockByMac(const std::string &mac) { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->AddBlockByMac(mac); } WifiErrorNo WifiApHalInterface::DelBlockByMac(const std::string &mac) { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->DelBlockByMac(mac); } WifiErrorNo WifiApHalInterface::RemoveStation(const std::string &mac) { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->RemoveStation(mac); } WifiErrorNo WifiApHalInterface::GetFrequenciesByBand(int band, std::vector &frequencies) { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->GetFrequenciesByBand(band, frequencies); } WifiErrorNo WifiApHalInterface::RegisterApEvent(IWifiApMonitorEventCallback callback) { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); WifiErrorNo err = mIdlClient->RegisterApEvent(callback); if (err == WIFI_IDL_OPT_OK || callback.onStaJoinOrLeave == nullptr) { mApCallback = callback; @@ -89,11 +98,13 @@ WifiErrorNo WifiApHalInterface::RegisterApEvent(IWifiApMonitorEventCallback call WifiErrorNo WifiApHalInterface::SetWifiCountryCode(const std::string &code) { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->SetWifiCountryCode(code); } WifiErrorNo WifiApHalInterface::DisconnectStaByMac(const std::string &mac) { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqDisconnectStaByMac(mac); } @@ -104,11 +115,13 @@ const IWifiApMonitorEventCallback &WifiApHalInterface::GetApCallbackInst(void) c WifiErrorNo WifiApHalInterface::GetPowerModel(int& model) const { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqGetPowerModel(model); } WifiErrorNo WifiApHalInterface::SetPowerModel(const int& model) const { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqSetPowerModel(model); } } // namespace Wifi diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_chip_hal_interface.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_chip_hal_interface.cpp index 47a32d9..5752777 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_chip_hal_interface.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_chip_hal_interface.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -39,51 +39,61 @@ WifiChipHalInterface &WifiChipHalInterface::GetInstance(void) WifiErrorNo WifiChipHalInterface::GetWifiChipObject(int id, IWifiChip &chip) { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->GetWifiChipObject(id, chip); } WifiErrorNo WifiChipHalInterface::GetChipIds(std::vector &ids) { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->GetChipIds(ids); } WifiErrorNo WifiChipHalInterface::GetUsedChipId(int &id) { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->GetUsedChipId(id); } WifiErrorNo WifiChipHalInterface::GetChipCapabilities(int &capabilities) { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->GetChipCapabilities(capabilities); } WifiErrorNo WifiChipHalInterface::GetSupportedModes(std::vector &modes) { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->GetSupportedModes(modes); } WifiErrorNo WifiChipHalInterface::ConfigRunModes(int mode) { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ConfigRunModes(mode); } WifiErrorNo WifiChipHalInterface::GetCurrentMode(int &mode) { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->GetCurrentMode(mode); } WifiErrorNo WifiChipHalInterface::RegisterChipEventCallback(WifiChipEventCallback &callback) { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->RegisterChipEventCallback(callback); } WifiErrorNo WifiChipHalInterface::RequestFirmwareDebugInfo(std::string &debugInfo) { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->RequestFirmwareDebugInfo(debugInfo); } WifiErrorNo WifiChipHalInterface::SetWifiPowerMode(int mode) { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->SetWifiPowerMode(mode); } } // namespace Wifi diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_p2p_hal_interface.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_p2p_hal_interface.cpp index ea7881e..c613d59 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_p2p_hal_interface.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_p2p_hal_interface.cpp @@ -40,16 +40,19 @@ WifiP2PHalInterface &WifiP2PHalInterface::GetInstance(void) WifiErrorNo WifiP2PHalInterface::StartP2p(void) const { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqP2pStart(); } WifiErrorNo WifiP2PHalInterface::StopP2p(void) const { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqP2pStop(); } WifiErrorNo WifiP2PHalInterface::RegisterP2pCallback(const P2pHalCallback &callbacks) { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); WifiErrorNo err = mIdlClient->ReqP2pRegisterCallback(callbacks); if (err == WIFI_IDL_OPT_OK || callbacks.onConnectSupplicant == nullptr) { mP2pCallback = callbacks; @@ -59,220 +62,263 @@ WifiErrorNo WifiP2PHalInterface::RegisterP2pCallback(const P2pHalCallback &callb WifiErrorNo WifiP2PHalInterface::StartWpsPbc(const std::string &groupInterface, const std::string &bssid) const { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqP2pSetupWpsPbc(groupInterface, bssid); } WifiErrorNo WifiP2PHalInterface::StartWpsPin( const std::string &groupInterface, const std::string &address, const std::string &pin, std::string &result) const { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqP2pSetupWpsPin(groupInterface, address, pin, result); } WifiErrorNo WifiP2PHalInterface::RemoveNetwork(int networkId) const { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqP2pRemoveNetwork(networkId); } WifiErrorNo WifiP2PHalInterface::ListNetworks(std::map &mapGroups) const { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqP2pListNetworks(mapGroups); } WifiErrorNo WifiP2PHalInterface::SetP2pDeviceName(const std::string &name) const { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqP2pSetDeviceName(name); } WifiErrorNo WifiP2PHalInterface::SetP2pDeviceType(const std::string &type) const { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqP2pSetWpsDeviceType(type); } WifiErrorNo WifiP2PHalInterface::SetP2pSecondaryDeviceType(const std::string &type) { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqP2pSetWpsSecondaryDeviceType(type); } WifiErrorNo WifiP2PHalInterface::SetP2pConfigMethods(const std::string &methods) const { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqP2pSetWpsConfigMethods(methods); } WifiErrorNo WifiP2PHalInterface::SetP2pSsidPostfix(const std::string &postfixName) const { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqP2pSetSsidPostfixName(postfixName); } WifiErrorNo WifiP2PHalInterface::SetP2pGroupIdle(const std::string &groupInterface, size_t time) const { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqP2pSetGroupMaxIdle(groupInterface, time); } WifiErrorNo WifiP2PHalInterface::SetP2pPowerSave(const std::string &groupInterface, bool enable) const { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqP2pSetPowerSave(groupInterface, enable); } WifiErrorNo WifiP2PHalInterface::SetWfdEnable(bool enable) const { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqP2pSetWfdEnable(enable); } WifiErrorNo WifiP2PHalInterface::SetWfdDeviceConfig(const std::string &config) const { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqP2pSetWfdDeviceConfig(config); } WifiErrorNo WifiP2PHalInterface::P2pFind(size_t timeout) const { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqP2pStartFind(timeout); } WifiErrorNo WifiP2PHalInterface::P2pStopFind() const { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqP2pStopFind(); } WifiErrorNo WifiP2PHalInterface::P2pConfigureListen(bool enable, size_t period, size_t interval) const { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqP2pSetExtListen(enable, period, interval); } WifiErrorNo WifiP2PHalInterface::SetListenChannel(size_t channel, unsigned char regClass) const { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqP2pSetListenChannel(channel, regClass); } WifiErrorNo WifiP2PHalInterface::P2pFlush() const { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqP2pFlush(); } WifiErrorNo WifiP2PHalInterface::Connect(const WifiP2pConfigInternal &config, bool isJoinExistingGroup, std::string &pin) const { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqP2pConnect(config, isJoinExistingGroup, pin); } WifiErrorNo WifiP2PHalInterface::CancelConnect() const { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqP2pCancelConnect(); } WifiErrorNo WifiP2PHalInterface::ProvisionDiscovery(const WifiP2pConfigInternal &config) const { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqP2pProvisionDiscovery(config); } WifiErrorNo WifiP2PHalInterface::GroupAdd(bool isPersistent, int networkId, int freq) const { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqP2pAddGroup(isPersistent, networkId, freq); } WifiErrorNo WifiP2PHalInterface::GroupRemove(const std::string &groupInterface) const { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqP2pRemoveGroup(groupInterface); } WifiErrorNo WifiP2PHalInterface::Invite(const WifiP2pGroupInfo &group, const std::string &deviceAddr) const { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqP2pInvite(group, deviceAddr); } WifiErrorNo WifiP2PHalInterface::Reinvoke(int networkId, const std::string &deviceAddr) const { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqP2pReinvoke(networkId, deviceAddr); } WifiErrorNo WifiP2PHalInterface::GetDeviceAddress(std::string &deviceAddress) const { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqP2pGetDeviceAddress(deviceAddress); } WifiErrorNo WifiP2PHalInterface::GetGroupCapability(const std::string &deviceAddress, uint32_t &cap) const { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqP2pGetGroupCapability(deviceAddress, cap); } WifiErrorNo WifiP2PHalInterface::P2pServiceAdd(const WifiP2pServiceInfo &info) const { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqP2pAddService(info); } WifiErrorNo WifiP2PHalInterface::P2pServiceRemove(const WifiP2pServiceInfo &info) const { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqP2pRemoveService(info); } WifiErrorNo WifiP2PHalInterface::FlushService() const { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqP2pFlushService(); } WifiErrorNo WifiP2PHalInterface::SaveConfig() const { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqP2pSaveConfig(); } WifiErrorNo WifiP2PHalInterface::ReqServiceDiscovery( const std::string &deviceAddress, const std::vector &tlvs, std::string &reqID) const { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqP2pReqServiceDiscovery(deviceAddress, tlvs, reqID); } WifiErrorNo WifiP2PHalInterface::CancelReqServiceDiscovery(const std::string &id) const { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqP2pCancelServiceDiscovery(id); } WifiErrorNo WifiP2PHalInterface::SetRandomMacAddr(bool enable) const { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqP2pSetRandomMac(enable); } WifiErrorNo WifiP2PHalInterface::SetMiracastMode(int type) const { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqP2pSetMiracastType(type); } WifiErrorNo WifiP2PHalInterface::SetPersistentReconnect(int mode) const { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqSetPersistentReconnect(mode); } WifiErrorNo WifiP2PHalInterface::RespServiceDiscovery( const WifiP2pDevice &device, int frequency, int dialogToken, const std::vector &tlvs) const { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqRespServiceDiscovery(device, frequency, dialogToken, tlvs); } WifiErrorNo WifiP2PHalInterface::SetServiceDiscoveryExternal(bool isExternalProcess) const { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqSetServiceDiscoveryExternal(isExternalProcess); } WifiErrorNo WifiP2PHalInterface::GetP2pPeer(const std::string &deviceAddress, WifiP2pDevice &device) const { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqGetP2pPeer(deviceAddress, device); } WifiErrorNo WifiP2PHalInterface::P2pGetSupportFrequenciesByBand(int band, std::vector &frequencies) const { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqP2pGetSupportFrequencies(band, frequencies); } WifiErrorNo WifiP2PHalInterface::P2pSetGroupConfig(int networkId, const IdlP2pGroupConfig &config) const { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqP2pSetGroupConfig(networkId, config); } WifiErrorNo WifiP2PHalInterface::P2pGetGroupConfig(int networkId, IdlP2pGroupConfig &config) const { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqP2pGetGroupConfig(networkId, config); } WifiErrorNo WifiP2PHalInterface::P2pAddNetwork(int &networkId) const { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqP2pAddNetwork(networkId); } @@ -283,6 +329,7 @@ const P2pHalCallback &WifiP2PHalInterface::GetP2pCallbackInst(void) const WifiErrorNo WifiP2PHalInterface::Hid2dConnect(const Hid2dConnectConfig &config) const { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqP2pHid2dConnect(config); } } // namespace Wifi diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_sta_hal_interface.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_sta_hal_interface.cpp index 523e593..ee0b4eb 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_sta_hal_interface.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_sta_hal_interface.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -39,146 +39,175 @@ WifiStaHalInterface &WifiStaHalInterface::GetInstance(void) WifiErrorNo WifiStaHalInterface::StartWifi(void) { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->StartWifi(); } WifiErrorNo WifiStaHalInterface::StopWifi(void) { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->StopWifi(); } WifiErrorNo WifiStaHalInterface::Connect(int networkId) { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqConnect(networkId); } WifiErrorNo WifiStaHalInterface::Reconnect(void) { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqReconnect(); } WifiErrorNo WifiStaHalInterface::Reassociate(void) { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqReassociate(); } WifiErrorNo WifiStaHalInterface::Disconnect(void) { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqDisconnect(); } WifiErrorNo WifiStaHalInterface::GetStaCapabilities(unsigned int &capabilities) { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->GetStaCapabilities(capabilities); } WifiErrorNo WifiStaHalInterface::GetStaDeviceMacAddress(std::string &mac) { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->GetStaDeviceMacAddress(mac); } WifiErrorNo WifiStaHalInterface::GetSupportFrequencies(int band, std::vector &frequencies) { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->GetSupportFrequencies(band, frequencies); } WifiErrorNo WifiStaHalInterface::SetConnectMacAddr(const std::string &mac) { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->SetConnectMacAddr(mac); } WifiErrorNo WifiStaHalInterface::SetScanMacAddress(const std::string &mac) { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->SetScanMacAddress(mac); } WifiErrorNo WifiStaHalInterface::DisconnectLastRoamingBssid(const std::string &mac) { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->DisconnectLastRoamingBssid(mac); } WifiErrorNo WifiStaHalInterface::GetSupportFeature(long &feature) { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqGetSupportFeature(feature); } WifiErrorNo WifiStaHalInterface::SendRequest(const WifiStaRequest &request) { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->SendRequest(request); } WifiErrorNo WifiStaHalInterface::SetTxPower(int power) { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->SetTxPower(power); } WifiErrorNo WifiStaHalInterface::Scan(const WifiScanParam &scanParam) { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->Scan(scanParam); } WifiErrorNo WifiStaHalInterface::QueryScanInfos(std::vector &scanInfos) { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->QueryScanInfos(scanInfos); } WifiErrorNo WifiStaHalInterface::GetNetworkList(std::vector &networkList) { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqGetNetworkList(networkList); } WifiErrorNo WifiStaHalInterface::StartPnoScan(const WifiPnoScanParam &scanParam) { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqStartPnoScan(scanParam); } WifiErrorNo WifiStaHalInterface::StopPnoScan(void) { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqStopPnoScan(); } WifiErrorNo WifiStaHalInterface::RemoveDevice(int networkId) { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->RemoveDevice(networkId); } WifiErrorNo WifiStaHalInterface::ClearDeviceConfig(void) const { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ClearDeviceConfig(); } WifiErrorNo WifiStaHalInterface::GetNextNetworkId(int &networkId) { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->GetNextNetworkId(networkId); } WifiErrorNo WifiStaHalInterface::EnableNetwork(int networkId) { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqEnableNetwork(networkId); } WifiErrorNo WifiStaHalInterface::DisableNetwork(int networkId) { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqDisableNetwork(networkId); } WifiErrorNo WifiStaHalInterface::SetDeviceConfig(int networkId, const WifiIdlDeviceConfig &config) { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->SetDeviceConfig(networkId, config); } WifiErrorNo WifiStaHalInterface::GetDeviceConfig(WifiIdlGetDeviceConfig &config) { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->GetDeviceConfig(config); } WifiErrorNo WifiStaHalInterface::SaveDeviceConfig(void) { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->SaveDeviceConfig(); } WifiErrorNo WifiStaHalInterface::RegisterStaEventCallback(const WifiEventCallback &callback) { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); WifiErrorNo err = mIdlClient->ReqRegisterStaEventCallback(callback); if (err == WIFI_IDL_OPT_OK || callback.onConnectChanged == nullptr) { mStaCallback = callback; @@ -188,6 +217,7 @@ WifiErrorNo WifiStaHalInterface::RegisterStaEventCallback(const WifiEventCallbac WifiErrorNo WifiStaHalInterface::StartWpsPbcMode(const WifiIdlWpsConfig &config) { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqStartWpsPbcMode(config); } @@ -196,31 +226,37 @@ WifiErrorNo WifiStaHalInterface::StartWpsPinMode(const WifiIdlWpsConfig &config, if (!config.pinCode.empty() && config.pinCode.length() != WIFI_IDL_PIN_CODE_LENGTH) { return WIFI_IDL_OPT_INVALID_PARAM; } + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqStartWpsPinMode(config, pinCode); } WifiErrorNo WifiStaHalInterface::StopWps(void) { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqStopWps(); } WifiErrorNo WifiStaHalInterface::GetRoamingCapabilities(WifiIdlRoamCapability &capability) { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqGetRoamingCapabilities(capability); } WifiErrorNo WifiStaHalInterface::SetRoamConfig(const WifiIdlRoamConfig &config) { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqSetRoamConfig(config); } WifiErrorNo WifiStaHalInterface::WpaAutoConnect(int enable) { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqWpaAutoConnect(enable); } WifiErrorNo WifiStaHalInterface::WpaBlocklistClear() { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqWpaBlocklistClear(); } @@ -229,6 +265,7 @@ WifiErrorNo WifiStaHalInterface::GetConnectSignalInfo(const std::string &endBssi if (endBssid.length() != WIFI_IDL_BSSID_LENGTH) { return WIFI_IDL_OPT_INPUT_MAC_INVALID; } + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqGetConnectSignalInfo(endBssid, info); } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_supplicant_hal_interface.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_supplicant_hal_interface.cpp index 04f6416..288fbc0 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_supplicant_hal_interface.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_supplicant_hal_interface.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -39,31 +39,37 @@ WifiSupplicantHalInterface &WifiSupplicantHalInterface::GetInstance(void) WifiErrorNo WifiSupplicantHalInterface::StartSupplicant(void) const { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqStartSupplicant(); } WifiErrorNo WifiSupplicantHalInterface::StopSupplicant(void) const { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqStopSupplicant(); } WifiErrorNo WifiSupplicantHalInterface::ConnectSupplicant(void) const { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqConnectSupplicant(); } WifiErrorNo WifiSupplicantHalInterface::DisconnectSupplicant(void) const { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqDisconnectSupplicant(); } WifiErrorNo WifiSupplicantHalInterface::RequestToSupplicant(const std::string &request) const { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqRequestToSupplicant(request); } WifiErrorNo WifiSupplicantHalInterface::RegisterSupplicantEventCallback(SupplicantEventCallback &callback) { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); WifiErrorNo err = mIdlClient->ReqRegisterSupplicantEventCallback(callback); if (err == WIFI_IDL_OPT_OK) { mCallback = callback; @@ -73,6 +79,7 @@ WifiErrorNo WifiSupplicantHalInterface::RegisterSupplicantEventCallback(Supplica WifiErrorNo WifiSupplicantHalInterface::UnRegisterSupplicantEventCallback(void) { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); WifiErrorNo err = mIdlClient->ReqUnRegisterSupplicantEventCallback(); mCallback.onScanNotify = nullptr; return err; @@ -80,16 +87,19 @@ WifiErrorNo WifiSupplicantHalInterface::UnRegisterSupplicantEventCallback(void) WifiErrorNo WifiSupplicantHalInterface::SetPowerSave(bool enable) const { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqSetPowerSave(enable); } WifiErrorNo WifiSupplicantHalInterface::WpaSetCountryCode(const std::string &countryCode) const { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqWpaSetCountryCode(countryCode); } WifiErrorNo WifiSupplicantHalInterface::WpaGetCountryCode(std::string &countryCode) const { + CHECK_NULL_AND_RETURN(mIdlClient, WIFI_IDL_OPT_FAILED); return mIdlClient->ReqWpaGetCountryCode(countryCode); } -- Gitee From 8c0add27926ab1d39b4988a1e6f01e2eb8c91763 Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Sat, 28 May 2022 02:04:22 +0000 Subject: [PATCH 140/491] fix #I57B1O code review issue Signed-off-by: zhangfeng Change-Id: Ic2b1ecec03929b93443e23de26cd015d30f6c929 --- .../wifi_standard/wifi_hal/wifi_hal_adapter.c | 34 +- .../wifi_standard/wifi_hal/wifi_hal_crpc_ap.c | 82 ++--- .../wifi_hal/wifi_hal_crpc_base.c | 14 +- .../wifi_hal/wifi_hal_crpc_chip.c | 94 +++--- .../wifi_hal/wifi_hal_crpc_common.c | 22 +- .../wifi_hal/wifi_hal_crpc_p2p.c | 302 +++++++++--------- .../wifi_hal/wifi_hal_crpc_server.c | 46 +-- .../wifi_hal/wifi_hal_crpc_sta.c | 232 +++++++------- .../wifi_hal/wifi_hal_crpc_supplicant.c | 44 +-- .../wifi_standard/wifi_hal/wifi_hal_define.h | 7 +- .../wifi_hal/wifi_hal_module_manage.c | 21 +- 11 files changed, 451 insertions(+), 447 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_adapter.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_adapter.c index 60a6c09..a7abcd0 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_adapter.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_adapter.c @@ -35,12 +35,12 @@ WifiHalVendorInterface *g_wifiHalVendorInterface = NULL; static int ReadConfigModuleName(char *name, int size) { if (name == NULL) { - return -1; + return HAL_FAILURE; } FILE *fp = fopen(MODULE_CONFIG_FILE_PATH, "r"); if (fp == NULL) { LOGE("open module configuration file failed"); - return 0; /* file not exist, use default operators */ + return HAL_SUCCESS; /* file not exist, use default operators */ } int flag = 0; do { @@ -65,21 +65,21 @@ static int ReadConfigModuleName(char *name, int size) static int OpenHalVendorModule(WifiHalVendorInterface *pInterface) { if (pInterface == NULL) { - return -1; + return HAL_FAILURE; } char name[MODULE_NAME_MAX_LEN] = {0}; if (ReadConfigModuleName(name, MODULE_NAME_MAX_LEN) < 0) { - return -1; + return HAL_FAILURE; } if (strlen(name) <= 0) { LOGW("module name is null."); - return 0; + return HAL_SUCCESS; } void *handle = dlopen(name, RTLD_LAZY); if (handle == NULL) { LOGE("open config [%{public}s] so failed![%{public}s]", name, dlerror()); - return -1; + return HAL_FAILURE; } int flag = 0; do { @@ -103,9 +103,9 @@ static int OpenHalVendorModule(WifiHalVendorInterface *pInterface) } while (0); if (flag == 0) { dlclose(handle); - return -1; + return HAL_FAILURE; } - return 0; + return HAL_SUCCESS; } WifiHalVendorInterface *GetWifiHalVendorInterface(void) @@ -146,13 +146,13 @@ int ExcuteCmd(const char *szCmd) int ret = system(szCmd); if (ret == -1) { LOGE("Execute system cmd %{private}s failed!", szCmd); - return -1; + return HAL_FAILURE; } if (WIFEXITED(ret) && (WEXITSTATUS(ret) == 0)) { - return 0; + return HAL_SUCCESS; } LOGE("Execute system cmd %{private}s failed: %{private}d", szCmd, WEXITSTATUS(ret)); - return -1; + return HAL_FAILURE; } int CopyConfigFile(const char* configName) @@ -160,27 +160,27 @@ int CopyConfigFile(const char* configName) char buf[BUFF_SIZE] = {0}; if (snprintf_s(buf, sizeof(buf), sizeof(buf) - 1, "/data/misc/wifi/wpa_supplicant/%s", configName) < 0) { LOGE("snprintf_s dest dir failed."); - return -1; + return HAL_FAILURE; } if (access(buf, F_OK) != -1) { LOGI("Configure file %{public}s is exist.", buf); - return 0; + return HAL_SUCCESS; } char path[PATH_NUM][BUFF_SIZE] = {"/vendor/etc/wifi/", "/system/etc/wifi/"}; for (int i = 0; i != PATH_NUM; ++i) { if (strcat_s(path[i], sizeof(path[i]), configName) != EOK) { LOGE("strcat_s failed."); - return -1; + return HAL_FAILURE; } if (access(path[i], F_OK) != -1) { char cmd[BUFF_SIZE] = {0}; if (snprintf_s(cmd, sizeof(cmd), sizeof(cmd) - 1, "cp %s /data/misc/wifi/wpa_supplicant/", path[i]) < 0) { LOGE("snprintf_s cp cmd failed."); - return -1; + return HAL_FAILURE; } return ExcuteCmd(cmd); } } LOGE("Copy config file failed: %{public}s", configName); - return -1; -} + return HAL_FAILURE; +} \ No newline at end of file diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_ap.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_ap.c index 29094ad..09d37fb 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_ap.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_ap.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -20,35 +20,35 @@ int RpcStartSoftAp(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = StartSoftAp(); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcStopSoftAp(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = StopSoftAp(); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcSetHostapdConfig(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } HostapdConfig config; if (memset_s(&config, sizeof(config), 0, sizeof(config)) != EOK) { - return -1; + return HAL_FAILURE; } if (ReadStr(context, config.ssid, sizeof(config.ssid)) != 0 || ReadInt(context, &config.ssidLen) < 0 || @@ -56,27 +56,27 @@ int RpcSetHostapdConfig(RpcServer *server, Context *context) ReadInt(context, &config.preSharedKeyLen) < 0 || ReadInt(context, &config.securityType) < 0 || ReadInt(context, &config.band) < 0 || ReadInt(context, &config.channel) < 0 || ReadInt(context, &config.maxConn) < 0) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = SetHostapdConfig(&config); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcGetStaInfos(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } int maxSize = 0; if (ReadInt(context, &maxSize) < 0 || maxSize <= 0) { - return -1; + return HAL_FAILURE; } char *infos = (char *)calloc(maxSize, sizeof(char)); if (infos == NULL) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = GetStaInfos(infos, &maxSize); WriteBegin(context, 0); @@ -88,43 +88,43 @@ int RpcGetStaInfos(RpcServer *server, Context *context) WriteEnd(context); free(infos); infos = NULL; - return 0; + return HAL_SUCCESS; } int RpcSetCountryCode(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } char countryCode[WIFI_COUNTRY_CODE_MAXLEN + 1] = {0}; if (ReadStr(context, countryCode, sizeof(countryCode)) != 0) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = SetCountryCode(countryCode); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcSetMacFilter(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } int lenMac = 0; if (ReadInt(context, &lenMac) < 0 || lenMac <= 0) { - return -1; + return HAL_FAILURE; } int len = lenMac + 1; unsigned char *mac = (unsigned char *)calloc(len, sizeof(unsigned char)); if (mac == NULL) { - return -1; + return HAL_FAILURE; } if (ReadUStr(context, mac, len) != 0) { free(mac); mac = NULL; - return -1; + return HAL_FAILURE; } WifiErrorNo err = SetMacFilter(mac, lenMac); WriteBegin(context, 0); @@ -132,27 +132,27 @@ int RpcSetMacFilter(RpcServer *server, Context *context) WriteEnd(context); free(mac); mac = NULL; - return 0; + return HAL_SUCCESS; } int RpcDelMacFilter(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } int lenMac = 0; if (ReadInt(context, &lenMac) < 0 || lenMac <= 0) { - return -1; + return HAL_FAILURE; } int len = lenMac + 1; unsigned char *mac = (unsigned char *)calloc(len, sizeof(unsigned char)); if (mac == NULL) { - return -1; + return HAL_FAILURE; } if (ReadUStr(context, mac, len) != 0) { free(mac); mac = NULL; - return -1; + return HAL_FAILURE; } WifiErrorNo err = DelMacFilter(mac, lenMac); WriteBegin(context, 0); @@ -160,28 +160,28 @@ int RpcDelMacFilter(RpcServer *server, Context *context) WriteEnd(context); free(mac); mac = NULL; - return 0; + return HAL_SUCCESS; } int RpcDisassociateSta(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } int lenMac = 0; if (ReadInt(context, &lenMac) < 0 || lenMac <= 0) { - return -1; + return HAL_FAILURE; } int len = lenMac + 1; unsigned char *mac = (unsigned char *)calloc(len, sizeof(unsigned char)); if (mac == NULL) { - return -1; + return HAL_FAILURE; } if (ReadUStr(context, mac, len) != 0) { free(mac); mac = NULL; - return -1; + return HAL_FAILURE; } WifiErrorNo err = DisassociateSta(mac, lenMac); WriteBegin(context, 0); @@ -189,25 +189,25 @@ int RpcDisassociateSta(RpcServer *server, Context *context) WriteEnd(context); free(mac); mac = NULL; - return 0; + return HAL_SUCCESS; } int RpcGetValidFrequenciesForBand(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } int band = 0; int size = 0; if (ReadInt(context, &band) < 0 || ReadInt(context, &size) < 0) { - return -1; + return HAL_FAILURE; } if (size <= 0) { - return -1; + return HAL_FAILURE; } int *frequencies = (int *)calloc(size, sizeof(int)); if (frequencies == NULL) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = GetValidFrequenciesForBand(band, frequencies, &size); WriteBegin(context, 0); @@ -221,29 +221,29 @@ int RpcGetValidFrequenciesForBand(RpcServer *server, Context *context) WriteEnd(context); free(frequencies); frequencies = NULL; - return 0; + return HAL_SUCCESS; } int RpcSetPowerModel(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } int mode = -1; if (ReadInt(context, &mode) < 0) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = WifiSetPowerModel(mode); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcGetPowerModel(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } int mode = -1; WifiErrorNo err = WifiGetPowerModel(&mode); @@ -253,5 +253,5 @@ int RpcGetPowerModel(RpcServer *server, Context *context) WriteInt(context, mode); } WriteEnd(context); - return 0; + return HAL_SUCCESS; } diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_base.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_base.c index 1953285..fd1f22f 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_base.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_base.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -75,15 +75,15 @@ char **ReadCharArray(Context *context, int size) int RpcGetName(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } int size = 0; if (ReadInt(context, &size) < 0 || size <= 0) { - return -1; + return HAL_FAILURE; } char *ifname = (char *)calloc(size, sizeof(char)); if (ifname == NULL) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = GetName(ifname, size); WriteBegin(context, 0); @@ -94,13 +94,13 @@ int RpcGetName(RpcServer *server, Context *context) WriteEnd(context); free(ifname); ifname = NULL; - return 0; + return HAL_SUCCESS; } int RpcGetType(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } int type = 0; WifiErrorNo err = GetType(&type); @@ -110,5 +110,5 @@ int RpcGetType(RpcServer *server, Context *context) WriteInt(context, type); } WriteEnd(context); - return 0; + return HAL_SUCCESS; } \ No newline at end of file diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_chip.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_chip.c index 25dec7a..ad52b42 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_chip.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_chip.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -20,15 +20,15 @@ int RpcGetWifiChip(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } int chipId = 0; if (ReadInt(context, &chipId) < 0) { - return -1; + return HAL_FAILURE; } WifiChip wifiChip; if (memset_s(&wifiChip, sizeof(wifiChip), 0, sizeof(wifiChip)) != EOK) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = GetWifiChip(chipId, &wifiChip); WriteBegin(context, 0); @@ -37,24 +37,24 @@ int RpcGetWifiChip(RpcServer *server, Context *context) WriteInt(context, wifiChip.chip); } WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcGetWifiChipIds(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } int maxSize = 0; if (ReadInt(context, &maxSize) < 0) { - return -1; + return HAL_FAILURE; } if (maxSize <= 0) { - return -1; + return HAL_FAILURE; } uint8_t *chipIds = (uint8_t *)calloc(maxSize, sizeof(int)); if (chipIds == NULL) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = GetWifiChipIds(chipIds, &maxSize); WriteBegin(context, 0); @@ -68,13 +68,13 @@ int RpcGetWifiChipIds(RpcServer *server, Context *context) WriteEnd(context); free(chipIds); chipIds = NULL; - return 0; + return HAL_SUCCESS; } int RpcGetChipId(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } int chipId = 0; WifiErrorNo err = GetChipId(&chipId); @@ -84,21 +84,21 @@ int RpcGetChipId(RpcServer *server, Context *context) WriteInt(context, chipId); } WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcCreateIface(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } int type = 0; if (ReadInt(context, &type) < 0) { - return -1; + return HAL_FAILURE; } WifiIface wifiIface; if (memset_s(&wifiIface, sizeof(wifiIface), 0, sizeof(wifiIface)) != EOK) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = CreateIface(type, &wifiIface); WriteBegin(context, 0); @@ -110,28 +110,28 @@ int RpcCreateIface(RpcServer *server, Context *context) WriteStr(context, wifiIface.macAddr); } WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcGetIface(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } WifiIface wifiIface; if (memset_s(&wifiIface, sizeof(wifiIface), 0, sizeof(wifiIface)) != EOK) { - return -1; + return HAL_FAILURE; } char ifname[WIFI_IFACE_NAME_MAXLEN] = {0}; char *pstr = NULL; int ret = ReadStr(context, ifname, WIFI_IFACE_NAME_MAXLEN); if (ret < 0) { - return -1; + return HAL_FAILURE; } else if (ret > 0) { int len = ret + 1; pstr = (char *)calloc(len, sizeof(char)); if (pstr == NULL) { - return -1; + return HAL_FAILURE; } ReadStr(context, pstr, len); } @@ -149,22 +149,22 @@ int RpcGetIface(RpcServer *server, Context *context) free(pstr); pstr = NULL; } - return 0; + return HAL_SUCCESS; } int RpcGetIfaceNames(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } int type = 0; int size = 0; if (ReadInt(context, &type) < 0 || ReadInt(context, &size) < 0 || size <= 0) { - return -1; + return HAL_FAILURE; } char *ifname = (char *)calloc(size, sizeof(char)); if (ifname == NULL) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = GetIfaceNames(type, ifname, size); WriteBegin(context, 0); @@ -175,24 +175,24 @@ int RpcGetIfaceNames(RpcServer *server, Context *context) WriteEnd(context); free(ifname); ifname = NULL; - return 0; + return HAL_SUCCESS; } int RpcRemoveIface(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } char ifname[WIFI_IFACE_NAME_MAXLEN] = {0}; char *pstr = NULL; int ret = ReadStr(context, ifname, WIFI_IFACE_NAME_MAXLEN); if (ret < 0) { - return -1; + return HAL_FAILURE; } else if (ret > 0) { int len = ret + 1; pstr = (char *)calloc(len, sizeof(char)); if (pstr == NULL) { - return -1; + return HAL_FAILURE; } ReadStr(context, pstr, len); } @@ -204,13 +204,13 @@ int RpcRemoveIface(RpcServer *server, Context *context) free(pstr); pstr = NULL; } - return 0; + return HAL_SUCCESS; } int RpcGetCapabilities(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } uint32_t capabilities = 0; WifiErrorNo err = GetCapabilities(&capabilities); @@ -220,21 +220,21 @@ int RpcGetCapabilities(RpcServer *server, Context *context) WriteInt(context, capabilities); } WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcGetSupportedComboModes(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } int maxSize = 0; if (ReadInt(context, &maxSize) < 0 || maxSize <= 0) { - return -1; + return HAL_FAILURE; } int *modes = (int *)calloc(maxSize, sizeof(int)); if (modes == NULL) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = GetSupportedComboModes(modes, &maxSize); WriteBegin(context, 0); @@ -248,29 +248,29 @@ int RpcGetSupportedComboModes(RpcServer *server, Context *context) WriteEnd(context); free(modes); modes = NULL; - return 0; + return HAL_SUCCESS; } int RpcConfigComboModes(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } int mode = 0; if (ReadInt(context, &mode) < 0) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = ConfigComboModes(mode); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcGetComboModes(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } int mode = 0; WifiErrorNo err = GetComboModes(&mode); @@ -280,22 +280,22 @@ int RpcGetComboModes(RpcServer *server, Context *context) WriteInt(context, mode); } WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcRequestFirmwareDebugDump(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } int maxSize = 0; if (ReadInt(context, &maxSize) < 0 || maxSize <= 0) { - return -1; + return HAL_FAILURE; } unsigned char *bytes = (unsigned char *)calloc(maxSize + 1, sizeof(unsigned char)); if (bytes == NULL) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = RequestFirmwareDebugDump(bytes, &maxSize); @@ -308,21 +308,21 @@ int RpcRequestFirmwareDebugDump(RpcServer *server, Context *context) WriteEnd(context); free(bytes); bytes = NULL; - return 0; + return HAL_SUCCESS; } int RpcSetPowerMode(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } int mode = 0; if (ReadInt(context, &mode) < 0) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = SetPowerMode(mode); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } \ No newline at end of file diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_common.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_common.c index 59cf9dc..05c6325 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_common.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_common.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -23,15 +23,15 @@ int RpcRegisterEventCallback(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } int num = 0; if (ReadInt(context, &num) < 0) { - return -1; + return HAL_FAILURE; } int *events = ReadIntArray(context, num); if (events == NULL) { - return -1; + return HAL_FAILURE; } for (int i = 0; i < num; ++i) { RegisterCallback(server, events[i], context); @@ -41,21 +41,21 @@ int RpcRegisterEventCallback(RpcServer *server, Context *context) WriteEnd(context); free(events); events = NULL; - return 0; + return HAL_SUCCESS; } int RpcUnRegisterEventCallback(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } int num = 0; if (ReadInt(context, &num) < 0) { - return -1; + return HAL_FAILURE; } int *events = ReadIntArray(context, num); if (events == NULL) { - return -1; + return HAL_FAILURE; } for (int i = 0; i < num; ++i) { UnRegisterCallback(server, events[i], context); @@ -65,13 +65,13 @@ int RpcUnRegisterEventCallback(RpcServer *server, Context *context) WriteEnd(context); free(events); events = NULL; - return 0; + return HAL_SUCCESS; } int RpcNotifyClear(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } ForceStop(); StopSoftAp(); @@ -79,5 +79,5 @@ int RpcNotifyClear(RpcServer *server, Context *context) WriteBegin(context, 0); WriteInt(context, 0); WriteEnd(context); - return 0; + return HAL_SUCCESS; } \ No newline at end of file diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_p2p.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_p2p.c index efc942b..2a98344 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_p2p.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_p2p.c @@ -21,135 +21,135 @@ int RpcP2pStart(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = P2pStart(); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcP2pStop(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = P2pStop(); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcP2pSetRandomMac(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } int enable = 0; if (ReadInt(context, &enable) < 0) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = P2pSetRandomMac(enable); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcP2pSetDeviceName(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } char name[WIFI_P2P_WPS_NAME_LENGTH] = {0}; if (ReadStr(context, name, sizeof(name)) != 0) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = P2pSetDeviceName(name); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcP2pSetSsidPostfixName(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } char name[WIFI_P2P_WPS_NAME_LENGTH] = {0}; if (ReadStr(context, name, sizeof(name)) != 0) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = P2pSetSsidPostfixName(name); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcP2pSetWpsDeviceType(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } char type[WIFI_P2P_WPS_NAME_LENGTH] = {0}; if (ReadStr(context, type, sizeof(type)) != 0) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = P2pSetWpsDeviceType(type); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcP2pSetWpsSecondaryDeviceType(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } char type[WIFI_P2P_WPS_NAME_LENGTH] = {0}; if (ReadStr(context, type, sizeof(type)) != 0) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = P2pSetWpsSecondaryDeviceType(type); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcP2pSetWpsConfigMethods(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } char methods[WIFI_P2P_WPS_METHODS_LENGTH] = {0}; if (ReadStr(context, methods, sizeof(methods)) != 0) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = P2pSetWpsConfigMethods(methods); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcP2pGetDeviceAddress(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } int size = 0; if (ReadInt(context, &size) < 0 || size <= 0) { - return -1; + return HAL_FAILURE; } char *address = (char *)calloc(size, sizeof(char)); if (address == NULL) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = P2pGetDeviceAddress(address, size); WriteBegin(context, 0); @@ -160,66 +160,66 @@ int RpcP2pGetDeviceAddress(RpcServer *server, Context *context) WriteEnd(context); free(address); address = NULL; - return 0; + return HAL_SUCCESS; } int RpcP2pFlush(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = P2pFlush(); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcP2pFlushService(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = P2pFlushService(); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcP2pSaveConfig(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = P2pSaveConfig(); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcP2pSetupWpsPbc(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } char interface[WIFI_P2P_GROUP_IFNAME_LENGTH] = {0}; char bssid[WIFI_BSSID_LENGTH] = {0}; if (ReadStr(context, interface, sizeof(interface)) != 0 || ReadStr(context, bssid, sizeof(bssid)) != 0) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = P2pSetupWpsPbc(interface, bssid); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcP2pSetupWpsPin(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } char interface[WIFI_P2P_GROUP_IFNAME_LENGTH] = {0}; char address[WIFI_BSSID_LENGTH] = {0}; @@ -227,14 +227,14 @@ int RpcP2pSetupWpsPin(RpcServer *server, Context *context) int resultLen = 0; if (ReadStr(context, interface, sizeof(interface)) != 0 || ReadStr(context, address, sizeof(address)) != 0 || ReadStr(context, pinCode, sizeof(pinCode)) != 0 || ReadInt(context, &resultLen) < 0) { - return -1; + return HAL_FAILURE; } if (resultLen <= 0) { - return -1; + return HAL_FAILURE; } char *pResult = (char *)calloc(resultLen, sizeof(char)); if (pResult == NULL) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = P2pSetupWpsPin(interface, address, pinCode, pResult, resultLen); WriteBegin(context, 0); @@ -245,33 +245,33 @@ int RpcP2pSetupWpsPin(RpcServer *server, Context *context) WriteEnd(context); free(pResult); pResult = NULL; - return 0; + return HAL_SUCCESS; } int RpcP2pRemoveNetwork(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } int networkId = 0; if (ReadInt(context, &networkId) < 0) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = P2pRemoveNetwork(networkId); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcP2pListNetworks(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } P2pNetworkList infoList; if (memset_s(&infoList, sizeof(infoList), 0, sizeof(infoList)) != EOK) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = P2pListNetworks(&infoList); WriteBegin(context, 0); @@ -288,152 +288,152 @@ int RpcP2pListNetworks(RpcServer *server, Context *context) WriteEnd(context); free(infoList.infos); infoList.infos = NULL; - return 0; + return HAL_SUCCESS; } int RpcP2pSetGroupMaxIdle(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } char interface[WIFI_P2P_GROUP_IFNAME_LENGTH] = {0}; int maxtime = 0; if (ReadStr(context, interface, sizeof(interface)) != 0 || ReadInt(context, &maxtime) < 0) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = P2pSetGroupMaxIdle(interface, maxtime); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcP2pSetPowerSave(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } char interface[WIFI_P2P_GROUP_IFNAME_LENGTH] = {0}; int enable = 0; if (ReadStr(context, interface, sizeof(interface)) != 0 || ReadInt(context, &enable) < 0) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = P2pSetPowerSave(interface, enable); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcP2pSetWfdEnable(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } int enable = 0; if (ReadInt(context, &enable) < 0) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = P2pSetWfdEnable(enable); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcP2pSetWfdDeviceConfig(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } char conf[WIFI_P2P_WFD_DEVICE_CONF_LENGTH] = {0}; if (ReadStr(context, conf, sizeof(conf)) != 0) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = P2pSetWfdDeviceConfig(conf); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcP2pStartFind(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } int timeout = 0; if (ReadInt(context, &timeout) < 0) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = P2pStartFind(timeout); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcP2pStopFind(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = P2pStopFind(); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcP2pSetExtListen(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } int enable = 0; int period = 0; int interval = 0; if (ReadInt(context, &enable) < 0 || ReadInt(context, &period) < 0 || ReadInt(context, &interval) < 0) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = P2pSetExtListen(enable, period, interval); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcP2pSetListenChannel(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } int channel = 0; int regClass = 0; if (ReadInt(context, &channel) < 0 || ReadInt(context, ®Class) < 0) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = P2pSetListenChannel(channel, regClass); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcP2pConnect(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } P2pConnectInfo info; if (memset_s(&info, sizeof(info), 0, sizeof(info)) != EOK) { - return -1; + return HAL_FAILURE; } if (ReadInt(context, &info.mode) < 0 || ReadInt(context, &info.provdisc) < 0 || ReadInt(context, &info.goIntent) < 0 || ReadInt(context, &info.persistent) < 0 || ReadStr(context, info.peerDevAddr, sizeof(info.peerDevAddr)) != 0 || ReadStr(context, info.pin, sizeof(info.pin)) != 0) { - return -1; + return HAL_FAILURE; } int flag = 0; if (info.provdisc == HAL_WPS_METHOD_DISPLAY && strcmp(info.pin, "pin") == 0) { @@ -446,76 +446,76 @@ int RpcP2pConnect(RpcServer *server, Context *context) WriteStr(context, info.pin); } WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcP2pCancelConnect(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = P2pCancelConnect(); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcP2pProvisionDiscovery(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } char bssid[WIFI_BSSID_LENGTH] = {0}; int mode = 0; if (ReadStr(context, bssid, sizeof(bssid)) != 0 || ReadInt(context, &mode) < 0) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = P2pProvisionDiscovery(bssid, mode); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcP2pAddGroup(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } int isPersistent = 0; int networkId = 0; int freq = 0; if (ReadInt(context, &isPersistent) < 0 || ReadInt(context, &networkId) < 0 || ReadInt(context, &freq) < 0) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = P2pAddGroup(isPersistent, networkId, freq); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcP2pRemoveGroup(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } char interface[WIFI_P2P_GROUP_IFNAME_LENGTH] = {0}; if (ReadStr(context, interface, sizeof(interface)) != 0) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = P2pRemoveGroup(interface); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcP2pInvite(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } int persistent = 0; char peerBssid[WIFI_BSSID_LENGTH] = {0}; @@ -523,40 +523,40 @@ int RpcP2pInvite(RpcServer *server, Context *context) char ifName[WIFI_IFACE_NAME_MAXLEN] = {0}; if (ReadInt(context, &persistent) < 0 || ReadStr(context, peerBssid, sizeof(peerBssid)) != 0 || ReadStr(context, goBssid, sizeof(goBssid)) != 0 || ReadStr(context, ifName, sizeof(ifName)) != 0) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = P2pInvite(persistent, peerBssid, goBssid, ifName); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcP2pReinvoke(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } int networkId = 0; char bssid[WIFI_BSSID_LENGTH] = {0}; if (ReadInt(context, &networkId) < 0 || ReadStr(context, bssid, sizeof(bssid)) != 0) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = P2pReinvoke(networkId, bssid); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcP2pGetGroupCapability(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } char bssid[WIFI_BSSID_LENGTH] = {0}; if (ReadStr(context, bssid, sizeof(bssid)) != 0) { - return -1; + return HAL_FAILURE; } int capacity = 0; WifiErrorNo err = P2pGetGroupCapability(bssid, &capacity); @@ -566,84 +566,84 @@ int RpcP2pGetGroupCapability(RpcServer *server, Context *context) WriteInt(context, capacity); } WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcP2pAddService(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } P2pServiceInfo argv; if (memset_s(&argv, sizeof(argv), 0, sizeof(argv)) != EOK) { - return -1; + return HAL_FAILURE; } if (ReadInt(context, &argv.mode) < 0) { - return -1; + return HAL_FAILURE; } if (!argv.mode) { if (ReadInt(context, &argv.version) < 0 || ReadStr(context, argv.name, sizeof(argv.name)) != 0) { - return -1; + return HAL_FAILURE; } } else { if (ReadStr(context, argv.query, sizeof(argv.query)) != 0 || ReadStr(context, argv.resp, sizeof(argv.resp)) != 0) { - return -1; + return HAL_FAILURE; } } WifiErrorNo err = P2pAddService(&argv); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcP2pRemoveService(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } P2pServiceInfo argv; if (memset_s(&argv, sizeof(argv), 0, sizeof(argv)) != EOK) { - return -1; + return HAL_FAILURE; } if (ReadInt(context, &argv.mode) < 0) { - return -1; + return HAL_FAILURE; } if (!argv.mode) { if (ReadInt(context, &argv.version) < 0 || ReadStr(context, argv.name, sizeof(argv.name)) != 0) { - return -1; + return HAL_FAILURE; } } else { if (ReadStr(context, argv.query, sizeof(argv.query)) != 0) { - return -1; + return HAL_FAILURE; } } WifiErrorNo err = P2pRemoveService(&argv); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcP2pReqServiceDiscovery(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } char bssid[WIFI_BSSID_LENGTH] = {0}; if (ReadStr(context, bssid, sizeof(bssid)) != 0) { - return -1; + return HAL_FAILURE; } char discoverinfo[WIFI_P2P_SERVE_DISCOVER_MSG_LENGTH] = {0}; char *pDiscoverInfo = NULL; int len = ReadStr(context, discoverinfo, sizeof(discoverinfo)); if (len < 0) { - return -1; + return HAL_FAILURE; } else if (len > 0) { pDiscoverInfo = (char *)calloc(len + 1, sizeof(char)); if (pDiscoverInfo == NULL) { - return -1; + return HAL_FAILURE; } ReadStr(context, pDiscoverInfo, len + 1); } @@ -651,13 +651,13 @@ int RpcP2pReqServiceDiscovery(RpcServer *server, Context *context) if (ReadInt(context, &retSize) < 0 || retSize <= 0) { free(pDiscoverInfo); pDiscoverInfo = NULL; - return -1; + return HAL_FAILURE; } char *pRetBuf = (char *)calloc(retSize, sizeof(char)); if (pRetBuf == NULL) { free(pDiscoverInfo); /* free(NULL) is ok, so here no need to judge pDiscoverInfo != NULL */ pDiscoverInfo = NULL; - return -1; + return HAL_FAILURE; } WifiErrorNo err = P2pReqServiceDiscovery(bssid, ((pDiscoverInfo == NULL) ? discoverinfo : pDiscoverInfo), pRetBuf, retSize); @@ -671,61 +671,61 @@ int RpcP2pReqServiceDiscovery(RpcServer *server, Context *context) pRetBuf = NULL; free(pDiscoverInfo); pDiscoverInfo = NULL; - return 0; + return HAL_SUCCESS; } int RpcP2pCancelServiceDiscovery(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } char id[WIFI_P2P_SERVER_DISCOVERY_SEQUENCE_LENGTH] = {0}; if (ReadStr(context, id, sizeof(id)) != 0) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = P2pCancelServiceDiscovery(id); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcP2pSetMiracastType(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } int type = 0; if (ReadInt(context, &type) < 0) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = P2pSetMiracastType(type); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcP2pRespServerDiscovery(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } P2pServDiscReqInfo info; if (memset_s(&info, sizeof(info), 0, sizeof(info)) != EOK) { - return -1; + return HAL_FAILURE; } if (ReadInt(context, &info.freq) < 0 || ReadInt(context, &info.dialogToken) < 0 || ReadStr(context, info.mac, sizeof(info.mac)) != 0) { - return -1; + return HAL_FAILURE; } int tlvsLen = ReadStr(context, NULL, 0); if (tlvsLen <= 0) { - return -1; + return HAL_FAILURE; } info.tlvs = (char *)calloc(tlvsLen + 1, sizeof(char)); if (info.tlvs == NULL) { - return -1; + return HAL_FAILURE; } ReadStr(context, info.tlvs, tlvsLen + 1); WifiErrorNo err = P2pRespServerDiscovery(&info); @@ -734,51 +734,51 @@ int RpcP2pRespServerDiscovery(RpcServer *server, Context *context) WriteEnd(context); free(info.tlvs); info.tlvs = NULL; - return 0; + return HAL_SUCCESS; } int RpcP2pSetServDiscExternal(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } int mode = 0; if (ReadInt(context, &mode) < 0) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = P2pSetServDiscExternal(mode); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcP2pSetPersistentReconnect(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } int mode = 0; if (ReadInt(context, &mode) < 0) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = P2pSetPersistentReconnect(mode); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcP2pGetPeer(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } char bssid[WIFI_BSSID_LENGTH] = {0}; P2pDeviceInfo peerInfo; if (memset_s(&peerInfo, sizeof(peerInfo), 0, sizeof(peerInfo)) != EOK || ReadStr(context, bssid, sizeof(bssid)) != 0) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = P2pGetPeer(bssid, &peerInfo); WriteBegin(context, 0); @@ -792,22 +792,22 @@ int RpcP2pGetPeer(RpcServer *server, Context *context) WriteInt(context, peerInfo.groupCapabilities); } WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcP2pGetFrequencies(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } int band = 0; int maxSize = 0; if (ReadInt(context, &band) < 0 || ReadInt(context, &maxSize) < 0 || maxSize <= 0) { - return -1; + return HAL_FAILURE; } int *frequencies = (int *)calloc(maxSize, sizeof(int)); if (frequencies == NULL) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = P2pGetFrequencies(band, frequencies, &maxSize); WriteBegin(context, 0); @@ -821,22 +821,22 @@ int RpcP2pGetFrequencies(RpcServer *server, Context *context) WriteEnd(context); free(frequencies); frequencies = NULL; - return 0; + return HAL_SUCCESS; } int RpcP2pSetGroupConfig(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } int networkId = 0; int size = 0; if (ReadInt(context, &networkId) < 0 || ReadInt(context, &size) < 0 || size <= 0) { - return -1; + return HAL_FAILURE; } P2pGroupConfig *confs = (P2pGroupConfig *)calloc(size, sizeof(P2pGroupConfig)); if (confs == NULL) { - return -1; + return HAL_FAILURE; } int flag = 0; for (int i = 0; i < size; ++i) { @@ -855,22 +855,22 @@ int RpcP2pSetGroupConfig(RpcServer *server, Context *context) WriteEnd(context); free(confs); confs = NULL; - return 0; + return HAL_SUCCESS; } int RpcP2pGetGroupConfig(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } int networkId = 0; int size = 0; if (ReadInt(context, &networkId) < 0 || ReadInt(context, &size) < 0 || size <= 0) { - return -1; + return HAL_FAILURE; } P2pGroupConfig *confs = (P2pGroupConfig *)calloc(size, sizeof(P2pGroupConfig)); if (confs == NULL) { - return -1; + return HAL_FAILURE; } int flag = 0; for (int i = 0; i < size; ++i) { @@ -893,13 +893,13 @@ int RpcP2pGetGroupConfig(RpcServer *server, Context *context) WriteEnd(context); free(confs); confs = NULL; - return 0; + return HAL_SUCCESS; } int RpcP2pAddNetwork(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } int networkId = 0; WifiErrorNo err = P2pAddNetwork(&networkId); @@ -909,28 +909,28 @@ int RpcP2pAddNetwork(RpcServer *server, Context *context) WriteInt(context, networkId); } WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcP2pHid2dConnect(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } Hid2dConnectInfo info; if (memset_s(&info, sizeof(info), 0, sizeof(info)) != EOK) { - return -1; + return HAL_FAILURE; } if (ReadStr(context, info.ssid, sizeof(info.ssid)) != 0 || ReadStr(context, info.bssid, sizeof(info.bssid)) != 0 || ReadStr(context, info.passphrase, sizeof(info.passphrase)) != 0 || ReadInt(context, &info.frequency) < 0) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = P2pHid2dConnect(&info); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } \ No newline at end of file diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.c index 5606363..d201df7 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.c @@ -59,7 +59,7 @@ static int GetPos(const char *name) static int PushRpcFunc(const char *name, Rpcfunc func) { if (g_rpcFuncHandle == NULL || name == NULL || func == NULL) { - return -1; + return HAL_FAILURE; } int pos = GetPos(name); if (g_rpcFuncHandle[pos].func == NULL) { @@ -72,14 +72,14 @@ static int PushRpcFunc(const char *name, Rpcfunc func) } WifiHalRpcFunc *q = (WifiHalRpcFunc *)calloc(1, sizeof(WifiHalRpcFunc)); if (q == NULL) { - return -1; + return HAL_FAILURE; } StrSafeCopy(q->funcname, sizeof(q->funcname), name); q->func = func; q->next = NULL; p->next = q; } - return 0; + return HAL_SUCCESS; } static int InitRpcFuncMapBase(void) @@ -245,11 +245,11 @@ static int InitRpcFuncMapP2p(void) int InitRpcFunc(void) { if (g_rpcFuncHandle != NULL) { - return 0; + return HAL_SUCCESS; } g_rpcFuncHandle = (WifiHalRpcFunc *)calloc(RPC_FUNC_NUM, sizeof(WifiHalRpcFunc)); if (g_rpcFuncHandle == NULL) { - return -1; + return HAL_FAILURE; } int ret = 0; @@ -261,13 +261,13 @@ int InitRpcFunc(void) ret += InitRpcFuncMapCommon(); ret += InitRpcFuncMapP2p(); if (ret < 0) { - return -1; + return HAL_FAILURE; } if (InitCallbackMsg() < 0) { - return -1; + return HAL_FAILURE; } - return 0; + return HAL_SUCCESS; } void ReleaseRpcFunc(void) @@ -306,13 +306,13 @@ Rpcfunc GetRpcFunc(const char *func) int OnTransact(RpcServer *server, Context *context) { if ((server == NULL) || (context == NULL)) { - return -1; + return HAL_FAILURE; } char func[RPC_FUNCNAME_MAX_LEN] = {0}; int ret = ReadFunc(context, func, RPC_FUNCNAME_MAX_LEN); if (ret < 0) { - return -1; + return HAL_FAILURE; } LOGI("run %{public}s", func); Rpcfunc pFunc = GetRpcFunc(func); @@ -331,7 +331,7 @@ int OnTransact(RpcServer *server, Context *context) WriteEnd(context); } } - return 0; + return HAL_SUCCESS; } /* Defines the bidirectional list of global callback event parameters. */ @@ -340,18 +340,18 @@ static WifiHalEventCallback *g_wifiHalEventCallback = NULL; int InitCallbackMsg(void) { if (g_wifiHalEventCallback != NULL) { - return 0; + return HAL_SUCCESS; } g_wifiHalEventCallback = (WifiHalEventCallback *)calloc(1, sizeof(WifiHalEventCallback)); if (g_wifiHalEventCallback == NULL) { - return -1; + return HAL_FAILURE; } pthread_mutex_init(&g_wifiHalEventCallback->mutex, NULL); for (int i = 0; i < WIFI_HAL_MAX_EVENT - WIFI_FAILURE_EVENT; ++i) { g_wifiHalEventCallback->cbmsgs[i].pre = g_wifiHalEventCallback->cbmsgs + i; g_wifiHalEventCallback->cbmsgs[i].next = g_wifiHalEventCallback->cbmsgs + i; } - return 0; + return HAL_SUCCESS; } void ReleaseCallbackMsg(void) @@ -377,7 +377,7 @@ void ReleaseCallbackMsg(void) int PushBackCallbackMsg(int event, WifiHalEventCallbackMsg *msg) { if (g_wifiHalEventCallback == NULL || event >= WIFI_HAL_MAX_EVENT || event < WIFI_FAILURE_EVENT || msg == NULL) { - return -1; + return HAL_FAILURE; } int pos = event - WIFI_FAILURE_EVENT; pthread_mutex_lock(&g_wifiHalEventCallback->mutex); @@ -394,13 +394,13 @@ int PushBackCallbackMsg(int event, WifiHalEventCallbackMsg *msg) head->pre = msg; } pthread_mutex_unlock(&g_wifiHalEventCallback->mutex); - return 0; + return HAL_SUCCESS; } int PopBackCallbackMsg(int event) { if (g_wifiHalEventCallback == NULL || event >= WIFI_HAL_MAX_EVENT || event < WIFI_FAILURE_EVENT) { - return -1; + return HAL_FAILURE; } int pos = event - WIFI_FAILURE_EVENT; pthread_mutex_lock(&g_wifiHalEventCallback->mutex); @@ -411,7 +411,7 @@ int PopBackCallbackMsg(int event) tail->pre->next = head; } pthread_mutex_unlock(&g_wifiHalEventCallback->mutex); - return 0; + return HAL_SUCCESS; } WifiHalEventCallbackMsg *FrontCallbackMsg(int event) @@ -431,7 +431,7 @@ WifiHalEventCallbackMsg *FrontCallbackMsg(int event) int PopFrontCallbackMsg(int event) { if (g_wifiHalEventCallback == NULL || event >= WIFI_HAL_MAX_EVENT || event < WIFI_FAILURE_EVENT) { - return -1; + return HAL_FAILURE; } int pos = event - WIFI_FAILURE_EVENT; pthread_mutex_lock(&g_wifiHalEventCallback->mutex); @@ -444,7 +444,7 @@ int PopFrontCallbackMsg(int event) p = NULL; } pthread_mutex_unlock(&g_wifiHalEventCallback->mutex); - return 0; + return HAL_SUCCESS; } /* Processing callback messages */ @@ -696,20 +696,20 @@ static void DealP2pCallback(int event, Context *context) int OnCallbackTransact(const RpcServer *server, int event, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } WriteBegin(context, 1); WriteInt(context, event); DealStaApCallback(event, context); DealP2pCallback(event, context); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int EndCallbackTransact(const RpcServer *server, int event) { if (server == NULL) { - return -1; + return HAL_FAILURE; } return PopFrontCallbackMsg(event); } \ No newline at end of file diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_sta.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_sta.c index 3920203..2816e1e 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_sta.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_sta.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -21,31 +21,31 @@ int RpcStart(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = Start(); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcStop(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = Stop(); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcStartScan(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } ScanSettings setting = {0}; int ret = -1; @@ -98,18 +98,18 @@ int RpcStartScan(RpcServer *server, Context *context) int RpcGetScanInfos(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } int maxSize = 0; if (ReadInt(context, &maxSize) < 0) { - return -1; + return HAL_FAILURE; } ScanInfo *results = NULL; if (maxSize > 0) { results = (ScanInfo *)calloc(maxSize, sizeof(ScanInfo)); } if (results == NULL) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = GetScanInfos(results, &maxSize); WriteBegin(context, 0); @@ -136,46 +136,46 @@ int RpcGetScanInfos(RpcServer *server, Context *context) WriteEnd(context); free(results); results = NULL; - return 0; + return HAL_SUCCESS; } static int ReadPnoScanSettings(Context *context, PnoScanSettings *pSetting) { if (ReadInt(context, &pSetting->scanInterval) < 0 || ReadInt(context, &pSetting->minRssi2Dot4Ghz) < 0 || ReadInt(context, &pSetting->minRssi5Ghz) < 0 || ReadInt(context, &pSetting->hiddenSsidSize) < 0) { - return -1; + return HAL_FAILURE; } if (pSetting->hiddenSsidSize > 0) { pSetting->hiddenSsid = ReadCharArray(context, pSetting->hiddenSsidSize); if (pSetting->hiddenSsid == NULL) { - return -1; + return HAL_FAILURE; } } if (ReadInt(context, &pSetting->savedSsidSize) < 0) { - return -1; + return HAL_FAILURE; } if (pSetting->savedSsidSize > 0) { pSetting->savedSsid = ReadCharArray(context, pSetting->savedSsidSize); if (pSetting->savedSsid == NULL) { - return -1; + return HAL_FAILURE; } } if (ReadInt(context, &pSetting->freqSize) < 0) { - return -1; + return HAL_FAILURE; } if (pSetting->freqSize > 0) { pSetting->freqs = ReadIntArray(context, pSetting->freqSize); if (pSetting->freqs == NULL) { - return -1; + return HAL_FAILURE; } } - return 0; + return HAL_SUCCESS; } int RpcStartPnoScan(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } PnoScanSettings setting = {0}; int ret = ReadPnoScanSettings(context, &setting); @@ -212,71 +212,71 @@ int RpcStartPnoScan(RpcServer *server, Context *context) int RpcStopPnoScan(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = StopPnoScan(); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcConnect(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } int networkId = 0; if (ReadInt(context, &networkId) < 0) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = Connect(networkId); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcReconnect(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = Reconnect(); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcReassociate(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = Reassociate(); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcDisconnect(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = Disconnect(); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcGetStaCapabilities(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } int32_t capabilities = 0; WifiErrorNo err = GetStaCapabilities(&capabilities); @@ -286,24 +286,24 @@ int RpcGetStaCapabilities(RpcServer *server, Context *context) WriteInt(context, capabilities); } WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcGetDeviceMacAddress(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } int maxSize = 0; if (ReadInt(context, &maxSize) < 0 || maxSize <= 0) { - return -1; + return HAL_FAILURE; } unsigned char *mac = NULL; if (maxSize > 0) { mac = (unsigned char *)calloc(maxSize + 1, sizeof(unsigned char)); } if (mac == NULL) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = GetDeviceMacAddress(mac, &maxSize); WriteBegin(context, 0); @@ -315,22 +315,22 @@ int RpcGetDeviceMacAddress(RpcServer *server, Context *context) WriteEnd(context); free(mac); mac = NULL; - return 0; + return HAL_SUCCESS; } int RpcGetFrequencies(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } int band = 0; int maxSize = 0; if (ReadInt(context, &band) < 0 || ReadInt(context, &maxSize) < 0 || maxSize <= 0) { - return -1; + return HAL_FAILURE; } int *frequencies = (int *)calloc(maxSize, sizeof(int)); if (frequencies == NULL) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = GetFrequencies(band, frequencies, &maxSize); WriteBegin(context, 0); @@ -344,92 +344,92 @@ int RpcGetFrequencies(RpcServer *server, Context *context) WriteEnd(context); free(frequencies); frequencies = NULL; - return 0; + return HAL_SUCCESS; } int RpcSetAssocMacAddr(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } int maxSize = 0; if (ReadInt(context, &maxSize) < 0) { - return -1; + return HAL_FAILURE; } int len = maxSize + 1; unsigned char *mac = (unsigned char *)calloc(len, sizeof(unsigned char)); if (mac == NULL) { - return -1; + return HAL_FAILURE; } if (ReadUStr(context, mac, len) != 0) { free(mac); mac = NULL; - return -1; + return HAL_FAILURE; } WifiErrorNo err = SetAssocMacAddr(mac, maxSize); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); free(mac); - return 0; + return HAL_SUCCESS; } int RpcSetScanningMacAddress(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } int maxSize = 0; if (ReadInt(context, &maxSize) < 0 || maxSize < 0) { - return -1; + return HAL_FAILURE; } int len = maxSize + 1; unsigned char *mac = (unsigned char *)calloc(len, sizeof(unsigned char)); if (mac == NULL) { - return -1; + return HAL_FAILURE; } if (ReadUStr(context, mac, len) != 0) { free(mac); - return -1; + return HAL_FAILURE; } WifiErrorNo err = SetScanningMacAddress(mac, maxSize); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); free(mac); - return 0; + return HAL_SUCCESS; } int RpcDeauthLastRoamingBssid(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } int maxSize = 0; if (ReadInt(context, &maxSize) < 0 || maxSize < 0) { - return -1; + return HAL_FAILURE; } int len = maxSize + 1; unsigned char *mac = (unsigned char *)calloc(len, sizeof(unsigned char)); if (mac == NULL) { - return -1; + return HAL_FAILURE; } if (ReadUStr(context, mac, len) != 0) { free(mac); - return -1; + return HAL_FAILURE; } WifiErrorNo err = DeauthLastRoamingBssid(mac, maxSize); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); free(mac); - return 0; + return HAL_SUCCESS; } int RpcGetSupportFeature(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } long feature = 0; WifiErrorNo err = GetSupportFeature(&feature); @@ -439,24 +439,24 @@ int RpcGetSupportFeature(RpcServer *server, Context *context) WriteLong(context, feature); } WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcRunCmd(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } char ifname[WIFI_IFACE_NAME_MAXLEN] = {0}; char *pIfName = NULL; int ret = ReadStr(context, ifname, WIFI_IFACE_NAME_MAXLEN); if (ret < 0) { - return -1; + return HAL_FAILURE; } else if (ret > 0) { int len = ret + 1; pIfName = (char *)calloc(len, sizeof(char)); if (pIfName == NULL) { - return -1; + return HAL_FAILURE; } ReadStr(context, pIfName, len); } @@ -465,21 +465,21 @@ int RpcRunCmd(RpcServer *server, Context *context) if (ReadInt(context, &cmdid) < 0 || ReadInt(context, &bufsize) < 0 || bufsize < 0) { free(pIfName); pIfName = NULL; - return -1; + return HAL_FAILURE; } int len = bufsize + 1; unsigned char *buf = (unsigned char *)calloc(len, sizeof(unsigned char)); if (buf == NULL) { free(pIfName); pIfName = NULL; - return -1; + return HAL_FAILURE; } if (ReadUStr(context, buf, len) != 0) { free(pIfName); free(buf); pIfName = NULL; buf = NULL; - return -1; + return HAL_FAILURE; } WifiErrorNo err = RunCmd((pIfName == NULL) ? ifname : pIfName, cmdid, buf, bufsize); WriteBegin(context, 0); @@ -489,45 +489,45 @@ int RpcRunCmd(RpcServer *server, Context *context) free(buf); pIfName = NULL; buf = NULL; - return 0; + return HAL_SUCCESS; } int RpcSetWifiTxPower(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } int32_t power = 0; if (ReadInt(context, &power) < 0) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = SetWifiTxPower(power); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcRemoveNetwork(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } int32_t networkId = 0; if (ReadInt(context, &networkId) < 0) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = RemoveNetwork(networkId); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcAddNetwork(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } int networkId = 0; WifiErrorNo err = AddNetwork(&networkId); @@ -537,61 +537,61 @@ int RpcAddNetwork(RpcServer *server, Context *context) WriteInt(context, networkId); } WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcEnableNetwork(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } int networkId = 0; if (ReadInt(context, &networkId) < 0) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = EnableNetwork(networkId); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcDisableNetwork(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } int networkId = 0; if (ReadInt(context, &networkId) < 0) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = DisableNetwork(networkId); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcSetNetwork(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } int networkId = 0; if (ReadInt(context, &networkId) < 0) { - return -1; + return HAL_FAILURE; } int size = 0; if (ReadInt(context, &size) < 0) { - return -1; + return HAL_FAILURE; } if (size <= 0) { - return -1; + return HAL_FAILURE; } SetNetworkConfig *confs = (SetNetworkConfig *)calloc(size, sizeof(SetNetworkConfig)); if (confs == NULL) { - return -1; + return HAL_FAILURE; } int flag = 0; @@ -611,57 +611,57 @@ int RpcSetNetwork(RpcServer *server, Context *context) WriteEnd(context); free(confs); confs = NULL; - return 0; + return HAL_SUCCESS; } int RpcSaveNetworkConfig(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = SaveNetworkConfig(); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcStartWpsPbcMode(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } WifiWpsParam param = {0}; if (ReadInt(context, ¶m.anyFlag) < 0) { - return -1; + return HAL_FAILURE; } if (ReadInt(context, ¶m.multiAp) < 0) { - return -1; + return HAL_FAILURE; } if (ReadStr(context, param.bssid, sizeof(param.bssid)) != 0) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = StartWpsPbcMode(¶m); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcStartWpsPinMode(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } WifiWpsParam param = {0}; if (ReadInt(context, ¶m.anyFlag) < 0) { - return -1; + return HAL_FAILURE; } if (ReadInt(context, ¶m.multiAp) < 0) { - return -1; + return HAL_FAILURE; } if (ReadStr(context, param.bssid, sizeof(param.bssid)) != 0) { - return -1; + return HAL_FAILURE; } int pinCode = 0; WifiErrorNo err = StartWpsPinMode(¶m, &pinCode); @@ -671,25 +671,25 @@ int RpcStartWpsPinMode(RpcServer *server, Context *context) WriteInt(context, pinCode); } WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcStopWps(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = StopWps(); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcGetRoamingCapabilities(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } WifiRoamCapability capability = {0}; WifiErrorNo err = GetRoamingCapabilities(&capability); @@ -700,7 +700,7 @@ int RpcGetRoamingCapabilities(RpcServer *server, Context *context) WriteInt(context, capability.maxTrustlistSize); } WriteEnd(context); - return 0; + return HAL_SUCCESS; } static char **ReadRoamBlockList(Context *context, int size) @@ -742,7 +742,7 @@ static char **ReadRoamBlockList(Context *context, int size) int RpcSetRoamConfig(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } int blocksize = 0; char **blocklist = NULL; @@ -798,11 +798,11 @@ int RpcSetRoamConfig(RpcServer *server, Context *context) int RpcWpaGetNetwork(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } GetNetworkConfig conf = {0}; if (ReadInt(context, &(conf.networkId)) < 0 || ReadStr(context, conf.param, sizeof(conf.param)) != 0) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = WpaGetNetWork(&conf); WriteBegin(context, 0); @@ -811,53 +811,53 @@ int RpcWpaGetNetwork(RpcServer *server, Context *context) WriteStr(context, conf.value); } WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcWpaAutoConnect(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } int enable = 0; if (ReadInt(context, &enable) < 0) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = WpaAutoConnect(enable); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcWpaBlocklistClear(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = WpaBlocklistClear(); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcGetNetworkList(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } int maxSize = 0; if (ReadInt(context, &maxSize) < 0) { - return -1; + return HAL_FAILURE; } if (maxSize <= 0) { - return -1; + return HAL_FAILURE; } WifiNetworkInfo *infos = (WifiNetworkInfo *)calloc(maxSize, sizeof(WifiNetworkInfo)); if (infos == NULL) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = GetNetworkList(infos, &maxSize); @@ -875,17 +875,17 @@ int RpcGetNetworkList(RpcServer *server, Context *context) WriteEnd(context); free(infos); infos = NULL; - return 0; + return HAL_SUCCESS; } int RpcGetConnectSignalInfo(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } char endBssid[WIFI_BSSID_LENGTH] = {0}; if (ReadStr(context, endBssid, sizeof(endBssid)) != 0) { - return -1; + return HAL_FAILURE; } WpaSignalInfo info = {0}; WifiErrorNo err = GetConnectSignalInfo(endBssid, &info); @@ -899,5 +899,5 @@ int RpcGetConnectSignalInfo(RpcServer *server, Context *context) WriteInt(context, info.frequency); } WriteEnd(context); - return 0; + return HAL_SUCCESS; } \ No newline at end of file diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_supplicant.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_supplicant.c index 9c46a25..113011e 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_supplicant.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_supplicant.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -20,69 +20,69 @@ int RpcStartSupplicant(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = StartSupplicant(); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcStopSupplicant(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = StopSupplicant(); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcConnectSupplicant(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = ConnectSupplicant(); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcDisconnectSupplicant(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = DisconnectSupplicant(); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcRequestToSupplicant(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } int maxSize = 0; if (ReadInt(context, &maxSize) < 0 || maxSize < 0) { - return -1; + return HAL_FAILURE; } int len = maxSize + 1; unsigned char *buf = (unsigned char *)calloc(len, sizeof(unsigned char)); if (buf == NULL) { - return -1; + return HAL_FAILURE; } if (ReadUStr(context, buf, len) != 0) { free(buf); buf = NULL; - return -1; + return HAL_FAILURE; } WifiErrorNo err = RequestToSupplicant(buf, maxSize); WriteBegin(context, 0); @@ -90,46 +90,46 @@ int RpcRequestToSupplicant(RpcServer *server, Context *context) WriteEnd(context); free(buf); buf = NULL; - return 0; + return HAL_SUCCESS; } int RpcSetPowerSave(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } int mode = 0; if (ReadInt(context, &mode) < 0) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = SetPowerSave(mode); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcWpaSetCountryCode(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } char countryCode[WIFI_COUNTRY_CODE_MAXLEN + 1] = {0}; if (ReadStr(context, countryCode, sizeof(countryCode)) != 0) { - return -1; + return HAL_FAILURE; } WifiErrorNo err = WpaSetCountryCode(countryCode); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); - return 0; + return HAL_SUCCESS; } int RpcWpaGetCountryCode(RpcServer *server, Context *context) { if (server == NULL || context == NULL) { - return -1; + return HAL_FAILURE; } char countryCode[WIFI_COUNTRY_CODE_MAXLEN + 1] = {0}; WifiErrorNo err = WpaGetCountryCode(countryCode, WIFI_COUNTRY_CODE_MAXLEN + 1); @@ -139,5 +139,5 @@ int RpcWpaGetCountryCode(RpcServer *server, Context *context) WriteStr(context, countryCode); } WriteEnd(context); - return 0; + return HAL_SUCCESS; } diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_define.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_define.h index 3a358cd..f913ebe 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_define.h +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_define.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -36,6 +36,9 @@ extern "C" { #define WIFI_P2P_SERVER_NAME_LENGTH 256 #define WIFI_NETWORK_PSK_MAXLEN 64 +#define HAL_SUCCESS 0 +#define HAL_FAILURE (-1) + typedef enum WifiErrorNo { WIFI_HAL_SUCCESS = 0, /* Success. */ WIFI_HAL_FAILED = 1, /* Failed. */ @@ -218,4 +221,4 @@ typedef enum HalWpsMethod { #ifdef __cplusplus } #endif -#endif \ No newline at end of file +#endif diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module_manage.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module_manage.c index 0fa0125..5bb1a72 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module_manage.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module_manage.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -21,6 +21,7 @@ #include #include #include +#include "wifi_hal_define.h" #include "wifi_log.h" #include "securec.h" @@ -126,19 +127,19 @@ static void *WpaThreadMain(void *p) int StartModuleInternal(const char *moduleName, const char *startCmd, pid_t *pProcessId) { if (moduleName == NULL || startCmd == NULL || pProcessId == NULL) { - return -1; + return HAL_FAILURE; } pid_t pid = fork(); if (pid < 0) { LOGE("Create wpa process failed!"); - return -1; + return HAL_FAILURE; } if (pid == 0) { /* sub process */ pthread_t tid; int ret = pthread_create(&tid, NULL, WpaThreadMain, (void *)startCmd); if (ret != 0) { LOGE("Create wpa thread failed!"); - return -1; + return HAL_FAILURE; } pthread_join(tid, NULL); exit(0); @@ -147,23 +148,23 @@ int StartModuleInternal(const char *moduleName, const char *startCmd, pid_t *pPr sleep(1); *pProcessId = pid; } - return 0; + return HAL_SUCCESS; } int StopModuleInternal(const char *moduleName, pid_t processId) { if (moduleName == NULL) { - return 0; + return HAL_SUCCESS; } int tryTimes = STOP_MODULE_TRY_TIMES; while (tryTimes-- >= 0) { if (kill(processId, SIGTERM) == -1) { if (ESRCH == errno) { LOGI("kill [%{public}d] success, pid no exist", processId); - return 0; + return HAL_SUCCESS; } LOGE("kill [%{public}d] failed", processId); - return -1; + return HAL_FAILURE; } sleep(1); int ret = waitpid(processId, NULL, WNOHANG); @@ -172,11 +173,11 @@ int StopModuleInternal(const char *moduleName, pid_t processId) continue; } else { LOGD("waitpid [%{public}d] success", processId); - return 0; + return HAL_SUCCESS; } } LOGE("stop [%{public}d] failed, cannot send SIGTERM signal to stop process", processId); - return -1; + return HAL_FAILURE; } ModuleInfo *FindModule(const char *moduleName) -- Gitee From 22d6c8515396c464ba8d2770999928c5fa4b29b5 Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Sat, 28 May 2022 07:03:43 +0000 Subject: [PATCH 141/491] update status on connect fail - #I59PTT Signed-off-by: zhangfeng Change-Id: Ib8af0510e27f4bf354c3f0778d8d4541631e6536 --- .../wifi_manage/wifi_sta/sta_service.cpp | 2 +- .../wifi_sta/sta_state_machine.cpp | 31 +++++++++++++------ .../wifi_manage/wifi_sta/sta_state_machine.h | 10 +++++- 3 files changed, 31 insertions(+), 12 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp index 552556a..937d8b4 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp @@ -197,7 +197,7 @@ ErrCode StaService::ConnectToDevice(const WifiDeviceConfig &config) const LOGD("StaService::ConnectTo AddDeviceConfig failed!"); return WIFI_OPT_FAILED; } - LOGD("StaService::ConnectTo AddDeviceConfig succeed!"); + LOGD("StaService::ConnectTo: %{public}d", netWorkId); pStaStateMachine->SendMessage(WIFI_SVR_CMD_STA_CONNECT_NETWORK, netWorkId, NETWORK_SELECTED_BY_THE_USER); return WIFI_OPT_SUCCESS; } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp index b474894..7f2c881 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp @@ -744,6 +744,14 @@ void StaStateMachine::ConvertFreqToChannel() return; } +void StaStateMachine::OnConnectFailed(int networkId) +{ + WIFI_LOGE("Connect to network failed: %{public}d.\n", networkId); + SaveLinkstate(ConnState::DISCONNECTED, DetailedState::FAILED); + staCallback.OnStaConnChanged(OperateResState::CONNECT_ENABLE_NETWORK_FAILED, linkedInfo); + staCallback.OnStaConnChanged(OperateResState::DISCONNECT_DISCONNECTED, linkedInfo); +} + void StaStateMachine::DealConnectToUserSelectedNetwork(InternalMessage *msg) { LOGI("enter DealConnectToUserSelectedNetwork.\n"); @@ -751,24 +759,25 @@ void StaStateMachine::DealConnectToUserSelectedNetwork(InternalMessage *msg) LOGE("msg is null.\n"); return; } - /* Save connection information. */ - SaveLinkstate(ConnState::CONNECTING, DetailedState::CONNECTING); - - /* Callback result to InterfaceService. */ - staCallback.OnStaConnChanged(OperateResState::CONNECT_CONNECTING, linkedInfo); int networkId = msg->GetParam1(); bool forceReconnect = msg->GetParam2(); - if (linkedInfo.connState == ConnState::CONNECTED && networkId == linkedInfo.networkId) { WIFI_LOGE("This network is in use and does not need to be reconnected.\n"); return; } + /* Save connection information. */ + SaveLinkstate(ConnState::CONNECTING, DetailedState::CONNECTING); + /* Callback result to InterfaceService. */ + staCallback.OnStaConnChanged(OperateResState::CONNECT_CONNECTING, linkedInfo); + if (StartConnectToNetwork(networkId) != WIFI_OPT_SUCCESS) { + OnConnectFailed(networkId); + return; + } /* Sets network status. */ WifiSettings::GetInstance().EnableNetwork(networkId, forceReconnect); WifiSettings::GetInstance().SetDeviceState(networkId, (int)WifiDeviceConfigStatus::ENABLED, false); - StartConnectToNetwork(networkId); } void StaStateMachine::DealConnectTimeOutCmd(InternalMessage *msg) @@ -1148,27 +1157,29 @@ void StaStateMachine::DealStartRoamCmd(InternalMessage *msg) SwitchState(pApRoamingState); } -void StaStateMachine::StartConnectToNetwork(int networkId) +ErrCode StaStateMachine::StartConnectToNetwork(int networkId) { targetNetworkId = networkId; SetRandomMac(targetNetworkId); if (WifiStaHalInterface::GetInstance().EnableNetwork(targetNetworkId) != WIFI_IDL_OPT_OK) { LOGE("EnableNetwork() failed!"); - return; + return WIFI_OPT_FAILED; } if (WifiStaHalInterface::GetInstance().Connect(targetNetworkId) != WIFI_IDL_OPT_OK) { LOGE("Connect failed!"); staCallback.OnStaConnChanged(OperateResState::CONNECT_SELECT_NETWORK_FAILED, linkedInfo); - return; + return WIFI_OPT_FAILED; } if (WifiStaHalInterface::GetInstance().SaveDeviceConfig() != WIFI_IDL_OPT_OK) { + /* OHOS's wpa don't support save command, so don't judge as failure */ LOGE("SaveDeviceConfig() failed!"); } StopTimer(static_cast(CMD_NETWORK_CONNECT_TIMEOUT)); StartTimer(static_cast(CMD_NETWORK_CONNECT_TIMEOUT), STA_NETWORK_CONNECTTING_DELAY); + return WIFI_OPT_SUCCESS; } void StaStateMachine::MacAddressGenerate(std::string &strMac) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h index d4e3bc2..3502dd9 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h @@ -446,12 +446,20 @@ private: */ void ConnectToNetworkProcess(InternalMessage *msg); + /** + * @Description On connect fail. + * + * @param networkId - the networkId of network which is going to be connected.(in) + */ + void OnConnectFailed(int networkId); + /** * @Description Start to connect to network. * * @param networkId - the networkId of network which is going to be connected.(in) + * @Return success: WIFI_OPT_SUCCESS fail: WIFI_OPT_FAILED */ - void StartConnectToNetwork(int networkId); + ErrCode StartConnectToNetwork(int networkId); /** * @Description Disable network * -- Gitee From 98c4f4809122e7c17a4278a3f8dc3e6667ed77ea Mon Sep 17 00:00:00 2001 From: y00316381 Date: Sat, 28 May 2022 15:06:13 +0800 Subject: [PATCH 142/491] bugfix from master Signed-off-by: y00316381 --- .../wifi_framework/wifi_manage/wifi_manager.cpp | 3 ++- .../wifi_manage/wifi_sta/sta_auto_connect_service.cpp | 10 ++++++++++ .../wifi_manage/wifi_sta/sta_auto_connect_service.h | 5 +++++ .../wifi_manage/wifi_sta/sta_state_machine.cpp | 5 +++-- 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp index db3fd89..46031a4 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp @@ -441,7 +441,7 @@ void WifiManager::DealStaCloseRes(OperateResState state) return; } if (state == OperateResState::CLOSE_WIFI_FAILED) { - WIFI_LOGD("DealStaCloseRes:upload wifi close failed event!"); + WIFI_LOGI("DealStaCloseRes:upload wifi close failed event!"); cbMsg.msgData = static_cast(WifiState::UNKNOWN); WifiInternalEventDispatcher::GetInstance().AddBroadCastMsg(cbMsg); } @@ -460,6 +460,7 @@ void WifiManager::DealStaCloseRes(OperateResState state) void WifiManager::DealStaConnChanged(OperateResState state, const WifiLinkedInfo &info) { + WIFI_LOGI("Enter, DealStaConnChanged, state: %{public}d!\n", static_cast(state)); bool isReport = true; int reportStateNum = static_cast(ConvertConnStateInternal(state, isReport)); if (isReport) { diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp index a4b0c8b..067bcb9 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp @@ -76,6 +76,9 @@ void StaAutoConnectService::OnScanInfosReadyHandler(const std::vector blockedBssids; GetBlockedBssids(blockedBssids); @@ -153,6 +156,13 @@ void StaAutoConnectService::GetBlockedBssids(std::vector &blockedBs return; } +void StaAutoConnectService::ClearAllBlockedBssids() +{ + WIFI_LOGI("Enter StaAutoConnectService::ClearAllBlockedBssids.\n"); + blockedBssidMap.clear(); + return; +} + void StaAutoConnectService::ClearOvertimeBlockedBssid() { WIFI_LOGI("Enter StaAutoConnectService::ClearOvertimeBlockedBssid.\n"); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.h index d069181..4f7d700 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.h @@ -109,6 +109,11 @@ private: ~BlockedBssidInfo(){} }; std::unordered_map blockedBssidMap; + /** + * @Description Clear all BSSIDs in BSSID Blocklist + * + */ + void ClearAllBlockedBssids(); /** * @Description Refreshing the BSSID Blocklist * diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp index b474894..7c1cbbd 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp @@ -773,7 +773,7 @@ void StaStateMachine::DealConnectToUserSelectedNetwork(InternalMessage *msg) void StaStateMachine::DealConnectTimeOutCmd(InternalMessage *msg) { - LOGD("enter DealConnectTimeOutCmd.\n"); + LOGW("enter DealConnectTimeOutCmd.\n"); if (msg == nullptr) { WIFI_LOGE("msg is nul\n"); } @@ -794,10 +794,11 @@ void StaStateMachine::DealConnectTimeOutCmd(InternalMessage *msg) void StaStateMachine::DealConnectionEvent(InternalMessage *msg) { if (msg == nullptr) { + WIFI_LOGE("DealConnectionEvent, msg is nullptr.\n"); return; } - WIFI_LOGD("enter DealConnectionEvent"); + WIFI_LOGI("enter DealConnectionEvent"); WifiSettings::GetInstance().SetDeviceState(targetNetworkId, (int)WifiDeviceConfigStatus::ENABLED, false); WifiSettings::GetInstance().SyncDeviceConfig(); /* Stop clearing the Wpa_blocklist. */ -- Gitee From 9d07f7580b1d640834f1918b5d376f7dcf17b6f7 Mon Sep 17 00:00:00 2001 From: y00316381 Date: Sat, 28 May 2022 15:23:56 +0800 Subject: [PATCH 143/491] bugfix from master Signed-off-by: y00316381 --- .../wifi_manage/wifi_sta/sta_auto_connect_service.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp index 067bcb9..5b60c50 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp @@ -205,19 +205,16 @@ void StaAutoConnectService::ConnectElectedDevice(WifiDeviceConfig &electedDevice currentConnectedNetwork.ssid == electedDevice.ssid && currentConnectedNetwork.bssid != electedDevice.bssid) { /* Frameworks start roaming only when firmware is not supported */ if (!firmwareRoamFlag) { - WIFI_LOGI("Roaming connectTo.\n"); + WIFI_LOGI("Roaming connectTo, networkId: %{public}d.\n", electedDevice.networkId); pStaStateMachine->StartRoamToNetwork(electedDevice.bssid); - WIFI_LOGI("connecTo network bssid is %s", electedDevice.bssid.c_str()); } } else if (currentConnectedNetwork.detailedState == DetailedState::DISCONNECTED || currentConnectedNetwork.detailedState == DetailedState::CONNECTION_TIMEOUT) { - WIFI_LOGI("connecTo save network.\n"); pStaStateMachine->SendMessage(WIFI_SVR_CMD_STA_CONNECT_SAVED_NETWORK, electedDevice.networkId, NETWORK_SELECTED_FOR_CONNECTION_MANAGEMENT); - WIFI_LOGI("connecTo networkId is %{public}d", electedDevice.networkId); - WIFI_LOGI("connecTo bssid is %s", electedDevice.bssid.c_str()); - WIFI_LOGI("connecTo preShareKey is %s", electedDevice.preSharedKey.c_str()); + WIFI_LOGI("connecTo save networkId: %{public}d, preShareKey len: %{public}d.\n", + electedDevice.networkId, electedDevice.preSharedKey.length()); } else { WIFI_LOGE("The current connection status is %{public}d.\n", currentConnectedNetwork.detailedState); } -- Gitee From 2d8eb7886f74f2144fee35eafe3b349089ed4a7c Mon Sep 17 00:00:00 2001 From: shiqichang Date: Sat, 28 May 2022 15:43:21 +0800 Subject: [PATCH 144/491] =?UTF-8?q?aafwk=E7=9B=AE=E5=BD=95=E5=88=87?= =?UTF-8?q?=E6=8D=A2ability=5Fability=5Fruntime?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: shiqichang Change-Id: Ia1eb6caa6991fead9120ba7b65d5e46c30fe5666 --- wifi/frameworks/js/napi/BUILD.gn | 4 ++-- wifi/wifi.gni | 2 +- wifi/wifi_lite.gni | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/wifi/frameworks/js/napi/BUILD.gn b/wifi/frameworks/js/napi/BUILD.gn index 4d03011..bb61334 100644 --- a/wifi/frameworks/js/napi/BUILD.gn +++ b/wifi/frameworks/js/napi/BUILD.gn @@ -70,7 +70,7 @@ ohos_shared_library("wifiext") { "$WIFI_ROOT_DIR/frameworks/native/include", "$WIFI_ROOT_DIR/frameworks/native/interfaces", "$WIFI_ROOT_DIR/frameworks/js/napi/inc", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/ability_runtime/context", + "//foundation/ability/ability_runtime/frameworks/kits/appkit/native/ability_runtime/context", ] sources = [ @@ -81,7 +81,7 @@ ohos_shared_library("wifiext") { deps = [ "$WIFI_ROOT_DIR/frameworks/native:wifi_sdk", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//foundation/aafwk/standard/frameworks/kits/appkit:app_context", + "//foundation/ability/ability_runtime/frameworks/kits/appkit:app_context", "//foundation/arkui/napi:ace_napi", "//utils/native/base:utils", ] diff --git a/wifi/wifi.gni b/wifi/wifi.gni index 84c926a..9b965cb 100644 --- a/wifi/wifi.gni +++ b/wifi/wifi.gni @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -aafwk_kits_path = "//foundation/aafwk/standard/frameworks/kits" +aafwk_kits_path = "//foundation/ability/ability_runtime/frameworks/kits" SUBSYSTEM_DIR = "//foundation/communication" WIFI_ROOT_DIR = "$SUBSYSTEM_DIR/wifi/wifi" diff --git a/wifi/wifi_lite.gni b/wifi/wifi_lite.gni index f1fb71f..526a069 100644 --- a/wifi/wifi_lite.gni +++ b/wifi/wifi_lite.gni @@ -11,8 +11,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -aaservices_path = "//foundation/aafwk/standard/services" -aainnerkits_path = "//foundation/aafwk/standard/interfaces/innerkits" +aaservices_path = "//foundation/ability/ability_runtime/services" +aainnerkits_path = "//foundation/ability/ability_runtime/interfaces/innerkits" SUBSYSTEM_DIR = "//foundation/communication" WIFI_ROOT_DIR = "$SUBSYSTEM_DIR/wifi/wifi" -- Gitee From 88a641c2a6e7f3436f161d70acd37fcfdc18b15f Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Sat, 28 May 2022 10:06:56 +0000 Subject: [PATCH 145/491] solve clang compiler update warnings Signed-off-by: zhangfeng --- wifi/services/wifi_standard/ipc_framework/cRPC/src/client.c | 5 +---- wifi/services/wifi_standard/ipc_framework/cRPC/src/serial.c | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/wifi/services/wifi_standard/ipc_framework/cRPC/src/client.c b/wifi/services/wifi_standard/ipc_framework/cRPC/src/client.c index fe520e1..ee10fec 100644 --- a/wifi/services/wifi_standard/ipc_framework/cRPC/src/client.c +++ b/wifi/services/wifi_standard/ipc_framework/cRPC/src/client.c @@ -24,11 +24,8 @@ const int FD_CHECK_TIMEOUT = 1000; /* poll wait time, units: ms */ const int CLIENT_STATE_IDLE = 0; const int CLIENT_STATE_DEAL_REPLY = 1; const int CLIENT_STATE_EXIT = 2; -#ifdef OHOS_ARCH_LITE + #define TMP_BUFF_SIZE 16 -#else -const int TMP_BUFF_SIZE = 16; -#endif static void *RpcClientThreadDeal(void *arg); diff --git a/wifi/services/wifi_standard/ipc_framework/cRPC/src/serial.c b/wifi/services/wifi_standard/ipc_framework/cRPC/src/serial.c index f6baf72..32f212c 100644 --- a/wifi/services/wifi_standard/ipc_framework/cRPC/src/serial.c +++ b/wifi/services/wifi_standard/ipc_framework/cRPC/src/serial.c @@ -15,11 +15,8 @@ #include #include "serial.h" -#ifdef OHOS_ARCH_LITE #define TMP_CHAR_LEN 64 -#else -const int TMP_CHAR_LEN = 64; -#endif + const int HIGH_TWO_BIT = 16; const int ALPHA_NUM_MAX = 10; -- Gitee From f51cd9a7bbb44fe5e1519027396b2619dfbd9d16 Mon Sep 17 00:00:00 2001 From: y00316381 Date: Sat, 28 May 2022 20:41:44 +0800 Subject: [PATCH 146/491] bugfix from master Signed-off-by: y00316381 --- .../wifi_sta/sta_state_machine.cpp | 38 +++++++++---------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp index 7c1cbbd..4ab202b 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp @@ -477,7 +477,7 @@ StaStateMachine::WpaStartedState::~WpaStartedState() void StaStateMachine::WpaStartedState::GoInState() { - WIFI_LOGD("WpaStartedState GoInState function."); + WIFI_LOGI("WpaStartedState GoInState function."); if (pStaStateMachine->operationalMode == STA_CONNECT_MODE) { pStaStateMachine->SwitchState(pStaStateMachine->pSeparatedState); } else if (pStaStateMachine->operationalMode == STA_DISABLED_MODE) { @@ -487,7 +487,7 @@ void StaStateMachine::WpaStartedState::GoInState() } void StaStateMachine::WpaStartedState::GoOutState() { - LOGD("WpaStartedState GoOutState function."); + LOGI("WpaStartedState GoOutState function."); return; } @@ -513,7 +513,7 @@ bool StaStateMachine::WpaStartedState::ExecuteStateMsg(InternalMessage *msg) void StaStateMachine::StopWifiProcess() { - WIFI_LOGD("Enter StaStateMachine::StopWifiProcess.\n"); + WIFI_LOGI("Enter StaStateMachine::StopWifiProcess.\n"); #ifndef OHOS_ARCH_LITE WifiNetAgent::GetInstance().UnregisterNetSupplier(); #endif @@ -663,7 +663,7 @@ void StaStateMachine::DealSignalPollResult(InternalMessage *msg) } WifiWpaSignalInfo signalInfo; WifiStaHalInterface::GetInstance().GetConnectSignalInfo(linkedInfo.bssid, signalInfo); - LOGI("DealSignalPollResult GetConnectSignalInfo rssi = %d, txLinkSpeed = %d, rxLinkSpeed =%d, frequency =%d.\n", + LOGI("DealSignalPollResult, rssi:%{public}d, txLinkSpeed:%{public}d, rxLinkSpeed:%{public}d, freq:%{public}d.\n", signalInfo.signal, signalInfo.txrate, signalInfo.rxrate, @@ -675,12 +675,10 @@ void StaStateMachine::DealSignalPollResult(InternalMessage *msg) linkedInfo.rssi = setRssi(signalInfo.signal); } int currentSignalLevel = WifiSettings::GetInstance().GetSignalLevel(linkedInfo.rssi, linkedInfo.band); - LOGI("DealSignalPollResult linkedInfo.rssi = %d, linkedInfo.band = %d.\n", linkedInfo.rssi, linkedInfo.band); - LOGI("DealSignalPollResult currentSignalLevel = %d, lastSignalLevel = %d.\n", + LOGI("DealSignalPollResult linkedInfo.rssi:%{public}d, linkedInfo.band:%{public}d.\n", linkedInfo.rssi, linkedInfo.band); + LOGI("DealSignalPollResult currentSignalLevel:%{public}d, lastSignalLevel:%{public}d.\n", currentSignalLevel, lastSignalLevel); if (currentSignalLevel != lastSignalLevel) { - LOGI("DealSignalPollResult currentSignalLevel = %d, lastSignalLevel = %d.\n", - currentSignalLevel, lastSignalLevel); if (staCallback.OnStaRssiLevelChanged != nullptr) { staCallback.OnStaRssiLevelChanged(linkedInfo.rssi); } @@ -876,7 +874,7 @@ void StaStateMachine::DealDisconnectEvent(InternalMessage *msg) void StaStateMachine::DealWpaLinkFailEvent(InternalMessage *msg) { - LOGD("enter DealWpaLinkFailEvent.\n"); + LOGW("enter DealWpaLinkFailEvent.\n"); if (msg == nullptr) { LOGE("msg is null.\n"); return; @@ -902,7 +900,7 @@ void StaStateMachine::DealWpaLinkFailEvent(InternalMessage *msg) void StaStateMachine::DealReConnectCmd(InternalMessage *msg) { - LOGD("enter DealReConnectCmd.\n"); + LOGI("enter DealReConnectCmd.\n"); if (msg == nullptr) { WIFI_LOGE("msg is null\n"); } @@ -925,7 +923,7 @@ void StaStateMachine::DealReConnectCmd(InternalMessage *msg) void StaStateMachine::DealReassociateCmd(InternalMessage *msg) { - LOGD("enter DealReassociateCmd.\n"); + LOGI("enter DealReassociateCmd.\n"); if (msg == nullptr) { WIFI_LOGE("msg is null\n"); } @@ -943,7 +941,7 @@ void StaStateMachine::DealReassociateCmd(InternalMessage *msg) void StaStateMachine::DealStartWpsCmd(InternalMessage *msg) { - WIFI_LOGD("enter DealStartWpsCmd\n"); + WIFI_LOGI("enter DealStartWpsCmd\n"); if (msg == nullptr) { return; } @@ -1031,23 +1029,23 @@ void StaStateMachine::StartWpsMode(InternalMessage *msg) void StaStateMachine::DealWpaBlockListClearEvent(InternalMessage *msg) { if (msg != nullptr) { - WIFI_LOGD("enter DealWpaBlockListClearEvent\n"); + WIFI_LOGE("enter DealWpaBlockListClearEvent\n"); } if (WifiStaHalInterface::GetInstance().WpaBlocklistClear() != WIFI_IDL_OPT_OK) { WIFI_LOGE("Clearing the Wpa_blocklist failed\n"); } StartTimer(static_cast(WPA_BLOCK_LIST_CLEAR_EVENT), BLOCK_LIST_CLEAR_TIMER); - WIFI_LOGD("Clearing the Wpa_blocklist.\n"); + WIFI_LOGI("Clearing the Wpa_blocklist.\n"); } void StaStateMachine::DealWpsConnectTimeOutEvent(InternalMessage *msg) { + WIFI_LOGW("enter DealWpsConnectTimeOutEvent\n"); if (msg == nullptr) { + WIFI_LOGE("msg is nullptr!\n"); return; } - WIFI_LOGD("enter DealWpsConnectTimeOutEvent\n"); - WIFI_LOGD("Wps Time out!"); DealCancelWpsCmd(msg); /* Callback InterfaceService that WPS time out. */ @@ -1107,7 +1105,7 @@ void StaStateMachine::DealStartRoamCmd(InternalMessage *msg) return; } - WIFI_LOGD("enter DealStartRoamCmd\n"); + WIFI_LOGI("enter DealStartRoamCmd\n"); std::string bssid = msg->GetStringFromMessage(); /* GetDeviceConfig from Configuration center. */ WifiDeviceConfig network; @@ -1174,7 +1172,7 @@ void StaStateMachine::StartConnectToNetwork(int networkId) void StaStateMachine::MacAddressGenerate(std::string &strMac) { - LOGD("enter MacAddressGenerate\n"); + LOGI("enter MacAddressGenerate\n"); constexpr int arraySize = 4; constexpr int macBitSize = 12; constexpr int firstBit = 1; @@ -1215,7 +1213,7 @@ bool StaStateMachine::ComparedKeymgmt(const std::string scanInfoKeymgmt, const s bool StaStateMachine::SetRandomMac(int networkId) { - LOGD("enter SetRandomMac.\n"); + LOGI("enter SetRandomMac.\n"); WifiDeviceConfig deviceConfig; if (WifiSettings::GetInstance().GetDeviceConfig(networkId, deviceConfig) != 0) { LOGE("SetRandomMac : GetDeviceConfig failed!\n"); @@ -1601,7 +1599,7 @@ void StaStateMachine::GetIpState::GoInState() LOGE("ConfigstaticIpAddress failed!\n"); } } else { - LOGD("GetIpState get dhcp result."); + LOGI("GetIpState get dhcp result."); int dhcpRet; DhcpServiceInfo dhcpInfo; pStaStateMachine->pDhcpService->GetDhcpInfo(IF_NAME, dhcpInfo); -- Gitee From bcb2f20e231f1b5155e0038a2106cebf7b8c356d Mon Sep 17 00:00:00 2001 From: y00316381 Date: Sat, 28 May 2022 20:49:32 +0800 Subject: [PATCH 147/491] bugfix from master Signed-off-by: y00316381 --- .../wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp index 4ab202b..84ee186 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp @@ -1600,7 +1600,7 @@ void StaStateMachine::GetIpState::GoInState() } } else { LOGI("GetIpState get dhcp result."); - int dhcpRet; + int dhcpRet = 0; DhcpServiceInfo dhcpInfo; pStaStateMachine->pDhcpService->GetDhcpInfo(IF_NAME, dhcpInfo); if (pStaStateMachine->isRoam && dhcpInfo.clientRunStatus == 1) { -- Gitee From 4c2920e7c3f25018150d61f740ec595d0e66a01d Mon Sep 17 00:00:00 2001 From: y00316381 Date: Sun, 29 May 2022 09:24:01 +0800 Subject: [PATCH 148/491] bugfix from master Signed-off-by: y00316381 --- .../wifi_manage/wifi_sta/sta_auto_connect_service.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp index 5b60c50..89b034b 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp @@ -214,7 +214,7 @@ void StaAutoConnectService::ConnectElectedDevice(WifiDeviceConfig &electedDevice electedDevice.networkId, NETWORK_SELECTED_FOR_CONNECTION_MANAGEMENT); WIFI_LOGI("connecTo save networkId: %{public}d, preShareKey len: %{public}d.\n", - electedDevice.networkId, electedDevice.preSharedKey.length()); + electedDevice.networkId, (int)electedDevice.preSharedKey.length()); } else { WIFI_LOGE("The current connection status is %{public}d.\n", currentConnectedNetwork.detailedState); } -- Gitee From 2470c8d1f16619c114c884fc6651704b10d4e324 Mon Sep 17 00:00:00 2001 From: y00316381 Date: Sun, 29 May 2022 17:28:24 +0800 Subject: [PATCH 149/491] bugfix from master Signed-off-by: y00316381 --- .../wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp index 84ee186..28e1383 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp @@ -675,7 +675,8 @@ void StaStateMachine::DealSignalPollResult(InternalMessage *msg) linkedInfo.rssi = setRssi(signalInfo.signal); } int currentSignalLevel = WifiSettings::GetInstance().GetSignalLevel(linkedInfo.rssi, linkedInfo.band); - LOGI("DealSignalPollResult linkedInfo.rssi:%{public}d, linkedInfo.band:%{public}d.\n", linkedInfo.rssi, linkedInfo.band); + LOGI("DealSignalPollResult linkedInfo.rssi:%{public}d, linkedInfo.band:%{public}d.\n", + linkedInfo.rssi, linkedInfo.band); LOGI("DealSignalPollResult currentSignalLevel:%{public}d, lastSignalLevel:%{public}d.\n", currentSignalLevel, lastSignalLevel); if (currentSignalLevel != lastSignalLevel) { -- Gitee From a4635bbb394a49796f57e97c14f88acd85cf1f5c Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Mon, 30 May 2022 11:12:24 +0000 Subject: [PATCH 150/491] fix SEC code warningsw Signed-off-by: zhangfeng --- dhcp/services/dhcp_server/src/dhcp_address_pool.c | 3 +-- dhcp/services/dhcp_server/src/dhcp_server.c | 1 - wifi/frameworks/js/napi/src/wifi_napi_event.cpp | 2 -- .../wifi_manage/wifi_p2p/wifi_p2p_group_manager.cpp | 5 +---- .../wifi_manage/wifi_sta/sta_state_machine.cpp | 3 +-- 5 files changed, 3 insertions(+), 11 deletions(-) diff --git a/dhcp/services/dhcp_server/src/dhcp_address_pool.c b/dhcp/services/dhcp_server/src/dhcp_address_pool.c index 12acccf..715ade3 100644 --- a/dhcp/services/dhcp_server/src/dhcp_address_pool.c +++ b/dhcp/services/dhcp_server/src/dhcp_address_pool.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -163,7 +163,6 @@ int CheckRangeAvailability( LOGD("address is out of range"); return RET_FAILED; } else { - distIp = beginIp; *outOfRange = 1; } return RET_FAILED; diff --git a/dhcp/services/dhcp_server/src/dhcp_server.c b/dhcp/services/dhcp_server/src/dhcp_server.c index ba138a6..cd3d4d0 100644 --- a/dhcp/services/dhcp_server/src/dhcp_server.c +++ b/dhcp/services/dhcp_server/src/dhcp_server.c @@ -1500,7 +1500,6 @@ static int ValidateReplyOptions(PDhcpMsgInfo reply) if (!pNode) { return RET_ERROR; } - pNode = pNode->next; PDhcpOption pOptMsgType = GetOption(&reply->options, DHCP_MESSAGE_TYPE_OPTION); if (!pOptMsgType) { LOGE("unkown reply message type."); diff --git a/wifi/frameworks/js/napi/src/wifi_napi_event.cpp b/wifi/frameworks/js/napi/src/wifi_napi_event.cpp index 185bc00..1ad1ac2 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_event.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_event.cpp @@ -519,8 +519,6 @@ int EventRegister::CheckPermission(const std::string& eventType) { auto callerToken = IPCSkeleton::GetCallingTokenID(); auto tokenType = Security::AccessToken::AccessTokenKit::GetTokenTypeFlag(callerToken); - WIFI_LOGD("Enter CheckPermission, callerToken=%{public}x, tokenType=%{public}x, eventType=%{public}s!", - callerToken, tokenType, eventType.c_str()); if (tokenType == Security::AccessToken::ATokenTypeEnum::TOKEN_NATIVE) { return WIFI_NAPI_PERMISSION_GRANTED; } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_manager.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_manager.cpp index ad1f9db..7eba194 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_manager.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_manager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -21,7 +21,6 @@ namespace OHOS { namespace Wifi { - WifiP2pGroupManager::WifiP2pGroupManager() : groupsInfo(), currentGroup(), groupMutex(), p2pConnInfo() {} @@ -87,7 +86,6 @@ void WifiP2pGroupManager::UpdateWpaGroup(const WifiP2pGroupInfo &group) int WifiP2pGroupManager::RemoveClientFromGroup(int networkId, const std::string &deviceAddress) { - bool isRemoveSucceed = false; WifiP2pDevice device; device.SetDeviceAddress(deviceAddress); @@ -97,7 +95,6 @@ int WifiP2pGroupManager::RemoveClientFromGroup(int networkId, const std::string if (networkId == it->GetNetworkId()) { if (it->IsContainsDevice(device)) { it->RemoveClientDevice(device); - isRemoveSucceed = true; } break; } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp index b474894..41d5a32 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp @@ -1745,9 +1745,8 @@ bool StaStateMachine::LinkedState::ExecuteStateMsg(InternalMessage *msg) return false; } - bool ret = NOT_EXECUTED; WIFI_LOGI("LinkedState-msgCode=%{public}d not handled.\n", msg->GetMessageName()); - return ret; + return NOT_EXECUTED; } /* --------------------------- state machine Roaming State ------------------------------ */ -- Gitee From d472d627ea0031cf16ab5fd6e3c2fb02cf0051e7 Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Tue, 31 May 2022 11:57:00 +0000 Subject: [PATCH 151/491] circumvent the file content loss of force reset the device Signed-off-by: zhangfeng --- .../common/config/wifi_config_file_impl.h | 18 ++++++++++++------ .../wifi_sta/sta_auto_connect_service.cpp | 6 ++++-- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/common/config/wifi_config_file_impl.h b/wifi/services/wifi_standard/wifi_framework/common/config/wifi_config_file_impl.h index a08a132..5bb7dd7 100644 --- a/wifi/services/wifi_standard/wifi_framework/common/config/wifi_config_file_impl.h +++ b/wifi/services/wifi_standard/wifi_framework/common/config/wifi_config_file_impl.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -18,6 +18,7 @@ #include #include #include +#include #include #include "wifi_config_file_spec.h" #include "wifi_log.h" @@ -165,9 +166,9 @@ int WifiConfigFileImpl::LoadConfig() template int WifiConfigFileImpl::SaveConfig() { - std::ofstream fs(mFileName.c_str()); - if (!fs.is_open()) { - LOGE("Save config file: %{public}s, fs.is_open() failed!", mFileName.c_str()); + FILE* fp = fopen(mFileName.c_str(), "w"); + if (!fp) { + LOGE("Save config file: %{public}s, fopen() failed!", mFileName.c_str()); return -1; } std::ostringstream ss; @@ -181,8 +182,13 @@ int WifiConfigFileImpl::SaveConfig() ss << OutTClassString(item) << std::endl; } std::string content = ss.str(); - fs.write(content.c_str(), content.length()); - fs.close(); + int ret = fwrite(content.c_str(), 1, content.length(), fp); + if (ret != (int)content.length()) { + LOGE("Save config file: %{public}s, fwrite() failed!", mFileName.c_str()); + } + (void)fflush(fp); + (void)fsync(fileno(fp)); + (void)fclose(fp); mValues.clear(); /* clear values */ return 0; } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp index 89b034b..9010857 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp @@ -209,7 +209,8 @@ void StaAutoConnectService::ConnectElectedDevice(WifiDeviceConfig &electedDevice pStaStateMachine->StartRoamToNetwork(electedDevice.bssid); } } else if (currentConnectedNetwork.detailedState == DetailedState::DISCONNECTED || - currentConnectedNetwork.detailedState == DetailedState::CONNECTION_TIMEOUT) { + currentConnectedNetwork.detailedState == DetailedState::CONNECTION_TIMEOUT || + currentConnectedNetwork.detailedState == DetailedState::FAILED) { pStaStateMachine->SendMessage(WIFI_SVR_CMD_STA_CONNECT_SAVED_NETWORK, electedDevice.networkId, NETWORK_SELECTED_FOR_CONNECTION_MANAGEMENT); @@ -444,7 +445,8 @@ bool StaAutoConnectService::AllowAutoSelectDevice(const std::vector Date: Wed, 1 Jun 2022 15:50:36 +0800 Subject: [PATCH 152/491] bugfix from master Signed-off-by: y00316381 --- .../native/c_adapter/inc/wifi_c_utils.h | 8 +++++++ .../native/c_adapter/src/wifi_c_device.cpp | 17 +++++++++----- .../native/c_adapter/src/wifi_c_hid2d.cpp | 1 + .../native/c_adapter/src/wifi_c_hotspot.cpp | 13 ++++++----- .../native/c_adapter/src/wifi_c_p2p.cpp | 22 ++++++++++--------- 5 files changed, 41 insertions(+), 20 deletions(-) diff --git a/wifi/frameworks/native/c_adapter/inc/wifi_c_utils.h b/wifi/frameworks/native/c_adapter/inc/wifi_c_utils.h index fecfa0e..5c01132 100644 --- a/wifi/frameworks/native/c_adapter/inc/wifi_c_utils.h +++ b/wifi/frameworks/native/c_adapter/inc/wifi_c_utils.h @@ -36,6 +36,14 @@ namespace Wifi { } #endif +#ifndef CHECK_PTR_RETURN_VOID +#define CHECK_PTR_RETURN_VOID(ptr) \ + if ((ptr) == nullptr) { \ + WIFI_LOGE("Error: the ptr is null!"); \ + return; \ + } +#endif + /** * @Description Convert c++ error code to c error code. * diff --git a/wifi/frameworks/native/c_adapter/src/wifi_c_device.cpp b/wifi/frameworks/native/c_adapter/src/wifi_c_device.cpp index 059270b..3d5112c 100644 --- a/wifi/frameworks/native/c_adapter/src/wifi_c_device.cpp +++ b/wifi/frameworks/native/c_adapter/src/wifi_c_device.cpp @@ -140,6 +140,7 @@ static void GetStaticIpFromCpp(const OHOS::Wifi::StaticIpAddress& staticIp, IpCo static void ConvertDeviceConfigFromC(const WifiDeviceConfig *config, OHOS::Wifi::WifiDeviceConfig& deviceConfig) { + CHECK_PTR_RETURN_VOID(config); deviceConfig.ssid = config->ssid; if (OHOS::Wifi::IsMacArrayEmpty(config->bssid)) { deviceConfig.bssid = ""; @@ -165,6 +166,7 @@ static void ConvertDeviceConfigFromC(const WifiDeviceConfig *config, OHOS::Wifi: static OHOS::Wifi::ErrCode ConvertDeviceConfigFromCpp(const OHOS::Wifi::WifiDeviceConfig& deviceConfig, WifiDeviceConfig *result) { + CHECK_PTR_RETURN(result, ERROR_WIFI_INVALID_ARGS); if (memcpy_s(result->ssid, WIFI_MAX_SSID_LEN, deviceConfig.ssid.c_str(), deviceConfig.ssid.size() + 1) != EOK) { return OHOS::Wifi::WIFI_OPT_FAILED; } @@ -194,6 +196,8 @@ static OHOS::Wifi::ErrCode ConvertDeviceConfigFromCpp(const OHOS::Wifi::WifiDevi WifiErrorCode AddDeviceConfig(const WifiDeviceConfig *config, int *result) { CHECK_PTR_RETURN(wifiDevicePtr, ERROR_WIFI_NOT_AVAILABLE); + CHECK_PTR_RETURN(config, ERROR_WIFI_INVALID_ARGS); + CHECK_PTR_RETURN(result, ERROR_WIFI_INVALID_ARGS); OHOS::Wifi::WifiDeviceConfig deviceConfig; ConvertDeviceConfigFromC(config, deviceConfig); int addResult = -1; @@ -205,11 +209,8 @@ WifiErrorCode AddDeviceConfig(const WifiDeviceConfig *config, int *result) WifiErrorCode GetDeviceConfigs(WifiDeviceConfig *result, unsigned int *size) { CHECK_PTR_RETURN(wifiDevicePtr, ERROR_WIFI_NOT_AVAILABLE); - if (result == nullptr) { - WIFI_LOGE("Get device configs result array is null!"); - return ERROR_WIFI_UNKNOWN; - } - + CHECK_PTR_RETURN(result, ERROR_WIFI_INVALID_ARGS); + CHECK_PTR_RETURN(size, ERROR_WIFI_INVALID_ARGS); std::vector vecDeviceConfigs; OHOS::Wifi::ErrCode ret = wifiDevicePtr->GetDeviceConfigs(vecDeviceConfigs); if (ret != OHOS::Wifi::WIFI_OPT_SUCCESS) { @@ -252,6 +253,7 @@ WifiErrorCode ConnectTo(int networkId) WifiErrorCode ConnectToDevice(const WifiDeviceConfig *config) { CHECK_PTR_RETURN(wifiDevicePtr, ERROR_WIFI_NOT_AVAILABLE); + CHECK_PTR_RETURN(config, ERROR_WIFI_INVALID_ARGS); OHOS::Wifi::WifiDeviceConfig deviceConfig; ConvertDeviceConfigFromC(config, deviceConfig); return GetCErrorCode(wifiDevicePtr->ConnectToDevice(deviceConfig)); @@ -265,6 +267,7 @@ WifiErrorCode Disconnect() static OHOS::Wifi::ErrCode GetLinkedInfoFromCpp(const OHOS::Wifi::WifiLinkedInfo& linkedInfo, WifiLinkedInfo *result) { + CHECK_PTR_RETURN(result, ERROR_WIFI_INVALID_ARGS); if (memcpy_s(result->ssid, WIFI_MAX_SSID_LEN, linkedInfo.ssid.c_str(), linkedInfo.ssid.size() + 1) != EOK) { return OHOS::Wifi::WIFI_OPT_FAILED; } @@ -284,6 +287,7 @@ static OHOS::Wifi::ErrCode GetLinkedInfoFromCpp(const OHOS::Wifi::WifiLinkedInfo WifiErrorCode GetLinkedInfo(WifiLinkedInfo *result) { CHECK_PTR_RETURN(wifiDevicePtr, ERROR_WIFI_NOT_AVAILABLE); + CHECK_PTR_RETURN(result, ERROR_WIFI_INVALID_ARGS); OHOS::Wifi::WifiLinkedInfo linkedInfo; OHOS::Wifi::ErrCode ret = wifiDevicePtr->GetLinkedInfo(linkedInfo); if (ret == OHOS::Wifi::WIFI_OPT_SUCCESS) { @@ -299,6 +303,7 @@ WifiErrorCode GetLinkedInfo(WifiLinkedInfo *result) WifiErrorCode GetDeviceMacAddress(unsigned char *result) { CHECK_PTR_RETURN(wifiDevicePtr, ERROR_WIFI_NOT_AVAILABLE); + CHECK_PTR_RETURN(result, ERROR_WIFI_INVALID_ARGS); std::string mac; OHOS::Wifi::ErrCode ret = wifiDevicePtr->GetDeviceMacAddress(mac); if (ret == OHOS::Wifi::WIFI_OPT_SUCCESS) { @@ -312,11 +317,13 @@ WifiErrorCode GetDeviceMacAddress(unsigned char *result) WifiErrorCode AdvanceScan(WifiScanParams *params) { + CHECK_PTR_RETURN(params, ERROR_WIFI_INVALID_ARGS); return GetCErrorCode(OHOS::Wifi::WIFI_OPT_NOT_SUPPORTED); } WifiErrorCode GetIpInfo(IpInfo *info) { + CHECK_PTR_RETURN(info, ERROR_WIFI_INVALID_ARGS); return GetCErrorCode(OHOS::Wifi::WIFI_OPT_NOT_SUPPORTED); } diff --git a/wifi/frameworks/native/c_adapter/src/wifi_c_hid2d.cpp b/wifi/frameworks/native/c_adapter/src/wifi_c_hid2d.cpp index 424c843..764d815 100644 --- a/wifi/frameworks/native/c_adapter/src/wifi_c_hid2d.cpp +++ b/wifi/frameworks/native/c_adapter/src/wifi_c_hid2d.cpp @@ -109,6 +109,7 @@ static void ConvertRecommendChannelRequest(const RecommendChannelRequest *reques static void ConvertRecommendChannelResponse(const OHOS::Wifi::RecommendChannelResponse& rsp, RecommendChannelResponse* response) { + CHECK_PTR_RETURN_VOID(config); response->status = RecommendStatus(static_cast(rsp.status)); response->index = rsp.index; response->centerFreq = rsp.centerFreq; diff --git a/wifi/frameworks/native/c_adapter/src/wifi_c_hotspot.cpp b/wifi/frameworks/native/c_adapter/src/wifi_c_hotspot.cpp index b8aea46..8bd84ad 100644 --- a/wifi/frameworks/native/c_adapter/src/wifi_c_hotspot.cpp +++ b/wifi/frameworks/native/c_adapter/src/wifi_c_hotspot.cpp @@ -78,6 +78,7 @@ static bool IsSecurityTypeSupported(int secType) static WifiErrorCode GetHotspotConfigFromC(const HotspotConfig *config, OHOS::Wifi::HotspotConfig& hotspotConfig) { + CHECK_PTR_RETURN(config, ERROR_WIFI_INVALID_ARGS); hotspotConfig.SetSsid(config->ssid); if (!IsSecurityTypeSupported(config->securityType)) { WIFI_LOGE("Ap security is not supported!"); @@ -92,6 +93,7 @@ static WifiErrorCode GetHotspotConfigFromC(const HotspotConfig *config, OHOS::Wi static WifiErrorCode GetHotspotConfigFromCpp(const OHOS::Wifi::HotspotConfig& hotspotConfig, HotspotConfig *result) { + CHECK_PTR_RETURN(result, ERROR_WIFI_INVALID_ARGS); if (memcpy_s(result->ssid, WIFI_MAX_SSID_LEN, hotspotConfig.GetSsid().c_str(), hotspotConfig.GetSsid().size() + 1) != EOK) { return ERROR_WIFI_UNKNOWN; @@ -108,6 +110,7 @@ static WifiErrorCode GetHotspotConfigFromCpp(const OHOS::Wifi::HotspotConfig& ho WifiErrorCode SetHotspotConfig(const HotspotConfig *config) { + CHECK_PTR_RETURN(config, ERROR_WIFI_INVALID_ARGS); CHECK_PTR_RETURN(hotspotPtr, ERROR_WIFI_NOT_AVAILABLE); OHOS::Wifi::HotspotConfig hotspotConfig; WifiErrorCode ret = GetHotspotConfigFromC(config, hotspotConfig); @@ -120,6 +123,7 @@ WifiErrorCode SetHotspotConfig(const HotspotConfig *config) WifiErrorCode GetHotspotConfig(HotspotConfig *result) { CHECK_PTR_RETURN(hotspotPtr, ERROR_WIFI_NOT_AVAILABLE); + CHECK_PTR_RETURN(result, ERROR_WIFI_INVALID_ARGS); OHOS::Wifi::HotspotConfig hotspotConfig; OHOS::Wifi::ErrCode ret = hotspotPtr->GetHotspotConfig(hotspotConfig); if (ret == OHOS::Wifi::WIFI_OPT_SUCCESS) { @@ -134,6 +138,7 @@ WifiErrorCode GetHotspotConfig(HotspotConfig *result) static WifiErrorCode GetStaListFromCpp(const std::vector& vecStaList, StationInfo *result) { + CHECK_PTR_RETURN(result, ERROR_WIFI_INVALID_ARGS); for (auto& each : vecStaList) { if (result->name != nullptr) { if (memcpy_s(result->name, DEVICE_NAME_LEN, each.deviceName.c_str(), each.deviceName.size() + 1) != EOK) { @@ -154,12 +159,9 @@ static WifiErrorCode GetStaListFromCpp(const std::vector vecStaList; OHOS::Wifi::ErrCode ret = hotspotPtr->GetStationList(vecStaList); *size = (int)vecStaList.size(); @@ -175,6 +177,7 @@ WifiErrorCode GetStationList(StationInfo *result, unsigned int *size) WifiErrorCode DisassociateSta(unsigned char *mac, int macLen) { + CHECK_PTR_RETURN(mac, ERROR_WIFI_INVALID_ARGS); return GetCErrorCode(OHOS::Wifi::WIFI_OPT_NOT_SUPPORTED); } diff --git a/wifi/frameworks/native/c_adapter/src/wifi_c_p2p.cpp b/wifi/frameworks/native/c_adapter/src/wifi_c_p2p.cpp index c244911..60d20a2 100644 --- a/wifi/frameworks/native/c_adapter/src/wifi_c_p2p.cpp +++ b/wifi/frameworks/native/c_adapter/src/wifi_c_p2p.cpp @@ -85,6 +85,7 @@ WifiErrorCode StopP2pListen() static void ConvertConfigCToCpp(const WifiP2pConfig* config, OHOS::Wifi::WifiP2pConfig& cppConfig) { + CHECK_PTR_RETURN_VOID(config); cppConfig.SetDeviceAddress(OHOS::Wifi::MacArrayToStr(config->devAddr)); cppConfig.SetGoBand(OHOS::Wifi::GroupOwnerBand(static_cast(config->goBand))); cppConfig.SetNetId(config->netId); @@ -96,6 +97,7 @@ static void ConvertConfigCToCpp(const WifiP2pConfig* config, OHOS::Wifi::WifiP2p WifiErrorCode CreateGroup(const WifiP2pConfig* config) { CHECK_PTR_RETURN(wifiP2pPtr, ERROR_WIFI_NOT_AVAILABLE); + CHECK_PTR_RETURN(config, ERROR_WIFI_INVALID_ARGS); OHOS::Wifi::WifiP2pConfig cppConfig; ConvertConfigCToCpp(config, cppConfig); return GetCErrorCode(wifiP2pPtr->CreateGroup(cppConfig)); @@ -129,6 +131,7 @@ static void ConvertP2PDeviceCToCpp(const WifiP2pDevice& p2pDevice, OHOS::Wifi::W static void ConvertGroupInfoCToCpp(const WifiP2pGroupInfo* group, OHOS::Wifi::WifiP2pGroupInfo& cppGroup) { + CHECK_PTR_RETURN_VOID(group); OHOS::Wifi::WifiP2pDevice owner; ConvertP2PDeviceCToCpp(group->owner, owner); cppGroup.SetOwner(owner); @@ -153,6 +156,7 @@ static void ConvertGroupInfoCToCpp(const WifiP2pGroupInfo* group, OHOS::Wifi::Wi WifiErrorCode DeleteGroup(const WifiP2pGroupInfo* group) { CHECK_PTR_RETURN(wifiP2pPtr, ERROR_WIFI_NOT_AVAILABLE); + CHECK_PTR_RETURN(group, ERROR_WIFI_INVALID_ARGS); OHOS::Wifi::WifiP2pGroupInfo groupInfo; ConvertGroupInfoCToCpp(group, groupInfo); return GetCErrorCode(wifiP2pPtr->DeleteGroup(groupInfo)); @@ -161,6 +165,7 @@ WifiErrorCode DeleteGroup(const WifiP2pGroupInfo* group) WifiErrorCode P2pConnect(const WifiP2pConfig* config) { CHECK_PTR_RETURN(wifiP2pPtr, ERROR_WIFI_NOT_AVAILABLE); + CHECK_PTR_RETURN(config, ERROR_WIFI_INVALID_ARGS); OHOS::Wifi::WifiP2pConfig deviceConfig; ConvertConfigCToCpp(config, deviceConfig); return GetCErrorCode(wifiP2pPtr->P2pConnect(deviceConfig)); @@ -174,6 +179,7 @@ WifiErrorCode P2pCancelConnect() static OHOS::Wifi::ErrCode ConvertP2PDeviceCppToC(const OHOS::Wifi::WifiP2pDevice& cppDevice, WifiP2pDevice* p2pDevice) { + CHECK_PTR_RETURN(p2pDevice, ERROR_WIFI_INVALID_ARGS); if (memcpy_s(p2pDevice->deviceName, P2P_NAME_LENGTH, cppDevice.GetDeviceName().c_str(), cppDevice.GetDeviceName().size() + 1) != EOK) { WIFI_LOGE("memcpy_s device name failed!"); @@ -207,6 +213,7 @@ static OHOS::Wifi::ErrCode ConvertP2PDeviceCppToC(const OHOS::Wifi::WifiP2pDevic static OHOS::Wifi::ErrCode ConvertGroupInfoCppToC(const OHOS::Wifi::WifiP2pGroupInfo& cppGroup, WifiP2pGroupInfo* group) { + CHECK_PTR_RETURN(group, ERROR_WIFI_INVALID_ARGS); if (ConvertP2PDeviceCppToC(cppGroup.GetOwner(), &group->owner) != OHOS::Wifi::WIFI_OPT_SUCCESS) { return OHOS::Wifi::WIFI_OPT_FAILED; } @@ -248,12 +255,8 @@ static OHOS::Wifi::ErrCode ConvertGroupInfoCppToC(const OHOS::Wifi::WifiP2pGroup WifiErrorCode GetCurrentGroup(WifiP2pGroupInfo* groupInfo) { - if (groupInfo == nullptr) { - WIFI_LOGE("get current group input args is null!"); - return ERROR_WIFI_INVALID_ARGS; - } - CHECK_PTR_RETURN(wifiP2pPtr, ERROR_WIFI_NOT_AVAILABLE); + CHECK_PTR_RETURN(groupInfo, ERROR_WIFI_INVALID_ARGS); OHOS::Wifi::WifiP2pGroupInfo cppGroupInfo; OHOS::Wifi::ErrCode ret = wifiP2pPtr->GetCurrentGroup(cppGroupInfo); if (ret != OHOS::Wifi::WIFI_OPT_SUCCESS) { @@ -265,12 +268,8 @@ WifiErrorCode GetCurrentGroup(WifiP2pGroupInfo* groupInfo) WifiErrorCode GetP2pConnectedStatus(int* status) { - if (status == nullptr) { - WIFI_LOGE("input args is null!"); - return ERROR_WIFI_INVALID_ARGS; - } - CHECK_PTR_RETURN(wifiP2pPtr, ERROR_WIFI_NOT_AVAILABLE); + CHECK_PTR_RETURN(status, ERROR_WIFI_INVALID_ARGS); int p2pStatus = -1; OHOS::Wifi::ErrCode ret = wifiP2pPtr->GetP2pConnectedStatus(p2pStatus); if (ret != OHOS::Wifi::WIFI_OPT_SUCCESS) { @@ -283,6 +282,8 @@ WifiErrorCode GetP2pConnectedStatus(int* status) WifiErrorCode QueryP2pDevices(WifiP2pDevice* clientDevices, int size, int* retSize) { CHECK_PTR_RETURN(wifiP2pPtr, ERROR_WIFI_NOT_AVAILABLE); + CHECK_PTR_RETURN(clientDevices, ERROR_WIFI_INVALID_ARGS); + CHECK_PTR_RETURN(retSize, ERROR_WIFI_INVALID_ARGS); std::vector vecDevices; OHOS::Wifi::ErrCode ret = wifiP2pPtr->QueryP2pDevices(vecDevices); if (ret != OHOS::Wifi::WIFI_OPT_SUCCESS) { @@ -303,6 +304,7 @@ WifiErrorCode QueryP2pDevices(WifiP2pDevice* clientDevices, int size, int* retSi WifiErrorCode QueryP2pGroups(WifiP2pGroupInfo* groupInfo, int size) { CHECK_PTR_RETURN(wifiP2pPtr, ERROR_WIFI_NOT_AVAILABLE); + CHECK_PTR_RETURN(groupInfo, ERROR_WIFI_INVALID_ARGS); std::vector groups; OHOS::Wifi::ErrCode ret = wifiP2pPtr->QueryP2pGroups(groups); if (ret != OHOS::Wifi::WIFI_OPT_SUCCESS) { -- Gitee From f969d4d8f70625a2398829c2598f85e2733a3b58 Mon Sep 17 00:00:00 2001 From: y00316381 Date: Wed, 1 Jun 2022 16:44:32 +0800 Subject: [PATCH 153/491] bugfix from master Signed-off-by: y00316381 --- wifi/frameworks/native/c_adapter/src/wifi_c_device.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wifi/frameworks/native/c_adapter/src/wifi_c_device.cpp b/wifi/frameworks/native/c_adapter/src/wifi_c_device.cpp index 3d5112c..8629e72 100644 --- a/wifi/frameworks/native/c_adapter/src/wifi_c_device.cpp +++ b/wifi/frameworks/native/c_adapter/src/wifi_c_device.cpp @@ -166,7 +166,7 @@ static void ConvertDeviceConfigFromC(const WifiDeviceConfig *config, OHOS::Wifi: static OHOS::Wifi::ErrCode ConvertDeviceConfigFromCpp(const OHOS::Wifi::WifiDeviceConfig& deviceConfig, WifiDeviceConfig *result) { - CHECK_PTR_RETURN(result, ERROR_WIFI_INVALID_ARGS); + CHECK_PTR_RETURN(result, OHOS::Wifi::WIFI_OPT_INVALID_PARAM); if (memcpy_s(result->ssid, WIFI_MAX_SSID_LEN, deviceConfig.ssid.c_str(), deviceConfig.ssid.size() + 1) != EOK) { return OHOS::Wifi::WIFI_OPT_FAILED; } @@ -267,7 +267,7 @@ WifiErrorCode Disconnect() static OHOS::Wifi::ErrCode GetLinkedInfoFromCpp(const OHOS::Wifi::WifiLinkedInfo& linkedInfo, WifiLinkedInfo *result) { - CHECK_PTR_RETURN(result, ERROR_WIFI_INVALID_ARGS); + CHECK_PTR_RETURN(result, OHOS::Wifi::WIFI_OPT_INVALID_PARAM); if (memcpy_s(result->ssid, WIFI_MAX_SSID_LEN, linkedInfo.ssid.c_str(), linkedInfo.ssid.size() + 1) != EOK) { return OHOS::Wifi::WIFI_OPT_FAILED; } -- Gitee From 00e5e617c4ada5c5267d8fdb4456577623eece31 Mon Sep 17 00:00:00 2001 From: y00316381 Date: Wed, 1 Jun 2022 17:19:28 +0800 Subject: [PATCH 154/491] bugfix from master Signed-off-by: y00316381 --- wifi/frameworks/native/c_adapter/src/wifi_c_hid2d.cpp | 3 ++- wifi/frameworks/native/c_adapter/src/wifi_c_p2p.cpp | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/wifi/frameworks/native/c_adapter/src/wifi_c_hid2d.cpp b/wifi/frameworks/native/c_adapter/src/wifi_c_hid2d.cpp index 764d815..20b5c4c 100644 --- a/wifi/frameworks/native/c_adapter/src/wifi_c_hid2d.cpp +++ b/wifi/frameworks/native/c_adapter/src/wifi_c_hid2d.cpp @@ -98,6 +98,7 @@ WifiErrorCode Hid2dReleaseIPAddr(const char ifName[IF_NAME_LEN]) static void ConvertRecommendChannelRequest(const RecommendChannelRequest *request, OHOS::Wifi::RecommendChannelRequest& req) { + CHECK_PTR_RETURN_VOID(request); req.remoteIfName = request->remoteIfName; req.remoteIfMode = request->remoteIfMode; req.localIfName = request->localIfName; @@ -109,7 +110,7 @@ static void ConvertRecommendChannelRequest(const RecommendChannelRequest *reques static void ConvertRecommendChannelResponse(const OHOS::Wifi::RecommendChannelResponse& rsp, RecommendChannelResponse* response) { - CHECK_PTR_RETURN_VOID(config); + CHECK_PTR_RETURN_VOID(response); response->status = RecommendStatus(static_cast(rsp.status)); response->index = rsp.index; response->centerFreq = rsp.centerFreq; diff --git a/wifi/frameworks/native/c_adapter/src/wifi_c_p2p.cpp b/wifi/frameworks/native/c_adapter/src/wifi_c_p2p.cpp index 60d20a2..4fd59e3 100644 --- a/wifi/frameworks/native/c_adapter/src/wifi_c_p2p.cpp +++ b/wifi/frameworks/native/c_adapter/src/wifi_c_p2p.cpp @@ -179,7 +179,7 @@ WifiErrorCode P2pCancelConnect() static OHOS::Wifi::ErrCode ConvertP2PDeviceCppToC(const OHOS::Wifi::WifiP2pDevice& cppDevice, WifiP2pDevice* p2pDevice) { - CHECK_PTR_RETURN(p2pDevice, ERROR_WIFI_INVALID_ARGS); + CHECK_PTR_RETURN(p2pDevice, OHOS::Wifi::WIFI_OPT_INVALID_PARAM); if (memcpy_s(p2pDevice->deviceName, P2P_NAME_LENGTH, cppDevice.GetDeviceName().c_str(), cppDevice.GetDeviceName().size() + 1) != EOK) { WIFI_LOGE("memcpy_s device name failed!"); @@ -213,7 +213,7 @@ static OHOS::Wifi::ErrCode ConvertP2PDeviceCppToC(const OHOS::Wifi::WifiP2pDevic static OHOS::Wifi::ErrCode ConvertGroupInfoCppToC(const OHOS::Wifi::WifiP2pGroupInfo& cppGroup, WifiP2pGroupInfo* group) { - CHECK_PTR_RETURN(group, ERROR_WIFI_INVALID_ARGS); + CHECK_PTR_RETURN(group, OHOS::Wifi::WIFI_OPT_INVALID_PARAM); if (ConvertP2PDeviceCppToC(cppGroup.GetOwner(), &group->owner) != OHOS::Wifi::WIFI_OPT_SUCCESS) { return OHOS::Wifi::WIFI_OPT_FAILED; } -- Gitee From ef457934129f318d765ca83fb1a11d8708e9bf03 Mon Sep 17 00:00:00 2001 From: lujunxin Date: Thu, 2 Jun 2022 18:36:44 +0800 Subject: [PATCH 155/491] adapter to ipc_single for L1 linux Signed-off-by: lujunxin --- wifi/frameworks/native/BUILD.gn | 4 +- .../src/wifi_device_callback_stub_lite.cpp | 61 +-- .../native/src/wifi_device_proxy_lite.cpp | 365 +++++++-------- .../src/wifi_scan_callback_stub_lite.cpp | 6 +- .../native/src/wifi_scan_proxy_lite.cpp | 160 ++++--- .../wifi_framework/wifi_manage/BUILD.gn | 8 +- .../wifi_manage/wifi_device_callback_proxy.h | 2 +- .../wifi_device_callback_proxy_lite.cpp | 118 +++-- .../wifi_manage/wifi_device_stub_lite.cpp | 421 +++++++++--------- .../wifi_manage/wifi_scan_callback_proxy.h | 2 +- .../wifi_scan_callback_proxy_lite.cpp | 25 +- .../wifi_manage/wifi_scan_stub_lite.cpp | 144 +++--- 12 files changed, 704 insertions(+), 612 deletions(-) diff --git a/wifi/frameworks/native/BUILD.gn b/wifi/frameworks/native/BUILD.gn index 506e1ed..421f225 100644 --- a/wifi/frameworks/native/BUILD.gn +++ b/wifi/frameworks/native/BUILD.gn @@ -40,7 +40,7 @@ if (defined(ohos_lite)) { "$DHCP_ROOT_DIR/services/mgr_service/include", "$WIFI_ROOT_DIR/utils/inc", "//base/hiviewdfx/hilog_lite/interfaces/native/innerkits", - "//foundation/communication/ipc_lite/interfaces/kits", + "//foundation/communication/ipc/interfaces/innerkits/c/ipc/include", "//foundation/distributedschedule/samgr_lite/interfaces/innerkits/registry", "//foundation/distributedschedule/samgr_lite/interfaces/innerkits/samgr", "//third_party/bounds_checking_function/include", @@ -51,7 +51,7 @@ if (defined(ohos_lite)) { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", "$WIFI_ROOT_DIR/utils/src:wifi_utils", "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", - "//foundation/communication/ipc_lite:liteipc_adapter", + "//foundation/communication/ipc/interfaces/innerkits/c/ipc:ipc_single", "//foundation/distributedschedule/samgr_lite/samgr:samgr", "//third_party/bounds_checking_function:libsec_shared", ] diff --git a/wifi/frameworks/native/src/wifi_device_callback_stub_lite.cpp b/wifi/frameworks/native/src/wifi_device_callback_stub_lite.cpp index dccedbf..8eff52e 100644 --- a/wifi/frameworks/native/src/wifi_device_callback_stub_lite.cpp +++ b/wifi/frameworks/native/src/wifi_device_callback_stub_lite.cpp @@ -37,7 +37,8 @@ int WifiDeviceCallBackStub::OnRemoteRequest(uint32_t code, IpcIo *data) return ret; } - int exception = IpcIoPopInt32(data); + int exception = WIFI_OPT_FAILED; + (void)ReadInt32(data, &exception); if (exception) { WIFI_LOGE("WifiDeviceCallBackStub::OnRemoteRequest, got exception: %{public}d!", exception); return ret; @@ -133,7 +134,8 @@ void WifiDeviceCallBackStub::OnStreamChanged(int direction) int WifiDeviceCallBackStub::RemoteOnWifiStateChanged(uint32_t code, IpcIo *data) { WIFI_LOGD("run %{public}s code %{public}u", __func__, code); - int state = IpcIoPopInt32(data); + int state = 0; + (void)ReadInt32(data, &state); OnWifiStateChanged(state); return 0; } @@ -142,38 +144,42 @@ int WifiDeviceCallBackStub::RemoteOnWifiConnectionChanged(uint32_t code, IpcIo * { WIFI_LOGD("run %{public}s code %{public}u", __func__, code); size_t readLen; - int state = IpcIoPopInt32(data); + int state = 0; + (void)ReadInt32(data, &state); WifiLinkedInfo info; - info.networkId = IpcIoPopInt32(data); - info.ssid = (char *)IpcIoPopString(data, &readLen); - info.bssid = (char *)IpcIoPopString(data, &readLen); - info.rssi = IpcIoPopInt32(data); - info.band = IpcIoPopInt32(data); - info.frequency = IpcIoPopInt32(data); - info.linkSpeed = IpcIoPopInt32(data); - info.macAddress = (char *)IpcIoPopString(data, &readLen); - info.ipAddress = IpcIoPopInt32(data); - int tmpConnState = IpcIoPopInt32(data); + (void)ReadInt32(data, &info.networkId); + info.ssid = (char *)ReadString(data, &readLen); + info.bssid = (char *)ReadString(data, &readLen); + (void)ReadInt32(data, &info.rssi); + (void)ReadInt32(data, &info.band); + (void)ReadInt32(data, &info.frequency); + (void)ReadInt32(data, &info.linkSpeed); + info.macAddress = (char *)ReadString(data, &readLen); + (void)ReadUint32(data, &info.ipAddress); + int tmpConnState = 0; + (void)ReadInt32(data, &tmpConnState); if (tmpConnState >= 0 && tmpConnState <= int(ConnState::UNKNOWN)) { info.connState = ConnState(tmpConnState); } else { info.connState = ConnState::UNKNOWN; } - info.ifHiddenSSID = IpcIoPopBool(data); - info.rxLinkSpeed = IpcIoPopInt32(data); - info.txLinkSpeed = IpcIoPopInt32(data); - info.chload = IpcIoPopInt32(data); - info.snr = IpcIoPopInt32(data); - info.isDataRestricted = IpcIoPopInt32(data); - info.portalUrl = (char *)IpcIoPopString(data, &readLen); - int tmpState = IpcIoPopInt32(data); + (void)ReadBool(data, &info.ifHiddenSSID); + (void)ReadInt32(data, &info.rxLinkSpeed); + (void)ReadInt32(data, &info.txLinkSpeed); + (void)ReadInt32(data, &info.chload); + (void)ReadInt32(data, &info.snr); + (void)ReadInt32(data, &info.isDataRestricted); + info.portalUrl = (char *)ReadString(data, &readLen); + int tmpState = 0; + (void)ReadInt32(data, &tmpState); if (tmpState >= 0 && tmpState <= int(SupplicantState::INVALID)) { info.supplicantState = SupplicantState(tmpState); } else { info.supplicantState = SupplicantState::INVALID; } - int tmpDetailState = IpcIoPopInt32(data); + int tmpDetailState = 0; + (void)ReadInt32(data, &tmpDetailState); if (tmpDetailState >= 0 && tmpDetailState <= int(DetailedState::INVALID)) { info.detailedState = DetailedState(tmpDetailState); } else { @@ -186,7 +192,8 @@ int WifiDeviceCallBackStub::RemoteOnWifiConnectionChanged(uint32_t code, IpcIo * int WifiDeviceCallBackStub::RemoteOnWifiRssiChanged(uint32_t code, IpcIo *data) { WIFI_LOGD("run %{public}s code %{public}u", __func__, code); - int rssi = IpcIoPopInt32(data); + int rssi = 0; + (void)ReadInt32(data, &rssi); OnWifiRssiChanged(rssi); return 0; } @@ -195,8 +202,9 @@ int WifiDeviceCallBackStub::RemoteOnWifiWpsStateChanged(uint32_t code, IpcIo *da { WIFI_LOGD("run %{public}s code %{public}u", __func__, code); size_t readLen; - int state = IpcIoPopInt32(data); - std::string pinCode = (char *)IpcIoPopString(data, &readLen); + int state = 0; + (void)ReadInt32(data, &state); + std::string pinCode = (char *)ReadString(data, &readLen); OnWifiWpsStateChanged(state, pinCode); return 0; } @@ -204,7 +212,8 @@ int WifiDeviceCallBackStub::RemoteOnWifiWpsStateChanged(uint32_t code, IpcIo *da int WifiDeviceCallBackStub::RemoteOnStreamChanged(uint32_t code, IpcIo *data) { WIFI_LOGD("run %{public}s code %{public}u", __func__, code); - int direction = IpcIoPopInt32(data); + int direction = 0; + (void)ReadInt32(data, &direction); OnStreamChanged(direction); return 0; } diff --git a/wifi/frameworks/native/src/wifi_device_proxy_lite.cpp b/wifi/frameworks/native/src/wifi_device_proxy_lite.cpp index 30599a7..020e725 100644 --- a/wifi/frameworks/native/src/wifi_device_proxy_lite.cpp +++ b/wifi/frameworks/native/src/wifi_device_proxy_lite.cpp @@ -15,7 +15,8 @@ #include "wifi_device_proxy.h" #include "define.h" -#include "liteipc_adapter.h" +#include "ipc_skeleton.h" +#include "rpc_errno.h" #include "serializer.h" #include "samgr_lite.h" #include "wifi_ipc_lite_adapter.h" @@ -26,19 +27,24 @@ DEFINE_WIFILOG_LABEL("WifiDeviceProxyLite"); namespace OHOS { namespace Wifi { +static SvcIdentity g_sid; +static IpcObjectStub g_objStub; static WifiDeviceCallBackStub g_deviceCallBackStub; static void ReadIpAddress(IpcIo *reply, WifiIpAddress &address) { constexpr int MAX_SIZE = 256; - address.family = IpcIoPopInt32(reply); - address.addressIpv4 = IpcIoPopInt32(reply); - int size = IpcIoPopInt32(reply); + (void)ReadInt32(reply, &address.family); + (void)ReadUint32(reply, &address.addressIpv4); + int size = 0; + (void)ReadInt32(reply, &size); if (size > MAX_SIZE) { WIFI_LOGE("Read IP address size error: %{public}d", size); return; } + int tmpAddress = 0; for (int i = 0; i < size; i++) { - address.addressIpv6.push_back(IpcIoPopInt8(reply)); + (void)ReadInt8(reply, (int8_t *)&tmpAddress); + address.addressIpv6.push_back(tmpAddress); } return; } @@ -47,49 +53,56 @@ static void ParseDeviceConfigs(IpcIo *reply, std::vector &resu { size_t readLen; constexpr int MAX_DEVICE_CONFIG_SIZE = 1024; - int retSize = IpcIoPopInt32(reply); + int retSize = 0; + (void)ReadInt32(reply, &retSize); if (retSize > MAX_DEVICE_CONFIG_SIZE) { WIFI_LOGE("Parse device config size error: %{public}d", retSize); return; } for (int i = 0; i < retSize; ++i) { WifiDeviceConfig config; - config.networkId = IpcIoPopInt32(reply); - config.status = IpcIoPopInt32(reply); - config.bssid = (char *)IpcIoPopString(reply, &readLen); - config.ssid = (char *)IpcIoPopString(reply, &readLen); - config.band = IpcIoPopInt32(reply); - config.channel = IpcIoPopInt32(reply); - config.frequency = IpcIoPopInt32(reply); - config.level = IpcIoPopInt32(reply); - config.isPasspoint = IpcIoPopBool(reply); - config.isEphemeral = IpcIoPopBool(reply); - config.preSharedKey = (char *)IpcIoPopString(reply, &readLen); - config.keyMgmt = (char *)IpcIoPopString(reply, &readLen); + (void)ReadInt32(reply, &config.networkId); + (void)ReadInt32(reply, &config.status); + config.bssid = (char *)ReadString(reply, &readLen); + config.ssid = (char *)ReadString(reply, &readLen); + (void)ReadInt32(reply, &config.band); + (void)ReadInt32(reply, &config.channel); + (void)ReadInt32(reply, &config.frequency); + (void)ReadInt32(reply, &config.level); + (void)ReadBool(reply, &config.isPasspoint); + (void)ReadBool(reply, &config.isEphemeral); + config.preSharedKey = (char *)ReadString(reply, &readLen); + config.keyMgmt = (char *)ReadString(reply, &readLen); for (int j = 0; j < WEPKEYS_SIZE; j++) { - config.wepKeys[j] = (char *)IpcIoPopString(reply, &readLen); + config.wepKeys[j] = (char *)ReadString(reply, &readLen); } - config.wepTxKeyIndex = IpcIoPopInt32(reply); - config.priority = IpcIoPopInt32(reply); - config.hiddenSSID = IpcIoPopBool(reply); - config.wifiIpConfig.assignMethod = AssignIpMethod(IpcIoPopInt32(reply)); + (void)ReadInt32(reply, &config.wepTxKeyIndex); + (void)ReadInt32(reply, &config.priority); + (void)ReadBool(reply, &config.hiddenSSID); + int ipMethod = 0; + (void)ReadInt32(reply, &ipMethod); + config.wifiIpConfig.assignMethod = AssignIpMethod(ipMethod); ReadIpAddress(reply, config.wifiIpConfig.staticIpAddress.ipAddress.address); - config.wifiIpConfig.staticIpAddress.ipAddress.prefixLength = IpcIoPopInt32(reply); - config.wifiIpConfig.staticIpAddress.ipAddress.flags = IpcIoPopInt32(reply); - config.wifiIpConfig.staticIpAddress.ipAddress.scope = IpcIoPopInt32(reply); + (void)ReadInt32(reply, &config.wifiIpConfig.staticIpAddress.ipAddress.prefixLength); + (void)ReadInt32(reply, &config.wifiIpConfig.staticIpAddress.ipAddress.flags); + (void)ReadInt32(reply, &config.wifiIpConfig.staticIpAddress.ipAddress.scope); ReadIpAddress(reply, config.wifiIpConfig.staticIpAddress.gateway); ReadIpAddress(reply, config.wifiIpConfig.staticIpAddress.dnsServer1); ReadIpAddress(reply, config.wifiIpConfig.staticIpAddress.dnsServer2); - config.wifiIpConfig.staticIpAddress.domains = (char *)IpcIoPopString(reply, &readLen); - config.wifiEapConfig.eap = (char *)IpcIoPopString(reply, &readLen); - config.wifiEapConfig.identity = (char *)IpcIoPopString(reply, &readLen); - config.wifiEapConfig.password = (char *)IpcIoPopString(reply, &readLen); - config.wifiProxyconfig.configureMethod = ConfigureProxyMethod(IpcIoPopInt32(reply)); - config.wifiProxyconfig.autoProxyConfig.pacWebAddress = (char *)IpcIoPopString(reply, &readLen); - config.wifiProxyconfig.manualProxyConfig.serverHostName = (char *)IpcIoPopString(reply, &readLen); - config.wifiProxyconfig.manualProxyConfig.serverPort = IpcIoPopInt32(reply); - config.wifiProxyconfig.manualProxyConfig.exclusionObjectList = (char *)IpcIoPopString(reply, &readLen); - config.wifiPrivacySetting = WifiPrivacyConfig(IpcIoPopInt32(reply)); + config.wifiIpConfig.staticIpAddress.domains = (char *)ReadString(reply, &readLen); + config.wifiEapConfig.eap = (char *)ReadString(reply, &readLen); + config.wifiEapConfig.identity = (char *)ReadString(reply, &readLen); + config.wifiEapConfig.password = (char *)ReadString(reply, &readLen); + int proxyMethod = 0; + (void)ReadInt32(reply, &proxyMethod); + config.wifiProxyconfig.configureMethod = ConfigureProxyMethod(proxyMethod); + config.wifiProxyconfig.autoProxyConfig.pacWebAddress = (char *)ReadString(reply, &readLen); + config.wifiProxyconfig.manualProxyConfig.serverHostName = (char *)ReadString(reply, &readLen); + (void)ReadInt32(reply, &config.wifiProxyconfig.manualProxyConfig.serverPort); + config.wifiProxyconfig.manualProxyConfig.exclusionObjectList = (char *)ReadString(reply, &readLen); + int privacyConfig = 0; + (void)ReadInt32(reply, &privacyConfig); + config.wifiPrivacySetting = WifiPrivacyConfig(privacyConfig); result.emplace_back(config); } @@ -98,37 +111,40 @@ static void ParseDeviceConfigs(IpcIo *reply, std::vector &resu static void ReadLinkedInfo(IpcIo *reply, WifiLinkedInfo &info) { size_t readLen; - info.networkId = IpcIoPopInt32(reply); - info.ssid = (char *)IpcIoPopString(reply, &readLen); - info.bssid = (char *)IpcIoPopString(reply, &readLen); - info.rssi = IpcIoPopInt32(reply); - info.band = IpcIoPopInt32(reply); - info.frequency = IpcIoPopInt32(reply); - info.linkSpeed = IpcIoPopInt32(reply); - info.macAddress = (char *)IpcIoPopString(reply, &readLen); - info.ipAddress = IpcIoPopInt32(reply); - int tmpConnState = IpcIoPopInt32(reply); + (void)ReadInt32(reply, &info.networkId); + info.ssid = (char *)ReadString(reply, &readLen); + info.bssid = (char *)ReadString(reply, &readLen); + (void)ReadInt32(reply, &info.rssi); + (void)ReadInt32(reply, &info.band); + (void)ReadInt32(reply, &info.frequency); + (void)ReadInt32(reply, &info.linkSpeed); + info.macAddress = (char *)ReadString(reply, &readLen); + (void)ReadUint32(reply, &info.ipAddress); + int tmpConnState = 0; + (void)ReadInt32(reply, &tmpConnState); if ((tmpConnState >= 0) && (tmpConnState <= (int)ConnState::UNKNOWN)) { info.connState = ConnState(tmpConnState); } else { info.connState = ConnState::UNKNOWN; } - info.ifHiddenSSID = IpcIoPopBool(reply); - info.rxLinkSpeed = IpcIoPopInt32(reply); - info.txLinkSpeed = IpcIoPopInt32(reply); - info.chload = IpcIoPopInt32(reply); - info.snr = IpcIoPopInt32(reply); - info.isDataRestricted = IpcIoPopInt32(reply); - info.portalUrl = (char *)IpcIoPopString(reply, &readLen); + (void)ReadBool(reply, &info.ifHiddenSSID); + (void)ReadInt32(reply, &info.rxLinkSpeed); + (void)ReadInt32(reply, &info.txLinkSpeed); + (void)ReadInt32(reply, &info.chload); + (void)ReadInt32(reply, &info.snr); + (void)ReadInt32(reply, &info.isDataRestricted); + info.portalUrl = (char *)ReadString(reply, &readLen); - int tmpState = IpcIoPopInt32(reply); + int tmpState = 0; + (void)ReadInt32(reply, &tmpState); if ((tmpState >= 0) && (tmpState <= (int)SupplicantState::INVALID)) { info.supplicantState = (SupplicantState)tmpState; } else { info.supplicantState = SupplicantState::INVALID; } - int tmpDetailState = IpcIoPopInt32(reply); + int tmpDetailState = 0; + (void)ReadInt32(reply, &tmpDetailState); if ((tmpDetailState >= 0) && (tmpDetailState <= (int)DetailedState::INVALID)) { info.detailedState = (DetailedState)tmpDetailState; } else { @@ -138,13 +154,13 @@ static void ReadLinkedInfo(IpcIo *reply, WifiLinkedInfo &info) static void ReadDhcpInfo(IpcIo *reply, IpInfo &info) { - info.ipAddress = IpcIoPopInt32(reply); - info.gateway = IpcIoPopInt32(reply); - info.netmask = IpcIoPopInt32(reply); - info.primaryDns = IpcIoPopInt32(reply); - info.secondDns = IpcIoPopInt32(reply); - info.serverIp = IpcIoPopInt32(reply); - info.leaseDuration = IpcIoPopInt32(reply); + (void)ReadUint32(reply, &info.ipAddress); + (void)ReadUint32(reply, &info.gateway); + (void)ReadUint32(reply, &info.netmask); + (void)ReadUint32(reply, &info.primaryDns); + (void)ReadUint32(reply, &info.secondDns); + (void)ReadUint32(reply, &info.serverIp); + (void)ReadUint32(reply, &info.leaseDuration); } static int IpcCallback(void *owner, int code, IpcIo *reply) @@ -152,14 +168,14 @@ static int IpcCallback(void *owner, int code, IpcIo *reply) if (code != 0 || owner == nullptr || reply == nullptr) { WIFI_LOGE("Callback error, code:%{public}d, owner:%{public}d, reply:%{public}d", code, owner == nullptr, reply == nullptr); - return LITEIPC_EINVAL; + return ERR_FAILED; } struct IpcOwner *data = (struct IpcOwner *)owner; - data->exception = IpcIoPopInt32(reply); - data->retCode = IpcIoPopInt32(reply); + (void)ReadInt32(reply, &data->exception); + (void)ReadInt32(reply, &data->retCode); if (data->exception != 0 || data->retCode != WIFI_OPT_SUCCESS || data->variable == nullptr) { - return LITEIPC_OK; + return ERR_NONE; } switch (data->funcId) { @@ -167,23 +183,25 @@ static int IpcCallback(void *owner, int code, IpcIo *reply) case WIFI_SVR_CMD_UPDATE_DEVICE_CONFIG: case WIFI_SVR_CMD_GET_WIFI_STATE: case WIFI_SVR_CMD_GET_SIGNAL_LEVEL: { - *((int32_t *)data->variable) = IpcIoPopInt32(reply); + (void)ReadInt32(reply, (int32_t *)data->variable); break; } case WIFI_SVR_CMD_IS_WIFI_CONNECTED: case WIFI_SVR_CMD_IS_WIFI_ACTIVE: case WIFI_SVR_CMD_SET_LOW_LATENCY_MODE: { - *((bool *)data->variable) = IpcIoPopBool(reply); + (void)ReadBool(reply, (bool *)data->variable); break; } case WIFI_SVR_CMD_GET_COUNTRY_CODE: case WIFI_SVR_CMD_GET_DERVICE_MAC_ADD: { size_t readLen = 0; - *((std::string *)data->variable) = (char *)IpcIoPopString(reply, &readLen); + *((std::string *)data->variable) = (char *)ReadString(reply, &readLen); break; } case WIFI_SVR_CMD_GET_SUPPORTED_FEATURES: { - *((long *)data->variable) = IpcIoPopInt64(reply); + int64_t features = 0; + ReadInt64(reply, &features); + *((long *)data->variable) = features; break; } case WIFI_SVR_CMD_GET_DEVICE_CONFIGS: { @@ -202,33 +220,26 @@ static int IpcCallback(void *owner, int code, IpcIo *reply) break; } - return LITEIPC_OK; + return ERR_NONE; } -static int AsyncCallback(const IpcContext *ipcContext, void *ipcMsg, IpcIo *data, void *arg) +static int AsyncCallback(uint32_t code, IpcIo *data, IpcIo *reply, MessageOption option) { - if (ipcMsg == nullptr || data == nullptr) { - WIFI_LOGE("AsyncCallback error, msg:%{public}d, data:%{public}d", - ipcMsg == nullptr, data == nullptr); - return LITEIPC_EINVAL; + if (data == nullptr) { + WIFI_LOGE("AsyncCallback error, data is null"); + return ERR_FAILED; } - - uint32_t code; - int codeRet = GetCode(ipcMsg, &code); - if (codeRet == LITEIPC_OK) { - return g_deviceCallBackStub.OnRemoteRequest(code, data); - } - return LITEIPC_EINVAL; + return g_deviceCallBackStub.OnRemoteRequest(code, data); } -static int OnRemoteSrvDied(const IpcContext *context, void *ipcMsg, IpcIo *data, void *arg) +static void OnRemoteSrvDied(void *arg) { WIFI_LOGE("%{public}s called.", __func__); WifiDeviceProxy *client = WifiDeviceProxy::GetInstance(); if (client != nullptr) { client->OnRemoteDied(); } - return LITEIPC_OK; + return; } WifiDeviceProxy *WifiDeviceProxy::g_instance = nullptr; @@ -275,7 +286,7 @@ ErrCode WifiDeviceProxy::Init() // Register SA Death Callback uint32_t deadId = 0; svcIdentity_ = SAMGR_GetRemoteIdentity(WIFI_SERVICE_LITE, WIFI_FEATURE_DEVICE); - result = RegisterDeathCallback(nullptr, svcIdentity_, OnRemoteSrvDied, nullptr, &deadId); + result = AddDeathRecipient(svcIdentity_, OnRemoteSrvDied, nullptr, &deadId); if (result != 0) { WIFI_LOGE("Register SA Death Callback failed, errorCode[%d]", result); } @@ -295,7 +306,7 @@ ErrCode WifiDeviceProxy::EnableWifi() struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; IpcIoInit(&req, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); - IpcIoPushInt32(&req, 0); + (void)WriteInt32(&req, 0); owner.funcId = WIFI_SVR_CMD_ENABLE_WIFI; int error = remote_->Invoke(remote_, WIFI_SVR_CMD_ENABLE_WIFI, &req, &owner, IpcCallback); if (error != EC_SUCCESS) { @@ -322,7 +333,7 @@ ErrCode WifiDeviceProxy::DisableWifi() struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; IpcIoInit(&req, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); - IpcIoPushInt32(&req, 0); + (void)WriteInt32(&req, 0); owner.funcId = WIFI_SVR_CMD_DISABLE_WIFI; int error = remote_->Invoke(remote_, WIFI_SVR_CMD_DISABLE_WIFI, &req, &owner, IpcCallback); if (error != EC_SUCCESS) { @@ -349,9 +360,9 @@ ErrCode WifiDeviceProxy::InitWifiProtect(const WifiProtectType &protectType, con struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; IpcIoInit(&req, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); - IpcIoPushInt32(&req, 0); - IpcIoPushInt32(&req, (int)protectType); - IpcIoPushString(&req, protectName.c_str()); + (void)WriteInt32(&req, 0); + (void)WriteInt32(&req, (int)protectType); + (void)WriteString(&req, protectName.c_str()); owner.funcId = WIFI_SVR_CMD_INIT_WIFI_PROTECT; int error = remote_->Invoke(remote_, WIFI_SVR_CMD_INIT_WIFI_PROTECT, &req, &owner, IpcCallback); if (error != EC_SUCCESS) { @@ -378,9 +389,9 @@ ErrCode WifiDeviceProxy::GetWifiProtectRef(const WifiProtectMode &protectMode, c struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; IpcIoInit(&req, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); - IpcIoPushInt32(&req, 0); - IpcIoPushInt32(&req, (int)protectMode); - IpcIoPushString(&req, protectName.c_str()); + (void)WriteInt32(&req, 0); + (void)WriteInt32(&req, (int)protectMode); + (void)WriteString(&req, protectName.c_str()); owner.funcId = WIFI_SVR_CMD_GET_WIFI_PROTECT; int error = remote_->Invoke(remote_, WIFI_SVR_CMD_GET_WIFI_PROTECT, &req, &owner, IpcCallback); if (error != EC_SUCCESS) { @@ -407,8 +418,8 @@ ErrCode WifiDeviceProxy::PutWifiProtectRef(const std::string &protectName) struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; IpcIoInit(&req, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); - IpcIoPushInt32(&req, 0); - IpcIoPushString(&req, protectName.c_str()); + (void)WriteInt32(&req, 0); + (void)WriteString(&req, protectName.c_str()); owner.funcId = WIFI_SVR_CMD_PUT_WIFI_PROTECT; int error = remote_->Invoke(remote_, WIFI_SVR_CMD_PUT_WIFI_PROTECT, &req, &owner, IpcCallback); if (error != EC_SUCCESS) { @@ -424,54 +435,54 @@ ErrCode WifiDeviceProxy::PutWifiProtectRef(const std::string &protectName) void WifiDeviceProxy::WriteIpAddress(IpcIo &req, const WifiIpAddress &address) { - IpcIoPushInt32(&req, address.family); - IpcIoPushInt32(&req, address.addressIpv4); + (void)WriteInt32(&req, address.family); + (void)WriteUint32(&req, address.addressIpv4); int size = address.addressIpv6.size(); - IpcIoPushInt32(&req, size); + (void)WriteInt32(&req, size); for (int i = 0; i < size; i++) { - IpcIoPushInt8(&req, address.addressIpv6[i]); + (void)WriteInt8(&req, address.addressIpv6[i]); } return; } void WifiDeviceProxy::WriteDeviceConfig(const WifiDeviceConfig &config, IpcIo &req) { - IpcIoPushInt32(&req, config.networkId); - IpcIoPushInt32(&req, config.status); - IpcIoPushString(&req, config.bssid.c_str()); - IpcIoPushString(&req, config.ssid.c_str()); - IpcIoPushInt32(&req, config.band); - IpcIoPushInt32(&req, config.channel); - IpcIoPushInt32(&req, config.frequency); - IpcIoPushInt32(&req, config.level); - IpcIoPushBool(&req, config.isPasspoint); - IpcIoPushBool(&req, config.isEphemeral); - IpcIoPushString(&req, config.preSharedKey.c_str()); - IpcIoPushString(&req, config.keyMgmt.c_str()); + (void)WriteInt32(&req, config.networkId); + (void)WriteInt32(&req, config.status); + (void)WriteString(&req, config.bssid.c_str()); + (void)WriteString(&req, config.ssid.c_str()); + (void)WriteInt32(&req, config.band); + (void)WriteInt32(&req, config.channel); + (void)WriteInt32(&req, config.frequency); + (void)WriteInt32(&req, config.level); + (void)WriteBool(&req, config.isPasspoint); + (void)WriteBool(&req, config.isEphemeral); + (void)WriteString(&req, config.preSharedKey.c_str()); + (void)WriteString(&req, config.keyMgmt.c_str()); for (int i = 0; i < WEPKEYS_SIZE; i++) { - IpcIoPushString(&req, config.wepKeys[i].c_str()); + (void)WriteString(&req, config.wepKeys[i].c_str()); } - IpcIoPushInt32(&req, config.wepTxKeyIndex); - IpcIoPushInt32(&req, config.priority); - IpcIoPushBool(&req, config.hiddenSSID); - IpcIoPushInt32(&req, (int)config.wifiIpConfig.assignMethod); + (void)WriteInt32(&req, config.wepTxKeyIndex); + (void)WriteInt32(&req, config.priority); + (void)WriteBool(&req, config.hiddenSSID); + (void)WriteInt32(&req, (int)config.wifiIpConfig.assignMethod); WriteIpAddress(req, config.wifiIpConfig.staticIpAddress.ipAddress.address); - IpcIoPushInt32(&req, config.wifiIpConfig.staticIpAddress.ipAddress.prefixLength); - IpcIoPushInt32(&req, config.wifiIpConfig.staticIpAddress.ipAddress.flags); - IpcIoPushInt32(&req, config.wifiIpConfig.staticIpAddress.ipAddress.scope); + (void)WriteInt32(&req, config.wifiIpConfig.staticIpAddress.ipAddress.prefixLength); + (void)WriteInt32(&req, config.wifiIpConfig.staticIpAddress.ipAddress.flags); + (void)WriteInt32(&req, config.wifiIpConfig.staticIpAddress.ipAddress.scope); WriteIpAddress(req, config.wifiIpConfig.staticIpAddress.gateway); WriteIpAddress(req, config.wifiIpConfig.staticIpAddress.dnsServer1); WriteIpAddress(req, config.wifiIpConfig.staticIpAddress.dnsServer2); - IpcIoPushString(&req, config.wifiIpConfig.staticIpAddress.domains.c_str()); - IpcIoPushString(&req, config.wifiEapConfig.eap.c_str()); - IpcIoPushString(&req, config.wifiEapConfig.identity.c_str()); - IpcIoPushString(&req, config.wifiEapConfig.password.c_str()); - IpcIoPushInt32(&req, (int)config.wifiProxyconfig.configureMethod); - IpcIoPushString(&req, config.wifiProxyconfig.autoProxyConfig.pacWebAddress.c_str()); - IpcIoPushString(&req, config.wifiProxyconfig.manualProxyConfig.serverHostName.c_str()); - IpcIoPushInt32(&req, config.wifiProxyconfig.manualProxyConfig.serverPort); - IpcIoPushString(&req, config.wifiProxyconfig.manualProxyConfig.exclusionObjectList.c_str()); - IpcIoPushInt32(&req, (int)config.wifiPrivacySetting); + (void)WriteString(&req, config.wifiIpConfig.staticIpAddress.domains.c_str()); + (void)WriteString(&req, config.wifiEapConfig.eap.c_str()); + (void)WriteString(&req, config.wifiEapConfig.identity.c_str()); + (void)WriteString(&req, config.wifiEapConfig.password.c_str()); + (void)WriteInt32(&req, (int)config.wifiProxyconfig.configureMethod); + (void)WriteString(&req, config.wifiProxyconfig.autoProxyConfig.pacWebAddress.c_str()); + (void)WriteString(&req, config.wifiProxyconfig.manualProxyConfig.serverHostName.c_str()); + (void)WriteInt32(&req, config.wifiProxyconfig.manualProxyConfig.serverPort); + (void)WriteString(&req, config.wifiProxyconfig.manualProxyConfig.exclusionObjectList.c_str()); + (void)WriteInt32(&req, (int)config.wifiPrivacySetting); } ErrCode WifiDeviceProxy::AddDeviceConfig(const WifiDeviceConfig &config, int &result) @@ -487,7 +498,7 @@ ErrCode WifiDeviceProxy::AddDeviceConfig(const WifiDeviceConfig &config, int &re struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; IpcIoInit(&req, data, IPC_DATA_SIZE_BIG, MAX_IPC_OBJ_COUNT); - IpcIoPushInt32(&req, 0); + (void)WriteInt32(&req, 0); WriteDeviceConfig(config, req); owner.variable = &result; owner.funcId = WIFI_SVR_CMD_ADD_DEVICE_CONFIG; @@ -516,7 +527,7 @@ ErrCode WifiDeviceProxy::UpdateDeviceConfig(const WifiDeviceConfig &config, int struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; IpcIoInit(&req, data, IPC_DATA_SIZE_BIG, MAX_IPC_OBJ_COUNT); - IpcIoPushInt32(&req, 0); + (void)WriteInt32(&req, 0); WriteDeviceConfig(config, req); owner.variable = &result; owner.funcId = WIFI_SVR_CMD_UPDATE_DEVICE_CONFIG; @@ -545,8 +556,8 @@ ErrCode WifiDeviceProxy::RemoveDevice(int networkId) struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; IpcIoInit(&req, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); - IpcIoPushInt32(&req, 0); - IpcIoPushInt32(&req, networkId); + (void)WriteInt32(&req, 0); + (void)WriteInt32(&req, networkId); owner.funcId = WIFI_SVR_CMD_REMOVE_DEVICE_CONFIG; int error = remote_->Invoke(remote_, WIFI_SVR_CMD_REMOVE_DEVICE_CONFIG, &req, &owner, IpcCallback); if (error != EC_SUCCESS) { @@ -573,7 +584,7 @@ ErrCode WifiDeviceProxy::RemoveAllDevice() struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; IpcIoInit(&req, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); - IpcIoPushInt32(&req, 0); + (void)WriteInt32(&req, 0); owner.funcId = WIFI_SVR_CMD_REMOVE_ALL_DEVICE_CONFIG; int error = remote_->Invoke(remote_, WIFI_SVR_CMD_REMOVE_ALL_DEVICE_CONFIG, &req, &owner, IpcCallback); if (error != EC_SUCCESS) { @@ -600,7 +611,7 @@ ErrCode WifiDeviceProxy::GetDeviceConfigs(std::vector &result) struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; IpcIoInit(&req, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); - IpcIoPushInt32(&req, 0); + (void)WriteInt32(&req, 0); owner.variable = &result; owner.funcId = WIFI_SVR_CMD_GET_DEVICE_CONFIGS; int error = remote_->Invoke(remote_, WIFI_SVR_CMD_GET_DEVICE_CONFIGS, &req, &owner, IpcCallback); @@ -629,9 +640,9 @@ ErrCode WifiDeviceProxy::EnableDeviceConfig(int networkId, bool attemptEnable) struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; IpcIoInit(&req, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); - IpcIoPushInt32(&req, 0); - IpcIoPushInt32(&req, networkId); - IpcIoPushInt32(&req, attemptEnable); + (void)WriteInt32(&req, 0); + (void)WriteInt32(&req, networkId); + (void)WriteInt32(&req, attemptEnable); owner.funcId = WIFI_SVR_CMD_ENABLE_DEVICE; int error = remote_->Invoke(remote_, WIFI_SVR_CMD_ENABLE_DEVICE, &req, &owner, IpcCallback); if (error != EC_SUCCESS) { @@ -658,8 +669,8 @@ ErrCode WifiDeviceProxy::DisableDeviceConfig(int networkId) struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; IpcIoInit(&req, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); - IpcIoPushInt32(&req, 0); - IpcIoPushInt32(&req, networkId); + (void)WriteInt32(&req, 0); + (void)WriteInt32(&req, networkId); owner.funcId = WIFI_SVR_CMD_DISABLE_DEVICE; int error = remote_->Invoke(remote_, WIFI_SVR_CMD_DISABLE_DEVICE, &req, &owner, IpcCallback); if (error != EC_SUCCESS) { @@ -686,8 +697,8 @@ ErrCode WifiDeviceProxy::ConnectToNetwork(int networkId) struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; IpcIoInit(&req, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); - IpcIoPushInt32(&req, 0); - IpcIoPushInt32(&req, networkId); + (void)WriteInt32(&req, 0); + (void)WriteInt32(&req, networkId); owner.funcId = WIFI_SVR_CMD_CONNECT_TO; int error = remote_->Invoke(remote_, WIFI_SVR_CMD_CONNECT_TO, &req, &owner, IpcCallback); if (error != EC_SUCCESS) { @@ -714,7 +725,7 @@ ErrCode WifiDeviceProxy::ConnectToDevice(const WifiDeviceConfig &config) struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; IpcIoInit(&req, data, IPC_DATA_SIZE_BIG, MAX_IPC_OBJ_COUNT); - IpcIoPushInt32(&req, 0); + (void)WriteInt32(&req, 0); WriteDeviceConfig(config, req); owner.funcId = WIFI_SVR_CMD_CONNECT2_TO; int error = remote_->Invoke(remote_, WIFI_SVR_CMD_CONNECT2_TO, &req, &owner, IpcCallback); @@ -743,7 +754,7 @@ bool WifiDeviceProxy::IsConnected() struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; IpcIoInit(&req, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); - IpcIoPushInt32(&req, 0); + (void)WriteInt32(&req, 0); owner.variable = &result; owner.funcId = WIFI_SVR_CMD_IS_WIFI_CONNECTED; int error = remote_->Invoke(remote_, WIFI_SVR_CMD_IS_WIFI_CONNECTED, &req, &owner, IpcCallback); @@ -771,7 +782,7 @@ ErrCode WifiDeviceProxy::ReConnect() struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; IpcIoInit(&req, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); - IpcIoPushInt32(&req, 0); + (void)WriteInt32(&req, 0); owner.funcId = WIFI_SVR_CMD_RECONNECT; int error = remote_->Invoke(remote_, WIFI_SVR_CMD_RECONNECT, &req, &owner, IpcCallback); if (error != EC_SUCCESS) { @@ -798,7 +809,7 @@ ErrCode WifiDeviceProxy::ReAssociate(void) struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; IpcIoInit(&req, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); - IpcIoPushInt32(&req, 0); + (void)WriteInt32(&req, 0); owner.funcId = WIFI_SVR_CMD_REASSOCIATE; int error = remote_->Invoke(remote_, WIFI_SVR_CMD_REASSOCIATE, &req, &owner, IpcCallback); if (error != EC_SUCCESS) { @@ -825,7 +836,7 @@ ErrCode WifiDeviceProxy::Disconnect(void) struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; IpcIoInit(&req, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); - IpcIoPushInt32(&req, 0); + (void)WriteInt32(&req, 0); owner.funcId = WIFI_SVR_CMD_DISCONNECT; int error = remote_->Invoke(remote_, WIFI_SVR_CMD_DISCONNECT, &req, &owner, IpcCallback); if (error != EC_SUCCESS) { @@ -852,10 +863,10 @@ ErrCode WifiDeviceProxy::StartWps(const WpsConfig &config) struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; IpcIoInit(&req, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); - IpcIoPushInt32(&req, 0); - IpcIoPushInt32(&req, static_cast(config.setup)); - IpcIoPushString(&req, config.pin.c_str()); - IpcIoPushString(&req, config.bssid.c_str()); + (void)WriteInt32(&req, 0); + (void)WriteInt32(&req, static_cast(config.setup)); + (void)WriteString(&req, config.pin.c_str()); + (void)WriteString(&req, config.bssid.c_str()); owner.funcId = WIFI_SVR_CMD_START_WPS; int error = remote_->Invoke(remote_, WIFI_SVR_CMD_START_WPS, &req, &owner, IpcCallback); if (error != EC_SUCCESS) { @@ -882,7 +893,7 @@ ErrCode WifiDeviceProxy::CancelWps(void) struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; IpcIoInit(&req, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); - IpcIoPushInt32(&req, 0); + (void)WriteInt32(&req, 0); owner.funcId = WIFI_SVR_CMD_CANCEL_WPS; int error = remote_->Invoke(remote_, WIFI_SVR_CMD_CANCEL_WPS, &req, &owner, IpcCallback); if (error != EC_SUCCESS) { @@ -909,7 +920,7 @@ ErrCode WifiDeviceProxy::IsWifiActive(bool &bActive) struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; IpcIoInit(&req, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); - IpcIoPushInt32(&req, 0); + (void)WriteInt32(&req, 0); owner.variable = &bActive; owner.funcId = WIFI_SVR_CMD_IS_WIFI_ACTIVE; int error = remote_->Invoke(remote_, WIFI_SVR_CMD_IS_WIFI_ACTIVE, &req, &owner, IpcCallback); @@ -937,7 +948,7 @@ ErrCode WifiDeviceProxy::GetWifiState(int &state) struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; IpcIoInit(&req, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); - IpcIoPushInt32(&req, 0); + (void)WriteInt32(&req, 0); owner.variable = &state; owner.funcId = WIFI_SVR_CMD_GET_WIFI_STATE; int error = remote_->Invoke(remote_, WIFI_SVR_CMD_GET_WIFI_STATE, &req, &owner, IpcCallback); @@ -965,7 +976,7 @@ ErrCode WifiDeviceProxy::GetLinkedInfo(WifiLinkedInfo &info) struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; IpcIoInit(&req, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); - IpcIoPushInt32(&req, 0); + (void)WriteInt32(&req, 0); owner.variable = &info; owner.funcId = WIFI_SVR_CMD_GET_LINKED_INFO; int error = remote_->Invoke(remote_, WIFI_SVR_CMD_GET_LINKED_INFO, &req, &owner, IpcCallback); @@ -993,7 +1004,7 @@ ErrCode WifiDeviceProxy::GetIpInfo(IpInfo &info) struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; IpcIoInit(&req, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); - IpcIoPushInt32(&req, 0); + (void)WriteInt32(&req, 0); owner.variable = &info; owner.funcId = WIFI_SVR_CMD_GET_DHCP_INFO; int error = remote_->Invoke(remote_, WIFI_SVR_CMD_GET_DHCP_INFO, &req, &owner, IpcCallback); @@ -1021,8 +1032,8 @@ ErrCode WifiDeviceProxy::SetCountryCode(const std::string &countryCode) struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; IpcIoInit(&req, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); - IpcIoPushInt32(&req, 0); - IpcIoPushString(&req, countryCode.c_str()); + (void)WriteInt32(&req, 0); + (void)WriteString(&req, countryCode.c_str()); owner.funcId = WIFI_SVR_CMD_SET_COUNTRY_CODE; int error = remote_->Invoke(remote_, WIFI_SVR_CMD_SET_COUNTRY_CODE, &req, &owner, IpcCallback); if (error != EC_SUCCESS) { @@ -1049,7 +1060,7 @@ ErrCode WifiDeviceProxy::GetCountryCode(std::string &countryCode) struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; IpcIoInit(&req, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); - IpcIoPushInt32(&req, 0); + (void)WriteInt32(&req, 0); owner.variable = &countryCode; owner.funcId = WIFI_SVR_CMD_GET_COUNTRY_CODE; int error = remote_->Invoke(remote_, WIFI_SVR_CMD_GET_COUNTRY_CODE, &req, &owner, IpcCallback); @@ -1072,19 +1083,25 @@ ErrCode WifiDeviceProxy::RegisterCallBack(const std::shared_ptrInvoke(remote_, WIFI_SVR_CMD_REGISTER_CALLBACK_CLIENT, &req, &owner, IpcCallback); @@ -1113,9 +1130,9 @@ ErrCode WifiDeviceProxy::GetSignalLevel(const int &rssi, const int &band, int &l struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; IpcIoInit(&req, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); - IpcIoPushInt32(&req, 0); - IpcIoPushInt32(&req, rssi); - IpcIoPushInt32(&req, band); + (void)WriteInt32(&req, 0); + (void)WriteInt32(&req, rssi); + (void)WriteInt32(&req, band); owner.variable = &level; owner.funcId = WIFI_SVR_CMD_GET_SIGNAL_LEVEL; int error = remote_->Invoke(remote_, WIFI_SVR_CMD_GET_SIGNAL_LEVEL, &req, &owner, IpcCallback); @@ -1143,7 +1160,7 @@ ErrCode WifiDeviceProxy::GetSupportedFeatures(long &features) struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; IpcIoInit(&req, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); - IpcIoPushInt32(&req, 0); + (void)WriteInt32(&req, 0); owner.variable = &features; owner.funcId = WIFI_SVR_CMD_GET_SUPPORTED_FEATURES; int error = remote_->Invoke(remote_, WIFI_SVR_CMD_GET_SUPPORTED_FEATURES, &req, &owner, IpcCallback); @@ -1171,7 +1188,7 @@ ErrCode WifiDeviceProxy::GetDeviceMacAddress(std::string &result) struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; IpcIoInit(&req, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); - IpcIoPushInt32(&req, 0); + (void)WriteInt32(&req, 0); owner.variable = &result; owner.funcId = WIFI_SVR_CMD_GET_DERVICE_MAC_ADD; int error = remote_->Invoke(remote_, WIFI_SVR_CMD_GET_DERVICE_MAC_ADD, &req, &owner, IpcCallback); @@ -1200,8 +1217,8 @@ bool WifiDeviceProxy::SetLowLatencyMode(bool enabled) struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; IpcIoInit(&req, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); - IpcIoPushInt32(&req, 0); - IpcIoPushBool(&req, enabled); + (void)WriteInt32(&req, 0); + (void)WriteBool(&req, enabled); owner.variable = &result; owner.funcId = WIFI_SVR_CMD_SET_LOW_LATENCY_MODE; int error = remote_->Invoke(remote_, WIFI_SVR_CMD_SET_LOW_LATENCY_MODE, &req, &owner, IpcCallback); diff --git a/wifi/frameworks/native/src/wifi_scan_callback_stub_lite.cpp b/wifi/frameworks/native/src/wifi_scan_callback_stub_lite.cpp index c976080..19c7ca1 100644 --- a/wifi/frameworks/native/src/wifi_scan_callback_stub_lite.cpp +++ b/wifi/frameworks/native/src/wifi_scan_callback_stub_lite.cpp @@ -38,7 +38,8 @@ int WifiScanCallbackStub::OnRemoteRequest(uint32_t code, IpcIo *data) return ret; } - int exception = IpcIoPopInt32(data); + int exception = WIFI_OPT_FAILED; + (void)ReadInt32(data, &exception); if (exception) { WIFI_LOGD("OnRemoteRequest exception! %{public}d!", exception); return ret; @@ -87,7 +88,8 @@ void WifiScanCallbackStub::OnWifiScanStateChanged(int state) int WifiScanCallbackStub::RemoteOnWifiScanStateChanged(uint32_t code, IpcIo *data) { WIFI_LOGD("run %{public}s code %{public}u", __func__, code); - int stateCode = IpcIoPopInt32(data); + int stateCode = 0; + (void)ReadInt32(data, &stateCode); OnWifiScanStateChanged(stateCode); return 0; } diff --git a/wifi/frameworks/native/src/wifi_scan_proxy_lite.cpp b/wifi/frameworks/native/src/wifi_scan_proxy_lite.cpp index cdf3a4b..0553709 100644 --- a/wifi/frameworks/native/src/wifi_scan_proxy_lite.cpp +++ b/wifi/frameworks/native/src/wifi_scan_proxy_lite.cpp @@ -15,7 +15,8 @@ #include "wifi_scan_proxy.h" #include "define.h" -#include "liteipc_adapter.h" +#include "ipc_skeleton.h" +#include "rpc_errno.h" #include "serializer.h" #include "samgr_lite.h" #include "wifi_ipc_lite_adapter.h" @@ -25,12 +26,15 @@ DEFINE_WIFILOG_SCAN_LABEL("WifiScanProxyLite"); namespace OHOS { namespace Wifi { +static SvcIdentity g_sid; +static IpcObjectStub g_objStub; static WifiScanCallbackStub g_wifiScanCallbackStub; static ErrCode ParseScanInfos(IpcIo *reply, std::vector &infos) { constexpr int MAX_SIZE = 4096; - int tmpsize = IpcIoPopInt32(reply); + int tmpsize = 0; + (void)ReadInt32(reply, &tmpsize); if (tmpsize > MAX_SIZE) { WIFI_LOGE("Scan info size exceeds maximum allowed size: %{public}d", tmpsize); return WIFI_OPT_FAILED; @@ -39,31 +43,43 @@ static ErrCode ParseScanInfos(IpcIo *reply, std::vector &infos) unsigned int readLen; for (int i = 0; i < tmpsize; ++i) { WifiScanInfo info; - info.bssid = (char *)IpcIoPopString(reply, &readLen); - info.ssid = (char *)IpcIoPopString(reply, &readLen); - info.capabilities = (char *)IpcIoPopString(reply, &readLen); - info.frequency = IpcIoPopInt32(reply); - info.rssi = IpcIoPopInt32(reply); - info.timestamp = IpcIoPopInt64(reply); - info.band = IpcIoPopInt32(reply); - info.securityType = static_cast(IpcIoPopInt32(reply)); - info.channelWidth = static_cast(IpcIoPopInt32(reply)); - info.centerFrequency0 = IpcIoPopInt32(reply); - info.centerFrequency1 = IpcIoPopInt32(reply); - info.features = IpcIoPopInt64(reply); + info.bssid = (char *)ReadString(reply, &readLen); + info.ssid = (char *)ReadString(reply, &readLen); + info.capabilities = (char *)ReadString(reply, &readLen); + (void)ReadInt32(reply, &info.frequency); + (void)ReadInt32(reply, &info.rssi); + int64_t timestamp = 0; + (void)ReadInt64(reply, ×tamp); + info.timestamp = timestamp; + (void)ReadInt32(reply, &info.band); + int securityType = 0; + (void)ReadInt32(reply, &securityType); + info.securityType = static_cast(securityType); + int channelWidth = 0; + (void)ReadInt32(reply, &channelWidth); + info.channelWidth = static_cast(channelWidth); + (void)ReadInt32(reply, &info.centerFrequency0); + (void)ReadInt32(reply, &info.centerFrequency1); + int64_t features = 0; + (void)ReadInt64(reply, &features); + info.features = features; constexpr int IE_SIZE_MAX = 256; - int ieSize = IpcIoPopInt32(reply); + int ieSize = 0; + (void)ReadInt32(reply, &ieSize); if (ieSize > IE_SIZE_MAX) { WIFI_LOGE("ie size error: %{public}d", ieSize); return WIFI_OPT_FAILED; } for (int m = 0; m < ieSize; ++m) { WifiInfoElem tempWifiInfoElem; - tempWifiInfoElem.id = IpcIoPopInt32(reply); - int contentSize = IpcIoPopInt32(reply); + (void)ReadUint32(reply, &tempWifiInfoElem.id); + int contentSize = 0; + (void)ReadInt32(reply, &contentSize); + int8_t tmpInt8 = 0; for (int n = 0; n < contentSize; n++) { - char tempChar = static_cast(IpcIoPopInt8(reply)); + (void)ReadInt8(reply, &tmpInt8); + char tempChar = static_cast(tmpInt8); tempWifiInfoElem.content.emplace_back(tempChar); } info.infoElems.emplace_back(tempWifiInfoElem); @@ -78,23 +94,25 @@ static int IpcCallback(void *owner, int code, IpcIo *reply) if (code != 0 || owner == nullptr || reply == nullptr) { WIFI_LOGE("Callback error, code:%{public}d, owner:%{public}d, reply:%{public}d", code, owner == nullptr, reply == nullptr); - return LITEIPC_EINVAL; + return ERR_FAILED; } struct IpcOwner *data = (struct IpcOwner *)owner; - data->exception = IpcIoPopInt32(reply); - data->retCode = IpcIoPopInt32(reply); + (void)ReadInt32(reply, &data->exception); + (void)ReadInt32(reply, &data->retCode); if (data->exception != 0 || data->retCode != WIFI_OPT_SUCCESS || data->variable == nullptr) { - return LITEIPC_OK; + return ERR_NONE; } switch (data->funcId) { case WIFI_SVR_CMD_IS_SCAN_ALWAYS_ACTIVE: { - *((bool *)data->variable) = IpcIoPopBool(reply); + (void)ReadBool(reply, (bool *)data->variable); break; } case WIFI_SVR_CMD_GET_SUPPORTED_FEATURES: { - *((long *)data->variable) = IpcIoPopInt64(reply); + int64_t features = 0; + (void)ReadInt64(reply, &features); + *((long *)data->variable) = features; break; } case WIFI_SVR_CMD_GET_SCAN_INFO_LIST: { @@ -104,33 +122,26 @@ static int IpcCallback(void *owner, int code, IpcIo *reply) default: break; } - return LITEIPC_OK; + return ERR_NONE; } -static int AsyncCallback(const IpcContext *ipcContext, void *ipcMsg, IpcIo *data, void *arg) +static int AsyncCallback(uint32_t code, IpcIo *data, IpcIo *reply, MessageOption option) { - if (ipcMsg == nullptr || data == nullptr) { - WIFI_LOGE("AsyncCallback error, msg:%{public}d, data:%{public}d", - ipcMsg == nullptr, data == nullptr); - return LITEIPC_EINVAL; + if (data == nullptr) { + WIFI_LOGE("AsyncCallback error, data is null"); + return ERR_FAILED; } - - uint32_t code; - int codeRet = GetCode(ipcMsg, &code); - if (codeRet == LITEIPC_OK) { - return g_wifiScanCallbackStub.OnRemoteRequest(code, data); - } - return LITEIPC_EINVAL; + return g_wifiScanCallbackStub.OnRemoteRequest(code, data); } -static int OnRemoteSrvDied(const IpcContext *context, void *ipcMsg, IpcIo *data, void *arg) +static void OnRemoteSrvDied(void *arg) { WIFI_LOGE("%{public}s called.", __func__); WifiScanProxy *client = WifiScanProxy::GetInstance(); if (client != nullptr) { client->OnRemoteDied(); } - return LITEIPC_OK; + return; } WifiScanProxy *WifiScanProxy::g_instance = nullptr; @@ -177,7 +188,7 @@ ErrCode WifiScanProxy::Init(void) // Register SA Death Callback uint32_t deadId = 0; svcIdentity_ = SAMGR_GetRemoteIdentity(WIFI_SERVICE_LITE, WIFI_FEATRUE_SCAN); - result = RegisterDeathCallback(nullptr, svcIdentity_, OnRemoteSrvDied, nullptr, &deadId); + result = AddDeathRecipient(svcIdentity_, OnRemoteSrvDied, nullptr, &deadId); if (result != 0) { WIFI_LOGE("Register SA Death Callback failed, errorCode[%d]", result); } @@ -197,23 +208,23 @@ ErrCode WifiScanProxy::SetScanControlInfo(const ScanControlInfo &info) struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; IpcIoInit(&request, data, IPC_DATA_SIZE_BIG, MAX_IPC_OBJ_COUNT); - IpcIoPushInt32(&request, 0); - IpcIoPushInt32(&request, info.scanForbidList.size()); + (void)WriteInt32(&request, 0); + (void)WriteInt32(&request, info.scanForbidList.size()); for (auto iter = info.scanForbidList.begin(); iter != info.scanForbidList.end(); iter++) { - IpcIoPushInt32(&request, iter->scanScene); - IpcIoPushInt32(&request, static_cast(iter->scanMode)); - IpcIoPushInt32(&request, iter->forbidTime); - IpcIoPushInt32(&request, iter->forbidCount); + (void)WriteInt32(&request, iter->scanScene); + (void)WriteInt32(&request, static_cast(iter->scanMode)); + (void)WriteInt32(&request, iter->forbidTime); + (void)WriteInt32(&request, iter->forbidCount); } - IpcIoPushInt32(&request, info.scanIntervalList.size()); + (void)WriteInt32(&request, info.scanIntervalList.size()); for (auto iter2 = info.scanIntervalList.begin(); iter2 != info.scanIntervalList.end(); iter2++) { - IpcIoPushInt32(&request, iter2->scanScene); - IpcIoPushInt32(&request, static_cast(iter2->scanMode)); - IpcIoPushBool(&request, iter2->isSingle); - IpcIoPushInt32(&request, static_cast(iter2->intervalMode)); - IpcIoPushInt32(&request, iter2->interval); - IpcIoPushInt32(&request, iter2->count); + (void)WriteInt32(&request, iter2->scanScene); + (void)WriteInt32(&request, static_cast(iter2->scanMode)); + (void)WriteBool(&request, iter2->isSingle); + (void)WriteInt32(&request, static_cast(iter2->intervalMode)); + (void)WriteInt32(&request, iter2->interval); + (void)WriteInt32(&request, iter2->count); } owner.funcId = WIFI_SVR_CMD_SET_SCAN_CONTROL_INFO; @@ -242,7 +253,7 @@ ErrCode WifiScanProxy::Scan() struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; IpcIoInit(&request, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); - IpcIoPushInt32(&request, 0); + (void)WriteInt32(&request, 0); owner.funcId = WIFI_SVR_CMD_FULL_SCAN; int error = remote_->Invoke(remote_, WIFI_SVR_CMD_FULL_SCAN, &request, &owner, IpcCallback); @@ -270,14 +281,14 @@ ErrCode WifiScanProxy::AdvanceScan(const WifiScanParams ¶ms) struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; IpcIoInit(&request, data, IPC_DATA_SIZE_MID, MAX_IPC_OBJ_COUNT); - IpcIoPushInt32(&request, 0); - IpcIoPushString(&request, params.ssid.c_str()); - IpcIoPushString(&request, params.bssid.c_str()); - IpcIoPushInt32(&request, params.freqs.size()); + (void)WriteInt32(&request, 0); + (void)WriteString(&request, params.ssid.c_str()); + (void)WriteString(&request, params.bssid.c_str()); + (void)WriteInt32(&request, params.freqs.size()); for (std::size_t i = 0; i < params.freqs.size(); i++) { - IpcIoPushInt32(&request, params.freqs[i]); + (void)WriteInt32(&request, params.freqs[i]); } - IpcIoPushInt32(&request, params.band); + (void)WriteUint32(&request, params.band); owner.funcId = WIFI_SVR_CMD_SPECIFIED_PARAMS_SCAN; int error = remote_->Invoke(remote_, WIFI_SVR_CMD_SPECIFIED_PARAMS_SCAN, &request, &owner, IpcCallback); @@ -306,7 +317,7 @@ ErrCode WifiScanProxy::IsWifiClosedScan(bool &bOpen) struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; IpcIoInit(&request, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); - IpcIoPushInt32(&request, 0); + (void)WriteInt32(&request, 0); owner.variable = &bOpen; owner.funcId = WIFI_SVR_CMD_IS_SCAN_ALWAYS_ACTIVE; int error = remote_->Invoke(remote_, WIFI_SVR_CMD_IS_SCAN_ALWAYS_ACTIVE, &request, &owner, IpcCallback); @@ -334,7 +345,7 @@ ErrCode WifiScanProxy::GetScanInfoList(std::vector &result) struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; IpcIoInit(&request, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); - IpcIoPushInt32(&request, 0); + (void)WriteInt32(&request, 0); owner.variable = &result; owner.funcId = WIFI_SVR_CMD_GET_SCAN_INFO_LIST; int error = remote_->Invoke(remote_, WIFI_SVR_CMD_GET_SCAN_INFO_LIST, &request, &owner, IpcCallback); @@ -357,18 +368,21 @@ ErrCode WifiScanProxy::RegisterCallBack(const std::shared_ptr return WIFI_OPT_FAILED; } WIFI_LOGD("RegisterCallBack start!"); - int ret = RegisterIpcCallback(AsyncCallback, ONCE, IPC_WAIT_FOREVER, &svcIdentity_, nullptr); - if (ret != 0) { - WIFI_LOGE("[WifiScanProxy] RegisterIpcCallback failed"); - return WIFI_OPT_FAILED; - } + g_objStub.func = AsyncCallback; + g_objStub.args = nullptr; + g_objStub.isRemote = false; + + g_sid.handle = IPC_INVALID_HANDLE; + g_sid.token = SERVICE_TYPE_ANONYMOUS; + g_sid.cookie = (uintptr_t)&g_objStub; + IpcIo request; char data[IPC_DATA_SIZE_SMALL]; struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; IpcIoInit(&request, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); - IpcIoPushInt32(&request, 0); - IpcIoPushSvc(&request, &svcIdentity_); + (void)WriteInt32(&request, 0); + (void)WriteRemoteObject(&request, &g_sid); owner.funcId = WIFI_SVR_CMD_REGISTER_SCAN_CALLBACK; int error = remote_->Invoke(remote_, WIFI_SVR_CMD_REGISTER_SCAN_CALLBACK, &request, &owner, IpcCallback); @@ -376,9 +390,11 @@ ErrCode WifiScanProxy::RegisterCallBack(const std::shared_ptr WIFI_LOGE("RegisterCallBack failed, error code is %{public}d", error); return WIFI_OPT_FAILED; } + WIFI_LOGD("RegisterCallBack is finished: result=%{public}d", owner.exception); + if (owner.exception) { + return WIFI_OPT_FAILED; + } g_wifiScanCallbackStub.RegisterCallBack(callback); - ret = owner.exception; - WIFI_LOGD("RegisterCallBack is finished: result=%{public}d", ret); return WIFI_OPT_SUCCESS; } @@ -395,7 +411,7 @@ ErrCode WifiScanProxy::GetSupportedFeatures(long &features) struct IpcOwner owner = {.exception = -1, .retCode = 0, .variable = nullptr}; IpcIoInit(&request, data, IPC_DATA_SIZE_SMALL, MAX_IPC_OBJ_COUNT); - IpcIoPushInt32(&request, 0); + (void)WriteInt32(&request, 0); owner.variable = &features; owner.funcId = WIFI_SVR_CMD_GET_SUPPORTED_FEATURES; int error = remote_->Invoke(remote_, WIFI_SVR_CMD_GET_SUPPORTED_FEATURES, &request, &owner, IpcCallback); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn index e55a671..0315886 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn @@ -75,7 +75,7 @@ if (defined(ohos_lite)) { "$DHCP_ROOT_DIR/interfaces/inner_api/interfaces", "$WIFI_ROOT_DIR/utils/inc", "//base/hiviewdfx/hilog_lite/interfaces/native/innerkits", - "//foundation/communication/ipc_lite/interfaces/kits", + "//foundation/communication/ipc/interfaces/innerkits/c/ipc/include", "//foundation/distributedschedule/samgr_lite/interfaces/innerkits/registry", "//foundation/distributedschedule/samgr_lite/interfaces/innerkits/samgr", "//third_party/bounds_checking_function/include", @@ -86,7 +86,7 @@ if (defined(ohos_lite)) { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", "$WIFI_ROOT_DIR/utils/src:wifi_utils", "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", - "//foundation/communication/ipc_lite:liteipc_adapter", + "//foundation/communication/ipc/interfaces/innerkits/c/ipc:ipc_single", "//foundation/distributedschedule/samgr_lite/samgr:samgr", "//third_party/bounds_checking_function:libsec_shared", ] @@ -126,7 +126,7 @@ if (defined(ohos_lite)) { "$DHCP_ROOT_DIR/interfaces/inner_api/interfaces", "$WIFI_ROOT_DIR/utils/inc", "//base/hiviewdfx/hilog_lite/interfaces/native/innerkits", - "//foundation/communication/ipc_lite/interfaces/kits", + "//foundation/communication/ipc/interfaces/innerkits/c/ipc/include", "//foundation/distributedschedule/samgr_lite/interfaces/innerkits/registry", "//foundation/distributedschedule/samgr_lite/interfaces/innerkits/samgr", "//third_party/bounds_checking_function/include", @@ -138,7 +138,7 @@ if (defined(ohos_lite)) { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", "$WIFI_ROOT_DIR/utils/src:wifi_utils", "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", - "//foundation/communication/ipc_lite:liteipc_adapter", + "//foundation/communication/ipc/interfaces/innerkits/c/ipc:ipc_single", "//foundation/distributedschedule/samgr_lite/samgr:samgr", "//third_party/bounds_checking_function:libsec_shared", ] diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_callback_proxy.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_callback_proxy.h index 98ebdc4..348bff4 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_callback_proxy.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_callback_proxy.h @@ -77,7 +77,7 @@ public: private: #ifdef OHOS_ARCH_LITE - SvcIdentity *sid_; + SvcIdentity sid_; static const int DEFAULT_IPC_SIZE = 256; #else static inline BrokerDelegator g_delegator; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_callback_proxy_lite.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_callback_proxy_lite.cpp index f72677d..cef9622 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_callback_proxy_lite.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_callback_proxy_lite.cpp @@ -15,25 +15,20 @@ #include "wifi_device_callback_proxy.h" #include "define.h" -#include "liteipc_adapter.h" +#include "ipc_skeleton.h" +#include "rpc_errno.h" #include "wifi_logger.h" DEFINE_WIFILOG_LABEL("WifiDeviceCallBackProxy"); namespace OHOS { namespace Wifi { -WifiDeviceCallBackProxy::WifiDeviceCallBackProxy(SvcIdentity *sid) : sid_(sid) +WifiDeviceCallBackProxy::WifiDeviceCallBackProxy(SvcIdentity *sid) : sid_(*sid) {} WifiDeviceCallBackProxy::~WifiDeviceCallBackProxy() { - if (sid_ != nullptr) { -#ifdef __LINUX__ - BinderRelease(sid_->ipcContext, sid_->handle); -#endif - free(sid_); - sid_ = nullptr; - } + ReleaseSvc(sid_); } void WifiDeviceCallBackProxy::OnWifiStateChanged(int state) @@ -42,10 +37,15 @@ void WifiDeviceCallBackProxy::OnWifiStateChanged(int state) IpcIo data; uint8_t buff[DEFAULT_IPC_SIZE]; IpcIoInit(&data, buff, DEFAULT_IPC_SIZE, 0); - IpcIoPushInt32(&data, 0); - IpcIoPushInt32(&data, state); - int ret = Transact(nullptr, *sid_, WIFI_CBK_CMD_STATE_CHANGE, &data, nullptr, LITEIPC_FLAG_ONEWAY, nullptr); - if (ret != LITEIPC_OK) { + (void)WriteInt32(&data, 0); + (void)WriteInt32(&data, state); + + IpcIo reply; + MessageOption option; + MessageOptionInit(&option); + option.flags = TF_OP_ASYNC; + int ret = SendRequest(sid_, WIFI_CBK_CMD_STATE_CHANGE, &data, &reply, option, nullptr); + if (ret != ERR_NONE) { WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", WIFI_CBK_CMD_STATE_CHANGE, ret); } } @@ -57,29 +57,34 @@ void WifiDeviceCallBackProxy::OnWifiConnectionChanged(int state, const WifiLinke constexpr int IPC_DATA_SIZE = 1024; uint8_t buff[IPC_DATA_SIZE]; IpcIoInit(&data, buff, IPC_DATA_SIZE, 0); - IpcIoPushInt32(&data, 0); - IpcIoPushInt32(&data, state); - IpcIoPushInt32(&data, info.networkId); - IpcIoPushString(&data, info.ssid.c_str()); - IpcIoPushString(&data, info.bssid.c_str()); - IpcIoPushInt32(&data, info.rssi); - IpcIoPushInt32(&data, info.band); - IpcIoPushInt32(&data, info.frequency); - IpcIoPushInt32(&data, info.linkSpeed); - IpcIoPushString(&data, info.macAddress.c_str()); - IpcIoPushInt32(&data, info.ipAddress); - IpcIoPushInt32(&data, (int)info.connState); - IpcIoPushBool(&data, info.ifHiddenSSID); - IpcIoPushInt32(&data, info.rxLinkSpeed); - IpcIoPushInt32(&data, info.txLinkSpeed); - IpcIoPushInt32(&data, info.chload); - IpcIoPushInt32(&data, info.snr); - IpcIoPushInt32(&data, info.isDataRestricted); - IpcIoPushString(&data, info.portalUrl.c_str()); - IpcIoPushInt32(&data, (int)info.supplicantState); - IpcIoPushInt32(&data, (int)info.detailedState); - int ret = Transact(nullptr, *sid_, WIFI_CBK_CMD_CONNECTION_CHANGE, &data, nullptr, LITEIPC_FLAG_ONEWAY, nullptr); - if (ret != LITEIPC_OK) { + (void)WriteInt32(&data, 0); + (void)WriteInt32(&data, state); + (void)WriteInt32(&data, info.networkId); + (void)WriteString(&data, info.ssid.c_str()); + (void)WriteString(&data, info.bssid.c_str()); + (void)WriteInt32(&data, info.rssi); + (void)WriteInt32(&data, info.band); + (void)WriteInt32(&data, info.frequency); + (void)WriteInt32(&data, info.linkSpeed); + (void)WriteString(&data, info.macAddress.c_str()); + (void)WriteUint32(&data, info.ipAddress); + (void)WriteInt32(&data, (int)info.connState); + (void)WriteBool(&data, info.ifHiddenSSID); + (void)WriteInt32(&data, info.rxLinkSpeed); + (void)WriteInt32(&data, info.txLinkSpeed); + (void)WriteInt32(&data, info.chload); + (void)WriteInt32(&data, info.snr); + (void)WriteInt32(&data, info.isDataRestricted); + (void)WriteString(&data, info.portalUrl.c_str()); + (void)WriteInt32(&data, (int)info.supplicantState); + (void)WriteInt32(&data, (int)info.detailedState); + + IpcIo reply; + MessageOption option; + MessageOptionInit(&option); + option.flags = TF_OP_ASYNC; + int ret = SendRequest(sid_, WIFI_CBK_CMD_CONNECTION_CHANGE, &data, &reply, option, nullptr); + if (ret != ERR_NONE) { WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", WIFI_CBK_CMD_CONNECTION_CHANGE, ret); } } @@ -90,10 +95,15 @@ void WifiDeviceCallBackProxy::OnWifiRssiChanged(int rssi) IpcIo data; uint8_t buff[DEFAULT_IPC_SIZE]; IpcIoInit(&data, buff, DEFAULT_IPC_SIZE, 0); - IpcIoPushInt32(&data, 0); - IpcIoPushInt32(&data, rssi); - int ret = Transact(nullptr, *sid_, WIFI_CBK_CMD_RSSI_CHANGE, &data, nullptr, LITEIPC_FLAG_ONEWAY, nullptr); - if (ret != LITEIPC_OK) { + (void)WriteInt32(&data, 0); + (void)WriteInt32(&data, rssi); + + IpcIo reply; + MessageOption option; + MessageOptionInit(&option); + option.flags = TF_OP_ASYNC; + int ret = SendRequest(sid_, WIFI_CBK_CMD_RSSI_CHANGE, &data, &reply, option, nullptr); + if (ret != ERR_NONE) { WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", WIFI_CBK_CMD_RSSI_CHANGE, ret); } } @@ -104,11 +114,16 @@ void WifiDeviceCallBackProxy::OnWifiWpsStateChanged(int state, const std::string IpcIo data; uint8_t buff[DEFAULT_IPC_SIZE]; IpcIoInit(&data, buff, DEFAULT_IPC_SIZE, 0); - IpcIoPushInt32(&data, 0); - IpcIoPushInt32(&data, state); - IpcIoPushString(&data, pinCode.c_str()); - int ret = Transact(nullptr, *sid_, WIFI_CBK_CMD_WPS_STATE_CHANGE, &data, nullptr, LITEIPC_FLAG_ONEWAY, nullptr); - if (ret != LITEIPC_OK) { + (void)WriteInt32(&data, 0); + (void)WriteInt32(&data, state); + (void)WriteString(&data, pinCode.c_str()); + + IpcIo reply; + MessageOption option; + MessageOptionInit(&option); + option.flags = TF_OP_ASYNC; + int ret = SendRequest(sid_, WIFI_CBK_CMD_WPS_STATE_CHANGE, &data, &reply, option, nullptr); + if (ret != ERR_NONE) { WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", WIFI_CBK_CMD_WPS_STATE_CHANGE, ret); } } @@ -119,10 +134,15 @@ void WifiDeviceCallBackProxy::OnStreamChanged(int direction) IpcIo data; uint8_t buff[DEFAULT_IPC_SIZE]; IpcIoInit(&data, buff, DEFAULT_IPC_SIZE, 0); - IpcIoPushInt32(&data, 0); - IpcIoPushInt32(&data, direction); - int ret = Transact(nullptr, *sid_, WIFI_CBK_CMD_STREAM_DIRECTION, &data, nullptr, LITEIPC_FLAG_ONEWAY, nullptr); - if (ret != LITEIPC_OK) { + (void)WriteInt32(&data, 0); + (void)WriteInt32(&data, direction); + + IpcIo reply; + MessageOption option; + MessageOptionInit(&option); + option.flags = TF_OP_ASYNC; + int ret = SendRequest(sid_, WIFI_CBK_CMD_STREAM_DIRECTION, &data, &reply, option, nullptr); + if (ret != ERR_NONE) { WIFI_LOGE("Set Attr(%{public}d) failed,error code is %{public}d", WIFI_CBK_CMD_STREAM_DIRECTION, ret); } } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub_lite.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub_lite.cpp index ee5007a..236aae2 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub_lite.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub_lite.cpp @@ -15,7 +15,8 @@ #include "wifi_device_stub_lite.h" #include "define.h" -#include "liteipc_adapter.h" +#include "ipc_skeleton.h" +#include "rpc_errno.h" #include "wifi_device_callback_proxy.h" #include "wifi_errcode.h" #include "wifi_logger.h" @@ -36,156 +37,167 @@ WifiDeviceStub::~WifiDeviceStub() void WifiDeviceStub::ReadIpAddress(IpcIo *req, WifiIpAddress &address) { constexpr int MAX_LIMIT_SIZE = 1024; - address.family = IpcIoPopInt32(req); - address.addressIpv4 = IpcIoPopInt32(req); - int size = IpcIoPopInt32(req); + (void)ReadInt32(req, &address.family); + (void)ReadUint32(req, &address.addressIpv4); + int size = 0; + (void)ReadInt32(req, &size); if (size > MAX_LIMIT_SIZE) { WIFI_LOGE("Read ip address parameter error: %{public}d", size); return; } + int8_t tmpInt8; for (int i = 0; i < size; i++) { - address.addressIpv6.push_back(IpcIoPopInt8(req)); + (void)ReadInt8(req, &tmpInt8); + address.addressIpv6.push_back(tmpInt8); } } void WifiDeviceStub::ReadWifiDeviceConfig(IpcIo *req, WifiDeviceConfig &config) { + int tmpInt; size_t size; - config.networkId = IpcIoPopInt32(req); - config.status = IpcIoPopInt32(req); - config.bssid = (char *)IpcIoPopString(req, &size); - config.ssid = (char *)IpcIoPopString(req, &size); - config.band = IpcIoPopInt32(req); - config.channel = IpcIoPopInt32(req); - config.frequency = IpcIoPopInt32(req); - config.level = IpcIoPopInt32(req); - config.isPasspoint = IpcIoPopBool(req); - config.isEphemeral = IpcIoPopBool(req); - config.preSharedKey = (char *)IpcIoPopString(req, &size); - config.keyMgmt = (char *)IpcIoPopString(req, &size); + (void)ReadInt32(req, &config.networkId); + (void)ReadInt32(req, &config.status); + config.bssid = (char *)ReadString(req, &size); + config.ssid = (char *)ReadString(req, &size); + (void)ReadInt32(req, &config.band); + (void)ReadInt32(req, &config.channel); + (void)ReadInt32(req, &config.frequency); + (void)ReadInt32(req, &config.level); + (void)ReadBool(req, &config.isPasspoint); + (void)ReadBool(req, &config.isEphemeral); + config.preSharedKey = (char *)ReadString(req, &size); + config.keyMgmt = (char *)ReadString(req, &size); for (int i = 0; i < WEPKEYS_SIZE; i++) { - config.wepKeys[i] = (char *)IpcIoPopString(req, &size); + config.wepKeys[i] = (char *)ReadString(req, &size); } - config.wepTxKeyIndex = IpcIoPopInt32(req); - config.priority = IpcIoPopInt32(req); - config.hiddenSSID = IpcIoPopBool(req); - config.wifiIpConfig.assignMethod = AssignIpMethod(IpcIoPopInt32(req)); + (void)ReadInt32(req, &config.wepTxKeyIndex); + (void)ReadInt32(req, &config.priority); + (void)ReadBool(req, &config.hiddenSSID); + (void)ReadInt32(req, &tmpInt); + config.wifiIpConfig.assignMethod = AssignIpMethod(tmpInt); ReadIpAddress(req, config.wifiIpConfig.staticIpAddress.ipAddress.address); - config.wifiIpConfig.staticIpAddress.ipAddress.prefixLength = IpcIoPopInt32(req); - config.wifiIpConfig.staticIpAddress.ipAddress.flags = IpcIoPopInt32(req); - config.wifiIpConfig.staticIpAddress.ipAddress.scope = IpcIoPopInt32(req); + (void)ReadInt32(req, &config.wifiIpConfig.staticIpAddress.ipAddress.prefixLength); + (void)ReadInt32(req, &config.wifiIpConfig.staticIpAddress.ipAddress.flags); + (void)ReadInt32(req, &config.wifiIpConfig.staticIpAddress.ipAddress.scope); ReadIpAddress(req, config.wifiIpConfig.staticIpAddress.gateway); ReadIpAddress(req, config.wifiIpConfig.staticIpAddress.dnsServer1); ReadIpAddress(req, config.wifiIpConfig.staticIpAddress.dnsServer2); - config.wifiIpConfig.staticIpAddress.domains = (char *)IpcIoPopString(req, &size); - config.wifiEapConfig.eap = (char *)IpcIoPopString(req, &size); - config.wifiEapConfig.identity = (char *)IpcIoPopString(req, &size); - config.wifiEapConfig.password = (char *)IpcIoPopString(req, &size); - config.wifiProxyconfig.configureMethod = ConfigureProxyMethod(IpcIoPopInt32(req)); - config.wifiProxyconfig.autoProxyConfig.pacWebAddress = (char *)IpcIoPopString(req, &size); - config.wifiProxyconfig.manualProxyConfig.serverHostName = (char *)IpcIoPopString(req, &size); - config.wifiProxyconfig.manualProxyConfig.serverPort = IpcIoPopInt32(req); - config.wifiProxyconfig.manualProxyConfig.exclusionObjectList = (char *)IpcIoPopString(req, &size); - config.wifiPrivacySetting = WifiPrivacyConfig(IpcIoPopInt32(req)); + config.wifiIpConfig.staticIpAddress.domains = (char *)ReadString(req, &size); + config.wifiEapConfig.eap = (char *)ReadString(req, &size); + config.wifiEapConfig.identity = (char *)ReadString(req, &size); + config.wifiEapConfig.password = (char *)ReadString(req, &size); + (void)ReadInt32(req, &tmpInt); + config.wifiProxyconfig.configureMethod = ConfigureProxyMethod(tmpInt); + config.wifiProxyconfig.autoProxyConfig.pacWebAddress = (char *)ReadString(req, &size); + config.wifiProxyconfig.manualProxyConfig.serverHostName = (char *)ReadString(req, &size); + (void)ReadInt32(req, &config.wifiProxyconfig.manualProxyConfig.serverPort); + config.wifiProxyconfig.manualProxyConfig.exclusionObjectList = (char *)ReadString(req, &size); + (void)ReadInt32(req, &tmpInt); + config.wifiPrivacySetting = WifiPrivacyConfig(tmpInt); } void WifiDeviceStub::WriteIpAddress(IpcIo *reply, const WifiIpAddress &address) { - IpcIoPushInt32(reply, address.family); - IpcIoPushInt32(reply, address.addressIpv4); + (void)WriteInt32(reply, address.family); + (void)WriteUint32(reply, address.addressIpv4); int size = address.addressIpv6.size(); - IpcIoPushInt32(reply, size); + (void)WriteInt32(reply, size); for (int i = 0; i < size; i++) { - IpcIoPushInt8(reply, address.addressIpv6[i]); + (void)WriteInt8(reply, address.addressIpv6[i]); } } void WifiDeviceStub::WriteWifiDeviceConfig(IpcIo *reply, const WifiDeviceConfig &config) { - IpcIoPushInt32(reply, config.networkId); - IpcIoPushInt32(reply, config.status); - IpcIoPushString(reply, config.bssid.c_str()); - IpcIoPushString(reply, config.ssid.c_str()); - IpcIoPushInt32(reply, config.band); - IpcIoPushInt32(reply, config.channel); - IpcIoPushInt32(reply, config.frequency); - IpcIoPushInt32(reply, config.level); - IpcIoPushBool(reply, config.isPasspoint); - IpcIoPushBool(reply, config.isEphemeral); - IpcIoPushString(reply, config.preSharedKey.c_str()); - IpcIoPushString(reply, config.keyMgmt.c_str()); + (void)WriteInt32(reply, config.networkId); + (void)WriteInt32(reply, config.status); + (void)WriteString(reply, config.bssid.c_str()); + (void)WriteString(reply, config.ssid.c_str()); + (void)WriteInt32(reply, config.band); + (void)WriteInt32(reply, config.channel); + (void)WriteInt32(reply, config.frequency); + (void)WriteInt32(reply, config.level); + (void)WriteBool(reply, config.isPasspoint); + (void)WriteBool(reply, config.isEphemeral); + (void)WriteString(reply, config.preSharedKey.c_str()); + (void)WriteString(reply, config.keyMgmt.c_str()); for (int j = 0; j < WEPKEYS_SIZE; j++) { - IpcIoPushString(reply, config.wepKeys[j].c_str()); + (void)WriteString(reply, config.wepKeys[j].c_str()); } - IpcIoPushInt32(reply, config.wepTxKeyIndex); - IpcIoPushInt32(reply, config.priority); - IpcIoPushBool(reply, config.hiddenSSID); - IpcIoPushInt32(reply, (int)config.wifiIpConfig.assignMethod); + (void)WriteInt32(reply, config.wepTxKeyIndex); + (void)WriteInt32(reply, config.priority); + (void)WriteBool(reply, config.hiddenSSID); + (void)WriteInt32(reply, (int)config.wifiIpConfig.assignMethod); WriteIpAddress(reply, config.wifiIpConfig.staticIpAddress.ipAddress.address); - IpcIoPushInt32(reply, config.wifiIpConfig.staticIpAddress.ipAddress.prefixLength); - IpcIoPushInt32(reply, config.wifiIpConfig.staticIpAddress.ipAddress.flags); - IpcIoPushInt32(reply, config.wifiIpConfig.staticIpAddress.ipAddress.scope); + (void)WriteInt32(reply, config.wifiIpConfig.staticIpAddress.ipAddress.prefixLength); + (void)WriteInt32(reply, config.wifiIpConfig.staticIpAddress.ipAddress.flags); + (void)WriteInt32(reply, config.wifiIpConfig.staticIpAddress.ipAddress.scope); WriteIpAddress(reply, config.wifiIpConfig.staticIpAddress.gateway); WriteIpAddress(reply, config.wifiIpConfig.staticIpAddress.dnsServer1); WriteIpAddress(reply, config.wifiIpConfig.staticIpAddress.dnsServer2); - IpcIoPushString(reply, config.wifiIpConfig.staticIpAddress.domains.c_str()); - IpcIoPushString(reply, config.wifiEapConfig.eap.c_str()); - IpcIoPushString(reply, config.wifiEapConfig.identity.c_str()); - IpcIoPushString(reply, config.wifiEapConfig.password.c_str()); - IpcIoPushInt32(reply, (int)config.wifiProxyconfig.configureMethod); - IpcIoPushString(reply, config.wifiProxyconfig.autoProxyConfig.pacWebAddress.c_str()); - IpcIoPushString(reply, config.wifiProxyconfig.manualProxyConfig.serverHostName.c_str()); - IpcIoPushInt32(reply, config.wifiProxyconfig.manualProxyConfig.serverPort); - IpcIoPushString(reply, config.wifiProxyconfig.manualProxyConfig.exclusionObjectList.c_str()); - IpcIoPushInt32(reply, (int)config.wifiPrivacySetting); + (void)WriteString(reply, config.wifiIpConfig.staticIpAddress.domains.c_str()); + (void)WriteString(reply, config.wifiEapConfig.eap.c_str()); + (void)WriteString(reply, config.wifiEapConfig.identity.c_str()); + (void)WriteString(reply, config.wifiEapConfig.password.c_str()); + (void)WriteInt32(reply, (int)config.wifiProxyconfig.configureMethod); + (void)WriteString(reply, config.wifiProxyconfig.autoProxyConfig.pacWebAddress.c_str()); + (void)WriteString(reply, config.wifiProxyconfig.manualProxyConfig.serverHostName.c_str()); + (void)WriteInt32(reply, config.wifiProxyconfig.manualProxyConfig.serverPort); + (void)WriteString(reply, config.wifiProxyconfig.manualProxyConfig.exclusionObjectList.c_str()); + (void)WriteInt32(reply, (int)config.wifiPrivacySetting); } void WifiDeviceStub::OnEnableWifi(uint32_t code, IpcIo *req, IpcIo *reply) { WIFI_LOGD("run %{public}s code %{public}u", __func__, code); ErrCode ret = EnableWifi(); - IpcIoPushInt32(reply, 0); - IpcIoPushInt32(reply, ret); + (void)WriteInt32(reply, 0); + (void)WriteInt32(reply, ret); } void WifiDeviceStub::OnDisableWifi(uint32_t code, IpcIo *req, IpcIo *reply) { WIFI_LOGD("run %{public}s code %{public}u", __func__, code); ErrCode ret = DisableWifi(); - IpcIoPushInt32(reply, 0); - IpcIoPushInt32(reply, ret); + (void)WriteInt32(reply, 0); + (void)WriteInt32(reply, ret); } void WifiDeviceStub::OnInitWifiProtect(uint32_t code, IpcIo *req, IpcIo *reply) { WIFI_LOGD("run %{public}s code %{public}u", __func__, code); size_t size; - WifiProtectType protectType = (WifiProtectType)IpcIoPopInt32(req); - std::string protectName = (char *)IpcIoPopString(req, &size); + int type = 0; + (void)ReadInt32(req, &type); + WifiProtectType protectType = (WifiProtectType)type; + std::string protectName = (char *)ReadString(req, &size); ErrCode ret = InitWifiProtect(protectType, protectName); - IpcIoPushInt32(reply, 0); - IpcIoPushInt32(reply, ret); + (void)WriteInt32(reply, 0); + (void)WriteInt32(reply, ret); } void WifiDeviceStub::OnGetWifiProtectRef(uint32_t code, IpcIo *req, IpcIo *reply) { WIFI_LOGD("run %{public}s code %{public}u", __func__, code); size_t size; - WifiProtectMode protectMode = (WifiProtectMode)IpcIoPopInt32(req); - std::string protectName = (char *)IpcIoPopString(req, &size); + int mode = 0; + (void)ReadInt32(req, &mode); + WifiProtectMode protectMode = (WifiProtectMode)mode; + std::string protectName = (char *)ReadString(req, &size); ErrCode ret = GetWifiProtectRef(protectMode, protectName); - IpcIoPushInt32(reply, 0); - IpcIoPushInt32(reply, ret); + (void)WriteInt32(reply, 0); + (void)WriteInt32(reply, ret); } void WifiDeviceStub::OnPutWifiProtectRef(uint32_t code, IpcIo *req, IpcIo *reply) { WIFI_LOGD("run %{public}s code %{public}u", __func__, code); size_t size; - std::string protectName = (char *)IpcIoPopString(req, &size); + std::string protectName = (char *)ReadString(req, &size); ErrCode ret = PutWifiProtectRef(protectName); - IpcIoPushInt32(reply, 0); - IpcIoPushInt32(reply, ret); + (void)WriteInt32(reply, 0); + (void)WriteInt32(reply, ret); } void WifiDeviceStub::OnAddDeviceConfig(uint32_t code, IpcIo *req, IpcIo *reply) @@ -197,10 +209,10 @@ void WifiDeviceStub::OnAddDeviceConfig(uint32_t code, IpcIo *req, IpcIo *reply) int result = INVALID_NETWORK_ID; ErrCode ret = AddDeviceConfig(config, result); - IpcIoPushInt32(reply, 0); - IpcIoPushInt32(reply, ret); + (void)WriteInt32(reply, 0); + (void)WriteInt32(reply, ret); if (ret == WIFI_OPT_SUCCESS) { - IpcIoPushInt32(reply, result); + (void)WriteInt32(reply, result); } } @@ -211,28 +223,29 @@ void WifiDeviceStub::OnUpdateDeviceConfig(uint32_t code, IpcIo *req, IpcIo *repl ReadWifiDeviceConfig(req, config); int result = INVALID_NETWORK_ID; ErrCode ret = UpdateDeviceConfig(config, result); - IpcIoPushInt32(reply, 0); - IpcIoPushInt32(reply, ret); + (void)WriteInt32(reply, 0); + (void)WriteInt32(reply, ret); if (ret == WIFI_OPT_SUCCESS) { - IpcIoPushInt32(reply, result); + (void)WriteInt32(reply, result); } } void WifiDeviceStub::OnRemoveDevice(uint32_t code, IpcIo *req, IpcIo *reply) { WIFI_LOGD("run %{public}s code %{public}u", __func__, code); - int networkId = IpcIoPopInt32(req); + int networkId = 0; + (void)ReadInt32(req, &networkId); ErrCode ret = RemoveDevice(networkId); - IpcIoPushInt32(reply, 0); - IpcIoPushInt32(reply, ret); + (void)WriteInt32(reply, 0); + (void)WriteInt32(reply, ret); } void WifiDeviceStub::OnRemoveAllDevice(uint32_t code, IpcIo *req, IpcIo *reply) { WIFI_LOGD("run %{public}s code %{public}u", __func__, code); ErrCode ret = RemoveAllDevice(); - IpcIoPushInt32(reply, 0); - IpcIoPushInt32(reply, ret); + (void)WriteInt32(reply, 0); + (void)WriteInt32(reply, ret); } void WifiDeviceStub::OnGetDeviceConfigs(uint32_t code, IpcIo *req, IpcIo *reply) @@ -240,12 +253,12 @@ void WifiDeviceStub::OnGetDeviceConfigs(uint32_t code, IpcIo *req, IpcIo *reply) WIFI_LOGD("run %{public}s code %{public}u", __func__, code); std::vector result; ErrCode ret = GetDeviceConfigs(result); - IpcIoPushInt32(reply, 0); - IpcIoPushInt32(reply, ret); + (void)WriteInt32(reply, 0); + (void)WriteInt32(reply, ret); if (ret == WIFI_OPT_SUCCESS) { unsigned int size = result.size(); - IpcIoPushInt32(reply, size); + (void)WriteInt32(reply, size); for (unsigned int i = 0; i < size; ++i) { WriteWifiDeviceConfig(reply, result[i]); } @@ -255,29 +268,33 @@ void WifiDeviceStub::OnGetDeviceConfigs(uint32_t code, IpcIo *req, IpcIo *reply) void WifiDeviceStub::OnEnableDeviceConfig(uint32_t code, IpcIo *req, IpcIo *reply) { WIFI_LOGD("run %{public}s code %{public}u", __func__, code); - int networkId = IpcIoPopInt32(req); - bool attemptEnable = IpcIoPopBool(req); + int networkId = 0; + (void)ReadInt32(req, &networkId); + bool attemptEnable; + (void)ReadBool(req, &attemptEnable); ErrCode ret = EnableDeviceConfig(networkId, attemptEnable); - IpcIoPushInt32(reply, 0); - IpcIoPushInt32(reply, ret); + (void)WriteInt32(reply, 0); + (void)WriteInt32(reply, ret); } void WifiDeviceStub::OnDisableDeviceConfig(uint32_t code, IpcIo *req, IpcIo *reply) { WIFI_LOGD("run %{public}s code %{public}u", __func__, code); - int networkId = IpcIoPopInt32(req); + int networkId = 0; + (void)ReadInt32(req, &networkId); ErrCode ret = DisableDeviceConfig(networkId); - IpcIoPushInt32(reply, 0); - IpcIoPushInt32(reply, ret); + (void)WriteInt32(reply, 0); + (void)WriteInt32(reply, ret); } void WifiDeviceStub::OnConnectTo(uint32_t code, IpcIo *req, IpcIo *reply) { WIFI_LOGD("run %{public}s code %{public}u", __func__, code); - int networkId = IpcIoPopInt32(req); + int networkId = 0; + (void)ReadInt32(req, &networkId); ErrCode ret = ConnectToNetwork(networkId); - IpcIoPushInt32(reply, 0); - IpcIoPushInt32(reply, ret); + (void)WriteInt32(reply, 0); + (void)WriteInt32(reply, ret); } void WifiDeviceStub::OnConnect2To(uint32_t code, IpcIo *req, IpcIo *reply) @@ -286,40 +303,40 @@ void WifiDeviceStub::OnConnect2To(uint32_t code, IpcIo *req, IpcIo *reply) WifiDeviceConfig config; ReadWifiDeviceConfig(req, config); ErrCode ret = ConnectToDevice(config); - IpcIoPushInt32(reply, 0); - IpcIoPushInt32(reply, ret); + (void)WriteInt32(reply, 0); + (void)WriteInt32(reply, ret); } void WifiDeviceStub::OnIsWifiConnected(uint32_t code, IpcIo *req, IpcIo *reply) { WIFI_LOGD("run %{public}s code %{public}u", __func__, code); - IpcIoPushInt32(reply, 0); - IpcIoPushInt32(reply, WIFI_OPT_SUCCESS); - IpcIoPushBool(reply, IsConnected()); + (void)WriteInt32(reply, 0); + (void)WriteInt32(reply, WIFI_OPT_SUCCESS); + (void)WriteBool(reply, IsConnected()); } void WifiDeviceStub::OnReConnect(uint32_t code, IpcIo *req, IpcIo *reply) { WIFI_LOGD("run %{public}s code %{public}u", __func__, code); ErrCode ret = ReConnect(); - IpcIoPushInt32(reply, 0); - IpcIoPushInt32(reply, ret); + (void)WriteInt32(reply, 0); + (void)WriteInt32(reply, ret); } void WifiDeviceStub::OnReAssociate(uint32_t code, IpcIo *req, IpcIo *reply) { WIFI_LOGD("run %{public}s code %{public}u", __func__, code); ErrCode ret = ReAssociate(); - IpcIoPushInt32(reply, 0); - IpcIoPushInt32(reply, ret); + (void)WriteInt32(reply, 0); + (void)WriteInt32(reply, ret); } void WifiDeviceStub::OnDisconnect(uint32_t code, IpcIo *req, IpcIo *reply) { WIFI_LOGD("run %{public}s code %{public}u", __func__, code); ErrCode ret = Disconnect(); - IpcIoPushInt32(reply, 0); - IpcIoPushInt32(reply, ret); + (void)WriteInt32(reply, 0); + (void)WriteInt32(reply, ret); } void WifiDeviceStub::OnStartWps(uint32_t code, IpcIo *req, IpcIo *reply) @@ -327,21 +344,23 @@ void WifiDeviceStub::OnStartWps(uint32_t code, IpcIo *req, IpcIo *reply) WIFI_LOGD("run %{public}s code %{public}u", __func__, code); size_t size; WpsConfig config; - config.setup = SetupMethod(IpcIoPopInt32(req)); - config.pin = (char *)IpcIoPopString(req, &size); - config.bssid = (char *)IpcIoPopString(req, &size); + int setup; + (void)ReadInt32(req, &setup); + config.setup = SetupMethod(setup); + config.pin = (char *)ReadString(req, &size); + config.bssid = (char *)ReadString(req, &size); ErrCode ret = StartWps(config); - IpcIoPushInt32(reply, 0); - IpcIoPushInt32(reply, ret); + (void)WriteInt32(reply, 0); + (void)WriteInt32(reply, ret); } void WifiDeviceStub::OnCancelWps(uint32_t code, IpcIo *req, IpcIo *reply) { WIFI_LOGD("run %{public}s code %{public}u", __func__, code); ErrCode ret = CancelWps(); - IpcIoPushInt32(reply, 0); - IpcIoPushInt32(reply, ret); + (void)WriteInt32(reply, 0); + (void)WriteInt32(reply, ret); } void WifiDeviceStub::OnIsWifiActive(uint32_t code, IpcIo *req, IpcIo *reply) @@ -349,10 +368,10 @@ void WifiDeviceStub::OnIsWifiActive(uint32_t code, IpcIo *req, IpcIo *reply) WIFI_LOGD("run %{public}s code %{public}u", __func__, code); bool bActive = false; ErrCode ret = IsWifiActive(bActive); - IpcIoPushInt32(reply, 0); - IpcIoPushInt32(reply, ret); + (void)WriteInt32(reply, 0); + (void)WriteInt32(reply, ret); if (ret == WIFI_OPT_SUCCESS) { - IpcIoPushBool(reply, bActive); + (void)WriteBool(reply, bActive); } } @@ -361,10 +380,10 @@ void WifiDeviceStub::OnGetWifiState(uint32_t code, IpcIo *req, IpcIo *reply) WIFI_LOGD("run %{public}s code %{public}u", __func__, code); int state = 0; ErrCode ret = GetWifiState(state); - IpcIoPushInt32(reply, 0); - IpcIoPushInt32(reply, ret); + (void)WriteInt32(reply, 0); + (void)WriteInt32(reply, ret); if (ret == WIFI_OPT_SUCCESS) { - IpcIoPushInt32(reply, state); + (void)WriteInt32(reply, state); } } @@ -373,29 +392,29 @@ void WifiDeviceStub::OnGetLinkedInfo(uint32_t code, IpcIo *req, IpcIo *reply) WIFI_LOGD("run %{public}s code %{public}u", __func__, code); WifiLinkedInfo wifiInfo; ErrCode ret = GetLinkedInfo(wifiInfo); - IpcIoPushInt32(reply, 0); - IpcIoPushInt32(reply, ret); + (void)WriteInt32(reply, 0); + (void)WriteInt32(reply, ret); if (ret == WIFI_OPT_SUCCESS) { - IpcIoPushInt32(reply, wifiInfo.networkId); - IpcIoPushString(reply, wifiInfo.ssid.c_str()); - IpcIoPushString(reply, wifiInfo.bssid.c_str()); - IpcIoPushInt32(reply, wifiInfo.rssi); - IpcIoPushInt32(reply, wifiInfo.band); - IpcIoPushInt32(reply, wifiInfo.frequency); - IpcIoPushInt32(reply, wifiInfo.linkSpeed); - IpcIoPushString(reply, wifiInfo.macAddress.c_str()); - IpcIoPushInt32(reply, wifiInfo.ipAddress); - IpcIoPushInt32(reply, (int)wifiInfo.connState); - IpcIoPushBool(reply, wifiInfo.ifHiddenSSID); - IpcIoPushInt32(reply, wifiInfo.rxLinkSpeed); - IpcIoPushInt32(reply, wifiInfo.txLinkSpeed); - IpcIoPushInt32(reply, wifiInfo.chload); - IpcIoPushInt32(reply, wifiInfo.snr); - IpcIoPushInt32(reply, wifiInfo.isDataRestricted); - IpcIoPushString(reply, wifiInfo.portalUrl.c_str()); - IpcIoPushInt32(reply, (int)wifiInfo.supplicantState); - IpcIoPushInt32(reply, (int)wifiInfo.detailedState); + (void)WriteInt32(reply, wifiInfo.networkId); + (void)WriteString(reply, wifiInfo.ssid.c_str()); + (void)WriteString(reply, wifiInfo.bssid.c_str()); + (void)WriteInt32(reply, wifiInfo.rssi); + (void)WriteInt32(reply, wifiInfo.band); + (void)WriteInt32(reply, wifiInfo.frequency); + (void)WriteInt32(reply, wifiInfo.linkSpeed); + (void)WriteString(reply, wifiInfo.macAddress.c_str()); + (void)WriteUint32(reply, wifiInfo.ipAddress); + (void)WriteInt32(reply, (int)wifiInfo.connState); + (void)WriteBool(reply, wifiInfo.ifHiddenSSID); + (void)WriteInt32(reply, wifiInfo.rxLinkSpeed); + (void)WriteInt32(reply, wifiInfo.txLinkSpeed); + (void)WriteInt32(reply, wifiInfo.chload); + (void)WriteInt32(reply, wifiInfo.snr); + (void)WriteInt32(reply, wifiInfo.isDataRestricted); + (void)WriteString(reply, wifiInfo.portalUrl.c_str()); + (void)WriteInt32(reply, (int)wifiInfo.supplicantState); + (void)WriteInt32(reply, (int)wifiInfo.detailedState); } } @@ -404,17 +423,17 @@ void WifiDeviceStub::OnGetIpInfo(uint32_t code, IpcIo *req, IpcIo *reply) WIFI_LOGD("run %{public}s code %{public}u", __func__, code); IpInfo info; ErrCode ret = GetIpInfo(info); - IpcIoPushInt32(reply, 0); - IpcIoPushInt32(reply, ret); + (void)WriteInt32(reply, 0); + (void)WriteInt32(reply, ret); if (ret == WIFI_OPT_SUCCESS) { - IpcIoPushInt32(reply, info.ipAddress); - IpcIoPushInt32(reply, info.gateway); - IpcIoPushInt32(reply, info.netmask); - IpcIoPushInt32(reply, info.primaryDns); - IpcIoPushInt32(reply, info.secondDns); - IpcIoPushInt32(reply, info.serverIp); - IpcIoPushInt32(reply, info.leaseDuration); + (void)WriteUint32(reply, info.ipAddress); + (void)WriteUint32(reply, info.gateway); + (void)WriteUint32(reply, info.netmask); + (void)WriteUint32(reply, info.primaryDns); + (void)WriteUint32(reply, info.secondDns); + (void)WriteUint32(reply, info.serverIp); + (void)WriteUint32(reply, info.leaseDuration); } } @@ -422,10 +441,10 @@ void WifiDeviceStub::OnSetCountryCode(uint32_t code, IpcIo *req, IpcIo *reply) { WIFI_LOGD("run %{public}s code %{public}u", __func__, code); size_t size; - std::string countrycode = (char *)IpcIoPopString(req, &size); + std::string countrycode = (char *)ReadString(req, &size); ErrCode ret = SetCountryCode(countrycode); - IpcIoPushInt32(reply, 0); - IpcIoPushInt32(reply, ret); + (void)WriteInt32(reply, 0); + (void)WriteInt32(reply, ret); } void WifiDeviceStub::OnGetCountryCode(uint32_t code, IpcIo *req, IpcIo *reply) @@ -433,11 +452,11 @@ void WifiDeviceStub::OnGetCountryCode(uint32_t code, IpcIo *req, IpcIo *reply) WIFI_LOGD("run %{public}s code %{public}u", __func__, code); std::string countryCode; ErrCode ret = GetCountryCode(countryCode); - IpcIoPushInt32(reply, 0); - IpcIoPushInt32(reply, ret); + (void)WriteInt32(reply, 0); + (void)WriteInt32(reply, ret); if (ret == WIFI_OPT_SUCCESS) { - IpcIoPushString(reply, countryCode.c_str()); + (void)WriteString(reply, countryCode.c_str()); } } @@ -445,36 +464,36 @@ void WifiDeviceStub::OnRegisterCallBack(uint32_t code, IpcIo *req, IpcIo *reply) { WIFI_LOGD("run %{public}s code %{public}u", __func__, code); ErrCode ret = WIFI_OPT_FAILED; - SvcIdentity *sid = IpcIoPopSvc(req); - if (sid == nullptr) { - WIFI_LOGE("sid is null"); - IpcIoPushInt32(reply, 0); - IpcIoPushInt32(reply, ret); + SvcIdentity sid; + bool readSid = ReadRemoteObject(req, &sid); + if (!readSid) { + WIFI_LOGE("read SvcIdentity failed"); + (void)WriteInt32(reply, 0); + (void)WriteInt32(reply, ret); return; } -#ifdef __LINUX__ - BinderAcquire(sid->ipcContext, sid->handle); -#endif - callback_ = std::make_shared(sid); + callback_ = std::make_shared(&sid); WIFI_LOGD("create new WifiDeviceCallbackProxy!"); ret = RegisterCallBack(callback_); - IpcIoPushInt32(reply, 0); - IpcIoPushInt32(reply, ret); + (void)WriteInt32(reply, 0); + (void)WriteInt32(reply, ret); } void WifiDeviceStub::OnGetSignalLevel(uint32_t code, IpcIo *req, IpcIo *reply) { WIFI_LOGD("run %{public}s code %{public}u", __func__, code); - int rssi = IpcIoPopInt32(req); - int band = IpcIoPopInt32(req); + int rssi = 0; + int band = 0; int level = 0; + (void)ReadInt32(req, &rssi); + (void)ReadInt32(req, &band); ErrCode ret = GetSignalLevel(rssi, band, level); - IpcIoPushInt32(reply, 0); - IpcIoPushInt32(reply, ret); + (void)WriteInt32(reply, 0); + (void)WriteInt32(reply, ret); if (ret == WIFI_OPT_SUCCESS) { - IpcIoPushInt32(reply, level); + (void)WriteInt32(reply, level); } } @@ -483,11 +502,11 @@ void WifiDeviceStub::OnGetSupportedFeatures(uint32_t code, IpcIo *req, IpcIo *re WIFI_LOGD("run %{public}s code %{public}u", __func__, code); long features = 0; int ret = GetSupportedFeatures(features); - IpcIoPushInt32(reply, 0); - IpcIoPushInt32(reply, ret); + (void)WriteInt32(reply, 0); + (void)WriteInt32(reply, ret); if (ret == WIFI_OPT_SUCCESS) { - IpcIoPushInt64(reply, features); + (void)WriteUint64(reply, features); } } @@ -496,10 +515,10 @@ void WifiDeviceStub::OnGetDeviceMacAdd(uint32_t code, IpcIo *req, IpcIo *reply) WIFI_LOGD("run %{public}s code %{public}u", __func__, code); std::string strMacAddr; ErrCode ret = GetDeviceMacAddress(strMacAddr); - IpcIoPushInt32(reply, 0); - IpcIoPushInt32(reply, ret); + (void)WriteInt32(reply, 0); + (void)WriteInt32(reply, ret); if (ret == WIFI_OPT_SUCCESS) { - IpcIoPushString(reply, strMacAddr.c_str()); + (void)WriteString(reply, strMacAddr.c_str()); } } @@ -507,10 +526,11 @@ void WifiDeviceStub::OnSetLowLatencyMode(uint32_t code, IpcIo *req, IpcIo *reply { WIFI_LOGD("run %{public}s code %{public}u", __func__, code); - bool enabled = IpcIoPopBool(req); - IpcIoPushInt32(reply, 0); - IpcIoPushInt32(reply, WIFI_OPT_SUCCESS); - IpcIoPushBool(reply, SetLowLatencyMode(enabled)); + bool enabled; + (void)ReadBool(req, &enabled); + (void)WriteInt32(reply, 0); + (void)WriteInt32(reply, WIFI_OPT_SUCCESS); + (void)WriteBool(reply, SetLowLatencyMode(enabled)); } void WifiDeviceStub::InitHandleMap() @@ -553,20 +573,21 @@ int WifiDeviceStub::OnRemoteRequest(uint32_t code, IpcIo *req, IpcIo *reply) WIFI_LOGD("run: %{public}s code: %{public}u", __func__, code); if (req == nullptr || reply == nullptr) { WIFI_LOGD("req:%{public}d, reply:%{public}d", req == nullptr, reply == nullptr); - return LITEIPC_EINVAL; + return ERR_FAILED; } - int exception = IpcIoPopInt32(req); + int exception = 0; + (void)ReadInt32(req, &exception); if (exception) { - IpcIoPushInt32(reply, 0); - IpcIoPushInt32(reply, WIFI_OPT_NOT_SUPPORTED); + (void)WriteInt32(reply, 0); + (void)WriteInt32(reply, WIFI_OPT_NOT_SUPPORTED); return WIFI_OPT_FAILED; } HandleFuncMap::iterator iter = handleFuncMap_.find(code); if (iter == handleFuncMap_.end()) { WIFI_LOGI("not find function to deal, code %{public}u", code); - IpcIoPushInt32(reply, 0); - IpcIoPushInt32(reply, WIFI_OPT_NOT_SUPPORTED); + (void)WriteInt32(reply, 0); + (void)WriteInt32(reply, WIFI_OPT_NOT_SUPPORTED); } else { (this->*(iter->second))(code, req, reply); } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_callback_proxy.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_callback_proxy.h index 77e6524..615ce02 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_callback_proxy.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_callback_proxy.h @@ -40,7 +40,7 @@ public: private: #ifdef OHOS_ARCH_LITE - SvcIdentity *sid_; + SvcIdentity sid_; static const int DEFAULT_IPC_SIZE = 256; #else static inline BrokerDelegator g_delegator; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_callback_proxy_lite.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_callback_proxy_lite.cpp index e062653..666e979 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_callback_proxy_lite.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_callback_proxy_lite.cpp @@ -15,25 +15,20 @@ #include "wifi_scan_callback_proxy.h" #include "define.h" -#include "liteipc_adapter.h" +#include "ipc_skeleton.h" +#include "rpc_errno.h" #include "wifi_logger.h" DEFINE_WIFILOG_SCAN_LABEL("WifiScanCallbackProxyLite"); namespace OHOS { namespace Wifi { -WifiScanCallbackProxy::WifiScanCallbackProxy(SvcIdentity *sid) : sid_(sid) +WifiScanCallbackProxy::WifiScanCallbackProxy(SvcIdentity *sid) : sid_(*sid) {} WifiScanCallbackProxy::~WifiScanCallbackProxy() { - if (sid_ != nullptr) { -#ifdef __LINUX__ - BinderRelease(sid_->ipcContext, sid_->handle); -#endif - free(sid_); - sid_ = nullptr; - } + ReleaseSvc(sid_); } void WifiScanCallbackProxy::OnWifiScanStateChanged(int state) @@ -42,11 +37,15 @@ void WifiScanCallbackProxy::OnWifiScanStateChanged(int state) IpcIo data; uint8_t buff[DEFAULT_IPC_SIZE]; IpcIoInit(&data, buff, DEFAULT_IPC_SIZE, 0); - IpcIoPushInt32(&data, 0); - IpcIoPushInt32(&data, state); - int ret = Transact(nullptr, *sid_, WIFI_CBK_CMD_SCAN_STATE_CHANGE, &data, nullptr, LITEIPC_FLAG_ONEWAY, nullptr); + (void)WriteInt32(&data, 0); + (void)WriteInt32(&data, state); + IpcIo reply; + MessageOption option; + MessageOptionInit(&option); + option.flags = TF_OP_ASYNC; + int ret = SendRequest(sid_, WIFI_CBK_CMD_SCAN_STATE_CHANGE, &data, &reply, option, nullptr); switch (ret) { - case LITEIPC_OK: + case ERR_NONE: WIFI_LOGD("OnWifiScanStateChanged callback sucessed!"); break; default: { diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_stub_lite.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_stub_lite.cpp index 8ef9648..bc5f1df 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_stub_lite.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_stub_lite.cpp @@ -15,7 +15,8 @@ #include "wifi_scan_stub_lite.h" #include "define.h" -#include "liteipc_adapter.h" +#include "ipc_skeleton.h" +#include "rpc_errno.h" #include "wifi_logger.h" #include "wifi_msg.h" #include "wifi_scan_callback_proxy.h" @@ -35,10 +36,11 @@ int WifiScanStub::OnRemoteRequest(uint32_t code, IpcIo *req, IpcIo *reply) WIFI_LOGD("WifiScanStub::OnRemoteRequest,code:%{public}u", code); if (req == nullptr || reply == nullptr) { WIFI_LOGD("req:%{public}d, reply:%{public}d", req == nullptr, reply == nullptr); - return LITEIPC_EINVAL; + return ERR_FAILED; } - int exception = IpcIoPopInt32(req); + int exception = ERR_FAILED; + (void)ReadInt32(req, &exception); if (exception) { return WIFI_OPT_FAILED; } @@ -88,43 +90,49 @@ std::shared_ptr WifiScanStub::GetCallback() const int WifiScanStub::OnSetScanControlInfo(uint32_t code, IpcIo *req, IpcIo *reply) { WIFI_LOGD("WifiScanStub run %{public}s code %{public}u", __func__, code); + int tmpInt; constexpr int MAX_SIZE = 1024; ScanControlInfo info; - int forbidListSize = IpcIoPopInt32(req); + int forbidListSize = 0; + (void)ReadInt32(req, &forbidListSize); if (forbidListSize > MAX_SIZE) { - IpcIoPushInt32(reply, 0); - IpcIoPushInt32(reply, WIFI_OPT_INVALID_PARAM); + (void)WriteInt32(reply, 0); + (void)WriteInt32(reply, WIFI_OPT_INVALID_PARAM); return WIFI_OPT_INVALID_PARAM; } for (int i = 0; i < forbidListSize; i++) { ScanForbidMode scanForbidMode; - scanForbidMode.scanScene = IpcIoPopInt32(req); - scanForbidMode.scanMode = static_cast(IpcIoPopInt32(req)); - scanForbidMode.forbidTime = IpcIoPopInt32(req); - scanForbidMode.forbidCount = IpcIoPopInt32(req); + (void)ReadInt32(req, &scanForbidMode.scanScene); + (void)ReadInt32(req, &tmpInt); + scanForbidMode.scanMode = static_cast(tmpInt); + (void)ReadInt32(req, &scanForbidMode.forbidTime); + (void)ReadInt32(req, &scanForbidMode.forbidCount); info.scanForbidList.push_back(scanForbidMode); } - int intervalSize = IpcIoPopInt32(req); + int intervalSize = 0; + (void)ReadInt32(req, &intervalSize); if (intervalSize > MAX_SIZE) { - IpcIoPushInt32(reply, 0); - IpcIoPushInt32(reply, WIFI_OPT_INVALID_PARAM); + (void)WriteInt32(reply, 0); + (void)WriteInt32(reply, WIFI_OPT_INVALID_PARAM); return WIFI_OPT_INVALID_PARAM; } for (int i = 0; i < intervalSize; i++) { ScanIntervalMode scanIntervalMode; - scanIntervalMode.scanScene = IpcIoPopInt32(req); - scanIntervalMode.scanMode = static_cast(IpcIoPopInt32(req)); - scanIntervalMode.isSingle = IpcIoPopBool(req); - scanIntervalMode.intervalMode = static_cast(IpcIoPopInt32(req)); - scanIntervalMode.interval = IpcIoPopInt32(req); - scanIntervalMode.count = IpcIoPopInt32(req); + (void)ReadInt32(req, &scanIntervalMode.scanScene); + (void)ReadInt32(req, &tmpInt); + scanIntervalMode.scanMode = static_cast(tmpInt); + (void)ReadBool(req, &scanIntervalMode.isSingle); + (void)ReadInt32(req, &tmpInt); + scanIntervalMode.intervalMode = static_cast(tmpInt); + (void)ReadInt32(req, &scanIntervalMode.interval); + (void)ReadInt32(req, &scanIntervalMode.count); info.scanIntervalList.push_back(scanIntervalMode); } ErrCode ret = SetScanControlInfo(info); - IpcIoPushInt32(reply, 0); - IpcIoPushInt32(reply, ret); + (void)WriteInt32(reply, 0); + (void)WriteInt32(reply, ret); return ret; } @@ -133,8 +141,8 @@ int WifiScanStub::OnScan(uint32_t code, IpcIo *req, IpcIo *reply) { WIFI_LOGD("WifiScanStub run %{public}s code %{public}u", __func__, code); ErrCode ret = Scan(); - IpcIoPushInt32(reply, 0); - IpcIoPushInt32(reply, ret); + (void)WriteInt32(reply, 0); + (void)WriteInt32(reply, ret); return ret; } @@ -145,23 +153,25 @@ int WifiScanStub::OnScanByParams(uint32_t code, IpcIo *req, IpcIo *reply) size_t readLen; constexpr int MAX_FREQS_SIZE = 512; WifiScanParams params; - params.ssid = (char *)IpcIoPopString(req, &readLen); - params.bssid = (char *)IpcIoPopString(req, &readLen); - int size = IpcIoPopInt32(req); + params.ssid = (char *)ReadString(req, &readLen); + params.bssid = (char *)ReadString(req, &readLen); + int size = 0; + (void)ReadInt32(req, &size); if (size > MAX_FREQS_SIZE) { - IpcIoPushInt32(reply, 0); - IpcIoPushInt32(reply, WIFI_OPT_INVALID_PARAM); + (void)WriteInt32(reply, 0); + (void)WriteInt32(reply, WIFI_OPT_INVALID_PARAM); return WIFI_OPT_INVALID_PARAM; } + int tmp; for (int i = 0; i < size; i++) { - int tmp = IpcIoPopInt32(req); + (void)ReadInt32(req, &tmp); params.freqs.push_back(tmp); } - params.band = IpcIoPopInt32(req); + (void)ReadUint32(req, ¶ms.band); ErrCode ret = AdvanceScan(params); - IpcIoPushInt32(reply, 0); - IpcIoPushInt32(reply, ret); + (void)WriteInt32(reply, 0); + (void)WriteInt32(reply, ret); return ret; } @@ -171,10 +181,10 @@ int WifiScanStub::OnIsWifiClosedScan(uint32_t code, IpcIo *req, IpcIo *reply) WIFI_LOGD("WifiScanStub run %{public}s code %{public}u", __func__, code); bool bOpen = false; ErrCode ret = IsWifiClosedScan(bOpen); - IpcIoPushInt32(reply, 0); - IpcIoPushInt32(reply, ret); + (void)WriteInt32(reply, 0); + (void)WriteInt32(reply, ret); if (ret == WIFI_OPT_SUCCESS) { - IpcIoPushBool(reply, bOpen); + (void)WriteBool(reply, bOpen); } return ret; } @@ -184,33 +194,33 @@ int WifiScanStub::OnGetScanInfoList(uint32_t code, IpcIo *req, IpcIo *reply) WIFI_LOGD("WifiScanStub run %{public}s code %{public}u", __func__, code); std::vector result; ErrCode ret = GetScanInfoList(result); - IpcIoPushInt32(reply, 0); - IpcIoPushInt32(reply, ret); + (void)WriteInt32(reply, 0); + (void)WriteInt32(reply, ret); if (ret != WIFI_OPT_SUCCESS) { return ret; } unsigned int size = result.size(); - IpcIoPushInt32(reply, size); + (void)WriteInt32(reply, size); for (unsigned int i = 0; i < size; ++i) { - IpcIoPushString(reply, result[i].bssid.c_str()); - IpcIoPushString(reply, result[i].ssid.c_str()); - IpcIoPushString(reply, result[i].capabilities.c_str()); - IpcIoPushInt32(reply, result[i].frequency); - IpcIoPushInt32(reply, result[i].rssi); - IpcIoPushInt64(reply, result[i].timestamp); - IpcIoPushInt32(reply, result[i].band); - IpcIoPushInt32(reply, static_cast(result[i].securityType)); - IpcIoPushInt32(reply, static_cast(result[i].channelWidth)); - IpcIoPushInt32(reply, result[i].centerFrequency0); - IpcIoPushInt32(reply, result[i].centerFrequency1); - IpcIoPushInt64(reply, result[i].features); - IpcIoPushInt32(reply, result[i].infoElems.size()); + (void)WriteString(reply, result[i].bssid.c_str()); + (void)WriteString(reply, result[i].ssid.c_str()); + (void)WriteString(reply, result[i].capabilities.c_str()); + (void)WriteInt32(reply, result[i].frequency); + (void)WriteInt32(reply, result[i].rssi); + (void)WriteUint64(reply, result[i].timestamp); + (void)WriteInt32(reply, result[i].band); + (void)WriteInt32(reply, static_cast(result[i].securityType)); + (void)WriteInt32(reply, static_cast(result[i].channelWidth)); + (void)WriteInt32(reply, result[i].centerFrequency0); + (void)WriteInt32(reply, result[i].centerFrequency1); + (void)WriteUint64(reply, result[i].features); + (void)WriteInt32(reply, result[i].infoElems.size()); for (unsigned int m = 0; m < result[i].infoElems.size(); ++m) { - IpcIoPushInt32(reply, result[i].infoElems[m].id); - IpcIoPushInt32(reply, result[i].infoElems[m].content.size()); + (void)WriteUint32(reply, result[i].infoElems[m].id); + (void)WriteInt32(reply, result[i].infoElems[m].content.size()); for (unsigned int n = 0; n < result[i].infoElems[m].content.size(); ++n) { - IpcIoPushInt8(reply, result[i].infoElems[m].content[n]); + (void)WriteInt8(reply, result[i].infoElems[m].content[n]); } } } @@ -221,23 +231,21 @@ int WifiScanStub::OnRegisterCallBack(uint32_t code, IpcIo *req, IpcIo *reply) { WIFI_LOGD("run %{public}s code %{public}u", __func__, code); ErrCode ret = WIFI_OPT_FAILED; - SvcIdentity *sid = IpcIoPopSvc(req); - if (sid == nullptr) { - WIFI_LOGE("sid is null"); - IpcIoPushInt32(reply, 0); - IpcIoPushInt32(reply, ret); + SvcIdentity sid; + bool readSid = ReadRemoteObject(req, &sid); + if (!readSid) { + WIFI_LOGE("read SvcIdentity failed"); + (void)WriteInt32(reply, 0); + (void)WriteInt32(reply, ret); return ret; } -#ifdef __LINUX__ - BinderAcquire(sid->ipcContext, sid->handle); -#endif - callback_ = std::make_shared(sid); + callback_ = std::make_shared(&sid); WIFI_LOGD("create new WifiScanCallbackProxy!"); ret = RegisterCallBack(callback_); - IpcIoPushInt32(reply, 0); - IpcIoPushInt32(reply, ret); + (void)WriteInt32(reply, 0); + (void)WriteInt32(reply, ret); return 0; } @@ -246,11 +254,11 @@ int WifiScanStub::OnGetSupportedFeatures(uint32_t code, IpcIo *req, IpcIo *reply WIFI_LOGD("WifiScanStub run %{public}s code %{public}u", __func__, code); long features = 0; int ret = GetSupportedFeatures(features); - IpcIoPushInt32(reply, 0); - IpcIoPushInt32(reply, ret); + (void)WriteInt32(reply, 0); + (void)WriteInt32(reply, ret); if (ret == WIFI_OPT_SUCCESS) { - IpcIoPushInt64(reply, features); + (void)WriteUint64(reply, features); } return ret; -- Gitee From 65a66a06e0f5e1be7bbae400b3129d8bd159659f Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Sun, 5 Jun 2022 22:16:01 +0800 Subject: [PATCH 156/491] bugfix from master 0605 Signed-off-by: yanxiaotao --- .../wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c index e2309b5..79abce5 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c @@ -737,6 +737,13 @@ static int DelScanInfoLine(ScanInfo *pcmd, char *srcBuf, int length) break; } start = end + 1; + char *res = strchr(srcBuf + start, '\t'); + if (res == NULL) { + /* after ssid, maybe some IEs are reported */ + LOGW("more IEs are reported, skip it for not support."); + } else { + *res = '\0'; + } if (strcpy_s(pcmd->ssid, sizeof(pcmd->ssid), srcBuf + start) != EOK) { fail = 1; break; -- Gitee From 8844cd8f5df11be4af1eef3be0d874f2bd1199e6 Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Mon, 6 Jun 2022 02:37:19 +0000 Subject: [PATCH 157/491] fix CSA code check issue Signed-off-by: zhangfeng Change-Id: If3369d2a1c5d687be6acd2b7d474baeafb237ee8 --- .../native/c_adapter/src/wifi_c_p2p.cpp | 20 +++++++++++++------ .../wifi_hal/wifi_hal_chip_interface.c | 13 ++---------- .../wifi_hal/wifi_hal_crpc_chip.c | 2 +- .../wpa_sta_hal/wifi_supplicant_hal.c | 10 +++++----- 4 files changed, 22 insertions(+), 23 deletions(-) diff --git a/wifi/frameworks/native/c_adapter/src/wifi_c_p2p.cpp b/wifi/frameworks/native/c_adapter/src/wifi_c_p2p.cpp index c244911..3ff90cb 100644 --- a/wifi/frameworks/native/c_adapter/src/wifi_c_p2p.cpp +++ b/wifi/frameworks/native/c_adapter/src/wifi_c_p2p.cpp @@ -174,6 +174,10 @@ WifiErrorCode P2pCancelConnect() static OHOS::Wifi::ErrCode ConvertP2PDeviceCppToC(const OHOS::Wifi::WifiP2pDevice& cppDevice, WifiP2pDevice* p2pDevice) { + if (p2pDevice == nullptr) { + WIFI_LOGE("p2pDevice is nullptr"); + return OHOS::Wifi::WIFI_OPT_FAILED; + } if (memcpy_s(p2pDevice->deviceName, P2P_NAME_LENGTH, cppDevice.GetDeviceName().c_str(), cppDevice.GetDeviceName().size() + 1) != EOK) { WIFI_LOGE("memcpy_s device name failed!"); @@ -343,14 +347,18 @@ public: WIFI_LOGI("received peers changed event: %{public}d", (int)devices.size()); WifiP2pDevice *devicePtr = nullptr; if (!devices.empty()) { - devicePtr = new WifiP2pDevice[(int)devices.size()]; - } - WifiP2pDevice *p = devicePtr; - for (auto& each : devices) { - if (ConvertP2PDeviceCppToC(each, p++) != OHOS::Wifi::WIFI_OPT_SUCCESS) { - WIFI_LOGE("peers changed convert p2p device failed!"); + devicePtr = new (std::nothrow) WifiP2pDevice[(int)devices.size()]; + if (devicePtr == nullptr) { + WIFI_LOGE("new WifiP2pDevice failed!"); return; } + WifiP2pDevice *p = devicePtr; + for (auto& each : devices) { + if (ConvertP2PDeviceCppToC(each, p++) != OHOS::Wifi::WIFI_OPT_SUCCESS) { + WIFI_LOGE("peers changed convert p2p device failed!"); + return; + } + } } if (peersChangeCb != nullptr) { peersChangeCb(devicePtr, (int)devices.size()); diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_chip_interface.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_chip_interface.c index 9cb0696..4bc8f56 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_chip_interface.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_chip_interface.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -71,16 +71,7 @@ WifiErrorNo GetIface(const char *ifname, WifiIface *iface) return WIFI_HAL_FAILED; } LOGD("GetIface() ifname: %{public}s", ifname); - - WifiIface tmpIface; - tmpIface.index = 0; /* fixed compile error, -Werror,-Wunused-parameter */ - tmpIface.type = 0; - tmpIface.name[0] = '\0'; - if (strcpy_s(tmpIface.macAddr, sizeof(tmpIface.macAddr), "00:00:00:00:00:00") != EOK) { - return WIFI_HAL_FAILED; - } - - iface = &tmpIface; + /* Currently not supported */ return WIFI_HAL_SUCCESS; } diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_chip.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_chip.c index ad52b42..ed544e4 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_chip.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_chip.c @@ -52,7 +52,7 @@ int RpcGetWifiChipIds(RpcServer *server, Context *context) if (maxSize <= 0) { return HAL_FAILURE; } - uint8_t *chipIds = (uint8_t *)calloc(maxSize, sizeof(int)); + uint8_t *chipIds = (uint8_t *)calloc(maxSize * sizeof(int), sizeof(uint8_t)); if (chipIds == NULL) { return HAL_FAILURE; } diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c index e2309b5..1d649ab 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c @@ -569,8 +569,8 @@ static int WpaCliCmdListNetworks(WifiWpaStaInterface *this, WifiNetworkInfo *pcm return -1; } char *savedPtr = NULL; - char *token = strtok_r(buf, "\n", &savedPtr); /* skip first line */ - token = strtok_r(NULL, "\n", &savedPtr); + strtok_r(buf, "\n", &savedPtr); /* skip first line */ + char *token = strtok_r(NULL, "\n", &savedPtr); int j = 0; while (token != NULL) { @@ -776,8 +776,8 @@ static int WpaCliCmdScanInfo(WifiWpaStaInterface *this, ScanInfo *pcmd, int *siz return -1; } char *savedPtr = NULL; - char *token = strtok_r(buf, "\n", &savedPtr); /* skip first line */ - token = strtok_r(NULL, "\n", &savedPtr); + strtok_r(buf, "\n", &savedPtr); /* skip first line */ + char *token = strtok_r(NULL, "\n", &savedPtr); int j = 0; while (token != NULL) { if (j >= *size) { @@ -836,7 +836,7 @@ static int WpaCliCmdGetSignalInfo(WifiWpaStaInterface *this, WpaSignalInfo *info token = strtok_r(NULL, "\n", &savedPtr); info->frequency = atoi(token); } else { - token = strtok_r(NULL, "\n", &savedPtr); + strtok_r(NULL, "\n", &savedPtr); } token = strtok_r(NULL, "=", &savedPtr); } -- Gitee From df4f665fb353c27b1a53c6b419e747244136b553 Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Mon, 6 Jun 2022 04:40:46 +0000 Subject: [PATCH 158/491] Sta interface adaptation Signed-off-by: zhangfeng Change-Id: I65e6764c8a0da9bb28e578765b381e828fd30708 --- wifi/frameworks/js/napi/inc/wifi_napi_utils.h | 1 + .../js/napi/src/wifi_napi_device.cpp | 52 ++++++++++++++----- .../js/napi/src/wifi_napi_hotspot.cpp | 4 +- 3 files changed, 42 insertions(+), 15 deletions(-) diff --git a/wifi/frameworks/js/napi/inc/wifi_napi_utils.h b/wifi/frameworks/js/napi/inc/wifi_napi_utils.h index 2c19d2d..5a2a521 100644 --- a/wifi/frameworks/js/napi/inc/wifi_napi_utils.h +++ b/wifi/frameworks/js/napi/inc/wifi_napi_utils.h @@ -23,6 +23,7 @@ namespace OHOS { namespace Wifi { +static constexpr int NAPI_MAX_STR_LENT = 128; class TraceFuncCall final { public: TraceFuncCall(std::string funcName); diff --git a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp index 800203d..e36bb5a 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp @@ -229,9 +229,9 @@ napi_value ConfigStaticIp(const napi_env& env, const napi_value& object, WifiDev static void JsObjToDeviceConfig(const napi_env& env, const napi_value& object, WifiDeviceConfig& cppConfig) { - JsObjectToString(env, object, "ssid", 33, cppConfig.ssid); /* 33: ssid max length is 32 + '\0' */ - JsObjectToString(env, object, "bssid", 18, cppConfig.bssid); /* 18: max bssid length for string type */ - JsObjectToString(env, object, "preSharedKey", 256, cppConfig.preSharedKey); /* 256: max length */ + JsObjectToString(env, object, "ssid", NAPI_MAX_STR_LENT, cppConfig.ssid); /* ssid max length is 32 + '\0' */ + JsObjectToString(env, object, "bssid", NAPI_MAX_STR_LENT, cppConfig.bssid); /* max bssid length: 18 */ + JsObjectToString(env, object, "preSharedKey", NAPI_MAX_STR_LENT, cppConfig.preSharedKey); JsObjectToBool(env, object, "isHiddenSsid", cppConfig.hiddenSSID); int type = static_cast(SecTypeJs::SEC_TYPE_INVALID); JsObjectToInt(env, object, "securityType", type); @@ -333,15 +333,16 @@ napi_value AddUntrustedConfig(napi_env env, napi_callback_info info) asyncContext->executeFunc = [&](void* data) -> void { AddDeviceConfigContext *context = static_cast(data); TRACE_FUNC_CALL_NAME("wifiDevicePtr->AddUntrustedConfig"); - /* This interface is not supported currently */ - context->addResult = -1; - context->errorCode = WIFI_OPT_NOT_SUPPORTED; + ErrCode ret = wifiDevicePtr->AddDeviceConfig(*context->config, context->addResult); + if (context->addResult < 0 || ret != WIFI_OPT_SUCCESS) { + context->addResult = -1; + } + context->errorCode = ret; }; asyncContext->completeFunc = [&](void* data) -> void { AddDeviceConfigContext *context = static_cast(data); - /* This interface is not supported currently */ - napi_get_boolean(context->env, false, &context->result); + napi_get_boolean(context->env, (context->addResult > 0), &context->result); if (context->config != nullptr) { delete context->config; context->config = nullptr; @@ -353,6 +354,21 @@ napi_value AddUntrustedConfig(napi_env env, napi_callback_info info) return DoAsyncWork(env, asyncContext, argc, argv, nonCallbackArgNum); } +static int GetDeviceConfigId(WifiDeviceConfig *config) +{ + std::vector vecConfigs; + ErrCode ret = wifiDevicePtr->GetDeviceConfigs(vecConfigs); + if (ret != WIFI_OPT_SUCCESS) { + return INVALID_NETWORK_ID; + } + for (auto& each : vecConfigs) { + if (each.ssid == config->ssid) { + return each.networkId; + } + } + return INVALID_NETWORK_ID; +} + napi_value RemoveUntrustedConfig(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; @@ -382,16 +398,26 @@ napi_value RemoveUntrustedConfig(napi_env env, napi_callback_info info) asyncContext->executeFunc = [&](void* data) -> void { AddDeviceConfigContext *context = static_cast(data); + if (context->config == nullptr) { + return; + } TRACE_FUNC_CALL_NAME("wifiDevicePtr->RemoveUntrustedConfig"); - /* This interface is not supported currently */ - context->addResult = -1; - context->errorCode = WIFI_OPT_NOT_SUPPORTED; + int networkId = context->config->networkId; + if (networkId < 0) { + networkId = GetDeviceConfigId(context->config); + } + if (networkId < 0) { + WIFI_LOGE("RemoveUntrustedConfig parameter is invalid."); + context->errorCode = WIFI_OPT_INVALID_PARAM; + return; + } + WIFI_LOGI("RemoveUntrustedConfig: %{public}d", networkId); + context->errorCode = wifiDevicePtr->RemoveDevice(networkId); }; asyncContext->completeFunc = [&](void* data) -> void { AddDeviceConfigContext *context = static_cast(data); - /* This interface is not supported currently */ - napi_get_boolean(context->env, false, &context->result); + napi_get_boolean(context->env, context->errorCode == WIFI_OPT_SUCCESS, &context->result); if (context->config != nullptr) { delete context->config; context->config = nullptr; diff --git a/wifi/frameworks/js/napi/src/wifi_napi_hotspot.cpp b/wifi/frameworks/js/napi/src/wifi_napi_hotspot.cpp index ddfb4a5..997249c 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_hotspot.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_hotspot.cpp @@ -98,7 +98,7 @@ static bool GetHotspotconfigFromJs(const napi_env& env, const napi_value& object { std::string str = ""; int value = 0; - JsObjectToString(env, object, "ssid", 33, str); // 33: ssid max length is 32 + '\0' + JsObjectToString(env, object, "ssid", NAPI_MAX_STR_LENT, str); // 33: ssid max length is 32 + '\0' config.SetSsid(str); str = ""; JsObjectToInt(env, object, "securityType", value); @@ -114,7 +114,7 @@ static bool GetHotspotconfigFromJs(const napi_env& env, const napi_value& object config.SetChannel(AP_CHANNEL_5G_DEFAULT); } value = 0; - JsObjectToString(env, object, "preSharedKey", 64, str); // 64: max length + JsObjectToString(env, object, "preSharedKey", NAPI_MAX_STR_LENT, str); // 64: max length config.SetPreSharedKey(str); JsObjectToInt(env, object, "maxConn", value); config.SetMaxConn(value); -- Gitee From 4b381fece595c947427d4a530490637d390b5fc7 Mon Sep 17 00:00:00 2001 From: shiqichang Date: Mon, 6 Jun 2022 14:32:27 +0800 Subject: [PATCH 159/491] aafwk directory switching Signed-off-by: shiqichang Change-Id: I159aa5dfb86377347ac852d9a33302796772668c --- wifi/wifi_lite.gni | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/wifi_lite.gni b/wifi/wifi_lite.gni index 526a069..67a2f53 100644 --- a/wifi/wifi_lite.gni +++ b/wifi/wifi_lite.gni @@ -12,7 +12,7 @@ # limitations under the License. aaservices_path = "//foundation/ability/ability_runtime/services" -aainnerkits_path = "//foundation/ability/ability_runtime/interfaces/innerkits" +aainnerkits_path = "//foundation/ability/ability_runtime/interfaces/inner_api" SUBSYSTEM_DIR = "//foundation/communication" WIFI_ROOT_DIR = "$SUBSYSTEM_DIR/wifi/wifi" -- Gitee From 1db1e51a1cb6669153e11b5561933bc34851bb93 Mon Sep 17 00:00:00 2001 From: y00316381 Date: Mon, 6 Jun 2022 16:34:10 +0800 Subject: [PATCH 160/491] bugfix from master 0606 Signed-off-by: y00316381 --- .../wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c index 79abce5..090bc54 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c @@ -33,7 +33,7 @@ #define SCAN_INFO_THREE 3 #define FAIL_PBC_OVERLAP_RETUEN 3 #define CMD_BUFFER_SIZE 1024 -#define REPLY_BUF_LENGTH 4096 +#define REPLY_BUF_LENGTH (4096 * 10) #define REPLY_BUF_SMALL_LENGTH 64 #define CMD_FREQ_MAX_LEN 8 -- Gitee From 1395c982e1f7deb42d63a967c61ea15ee07c0e98 Mon Sep 17 00:00:00 2001 From: zhangfeng Date: Mon, 6 Jun 2022 09:58:50 +0000 Subject: [PATCH 161/491] Interface implementation optimize Signed-off-by: zhangfeng --- wifi/frameworks/js/napi/src/wifi_napi_device.cpp | 2 +- wifi/frameworks/js/napi/src/wifi_napi_utils.cpp | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp index e36bb5a..fad7159 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp @@ -342,7 +342,7 @@ napi_value AddUntrustedConfig(napi_env env, napi_callback_info info) asyncContext->completeFunc = [&](void* data) -> void { AddDeviceConfigContext *context = static_cast(data); - napi_get_boolean(context->env, (context->addResult > 0), &context->result); + napi_get_boolean(context->env, (context->addResult >= 0), &context->result); if (context->config != nullptr) { delete context->config; context->config = nullptr; diff --git a/wifi/frameworks/js/napi/src/wifi_napi_utils.cpp b/wifi/frameworks/js/napi/src/wifi_napi_utils.cpp index 802c756..6755d81 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_utils.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_utils.cpp @@ -251,9 +251,8 @@ static napi_value DoCallBackAsyncWork(const napi_env& env, AsyncContext *asyncCo return; } AsyncContext *context = (AsyncContext *)data; - napi_value undefine; + napi_value undefine, callback; napi_get_undefined(env, &undefine); - napi_value callback; context->completeFunc(data); constexpr int ARGS_TWO = 2; napi_value result[ARGS_TWO] = {nullptr}; @@ -263,12 +262,13 @@ static napi_value DoCallBackAsyncWork(const napi_env& env, AsyncContext *asyncCo napi_get_reference_value(env, context->callback[0], &callback); napi_call_function(env, nullptr, callback, ARGS_TWO, result, &undefine); } else { - if (context->callback[1]) { - napi_get_reference_value(env, context->callback[1], &callback); - napi_call_function(env, nullptr, callback, ARGS_TWO, result, &undefine); - } else { + napi_ref errCb = context->callback[1]; + if (!errCb) { WIFI_LOGE("Get callback func[1] is null"); + errCb = context->callback[0]; } + napi_get_reference_value(env, errCb, &callback); + napi_call_function(env, nullptr, callback, ARGS_TWO, result, &undefine); } if (context->callback[0] != nullptr) { napi_delete_reference(env, context->callback[0]); -- Gitee From 9b86f709cc5055f23a2f0df057fdfa2ce0c9c48c Mon Sep 17 00:00:00 2001 From: lixiangzhi007 Date: Thu, 9 Jun 2022 00:18:07 -0700 Subject: [PATCH 162/491] Modify README Signed-off-by: lixiangzhi007 --- README_zh.md | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) mode change 100644 => 100755 README_zh.md diff --git a/README_zh.md b/README_zh.md old mode 100644 new mode 100755 index 5c984a2..bf2c8e5 --- a/README_zh.md +++ b/README_zh.md @@ -110,7 +110,7 @@ WLAN基础功能由@ohos.wifi类提供，其接口\(JS接口\)说明如下。

function connectToDevice(config: WifiDeviceConfig): boolean

连接到WLAN网络。

+

通过配置信息连接到WLAN网络。

NA