B.A.T.M.A.N

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

15 participants
4309 discussions

[B.A.T.M.A.N.] (no subject)
by Antonio Quartulli 23 May '13

23 May '13

Hello David, this is another small patch for net/linux-3.10. It is preventing a double free of the bat_counters in case of mesh initialisation failure. Sorry for sending such small pull requests (I guess this is not that bad since they target net :-)), but these are small glitches we are finding while testing new features. Please pull or let me know if there is any problem. Thanks a lot, Antonio The following changes since commit 3ccfc1b1d2fa78f8ece83646027982916fcc794b: Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless (2013-05-20 14:05:22 -0700) are available in the git repository at: git://git.open-mesh.org/linux-merge.git tags/batman-adv-fix-for-davem for you to fetch changes up to f69ae770e74df420fbcf93aae81b30a5dcc73b7d: batman-adv: Avoid double freeing of bat_counters (2013-05-21 21:34:36 +0200) ---------------------------------------------------------------- Included change: - fix double free in case of failure during mesh initialisation ---------------------------------------------------------------- Martin Hundebøll (1): batman-adv: Avoid double freeing of bat_counters net/batman-adv/main.c | 1 + net/batman-adv/soft-interface.c | 1 + 2 files changed, 2 insertions(+)

2 3

[B.A.T.M.A.N.] Fwd: Re: [Freifunk.luebeck-devel] [Freifunk-Bonn] On compat version 15 in the Freifunk-KBU network
by Jan Luehr 19 May '13

19 May '13

