B.A.T.M.A.N October 2012

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

24 participants
68 discussions

[B.A.T.M.A.N.] [PATCH] batman-adv: recompute mac_len at the beginning of the rx path
by Antonio Quartulli 14 Oct '12

14 Oct '12

It is possible that the mac_len is not properly exported because of strange device configuration (this behaviour has been observed when using batman-adv on top of a vlan interface). Therefore it is needed to explicitly recompute it at the very beginning of the rx path Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- main.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/main.c b/main.c index f9bcfa1..4ef39b6 100644 --- a/main.c +++ b/main.c @@ -245,6 +245,12 @@ int batadv_batman_skb_recv(struct sk_buff *skb, struct net_device *dev, if (unlikely(!pskb_may_pull(skb, 2))) goto err_free; + /* sometimes the mac_len value is not properly computed (e.g. when using + * batman-adv on top of a vlan interface), therefore we need to + * explicitly recompute it here + */ + skb_reset_mac_len(skb); + /* expect a valid ethernet header here. */ if (unlikely(skb->mac_len != ETH_HLEN || !skb_mac_header(skb))) goto err_free; -- 1.7.12

4 8

[B.A.T.M.A.N.] [PATCHv3] batman-adv: enable fast client detection using unicast_4addr packets
by Antonio Quartulli 14 Oct '12

14 Oct '12

The "early client detection mechanism" can be extended to find new clients by means of unicast_4addr packets. The unicast_4addr packet contains as well as the broadcast packet (which is currently used in this mechanism) the address of the originating node and can therefore be used to install new entries in the Global Translation Table Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- v3: - fixed refcounting (again) routing.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/routing.c b/routing.c index 96375c5..c2c4de3 100644 --- a/routing.c +++ b/routing.c @@ -1042,6 +1042,8 @@ int batadv_recv_unicast_packet(struct sk_buff *skb, struct batadv_priv *bat_priv = netdev_priv(recv_if->soft_iface); struct batadv_unicast_packet *unicast_packet; struct batadv_unicast_4addr_packet *unicast_4addr_packet; + uint8_t *orig_addr; + struct batadv_orig_node *orig_node = NULL; int hdr_size = sizeof(*unicast_packet); bool is4addr; @@ -1061,9 +1063,12 @@ int batadv_recv_unicast_packet(struct sk_buff *skb, /* packet for me */ if (batadv_is_my_mac(unicast_packet->dest)) { - if (is4addr) + if (is4addr) { batadv_dat_inc_counter(bat_priv, unicast_4addr_packet->subtype); + orig_addr = unicast_4addr_packet->src; + orig_node = batadv_orig_hash_find(bat_priv, orig_addr); + } if (batadv_dat_snoop_incoming_arp_request(bat_priv, skb, hdr_size)) @@ -1073,9 +1078,12 @@ int batadv_recv_unicast_packet(struct sk_buff *skb, goto rx_success; batadv_interface_rx(recv_if->soft_iface, skb, recv_if, hdr_size, - NULL); + orig_node); rx_success: + if (orig_node) + batadv_orig_node_free_ref(orig_node); + return NET_RX_SUCCESS; } -- 1.7.12.3

2 1

[B.A.T.M.A.N.] [PATCHv5 1/3] batctl: add support for the DAT local table
by Antonio Quartulli 14 Oct '12

14 Oct '12

With the introduction of DAT in batman-adv, another table is now exported through debugfs. This patch adds the possibility to print it Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- v5: - long option renamed from 'datcache' to dat_cache' README | 18 ++++++++++++++++++ debug.c | 5 +++++ debug.h | 1 + functions.c | 1 + man/batctl.8 | 3 +++ 5 files changed, 28 insertions(+) diff --git a/README b/README index 03d36c4..5e58452 100644 --- a/README +++ b/README @@ -408,6 +408,24 @@ where: If any of the flags is not enabled, a '.' will substitute its symbol. +batctl dat_cache +================= + +display the local D.A.T. cache + +Usage batctl dat_cache|dc + +Example: + +Distributed ARP Table (bat0): + IPv4 MAC last-seen + * 172.100.0.1 b6:9b:d0:ea:b1:13 0:00 + +where: +- IPv4 is the IP address of a client in the mesh network +- MAC is the MAC address associated to that IP +- last-seen is the amount of time since last refresh of this entry + batctl vis_mode ================= diff --git a/debug.c b/debug.c index 9b5146f..a230a12 100644 --- a/debug.c +++ b/debug.c @@ -64,6 +64,11 @@ const struct debug_table_data batctl_debug_tables[BATCTL_TABLE_NUM] = { .opt_short = "bbt", .debugfs_name = "bla_backbone_table", }, + { + .opt_long = "dat_cache", + .opt_short = "dc", + .debugfs_name = "dat_cache", + }, }; void debug_table_usage(int debug_table) diff --git a/debug.h b/debug.h index 6068c2c..4e935cb 100644 --- a/debug.h +++ b/debug.h @@ -31,6 +31,7 @@ enum batctl_debug_tables { BATCTL_TABLE_TRANSGLOBAL, BATCTL_TABLE_BLA_CLAIMS, BATCTL_TABLE_BLA_BACKBONES, + BATCTL_TABLE_DAT, BATCTL_TABLE_NUM, }; diff --git a/functions.c b/functions.c index e095fd0..0d88137 100644 --- a/functions.c +++ b/functions.c @@ -48,6 +48,7 @@ const char *fs_compile_out_param[] = { batctl_settings[BATCTL_SETTINGS_BLA].sysfs_name, batctl_debug_tables[BATCTL_TABLE_BLA_CLAIMS].debugfs_name, batctl_debug_tables[BATCTL_TABLE_BLA_BACKBONES].debugfs_name, + batctl_debug_tables[BATCTL_TABLE_DAT].debugfs_name, NULL, }; diff --git a/man/batctl.8 b/man/batctl.8 index ab02e9a..310b43f 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -187,6 +187,9 @@ List of debug tables: .RS 10 \- backbonetable|bbt (compile time option) .RE +.RS 10 +\- datcache|dc (compile time option) +.RE .RE .br .IP "\fBstatistics\fP|\fBs\fP" -- 1.7.12.3

2 5

[B.A.T.M.A.N.] [PATCHv2] batman-adv: enable fast client detection using unicast_4addr packets
by Antonio Quartulli 14 Oct '12

14 Oct '12

The "early client detection mechanism" can be extended to find new clients by means of unicast_4addr packets. The unicast_4addr packet contains as well as the broadcast packet (which is currently used in this mechanism) the address of the originating node and can therefore be used to install new entries in the Global Translation Table Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- v2: - fixed refcounting routing.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/routing.c b/routing.c index 96375c5..2615f91 100644 --- a/routing.c +++ b/routing.c @@ -1042,6 +1042,8 @@ int batadv_recv_unicast_packet(struct sk_buff *skb, struct batadv_priv *bat_priv = netdev_priv(recv_if->soft_iface); struct batadv_unicast_packet *unicast_packet; struct batadv_unicast_4addr_packet *unicast_4addr_packet; + uint8_t *orig_addr; + struct batadv_orig_node *orig_node = NULL; int hdr_size = sizeof(*unicast_packet); bool is4addr; @@ -1061,9 +1063,12 @@ int batadv_recv_unicast_packet(struct sk_buff *skb, /* packet for me */ if (batadv_is_my_mac(unicast_packet->dest)) { - if (is4addr) + if (is4addr) { batadv_dat_inc_counter(bat_priv, unicast_4addr_packet->subtype); + orig_addr = unicast_4addr_packet->src; + orig_node = batadv_orig_hash_find(bat_priv, orig_addr); + } if (batadv_dat_snoop_incoming_arp_request(bat_priv, skb, hdr_size)) @@ -1073,7 +1078,9 @@ int batadv_recv_unicast_packet(struct sk_buff *skb, goto rx_success; batadv_interface_rx(recv_if->soft_iface, skb, recv_if, hdr_size, - NULL); + orig_node); + if (orig_node) + batadv_orig_node_free_ref(orig_node); rx_success: return NET_RX_SUCCESS; -- 1.7.12.3

1 0

[B.A.T.M.A.N.] [PATCH] batman-adv: enable fast client detection using unicast_4addr packets
by Antonio Quartulli 14 Oct '12

14 Oct '12

The "early client detection mechanism" introduced with ("batman-adv: detect not yet announced clients") can be extended to find new clients by means of unicast_4addr packets. The unicast_4addr packet contains as well as the broadcast packet (which is currently used in this mechanism) the address of the originating node and can therefore be used to install new entries in the Global Translation Table Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- ** this patch is based on top of: batman-adv: fix DAT packet counting ** routing.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/routing.c b/routing.c index 75615cc..5df765a 100644 --- a/routing.c +++ b/routing.c @@ -1042,6 +1042,8 @@ int batadv_recv_unicast_packet(struct sk_buff *skb, struct batadv_priv *bat_priv = netdev_priv(recv_if->soft_iface); struct batadv_unicast_packet *unicast_packet; struct batadv_unicast_4addr_packet *unicast_4addr_packet; + uint8_t *orig_addr; + struct batadv_orig_node *orig_node = NULL; int hdr_size = sizeof(*unicast_packet); bool is4addr; @@ -1061,9 +1063,12 @@ int batadv_recv_unicast_packet(struct sk_buff *skb, /* packet for me */ if (batadv_is_my_mac(unicast_packet->dest)) { - if (is4addr) + if (is4addr) { batadv_dat_inc_counter(bat_priv, unicast_4addr_packet->subtype); + orig_addr = unicast_4addr_packet->src; + orig_node = batadv_orig_hash_find(bat_priv, orig_addr); + } if (batadv_dat_snoop_incoming_arp_request(bat_priv, skb, hdr_size)) @@ -1073,7 +1078,7 @@ int batadv_recv_unicast_packet(struct sk_buff *skb, goto rx_success; batadv_interface_rx(recv_if->soft_iface, skb, recv_if, hdr_size, - NULL); + orig_node); rx_success: return NET_RX_SUCCESS; -- 1.7.12

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv: fix DAT packet counting
by Antonio Quartulli 14 Oct '12

14 Oct '12

DAT packets must be counted before any batadv_dat_snoop_incoming_* invocation otherwise the code flow can jump the counters increment at all Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- routing.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/routing.c b/routing.c index 12af7d3..75615cc 100644 --- a/routing.c +++ b/routing.c @@ -1061,6 +1061,10 @@ int batadv_recv_unicast_packet(struct sk_buff *skb, /* packet for me */ if (batadv_is_my_mac(unicast_packet->dest)) { + if (is4addr) + batadv_dat_inc_counter(bat_priv, + unicast_4addr_packet->subtype); + if (batadv_dat_snoop_incoming_arp_request(bat_priv, skb, hdr_size)) goto rx_success; @@ -1068,10 +1072,6 @@ int batadv_recv_unicast_packet(struct sk_buff *skb, hdr_size)) goto rx_success; - if (is4addr) - batadv_dat_inc_counter(bat_priv, - unicast_4addr_packet->subtype); - batadv_interface_rx(recv_if->soft_iface, skb, recv_if, hdr_size, NULL); -- 1.7.12

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv: Mark best gateway in transtable_global debugfs
by Sven Eckelmann 14 Oct '12

14 Oct '12

The transtable_global debug file can show multiple entries for a single client when multiple gateways exist. The chosen gateway isn't marked in the list and therefore the user cannot easily debug the situation when there is a problem with the currently used gateway. The best gateway is now marked with "*" and secondary gateways are marked with "+". Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- translation-table.c | 80 +++++++++++++++++++++++++++++++++++---------------- 1 file changed, 56 insertions(+), 24 deletions(-) diff --git a/translation-table.c b/translation-table.c index 41613b7..ddef48d 100644 --- a/translation-table.c +++ b/translation-table.c @@ -912,6 +912,36 @@ out: return ret; } +/* batadv_transtable_best_orig - Get best originator list entry from tt entry + * @tt_global_entry: global translation table entry to be analyzed + * + * Returns best originator list entry or NULL on errors. + */ +static struct batadv_tt_orig_list_entry * +batadv_transtable_best_orig(struct batadv_tt_global_entry *tt_global_entry) +{ + struct batadv_neigh_node *router = NULL; + struct hlist_head *head; + struct hlist_node *node; + struct batadv_tt_orig_list_entry *orig_entry, *best_entry = NULL; + int best_tq = 0; + + head = &tt_global_entry->orig_list; + hlist_for_each_entry_rcu(orig_entry, node, head, list) { + router = batadv_orig_node_get_router(orig_entry->orig_node); + if (!router) + continue; + + if (router->tq_avg > best_tq) { + best_entry = orig_entry; + best_tq = router->tq_avg; + } + batadv_neigh_node_free_ref(router); + } + + return best_entry; +} + /* print all orig nodes who announce the address for this global entry. * it is assumed that the caller holds rcu_read_lock(); */ @@ -921,21 +951,37 @@ batadv_tt_global_print_entry(struct batadv_tt_global_entry *tt_global_entry, { struct hlist_head *head; struct hlist_node *node; - struct batadv_tt_orig_list_entry *orig_entry; + struct batadv_tt_orig_list_entry *orig_entry, *best_entry; struct batadv_tt_common_entry *tt_common_entry; uint16_t flags; uint8_t last_ttvn; tt_common_entry = &tt_global_entry->common; + flags = tt_common_entry->flags; + + best_entry = batadv_transtable_best_orig(tt_global_entry); + if (best_entry) { + last_ttvn = atomic_read(&best_entry->orig_node->last_ttvn); + seq_printf(seq, " %c %pM (%3u) via %pM (%3u) [%c%c%c]\n", + '*', tt_global_entry->common.addr, + best_entry->ttvn, best_entry->orig_node->orig, + last_ttvn, + (flags & BATADV_TT_CLIENT_ROAM ? 'R' : '.'), + (flags & BATADV_TT_CLIENT_WIFI ? 'W' : '.'), + (flags & BATADV_TT_CLIENT_TEMP ? 'T' : '.')); + } head = &tt_global_entry->orig_list; hlist_for_each_entry_rcu(orig_entry, node, head, list) { - flags = tt_common_entry->flags; + if (best_entry == orig_entry) + continue; + last_ttvn = atomic_read(&orig_entry->orig_node->last_ttvn); - seq_printf(seq, " * %pM (%3u) via %pM (%3u) [%c%c%c]\n", - tt_global_entry->common.addr, orig_entry->ttvn, - orig_entry->orig_node->orig, last_ttvn, + seq_printf(seq, " %c %pM (%3u) via %pM (%3u) [%c%c%c]\n", + '+', tt_global_entry->common.addr, + orig_entry->ttvn, orig_entry->orig_node->orig, + last_ttvn, (flags & BATADV_TT_CLIENT_ROAM ? 'R' : '.'), (flags & BATADV_TT_CLIENT_WIFI ? 'W' : '.'), (flags & BATADV_TT_CLIENT_TEMP ? 'T' : '.')); @@ -1281,11 +1327,7 @@ struct batadv_orig_node *batadv_transtable_search(struct batadv_priv *bat_priv, struct batadv_tt_local_entry *tt_local_entry = NULL; struct batadv_tt_global_entry *tt_global_entry = NULL; struct batadv_orig_node *orig_node = NULL; - struct batadv_neigh_node *router = NULL; - struct hlist_head *head; - struct hlist_node *node; - struct batadv_tt_orig_list_entry *orig_entry; - int best_tq; + struct batadv_tt_orig_list_entry *best_entry; if (src && atomic_read(&bat_priv->ap_isolation)) { tt_local_entry = batadv_tt_local_hash_find(bat_priv, src); @@ -1305,25 +1347,15 @@ struct batadv_orig_node *batadv_transtable_search(struct batadv_priv *bat_priv, _batadv_is_ap_isolated(tt_local_entry, tt_global_entry)) goto out; - best_tq = 0; - rcu_read_lock(); - head = &tt_global_entry->orig_list; - hlist_for_each_entry_rcu(orig_entry, node, head, list) { - router = batadv_orig_node_get_router(orig_entry->orig_node); - if (!router) - continue; - - if (router->tq_avg > best_tq) { - orig_node = orig_entry->orig_node; - best_tq = router->tq_avg; - } - batadv_neigh_node_free_ref(router); - } + best_entry = batadv_transtable_best_orig(tt_global_entry); /* found anything? */ + if (best_entry) + orig_node = best_entry->orig_node; if (orig_node && !atomic_inc_not_zero(&orig_node->refcount)) orig_node = NULL; rcu_read_unlock(); + out: if (tt_global_entry) batadv_tt_global_entry_free_ref(tt_global_entry); -- 1.7.10.4

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv: Remove instant overwritten variable initialization
by Sven Eckelmann 14 Oct '12

14 Oct '12

Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- routing.c | 2 +- sysfs.c | 2 +- translation-table.c | 20 ++++++++++---------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/routing.c b/routing.c index 12af7d3..e146370 100644 --- a/routing.c +++ b/routing.c @@ -911,7 +911,7 @@ batadv_reroute_unicast_packet(struct batadv_priv *bat_priv, struct batadv_unicast_packet *unicast_packet, uint8_t *dst_addr) { - struct batadv_orig_node *orig_node = NULL; + struct batadv_orig_node *orig_node; bool ret = false; orig_node = batadv_transtable_search(bat_priv, NULL, dst_addr); diff --git a/sysfs.c b/sysfs.c index 7fdc220..cc56ed0 100644 --- a/sysfs.c +++ b/sysfs.c @@ -739,7 +739,7 @@ int batadv_throw_uevent(struct batadv_priv *bat_priv, enum batadv_uev_type type, enum batadv_uev_action action, const char *data) { int ret = -ENOMEM; - struct batadv_hard_iface *primary_if = NULL; + struct batadv_hard_iface *primary_if; struct kobject *bat_kobj; char *uevent_env[4] = { NULL, NULL, NULL, NULL }; diff --git a/translation-table.c b/translation-table.c index 1f5ad91..41613b7 100644 --- a/translation-table.c +++ b/translation-table.c @@ -256,8 +256,8 @@ void batadv_tt_local_add(struct net_device *soft_iface, const uint8_t *addr, int ifindex) { struct batadv_priv *bat_priv = netdev_priv(soft_iface); - struct batadv_tt_local_entry *tt_local = NULL; - struct batadv_tt_global_entry *tt_global = NULL; + struct batadv_tt_local_entry *tt_local; + struct batadv_tt_global_entry *tt_global; struct hlist_head *head; struct hlist_node *node; struct batadv_tt_orig_list_entry *orig_entry; @@ -543,7 +543,7 @@ 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; + struct batadv_tt_local_entry *tt_local_entry; uint16_t flags, curr_flags = BATADV_NO_FLAGS; tt_local_entry = batadv_tt_local_hash_find(bat_priv, addr); @@ -783,8 +783,8 @@ int batadv_tt_global_add(struct batadv_priv *bat_priv, const unsigned char *tt_addr, uint8_t flags, uint8_t ttvn) { - struct batadv_tt_global_entry *tt_global_entry = NULL; - struct batadv_tt_local_entry *tt_local_entry = NULL; + struct batadv_tt_global_entry *tt_global_entry; + struct batadv_tt_local_entry *tt_local_entry; int ret = 0; int hash_added; struct batadv_tt_common_entry *common; @@ -1074,7 +1074,7 @@ static void batadv_tt_global_del(struct batadv_priv *bat_priv, const unsigned char *addr, const char *message, bool roaming) { - struct batadv_tt_global_entry *tt_global_entry = NULL; + struct batadv_tt_global_entry *tt_global_entry; struct batadv_tt_local_entry *local_entry = NULL; tt_global_entry = batadv_tt_global_hash_find(bat_priv, addr); @@ -1677,7 +1677,7 @@ static bool batadv_send_other_tt_response(struct batadv_priv *bat_priv, struct batadv_tt_query_packet *tt_request) { - struct batadv_orig_node *req_dst_orig_node = NULL; + struct batadv_orig_node *req_dst_orig_node; struct batadv_orig_node *res_dst_orig_node = NULL; struct batadv_neigh_node *neigh_node = NULL; struct batadv_hard_iface *primary_if = NULL; @@ -1812,7 +1812,7 @@ static bool batadv_send_my_tt_response(struct batadv_priv *bat_priv, struct batadv_tt_query_packet *tt_request) { - struct batadv_orig_node *orig_node = NULL; + struct batadv_orig_node *orig_node; struct batadv_neigh_node *neigh_node = NULL; struct batadv_hard_iface *primary_if = NULL; uint8_t my_ttvn, req_ttvn, ttvn; @@ -1978,7 +1978,7 @@ static void _batadv_tt_update_changes(struct batadv_priv *bat_priv, static void batadv_tt_fill_gtable(struct batadv_priv *bat_priv, struct batadv_tt_query_packet *tt_response) { - struct batadv_orig_node *orig_node = NULL; + struct batadv_orig_node *orig_node; orig_node = batadv_orig_hash_find(bat_priv, tt_response->src); if (!orig_node) @@ -2020,7 +2020,7 @@ static void batadv_tt_update_changes(struct batadv_priv *bat_priv, bool batadv_is_my_client(struct batadv_priv *bat_priv, const uint8_t *addr) { - struct batadv_tt_local_entry *tt_local_entry = NULL; + struct batadv_tt_local_entry *tt_local_entry; bool ret = false; tt_local_entry = batadv_tt_local_hash_find(bat_priv, addr); -- 1.7.10.4

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv: fix new line alignment
by Antonio Quartulli 14 Oct '12

14 Oct '12

Introduced with ("batman-adv: Distributed ARP Table - create DHT helper functions") Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- distributed-arp-table.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distributed-arp-table.h b/distributed-arp-table.h index 22dd983..63a13a5 100644 --- a/distributed-arp-table.h +++ b/distributed-arp-table.h @@ -60,7 +60,7 @@ batadv_dat_init_orig_node_addr(struct batadv_orig_node *orig_node) */ static inline void batadv_dat_init_own_addr(struct batadv_priv *bat_priv, - struct batadv_hard_iface *primary_if) + struct batadv_hard_iface *primary_if) { uint32_t addr; -- 1.7.12

2 1

[B.A.T.M.A.N.] batman-adv: ap mode with isolation enabled
by Nicolás Echániz 13 Oct '12

13 Oct '12

Hi folks, I don't know if this is common knowledge, but we have been experimenting with isolation in our mixed mode batman-adv network and got some interesting results we'd like to share. Here's a blog post on this matter with related graphics: http://blog.altermundi.net/article/batman-adv-ap-mode-with-isolation-enable… Summary: Infrastrucutre nodes tend to "confuse" batman-adv. Every client connected to an ap will “think” that it is directly connected to every other client, which creates a mess in potential hops selection. Turing isolation on in the AP solves the problem. Client nodes will no longer see OGMs from other clients and will correctly show their AP as next hop. Would you say there are any bad side-effects to this approach? Cheers, NicoEchániz

4 8

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N October 2012