commits September 2012

commits@lists.open-mesh.org

1 participants
35 discussions

[batman-adv] next's head updated: Merge branch 'maint' into next (3b1bf5a)
by postmaster＠open-mesh.org 23 Sep '12

23 Sep '12

Repository : ssh://git@open-mesh.org/batman-adv Branch 'next' now includes: 86fa71a batman-adv: Fix change mac address of soft iface. 3b1bf5a Merge branch 'maint' into next

1 0

[batman-adv] maint: batman-adv: Fix change mac address of soft iface. (86fa71a)
by postmaster＠open-mesh.org 23 Sep '12

23 Sep '12

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit 86fa71a4985f60da5918e1f43136dae77852cdc3 Author: Def <def(a)laposte.net> Date: Thu Sep 20 14:56:13 2012 +0200 batman-adv: Fix change mac address of soft iface. Into function interface_set_mac_addr, the function tt_local_add was invoked before updating dev->dev_addr. The new MAC address was not tagged as NoPurge. Signed-off-by: Def <def(a)laposte.net> >--------------------------------------------------------------- 86fa71a4985f60da5918e1f43136dae77852cdc3 soft-interface.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/soft-interface.c b/soft-interface.c index cf26e41..b762068 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -100,18 +100,21 @@ static int batadv_interface_set_mac_addr(struct net_device *dev, void *p) { struct batadv_priv *bat_priv = netdev_priv(dev); struct sockaddr *addr = p; + uint8_t old_addr[ETH_ALEN]; if (!is_valid_ether_addr(addr->sa_data)) return -EADDRNOTAVAIL; + memcpy(old_addr, dev->dev_addr, ETH_ALEN); + memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN); + /* only modify transtable if it has been initialized before */ if (atomic_read(&bat_priv->mesh_state) == BATADV_MESH_ACTIVE) { - batadv_tt_local_remove(bat_priv, dev->dev_addr, + batadv_tt_local_remove(bat_priv, old_addr, "mac address changed", false); batadv_tt_local_add(dev, addr->sa_data, BATADV_NULL_IFINDEX); } - memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN); dev->addr_assign_type &= ~NET_ADDR_RANDOM; return 0; }

1 0

[batman-adv] master: batman-adv: wait multiple periods before activating bla (bafd3f4)
by postmaster＠open-mesh.org 23 Sep '12

23 Sep '12

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit bafd3f4f99d2b0b205a1b4cf193ee8ad151c710e Author: Simon Wunderlich <simon.wunderlich(a)s2003.tu-chemnitz.de> Date: Thu Sep 13 18:18:46 2012 +0200 batman-adv: wait multiple periods before activating bla For some reasons (bridge forward delay, network device setup order, etc) the initial bridge loop avoidance announcement packets may be lost. This may lead to problems in finding other backbone gws, and therfore create loops in the startup time. Fix this by extending the waiting periods to 3 (define can be changed) before allowing broadcast traffic. Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> >--------------------------------------------------------------- bafd3f4f99d2b0b205a1b4cf193ee8ad151c710e bridge_loop_avoidance.c | 9 ++++++++- main.h | 1 + types.h | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index 060ffcc..23a6359 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -390,6 +390,7 @@ batadv_bla_get_backbone_gw(struct batadv_priv *bat_priv, uint8_t *orig, entry->crc = BATADV_BLA_CRC_INIT; entry->bat_priv = bat_priv; atomic_set(&entry->request_sent, 0); + atomic_set(&entry->wait_periods, 0); memcpy(entry->orig, orig, ETH_ALEN); /* one for the hash, one for returning */ @@ -419,6 +420,7 @@ batadv_bla_get_backbone_gw(struct batadv_priv *bat_priv, uint8_t *orig, /* this will be decreased in the worker thread */ atomic_inc(&entry->request_sent); + atomic_set(&entry->wait_periods, BATADV_BLA_WAIT_PERIODS); atomic_inc(&bat_priv->bla.num_requests); } @@ -1160,12 +1162,17 @@ static void batadv_bla_periodic_work(struct work_struct *work) * problems when we are not yet known as backbone gw * in the backbone. * - * We can reset this now and allow traffic again. + * We can reset this now after we waited some periods + * to give bridge forward delays and bla group forming + * some grace time. */ if (atomic_read(&backbone_gw->request_sent) == 0) continue; + if (!atomic_dec_and_test(&backbone_gw->wait_periods)) + continue; + atomic_dec(&backbone_gw->bat_priv->bla.num_requests); atomic_set(&backbone_gw->request_sent, 0); } diff --git a/main.h b/main.h index e828755..b45d5ad 100644 --- a/main.h +++ b/main.h @@ -89,6 +89,7 @@ #define BATADV_BLA_PERIOD_LENGTH 10000 /* 10 seconds */ #define BATADV_BLA_BACKBONE_TIMEOUT (BATADV_BLA_PERIOD_LENGTH * 3) #define BATADV_BLA_CLAIM_TIMEOUT (BATADV_BLA_PERIOD_LENGTH * 10) +#define BATADV_BLA_WAIT_PERIODS 3 #define BATADV_DUPLIST_SIZE 16 #define BATADV_DUPLIST_TIMEOUT 500 /* 500 ms */ diff --git a/types.h b/types.h index e0c7ac2..02d5f50 100644 --- a/types.h +++ b/types.h @@ -326,6 +326,7 @@ struct batadv_backbone_gw { struct hlist_node hash_entry; struct batadv_priv *bat_priv; unsigned long lasttime; /* last time we heard of this backbone gw */ + atomic_t wait_periods; atomic_t request_sent; atomic_t refcount; struct rcu_head rcu;

