B.A.T.M.A.N

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

15 participants
4308 discussions

[B.A.T.M.A.N.] [PATCH 1/9] batman-adv: Check hard_iface refcnt before calling function
by Sven Eckelmann 11 Apr '16

11 Apr '16

The batadv_hardif_list list is checked in many situations and the items in this list are given to specialized functions to modify the routing behavior. At the moment each of these called functions has to check itself whether the received batadv_hard_iface has a refcount > 0 before it can increase the reference counter and use it in other objects. This can easily lead to problems because it is not easily visible where all callers of a function got the batadv_hard_iface object from and whether they already hold a valid reference. Checking the reference counter directly before calling a subfunction with a pointer from the batadv_hardif_list avoids this problem. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- net/batman-adv/bat_iv_ogm.c | 11 +++++++++++ net/batman-adv/bat_v_ogm.c | 14 +++++++++++++- net/batman-adv/originator.c | 5 +++++ net/batman-adv/send.c | 6 ++++++ 4 files changed, 35 insertions(+), 1 deletion(-) diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 2c65668..b390ff9 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -985,9 +985,15 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface) list_for_each_entry_rcu(tmp_hard_iface, &batadv_hardif_list, list) { if (tmp_hard_iface->soft_iface != hard_iface->soft_iface) continue; + + if (!kref_get_unless_zero(&tmp_hard_iface->refcount)) + continue; + batadv_iv_ogm_queue_add(bat_priv, *ogm_buff, *ogm_buff_len, hard_iface, tmp_hard_iface, 1, send_time); + + batadv_hardif_put(tmp_hard_iface); } rcu_read_unlock(); @@ -1767,8 +1773,13 @@ static void batadv_iv_ogm_process(const struct sk_buff *skb, int ogm_offset, if (hard_iface->soft_iface != bat_priv->soft_iface) continue; + if (!kref_get_unless_zero(&hard_iface->refcount)) + continue; + batadv_iv_ogm_process_per_outif(skb, ogm_offset, orig_node, if_incoming, hard_iface); + + batadv_hardif_put(hard_iface); } rcu_read_unlock(); diff --git a/net/batman-adv/bat_v_ogm.c b/net/batman-adv/bat_v_ogm.c index 4155fa5..473ebb9 100644 --- a/net/batman-adv/bat_v_ogm.c +++ b/net/batman-adv/bat_v_ogm.c @@ -26,6 +26,7 @@ #include <linux/if_ether.h> #include <linux/jiffies.h> #include <linux/kernel.h> +#include <linux/kref.h> #include <linux/list.h> #include <linux/netdevice.h> #include <linux/random.h> @@ -176,6 +177,9 @@ static void batadv_v_ogm_send(struct work_struct *work) if (hard_iface->soft_iface != bat_priv->soft_iface) continue; + if (!kref_get_unless_zero(&hard_iface->refcount)) + continue; + batadv_dbg(BATADV_DBG_BATMAN, bat_priv, "Sending own OGM2 packet (originator %pM, seqno %u, throughput %u, TTL %d) on interface %s [%pM]\n", ogm_packet->orig, ntohl(ogm_packet->seqno), @@ -185,10 +189,13 @@ static void batadv_v_ogm_send(struct work_struct *work) /* this skb gets consumed by batadv_v_ogm_send_to_if() */ skb_tmp = skb_clone(skb, GFP_ATOMIC); - if (!skb_tmp) + if (!skb_tmp) { + batadv_hardif_put(hard_iface); break; + } batadv_v_ogm_send_to_if(skb_tmp, hard_iface); + batadv_hardif_put(hard_iface); } rcu_read_unlock(); @@ -704,9 +711,14 @@ static void batadv_v_ogm_process(const struct sk_buff *skb, int ogm_offset, if (hard_iface->soft_iface != bat_priv->soft_iface) continue; + if (!kref_get_unless_zero(&hard_iface->refcount)) + continue; + batadv_v_ogm_process_per_outif(bat_priv, ethhdr, ogm_packet, orig_node, neigh_node, if_incoming, hard_iface); + + batadv_hardif_put(hard_iface); } rcu_read_unlock(); out: diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c index e63d6a5..44c508a 100644 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@ -1165,6 +1165,9 @@ static bool batadv_purge_orig_node(struct batadv_priv *bat_priv, if (hard_iface->soft_iface != bat_priv->soft_iface) continue; + if (!kref_get_unless_zero(&hard_iface->refcount)) + continue; + best_neigh_node = batadv_find_best_neighbor(bat_priv, orig_node, hard_iface); @@ -1172,6 +1175,8 @@ static bool batadv_purge_orig_node(struct batadv_priv *bat_priv, best_neigh_node); if (best_neigh_node) batadv_neigh_node_put(best_neigh_node); + + batadv_hardif_put(hard_iface); } rcu_read_unlock(); diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c index 3ce06e0..43a950e 100644 --- a/net/batman-adv/send.c +++ b/net/batman-adv/send.c @@ -26,6 +26,7 @@ #include <linux/if.h> #include <linux/jiffies.h> #include <linux/kernel.h> +#include <linux/kref.h> #include <linux/list.h> #include <linux/netdevice.h> #include <linux/printk.h> @@ -577,10 +578,15 @@ static void batadv_send_outstanding_bcast_packet(struct work_struct *work) if (forw_packet->num_packets >= hard_iface->num_bcasts) continue; + if (!kref_get_unless_zero(&hard_iface->refcount)) + continue; + /* send a copy of the saved skb */ skb1 = skb_clone(forw_packet->skb, GFP_ATOMIC); if (skb1) batadv_send_broadcast_skb(skb1, hard_iface); + + batadv_hardif_put(hard_iface); } rcu_read_unlock(); -- 2.7.0

