commits August 2012

commits@lists.open-mesh.org

1 participants
355 discussions

[linux-merge]linux integration; branch, merge/master, updated. v3.6-rc1-1509-g6fd9fab
by postmaster＠open-mesh.org 21 Aug '12

21 Aug '12

The following commit has been merged in the merge/master branch: commit 4c66b7d492b5f5d2931818ba7bdeb0d415b87b3a Author: Simon Wunderlich <simon.wunderlich(a)s2003.tu-chemnitz.de> Date: Sat Jun 23 12:34:17 2012 +0200 batman-adv: correct comments in bridge loop avoidance Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index 1e2cfe5..2899104 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -280,7 +280,7 @@ static void batadv_bla_send_claim(struct batadv_priv *bat_priv, uint8_t *mac, NULL, /* Ethernet SRC/HW SRC: originator mac */ primary_if->net_dev->dev_addr, - /* HW DST: FF:43:05:XX:00:00 + /* HW DST: FF:43:05:XX:YY:YY * with XX = claim type * and YY:YY = group id */ @@ -322,7 +322,8 @@ static void batadv_bla_send_claim(struct batadv_priv *bat_priv, uint8_t *mac, break; case BATADV_CLAIM_TYPE_REQUEST: /* request frame - * set HW SRC to the special mac containg the crc + * set HW SRC and header destination to the receiving backbone + * gws mac */ memcpy(hw_src, mac, ETH_ALEN); memcpy(ethhdr->h_dest, mac, ETH_ALEN); -- linux integration

1 0

[linux-merge]linux integration; branch, patches-2012.4.0, created. v3.6-rc1-1493-g8fb6c2d
by postmaster＠open-mesh.org 21 Aug '12

21 Aug '12

The branch, patches-2012.4.0 has been created at 8fb6c2d1133699e28bae5dd1a8ff1050fd0969bb (commit) - Shortlog ------------------------------------------------------------ commit 8fb6c2d1133699e28bae5dd1a8ff1050fd0969bb Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Aug 19 21:48:25 2012 +0200 batman-adv: Start new development cycle Signed-off-by: Sven Eckelmann <sven(a)narfation.org> commit 1e42639f2cdf3df7f5d29adbd2c16488c846741b Author: Jesper Juhl <jj(a)chaosbits.net> Date: Tue Aug 7 20:32:34 2012 +0200 batman-adv: Fix mem leak in the batadv_tt_local_event() function Memory is allocated for 'tt_change_node' with kmalloc(). 'tt_change_node' may go out of scope without really being used for anything (except have a few members initialized) if we hit the 'del:' label. This patch makes sure we free the memory in that case. Signed-off-by: Jesper Juhl <jj(a)chaosbits.net> Acked-by: Antonio Quartulli <ordex(a)autistici.org> commit 34903a5e08c5e99e5a3df6bdfa9bdd22b16eede3 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Mon Jul 23 14:59:13 2012 +0200 batman-adv: select an internet gateway if none was chosen This is a regression introduced by: 6a17ecc4603be7f065c38b288d038a0082bbf21d Reported-by: Nicolás Echániz <nicoechaniz(a)codigosur.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Acked-by: Antonio Quartulli <ordex(a)autistici.org> commit 3a07f75829cb408cff32733ecbae05975dcd743e Author: Sven Eckelmann <sven(a)narfation.org> Date: Wed Jul 18 09:07:07 2012 +0200 batman-adv: Fix wrong multiline comment ending This regression was introduced in 724d05c8215e4e8186097121595ef20b6ba601b7 Signed-off-by: Sven Eckelmann <sven(a)narfation.org> commit 8e372fef4fead5f31c65549460e76e9740e5c7a8 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Thu Jul 5 23:38:30 2012 +0200 batman-adv: change interface_rx to get orig node In order to understand where a broadcast packet is coming from and use this information to detect not yet announced clients, this patch modifies the interface_rx() function by passing a new argument: the orig node corresponding to the node that originated the received packet (if known). This new argument if not NULL for broadcast packets only (other packets does not have source field). Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> commit ff759ec03a0e6be67d3b2ae2f5e1c21773eb3901 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Thu Jul 5 23:38:29 2012 +0200 batman-adv: detect not yet announced clients With the current TT mechanism a new client joining the network is not immediately able to communicate with other hosts because its MAC address has not been announced yet. This situation holds until the first OGM containing its joining event will be spread over the mesh network. This behaviour can be acceptable in networks where the originator interval is a small value (e.g. 1sec) but if that value is set to an higher time (e.g. 5secs) the client could suffer from several malfunctions like DHCP client timeouts, etc. This patch adds an early detection mechanism that makes nodes in the network able to recognise "not yet announced clients" by means of the broadcast packets they emitted on connection (e.g. ARP or DHCP request). The added client will then be confirmed upon receiving the OGM claiming it or purged if such OGM is not received within a fixed amount of time. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> commit 2e1c8c32aca6566c1537f826c32dda4240934726 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Jul 8 18:33:51 2012 +0200 batman-adv: Reduce accumulated length of simple statements Signed-off-by: Sven Eckelmann <sven(a)narfation.org> commit 2623be48079a2ee2b508a3b69cad8924efc84a3a Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Jul 8 17:13:15 2012 +0200 batman-adv: Don't break statements after assignment operator Signed-off-by: Sven Eckelmann <sven(a)narfation.org> commit 1c007a4e65b840083e99090ad5ba934500861757 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Jul 8 16:32:09 2012 +0200 batman-adv: Use BIT(x) macro to calculate bit positions Signed-off-by: Sven Eckelmann <sven(a)narfation.org> commit 89068bc06a25f4aa3468cd4420177c9a201c164b Author: Martin Hundebøll <martin(a)hundeboll.net> Date: Thu Jul 5 11:34:28 2012 +0200 batman-adv: Drop tt queries with foreign dest When enabling promiscuous mode, tt queries for other hosts might be received. Before this patch, "foreign" tt queries were processed like any other query and thus forwarded to its destination again and thereby causing a loop. This patch adds a check to drop foreign tt queries. Signed-off-by: Martin Hundebøll <martin(a)hundeboll.net> commit 8a6dbecffa708cb06927a607763ecd83d3cb7163 Author: Martin Hundebøll <martin(a)hundeboll.net> Date: Thu Jul 5 11:34:27 2012 +0200 batman-adv: Move batadv_check_unicast_packet() batadv_check_unicast_packet() is needed in batadv_recv_tt_query(), so move the former to before the latter. Signed-off-by: Martin Hundebøll <martin(a)hundeboll.net> commit 7c9011cf66d23bf9b380266b78ab94c22420eb76 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Jul 15 22:26:51 2012 +0200 batman-adv: Split batadv_priv in sub-structures for features The structure batadv_priv grows everytime a new feature is introduced. It gets hard to find the parts of the struct that belongs to a specific feature. This becomes even harder by the fact that not every feature uses a prefix in the member name. The variables for bridge loop avoidence, gateway handling, translation table and visualization server are moved into separate structs that are included in the bat_priv main struct. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> commit 94ad7fbe7e610061e091bcc914db70c52913e03b Author: Simon Wunderlich <simon.wunderlich(a)s2003.tu-chemnitz.de> Date: Sun Jul 1 22:51:55 2012 +0200 batman-adv: check batadv_orig_hash_add_if() return code If this call fails, some of the orig_nodes spaces may have been resized for the increased number of interface, and some may not. If we would just continue with the larger number of interfaces, this would lead to access to not allocated memory later. We better check the return code, and don't add the interface if no memory is available. OTOH, keeping some of the orig_nodes with too much memory allocated should hurt no one (except for a few too many bytes allocated). Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> commit e1732c8b4e17b1cc2dc0d9ae144f7b8acf768061 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Sun Jul 1 19:07:31 2012 +0200 batman-adv: fix typos in comments the word millisecond is misspelled in several comments. This patch fixes it. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> commit 0634ff72b9104cb347a0b83748c199b40ed95f2e Author: Antonio Quartulli <ordex(a)autistici.org> Date: Sun Jul 1 14:09:12 2012 +0200 batman-adv: add reference counting for type batadv_tt_orig_list_entry The batadv_tt_orig_list_entry structure didn't have any refcounting mechanism so far. This patch introduces it and makes the structure being usable in much more complex context. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> commit 411ed2498022b4d4c1650641c8523542f082dedd Author: Jonathan Corbet <corbet(a)lwn.net> Date: Sat Jun 30 10:49:13 2012 -0600 batman-adv: remove a misleading comment As much as I'm happy to see LWN links sprinkled through the kernel by the dozen, this one in particular reflects a very old state of reality; the associated comment is now incorrect. So just delete it. Signed-off-by: Jonathan Corbet <corbet(a)lwn.net> commit d7d792f51fe21bed7280eecc3ecc2f9f9ceb9bb7 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Tue Jun 26 12:00:34 2012 +0200 batman-adv: fix multiline comment complaint Regression introduced with: a81d0f914409c04cbefafb8b4ccf2de4cc50458f Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> commit 14ad06e11a643de388735ca386028102eae3a1e4 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sat Jun 23 11:47:53 2012 +0200 batman-adv: convert remaining packet counters to per_cpu_ptr() infrastructure Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Acked-by: Martin Hundebøll <martin(a)hundeboll.net> commit 00e7aed048a713a24722aea034550baa5db3f2a2 Author: Simon Wunderlich <simon.wunderlich(a)s2003.tu-chemnitz.de> Date: Sat Jun 23 12:34:18 2012 +0200 batman-adv: rename bridge loop avoidance claim types for consistency reasons within the code and with the documentation, we should always call it "claim" and "unclaim". Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> commit 5ca1e9e482cc25efdd18b9bce0d603a2f458116e Author: Simon Wunderlich <simon.wunderlich(a)s2003.tu-chemnitz.de> Date: Sat Jun 23 12:34:17 2012 +0200 batman-adv: correct comments in bridge loop avoidance Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> commit 5b6de3c833e3060bbc6d7ad88155b6b7f6408303 Author: Simon Wunderlich <simon.wunderlich(a)s2003.tu-chemnitz.de> Date: Mon Jun 18 18:39:26 2012 +0200 batman-adv: Add the backbone gateway list to debugfs This is especially useful if there are no claims yet, but we still want to know which gateways are using bridge loop avoidance in the network. Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> ----------------------------------------------------------------------- -- linux integration

1 0

[openwrt-feed-batman-adv] master: batman-adv-devel: make git revision configurable via make menuconfig (2c0d9ea)
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 2c0d9ea180814e490a6ad41cb07ed79c962ccf7e Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Mon Jul 30 22:18:40 2012 +0000 batman-adv-devel: make git revision configurable via make menuconfig Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 2c0d9ea180814e490a6ad41cb07ed79c962ccf7e batman-adv-devel/Config.in | 46 ++++++++++++++++++-------------------------- batman-adv-devel/Makefile | 9 ++++----- 2 files changed, 23 insertions(+), 32 deletions(-) diff --git a/batman-adv-devel/Config.in b/batman-adv-devel/Config.in index e1b70df..78bc5a7 100644 --- a/batman-adv-devel/Config.in +++ b/batman-adv-devel/Config.in @@ -12,32 +12,24 @@ config KMOD_BATMAN_ADV_DEVEL_BATCTL depends PACKAGE_kmod-batman-adv-devel default y help - 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. + 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_BATMANV - bool "batman V routing algorithm" - - 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_BATMAN_REV + string + prompt "batman-adv git revision to build package with" + default "3fdeaa6" + help + Enter the full or shortened git revision to override package + default value. This allows to build from non-master branches + to test unreleased features. -config KMOD_BATMAN_ADV_DEVEL_BRANCH_NAME - string - default "master" if KMOD_BATMAN_ADV_DEVEL_BRANCH_MASTER - 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 +config KMOD_BATMAN_ADV_DEVEL_BATCTL_REV + string + prompt "batctl git revision to build package with" + default "acd06db" + help + Enter the full or shortened git revision to override package + default value. This allows to build from non-master branches + to test unreleased features. diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index a290369..db58b99 100644 --- a/batman-adv-devel/Makefile +++ b/batman-adv-devel/Makefile @@ -10,12 +10,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batman-adv-devel -PKG_BATMAN_REV:=5deb69f60f388055982a1da6dce876049f86841d -PKG_BATCTL_REV:=b7b948479ca2c12ad4f038c974ee20294005ddf1 +PKG_BATMAN_REV:=$(CONFIG_KMOD_BATMAN_ADV_DEVEL_BATMAN_REV) +PKG_BATCTL_REV:=$(CONFIG_KMOD_BATMAN_ADV_DEVEL_BATCTL_REV) -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_BRANCH)-$(PKG_BATMAN_SHORTREV).tar.gz +PKG_BATMAN_FNAME:=batman-adv-devel-$(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 @@ -61,7 +60,7 @@ MAKE_BATMAN_ADV_ARGS += \ LINUX_VERSION="$(LINUX_VERSION)" \ 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 + REVISION="$(PKG_BATMAN_SHORTREV)" all MAKE_BATCTL_ARGS += \ CFLAGS="$(TARGET_CFLAGS)" \

1 0

[openwrt-feed-batman-adv] master: batman-adv-devel: /etc/functions.sh => /lib/functions.sh (24650af)
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 24650afef4392ac16f8767bbb3862336178a13fb Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Wed Jun 13 11:27:51 2012 +0000 batman-adv-devel: /etc/functions.sh => /lib/functions.sh Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 24650afef4392ac16f8767bbb3862336178a13fb batman-adv-devel/files/lib/batman-adv/config.sh | 2 +- batman-adv-devel/files/usr/sbin/batman-adv | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/batman-adv-devel/files/lib/batman-adv/config.sh b/batman-adv-devel/files/lib/batman-adv/config.sh index b1bb1f3..00441a3 100644 --- a/batman-adv-devel/files/lib/batman-adv/config.sh +++ b/batman-adv-devel/files/lib/batman-adv/config.sh @@ -4,7 +4,7 @@ bat_load_module() { [ -d "/sys/module/batman_adv/" ] && return - . /etc/functions.sh + . /lib/functions.sh load_modules /etc/modules.d/*-crc16 /etc/modules.d/*-batman-adv* } diff --git a/batman-adv-devel/files/usr/sbin/batman-adv b/batman-adv-devel/files/usr/sbin/batman-adv index 93ae1b5..ca9e603 100644 --- a/batman-adv-devel/files/usr/sbin/batman-adv +++ b/batman-adv-devel/files/usr/sbin/batman-adv @@ -1,7 +1,7 @@ #!/bin/sh # Copyright (C) 2011 OpenWrt.org -. /etc/functions.sh +. /lib/functions.sh . /lib/batman-adv/config.sh start_mesh() {

1 0

[openwrt-feed-batman-adv] master: batman-adv-devel: script cleanups (380c825)
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 380c8253c5f8798ad01e359f25efb915bb2d6f1e Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Tue Jun 19 15:03:10 2012 +0000 batman-adv-devel: script cleanups Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 380c8253c5f8798ad01e359f25efb915bb2d6f1e batman-adv-devel/Config.in | 6 +++--- batman-adv-devel/files/lib/batman-adv/config.sh | 19 ++++++++++--------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/batman-adv-devel/Config.in b/batman-adv-devel/Config.in index f67f69e..e1b70df 100644 --- a/batman-adv-devel/Config.in +++ b/batman-adv-devel/Config.in @@ -4,9 +4,9 @@ config KMOD_BATMAN_ADV_DEVEL_DEBUG_LOG 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 + 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 diff --git a/batman-adv-devel/files/lib/batman-adv/config.sh b/batman-adv-devel/files/lib/batman-adv/config.sh index 00441a3..295b543 100644 --- a/batman-adv-devel/files/lib/batman-adv/config.sh +++ b/batman-adv-devel/files/lib/batman-adv/config.sh @@ -11,35 +11,36 @@ bat_load_module() 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 + local aggregated_ogms ap_isolation bonding bridge_loop_avoidance fragmentation gw_bandwidth + local gw_mode gw_sel_class hop_penalty log_level orig_interval vis_mode config_get aggregated_ogms "$mesh" aggregated_ogms + config_get ap_isolation "$mesh" ap_isolation config_get bonding "$mesh" bonding + config_get bridge_loop_avoidance "$mesh" bridge_loop_avoidance 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 hop_penalty "$mesh" hop_penalty 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 - config_get ap_isolation "$mesh" ap_isolation - config_get bridge_loop_avoidance "$mesh" bridge_loop_avoidance [ ! -f "/sys/class/net/$mesh/mesh/orig_interval" ] && echo "batman-adv mesh $mesh does not exist - check your interface configuration" && return 1 - [ -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 "$ap_isolation" ] && echo $ap_isolation > /sys/class/net/$mesh/mesh/ap_isolation [ -n "$bonding" ] && echo $bonding > /sys/class/net/$mesh/mesh/bonding + [ -n "$bridge_loop_avoidance" ] && echo $bridge_loop_avoidance > /sys/class/net/$mesh/mesh/bridge_loop_avoidance [ -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 "$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 "$orig_interval" ] && echo $orig_interval > /sys/class/net/$mesh/mesh/orig_interval [ -n "$vis_mode" ] && echo $vis_mode > /sys/class/net/$mesh/mesh/vis_mode - [ -n "$ap_isolation" ] && echo $ap_isolation > /sys/class/net/$mesh/mesh/ap_isolation - [ -n "$bridge_loop_avoidance" ] && echo $bridge_loop_avoidance > /sys/class/net/$mesh/mesh/bridge_loop_avoidance } bat_add_interface()

1 0

[openwrt-feed-batman-adv] master: batman-adv-devel: update to latest master (782034b)
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 782034b6b17833e014ad70dc8e49e19534624d8b Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Wed Jul 4 10:09:11 2012 +0000 batman-adv-devel: update to latest master Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 782034b6b17833e014ad70dc8e49e19534624d8b batman-adv-devel/Makefile | 4 ++-- batman-adv-devel/files/etc/config/batman-adv | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index 074be94..a290369 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:=c3c748339f605c034bac3317a93e10fc0f8d1d0a -PKG_BATCTL_REV:=3e88396b24c65bc438be54e80f930a728ab5c65b +PKG_BATMAN_REV:=5deb69f60f388055982a1da6dce876049f86841d +PKG_BATCTL_REV:=b7b948479ca2c12ad4f038c974ee20294005ddf1 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/config/batman-adv b/batman-adv-devel/files/etc/config/batman-adv index fb7b384..766d949 100644 --- a/batman-adv-devel/files/etc/config/batman-adv +++ b/batman-adv-devel/files/etc/config/batman-adv @@ -12,6 +12,7 @@ config 'mesh' 'bat0' option 'orig_interval' option 'vis_mode' option 'bridge_loop_avoidance' + option 'hop_penalty' # yet another batX instance # config 'mesh' 'bat5'

1 0

[openwrt-feed-batman-adv] master: batman-adv-devel: update to latest master (9902911)
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 9902911fe8f04a2889f00e3374a5df99842160f2 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Tue Apr 17 12:22:42 2012 +0000 batman-adv-devel: update to latest master Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 9902911fe8f04a2889f00e3374a5df99842160f2 batman-adv-devel/Makefile | 4 ++-- batman-adv-devel/files/lib/batman-adv/config.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index d914bc1..9c2a6fd 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:=6b49cabfc29467b91458a073b1eaf7506b977269 -PKG_BATCTL_REV:=59b559c4138d006beabf79e8f97767e99726dce7 +PKG_BATMAN_REV:=b0f3829d152db3dd98d0bcd894762e4a5788b135 +PKG_BATCTL_REV:=54b7d54c5743bb53cdc8c4d8ef5e033ab40b7c2b 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/lib/batman-adv/config.sh b/batman-adv-devel/files/lib/batman-adv/config.sh index 6f3e533..f15bd7c 100644 --- a/batman-adv-devel/files/lib/batman-adv/config.sh +++ b/batman-adv-devel/files/lib/batman-adv/config.sh @@ -5,7 +5,7 @@ bat_load_module() [ -d "/sys/module/batman_adv/" ] && return . /etc/functions.sh - load_modules /etc/modules.d/*-lib-crc16 /etc/modules.d/*-batman-adv + load_modules /etc/modules.d/*-crc16 /etc/modules.d/*-batman-adv* } bat_config()

1 0

[openwrt-feed-batman-adv] master: batman-adv-devel: updating to latest master (fd3d0c5)
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 fd3d0c5dc54d0b0a91d4f8adfb34a2699dbce5e6 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Wed Jun 13 11:27:43 2012 +0000 batman-adv-devel: updating to latest master Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- fd3d0c5dc54d0b0a91d4f8adfb34a2699dbce5e6 batman-adv-devel/Makefile | 4 ++-- batman-adv-devel/files/lib/batman-adv/config.sh | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index 9c2a6fd..2bb7e36 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:=b0f3829d152db3dd98d0bcd894762e4a5788b135 -PKG_BATCTL_REV:=54b7d54c5743bb53cdc8c4d8ef5e033ab40b7c2b +PKG_BATMAN_REV:=c3c748339f605c034bac3317a93e10fc0f8d1d0a +PKG_BATCTL_REV:=3e88396b24c65bc438be54e80f930a728ab5c65b 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/lib/batman-adv/config.sh b/batman-adv-devel/files/lib/batman-adv/config.sh index f15bd7c..b1bb1f3 100644 --- a/batman-adv-devel/files/lib/batman-adv/config.sh +++ b/batman-adv-devel/files/lib/batman-adv/config.sh @@ -26,6 +26,8 @@ bat_config() config_get ap_isolation "$mesh" ap_isolation config_get bridge_loop_avoidance "$mesh" bridge_loop_avoidance + [ ! -f "/sys/class/net/$mesh/mesh/orig_interval" ] && echo "batman-adv mesh $mesh does not exist - check your interface configuration" && return 1 + [ -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>&-

1 0

[openwrt-feed-batman-adv] master: batman-adv-devel: Make kmod-batman-adv-devel depend on libc (406b8ab)
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 406b8abc1360f565c26f8caea5e842b33cc05c8d Author: Jo-Philipp Wich <jow(a)openwrt.org> Date: Wed Jun 13 11:27:46 2012 +0000 batman-adv-devel: Make kmod-batman-adv-devel depend on libc OpenWrt implemented strict library dependency checking with r32185. Since the batman kmod package bundles a userspace utility, it must depend on +libc. This dependency is injected automatically into non-kmod packages but must be specified manually for kmods that it. Signed-off-by: Jo-Philipp Wich <jow(a)openwrt.org> >--------------------------------------------------------------- 406b8abc1360f565c26f8caea5e842b33cc05c8d batman-adv-devel/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index 2bb7e36..074be94 100644 --- a/batman-adv-devel/Makefile +++ b/batman-adv-devel/Makefile @@ -34,7 +34,7 @@ define KernelPackage/batman-adv-devel URL:=http://www.open-mesh.org/ MAINTAINER:=Marek Lindner <lindner_marek(a)yahoo.de> SUBMENU:=Network Support - DEPENDS:=+kmod-lib-crc16 + DEPENDS:=+kmod-lib-crc16 +libc TITLE:=B.A.T.M.A.N. Adv devel FILES:=$(PKG_BUILD_DIR)/batman-adv.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,50,batman-adv)

1 0

[openwrt-feed-batman-adv] master: batman-adv-devel: hotplug script fixes & updates (435dfff)
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 435dfff3d96f1d6918afced7a5933bdc515dd392 Author: Filippo Sallemi <tonyputi(a)gmail.com> Date: Sun Feb 12 14:09:38 2012 +0000 batman-adv-devel: hotplug script fixes & updates * call bat_config() instead of config_bat() (which does not exist) * support ap isolation config option * remove /etc/rc.common from script since it is not an init script anymore Signed-off-by: Filippo Sallemi <tonyputi(a)gmail.com> * bridge loop avoidance uci support added * batman-adv/batctl updated to latest master Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 435dfff3d96f1d6918afced7a5933bdc515dd392 batman-adv-devel/Makefile | 4 ++-- batman-adv-devel/files/etc/config/batman-adv | 1 + batman-adv-devel/files/etc/hotplug.d/net/99-batman-adv | 2 +- batman-adv-devel/files/lib/batman-adv/config.sh | 4 ++++ batman-adv-devel/files/usr/sbin/batman-adv | 15 ++++++++++++++- 5 files changed, 22 insertions(+), 4 deletions(-) diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index 718c9c4..ffb9958 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:=052332fb1a2d694fdc10bb0ebef495bbcb6fb06d -PKG_BATCTL_REV:=7dd21c88f6c1484ce0cbf52dca7b9fc86c2c9bb0 +PKG_BATMAN_REV:=f86649b10214e8e98bdec161cefa13dcc8cb1e41 +PKG_BATCTL_REV:=1cce9654449331d13b5576e845453ff2613dbe43 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/config/batman-adv b/batman-adv-devel/files/etc/config/batman-adv index 5197820..fb7b384 100644 --- a/batman-adv-devel/files/etc/config/batman-adv +++ b/batman-adv-devel/files/etc/config/batman-adv @@ -11,6 +11,7 @@ config 'mesh' 'bat0' option 'log_level' option 'orig_interval' option 'vis_mode' + option 'bridge_loop_avoidance' # yet another batX instance # config 'mesh' 'bat5' 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 2ad83cf..fe19e64 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 @@ -6,7 +6,7 @@ config_load batman-adv case "$ACTION" in add) - [ -d /sys/class/net/$INTERFACE/mesh/ ] && config_bat "$INTERFACE" + [ -d /sys/class/net/$INTERFACE/mesh/ ] && bat_config "$INTERFACE" [ -d /sys/class/net/$INTERFACE/batman_adv/ ] && config_foreach bat_add_interface mesh "$INTERFACE" ;; remove) diff --git a/batman-adv-devel/files/lib/batman-adv/config.sh b/batman-adv-devel/files/lib/batman-adv/config.sh index d0569bc..dfd9580 100644 --- a/batman-adv-devel/files/lib/batman-adv/config.sh +++ b/batman-adv-devel/files/lib/batman-adv/config.sh @@ -14,6 +14,8 @@ bat_config(){ config_get orig_interval "$mesh" orig_interval config_get hop_penalty "$mesh" hop_penalty config_get vis_mode "$mesh" vis_mode + config_get ap_isolation "$mesh" ap_isolation + config_get bridge_loop_avoidance "$mesh" bridge_loop_avoidance [ -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 @@ -25,6 +27,8 @@ bat_config(){ [ -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 + [ -n "$ap_isolation" ] && echo $ap_isolation > /sys/class/net/$mesh/mesh/ap_isolation + [ -n "$bridge_loop_avoidance" ] && echo $bridge_loop_avoidance > /sys/class/net/$mesh/mesh/bridge_loop_avoidance } bat_add_interface(){ diff --git a/batman-adv-devel/files/usr/sbin/batman-adv b/batman-adv-devel/files/usr/sbin/batman-adv index 4f17991..6580756 100644 --- a/batman-adv-devel/files/usr/sbin/batman-adv +++ b/batman-adv-devel/files/usr/sbin/batman-adv @@ -1,6 +1,7 @@ -#!/bin/sh /etc/rc.common +#!/bin/sh # Copyright (C) 2011 OpenWrt.org +. /etc/functions.sh . /lib/batman-adv/config.sh start_mesh() { @@ -44,3 +45,15 @@ stop () { config_foreach stop_mesh mesh fi } + +restart() { + stop $1 + start $1 +} + +case "$1" in + start) start $2 ;; + stop) stop $2 ;; + restart) restart $2 ;; + *) echo "Usage: batman-adv <start|stop|restart> [mesh instance]" +esac

1 0

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits August 2012