Kernel
/
iwd
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git
3
0
Fork 0
Code Releases Activity

eap-ttls: Use method object in phase2 reset/destroy

This commit is contained in:
Tim Kourt 2019-01-10 14:34:27 -08:00 committed by Denis Kenzior
parent 9d1e2fa85b
commit fd2c34cebc
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/eap-ttls.c
View File

@ -347,15 +347,6 @@ static bool avp_iter_next(struct avp_iter *iter)
return true;
}
struct phase2_method_ops {
bool (*init)(struct eap_state *eap);
bool (*handle_avp)(struct eap_state *eap, enum radius_attr type,
uint32_t vendor_id, const uint8_t *data,
size_t len);
void (*destroy)(void *state);
void (*reset)(void *state);
};
struct phase2_credentials {
char *username;
char *password;
@ -367,6 +358,15 @@ struct phase2_method {
const struct phase2_method_ops *ops;
};
struct phase2_method_ops {
bool (*init)(struct eap_state *eap);
bool (*handle_avp)(struct eap_state *eap, enum radius_attr type,
uint32_t vendor_id, const uint8_t *data,
size_t len);
void (*destroy)(struct phase2_method *phase2);
void (*reset)(struct phase2_method *phase2);
};
static void eap_ttls_phase2_credentials_destroy(
struct phase2_credentials *credentials)
{
@ -628,21 +628,21 @@ static bool eap_ttls_phase2_eap_handle_avp(struct eap_state *eap,
return true;
}
static void eap_ttls_phase2_eap_destroy(void *state)
static void eap_ttls_phase2_eap_destroy(struct phase2_method *phase2)
{
if (!state)
if (!phase2->state)
return;
eap_reset(state);
eap_free(state);
eap_reset(phase2->state);
eap_free(phase2->state);
}
static void eap_ttls_phase2_eap_reset(void *state)
static void eap_ttls_phase2_eap_reset(struct phase2_method *phase2)
{
if (!state)
if (!phase2->state)
return;
eap_reset(state);
eap_reset(phase2->state);
}
static const struct phase2_method_ops phase2_eap_ops = {
@ -710,7 +710,7 @@ static void eap_ttls_state_reset(void *data)
if (!phase2->ops->reset)
return;
phase2->ops->reset(phase2->state);
phase2->ops->reset(phase2);
}
static void eap_ttls_state_destroy(void *data)
@ -720,7 +720,7 @@ static void eap_ttls_state_destroy(void *data)
eap_ttls_phase2_credentials_destroy(&phase2->credentials);
if (phase2->ops->destroy)
phase2->ops->destroy(phase2->state);
phase2->ops->destroy(phase2);
l_free(phase2);
}