3 22

[B.A.T.M.A.N.] [PATCH v2] batman-adv: Fix broadcast/ogm queue limit on a removed interface
by Sven Eckelmann 11 Apr '16

11 Apr '16

From: Linus Lüssing <linus.luessing(a)c0d3.blue> When removing a single interface while a broadcast or ogm packet is still pending then we will free the forward packet without releasing the queue slots again. This patch is supposed to fix this issue. Fixes: d5bbce8465af ("batman-adv: Add missing hardif_free_ref in forw_packet_free") Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> [sven(a)narfation.org: fix conflicts with current version] Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- v2: - rebased patch Patch was resurrected from https://patchwork.open-mesh.org/patch/2921/ I've requested an rebased version at https://lists.open-mesh.org/pipermail/b.a.t.m.a.n/2016-March/014635.html but done it myself because it was rather trivial. --- net/batman-adv/send.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c index 3ce06e0..7641785 100644 --- a/net/batman-adv/send.c +++ b/net/batman-adv/send.c @@ -675,6 +675,9 @@ batadv_purge_outstanding_packets(struct batadv_priv *bat_priv, if (pending) { hlist_del(&forw_packet->list); + if (!forw_packet->own) + atomic_inc(&bat_priv->bcast_queue_left); + batadv_forw_packet_free(forw_packet); } } @@ -702,6 +705,9 @@ batadv_purge_outstanding_packets(struct batadv_priv *bat_priv, if (pending) { hlist_del(&forw_packet->list); + if (!forw_packet->own) + atomic_inc(&bat_priv->batman_queue_left); + batadv_forw_packet_free(forw_packet); } } -- 2.7.0

2 1

[B.A.T.M.A.N.] [PATCH 1/2] batman-adv: Fix broadcast queue limit on a removed interface
by Linus Lüssing 09 Apr '16

09 Apr '16

When removing a single interface while a broadcast or ogm packet is still pending then we will free the forward packet without releasing the queue slots again. This patch is supposed to fix this issue. Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> --- send.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/send.c b/send.c index ed7072a..2d539d6 100644 --- a/send.c +++ b/send.c @@ -356,6 +356,9 @@ batadv_purge_outstanding_packets(struct batadv_priv *bat_priv, if (pending) { hlist_del(&forw_packet->list); + if (!forw_packet->own) + atomic_inc(&bat_priv->bcast_queue_left); + batadv_forw_packet_free(forw_packet); } } @@ -382,6 +385,9 @@ batadv_purge_outstanding_packets(struct batadv_priv *bat_priv, if (pending) { hlist_del(&forw_packet->list); + if (!forw_packet->own) + atomic_inc(&bat_priv->batman_queue_left); + batadv_forw_packet_free(forw_packet); } } -- 1.7.10.4

2 5

[B.A.T.M.A.N.] [B.A.T.M.A.N] simulate multihop
by Fábio Carvalho 06 Apr '16

06 Apr '16

