commits August 2012

commits@lists.open-mesh.org

1 participants
355 discussions

[openwrt-feed-batman-adv] master: batman-adv-devel: load kernel module if needed in hotplug script (0224ae6)
by postmaster＠open-mesh.org 21 Aug '12

21 Aug '12

Repository : ssh://git@open-mesh.org/openwrt-feed-batman-adv On branch : master >--------------------------------------------------------------- commit 0224ae6fba596befb6139b7d83360ae78eab39af Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Wed Mar 7 16:22:22 2012 +0000 batman-adv-devel: load kernel module if needed in hotplug script Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 0224ae6fba596befb6139b7d83360ae78eab39af batman-adv-devel/Makefile | 4 ++-- .../files/etc/hotplug.d/net/99-batman-adv | 1 + batman-adv-devel/files/lib/batman-adv/config.sh | 17 ++++++++++++++--- batman-adv-devel/files/usr/sbin/batman-adv | 1 + 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index ffb9958..603080f 100644 --- a/batman-adv-devel/Makefile +++ b/batman-adv-devel/Makefile @@ -10,8 +10,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batman-adv-devel -PKG_BATMAN_REV:=f86649b10214e8e98bdec161cefa13dcc8cb1e41 -PKG_BATCTL_REV:=1cce9654449331d13b5576e845453ff2613dbe43 +PKG_BATMAN_REV:=0c9a249ef4dcaf733f6c7f64d4ce5c97b4705968 +PKG_BATCTL_REV:=2f71a2e4e6863efa4c1112c7f585d074dce34782 PKG_BATMAN_BRANCH:=$(subst ",,$(CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_NAME)) PKG_BATMAN_SHORTREV:=$(shell echo $(PKG_BATMAN_REV) | cut -c1-7) diff --git a/batman-adv-devel/files/etc/hotplug.d/net/99-batman-adv b/batman-adv-devel/files/etc/hotplug.d/net/99-batman-adv index fe19e64..42d4c29 100644 --- a/batman-adv-devel/files/etc/hotplug.d/net/99-batman-adv +++ b/batman-adv-devel/files/etc/hotplug.d/net/99-batman-adv @@ -2,6 +2,7 @@ . /lib/batman-adv/config.sh +bat_load_module config_load batman-adv case "$ACTION" in diff --git a/batman-adv-devel/files/lib/batman-adv/config.sh b/batman-adv-devel/files/lib/batman-adv/config.sh index dfd9580..6f3e533 100644 --- a/batman-adv-devel/files/lib/batman-adv/config.sh +++ b/batman-adv-devel/files/lib/batman-adv/config.sh @@ -1,6 +1,15 @@ #!/bin/sh -bat_config(){ +bat_load_module() +{ + [ -d "/sys/module/batman_adv/" ] && return + + . /etc/functions.sh + load_modules /etc/modules.d/*-lib-crc16 /etc/modules.d/*-batman-adv +} + +bat_config() +{ local mesh="$1" local aggregated_ogms bonding fragmentation gw_bandwidth gw_mode gw_sel_class log_level orig_interval hop_penalty vis_mode @@ -31,7 +40,8 @@ bat_config(){ [ -n "$bridge_loop_avoidance" ] && echo $bridge_loop_avoidance > /sys/class/net/$mesh/mesh/bridge_loop_avoidance } -bat_add_interface(){ +bat_add_interface() +{ local mesh="$1" local interface="$2" local interfaces @@ -48,7 +58,8 @@ bat_add_interface(){ done } -bat_del_interface(){ +bat_del_interface() +{ local mesh="$1" local interface="$2" local interfaces diff --git a/batman-adv-devel/files/usr/sbin/batman-adv b/batman-adv-devel/files/usr/sbin/batman-adv index 6580756..93ae1b5 100644 --- a/batman-adv-devel/files/usr/sbin/batman-adv +++ b/batman-adv-devel/files/usr/sbin/batman-adv @@ -26,6 +26,7 @@ stop_mesh() { # can also be used with "batman-adv start bat0" start() { + bat_load_module config_load batman-adv if [ -n "$1" ]; then

1 0

[openwrt-feed-batman-adv] master: batman-adv-devel: update to latest master (9d044b7)
by postmaster＠open-mesh.org 21 Aug '12

21 Aug '12

Repository : ssh://git@open-mesh.org/openwrt-feed-batman-adv On branch : master >--------------------------------------------------------------- commit 9d044b74a8444ddb7628db1ba284764ba9e78f6b Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Wed Mar 28 16:16:25 2012 +0000 batman-adv-devel: update to latest master Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 9d044b74a8444ddb7628db1ba284764ba9e78f6b batman-adv-devel/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index 603080f..d914bc1 100644 --- a/batman-adv-devel/Makefile +++ b/batman-adv-devel/Makefile @@ -10,8 +10,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batman-adv-devel -PKG_BATMAN_REV:=0c9a249ef4dcaf733f6c7f64d4ce5c97b4705968 -PKG_BATCTL_REV:=2f71a2e4e6863efa4c1112c7f585d074dce34782 +PKG_BATMAN_REV:=6b49cabfc29467b91458a073b1eaf7506b977269 +PKG_BATCTL_REV:=59b559c4138d006beabf79e8f97767e99726dce7 PKG_BATMAN_BRANCH:=$(subst ",,$(CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_NAME)) PKG_BATMAN_SHORTREV:=$(shell echo $(PKG_BATMAN_REV) | cut -c1-7)

1 0

