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.] Implement DAT for IPv6
by Mihail Costea 08 Mar '13

08 Mar '13

Hi, I've started implementing DAT for IPv6 and I have a few questions regarding the design. I've already implemented a snooping mechanism for Network Solicitation package, but now I have to add it to the ipv6 distributed table. I'm also a beginner in kernel programming so any help would be useful. >From what I've seen there is a lot of code in distributed-arp-table.c that could be used for ipv6 distributed table. A problem in using that code, from what I've seen, is the fact that <struct batadv_dat_entry > has a field for ip with only 32 bits (__be32). So I was thinking to make it more general by: 1. transforming that into a pointer (unsigned char *ip) and add a field size which will represent the total size of the ip. The ip itself would be allocated dynamically. 2. use a union with both _be32 / struct in6_addr. In this case the problem is that if we use ipv4 then all the other space for struct in6_addr would be wasted. The second problem from what I've seen in the code is that the batadv_priv->dat field is hardcoded. For ipv6 we would need a new field to memorize the table, but I don't think it's a really hard problem to solve in order to make it general. This solution would be to avoid code duplicate. Off course, I could still write all the code in parallel just for IPv6, but I think that a common base would be useful. Thanks, Mihail

2 11

[B.A.T.M.A.N.] [RFC 1/2] batman-adv: invoke post_func only if the attribute has been changed
by Antonio Quartulli 06 Mar '13

06 Mar '13