1 0

[linux-merge]linux integration; annotated tag, v3.6-rc6, created. v3.6-rc6
by postmaster＠open-mesh.org 17 Sep '12

17 Sep '12

The annotated tag, v3.6-rc6 has been created at 895fdd1a25e399348c1fdc9be85dd847c302c275 (tag) tagging 5698bd757d55b1bb87edd1a9744ab09c142abfc2 (commit) replaces v3.6-rc5 tagged by Linus Torvalds on Sun Sep 16 14:59:05 2012 -0700 - Shortlog ------------------------------------------------------------ Linux 3.6-rc6 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) iQEcBAABAgAGBQJQVkutAAoJEHm+PkMAQRiGW8sH/36FVQ3zI75QH16AmR++2nMZ BRJGoxcRFMssrXTYVdkMyzygf8b7MZbNEn1qt2g63MNzGaJucPlw5NVL4GLzR+zr x/EglLrTEPCD5el9wJ3ls9iC1soudKQTvC2BjcdUjpoSwHrDM/7GKfbOacE54Wqc C1VHCcg5DWOD7F0RnYT2SQEVCeDODNmcyFdk7Oi4cUicTPJoYWJ9O9MGfBDBok0N M+dXxa9nvsl7EeEKpBKH9vo4TfXn3Gsj6LCRdedvI15ilZjfo8jdHYbSn7KBfQuZ JIKRnqkaQ1JfMFt+M/JJZ1b/+Wrd4HLMmmn5oUmrGGIvhpi32nJfi/97+nSy8iU= =c5gW -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[batman-adv] master: batman-adv: allow bla traffic only after first worker period (e344097)
by postmaster＠open-mesh.org 13 Sep '12

13 Sep '12

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit e344097b219b09ed1d70f4e47164bba7998cc5a6 Author: Simon Wunderlich <simon.wunderlich(a)s2003.tu-chemnitz.de> Date: Sun Sep 9 22:27:57 2012 +0200 batman-adv: allow bla traffic only after first worker period When adding a backbone gateway for the first time, it might not yet be known in the backbone, and therefore we should not forward broadcasts yet. This behaviour is the same as when sending a request to another backbone gw because of a CRC mismatch. The backbone gw will operate normal after the next periodic bla work. Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> >--------------------------------------------------------------- e344097b219b09ed1d70f4e47164bba7998cc5a6 bridge_loop_avoidance.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index 2b74495..060ffcc 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -414,9 +414,14 @@ batadv_bla_get_backbone_gw(struct batadv_priv *bat_priv, uint8_t *orig, batadv_orig_node_free_ref(orig_node); } - if (own_backbone) + if (own_backbone) { batadv_bla_send_announce(bat_priv, entry); + /* this will be decreased in the worker thread */ + atomic_inc(&entry->request_sent); + atomic_inc(&bat_priv->bla.num_requests); + } + return entry; } @@ -1150,6 +1155,19 @@ static void batadv_bla_periodic_work(struct work_struct *work) backbone_gw->lasttime = jiffies; batadv_bla_send_announce(bat_priv, backbone_gw); + + /* request_sent is only set after creation to avoid + * problems when we are not yet known as backbone gw + * in the backbone. + * + * We can reset this now and allow traffic again. + */ + + if (atomic_read(&backbone_gw->request_sent) == 0) + continue; + + atomic_dec(&backbone_gw->bat_priv->bla.num_requests); + atomic_set(&backbone_gw->request_sent, 0); } rcu_read_unlock(); }

