openharmony/communication_wifi
1
0
Fork 0
mirror of https://gitee.com/openharmony/communication_wifi.git synced 2024-12-26 08:56:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

inner api

Browse Source 
Signed-off-by: zsc <zhangshaocheng2@huawei.com>
Change-Id: I70c4544deb46c57a0ab7b3b0a3a43b7d2c223272
This commit is contained in:
zsc 2023-05-09 15:26:50 +08:00
parent 9cb3ac0b4e
commit 6a917b2d54
47 changed files with 130 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
wifi/bundle.json
View File

@ -92,28 +92,15 @@
"//foundation/communication/wifi/wifi/services/wifi_standard/wifi_hal:wifi_hal"
]
},
"inner_kits": [
"inner_api": [
{
"header" : {
"header_base": "//foundation/communication/wifi/wifi/interfaces/kits/c",
"header_base": "//foundation/communication/wifi/wifi/interfaces/",
"header_files": [
"wifi_device.h",
"wifi_hotspot.h",
"wifi_p2p.h",
"wifi_hid2d.h"
]
},
"name" : "//foundation/communication/wifi/wifi/frameworks/native:wifi_sdk"
},
{
"header" : {
"header_base": "//foundation/communication/wifi/wifi/frameworks/native/include",
"header_files": [
"wifi_device.h",
"wifi_hotspot.h",
"wifi_p2p.h",
"wifi_scan.h",
"wifi_hid2d.h"
"kits/c/wifi_device.h",
"kits/c/wifi_hotspot.h",
"kits/c/wifi_p2p.h",
"kits/c/wifi_hid2d.h"
]
},
"name" : "//foundation/communication/wifi/wifi/frameworks/native:wifi_sdk"

50
wifi/frameworks/js/napi/BUILD.gn
View File

@ -46,18 +46,16 @@ ohos_shared_library("wifi") {
"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",
]
deps = [ "$WIFI_ROOT_DIR/frameworks/native:wifi_sdk" ]
external_deps = [
"ability_runtime:app_context",
"access_token:libaccesstoken_sdk",
"bundle_framework:appexecfwk_base",
"c_utils:utils",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
"napi:ace_napi",
"samgr:samgr_proxy",
]
@ -92,16 +90,14 @@ ohos_shared_library("wifiext") {
"src/wifi_napi_errcode.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",
]
deps = [ "$WIFI_ROOT_DIR/frameworks/native:wifi_sdk" ]
external_deps = [
"ability_runtime:app_context",
"bundle_framework:appexecfwk_base",
"c_utils:utils",
"hiviewdfx_hilog_native:libhilog",
"napi:ace_napi",
]
if (wifi_feature_with_ap_extension) {
@ -145,20 +141,18 @@ ohos_shared_library("wifi_native_js") {
"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",
]
deps = [ "$WIFI_ROOT_DIR/frameworks/native:wifi_sdk" ]
defines = [ "ENABLE_NAPI_COMPATIBLE" ]
external_deps = [
"ability_runtime:app_context",
"access_token:libaccesstoken_sdk",
"bundle_framework:appexecfwk_base",
"c_utils:utils",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
"napi:ace_napi",
"samgr:samgr_proxy",
]
@ -198,18 +192,16 @@ ohos_shared_library("wifimanager") {
"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",
]
deps = [ "$WIFI_ROOT_DIR/frameworks/native:wifi_sdk" ]
defines = [ "ENABLE_NAPI_WIFI_MANAGER" ]
external_deps = [
"ability_runtime:app_context",
"access_token:libaccesstoken_sdk",
"bundle_framework:appexecfwk_base",
"c_utils:utils",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
"napi:ace_napi",
"samgr:samgr_proxy",
]
relative_install_dir = "module"
@ -243,19 +235,17 @@ ohos_shared_library("wifimanagerext") {
"src/wifi_napi_errcode.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",
]
deps = [ "$WIFI_ROOT_DIR/frameworks/native:wifi_sdk" ]
defines = [ "ENABLE_NAPI_WIFI_MANAGER" ]
if (wifi_feature_with_ap_extension) {
defines += [ "FEATURE_AP_EXTENSION" ]
}
external_deps = [
"ability_runtime:app_context",
"bundle_framework:appexecfwk_base",
"c_utils:utils",
"hiviewdfx_hilog_native:libhilog",
"napi:ace_napi",
]
relative_install_dir = "module"

26
wifi/frameworks/native/BUILD.gn
View File

@ -88,13 +88,19 @@ if (defined(ohos_lite)) {
"$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/wifi_toolkit/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",
]
}
config("wifi_exported_header_files") {
visibility = [ ":*" ]
include_dirs = [
"$WIFI_ROOT_DIR/interfaces/kits/c",
"$WIFI_ROOT_DIR/interfaces/inner_api",
]
}
config("wifi_sdk_config") {
visibility = [ ":*" ]
include_dirs = [ ":wifi_fw_common_header" ]
@ -122,7 +128,7 @@ if (defined(ohos_lite)) {
":wifi_sdk_header",
]
external_deps = [ "ipc:ipc_core" ]
external_deps = [ "ipc:ipc_single" ]
}
ohos_source_set("wifi_hotspot_proxy_impl") {
@ -138,7 +144,7 @@ if (defined(ohos_lite)) {
":wifi_sdk_header",
]
external_deps = [ "ipc:ipc_core" ]
external_deps = [ "ipc:ipc_single" ]
}
ohos_source_set("wifi_scan_proxy_impl") {
@ -153,7 +159,7 @@ if (defined(ohos_lite)) {
":wifi_sdk_header",
]
external_deps = [ "ipc:ipc_core" ]
external_deps = [ "ipc:ipc_single" ]
}
ohos_source_set("wifi_p2p_proxy_impl") {
@ -168,7 +174,7 @@ if (defined(ohos_lite)) {
":wifi_sdk_header",
]
external_deps = [ "ipc:ipc_core" ]
external_deps = [ "ipc:ipc_single" ]
}
ohos_shared_library("wifi_sdk") {
@ -206,14 +212,14 @@ if (defined(ohos_lite)) {
":wifi_p2p_proxy_impl",
":wifi_scan_proxy_impl",
"$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_shared",
]
external_deps = [
"c_utils:utils",
"ipc:ipc_core",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_single",
"samgr:samgr_proxy",
]
defines = [ "AP_INSTANCE_MAX_NUM=$wifi_feature_with_ap_num" ]
@ -235,5 +241,7 @@ if (defined(ohos_lite)) {
part_name = "wifi"
subsystem_name = "communication"
public_configs = [ ":wifi_exported_header_files" ]
innerapi_tags = [ "platformsdk" ]
}
}

1
wifi/services/wifi_standard/ipc_framework/cRPC/src/client.c
View File

@ -165,6 +165,7 @@ RpcClient *CreateRpcClient(const char *path)
pthread_cond_init(&client->lockCond, NULL);
int ret = pthread_create(&client->threadId, NULL, RpcClientThreadDeal, client);
if (ret) {
pthread_setname_np(client->threadId, "RpcClientThread");
pthread_cond_destroy(&client->condW);
pthread_mutex_destroy(&client->mutex);
pthread_cond_destroy(&client->lockCond);

39
wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn
View File

@ -171,9 +171,6 @@ 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",
"$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",
"$WIFI_ROOT_DIR/utils/inc",
"//foundation/appexecfwk/adapter/interfaces/innerkits/appexecfwk_base/include",
"//base/notification/common_event_service/interfaces/inner_api",
@ -215,16 +212,15 @@ if (defined(ohos_lite)) {
":wifi_manager_service_header",
]
deps = [
"//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
"//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk:system_ability_fwk",
]
deps = []
external_deps = [
"ability_base:want",
"c_utils:utils",
"hiviewdfx_hilog_native:libhilog",
"huks:libhukssdk",
"ipc:ipc_core",
"ipc:ipc_single",
"safwk:system_ability_fwk",
]
}
ohos_source_set("wifi_device_service_impl") {
@ -248,9 +244,6 @@ 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",
"//base/notification/common_event_service/frameworks/native:cesfwk_innerkits",
"//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk:system_ability_fwk",
]
if (wifi_feature_with_p2p) {
@ -268,8 +261,10 @@ if (defined(ohos_lite)) {
"c_utils:utils",
"common_event_service:cesfwk_innerkits",
"hicollie_native:libhicollie",
"hiviewdfx_hilog_native:libhilog",
"huks:libhukssdk",
"ipc:ipc_core",
"ipc:ipc_single",
"safwk:system_ability_fwk",
]
}
ohos_source_set("wifi_hotspot_service_impl") {
@ -290,15 +285,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",
]
external_deps = [
"ability_base:want",
"c_utils:utils",
"hiviewdfx_hilog_native:libhilog",
"huks:libhukssdk",
"ipc:ipc_core",
"ipc:ipc_single",
"safwk:system_ability_fwk",
]
defines = [
@ -328,16 +323,16 @@ 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",
]
external_deps = [
"ability_base:want",
"c_utils:utils",
"hiviewdfx_hilog_native:libhilog",
"huks:libhukssdk",
"ipc:ipc_core",
"ipc:ipc_single",
"netmanager_base:net_conn_manager_if",
"safwk:system_ability_fwk",
]
defines = [ "FEATURE_P2P_SUPPORT" ]
}
@ -365,10 +360,7 @@ if (defined(ohos_lite)) {
"$WIFI_ROOT_DIR/services/wifi_standard/etc/init:etc",
"$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",
"//base/notification/common_event_service/frameworks/native:cesfwk_innerkits",
"//foundation/communication/netmanager_base/services/netmanagernative:netsys_native_manager",
"//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk:system_ability_fwk",
]
configs = [ ":wifi_manager_service_header" ]
@ -379,9 +371,12 @@ if (defined(ohos_lite)) {
"access_token:libtokenid_sdk",
"bundle_framework:appexecfwk_base",
"c_utils:utils",
"common_event_service:cesfwk_innerkits",
"hiviewdfx_hilog_native:libhilog",
"huks:libhukssdk",
"ipc:ipc_core",
"ipc:ipc_single",
"netmanager_base:net_conn_manager_if",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
]
if (wifi_feature_with_encryption) {

1
wifi/services/wifi_standard/wifi_framework/wifi_manage/common/handler.cpp
View File

@ -51,6 +51,7 @@ bool Handler::InitialHandler()
return false;
}
LOGI("pthread_create ret: %{public}d\n", ret);
pthread_setname_np(handleThread, "RunHandleThread");
return true;
}

3
wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn
View File

@ -56,9 +56,6 @@ ohos_shared_library("wifi_ap_service") {
"$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/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",
"$WIFI_ROOT_DIR/services/wifi_standard/include",

1
wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher.cpp
View File

@ -105,6 +105,7 @@ int WifiInternalEventDispatcher::Init()
/* first init system notify service client here ! */
mBroadcastThread = std::thread(WifiInternalEventDispatcher::Run, std::ref(*this));
pthread_setname_np(mBroadcastThread.native_handle(), "InnerDisThread");
return 0;
}

1
wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher_lite.cpp
View File

@ -41,6 +41,7 @@ int WifiInternalEventDispatcher::Init()
/* first init system notify service client here ! */
mBroadcastThread = std::thread(WifiInternalEventDispatcher::Run, std::ref(*this));
pthread_setname_np(mBroadcastThread.native_handle(), "InnerDisThread");
return 0;
}

