commits March 2012

commits@lists.open-mesh.org

1 participants
147 discussions

batman-adv; branch, master, updated. v2012.0.0-111-g0314b0c
by postmaster＠open-mesh.org 20 Mar '12

20 Mar '12

The following commit has been merged in the master branch: commit 0314b0c48cdb72160e80cd6f64b2bbd46c47a7ef Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sat Mar 17 15:28:35 2012 +0800 batman-adv: fix checkpatch opening parenthesis complaint Regression introduced by: 7c73d4c1d61b3db2f8b6bdd999ecebd231429082 Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/bat_sysfs.c b/bat_sysfs.c index 35c15e9..d0f8453 100644 --- a/bat_sysfs.c +++ b/bat_sysfs.c @@ -441,7 +441,7 @@ static BAT_ATTR(gw_mode, S_IRUGO | S_IWUSR, show_gw_mode, store_gw_mode); BAT_ATTR_SIF_UINT(orig_interval, S_IRUGO | S_IWUSR, 2 * JITTER, INT_MAX, NULL); BAT_ATTR_SIF_UINT(hop_penalty, S_IRUGO | S_IWUSR, 0, TQ_MAX_VALUE, NULL); BAT_ATTR_SIF_UINT(gw_sel_class, S_IRUGO | S_IWUSR, 1, TQ_MAX_VALUE, - post_gw_deselect); + post_gw_deselect); static BAT_ATTR(gw_bandwidth, S_IRUGO | S_IWUSR, show_gw_bwidth, store_gw_bwidth); #ifdef CONFIG_BATMAN_ADV_DEBUG -- batman-adv

1 0

batman-adv; branch, master, updated. v2012.0.0-110-g94bb34b
by postmaster＠open-mesh.org 20 Mar '12

20 Mar '12

The following commit has been merged in the master branch: commit 94bb34b538052d5fcc6db5b33471adf0a890a880 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sat Mar 17 15:28:34 2012 +0800 batman-adv: fix checkpatch string complaint Regression introduced by: f76d019194e0a88c57371df169ecc979690a04c2 Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index fa41307..994369d 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -1061,8 +1061,8 @@ static void bat_iv_ogm_process(const struct ethhdr *ethhdr, if (batman_ogm_packet->flags & NOT_BEST_NEXT_HOP) { bat_dbg(DBG_BATMAN, bat_priv, - "Drop packet: ignoring all packets not forwarded from " - "the best next hop (sender: %pM)\n", ethhdr->h_source); + "Drop packet: ignoring all packets not forwarded from the best next hop (sender: %pM)\n", + ethhdr->h_source); return; } -- batman-adv

1 0

batman-adv; branch, master, updated. v2012.0.0-109-gf5ca81f
by postmaster＠open-mesh.org 20 Mar '12

20 Mar '12