[openwrt-feed-batman-adv] master: batman-adv-devel: update to latest master (1c26956)
by postmaster＠open-mesh.org 21 Aug '12

21 Aug '12

Repository : ssh://git@open-mesh.org/openwrt-feed-batman-adv On branch : master >--------------------------------------------------------------- commit 1c26956a1f5d82103f06cc51e59e4462e6d0b420 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Thu Dec 8 11:30:03 2011 +0000 batman-adv-devel: update to latest master Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 1c26956a1f5d82103f06cc51e59e4462e6d0b420 batman-adv-devel/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index f54b20a..3538a7b 100644 --- a/batman-adv-devel/Makefile +++ b/batman-adv-devel/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batman-adv-devel -PKG_BATMAN_REV:=b3d474c54bca76797e88878f29f100a7d5c7e02b +PKG_BATMAN_REV:=486dc02b027ff118757c0cc530040a4e855f2e5a PKG_BATCTL_REV:=5f3776affad426fc2c00be3fb04c1bc1158829c5 PKG_BATMAN_SHORTREV:=$(shell echo $(PKG_BATMAN_REV) | cut -c1-7) @@ -52,13 +52,14 @@ endef MAKE_BATMAN_ADV_ARGS += \ CROSS_COMPILE="$(TARGET_CROSS)" \ + KERNELPATH="$(LINUX_DIR)" \ ARCH="$(LINUX_KARCH)" \ PATH="$(TARGET_PATH)" \ - $(if $(CONFIG_KMOD_BATMAN_ADV_DEVEL_DEBUG_LOG),EXTRA_CFLAGS="-DCONFIG_BATMAN_ADV_DEBUG -DREVISION_VERSION=\\\"$(PKG_BATMAN_SHORTREV)\\\"") \ SUBDIRS="$(PKG_BUILD_DIR)" \ PWD="$(PKG_BUILD_DIR)" \ LINUX_VERSION="$(LINUX_VERSION)" \ - REVISION="$(PKG_BATMAN_SHORTREV)" modules + $(if $(CONFIG_KMOD_BATMAN_ADV_DEVEL_DEBUG_LOG),CONFIG_BATMAN_ADV_DEBUG=y) \ + REVISION="$(PKG_BATMAN_SHORTREV)" all MAKE_BATCTL_ARGS += \ CFLAGS="$(TARGET_CFLAGS)" \ @@ -101,7 +102,7 @@ define Build/Patch endef define Build/Compile - $(MAKE) -C "$(LINUX_DIR)" $(MAKE_BATMAN_ADV_ARGS) + $(MAKE) -C "$(PKG_BUILD_DIR)" $(MAKE_BATMAN_ADV_ARGS) $(BATCTL_BUILD) endef

1 0

[openwrt-feed-batman-adv] master: batman-adv-devel: add bla2/catwoman/dat branch for testing (144adaa)
by postmaster＠open-mesh.org 21 Aug '12

21 Aug '12

Repository : ssh://git@open-mesh.org/openwrt-feed-batman-adv On branch : master >--------------------------------------------------------------- commit 144adaa6ca2b25959a402607fbf4606644ad6981 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Thu Jan 5 15:16:24 2012 +0000 batman-adv-devel: add bla2/catwoman/dat branch for testing Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 144adaa6ca2b25959a402607fbf4606644ad6981 batman-adv-devel/Config.in | 26 ++++++++++++++++++++++++++ batman-adv-devel/Makefile | 11 ++++++----- 2 files changed, 32 insertions(+), 5 deletions(-) diff --git a/batman-adv-devel/Config.in b/batman-adv-devel/Config.in index 5518f8d..7239f34 100644 --- a/batman-adv-devel/Config.in +++ b/batman-adv-devel/Config.in @@ -11,3 +11,29 @@ config KMOD_BATMAN_ADV_DEVEL_BATCTL batctl is a more intuitive managment utility for B.A.T.M.A.N.-Advanced. It is an easier method for configuring batman-adv and provides some additional tools for debugging as well. + +choice + prompt "branch selection" + default KMOD_BATMAN_ADV_DEVEL_BRANCH_MASTER + help + Select the branch to be built (if unsure leave default value). + + config KMOD_BATMAN_ADV_DEVEL_BRANCH_MASTER + bool "master" + + config KMOD_BATMAN_ADV_DEVEL_BRANCH_BLA2 + bool "bridge loop avoidance" + + config KMOD_BATMAN_ADV_DEVEL_BRANCH_CATWOMAN + bool "network encoding (alias catwoman)" + + config KMOD_BATMAN_ADV_DEVEL_BRANCH_DAT + bool "distributed arp table" +endchoice + +config KMOD_BATMAN_ADV_DEVEL_BRANCH_NAME + string + default "master" if KMOD_BATMAN_ADV_DEVEL_BRANCH_MASTER + default "bla2" if KMOD_BATMAN_ADV_DEVEL_BRANCH_BLA2 + default "catwoman" if KMOD_BATMAN_ADV_DEVEL_BRANCH_CATWOMAN + default "dat" if KMOD_BATMAN_ADV_DEVEL_BRANCH_DAT diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index 3538a7b..6289358 100644 --- a/batman-adv-devel/Makefile +++ b/batman-adv-devel/Makefile @@ -10,17 +10,18 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batman-adv-devel -PKG_BATMAN_REV:=486dc02b027ff118757c0cc530040a4e855f2e5a -PKG_BATCTL_REV:=5f3776affad426fc2c00be3fb04c1bc1158829c5 +PKG_BATMAN_REV:=b82b9b254c8a923fb2d65e2ca3eefc2e8b4429e7 +PKG_BATCTL_REV:=d9ee7eed3175992be75e2cb949c048bdddeb0769 +PKG_BATMAN_BRANCH:=$(subst ",,$(CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_NAME)) PKG_BATMAN_SHORTREV:=$(shell echo $(PKG_BATMAN_REV) | cut -c1-7) -PKG_BATMAN_FNAME:=batman-adv-devel-$(PKG_BATMAN_SHORTREV).tar.gz +PKG_BATMAN_FNAME:=batman-adv-devel-$(PKG_BATMAN_BRANCH)-$(PKG_BATMAN_SHORTREV).tar.gz PKG_BATMAN_DIR:=batman-adv-$(PKG_BATMAN_SHORTREV) PKG_BATCTL_SHORTREV:=$(shell echo $(PKG_BATCTL_REV) | cut -c1-7) PKG_BATCTL_FNAME:=batctl-devel-$(PKG_BATCTL_SHORTREV).tar.gz PKG_BATCTL_DIR:=batctl-$(PKG_BATCTL_SHORTREV) -PKG_SOURCE_URL:=http://git.open-mesh.org/snapshot/$(PKG_BATMAN_VERSION) +PKG_SOURCE_URL:=http://git.open-mesh.org/snapshot/ PKG_SOURCE:=$(PKG_BATMAN_FNAME) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_BATMAN_DIR) @@ -59,7 +60,7 @@ MAKE_BATMAN_ADV_ARGS += \ PWD="$(PKG_BUILD_DIR)" \ LINUX_VERSION="$(LINUX_VERSION)" \ $(if $(CONFIG_KMOD_BATMAN_ADV_DEVEL_DEBUG_LOG),CONFIG_BATMAN_ADV_DEBUG=y) \ - REVISION="$(PKG_BATMAN_SHORTREV)" all + REVISION="$(PKG_BATMAN_BRANCH)-$(PKG_BATMAN_SHORTREV)" all MAKE_BATCTL_ARGS += \ CFLAGS="$(TARGET_CFLAGS)" \

