DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

FT: Fix architecture for RxKH loading from a file

Browse source 
src/ap/ap_config.c is not really supposed to call directly into a
function in hostapd/config_file.c. Furthermore, the wrapper through
ap_config.c did not really have any real value since it just called a
function that is within hostapd/*.c and that wrapper was called from
hostapd/*.c.

Instead of the wrapper, just call the function directly within the
hostapd directory.

Fixes: 392114a179 ("FT: Add dynamic reload of RxKH definitions from file")
Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>
This commit is contained in:
Jouni Malinen 2024-01-22 21:30:10 +02:00 committed by Jouni Malinen
parent 0b95d1346f
commit a4d599a53d
4 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hostapd/config_file.h
View file

@ -10,6 +10,8 @@
#define CONFIG_FILE_H
struct hostapd_config * hostapd_config_read(const char *fname);
int hostapd_config_read_rxkh_file(struct hostapd_bss_config *conf,
const char *fname);
int hostapd_set_iface(struct hostapd_config *conf,
struct hostapd_bss_config *bss, const char *field,
char *value);

2
hostapd/ctrl_iface.c
View file

@ -1530,7 +1530,7 @@ static int hostapd_ctrl_iface_reload_rxkhs(struct hostapd_data *hapd)
hostapd_config_clear_rxkhs(conf);
err = hostapd_config_setup_rxkhs(conf);
err = hostapd_config_read_rxkh_file(conf, conf->rxkh_file);
if (err < 0) {
wpa_printf(MSG_ERROR, "Reloading RxKHs failed: %d",
err);

6
src/ap/ap_config.c
View file

@ -702,12 +702,6 @@ void hostapd_config_clear_wpa_psk(struct hostapd_wpa_psk **l)
#ifdef CONFIG_IEEE80211R_AP
int hostapd_config_setup_rxkhs(struct hostapd_bss_config *conf)
{
return hostapd_config_read_rxkh_file(conf, conf->rxkh_file);
}
void hostapd_config_clear_rxkhs(struct hostapd_bss_config *conf)
{
struct ft_remote_r0kh *r0kh, *r0kh_prev;

3
src/ap/ap_config.h
View file

@ -1350,10 +1350,7 @@ void hostapd_config_free_radius_attr(struct hostapd_radius_attr *attr);
void hostapd_config_free_eap_user(struct hostapd_eap_user *user);
void hostapd_config_free_eap_users(struct hostapd_eap_user *user);
void hostapd_config_clear_wpa_psk(struct hostapd_wpa_psk **p);
int hostapd_config_read_rxkh_file(struct hostapd_bss_config *conf,
const char *fname);
void hostapd_config_clear_rxkhs(struct hostapd_bss_config *conf);
int hostapd_config_setup_rxkhs(struct hostapd_bss_config *conf);
void hostapd_config_free_bss(struct hostapd_bss_config *conf);
void hostapd_config_free(struct hostapd_config *conf);
int hostapd_maclist_found(struct mac_acl_entry *list, int num_entries,