commits September 2012

commits@lists.open-mesh.org

1 participants
35 discussions

[batman-adv] master, next: Merge branch 'maint' into next (5c4608f)
by postmaster＠open-mesh.org 09 Sep '12

09 Sep '12

Repository : ssh://git@open-mesh.org/batman-adv On branches: master,next >--------------------------------------------------------------- commit 5c4608f46bcbd42544fec34e7541394a741dcdc1 Merge: 28d246e 716c8c9 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Sep 9 11:29:31 2012 +0200 Merge branch 'maint' into next >--------------------------------------------------------------- 5c4608f46bcbd42544fec34e7541394a741dcdc1 bitarray.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

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

09 Sep '12

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit bf73b148654906d5371bfcb761906f569e68109d 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> >--------------------------------------------------------------- bf73b148654906d5371bfcb761906f569e68109d 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

[batman-adv] master: batman-adv: fix wrong spinlock inline comment (85f416e)
by postmaster＠open-mesh.org 09 Sep '12

09 Sep '12

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 85f416edfb289ddf1cf4f896f391228aaded2a9a Author: Antonio Quartulli <ordex(a)autistici.org> Date: Sun Sep 2 19:00:38 2012 +0200 batman-adv: fix wrong spinlock inline comment Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> >--------------------------------------------------------------- 85f416edfb289ddf1cf4f896f391228aaded2a9a types.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/types.h b/types.h index dc126e7..e0c7ac2 100644 --- a/types.h +++ b/types.h @@ -263,7 +263,7 @@ struct batadv_priv { struct hlist_head forw_bcast_list; struct batadv_hashtable *orig_hash; spinlock_t forw_bat_list_lock; /* protects forw_bat_list */ - spinlock_t forw_bcast_list_lock; /* protects */ + spinlock_t forw_bcast_list_lock; /* protects forw_bcast_list */ struct delayed_work orig_work; struct batadv_hard_iface __rcu *primary_if; /* rcu protected pointer */ struct batadv_algo_ops *bat_algo_ops;

1 0

[batman-adv] master: batman-adv: don't rely on positions in struct for hashing (7e15c93)
by postmaster＠open-mesh.org 09 Sep '12

09 Sep '12

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 7e15c9305ce0c3cdc806dfef2a2183ad447304a2 Author: Simon Wunderlich <simon.wunderlich(a)s2003.tu-chemnitz.de> Date: Thu Aug 30 18:22:27 2012 +0200 batman-adv: don't rely on positions in struct for hashing The hash functions in the bridge loop avoidance code expects the VLAN vid to be right after the mac address, but this is not guaranteed. Fix this by explicitly hashing over the right fields of the struct. Reported-by: Marek Lindner <lindner_marek(a)yahoo.de> Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> >--------------------------------------------------------------- 7e15c9305ce0c3cdc806dfef2a2183ad447304a2 bridge_loop_avoidance.c | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index 0921509..7e62c79 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -37,18 +37,26 @@ static void batadv_bla_periodic_work(struct work_struct *work); static void batadv_bla_send_announce(struct batadv_priv *bat_priv, struct batadv_backbone_gw *backbone_gw); +static inline void 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); + } +} + /* return the index of the claim */ static inline uint32_t batadv_choose_claim(const void *data, uint32_t size) { - const unsigned char *key = data; + struct batadv_claim *claim = (struct batadv_claim *)data; uint32_t hash = 0; - size_t i; - for (i = 0; i < ETH_ALEN + sizeof(short); i++) { - hash += key[i]; - hash += (hash << 10); - hash ^= (hash >> 6); - } + hash_bytes(&hash, &claim->addr, sizeof(claim->addr)); + hash_bytes(&hash, &claim->vid, sizeof(claim->vid)); hash += (hash << 3); hash ^= (hash >> 11); @@ -61,15 +69,11 @@ static inline uint32_t batadv_choose_claim(const void *data, uint32_t size) static inline uint32_t batadv_choose_backbone_gw(const void *data, uint32_t size) { - const unsigned char *key = data; + struct batadv_claim *claim = (struct batadv_claim *)data; uint32_t hash = 0; - size_t i; - for (i = 0; i < ETH_ALEN + sizeof(short); i++) { - hash += key[i]; - hash += (hash << 10); - hash ^= (hash >> 6); - } + hash_bytes(&hash, &claim->addr, sizeof(claim->addr)); + hash_bytes(&hash, &claim->vid, sizeof(claim->vid)); hash += (hash << 3); hash ^= (hash >> 11);

1 0

[batman-adv] master: batman-adv: Add KernelDoc for soft-interface lockdep functions (5db427c)
by postmaster＠open-mesh.org 09 Sep '12

09 Sep '12

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 5db427c5d73170e2f76461bb6dada913d69e4329 Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Aug 27 10:53:51 2012 +0200 batman-adv: Add KernelDoc for soft-interface lockdep functions e27bb6fa916451e9eaced16e7c21d5b71a3b7f30 ("batman-adv: Set special lockdep classes to avoid lockdep warning") added new functions, but no new documentation for these functions. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 5db427c5d73170e2f76461bb6dada913d69e4329 soft-interface.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/soft-interface.c b/soft-interface.c index 72d8767..5fd3e30 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -359,6 +359,12 @@ out: static struct lock_class_key batadv_netdev_xmit_lock_key; static struct lock_class_key batadv_netdev_addr_lock_key; +/** + * batadv_set_lockdep_class_one - Set lockdep class for a single tx queue + * @dev: device which owns the tx queue + * @txq: tx queue to modify + * @_unused: always NULL + */ static void batadv_set_lockdep_class_one(struct net_device *dev, struct netdev_queue *txq, void *_unused) @@ -366,6 +372,10 @@ static void batadv_set_lockdep_class_one(struct net_device *dev, lockdep_set_class(&txq->_xmit_lock, &batadv_netdev_xmit_lock_key); } +/** + * batadv_set_lockdep_class - Set txq and addr_list lockdep class + * @dev: network device to modify + */ static void batadv_set_lockdep_class(struct net_device *dev) { lockdep_set_class(&dev->addr_list_lock, &batadv_netdev_addr_lock_key);

1 0

[batman-adv] master: batman-adv: Write lockdep xmit class in late initialization phase (b8f86c9)
by postmaster＠open-mesh.org 09 Sep '12

09 Sep '12

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit b8f86c91faeb816168ecbdac0a355f316781ba77 Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Aug 27 10:53:50 2012 +0200 batman-adv: Write lockdep xmit class in late initialization phase e27bb6fa916451e9eaced16e7c21d5b71a3b7f30 ("batman-adv: Set special lockdep classes to avoid lockdep warning") introduced a lockdep class for the tx queue, but did not set it in the correct initialization phase. The batman-adv specific lock class could be replaced by a later netdevice registration phase. Reported-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- b8f86c91faeb816168ecbdac0a355f316781ba77 soft-interface.c | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/soft-interface.c b/soft-interface.c index a584f62..72d8767 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -352,16 +352,6 @@ out: return; } -static const struct net_device_ops batadv_netdev_ops = { - .ndo_open = batadv_interface_open, - .ndo_stop = batadv_interface_release, - .ndo_get_stats = batadv_interface_stats, - .ndo_set_mac_address = batadv_interface_set_mac_addr, - .ndo_change_mtu = batadv_interface_change_mtu, - .ndo_start_xmit = batadv_interface_tx, - .ndo_validate_addr = eth_validate_addr -}; - /* batman-adv network devices have devices nesting below it and are a special * "super class" of normal network devices; split their locks off into a * separate class since they always nest. @@ -382,6 +372,30 @@ static void batadv_set_lockdep_class(struct net_device *dev) netdev_for_each_tx_queue(dev, batadv_set_lockdep_class_one, NULL); } +/** + * batadv_softif_init - Late stage initialization of soft interface + * @dev: registered network device to modify + * + * Returns error code on failures + */ +static int batadv_softif_init(struct net_device *dev) +{ + batadv_set_lockdep_class(dev); + + return 0; +} + +static const struct net_device_ops batadv_netdev_ops = { + .ndo_init = batadv_softif_init, + .ndo_open = batadv_interface_open, + .ndo_stop = batadv_interface_release, + .ndo_get_stats = batadv_interface_stats, + .ndo_set_mac_address = batadv_interface_set_mac_addr, + .ndo_change_mtu = batadv_interface_change_mtu, + .ndo_start_xmit = batadv_interface_tx, + .ndo_validate_addr = eth_validate_addr +}; + static void batadv_interface_setup(struct net_device *dev) { struct batadv_priv *priv = netdev_priv(dev); @@ -391,7 +405,6 @@ static void batadv_interface_setup(struct net_device *dev) dev->netdev_ops = &batadv_netdev_ops; dev->destructor = free_netdev; dev->tx_queue_len = 0; - batadv_set_lockdep_class(dev); /* can't call min_mtu, because the needed variables * have not been initialized yet

1 0

[batman-adv] master: batman-adv: add kernel-doc for enum batadv_dbg_level (32d59e4)
by postmaster＠open-mesh.org 02 Sep '12

02 Sep '12

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 32d59e468017d478aa0bb6b37df8b347ba0e90b1 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Mon Aug 27 11:45:37 2012 +0200 batman-adv: add kernel-doc for enum batadv_dbg_level Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> >--------------------------------------------------------------- 32d59e468017d478aa0bb6b37df8b347ba0e90b1 main.h | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/main.h b/main.h index c243294..e828755 100644 --- a/main.h +++ b/main.h @@ -167,12 +167,19 @@ int batadv_algo_register(struct batadv_algo_ops *bat_algo_ops); int batadv_algo_select(struct batadv_priv *bat_priv, char *name); int batadv_algo_seq_print_text(struct seq_file *seq, void *offset); -/* all messages related to routing / flooding / broadcasting / etc */ +/** + * enum batadv_dbg_level - available log levels + * @BATADV_DBG_BATMAN: OGM and TQ computations related messages + * @BATADV_DBG_ROUTES: route added / changed / deleted + * @BATADV_DBG_TT: translation table messages + * @BATADV_DBG_BLA: bridge loop avoidance messages + * @BATADV_DBG_ALL: the union of all the above log levels + */ enum batadv_dbg_level { BATADV_DBG_BATMAN = BIT(0), - BATADV_DBG_ROUTES = BIT(1), /* route added / changed / deleted */ - BATADV_DBG_TT = BIT(2), /* translation table operations */ - BATADV_DBG_BLA = BIT(3), /* bridge loop avoidance */ + BATADV_DBG_ROUTES = BIT(1), + BATADV_DBG_TT = BIT(2), + BATADV_DBG_BLA = BIT(3), BATADV_DBG_ALL = 15, };

1 0

[batman-adv] master: batman-adv: pass the WIFI flag from the local to global entry (0ac0147)
by postmaster＠open-mesh.org 02 Sep '12

02 Sep '12

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 0ac014725d04fd1c38de479fddc6fe425daebeb7 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Mon Aug 27 11:44:43 2012 +0200 batman-adv: pass the WIFI flag from the local to global entry in case of client roaming a new global entry is added while a corresponding local one is still present. In this case the node can safely pass the WIFI flag from the local to the global entry. This change is required to let the AP-isolation correctly working in case of roaming: if a generic WIFI client C roams from node A to B, A adds a global entry for C without adding any WIFI flag. The latter will be set only later, once A has received C's advertisement from B. In this time period the AP-Isolation (if enabled) would not correctly work since C is not marked as WIFI, so allowing it to communicate with other WIFI clients. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> >--------------------------------------------------------------- 0ac014725d04fd1c38de479fddc6fe425daebeb7 translation-table.c | 31 +++++++++++++++++++++++++------ translation-table.h | 6 +++--- 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/translation-table.c b/translation-table.c index c61209f..a570d95 100644 --- a/translation-table.c +++ b/translation-table.c @@ -489,24 +489,39 @@ batadv_tt_local_set_pending(struct batadv_priv *bat_priv, tt_local_entry->common.addr, message); } -void batadv_tt_local_remove(struct batadv_priv *bat_priv, const uint8_t *addr, - const char *message, bool roaming) +/** + * batadv_tt_local_remove - logically remove an entry from the local table + * @bat_priv: the bat priv with all the soft interface information + * @addr: the MAC address of the client to remove + * @message: message to append to the log on deletion + * @roaming: true if the deletion is due to a roaming event + * + * Returns the flags assigned to the local entry before being deleted + */ +uint16_t batadv_tt_local_remove(struct batadv_priv *bat_priv, + const uint8_t *addr, const char *message, + bool roaming) { struct batadv_tt_local_entry *tt_local_entry = NULL; - uint16_t flags; + uint16_t flags, curr_flags = BATADV_NO_FLAGS; tt_local_entry = batadv_tt_local_hash_find(bat_priv, addr); if (!tt_local_entry) goto out; + curr_flags = tt_local_entry->common.flags; + flags = BATADV_TT_CLIENT_DEL; if (roaming) flags |= BATADV_TT_CLIENT_ROAM; batadv_tt_local_set_pending(bat_priv, tt_local_entry, flags, message); + out: if (tt_local_entry) batadv_tt_local_entry_free_ref(tt_local_entry); + + return curr_flags; } static void batadv_tt_local_purge_list(struct batadv_priv *bat_priv, @@ -713,6 +728,7 @@ int batadv_tt_global_add(struct batadv_priv *bat_priv, int ret = 0; int hash_added; struct batadv_tt_common_entry *common; + uint16_t local_flags; tt_global_entry = batadv_tt_global_hash_find(bat_priv, tt_addr); @@ -785,10 +801,13 @@ int batadv_tt_global_add(struct batadv_priv *bat_priv, ret = 1; out_remove: + /* remove address from local hash if present */ - batadv_tt_local_remove(bat_priv, tt_global_entry->common.addr, - "global tt received", - flags & BATADV_TT_CLIENT_ROAM); + local_flags = batadv_tt_local_remove(bat_priv, tt_addr, + "global tt received", + flags & BATADV_TT_CLIENT_ROAM); + tt_global_entry->common.flags |= local_flags & BATADV_TT_CLIENT_WIFI; + out: if (tt_global_entry) batadv_tt_global_entry_free_ref(tt_global_entry); diff --git a/translation-table.h b/translation-table.h index 811fffd..9fa4fe4 100644 --- a/translation-table.h +++ b/translation-table.h @@ -24,9 +24,9 @@ int batadv_tt_len(int changes_num); int batadv_tt_init(struct batadv_priv *bat_priv); void batadv_tt_local_add(struct net_device *soft_iface, const uint8_t *addr, int ifindex); -void batadv_tt_local_remove(struct batadv_priv *bat_priv, - const uint8_t *addr, const char *message, - bool roaming); +uint16_t batadv_tt_local_remove(struct batadv_priv *bat_priv, + const uint8_t *addr, const char *message, + bool roaming); int batadv_tt_local_seq_print_text(struct seq_file *seq, void *offset); void batadv_tt_global_add_orig(struct batadv_priv *bat_priv, struct batadv_orig_node *orig_node,

1 0

[batman-adv] master: batman-adv: properly convert flag into a boolean value (ccf0eec)
by postmaster＠open-mesh.org 02 Sep '12

02 Sep '12

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit ccf0eec672598a613a18bb4cdadfde4a1ac539c5 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Mon Aug 27 09:35:54 2012 +0200 batman-adv: properly convert flag into a boolean value In order to properly convert a bitwise AND to a boolean value, the whole expression must be prepended by "!!". Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> >--------------------------------------------------------------- ccf0eec672598a613a18bb4cdadfde4a1ac539c5 translation-table.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translation-table.c b/translation-table.c index 0ac39d5..c61209f 100644 --- a/translation-table.c +++ b/translation-table.c @@ -2420,7 +2420,7 @@ bool batadv_tt_global_client_is_roaming(struct batadv_priv *bat_priv, if (!tt_global_entry) goto out; - ret = tt_global_entry->common.flags & BATADV_TT_CLIENT_ROAM; + ret = !!(tt_global_entry->common.flags & BATADV_TT_CLIENT_ROAM); batadv_tt_global_entry_free_ref(tt_global_entry); out: return ret;

1 0

[batman-adv] master: batman-adv: check for more space before accessing the skb (94494a1)
by postmaster＠open-mesh.org 02 Sep '12

02 Sep '12

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 94494a10f95e00d4e1f7da0f8b1e45904ec165eb Author: Antonio Quartulli <ordex(a)autistici.org> Date: Sun Aug 26 23:25:59 2012 +0200 batman-adv: check for more space before accessing the skb In batadv_check_unicast_ttvn() the code accesses both the unicast header and the Ethernet header in the payload. For this reason pskb_may_pull() must be invoked to check for the required space. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> >--------------------------------------------------------------- 94494a10f95e00d4e1f7da0f8b1e45904ec165eb routing.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/routing.c b/routing.c index 784e9cc..44109cc 100644 --- a/routing.c +++ b/routing.c @@ -908,8 +908,12 @@ static int batadv_check_unicast_ttvn(struct batadv_priv *bat_priv, bool tt_poss_change; int is_old_ttvn; - /* I could need to modify it */ - if (skb_cow(skb, sizeof(struct batadv_unicast_packet)) < 0) + /* check if there is enough data before accessing it */ + if (pskb_may_pull(skb, sizeof(*unicast_packet) + ETH_HLEN) < 0) + return 0; + + /* create a copy of the skb (in case of for re-routing) to modify it. */ + if (skb_cow(skb, sizeof(*unicast_packet)) < 0) return 0; unicast_packet = (struct batadv_unicast_packet *)skb->data;

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits September 2012