Hi all, I have a network with three nodes and i wanted simulate multihop with batman-adv protocol. node 1 <-> node 2 <-> node3 For this, i have to block mac address of node 3 on node 1 and mac address of node 1 on node 3. Thus, they only communicate via node2. I can not use iptables (iptables -A INPUT -m mac --mac-source $MAC -j DROP) because the protocol works on layer 2 and iptables works on layer 3, so, when the packet arrive at the node is handled by protocol before being blocked by iptables. After read some post, another solution is using ebtables, but ebtables only works with interfaces in mode bridge. If i execute these rules on nodes it does not work. node 1: ebtables -I INPUT -s <MAC_node3> -j DROP node3: ebtables -I INPUT -s <MAC_node1> -j DROP Anyone have another solution or i am doing something wrong? I think that ebtables does not work because my interface (wireless) is not on bridge mode, i cannot set it for bridge mode because i need create a mesh network (the wireless interface have to be in ad hoc mode). Cumprimentos, Fábio Carvalho

2 1

[B.A.T.M.A.N.] Need some help to understand the code
by Philipp Psurek 05 Apr '16

05 Apr '16

Hi all, I'm 1st term IT student and a candidate for Freifunk's GSoC. I can imagine to look inside batman-adv. Therefore I've to learn much more beyond the „Write in C 101“ I took part last year. If you have some spare time please recommend me some literature that has helped you on your way to write batman-adv code. I've two, three weeks to prepare myself and evaluate if I understand the code (or some parts of it) or participate in fixing some other Freifunk related issues. Thank you in advance and thank you for batman-adv best regards, Philipp

4 5

[B.A.T.M.A.N.] [PATCH] alfred: Don't accept user defined dataset source address in slave mode
by Sven Eckelmann 04 Apr '16

04 Apr '16

The dataset source is used by master servers to identify if it has to be forwarded to other master servers. The data::source of an incoming UDP push_data is checked and compared against the address of the node sending the dataset. If both are same then the dataset is marked as SOURCE_FIRST_HAND. Otherwise it is already synced dataset (SOURCE_SYNCED). Only datasets marked as SOURCE_FIRST_HAND or SOURCE_LOCAL will be forwarded by master servers. Allowing slave servers to accept push_data packets via unix socket with a modified data::source would break the synchronization of datasets between the master servers. The slave server would forward data to the master server as always but the master would now mark the packet as SOURCE_SYNCED. The synchronization process would end here. Parts of the alfred servers would therefore have access to the dataset and some not. Instead drop the incoming push_data with a set data::source on the slave. No alfred server will have the dataset and the stable inconsistency is avoided. Fixes: 58e109973bbe ("alfred: Allow setting the source mac via unix sock") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- Depends on the patch https://patchwork.open-mesh.org/patch/15954/ --- unix_sock.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/unix_sock.c b/unix_sock.c index ee6dd8f..150ad32 100644 --- a/unix_sock.c +++ b/unix_sock.c @@ -122,10 +122,18 @@ static int unix_sock_add_data(struct globals *globals, /* clients should set the source mac to 00:00:00:00:00:00 * to make the server set the source for them + * + * Only alfred in master mode can accept a user defined + * source addresses. Otherwise the data would not be + * synced between master servers. */ - if (!is_valid_ether_addr(data->source)) - memcpy(data->source, &interface->hwaddr, - sizeof(interface->hwaddr)); + if (is_valid_ether_addr(data->source)) { + if (memcmp(data->source, &interface->hwaddr, ETH_ALEN) != 0 && + globals->opmode != OPMODE_MASTER) + goto err; + } else { + memcpy(data->source, &interface->hwaddr, ETH_ALEN); + } if ((int)(data_len + sizeof(*data)) > len) goto err; -- 2.8.0.rc3

2 1

[B.A.T.M.A.N.] [PATCH 1/2] alfred: Check for invalid mac in EUI64 address
by Sven Eckelmann 04 Apr '16

04 Apr '16