1 0

[openwrt-feed-batman-adv] master: batman-adv-devel: support hop_penalty option (bc92574)
by postmaster＠open-mesh.org 21 Aug '12

21 Aug '12

Repository : ssh://git@open-mesh.org/openwrt-feed-batman-adv On branch : master >--------------------------------------------------------------- commit bc925741197a70f7e591e150279dc6fc7d01ec25 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Tue Jan 10 14:55:39 2012 +0000 batman-adv-devel: support hop_penalty option Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- bc925741197a70f7e591e150279dc6fc7d01ec25 batman-adv-devel/files/lib/batman-adv/config.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/batman-adv-devel/files/lib/batman-adv/config.sh b/batman-adv-devel/files/lib/batman-adv/config.sh index 500665e..62645ee 100644 --- a/batman-adv-devel/files/lib/batman-adv/config.sh +++ b/batman-adv-devel/files/lib/batman-adv/config.sh @@ -2,7 +2,7 @@ bat_config(){ local mesh="$1" - local aggregated_ogms bonding fragmentation gw_bandwidth gw_mode gw_sel_class log_level orig_interval vis_mode + local aggregated_ogms bonding fragmentation gw_bandwidth gw_mode gw_sel_class log_level orig_interval hop_penalty vis_mode logger -st batman-adv "config_bat: mesh = $mesh" @@ -14,9 +14,11 @@ bat_config(){ config_get gw_sel_class "$mesh" gw_sel_class config_get log_level "$mesh" log_level config_get orig_interval "$mesh" orig_interval + config_get hop_penalty "$mesh" hop_penalty config_get vis_mode "$mesh" vis_mode [ -n "$orig_interval" ] && echo $orig_interval > /sys/class/net/$mesh/mesh/orig_interval + [ -n "$hop_penalty" ] && echo $hop_penalty > /sys/class/net/$mesh/mesh/hop_penalty [ -n "$log_level" ] && echo $log_level > /sys/class/net/$mesh/mesh/log_level 2>&- [ -n "$aggregate_ogms" ] && echo $aggregate_ogms > /sys/class/net/$mesh/mesh/aggregate_ogms [ -n "$bonding" ] && echo $bonding > /sys/class/net/$mesh/mesh/bonding

1 0

[openwrt-feed-batman-adv] master: batman-adv-devel: merge bla2, add batman v & rebase on trunk (cc06b85)
by postmaster＠open-mesh.org 21 Aug '12

21 Aug '12

