From owner-svn-src-projects@FreeBSD.ORG Wed May 20 18:16:45 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 C3789106564A; Wed, 20 May 2009 18:16:45 +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 B10478FC15; Wed, 20 May 2009 18:16:45 +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 n4KIGjEW039395; Wed, 20 May 2009 18:16:45 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4KIGjRN039391; Wed, 20 May 2009 18:16:45 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200905201816.n4KIGjRN039391@svn.freebsd.org> From: Rui Paulo Date: Wed, 20 May 2009 18:16:45 +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: r192454 - 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: Wed, 20 May 2009 18:16:46 -0000 Author: rpaulo Date: Wed May 20 18:16:45 2009 New Revision: 192454 URL: http://svn.freebsd.org/changeset/base/192454 Log: Add HWMP variables. Add mesh forwarding variable control. Sponsored by: The FreeBSD Foundation Modified: projects/mesh11s/sys/net80211/ieee80211_freebsd.c projects/mesh11s/sys/net80211/ieee80211_hwmp.c projects/mesh11s/sys/net80211/ieee80211_hwmp.h projects/mesh11s/sys/net80211/ieee80211_mesh.c Modified: projects/mesh11s/sys/net80211/ieee80211_freebsd.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_freebsd.c Wed May 20 18:15:13 2009 (r192453) +++ projects/mesh11s/sys/net80211/ieee80211_freebsd.c Wed May 20 18:16:45 2009 (r192454) @@ -75,6 +75,9 @@ SYSCTL_NODE(_net_wlan, OID_AUTO, mesh, C extern int ieee80211_mesh_ttl; SYSCTL_INT(_net_wlan_mesh, OID_AUTO, ttl, CTLTYPE_INT | CTLFLAG_RW, &ieee80211_mesh_ttl, 0, "TTL for mesh packets"); +extern int ieee80211_mesh_forwarding; +SYSCTL_INT(_net_wlan_mesh, OID_AUTO, forwarding, CTLTYPE_INT | CTLFLAG_RW, + &ieee80211_mesh_forwarding, 0, "Forward mesh packets"); MALLOC_DEFINE(M_80211_COM, "80211com", "802.11 com state"); Modified: projects/mesh11s/sys/net80211/ieee80211_hwmp.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_hwmp.c Wed May 20 18:15:13 2009 (r192453) +++ projects/mesh11s/sys/net80211/ieee80211_hwmp.c Wed May 20 18:16:45 2009 (r192454) @@ -36,3 +36,45 @@ __FBSDID("$FreeBSD$"); */ #include "opt_inet.h" #include "opt_wlan.h" + +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#include + +#include +#include +#include + + +int ieee80211_hwmp_maxhops = 31; +int ieee80211_hwmp_maxhopstime = 500; +int ieee80211_hwmp_maxprepretries = 3; +int ieee80211_hwmp_prepminint = 100; +int ieee80211_hwmp_perrminint = 100; +int ieee80211_hwmp_roottimeout = 5000; +int ieee80211_hwmp_pathtimeout = 5000; +int ieee80211_hwmp_rootmode = 0; +int ieee80211_hwmp_pathtoroottimeout = 5000; +int ieee80211_hmwp_rootint = 2000; +int ieee80211_hwmp_rannint = 1000; +int ieee80211_hwmp_targetonly = 1; /* reply to PREQs if we have the info */ +int ieee80211_hwmp_replyforward = 1; /* propagate PREQs */ +int ieee80211_hwmp_pathmaintenance = 2000; +int ieee80211_hwmp_confirmint = 2000; + Modified: projects/mesh11s/sys/net80211/ieee80211_hwmp.h ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_hwmp.h Wed May 20 18:15:13 2009 (r192453) +++ projects/mesh11s/sys/net80211/ieee80211_hwmp.h Wed May 20 18:16:45 2009 (r192454) @@ -31,4 +31,8 @@ #ifndef _NET80211_IEEE80211_HWMP_H_ #define _NET80211_IEEE80211_HWMP_H_ +void ieee80211_hwmp_recv_path(struct ieee80211vap *, struct ieee80211_node *, + struct mbuf *); + + #endif /* _NET80211_IEEE80211_HWMP_H_ */ Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_mesh.c Wed May 20 18:15:13 2009 (r192453) +++ projects/mesh11s/sys/net80211/ieee80211_mesh.c Wed May 20 18:16:45 2009 (r192454) @@ -90,6 +90,7 @@ static const int ieee80211_mesh_confirmt static const int ieee80211_mesh_maxretries = 2; /* non static for sysctl hookup */ int ieee80211_mesh_ttl = 31; +int ieee80211_mesh_forwarding = 1; static const char *nodemeshstates[] = { "IDLE",