svn commit: r192454 - projects/mesh11s/sys/net80211

[Rui Paulo]

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 <sys/param.h>
+#include <sys/systm.h> 
+#include <sys/mbuf.h>   
+#include <sys/malloc.h>
+#include <sys/kernel.h>
+
+#include <sys/socket.h>
+#include <sys/sockio.h>
+#include <sys/endian.h>
+#include <sys/errno.h>
+#include <sys/proc.h>
+#include <sys/sysctl.h>
+
+#include <net/if.h>
+#include <net/if_media.h>
+#include <net/if_llc.h>
+#include <net/ethernet.h>
+
+#include <net/bpf.h>
+
+#include <net80211/ieee80211_var.h>
+#include <net80211/ieee80211_hwmp.h>
+#include <net80211/ieee80211_input.h>
+
+
+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",