1 0

[batman-adv] master: batman-adv: send announcement when backbone gw is registered (5c28095)
by postmaster＠open-mesh.org 13 Sep '12

13 Sep '12

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 5c280951b31f8ba8aab64ea5781d28de68c4bb70 Author: Simon Wunderlich <simon.wunderlich(a)s2003.tu-chemnitz.de> Date: Sat Sep 8 18:02:53 2012 +0200 batman-adv: send announcement when backbone gw is registered To avoid loops in the startup phase until the first announcement is sent, send an announcement immediately as soon as a backbone gw is added. This may happen due to various reasons, e.g. a packet passes the rx or tx path. Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> >--------------------------------------------------------------- 5c280951b31f8ba8aab64ea5781d28de68c4bb70 bridge_loop_avoidance.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index 7e62c79..2b74495 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -366,7 +366,7 @@ out: */ static struct batadv_backbone_gw * batadv_bla_get_backbone_gw(struct batadv_priv *bat_priv, uint8_t *orig, - short vid) + short vid, bool own_backbone) { struct batadv_backbone_gw *entry; struct batadv_orig_node *orig_node; @@ -413,6 +413,10 @@ batadv_bla_get_backbone_gw(struct batadv_priv *bat_priv, uint8_t *orig, "became a backbone gateway"); batadv_orig_node_free_ref(orig_node); } + + if (own_backbone) + batadv_bla_send_announce(bat_priv, entry); + return entry; } @@ -428,7 +432,7 @@ batadv_bla_update_own_backbone_gw(struct batadv_priv *bat_priv, backbone_gw = batadv_bla_get_backbone_gw(bat_priv, primary_if->net_dev->dev_addr, - vid); + vid, true); if (unlikely(!backbone_gw)) return; @@ -636,7 +640,8 @@ static int batadv_handle_announce(struct batadv_priv *bat_priv, if (memcmp(an_addr, batadv_announce_mac, 4) != 0) return 0; - backbone_gw = batadv_bla_get_backbone_gw(bat_priv, backbone_addr, vid); + backbone_gw = batadv_bla_get_backbone_gw(bat_priv, backbone_addr, vid, + false); if (unlikely(!backbone_gw)) return 1; @@ -734,7 +739,8 @@ static int batadv_handle_claim(struct batadv_priv *bat_priv, /* register the gateway if not yet available, and add the claim. */ - backbone_gw = batadv_bla_get_backbone_gw(bat_priv, backbone_addr, vid); + backbone_gw = batadv_bla_get_backbone_gw(bat_priv, backbone_addr, vid, + false); if (unlikely(!backbone_gw)) return 1;

1 0

[batman-adv] master: batman-adv: prevent using any virtual device created on batman-adv as hard-interface (3d48811)
by postmaster＠open-mesh.org 13 Sep '12

13 Sep '12

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 3d48811b27f5d5f3b209b0b7856d4cb3439dadfc Author: Antonio Quartulli <ordex(a)autistici.org> Date: Sun Sep 9 10:46:46 2012 +0200 batman-adv: prevent using any virtual device created on batman-adv as hard-interface Any virtual device created on top of a batman-adv mesh interface must be prevented to be used to create a new mesh network (this would lead to an unwanted batman-over-batman configuration) Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> >--------------------------------------------------------------- 3d48811b27f5d5f3b209b0b7856d4cb3439dadfc hard-interface.c | 41 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/hard-interface.c b/hard-interface.c index fab9e41..81f1771 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -58,6 +58,45 @@ 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) @@ -70,7 +109,7 @@ static int batadv_is_valid_iface(const struct net_device *net_dev) return 0; /* no batman over batman */ - if (batadv_softif_is_valid(net_dev)) + if (batadv_is_on_batman_iface(net_dev)) return 0; return 1;

1 0

[linux-merge]linux integration; annotated tag, v3.6-rc5, created. v3.6-rc5
by postmaster＠open-mesh.org 09 Sep '12

09 Sep '12

The annotated tag, v3.6-rc5 has been created at 4678fc83dcdd811ec2b893b087d2a08c8530d7b2 (tag) tagging 55d512e245bc7699a8800e23df1a24195dd08217 (commit) replaces v3.6-rc4 tagged by Linus Torvalds on Sat Sep 8 16:44:00 2012 -0700 - Shortlog ------------------------------------------------------------ Linux 3.6-rc5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) iQEcBAABAgAGBQJQS9hEAAoJEHm+PkMAQRiGo04H/0UmrnxfD6NLS8SGE8EOqbn+ d2kSVcLxvpBAOSg6chvNgxnUoohL3Or4LpagqLSsfAYgLBmGw8lPEEOFJ3MMXhsd /YYJti2Hyke0zFfbW3ZxUmL1d+DFopqgjLeDLsabcTuL9ksVkA5tOeIwyEVZb9k0 8Uwh4ejscKHdNUZXMWB6DQoxnDFwlgdz+/n8Bj/v7w71suvIxSWSo2A7TtfVhMsz 34uifzaawhs8bldpHkRuuo6+YSNs+ozhVFcz8aT/zf7egDjCfuVA098Te28k2PKS LMQs9uDpXEJ3jE7/bb4O9iSc0+ZlBLz5c3XDj5ijqjdC3Us8Na6dRB0eu3Wdb+o= =KJIJ -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[batman-adv] master: Merge branch 'next' (19dc74f)
by postmaster＠open-mesh.org 09 Sep '12

