nl80211: Use wpa_ssid_txt() for debug messages more consistently

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>

diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
index 0a70e22f799af865f1a5c64844957b74bb85340d..e0e6fe52c3fcfcba1026c2eecb243ec999575f1a 100644 (file)
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
@@ -3477,8 +3477,8 @@ retry:
                        goto fail;
        }
        if (params->ssid) {
-               wpa_hexdump_ascii(MSG_DEBUG, "  * SSID",
-                                 params->ssid, params->ssid_len);
+               wpa_printf(MSG_DEBUG, "  * SSID=%s",
+                          wpa_ssid_txt(params->ssid, params->ssid_len));
                if (nla_put(msg, NL80211_ATTR_SSID, params->ssid_len,
                            params->ssid))
                        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: rate_type=%d", params->rate_type);
        wpa_printf(MSG_DEBUG, "nl80211: dtim_period=%d", params->dtim_period);
-       wpa_hexdump_ascii(MSG_DEBUG, "nl80211: ssid",
-                         params->ssid, params->ssid_len);
+       wpa_printf(MSG_DEBUG, "nl80211: ssid=%s",
+                  wpa_ssid_txt(params->ssid, params->ssid_len));
        if (!(msg = nl80211_bss_msg(bss, 0, cmd)) ||
            nla_put(msg, NL80211_ATTR_BEACON_HEAD, params->head_len,
                    params->head) ||
@@ -5289,8 +5289,8 @@ retry:
            params->ssid == NULL || params->ssid_len > sizeof(drv->ssid))
                goto fail;
 
-       wpa_hexdump_ascii(MSG_DEBUG, "  * SSID",
-                         params->ssid, params->ssid_len);
+       wpa_printf(MSG_DEBUG, "  * SSID=%s",
+                  wpa_ssid_txt(params->ssid, params->ssid_len));
        if (nla_put(msg, NL80211_ATTR_SSID, params->ssid_len, params->ssid))
                goto fail;
        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) {
-               wpa_hexdump_ascii(MSG_DEBUG, "  * SSID",
-                                 params->ssid, params->ssid_len);
+               wpa_printf(MSG_DEBUG, "  * SSID=%s",
+                          wpa_ssid_txt(params->ssid, params->ssid_len));
                if (nla_put(msg, NL80211_ATTR_SSID, params->ssid_len,
                            params->ssid))
                        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)
 {
        if (mesh_id) {
-               wpa_hexdump_ascii(MSG_DEBUG, "  * Mesh ID (SSID)",
-                                 mesh_id, mesh_id_len);
+               wpa_printf(MSG_DEBUG, "  * Mesh ID (SSID)=%s",
+                          wpa_ssid_txt(mesh_id, mesh_id_len));
                return nla_put(msg, NL80211_ATTR_MESH_ID, mesh_id_len, mesh_id);
        }
 

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