B.A.T.M.A.N November 2012

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

24 participants
65 discussions

[B.A.T.M.A.N.] [PATCH next] batman-adv: use batadv_compare_eth instead of memcmp
by Antonio Quartulli 19 Nov '12

19 Nov '12

When comparing ethernet address the batadv_compare_eth function has to be used instead of memcmp. This was introduced by 923d5d148cdd0928c9c5f8e0e2024f585dcf6efd ("batman-adv: fix bla compare function") Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- bridge_loop_avoidance.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index fc56ea2..5aebe93 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -79,7 +79,7 @@ static int batadv_compare_backbone_gw(const struct hlist_node *node, hash_entry); const struct batadv_backbone_gw *gw1 = data1, *gw2 = data2; - if (memcmp(gw1->orig, gw2->orig, ETH_ALEN)) + if (!batadv_compare_eth(gw1->orig, gw2->orig)) return 0; if (gw1->vid != gw2->vid) @@ -96,7 +96,7 @@ static int batadv_compare_claim(const struct hlist_node *node, hash_entry); const struct batadv_claim *cl1 = data1, *cl2 = data2; - if (memcmp(cl1->addr, cl2->addr, ETH_ALEN)) + if (!batadv_compare_eth(cl1->addr, cl2->addr)) return 0; if (cl1->vid != cl2->vid) -- 1.8.0

3 2

[B.A.T.M.A.N.] Fwd: [Interop-dev] Web-based Visualisation Tool
by Gui Iribarren 17 Nov '12

17 Nov '12

Re-added several people dropped from CC, sorry ---------- Forwarded message ---------- From: Gui Iribarren <gui(a)altermundi.net> Date: Fri, Nov 16, 2012 at 10:02 PM Subject: Re: [Interop-dev] Web-based Visualisation Tool To: interop-dev(a)lists.funkfeuer.at > > > Hi, > > a precisation about nodeshot. Nodeshot does not really require the > info about batman to be in an OLSR like format. It's just that the > guys were lazy and outputted the topology data in an OLSR-like format > because they didn't want to spend extra time developing another cron > script that used another strategy. > But it really only depends from a script that runs in a cronjob, so > everyone can (and should with the current version) make its own > script, infact some people in the US are working to make it work with > another new thing called CJDNS (i don't know much about it). In the > future version the approach will most likely be slightly different. > > Regarding the other things, I read a great deal of information about > Javascript MVC frameworks, RESTful APIs and NoSQL databases. I think > we're kinda heading in the same direction but with different > strategies. It is good that we keep doing so, this way someone will > surely get it right. > > My only worry is that some of these solutions are quite new in the > web-dev world so they should be approached with caution. > > The idea of having a copy of the nodes locally is really cool. > > It would be good to make it possible for different Node DB apps to > communicate to one another through some JSON Api. So +1 for having > thought about that, if you didn't know we have been talking about it > for quite a while. > But i warn you, if we don't manage to lower our > egos and agree to some compromises we'll risk to end up again with > nothing done. I agree, and apologize for the tone in my original email: I could have used much less hype; thanks a lot for the comprehension! > > I think it's great you're experimenting with these solutions, please > keep us updated and show us something working online when you have it > ready. Well, our idea was doing it the other way round :) first get an idea of current interoperability efforts of existing solutions, and then start to code after the insightful discussions that went through the relevant threads, Nico came up with a working PoC (no auth or security at all yet, but draws nodes and links in realtime). http://tilc.red.quintanalibre.org.ar:5984/altermap/_design/altermap/index.h… (it's ipv6 only) It's been running since.. today! so bugs and erratic behaviour is expected. It might be difficult to notice (given the stability of links) but all links are redrawn when updated. I was quite impressed to see a link blink at my browser, the moment a router sent its update. Cheers! Gui

1 0

[B.A.T.M.A.N.] [RFC] batman-adv: Reorder structs to reduce padding
by Sven Eckelmann 16 Nov '12

