From 22a7f39f2342c4a74d26df1046ccd9587573617a Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Sun, 6 Dec 2009 18:48:30 +0200 Subject: [PATCH] Remove unused hostapd reconfig code --- hostapd/accounting.c | 11 ----------- hostapd/accounting.h | 2 -- hostapd/ap_list.c | 27 --------------------------- hostapd/ap_list.h | 2 -- hostapd/hostapd.h | 1 - hostapd/iapp.c | 18 ------------------ hostapd/iapp.h | 9 --------- hostapd/ieee802_11_auth.c | 11 ----------- hostapd/ieee802_11_auth.h | 2 -- hostapd/ieee802_1x.c | 9 --------- hostapd/ieee802_1x.h | 3 --- hostapd/vlan_init.c | 11 ----------- hostapd/vlan_init.h | 2 -- 13 files changed, 108 deletions(-) diff --git a/hostapd/accounting.c b/hostapd/accounting.c index 991fb5326..8adaf8886 100644 --- a/hostapd/accounting.c +++ b/hostapd/accounting.c @@ -499,14 +499,3 @@ void accounting_deinit(struct hostapd_data *hapd) { accounting_report_state(hapd, 0); } - - -int accounting_reconfig(struct hostapd_data *hapd, - struct hostapd_config *oldconf) -{ - if (!hapd->radius_client_reconfigured) - return 0; - - accounting_deinit(hapd); - return accounting_init(hapd); -} diff --git a/hostapd/accounting.h b/hostapd/accounting.h index 5f6d9dc44..f3d60f015 100644 --- a/hostapd/accounting.h +++ b/hostapd/accounting.h @@ -41,7 +41,5 @@ void accounting_sta_stop(struct hostapd_data *hapd, struct sta_info *sta); int accounting_init(struct hostapd_data *hapd); void accounting_deinit(struct hostapd_data *hapd); #endif /* CONFIG_NO_ACCOUNTING */ -int accounting_reconfig(struct hostapd_data *hapd, - struct hostapd_config *oldconf); #endif /* ACCOUNTING_H */ diff --git a/hostapd/ap_list.c b/hostapd/ap_list.c index 7cb7b3742..1807055b0 100644 --- a/hostapd/ap_list.c +++ b/hostapd/ap_list.c @@ -446,30 +446,3 @@ void ap_list_deinit(struct hostapd_iface *iface) eloop_cancel_timeout(ap_list_timer, iface, NULL); hostapd_free_aps(iface); } - - -int ap_list_reconfig(struct hostapd_iface *iface, - struct hostapd_config *oldconf) -{ - time_t now; - struct ap_info *ap; - - if (iface->conf->ap_table_max_size == oldconf->ap_table_max_size && - iface->conf->ap_table_expiration_time == - oldconf->ap_table_expiration_time) - return 0; - - time(&now); - - while (iface->ap_list) { - ap = iface->ap_list->prev; - if (iface->num_ap <= iface->conf->ap_table_max_size && - ap->last_beacon + iface->conf->ap_table_expiration_time >= - now) - break; - - ap_free_ap(iface, iface->ap_list->prev); - } - - return 0; -} diff --git a/hostapd/ap_list.h b/hostapd/ap_list.h index 2845aa429..839f5a908 100644 --- a/hostapd/ap_list.h +++ b/hostapd/ap_list.h @@ -76,7 +76,5 @@ static inline void ap_list_deinit(struct hostapd_iface *iface) { } #endif /* NEED_AP_MLME */ -int ap_list_reconfig(struct hostapd_iface *iface, - struct hostapd_config *oldconf); #endif /* AP_LIST_H */ diff --git a/hostapd/hostapd.h b/hostapd/hostapd.h index 1c6372c91..dae3c12a0 100644 --- a/hostapd/hostapd.h +++ b/hostapd/hostapd.h @@ -64,7 +64,6 @@ struct hostapd_data { void *msg_ctx; /* ctx for wpa_msg() calls */ struct radius_client_data *radius; - int radius_client_reconfigured; u32 acct_session_id_hi, acct_session_id_lo; struct iapp_data *iapp; diff --git a/hostapd/iapp.c b/hostapd/iapp.c index 1451aa4d7..001e46e86 100644 --- a/hostapd/iapp.c +++ b/hostapd/iapp.c @@ -536,21 +536,3 @@ void iapp_deinit(struct iapp_data *iapp) } os_free(iapp); } - -int iapp_reconfig(struct hostapd_data *hapd, struct hostapd_config *oldconf, - struct hostapd_bss_config *oldbss) -{ - if (hapd->conf->ieee802_11f != oldbss->ieee802_11f || - os_strcmp(hapd->conf->iapp_iface, oldbss->iapp_iface) != 0) { - iapp_deinit(hapd->iapp); - hapd->iapp = NULL; - - if (hapd->conf->ieee802_11f) { - hapd->iapp = iapp_init(hapd, hapd->conf->iapp_iface); - if (hapd->iapp == NULL) - return -1; - } - } - - return 0; -} diff --git a/hostapd/iapp.h b/hostapd/iapp.h index 86de59256..5fc01cb70 100644 --- a/hostapd/iapp.h +++ b/hostapd/iapp.h @@ -22,8 +22,6 @@ struct iapp_data; void iapp_new_station(struct iapp_data *iapp, struct sta_info *sta); struct iapp_data * iapp_init(struct hostapd_data *hapd, const char *iface); void iapp_deinit(struct iapp_data *iapp); -int iapp_reconfig(struct hostapd_data *hapd, struct hostapd_config *oldconf, - struct hostapd_bss_config *oldbss); #else /* CONFIG_IAPP */ @@ -42,13 +40,6 @@ static inline void iapp_deinit(struct iapp_data *iapp) { } -static inline int -iapp_reconfig(struct hostapd_data *hapd, struct hostapd_config *oldconf, - struct hostapd_bss_config *oldbss) -{ - return 0; -} - #endif /* CONFIG_IAPP */ #endif /* IAPP_H */ diff --git a/hostapd/ieee802_11_auth.c b/hostapd/ieee802_11_auth.c index 0aa86b08a..092e27ab9 100644 --- a/hostapd/ieee802_11_auth.c +++ b/hostapd/ieee802_11_auth.c @@ -529,15 +529,4 @@ void hostapd_acl_deinit(struct hostapd_data *hapd) } } - -int hostapd_acl_reconfig(struct hostapd_data *hapd, - struct hostapd_config *oldconf) -{ - if (!hapd->radius_client_reconfigured) - return 0; - - hostapd_acl_deinit(hapd); - return hostapd_acl_init(hapd); -} - #endif /* CONFIG_NATIVE_WINDOWS */ diff --git a/hostapd/ieee802_11_auth.h b/hostapd/ieee802_11_auth.h index 0eed825e2..b2971e509 100644 --- a/hostapd/ieee802_11_auth.h +++ b/hostapd/ieee802_11_auth.h @@ -27,7 +27,5 @@ int hostapd_allowed_address(struct hostapd_data *hapd, const u8 *addr, u32 *acct_interim_interval, int *vlan_id); int hostapd_acl_init(struct hostapd_data *hapd); void hostapd_acl_deinit(struct hostapd_data *hapd); -int hostapd_acl_reconfig(struct hostapd_data *hapd, - struct hostapd_config *oldconf); #endif /* IEEE802_11_AUTH_H */ diff --git a/hostapd/ieee802_1x.c b/hostapd/ieee802_1x.c index 5a0f4070b..a5bc0e313 100644 --- a/hostapd/ieee802_1x.c +++ b/hostapd/ieee802_1x.c @@ -1703,15 +1703,6 @@ void ieee802_1x_deinit(struct hostapd_data *hapd) } -int ieee802_1x_reconfig(struct hostapd_data *hapd, - struct hostapd_config *oldconf, - struct hostapd_bss_config *oldbss) -{ - ieee802_1x_deinit(hapd); - return ieee802_1x_init(hapd); -} - - int ieee802_1x_tx_status(struct hostapd_data *hapd, struct sta_info *sta, const u8 *buf, size_t len, int ack) { diff --git a/hostapd/ieee802_1x.h b/hostapd/ieee802_1x.h index 514502d6d..e7be41bb5 100644 --- a/hostapd/ieee802_1x.h +++ b/hostapd/ieee802_1x.h @@ -58,9 +58,6 @@ void ieee802_1x_set_sta_authorized(struct hostapd_data *hapd, void ieee802_1x_dump_state(FILE *f, const char *prefix, struct sta_info *sta); int ieee802_1x_init(struct hostapd_data *hapd); void ieee802_1x_deinit(struct hostapd_data *hapd); -int ieee802_1x_reconfig(struct hostapd_data *hapd, - struct hostapd_config *oldconf, - struct hostapd_bss_config *oldbss); int ieee802_1x_tx_status(struct hostapd_data *hapd, struct sta_info *sta, const u8 *buf, size_t len, int ack); u8 * ieee802_1x_get_identity(struct eapol_state_machine *sm, size_t *len); diff --git a/hostapd/vlan_init.c b/hostapd/vlan_init.c index 6de54ea2a..c4f223bb1 100644 --- a/hostapd/vlan_init.c +++ b/hostapd/vlan_init.c @@ -743,17 +743,6 @@ void vlan_deinit(struct hostapd_data *hapd) } -int vlan_reconfig(struct hostapd_data *hapd, struct hostapd_config *oldconf, - struct hostapd_bss_config *oldbss) -{ - vlan_dynamic_remove(hapd, oldbss->vlan); - if (vlan_dynamic_add(hapd, hapd->conf->vlan)) - return -1; - - return 0; -} - - struct hostapd_vlan * vlan_add_dynamic(struct hostapd_data *hapd, struct hostapd_vlan *vlan, int vlan_id) diff --git a/hostapd/vlan_init.h b/hostapd/vlan_init.h index 873fd5584..382d5dee4 100644 --- a/hostapd/vlan_init.h +++ b/hostapd/vlan_init.h @@ -19,8 +19,6 @@ #ifndef CONFIG_NO_VLAN int vlan_init(struct hostapd_data *hapd); void vlan_deinit(struct hostapd_data *hapd); -int vlan_reconfig(struct hostapd_data *hapd, struct hostapd_config *oldconf, - struct hostapd_bss_config *oldbss); struct hostapd_vlan * vlan_add_dynamic(struct hostapd_data *hapd, struct hostapd_vlan *vlan, int vlan_id);