commits August 2012

commits@lists.open-mesh.org

1 participants
355 discussions

[openwrt-feed-batman-adv] master: batman-adv-devel: upgrade package to latest git revision (8c24660)
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 8c24660d4b37992cc4dc5e1dd6831717e06c939a Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Tue Apr 19 13:17:22 2011 +0000 batman-adv-devel: upgrade package to latest git revision >--------------------------------------------------------------- 8c24660d4b37992cc4dc5e1dd6831717e06c939a 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 3eff7ed..ea2f69f 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:=3cc9ba15c95147eeb70529ca3892853b3c81a862 -PKG_BATCTL_REV:=6f77463027311b49d52bd3aef4d82c8aae27014f +PKG_BATMAN_REV:=ffe432976aeb189d5721fc5d6dddc7340e8cf5b7 +PKG_BATCTL_REV:=16692bd9341f49d7c2f27ee6e3074d62f53df71e PKG_BATMAN_SHORTREV:=$(shell echo $(PKG_BATMAN_REV) | cut -c1-7) PKG_BATMAN_FNAME:=batman-adv-devel-$(PKG_BATMAN_SHORTREV).tar.gz

1 0

[openwrt-feed-batman-adv] master: batman-adv-devel: init script tries to retrieve interfaces from uci (1e9acd6)
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 1e9acd6f93a736b8f3c1335b60ca6ce7962283ad Author: Filippo Sallemi <tonyputi(a)gmail.com> Date: Tue Apr 19 13:18:56 2011 +0000 batman-adv-devel: init script tries to retrieve interfaces from uci The batman-adv init script will query uci (network.$iface.ifname) to retrieve the interface name to re-use the existing network configuration system. The default iface configuration (batman-adv.bat0.interfaces) is set to 'mesh' which allows to start batman-adv as soon as the network configuration contains a 'mesh' stanza. Signed-off-by: Filippo Sallemi <tonyputi(a)gmail.com> Signed-off-by: Gioacchino Mazzurco <gmazzurco89(a)gmail.com> >--------------------------------------------------------------- 1e9acd6f93a736b8f3c1335b60ca6ce7962283ad batman-adv-devel/files/etc/config/batman-adv | 2 +- batman-adv-devel/files/etc/init.d/batman-adv | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/batman-adv-devel/files/etc/config/batman-adv b/batman-adv-devel/files/etc/config/batman-adv index 9c66c93..31ef797 100644 --- a/batman-adv-devel/files/etc/config/batman-adv +++ b/batman-adv-devel/files/etc/config/batman-adv @@ -1,6 +1,6 @@ config 'mesh' 'bat0' - option 'interfaces' 'wlan0' + option 'interfaces' 'mesh' option 'aggregated_ogms' option 'bonding' option 'fragmentation' diff --git a/batman-adv-devel/files/etc/init.d/batman-adv b/batman-adv-devel/files/etc/init.d/batman-adv index 5011b6d..a6a8500 100644 --- a/batman-adv-devel/files/etc/init.d/batman-adv +++ b/batman-adv-devel/files/etc/init.d/batman-adv @@ -1,4 +1,6 @@ #!/bin/sh /etc/rc.common +# Copyright (C) 2011 OpenWrt.org + START=90 is_module_loaded() { @@ -36,8 +38,13 @@ start_mesh () { for interface in $interfaces do - [ ! -f "/sys/class/net/$interface/batman_adv/mesh_iface" ] && echo "Can't add interface $interface - ignoring" && continue - echo $meshif > /sys/class/net/$interface/batman_adv/mesh_iface + 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 @@ -86,7 +93,7 @@ stop_mesh() { for iface in $(ls /sys/class/net/*) do [ ! -f "$iface/batman_adv/mesh_iface" ] && continue - [ "$(head -1 $iface/batman_adv/mesh_iface)" != "status: $meshif" ] && continue + [ "$(head -1 $iface/batman_adv/mesh_iface)" != "$meshif" ] && continue echo "none" > $iface/batman_adv/mesh_iface done

1 0

[openwrt-feed-batman-adv] master: remove unused folder (f549d8e)
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 f549d8e72527c075b41d0ec55fdcae8540874431 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Thu Jul 1 14:26:58 2010 +0000 remove unused folder >---------------------------------------------------------------

1 0