Hello, sorry for forwarding - mail got filtered... Betreff: Re: [Freifunk.luebeck-devel] [Freifunk-Bonn] [B.A.T.M.A.N.] On compat version 15 in the Freifunk-KBU network Datum: Sun, 19 May 2013 14:49:45 +0200 Von: Jan Lühr <ff(a)jluehr.de> An: "Allgemeine Mailingliste zum Freifunk Köln, Bonn und Umgebung" <freifunk-bonn(a)lists.bonn.freifunk.net> CC: The list for a Better Approach To Mobile Ad-hoc Networking <b.a.t.m.a.n(a)lists.open-mesh.org>, freifunk.luebeck-devel(a)asta.uni-luebeck.de Hello, Am 19.05.2013 um 12:40 schrieb Simon Wunderlich: > Hello yanosz, > > On Sun, May 19, 2013 at 10:52:01AM +0200, Jan Lühr wrote: >> Hello folks, >> >> I'd like to give some thought's for the upcoming batman-adv release, especially on compat version 15. This somewhat summarizes my discussion with T_X on the wireless community weekend (WCW -- 2013-05-10 - 2013-05-12). (...) >> It's not my intention to bash on batman-adv in general or to start flame-wars (like: batman-adv vs. olsr or something else) - I'd like to provide some statement on the impact of the upcoming protocol changes. > > Thanks for your feedback. Yes, we are preparing a compat bump (actually for a long time now) and it's good to discuss it. :) Thanks for your detailed answer - I'll cut some parts for better readability. > >> >> 1. The upcoming protocol change appears to be painful - we have no suitable migration strategy. (...) >> 13 nodes in the next months - by that, we'll probably have some compat 13 ones for at least 1/2 year. There is no way of telling newer nodes to use compat version 13. Since some "supernodes" (dedicated servers) are part of the batman-adv cloud, we need twice the servers as well. >> Upgrading to compat version 15 will require a huge amount of work: New infrastructure (servers) must be deployed and nodes meshing with each other must be upgraded in parallel. > > > Btw, it's interesting that you use compat version 13 - only one release had that included, and we are > on compat 14 for quite some time ... > [1] http://www.open-mesh.org/projects/batman-adv/wiki/Compatversion (...) - yes, I know. Theses nodes are quite old. I guess this somewhat illustrates the upcoming situation. >> >> 2. Backwards-compatilibilty doesn't seem to be a design target. > > Actually, that is one of the main design targets. We are aware that with our current packet type design, > we cannot change even parts of the protocol without breaking compatibility. This has bothered us for quite > some time and we have worked on solutions to prevent compat bumps as good as possible. We have introduced > different means [2,3] to be able to add new features, change features, let sub-features update their > protocols (by using TVLVs) without breaking the rest and ensure compatibility on their own [3], route even > yet unknown packets on their own [2], ... Actually the TVLV thing is pretty similar to other protocols > (e.g. IEEE 802.11) which use that to ensure backwards compatiblity for years. The goal is to keep the > compat bump stable for at least a decade now, if not longer. No guarantees of course, but this compat > bump is made to CREATE backwards compatiblity. :) > > Note that the compat bump is not released yet but still only in our development branch. > > [2] http://www.open-mesh.org/projects/batman-adv/wiki/Packet-types > [3] http://www.open-mesh.org/projects/batman-adv/wiki/TVLV Thanks for the details. I understand your reasons for changing the protocol - and I'm perfectly fine with that. I know that manets are an area of active research. Bit this won't be a problem at all, if upcoming batman-adv versions are capable if "speaking" older compat versions. If done so, we (as in Freifunk-KBU) would be able to simple "choose" the compat version for our network - and pick a newer one if needed. >> Since batman-adv depends on the kernel (old batman-adv versions won't build with recent kernels) using 14 will not be an option in a few months: If some router hardware requires recent Kernel / OpenWRT releases version 14 might no longer be used. > > I think it would be possible to maintain older releases of batman-adv and add compatibility code for > newer kernels. We are doing the same now to provide compatibility for older kernels [4]. We would > be happy if someone (you?) would take over that job, I guess it would mostly mean to test new kernels > and add a little bit of compat code like we do for the old kernels. You are welcome to contribute > such "stable" versions. :) > > [4] http://git.open-mesh.org/batman-adv.git/blob/refs/heads/master:/compat.h Hmm... well, I'm not into kernel development, but I could maintain some CI services for testing. I'll ask some our folks on our next community meeting. > >> -> We're aware, that we cannot use version 14 in some months >> -> At the point, when 14 becomes unusable (introduced into OpenWRT Kernels / release we need -- or Debian), we will almost certainly discontinue batman-adv and go one with sth. else. (Due to kernel deps it's easier to run batman-adv / olsr in parallel than two different version of batman-adv) > > I don't see that by releasing batman-adv with the new compat version, suddenly your network breaks > - in Debian you usually keep the same kernel for YEARS, and in OpenWRT you can just keep the batman-adv > package at the desired version number. The only problem you might run into is that newer kernels might > not work, as stated above. Actually, it has consequences: About 5-8 months ago (don't remember the details). 2011.2 didn't build on Attitude Adjustment (12.09) (OpenWRT issue? Kernel Issue? I don't remember ...), while newer TP Link 1043nd models needed 12.09 (brick, otherwise). At that time we're eager of deploying compat 14 releases - succeeding about 3,5 months ago. But in the aftermath of it, we noticed that we did not succeed in upgrading the whole network - since upgrading some nodes is still impossible because of organizational issues. Some people complained about the effort needed - for valid reasons, imho (although we provided free vodka at our release party ;-) ) To be honest: I don't like to be stuck at this, again. With compat 15 on the horizon, we're in the need of finding adequate strategies. Do you have something in your mind? >> -> Maybe, some future version of batman-adv addresses backwards-compatibility. Maybe, in 2018 we will have a look at batman-adv again - noticing, that batman-adv remained stable (or migratable) over the last years and start using it again. Maybe, batman-adv will fit our needs, then. > > You are free to use whatever you want. I think I've made a clear point that this compat bump is designed > to address the compat issues we had. What you roll out then is up to you (personally I'd be interested > what you'll use instead) - but I guess you'll miss a lot of very nice features of batman-adv. ;) Yeah - I guess I'll miss some features - and there is no decision yet (not even candidates). However - in retrospect - kernel-dependencies will be taken into account this time. Greetz, yanosz

1 0

[B.A.T.M.A.N.] On compat version 15 in the Freifunk-KBU network
by Jan Lühr 19 May '13

19 May '13