2
wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp
View File

@ -245,6 +245,7 @@ int WifiManager::Init()
return -1;
}
mCloseServiceThread = std::thread(WifiManager::DealCloseServiceMsg, std::ref(*this));
pthread_setname_np(mCloseServiceThread.native_handle(), "WifiCloseThread");
#ifndef OHOS_ARCH_LITE
if (screenEventSubscriber_ == nullptr) {
@ -276,6 +277,7 @@ int WifiManager::Init()
if (WifiConfigCenter::GetInstance().GetStaLastRunState()) { /* Automatic startup upon startup */
WIFI_LOGI("AutoStartServiceThread");
std::thread startStaSrvThread(WifiManager::AutoStartServiceThread);
pthread_setname_np(startStaSrvThread.native_handle(), "AutoStartThread");
startStaSrvThread.detach();
} else {
/**

4
wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_net_agent.cpp
View File

@ -198,6 +198,7 @@ void WifiNetAgent::OnStaMachineUpdateNetLinkInfo(const std::string &strIp, const
const std::string &strGateWay, const std::string &strDns, const std::string &strBakDns)
{
std::thread([ip = strIp, mask = strMask, gateWay = strGateWay, dns = strDns, bakDns = strBakDns, this]() {
pthread_setname_np(pthread_self(), "OnLinkInfoThread");
UpdateNetLinkInfo(ip, mask, gateWay, dns, bakDns);
}).detach();
}
@ -205,6 +206,7 @@ void WifiNetAgent::OnStaMachineUpdateNetLinkInfo(const std::string &strIp, const
void WifiNetAgent::OnStaMachineUpdateNetSupplierInfo(const sptr<NetManagerStandard::NetSupplierInfo> &netSupplierInfo)
{
std::thread([netInfo = netSupplierInfo, this]() {
pthread_setname_np(pthread_self(), "OnSuppThread");
UpdateNetSupplierInfo(netInfo);
}).detach();
}
@ -212,6 +214,7 @@ void WifiNetAgent::OnStaMachineUpdateNetSupplierInfo(const sptr<NetManagerStanda
void WifiNetAgent::OnStaMachineWifiStart(const StaServiceCallback &callback)
{
std::thread([cb = callback, this]() {
pthread_setname_np(pthread_self(), "OnStartThread");
RegisterNetSupplier();
RegisterNetSupplierCallback(cb);
}).detach();
@ -221,6 +224,7 @@ void WifiNetAgent::OnStaMachineNetManagerRestart(const sptr<NetManagerStandard::
const StaServiceCallback &callback)
{
std::thread([cb = callback, supplierInfo = netSupplierInfo, this]() {
pthread_setname_np(pthread_self(), "OnReStartThread");
RegisterNetSupplier();
RegisterNetSupplierCallback(cb);
WifiLinkedInfo linkedInfo;

5
wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/BUILD.gn
View File

@ -82,9 +82,6 @@ ohos_shared_library("wifi_p2p_service") {
"$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/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",
@ -110,12 +107,12 @@ ohos_shared_library("wifi_p2p_service") {
external_deps = [
"c_utils:utils",
"dhcp:dhcp_manager_service",
"hiviewdfx_hilog_native:libhilog",
"netmanager_base:net_conn_manager_if",
]
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_toolkit:wifi_toolkit",

2
wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp
View File

@ -123,7 +123,7 @@ void P2pStateMachine::Initialize()
SetFirstState(&p2pDisabledState);
StartStateMachine();
pDhcpService.reset(new (std::nothrow) DhcpService());
pDhcpService = DhcpServiceApi::GetInstance();
if (pDhcpService.get() == nullptr) {
WIFI_LOGW("pDhcpService Initialize failed.");
}

2
wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.h
View File

@ -21,7 +21,7 @@
#include "p2p_monitor.h"
#include "wifi_p2p_service_manager.h"
#include "i_dhcp_result_notify.h"
#include "dhcp_service.h"
#include "dhcp_service_api.h"
#include "dhcpd_interface.h"
#include "authorizing_negotiation_request_state.h"
#include "group_formed_state.h"

7
wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn
View File

@ -50,9 +50,6 @@ 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",
"$DHCP_ROOT_DIR/services/mgr_service/include",
"$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_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_common",
@ -120,7 +117,6 @@ if (defined(ohos_lite)) {
]
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",
@ -130,8 +126,9 @@ if (defined(ohos_lite)) {
external_deps = [
"c_utils:utils",
"dhcp:dhcp_manager_service",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
"ipc:ipc_single",
"netmanager_base:net_conn_manager_if",
"samgr:samgr_proxy",
]

1
wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check.cpp
View File

@ -172,6 +172,7 @@ ErrCode StaNetworkCheck::InitNetCheckThread()
WIFI_LOGE("In StaNetworkCheck start NetCheck thread failed!\n");
return ErrCode::WIFI_OPT_FAILED;
}
pthread_setname_np(pDealNetCheckThread->native_handle(), "NetCheckThread");
return ErrCode::WIFI_OPT_SUCCESS;
}

8
wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp
View File

@ -33,7 +33,7 @@
#endif // OHOS_ARCH_LITE
#ifndef OHOS_WIFI_STA_TEST
#include "dhcp_service.h"
#include "dhcp_service_api.h"
#else
#include "mock_dhcp_service.h"
#endif
@ -124,8 +124,12 @@ ErrCode StaStateMachine::InitStaStateMachine()
SetFirstState(pInitState);
StartStateMachine();
InitStaSMHandleMap();
#ifndef OHOS_WIFI_STA_TEST
pDhcpService = DhcpServiceApi::GetInstance().get();
#else
pDhcpService = new (std::nothrow) DhcpService();
#endif
if (pDhcpService == nullptr) {
WIFI_LOGE("pDhcpServer is null\n");
return WIFI_OPT_FAILED;

15
wifi/services/wifi_standard/wifi_framework/wifi_toolkit/BUILD.gn
View File

@ -51,9 +51,6 @@ local_base_include_dirs = [
"//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",
"$WIFI_ROOT_DIR/services/wifi_standard/include",
]
@ -100,11 +97,7 @@ if (defined(ohos_lite)) {
"//base/security/certificate_manager/interfaces/innerkits/cert_manager_standard/main/include",
]
deps = [
"$DHCP_ROOT_DIR/services/mgr_service:dhcp_manager_service",
"//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
"//base/security/certificate_manager/interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk",
]
deps = []
defines = [ "AP_INSTANCE_MAX_NUM=$wifi_feature_with_ap_num" ]
if (wifi_feature_with_encryption) {
@ -114,10 +107,16 @@ if (defined(ohos_lite)) {
external_deps = [
"ability_base:want",
"c_utils:utils",
"certificate_manager:cert_manager_sdk",
"common_event_service:cesfwk_innerkits",
"dhcp:dhcp_manager_service",
"eventhandler:libeventhandler",
"hiviewdfx_hilog_native:libhilog",
"huks:libhukssdk",
]
public_deps = [ "$DHCP_ROOT_DIR/services/mgr_service:dhcp_manager_service" ]
if (wifi_feature_with_encryption) {
external_deps += [ "huks:libhukssdk" ]
}

4
wifi/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/dhcpd_interface.cpp
View File

@ -17,7 +17,7 @@
#include <arpa/inet.h>
#include <netinet/in.h>
#include "dhcp_define.h"
#include "dhcp_service.h"
#include "dhcp_service_api.h"
#include "network_interface.h"
#include "wifi_global_func.h"
#include "wifi_logger.h"
@ -62,7 +62,7 @@ bool DhcpdInterface::SetDhcpEventFunc(const std::string &ifaceName, IDhcpResultN
bool DhcpdInterface::StartDhcpServer(const std::string &ifaceName, Ipv4Address &ipv4, Ipv6Address &ipv6, bool isIpV4)
{
if (mDhcpService == nullptr) {
mDhcpService = std::make_unique<DhcpService>();
mDhcpService = DhcpServiceApi::GetInstance();
if (mDhcpService == nullptr) {
return false;
}

1
wifi/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/http_request.cpp
View File

@ -351,6 +351,7 @@ int HttpRequest::GetIPFromUrl()
int iRlt = -1;
std::thread getHost = std::thread(&GetHostThread, pData);
pthread_setname_np(getHost.native_handle(), "GetHostThread");
getHost.detach();
bool bTimeOut = false;

1
wifi/services/wifi_standard/wifi_framework/wifi_toolkit/net_helper/if_config.cpp
View File

@ -70,6 +70,7 @@ bool IfConfig::AsyncExecuteCommand(const std::string& cmd)
{
std::thread t(
[cmd]() {
pthread_setname_np(pthread_self(), "ExecCmdThread");
FILE *fp = nullptr;
char buffer[RECEIVE_BUFFER_LEN];
if ((fp = popen(cmd.c_str(), "r")) != nullptr) {

5
wifi/services/wifi_standard/wifi_hal/BUILD.gn
View File

@ -115,7 +115,10 @@ if (defined(ohos_lite)) {
"//third_party/wpa_supplicant/wpa_supplicant-2.9_standard:wpa_client",
]
external_deps = [ "c_utils:utils" ]
external_deps = [
"c_utils:utils",
"hiviewdfx_hilog_native:libhilog"
]
defines = [
"AP_INTF=\"$wifi_feature_with_ap_intf\"",

1
wifi/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.c
View File

@ -261,6 +261,7 @@ static int HostapdCliConnect(int id)
LOGE("Create hostapd monitor thread failed!");
return -1;
}
pthread_setname_np(g_hostapdHalDevInfo[id].hostapdHalDev->tid, "HostapdCBThread");
return 0;
}

1
wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c
View File

@ -783,6 +783,7 @@ static int WpaCliConnect(WifiWpaInterface *p)
LOGE("Create monitor thread failed!");
return -1;
}
pthread_setname_np(p->tid, "WpaCBThread");
LOGI("Wpa connect finish.");
return 0;
}

1
wifi/services/wifi_standard/wifi_hal/wifi_hal_module_manage.c
View File

@ -145,6 +145,7 @@ int StartModuleInternal(const char *moduleName, const char *startCmd, pid_t *pPr
LOGE("Create wpa thread failed!");
return HAL_FAILURE;
}
pthread_setname_np(tid, "WpaMainThread");
pthread_join(tid, NULL);
exit(0);
} else {

2
wifi/test/fuzztest/frameworks/native/c_adapter/wificdevice_fuzzer/BUILD.gn Executable file → Normal file
View File

@ -41,7 +41,7 @@ ohos_fuzztest("WifiCDeviceFuzzTest") {
external_deps = [
"c_utils:utils",
"ipc:ipc_core",
"ipc:ipc_single",
]
part_name = "wifi"

2
wifi/test/fuzztest/frameworks/native/c_adapter/wifichid2d_fuzzer/BUILD.gn
View File

@ -41,7 +41,7 @@ ohos_fuzztest("WifiCHid2dFuzzTest") {
external_deps = [
"c_utils:utils",
"ipc:ipc_core",
"ipc:ipc_single",
]
part_name = "wifi"

2
wifi/test/fuzztest/frameworks/native/c_adapter/wifichotspot_fuzzer/BUILD.gn
View File

@ -41,7 +41,7 @@ ohos_fuzztest("WifiCHotSpotFuzzTest") {
external_deps = [
"c_utils:utils",
"ipc:ipc_core",
"ipc:ipc_single",
]
part_name = "wifi"

2
wifi/test/fuzztest/frameworks/native/c_adapter/wificp2p_fuzzer/BUILD.gn
View File

@ -42,7 +42,7 @@ ohos_fuzztest("WifiCP2PFuzzTest") {
external_deps = [
"c_utils:utils",
"ipc:ipc_core",
"ipc:ipc_single",
]
part_name = "wifi"

2
wifi/test/fuzztest/frameworks/native/src/wifip2pimpl_fuzzer/BUILD.gn
View File

@ -42,7 +42,7 @@ ohos_fuzztest("WifiP2pImplFuzzTest") {
external_deps = [
"c_utils:utils",
"ipc:ipc_core",
"ipc:ipc_single",
]
part_name = "wifi"

2
wifi/test/fuzztest/wifi_sta/adddeviceconfig_fuzzer/BUILD.gn
View File

@ -42,7 +42,7 @@ ohos_fuzztest("AddDeviceConfigFuzzTest") {
external_deps = [
"c_utils:utils",
"ipc:ipc_core",
"ipc:ipc_single",
]
part_name = "wifi"

2
wifi/test/fuzztest/wifi_sta/connecttodevice_fuzzer/BUILD.gn
View File

@ -42,7 +42,7 @@ ohos_fuzztest("ConnectToDeviceFuzzTest") {
external_deps = [
"c_utils:utils",
"ipc:ipc_core",
"ipc:ipc_single",
]
part_name = "wifi"

2
wifi/test/fuzztest/wifi_sta/disablewifi_fuzzer/BUILD.gn Executable file → Normal file
View File

@ -41,7 +41,7 @@ ohos_fuzztest("DisableWifiFuzzTest") {
external_deps = [
"c_utils:utils",
"ipc:ipc_core",
"ipc:ipc_single",
]
part_name = "wifi"

2
wifi/test/fuzztest/wifi_sta/disconnect_fuzzer/BUILD.gn Executable file → Normal file
View File

@ -41,7 +41,7 @@ ohos_fuzztest("DisconnectFuzzTest") {
external_deps = [
"c_utils:utils",
"ipc:ipc_core",
"ipc:ipc_single",
]
part_name = "wifi"

2
wifi/test/fuzztest/wifi_sta/enablewifi_fuzzer/BUILD.gn Executable file → Normal file
View File

@ -41,7 +41,7 @@ ohos_fuzztest("EnableWifiFuzzTest") {
external_deps = [
"c_utils:utils",
"ipc:ipc_core",
"ipc:ipc_single",
]
part_name = "wifi"

2
wifi/test/fuzztest/wifi_sta/isconnected_fuzzer/BUILD.gn Executable file → Normal file
View File

@ -41,7 +41,7 @@ ohos_fuzztest("IsConnectedFuzzTest") {
external_deps = [
"c_utils:utils",
"ipc:ipc_core",
"ipc:ipc_single",
]
part_name = "wifi"

2
wifi/test/fuzztest/wifi_sta/reassociate_fuzzer/BUILD.gn Executable file → Normal file
View File

@ -41,7 +41,7 @@ ohos_fuzztest("ReAssociateFuzzTest") {
external_deps = [
"c_utils:utils",
"ipc:ipc_core",
"ipc:ipc_single",
]
part_name = "wifi"

2
wifi/test/fuzztest/wifi_sta/reconnect_fuzzer/BUILD.gn Executable file → Normal file
View File

@ -41,7 +41,7 @@ ohos_fuzztest("ReConnectFuzzTest") {
external_deps = [
"c_utils:utils",
"ipc:ipc_core",
"ipc:ipc_single",
]
part_name = "wifi"

4
wifi/test/wifi_standard/native/BUILD.gn
View File

@ -56,14 +56,14 @@ ohos_unittest("native_unittest") {
deps = [
"$WIFI_ROOT_DIR/frameworks/native:wifi_sdk",
"$WIFI_ROOT_DIR/utils:wifi_utils",
"//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
"//third_party/googletest:gmock_main",
"//third_party/googletest:gtest_main",
]
external_deps = [
"c_utils:utils",
"ipc:ipc_core",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_single",
]
part_name = "wifi"

6
wifi/test/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/BUILD.gn
View File

@ -131,10 +131,12 @@ ohos_unittest("mock_wifi_hal_service") {
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",
]
external_deps = [ "c_utils:utils" ]
external_deps = [
"c_utils:utils",
"hiviewdfx_hilog_native:libhilog",
]
cflags_cc = [ "-fno-rtti" ]

2
wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn
View File

@ -101,7 +101,7 @@ ohos_unittest("manager_unittest") {
"common_event_service:cesfwk_innerkits",
"eventhandler:libeventhandler",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
"ipc:ipc_single",
"netmanager_base:net_conn_manager_if",
]

2
wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn
View File

@ -89,7 +89,6 @@ ohos_unittest("WifiApServiceTest") {
"--coverage",
]
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/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit",
"$WIFI_ROOT_DIR/utils:wifi_utils",
@ -98,6 +97,7 @@ ohos_unittest("WifiApServiceTest") {
]
external_deps = [
"c_utils:utils",
"dhcp:dhcp_manager_service",
"hiviewdfx_hilog_native:libhilog",
]
defines = [

7
wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn
View File

@ -121,9 +121,6 @@ ohos_unittest("wifi_p2p_test") {
"$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/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",
@ -133,7 +130,6 @@ ohos_unittest("wifi_p2p_test") {
]
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/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit",
@ -143,8 +139,9 @@ ohos_unittest("wifi_p2p_test") {
]
external_deps = [
"c_utils:utils",
"dhcp:dhcp_manager_service",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
"ipc:ipc_single",
"netmanager_base:net_conn_manager_if",
]

7
wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn
View File

@ -86,9 +86,6 @@ ohos_unittest("wifi_sta_unittest") {
"$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/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",
@ -105,7 +102,6 @@ ohos_unittest("wifi_sta_unittest") {
]
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",
@ -117,8 +113,9 @@ ohos_unittest("wifi_sta_unittest") {
external_deps = [
"ability_base:want",
"c_utils:utils",
"dhcp:dhcp_manager_service",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
"ipc:ipc_single",
"netmanager_base:net_conn_manager_if",
"samgr:samgr_proxy",
]

5
wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/BUILD.gn
View File

@ -68,9 +68,6 @@ ohos_unittest("toolkit_unittest") {
"$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit/config",
"$WIFI_ROOT_DIR/frameworks/native/interfaces",
"$WIFI_ROOT_DIR/services/wifi_standard/include",
"$DHCP_ROOT_DIR/interfaces/inner_api/interfaces",
"$DHCP_ROOT_DIR/interfaces/inner_api/include",
"$DHCP_ROOT_DIR/services/mgr_service/include",
]
ldflags = [
@ -79,13 +76,13 @@ ohos_unittest("toolkit_unittest") {
]
deps = [
"$DHCP_ROOT_DIR/services/mgr_service:dhcp_manager_service",
"//third_party/googletest:gmock_main",
"//third_party/googletest:gtest_main",
]
defines = []
external_deps = [
"c_utils:utils",
"dhcp:dhcp_manager_service",
"hiviewdfx_hilog_native:libhilog",
]
if (wifi_feature_with_encryption) {

1
wifi/test/wifi_standard/wifi_hal/unittest/BUILD.gn
View File

@ -92,7 +92,6 @@ 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",
]

9
wifi/utils/BUILD.gn
View File

@ -65,10 +65,7 @@ if (defined(ohos_lite)) {
"src/wifi_sa_manager.cpp",
]
deps = [
"//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
"//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
]
deps = []
external_deps = [
"ability_base:want",
@ -77,7 +74,9 @@ if (defined(ohos_lite)) {
"bundle_framework:appexecfwk_core",
"c_utils:utils",
"hisysevent_native:libhisysevent",
"ipc:ipc_core",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_single",
"samgr:samgr_proxy",
]
cflags_cc = [