AP: Convert some wpa_printf to wpa_msg/dbg

This generates better log messages when running multiple
interfaces in one process.

Signed-off-by: Ben Greear <greearb@candelatech.com>

diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c
index 8284ab607ce1a5e27078e294164d281ff3226c8b..a38d77cbfa6d3671f29ae09f6f86efd02e761946 100644 (file)
--- a/hostapd/ctrl_iface.c
+++ b/hostapd/ctrl_iface.c
@@ -173,9 +173,9 @@ static int p2p_manager_disconnect(struct hostapd_data *hapd, u16 stype,
        if (mgmt == NULL)
                return -1;
 
-       wpa_printf(MSG_DEBUG, "P2P: Disconnect STA " MACSTR " with minor "
-                  "reason code %u (stype=%u)",
-                  MAC2STR(addr), minor_reason_code, stype);
+       wpa_dbg(hapd->msg_ctx, MSG_DEBUG, "P2P: Disconnect STA " MACSTR
+               " with minor reason code %u (stype=%u)",
+               MAC2STR(addr), minor_reason_code, stype);
 
        mgmt->frame_control = IEEE80211_FC(WLAN_FC_TYPE_MGMT, stype);
        os_memcpy(mgmt->da, addr, ETH_ALEN);
@@ -218,7 +218,8 @@ static int hostapd_ctrl_iface_deauthenticate(struct hostapd_data *hapd,
        struct sta_info *sta;
        const char *pos;
 
-       wpa_printf(MSG_DEBUG, "CTRL_IFACE DEAUTHENTICATE %s", txtaddr);
+       wpa_dbg(hapd->msg_ctx, MSG_DEBUG, "CTRL_IFACE DEAUTHENTICATE %s",
+               txtaddr);
 
        if (hwaddr_aton(txtaddr, addr))
                return -1;
@@ -274,7 +275,8 @@ static int hostapd_ctrl_iface_disassociate(struct hostapd_data *hapd,
        struct sta_info *sta;
        const char *pos;
 
-       wpa_printf(MSG_DEBUG, "CTRL_IFACE DISASSOCIATE %s", txtaddr);
+       wpa_dbg(hapd->msg_ctx, MSG_DEBUG, "CTRL_IFACE DISASSOCIATE %s",
+               txtaddr);
 
        if (hwaddr_aton(txtaddr, addr))
                return -1;

diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c
index 67384d0b8161a83d33bd3cfb36a1ba33b4914ff9..0c5ee2ec07ee0c1f0fdbce7d24b57cebdf07d891 100644 (file)
--- a/src/ap/hostapd.c
+++ b/src/ap/hostapd.c
@@ -347,12 +347,13 @@ static int hostapd_flush_old_stations(struct hostapd_data *hapd)
        if (hostapd_drv_none(hapd) || hapd->drv_priv == NULL)
                return 0;
 
-       wpa_printf(MSG_DEBUG, "Flushing old station entries");
+       wpa_dbg(hapd->msg_ctx, MSG_DEBUG, "Flushing old station entries");
        if (hostapd_flush(hapd)) {
-               wpa_printf(MSG_WARNING, "Could not connect to kernel driver.");
+               wpa_msg(hapd->msg_ctx, MSG_WARNING, "Could not connect to "
+                       "kernel driver");
                ret = -1;
        }
-       wpa_printf(MSG_DEBUG, "Deauthenticate all stations");
+       wpa_dbg(hapd->msg_ctx, MSG_DEBUG, "Deauthenticate all stations");
        os_memset(addr, 0xff, ETH_ALEN);
        hostapd_drv_sta_deauth(hapd, addr, WLAN_REASON_PREV_AUTH_NOT_VALID);
        hostapd_free_stas(hapd);

diff --git a/src/ap/ieee802_1x.c b/src/ap/ieee802_1x.c
index 18ee747441a76f24d42a5cdcc7cb0fe2d36e4282..d2121ab2ccaa5ca74ae54a8cdea0deb0db14474b 100644 (file)
--- a/src/ap/ieee802_1x.c
+++ b/src/ap/ieee802_1x.c
@@ -2094,8 +2094,8 @@ static void ieee802_1x_finished(struct hostapd_data *hapd,
                 * EAP-FAST with anonymous provisioning, may require another
                 * EAPOL authentication to be started to complete connection.
                 */
-               wpa_printf(MSG_DEBUG, "IEEE 802.1X: Force disconnection after "
-                          "EAP-Failure");
+               wpa_dbg(hapd->msg_ctx, MSG_DEBUG, "IEEE 802.1X: Force "
+                       "disconnection after EAP-Failure");
                /* Add a small sleep to increase likelihood of previously
                 * requested EAP-Failure TX getting out before this should the
                 * driver reorder operations.