Repository : ssh://git@open-mesh.org/openwrt-feed-batman-adv On branch : master >--------------------------------------------------------------- commit cc06b8553704e6303152e740f6ba312a7930f317 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Thu Feb 9 10:18:14 2012 +0000 batman-adv-devel: merge bla2, add batman v & rebase on trunk Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- cc06b8553704e6303152e740f6ba312a7930f317 batman-adv-devel/Config.in | 10 +++++++--- batman-adv-devel/Makefile | 7 ++++--- batman-adv-devel/files/lib/batman-adv/config.sh | 4 ---- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/batman-adv-devel/Config.in b/batman-adv-devel/Config.in index 7239f34..f67f69e 100644 --- a/batman-adv-devel/Config.in +++ b/batman-adv-devel/Config.in @@ -3,6 +3,10 @@ config KMOD_BATMAN_ADV_DEVEL_DEBUG_LOG bool "enable verbose debug logging" depends PACKAGE_kmod-batman-adv-devel default n +config KMOD_BATMAN_ADV_DEVEL_BLA + bool "enable bridge loop avoidance" + depends PACKAGE_kmod-batman-adv-devel + default y config KMOD_BATMAN_ADV_DEVEL_BATCTL bool "enable batctl" depends PACKAGE_kmod-batman-adv-devel @@ -21,8 +25,8 @@ choice config KMOD_BATMAN_ADV_DEVEL_BRANCH_MASTER bool "master" - config KMOD_BATMAN_ADV_DEVEL_BRANCH_BLA2 - bool "bridge loop avoidance" + config KMOD_BATMAN_ADV_DEVEL_BRANCH_BATMANV + bool "batman V routing algorithm" config KMOD_BATMAN_ADV_DEVEL_BRANCH_CATWOMAN bool "network encoding (alias catwoman)" @@ -34,6 +38,6 @@ endchoice config KMOD_BATMAN_ADV_DEVEL_BRANCH_NAME string default "master" if KMOD_BATMAN_ADV_DEVEL_BRANCH_MASTER - default "bla2" if KMOD_BATMAN_ADV_DEVEL_BRANCH_BLA2 + default "batmanv" if KMOD_BATMAN_ADV_DEVEL_BRANCH_BATMANV default "catwoman" if KMOD_BATMAN_ADV_DEVEL_BRANCH_CATWOMAN default "dat" if KMOD_BATMAN_ADV_DEVEL_BRANCH_DAT diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index 6289358..718c9c4 100644 --- a/batman-adv-devel/Makefile +++ b/batman-adv-devel/Makefile @@ -10,8 +10,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batman-adv-devel -PKG_BATMAN_REV:=b82b9b254c8a923fb2d65e2ca3eefc2e8b4429e7 -PKG_BATCTL_REV:=d9ee7eed3175992be75e2cb949c048bdddeb0769 +PKG_BATMAN_REV:=052332fb1a2d694fdc10bb0ebef495bbcb6fb06d +PKG_BATCTL_REV:=7dd21c88f6c1484ce0cbf52dca7b9fc86c2c9bb0 PKG_BATMAN_BRANCH:=$(subst ",,$(CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_NAME)) PKG_BATMAN_SHORTREV:=$(shell echo $(PKG_BATMAN_REV) | cut -c1-7) @@ -59,7 +59,8 @@ MAKE_BATMAN_ADV_ARGS += \ SUBDIRS="$(PKG_BUILD_DIR)" \ PWD="$(PKG_BUILD_DIR)" \ LINUX_VERSION="$(LINUX_VERSION)" \ - $(if $(CONFIG_KMOD_BATMAN_ADV_DEVEL_DEBUG_LOG),CONFIG_BATMAN_ADV_DEBUG=y) \ + CONFIG_BATMAN_ADV_DEBUG=$(if $(CONFIG_KMOD_BATMAN_ADV_DEVEL_DEBUG_LOG),y,n) \ + CONFIG_BATMAN_ADV_BLA=$(if $(CONFIG_KMOD_BATMAN_ADV_DEVEL_BLA),y,n) \ REVISION="$(PKG_BATMAN_BRANCH)-$(PKG_BATMAN_SHORTREV)" all MAKE_BATCTL_ARGS += \ diff --git a/batman-adv-devel/files/lib/batman-adv/config.sh b/batman-adv-devel/files/lib/batman-adv/config.sh index 62645ee..d0569bc 100644 --- a/batman-adv-devel/files/lib/batman-adv/config.sh +++ b/batman-adv-devel/files/lib/batman-adv/config.sh @@ -4,8 +4,6 @@ bat_config(){ local mesh="$1" local aggregated_ogms bonding fragmentation gw_bandwidth gw_mode gw_sel_class log_level orig_interval hop_penalty vis_mode - logger -st batman-adv "config_bat: mesh = $mesh" - config_get aggregated_ogms "$mesh" aggregated_ogms config_get bonding "$mesh" bonding config_get fragmentation "$mesh" fragmentation @@ -36,14 +34,12 @@ bat_add_interface(){ sleep 3s # some device (ath) is very lazy to start config_get interfaces $mesh interfaces - logger -st batman-adv "add_interface: mesh = $mesh, iface = $interface, ifaces = $interfaces" for iface in $interfaces; do [ -f "/sys/class/net/$iface/batman_adv/mesh_iface" ] || { iface=$(uci -q -P/var/state get network.$iface.ifname) [ -f "/sys/class/net/$iface/batman_adv/mesh_iface" ] || continue } - logger -st batman-adv "add_interface: $iface == $interface -> mesh = $mesh" [ "$iface" = "$interface" ] && echo $mesh > /sys/class/net/$iface/batman_adv/mesh_iface done }

1 0

[openwrt-feed-batman-adv] master: batman-adv-devel: update to latest master & add ap_isolation support (1d8a875)
by postmaster＠open-mesh.org 21 Aug '12

21 Aug '12

