iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mac80211: generate mesh probe responses

Browse Source 
Mesh interfaces will now respond to any broadcast (or
matching directed mesh) probe requests with a probe
response.

Signed-off-by: Thomas Pedersen <thomas@cozybit.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Thomas Pedersen 2013-02-14 11:20:14 -08:00 committed by Johannes Berg
parent 2b5e196775
commit 9fb04b501a
2 changed files with 63 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
net/mac80211/mesh.c
View File

@ -868,6 +868,63 @@ void ieee80211_stop_mesh(struct ieee80211_sub_if_data *sdata)
sdata->u.mesh.timers_running = 0; sdata->u.mesh.timers_running = 0;
} }
static void
ieee80211_mesh_rx_probe_req(struct ieee80211_sub_if_data *sdata,
struct ieee80211_mgmt *mgmt, size_t len)
{
struct ieee80211_local *local = sdata->local;
struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;
struct sk_buff *presp;
struct beacon_data *bcn;
struct ieee80211_mgmt *hdr;
struct ieee802_11_elems elems;
size_t baselen;
u8 *pos, *end;
end = ((u8 *) mgmt) + len;
pos = mgmt->u.probe_req.variable;
baselen = (u8 *) pos - (u8 *) mgmt;
if (baselen > len)
return;
ieee802_11_parse_elems(pos, len - baselen, &elems);
/* 802.11-2012 10.1.4.3.2 */
if ((!ether_addr_equal(mgmt->da, sdata->vif.addr) &&
!is_broadcast_ether_addr(mgmt->da)) ||
elems.ssid_len != 0)
return;
if (elems.mesh_id_len != 0 &&
(elems.mesh_id_len != ifmsh->mesh_id_len ||
memcmp(elems.mesh_id, ifmsh->mesh_id, ifmsh->mesh_id_len)))
return;
rcu_read_lock();
bcn = rcu_dereference(ifmsh->beacon);
if (!bcn)
goto out;
presp = dev_alloc_skb(local->tx_headroom +
bcn->head_len + bcn->tail_len);
if (!presp)
goto out;
skb_reserve(presp, local->tx_headroom);
memcpy(skb_put(presp, bcn->head_len), bcn->head, bcn->head_len);
memcpy(skb_put(presp, bcn->tail_len), bcn->tail, bcn->tail_len);
hdr = (struct ieee80211_mgmt *) presp->data;
hdr->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
IEEE80211_STYPE_PROBE_RESP);
memcpy(hdr->da, mgmt->sa, ETH_ALEN);
mpl_dbg(sdata, "sending probe resp. to %pM\n", hdr->da);
IEEE80211_SKB_CB(presp)->flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT;
ieee80211_tx_skb(sdata, presp);
out:
rcu_read_unlock();
}
static void ieee80211_mesh_rx_bcn_presp(struct ieee80211_sub_if_data *sdata, static void ieee80211_mesh_rx_bcn_presp(struct ieee80211_sub_if_data *sdata,
u16 stype, u16 stype,
struct ieee80211_mgmt *mgmt, struct ieee80211_mgmt *mgmt,
@ -957,6 +1014,9 @@ void ieee80211_mesh_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,
ieee80211_mesh_rx_bcn_presp(sdata, stype, mgmt, skb->len, ieee80211_mesh_rx_bcn_presp(sdata, stype, mgmt, skb->len,
rx_status); rx_status);
break; break;
case IEEE80211_STYPE_PROBE_REQ:
ieee80211_mesh_rx_probe_req(sdata, mgmt, skb->len);
break;
case IEEE80211_STYPE_ACTION: case IEEE80211_STYPE_ACTION:
ieee80211_mesh_rx_mgmt_action(sdata, mgmt, skb->len, rx_status); ieee80211_mesh_rx_mgmt_action(sdata, mgmt, skb->len, rx_status);
break; break;

5
net/mac80211/rx.c
View File

@ -2718,8 +2718,9 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_data *rx)
return RX_DROP_MONITOR; return RX_DROP_MONITOR;
break; break;
case cpu_to_le16(IEEE80211_STYPE_PROBE_REQ): case cpu_to_le16(IEEE80211_STYPE_PROBE_REQ):
/* process only for ibss */ /* process only for ibss and mesh */
if (sdata->vif.type != NL80211_IFTYPE_ADHOC) if (sdata->vif.type != NL80211_IFTYPE_ADHOC &&
sdata->vif.type != NL80211_IFTYPE_MESH_POINT)
return RX_DROP_MONITOR; return RX_DROP_MONITOR;
break; break;
default: default: