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

Mesh HWMP forwarding information: updating FI for transmitter.

Browse Source 
* Added hwmp_update_transmitter function that checks if the metric
  to the transmitter have improved. If old FI is invalid or metric
  is larger the FI to the transmitter is updated occurdingly.
  This is a recommendation from the 802.11 2012 standard, table 13-9;

Approved by:	adrian (mentor)
This commit is contained in:
Monthadar Al Jaberi 2013-02-07 21:31:37 +00:00
parent 80e25642f2
commit d68e1a3749
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=246519
1 changed files with 44 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
sys/net80211/ieee80211_hwmp.c
View File

@ -896,6 +896,45 @@ hwmp_rootmode_rann_cb(void *arg)
hwmp_rootmode_setup(vap);
}
/*
* Update forwarding information to TA if metric improves.
*/
static void
hwmp_update_transmitter(struct ieee80211vap *vap, struct ieee80211_node *ni,
const char *hwmp_frame)
{
struct ieee80211_mesh_state *ms = vap->iv_mesh;
struct ieee80211_mesh_route *rttran = NULL; /* Transmitter */
int metric = 0;
rttran = ieee80211_mesh_rt_find(vap, ni->ni_macaddr);
if (rttran == NULL) {
rttran = ieee80211_mesh_rt_add(vap, ni->ni_macaddr);
if (rttran == NULL) {
IEEE80211_NOTE(vap, IEEE80211_MSG_HWMP, ni,
"unable to add path to transmitter %6D of %s",
ni->ni_macaddr, ":", hwmp_frame);
vap->iv_stats.is_mesh_rtaddfailed++;
return;
}
}
metric = ms->ms_pmetric->mpm_metric(ni);
if (!(rttran->rt_flags & IEEE80211_MESHRT_FLAGS_VALID) ||
rttran->rt_metric > metric)
{
IEEE80211_NOTE(vap, IEEE80211_MSG_HWMP, ni,
"%s path to transmiter %6D of %s, metric %d:%d",
rttran->rt_flags & IEEE80211_MESHRT_FLAGS_VALID ?
"prefer" : "update", ni->ni_macaddr, ":", hwmp_frame,
rttran->rt_metric, metric);
IEEE80211_ADDR_COPY(rttran->rt_nexthop, ni->ni_macaddr);
rttran->rt_metric = metric;
rttran->rt_nhops = 1;
ieee80211_mesh_rt_update(rttran, ms->ms_ppath->mpp_inact);
rttran->rt_flags = IEEE80211_MESHRT_FLAGS_VALID;
}
}
#define PREQ_TFLAGS(n) preq->preq_targets[n].target_flags
#define PREQ_TADDR(n) preq->preq_targets[n].target_addr
#define PREQ_TSEQ(n) preq->preq_targets[n].target_seq
@ -1010,10 +1049,8 @@ hwmp_recv_preq(struct ieee80211vap *vap, struct ieee80211_node *ni,
return;
}
/*
* Forwarding information for transmitter mesh STA
* [OPTIONAL: if metric improved]
*/
/* Update forwarding information to TA if metric improves. */
hwmp_update_transmitter(vap, ni, "PREQ");
/*
* Check if the PREQ is addressed to us.
@ -1268,7 +1305,6 @@ hwmp_recv_prep(struct ieee80211vap *vap, struct ieee80211_node *ni,
* rules defined in 13.10.8.4). If the conditions for creating or
* updating the forwarding information have not been met in those
* rules, no further steps are applied to the PREP.
* [OPTIONAL]: update forwarding information to TA if metric improves.
*/
rt = ieee80211_mesh_rt_find(vap, prep->prep_targetaddr);
if (rt == NULL) {
@ -1323,6 +1359,9 @@ hwmp_recv_prep(struct ieee80211vap *vap, struct ieee80211_node *ni,
}
rt->rt_flags |= IEEE80211_MESHRT_FLAGS_VALID; /* mark valid */
/* Update forwarding information to TA if metric improves */
hwmp_update_transmitter(vap, ni, "PREP");
/*
* If it's NOT for us, propagate the PREP
*/