Reduce debug verbosity for read-only control interface commands

Commands like BSS and GET_NETWORK are used in some cases very frequently
and those can increase the amount of debug information from
wpa_supplicant without significant benefit. These were logged at the
DEBUG level (-d). Move logging of such read-only commands (i.e., no new
wpa_supplicant operation is started based on it) to EXCESSIVE level
(-ddd) which was already used for the PING command.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Jouni Malinen 2015-09-10 11:17:19 +03:00 committed by Jouni Malinen
parent 7cb9bb4d9b
commit 8db9a79d41

View file

@ -3039,19 +3039,19 @@ static int wpa_supplicant_ctrl_iface_get_network(
*name++ = '\0'; *name++ = '\0';
id = atoi(cmd); id = atoi(cmd);
wpa_printf(MSG_DEBUG, "CTRL_IFACE: GET_NETWORK id=%d name='%s'", wpa_printf(MSG_EXCESSIVE, "CTRL_IFACE: GET_NETWORK id=%d name='%s'",
id, name); id, name);
ssid = wpa_config_get_network(wpa_s->conf, id); ssid = wpa_config_get_network(wpa_s->conf, id);
if (ssid == NULL) { if (ssid == NULL) {
wpa_printf(MSG_DEBUG, "CTRL_IFACE: Could not find network " wpa_printf(MSG_EXCESSIVE, "CTRL_IFACE: Could not find network "
"id=%d", id); "id=%d", id);
return -1; return -1;
} }
value = wpa_config_get_no_key(ssid, name); value = wpa_config_get_no_key(ssid, name);
if (value == NULL) { if (value == NULL) {
wpa_printf(MSG_DEBUG, "CTRL_IFACE: Failed to get network " wpa_printf(MSG_EXCESSIVE, "CTRL_IFACE: Failed to get network "
"variable '%s'", name); "variable '%s'", name);
return -1; return -1;
} }
@ -8112,6 +8112,19 @@ static int wpas_ctrl_iface_mac_rand_scan(struct wpa_supplicant *wpa_s,
} }
static int wpas_ctrl_cmd_debug_level(const char *cmd)
{
if (os_strcmp(cmd, "PING") == 0 ||
os_strncmp(cmd, "BSS ", 4) == 0 ||
os_strncmp(cmd, "GET_NETWORK ", 12) == 0 ||
os_strncmp(cmd, "STATUS", 6) == 0 ||
os_strncmp(cmd, "STA ", 4) == 0 ||
os_strncmp(cmd, "STA-", 4) == 0)
return MSG_EXCESSIVE;
return MSG_DEBUG;
}
char * wpa_supplicant_ctrl_iface_process(struct wpa_supplicant *wpa_s, char * wpa_supplicant_ctrl_iface_process(struct wpa_supplicant *wpa_s,
char *buf, size_t *resp_len) char *buf, size_t *resp_len)
{ {
@ -8135,9 +8148,7 @@ char * wpa_supplicant_ctrl_iface_process(struct wpa_supplicant *wpa_s,
wpa_hexdump_ascii_key(MSG_DEBUG, "RX ctrl_iface", wpa_hexdump_ascii_key(MSG_DEBUG, "RX ctrl_iface",
(const u8 *) buf, os_strlen(buf)); (const u8 *) buf, os_strlen(buf));
} else { } else {
int level = MSG_DEBUG; int level = wpas_ctrl_cmd_debug_level(buf);
if (os_strcmp(buf, "PING") == 0)
level = MSG_EXCESSIVE;
wpa_dbg(wpa_s, level, "Control interface command '%s'", buf); wpa_dbg(wpa_s, level, "Control interface command '%s'", buf);
} }