B.A.T.M.A.N August 2012

b.a.t.m.a.n@lists.open-mesh.org

18 participants
50 discussions

[B.A.T.M.A.N.] [PATCH] batctl: Clear screen using ANSI escape codes
by Sven Eckelmann 24 Aug '12

24 Aug '12

It is not necessary to call an external binary to clear the screen of a default unix terminal emulator. The external call using system("clear") may be used by an attacker to get untrusted code called with an higher privilege because batctl has to be run as using uid 0. Reported-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- functions.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions.c b/functions.c index c78e408..1d737fa 100644 --- a/functions.c +++ b/functions.c @@ -184,7 +184,7 @@ open: } if (read_opt & CLR_CONT_READ) - system("clear"); + printf("\033[2J\033[0;0f"); read: while (getline(&line_ptr, &len, fp) != -1) { -- 1.7.10.4

2 2

[B.A.T.M.A.N.] [RFC] batman-adv: Set special lockdep classes to avoid lockdep warning
by Sven Eckelmann 24 Aug '12

24 Aug '12

[text will be added after I am awake... maybe] [Should be fix the problem found in bug 162... formerly known as 161. code stolen from macvlan... this is just a reimplementation of a solution proposed by Simon Wunderlich] Reported-by: Linus Lüssing <linus.luessing(a)web.de> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- soft-interface.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/soft-interface.c b/soft-interface.c index 1aee7db..588c6f6 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -344,7 +344,36 @@ out: return; } +/* + * batman-adv network devices have devices nesting below it and are a special + * "super class" of normal network devices; split their locks off into a + * separate class since they always nest. + */ +static struct lock_class_key batadv_netdev_xmit_lock_key; +static struct lock_class_key batadv_netdev_addr_lock_key; + +static void batadv_set_lockdep_class_one(struct net_device *dev, + struct netdev_queue *txq, + void *_unused) +{ + lockdep_set_class(&txq->_xmit_lock, &batadv_netdev_xmit_lock_key); +} + +static void batadv_set_lockdep_class(struct net_device *dev) +{ + lockdep_set_class(&dev->addr_list_lock, &batadv_netdev_addr_lock_key); + netdev_for_each_tx_queue(dev, batadv_set_lockdep_class_one, NULL); +} + +static int batadv_softif_init(struct net_device *dev) +{ + batadv_set_lockdep_class(dev); + + return 0; +} + static const struct net_device_ops batadv_netdev_ops = { + .ndo_init = batadv_softif_init, .ndo_open = batadv_interface_open, .ndo_stop = batadv_interface_release, .ndo_get_stats = batadv_interface_stats, -- 1.7.10.4

3 5

[B.A.T.M.A.N.] [PATCH] batman-adv: print packets re-routing on DBG_TT and ratelimit it
by Antonio Quartulli 24 Aug '12

24 Aug '12

To simplify TranslationTable debugging it is better to print the packet rerouting message on the DBG_TT log level. In this way a developer interested in packets rerouting doesn't need to filter it out of the whole ROUTES log. Moreover, since this message will appear for each rerouted message, it is now "ratelimited". Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- routing.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/routing.c b/routing.c index e7a4e25..f9751a0 100644 --- a/routing.c +++ b/routing.c @@ -972,10 +972,11 @@ static int batadv_check_unicast_ttvn(struct batadv_priv *bat_priv, batadv_orig_node_free_ref(orig_node); } - batadv_dbg(BATADV_DBG_ROUTES, bat_priv, - "TTVN mismatch (old_ttvn %u new_ttvn %u)! Rerouting unicast packet (for %pM) to %pM\n", - unicast_packet->ttvn, curr_ttvn, ethhdr->h_dest, - unicast_packet->dest); + if (net_ratelimit()) + batadv_dbg(BATADV_DBG_TT, bat_priv, + "TTVN mismatch (old_ttvn %u new_ttvn %u)! Rerouting unicast packet (for %pM) to %pM\n", + unicast_packet->ttvn, curr_ttvn, + ethhdr->h_dest, unicast_packet->dest); unicast_packet->ttvn = curr_ttvn; } -- 1.7.9.4

1 1

[B.A.T.M.A.N.] pull request: batman-adv 2012-08-23
by Antonio Quartulli 24 Aug '12

24 Aug '12

Hello David, this is our set of changes intended for net-next/linux-3.7. It is mostly composed by style fixes and cleanups. Other than that you have a patch introducing a new table in debugfs (backbone gateways table for the Bridge Loop Avoidance) and a new mechanism for the TranslationTable component. The latter allows mesh nodes to immediately detect new clients joining the network, without waiting for any periodic advertisement. Thank you, Antonio The following changes since commit 0fa7fa98dbcc2789409ed24e885485e645803d7f: packet: Protect packet sk list with mutex (v2) (2012-08-22 22:58:27 -0700) are available in the git repository at: git://git.open-mesh.org/linux-merge.git tags/batman-adv-for-davem for you to fetch changes up to fa4f0afcf40361bf67ed3abd520a5fbe12d11166: batman-adv: Start new development cycle (2012-08-23 14:20:23 +0200) ---------------------------------------------------------------- Included changes: - a set of codestyle rearrangements/fixes - new feature to early detect new joining (mesh-unaware) clients - a minor fix for the gw-feature - substitution of shift operations with the BIT() macro - reorganization of the main batman-adv structure (struct batadv_priv) - some more (very) minor cleanups and fixes ---------------------------------------------------------------- Antonio Quartulli (5): batman-adv: move function arguments on one line batman-adv: add reference counting for type batadv_tt_orig_list_entry batman-adv: fix typos in comments batman-adv: detect not yet announced clients batman-adv: change interface_rx to get orig node Jonathan Corbet (1): batman-adv: remove a misleading comment Marek Lindner (1): batman-adv: convert remaining packet counters to per_cpu_ptr() infrastructure Martin Hundebøll (2): batman-adv: Move batadv_check_unicast_packet() batman-adv: Drop tt queries with foreign dest Simon Wunderlich (4): batman-adv: Add the backbone gateway list to debugfs batman-adv: correct comments in bridge loop avoidance batman-adv: rename bridge loop avoidance claim types batman-adv: check batadv_orig_hash_add_if() return code Sven Eckelmann (5): batman-adv: Split batadv_priv in sub-structures for features batman-adv: Use BIT(x) macro to calculate bit positions batman-adv: Don't break statements after assignment operator batman-adv: Reduce accumulated length of simple statements batman-adv: Start new development cycle Documentation/networking/batman-adv.txt | 7 +- net/batman-adv/bat_iv_ogm.c | 96 ++++--- net/batman-adv/bridge_loop_avoidance.c | 214 ++++++++++------ net/batman-adv/bridge_loop_avoidance.h | 11 +- net/batman-adv/debugfs.c | 12 + net/batman-adv/gateway_client.c | 53 ++-- net/batman-adv/hard-interface.c | 13 +- net/batman-adv/main.c | 27 +- net/batman-adv/main.h | 29 +-- net/batman-adv/packet.h | 35 +-- net/batman-adv/routing.c | 85 +++---- net/batman-adv/send.c | 8 +- net/batman-adv/soft-interface.c | 79 +++--- net/batman-adv/soft-interface.h | 5 +- net/batman-adv/translation-table.c | 416 +++++++++++++++++++------------ net/batman-adv/translation-table.h | 4 +- net/batman-adv/types.h | 120 +++++---- net/batman-adv/unicast.c | 16 +- net/batman-adv/vis.c | 144 +++++------ net/batman-adv/vis.h | 2 +- 20 files changed, 818 insertions(+), 558 deletions(-)

2 19

[B.A.T.M.A.N.] batman-adv 2012.3.0 released
by Marek Lindner 24 Aug '12

24 Aug '12

The B.A.T.M.A.N. team is delighted to announce its latest release, batman-adv 2012.3.0, focused on cleanups, stability and bugfixes bundled with a few smaller features. As the kernel module always depends on the Linux kernel it was compiled against, it does not make sense to provide binaries on our website. As usual, you will find the signed tarballs in our download section: http://downloads.open-mesh.org/batman/releases/batman-adv-2012.3.0/ as well as prepackaged binaries in your distribution. Thanks ------ Thanks to all people sending in patches: * Al Viro <viro(a)ZenIV.linux.org.uk> * Antonio Quartulli <ordex(a)autistici.org> * Ben Hutchings <bhutchings(a)solarflare.com> * Jesper Juhl <jj(a)chaosbits.net> * Marek Lindner <lindner_marek(a)yahoo.de> * Martin Hundebøll <martin(a)hundeboll.net> * Matthias Schiffer <mschiffer(a)universe-factory.net> * Simon Wunderlich <simon.wunderlich(a)s2003.tu-chemnitz.de> * Sven Eckelmann <sven(a)narfation.org> and to all those that supported us with good advice, code review and/or rigorous testing: * Andrew Lunn <andrew(a)lunn.ch> * David S. Miller <davem(a)davemloft.net> * Guido Iribarren <guidoiribarren(a)buenosaireslibre.org> * Nicolás Echániz <nicoechaniz(a)codigosur.org> Special thanks to Sven Eckelmann who took on the nearly-impossible task of restyling / renaming of all existing variable declarations and function names throughout the code. With 68 patches he submitted about 5000 changes to achieve the goal of making the code more coherent. batman-adv ---------- David Miller, the Linux kernel network maintainer, wanted batman-adv to become a better Linux-citizen by conforming to the Linux namespace convention. Since this topic was neglected for quite some time a fair amount of code changes were required to comply with the convention. This renaming / restyling work represents the bulk of the changes coming with this release. The newly introduced extended traffic statistics support also is worth mentioning: Up until now batman-adv only collected statistics about the payload traffic. This release adds counters about mesh internal traffic like forwarded traffic, OGM and TT management traffic that can be accessed through the ethtool API. Numerous components received bugfixes: The translation table handling code fixed a race condition in the full-table replacement logic and correctly handles endianness when forwarding TT Request packets. Furthermore, the cooperation between the routing protocol and the translation table has been abstracted to allow a smooth integration with the routing protocol API. The gateway code dealt with a regression which made it impossible to select a gateway on a client if a selection class smaller than 3 was chosen. The recently renovated bridge loop avoidance falsely dropped DHCP packets coming through the gateway code as it believed to prevent a loop. This has been addressed. The AP isolation was a little too aggressively dropping all broadcast traffic from WiFi clients which made it impossible, for example, to exchange mac address entries via ARP. The visualization output of the vis component does not fail on primary interfaces without neighbors anymore. Batman-adv was modified to initialize all reserved protocol fields with zero to ensure later compatibility when the packet format may be changed. A race condition in the hash implementation was found and fixed as well. batctl ------ New in this release is the packet statistics retrieval component which displays the data gathered by batman-adv through a new command line switch. The mini-tcpdump allows to filter parsed packets by compatibility number only showing packets that match its own compat number. In addition, it learned the new bridge loop avoidance (BLA II) packet format to also display those packets. The ping and traceroute components properly initialize all ICMP fields to avoid unexpected behavior. Happy routing, The B.A.T.M.A.N. team

1 0

[B.A.T.M.A.N.] editing the routing information
by Dominic Follett-Smith 24 Aug '12

24 Aug '12

Hi all, I am using the batmand release and I trying to edit where batman keeps a statistic of next best hops to a destination node. I want to change the metric in some way to alter the choices that batman makes when routing a packet to its destination. However I am rather stuck, and would appreciate some direction on where the updating of this statistic of next best hops for a destination is done in the batman code. Many Thanks Dominic

3 3

[B.A.T.M.A.N.] [RFC] GSOC:bandwidth meter
by Edo Monticelli 23 Aug '12

23 Aug '12

Hi, this patch adds the possibility to call bandwidth meter from batctl. batctl bw <MAC> This is part of my gsoc bandwidth meter project. Any comment is welcome, Edo montik (1): batctl: introduced support for bandwidth meter Makefile | 2 +- bw_meter.c | 168 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ bw_meter.h | 1 + main.c | 6 ++ man/batctl.8 | 24 ++++++++- packet.h | 38 +++++++++++-- 6 files changed, 231 insertions(+), 8 deletions(-) create mode 100644 bw_meter.c create mode 100644 bw_meter.h -- 1.7.8.6

1 1

[B.A.T.M.A.N.] [PATCH] batman-adv: return proper value in case of hash_add failure
by Antonio Quartulli 22 Aug '12

22 Aug '12

In case of hash_add failure tt_global_add() must return 0 (which means on entry insertion). Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- This patch is based on master. This bug exists since "a bit" but nobody actually found it because this bug should have been triggered in the unlikely case of hash adding failure. Therefore I do not think it is a crucial bug and it is not worth sending this patch to stable. Cheers, Makefile | 2 +- translation-table.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index bd8d30c..12aebe5 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ # changing the CONFIG_* line to 'y' enables the related feature # B.A.T.M.A.N. debugging: -export CONFIG_BATMAN_ADV_DEBUG=n +export CONFIG_BATMAN_ADV_DEBUG=y # B.A.T.M.A.N. bridge loop avoidance: export CONFIG_BATMAN_ADV_BLA=y diff --git a/translation-table.c b/translation-table.c index 112edd3..eb352db 100644 --- a/translation-table.c +++ b/translation-table.c @@ -788,13 +788,13 @@ int batadv_tt_global_add(struct batadv_priv *bat_priv, batadv_dbg(BATADV_DBG_TT, bat_priv, "Creating new global tt entry: %pM (via %pM)\n", tt_global_entry->common.addr, orig_node->orig); + ret = 1; out_remove: /* remove address from local hash if present */ batadv_tt_local_remove(bat_priv, tt_global_entry->common.addr, "global tt received", flags & BATADV_TT_CLIENT_ROAM); - ret = 1; out: if (tt_global_entry) batadv_tt_global_entry_free_ref(tt_global_entry); -- 1.7.9.4

3 4

[B.A.T.M.A.N.] [PATCH] batman-adv: Remove unused hlist macros in compat.h
by Martin Hundebøll 22 Aug '12

22 Aug '12

Signed-off-by: Martin Hundebøll <martin(a)hundeboll.net> --- compat.h | 8 -------- 1 file changed, 8 deletions(-) diff --git a/compat.h b/compat.h index 13253dd..8ac22a8 100644 --- a/compat.h +++ b/compat.h @@ -67,14 +67,6 @@ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 34) -#define hlist_first_rcu(head) (*((struct hlist_node **)(&(head)->first))) -#define hlist_next_rcu(node) (*((struct hlist_node **)(&(node)->next))) - -#define __hlist_for_each_rcu(pos, head) \ - for (pos = rcu_dereference(hlist_first_rcu(head)); \ - pos && ({ prefetch(pos->next); 1; }); \ - pos = rcu_dereference(hlist_next_rcu(pos))) - #define rcu_dereference_protected(p, c) (p) #endif /* < KERNEL_VERSION(2, 6, 34) */ -- 1.7.11.4