16 Nov '12

Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- Just found pahole from "dwarves" and had to try it out :D This can save from 8 to 24 bytes per struct on amd64 types.h | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/types.h b/types.h index ae9ac9a..ae8bc33 100644 --- a/types.h +++ b/types.h @@ -55,8 +55,8 @@ struct batadv_hard_iface { struct list_head list; int16_t if_num; char if_status; - struct net_device *net_dev; atomic_t frag_seqno; + struct net_device *net_dev; struct kobject *hardif_obj; atomic_t refcount; struct packet_type batman_adv_ptype; @@ -83,28 +83,29 @@ struct batadv_hard_iface { struct batadv_orig_node { uint8_t orig[ETH_ALEN]; uint8_t primary_addr[ETH_ALEN]; - struct batadv_neigh_node __rcu *router; /* rcu protected pointer */ #ifdef CONFIG_BATMAN_ADV_DAT batadv_dat_addr_t dat_addr; #endif + uint8_t flags; + uint8_t gw_flags; + struct batadv_neigh_node __rcu *router; /* rcu protected pointer */ unsigned long *bcast_own; uint8_t *bcast_own_sum; unsigned long last_seen; unsigned long bcast_seqno_reset; unsigned long batman_seqno_reset; - uint8_t gw_flags; - uint8_t flags; - atomic_t last_ttvn; /* last seen translation table version number */ uint16_t tt_crc; - unsigned char *tt_buff; int16_t tt_buff_len; + atomic_t last_ttvn; /* last seen translation table version number */ + unsigned char *tt_buff; + bool tt_initialised; + uint8_t last_ttl; spinlock_t tt_buff_lock; /* protects tt_buff */ atomic_t tt_size; - bool tt_initialised; + atomic_t bond_candidates; uint32_t last_real_seqno; - uint8_t last_ttl; - DECLARE_BITMAP(bcast_bits, BATADV_TQ_LOCAL_WINDOW_SIZE); uint32_t last_bcast_seqno; + DECLARE_BITMAP(bcast_bits, BATADV_TQ_LOCAL_WINDOW_SIZE); struct hlist_head neigh_list; struct list_head frag_list; spinlock_t neigh_list_lock; /* protects neigh_list and router */ @@ -120,7 +121,6 @@ struct batadv_orig_node { /* bcast_seqno_lock protects bcast_bits, last_bcast_seqno */ spinlock_t bcast_seqno_lock; spinlock_t tt_list_lock; /* protects tt_list */ - atomic_t bond_candidates; struct list_head bond_list; }; @@ -147,10 +147,10 @@ struct batadv_neigh_node { unsigned long last_seen; DECLARE_BITMAP(real_bits, BATADV_TQ_LOCAL_WINDOW_SIZE); atomic_t refcount; + spinlock_t lq_update_lock; /* protects: tq_recv, tq_index */ struct rcu_head rcu; struct batadv_orig_node *orig_node; struct batadv_hard_iface *if_incoming; - spinlock_t lq_update_lock; /* protects: tq_recv, tq_index */ }; #ifdef CONFIG_BATMAN_ADV_BLA @@ -205,6 +205,8 @@ struct batadv_priv_tt { atomic_t vn; atomic_t ogm_append_cnt; atomic_t local_changes; + uint16_t local_crc; + int16_t last_changeset_len; struct list_head changes_list; struct batadv_hashtable *local_hash; struct batadv_hashtable *global_hash; @@ -214,9 +216,7 @@ struct batadv_priv_tt { spinlock_t req_list_lock; /* protects req_list */ spinlock_t roam_list_lock; /* protects roam_list */ atomic_t local_entry_num; - uint16_t local_crc; unsigned char *last_changeset; - int16_t last_changeset_len; spinlock_t last_changeset_lock; /* protects last_changeset */ struct delayed_work work; }; @@ -224,12 +224,12 @@ struct batadv_priv_tt { #ifdef CONFIG_BATMAN_ADV_BLA struct batadv_priv_bla { atomic_t num_requests; /* number of bla requests in flight */ + /* protects bcast_duplist and bcast_duplist_curr */ + spinlock_t bcast_duplist_lock; struct batadv_hashtable *claim_hash; struct batadv_hashtable *backbone_hash; struct batadv_bcast_duplist_entry bcast_duplist[BATADV_DUPLIST_SIZE]; int bcast_duplist_curr; - /* protects bcast_duplist and bcast_duplist_curr */ - spinlock_t bcast_duplist_lock; struct batadv_bla_claim_dst claim_dest; struct delayed_work work; }; @@ -238,8 +238,8 @@ struct batadv_priv_bla { struct batadv_priv_gw { struct hlist_head list; spinlock_t list_lock; /* protects gw_list and curr_gw */ - struct batadv_gw_node __rcu *curr_gw; /* rcu protected pointer */ atomic_t reselect; + struct batadv_gw_node __rcu *curr_gw; /* rcu protected pointer */ }; struct batadv_priv_vis { @@ -266,8 +266,9 @@ struct batadv_priv_dat { #endif struct batadv_priv { - atomic_t mesh_state; struct net_device_stats stats; + atomic_t mesh_state; + char num_ifaces; uint64_t __percpu *bat_counters; /* Per cpu counters */ atomic_t aggregated_ogms; /* boolean */ atomic_t bonding; /* boolean */ @@ -287,7 +288,6 @@ struct batadv_priv { atomic_t bcast_seqno; atomic_t bcast_queue_left; atomic_t batman_queue_left; - char num_ifaces; struct batadv_debug_log *debug_log; struct kobject *mesh_obj; struct dentry *debug_dir; @@ -327,8 +327,8 @@ struct batadv_socket_packet { struct batadv_tt_common_entry { uint8_t addr[ETH_ALEN]; - struct hlist_node hash_entry; uint16_t flags; + struct hlist_node hash_entry; unsigned long added_at; atomic_t refcount; struct rcu_head rcu; @@ -364,8 +364,8 @@ struct batadv_backbone_gw { atomic_t wait_periods; atomic_t request_sent; atomic_t refcount; - struct rcu_head rcu; uint16_t crc; /* crc checksum over all claims */ + struct rcu_head rcu; }; struct batadv_claim { @@ -404,10 +404,10 @@ struct batadv_forw_packet { struct hlist_node list; unsigned long send_time; uint8_t own; - struct sk_buff *skb; + uint8_t num_packets; uint16_t packet_len; uint32_t direct_link_flags; - uint8_t num_packets; + struct sk_buff *skb; struct delayed_work delayed_work; struct batadv_hard_iface *if_incoming; }; @@ -494,9 +494,9 @@ struct batadv_algo_ops { struct batadv_dat_entry { __be32 ip; uint8_t mac_addr[ETH_ALEN]; + atomic_t refcount; unsigned long last_update; struct hlist_node hash_entry; - atomic_t refcount; struct rcu_head rcu; }; -- 1.7.10.4

2 2

[B.A.T.M.A.N.] batman-adv on ethernet
by Donald Gordon 16 Nov '12

16 Nov '12

Hi What happens if I add an interface to batman-adv (on which to exchange mesh frames), and add that same interface to a bridge with bat0? E.g. on an openwrt, br-lan contains eth0, bat0 and wlan0; batman-adv is exchanging mesh frames on wlan1 and eth0. Will I end up with BATMAN-on-BATMAN or will batman-adv filter out the batman frames it sees on bat0? thanks donald

3 3

[B.A.T.M.A.N.] Misconfigured mail-server, anyone?
by Simon Wunderlich 15 Nov '12

15 Nov '12

Hello, we are having someone on the mailing list since yesterday who appearently re-sends mails from the mailing list to the receivers, which creates a lot of spam. From what we can see: * relayed via 1&1/united internet/GMX/etc, host is: moutng.kundenserver.de * senders IP address appears to be an Arcor ADSL connection, GeoIP says this might come from Berlin * internal IP address might be 10.99.52.31 * spam started most probably yesterday (all this information is available in mail headers [1], visible to everyone reading this mailing list. No sniffing etc happened to acquire this.) If you (partly) match this description, please check your mail server and fix this. If you could drop me a mail too, that would be great - I won't tell on you, promise - but then we can stop looking for the culprit. ;) Cheers, Simon [1] Received: from moutng.kundenserver.de (moutng.kundenserver.de [212.227.126.171]) by open-mesh.org (Postfix) with ESMTPS id 5102A601742 for <b.a.t.m.a.n(a)lists.open-mesh.org>; Wed, 14 Nov 2012 23:56:12 +0100 (CET) Received: from [10.99.52.31] (dslb-094-222-006-045.pools.arcor-ip.net [94.222.6.45]) by mrelayeu.kundenserver.de (node=mreu3) with ESMTP (Nemesis) id 0MD19D-1TQlP141HX-009dni; Wed, 14 Nov 2012 23:56:09 +0100

2 1

[B.A.T.M.A.N.] pull request: batman-adv 2012-11-14
by Antonio Quartulli 15 Nov '12

15 Nov '12

Hello David, here is again our new patchset intended for net-next/linux-3.8. Patch 1/11 has been modified to address the problems you pointed out last time; however hash_bytes has kept its inline tag and it has been moved to hash.h (in this way it becomes usable by the rest of the batman-adv code for new changes). Let me know if there is any problem! Thanks a lot! Antonio The following changes since commit bf0098f22ca7b59e8844ac6882bbae230d34b98d: ARM: net: bpf_jit_32: add VLAN instructions for BPF JIT (2012-11-13 18:21:10 -0500) are available in the git repository at: git://git.open-mesh.org/linux-merge.git tags/batman-adv-for-davem for you to fetch changes up to 170173bf37342dab486daaa2a0381d802c10fb21: batman-adv: Remove instant overwritten variable initialization (2012-11-14 21:00:37 +0100) ---------------------------------------------------------------- Included changes: - hash computation improvements - Bridge Loop Avoidance set-up phase optimisations - Roaming handling code redesign - some code cleanups ---------------------------------------------------------------- Antonio Quartulli (6): batman-adv: fix wrong spinlock inline comment batman-adv: prevent using any virtual device created on batman-adv as hard-interface batman-adv: substitute tt_poss_change with a per-tt_entry flag batman-adv: refactor code to simplify long lines batman-adv: refactor tt_global_del_struct() batman-adv: roaming handling mechanism redesign Simon Wunderlich (4): batman-adv: don't rely on positions in struct for hashing batman-adv: send announcement when backbone gw is registered batman-adv: allow bla traffic only after first worker period batman-adv: wait multiple periods before activating bla Sven Eckelmann (1): batman-adv: Remove instant overwritten variable initialization net/batman-adv/bridge_loop_avoidance.c | 59 ++++--- net/batman-adv/hard-interface.c | 41 ++++- net/batman-adv/hash.h | 22 +++ net/batman-adv/main.h | 1 + net/batman-adv/originator.c | 1 - net/batman-adv/routing.c | 173 +++++++++++++++------ net/batman-adv/soft-interface.c | 1 - net/batman-adv/sysfs.c | 2 +- net/batman-adv/translation-table.c | 276 ++++++++++++++++++++++----------- net/batman-adv/translation-table.h | 2 + net/batman-adv/types.h | 11 +- 11 files changed, 416 insertions(+), 173 deletions(-)

2 13

[B.A.T.M.A.N.] [RFC] batman-adv: pass value in batadv_hash_bytes
by Simon Wunderlich 14 Nov '12

14 Nov '12

Passing the hash value by reference creates unneeded overhead. Pass by value instead. Reported-by: David Miller <davem(a)davemloft.net> Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> --- bridge_loop_avoidance.c | 8 ++++---- hash.h | 12 ++++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index b6da6ae..fc56ea2 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -43,8 +43,8 @@ static inline uint32_t batadv_choose_claim(const void *data, uint32_t size) struct batadv_claim *claim = (struct batadv_claim *)data; uint32_t hash = 0; - batadv_hash_bytes(&hash, &claim->addr, sizeof(claim->addr)); - batadv_hash_bytes(&hash, &claim->vid, sizeof(claim->vid)); + hash = batadv_hash_bytes(hash, &claim->addr, sizeof(claim->addr)); + hash = batadv_hash_bytes(hash, &claim->vid, sizeof(claim->vid)); hash += (hash << 3); hash ^= (hash >> 11); @@ -60,8 +60,8 @@ static inline uint32_t batadv_choose_backbone_gw(const void *data, struct batadv_claim *claim = (struct batadv_claim *)data; uint32_t hash = 0; - batadv_hash_bytes(&hash, &claim->addr, sizeof(claim->addr)); - batadv_hash_bytes(&hash, &claim->vid, sizeof(claim->vid)); + hash = batadv_hash_bytes(hash, &claim->addr, sizeof(claim->addr)); + hash = batadv_hash_bytes(hash, &claim->vid, sizeof(claim->vid)); hash += (hash << 3); hash ^= (hash >> 11); diff --git a/hash.h b/hash.h index f173427..e053339 100644 --- a/hash.h +++ b/hash.h @@ -86,17 +86,21 @@ static inline void batadv_hash_delete(struct batadv_hashtable *hash, * @hash: previous hash value * @data: data to be hashed * @size: number of bytes to be hashed + * + * Returns the new hash value. */ -static inline void batadv_hash_bytes(uint32_t *hash, void *data, uint32_t size) +static inline uint32_t batadv_hash_bytes(uint32_t hash, void *data, + uint32_t size) { const unsigned char *key = data; int i; for (i = 0; i < size; i++) { - *hash += key[i]; - *hash += (*hash << 10); - *hash ^= (*hash >> 6); + hash += key[i]; + hash += (hash << 10); + hash ^= (hash >> 6); } + return hash; } /** -- 1.7.10

4 4

[B.A.T.M.A.N.] pull request: batman-adv 2012-11-13
by Antonio Quartulli 13 Nov '12

13 Nov '12

Hello David, this is another set of changes intended for net-next/linux-3.8. In this patchset you have patch 10/11 which is a roaming handling procedure re-arrangement and patches 4,5,6/11 by Simon Wunderlich which improve the Bridge Loop Avoidance set-up phase. The rest is mostly clean-up work. Let me know if there is any problem! Thanks a lot, Antonio The following changes since commit 9fafd65ad407d4e0c96919a325f568dd95d032af: ipv6 ndisc: Use pre-defined in6addr_linklocal_allnodes. (2012-11-12 15:23:21 -0500) are available in the git repository at: git://git.open-mesh.org/linux-merge.git tags/batman-adv-for-davem for you to fetch changes up to 153f5177b998c04c8459bc591cd4e5204fe66a1c: batman-adv: Remove instant overwritten variable initialization (2012-11-13 10:06:08 +0100) ---------------------------------------------------------------- Included changes: - hash computation improvements - Bridge Loop Avoidance set-up phase optimisations - Roaming handling code redesign - some code cleanups ---------------------------------------------------------------- Antonio Quartulli (6): batman-adv: fix wrong spinlock inline comment batman-adv: prevent using any virtual device created on batman-adv as hard-interface batman-adv: substitute tt_poss_change with a per-tt_entry flag batman-adv: refactor code to simplify long lines batman-adv: refactor tt_global_del_struct() batman-adv: roaming handling mechanism redesign Simon Wunderlich (4): batman-adv: don't rely on positions in struct for hashing batman-adv: send announcement when backbone gw is registered batman-adv: allow bla traffic only after first worker period batman-adv: wait multiple periods before activating bla Sven Eckelmann (1): batman-adv: Remove instant overwritten variable initialization net/batman-adv/bridge_loop_avoidance.c | 71 ++++++--- net/batman-adv/hard-interface.c | 41 ++++- net/batman-adv/main.h | 1 + net/batman-adv/originator.c | 1 - net/batman-adv/routing.c | 173 +++++++++++++++------ net/batman-adv/soft-interface.c | 1 - net/batman-adv/sysfs.c | 2 +- net/batman-adv/translation-table.c | 276 ++++++++++++++++++++++----------- net/batman-adv/translation-table.h | 2 + net/batman-adv/types.h | 11 +- 10 files changed, 406 insertions(+), 173 deletions(-)

2 12

[B.A.T.M.A.N.] [PATCH 1/2] batman-adv: reduce local TT entry timeout to 10 minutes
by Antonio Quartulli 13 Nov '12

13 Nov '12

The current timeout is set to one hour. However a client connected to the mesh network will always generate traffic. In the worst case it will send ARP requests every 4 or 5 minutes. On the other hand having a long timeout means storing dead entries for one hour leads to very big trans-tables containing useless clients. This patch reduces the timeout to 10 minutes Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.h b/main.h index ec9c5ad..a8138be 100644 --- a/main.h +++ b/main.h @@ -41,7 +41,7 @@ * -> TODO: check influence on BATADV_TQ_LOCAL_WINDOW_SIZE */ #define BATADV_PURGE_TIMEOUT 200000 /* 200 seconds */ -#define BATADV_TT_LOCAL_TIMEOUT 3600000 /* in milliseconds */ +#define BATADV_TT_LOCAL_TIMEOUT 600000 /* in milliseconds */ #define BATADV_TT_CLIENT_ROAM_TIMEOUT 600000 /* in milliseconds */ #define BATADV_TT_CLIENT_TEMP_TIMEOUT 600000 /* in milliseconds */ #define BATADV_DAT_ENTRY_TIMEOUT (5*60000) /* 5 mins in milliseconds */ -- 1.8.0

2 3

[B.A.T.M.A.N.] [PATCH next] batman-adv: remove useless !! when converting to bool
by Antonio Quartulli 13 Nov '12

13 Nov '12

In C standard any expression different from 0 will be converted to 'true' when casting to bool (whatever is the length of the value). Therefore the "!!" conversion can be removed. This was introduced by 3fbd7ac8c71b3778c5751b3d096ea36f96ef534e ("batman-adv: substitute tt_poss_change with a per-tt_entry flag") Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- translation-table.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translation-table.c b/translation-table.c index cb0281a..39ae6b0 100644 --- a/translation-table.c +++ b/translation-table.c @@ -2545,7 +2545,7 @@ bool batadv_tt_local_client_is_roaming(struct batadv_priv *bat_priv, if (!tt_local_entry) goto out; - ret = !!(tt_local_entry->common.flags & BATADV_TT_CLIENT_ROAM); + ret = tt_local_entry->common.flags & BATADV_TT_CLIENT_ROAM; batadv_tt_local_entry_free_ref(tt_local_entry); out: return ret; -- 1.8.0

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 November 2012