From 6fd5ceaf70ad32effea675c5f7dc0c76fc19cc23 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Sat, 18 May 2013 11:40:23 +0300 Subject: [PATCH] wpa_cli: Allow global interface to be used in interactive mode This is mostly a corner case at this point, but if wpa_cli was started with global control interface connection (-g) and interactive mode, per-interface control interface was tried to be opened with the previously opened global ctrl_iface connection gettign leaked. Signed-hostap: Jouni Malinen --- wpa_supplicant/wpa_cli.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/wpa_supplicant/wpa_cli.c b/wpa_supplicant/wpa_cli.c index 0727e921b..08bc1b1e6 100644 --- a/wpa_supplicant/wpa_cli.c +++ b/wpa_supplicant/wpa_cli.c @@ -3330,6 +3330,9 @@ static void update_bssid_list(struct wpa_ctrl *ctrl) static void try_connection(void *eloop_ctx, void *timeout_ctx) { + if (ctrl_conn) + goto done; + if (ctrl_ifname == NULL) ctrl_ifname = wpa_cli_get_default_ifname(); @@ -3348,6 +3351,7 @@ static void try_connection(void *eloop_ctx, void *timeout_ctx) if (warning_displayed) printf("Connection established.\n"); +done: start_edit(); }