In the sysfs boolean attribute handling mechanism, the post_func passed as argument to the store procedure had to be invoked if and only if the value of the attribute has been switched. This avoids to invoke the post_func many times while it does not expect so. Cc: Marek Lindner <lindner_marek(a)yahoo.de> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- * compiled test only * will do more tests later, hoping that the concept is not entirely wrong :) sysfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sysfs.c b/sysfs.c index 15a22ef..c9b5257 100644 --- a/sysfs.c +++ b/sysfs.c @@ -149,7 +149,7 @@ static int batadv_store_bool_attr(char *buff, size_t count, } if (atomic_read(attr) == enabled) - return count; + return 0; batadv_info(net_dev, "%s: Changing from: %s to: %s\n", attr_name, atomic_read(attr) == 1 ? "enabled" : "disabled", @@ -169,7 +169,7 @@ __batadv_store_bool_attr(char *buff, size_t count, ret = batadv_store_bool_attr(buff, count, net_dev, attr->name, attr_store); - if (post_func && ret) + if (post_func && ret > 0) post_func(net_dev); return ret; -- 1.8.1.5

2 3

[B.A.T.M.A.N.] [Battlemesh] Wireless Battle Mesh v6 - Call for Talks Announcement
by Antonio Quartulli 04 Mar '13

04 Mar '13

Wireless Battle Mesh v6 - Call for Talks Announcement ============================================================= Any progress, idea, project, etc. to be presented to the Community Networks? Lucky you! Wireless Battle Mesh v6 (WBMv6) is at hand and it's time to bring together the agenda. Following the approach of arranging the agenda beforehand started in v4 and continued in v5, we open the proposals submission period. Timeslots ========= http://battlemesh.org/BattleMeshV6/Agenda Types of Talks ============== Whatever suits you the best: presentation, workshop, panel, demo, etc. Topics ====== Despite the WBM running routing protocols in its veins, we also welcome proposals unrelated to routing protocols as long as you think they are of the interest to Community Networks enthusiasts. Obviously, proposals related to routing protocols have higher priority in case of an excess of proposals. Previous years' agenda also should be able to provide some insights: http://battlemesh.org/BattleMeshV4/Agenda http://battlemesh.org/BattleMeshV5/Agenda Submissions ========== To allow an efficient handling of your submission, please provide the following information and send them in form of an email to the Contacts section e-mail address: your name the type of your slot (talk/workshop/panel discussion/lightening talk) your topic headline your topic description which can brief (does not need to exceed a couple of lines) but should provide a reasonable summary of your talk the dates of your stay at the event + (optional) preferred day for your slot length of the slot if you wish to do a workshop (all other slots will be limited to one hour) Deadlines ========= We kindly request to be respectful with the deadlines for the good of all. Submissions are accepted until and including the 1st of April. The final program will be made available in the aforementioned wiki during the first week of April. Any disagreement with the proposed final program must be discussed in the WBM mailing list. Lighting Talks ============== Everyone missing the submission deadline still has the opportunity to apply for a lighting talk slot. Lighting talk slots are 7 minutes long, with 3 extra minutes for questions and comments. Slides must be submitted to the Contacts section e-mail address in form of PDF file. Slots will be allocated according to the reception sequence. Submission period starts on the 15th of April at 9:00 Contact ======= Please, send your proposals or specific questions at: submissions(a)battlemesh.org For general questions use the WBM mailing list (see below) About the Wireless Battle Mesh ============================== The Wireless Battle of the Mesh is an event that aims at bringing together people from across Europe to test the performance of different routing protocols for ad-hoc networks, like Babel, B.A.T.M.A.N., BMX6, OLSR, 802.11s and Static Routing. It is a tournament with a social character. If you are a mesh networking enthusiast, community networking activist, or have an interest in mesh networks you might want to check this out ! The goal of the Wireless Battle Mesh events is to set-up hands-on testbed for each available mesh routing protocol with a standard test procedure for the different mesh networks. During the different WBM events, similar hardware and software configuration will be used based on the OpenWRT Board-Support-Package and packages for each protocol implementation. The WBM events are also a great opportunity to develop testing tools for PHY/MAC radio layers (drivers, scripts and PHY analyzers) . If you want to know who is behind the WBM you should visit AboutUs (http://battlemesh.org/AboutUs) The Wireless Battle Mesh Mailing List ============================ The mailing list is the main communication channel to organise the Wireless Battle Mesh events. You can subscribe it at the following link: http://ml.ninux.org/mailman/listinfo/battlemesh Regards, Federico and Roger -- Antonio Quartulli ..each of us alone is worth nothing.. Ernesto "Che" Guevara

1 0

[B.A.T.M.A.N.] [PATCH] batman-adv: verify whether tt len exceeds packet len upon receipt of OGM
by Marek Lindner 04 Mar '13

04 Mar '13

Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> --- bat_iv_ogm.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 7654b76..99cab3b 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -1272,7 +1272,7 @@ static int batadv_iv_ogm_receive(struct sk_buff *skb, struct batadv_priv *bat_priv = netdev_priv(if_incoming->soft_iface); struct batadv_ogm_packet *batadv_ogm_packet; struct ethhdr *ethhdr; - int buff_pos = 0, packet_len; + int buff_pos = 0, tt_len, packet_len; unsigned char *tt_buff, *packet_buff; bool ret; uint8_t *packet_pos; @@ -1298,14 +1298,17 @@ static int batadv_iv_ogm_receive(struct sk_buff *skb, /* unpack the aggregated packets and process them one by one */ do { + tt_len = batadv_tt_len(batadv_ogm_packet->tt_num_changes); + + if (buff_pos + BATADV_OGM_HLEN + tt_len > packet_len) + break; + tt_buff = packet_buff + buff_pos + BATADV_OGM_HLEN; batadv_iv_ogm_process(ethhdr, batadv_ogm_packet, tt_buff, if_incoming); - buff_pos += BATADV_OGM_HLEN; - buff_pos += batadv_tt_len(batadv_ogm_packet->tt_num_changes); - + buff_pos += BATADV_OGM_HLEN + tt_len; packet_pos = packet_buff + buff_pos; batadv_ogm_packet = (struct batadv_ogm_packet *)packet_pos; } while (batadv_iv_ogm_aggr_packet(buff_pos, packet_len, -- 1.7.10.4

1 0

[B.A.T.M.A.N.] batctl.8 suggested correction.
by cmsv 03 Mar '13

03 Mar '13

Having in mind that throughput and bandwidth are not the same and do not necessarily match; the use of the word "throughput" in batman-adv (Layer2) is misleading and can cause confusion when in measuring the real throughput on layer3 with L3 software. As far as i know; at the moment batman-adv (L2) has no way to know what is the real throughput that the announced gateway bandwidth (l3) actually allows therefore the " throughput" should be changed to announced bandwidth. Example: If the node is a gateway client the parameter will decide which criterias to consider when the batman-adv module has to choose between different internet connections announced by the afore- mentioned servers. default: 20 -> late switch (TQ 20) examples: 1 -> fast connection consider the gateway's advertised bandwidth as well as the link quality towards the gateway and stick with the selection until the gateway disappears 2 -> stable connection chooses the gateway with the best link quality and sticks with it (ignore the advertised bandwidth) 3 -> fast switch connection chooses the gateway with the best link quality but switches to another gateway as soon as a better one is found XX -> late switch connection chooses the gateway with the best link quality but switches to another gateway as soon as a better one is found which is at least XX TQ better than the cur- rently selected gateway (XX has to be a number between 3 and 256). -- Redes wireless http://wirelesspt.net

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv: fix old master freeing operation
by Antonio Quartulli 03 Mar '13

03 Mar '13

When a new hard_iface has a master already, ndo_del_slave has to be used in order to let the old master perform its cleaning up routing correctly. Unregistering the master iface only could lead to a inconsistent state in the old master knowledge. Introduced by 5e57e3bff429cd403f0e30af69cf87a2cd55598f ("batman-adv: free an hard-interface before adding it"). Reported-by: Marek Lindner <lindner_marek(a)yahoo.de> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- hard-interface.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/hard-interface.c b/hard-interface.c index fd99e42..f446e69 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -346,8 +346,15 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface, * in that case unlink it first */ master = netdev_master_upper_dev_get(hard_iface->net_dev); - if (master) - netdev_upper_dev_unlink(hard_iface->net_dev, master); + if (master && master->netdev_ops->ndo_del_slave) { + ret = master->netdev_ops->ndo_del_slave(master, + hard_iface->net_dev); + if (ret < 0) + goto err_dev; + } else if (master) { + ret = -EINVAL; + goto err_dev; + } hard_iface->soft_iface = soft_iface; bat_priv = netdev_priv(hard_iface->soft_iface); -- 1.8.1.5

2 2

[B.A.T.M.A.N.] batman-adv 2013.1.0 released
by Marek Lindner 03 Mar '13

03 Mar '13

Today, the B.A.T.M.A.N. team publishes batman-adv 2013.1.0 - a stability and bugfix release, addressing bugs and open issues only. No new features were added to ensure maximum stability. 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-2013.1.0/ as well as prepackaged binaries in your distribution. Thanks ------ Thanks to all people sending in patches: * Akinobu Mita <akinobu.mita(a)gmail.com> * Antonio Quartulli <ordex(a)autistici.org> * Jiri Pirko <jiri(a)resnulli.us> * Linus Lüssing <linus.luessing(a)web.de> * Marek Lindner <lindner_marek(a)yahoo.de> * Matthias Schiffer <mschiffer(a)universe-factory.net> * Pau Koning <paukoning(a)gmail.com> * Shan Wei <davidshan(a)tencent.com> * Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> and to all those that supported us with good advice, code review and/or rigorous testing: * Sasha Levin <sasha.levin(a)oracle.com> batman-adv ---------- The translation table has been further polished by not adding multicast addresses to avoid interfering with multicast traffic. The output of the translation tables has been modified to not print the 'last seen' values for batX interfaces (these entries are never subject to purging). Moreover, the CRC consistency checksums are printed along with the rest of the table to facilitate debugging. As part of our ongoing effort to document the code itself the entire types.h file was 'kernel doc'-ified, thereby documenting the bulk of all struct definitions and defines used throughout the batman-adv code base. While reviewing and documenting all these definitions a few unused but forgotten variables we identified and removed, reducing the memory consumption by a few bytes. The previously added distributed ARP table (DAT) received more testing and reviews which led to a number of fixes: ARP packets with invalid MAC or IP addresses are not added to the ARP table anymore. A potential crash due to a NULL pointer dereference in the hash collision avoidance section was fixed. The batman-adv interface removal could lead to deadlock in the kernel if it was triggered at the wrong moment. To resolve the issue the internal interface cleanup is delayed until all necessary locks can safely be acquired. The initialization of the lockdep class keys for has structures inside batman- adv has been improved to mitigate false warnings when running lockdep to find problems in the locking routines. batctl ------ The batctl man page carried a broken format instruction leading to an "undefined macro" warning and partial disappearance of text. The text misinterpretation was removed and the man page text restored. Happy routing, The B.A.T.M.A.N. team

1 0

[B.A.T.M.A.N.] [PATCHv4] batman-adv: remove interfacing enslaving loop private check
by Antonio Quartulli 02 Mar '13

02 Mar '13

Now that the new dev_upper API is used, the private check for enslaving loops is not needed anymore as this is performed by the new API itself. Reported-by: Marek Lindner <lindner_marek(a)yahoo.de> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- v2, v3, v4: - no change to this patch v4: - added compat code compat.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ compat.h | 5 ++++- hard-interface.c | 43 ------------------------------------------- 3 files changed, 57 insertions(+), 44 deletions(-) diff --git a/compat.c b/compat.c index 764878f..da63ea6 100644 --- a/compat.c +++ b/compat.c @@ -24,6 +24,7 @@ #include <linux/in.h> #include <linux/version.h> #include "main.h" +#include "soft-interface.h" #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 0, 0) @@ -85,3 +86,55 @@ void batadv_free_rcu_nc_path(struct rcu_head *rcu) #endif #endif /* < KERNEL_VERSION(3, 0, 0) */ + +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0) + +/** + * batadv_is_on_batman_iface - check if a device is a batman iface descendant + * @net_dev: the device to check + * + * If the user creates any virtual device on top of a batman-adv interface, it + * is important to prevent this new interface to be used to create a new mesh + * network (this behaviour would lead to a batman-over-batman configuration). + * This function recursively checks all the fathers of the device passed as + * argument looking for a batman-adv soft interface. + * + * Returns true if the device is descendant of a batman-adv mesh interface (or + * if it is a batman-adv interface itself), false otherwise + */ +static bool batadv_is_on_batman_iface(const struct net_device *net_dev) +{ + struct net_device *parent_dev; + bool ret; + + /* check if this is a batman-adv mesh interface */ + if (batadv_softif_is_valid(net_dev)) + return true; + + /* no more parents..stop recursion */ + if (net_dev->iflink == net_dev->ifindex) + return false; + + /* recurse over the parent device */ + parent_dev = dev_get_by_index(&init_net, net_dev->iflink); + /* if we got a NULL parent_dev there is something broken.. */ + if (WARN(!parent_dev, "Cannot find parent device")) + return false; + + ret = batadv_is_on_batman_iface(parent_dev); + + if (parent_dev) + dev_put(parent_dev); + return ret; +} + +int batadv_netdev_set_master(struct net_device *slave, + struct net_device *master) +{ + if (batadv_is_on_batman_iface(slave)) + return -1; + + return netdev_set_master(slave, master); +} + +#endif /* < KERNEL_VERSION(3, 9, 0) */ diff --git a/compat.h b/compat.h index 69c3dc2..79d4217 100644 --- a/compat.h +++ b/compat.h @@ -229,7 +229,10 @@ static int batadv_interface_set_mac_addr(struct net_device *dev, void *p) \ }\ static int __batadv_interface_set_mac_addr(x, y) -#define netdev_master_upper_dev_link netdev_set_master +int batadv_netdev_set_master(struct net_device *slave, + struct net_device *master); + +#define netdev_master_upper_dev_link batadv_netdev_set_master #define netdev_upper_dev_unlink(slave, master) netdev_set_master(slave, NULL) #define netdev_master_upper_dev_get(dev) \ ({\ diff --git a/hard-interface.c b/hard-interface.c index fd99e42..b96f819 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -60,45 +60,6 @@ out: return hard_iface; } -/** - * batadv_is_on_batman_iface - check if a device is a batman iface descendant - * @net_dev: the device to check - * - * If the user creates any virtual device on top of a batman-adv interface, it - * is important to prevent this new interface to be used to create a new mesh - * network (this behaviour would lead to a batman-over-batman configuration). - * This function recursively checks all the fathers of the device passed as - * argument looking for a batman-adv soft interface. - * - * Returns true if the device is descendant of a batman-adv mesh interface (or - * if it is a batman-adv interface itself), false otherwise - */ -static bool batadv_is_on_batman_iface(const struct net_device *net_dev) -{ - struct net_device *parent_dev; - bool ret; - - /* check if this is a batman-adv mesh interface */ - if (batadv_softif_is_valid(net_dev)) - return true; - - /* no more parents..stop recursion */ - if (net_dev->iflink == net_dev->ifindex) - return false; - - /* recurse over the parent device */ - parent_dev = dev_get_by_index(&init_net, net_dev->iflink); - /* if we got a NULL parent_dev there is something broken.. */ - if (WARN(!parent_dev, "Cannot find parent device")) - return false; - - ret = batadv_is_on_batman_iface(parent_dev); - - if (parent_dev) - dev_put(parent_dev); - return ret; -} - static int batadv_is_valid_iface(const struct net_device *net_dev) { if (net_dev->flags & IFF_LOOPBACK) @@ -110,10 +71,6 @@ static int batadv_is_valid_iface(const struct net_device *net_dev) if (net_dev->addr_len != ETH_ALEN) return 0; - /* no batman over batman */ - if (batadv_is_on_batman_iface(net_dev)) - return 0; - return 1; } -- 1.8.1.4

2 2

[B.A.T.M.A.N.] [PATCH] batman-adv: change compat code to remove sparse warning
by Simon Wunderlich 01 Mar '13

01 Mar '13

The latest compat patch fixing rtnl ops compile errors from 2.6.32 ("batman-adv: add compat support for the new netlink ops") fixes the compilation, but leaves some sparse errors: batman-adv/soft-interface.c:573:10: warning: Initializer entry defined twice batman-adv/soft-interface.c:574:10: also defined here This patch uses another approach by moving the initializers in a dummy struct instead. This also removes the sparse errors. Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> --- compat.h | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/compat.h b/compat.h index 64244ac..69c3dc2 100644 --- a/compat.h +++ b/compat.h @@ -135,23 +135,19 @@ static inline int batadv_param_set_copystring(const char *val, #define kstrtoul strict_strtoul #define kstrtol strict_strtol -#define batadv_softif_slave_add(x, y) \ -batadv_softif_slave_add(struct net_device *dev, struct ifreq *rq, int cmd)\ -{\ - return -EOPNOTSUPP;\ -}\ -static int __attribute__((unused)) __batadv_softif_slave_add(x, y) - -#define batadv_softif_slave_del(x, y) \ -__batadv_softif_slave_del(struct net_device *dev, struct net_device *slave_dev);\ -static int batadv_softif_slave_del(struct net_device *dev, struct ifreq *rq, int cmd)\ -{\ - return -EOPNOTSUPP;\ -}\ -static int __attribute__((unused)) __batadv_softif_slave_del(x, y) - -#define ndo_add_slave ndo_do_ioctl -#define ndo_del_slave ndo_do_ioctl +/* Hack for removing ndo_add/del_slave at the end of net_device_ops. + * This is somewhat ugly because it requires that ndo_validate_addr + * is at the end of this struct in soft-interface.c. + */ +#define ndo_validate_addr \ + ndo_validate_addr = eth_validate_addr, \ +}; \ +static const struct { \ + void *ndo_validate_addr; \ + void *ndo_add_slave; \ + void *ndo_del_slave; \ +} __attribute__((unused)) __useless_ops1 = { \ + .ndo_validate_addr #endif /* < KERNEL_VERSION(2, 6, 39) */ -- 1.7.10.4

3 2

[B.A.T.M.A.N.] [PATCHv3 1/2] batman-adv: free an hard-interface before adding it
by Antonio Quartulli 27 Feb '13

27 Feb '13

When adding a new hard interface (e.h. wlan0) to a soft interface (e.g. bat0) and the former is already enslaved in another virtual interface (e.g. a software bridge) batman-adv has to free the it first and then continue with the adding mechanism. In this way the behaviour becomes consistent with what "ip link set master" does. At the moment batman-adv enslaves the hard interface without checking for the master device, possibly causing strange behaviours which are never wanted by the users. Reported-by: Marek Lindner <lindner_marek(a)yahoo.de> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- v2: - added compat code for netdev_master_upper_dev_get() v3: - use #define instead of a static inline function in compat code compat.h | 5 +++++ hard-interface.c | 14 ++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/compat.h b/compat.h index 425b3d9..885e551 100644 --- a/compat.h +++ b/compat.h @@ -214,6 +214,11 @@ static int __batadv_interface_set_mac_addr(x, y) #define netdev_master_upper_dev_link netdev_set_master #define netdev_upper_dev_unlink(slave, master) netdev_set_master(slave, NULL) +#define netdev_master_upper_dev_get(dev) \ +({\ + ASSERT_RTNL();\ + dev->master;\ +}) #endif /* < KERNEL_VERSION(3, 9, 0) */ diff --git a/hard-interface.c b/hard-interface.c index c08e39e..fd99e42 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -311,7 +311,7 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface, const char *iface_name) { struct batadv_priv *bat_priv; - struct net_device *soft_iface; + struct net_device *soft_iface, *master; __be16 ethertype = __constant_htons(ETH_P_BATMAN); int ret; @@ -321,11 +321,6 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface, if (!atomic_inc_not_zero(&hard_iface->refcount)) goto out; - /* hard-interface is part of a bridge */ - if (hard_iface->net_dev->priv_flags & IFF_BRIDGE_PORT) - pr_err("You are about to enable batman-adv on '%s' which already is part of a bridge. Unless you know exactly what you are doing this is probably wrong and won't work the way you think it would.\n", - hard_iface->net_dev->name); - soft_iface = dev_get_by_name(&init_net, iface_name); if (!soft_iface) { @@ -347,6 +342,13 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface, goto err_dev; } + /* check if the interface is enslaved in another virtual one and + * in that case unlink it first + */ + master = netdev_master_upper_dev_get(hard_iface->net_dev); + if (master) + netdev_upper_dev_unlink(hard_iface->net_dev, master); + hard_iface->soft_iface = soft_iface; bat_priv = netdev_priv(hard_iface->soft_iface); -- 1.8.1.2

2 6

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