From fa0e91767d5ce18eafc7efe00a7c4dabaffba118 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Fri, 26 Sep 2014 15:23:00 +0300 Subject: [PATCH] wpa_cli: Fix PING in interactive mode with ifname_prefix The ifname_prefix string could change during line editing and the periodic PING command running in the background ended up getting the latest snapshot of the command line due to the pointer being left to point to the edit buffer. This resulted in unexpected prefix strings getting used with the periodic PING command. Fix this by temporarily clearing the ifname_prefix whenever running such a periodic PING. Signed-off-by: Jouni Malinen --- wpa_supplicant/wpa_cli.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/wpa_supplicant/wpa_cli.c b/wpa_supplicant/wpa_cli.c index 8811d6fd7..3b48c9339 100644 --- a/wpa_supplicant/wpa_cli.c +++ b/wpa_supplicant/wpa_cli.c @@ -3449,10 +3449,18 @@ static int tokenize_cmd(char *cmd, char *argv[]) static void wpa_cli_ping(void *eloop_ctx, void *timeout_ctx) { - if (ctrl_conn && _wpa_ctrl_command(ctrl_conn, "PING", 0)) { - printf("Connection to wpa_supplicant lost - trying to " - "reconnect\n"); - wpa_cli_close_connection(); + if (ctrl_conn) { + int res; + char *prefix = ifname_prefix; + + ifname_prefix = NULL; + res = _wpa_ctrl_command(ctrl_conn, "PING", 0); + ifname_prefix = prefix; + if (res) { + printf("Connection to wpa_supplicant lost - trying to " + "reconnect\n"); + wpa_cli_close_connection(); + } } if (!ctrl_conn) wpa_cli_reconnect();