Repository : ssh://git@open-mesh.org/openwrt-feed-batman-adv On branch : master >--------------------------------------------------------------- commit 1d8a8756d0a15360b2cdb559e2b5df8a089098fd Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Mon Nov 14 15:30:06 2011 +0000 batman-adv-devel: update to latest master & add ap_isolation support Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 1d8a8756d0a15360b2cdb559e2b5df8a089098fd batman-adv-devel/Makefile | 4 ++-- batman-adv-devel/files/etc/config/batman-adv | 1 + batman-adv-devel/files/lib/batman-adv/config.sh | 7 ++++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index 1064cef..285b807 100644 --- a/batman-adv-devel/Makefile +++ b/batman-adv-devel/Makefile @@ -10,8 +10,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batman-adv-devel -PKG_BATMAN_REV:=00ca20ef24617946e37bf69ca0a374f86ea56e6b -PKG_BATCTL_REV:=9031e43c3d40a1771d6969c44e06ba4229ee6522 +PKG_BATMAN_REV:=44bb66d56dd8bcbdd9f92bf43280a6b956a65652 +PKG_BATCTL_REV:=ab16078808bf32b473d65055d7788793307f8cc1 PKG_BATMAN_SHORTREV:=$(shell echo $(PKG_BATMAN_REV) | cut -c1-7) PKG_BATMAN_FNAME:=batman-adv-devel-$(PKG_BATMAN_SHORTREV).tar.gz diff --git a/batman-adv-devel/files/etc/config/batman-adv b/batman-adv-devel/files/etc/config/batman-adv index 31ef797..414b119 100644 --- a/batman-adv-devel/files/etc/config/batman-adv +++ b/batman-adv-devel/files/etc/config/batman-adv @@ -2,6 +2,7 @@ config 'mesh' 'bat0' option 'interfaces' 'mesh' option 'aggregated_ogms' + option 'ap_isolation' option 'bonding' option 'fragmentation' option 'gw_bandwidth' diff --git a/batman-adv-devel/files/lib/batman-adv/config.sh b/batman-adv-devel/files/lib/batman-adv/config.sh index 347e307..58a01d2 100644 --- a/batman-adv-devel/files/lib/batman-adv/config.sh +++ b/batman-adv-devel/files/lib/batman-adv/config.sh @@ -13,13 +13,14 @@ is_module_loaded() { start_mesh () { local meshif="$1" - local interfaces aggregated_ogms bonding fragmentation gw_bandwidth gw_mode gw_sel_class log_level orig_interval vis_mode + local interfaces aggregated_ogms ap_isolation bonding fragmentation gw_bandwidth gw_mode gw_sel_class log_level orig_interval vis_mode is_module_loaded [ $? -ne 1 ] && return config_get interfaces "$meshif" interfaces config_get aggregated_ogms "$meshif" aggregated_ogms + config_get ap_isolation "$meshif" ap_isolation config_get bonding "$meshif" bonding config_get fragmentation "$meshif" fragmentation config_get gw_bandwidth "$meshif" gw_bandwidth @@ -57,6 +58,10 @@ start_mesh () { echo $aggregated_ogms > /sys/class/net/$meshif/mesh/aggregated_ogms fi + if [ $ap_isolation ]; then + echo $ap_isolation > /sys/class/net/$meshif/mesh/ap_isolation + fi + if [ $bonding ]; then echo $bonding > /sys/class/net/$meshif/mesh/bonding fi

1 0

[openwrt-feed-batman-adv] master: batman-adv-devel: hotplug rewrite (e035d4c)
by postmaster＠open-mesh.org 21 Aug '12

21 Aug '12