The following commit has been merged in the master branch: commit f5ca81fd9886d4a2c330ced7f9d23fd41c5e847c Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sat Mar 17 15:28:33 2012 +0800 batman-adv: refactor window_protected to avoid unnecessary return statement Reported-by: David Laight <David.Laight(a)aculab.com> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/routing.c b/routing.c index 0950c53..795d3af 100644 --- a/routing.c +++ b/routing.c @@ -234,17 +234,14 @@ int window_protected(struct bat_priv *bat_priv, int32_t seq_num_diff, { if ((seq_num_diff <= -TQ_LOCAL_WINDOW_SIZE) || (seq_num_diff >= EXPECTED_SEQNO_RANGE)) { - if (has_timed_out(*last_reset, RESET_PROTECTION_MS)) { - - *last_reset = jiffies; - bat_dbg(DBG_BATMAN, bat_priv, - "old packet received, start protection\n"); - - return 0; - } else { + if (!has_timed_out(*last_reset, RESET_PROTECTION_MS)) return 1; - } + + *last_reset = jiffies; + bat_dbg(DBG_BATMAN, bat_priv, + "old packet received, start protection\n"); } + return 0; } -- batman-adv

1 0

batman-adv; branch, master, updated. v2012.0.0-108-g6cc8dda
by postmaster＠open-mesh.org 20 Mar '12

20 Mar '12

The following commit has been merged in the master branch: commit 6cc8dda7aed300977172e9369a6f27e06fd25bc5 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sat Mar 17 15:28:32 2012 +0800 batman-adv: prepare lq_update_lock to be shared among different protocols Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 85617c4..fa41307 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -43,7 +43,6 @@ static struct neigh_node *bat_iv_ogm_neigh_new(struct hard_iface *hard_iface, goto out; INIT_LIST_HEAD(&neigh_node->bonding_list); - spin_lock_init(&neigh_node->tq_lock); neigh_node->orig_node = orig_neigh; neigh_node->if_incoming = hard_iface; @@ -638,12 +637,12 @@ static void bat_iv_ogm_orig_update(struct bat_priv *bat_priv, if (is_duplicate) continue; - spin_lock_bh(&tmp_neigh_node->tq_lock); + spin_lock_bh(&tmp_neigh_node->lq_update_lock); ring_buffer_set(tmp_neigh_node->tq_recv, &tmp_neigh_node->tq_index, 0); tmp_neigh_node->tq_avg = ring_buffer_avg(tmp_neigh_node->tq_recv); - spin_unlock_bh(&tmp_neigh_node->tq_lock); + spin_unlock_bh(&tmp_neigh_node->lq_update_lock); } if (!neigh_node) { @@ -669,12 +668,12 @@ static void bat_iv_ogm_orig_update(struct bat_priv *bat_priv, orig_node->flags = batman_ogm_packet->flags; neigh_node->last_seen = jiffies; - spin_lock_bh(&neigh_node->tq_lock); + spin_lock_bh(&neigh_node->lq_update_lock); ring_buffer_set(neigh_node->tq_recv, &neigh_node->tq_index, batman_ogm_packet->tq); neigh_node->tq_avg = ring_buffer_avg(neigh_node->tq_recv); - spin_unlock_bh(&neigh_node->tq_lock); + spin_unlock_bh(&neigh_node->lq_update_lock); if (!is_duplicate) { orig_node->last_ttl = batman_ogm_packet->header.ttl; diff --git a/originator.c b/originator.c index 4432d64..30889c9 100644 --- a/originator.c +++ b/originator.c @@ -99,6 +99,7 @@ struct neigh_node *neigh_node_new(struct hard_iface *hard_iface, INIT_HLIST_NODE(&neigh_node->list); memcpy(neigh_node->addr, neigh_addr, ETH_ALEN); + spin_lock_init(&neigh_node->lq_update_lock); /* extra reference for return */ atomic_set(&neigh_node->refcount, 2); diff --git a/types.h b/types.h index 04d6cf5..15f538a 100644 --- a/types.h +++ b/types.h @@ -151,7 +151,7 @@ struct neigh_node { struct rcu_head rcu; struct orig_node *orig_node; struct hard_iface *if_incoming; - spinlock_t tq_lock; /* protects: tq_recv, tq_index */ + spinlock_t lq_update_lock; /* protects: tq_recv, tq_index */ }; #ifdef CONFIG_BATMAN_ADV_BLA -- batman-adv

1 0

batctl; branch, master, updated. v2012.0.0-25-g59b559c
by postmaster＠open-mesh.org 20 Mar '12

20 Mar '12

The following commit has been merged in the master branch: commit 59b559c4138d006beabf79e8f97767e99726dce7 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sat Mar 17 12:18:04 2012 +0800 batctl: tcpdump - display new not_best_hop_flag when parsing OGMs Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/tcpdump.c b/tcpdump.c index 771e4f0..72c9cf1 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -331,10 +331,11 @@ static void dump_batman_iv_ogm(unsigned char *packet_buff, ssize_t buff_len, int printf("BAT %s: ", get_name_by_macaddr((struct ether_addr *)batman_ogm_packet->orig, read_opt)); - printf("OGM IV via neigh %s, seq %u, tq %3d, ttvn %d, ttcrc %hu, ttl %2d, v %d, flags [%c%c%c%c], length %zu\n", + printf("OGM IV via neigh %s, seq %u, tq %3d, ttvn %d, ttcrc %hu, ttl %2d, v %d, flags [%c%c%c%c%c], length %zu\n", get_name_by_macaddr((struct ether_addr *)ether_header->ether_shost, read_opt), ntohl(batman_ogm_packet->seqno), batman_ogm_packet->tq, batman_ogm_packet->ttvn, ntohs(batman_ogm_packet->tt_crc), batman_ogm_packet->header.ttl, batman_ogm_packet->header.version, + (batman_ogm_packet->flags & NOT_BEST_NEXT_HOP ? 'N' : '.'), (batman_ogm_packet->flags & DIRECTLINK ? 'D' : '.'), (batman_ogm_packet->flags & VIS_SERVER ? 'V' : '.'), (batman_ogm_packet->flags & PRIMARIES_FIRST_HOP ? 'F' : '.'), -- batctl

1 0

batman-adv; branch, master, updated. v2012.0.0-107-gb46c60b
by postmaster＠open-mesh.org 20 Mar '12

20 Mar '12

The following commit has been merged in the master branch: commit b46c60b9e1ee7a1909c542413a85875a750955d6 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Fri Mar 16 18:03:28 2012 +0100 batman-adv: improve unicast packet (re)routing In case of a client X roaming from a generic node A to another node B, it is possible that a third node C gets A's OGM but not B's. At this point in time, if C wants to send data to X it will send a unicast packet destined to A. The packet header will contain A's last ttvn (C got A's OGM and so it knows it). The packet will travel towards A without being intercepted because the ttvn contained in its header is the newest for A. Once A will receive the packet, A's state will not report to be in a "roaming phase" (because, after a roaming, once A sends out its OGM, all the changes are committed and the node is considered not to be in the roaming state anymore) and it will match the ttvn carried by the packet. Therefore there is no reason for A to try to alter the packet's route, thus dropping the packet because the destination client is not there anymore. However, C is well aware that it's routing information towards the client X is outdated as it received an OGM from A saying that the client roamed away. Thanks to this detail, this patch introduces a small change in behaviour: as long as C is in the state of not knowing the new location of client X it will forward the traffic to its last known location using ttvn-1 of the destination. By using an older ttvn node A will be forced to re-route the packet. Intermediate nodes are also allowed to update the packet's destination as long as they have the information about the client's new location. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/routing.c b/routing.c index 576ffb1..0950c53 100644 --- a/routing.c +++ b/routing.c @@ -922,6 +922,12 @@ static int check_unicast_ttvn(struct bat_priv *bat_priv, ethhdr = (struct ethhdr *)(skb->data + sizeof(struct unicast_packet)); + + /* we don't have an updated route for this client, so we should + * not try to reroute the packet!! */ + if (tt_global_client_is_roaming(bat_priv, ethhdr->h_dest)) + return 1; + orig_node = transtable_search(bat_priv, NULL, ethhdr->h_dest); if (!orig_node) { diff --git a/translation-table.c b/translation-table.c index b4a070f..934900d 100644 --- a/translation-table.c +++ b/translation-table.c @@ -2113,3 +2113,21 @@ request_table: } } } + +/* returns true whether we know that the client has moved from its old + * originator to another one. This entry is kept is still kept for consistency + * purposes */ +bool tt_global_client_is_roaming(struct bat_priv *bat_priv, uint8_t *addr) +{ + struct tt_global_entry *tt_global_entry; + bool ret = false; + + tt_global_entry = tt_global_hash_find(bat_priv, addr); + if (!tt_global_entry) + goto out; + + ret = tt_global_entry->common.flags & TT_CLIENT_ROAM; + tt_global_entry_free_ref(tt_global_entry); +out: + return ret; +} diff --git a/translation-table.h b/translation-table.h index 593d1b3..c43374d 100644 --- a/translation-table.h +++ b/translation-table.h @@ -53,5 +53,7 @@ bool is_ap_isolated(struct bat_priv *bat_priv, uint8_t *src, uint8_t *dst); void tt_update_orig(struct bat_priv *bat_priv, struct orig_node *orig_node, const unsigned char *tt_buff, uint8_t tt_num_changes, uint8_t ttvn, uint16_t tt_crc); +bool tt_global_client_is_roaming(struct bat_priv *bat_priv, uint8_t *addr); + #endif /* _NET_BATMAN_ADV_TRANSLATION_TABLE_H_ */ diff --git a/unicast.c b/unicast.c index 2d61e54..63ab35b 100644 --- a/unicast.c +++ b/unicast.c @@ -392,6 +392,14 @@ find_router: } unicast_packet = (struct unicast_packet *)skb->data; + + /* inform the destination ode that we are still missing a correct route + * for this client. The destination will receive this packet and will + * try to reroute it because the ttvn contained in the header is less + * than the current one */ + if (tt_global_client_is_roaming(bat_priv, ethhdr->h_dest)) + unicast_packet->ttvn = unicast_packet->ttvn - 1; + /* fragmentation mechanism only works for UNICAST (now) */ if (packet_type == BAT_UNICAST && atomic_read(&bat_priv->fragmentation) && -- batman-adv

1 0

batman-adv; branch, master, updated. v2012.0.0-106-g782b0f4
by postmaster＠open-mesh.org 20 Mar '12

20 Mar '12

The following commit has been merged in the master branch: commit 782b0f4b7f175e639299e9bd15e6c5064d39ed67 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Fri Mar 16 11:52:31 2012 +0100 batman-adv: avoid skb_linearise() if not needed Whenever we want to access headers only, we do not need to linearise the whole packet. Instead we can use pskb_may_pull() Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/routing.c b/routing.c index 962a315..576ffb1 100644 --- a/routing.c +++ b/routing.c @@ -915,8 +915,9 @@ static int check_unicast_ttvn(struct bat_priv *bat_priv, /* Check whether I have to reroute the packet */ if (seq_before(unicast_packet->ttvn, curr_ttvn) || tt_poss_change) { - /* Linearize the skb before accessing it */ - if (skb_linearize(skb) < 0) + /* check if there is enough data before accessing it */ + if (pskb_may_pull(skb, sizeof(struct unicast_packet) + + ETH_HLEN) < 0) return 0; ethhdr = (struct ethhdr *)(skb->data + -- batman-adv

1 0

batman-adv; branch, master, updated. v2012.0.0-105-g7de96f5
by postmaster＠open-mesh.org 20 Mar '12

20 Mar '12

The following commit has been merged in the master branch: commit 7de96f50dd783093627501feec26f05f158588c9 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Thu Mar 15 17:48:35 2012 +0100 batman-adv: add BAT_UNICAST_4ADDR handler in the packet-handlers array Commit 1887248c268928ebb434edab611978f51e2a4b8f introduced the packet-handlers array but it forgot to set a proper handler for the BAT_UNICAST_4ADDR packet type. This patch fixes it. Reported-by: Martin Hundebøll <martin(a)hundeboll.net> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/main.c b/main.c index 75938fb..0757c2d 100644 --- a/main.c +++ b/main.c @@ -265,6 +265,8 @@ static void recv_handler_init(void) /* batman icmp packet */ recv_packet_handler[BAT_ICMP] = recv_icmp_packet; + /* unicast with 4 addresses packet */ + recv_packet_handler[BAT_UNICAST_4ADDR] = recv_unicast_packet; /* unicast packet */ recv_packet_handler[BAT_UNICAST] = recv_unicast_packet; /* fragmented unicast packet */ -- batman-adv

1 0

linux integration; annotated tag, v3.3, created. v3.3
by postmaster＠open-mesh.org 19 Mar '12

19 Mar '12

The annotated tag, v3.3 has been created at 353f301f06485635f3a7789c2787da50a34c49b5 (tag) tagging c16fa4f2ad19908a47c63d8fa436a1178438c7e7 (commit) replaces v3.3-rc7 tagged by Linus Torvalds on Sun Mar 18 16:15:42 2012 -0700 - Shortlog ------------------------------------------------------------ Linux 3.3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) iQEcBAABAgAGBQJPZmyhAAoJEHm+PkMAQRiG8jUH/ilVI3DQh0b9eAEltKcEBZO4 wPt3LAXMpswFVAQbipjzWoD9gdoVnn/4tZshLYaCdcMCONJnxTGwENx/Cct6XH8U YtQW8FQp20XeT2lirOfnDB36MC2/kWk9vRpanqghFp2D/bSjAamPlfwBaBmK+obu GMA9fb3umvtxmOg9G96qSK4vC7aCi5Q2X90tEJVEWi5NffuA6VZSy1MTxlSm6Uyn 3mb4tf2oKBKpBronRu7c7Jc/vQeVT5F+5nKkYhjVWYMYKAcg3UGve+S2A2T1ZUK2 7FUIuXWHSyXlODjuAJqPQAuNW3nApaermMe2bL5720d+k7/pbZkOf8UJgXKFGdo= =4kxB -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

batctl; branch, master, updated. v2012.0.0-24-gc4bdda5
by postmaster＠open-mesh.org 17 Mar '12

17 Mar '12

The following commit has been merged in the master branch: commit c4bdda5487825ba83dd06d69c8507fceb1baca6b Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sun Mar 11 06:17:53 2012 +0800 batman-adv: avoid temporary routing loops by being strict on forwarded OGMs batman-adv would forward OGMs from non-besthops while replacing the the TQ and TTL values with the values from the best hop. In certain corner cases this leads to a temporary routing loop. This patch changes this behavior: Only packets from best next hops are forwarded - TQ and TTL values won't be replaced anymore. However, the protocol needs to rebroadcast OGMs from single hop neighbors regardless of whether or not they are the best hop. To handle this case a new flag is introduced to alert neighboring nodes about the forwarded OGM that is not from my best next hop. It is to be discarded by all nodes except for the one originating the OGM. Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Acked-by: Daniele Furlan <daniele.furlan(a)gmail.com> Tested-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> diff --git a/packet.h b/packet.h index 02b0c87..3c4c533 100644 --- a/packet.h +++ b/packet.h @@ -47,6 +47,7 @@ enum bat_subtype { #define COMPAT_VERSION 14 enum batman_iv_flags { + NOT_BEST_NEXT_HOP = 1 << 3, PRIMARIES_FIRST_HOP = 1 << 4, VIS_SERVER = 1 << 5, DIRECTLINK = 1 << 6 -- batctl

1 0

← Newer
1
...
9
10
11
12
13
14
15
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits March 2012