3 2

[B.A.T.M.A.N.] [PATCH] batman-adv: pass the WIFI flag from the local to global entry
by Antonio Quartulli 22 Aug '12

22 Aug '12

in case of client roaming a new global entry is added while a corresponding local one is still present. In this case the node can safely pass the WIFI flag from the local to the global entry Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- translation-table.c | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/translation-table.c b/translation-table.c index 37ae4a9..2aacde9 100644 --- a/translation-table.c +++ b/translation-table.c @@ -500,21 +500,30 @@ batadv_tt_local_set_pending(struct batadv_priv *bat_priv, tt_local_entry->common.addr, message); } +static void __batadv_tt_local_remove(struct batadv_priv *bat_priv, + struct batadv_tt_local_entry *tt_local, + const char *message, bool roaming) +{ + uint16_t flags; + + flags = BATADV_TT_CLIENT_DEL; + if (roaming) + flags |= BATADV_TT_CLIENT_ROAM; + + batadv_tt_local_set_pending(bat_priv, tt_local, flags, message); +} + void batadv_tt_local_remove(struct batadv_priv *bat_priv, const uint8_t *addr, const char *message, bool roaming) { struct batadv_tt_local_entry *tt_local_entry = NULL; - uint16_t flags; tt_local_entry = batadv_tt_local_hash_find(bat_priv, addr); if (!tt_local_entry) goto out; - flags = BATADV_TT_CLIENT_DEL; - if (roaming) - flags |= BATADV_TT_CLIENT_ROAM; + __batadv_tt_local_remove(bat_priv, tt_local_entry, message, roaming); - batadv_tt_local_set_pending(bat_priv, tt_local_entry, flags, message); out: if (tt_local_entry) batadv_tt_local_entry_free_ref(tt_local_entry); @@ -721,9 +730,11 @@ int batadv_tt_global_add(struct batadv_priv *bat_priv, uint8_t ttvn) { struct batadv_tt_global_entry *tt_global_entry = NULL; + struct batadv_tt_local_entry *tt_local_entry = NULL; int ret = 0; int hash_added; struct batadv_tt_common_entry *common; + uint16_t wifi_flag; tt_global_entry = batadv_tt_global_hash_find(bat_priv, tt_addr); @@ -789,14 +800,23 @@ int batadv_tt_global_add(struct batadv_priv *bat_priv, tt_global_entry->common.addr, orig_node->orig); out_remove: + tt_local_entry = batadv_tt_local_hash_find(bat_priv, tt_addr); + if (!tt_local_entry) + goto out; + + wifi_flag = tt_local_entry->common.flags & BATADV_TT_CLIENT_WIFI; + tt_global_entry->common.flags |= wifi_flag; + /* remove address from local hash if present */ - batadv_tt_local_remove(bat_priv, tt_global_entry->common.addr, - "global tt received", - flags & BATADV_TT_CLIENT_ROAM); + __batadv_tt_local_remove(bat_priv, tt_local_entry, "global tt received", + flags & BATADV_TT_CLIENT_ROAM); + ret = 1; out: if (tt_global_entry) batadv_tt_global_entry_free_ref(tt_global_entry); + if (tt_local_entry) + batadv_tt_local_entry_free_ref(tt_local_entry); return ret; } -- 1.7.9.4

2 10

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N August 2012