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

RADIUS server: Use struct eap_config to avoid duplicated definitions

Browse source 
Use struct eap_config as-is within RADIUS server to avoid having to
duplicate all the configuration variables at each interface. This
continues cleanup on struct eap_config duplication in hostapd.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2019-08-20 02:32:05 +03:00
parent a00cb1b1f5
commit fa1f0751cc
4 changed files with 70 additions and 273 deletions
Download patch file Download diff file Expand all files Collapse all files

54
src/radius/radius_server.c
View file

@ -230,7 +230,7 @@ struct radius_server_data {
sqlite3 *db;
#endif /* CONFIG_SQLITE */
struct eap_config *eap_cfg;
const struct eap_config *eap_cfg;
};
@ -2189,7 +2189,6 @@ struct radius_server_data *
radius_server_init(struct radius_server_conf *conf)
{
struct radius_server_data *data;
struct eap_config *eap_cfg;
#ifndef CONFIG_IPV6
if (conf->ipv6) {
@ -2202,57 +2201,16 @@ radius_server_init(struct radius_server_conf *conf)
if (data == NULL)
return NULL;
eap_cfg = data->eap_cfg = os_zalloc(sizeof(*eap_cfg));
if (!eap_cfg) {
os_free(data);
return NULL;
}
data->eap_cfg = conf->eap_cfg;
data->auth_sock = -1;
data->acct_sock = -1;
dl_list_init(&data->erp_keys);
os_get_reltime(&data->start_time);
data->conf_ctx = conf->conf_ctx;
eap_cfg->backend_auth = TRUE;
eap_cfg->eap_server = 1;
eap_cfg->eap_sim_db_priv = conf->eap_sim_db_priv;
eap_cfg->ssl_ctx = conf->ssl_ctx;
eap_cfg->msg_ctx = conf->msg_ctx;
conf->eap_cfg->backend_auth = TRUE;
conf->eap_cfg->eap_server = 1;
data->ipv6 = conf->ipv6;
if (conf->pac_opaque_encr_key) {
eap_cfg->pac_opaque_encr_key = os_malloc(16);
if (eap_cfg->pac_opaque_encr_key) {
os_memcpy(eap_cfg->pac_opaque_encr_key,
conf->pac_opaque_encr_key, 16);
}
}
if (conf->eap_fast_a_id) {
eap_cfg->eap_fast_a_id = os_malloc(conf->eap_fast_a_id_len);
if (eap_cfg->eap_fast_a_id) {
os_memcpy(eap_cfg->eap_fast_a_id, conf->eap_fast_a_id,
conf->eap_fast_a_id_len);
eap_cfg->eap_fast_a_id_len = conf->eap_fast_a_id_len;
}
}
if (conf->eap_fast_a_id_info)
eap_cfg->eap_fast_a_id_info =
os_strdup(conf->eap_fast_a_id_info);
eap_cfg->eap_fast_prov = conf->eap_fast_prov;
eap_cfg->pac_key_lifetime = conf->pac_key_lifetime;
eap_cfg->pac_key_refresh_time = conf->pac_key_refresh_time;
eap_cfg->eap_teap_auth = conf->eap_teap_auth;
eap_cfg->eap_teap_pac_no_inner = conf->eap_teap_pac_no_inner;
eap_cfg->eap_teap_separate_result = conf->eap_teap_separate_result;
eap_cfg->eap_teap_id = conf->eap_teap_id;
data->get_eap_user = conf->get_eap_user;
eap_cfg->eap_sim_aka_result_ind = conf->eap_sim_aka_result_ind;
eap_cfg->eap_sim_id = conf->eap_sim_id;
eap_cfg->tnc = conf->tnc;
eap_cfg->wps = conf->wps;
eap_cfg->pwd_group = conf->pwd_group;
if (conf->server_id) {
eap_cfg->server_id = (u8 *) os_strdup(conf->server_id);
eap_cfg->server_id_len = os_strlen(conf->server_id);
}
if (conf->eap_req_id_text) {
data->eap_req_id_text = os_malloc(conf->eap_req_id_text_len);
if (data->eap_req_id_text) {
@ -2261,10 +2219,7 @@ radius_server_init(struct radius_server_conf *conf)
data->eap_req_id_text_len = conf->eap_req_id_text_len;
}
}
eap_cfg->erp = conf->erp;
data->erp_domain = conf->erp_domain;
eap_cfg->tls_session_lifetime = conf->tls_session_lifetime;
eap_cfg->tls_flags = conf->tls_flags;
if (conf->subscr_remediation_url) {
data->subscr_remediation_url =
@ -2400,7 +2355,6 @@ void radius_server_deinit(struct radius_server_data *data)
#endif /* CONFIG_SQLITE */
radius_server_erp_flush(data);
eap_server_config_free(data->eap_cfg);
os_free(data);
}