nl80211: Add send_and_recv_resp() helper

This is a variant for the second most common case of send_and_recv() needs:
send a command with a special response handling.

Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>

diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
index a5fe02500df4c927707cbdab622534ad2153f25e..c4448d66c4c645118553f1d19648c2a6b5783188 100644 (file)
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
@@ -778,8 +778,7 @@ int nl80211_get_wiphy_index(struct i802_bss *bss)
        if (!(msg = nl80211_cmd_msg(bss, 0, NL80211_CMD_GET_INTERFACE)))
                return -1;
 
-       if (send_and_recv_msgs(bss->drv, msg, netdev_info_handler, &data,
-                              NULL, NULL, NULL) == 0)
+       if (send_and_recv_resp(bss->drv, msg, netdev_info_handler, &data) == 0)
                return data.wiphy_idx;
        return -1;
 }
@@ -796,8 +795,7 @@ static enum nl80211_iftype nl80211_get_ifmode(struct i802_bss *bss)
        if (!(msg = nl80211_cmd_msg(bss, 0, NL80211_CMD_GET_INTERFACE)))
                return NL80211_IFTYPE_UNSPECIFIED;
 
-       if (send_and_recv_msgs(bss->drv, msg, netdev_info_handler, &data,
-                              NULL, NULL, NULL) == 0)
+       if (send_and_recv_resp(bss->drv, msg, netdev_info_handler, &data) == 0)
                return data.nlmode;
        return NL80211_IFTYPE_UNSPECIFIED;
 }
@@ -813,8 +811,7 @@ static int nl80211_get_macaddr(struct i802_bss *bss)
        if (!(msg = nl80211_cmd_msg(bss, 0, NL80211_CMD_GET_INTERFACE)))
                return -1;
 
-       return send_and_recv_msgs(bss->drv, msg, netdev_info_handler, &data,
-                                 NULL, NULL, NULL);
+       return send_and_recv_resp(bss->drv, msg, netdev_info_handler, &data);
 }
 
 
@@ -826,8 +823,7 @@ static int nl80211_get_4addr(struct i802_bss *bss)
        };
 
        if (!(msg = nl80211_cmd_msg(bss, 0, NL80211_CMD_GET_INTERFACE)) ||
-           send_and_recv_msgs(bss->drv, msg, netdev_info_handler, &data,
-                              NULL, NULL, NULL))
+           send_and_recv_resp(bss->drv, msg, netdev_info_handler, &data))
                return -1;
        return data.use_4addr;
 }
@@ -1107,8 +1103,8 @@ static int nl80211_get_sta_mlo_info(void *priv,
                struct nl_msg *msg;
 
                msg = nl80211_drv_msg(drv, 0, NL80211_CMD_GET_INTERFACE);
-               if (send_and_recv_msgs(drv, msg, get_mlo_info,
-                                      &drv->sta_mlo_info, NULL, NULL, NULL))
+               if (send_and_recv_resp(drv, msg, get_mlo_info,
+                                      &drv->sta_mlo_info))
                        return -1;
        }
 
@@ -1650,8 +1646,8 @@ try_again:
        msg = nl80211_drv_msg(drv, NLM_F_DUMP, NL80211_CMD_GET_SCAN);
        os_memset(&arg, 0, sizeof(arg));
        arg.drv = drv;
