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

nl80211: Allocate nl CB for BSS RX

Browse source 
In preparation for things that receive on a BSS-specific handle,
allocate a CB for it and hook it up to receive functions.

Signed-hostap: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Johannes Berg 2011-12-03 20:14:53 +02:00 committed by Jouni Malinen
parent f06aedd92f
commit cc7a48d1f4
1 changed files with 49 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
src/drivers/driver_nl80211.c
View file

@ -195,6 +195,7 @@ struct i802_bss {
int freq; int freq;
struct nl80211_handles nl_preq; struct nl80211_handles nl_preq;
struct nl_cb *nl_cb;
}; };
struct wpa_driver_nl80211_data { struct wpa_driver_nl80211_data {
@ -1862,6 +1863,25 @@ static int process_drv_event(struct nl_msg *msg, void *arg)
} }
static int process_bss_event(struct nl_msg *msg, void *arg)
{
struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg));
struct nlattr *tb[NL80211_ATTR_MAX + 1];
nla_parse(tb, NL80211_ATTR_MAX, genlmsg_attrdata(gnlh, 0),
genlmsg_attrlen(gnlh, 0), NULL);
switch (gnlh->cmd) {
default:
wpa_printf(MSG_DEBUG, "nl80211: Ignored unknown event "
"(cmd=%d)", gnlh->cmd);
break;
}
return NL_SKIP;
}
static void wpa_driver_nl80211_event_receive(int sock, void *eloop_ctx, static void wpa_driver_nl80211_event_receive(int sock, void *eloop_ctx,
void *handle) void *handle)
{ {
@ -2380,6 +2400,28 @@ static void wpa_driver_nl80211_handle_eapol_tx_status(int sock,
} }
static int nl80211_init_bss(struct i802_bss *bss)
{
bss->nl_cb = nl_cb_alloc(NL_CB_DEFAULT);
if (!bss->nl_cb)
return -1;
nl_cb_set(bss->nl_cb, NL_CB_SEQ_CHECK, NL_CB_CUSTOM,
no_seq_check, NULL);
nl_cb_set(bss->nl_cb, NL_CB_VALID, NL_CB_CUSTOM,
process_bss_event, bss);
return 0;
}
static void nl80211_destroy_bss(struct i802_bss *bss)
{
nl_cb_put(bss->nl_cb);
bss->nl_cb = NULL;
}
/** /**
* wpa_driver_nl80211_init - Initialize nl80211 driver interface * wpa_driver_nl80211_init - Initialize nl80211 driver interface
* @ctx: context to be used when calling wpa_supplicant functions, * @ctx: context to be used when calling wpa_supplicant functions,
@ -2415,6 +2457,9 @@ static void * wpa_driver_nl80211_init(void *ctx, const char *ifname,
return NULL; return NULL;
} }
if (nl80211_init_bss(bss))
goto failed;
nl80211_get_phy_name(drv); nl80211_get_phy_name(drv);
rcfg = os_zalloc(sizeof(*rcfg)); rcfg = os_zalloc(sizeof(*rcfg));
@ -2726,6 +2771,8 @@ static void wpa_driver_nl80211_deinit(void *priv)
nl_destroy_handles(&drv->nl_event); nl_destroy_handles(&drv->nl_event);
nl_cb_put(drv->nl_cb); nl_cb_put(drv->nl_cb);
nl80211_destroy_bss(&drv->first_bss);
os_free(drv->filter_ssids); os_free(drv->filter_ssids);
if (drv->in_interface_list) if (drv->in_interface_list)
@ -6910,6 +6957,7 @@ static int wpa_driver_nl80211_if_add(void *priv, enum wpa_driver_if_type type,
drv->first_bss.next = new_bss; drv->first_bss.next = new_bss;
if (drv_priv) if (drv_priv)
*drv_priv = new_bss; *drv_priv = new_bss;
nl80211_init_bss(new_bss);
} }
#endif /* HOSTAPD */ #endif /* HOSTAPD */
@ -6961,6 +7009,7 @@ static int wpa_driver_nl80211_if_remove(void *priv,
for (tbss = &drv->first_bss; tbss; tbss = tbss->next) { for (tbss = &drv->first_bss; tbss; tbss = tbss->next) {
if (tbss->next == bss) { if (tbss->next == bss) {
tbss->next = bss->next; tbss->next = bss->next;
nl80211_destroy_bss(bss);
os_free(bss); os_free(bss);
bss = NULL; bss = NULL;
break; break;