Author: monthadar
Date: Thu Feb 7 21:24:20 2013
New Revision: 246508
URL: http://svnweb.freebsd.org/changeset/base/246508
Log:
Propagate GANN frames, and store know gate info.
* Modified mesh_recv_action_meshgate to do following:
+ if mesh STA already knows the mesh gate of the recevied GANN frame
+ if mesh gate is know, check seq number according to 802.11 standard
+ if mesh gate is not know, add it to the list of known mesh gates
+ if forwarding is enabled and ttl >= 1 then propagate the GANN frame;
* Declare a new malloc type M_80211_MESH_GT_RT;
* Declare a struct to store GANN information, ieee80211_mesh_gate_route. And
add it as a TAILQ list to ieee80211_mesh_state;
Approved by: adrian (mentor)
Modified:
head/sys/net80211/ieee80211_mesh.c
head/sys/net80211/ieee80211_mesh.h
Modified: head/sys/net80211/ieee80211_mesh.c
==============================================================================
--- head/sys/net80211/ieee80211_mesh.c Thu Feb 7 21:24:10 2013
(r246507)
+++ head/sys/net80211/ieee80211_mesh.c Thu Feb 7 21:24:20 2013
(r246508)
@@ -171,7 +171,8 @@ MALLOC_DEFINE(M_80211_MESH_PERR, "80211p
/* The longer one of the lifetime should be stored as new lifetime */
#define MESH_ROUTE_LIFETIME_MAX(a, b) (a > b ? a : b)
-MALLOC_DEFINE(M_80211_MESH_RT, "80211mesh", "802.11s routing table");
+MALLOC_DEFINE(M_80211_MESH_RT, "80211mesh_rt", "802.11s routing table");
+MALLOC_DEFINE(M_80211_MESH_GT_RT, "80211mesh_gt", "802.11s known gates table");
/*
* Helper functions to manipulate the Mesh routing table.
@@ -670,6 +671,7 @@ mesh_vattach(struct ieee80211vap *vap)
ms->ms_seq = 0;
ms->ms_flags = (IEEE80211_MESHFLAGS_AP | IEEE80211_MESHFLAGS_FWD);
ms->ms_ttl = IEEE80211_MESH_DEFAULT_TTL;
+ TAILQ_INIT(&ms->ms_known_gates);
TAILQ_INIT(&ms->ms_routes);
mtx_init(&ms->ms_rt_lock, "MBSS", "802.11s routing table", MTX_DEF);
callout_init(&ms->ms_cleantimer, CALLOUT_MPSAFE);
@@ -2370,18 +2372,78 @@ mesh_recv_action_meshgate(struct ieee802
const uint8_t *frm, const uint8_t *efrm)
{
struct ieee80211vap *vap = ni->ni_vap;
+ struct ieee80211_mesh_state *ms = vap->iv_mesh;
+ struct ieee80211_mesh_gate_route *gr, *next;
struct ieee80211_mesh_route *rt_gate;
+ struct ieee80211_meshgann_ie pgann;
+ int found = 0;
const struct ieee80211_meshgann_ie *ie =
(const struct ieee80211_meshgann_ie *)
(frm+2); /* action + code */
- IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_MESH, ie->gann_addr,
- "%s", "received GANN from meshgate");
+ if (IEEE80211_ADDR_EQ(vap->iv_myaddr, ie->gann_addr))
+ return 0;
+
+ IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_MESH, ni->ni_macaddr,
+ "received GANN, meshgate: %6D (seq %u)", ie->gann_addr, ":",
+ ie->gann_seq);
+
+ if (ms == NULL)
+ return (0);
+ MESH_RT_LOCK(ms);
+ TAILQ_FOREACH_SAFE(gr, &ms->ms_known_gates, gr_next, next) {
+ if (!IEEE80211_ADDR_EQ(gr->gr_addr, ie->gann_addr))
+ continue;
+ if (ie->gann_seq <= gr->gr_lastseq) {
+ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_MESH,
+ ni->ni_macaddr, NULL,
+ "GANN old seqno %u <= %u",
+ ie->gann_seq, gr->gr_lastseq);
+ MESH_RT_UNLOCK(ms);
+ return (0);
+ }
+ /* corresponding mesh gate found & GANN accepted */
+ found = 1;
+ break;
+
+ }
+ if (found == 0) {
+ /* this GANN is from a new mesh Gate add it to known table. */
+ IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_MESH, ie->gann_addr,
+ "stored new GANN information, seq %u.", ie->gann_seq);
+ gr = malloc(ALIGN(sizeof(struct ieee80211_mesh_gate_route)),
+ M_80211_MESH_GT_RT, M_NOWAIT | M_ZERO);
+ IEEE80211_ADDR_COPY(gr->gr_addr, ie->gann_addr);
+ TAILQ_INSERT_TAIL(&ms->ms_known_gates, gr, gr_next);
+ }
+ gr->gr_lastseq = ie->gann_seq;
- rt_gate = ieee80211_mesh_rt_find(vap, ie->gann_addr);
+ /* check if we have a path to this gate */
+ rt_gate = mesh_rt_find_locked(ms, gr->gr_addr);
if (rt_gate != NULL &&
- rt_gate->rt_flags & IEEE80211_MESHRT_FLAGS_VALID)
+ rt_gate->rt_flags & IEEE80211_MESHRT_FLAGS_VALID) {
+ gr->gr_route = rt_gate;
rt_gate->rt_flags |= IEEE80211_MESHRT_FLAGS_GATE;
+ }
+
+ MESH_RT_UNLOCK(ms);
+
+ /* popagate only if decremented ttl >= 1 && forwarding is enabled */
+ if ((ie->gann_ttl - 1) < 1 &&
+ !(ms->ms_flags & IEEE80211_MESHFLAGS_FWD))
+ return 0;
+ pgann.gann_flags = ie->gann_flags; /* Reserved */
+ pgann.gann_hopcount = ie->gann_hopcount + 1;
+ pgann.gann_ttl = ie->gann_ttl - 1;
+ IEEE80211_ADDR_COPY(pgann.gann_addr, ie->gann_addr);
+ pgann.gann_seq = ie->gann_seq;
+ pgann.gann_interval = ie->gann_interval;
+
+ IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_MESH, ie->gann_addr,
+ "%s", "propagate GANN");
+
+ ieee80211_send_action(vap->iv_bss, IEEE80211_ACTION_CAT_MESH,
+ IEEE80211_ACTION_MESH_GANN, &pgann);
return 0;
}
Modified: head/sys/net80211/ieee80211_mesh.h
==============================================================================
--- head/sys/net80211/ieee80211_mesh.h Thu Feb 7 21:24:10 2013
(r246507)
+++ head/sys/net80211/ieee80211_mesh.h Thu Feb 7 21:24:20 2013
(r246508)
@@ -405,6 +405,7 @@ MALLOC_DECLARE(M_80211_MESH_PREP);
MALLOC_DECLARE(M_80211_MESH_PERR);
MALLOC_DECLARE(M_80211_MESH_RT);
+MALLOC_DECLARE(M_80211_MESH_GT_RT);
/*
* Basic forwarding information:
* o Destination MAC
@@ -437,6 +438,16 @@ struct ieee80211_mesh_route {
};
#define IEEE80211_MESH_ROUTE_PRIV(rt, cast) ((cast *)rt->rt_priv)
+/*
+ * Stored information about known mesh gates.
+ */
+struct ieee80211_mesh_gate_route {
+ TAILQ_ENTRY(ieee80211_mesh_gate_route) gr_next;
+ uint8_t gr_addr[IEEE80211_ADDR_LEN];
+ uint32_t gr_lastseq;
+ struct ieee80211_mesh_route *gr_route;
+};
+
#define IEEE80211_MESH_PROTO_DSZ 12 /* description size */
/*
* Mesh Path Selection Protocol.
@@ -508,6 +519,7 @@ struct ieee80211_mesh_state {
struct callout ms_cleantimer;
struct callout ms_gatetimer;
ieee80211_mesh_seq ms_gateseq;
+ TAILQ_HEAD(, ieee80211_mesh_gate_route) ms_known_gates;
TAILQ_HEAD(, ieee80211_mesh_route) ms_routes;
struct ieee80211_mesh_proto_metric *ms_pmetric;
struct ieee80211_mesh_proto_path *ms_ppath;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
