jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Move DROP_SA command to be within ifdef CONFIG_TESTING_OPTIONS

Browse source 
This is a test command and has no use in production builds.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2014-04-05 23:59:31 +03:00
parent eaf3f9b10d
commit 9ff4de6de4
3 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/rsn_supp/wpa.c
View file

@ -2627,6 +2627,7 @@ int wpa_sm_pmksa_cache_list(struct wpa_sm *sm, char *buf, size_t len)
} }
#ifdef CONFIG_TESTING_OPTIONS
void wpa_sm_drop_sa(struct wpa_sm *sm) void wpa_sm_drop_sa(struct wpa_sm *sm)
{ {
wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, "WPA: Clear old PMK and PTK"); wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, "WPA: Clear old PMK and PTK");
@ -2636,6 +2637,7 @@ void wpa_sm_drop_sa(struct wpa_sm *sm)
os_memset(&sm->ptk, 0, sizeof(sm->ptk)); os_memset(&sm->ptk, 0, sizeof(sm->ptk));
os_memset(&sm->tptk, 0, sizeof(sm->tptk)); os_memset(&sm->tptk, 0, sizeof(sm->tptk));
} }
#endif /* CONFIG_TESTING_OPTIONS */
int wpa_sm_has_ptk(struct wpa_sm *sm) int wpa_sm_has_ptk(struct wpa_sm *sm)

4
wpa_supplicant/ctrl_iface.c
View file

@ -3819,6 +3819,7 @@ static int wpa_supplicant_ctrl_iface_bss_flush(
} }
#ifdef CONFIG_TESTING_OPTIONS
static void wpa_supplicant_ctrl_iface_drop_sa(struct wpa_supplicant *wpa_s) static void wpa_supplicant_ctrl_iface_drop_sa(struct wpa_supplicant *wpa_s)
{ {
wpa_printf(MSG_DEBUG, "Dropping SA without deauthentication"); wpa_printf(MSG_DEBUG, "Dropping SA without deauthentication");
@ -3840,6 +3841,7 @@ static void wpa_supplicant_ctrl_iface_drop_sa(struct wpa_supplicant *wpa_s)
MLME_SETPROTECTION_KEY_TYPE_PAIRWISE); MLME_SETPROTECTION_KEY_TYPE_PAIRWISE);
wpa_sm_drop_sa(wpa_s->wpa); wpa_sm_drop_sa(wpa_s->wpa);
} }
#endif /* CONFIG_TESTING_OPTIONS */
static int wpa_supplicant_ctrl_iface_roam(struct wpa_supplicant *wpa_s, static int wpa_supplicant_ctrl_iface_roam(struct wpa_supplicant *wpa_s,
@ -6540,8 +6542,10 @@ char * wpa_supplicant_ctrl_iface_process(struct wpa_supplicant *wpa_s,
wpas_notify_suspend(wpa_s->global); wpas_notify_suspend(wpa_s->global);
} else if (os_strcmp(buf, "RESUME") == 0) { } else if (os_strcmp(buf, "RESUME") == 0) {
wpas_notify_resume(wpa_s->global); wpas_notify_resume(wpa_s->global);
#ifdef CONFIG_TESTING_OPTIONS
} else if (os_strcmp(buf, "DROP_SA") == 0) { } else if (os_strcmp(buf, "DROP_SA") == 0) {
wpa_supplicant_ctrl_iface_drop_sa(wpa_s); wpa_supplicant_ctrl_iface_drop_sa(wpa_s);
#endif /* CONFIG_TESTING_OPTIONS */
} else if (os_strncmp(buf, "ROAM ", 5) == 0) { } else if (os_strncmp(buf, "ROAM ", 5) == 0) {
if (wpa_supplicant_ctrl_iface_roam(wpa_s, buf + 5)) if (wpa_supplicant_ctrl_iface_roam(wpa_s, buf + 5))
reply_len = -1; reply_len = -1;

4
wpa_supplicant/wpa_cli.c
View file

@ -1738,10 +1738,12 @@ static int wpa_cli_cmd_resume(struct wpa_ctrl *ctrl, int argc, char *argv[])
} }
#ifdef CONFIG_TESTING_OPTIONS
static int wpa_cli_cmd_drop_sa(struct wpa_ctrl *ctrl, int argc, char *argv[]) static int wpa_cli_cmd_drop_sa(struct wpa_ctrl *ctrl, int argc, char *argv[])
{ {
return wpa_ctrl_command(ctrl, "DROP_SA"); return wpa_ctrl_command(ctrl, "DROP_SA");
} }
#endif /* CONFIG_TESTING_OPTIONS */
static int wpa_cli_cmd_roam(struct wpa_ctrl *ctrl, int argc, char *argv[]) static int wpa_cli_cmd_roam(struct wpa_ctrl *ctrl, int argc, char *argv[])
@ -2768,8 +2770,10 @@ static struct wpa_cli_cmd wpa_cli_commands[] = {
"= notification of suspend/hibernate" }, "= notification of suspend/hibernate" },
{ "resume", wpa_cli_cmd_resume, NULL, cli_cmd_flag_none, { "resume", wpa_cli_cmd_resume, NULL, cli_cmd_flag_none,
"= notification of resume/thaw" }, "= notification of resume/thaw" },
#ifdef CONFIG_TESTING_OPTIONS
{ "drop_sa", wpa_cli_cmd_drop_sa, NULL, cli_cmd_flag_none, { "drop_sa", wpa_cli_cmd_drop_sa, NULL, cli_cmd_flag_none,
"= drop SA without deauth/disassoc (test command)" }, "= drop SA without deauth/disassoc (test command)" },
#endif /* CONFIG_TESTING_OPTIONS */
{ "roam", wpa_cli_cmd_roam, wpa_cli_complete_bss, { "roam", wpa_cli_cmd_roam, wpa_cli_complete_bss,
cli_cmd_flag_none, cli_cmd_flag_none,
"<addr> = roam to the specified BSS" }, "<addr> = roam to the specified BSS" },