diff --git a/wifi/frameworks/native/src/wifi_device_callback_stub.cpp b/wifi/frameworks/native/src/wifi_device_callback_stub.cpp index d449ce8c22f0575cd183f8b0dc750bd7287d3f6d..bc08d175d7e2f44454df739f2a8a667c788c2fb0 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 5a18637d05842dbb06abe4394c103a46b9c39b72..5ea421e189c812298ea349d79fbd20ef28e44c26 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 12d13ff182c1b0cd1206be30aaaec757513aa1ba..630fe7eb0db2cfdc24efc3b1b76534279031cee7 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 b12092c5e78e0d535247aebeaf2382f8d1f7f015..a19cf3ddff7df46ac88b48a65f68afef8f122dee 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 0baf7b69dd6e9bde59b052aaed306650c9491c8f..dbd7808b274da796337e930280affdbd5f22ff61 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 56cdd72e4602bbee9af0b592b6e765a92aef5f58..4b273de21dd248c66e4925999ee964f7a9e90309 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 29cb1ad47c8322c3373c19933094d67dbc39490a..dffd84e74a258234ac712355fb21a53d71bdeb24 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 4304de1fec7cdb89b99129c1f202d0ec90c09634..5c180a0f3b5fca7ec909ae94d9a041ca8e57dac0 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 08f792159d9c5b6ee3279660aad8a65f65352f1e..250f5e0c9c18aaffd3681eea64fce5f86a2b4066 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 3f89c2e16f0269b91a41933936716c0fffd1389f..3afe59d83e75c1a45b1729d2008c00b11ef0e81b 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 0e0e12d6900dad60a35445c92c68a985b9534e0a..55050ffe2ce69262d662cead29e3fdf947f9409a 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 26c5527a4e18bf7b8654b3051040672cd9f6fcd8..74f0b643f8a99696d957e9bd8ea3a0075d1353a0 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 e66ea45819c423eb56551c00cda8af98c7b74062..f6e781df393adb77769358ab18bffefeff5902ef 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 264c56f1acd8fec646ad0e64ec839af575e4919f..fa01fa93a2f7ae94602dd12d4b1254d4ace2a175 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 e77caddb5d2c8c7791bab41e19efeef23cec0d64..2aa11eebb52c68329635df6420d1153d3a2b5d48 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 d3645682954ba95825a5d02a19744b2990b7f3bd..5c711e715a3243fb646f7c77bf4a37770190b1fe 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; }