From owner-svn-src-projects@FreeBSD.ORG Tue Jun 30 18:52:36 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D9BF01065675; Tue, 30 Jun 2009 18:52:36 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C87DD8FC24; Tue, 30 Jun 2009 18:52:36 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5UIqahi089235; Tue, 30 Jun 2009 18:52:36 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5UIqaV4089232; Tue, 30 Jun 2009 18:52:36 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200906301852.n5UIqaV4089232@svn.freebsd.org> From: Rui Paulo Date: Tue, 30 Jun 2009 18:52:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r195201 - projects/mesh11s/sys/net80211 X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Jun 2009 18:52:37 -0000 Author: rpaulo Date: Tue Jun 30 18:52:36 2009 New Revision: 195201 URL: http://svn.freebsd.org/changeset/base/195201 Log: Try to avoid duplicates by using the HWMP table. XXX will be redone in the near future. Sponsored by: The FreeBSD Foundation Modified: projects/mesh11s/sys/net80211/ieee80211_hwmp.c projects/mesh11s/sys/net80211/ieee80211_mesh.c Modified: projects/mesh11s/sys/net80211/ieee80211_hwmp.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_hwmp.c Tue Jun 30 18:51:22 2009 (r195200) +++ projects/mesh11s/sys/net80211/ieee80211_hwmp.c Tue Jun 30 18:52:36 2009 (r195201) @@ -173,7 +173,6 @@ hwmp_rt_add(struct ieee80211vap *vap, co rt = malloc(sizeof(struct ieee80211_hwmp_route), M_80211_HWMP, M_NOWAIT | M_ZERO); - memset(rt, 0, sizeof(*rt)); IEEE80211_ADDR_COPY(rt->rt_dest, dest); HWMP_LOCK(hs); TAILQ_INSERT_TAIL(&hs->hs_routes, rt, rt_next); @@ -691,11 +690,10 @@ hwmp_recv_preq(struct ieee80211vap *vap, * propagate the PREQ based on TTL. */ } else if (preq->preq_ttl > 1) { - if (rt == NULL) { + if (rt == NULL) rt = hwmp_rt_add(vap, PREQ_TADDR(0)); - rt->rt_metric = preq->preq_metric; - rt->rt_lifetime = preq->preq_lifetime; - } + rt->rt_metric = preq->preq_metric; + rt->rt_lifetime = preq->preq_lifetime; rt->rt_seq = preq->preq_origseq; rt->rt_preqid = preq->preq_id; @@ -1074,14 +1072,13 @@ ieee80211_hwmp_discover(struct ieee80211 /* XXX stat+msg */ goto done; } + } + if (IEEE80211_ADDR_EQ(rt->rt_nexthop, invalidaddr)) { rt->rt_seq = ++hs->hs_seq; rt->rt_preqid = ++hs->hs_preqid; rt->rt_metric = IEEE80211_MESHLMETRIC_INITIALVAL; rt->rt_lifetime = timeval2msecs(ieee80211_hwmp_pathtimeout); - sendpreq = 1; - unknowndst = 1; - } else if (IEEE80211_ADDR_EQ(rt->rt_nexthop, invalidaddr)) { /* XXX check preq retries */ sendpreq = 1; unknowndst = 1; @@ -1177,9 +1174,12 @@ ieee80211_hwmp_checkpseq(struct ieee8021 rt->rt_lastpseq = seq; return 0; } - if (rt->rt_lastpseq >= seq) + if (rt->rt_lastpseq >= seq) { + IEEE80211_NOTE(vap, IEEE80211_MSG_MESH, + vap->iv_bss, "seqno %u <= seqno %u", seq, + rt->rt_lastpseq); return 1; - else { + } else { rt->rt_lastpseq = seq; return 0; } Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_mesh.c Tue Jun 30 18:51:22 2009 (r195200) +++ projects/mesh11s/sys/net80211/ieee80211_mesh.c Tue Jun 30 18:52:36 2009 (r195201) @@ -413,6 +413,8 @@ mesh_input(struct ieee80211_node *ni, st const struct ieee80211_meshcntl *mc; int hdrspace, need_tap; uint8_t dir, type, subtype, qos; + uint32_t seq; + uint8_t *addr; KASSERT(ni != NULL, ("null node")); ni->ni_inact = ni->ni_inact_reload; @@ -514,10 +516,24 @@ mesh_input(struct ieee80211_node *ni, st ((struct ieee80211_qosframe *)wh)->i_qos[0]; } else qos = 0; + + /* + * BIG FAT XXX + * ugly + */ + seq = LE_READ_4(mc->mc_seq); + if (IEEE80211_IS_MULTICAST(wh->i_addr1)) + addr = wh->i_addr3; + else + addr = ((struct ieee80211_qosframe_addr4 *)wh)->i_addr4; + if (IEEE80211_ADDR_EQ(vap->iv_myaddr, addr)) + goto out; + if (ieee80211_hwmp_checkpseq(vap, addr, seq)) + goto out; /* * Check if we can forward the packet. */ - if (mc->mc_ttl <= 0 || + if (mc->mc_ttl == 0 || !(ms->ms_flags & IEEE80211_MESHFLAGS_FWD)) goto deliver; /*