From 25db5c8151c3abe10dbccc6dfe99f62c9eb23685 Mon Sep 17 00:00:00 2001 From: TeamCorePro Date: Mon, 31 Mar 2025 17:39:22 +0800 Subject: [PATCH] okc roam Signed-off-by: TeamCorePro --- bundle.json | 3 ++- wpa_supplicant-2.9_standard/BUILD.gn | 17 +++++++++++++++++ .../wpa_supplicant/config.c | 4 ++++ .../wpa_supplicant/wpa_supplicant.c | 3 +++ 4 files changed, 26 insertions(+), 1 deletion(-) diff --git a/bundle.json b/bundle.json index ca91e4d..ffe98f2 100644 --- a/bundle.json +++ b/bundle.json @@ -27,7 +27,8 @@ "wpa_supplicant_config_openssl", "wpa_supplicant_config_wfd", "wpa_supplicant_config_mlo", - "wpa_supplicant_ieee80211be" + "wpa_supplicant_ieee80211be", + "wpa_supplicant_config_okc_roam" ], "adapted_system_type": ["small","standard"], "rom": "2.1MB", diff --git a/wpa_supplicant-2.9_standard/BUILD.gn b/wpa_supplicant-2.9_standard/BUILD.gn index dd6fb58..7987828 100644 --- a/wpa_supplicant-2.9_standard/BUILD.gn +++ b/wpa_supplicant-2.9_standard/BUILD.gn @@ -30,6 +30,7 @@ declare_args() { wpa_supplicant_config_openssl = true wpa_supplicant_config_wfd = true wpa_supplicant_config_mlo = false + wpa_supplicant_config_okc_roam = false } if (wpa_supplicant_ohos_certmgr) { @@ -561,6 +562,10 @@ ohos_shared_library("wpa_sys") { cflags += [ "-DCONFIG_WIFI_DISPLAY" ] } + if (wpa_supplicant_config_okc_roam) { + cflags += [ "-DCONFIG_OKC_ROAM" ] + } + defines = [ "TLS_DEFAULT_CIPHERS = \"DEFAULT:!EXP:!LOW\"", "OPENSSL_SUPPRESS_DEPRECATED", @@ -719,6 +724,10 @@ ohos_shared_library("wpa_sys_updater") { cflags += [ "-DCONFIG_WIFI_DISPLAY" ] } + if (wpa_supplicant_config_okc_roam) { + cflags += [ "-DCONFIG_OKC_ROAM" ] + } + defines = [ "TLS_DEFAULT_CIPHERS = \"DEFAULT:!EXP:!LOW\"", "OPENSSL_SUPPRESS_DEPRECATED", @@ -892,6 +901,10 @@ ohos_shared_library("wpa") { cflags += [ "-DCONFIG_WIFI_DISPLAY" ] } + if (wpa_supplicant_config_okc_roam) { + cflags += [ "-DCONFIG_OKC_ROAM" ] + } + defines = [ "TLS_DEFAULT_CIPHERS = \"DEFAULT:!EXP:!LOW\"", "OPENSSL_SUPPRESS_DEPRECATED", @@ -1052,6 +1065,10 @@ ohos_shared_library("wpa_updater") { cflags += [ "-DCONFIG_WIFI_DISPLAY" ] } + if (wpa_supplicant_config_okc_roam) { + cflags += [ "-DCONFIG_OKC_ROAM" ] + } + defines = [ "TLS_DEFAULT_CIPHERS = \"DEFAULT:!EXP:!LOW\"", "OPENSSL_SUPPRESS_DEPRECATED", diff --git a/wpa_supplicant-2.9_standard/wpa_supplicant/config.c b/wpa_supplicant-2.9_standard/wpa_supplicant/config.c index bcf2915..8bafb64 100644 --- a/wpa_supplicant-2.9_standard/wpa_supplicant/config.c +++ b/wpa_supplicant-2.9_standard/wpa_supplicant/config.c @@ -3400,7 +3400,11 @@ void wpa_config_set_network_defaults(struct wpa_ssid *ssid) ssid->vht_tx_mcs_nss_7 = -1; ssid->vht_tx_mcs_nss_8 = -1; #endif /* CONFIG_VHT_OVERRIDES */ +#ifdef CONFIG_OKC_ROAM + ssid->proactive_key_caching = 1; +#else ssid->proactive_key_caching = -1; +#endif ssid->ieee80211w = MGMT_FRAME_PROTECTION_DEFAULT; ssid->sae_pwe = DEFAULT_SAE_PWE; #ifdef CONFIG_MACSEC diff --git a/wpa_supplicant-2.9_standard/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant-2.9_standard/wpa_supplicant/wpa_supplicant.c index 7203df6..c560759 100644 --- a/wpa_supplicant-2.9_standard/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant-2.9_standard/wpa_supplicant/wpa_supplicant.c @@ -7941,6 +7941,9 @@ static int wpa_supplicant_init_iface(struct wpa_supplicant *wpa_s, if (strcmp(wpa_s->ifname, "wlan0") == 0) { gWpaWlan = wpa_s; wpa_printf(MSG_ERROR, "gWpaWlan =%p", gWpaWlan); + #ifdef CONFIG_OKC_ROAM + wpa_s->conf->okc = 1; + #endif } else if ((strcmp(wpa_s->ifname, "p2p-dev-wlan0") == 0) || (strcmp(wpa_s->ifname, "p2p0") == 0)) { gWpaP2p = wpa_s; wpa_printf(MSG_ERROR, "gWpaP2p =%p", gWpaP2p); -- Gitee