Repository : ssh://git@open-mesh.org/openwrt-feed-batman-adv On branch : master >--------------------------------------------------------------- commit e035d4c433b4d2414fb025d4b9bfbac30992e62f Author: Filippo Sallemi <tonyputi(a)gmail.com> Date: Thu Nov 24 07:36:35 2011 +0000 batman-adv-devel: hotplug rewrite The batman-adv-devel package now uses hotplug to enable / disable its interfaces and to load the mesh configuration settings. The previously used batman-adv init script isn't needed any longer. To still offer a convenient way of reloading the batman-adv config the batman-adv script is provided. Signed-off-by: Filippo Sallemi <tonyputi(a)gmail.com> >--------------------------------------------------------------- e035d4c433b4d2414fb025d4b9bfbac30992e62f batman-adv-devel/Makefile | 34 ++--- batman-adv-devel/files/etc/config/batman-adv | 3 + .../files/etc/hotplug.d/net/99-batman-adv | 15 ++ batman-adv-devel/files/etc/init.d/batman-adv | 28 ---- batman-adv-devel/files/lib/batman-adv/config.sh | 148 +++++++------------- batman-adv-devel/files/usr/sbin/batman-adv | 46 ++++++ 6 files changed, 131 insertions(+), 143 deletions(-) diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index 285b807..f54c5da 100644 --- a/batman-adv-devel/Makefile +++ b/batman-adv-devel/Makefile @@ -33,7 +33,7 @@ define KernelPackage/batman-adv-devel URL:=http://www.open-mesh.org/ MAINTAINER:=Marek Lindner <lindner_marek(a)yahoo.de> SUBMENU:=Network Support - DEPENDS:=@!LINUX_2_4 +kmod-crc16 + DEPENDS:=+kmod-lib-crc16 TITLE:=B.A.T.M.A.N. Adv devel FILES:=$(PKG_BUILD_DIR)/batman-adv.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,50,batman-adv) @@ -78,9 +78,10 @@ define Download/batctl endef $(eval $(call Download,batctl)) -EXTRACT_BATCTL = tar xzf "$(DL_DIR)/$(PKG_BATCTL_FNAME)" -C "$(BUILD_DIR)/$(PKG_NAME)" -PATCH_BATCTL = $(call Build/DoPatch,"$(PKG_BATCTL_BUILD_DIR)","$(PATCH_DIR)","*batctl*") -BUILD_BATCTL = $(MAKE) -C $(PKG_BATCTL_BUILD_DIR) $(MAKE_BATCTL_ARGS) +BATCTL_EXTRACT = tar xzf "$(DL_DIR)/$(PKG_BATCTL_FNAME)" -C "$(BUILD_DIR)/$(PKG_NAME)" +BATCTL_PATCH = $(call Build/DoPatch,"$(PKG_BATCTL_BUILD_DIR)","$(PATCH_DIR)","*batctl*") +BATCTL_BUILD = $(MAKE) -C $(PKG_BATCTL_BUILD_DIR) $(MAKE_BATCTL_ARGS) +BATCTL_INSTALL = $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/local/sbin/batctl $(1)/usr/sbin/ endif KPATCH ?= $(PATCH) @@ -94,36 +95,27 @@ endef define Build/Patch $(call Build/DoPatch,"$(PKG_BUILD_DIR)","$(PATCH_DIR)","*batman*") - $(EXTRACT_BATCTL) - $(PATCH_BATCTL) + $(BATCTL_EXTRACT) + $(BATCTL_PATCH) endef define Build/Compile cp $(PKG_BUILD_DIR)/Makefile.kbuild $(PKG_BUILD_DIR)/Makefile $(MAKE) -C "$(LINUX_DIR)" $(MAKE_BATMAN_ADV_ARGS) - $(BUILD_BATCTL) + $(BATCTL_BUILD) endef define Build/Clean rm -rf $(BUILD_DIR)/$(PKG_NAME)/ endef -ifneq ($(DEVELOPER)$(CONFIG_KMOD_BATMAN_ADV_DEVEL_BATCTL),) define KernelPackage/batman-adv-devel/install - $(INSTALL_DIR) $(1)/etc/config $(1)/etc/init.d $(1)/lib/batman-adv - $(INSTALL_BIN) ./files/etc/init.d/batman-adv $(1)/etc/init.d - $(INSTALL_BIN) ./files/lib/batman-adv/config.sh $(1)/lib/batman-adv + $(INSTALL_DIR) $(1)/etc/config $(1)/etc/hotplug.d/net $(1)/lib/batman-adv $(1)/usr/sbin $(INSTALL_DATA) ./files/etc/config/batman-adv $(1)/etc/config - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/local/sbin/batctl $(1)/usr/sbin/ + $(INSTALL_DATA) ./files/lib/batman-adv/config.sh $(1)/lib/batman-adv + $(INSTALL_BIN) ./files/etc/hotplug.d/net/99-batman-adv $(1)/etc/hotplug.d/net + $(INSTALL_BIN) ./files/usr/sbin/batman-adv $(1)/usr/sbin + $(BATCTL_INSTALL) endef -else -define KernelPackage/batman-adv-devel/install - $(INSTALL_DIR) $(1)/etc/config $(1)/etc/init.d $(1)/lib/batman-adv - $(INSTALL_BIN) ./files/etc/init.d/batman-adv $(1)/etc/init.d - $(INSTALL_BIN) ./files/lib/batman-adv/config.sh $(1)/lib/batman-adv - $(INSTALL_DATA) ./files/etc/config/batman-adv $(1)/etc/config -endef -endif $(eval $(call KernelPackage,batman-adv-devel)) diff --git a/batman-adv-devel/files/etc/config/batman-adv b/batman-adv-devel/files/etc/config/batman-adv index 414b119..5197820 100644 --- a/batman-adv-devel/files/etc/config/batman-adv +++ b/batman-adv-devel/files/etc/config/batman-adv @@ -12,3 +12,6 @@ config 'mesh' 'bat0' option 'orig_interval' option 'vis_mode' +# yet another batX instance +# config 'mesh' 'bat5' +# option 'interfaces' 'second_mesh' diff --git a/batman-adv-devel/files/etc/hotplug.d/net/99-batman-adv b/batman-adv-devel/files/etc/hotplug.d/net/99-batman-adv new file mode 100644 index 0000000..2ad83cf --- /dev/null +++ b/batman-adv-devel/files/etc/hotplug.d/net/99-batman-adv @@ -0,0 +1,15 @@ +#!/bin/sh + +. /lib/batman-adv/config.sh + +config_load batman-adv + +case "$ACTION" in + add) + [ -d /sys/class/net/$INTERFACE/mesh/ ] && config_bat "$INTERFACE" + [ -d /sys/class/net/$INTERFACE/batman_adv/ ] && config_foreach bat_add_interface mesh "$INTERFACE" + ;; + remove) + [ -d /sys/class/net/$INTERFACE/batman_adv/ ] && config_foreach bat_del_interface mesh "$INTERFACE" + ;; +esac diff --git a/batman-adv-devel/files/etc/init.d/batman-adv b/batman-adv-devel/files/etc/init.d/batman-adv deleted file mode 100644 index f0f6789..0000000 --- a/batman-adv-devel/files/etc/init.d/batman-adv +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh /etc/rc.common -# Copyright (C) 2011 OpenWrt.org - -START=90 - -. /lib/batman-adv/config.sh - -# can also be used with "batman-adv start bat0" -start() { - config_load batman-adv - - if [ -n "$1" ]; then - start_mesh $1 - else - config_foreach start_mesh mesh - fi -} - -# can also be used with "batman-adv stop bat0" -stop () { - config_load batman-adv - - if [ -n "$1" ]; then - stop_mesh $1 - else - config_foreach stop_mesh mesh - fi -} diff --git a/batman-adv-devel/files/lib/batman-adv/config.sh b/batman-adv-devel/files/lib/batman-adv/config.sh index 58a01d2..500665e 100644 --- a/batman-adv-devel/files/lib/batman-adv/config.sh +++ b/batman-adv-devel/files/lib/batman-adv/config.sh @@ -1,103 +1,63 @@ #!/bin/sh -# Copyright (C) 2011 OpenWrt.org -is_module_loaded() { - - if [ ! -d "/sys/module/batman_adv" ]; then - echo "batman-adv module directory not found - was the kernel module loaded ?" >&2 - return 0 - fi - - return 1 +bat_config(){ + local mesh="$1" + local aggregated_ogms bonding fragmentation gw_bandwidth gw_mode gw_sel_class log_level orig_interval vis_mode + + logger -st batman-adv "config_bat: mesh = $mesh" + + config_get aggregated_ogms "$mesh" aggregated_ogms + config_get bonding "$mesh" bonding + config_get fragmentation "$mesh" fragmentation + config_get gw_bandwidth "$mesh" gw_bandwidth + config_get gw_mode "$mesh" gw_mode + config_get gw_sel_class "$mesh" gw_sel_class + config_get log_level "$mesh" log_level + config_get orig_interval "$mesh" orig_interval + config_get vis_mode "$mesh" vis_mode + + [ -n "$orig_interval" ] && echo $orig_interval > /sys/class/net/$mesh/mesh/orig_interval + [ -n "$log_level" ] && echo $log_level > /sys/class/net/$mesh/mesh/log_level 2>&- + [ -n "$aggregate_ogms" ] && echo $aggregate_ogms > /sys/class/net/$mesh/mesh/aggregate_ogms + [ -n "$bonding" ] && echo $bonding > /sys/class/net/$mesh/mesh/bonding + [ -n "$fragmentation" ] && echo $fragmentation > /sys/class/net/$mesh/mesh/fragmentation + [ -n "$gw_bandwidth" ] && echo $gw_bandwidth > /sys/class/net/$mesh/mesh/gw_bandwidth + [ -n "$gw_mode" ] && echo $gw_mode > /sys/class/net/$mesh/mesh/gw_mode + [ -n "$gw_sel_class" ] && echo $gw_sel_class > /sys/class/net/$mesh/mesh/gw_sel_class + [ -n "$vis_mode" ] && echo $vis_mode > /sys/class/net/$mesh/mesh/vis_mode } -start_mesh () { - local meshif="$1" - local interfaces aggregated_ogms ap_isolation bonding fragmentation gw_bandwidth gw_mode gw_sel_class log_level orig_interval vis_mode - - is_module_loaded - [ $? -ne 1 ] && return - - config_get interfaces "$meshif" interfaces - config_get aggregated_ogms "$meshif" aggregated_ogms - config_get ap_isolation "$meshif" ap_isolation - config_get bonding "$meshif" bonding - config_get fragmentation "$meshif" fragmentation - config_get gw_bandwidth "$meshif" gw_bandwidth - config_get gw_mode "$meshif" gw_mode - config_get gw_sel_class "$meshif" gw_sel_class - config_get log_level "$meshif" log_level - config_get orig_interval "$meshif" orig_interval - config_get vis_mode "$meshif" vis_mode - - if [ "$interfaces" = "" ]; then - echo Error, you must specify at least a network interface - return - fi - - for interface in $interfaces - do - ifname=$(uci -P /var/state get network.$interface.ifname 2>&-) - [ ! -f "/sys/class/net/$ifname/batman_adv/mesh_iface" ] && { - ifname=${interface} - [ ! -f "/sys/class/net/$ifname/batman_adv/mesh_iface" ] && echo "Can't add interface $ifname - ignoring" && continue - } - - echo $meshif > /sys/class/net/$ifname/batman_adv/mesh_iface - done - - if [ $orig_interval ]; then - echo $orig_interval > /sys/class/net/$meshif/mesh/orig_interval - fi - - if [ $log_level ]; then - echo $log_level > /sys/class/net/$meshif/mesh/log_level 2>&- - fi - - if [ $aggregated_ogms ]; then - echo $aggregated_ogms > /sys/class/net/$meshif/mesh/aggregated_ogms - fi - - if [ $ap_isolation ]; then - echo $ap_isolation > /sys/class/net/$meshif/mesh/ap_isolation - fi - - if [ $bonding ]; then - echo $bonding > /sys/class/net/$meshif/mesh/bonding - fi - - if [ $fragmentation ]; then - echo $fragmentation > /sys/class/net/$meshif/mesh/fragmentation - fi - - if [ $gw_bandwidth ]; then - echo $gw_bandwidth > /sys/class/net/$meshif/mesh/gw_bandwidth - fi - - if [ $gw_mode ]; then - echo $gw_mode > /sys/class/net/$meshif/mesh/gw_mode - fi - - if [ $gw_sel_class ]; then - echo $gw_sel_class > /sys/class/net/$meshif/mesh/gw_sel_class - fi - - if [ $vis_mode ]; then - echo $vis_mode > /sys/class/net/$meshif/mesh/vis_mode - fi +bat_add_interface(){ + local mesh="$1" + local interface="$2" + local interfaces + + sleep 3s # some device (ath) is very lazy to start + config_get interfaces $mesh interfaces + logger -st batman-adv "add_interface: mesh = $mesh, iface = $interface, ifaces = $interfaces" + for iface in $interfaces; do + [ -f "/sys/class/net/$iface/batman_adv/mesh_iface" ] || { + iface=$(uci -q -P/var/state get network.$iface.ifname) + [ -f "/sys/class/net/$iface/batman_adv/mesh_iface" ] || continue + } + + logger -st batman-adv "add_interface: $iface == $interface -> mesh = $mesh" + [ "$iface" = "$interface" ] && echo $mesh > /sys/class/net/$iface/batman_adv/mesh_iface + done } -stop_mesh() { - local meshif="$1" - - is_module_loaded - [ $? -ne 1 ] && return +bat_del_interface(){ + local mesh="$1" + local interface="$2" + local interfaces - for iface in $(ls /sys/class/net/*) - do - [ ! -f "$iface/batman_adv/mesh_iface" ] && continue - [ "$(head -1 $iface/batman_adv/mesh_iface)" != "$meshif" ] && continue + config_get interfaces $mesh interfaces + for iface in $interfaces; do + [ -f "/sys/class/net/$iface/batman_adv/mesh_iface" ] || { + iface=$(uci -q -P/var/state get network.$iface.ifname) + [ -f "/sys/class/net/$iface/batman_adv/mesh_iface" ] || continue + } - echo "none" > $iface/batman_adv/mesh_iface - done + [ "$iface" = "$interface" ] && echo none > /sys/class/net/$iface/batman_adv/mesh_iface + done } diff --git a/batman-adv-devel/files/usr/sbin/batman-adv b/batman-adv-devel/files/usr/sbin/batman-adv new file mode 100644 index 0000000..4f17991 --- /dev/null +++ b/batman-adv-devel/files/usr/sbin/batman-adv @@ -0,0 +1,46 @@ +#!/bin/sh /etc/rc.common +# Copyright (C) 2011 OpenWrt.org + +. /lib/batman-adv/config.sh + +start_mesh() { + local mesh="$1" + local ifaces=$(awk -F':' '{if (NR > 2) print $1}' /proc/net/dev) + + for iface in $ifaces; do + [ -d /sys/class/net/$iface/batman_adv/ ] && bat_add_interface "$mesh" "$iface" + done + + bat_config "$mesh" +} + +stop_mesh() { + local mesh="$1" + local ifaces=$(awk -F':' '{if (NR > 2) print $1}' /proc/net/dev) + + for iface in $ifaces; do + [ -d /sys/class/net/$iface/batman_adv/ ] && bat_del_interface "$mesh" "$iface" + done +} + +# can also be used with "batman-adv start bat0" +start() { + config_load batman-adv + + if [ -n "$1" ]; then + start_mesh $1 + else + config_foreach start_mesh mesh + fi +} + +# can also be used with "batman-adv stop bat0" +stop () { + config_load batman-adv + + if [ -n "$1" ]; then + stop_mesh $1 + else + config_foreach stop_mesh mesh + fi +}

