From owner-svn-src-projects@FreeBSD.ORG Fri Jun 26 22:26:08 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 44C32106564A; Fri, 26 Jun 2009 22:26:08 +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 188B78FC12; Fri, 26 Jun 2009 22:26:08 +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 n5QMQ7rE010137; Fri, 26 Jun 2009 22:26:07 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5QMQ7fN010135; Fri, 26 Jun 2009 22:26:07 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200906262226.n5QMQ7fN010135@svn.freebsd.org> From: Rui Paulo Date: Fri, 26 Jun 2009 22:26:07 +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: r195082 - 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: Fri, 26 Jun 2009 22:26:08 -0000 Author: rpaulo Date: Fri Jun 26 22:26:07 2009 New Revision: 195082 URL: http://svn.freebsd.org/changeset/base/195082 Log: Enable commented out verify length. Sponsored by: The FreeBSD Foundation Modified: projects/mesh11s/sys/net80211/ieee80211_hwmp.c Modified: projects/mesh11s/sys/net80211/ieee80211_hwmp.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_hwmp.c Fri Jun 26 22:13:15 2009 (r195081) +++ projects/mesh11s/sys/net80211/ieee80211_hwmp.c Fri Jun 26 22:26:07 2009 (r195082) @@ -564,18 +564,8 @@ hwmp_recv_preq(struct ieee80211vap *vap, } fi = hwmp_rt_find(vap, PREQ_TADDR(0)); -#if 0 - /* - * Record the PREQ ID and the originator MAC address. - */ - if (fi == NULL) { - fi = hwmp_rt_add(vap, PREQ_TADDR(0)); - fi->fi_seq = preq->preq_origseq; - fi->fi_metric = preq->preq_metric; - fi->fi_lifetime = preq->preq_lifetime; - } - fi->fi_preqid = preq->preq_id; -#endif + if (fi) + fi->fi_preqid = preq->preq_id; /* * Check if the PREQ is addressed to us. @@ -599,16 +589,15 @@ hwmp_recv_preq(struct ieee80211vap *vap, IEEE80211_ADDR_COPY(prep.prep_origaddr, vap->iv_myaddr); prep.prep_origseq = hs->hs_seq++; hwmp_send_prep(ni, vap->iv_myaddr, wh->i_addr2, &prep); -#if 0 /* * Build the reverse path, if we don't have it already. */ - if (fi == NULL || - IEEE80211_ADDR_EQ(fi->fi_nexthop, invalidaddr)) { - ieee80211_hwmp_discover(vap, fi->fi_dest); - } -#endif - + fi = hwmp_rt_find(vap, preq->preq_origaddr); + if (fi == NULL) { + fi = hwmp_rt_add(vap, preq->preq_origaddr); + ieee80211_hwmp_discover(vap, fi->fi_dest, NULL); + } else if (IEEE80211_ADDR_EQ(fi->fi_nexthop, invalidaddr)) + ieee80211_hwmp_discover(vap, fi->fi_dest, NULL); return; } @@ -626,7 +615,6 @@ hwmp_recv_preq(struct ieee80211vap *vap, */ if (fi != NULL && !IEEE80211_ADDR_EQ(fi->fi_nexthop, invalidaddr)) { - IEEE80211_NOTE(vap, IEEE80211_MSG_HWMP, ni, "forwarding PREQ from %s", ether_sprintf(preq->preq_origaddr)); @@ -670,6 +658,12 @@ hwmp_recv_preq(struct ieee80211vap *vap, broadcastaddr, &prep); } } else { + fi = hwmp_rt_add(vap, PREQ_TADDR(0)); + fi->fi_seq = preq->preq_origseq; + fi->fi_metric = preq->preq_metric; + fi->fi_lifetime = preq->preq_lifetime; + fi->fi_preqid = preq->preq_id; + IEEE80211_NOTE(vap, IEEE80211_MSG_HWMP, ni, "forwarding PREQ from %s", ether_sprintf(preq->preq_origaddr));