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

Fix conditional EAP-SIM/AKA DB code selection

Browse source
This commit is contained in:
Jouni Malinen 2009-12-06 19:48:25 +02:00
parent d45354be53
commit 95272a888c
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
hostapd/hostapd.c
View file

@ -51,8 +51,12 @@ static int hostapd_setup_encryption(char *iface, struct hostapd_data *hapd);
extern int wpa_debug_level; extern int wpa_debug_level;
#if defined(EAP_SERVER_SIM) || defined(EAP_SERVER_AKA)
#define EAP_SIM_DB
#endif /* EAP_SERVER_SIM || EAP_SERVER_AKA */
#ifdef EAP_SERVER
#ifdef EAP_SIM_DB
static int hostapd_sim_db_cb_sta(struct hostapd_data *hapd, static int hostapd_sim_db_cb_sta(struct hostapd_data *hapd,
struct sta_info *sta, void *ctx) struct sta_info *sta, void *ctx)
{ {
@ -71,7 +75,7 @@ static void hostapd_sim_db_cb(void *ctx, void *session_ctx)
#endif /* RADIUS_SERVER */ #endif /* RADIUS_SERVER */
} }
} }
#endif /* EAP_SERVER */ #endif /* EAP_SIM_DB */
static void hostapd_wpa_auth_conf(struct hostapd_bss_config *conf, static void hostapd_wpa_auth_conf(struct hostapd_bss_config *conf,
@ -1430,7 +1434,7 @@ hostapd_alloc_bss_data(struct hostapd_iface *hapd_iface,
} }
#endif /* EAP_TLS_FUNCS */ #endif /* EAP_TLS_FUNCS */
#if defined(EAP_SERVER_SIM) || defined(EAP_SERVER_AKA) #ifdef EAP_SIM_DB
if (hapd->conf->eap_sim_db) { if (hapd->conf->eap_sim_db) {
hapd->eap_sim_db_priv = hapd->eap_sim_db_priv =
eap_sim_db_init(hapd->conf->eap_sim_db, eap_sim_db_init(hapd->conf->eap_sim_db,
@ -1441,13 +1445,13 @@ hostapd_alloc_bss_data(struct hostapd_iface *hapd_iface,
goto fail; goto fail;
} }
} }
#endif /* EAP_SERVER_SIM || EAP_SERVER_AKA */ #endif /* EAP_SIM_DB */
hapd->driver = hapd->iconf->driver; hapd->driver = hapd->iconf->driver;
return hapd; return hapd;
#if defined(EAP_TLS_FUNCS) || defined(EAP_SERVER) #if defined(EAP_TLS_FUNCS) || defined(EAP_SIM_DB)
fail: fail:
#endif #endif
/* TODO: cleanup allocated resources(?) */ /* TODO: cleanup allocated resources(?) */