Hello folks, I'd like to give some thought's for the upcoming batman-adv release, especially on compat version 15. This somewhat summarizes my discussion with T_X on the wireless community weekend (WCW -- 2013-05-10 - 2013-05-12). As some of you may know already, we're running a small freifunk network in western Germany (Köln-Bonn-area) - about ~100 nodes in total; ~40 are online at the moment. It's not my intention to bash on batman-adv in general or to start flame-wars (like: batman-adv vs. olsr or something else) - I'd like to provide some statement on the impact of the upcoming protocol changes. 1. The upcoming protocol change appears to be painful - we have no suitable migration strategy. Compat version 14 and 15 will be incompatible. Nodes will loose mesh connectivity (to older nodes). Since we cannot upgrade all nodes at once, we'll have to run different networks in parallel. In fact, we're running two networks at the moment (compat 13 and 14). We aren't able to upgrade the existing compat 13 nodes in the next months - by that, we'll probably have some compat 13 ones for at least 1/2 year. There is no way of telling newer nodes to use compat version 13. Since some "supernodes" (dedicated servers) are part of the batman-adv cloud, we need twice the servers as well. Upgrading to compat version 15 will require a huge amount of work: New infrastructure (servers) must be deployed and nodes meshing with each other must be upgraded in parallel. 2. Backwards-compatilibilty doesn't seem to be a design target. Looking at other routing protocols (BGP-4 - for example) - they provide decent ways for protocol extension while still providing backwards compatibility for the version specified 7 years ago. Looking at batman-adv a lot of protocol changes have been introduced in the past years - but no backwards compatibility is there. Eg. - There will be no flag for using compat 14 version in newer version of batman-adv - if 15 is out. - Nodes using 14 and 15 cannot mesh. Since batman-adv depends on the kernel (old batman-adv versions won't build with recent kernels) using 14 will not be an option in a few months: If some router hardware requires recent Kernel / OpenWRT releases version 14 might no longer be used. 3. Conclusion -> Freifunk KBU will not use compat version 15 in the foreseeable future -> We're aware, that we cannot use version 14 in some months -> At the point, when 14 becomes unusable (introduced into OpenWRT Kernels / release we need -- or Debian), we will almost certainly discontinue batman-adv and go one with sth. else. (Due to kernel deps it's easier to run batman-adv / olsr in parallel than two different version of batman-adv) -> We'd by very happy if someone forks batman-adv to provide modules for recent kernels still using version 14 -> Maybe, some future version of batman-adv addresses backwards-compatibility. Maybe, in 2018 we will have a look at batman-adv again - noticing, that batman-adv remained stable (or migratable) over the last years and start using it again. Maybe, batman-adv will fit our needs, then. Thanks for your time, greetz, yanosz

3 2

[B.A.T.M.A.N.] [PATCHv3] batman-adv: use __constant_htons when possible
by Antonio Quartulli 19 May '13

19 May '13

When comparing a network ordered value with a constant, it is better to convert the constant at compile time by means of __constant_htons() instead of converting the value at runtime using ntohs(). This refactoring may slightly improve the code performance. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- v2: - patch rebased on top of "batman-adv: use VLAN_ETH_HLEN instead of sizeof(struct vlan_eth_hdr)" v3: - use __constant* for vlan_insert_tag() argument bridge_loop_avoidance.c | 14 +++++++------- gateway_client.c | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index 9e691b0..de02e7c 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -343,7 +343,7 @@ static void batadv_bla_send_claim(struct batadv_priv *bat_priv, uint8_t *mac, } if (vid & BATADV_VLAN_HAS_TAG) - skb = vlan_insert_tag(skb, htons(ETH_P_8021Q), + skb = vlan_insert_tag(skb, __constant_htons(ETH_P_8021Q), vid & VLAN_VID_MASK); skb_reset_mac_header(skb); @@ -863,25 +863,25 @@ static int batadv_bla_process_claim(struct batadv_priv *bat_priv, struct arphdr *arphdr; uint8_t *hw_src, *hw_dst; struct batadv_bla_claim_dst *bla_dst; - uint16_t proto; + __be16 proto; int headlen; unsigned short vid = BATADV_NO_FLAGS; int ret; ethhdr = eth_hdr(skb); - if (ntohs(ethhdr->h_proto) == ETH_P_8021Q) { + if (ethhdr->h_proto == __constant_htons(ETH_P_8021Q)) { vhdr = (struct vlan_ethhdr *)ethhdr; vid = ntohs(vhdr->h_vlan_TCI) & VLAN_VID_MASK; vid |= BATADV_VLAN_HAS_TAG; - proto = ntohs(vhdr->h_vlan_encapsulated_proto); + proto = vhdr->h_vlan_encapsulated_proto; headlen = sizeof(*vhdr); } else { - proto = ntohs(ethhdr->h_proto); + proto = ethhdr->h_proto; headlen = ETH_HLEN; } - if (proto != ETH_P_ARP) + if (proto != __constant_htons(ETH_P_ARP)) return 0; /* not a claim frame */ /* this must be a ARP frame. check if it is a claim. */ @@ -1375,7 +1375,7 @@ int batadv_bla_is_backbone_gw(struct sk_buff *skb, ethhdr = (struct ethhdr *)(((uint8_t *)skb->data) + hdr_size); - if (ntohs(ethhdr->h_proto) == ETH_P_8021Q) { + if (ethhdr->h_proto == __constant_htons(ETH_P_8021Q)) { if (!pskb_may_pull(skb, hdr_size + VLAN_ETH_HLEN)) return 0; diff --git a/gateway_client.c b/gateway_client.c index f59e58d..3cf92f8 100644 --- a/gateway_client.c +++ b/gateway_client.c @@ -682,11 +682,11 @@ bool batadv_gw_is_dhcp_target(struct sk_buff *skb, unsigned int *header_len) /* check for bootp port */ if ((proto == __constant_htons(ETH_P_IP)) && - (ntohs(udphdr->dest) != 67)) + (udphdr->dest != __constant_htons(67))) return false; if ((proto == __constant_htons(ETH_P_IPV6)) && - (ntohs(udphdr->dest) != 547)) + (udphdr->dest != __constant_htons(547))) return false; return true; -- 1.8.1.5

1 1

[B.A.T.M.A.N.] [PATCH] batctl: fix typos in error messages
by Antonio Quartulli 18 May '13

18 May '13

From: Antonio Quartulli <antonio(a)open-mesh.com> Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> --- bisect_iv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bisect_iv.c b/bisect_iv.c index f958511..0dbc2ef 100644 --- a/bisect_iv.c +++ b/bisect_iv.c @@ -1525,13 +1525,13 @@ int bisect_iv(int argc, char **argv) num_parsed_files = 0; if ((rt_orig_ptr) && (trace_orig_ptr)) { - fprintf(stderr, "Error - the 'print routing table' option can't be used together with the the 'trace seqno' option\n"); + fprintf(stderr, "Error - the 'print routing table' option can't be used together with the 'trace seqno' option\n"); goto err; } else if ((loop_orig_ptr) && (trace_orig_ptr)) { - fprintf(stderr, "Error - the 'loop detection' option can't be used together with the the 'trace seqno' option\n"); + fprintf(stderr, "Error - the 'loop detection' option can't be used together with the 'trace seqno' option\n"); goto err; } else if ((loop_orig_ptr) && (rt_orig_ptr)) { - fprintf(stderr, "Error - the 'loop detection' option can't be used together with the the 'print routing table' option\n"); + fprintf(stderr, "Error - the 'loop detection' option can't be used together with the 'print routing table' option\n"); goto err; } else if (rt_orig_ptr) { res = get_orig_addr(rt_orig_ptr, orig); -- 1.8.1.5

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv: use VLAN_ETH_HLEN instead of sizeof(struct vlan_eth_hdr)
by Antonio Quartulli 18 May '13

18 May '13

Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- bridge_loop_avoidance.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index 0582b7d..124a743 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -1376,7 +1376,7 @@ int batadv_bla_is_backbone_gw(struct sk_buff *skb, ethhdr = (struct ethhdr *)(((uint8_t *)skb->data) + hdr_size); if (ntohs(ethhdr->h_proto) == ETH_P_8021Q) { - if (!pskb_may_pull(skb, hdr_size + sizeof(struct vlan_ethhdr))) + if (!pskb_may_pull(skb, hdr_size + VLAN_ETH_HLEN)) return 0; vhdr = (struct vlan_ethhdr *)(skb->data + hdr_size); -- 1.8.1.5

2 1

[B.A.T.M.A.N.] [PATCHv2] batman-adv: h_vlan_encapsulated_proto access refactoring
by Antonio Quartulli 18 May '13

18 May '13

In the gateway code in case of VLAN tagged frame the ethhdr pointer is moved forward by 4 bytes so that the offset of h_proto in struct ethhdr matches the real h_vlan_encapsulated_proto address in the skb. This trick is correct but the code is not easy to understand and may lead to bugs in case of re-use of ethhdr for other purposes. Do some code refactoring in order to make it easier to understand and to change in the future. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- v2: - slightly change the commit subject and message - use __constant_htons() when comparing proto with constants gateway_client.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/gateway_client.c b/gateway_client.c index 973f02d..f59e58d 100644 --- a/gateway_client.c +++ b/gateway_client.c @@ -626,24 +626,30 @@ bool batadv_gw_is_dhcp_target(struct sk_buff *skb, unsigned int *header_len) struct iphdr *iphdr; struct ipv6hdr *ipv6hdr; struct udphdr *udphdr; + __be16 proto; /* check for ethernet header */ if (!pskb_may_pull(skb, *header_len + ETH_HLEN)) return false; ethhdr = (struct ethhdr *)skb->data; + proto = ethhdr->h_proto; *header_len += ETH_HLEN; /* check for initial vlan header */ - if (ntohs(ethhdr->h_proto) == ETH_P_8021Q) { + if (proto == __constant_htons(ETH_P_8021Q)) { + struct vlan_ethhdr *vhdr; + if (!pskb_may_pull(skb, *header_len + VLAN_HLEN)) return false; - ethhdr = (struct ethhdr *)(skb->data + VLAN_HLEN); + + vhdr = (struct vlan_ethhdr *)skb->data; + proto = vhdr->h_vlan_encapsulated_proto; *header_len += VLAN_HLEN; } /* check for ip header */ - switch (ntohs(ethhdr->h_proto)) { - case ETH_P_IP: + switch (proto) { + case __constant_htons(ETH_P_IP): if (!pskb_may_pull(skb, *header_len + sizeof(*iphdr))) return false; iphdr = (struct iphdr *)(skb->data + *header_len); @@ -654,7 +660,7 @@ bool batadv_gw_is_dhcp_target(struct sk_buff *skb, unsigned int *header_len) return false; break; - case ETH_P_IPV6: + case __constant_htons(ETH_P_IPV6): if (!pskb_may_pull(skb, *header_len + sizeof(*ipv6hdr))) return false; ipv6hdr = (struct ipv6hdr *)(skb->data + *header_len); @@ -675,11 +681,11 @@ bool batadv_gw_is_dhcp_target(struct sk_buff *skb, unsigned int *header_len) *header_len += sizeof(*udphdr); /* check for bootp port */ - if ((ntohs(ethhdr->h_proto) == ETH_P_IP) && + if ((proto == __constant_htons(ETH_P_IP)) && (ntohs(udphdr->dest) != 67)) return false; - if ((ntohs(ethhdr->h_proto) == ETH_P_IPV6) && + if ((proto == __constant_htons(ETH_P_IPV6)) && (ntohs(udphdr->dest) != 547)) return false; -- 1.8.1.5

2 1

[B.A.T.M.A.N.] [PATCH] batctl: fix false uninitialized variable warning when compiling with O2
by Marek Lindner 18 May '13

18 May '13

Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> --- functions.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions.c b/functions.c index a025395..cc05a48 100644 --- a/functions.c +++ b/functions.c @@ -458,7 +458,7 @@ static void request_arp(uint32_t ipv4_addr) static struct ether_addr *resolve_mac_from_arp(uint32_t ipv4_addr) { struct ether_addr mac_empty; - struct ether_addr *mac_result = NULL, *mac_tmp; + struct ether_addr *mac_result = NULL, *mac_tmp = NULL; struct sockaddr_in inet4; int ret; FILE *f; -- 1.7.10.4

1 1

[B.A.T.M.A.N.] Basic Multicast Optimizations
by Linus Lüssing 17 May '13

17 May '13

This set of patches is the first one for a more efficient, group aware multicast forwarding infrastructure in batman-adv. This initial set mainly consists of the integration of announcing the location of multicast listeners via the translation table mechanism to be able to find out which batman-adv nodes are actually interested in certain multicast traffic. As well as the signalizing of this announcement capability via a new multicast TVLV. Finally some basic multicast forwarding opitimizations are introduced: If all nodes signalized the MLA capability then link-local IPv6 traffic will be dropped if there is no interested listener or gets forwarded via a batman-adv unicast packet if there is just one node interested in the data. For now, these optimizations only apply if all nodes in the mesh have no bridge interface on top their bat0 interface. However making it possible with bridges, too, and other features are on the roadmap. See the according wiki page for details [1]. [1]: http://www.open-mesh.org/projects/batman-adv/wiki/Multicast-ideas-updated#R…

3 18

[B.A.T.M.A.N.] pull request for net: batman-adv 2013-05-17
by Antonio Quartulli 17 May '13

17 May '13

Hello David, here you have one fix intended for net/linux-3.10. This patch is fixing a global fault protection that can be triggered on module removal due to the double invocation of call_rcu() in chain. While fixing, the patch is also adding some kernel doc to the changed functions. Consider queueing this patch to -stable. Please pull or let me know if there is any problem! Thank you, Antonio The following changes since commit b0ce3508b25ea6fa10ae3ca254de1d695b521702: bonding: allow TSO being set on bonding master (2013-05-16 15:02:01 -0700) are available in the git repository at: git://git.open-mesh.org/linux-merge.git tags/batman-adv-fix-for-davem for you to fetch changes up to 72822225bd41320a98f5d7cde38317766e18983f: batman-adv: Fix rcu_barrier() miss due to double call_rcu() in TT code (2013-05-17 09:54:28 +0200) ---------------------------------------------------------------- Included changes: - fix global protection fault by avoiding double call_rcu ---------------------------------------------------------------- Linus Lüssing (1): batman-adv: Fix rcu_barrier() miss due to double call_rcu() in TT code net/batman-adv/originator.c | 16 ++++++++++++++++ net/batman-adv/originator.h | 1 + net/batman-adv/translation-table.c | 7 ++++++- 3 files changed, 23 insertions(+), 1 deletion(-)

2 2

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N