1 0

[openwrt-feed-batman-adv] master: batman-adv-devel: delete empty directory (eb22c7f)
by postmaster＠open-mesh.org 21 Aug '12

21 Aug '12

Repository : ssh://git@open-mesh.org/openwrt-feed-batman-adv On branch : master >--------------------------------------------------------------- commit eb22c7ff07ca199b83bee0919226cfcd8a8dcb3a Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Thu Nov 24 07:39:33 2011 +0000 batman-adv-devel: delete empty directory Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >---------------------------------------------------------------

1 0

[openwrt-feed-batman-adv] master: batman-adv-devel: update to latest master (6682952)
by postmaster＠open-mesh.org 21 Aug '12

21 Aug '12

Repository : ssh://git@open-mesh.org/openwrt-feed-batman-adv On branch : master >--------------------------------------------------------------- commit 668295223e57396f923112ffb803a08d7907faf8 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Wed Dec 7 09:31:24 2011 +0000 batman-adv-devel: update to latest master Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 668295223e57396f923112ffb803a08d7907faf8 batman-adv-devel/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index f54c5da..f54b20a 100644 --- a/batman-adv-devel/Makefile +++ b/batman-adv-devel/Makefile @@ -10,8 +10,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batman-adv-devel -PKG_BATMAN_REV:=44bb66d56dd8bcbdd9f92bf43280a6b956a65652 -PKG_BATCTL_REV:=ab16078808bf32b473d65055d7788793307f8cc1 +PKG_BATMAN_REV:=b3d474c54bca76797e88878f29f100a7d5c7e02b +PKG_BATCTL_REV:=5f3776affad426fc2c00be3fb04c1bc1158829c5 PKG_BATMAN_SHORTREV:=$(shell echo $(PKG_BATMAN_REV) | cut -c1-7) PKG_BATMAN_FNAME:=batman-adv-devel-$(PKG_BATMAN_SHORTREV).tar.gz @@ -56,6 +56,7 @@ MAKE_BATMAN_ADV_ARGS += \ PATH="$(TARGET_PATH)" \ $(if $(CONFIG_KMOD_BATMAN_ADV_DEVEL_DEBUG_LOG),EXTRA_CFLAGS="-DCONFIG_BATMAN_ADV_DEBUG -DREVISION_VERSION=\\\"$(PKG_BATMAN_SHORTREV)\\\"") \ SUBDIRS="$(PKG_BUILD_DIR)" \ + PWD="$(PKG_BUILD_DIR)" \ LINUX_VERSION="$(LINUX_VERSION)" \ REVISION="$(PKG_BATMAN_SHORTREV)" modules @@ -100,7 +101,6 @@ define Build/Patch endef define Build/Compile - cp $(PKG_BUILD_DIR)/Makefile.kbuild $(PKG_BUILD_DIR)/Makefile $(MAKE) -C "$(LINUX_DIR)" $(MAKE_BATMAN_ADV_ARGS) $(BATCTL_BUILD) endef

1 0

← Newer
1
...
28
29
30
31
32
33
34
35
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits August 2012