[openwrt-feed-batman-adv] master: batman-adv-devel: updating package to latest (2dedac5)
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 2dedac524dc5e5471f5e9ade66e6dc3aab4eb1c5 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sun Sep 5 21:17:27 2010 +0000 batman-adv-devel: updating package to latest >--------------------------------------------------------------- 2dedac524dc5e5471f5e9ade66e6dc3aab4eb1c5 batman-adv-devel/Makefile | 4 ++-- batman-adv-devel/files/etc/config/batman-adv | 3 ++- batman-adv-devel/files/etc/init.d/batman-adv | 19 ++++++++++++------- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index 0f80b55..633eda0 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_REV:=1729 +PKG_REV:=1787 PKG_VERSION:=r$(PKG_REV) PKG_SOURCE_PROTO:=svn @@ -49,7 +49,7 @@ MAKE_BATMAN_ADV_ARGS += \ CROSS_COMPILE="$(TARGET_CROSS)" \ ARCH="$(LINUX_KARCH)" \ PATH="$(TARGET_PATH)" \ - $(if $(CONFIG_KMOD_BATMAN_ADV_DEVEL_DEBUG_LOG),EXTRA_CFLAGS="-DCONFIG_BATMAN_ADV_DEBUG") \ + $(if $(CONFIG_KMOD_BATMAN_ADV_DEVEL_DEBUG_LOG),EXTRA_CFLAGS="-DCONFIG_BATMAN_ADV_DEBUG -DREVISION_VERSION=\\\"$(PKG_REV)\\\"") \ SUBDIRS="$(PKG_BUILD_DIR)/batman-adv" \ LINUX_VERSION="$(LINUX_VERSION)" \ REVISION="$(PKG_REV)" modules diff --git a/batman-adv-devel/files/etc/config/batman-adv b/batman-adv-devel/files/etc/config/batman-adv index 9c09691..886fdb9 100644 --- a/batman-adv-devel/files/etc/config/batman-adv +++ b/batman-adv-devel/files/etc/config/batman-adv @@ -3,5 +3,6 @@ config 'mesh' 'bat0' option 'interfaces' 'wlan0' option 'orig_interval' option 'log_level' - option 'aggregate_ogm' + option 'aggregated_ogms' + option 'bonding' option 'vis_mode' diff --git a/batman-adv-devel/files/etc/init.d/batman-adv b/batman-adv-devel/files/etc/init.d/batman-adv index 49f948f..a08b21e 100644 --- a/batman-adv-devel/files/etc/init.d/batman-adv +++ b/batman-adv-devel/files/etc/init.d/batman-adv @@ -13,7 +13,7 @@ is_module_loaded() { start_mesh () { local meshif="$1" - local interfaces orig_interval log_level aggregate_ogm vis_mode + local interfaces orig_interval log_level aggregated_ogms bonding vis_mode is_module_loaded [ $? -ne 1 ] && return @@ -21,7 +21,8 @@ start_mesh () { config_get interfaces "$meshif" interfaces config_get orig_interval "$meshif" orig_interval config_get log_level "$meshif" log_level - config_get aggregate_ogm "$meshif" aggregate_ogm + config_get aggregated_ogms "$meshif" aggregated_ogms + config_get bonding "$meshif" bonding config_get vis_mode "$meshif" vis_mode if [ "$interfaces" = "" ]; then @@ -36,19 +37,23 @@ start_mesh () { done if [ $orig_interval ]; then - echo $orig_interval > /sys/class/net/$meshif/batman_adv/originator_interval + echo $orig_interval > /sys/class/net/$meshif/mesh/orig_interval fi if [ $log_level ]; then - echo $log_level > /sys/module/batman_adv/parameters/debug 2>&- + echo $log_level > /sys/class/net/$meshif/mesh/log_level 2>&- fi - if [ $aggregate_ogm ]; then - echo $aggregate_ogm > /sys/class/net/$meshif/batman_adv/aggregate_ogm + if [ $aggregated_ogms ]; then + echo $aggregated_ogms > /sys/class/net/$meshif/mesh/aggregated_ogms + fi + + if [ $bonding ]; then + echo $bonding > /sys/class/net/$meshif/mesh/bonding fi if [ $vis_mode ]; then - echo $vis_mode > /sys/class/net/$meshif/batman_adv/vis_mode + echo $vis_mode > /sys/class/net/$meshif/mesh/vis_mode fi }

1 0

[batctl] tag 'v2012.3.0' created
by postmaster＠open-mesh.org 19 Aug '12

19 Aug '12

Repository : ssh://git@open-mesh.org/batctl New tag : v2012.3.0 Referencing: 70ba3ba70c6aaa27b34dba54d129ef937f41c3e7

1 0

[batctl] master's head updated: batctl: Start new development cycle (87a09cf)
by postmaster＠open-mesh.org 19 Aug '12

19 Aug '12

Repository : ssh://git@open-mesh.org/batctl Branch 'master' now includes: f38cae7 batctl: remove dat reference from manpage 678022a Merge tag 'v2012.3.0' 87a09cf batctl: Start new development cycle

1 0

[batctl] maint's head updated: batctl: remove dat reference from manpage (f38cae7)
by postmaster＠open-mesh.org 19 Aug '12

19 Aug '12

Repository : ssh://git@open-mesh.org/batctl Branch 'maint' now includes: f38cae7 batctl: remove dat reference from manpage

1 0

[batctl] next's head updated: batctl: Start new development cycle (87a09cf)
by postmaster＠open-mesh.org 19 Aug '12

19 Aug '12

Repository : ssh://git@open-mesh.org/batctl Branch 'next' now includes: a738c35 batctl: add support for the bla backbone table in debugfs b02e69f Merge branch 'next' d3bcb9c batctl: rename bridge loop avoidance claim types a7d1ac6 batctl: purge redundant statistic code 4f6745d batctl: unify debug table handling and remove redundant code 5ec3a91 batctl: unify settings handling and remove redundant code 40cc393 batctl: beef up man page b7b9484 Merge branch 'next' dc51362 batctl: more detailed error messages when file can't be opened 7325845 batctl: Use BIT(x) macro to calculate bit positions acd06db batctl: detect not yet announced clients 678022a Merge tag 'v2012.3.0' 87a09cf batctl: Start new development cycle

1 0

[batctl] master,next: Merge tag 'v2012.3.0' (678022a)
by postmaster＠open-mesh.org 19 Aug '12

19 Aug '12

Repository : ssh://git@open-mesh.org/batctl On branches: master,next >--------------------------------------------------------------- commit 678022a33afb46c0ad335652092f0801d51cef1e Merge: acd06db f38cae7 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Aug 19 22:15:43 2012 +0200 Merge tag 'v2012.3.0' batctl 2012.3.0 Conflicts: man/batctl.8 >--------------------------------------------------------------- 678022a33afb46c0ad335652092f0801d51cef1e man/batctl.8 | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --cc man/batctl.8 index 1a11508,3b8b333..f904719 --- a/man/batctl.8 +++ b/man/batctl.8 @@@ -142,57 -112,55 +142,56 @@@ least XX TQ better than the currently s .RE .RE .br -.IP "\fBgateways|gwl\fP [\fB\-w\fP [\fI\interval\fP]][\fB\-n\fP]" -Once started batctl will display the list of announced gateways in the network. Use the "\-w" option to let batctl refresh the list every second or add a number to let it refresh at a custom interval in seconds (with optional decimal places). If "\-n" was given batctl will not replace the mac addresses with bat\-host names in the output. -.br -.IP "\fBtranslocal\fP|\fBtl\fP [\fB\-w\fP [\fI\interval\fP]][\fB\-n\fP]" -Display the local translation table. batctl will refresh the list every second if the "\-w" option was given or add a number to let it refresh at a custom interval in seconds (with optional decimal places). Use "\-n" to let batctl not replace the MAC addresses with bat\-host names in the output. -.br -.IP "\fBtransglobal\fP|\fBtg\fP [\fB\-w\fP [\fI\interval\fP]][\fB\-n\fP]" -Display the global translation table. batctl will refresh the list every second if the "\-w" option was given or add a number to let it refresh at a custom interval in seconds (with optional decimal places). Use "\-n" to let batctl not replace the MAC addresses with bat\-host names in the output. -.br -.IP "\fBclaimtable\fP|\fBcl\fP [\fB\-w\fP [\fI\interval\fP]][\fB\-n\fP]" -Display the bridge loop avoidance claim table. batctl will refresh the list every second if the "\-w" option was given or add a number to let it refresh at a custom interval in seconds (with optional decimal places). Use "\-n" to let batctl not replace the MAC addresses with bat\-host names in the output. -.br -.IP "\fBvis_mode|vm\fP [\fBmode\fP]\fP" -If no parameter is given the current vis mode is displayed otherwise the parameter is used to set the vis mode. -.br -.IP "\fBvis_data|vd dot\fP [\fB\-n\fP|\fB\-\-numbers\fP][\fB\-T\fP|\fB\-\-no-TT\fP][\fB\-2\fP|\fB\-\-no-2nd\fP]" -Display the visualisation data in graphviz \fBdot\fP(1) format. If -"\-\-numbers" or "\-n" is given batctl will not replace the MAC -addresses with bat-host names in the output. With "\-\-no-TT" or -"\-T" the TT entries are not displayed, so the pure mesh topology can -be seen. With "\-\-no-2nd" or "\-2" a dot cluster is not formed around -primary and secondary addresses from the same device. -.br -.IP "\fBvis_data|vd json\fP [\fB\-n\fP|\fB\-\-numbers\fP][\fB\-T\fP|\fB\-\-no-TT\fP][\fB\-2\fP|\fB\-\-no-2nd\fP]" -Display the visualisation data in JSON format. If "\-\-numbers" or -"\-n" is given batctl will not replace the MAC addresses with bat-host -names in the output. With "\-\-no-TT" or "\-T" the TT entries are -not displayed, so the pure mesh topology can be seen. With -"\-\-no-2nd" or "\-2" a dot cluster is not formed around primary and -secondary addresses from the same device. -.br -.IP "\fBaggregation\fP|\fBag\fP [\fB1\fP|\fB0\fP]" -If no parameter is given the current aggregation setting is displayed. Otherwise the parameter is used to enable or disable packet aggregation. +.IP "\fBvis_data|vd dot\fP [\fB\-n\fP|\fB\-\-numbers\fP][\fB\-T\fP|\fB\-\-no-TT\fP][\fB\-2\fP|\fB\-\-no-2nd\fP]" +Display the visualisation data in graphviz \fBdot\fP(1) format. If "\-\-numbers" or "\-n" is given batctl will not replace +the MAC addresses with bat-host names in the output. With "\-\-no-TT" or "\-T" the TT entries are not displayed, so the pure +mesh topology can be seen. With "\-\-no-2nd" or "\-2" a dot cluster is not formed around primary and secondary addresses +from the same device. .br -.IP "\fBbonding\fP|\fBb\fP [\fB1\fP|\fB0\fP]" -If no parameter is given the current bonding mode setting is displayed. Otherwise the parameter is used to enable or disable the bonding mode. -.br -.IP "\fBbridge_loop_avoidance\fP|\fBbl\fP [\fB1\fP|\fB0\fP]" -If no parameter is given the current bridge loop avoidance setting is displayed. Otherwise the parameter is used to enable or disable the bridge loop avoidance. -.br -.IP "\fBfragmentation\fP|\fBf\fP [\fB1\fP|\fB0\fP]" -If no parameter is given the current fragmentation mode setting is displayed. Otherwise the parameter is used to enable or disable fragmentation. -.br -.IP "\fBap_isolation\fP|\fBap\fP [\fB1\fP|\fB0\fP]" -If no parameter is given the current ap isolation setting is displayed. Otherwise the parameter is used to enable or disable ap isolation. +.PP +.I \fBdebug tables: +.IP +The batman-adv kernel module comes with a variety of debug tables containing various information about the state of the mesh +seen by each individual node. These tables are exported via debugfs and easily accessible via batctl. You will need debugfs +support compiled into your kernel and preferrably have mounted the debugfs to a well-known mountpoint. If debugfs is not +mounted batctl will attempt to do this step for you. + +All of the debug tables support the following options: +.RS 10 +\-w refresh the list every second or add a number to let it refresh at a custom interval in seconds (with optional decimal places) +.RE +.RS 10 +\-n do not replace the MAC addresses with bat\-host names in the output +.RE + +.RS 7 +The originator table also supports the "\-t" filter option to remove all originators from the output that have not been seen +for the specified amount of seconds (with optional decimal places). + +List of debug tables: +.RS 10 +\- originators|o +.RE +.RS 10 +\- gateways|gwl +.RE +.RS 10 +\- translocal|tl +.RE +.RS 10 +\- transglobal|tg +.RE +.RS 10 +\- claimtable|cl (compile time option) +.RE +.RS 10 +\- backbonetable|bbt (compile time option) +.RE +.RE .br .IP "\fBstatistics\fP|\fBs\fP" -Retrieve traffic counters from batman-adv kernel module. The output may vary depending on which features have -been compiled into the kernel module. +Retrieve traffic counters from batman-adv kernel module. The output may vary depending on which features have been compiled - into the kernel module. For example, if the distributed arp table (short: dat) wasn't selected as an option at compile time - its counters won't be shown. ++into the kernel module. .br Each module subsystem has its own counters which are indicated by their prefixes: .RS 15

1 0

[batctl] master, next: batctl: Start new development cycle (87a09cf)
by postmaster＠open-mesh.org 19 Aug '12

19 Aug '12

Repository : ssh://git@open-mesh.org/batctl On branches: master,next >--------------------------------------------------------------- commit 87a09cfd8f4c2fde74fb3374b0a70d68b29dec25 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Aug 19 22:16:23 2012 +0200 batctl: Start new development cycle Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 87a09cfd8f4c2fde74fb3374b0a70d68b29dec25 main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.h b/main.h index 34ac4f5..be5de68 100644 --- a/main.h +++ b/main.h @@ -20,7 +20,7 @@ */ #ifndef SOURCE_VERSION -#define SOURCE_VERSION "2012.3.0" +#define SOURCE_VERSION "2012.4.0" #endif #define SOCKET_PATH_FMT "%s/batman_adv/%s/socket"

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits August 2012