The ipv6_to_mac function currently only checks if the EUI64 markers are present but not if the mac address is valid for a host. This has to be done to avoid invalid data in the alfred data storage. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- alfred.h | 2 ++ batadv_query.c | 4 ++++ util.c | 15 +++++++++++++++ 3 files changed, 21 insertions(+) diff --git a/alfred.h b/alfred.h index 7e5db16..8ed1ef0 100644 --- a/alfred.h +++ b/alfred.h @@ -26,6 +26,7 @@ #include <net/ethernet.h> #include <netinet/in.h> #include <netinet/udp.h> +#include <stdbool.h> #include <stdint.h> #include <time.h> #include <sys/select.h> @@ -196,3 +197,4 @@ int time_diff(struct timespec *tv1, struct timespec *tv2, struct timespec *tvdiff); void time_random_seed(void); uint16_t get_random_id(void); +bool is_valid_ether_addr(uint8_t *addr); diff --git a/batadv_query.c b/batadv_query.c index 2604503..6dc2cf4 100644 --- a/batadv_query.c +++ b/batadv_query.c @@ -19,6 +19,7 @@ * */ +#include "alfred.h" #include "batadv_query.h" #include <errno.h> #include <net/ethernet.h> @@ -85,6 +86,9 @@ int ipv6_to_mac(const struct in6_addr *addr, struct ether_addr *mac) mac->ether_addr_octet[4] = addr->s6_addr[14]; mac->ether_addr_octet[5] = addr->s6_addr[15]; + if (!is_valid_ether_addr(mac->ether_addr_octet)) + return -EINVAL; + return 0; } diff --git a/util.c b/util.c index db6ec96..c7e11cc 100644 --- a/util.c +++ b/util.c @@ -19,6 +19,8 @@ * */ +#include <netinet/ether.h> +#include <stdbool.h> #include <stddef.h> #include <stdint.h> #include <stdlib.h> @@ -60,3 +62,16 @@ uint16_t get_random_id(void) { return random(); } + +bool is_valid_ether_addr(uint8_t addr[ETH_ALEN]) +{ + /* multicast address */ + if (addr[0] & 0x01) + return false; + + /* 00:00:00:00:00:00 */ + if ((addr[0] | addr[1] | addr[2] | addr[3] | addr[4] | addr[5]) == 0) + return false; + + return true; +} -- 2.8.0.rc3

2 3

[B.A.T.M.A.N.] i4free-gr community BATMAN-ADV application workshops in Greece
by 3zl Trizonelabs 04 Apr '16

04 Apr '16

following the first attempt at the Athens Wireless Summit 2015 the i4free-gr community will perform 2 workshops embracing BATMAN-ADV network applications. Title : "i4free-gr how to build small community mesh networks the easy way using the BRUCE framework protoype ( Openwrt & batman-advanced )" 1. TEI Technical University Mesolongi at 13.03.2016 Antirio 2. FOSSCOM TEI Technical University Pireus at 16/17.04.2016 https://ellak.gr/2016/02/fosscomm-2016-stis-16-17-apriliou-2016-sto-panepis… greetings to the hard-working BATMAN people 3zl

1 0

[B.A.T.M.A.N.] [PATCH 1/2] MAINTAINERS: Mark BATMAN ADVANCED mailing list as moderated
by Sven Eckelmann 01 Apr '16

01 Apr '16

The mailing list of b.a.t.m.a.n(a)lists.open-mesh.org is moderated for non-subscribers and non-whitelisted addresses. Such mails will be delayed but the sender will not be informed about the moderation. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 16ccda4..835a520 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2206,7 +2206,7 @@ BATMAN ADVANCED M: Marek Lindner <mareklindner(a)neomailbox.ch> M: Simon Wunderlich <sw(a)simonwunderlich.de> M: Antonio Quartulli <a(a)unstable.cc> -L: b.a.t.m.a.n(a)lists.open-mesh.org +L: b.a.t.m.a.n(a)lists.open-mesh.org (moderated for non-subscribers) W: https://www.open-mesh.org/ Q: https://patchwork.open-mesh.org/project/batman/list/ S: Maintained -- 2.8.0.rc3

1 1

[B.A.T.M.A.N.] [PATCH] batman-adv: Fix checkpatch warning about 'unsigned' type
by Sven Eckelmann 01 Apr '16

01 Apr '16

From: Sven Eckelmann <sven.eckelmann(a)open-mesh.com> checkpatch.pl warns about the use of 'unsigned' as a short form for 'unsigned int'. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)open-mesh.com> --- net/batman-adv/fragmentation.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c index 910c841..65536db 100644 --- a/net/batman-adv/fragmentation.c +++ b/net/batman-adv/fragmentation.c @@ -452,7 +452,7 @@ bool batadv_frag_send_packet(struct sk_buff *skb, /* To avoid merge and refragmentation at next-hops we never send * fragments larger than BATADV_FRAG_MAX_FRAG_SIZE */ - mtu = min_t(unsigned, mtu, BATADV_FRAG_MAX_FRAG_SIZE); + mtu = min_t(unsigned int, mtu, BATADV_FRAG_MAX_FRAG_SIZE); max_fragment_size = mtu - header_size; max_packet_size = max_fragment_size * BATADV_FRAG_MAX_FRAGMENTS; -- 2.8.0.rc3

2 1

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