From owner-svn-src-projects@FreeBSD.ORG Fri Apr 24 14:22:09 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 EED3A106564A; Fri, 24 Apr 2009 14:22:09 +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 DC9F38FC0A; Fri, 24 Apr 2009 14:22:09 +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 n3OEM9q9024416; Fri, 24 Apr 2009 14:22:09 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3OEM9Tc024411; Fri, 24 Apr 2009 14:22:09 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200904241422.n3OEM9Tc024411@svn.freebsd.org> From: Rui Paulo Date: Fri, 24 Apr 2009 14:22:09 +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: r191466 - 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, 24 Apr 2009 14:22:10 -0000 Author: rpaulo Date: Fri Apr 24 14:22:09 2009 New Revision: 191466 URL: http://svn.freebsd.org/changeset/base/191466 Log: Initial work on adding mesh ID IE on beacon construction. Sponsored by: The FreeBSD Foundation Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c projects/mesh11s/sys/net80211/ieee80211_mesh.h projects/mesh11s/sys/net80211/ieee80211_node.c projects/mesh11s/sys/net80211/ieee80211_output.c projects/mesh11s/sys/net80211/ieee80211_scan_sta.c Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_mesh.c Fri Apr 24 13:28:25 2009 (r191465) +++ projects/mesh11s/sys/net80211/ieee80211_mesh.c Fri Apr 24 14:22:09 2009 (r191466) @@ -379,8 +379,8 @@ ieee80211_parse_meshid(struct ieee80211_ struct ieee80211vap *vap = ni->ni_vap; if (vap->iv_caps & IEEE80211_C_MBSS) { - const struct ieee80211_meshid_ie *meshid = - (const struct ieee80211_meshid_ie *)ie; + /*const struct ieee80211_meshid_ie *meshid = + (const struct ieee80211_meshid_ie *)ie;*/ /* * Mesh STAs are QoS stations, so QoS is not optional. @@ -389,6 +389,29 @@ ieee80211_parse_meshid(struct ieee80211_ } } +/* + * Add a MESH ID element to a frame. + */ +uint8_t * +ieee80211_add_meshid(uint8_t *frm, struct ieee80211vap *vap) +{ + struct ieee80211_meshid_ie ie = { + .id_ie = IEEE80211_ELEMID_MESHID, + .id_len = sizeof(struct ieee80211_meshid_ie) + + vap->iv_meshidlen, + }; + + KASSERT(vap->iv_caps & IEEE80211_C_MBSS, + ("not a mbss vap, caps 0x%x", vap->iv_caps)); + + memcpy(frm, &ie, sizeof(ie)); + frm += sizeof(struct ieee80211_meshid_ie); + memcpy(frm, vap->iv_meshid, vap->iv_meshidlen); + frm += vap->iv_meshidlen; + + return frm; +} + static int mesh_ioctl_get80211(struct ieee80211vap *vap, struct ieee80211req *ireq) { Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.h ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_mesh.h Fri Apr 24 13:28:25 2009 (r191465) +++ projects/mesh11s/sys/net80211/ieee80211_mesh.h Fri Apr 24 14:22:09 2009 (r191466) @@ -289,8 +289,9 @@ struct ieee80211_meshact_ie { } __packed; -void ieee80211_mesh_attach(struct ieee80211com *); -void ieee80211_mesh_detach(struct ieee80211com *); -void ieee80211_parse_meshid(struct ieee80211_node *, const uint8_t *); +void ieee80211_mesh_attach(struct ieee80211com *); +void ieee80211_mesh_detach(struct ieee80211com *); +void ieee80211_parse_meshid(struct ieee80211_node *, const uint8_t *); +uint8_t * ieee80211_add_meshid(uint8_t *, struct ieee80211vap *); #endif /* !_NET80211_IEEE80211_MESH_H_ */ Modified: projects/mesh11s/sys/net80211/ieee80211_node.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_node.c Fri Apr 24 13:28:25 2009 (r191465) +++ projects/mesh11s/sys/net80211/ieee80211_node.c Fri Apr 24 14:22:09 2009 (r191466) @@ -50,6 +50,7 @@ __FBSDID("$FreeBSD$"); #include #endif #include +#include #include Modified: projects/mesh11s/sys/net80211/ieee80211_output.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_output.c Fri Apr 24 13:28:25 2009 (r191465) +++ projects/mesh11s/sys/net80211/ieee80211_output.c Fri Apr 24 14:22:09 2009 (r191466) @@ -54,6 +54,7 @@ __FBSDID("$FreeBSD$"); #include #endif #include +#include #ifdef INET #include @@ -2331,6 +2332,8 @@ ieee80211_beacon_construct(struct mbuf * * XXX Vendor-specific OIDs (e.g. Atheros) * [tlv] WPA parameters * [tlv] WME parameters + * [tlv] MESH ID + * [tlv] MESH configuration * [tlv] Vendor OUI HT capabilities (optional) * [tlv] Vendor OUI HT information (optional) * [tlv] Atheros capabilities (optional) @@ -2441,6 +2444,9 @@ ieee80211_beacon_construct(struct mbuf * bo->bo_appie_len = vap->iv_appie_beacon->ie_len; frm = add_appie(frm, vap->iv_appie_beacon); } + if (vap->iv_opmode == IEEE80211_M_MBSS) { + frm = ieee80211_add_meshid(frm, vap); + } bo->bo_tim_trailer_len = frm - bo->bo_tim_trailer; bo->bo_csa_trailer_len = frm - bo->bo_csa; m->m_pkthdr.len = m->m_len = frm - mtod(m, uint8_t *); @@ -2642,6 +2648,9 @@ ieee80211_beacon_update(struct ieee80211 ieee80211_tdma_update_beacon(vap, bo); } #endif + if (vap->iv_opmode == IEEE80211_M_MBSS) { + /*ieee80211_mesh_update_beacon(vap, bo);*/ + } if (vap->iv_opmode == IEEE80211_M_HOSTAP) { /* NB: no IBSS support*/ struct ieee80211_tim_ie *tie = (struct ieee80211_tim_ie *) bo->bo_tim; Modified: projects/mesh11s/sys/net80211/ieee80211_scan_sta.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_scan_sta.c Fri Apr 24 13:28:25 2009 (r191465) +++ projects/mesh11s/sys/net80211/ieee80211_scan_sta.c Fri Apr 24 14:22:09 2009 (r191466) @@ -992,13 +992,14 @@ match_bss(struct ieee80211vap *vap, #endif /* IEEE80211_SUPPORT_TDMA */ } else if (vap->iv_opmode == IEEE80211_M_MBSS) { /* - * We are only interested in finding non IBSS/ESS nodes. + * Mesh nodes have IBSS & ESS bits in capinfo turned off. */ if (se->se_capinfo & (IEEE80211_CAPINFO_IBSS|IEEE80211_CAPINFO_ESS)) fail |= MATCH_CAPINFO; if (vap->iv_caps & IEEE80211_C_MBSS) { - /* TBD */ + /*const struct ieee80211_meshid_ie *meshid = + (const struct ieee80211_meshid_ie *)se->se_ies.meshid_ie;*/ } } else { if ((se->se_capinfo & IEEE80211_CAPINFO_ESS) == 0)