commits June 2013

commits@lists.open-mesh.org

1 participants
36 discussions

[batman-adv] next's head updated: Merge branch 'maint' into next (052104b)
by postmaster＠open-mesh.org 09 Jun '13

09 Jun '13

Repository : ssh://git@open-mesh.org/batman-adv Branch 'next' now includes: 518fba1 batman-adv: Don't handle address updates when bla is disabled 052104b Merge branch 'maint' into next

1 0

[batman-adv] maint: batman-adv: Don't handle address updates when bla is disabled (518fba1)
by postmaster＠open-mesh.org 09 Jun '13

09 Jun '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit 518fba156ed911c6183cf5cb34955a6fdf1b4637 Author: Simon Wunderlich <simon(a)open-mesh.com> Date: Fri Jun 7 16:52:05 2013 +0200 batman-adv: Don't handle address updates when bla is disabled The bridge loop avoidance has a hook to handle address updates of the originator. These should not be handled when bridge loop avoidance is disabled - it might send some bridge loop avoidance packets which should not appear if bla is disabled. Signed-off-by: Simon Wunderlich <simon(a)open-mesh.com> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 518fba156ed911c6183cf5cb34955a6fdf1b4637 bridge_loop_avoidance.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index 379061c..de27b31 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -1067,6 +1067,10 @@ void batadv_bla_update_orig_address(struct batadv_priv *bat_priv, group = htons(crc16(0, primary_if->net_dev->dev_addr, ETH_ALEN)); bat_priv->bla.claim_dest.group = group; + /* purge everything when bridge loop avoidance is turned off */ + if (!atomic_read(&bat_priv->bridge_loop_avoidance)) + oldif = NULL; + if (!oldif) { batadv_bla_purge_claims(bat_priv, NULL, 1); batadv_bla_purge_backbone_gw(bat_priv, 1);

1 0

[batman-adv] master: batman-adv: make batadv_tt_save_orig_buffer() generic (9b5fcdc)
by postmaster＠open-mesh.org 05 Jun '13

05 Jun '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 9b5fcdc10f09c6920fef574db59483a27b827b62 Author: Antonio Quartulli <antonio(a)open-mesh.com> Date: Tue May 28 13:14:28 2013 +0200 batman-adv: make batadv_tt_save_orig_buffer() generic This is a simple batadv_tt_save_orig_buffer() refactoring aiming to make it more generic and avoid useless casts. Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 9b5fcdc10f09c6920fef574db59483a27b827b62 translation-table.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/translation-table.c b/translation-table.c index 748f806..7580ee5 100644 --- a/translation-table.c +++ b/translation-table.c @@ -1496,11 +1496,9 @@ static void batadv_tt_req_list_free(struct batadv_priv *bat_priv) static void batadv_tt_save_orig_buffer(struct batadv_priv *bat_priv, struct batadv_orig_node *orig_node, - const unsigned char *tt_buff, - uint16_t tt_num_changes) + const void *tt_buff, + uint16_t tt_buff_len) { - uint16_t tt_buff_len = batadv_tt_len(tt_num_changes); - /* Replace the old buffer only if I received something in the * last OGM (the OGM could carry no changes) */ @@ -2037,8 +2035,8 @@ static void batadv_tt_update_changes(struct batadv_priv *bat_priv, _batadv_tt_update_changes(bat_priv, orig_node, tt_change, tt_num_changes, ttvn); - batadv_tt_save_orig_buffer(bat_priv, orig_node, - (unsigned char *)tt_change, tt_num_changes); + batadv_tt_save_orig_buffer(bat_priv, orig_node, tt_change, + batadv_tt_len(tt_num_changes)); atomic_set(&orig_node->last_ttvn, ttvn); }

1 0

[batman-adv] master: batman-adv: implement batadv_tt_entries (f3ec6b3)
by postmaster＠open-mesh.org 05 Jun '13

05 Jun '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit f3ec6b31c6a515712500836223e1738f0bdfc885 Author: Antonio Quartulli <antonio(a)open-mesh.com> Date: Tue May 28 13:14:27 2013 +0200 batman-adv: implement batadv_tt_entries Implement batadv_tt_entries() to get the number of entries fitting in a given amount of bytes. This computation is done several times in the code and therefore it is useful to have an helper function. Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- f3ec6b31c6a515712500836223e1738f0bdfc885 translation-table.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/translation-table.c b/translation-table.c index 8d9f5cc..748f806 100644 --- a/translation-table.c +++ b/translation-table.c @@ -232,6 +232,17 @@ static int batadv_tt_len(int changes_num) return changes_num * sizeof(struct batadv_tvlv_tt_change); } +/** + * batadv_tt_entries - compute the number of entries fitting in tt_len bytes + * @tt_len: available space + * + * Returns the number of entries. + */ +static uint16_t batadv_tt_entries(uint16_t tt_len) +{ + return tt_len / batadv_tt_len(1); +} + static int batadv_tt_local_init(struct batadv_priv *bat_priv) { if (bat_priv->tt.local_hash) @@ -406,7 +417,7 @@ static void batadv_tt_tvlv_container_update(struct batadv_priv *bat_priv) if (tt_diff_len == 0) goto container_register; - tt_diff_entries_num = tt_diff_len / batadv_tt_len(1); + tt_diff_entries_num = batadv_tt_entries(tt_diff_len); spin_lock_bh(&bat_priv->tt.changes_list_lock); atomic_set(&bat_priv->tt.local_changes, 0); @@ -1616,7 +1627,7 @@ batadv_tt_tvlv_generate(struct batadv_priv *bat_priv, tt_len -= tt_len % sizeof(struct batadv_tvlv_tt_change); } - tt_tot = tt_len / sizeof(struct batadv_tvlv_tt_change); + tt_tot = batadv_tt_entries(tt_len); tvlv_tt_data = kzalloc(sizeof(*tvlv_tt_data) + tt_len, GFP_ATOMIC); @@ -2567,7 +2578,7 @@ static void batadv_tt_tvlv_ogm_handler_v1(struct batadv_priv *bat_priv, tt_data = (struct batadv_tvlv_tt_data *)tvlv_value; tvlv_value_len -= sizeof(*tt_data); - num_entries = tvlv_value_len / batadv_tt_len(1); + num_entries = batadv_tt_entries(tvlv_value_len); batadv_tt_update_orig(bat_priv, orig, (unsigned char *)(tt_data + 1), @@ -2602,7 +2613,7 @@ static int batadv_tt_tvlv_unicast_handler_v1(struct batadv_priv *bat_priv, tt_data = (struct batadv_tvlv_tt_data *)tvlv_value; tvlv_value_len -= sizeof(*tt_data); - num_entries = tvlv_value_len / batadv_tt_len(1); + num_entries = batadv_tt_entries(tvlv_value_len); switch (tt_data->flags & BATADV_TT_DATA_TYPE_MASK) { case BATADV_TT_REQUEST:

1 0

[batman-adv] master: batman-adv: fix possible memleak in fragmentation (0b415bb)
by postmaster＠open-mesh.org 04 Jun '13

04 Jun '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 0b415bb4dfe2351526ec7de5558a5fcce47642d4 Author: Martin Hundebøll <martin(a)hundeboll.net> Date: Tue May 28 08:23:22 2013 +0200 batman-adv: fix possible memleak in fragmentation Use a variable for return value in batadv_frag_insert_packet() to free the allocated struct batadv_frag_list_entry in all cases where it is not inserted into a chain. Introduced by 9b3eab61754d74a93c9840c296013fe3b4a1b606 ("batman-adv: Receive fragmented packets and merge") Signed-off-by: Martin Hundebøll <martin(a)hundeboll.net> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 0b415bb4dfe2351526ec7de5558a5fcce47642d4 fragmentation.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/fragmentation.c b/fragmentation.c index 6054ff6..ab85e75 100644 --- a/fragmentation.c +++ b/fragmentation.c @@ -129,10 +129,11 @@ static bool batadv_frag_insert_packet(struct batadv_orig_node *orig_node, struct hlist_head *chain_out) { struct batadv_frag_table_entry *chain; - struct batadv_frag_list_entry *frag_entry_new, *frag_entry_curr; + struct batadv_frag_list_entry *frag_entry_new = NULL, *frag_entry_curr; struct batadv_frag_packet *frag_packet; uint8_t bucket; uint16_t seqno, hdr_size = sizeof(struct batadv_frag_packet); + bool ret = false; /* Linearize packet to avoid linearizing 16 packets in a row when doing * the later merge. Non-linear merge should be added to remove this @@ -162,6 +163,7 @@ static bool batadv_frag_insert_packet(struct batadv_orig_node *orig_node, hlist_add_head(&frag_entry_new->list, &chain->head); chain->size = skb->len - hdr_size; chain->timestamp = jiffies; + ret = true; goto out; } @@ -177,6 +179,7 @@ static bool batadv_frag_insert_packet(struct batadv_orig_node *orig_node, &frag_entry_curr->list); chain->size += skb->len - hdr_size; chain->timestamp = jiffies; + ret = true; goto out; } } @@ -186,6 +189,7 @@ static bool batadv_frag_insert_packet(struct batadv_orig_node *orig_node, hlist_add_after(&frag_entry_curr->list, &frag_entry_new->list); chain->size += skb->len - hdr_size; chain->timestamp = jiffies; + ret = true; } out: @@ -202,14 +206,14 @@ out: chain->size = 0; } - spin_unlock_bh(&chain->lock); - return true; - err_unlock: spin_unlock_bh(&chain->lock); - kfree(frag_entry_new); + err: - return false; + if (!ret) + kfree(frag_entry_new); + + return ret; } /**

1 0

[batman-adv] master: batman-adv: remove useless find_router look up (87d4a28)
by postmaster＠open-mesh.org 04 Jun '13

04 Jun '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 87d4a2829d870da1de17e66fbf792f767ed796c8 Author: Simon Wunderlich <simon(a)open-mesh.com> Date: Tue May 28 11:49:47 2013 +0200 batman-adv: remove useless find_router look up This is not used anymore with the new fragmentation, and it might actually mess up the bonding code because find_router() assumes it is only called once per packet. Signed-off-by: Simon Wunderlich <simon(a)open-mesh.com> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 87d4a2829d870da1de17e66fbf792f767ed796c8 send.c | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/send.c b/send.c index 8f74201..d780b9d 100644 --- a/send.c +++ b/send.c @@ -251,30 +251,19 @@ int batadv_send_skb_generic_unicast(struct batadv_priv *bat_priv, struct ethhdr *ethhdr = (struct ethhdr *)skb->data; struct batadv_unicast_packet *unicast_packet; struct batadv_orig_node *orig_node; - struct batadv_neigh_node *neigh_node; int ret = NET_RX_DROP; /* get routing information */ - if (is_multicast_ether_addr(ethhdr->h_dest)) { + if (is_multicast_ether_addr(ethhdr->h_dest)) orig_node = batadv_gw_get_selected_orig(bat_priv); - if (orig_node) - goto find_router; - } - - /* check for tt host - increases orig_node refcount. - * returns NULL in case of AP isolation - */ - orig_node = batadv_transtable_search(bat_priv, ethhdr->h_source, - ethhdr->h_dest); - -find_router: - /* find_router(): - * - if orig_node is NULL it returns NULL - * - increases neigh_nodes refcount if found. - */ - neigh_node = batadv_find_router(bat_priv, orig_node, NULL); + else + /* check for tt host - increases orig_node refcount. + * returns NULL in case of AP isolation + */ + orig_node = batadv_transtable_search(bat_priv, ethhdr->h_source, + ethhdr->h_dest); - if (!neigh_node) + if (!orig_node) goto out; switch (packet_type) { @@ -306,8 +295,6 @@ find_router: ret = 0; out: - if (neigh_node) - batadv_neigh_node_free_ref(neigh_node); if (orig_node) batadv_orig_node_free_ref(orig_node); if (ret == NET_RX_DROP)

1 0

[batman-adv] master's head updated: Merge branch 'next' (0b0ef5b)
by postmaster＠open-mesh.org 04 Jun '13

04 Jun '13

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: a5d7963 batman-adv: Avoid double freeing of bat_counters 96cd772 batman-adv: wait for rtnl in batadv_store_mesh_iface instead of failing if it is taken 33da4be Merge branch 'maint' into next 0b0ef5b Merge branch 'next'

1 0

[batman-adv] master: Merge branch 'next' (0b0ef5b)
by postmaster＠open-mesh.org 04 Jun '13

04 Jun '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 0b0ef5bb4e18a819f7c8b1b53215fad5a223df33 Merge: 288a0ef 33da4be Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Tue Jun 4 17:18:06 2013 +0800 Merge branch 'next' >--------------------------------------------------------------- 0b0ef5bb4e18a819f7c8b1b53215fad5a223df33 sysfs.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)

1 0

[batman-adv] next: Merge branch 'maint' into next (33da4be)
by postmaster＠open-mesh.org 04 Jun '13

04 Jun '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit 33da4be3846cbc5971907f655075e9e7a2132d6b Merge: 92bc8cd 96cd772 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Tue Jun 4 17:16:29 2013 +0800 Merge branch 'maint' into next >--------------------------------------------------------------- 33da4be3846cbc5971907f655075e9e7a2132d6b sysfs.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)

1 0

[batman-adv] next's head updated: Merge branch 'maint' into next (33da4be)
by postmaster＠open-mesh.org 04 Jun '13

04 Jun '13

Repository : ssh://git@open-mesh.org/batman-adv Branch 'next' now includes: a5d7963 batman-adv: Avoid double freeing of bat_counters 96cd772 batman-adv: wait for rtnl in batadv_store_mesh_iface instead of failing if it is taken 33da4be Merge branch 'maint' into next

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits June 2013