hostap: Relocate hostapd related source code to new files #83253
Conversation
|
The following west manifest projects have changed revision in this Pull Request:
⛔ DNM label due to: 2 projects with PR revision Note: This message is automatically posted and updated by the Manifest GitHub Action. |
zephyrbot
added
manifest
manifest-hostap
manifest-hal_nxp
DNM
|
This PR is related to issue #77383 |
nxf58150
force-pushed
the
hostapd_split
branch
3 times, most recently
from
97c0595 to
db8d204
Compare
|
Hi @krish2718 , please help review this PR. As discussed before, I moved the hostapd related source code to new files. Please also help add Jerome as reviewer. Thanks! |
nxf58150
force-pushed
the
hostapd_split
branch
from
db8d204 to
7e61f67
Compare
nxf58150
force-pushed
the
hostapd_split
branch
2 times, most recently
from
3ca0e3d to
e75bcee
Compare
Created new files and relocate hostapd support code in glue layer to new files. The new files will be compiled only if hostapd support is enabled. Signed-off-by: Hui Bai <[email protected]>
nxf58150
force-pushed
the
hostapd_split
branch
from
e75bcee to
19149a1
Compare
| bss->wps_state = WPS_STATE_CONFIGURED; | ||
| bss->eap_server = 1; | ||
| #ifdef CONFIG_WPS | ||
| bss->ap_setup_locked = 1; |
There was a problem hiding this comment.
Not related to this PR (because this PR only relocate code without modifying it): we could write bss->ap_setup_locked = IS_ENABLED(CONFIG_WPS);.
| conf->channel = 1; | ||
| conf->acs = conf->channel == 0; | ||
| #ifdef CONFIG_ACS | ||
| conf->acs_num_scans = 1; |
There was a problem hiding this comment.
Ditto, in a further PR, we could change this line in conf->acs_num_scans = IS_ENABLED(CONFIG_ACS);.
| #ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE | ||
| #include "eap_peer/eap.h" | ||
| #endif | ||
| #include "supp_events.h" | ||
| #ifdef CONFIG_WIFI_NM_HOSTAPD_AP | ||
| #include "hapd_api.h" | ||
| #endif |
There was a problem hiding this comment.
Including a header do not increase the size of the code and can simplify the code. Typically, it allow to write:
if (IS_ENABLED(CONFIG_FOO))
function_declared_but_not_defined_since_CONFIG_FOO_is_not_set()
So, unless you have a good reason, I would avoid to include header conditionally.
| if (!interfaces->dpp) { | ||
| return; | ||
| } | ||
| #endif /* CONFIG_DPP */ |
There was a problem hiding this comment.
This could be written:
if (IS_ENABLED(CONFIG_DPP)) {
os_memset(&dpp_conf, 0, sizeof(dpp_conf));
[...]
}
Then, you can also drop the #ifdef CONFIG_DPP around declaration of dpp_conf.
(if you do the change, I suggest to place it in another commit or PR)
| return iface; | ||
| } | ||
|
|
||
| void zephyr_hostapd_init(void *ctx) |
There was a problem hiding this comment.
It is not possible to declare ctx as a struct hapd_interfaces *?
| { | ||
| return &get_default_context()->hostapd; | ||
| } | ||
| #endif |
There was a problem hiding this comment.
Do you think it would make sense to relocate this function in hapd_main.c and do the same pattern than get_default_context(void):
static struct hapd_interfaces *zephyr_get_default_hapd_context(void)
{
static struct hapd_interfaces ctx;
return &ctx;
}
Thus, struct hapd_interfaces won't have to be known in supplicant. It may lead to further simplifications.
| @@ -20,6 +21,14 @@ | |||
| #define MAC_STR_LEN 18 /* for ':' or '-' separated MAC address string */ | |||
| #define CHAN_NUM_LEN 6 /* for space-separated channel numbers string */ | |||
|
|
|||
| enum wifi_frequency_bands wpas_band_to_zephyr(enum wpa_radio_work_band band); | |||
|
|
|||
| enum wifi_security_type wpas_key_mgmt_to_zephyr(int key_mgmt, int proto); | |||
There was a problem hiding this comment.
| enum wifi_security_type wpas_key_mgmt_to_zephyr(int key_mgmt, int proto); | |
| enum wifi_security_type wpas_key_mgmt_to_zephyr(bool is_hapd, void *config, int key_mgmt, int proto, int pwe); |
There was a problem hiding this comment.
please also remove the static inline from definition
| "auth=MSCHAPV2"}, | ||
| {WIFI_SECURITY_TYPE_EAP_PEAP_TLS, WIFI_EAP_TYPE_PEAP, WIFI_EAP_TYPE_TLS, "PEAP", | ||
| "auth=TLS"}, | ||
| {WIFI_SECURITY_TYPE_EAP_TLS_SHA256, WIFI_EAP_TYPE_TLS, WIFI_EAP_TYPE_NONE, "TLS", NULL}, |
There was a problem hiding this comment.
In TOT, WIFI_SECURITY_TYPE_EAP_TLS_SHA256 has been removed
Created new files and relocate hostapd support code in glue layer to new files. The new files will be compiled only if hostapd support is enabled.