-       ret = send_and_recv_msgs(drv, msg, nl80211_get_assoc_freq_handler,
-                                &arg, NULL, NULL, NULL);
+       ret = send_and_recv_resp(drv, msg, nl80211_get_assoc_freq_handler,
+                                &arg);
        if (ret == -EAGAIN) {
                count++;
                if (count >= 10) {
@@ -1684,8 +1680,8 @@ try_again:
        msg = nl80211_drv_msg(drv, NLM_F_DUMP, NL80211_CMD_GET_SCAN);
        os_memset(&arg, 0, sizeof(arg));
        arg.drv = drv;
-       ret = send_and_recv_msgs(drv, msg, nl80211_get_assoc_freq_handler,
-                                &arg, NULL, NULL, NULL);
+       ret = send_and_recv_resp(drv, msg, nl80211_get_assoc_freq_handler,
+                                &arg);
        if (ret == -EAGAIN) {
                count++;
                if (count >= 10) {
@@ -1773,8 +1769,7 @@ int nl80211_get_link_noise(struct wpa_driver_nl80211_data *drv,
        sig_change->frequency = drv->assoc_freq;
 
        msg = nl80211_drv_msg(drv, NLM_F_DUMP, NL80211_CMD_GET_SURVEY);
-       return send_and_recv_msgs(drv, msg, get_link_noise, sig_change,
-                                 NULL, NULL, NULL);
+       return send_and_recv_resp(drv, msg, get_link_noise, sig_change);
 }
 
 
@@ -1838,8 +1833,7 @@ static int nl80211_channel_info(void *priv, struct wpa_channel_info *ci)
        struct nl_msg *msg;
 
        msg = nl80211_drv_msg(drv, 0, NL80211_CMD_GET_INTERFACE);
-       return send_and_recv_msgs(drv, msg, get_channel_info, ci, NULL, NULL,
-                                 NULL);
+       return send_and_recv_resp(drv, msg, get_channel_info, ci);
 }
 
 
@@ -1934,8 +1928,7 @@ static int wpa_driver_nl80211_get_country(void *priv, char *alpha2)
        }
 
        alpha2[0] = '\0';
-       ret = send_and_recv_msgs(drv, msg, nl80211_get_country, alpha2,
-                                NULL, NULL, NULL);
+       ret = send_and_recv_resp(drv, msg, nl80211_get_country, alpha2);
        if (!alpha2[0])
                ret = -1;
 
@@ -2905,8 +2898,7 @@ static void qca_vendor_test(struct wpa_driver_nl80211_data *drv)
        }
        nla_nest_end(msg, params);
 
-       ret = send_and_recv_msgs(drv, msg, qca_vendor_test_cmd_handler, drv,
-                                NULL, NULL, NULL);
+       ret = send_and_recv_resp(drv, msg, qca_vendor_test_cmd_handler, drv);
        wpa_printf(MSG_DEBUG,
                   "nl80211: QCA vendor test command returned %d (%s)",
                   ret, strerror(-ret));
@@ -5996,7 +5988,7 @@ static int nl80211_create_iface_once(struct wpa_driver_nl80211_data *drv,
            nla_put(msg, NL80211_ATTR_MAC, ETH_ALEN, addr))
                goto fail;
 
-       ret = send_and_recv_msgs(drv, msg, handler, arg, NULL, NULL, NULL);
+       ret = send_and_recv_resp(drv, msg, handler, arg);
        msg = NULL;
        if (ret) {
        fail:
@@ -7647,8 +7639,7 @@ static int i802_get_seqnum(const char *iface, void *priv, const u8 *addr,
        }
 
        os_memset(seq, 0, 6);
-       res = send_and_recv_msgs(drv, msg, get_key_handler, seq, NULL, NULL,
-                                NULL);
+       res = send_and_recv_resp(drv, msg, get_key_handler, seq);
        if (res) {
                wpa_printf(MSG_DEBUG,
                           "nl80211: Failed to get current TX sequence for a key (link_id=%d idx=%d): %d (%s)",
@@ -8059,8 +8050,7 @@ int nl80211_get_link_signal(struct wpa_driver_nl80211_data *drv,
                return -ENOBUFS;
        }
 
-       return send_and_recv_msgs(drv, msg, get_sta_handler, data, NULL, NULL,
-                                 NULL);
+       return send_and_recv_resp(drv, msg, get_sta_handler, data);
 }
 
 
@@ -8076,8 +8066,7 @@ static int i802_read_sta_data(struct i802_bss *bss,
                return -ENOBUFS;
        }
 
-       return send_and_recv_msgs(bss->drv, msg, get_sta_handler, data,
-                                 NULL, NULL, NULL);
+       return send_and_recv_resp(bss->drv, msg, get_sta_handler, data);
 }
 
 
@@ -9036,8 +9025,7 @@ static int nl80211_send_frame_cmd(struct i802_bss *bss,
                goto fail;
 
        cookie = 0;
-       ret = send_and_recv_msgs(drv, msg, cookie_handler, &cookie, NULL, NULL,
-                                NULL);
+       ret = send_and_recv_resp(drv, msg, cookie_handler, &cookie);
        msg = NULL;
        if (ret) {
                wpa_printf(MSG_DEBUG, "nl80211: Frame command failed: ret=%d "
@@ -9224,8 +9212,7 @@ static int wpa_driver_nl80211_remain_on_channel(void *priv, unsigned int freq,
        }
 
        cookie = 0;
-       ret = send_and_recv_msgs(drv, msg, cookie_handler, &cookie, NULL, NULL,
-                                NULL);
+       ret = send_and_recv_resp(drv, msg, cookie_handler, &cookie);
        if (ret == 0) {
                wpa_printf(MSG_DEBUG, "nl80211: Remain-on-channel cookie "
                           "0x%llx for freq=%u MHz duration=%u",
@@ -9556,8 +9543,7 @@ static int nl80211_get_channel_width(struct wpa_driver_nl80211_data *drv,
        struct nl_msg *msg;
 
        msg = nl80211_drv_msg(drv, 0, NL80211_CMD_GET_INTERFACE);
-       return send_and_recv_msgs(drv, msg, get_channel_width, sig, NULL, NULL,
-                                 NULL);
+       return send_and_recv_resp(drv, msg, get_channel_width, sig);
 }
 
 
@@ -9641,8 +9627,7 @@ static int nl80211_get_links_noise(struct wpa_driver_nl80211_data *drv,
        struct nl_msg *msg;
 
        msg = nl80211_drv_msg(drv, NLM_F_DUMP, NL80211_CMD_GET_SURVEY);
-       return send_and_recv_msgs(drv, msg, get_links_noise, mlo_sig,
-                                 NULL, NULL, NULL);
+       return send_and_recv_resp(drv, msg, get_links_noise, mlo_sig);
 }
 
 
@@ -9696,8 +9681,7 @@ static int nl80211_get_links_channel_width(struct wpa_driver_nl80211_data *drv,
        struct nl_msg *msg;
 
        msg = nl80211_drv_msg(drv, 0, NL80211_CMD_GET_INTERFACE);
-       return send_and_recv_msgs(drv, msg, get_links_channel_width, mlo_sig,
-                                 NULL, NULL, NULL);
+       return send_and_recv_resp(drv, msg, get_links_channel_width, mlo_sig);
 }
 
 
@@ -10168,8 +10152,8 @@ static int wpa_driver_nl80211_get_survey(void *priv, unsigned int freq)
 
        do {
                wpa_printf(MSG_DEBUG, "nl80211: Fetch survey data");
-               err = send_and_recv_msgs(drv, msg, survey_handler,
-                                        survey_results, NULL, NULL, NULL);
+               err = send_and_recv_resp(drv, msg, survey_handler,
+                                        survey_results);
        } while (err > 0);
 
        if (err)
@@ -10276,8 +10260,7 @@ static void nl80211_poll_client(void *priv, const u8 *own_addr, const u8 *addr,
                return;
        }
 
-       ret = send_and_recv_msgs(drv, msg, cookie_handler, &cookie, NULL, NULL,
-                                NULL);
+       ret = send_and_recv_resp(drv, msg, cookie_handler, &cookie);
        if (ret < 0) {
                wpa_printf(MSG_DEBUG, "nl80211: Client probe request for "
                           MACSTR " failed: ret=%d (%s)",
@@ -10995,8 +10978,8 @@ static int wpa_driver_nl80211_status(void *priv, char *buf, size_t buflen)
        if (msg &&
            nl80211_cmd(drv, msg, 0, NL80211_CMD_GET_REG) &&
            nla_put_u32(msg, NL80211_ATTR_WIPHY, drv->wiphy_idx) == 0) {
-               if (send_and_recv_msgs(drv, msg, nl80211_get_country,
-                                      alpha2, NULL, NULL, NULL) == 0 &&
+               if (send_and_recv_resp(drv, msg, nl80211_get_country,
+                                      alpha2) == 0 &&
                    alpha2[0]) {
                        res = os_snprintf(pos, end - pos, "country=%s\n",
                                          alpha2);
@@ -11439,8 +11422,7 @@ static int nl80211_vendor_cmd(void *priv, unsigned int vendor_id,
                     data_len, data)))
                goto fail;
 
-       ret = send_and_recv_msgs(drv, msg, vendor_reply_handler, buf,
-                                NULL, NULL, NULL);
+       ret = send_and_recv_resp(drv, msg, vendor_reply_handler, buf);
        if (ret)
                wpa_printf(MSG_DEBUG, "nl80211: vendor command failed err=%d",
                           ret);
@@ -11504,8 +11486,7 @@ static int nl80211_get_wowlan(void *priv)
 
        msg = nl80211_drv_msg(drv, 0, NL80211_CMD_GET_WOWLAN);
 
-       ret = send_and_recv_msgs(drv, msg, get_wowlan_handler, &wowlan_enabled,
-                                NULL, NULL, NULL);
+       ret = send_and_recv_resp(drv, msg, get_wowlan_handler, &wowlan_enabled);
        if (ret) {
                wpa_printf(MSG_DEBUG, "nl80211: Getting wowlan status failed");
                return 0;
@@ -12673,11 +12654,10 @@ static int nl80211_get_pref_freq_list(void *priv,
 
        if (freq_list)
                os_memset(freq_list, 0, *num * sizeof(struct weighted_pcl));
-       ret = send_and_recv_msgs(drv, msg, preferred_freq_info_handler, &param,
-                                NULL, NULL, NULL);
+       ret = send_and_recv_resp(drv, msg, preferred_freq_info_handler, &param);
        if (ret) {
                wpa_printf(MSG_ERROR,
-                          "%s: err in send_and_recv_msgs", __func__);
+                          "%s: err in send_and_recv_resp", __func__);
                return ret;
        }
 
@@ -13049,9 +13029,9 @@ nl80211_get_bss_transition_status(void *priv, struct wpa_bss_trans_info *params)
        nla_nest_end(msg, attr1);
        nla_nest_end(msg, attr);
 
-       ret = send_and_recv_msgs(drv, msg,
+       ret = send_and_recv_resp(drv, msg,
                                 nl80211_get_bss_transition_status_handler,
-                                info, NULL, NULL, NULL);
+                                info);
        msg = NULL;
        if (ret) {
                wpa_printf(MSG_ERROR,

diff --git a/src/drivers/driver_nl80211.h b/src/drivers/driver_nl80211.h
index 0b9bc9a8c3375db28ccef439a60a9d815102b313..ee736d17aee2ad7d1ec045b9567f2c81ef595ee3 100644 (file)
--- a/src/drivers/driver_nl80211.h
+++ b/src/drivers/driver_nl80211.h
@@ -295,6 +295,16 @@ send_and_recv_cmd(struct wpa_driver_nl80211_data *drv,
                             NULL, NULL, NULL, NULL, NULL);
 }
 
+static inline int
+send_and_recv_resp(struct wpa_driver_nl80211_data *drv,
+                  struct nl_msg *msg,
+                  int (*valid_handler)(struct nl_msg *, void *),
+                  void *valid_data)
+{
+       return send_and_recv(drv->global, drv->global->nl, msg,
+                            valid_handler, valid_data, NULL, NULL, NULL);
+}
+
 static inline int
 send_and_recv_msgs(struct wpa_driver_nl80211_data *drv,
                   struct nl_msg *msg,

diff --git a/src/drivers/driver_nl80211_capa.c b/src/drivers/driver_nl80211_capa.c
index 8e033ceb0ed1652110776c8d73784384dd9b17fa..d223cc69397f974e093b4a8e7ec2d09e410a92e7 100644 (file)
--- a/src/drivers/driver_nl80211_capa.c
+++ b/src/drivers/driver_nl80211_capa.c
@@ -50,8 +50,7 @@ static u32 get_nl80211_protocol_features(struct wpa_driver_nl80211_data *drv)
                return 0;
        }
 
-       if (send_and_recv_msgs(drv, msg, protocol_feature_handler, &feat,
-                              NULL, NULL, NULL) == 0)
+       if (send_and_recv_resp(drv, msg, protocol_feature_handler, &feat) == 0)
                return feat;
 
        return 0;
@@ -1202,8 +1201,7 @@ static int wpa_driver_nl80211_get_info(struct wpa_driver_nl80211_data *drv,
                return -1;
        }
 
-       if (send_and_recv_msgs(drv, msg, wiphy_info_handler, info, NULL, NULL,
-                              NULL))
+       if (send_and_recv_resp(drv, msg, wiphy_info_handler, info))
                return -1;
 
        if (info->auth_supported)
@@ -1312,8 +1310,7 @@ static void qca_nl80211_check_dfs_capa(struct wpa_driver_nl80211_data *drv)
                return;
        }
 
-       ret = send_and_recv_msgs(drv, msg, dfs_info_handler, &dfs_capability,
-                                NULL, NULL, NULL);
+       ret = send_and_recv_resp(drv, msg, dfs_info_handler, &dfs_capability);
        if (!ret && dfs_capability)
                drv->capa.flags |= WPA_DRIVER_FLAGS_DFS_OFFLOAD;
 }
@@ -1400,8 +1397,7 @@ static void qca_nl80211_get_features(struct wpa_driver_nl80211_data *drv)
 
        os_memset(&info, 0, sizeof(info));
        info.capa = &drv->capa;
-       ret = send_and_recv_msgs(drv, msg, features_info_handler, &info,
-                                NULL, NULL, NULL);
+       ret = send_and_recv_resp(drv, msg, features_info_handler, &info);
        if (ret || !info.flags)
                return;
 
@@ -2541,8 +2537,7 @@ static int nl80211_set_regulatory_flags(struct wpa_driver_nl80211_data *drv,
                }
        }
 
-       return send_and_recv_msgs(drv, msg, nl80211_get_reg, results,
-                                 NULL, NULL, NULL);
+       return send_and_recv_resp(drv, msg, nl80211_get_reg, results);
 }
 
 
@@ -2634,8 +2629,7 @@ nl80211_get_hw_feature_data(void *priv, u16 *num_modes, u16 *flags,
                return NULL;
        }
 
-       if (send_and_recv_msgs(drv, msg, phy_info_handler, &result,
-                              NULL, NULL, NULL) == 0) {
+       if (send_and_recv_resp(drv, msg, phy_info_handler, &result) == 0) {
                struct hostapd_hw_modes *modes;
 
                nl80211_set_regulatory_flags(drv, &result);

diff --git a/src/drivers/driver_nl80211_event.c b/src/drivers/driver_nl80211_event.c
index 6c674672ea0e9fae33d495e6268f199c94b0420a..a0f32cdca6b9df7fe3c075b097b56d4879c673a2 100644 (file)
--- a/src/drivers/driver_nl80211_event.c
+++ b/src/drivers/driver_nl80211_event.c
@@ -386,9 +386,9 @@ drv_get_connect_fail_reason_code(struct wpa_driver_nl80211_data *drv)
                return 0;
        }
 
-       ret = send_and_recv_msgs(drv, msg,
+       ret = send_and_recv_resp(drv, msg,
                                 qca_drv_connect_fail_reason_code_handler,
-                                &reason_code, NULL, NULL, NULL);
+                                &reason_code);
        if (ret)
                wpa_printf(MSG_DEBUG,
                           "nl80211: Get connect fail reason_code failed: ret=%d (%s)",

diff --git a/src/drivers/driver_nl80211_scan.c b/src/drivers/driver_nl80211_scan.c
index da3bce661873b8321f41f1419778908429403fba..c482b054819532076ca61b9579b39ea9b669b189 100644 (file)
--- a/src/drivers/driver_nl80211_scan.c
+++ b/src/drivers/driver_nl80211_scan.c
@@ -82,8 +82,7 @@ static int nl80211_get_noise_for_scan_results(
 
        os_memset(info, 0, sizeof(*info));
        msg = nl80211_drv_msg(drv, NLM_F_DUMP, NL80211_CMD_GET_SURVEY);
-       return send_and_recv_msgs(drv, msg, get_noise_for_scan_results, info,
-                                 NULL, NULL, NULL);
+       return send_and_recv_resp(drv, msg, get_noise_for_scan_results, info);
 }
 
 
@@ -992,8 +991,7 @@ try_again:
 
        arg.drv = drv;
        arg.res = res;
-       ret = send_and_recv_msgs(drv, msg, bss_info_handler, &arg, NULL, NULL,
-                                NULL);
+       ret = send_and_recv_resp(drv, msg, bss_info_handler, &arg);
        if (ret == -EAGAIN) {
                count++;
                if (count >= 10) {
@@ -1077,8 +1075,7 @@ void nl80211_dump_scan(struct wpa_driver_nl80211_data *drv)
        ctx.idx = 0;
        msg = nl80211_cmd_msg(drv->first_bss, NLM_F_DUMP, NL80211_CMD_GET_SCAN);
        if (msg)
-               send_and_recv_msgs(drv, msg, nl80211_dump_scan_handler, &ctx,
-                                  NULL, NULL, NULL);
+               send_and_recv_resp(drv, msg, nl80211_dump_scan_handler, &ctx);
 }
 
 
@@ -1271,8 +1268,7 @@ int wpa_driver_nl80211_vendor_scan(struct i802_bss *bss,
 
        nla_nest_end(msg, attr);
 
-       ret = send_and_recv_msgs(drv, msg, scan_cookie_handler, &cookie,
-                                NULL, NULL, NULL);
+       ret = send_and_recv_resp(drv, msg, scan_cookie_handler, &cookie);
        msg = NULL;
        if (ret) {
                wpa_printf(MSG_DEBUG,