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.] [PATCHv3] batman-adv: introduce capability initialization bitfield
by Linus Lüssing 11 Nov '13

11 Nov '13

The new bitfield allows us to keep track whether capability subsets of an originator have gone through their initialization phase yet. The translation table is the only user right now, but a new one will be added soon. Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> --- * fix typo: BATADV_ORIG_CAPA_HAS_TVLV -> BATADV_ORIG_CAPA_HAS_TT (plus one comment) originator.c | 1 - translation-table.c | 12 +++++++----- types.h | 6 ++++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/originator.c b/originator.c index edfb921..24e0681 100644 --- a/originator.c +++ b/originator.c @@ -335,7 +335,6 @@ struct batadv_orig_node *batadv_orig_node_new(struct batadv_priv *bat_priv, /* extra reference for return */ atomic_set(&orig_node->refcount, 2); - orig_node->tt_initialised = false; orig_node->bat_priv = bat_priv; memcpy(orig_node->orig, addr, ETH_ALEN); batadv_dat_init_orig_node_addr(orig_node); diff --git a/translation-table.c b/translation-table.c index 1f482a4..be3468b 100644 --- a/translation-table.c +++ b/translation-table.c @@ -1748,7 +1748,7 @@ void batadv_tt_global_del_orig(struct batadv_priv *bat_priv, } spin_unlock_bh(list_lock); } - orig_node->tt_initialised = false; + orig_node->capa_initialized &= ~BATADV_ORIG_CAPA_HAS_TT; } static bool batadv_tt_global_to_purge(struct batadv_tt_global_entry *tt_global, @@ -2702,7 +2702,7 @@ static void _batadv_tt_update_changes(struct batadv_priv *bat_priv, return; } } - orig_node->tt_initialised = true; + orig_node->capa_initialized |= BATADV_ORIG_CAPA_HAS_TT; } static void batadv_tt_fill_gtable(struct batadv_priv *bat_priv, @@ -3192,13 +3192,15 @@ static void batadv_tt_update_orig(struct batadv_priv *bat_priv, uint8_t orig_ttvn = (uint8_t)atomic_read(&orig_node->last_ttvn); struct batadv_tvlv_tt_vlan_data *tt_vlan; bool full_table = true; + bool has_tt_init; tt_vlan = (struct batadv_tvlv_tt_vlan_data *)tt_buff; + has_tt_init = orig_node->capa_initialized & BATADV_ORIG_CAPA_HAS_TT; + /* orig table not initialised AND first diff is in the OGM OR the ttvn * increased by one -> we can apply the attached changes */ - if ((!orig_node->tt_initialised && ttvn == 1) || - ttvn - orig_ttvn == 1) { + if ((!has_tt_init && ttvn == 1) || ttvn - orig_ttvn == 1) { /* the OGM could not contain the changes due to their size or * because they have already been sent BATADV_TT_OGM_APPEND_MAX * times. @@ -3239,7 +3241,7 @@ static void batadv_tt_update_orig(struct batadv_priv *bat_priv, /* if we missed more than one change or our tables are not * in sync anymore -> request fresh tt data */ - if (!orig_node->tt_initialised || ttvn != orig_ttvn || + if (!has_tt_init || ttvn != orig_ttvn || !batadv_tt_global_check_crc(orig_node, tt_vlan, tt_num_vlan)) { request_table: diff --git a/types.h b/types.h index 8966508..4e5468f 100644 --- a/types.h +++ b/types.h @@ -166,13 +166,12 @@ struct batadv_orig_bat_iv { * @bcast_seqno_reset: time when the broadcast seqno window was reset * @batman_seqno_reset: time when the batman seqno window was reset * @capabilities: announced capabilities of this originator + * @capa_initialized: bitfield to remember whether a capability was initialized * @last_ttvn: last seen translation table version number * @tt_buff: last tt changeset this node received from the orig node * @tt_buff_len: length of the last tt changeset this node received from the * orig node * @tt_buff_lock: lock that protects tt_buff and tt_buff_len - * @tt_initialised: bool keeping track of whether or not this node have received - * any translation table information from the orig node yet * @tt_lock: prevents from updating the table while reading it. Table update is * made up by two operations (data structure update and metdata -CRC/TTVN- * recalculation) and they have to be executed atomically in order to avoid @@ -213,6 +212,7 @@ struct batadv_orig_node { unsigned long bcast_seqno_reset; unsigned long batman_seqno_reset; uint8_t capabilities; + uint8_t capa_initialized; atomic_t last_ttvn; unsigned char *tt_buff; int16_t tt_buff_len; @@ -251,10 +251,12 @@ struct batadv_orig_node { * enum batadv_orig_capabilities - orig node capabilities * @BATADV_ORIG_CAPA_HAS_DAT: orig node has distributed arp table enabled * @BATADV_ORIG_CAPA_HAS_NC: orig node has network coding enabled + * @BATADV_ORIG_CAPA_HAS_TT: orig node has tt capability */ enum batadv_orig_capabilities { BATADV_ORIG_CAPA_HAS_DAT = BIT(0), BATADV_ORIG_CAPA_HAS_NC = BIT(1), + BATADV_ORIG_CAPA_HAS_TT = BIT(2), }; /** -- 1.7.10.4

3 2

[B.A.T.M.A.N.] [PATCH] batman-adv: compat: fix multicast compat code for < 2.6.35
by Linus Lüssing 11 Nov '13

11 Nov '13

A typo resulted into the following build warning: "In function 'batadv_mcast_mla_softif_get': warning: assignment from incompatible pointer type" This commit fixes it by using the correct name for the according struct. Introduced by: a3f58139efedb96222dffdda89896c243fdff49e ("batman-adv: Multicast Listener Announcements via Translation Table") Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> --- compat.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compat.h b/compat.h index 186547b..c83ac2c 100644 --- a/compat.h +++ b/compat.h @@ -103,8 +103,8 @@ static inline struct sk_buff *netdev_alloc_skb_ip_align(struct net_device *dev, #undef netdev_for_each_mc_addr #define netdev_for_each_mc_addr(mclist, dev) \ - for (mclist = (struct bat_dev_addr_list *)dev->mc_list; mclist; \ - mclist = (struct bat_dev_addr_list *)mclist->next) + for (mclist = (struct batadv_dev_addr_list *)dev->mc_list; mclist; \ + mclist = (struct batadv_dev_addr_list *)mclist->next) /* Note, that this breaks the usage of the normal 'struct netdev_hw_addr' * for kernels < 2.6.35 in batman-adv! -- 1.7.10.4

1 0

[B.A.T.M.A.N.] [PATCHv2] batman-adv: introduce capability initialization bitfield
by Linus Lüssing 10 Nov '13

10 Nov '13

The new bitfield allows us to keep track whether capability subsets of an originator have gone through their initialization phase yet. The translation table is the only user right now, but a new one will be added soon. Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> --- * style improvements (+has_tt_init) originator.c | 1 - translation-table.c | 12 +++++++----- types.h | 6 ++++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/originator.c b/originator.c index edfb921..24e0681 100644 --- a/originator.c +++ b/originator.c @@ -335,7 +335,6 @@ struct batadv_orig_node *batadv_orig_node_new(struct batadv_priv *bat_priv, /* extra reference for return */ atomic_set(&orig_node->refcount, 2); - orig_node->tt_initialised = false; orig_node->bat_priv = bat_priv; memcpy(orig_node->orig, addr, ETH_ALEN); batadv_dat_init_orig_node_addr(orig_node); diff --git a/translation-table.c b/translation-table.c index 1f482a4..2b7bb2e 100644 --- a/translation-table.c +++ b/translation-table.c @@ -1748,7 +1748,7 @@ void batadv_tt_global_del_orig(struct batadv_priv *bat_priv, } spin_unlock_bh(list_lock); } - orig_node->tt_initialised = false; + orig_node->capa_initialized &= ~BATADV_ORIG_CAPA_HAS_TVLV; } static bool batadv_tt_global_to_purge(struct batadv_tt_global_entry *tt_global, @@ -2702,7 +2702,7 @@ static void _batadv_tt_update_changes(struct batadv_priv *bat_priv, return; } } - orig_node->tt_initialised = true; + orig_node->capa_initialized |= BATADV_ORIG_CAPA_HAS_TVLV; } static void batadv_tt_fill_gtable(struct batadv_priv *bat_priv, @@ -3192,13 +3192,15 @@ static void batadv_tt_update_orig(struct batadv_priv *bat_priv, uint8_t orig_ttvn = (uint8_t)atomic_read(&orig_node->last_ttvn); struct batadv_tvlv_tt_vlan_data *tt_vlan; bool full_table = true; + bool has_tt_init; tt_vlan = (struct batadv_tvlv_tt_vlan_data *)tt_buff; + has_tt_init = orig_node->capa_initialized & BATADV_ORIG_CAPA_HAS_TVLV; + /* orig table not initialised AND first diff is in the OGM OR the ttvn * increased by one -> we can apply the attached changes */ - if ((!orig_node->tt_initialised && ttvn == 1) || - ttvn - orig_ttvn == 1) { + if ((!has_tt_init && ttvn == 1) || ttvn - orig_ttvn == 1) { /* the OGM could not contain the changes due to their size or * because they have already been sent BATADV_TT_OGM_APPEND_MAX * times. @@ -3239,7 +3241,7 @@ static void batadv_tt_update_orig(struct batadv_priv *bat_priv, /* if we missed more than one change or our tables are not * in sync anymore -> request fresh tt data */ - if (!orig_node->tt_initialised || ttvn != orig_ttvn || + if (!has_tt_init || ttvn != orig_ttvn || !batadv_tt_global_check_crc(orig_node, tt_vlan, tt_num_vlan)) { request_table: diff --git a/types.h b/types.h index 8966508..54ea34a 100644 --- a/types.h +++ b/types.h @@ -166,13 +166,12 @@ struct batadv_orig_bat_iv { * @bcast_seqno_reset: time when the broadcast seqno window was reset * @batman_seqno_reset: time when the batman seqno window was reset * @capabilities: announced capabilities of this originator + * @capa_initialized: bitfield to remember whether a capability was initialized * @last_ttvn: last seen translation table version number * @tt_buff: last tt changeset this node received from the orig node * @tt_buff_len: length of the last tt changeset this node received from the * orig node * @tt_buff_lock: lock that protects tt_buff and tt_buff_len - * @tt_initialised: bool keeping track of whether or not this node have received - * any translation table information from the orig node yet * @tt_lock: prevents from updating the table while reading it. Table update is * made up by two operations (data structure update and metdata -CRC/TTVN- * recalculation) and they have to be executed atomically in order to avoid @@ -213,6 +212,7 @@ struct batadv_orig_node { unsigned long bcast_seqno_reset; unsigned long batman_seqno_reset; uint8_t capabilities; + uint8_t capa_initialized; atomic_t last_ttvn; unsigned char *tt_buff; int16_t tt_buff_len; @@ -251,10 +251,12 @@ struct batadv_orig_node { * enum batadv_orig_capabilities - orig node capabilities * @BATADV_ORIG_CAPA_HAS_DAT: orig node has distributed arp table enabled * @BATADV_ORIG_CAPA_HAS_NC: orig node has network coding enabled + * @BATADV_ORIG_CAPA_HAS_TVLV: orig node has tvlv capability */ enum batadv_orig_capabilities { BATADV_ORIG_CAPA_HAS_DAT = BIT(0), BATADV_ORIG_CAPA_HAS_NC = BIT(1), + BATADV_ORIG_CAPA_HAS_TVLV = BIT(2), }; /** -- 1.7.10.4

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv: introduce capability initialization bitfield
by Linus Lüssing 10 Nov '13

10 Nov '13

The new bitfield allows us to keep track whether capability subsets of an originator have gone through their initialization phase yet. The translation table is the only user right now, but a new one will be added soon. Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> --- originator.c | 1 - translation-table.c | 11 ++++++----- types.h | 6 ++++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/originator.c b/originator.c index edfb921..24e0681 100644 --- a/originator.c +++ b/originator.c @@ -335,7 +335,6 @@ struct batadv_orig_node *batadv_orig_node_new(struct batadv_priv *bat_priv, /* extra reference for return */ atomic_set(&orig_node->refcount, 2); - orig_node->tt_initialised = false; orig_node->bat_priv = bat_priv; memcpy(orig_node->orig, addr, ETH_ALEN); batadv_dat_init_orig_node_addr(orig_node); diff --git a/translation-table.c b/translation-table.c index 1f482a4..128d20c 100644 --- a/translation-table.c +++ b/translation-table.c @@ -1748,7 +1748,7 @@ void batadv_tt_global_del_orig(struct batadv_priv *bat_priv, } spin_unlock_bh(list_lock); } - orig_node->tt_initialised = false; + orig_node->capa_initialized &= ~BATADV_ORIG_CAPA_HAS_TVLV; } static bool batadv_tt_global_to_purge(struct batadv_tt_global_entry *tt_global, @@ -2702,7 +2702,7 @@ static void _batadv_tt_update_changes(struct batadv_priv *bat_priv, return; } } - orig_node->tt_initialised = true; + orig_node->capa_initialized |= BATADV_ORIG_CAPA_HAS_TVLV; } static void batadv_tt_fill_gtable(struct batadv_priv *bat_priv, @@ -3197,8 +3197,8 @@ static void batadv_tt_update_orig(struct batadv_priv *bat_priv, /* orig table not initialised AND first diff is in the OGM OR the ttvn * increased by one -> we can apply the attached changes */ - if ((!orig_node->tt_initialised && ttvn == 1) || - ttvn - orig_ttvn == 1) { + if ((!(orig_node->capa_initialized & BATADV_ORIG_CAPA_HAS_TVLV) && + ttvn == 1) || ttvn - orig_ttvn == 1) { /* the OGM could not contain the changes due to their size or * because they have already been sent BATADV_TT_OGM_APPEND_MAX * times. @@ -3239,7 +3239,8 @@ static void batadv_tt_update_orig(struct batadv_priv *bat_priv, /* if we missed more than one change or our tables are not * in sync anymore -> request fresh tt data */ - if (!orig_node->tt_initialised || ttvn != orig_ttvn || + if (!(orig_node->capa_initialized + & BATADV_ORIG_CAPA_HAS_TVLV) || ttvn != orig_ttvn || !batadv_tt_global_check_crc(orig_node, tt_vlan, tt_num_vlan)) { request_table: diff --git a/types.h b/types.h index 8966508..54ea34a 100644 --- a/types.h +++ b/types.h @@ -166,13 +166,12 @@ struct batadv_orig_bat_iv { * @bcast_seqno_reset: time when the broadcast seqno window was reset * @batman_seqno_reset: time when the batman seqno window was reset * @capabilities: announced capabilities of this originator + * @capa_initialized: bitfield to remember whether a capability was initialized * @last_ttvn: last seen translation table version number * @tt_buff: last tt changeset this node received from the orig node * @tt_buff_len: length of the last tt changeset this node received from the * orig node * @tt_buff_lock: lock that protects tt_buff and tt_buff_len - * @tt_initialised: bool keeping track of whether or not this node have received - * any translation table information from the orig node yet * @tt_lock: prevents from updating the table while reading it. Table update is * made up by two operations (data structure update and metdata -CRC/TTVN- * recalculation) and they have to be executed atomically in order to avoid @@ -213,6 +212,7 @@ struct batadv_orig_node { unsigned long bcast_seqno_reset; unsigned long batman_seqno_reset; uint8_t capabilities; + uint8_t capa_initialized; atomic_t last_ttvn; unsigned char *tt_buff; int16_t tt_buff_len; @@ -251,10 +251,12 @@ struct batadv_orig_node { * enum batadv_orig_capabilities - orig node capabilities * @BATADV_ORIG_CAPA_HAS_DAT: orig node has distributed arp table enabled * @BATADV_ORIG_CAPA_HAS_NC: orig node has network coding enabled + * @BATADV_ORIG_CAPA_HAS_TVLV: orig node has tvlv capability */ enum batadv_orig_capabilities { BATADV_ORIG_CAPA_HAS_DAT = BIT(0), BATADV_ORIG_CAPA_HAS_NC = BIT(1), + BATADV_ORIG_CAPA_HAS_TVLV = BIT(2), }; /** -- 1.7.10.4

1 0

[B.A.T.M.A.N.] [PATCHv2] batman-adv: add missing multicast.h include
by Linus Lüssing 10 Nov '13

10 Nov '13

Not having it doesn't seem to break anything, but looks like it's recommended C practice. Introduced by: a3f58139efedb96222dffdda89896c243fdff49e ("batman-adv: Multicast Listener Announcements via Translation Table") Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> --- Added "Introduced by" clause multicast.c | 1 + 1 file changed, 1 insertion(+) diff --git a/multicast.c b/multicast.c index 4a978a6..cb1984d 100644 --- a/multicast.c +++ b/multicast.c @@ -13,6 +13,7 @@ */ #include "main.h" +#include "multicast.h" #include "originator.h" #include "hard-interface.h" #include "translation-table.h" -- 1.7.10.4

2 1

[B.A.T.M.A.N.] Replacing OLSRD with batman-adv?
by tjhowse 08 Nov '13

08 Nov '13

Hi Ladies and Gents, I've built a three-node mesh network using cheap TP-Link TL-WDR3600 routers. They can do simultaneous 5.8GHz and 2.4GHz. I use the 5.8 for the backbone links between the nodes, and 2.4 to clients. The nodes are running OpenWRT and OLSRD. This system mostly works well, but there are a couple of problems with it that I'm wondering if batman-adv would solve or make easier to solve: 1) The backbone links cannot be better protected than WEP, a limitation of OLSRD, 2) Gateway assignment is a manual process, which must be performed on every node in the mesh, referring to the single node connected to the WAN, 3) The manual gateway configuration of 2) prevents peer-to-peer communications between mesh clients, 4) Each node has its own /24 subnet. This causes problems when a device roams from one device's jurisdiction to another if the interface doesn't re-issue a DHCP request. We're expanding the network, I've just bought another ten of these routers, and I'm going to spend some time assessing if batman-adv would be a better fit for our purposes. There will be a range of ios, android and windows devices connecting to the mesh. My questions are as follows: 1) Does batman-adv worth with WPA2 or better encryption? 2) Must every client to a batman-adv mesh have a daemon installed? 3) Is it possible to separate different radio interfaces for different purposes? I.E. 5.8 for backbone, 2.4 for clients. 4) Can all nodes and clients on a mesh have an IP in the same subnet, solving some of the roaming problems caused by bad interface settings or drivers? Thanks, Travis.

5 6

[B.A.T.M.A.N.] [PATCH] batman-adv: add missing multicast.h include
by Linus Lüssing 06 Nov '13

06 Nov '13

Not having it doesn't seem to break anything, but looks like it's recommended C practice. Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> --- multicast.c | 1 + 1 file changed, 1 insertion(+) diff --git a/multicast.c b/multicast.c index 4a978a6..cb1984d 100644 --- a/multicast.c +++ b/multicast.c @@ -13,6 +13,7 @@ */ #include "main.h" +#include "multicast.h" #include "originator.h" #include "hard-interface.h" #include "translation-table.h" -- 1.7.10.4

2 1

[B.A.T.M.A.N.] Documentation of packet types
by Ruben Kelevra 06 Nov '13

06 Nov '13

Hi, I've been searching on your website, but I cant find the packet type documentation. The only definition I found was this[1] for clientroaming. Is there a documentation of the latest compatv. 14 out there? [1] http://www.open-mesh.org/projects/batman-adv/wiki/Client-roaming Best Regards, Ruben

2 1

[B.A.T.M.A.N.] [PATCHv2 0/8] add network wide multi interface optimization
by Simon Wunderlich 05 Nov '13

05 Nov '13

This patchset adds the network wide multi interface optimization as proposed in our wiki [1] for BATMAN IV. The main purpose is to do interface alternating and bonding by considering multi interface capabilities globally and not just for the (next) link, otherwise non-optimal links may be chosen. This patchset needs to change a lot of core data structures and routing, please review it carefully. A local development branch exists on the public git repo [2]. Changes from PATCH series earlier this month (thanks Marek and Antonio for suggestions) are: * change locking from implicit rcu locking to refcount based locking * add debugfs folder for hardif (new patch 7) and use separate tables per interface * split *ifinfo_get() functions into ifinfo_new() and ifinfo_get() * simplify function names and change to new naming scheme * review bonding locking * various kerneldoc/style/comment improvements * rebase on latest master * ... and some more in the changelog of the individual patches I've tested the patchset in my VMs to confirm that bonding and alternating works as expected. Patches should be checkpatch and sparse clean. As always, any comments are appreciated! Thanks, Simon [1] http://www.open-mesh.org/projects/batman-adv/wiki/network-wide-multi-link-o… [2] http://git.open-mesh.org/batman-adv.git/shortlog/refs/heads/simon/network-w… Simon Wunderlich (8): batman-adv: remove bonding and interface alternating batman-adv: split tq information in neigh_node struct batman-adv: split out router from orig_node batman-adv: add WiFi penalty batman-adv: consider outgoing interface in OGM sending batman-adv: add bonding again batman-adv: add debugfs structure for information per interface batman-adv: add debugfs support to view multiif tables bat_iv_ogm.c | 855 +++++++++++++++++++++++++++++++---------------- debugfs.c | 83 +++++ debugfs.h | 3 + distributed-arp-table.c | 3 +- gateway_client.c | 83 ++++- hard-interface.c | 9 + hard-interface.h | 18 + icmp_socket.c | 3 +- main.h | 5 + network-coding.c | 9 +- originator.c | 501 ++++++++++++++++++++++++--- originator.h | 20 +- routing.c | 426 ++++++++--------------- routing.h | 12 +- send.c | 19 +- soft-interface.c | 2 +- translation-table.c | 6 +- types.h | 129 ++++--- 18 files changed, 1498 insertions(+), 688 deletions(-) -- 1.7.10.4

3 15

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

05 Nov '13

This is the tenth revision of the basic multicast optimization patches. No changes were made except dealing with two or three rebase conflicts while rebasing on top of 24c51de20. Cheers, Linus

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