B.A.T.M.A.N June 2014

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

34 participants
53 discussions

[B.A.T.M.A.N.] New to the list
by Jay Brussels 17 Jun '14

17 Jun '14

Hello everyone, Just joined the list. I am planning on building a mesh network for 7,000 clients utilizing 145 gateways. I have the radio backbone already in place for another purpose (145 stations connected to centrally located tower) and this is fed by fiber. I am interested in mesh since some clients (indoor dual-band routers) will not be able to communicate directly with the 145 radios. I plan to add a second radio at each of the 145 sites to be part of the mesh network. Any help or suggestions will be appreciated. Jay Brussels DSLX jay(a)dslx.net

1 0

[B.A.T.M.A.N.] question about batman-adv auto run
by michael.holcman1＠free.fr 17 Jun '14

17 Jun '14

Hello, Do you know how to auto run batman-adv, because, i have no answer where i write:/etc/init.d enable ? Where i can located the configure fils as following ? config 'mesh' 'bat0' option 'interface' 'wlan0' 'bride' option 'aggregated_ogms' option 'ap_isolation' option 'bonding' option 'fragmentation' option 'gw_bandwidth' option 'gw_mode' option 'gw_sel_class' option 'log_level' 'all' option 'orig_interval' '500' option 'vis_mode' option 'bridge_loop_avoidance' '1' option 'distributed_arp_table' option 'network_coding' option 'hop_penalty' # yet another batX instance # config 'mesh' 'bat5' # option 'interfaces' 'second_mesh'

4 7

[B.A.T.M.A.N.] DHCP-Monitoring of Gateways
by Jan Lühr 16 Jun '14

16 Jun '14

Hello, we're running batman 2013.4, having multiple Gateways. For doing so, we'd like to monitor the availability of every dhcp-server on each Gateway. I noticed: If DHCP-Packages (even unicast ones) that unicast DHCP-Requests / Discovery are unanswered, if -> they're sent locally on a gateway -> sent to a gateway not "chosen" (according to batctl gwl) by the monitoring host. What's the best way of monitoring all DHCP-Servers? Is there a way to set up a monitoring node, that can reach all DHCP-Servers? If not, how can request an ip address locally? Thanks, Greetz, Jan

3 4

[B.A.T.M.A.N.] [PATCH] remove unnecessary logspam
by André Gaul 15 Jun '14

15 Jun '14

