DFS: Print error in case CAC fails

Previously, we printed this message as a debug one, which was confusing
in case verbose debug messages were disabled. User could think CAC
started but never ended. Add more parameterss to DFS_EVENT_CAC_START, so
external programs can more easily check what was wrong in case of
errors.

Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>

diff --git a/src/ap/ap_drv_ops.c b/src/ap/ap_drv_ops.c
index b8b260a..5ba48c9 100644 (file)
--- a/src/ap/ap_drv_ops.c
+++ b/src/ap/ap_drv_ops.c
@@ -767,8 +767,10 @@ int hostapd_start_dfs_cac(struct hostapd_iface *iface, int mode, int freq,
                                    vht_enabled, sec_channel_offset,
                                    vht_oper_chwidth, center_segment0,
                                    center_segment1,
-                                   iface->current_mode->vht_capab))
+                                   iface->current_mode->vht_capab)) {
+               wpa_printf(MSG_ERROR, "Can't set freq params");
                return -1;
+       }
 
        res = hapd->driver->start_dfs_cac(hapd->drv_priv, &data);
        if (!res)

diff --git a/src/ap/dfs.c b/src/ap/dfs.c
index 2b8b90f..92eda21 100644 (file)
--- a/src/ap/dfs.c
+++ b/src/ap/dfs.c
@@ -608,19 +608,25 @@ int hostapd_handle_dfs(struct hostapd_iface *iface)
        hostapd_set_state(iface, HAPD_IFACE_DFS);
        wpa_printf(MSG_DEBUG, "DFS start CAC on %d MHz", iface->freq);
        wpa_msg(iface->bss[0]->msg_ctx, MSG_INFO, DFS_EVENT_CAC_START
-               "freq=%d chan=%d sec_chan=%d",
+               "freq=%d chan=%d sec_chan=%d, width=%d, seg0=%d, seg1=%d",
                iface->freq,
-               iface->conf->channel, iface->conf->secondary_channel);
-       if (hostapd_start_dfs_cac(iface, iface->conf->hw_mode,
-                                 iface->freq,
-                                 iface->conf->channel,
-                                 iface->conf->ieee80211n,
-                                 iface->conf->ieee80211ac,
-                                 iface->conf->secondary_channel,
-                                 iface->conf->vht_oper_chwidth,
-                                 iface->conf->vht_oper_centr_freq_seg0_idx,
-                                 iface->conf->vht_oper_centr_freq_seg1_idx)) {
-               wpa_printf(MSG_DEBUG, "DFS start_dfs_cac() failed");
+               iface->conf->channel, iface->conf->secondary_channel,
+               iface->conf->vht_oper_chwidth,
+               iface->conf->vht_oper_centr_freq_seg0_idx,
+               iface->conf->vht_oper_centr_freq_seg1_idx);
+
+       res = hostapd_start_dfs_cac(iface, iface->conf->hw_mode,
+                                   iface->freq,
+                                   iface->conf->channel,
+                                   iface->conf->ieee80211n,
+                                   iface->conf->ieee80211ac,
+                                   iface->conf->secondary_channel,
+                                   iface->conf->vht_oper_chwidth,
+                                   iface->conf->vht_oper_centr_freq_seg0_idx,
+                                   iface->conf->vht_oper_centr_freq_seg1_idx);
+
+       if (res) {
+               wpa_printf(MSG_ERROR, "DFS start_dfs_cac() failed, %d", res);
                return -1;
        }