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

nl80211: Use wpa_ssid_txt() for debug messages more consistently

Browse source 
Print the SSID with printf escaping instead of wpa_hexdump_ascii()
format to clean up the debug log a bit. This was already done for number
of SSID debug prints.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2019-02-10 00:06:26 +02:00
parent bbdb501460
commit 21cd8f8319
2 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/drivers/driver_nl80211.c
View file

@ -3477,8 +3477,8 @@ retry:
goto fail; goto fail;
} }
if (params->ssid) { if (params->ssid) {
wpa_hexdump_ascii(MSG_DEBUG, " * SSID", wpa_printf(MSG_DEBUG, " * SSID=%s",
params->ssid, params->ssid_len); wpa_ssid_txt(params->ssid, params->ssid_len));
if (nla_put(msg, NL80211_ATTR_SSID, params->ssid_len, if (nla_put(msg, NL80211_ATTR_SSID, params->ssid_len,
params->ssid)) params->ssid))
goto fail; goto fail;
@ -4074,8 +4074,8 @@ static int wpa_driver_nl80211_set_ap(void *priv,
wpa_printf(MSG_DEBUG, "nl80211: beacon_rate=%u", params->beacon_rate); wpa_printf(MSG_DEBUG, "nl80211: beacon_rate=%u", params->beacon_rate);
wpa_printf(MSG_DEBUG, "nl80211: rate_type=%d", params->rate_type); wpa_printf(MSG_DEBUG, "nl80211: rate_type=%d", params->rate_type);
wpa_printf(MSG_DEBUG, "nl80211: dtim_period=%d", params->dtim_period); wpa_printf(MSG_DEBUG, "nl80211: dtim_period=%d", params->dtim_period);
wpa_hexdump_ascii(MSG_DEBUG, "nl80211: ssid", wpa_printf(MSG_DEBUG, "nl80211: ssid=%s",
params->ssid, params->ssid_len); wpa_ssid_txt(params->ssid, params->ssid_len));
if (!(msg = nl80211_bss_msg(bss, 0, cmd)) || if (!(msg = nl80211_bss_msg(bss, 0, cmd)) ||
nla_put(msg, NL80211_ATTR_BEACON_HEAD, params->head_len, nla_put(msg, NL80211_ATTR_BEACON_HEAD, params->head_len,
params->head) || params->head) ||
@ -5289,8 +5289,8 @@ retry:
params->ssid == NULL || params->ssid_len > sizeof(drv->ssid)) params->ssid == NULL || params->ssid_len > sizeof(drv->ssid))
goto fail; goto fail;
wpa_hexdump_ascii(MSG_DEBUG, " * SSID", wpa_printf(MSG_DEBUG, " * SSID=%s",
params->ssid, params->ssid_len); wpa_ssid_txt(params->ssid, params->ssid_len));
if (nla_put(msg, NL80211_ATTR_SSID, params->ssid_len, params->ssid)) if (nla_put(msg, NL80211_ATTR_SSID, params->ssid_len, params->ssid))
goto fail; goto fail;
os_memcpy(drv->ssid, params->ssid, params->ssid_len); os_memcpy(drv->ssid, params->ssid, params->ssid_len);
@ -5451,8 +5451,8 @@ static int nl80211_connect_common(struct wpa_driver_nl80211_data *drv,
} }
if (params->ssid) { if (params->ssid) {
wpa_hexdump_ascii(MSG_DEBUG, " * SSID", wpa_printf(MSG_DEBUG, " * SSID=%s",
params->ssid, params->ssid_len); wpa_ssid_txt(params->ssid, params->ssid_len));
if (nla_put(msg, NL80211_ATTR_SSID, params->ssid_len, if (nla_put(msg, NL80211_ATTR_SSID, params->ssid_len,
params->ssid)) params->ssid))
return -1; return -1;
@ -9435,8 +9435,8 @@ static int nl80211_put_mesh_id(struct nl_msg *msg, const u8 *mesh_id,
size_t mesh_id_len) size_t mesh_id_len)
{ {
if (mesh_id) { if (mesh_id) {
wpa_hexdump_ascii(MSG_DEBUG, " * Mesh ID (SSID)", wpa_printf(MSG_DEBUG, " * Mesh ID (SSID)=%s",
mesh_id, mesh_id_len); wpa_ssid_txt(mesh_id, mesh_id_len));
return nla_put(msg, NL80211_ATTR_MESH_ID, mesh_id_len, mesh_id); return nla_put(msg, NL80211_ATTR_MESH_ID, mesh_id_len, mesh_id);
} }

20
src/drivers/driver_nl80211_scan.c
View file

@ -197,9 +197,9 @@ nl80211_scan_common(struct i802_bss *bss, u8 cmd,
if (ssids == NULL) if (ssids == NULL)
goto fail; goto fail;
for (i = 0; i < params->num_ssids; i++) { for (i = 0; i < params->num_ssids; i++) {
wpa_hexdump_ascii(MSG_MSGDUMP, "nl80211: Scan SSID", wpa_printf(MSG_MSGDUMP, "nl80211: Scan SSID %s",
params->ssids[i].ssid, wpa_ssid_txt(params->ssids[i].ssid,
params->ssids[i].ssid_len); params->ssids[i].ssid_len));
if (nla_put(msg, i + 1, params->ssids[i].ssid_len, if (nla_put(msg, i + 1, params->ssids[i].ssid_len,
params->ssids[i].ssid)) params->ssids[i].ssid))
goto fail; goto fail;
@ -537,10 +537,10 @@ int wpa_driver_nl80211_sched_scan(void *priv,
for (i = 0; i < drv->num_filter_ssids; i++) { for (i = 0; i < drv->num_filter_ssids; i++) {
struct nlattr *match_set_ssid; struct nlattr *match_set_ssid;
wpa_hexdump_ascii(MSG_MSGDUMP, wpa_printf(MSG_MSGDUMP,
"nl80211: Sched scan filter SSID", "nl80211: Sched scan filter SSID %s",
drv->filter_ssids[i].ssid, wpa_ssid_txt(drv->filter_ssids[i].ssid,
drv->filter_ssids[i].ssid_len); drv->filter_ssids[i].ssid_len));
match_set_ssid = nla_nest_start(msg, i + 1); match_set_ssid = nla_nest_start(msg, i + 1);
if (match_set_ssid == NULL || if (match_set_ssid == NULL ||
@ -1098,9 +1098,9 @@ int wpa_driver_nl80211_vendor_scan(struct i802_bss *bss,
if (ssids == NULL) if (ssids == NULL)
goto fail; goto fail;
for (i = 0; i < params->num_ssids; i++) { for (i = 0; i < params->num_ssids; i++) {
wpa_hexdump_ascii(MSG_MSGDUMP, "nl80211: Scan SSID", wpa_printf(MSG_MSGDUMP, "nl80211: Scan SSID %s",
params->ssids[i].ssid, wpa_ssid_txt(params->ssids[i].ssid,
params->ssids[i].ssid_len); params->ssids[i].ssid_len));
if (nla_put(msg, i + 1, params->ssids[i].ssid_len, if (nla_put(msg, i + 1, params->ssids[i].ssid_len,
params->ssids[i].ssid)) params->ssids[i].ssid))
goto fail; goto fail;