This patch removes unnecessary logspam which resulted from superfluous calls to net_ratelimit(). With the supplied patch, net_ratelimit() is called after the loglevel has been checked. Signed-off-by: André Gaul <gaul(a)web-yard.de> --- main.h | 16 ++++++++++++---- routing.c | 4 ++-- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/main.h b/main.h index 87e7196..df57639 100644 --- a/main.h +++ b/main.h @@ -239,21 +239,29 @@ enum batadv_dbg_level { int batadv_debug_log(struct batadv_priv *bat_priv, const char *fmt, ...) __printf(2, 3); -#define batadv_dbg(type, bat_priv, fmt, arg...) \ +/* possibly ratelimited debug output */ +#define _batadv_dbg(type, bat_priv, ratelimited, fmt, arg...) \ do { \ - if (atomic_read(&bat_priv->log_level) & type) \ + if (atomic_read(&bat_priv->log_level) & type && \ + (!ratelimited || net_ratelimit())) \ batadv_debug_log(bat_priv, fmt, ## arg);\ } \ while (0) #else /* !CONFIG_BATMAN_ADV_DEBUG */ -__printf(3, 4) -static inline void batadv_dbg(int type __always_unused, +__printf(4, 5) +static inline void _batadv_dbg(int type __always_unused, struct batadv_priv *bat_priv __always_unused, + int ratelimited __always_unused, const char *fmt __always_unused, ...) { } #endif +#define batadv_dbg(type, bat_priv, arg...) \ + _batadv_dbg(type, bat_priv, 0, ## arg) +#define batadv_dbg_ratelimited(type, bat_priv, arg...) \ + _batadv_dbg(type, bat_priv, 1, ## arg) + #define batadv_info(net_dev, fmt, arg...) \ do { \ struct net_device *_netdev = (net_dev); \ diff --git a/routing.c b/routing.c index 3514153..c679c6f 100644 --- a/routing.c +++ b/routing.c @@ -706,7 +706,7 @@ static int batadv_check_unicast_ttvn(struct batadv_priv *bat_priv, if (batadv_tt_local_client_is_roaming(bat_priv, ethhdr->h_dest, vid)) { if (batadv_reroute_unicast_packet(bat_priv, unicast_packet, ethhdr->h_dest, vid)) - net_ratelimited_function(batadv_dbg, BATADV_DBG_TT, + batadv_dbg_ratelimited(BATADV_DBG_TT, bat_priv, "Rerouting unicast packet to %pM (dst=%pM): Local Roaming\n", unicast_packet->dest, @@ -752,7 +752,7 @@ static int batadv_check_unicast_ttvn(struct batadv_priv *bat_priv, */ if (batadv_reroute_unicast_packet(bat_priv, unicast_packet, ethhdr->h_dest, vid)) { - net_ratelimited_function(batadv_dbg, BATADV_DBG_TT, bat_priv, + batadv_dbg_ratelimited(BATADV_DBG_TT, bat_priv, "Rerouting unicast packet to %pM (dst=%pM): TTVN mismatch old_ttvn=%u new_ttvn=%u\n", unicast_packet->dest, ethhdr->h_dest, old_ttvn, curr_ttvn); -- 1.9.1

3 11

[B.A.T.M.A.N.] [PATCH] net: add __pskb_copy_fclone and pskb_copy_for_clone
by Antonio Quartulli 14 Jun '14

14 Jun '14

From: Octavian Purdila <octavian.purdila(a)intel.com> There are several instances where a pskb_copy or __pskb_copy is immediately followed by an skb_clone. Add a couple of new functions to allow the copy skb to be allocated from the fclone cache and thus speed up subsequent skb_clone calls. Cc: Alexander Smirnov <alex.bluesman.smirnov(a)gmail.com> Cc: Dmitry Eremin-Solenikov <dbaryshkov(a)gmail.com> Cc: Marek Lindner <mareklindner(a)neomailbox.ch> Cc: Simon Wunderlich <sw(a)simonwunderlich.de> Cc: Antonio Quartulli <antonio(a)meshcoding.com> Cc: Marcel Holtmann <marcel(a)holtmann.org> Cc: Gustavo Padovan <gustavo(a)padovan.org> Cc: Johan Hedberg <johan.hedberg(a)gmail.com> Cc: Arvid Brodin <arvid.brodin(a)alten.se> Cc: Patrick McHardy <kaber(a)trash.net> Cc: Pablo Neira Ayuso <pablo(a)netfilter.org> Cc: Jozsef Kadlecsik <kadlec(a)blackhole.kfki.hu> Cc: Lauro Ramos Venancio <lauro.venancio(a)openbossa.org> Cc: Aloisio Almeida Jr <aloisio.almeida(a)openbossa.org> Cc: Samuel Ortiz <sameo(a)linux.intel.com> Cc: Jon Maloy <jon.maloy(a)ericsson.com> Cc: Allan Stephens <allan.stephens(a)windriver.com> Cc: Andrew Hendry <andrew.hendry(a)gmail.com> Cc: Eric Dumazet <edumazet(a)google.com> Reviewed-by: Christoph Paasch <christoph.paasch(a)uclouvain.be> Signed-off-by: Octavian Purdila <octavian.purdila(a)intel.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> --- compat.h | 6 ++++++ distributed-arp-table.c | 2 +- network-coding.c | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/compat.h b/compat.h index 28f4cfe..ed5b815 100644 --- a/compat.h +++ b/compat.h @@ -440,4 +440,10 @@ static int __batadv_interface_kill_vid(struct net_device *dev, __be16 proto,\ #endif /* < KERNEL_VERSION(3, 14, 0) */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 16, 0) + +#define pskb_copy_for_clone pskb_copy + +#endif /* < KERNEL_VERSION(3, 16, 0) */ + #endif /* _NET_BATMAN_ADV_COMPAT_H_ */ diff --git a/distributed-arp-table.c b/distributed-arp-table.c index b7406e0..b598111 100644 --- a/distributed-arp-table.c +++ b/distributed-arp-table.c @@ -595,7 +595,7 @@ static bool batadv_dat_send_data(struct batadv_priv *bat_priv, if (!neigh_node) goto free_orig; - tmp_skb = pskb_copy(skb, GFP_ATOMIC); + tmp_skb = pskb_copy_for_clone(skb, GFP_ATOMIC); if (!batadv_send_skb_prepare_unicast_4addr(bat_priv, tmp_skb, cand[i].orig_node, packet_subtype)) { diff --git a/network-coding.c b/network-coding.c index 40a2fc4..8d04d17 100644 --- a/network-coding.c +++ b/network-coding.c @@ -1344,7 +1344,7 @@ static void batadv_nc_skb_store_before_coding(struct batadv_priv *bat_priv, struct ethhdr *ethhdr; /* Copy skb header to change the mac header */ - skb = pskb_copy(skb, GFP_ATOMIC); + skb = pskb_copy_for_clone(skb, GFP_ATOMIC); if (!skb) return; -- 1.8.5.5

2 1

[B.A.T.M.A.N.] [PATCHv2] batman-adv: add compat code for kmalloc_array()
by Antonio Quartulli 14 Jun '14

14 Jun '14

kmalloc_array() was introduced with linux-3.4 therefore we need some compat code in order to be able to compile batman-adv against older kernels. Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> --- Changes from v2: - fix linux version in commit message compat.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/compat.h b/compat.h index 5eb5fe6..28f4cfe 100644 --- a/compat.h +++ b/compat.h @@ -274,6 +274,8 @@ static inline void batadv_eth_hw_addr_random(struct net_device *dev) random_ether_addr(dev->dev_addr); } +#define kmalloc_array(n, size, flags) kmalloc(n * size, flags) + #endif /* < KERNEL_VERSION(3, 4, 0) */ #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 5, 0) -- 1.8.5.5

2 1

[B.A.T.M.A.N.] [PATCH] batctl: Force \0 termination of string in bisect_iv
by Sven Eckelmann 14 Jun '14

14 Jun '14

This is a part of patch 4faf653307789150f1d40383e95c85a086630378 ("batctl: Force null termination of string after strncpy") but was forgotten before it was submitted to the maintainers. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- bisect_iv.c | 1 + 1 file changed, 1 insertion(+) diff --git a/bisect_iv.c b/bisect_iv.c index e5efb89..b748813 100644 --- a/bisect_iv.c +++ b/bisect_iv.c @@ -365,6 +365,7 @@ static int routing_table_new(char *orig, char *next_hop, char *old_next_hop, cha if ((rt_table->num_entries == 1) || (rt_table->num_entries != j + 1)) { i = rt_table->num_entries; strncpy(rt_table->entries[i - 1].orig, orig, NAME_LEN); + rt_table->entries[i - 1].orig[NAME_LEN - 1] = '\0'; rt_table->entries[i - 1].next_hop = next_hop_node; rt_table->entries[i - 1].flags = rt_flag; } -- 2.0.0

2 1

[B.A.T.M.A.N.] [PATCHv2] batman-adv: remove unnecessary logspam
by André Gaul 14 Jun '14

14 Jun '14

This patch removes unnecessary logspam which resulted from superfluous calls to net_ratelimit(). With the supplied patch, net_ratelimit() is called after the loglevel has been checked. Signed-off-by: André Gaul <gaul(a)web-yard.de> --- main.h | 20 ++++++++++++++------ routing.c | 18 +++++++++--------- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/main.h b/main.h index 87e7196..4bb500b 100644 --- a/main.h +++ b/main.h @@ -239,21 +239,29 @@ enum batadv_dbg_level { int batadv_debug_log(struct batadv_priv *bat_priv, const char *fmt, ...) __printf(2, 3); -#define batadv_dbg(type, bat_priv, fmt, arg...) \ +/* possibly ratelimited debug output */ +#define _batadv_dbg(type, bat_priv, ratelimited, fmt, arg...) \ do { \ - if (atomic_read(&bat_priv->log_level) & type) \ + if (atomic_read(&bat_priv->log_level) & type && \ + (!ratelimited || net_ratelimit())) \ batadv_debug_log(bat_priv, fmt, ## arg);\ } \ while (0) #else /* !CONFIG_BATMAN_ADV_DEBUG */ -__printf(3, 4) -static inline void batadv_dbg(int type __always_unused, - struct batadv_priv *bat_priv __always_unused, - const char *fmt __always_unused, ...) +__printf(4, 5) +static inline void _batadv_dbg(int type __always_unused, + struct batadv_priv *bat_priv __always_unused, + int ratelimited __always_unused, + const char *fmt __always_unused, ...) { } #endif +#define batadv_dbg(type, bat_priv, arg...) \ + _batadv_dbg(type, bat_priv, 0, ## arg) +#define batadv_dbg_ratelimited(type, bat_priv, arg...) \ + _batadv_dbg(type, bat_priv, 1, ## arg) + #define batadv_info(net_dev, fmt, arg...) \ do { \ struct net_device *_netdev = (net_dev); \ diff --git a/routing.c b/routing.c index 3514153..35f76f2 100644 --- a/routing.c +++ b/routing.c @@ -706,11 +706,11 @@ static int batadv_check_unicast_ttvn(struct batadv_priv *bat_priv, if (batadv_tt_local_client_is_roaming(bat_priv, ethhdr->h_dest, vid)) { if (batadv_reroute_unicast_packet(bat_priv, unicast_packet, ethhdr->h_dest, vid)) - net_ratelimited_function(batadv_dbg, BATADV_DBG_TT, - bat_priv, - "Rerouting unicast packet to %pM (dst=%pM): Local Roaming\n", - unicast_packet->dest, - ethhdr->h_dest); + batadv_dbg_ratelimited(BATADV_DBG_TT, + bat_priv, + "Rerouting unicast packet to %pM (dst=%pM): Local Roaming\n", + unicast_packet->dest, + ethhdr->h_dest); /* at this point the mesh destination should have been * substituted with the originator address found in the global * table. If not, let the packet go untouched anyway because @@ -752,10 +752,10 @@ static int batadv_check_unicast_ttvn(struct batadv_priv *bat_priv, */ if (batadv_reroute_unicast_packet(bat_priv, unicast_packet, ethhdr->h_dest, vid)) { - net_ratelimited_function(batadv_dbg, BATADV_DBG_TT, bat_priv, - "Rerouting unicast packet to %pM (dst=%pM): TTVN mismatch old_ttvn=%u new_ttvn=%u\n", - unicast_packet->dest, ethhdr->h_dest, - old_ttvn, curr_ttvn); + batadv_dbg_ratelimited(BATADV_DBG_TT, bat_priv, + "Rerouting unicast packet to %pM (dst=%pM): TTVN mismatch old_ttvn=%u new_ttvn=%u\n", + unicast_packet->dest, ethhdr->h_dest, + old_ttvn, curr_ttvn); return 1; } -- 1.9.1

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv: Fix out-of-order fragmentation support
by Sven Eckelmann 14 Jun '14

14 Jun '14

batadv_frag_insert_packet was unable to handle out-of-order packets because it dropped them directly. This is caused by the way the fragmentation lists is checked for the correct place to insert a fragmentation entry. The fragmentation code keeps the fragments in lists. The fragmentation entries are kept in descending order of sequence number. The list is traversed and each entry is compared with the new fragment. If the current entry has a smaller sequence number than the new fragment then the new one has to be inserted before the current entry. This ensures that the list is still in descending order. An out-of-order packet with a smaller sequence number than all entries in the list still has to be added to the end of the list. The used hlist has no information about the last entry in the list inside hlist_head and thus the last entry has to be calculated differently. Currently the code assumes that the iterator variable of hlist_for_each_entry can be used for this purpose after the hlist_for_each_entry finished. This is obviously wrong because the iterator variable is always NULL when the list was completely traversed. Instead the information about the last entry has to be stored in a different variable. This problem was introduced in 9b3eab61754d74a93c9840c296013fe3b4a1b606 ("batman-adv: Receive fragmented packets and merge"). Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- Patch was only build-tested --- fragmentation.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/fragmentation.c b/fragmentation.c index f14e54a..022d18a 100644 --- a/fragmentation.c +++ b/fragmentation.c @@ -128,6 +128,7 @@ static bool batadv_frag_insert_packet(struct batadv_orig_node *orig_node, { struct batadv_frag_table_entry *chain; struct batadv_frag_list_entry *frag_entry_new = NULL, *frag_entry_curr; + struct batadv_frag_list_entry *frag_entry_last = NULL; struct batadv_frag_packet *frag_packet; uint8_t bucket; uint16_t seqno, hdr_size = sizeof(struct batadv_frag_packet); @@ -180,11 +181,14 @@ static bool batadv_frag_insert_packet(struct batadv_orig_node *orig_node, ret = true; goto out; } + + /* store current entry because it could be the last in list */ + frag_entry_last = frag_entry_curr; } - /* Reached the end of the list, so insert after 'frag_entry_curr'. */ - if (likely(frag_entry_curr)) { - hlist_add_after(&frag_entry_curr->list, &frag_entry_new->list); + /* Reached the end of the list, so insert after 'frag_entry_last'. */ + if (likely(frag_entry_last)) { + hlist_add_after(&frag_entry_last->list, &frag_entry_new->list); chain->size += skb->len - hdr_size; chain->timestamp = jiffies; ret = true; -- 2.0.0.rc4

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv: add compat code for kmalloc_array()
by Antonio Quartulli 13 Jun '14

13 Jun '14

kmalloc_array() was introduced with linux-3.3 therefore we need some compat code in order to be able to compile batman-adv against older kernels. Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> --- compat.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/compat.h b/compat.h index 5eb5fe6..28f4cfe 100644 --- a/compat.h +++ b/compat.h @@ -274,6 +274,8 @@ static inline void batadv_eth_hw_addr_random(struct net_device *dev) random_ether_addr(dev->dev_addr); } +#define kmalloc_array(n, size, flags) kmalloc(n * size, flags) + #endif /* < KERNEL_VERSION(3, 4, 0) */ #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 5, 0) -- 1.8.5.5

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N June 2014