B.A.T.M.A.N May 2013

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

16 participants
80 discussions

[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

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

17 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: - v1 was based on a patch I decided to not send anymore and was generating a conflict. now it is based on top of "batman-adv: use VLAN_ETH_HLEN instead of sizeof(struct vlan_eth_hdr)" bridge_loop_avoidance.c | 12 ++++++------ gateway_client.c | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index 9e691b0..90b27b3 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -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

Re: [B.A.T.M.A.N.] [OpenWrt-Devel] AA "r36608" & Batman-adv 2013.2.0
by cmsv 16 May '13

16 May '13

Yes i am aware of that configuration and it is what i use. I now see that restarting batman-adv is done by restarting the network which means that the change was intentional. Thank you On 05/16/2013 05:07 AM, Bastian Bittorf wrote: > * cmsv <cmsv(a)wirelesspt.net> [16.05.2013 10:43]: >> Usage: batman-adv <start|stop|restart> [mesh instance] >> >> Does not exist with this combination. I tried to find an answer in the >> docs from both sides but was unable to obtain an answer. > > http://www.open-mesh.org/projects/batman-adv/wiki/Batman-adv-openwrt-config > > bye, bastian >

1 0

[B.A.T.M.A.N.] AA "r36608" & Batman-adv 2013.2.0
by cmsv 16 May '13

16 May '13

While trying to compile AA "r36608" and Batman-adv 2013.2.0 i noticed that some previously working functionalities are not present such as: # batman-adv Usage: batman-adv <start|stop|restart> [mesh instance] Does not exist with this combination. I tried to find an answer in the docs from both sides but was unable to obtain an answer. As this been removed from open-mesh side or openwrt? Was it intentional, mistake, or incompatibility? -- Site: http://wirelesspt.net Mesh: http://tinyurl.com/wirelesspt Admin: http://wirelesspt.net/wiki/Cmsv Twitter: http://twitter.com/wirelesspt Suporte técnico via sms: 91 19 11 798 Donativos/Paypal: http://tinyurl.com/doar-verba Chave publica PGP/SSH: http://wirelesspt.net/arquivos/pk Email assinado digitalmente pelo emissor assegurando autenticidade

1 0

[B.A.T.M.A.N.] [PATCH] batman-adv: add declaration in compat code
by Antonio Quartulli 15 May '13

15 May '13

Add missing declaration in compat.h. Introduced by 1bd816198771e2cbd44948a12aaca3ac33993d9d "batman-adv: don't use call_rcu if not needed" Reported-by: Daily build check <postmaster(a)open-mesh.org> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- compat.h | 1 + 1 file changed, 1 insertion(+) diff --git a/compat.h b/compat.h index 8bd4f62..6c8559d 100644 --- a/compat.h +++ b/compat.h @@ -182,6 +182,7 @@ static const struct { \ #define kfree_rcu(ptr, rcu_head) call_rcu(&ptr->rcu_head, batadv_free_rcu_##ptr) #define vlan_insert_tag(skb, proto, vid) __vlan_put_tag(skb, vid) +void batadv_free_rcu_tt_global_entry(struct rcu_head *rcu); void batadv_free_rcu_gw_node(struct rcu_head *rcu); void batadv_free_rcu_neigh_node(struct rcu_head *rcu); void batadv_free_rcu_tt_local_entry(struct rcu_head *rcu); -- 1.8.1.5

2 1

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N May 2013