d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* PREQ acceptance criteria updated to check for proxy condition as in amendment;

Browse Source 
Approved by: adrian
This commit is contained in:
Monthadar Al Jaberi 2012-05-01 16:09:44 +00:00
parent 53c35d21d5
commit 52e45fc074
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/net80211/ieee80211_hwmp.c
View File

@ -907,13 +907,17 @@ hwmp_recv_preq(struct ieee80211vap *vap, struct ieee80211_node *ni,
PREQ_TADDR(0), ":");
/*
* Acceptance criteria: if the PREQ is not for us or not broadcast
* Acceptance criteria: (if the PREQ is not for us or not broadcast,
* or an external mac address not proxied by us),
* AND forwarding is disabled, discard this PREQ.
* XXX: need to check PROXY
*/
if ((!IEEE80211_ADDR_EQ(vap->iv_myaddr, PREQ_TADDR(0)) ||
!IEEE80211_IS_MULTICAST(PREQ_TADDR(0))) &&
!(ms->ms_flags & IEEE80211_MESHFLAGS_FWD)) {
rttarg = ieee80211_mesh_rt_find(vap, PREQ_TADDR(0));
if (!(ms->ms_flags & IEEE80211_MESHFLAGS_FWD) &&
(!IEEE80211_ADDR_EQ(vap->iv_myaddr, PREQ_TADDR(0)) ||
!IEEE80211_IS_MULTICAST(PREQ_TADDR(0)) ||
(rttarg != NULL &&
rttarg->rt_flags & IEEE80211_MESHRT_FLAGS_PROXY &&
IEEE80211_ADDR_EQ(vap->iv_myaddr, rttarg->rt_mesh_gate)))) {
IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_HWMP,
preq->preq_origaddr, NULL, "%s", "not accepting PREQ");
return;
@ -922,7 +926,6 @@ hwmp_recv_preq(struct ieee80211vap *vap, struct ieee80211_node *ni,
* Acceptance criteria: if unicast addressed
* AND no valid forwarding for Target of PREQ, discard this PREQ.
*/
rttarg = ieee80211_mesh_rt_find(vap, PREQ_TADDR(0));
if(rttarg != NULL)
hrtarg = IEEE80211_MESH_ROUTE_PRIV(rttarg,
struct ieee80211_hwmp_route);