From 11be938b7911e142c2d35848845b40ae136f5050 Mon Sep 17 00:00:00 2001 From: Qiandking Date: Tue, 24 Jun 2025 08:25:23 +0000 Subject: [PATCH 1/7] fix softap no ipv6 Signed-off-by: Qiandking --- .../wifi_framework/wifi_manage/BUILD.gn | 2 ++ .../wifi_service_scheduler.cpp | 19 +++++++++++++++++-- 2 files changed, 19 insertions(+), 2 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 43cfc865d..e2cafc5e7 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn @@ -476,6 +476,8 @@ if (defined(ohos_lite)) { "huks:libhukssdk", "ipc:ipc_single", "netmanager_base:net_conn_manager_if", + "netmanager_base::net_native_manager_if", + "netmanager_base::netsys_controller", "safwk:system_ability_fwk", "samgr:samgr_proxy", "window_manager:libdm_lite", diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_controller/wifi_service_scheduler.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_controller/wifi_service_scheduler.cpp index db3e7a944..9910ac945 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_controller/wifi_service_scheduler.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_controller/wifi_service_scheduler.cpp @@ -42,11 +42,15 @@ #include "hal_device_manage.h" #endif #include "wifi_global_func.h" - +#ifndef OHOS_ARCH_LITE +#include "netsys_controller.h" +#endif namespace OHOS { namespace Wifi { constexpr const char* WIFI_SELFCURE_PROP_CONFIG = "const.wifi.selfcure"; constexpr const int32_t WIFI_SELFCURE_PROP_SIZE = 16; +constexpr const int DHCP_IPV6_ENABLE = 1; +constexpr const int32_t DHCP_IPV6_DISENABLE = 0; DEFINE_WIFILOG_LABEL("WifiServiceScheduler"); WifiServiceScheduler &WifiServiceScheduler::GetInstance() { @@ -902,6 +906,9 @@ ErrCode WifiServiceScheduler::AutoStartApService(int instId, std::string &softAp WIFI_LOGE("AutoStartApService, create iface failed!"); return WIFI_OPT_FAILED; } +#ifndef OHOS_ARCH_LITE + NetManagerStandard::NetsysController::GetInstance().SetEnableIpv6(ifaceName, DHCP_IPV6_ENABLE); +#endif WifiConfigCenter::GetInstance().SetApIfaceName(ifaceName); softApIfName = ifaceName; softApIfaceNameMap.insert(std::make_pair(instId, ifaceName)); @@ -931,7 +938,15 @@ ErrCode WifiServiceScheduler::AutoStopApService(int instId) return WIFI_OPT_CLOSE_SUCC_WHEN_CLOSED; } } - +#ifdef HDI_CHIP_INTERFACE_SUPPORT + std::string ifaceName = ""; + if (softApIfaceNameMap.count(instId) > 0) { + ifaceName = softApIfaceNameMap[instId]; + } +#ifndef OHOS_ARCH_LITE + NetManagerStandard::NetsysController::GetInstance().SetEnableIpv6(ifaceName, DHCP_IPV6_DISENABLE); +#endif +#endif if (!WifiConfigCenter::GetInstance().SetApMidState(apState, WifiOprMidState::CLOSING, instId)) { WIFI_LOGE("AutoStopApService,set ap mid state closing failed!"); return WIFI_OPT_SUCCESS; -- Gitee From a0586efd2ac64e53e765500f8f26d580bbd6b89f Mon Sep 17 00:00:00 2001 From: Qiandking Date: Tue, 24 Jun 2025 08:38:17 +0000 Subject: [PATCH 2/7] update wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn. Signed-off-by: Qiandking --- .../wifi_standard/wifi_framework/wifi_manage/BUILD.gn | 4 ++-- 1 file changed, 2 insertions(+), 2 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 e2cafc5e7..ed01e10dd 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn @@ -476,8 +476,8 @@ if (defined(ohos_lite)) { "huks:libhukssdk", "ipc:ipc_single", "netmanager_base:net_conn_manager_if", - "netmanager_base::net_native_manager_if", - "netmanager_base::netsys_controller", + "netmanager_base:net_native_manager_if", + "netmanager_base:netsys_controller", "safwk:system_ability_fwk", "samgr:samgr_proxy", "window_manager:libdm_lite", -- Gitee From 86f1e5baf4f9520abea4e421380fe8cac84ede96 Mon Sep 17 00:00:00 2001 From: Qiandking Date: Wed, 25 Jun 2025 01:31:19 +0000 Subject: [PATCH 3/7] update wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn. Signed-off-by: Qiandking --- .../wifi_standard/wifi_framework/wifi_manage/BUILD.gn | 4 ++-- 1 file changed, 2 insertions(+), 2 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 ed01e10dd..58644adae 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn @@ -476,8 +476,6 @@ if (defined(ohos_lite)) { "huks:libhukssdk", "ipc:ipc_single", "netmanager_base:net_conn_manager_if", - "netmanager_base:net_native_manager_if", - "netmanager_base:netsys_controller", "safwk:system_ability_fwk", "samgr:samgr_proxy", "window_manager:libdm_lite", @@ -747,6 +745,8 @@ if (defined(ohos_lite)) { "ipc:ipc_single", "libxml2:libxml2", "netmanager_base:net_conn_manager_if", + "netmanager_base:net_native_manager_if", + "netmanager_base:netsys_controller", ] version_script = "libwifi_manager.map" -- Gitee From 0617f0af787f3d229bf52f2e7d788b63a24481ec Mon Sep 17 00:00:00 2001 From: Qiandking Date: Wed, 25 Jun 2025 03:39:40 +0000 Subject: [PATCH 4/7] =?UTF-8?q?update=20=E5=8F=98=E9=87=8F=E5=AE=9A?= =?UTF-8?q?=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Qiandking --- .../wifi_manage/wifi_controller/wifi_service_scheduler.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_controller/wifi_service_scheduler.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_controller/wifi_service_scheduler.cpp index 9910ac945..c897a8673 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_controller/wifi_service_scheduler.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_controller/wifi_service_scheduler.cpp @@ -49,8 +49,8 @@ namespace OHOS { namespace Wifi { constexpr const char* WIFI_SELFCURE_PROP_CONFIG = "const.wifi.selfcure"; constexpr const int32_t WIFI_SELFCURE_PROP_SIZE = 16; -constexpr const int DHCP_IPV6_ENABLE = 1; -constexpr const int32_t DHCP_IPV6_DISENABLE = 0; +constexpr int DHCP_IPV6_ENABLE = 1; +constexpr int DHCP_IPV6_DISENABLE = 0; DEFINE_WIFILOG_LABEL("WifiServiceScheduler"); WifiServiceScheduler &WifiServiceScheduler::GetInstance() { -- Gitee From 26b8e1d1e03c50dfd2ac9edfb1d00e3f507eaf42 Mon Sep 17 00:00:00 2001 From: Qiandking Date: Wed, 25 Jun 2025 06:10:18 +0000 Subject: [PATCH 5/7] =?UTF-8?q?update=20=E7=BC=96=E8=AF=91=E6=8A=A5?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Qiandking --- .../wifi_manage/wifi_controller/wifi_service_scheduler.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_controller/wifi_service_scheduler.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_controller/wifi_service_scheduler.cpp index c897a8673..dbec13ca1 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_controller/wifi_service_scheduler.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_controller/wifi_service_scheduler.cpp @@ -44,13 +44,14 @@ #include "wifi_global_func.h" #ifndef OHOS_ARCH_LITE #include "netsys_controller.h" +constexpr int DHCP_IPV6_ENABLE = 1; +constexpr int DHCP_IPV6_DISENABLE = 0; #endif + namespace OHOS { namespace Wifi { constexpr const char* WIFI_SELFCURE_PROP_CONFIG = "const.wifi.selfcure"; constexpr const int32_t WIFI_SELFCURE_PROP_SIZE = 16; -constexpr int DHCP_IPV6_ENABLE = 1; -constexpr int DHCP_IPV6_DISENABLE = 0; DEFINE_WIFILOG_LABEL("WifiServiceScheduler"); WifiServiceScheduler &WifiServiceScheduler::GetInstance() { -- Gitee From 91de5d739bade5fd603fa53ecd0bfb691c0f783a Mon Sep 17 00:00:00 2001 From: Qiandking Date: Thu, 26 Jun 2025 02:13:02 +0000 Subject: [PATCH 6/7] =?UTF-8?q?update=20=E5=8F=98=E9=87=8F=E5=86=97?= =?UTF-8?q?=E4=BD=99=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Qiandking --- .../wifi_manage/wifi_controller/wifi_service_scheduler.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_controller/wifi_service_scheduler.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_controller/wifi_service_scheduler.cpp index dbec13ca1..aa409442d 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_controller/wifi_service_scheduler.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_controller/wifi_service_scheduler.cpp @@ -44,8 +44,6 @@ #include "wifi_global_func.h" #ifndef OHOS_ARCH_LITE #include "netsys_controller.h" -constexpr int DHCP_IPV6_ENABLE = 1; -constexpr int DHCP_IPV6_DISENABLE = 0; #endif namespace OHOS { @@ -908,6 +906,8 @@ ErrCode WifiServiceScheduler::AutoStartApService(int instId, std::string &softAp return WIFI_OPT_FAILED; } #ifndef OHOS_ARCH_LITE + int DHCP_IPV6_ENABLE = 1; + WIFI_LOGI("AutoStartApService, set ipv6 enable, ifaceName is %{public}s", ifaceName.c_str()); NetManagerStandard::NetsysController::GetInstance().SetEnableIpv6(ifaceName, DHCP_IPV6_ENABLE); #endif WifiConfigCenter::GetInstance().SetApIfaceName(ifaceName); @@ -945,6 +945,8 @@ ErrCode WifiServiceScheduler::AutoStopApService(int instId) ifaceName = softApIfaceNameMap[instId]; } #ifndef OHOS_ARCH_LITE + int DHCP_IPV6_DISENABLE = 0; + WIFI_LOGI("AutoStopApService, set ipv6 disable, ifaceName is %{public}s", ifaceName.c_str()); NetManagerStandard::NetsysController::GetInstance().SetEnableIpv6(ifaceName, DHCP_IPV6_DISENABLE); #endif #endif -- Gitee From 52688218e67babf25b1efbc9cba85061ac225a3b Mon Sep 17 00:00:00 2001 From: Qiandking Date: Thu, 26 Jun 2025 03:51:00 +0000 Subject: [PATCH 7/7] update wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn. Signed-off-by: Qiandking --- .../wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn | 1 + 1 file changed, 1 insertion(+) 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 6990a40e9..d6a2f85ee 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 @@ -221,6 +221,7 @@ ohos_unittest("manager_unittest") { "netmanager_base:net_conn_manager_if", "netmanager_base:net_native_manager_if", "netmanager_base:net_stats_manager_if", + "netmanager_base:netsys_controller", "power_manager:powermgr_client", "safwk:system_ability_fwk", "samgr:samgr_proxy", -- Gitee