09 Sep '12

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 19dc74f0f1ffe162c5d4b52197b8b0f962c1df1c Merge: 85f416e 5c4608f Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Sep 9 11:30:15 2012 +0200 Merge branch 'next' >--------------------------------------------------------------- 19dc74f0f1ffe162c5d4b52197b8b0f962c1df1c bitarray.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[batman-adv] maint, master, next: batman-adv: make batadv_test_bit() return 0 or 1 only (716c8c9)
by postmaster＠open-mesh.org 09 Sep '12

09 Sep '12

Repository : ssh://git@open-mesh.org/batman-adv On branches: maint,master,next >--------------------------------------------------------------- commit 716c8c9a8bb7ac1e30e959e50ed74caa7dabe60a Author: Linus Lüssing <linus.luessing(a)web.de> Date: Mon Sep 3 22:20:31 2012 +0200 batman-adv: make batadv_test_bit() return 0 or 1 only On some architectures test_bit() can return other values than 0 or 1: With a generic x86 OpenWrt image in a kvm setup (batadv_)test_bit() frequently returns -1 for me, leading to batadv_iv_ogm_update_seqnos() wrongly signaling a protected seqno window. This patch tries to fix this issue by making batadv_test_bit() return 0 or 1 only. Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> Acked-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 716c8c9a8bb7ac1e30e959e50ed74caa7dabe60a bitarray.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bitarray.h b/bitarray.h index a081ce1..cebaae7 100644 --- a/bitarray.h +++ b/bitarray.h @@ -20,8 +20,8 @@ #ifndef _NET_BATMAN_ADV_BITARRAY_H_ #define _NET_BATMAN_ADV_BITARRAY_H_ -/* returns true if the corresponding bit in the given seq_bits indicates true - * and curr_seqno is within range of last_seqno +/* Returns 1 if the corresponding bit in the given seq_bits indicates true + * and curr_seqno is within range of last_seqno. Otherwise returns 0. */ static inline int batadv_test_bit(const unsigned long *seq_bits, uint32_t last_seqno, uint32_t curr_seqno) @@ -32,7 +32,7 @@ static inline int batadv_test_bit(const unsigned long *seq_bits, if (diff < 0 || diff >= BATADV_TQ_LOCAL_WINDOW_SIZE) return 0; else - return test_bit(diff, seq_bits); + return test_bit(diff, seq_bits) != 0; } /* turn corresponding bit on, so we can remember that we got the packet */

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits September 2012