DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

nl80211: Add send_and_recv_cmd() helper

Browse source 
This is a variant for the most common case of send_and_recv() needs:
send a command without needing a special response handling. In addition,
move the helper functions into driver_nl80211.h since these are now
simple wrappers for the more flexible send_and_recv().

Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>
This commit is contained in:
Jouni Malinen 2023-12-19 01:00:23 +02:00 committed by Jouni Malinen
parent c73f9cde8b
commit ab506d7772
3 changed files with 114 additions and 103 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

168
src/drivers/driver_nl80211.c
View file

@ -488,13 +488,13 @@ out:
} }
static int send_and_recv(struct nl80211_global *global, int send_and_recv(struct nl80211_global *global,
struct nl_sock *nl_handle, struct nl_msg *msg, struct nl_sock *nl_handle, struct nl_msg *msg,
int (*valid_handler)(struct nl_msg *, void *), int (*valid_handler)(struct nl_msg *, void *),
void *valid_data, void *valid_data,
int (*ack_handler_custom)(struct nl_msg *, void *), int (*ack_handler_custom)(struct nl_msg *, void *),
void *ack_data, void *ack_data,
struct nl80211_err_info *err_info) struct nl80211_err_info *err_info)
{ {
struct nl_cb *cb; struct nl_cb *cb;
struct nl80211_ack_err_args err; struct nl80211_ack_err_args err;
@ -582,20 +582,6 @@ static int send_and_recv(struct nl80211_global *global,
} }
int send_and_recv_msgs(struct wpa_driver_nl80211_data *drv,
struct nl_msg *msg,
int (*valid_handler)(struct nl_msg *, void *),
void *valid_data,
int (*ack_handler_custom)(struct nl_msg *, void *),
void *ack_data,
struct nl80211_err_info *err_info)
{
return send_and_recv(drv->global, drv->global->nl, msg,
valid_handler, valid_data,
ack_handler_custom, ack_data, err_info);
}
static int nl80211_put_control_port(struct wpa_driver_nl80211_data *drv, static int nl80211_put_control_port(struct wpa_driver_nl80211_data *drv,
struct nl_msg *msg) struct nl_msg *msg)
{ {
@ -1902,7 +1888,7 @@ static int wpa_driver_nl80211_set_country(void *priv, const char *alpha2_arg)
nlmsg_free(msg); nlmsg_free(msg);
return -EINVAL; return -EINVAL;
} }
if (send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL)) if (send_and_recv_cmd(drv, msg))
return -EINVAL; return -EINVAL;
return 0; return 0;
} }
@ -2833,7 +2819,7 @@ static void nl80211_del_p2pdev(struct i802_bss *bss)
int ret; int ret;
msg = nl80211_cmd_msg(bss, 0, NL80211_CMD_DEL_INTERFACE); msg = nl80211_cmd_msg(bss, 0, NL80211_CMD_DEL_INTERFACE);
ret = send_and_recv_msgs(bss->drv, msg, NULL, NULL, NULL, NULL, NULL); ret = send_and_recv_cmd(bss->drv, msg);
wpa_printf(MSG_DEBUG, "nl80211: Delete P2P Device %s (0x%llx): %s", wpa_printf(MSG_DEBUG, "nl80211: Delete P2P Device %s (0x%llx): %s",
bss->ifname, (long long unsigned int) bss->wdev_id, bss->ifname, (long long unsigned int) bss->wdev_id,
@ -2848,7 +2834,7 @@ static int nl80211_set_p2pdev(struct i802_bss *bss, int start)
msg = nl80211_cmd_msg(bss, 0, start ? NL80211_CMD_START_P2P_DEVICE : msg = nl80211_cmd_msg(bss, 0, start ? NL80211_CMD_START_P2P_DEVICE :
NL80211_CMD_STOP_P2P_DEVICE); NL80211_CMD_STOP_P2P_DEVICE);
ret = send_and_recv_msgs(bss->drv, msg, NULL, NULL, NULL, NULL, NULL); ret = send_and_recv_cmd(bss->drv, msg);
wpa_printf(MSG_DEBUG, "nl80211: %s P2P Device %s (0x%llx): %s", wpa_printf(MSG_DEBUG, "nl80211: %s P2P Device %s (0x%llx): %s",
start ? "Start" : "Stop", start ? "Start" : "Stop",
@ -3067,7 +3053,7 @@ static int wpa_driver_nl80211_del_beacon(struct i802_bss *bss,
} }
} }
return send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); return send_and_recv_cmd(drv, msg);
} }
@ -3347,7 +3333,7 @@ static int issue_key_mgmt_set_key(struct wpa_driver_nl80211_data *drv,
nlmsg_free(msg); nlmsg_free(msg);
return -1; return -1;
} }
ret = send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); ret = send_and_recv_cmd(drv, msg);
if (ret) { if (ret) {
wpa_printf(MSG_DEBUG, wpa_printf(MSG_DEBUG,
"nl80211: Key management set key failed: ret=%d (%s)", "nl80211: Key management set key failed: ret=%d (%s)",
@ -3387,7 +3373,7 @@ static int nl80211_set_pmk(struct wpa_driver_nl80211_data *drv,
return -ENOBUFS; return -ENOBUFS;
} }
ret = send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); ret = send_and_recv_cmd(drv, msg);
if (ret) { if (ret) {
wpa_printf(MSG_DEBUG, "nl80211: Set PMK failed: ret=%d (%s)", wpa_printf(MSG_DEBUG, "nl80211: Set PMK failed: ret=%d (%s)",
ret, strerror(-ret)); ret, strerror(-ret));
@ -3561,7 +3547,7 @@ static int wpa_driver_nl80211_set_key(struct i802_bss *bss,
goto fail; goto fail;
} }
ret = send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); ret = send_and_recv_cmd(drv, msg);
if ((ret == -ENOENT || ret == -ENOLINK) && alg == WPA_ALG_NONE) if ((ret == -ENOENT || ret == -ENOLINK) && alg == WPA_ALG_NONE)
ret = 0; ret = 0;
if (ret) if (ret)
@ -3630,7 +3616,7 @@ static int wpa_driver_nl80211_set_key(struct i802_bss *bss,
goto fail; goto fail;
} }
ret = send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); ret = send_and_recv_cmd(drv, msg);
if (ret) if (ret)
wpa_printf(MSG_DEBUG, wpa_printf(MSG_DEBUG,
"nl80211: set_key default failed; err=%d %s", "nl80211: set_key default failed; err=%d %s",
@ -4032,7 +4018,7 @@ retry:
goto fail; goto fail;
} }
ret = send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); ret = send_and_recv_cmd(drv, msg);
msg = NULL; msg = NULL;
if (ret) { if (ret) {
wpa_dbg(drv->ctx, MSG_DEBUG, wpa_dbg(drv->ctx, MSG_DEBUG,
@ -4395,7 +4381,7 @@ static int nl80211_set_bss(struct i802_bss *bss, int cts, int preamble,
return -ENOBUFS; return -ENOBUFS;
} }
return send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); return send_and_recv_cmd(drv, msg);
} }
@ -4454,7 +4440,7 @@ static int wpa_driver_nl80211_set_acl(void *priv,
} }
nlmsg_free(acl); nlmsg_free(acl);
ret = send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); ret = send_and_recv_cmd(drv, msg);
if (ret) { if (ret) {
wpa_printf(MSG_DEBUG, "nl80211: Failed to set MAC ACL: %d (%s)", wpa_printf(MSG_DEBUG, "nl80211: Failed to set MAC ACL: %d (%s)",
ret, strerror(-ret)); ret, strerror(-ret));
@ -4506,7 +4492,7 @@ static int nl80211_set_mesh_config(void *priv,
return ret; return ret;
} }
ret = send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); ret = send_and_recv_cmd(drv, msg);
if (ret) { if (ret) {
wpa_printf(MSG_ERROR, wpa_printf(MSG_ERROR,
"nl80211: Mesh config set failed: %d (%s)", "nl80211: Mesh config set failed: %d (%s)",
@ -4652,7 +4638,7 @@ static int nl80211_set_multicast_to_unicast(struct i802_bss *bss,
return -ENOBUFS; return -ENOBUFS;
} }
ret = send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); ret = send_and_recv_cmd(drv, msg);
switch (ret) { switch (ret) {
case 0: case 0:
@ -4877,7 +4863,7 @@ static void qca_set_allowed_ap_freqs(struct wpa_driver_nl80211_data *drv,
nla_nest_end(msg, freqs_list); nla_nest_end(msg, freqs_list);
nla_nest_end(msg, params); nla_nest_end(msg, params);
ret = send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); ret = send_and_recv_cmd(drv, msg);
if (ret) if (ret)
wpa_printf(MSG_ERROR, wpa_printf(MSG_ERROR,
"nl80211: Failed set AP alllowed frequency list: %d (%s)", "nl80211: Failed set AP alllowed frequency list: %d (%s)",
@ -5483,7 +5469,7 @@ static int nl80211_set_channel(struct i802_bss *bss,
} }
} }
ret = send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); ret = send_and_recv_cmd(drv, msg);
if (ret == 0) { if (ret == 0) {
nl80211_link_set_freq(bss, freq->link_id, freq->freq); nl80211_link_set_freq(bss, freq->link_id, freq->freq);
return 0; return 0;
@ -5824,7 +5810,7 @@ static int wpa_driver_nl80211_sta_add(void *priv,
goto fail; goto fail;
} }
ret = send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); ret = send_and_recv_cmd(drv, msg);
msg = NULL; msg = NULL;
if (ret) if (ret)
wpa_printf(MSG_DEBUG, "nl80211: %s result: %d (%s)", wpa_printf(MSG_DEBUG, "nl80211: %s result: %d (%s)",
@ -5895,7 +5881,7 @@ static int wpa_driver_nl80211_sta_remove(struct i802_bss *bss, const u8 *addr,
return -ENOBUFS; return -ENOBUFS;
} }
ret = send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); ret = send_and_recv_cmd(drv, msg);
wpa_printf(MSG_DEBUG, "nl80211: sta_remove -> DEL_STATION %s " MACSTR wpa_printf(MSG_DEBUG, "nl80211: sta_remove -> DEL_STATION %s " MACSTR
" --> %d (%s)", " --> %d (%s)",
bss->ifname, MAC2STR(addr), ret, strerror(-ret)); bss->ifname, MAC2STR(addr), ret, strerror(-ret));
@ -5926,7 +5912,7 @@ void nl80211_remove_iface(struct wpa_driver_nl80211_data *drv, int ifidx)
} }
msg = nl80211_ifindex_msg(drv, ifidx, 0, NL80211_CMD_DEL_INTERFACE); msg = nl80211_ifindex_msg(drv, ifidx, 0, NL80211_CMD_DEL_INTERFACE);
if (send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL) == 0) if (send_and_recv_cmd(drv, msg) == 0)
return; return;
wpa_printf(MSG_ERROR, "Failed to remove interface (ifidx=%d)", ifidx); wpa_printf(MSG_ERROR, "Failed to remove interface (ifidx=%d)", ifidx);
} }
@ -6359,7 +6345,7 @@ static int wpa_driver_nl80211_sta_set_flags(void *priv, const u8 *addr,
if (nla_put(msg, NL80211_ATTR_STA_FLAGS2, sizeof(upd), &upd)) if (nla_put(msg, NL80211_ATTR_STA_FLAGS2, sizeof(upd), &upd))
goto fail; goto fail;
return send_and_recv_msgs(bss->drv, msg, NULL, NULL, NULL, NULL, NULL); return send_and_recv_cmd(bss->drv, msg);
fail: fail:
nlmsg_free(msg); nlmsg_free(msg);
return -ENOBUFS; return -ENOBUFS;
@ -6382,7 +6368,7 @@ static int driver_nl80211_sta_set_airtime_weight(void *priv, const u8 *addr,
nla_put_u16(msg, NL80211_ATTR_AIRTIME_WEIGHT, weight)) nla_put_u16(msg, NL80211_ATTR_AIRTIME_WEIGHT, weight))
goto fail; goto fail;
ret = send_and_recv_msgs(bss->drv, msg, NULL, NULL, NULL, NULL, NULL); ret = send_and_recv_cmd(bss->drv, msg);
if (ret) { if (ret) {
wpa_printf(MSG_DEBUG, wpa_printf(MSG_DEBUG,
"nl80211: SET_STATION[AIRTIME_WEIGHT] failed: ret=%d (%s)", "nl80211: SET_STATION[AIRTIME_WEIGHT] failed: ret=%d (%s)",
@ -7330,7 +7316,7 @@ static int nl80211_set_mode(struct wpa_driver_nl80211_data *drv,
if (!msg || nla_put_u32(msg, NL80211_ATTR_IFTYPE, mode)) if (!msg || nla_put_u32(msg, NL80211_ATTR_IFTYPE, mode))
goto fail; goto fail;
ret = send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); ret = send_and_recv_cmd(drv, msg);
msg = NULL; msg = NULL;
if (!ret) if (!ret)
return 0; return 0;
@ -7594,7 +7580,7 @@ static int wpa_driver_nl80211_set_supp_port(void *priv, int authorized)
return -ENOBUFS; return -ENOBUFS;
} }
ret = send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); ret = send_and_recv_cmd(drv, msg);
if (!ret) if (!ret)
return 0; return 0;
wpa_printf(MSG_DEBUG, "nl80211: Failed to set STA flag: %d (%s)", wpa_printf(MSG_DEBUG, "nl80211: Failed to set STA flag: %d (%s)",
@ -7692,7 +7678,7 @@ static int i802_set_rts(void *priv, int rts)
return -ENOBUFS; return -ENOBUFS;
} }
ret = send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); ret = send_and_recv_cmd(drv, msg);
if (!ret) if (!ret)
return 0; return 0;
wpa_printf(MSG_DEBUG, "nl80211: Failed to set RTS threshold %d: " wpa_printf(MSG_DEBUG, "nl80211: Failed to set RTS threshold %d: "
@ -7720,7 +7706,7 @@ static int i802_set_frag(void *priv, int frag)
return -ENOBUFS; return -ENOBUFS;
} }
ret = send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); ret = send_and_recv_cmd(drv, msg);
if (!ret) if (!ret)
return 0; return 0;
wpa_printf(MSG_DEBUG, "nl80211: Failed to set fragmentation threshold " wpa_printf(MSG_DEBUG, "nl80211: Failed to set fragmentation threshold "
@ -7742,7 +7728,7 @@ static int i802_flush(void *priv)
* XXX: FIX! this needs to flush all VLANs too * XXX: FIX! this needs to flush all VLANs too
*/ */
msg = nl80211_bss_msg(bss, 0, NL80211_CMD_DEL_STATION); msg = nl80211_bss_msg(bss, 0, NL80211_CMD_DEL_STATION);
res = send_and_recv_msgs(bss->drv, msg, NULL, NULL, NULL, NULL, NULL); res = send_and_recv_cmd(bss->drv, msg);
if (res) { if (res) {
wpa_printf(MSG_DEBUG, "nl80211: Station flush failed: ret=%d " wpa_printf(MSG_DEBUG, "nl80211: Station flush failed: ret=%d "
"(%s)", res, strerror(-res)); "(%s)", res, strerror(-res));
@ -8153,7 +8139,7 @@ static int i802_set_tx_queue_params(void *priv, int queue, int aifs,
nla_put_u8(msg, NL80211_ATTR_MLO_LINK_ID, link_id)) nla_put_u8(msg, NL80211_ATTR_MLO_LINK_ID, link_id))
goto fail; goto fail;
res = send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); res = send_and_recv_cmd(drv, msg);
wpa_printf(MSG_DEBUG, wpa_printf(MSG_DEBUG,
"nl80211: TX queue param set: queue=%d aifs=%d cw_min=%d cw_max=%d burst_time=%d --> res=%d", "nl80211: TX queue param set: queue=%d aifs=%d cw_min=%d cw_max=%d burst_time=%d --> res=%d",
queue, aifs, cw_min, cw_max, burst_time, res); queue, aifs, cw_min, cw_max, burst_time, res);
@ -8188,7 +8174,7 @@ static int i802_set_sta_vlan(struct i802_bss *bss, const u8 *addr,
return -ENOBUFS; return -ENOBUFS;
} }
ret = send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); ret = send_and_recv_cmd(drv, msg);
if (ret < 0) { if (ret < 0) {
wpa_printf(MSG_ERROR, "nl80211: NL80211_ATTR_STA_VLAN (addr=" wpa_printf(MSG_ERROR, "nl80211: NL80211_ATTR_STA_VLAN (addr="
MACSTR " ifname=%s vlan_id=%d) failed: %d (%s)", MACSTR " ifname=%s vlan_id=%d) failed: %d (%s)",
@ -9189,7 +9175,7 @@ static void nl80211_frame_wait_cancel(struct i802_bss *bss, u64 cookie)
return; return;
} }
ret = send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); ret = send_and_recv_cmd(drv, msg);
if (ret) if (ret)
wpa_printf(MSG_DEBUG, "nl80211: wait cancel failed: ret=%d " wpa_printf(MSG_DEBUG, "nl80211: wait cancel failed: ret=%d "
"(%s)", ret, strerror(-ret)); "(%s)", ret, strerror(-ret));
@ -9279,7 +9265,7 @@ static int wpa_driver_nl80211_cancel_remain_on_channel(void *priv)
return -1; return -1;
} }
ret = send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); ret = send_and_recv_cmd(drv, msg);
if (ret == 0) if (ret == 0)
return 0; return 0;
wpa_printf(MSG_DEBUG, "nl80211: Failed to cancel remain-on-channel: " wpa_printf(MSG_DEBUG, "nl80211: Failed to cancel remain-on-channel: "
@ -9376,7 +9362,7 @@ static int nl80211_disable_11b_rates(struct wpa_driver_nl80211_data *drv,
nla_nest_end(msg, bands); nla_nest_end(msg, bands);
ret = send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); ret = send_and_recv_cmd(drv, msg);
if (ret) { if (ret) {
wpa_printf(MSG_DEBUG, "nl80211: Set TX rates failed: ret=%d " wpa_printf(MSG_DEBUG, "nl80211: Set TX rates failed: ret=%d "
"(%s)", ret, strerror(-ret)); "(%s)", ret, strerror(-ret));
@ -9433,7 +9419,7 @@ static void nl80211_remove_links(struct i802_bss *bss)
return; return;
} }
ret = send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); ret = send_and_recv_cmd(drv, msg);
if (ret) { if (ret) {
wpa_printf(MSG_ERROR, wpa_printf(MSG_ERROR,
"nl80211: remove link (%d) failed. ret=%d (%s)", "nl80211: remove link (%d) failed. ret=%d (%s)",
@ -9532,7 +9518,7 @@ static int nl80211_signal_monitor(void *priv, int threshold, int hysteresis)
} }
nla_nest_end(msg, cqm); nla_nest_end(msg, cqm);
return send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); return send_and_recv_cmd(drv, msg);
} }
@ -9942,7 +9928,7 @@ static int nl80211_pmkid(struct i802_bss *bss, int cmd,
return -ENOBUFS; return -ENOBUFS;
} }
return send_and_recv_msgs(bss->drv, msg, NULL, NULL, NULL, NULL, NULL); return send_and_recv_cmd(bss->drv, msg);
} }
@ -10018,7 +10004,7 @@ static int nl80211_flush_pmkid(void *priv)
msg = nl80211_bss_msg(bss, 0, NL80211_CMD_FLUSH_PMKSA); msg = nl80211_bss_msg(bss, 0, NL80211_CMD_FLUSH_PMKSA);
if (!msg) if (!msg)
return -ENOBUFS; return -ENOBUFS;
return send_and_recv_msgs(bss->drv, msg, NULL, NULL, NULL, NULL, NULL); return send_and_recv_cmd(bss->drv, msg);
} }
@ -10223,7 +10209,7 @@ static void nl80211_set_rekey_info(void *priv, const u8 *kek, size_t kek_len,
nla_nest_end(msg, replay_nested); nla_nest_end(msg, replay_nested);
ret = send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); ret = send_and_recv_cmd(drv, msg);
if (ret == -EOPNOTSUPP) { if (ret == -EOPNOTSUPP) {
wpa_printf(MSG_DEBUG, wpa_printf(MSG_DEBUG,
"nl80211: Driver does not support rekey offload"); "nl80211: Driver does not support rekey offload");
@ -10317,7 +10303,7 @@ static int nl80211_set_power_save(struct i802_bss *bss, int enabled)
return -ENOBUFS; return -ENOBUFS;
} }
ret = send_and_recv_msgs(bss->drv, msg, NULL, NULL, NULL, NULL, NULL); ret = send_and_recv_cmd(bss->drv, msg);
if (ret < 0) { if (ret < 0) {
wpa_printf(MSG_DEBUG, wpa_printf(MSG_DEBUG,
"nl80211: Setting PS state %s failed: %d (%s)", "nl80211: Setting PS state %s failed: %d (%s)",
@ -10377,7 +10363,7 @@ static int nl80211_start_radar_detection(void *priv,
return -1; return -1;
} }
ret = send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); ret = send_and_recv_cmd(drv, msg);
if (ret == 0) if (ret == 0)
return 0; return 0;
wpa_printf(MSG_DEBUG, "nl80211: Failed to start radar detection: " wpa_printf(MSG_DEBUG, "nl80211: Failed to start radar detection: "
@ -10436,7 +10422,7 @@ nl80211_tdls_set_discovery_resp_link(struct wpa_driver_nl80211_data *drv,
} }
nla_nest_end(msg, params); nla_nest_end(msg, params);
return send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); return send_and_recv_cmd(drv, msg);
#else /* CONFIG_DRIVER_NL80211_QCA */ #else /* CONFIG_DRIVER_NL80211_QCA */
wpa_printf(MSG_ERROR, wpa_printf(MSG_ERROR,
"nl80211: Setting TX link for TDLS Discovery Response not supported"); "nl80211: Setting TX link for TDLS Discovery Response not supported");
@ -10474,7 +10460,7 @@ static int nl80211_send_tdls_mgmt(void *priv, const u8 *dst, u8 action_code,
nla_put(msg, NL80211_ATTR_IE, len, buf)) nla_put(msg, NL80211_ATTR_IE, len, buf))
goto fail; goto fail;
return send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); return send_and_recv_cmd(drv, msg);
fail: fail:
nlmsg_free(msg); nlmsg_free(msg);
@ -10524,7 +10510,7 @@ static int nl80211_tdls_oper(void *priv, enum tdls_oper oper, const u8 *peer)
return -ENOBUFS; return -ENOBUFS;
} }
res = send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); res = send_and_recv_cmd(drv, msg);
wpa_printf(MSG_DEBUG, "nl80211: TDLS_OPER: oper=%d mac=" MACSTR wpa_printf(MSG_DEBUG, "nl80211: TDLS_OPER: oper=%d mac=" MACSTR
" --> res=%d (%s)", nl80211_oper, MAC2STR(peer), res, " --> res=%d (%s)", nl80211_oper, MAC2STR(peer), res,
strerror(-res)); strerror(-res));
@ -10558,7 +10544,7 @@ nl80211_tdls_enable_channel_switch(void *priv, const u8 *addr, u8 oper_class,
return ret; return ret;
} }
return send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); return send_and_recv_cmd(drv, msg);
} }
@ -10584,7 +10570,7 @@ nl80211_tdls_disable_channel_switch(void *priv, const u8 *addr)
return -ENOBUFS; return -ENOBUFS;
} }
return send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); return send_and_recv_cmd(drv, msg);
} }
#endif /* CONFIG TDLS */ #endif /* CONFIG TDLS */
@ -10729,7 +10715,7 @@ static int wpa_driver_nl80211_update_ft_ies(void *priv, const u8 *md,
return -ENOBUFS; return -ENOBUFS;
} }
ret = send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); ret = send_and_recv_cmd(drv, msg);
if (ret) { if (ret) {
wpa_printf(MSG_DEBUG, "nl80211: update_ft_ies failed " wpa_printf(MSG_DEBUG, "nl80211: update_ft_ies failed "
"err=%d (%s)", ret, strerror(-ret)); "err=%d (%s)", ret, strerror(-ret));
@ -10757,7 +10743,7 @@ static int nl80211_update_dh_ie(void *priv, const u8 *peer_mac,
return -ENOBUFS; return -ENOBUFS;
} }
ret = send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); ret = send_and_recv_cmd(drv, msg);
if (ret) { if (ret) {
wpa_printf(MSG_DEBUG, wpa_printf(MSG_DEBUG,
"nl80211: update_dh_ie failed err=%d (%s)", "nl80211: update_dh_ie failed err=%d (%s)",
@ -11175,7 +11161,7 @@ static int nl80211_switch_channel(void *priv, struct csa_settings *settings)
goto fail; goto fail;
nla_nest_end(msg, beacon_csa); nla_nest_end(msg, beacon_csa);
ret = send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); ret = send_and_recv_cmd(drv, msg);
if (ret) { if (ret) {
wpa_printf(MSG_DEBUG, "nl80211: switch_channel failed err=%d (%s)", wpa_printf(MSG_DEBUG, "nl80211: switch_channel failed err=%d (%s)",
ret, strerror(-ret)); ret, strerror(-ret));
@ -11256,7 +11242,7 @@ static int nl80211_switch_color(void *priv, struct cca_settings *settings)
} }
nla_nest_end(msg, beacon_cca); nla_nest_end(msg, beacon_cca);
ret = send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); ret = send_and_recv_cmd(drv, msg);
if (ret) { if (ret) {
wpa_printf(MSG_DEBUG, wpa_printf(MSG_DEBUG,
"nl80211: switch_color failed err=%d (%s)", "nl80211: switch_color failed err=%d (%s)",
@ -11297,7 +11283,7 @@ static int nl80211_add_ts(void *priv, u8 tsid, const u8 *addr,
return -ENOBUFS; return -ENOBUFS;
} }
ret = send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); ret = send_and_recv_cmd(drv, msg);
if (ret) if (ret)
wpa_printf(MSG_DEBUG, "nl80211: add_ts failed err=%d (%s)", wpa_printf(MSG_DEBUG, "nl80211: add_ts failed err=%d (%s)",
ret, strerror(-ret)); ret, strerror(-ret));
@ -11324,7 +11310,7 @@ static int nl80211_del_ts(void *priv, u8 tsid, const u8 *addr)
return -ENOBUFS; return -ENOBUFS;
} }
ret = send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); ret = send_and_recv_cmd(drv, msg);
if (ret) if (ret)
wpa_printf(MSG_DEBUG, "nl80211: del_ts failed err=%d (%s)", wpa_printf(MSG_DEBUG, "nl80211: del_ts failed err=%d (%s)",
ret, strerror(-ret)); ret, strerror(-ret));
@ -11483,7 +11469,7 @@ static int nl80211_set_qos_map(void *priv, const u8 *qos_map_set,
return -ENOBUFS; return -ENOBUFS;
} }
ret = send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); ret = send_and_recv_cmd(drv, msg);
if (ret) if (ret)
wpa_printf(MSG_DEBUG, "nl80211: Setting QoS Map failed"); wpa_printf(MSG_DEBUG, "nl80211: Setting QoS Map failed");
@ -11566,7 +11552,7 @@ static int nl80211_set_wowlan(void *priv,
nla_nest_end(msg, wowlan_triggers); nla_nest_end(msg, wowlan_triggers);
ret = send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); ret = send_and_recv_cmd(drv, msg);
if (ret) if (ret)
wpa_printf(MSG_DEBUG, "nl80211: Setting wowlan failed"); wpa_printf(MSG_DEBUG, "nl80211: Setting wowlan failed");
@ -11605,7 +11591,7 @@ static int nl80211_roaming(void *priv, int allowed, const u8 *bssid)
} }
nla_nest_end(msg, params); nla_nest_end(msg, params);
return send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); return send_and_recv_cmd(drv, msg);
} }
@ -11633,7 +11619,7 @@ static int nl80211_disable_fils(void *priv, int disable)
} }
nla_nest_end(msg, params); nla_nest_end(msg, params);
return send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); return send_and_recv_cmd(drv, msg);
} }
@ -11690,7 +11676,7 @@ static int nl80211_set_bssid_tmp_disallow(void *priv, unsigned int num_bssid,
nla_nest_end(msg, nlbssids); nla_nest_end(msg, nlbssids);
nla_nest_end(msg, params); nla_nest_end(msg, params);
return send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); return send_and_recv_cmd(drv, msg);
fail: fail:
nlmsg_free(msg); nlmsg_free(msg);
@ -11728,7 +11714,7 @@ static int nl80211_add_sta_node(void *priv, const u8 *addr, u16 auth_alg)
} }
nla_nest_end(msg, params); nla_nest_end(msg, params);
return send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); return send_and_recv_cmd(drv, msg);
} }
#endif /* CONFIG_DRIVER_NL80211_QCA */ #endif /* CONFIG_DRIVER_NL80211_QCA */
@ -12010,7 +11996,7 @@ static int nl80211_probe_mesh_link(void *priv, const u8 *addr, const u8 *eth,
return -ENOBUFS; return -ENOBUFS;
} }
ret = send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); ret = send_and_recv_cmd(drv, msg);
if (ret) { if (ret) {
wpa_printf(MSG_DEBUG, "nl80211: mesh link probe to " MACSTR wpa_printf(MSG_DEBUG, "nl80211: mesh link probe to " MACSTR
" failed: ret=%d (%s)", " failed: ret=%d (%s)",
@ -12427,7 +12413,7 @@ static int nl80211_qca_do_acs(struct wpa_driver_nl80211_data *drv,
params->vht_enabled, params->eht_enabled, params->ch_width, params->vht_enabled, params->eht_enabled, params->ch_width,
params->edmg_enabled); params->edmg_enabled);
ret = send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); ret = send_and_recv_cmd(drv, msg);
if (ret) { if (ret) {
wpa_printf(MSG_DEBUG, wpa_printf(MSG_DEBUG,
"nl80211: Failed to invoke driver ACS function: %s", "nl80211: Failed to invoke driver ACS function: %s",
@ -12485,7 +12471,7 @@ static int nl80211_set_band(void *priv, u32 band_mask)
} }
nla_nest_end(msg, data); nla_nest_end(msg, data);
ret = send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); ret = send_and_recv_cmd(drv, msg);
if (ret) { if (ret) {
wpa_printf(MSG_DEBUG, wpa_printf(MSG_DEBUG,
"nl80211: Driver setband function failed: %s", "nl80211: Driver setband function failed: %s",
@ -12742,10 +12728,10 @@ static int nl80211_set_prob_oper_freq(void *priv, unsigned int freq)
} }
nla_nest_end(msg, params); nla_nest_end(msg, params);
ret = send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); ret = send_and_recv_cmd(drv, msg);
msg = NULL; msg = NULL;
if (ret) { if (ret) {
wpa_printf(MSG_ERROR, "%s: err in send_and_recv_msgs", wpa_printf(MSG_ERROR, "%s: err in send_and_recv_cmd",
__func__); __func__);
return ret; return ret;
} }
@ -12798,7 +12784,7 @@ static int nl80211_p2p_lo_start(void *priv, unsigned int freq,
goto fail; goto fail;
nla_nest_end(msg, container); nla_nest_end(msg, container);
ret = send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); ret = send_and_recv_cmd(drv, msg);
msg = NULL; msg = NULL;
if (ret) { if (ret) {
wpa_printf(MSG_DEBUG, wpa_printf(MSG_DEBUG,
@ -12833,7 +12819,7 @@ static int nl80211_p2p_lo_stop(void *priv)
return -1; return -1;
} }
return send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); return send_and_recv_cmd(drv, msg);
} }
@ -12872,7 +12858,7 @@ static int nl80211_set_tdls_mode(void *priv, int tdls_external_control)
nla_nest_end(msg, params); nla_nest_end(msg, params);
ret = send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); ret = send_and_recv_cmd(drv, msg);
msg = NULL; msg = NULL;
if (ret) { if (ret) {
wpa_printf(MSG_ERROR, wpa_printf(MSG_ERROR,
@ -13118,7 +13104,7 @@ static int nl80211_ignore_assoc_disallow(void *priv, int ignore_disallow)
nla_nest_end(msg, attr); nla_nest_end(msg, attr);
ret = send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); ret = send_and_recv_cmd(drv, msg);
msg = NULL; msg = NULL;
if (ret) { if (ret) {
wpa_printf(MSG_ERROR, wpa_printf(MSG_ERROR,
@ -13189,7 +13175,7 @@ static int nl80211_send_pasn_resp(void *priv, struct pasn_auth *params)
nla_nest_end(msg, nlpeers); nla_nest_end(msg, nlpeers);
nla_nest_end(msg, attr); nla_nest_end(msg, attr);
return send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); return send_and_recv_cmd(drv, msg);
fail: fail:
nlmsg_free(msg); nlmsg_free(msg);
@ -13285,7 +13271,7 @@ static int nl80211_set_secure_ranging_ctx(void *priv,
} }
nla_nest_end(msg, attr); nla_nest_end(msg, attr);
ret = send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); ret = send_and_recv_cmd(drv, msg);
if (ret) if (ret)
wpa_printf(MSG_DEBUG, wpa_printf(MSG_DEBUG,
"nl80211: Set secure ranging context failed: ret=%d (%s)", "nl80211: Set secure ranging context failed: ret=%d (%s)",
@ -13339,7 +13325,7 @@ static int wpa_driver_do_broadcom_acs(struct wpa_driver_nl80211_data *drv,
params->hw_mode, params->ht_enabled, params->ht40_enabled, params->hw_mode, params->ht_enabled, params->ht40_enabled,
params->vht_enabled, params->ch_width); params->vht_enabled, params->ch_width);
ret = send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); ret = send_and_recv_cmd(drv, msg);
if (ret) { if (ret) {
wpa_printf(MSG_ERROR, wpa_printf(MSG_ERROR,
"nl80211: BRCM Failed to invoke driver ACS function: %s", "nl80211: BRCM Failed to invoke driver ACS function: %s",
@ -13594,7 +13580,7 @@ static int nl80211_update_connection_params(
nl80211_put_fils_connect_params(drv, params, msg)) nl80211_put_fils_connect_params(drv, params, msg))
goto fail; goto fail;
ret = send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); ret = send_and_recv_cmd(drv, msg);
msg = NULL; msg = NULL;
if (ret) if (ret)
wpa_dbg(drv->ctx, MSG_DEBUG, wpa_dbg(drv->ctx, MSG_DEBUG,
@ -13637,7 +13623,7 @@ static int nl80211_send_external_auth_status(void *priv,
(params->bssid && (params->bssid &&
nla_put(msg, NL80211_ATTR_BSSID, ETH_ALEN, params->bssid))) nla_put(msg, NL80211_ATTR_BSSID, ETH_ALEN, params->bssid)))
goto fail; goto fail;
ret = send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); ret = send_and_recv_cmd(drv, msg);
msg = NULL; msg = NULL;
if (ret) { if (ret) {
wpa_printf(MSG_DEBUG, wpa_printf(MSG_DEBUG,
@ -13677,7 +13663,7 @@ static int nl80211_set_4addr_mode(void *priv, const char *bridge_ifname,
bss->added_if_into_bridge = 0; bss->added_if_into_bridge = 0;
} }
ret = send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); ret = send_and_recv_cmd(drv, msg);
msg = NULL; msg = NULL;
if (ret && val && nl80211_get_4addr(bss) == 1) { if (ret && val && nl80211_get_4addr(bss) == 1) {
wpa_printf(MSG_DEBUG, wpa_printf(MSG_DEBUG,
@ -13775,7 +13761,7 @@ static int nl80211_link_add(void *priv, u8 link_id, const u8 *addr)
return -ENOBUFS; return -ENOBUFS;
} }
ret = send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); ret = send_and_recv_cmd(drv, msg);
if (ret) { if (ret) {
wpa_printf(MSG_DEBUG, "nl80211: add link failed. ret=%d (%s)", wpa_printf(MSG_DEBUG, "nl80211: add link failed. ret=%d (%s)",
ret, strerror(-ret)); ret, strerror(-ret));

37
src/drivers/driver_nl80211.h
View file

@ -278,12 +278,37 @@ struct nl_msg * nl80211_cmd_msg(struct i802_bss *bss, int flags, uint8_t cmd);
struct nl_msg * nl80211_drv_msg(struct wpa_driver_nl80211_data *drv, int flags, struct nl_msg * nl80211_drv_msg(struct wpa_driver_nl80211_data *drv, int flags,
uint8_t cmd); uint8_t cmd);
struct nl_msg * nl80211_bss_msg(struct i802_bss *bss, int flags, uint8_t cmd); struct nl_msg * nl80211_bss_msg(struct i802_bss *bss, int flags, uint8_t cmd);
int send_and_recv_msgs(struct wpa_driver_nl80211_data *drv, struct nl_msg *msg,
int (*valid_handler)(struct nl_msg *, void *), int send_and_recv(struct nl80211_global *global,
void *valid_data, struct nl_sock *nl_handle, struct nl_msg *msg,
int (*ack_handler_custom)(struct nl_msg *, void *), int (*valid_handler)(struct nl_msg *, void *),
void *ack_data, void *valid_data,
struct nl80211_err_info *err_info); int (*ack_handler_custom)(struct nl_msg *, void *),
void *ack_data,
struct nl80211_err_info *err_info);
static inline int
send_and_recv_cmd(struct wpa_driver_nl80211_data *drv,
struct nl_msg *msg)
{
return send_and_recv(drv->global, drv->global->nl, msg,
NULL, NULL, NULL, NULL, NULL);
}
static inline int
send_and_recv_msgs(struct wpa_driver_nl80211_data *drv,
struct nl_msg *msg,
int (*valid_handler)(struct nl_msg *, void *),
void *valid_data,
int (*ack_handler_custom)(struct nl_msg *, void *),
void *ack_data,
struct nl80211_err_info *err_info)
{
return send_and_recv(drv->global, drv->global->nl, msg,
valid_handler, valid_data,
ack_handler_custom, ack_data, err_info);
}
int nl80211_create_iface(struct wpa_driver_nl80211_data *drv, int nl80211_create_iface(struct wpa_driver_nl80211_data *drv,
const char *ifname, enum nl80211_iftype iftype, const char *ifname, enum nl80211_iftype iftype,
const u8 *addr, int wds, const u8 *addr, int wds,

12
src/drivers/driver_nl80211_scan.c
View file

@ -95,7 +95,7 @@ static int nl80211_abort_scan(struct i802_bss *bss)
wpa_printf(MSG_DEBUG, "nl80211: Abort scan"); wpa_printf(MSG_DEBUG, "nl80211: Abort scan");
msg = nl80211_cmd_msg(bss, 0, NL80211_CMD_ABORT_SCAN); msg = nl80211_cmd_msg(bss, 0, NL80211_CMD_ABORT_SCAN);
ret = send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); ret = send_and_recv_cmd(drv, msg);
if (ret) { if (ret) {
wpa_printf(MSG_DEBUG, "nl80211: Abort scan failed: ret=%d (%s)", wpa_printf(MSG_DEBUG, "nl80211: Abort scan failed: ret=%d (%s)",
ret, strerror(-ret)); ret, strerror(-ret));
@ -126,7 +126,7 @@ static int nl80211_abort_vendor_scan(struct wpa_driver_nl80211_data *drv,
nla_nest_end(msg, params); nla_nest_end(msg, params);
ret = send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); ret = send_and_recv_cmd(drv, msg);
msg = NULL; msg = NULL;
if (ret) { if (ret) {
wpa_printf(MSG_INFO, wpa_printf(MSG_INFO,
@ -397,7 +397,7 @@ int wpa_driver_nl80211_scan(struct i802_bss *bss,
goto fail; goto fail;
} }
ret = send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); ret = send_and_recv_cmd(drv, msg);
msg = NULL; msg = NULL;
if (ret) { if (ret) {
wpa_printf(MSG_DEBUG, "nl80211: Scan trigger failed: ret=%d " wpa_printf(MSG_DEBUG, "nl80211: Scan trigger failed: ret=%d "
@ -650,7 +650,7 @@ int wpa_driver_nl80211_sched_scan(void *priv,
params->sched_scan_start_delay)) params->sched_scan_start_delay))
goto fail; goto fail;
ret = send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); ret = send_and_recv_cmd(drv, msg);
/* TODO: if we get an error here, we should fall back to normal scan */ /* TODO: if we get an error here, we should fall back to normal scan */
@ -687,7 +687,7 @@ int wpa_driver_nl80211_stop_sched_scan(void *priv)
#endif /* ANDROID */ #endif /* ANDROID */
msg = nl80211_drv_msg(drv, 0, NL80211_CMD_STOP_SCHED_SCAN); msg = nl80211_drv_msg(drv, 0, NL80211_CMD_STOP_SCHED_SCAN);
ret = send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); ret = send_and_recv_cmd(drv, msg);
if (ret) { if (ret) {
wpa_printf(MSG_DEBUG, wpa_printf(MSG_DEBUG,
"nl80211: Sched scan stop failed: ret=%d (%s)", "nl80211: Sched scan stop failed: ret=%d (%s)",
@ -1335,7 +1335,7 @@ int nl80211_set_default_scan_ies(void *priv, const u8 *ies, size_t ies_len)
nla_nest_end(msg, attr); nla_nest_end(msg, attr);
ret = send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL, NULL); ret = send_and_recv_cmd(drv, msg);
msg = NULL; msg = NULL;
if (ret) { if (ret) {
wpa_printf(MSG_ERROR, wpa_printf(MSG_ERROR,