B.A.T.M.A.N

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

15 participants
4308 discussions

[B.A.T.M.A.N.] [PATCH] batman-adv: invoke ogm_schedule() only when the interface is activated
by Antonio Quartulli 23 Mar '13

23 Mar '13

the current implementation works as expected because once ogm_schedule() has been invoked once it will continue to invoke itself periodically thanks to the schedule (but not sent) packets. A correct behaviour would be to wait for the interface to be ready for sending before scheduling the first OGM. Moreover another routing algorithm may not schedule any packet because the interface is not active yet, and this would lead to a breakage in the interface activation procedure Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- hard-interface.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hard-interface.c b/hard-interface.c index d55213c..4a1a24b 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -339,6 +339,8 @@ batadv_hardif_activate_interface(struct batadv_hard_iface *hard_iface) batadv_update_min_mtu(hard_iface->soft_iface); + /* begin scheduling originator messages on that interface */ + batadv_schedule_bat_ogm(hard_iface); out: if (primary_if) batadv_hardif_free_ref(primary_if); @@ -453,9 +455,6 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface, "Not using interface %s (retrying later): interface not active\n", hard_iface->net_dev->name); - /* begin scheduling originator messages on that interface */ - batadv_schedule_bat_ogm(hard_iface); - out: return 0; -- 1.8.1.5

1 0

[B.A.T.M.A.N.] [RFC] batman-adv: make the routing API more generic
by Antonio Quartulli 23 Mar '13

23 Mar '13

From: Antonio Quartulli <antonio(a)open-mesh.com> The current routing API exports bat_ogm_emit() and bat_ogm_schedule() which are strictly related to the way B.A.T.M.A.N. IV was implemented. Moreover they are invoked like "callbacks" and not like real APIs. Implementing a new algorithm which behaves differently using this schema is difficult or probably impossible at all. Remove bat_ogm_emit() and bat_ogm_schedule(), which can be directly handled inside the routing code and add bat_iface_activate() which is invoked when the interface is ready to send packets. This new function is used by the routing code to start any sending mechanism or periodic work Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> --- bat_iv_ogm.c | 47 +++++++++++++++++++++++++++++++++++++++++++---- hard-interface.c | 10 +++++++--- main.c | 3 +-- send.c | 56 +------------------------------------------------------- send.h | 1 + types.h | 7 +++---- 6 files changed, 56 insertions(+), 68 deletions(-) diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 071f288..5d6cc79 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -376,6 +376,8 @@ out: return res; } +static void batadv_iv_ogm_send_outstanding(struct work_struct *work); + /* create a new aggregated packet and add this packet to it */ static void batadv_iv_ogm_aggregate_new(const unsigned char *packet_buff, int packet_len, unsigned long send_time, @@ -447,7 +449,7 @@ static void batadv_iv_ogm_aggregate_new(const unsigned char *packet_buff, /* start timer for this packet */ INIT_DELAYED_WORK(&forw_packet_aggr->delayed_work, - batadv_send_outstanding_bat_ogm_packet); + batadv_iv_ogm_send_outstanding); queue_delayed_work(batadv_event_workqueue, &forw_packet_aggr->delayed_work, send_time - jiffies); @@ -601,6 +603,9 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface) uint32_t seqno; uint8_t bandwidth; + if (hard_iface->if_status != BATADV_IF_ACTIVE) + return; + vis_server = atomic_read(&bat_priv->vis_mode); primary_if = batadv_primary_if_get_selected(bat_priv); @@ -643,6 +648,40 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface) batadv_hardif_free_ref(primary_if); } +static void batadv_iv_ogm_send_outstanding(struct work_struct *work) +{ + struct delayed_work *delayed_work; + struct batadv_forw_packet *forw_packet; + struct batadv_priv *bat_priv; + + delayed_work = container_of(work, struct delayed_work, work); + forw_packet = container_of(delayed_work, struct batadv_forw_packet, + delayed_work); + bat_priv = netdev_priv(forw_packet->if_incoming->soft_iface); + spin_lock_bh(&bat_priv->forw_bat_list_lock); + hlist_del(&forw_packet->list); + spin_unlock_bh(&bat_priv->forw_bat_list_lock); + + if (atomic_read(&bat_priv->mesh_state) == BATADV_MESH_DEACTIVATING) + goto out; + + batadv_iv_ogm_emit(forw_packet); + + /* we have to have at least one packet in the queue + * to determine the queues wake up time unless we are + * shutting down + */ + if (forw_packet->own) + batadv_iv_ogm_schedule(forw_packet->if_incoming); + +out: + /* don't count own packet */ + if (!forw_packet->own) + atomic_inc(&bat_priv->batman_queue_left); + + batadv_forw_packet_free(forw_packet); +} + static void batadv_iv_ogm_orig_update(struct batadv_priv *bat_priv, struct batadv_orig_node *orig_node, @@ -1280,7 +1319,8 @@ static int batadv_iv_ogm_receive(struct sk_buff *skb, /* did we receive a B.A.T.M.A.N. IV OGM packet on an interface * that does not have B.A.T.M.A.N. IV enabled ? */ - if (bat_priv->bat_algo_ops->bat_ogm_emit != batadv_iv_ogm_emit) + if (bat_priv->bat_algo_ops->bat_iface_activate != + batadv_iv_ogm_schedule) return NET_RX_DROP; batadv_inc_counter(bat_priv, BATADV_CNT_MGMT_RX); @@ -1317,8 +1357,7 @@ static struct batadv_algo_ops batadv_batman_iv __read_mostly = { .bat_iface_disable = batadv_iv_ogm_iface_disable, .bat_iface_update_mac = batadv_iv_ogm_iface_update_mac, .bat_primary_iface_set = batadv_iv_ogm_primary_iface_set, - .bat_ogm_schedule = batadv_iv_ogm_schedule, - .bat_ogm_emit = batadv_iv_ogm_emit, + .bat_iface_activate = batadv_iv_ogm_schedule, }; int __init batadv_iv_init(void) diff --git a/hard-interface.c b/hard-interface.c index d55213c..8e57693 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -339,6 +339,13 @@ batadv_hardif_activate_interface(struct batadv_hard_iface *hard_iface) batadv_update_min_mtu(hard_iface->soft_iface); + /* the interface gets activated here to avoid race conditions when the + * originator mac has not properly set yet + */ + hard_iface->if_status = BATADV_IF_ACTIVE; + + bat_priv->bat_algo_ops->bat_iface_activate(hard_iface); + out: if (primary_if) batadv_hardif_free_ref(primary_if); @@ -453,9 +460,6 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface, "Not using interface %s (retrying later): interface not active\n", hard_iface->net_dev->name); - /* begin scheduling originator messages on that interface */ - batadv_schedule_bat_ogm(hard_iface); - out: return 0; diff --git a/main.c b/main.c index 62b1f89..31f71b6 100644 --- a/main.c +++ b/main.c @@ -383,8 +383,7 @@ int batadv_algo_register(struct batadv_algo_ops *bat_algo_ops) !bat_algo_ops->bat_iface_disable || !bat_algo_ops->bat_iface_update_mac || !bat_algo_ops->bat_primary_iface_set || - !bat_algo_ops->bat_ogm_schedule || - !bat_algo_ops->bat_ogm_emit) { + !bat_algo_ops->bat_iface_activate) { pr_info("Routing algo '%s' does not implement required ops\n", bat_algo_ops->name); ret = -EINVAL; diff --git a/send.c b/send.c index eb16b04..0642756 100644 --- a/send.c +++ b/send.c @@ -118,27 +118,7 @@ bool batadv_send_skb_to_orig(struct sk_buff *skb, return true; } -void batadv_schedule_bat_ogm(struct batadv_hard_iface *hard_iface) -{ - struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface); - - if ((hard_iface->if_status == BATADV_IF_NOT_IN_USE) || - (hard_iface->if_status == BATADV_IF_TO_BE_REMOVED)) - return; - - /* the interface gets activated here to avoid race conditions between - * the moment of activating the interface in - * hardif_activate_interface() where the originator mac is set and - * outdated packets (especially uninitialized mac addresses) in the - * packet queue - */ - if (hard_iface->if_status == BATADV_IF_TO_BE_ACTIVATED) - hard_iface->if_status = BATADV_IF_ACTIVE; - - bat_priv->bat_algo_ops->bat_ogm_schedule(hard_iface); -} - -static void batadv_forw_packet_free(struct batadv_forw_packet *forw_packet) +void batadv_forw_packet_free(struct batadv_forw_packet *forw_packet) { if (forw_packet->skb) kfree_skb(forw_packet->skb); @@ -285,40 +265,6 @@ out: atomic_inc(&bat_priv->bcast_queue_left); } -void batadv_send_outstanding_bat_ogm_packet(struct work_struct *work) -{ - struct delayed_work *delayed_work; - struct batadv_forw_packet *forw_packet; - struct batadv_priv *bat_priv; - - delayed_work = container_of(work, struct delayed_work, work); - forw_packet = container_of(delayed_work, struct batadv_forw_packet, - delayed_work); - bat_priv = netdev_priv(forw_packet->if_incoming->soft_iface); - spin_lock_bh(&bat_priv->forw_bat_list_lock); - hlist_del(&forw_packet->list); - spin_unlock_bh(&bat_priv->forw_bat_list_lock); - - if (atomic_read(&bat_priv->mesh_state) == BATADV_MESH_DEACTIVATING) - goto out; - - bat_priv->bat_algo_ops->bat_ogm_emit(forw_packet); - - /* we have to have at least one packet in the queue - * to determine the queues wake up time unless we are - * shutting down - */ - if (forw_packet->own) - batadv_schedule_bat_ogm(forw_packet->if_incoming); - -out: - /* don't count own packet */ - if (!forw_packet->own) - atomic_inc(&bat_priv->batman_queue_left); - - batadv_forw_packet_free(forw_packet); -} - void batadv_purge_outstanding_packets(struct batadv_priv *bat_priv, const struct batadv_hard_iface *hard_iface) diff --git a/send.h b/send.h index 38e662f..0a966e6 100644 --- a/send.h +++ b/send.h @@ -34,5 +34,6 @@ void batadv_send_outstanding_bat_ogm_packet(struct work_struct *work); void batadv_purge_outstanding_packets(struct batadv_priv *bat_priv, const struct batadv_hard_iface *hard_iface); +void batadv_forw_packet_free(struct batadv_forw_packet *forw_packet); #endif /* _NET_BATMAN_ADV_SEND_H_ */ diff --git a/types.h b/types.h index 5f542bd..8466a85 100644 --- a/types.h +++ b/types.h @@ -946,8 +946,8 @@ struct batadv_vis_if_list_entry { * @bat_iface_update_mac: (re-)init mac addresses of the protocol information * belonging to this hard-interface * @bat_primary_iface_set: called when primary interface is selected / changed - * @bat_ogm_schedule: prepare a new outgoing OGM for the send queue - * @bat_ogm_emit: send scheduled OGM + * @bat_iface_activate: called when the interface is activated and can be used + * for transmissions */ struct batadv_algo_ops { struct hlist_node list; @@ -956,8 +956,7 @@ struct batadv_algo_ops { void (*bat_iface_disable)(struct batadv_hard_iface *hard_iface); void (*bat_iface_update_mac)(struct batadv_hard_iface *hard_iface); void (*bat_primary_iface_set)(struct batadv_hard_iface *hard_iface); - void (*bat_ogm_schedule)(struct batadv_hard_iface *hard_iface); - void (*bat_ogm_emit)(struct batadv_forw_packet *forw_packet); + void (*bat_iface_activate)(struct batadv_hard_iface *hard_iface); }; /** -- 1.8.1.5

1 0

[B.A.T.M.A.N.] Multiple border gateways between bat-networks
by Gui Iribarren 20 Mar '13

20 Mar '13

Hey folks! today we bring you a riddle to start the week /me grins... First, some clues: http://comments.gmane.org/gmane.org.freifunk.batman/6603 http://www.open-mesh.org/projects/open-mesh/wiki/FAQ#How-do-I-announce-IP-s… now, given the attached diagram .png * the description given in the wiki still applies, i.e. A, B, C... nodes run your favourite layer3 dynamic routing protocol, and all nodes run batman, in segmented (colored) clouds = subnets. * i am one of the clients connected to F * in the blue cloud, there's one preferred gw_mode=server which is D (or E for that matter, but certainly not F or G) * D gave me a DHCP OFFER and since then is my default gw, which i use to access the internet. I have no other routes setup. * the violet link G <-> H although it looks "long" is in fact a superb link, 0% packet loss, high bw. F <-> G also works great. Now, i want to send a file to H. Visibly, the optimal route would be F -> G -> H. BUT, i only have a default gw, which is D. I pass the packet to D. Thanks to the layer3 routing protocol, D knows that both E and G have access to the red network. However, E is closer so it relays the packet there, and at the same time ICMP-REDIRECTs me saying "hey, in order to get to the red network, you don't need to send packets to me; save yourself a hop and use E directly" Great, so now i get a new temporary routing entry which is sub-optimal, since my traffic will go all over 5 hops, instead of taking the optimal F-G-H Now the catchy question: Is there any way for my traffic to find the optimal path, in this scenario? Spoiler: I get the feeling the answer is "no", since D is giving me the optimal path *according to D perspective*, and there's no way to for D to understand my perspective. So... it seems to me that, even with this mix of layer2 and 3 described in the wiki, the solution cannot currently handle traffic in the most optimal way, inside networks that have more than one border gateway with another network. But asking never hurts! Bonus question: If my reasoning is correct, and my conclusion is sadly true... are there any plans to address this issue (/corner case?), and how? Have a nice week! Gui

3 2

[B.A.T.M.A.N.] [PATCHv2] batman-adv: fix old master freeing operation
by Antonio Quartulli 19 Mar '13

19 Mar '13

When a new hard_iface has a master already, ndo_del_slave has to be used in order to let the old master perform its cleaning up routing correctly. Unregistering the master iface only could lead to a inconsistent state in the old master knowledge. Introduced by 5e57e3bff429cd403f0e30af69cf87a2cd55598f ("batman-adv: free an hard-interface before adding it"). Reported-by: Marek Lindner <lindner_marek(a)yahoo.de> Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- v2: - patch restyled - added compat code for <2.6.39 (Thanks to Simon) compat.h | 4 +++- hard-interface.c | 29 +++++++++++++++++++++++++++-- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/compat.h b/compat.h index ba07ae4..a5a4f1d 100644 --- a/compat.h +++ b/compat.h @@ -161,8 +161,10 @@ static const struct { \ } __attribute__((unused)) __useless_ops1 = { \ .ndo_validate_addr -#endif /* < KERNEL_VERSION(2, 6, 39) */ +#define ndo_del_slave ndo_init +#define ndo_init(x, y) ndo_init - master->netdev_ops->ndo_init - EINVAL +#endif /* < KERNEL_VERSION(2, 6, 39) */ #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 0, 0) diff --git a/hard-interface.c b/hard-interface.c index fd99e42..b7fb9c0 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -307,6 +307,30 @@ batadv_hardif_deactivate_interface(struct batadv_hard_iface *hard_iface) batadv_update_min_mtu(hard_iface->soft_iface); } +/** + * batadv_master_del_slave - remove hard_iface from the current master interface + * @slave: the interface enslaved in another master + * @master: the master from which slave has to be removed + * + * Invoke ndo_del_slave on master passing slave as argument. In this way slave + * is free'd and master can correctly change its internal state. + * Return 0 on success, a negative value representing the error otherwise + */ +static int batadv_master_del_slave(struct batadv_hard_iface *slave, + struct net_device *master) +{ + int ret; + + if (!master) + return 0; + + ret = -EINVAL; + if (master->netdev_ops->ndo_del_slave) + ret = master->netdev_ops->ndo_del_slave(master, slave->net_dev); + + return ret; +} + int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface, const char *iface_name) { @@ -346,8 +370,9 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface, * in that case unlink it first */ master = netdev_master_upper_dev_get(hard_iface->net_dev); - if (master) - netdev_upper_dev_unlink(hard_iface->net_dev, master); + ret = batadv_master_del_slave(hard_iface, master); + if (ret) + goto err_dev; hard_iface->soft_iface = soft_iface; bat_priv = netdev_priv(hard_iface->soft_iface); -- 1.8.1.5

1 0

[B.A.T.M.A.N.] [PATCH] Fix compat for for Debian Wheezy kernel v3.2.39
by Matthias Schiffer 18 Mar '13

18 Mar '13

Starting with kernel v3.2.39, a Debian specific patch defines eth_hw_addr_random() in include/linux/etherdevice.h, causing the build of batman-adv to fail. This patch fixes the build on these kernels while keeping compatiblity with unpatched kernels by replacing batman-adv's compat definition of the eth_hw_addr_random() function with a #define macro. Signed-off-by: Matthias Schiffer <mschiffer(a)universe-factory.net> --- compat.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/compat.h b/compat.h index e1c6cd2..46baf6c 100644 --- a/compat.h +++ b/compat.h @@ -174,10 +174,7 @@ static inline void skb_reset_mac_len(struct sk_buff *skb) #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0) -static inline void eth_hw_addr_random(struct net_device *dev) -{ - random_ether_addr(dev->dev_addr); -} +#define eth_hw_addr_random(dev) random_ether_addr((dev)->dev_addr) #endif /* < KERNEL_VERSION(3, 4, 0) */ -- 1.8.2

2 4

[B.A.T.M.A.N.] [PATCH] batman-adv: add RCU compat code for linux < 2.6.34
by Antonio Quartulli 18 Mar '13

18 Mar '13

In linux version < 2.6.34 rcu_dereference_raw() does not exist and needs to be backported. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- compat.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/compat.h b/compat.h index 6a7e03b..23f43d5 100644 --- a/compat.h +++ b/compat.h @@ -81,6 +81,12 @@ static inline void batadv_this_cpu_add(uint64_t *count_ptr, size_t count) #define rcu_dereference_protected(p, c) (p) +#define rcu_dereference_raw(p) ({ \ + typeof(p) _________p1 = ACCESS_ONCE(p); \ + smp_read_barrier_depends(); \ + (_________p1); \ + }) + #endif /* < KERNEL_VERSION(2, 6, 34) */ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35) -- 1.8.1.5

2 1

[B.A.T.M.A.N.] [PATCHv2] batman-adv: add RCU compat code for kernel < 2.6.37
by Antonio Quartulli 18 Mar '13

18 Mar '13

In linux version < 2.6.37 hlist_first_rcu() and hlist_next_rcu() do not exist and therefore they need to be backported. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- compat.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/compat.h b/compat.h index e1c6cd2..a71be7d 100644 --- a/compat.h +++ b/compat.h @@ -129,6 +129,12 @@ static inline int batadv_param_set_copystring(const char *val, #endif /* < KERNEL_VERSION(2, 6, 36) */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 37) + +#define hlist_first_rcu(head) (*((struct hlist_node __rcu **)(&(head)->first))) +#define hlist_next_rcu(node) (*((struct hlist_node __rcu **)(&(node)->next))) + +#endif /* < KERNEL_VERSION(2, 6, 37) */ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39) -- 1.8.1.5

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv: add compat RCU code for kernel < 2.6.37
by Antonio Quartulli 16 Mar '13

16 Mar '13

In linux version < 2.6.37 hlist_first_rcu() and hlist_next_rcu() do not exist and therefore they need to be backported. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- compat.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/compat.h b/compat.h index e1c6cd2..6a7e03b 100644 --- a/compat.h +++ b/compat.h @@ -129,6 +129,12 @@ static inline int batadv_param_set_copystring(const char *val, #endif /* < KERNEL_VERSION(2, 6, 36) */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 37) + +#define hlist_first_rcu(head) (*((struct hlist_node __rcu **)(&(head)->first))) +#define hlist_next_rcu(node) (*((struct hlist_node __rcu **)(&(node)->next))) + +#endif /* < KERNEL_VERSION(2, 6, 37) */ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39) @@ -236,6 +242,7 @@ static int __batadv_interface_set_mac_addr(x, y) ASSERT_RTNL();\ dev->master;\ }) + #define hlist_entry_safe(ptr, type, member) \ (ptr) ? hlist_entry(ptr, type, member) : NULL -- 1.8.1.5

2 2

[B.A.T.M.A.N.] [PATCH] batman-adv: fix typos in kernel doc & comments
by Marek Lindner 16 Mar '13

16 Mar '13

Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> --- distributed-arp-table.c | 82 ++++++++++++++++++++++------------------------- 1 file changed, 39 insertions(+), 43 deletions(-) diff --git a/distributed-arp-table.c b/distributed-arp-table.c index 8e15d96..3a3e1d8 100644 --- a/distributed-arp-table.c +++ b/distributed-arp-table.c @@ -45,9 +45,9 @@ static void batadv_dat_start_timer(struct batadv_priv *bat_priv) } /** - * batadv_dat_entry_free_ref - decrements the dat_entry refcounter and possibly + * batadv_dat_entry_free_ref - decrement the dat_entry refcounter and possibly * free it - * @dat_entry: the oentry to free + * @dat_entry: the entry to free */ static void batadv_dat_entry_free_ref(struct batadv_dat_entry *dat_entry) { @@ -56,10 +56,10 @@ static void batadv_dat_entry_free_ref(struct batadv_dat_entry *dat_entry) } /** - * batadv_dat_to_purge - checks whether a dat_entry has to be purged or not + * batadv_dat_to_purge - check whether a dat_entry has to be purged or not * @dat_entry: the entry to check * - * Returns true if the entry has to be purged now, false otherwise + * Returns true if the entry has to be purged now, false otherwise. */ static bool batadv_dat_to_purge(struct batadv_dat_entry *dat_entry) { @@ -75,8 +75,8 @@ static bool batadv_dat_to_purge(struct batadv_dat_entry *dat_entry) * returns a boolean value: true is the entry has to be deleted, * false otherwise * - * Loops over each entry in the DAT local storage and delete it if and only if - * the to_purge function passed as argument returns true + * Loops over each entry in the DAT local storage and deletes it if and only if + * the to_purge function passed as argument returns true. */ static void __batadv_dat_purge(struct batadv_priv *bat_priv, bool (*to_purge)(struct batadv_dat_entry *)) @@ -97,7 +97,7 @@ static void __batadv_dat_purge(struct batadv_priv *bat_priv, spin_lock_bh(list_lock); hlist_for_each_entry_safe(dat_entry, node_tmp, head, hash_entry) { - /* if an helper function has been passed as parameter, + /* if a helper function has been passed as parameter, * ask it if the entry has to be purged or not */ if (to_purge && !to_purge(dat_entry)) @@ -134,7 +134,7 @@ static void batadv_dat_purge(struct work_struct *work) * @node: node in the local table * @data2: second object to compare the node to * - * Returns 1 if the two entry are the same, 0 otherwise + * Returns 1 if the two entries are the same, 0 otherwise. */ static int batadv_compare_dat(const struct hlist_node *node, const void *data2) { @@ -149,7 +149,7 @@ static int batadv_compare_dat(const struct hlist_node *node, const void *data2) * @skb: ARP packet * @hdr_size: size of the possible header before the ARP packet * - * Returns the value of the hw_src field in the ARP packet + * Returns the value of the hw_src field in the ARP packet. */ static uint8_t *batadv_arp_hw_src(struct sk_buff *skb, int hdr_size) { @@ -166,7 +166,7 @@ static uint8_t *batadv_arp_hw_src(struct sk_buff *skb, int hdr_size) * @skb: ARP packet * @hdr_size: size of the possible header before the ARP packet * - * Returns the value of the ip_src field in the ARP packet + * Returns the value of the ip_src field in the ARP packet. */ static __be32 batadv_arp_ip_src(struct sk_buff *skb, int hdr_size) { @@ -178,7 +178,7 @@ static __be32 batadv_arp_ip_src(struct sk_buff *skb, int hdr_size) * @skb: ARP packet * @hdr_size: size of the possible header before the ARP packet * - * Returns the value of the hw_dst field in the ARP packet + * Returns the value of the hw_dst field in the ARP packet. */ static uint8_t *batadv_arp_hw_dst(struct sk_buff *skb, int hdr_size) { @@ -190,7 +190,7 @@ static uint8_t *batadv_arp_hw_dst(struct sk_buff *skb, int hdr_size) * @skb: ARP packet * @hdr_size: size of the possible header before the ARP packet * - * Returns the value of the ip_dst field in the ARP packet + * Returns the value of the ip_dst field in the ARP packet. */ static __be32 batadv_arp_ip_dst(struct sk_buff *skb, int hdr_size) { @@ -202,7 +202,7 @@ static __be32 batadv_arp_ip_dst(struct sk_buff *skb, int hdr_size) * @data: data to hash * @size: size of the hash table * - * Returns the selected index in the hash table for the given data + * Returns the selected index in the hash table for the given data. */ static uint32_t batadv_hash_dat(const void *data, uint32_t size) { @@ -224,12 +224,12 @@ static uint32_t batadv_hash_dat(const void *data, uint32_t size) } /** - * batadv_dat_entry_hash_find - looks for a given dat_entry in the local hash + * batadv_dat_entry_hash_find - look for a given dat_entry in the local hash * table * @bat_priv: the bat priv with all the soft interface information * @ip: search key * - * Returns the dat_entry if found, NULL otherwise + * Returns the dat_entry if found, NULL otherwise. */ static struct batadv_dat_entry * batadv_dat_entry_hash_find(struct batadv_priv *bat_priv, __be32 ip) @@ -343,9 +343,6 @@ static void batadv_dbg_arp(struct batadv_priv *bat_priv, struct sk_buff *skb, if (hdr_size == 0) return; - /* if the ARP packet is encapsulated in a batman packet, let's print - * some debug messages - */ unicast_4addr_packet = (struct batadv_unicast_4addr_packet *)skb->data; switch (unicast_4addr_packet->u.header.packet_type) { @@ -409,7 +406,8 @@ static void batadv_dbg_arp(struct batadv_priv *bat_priv, struct sk_buff *skb, * @candidate: orig_node under evaluation * @max_orig_node: last selected candidate * - * Returns true if the node has been elected as next candidate or false othrwise + * Returns true if the node has been elected as next candidate or false + * otherwise. */ static bool batadv_is_orig_node_eligible(struct batadv_dat_candidate *res, int select, batadv_dat_addr_t tmp_max, @@ -472,7 +470,7 @@ static void batadv_choose_next_candidate(struct batadv_priv *bat_priv, */ cands[select].type = BATADV_DAT_CANDIDATE_NOT_FOUND; - /* iterate over the originator list and find the node with closest + /* iterate over the originator list and find the node with the closest * dat_address which has not been selected yet */ for (i = 0; i < hash->size; i++) { @@ -480,7 +478,7 @@ static void batadv_choose_next_candidate(struct batadv_priv *bat_priv, rcu_read_lock(); hlist_for_each_entry_rcu(orig_node, head, hash_entry) { - /* the dht space is a ring and addresses are unsigned */ + /* the dht space is a ring using unsigned addresses */ tmp_max = BATADV_DAT_ADDR_MAX - orig_node->dat_addr + ip_key; @@ -512,7 +510,7 @@ static void batadv_choose_next_candidate(struct batadv_priv *bat_priv, } /** - * batadv_dat_select_candidates - selects the nodes which the DHT message has to + * batadv_dat_select_candidates - select the nodes which the DHT message has to * be sent to * @bat_priv: the bat priv with all the soft interface information * @ip_dst: ipv4 to look up in the DHT @@ -521,7 +519,7 @@ static void batadv_choose_next_candidate(struct batadv_priv *bat_priv, * closest values (from the LEFT, with wrap around if needed) then the hash * value of the key. ip_dst is the key. * - * Returns the candidate array of size BATADV_DAT_CANDIDATE_NUM + * Returns the candidate array of size BATADV_DAT_CANDIDATE_NUM. */ static struct batadv_dat_candidate * batadv_dat_select_candidates(struct batadv_priv *bat_priv, __be32 ip_dst) @@ -558,10 +556,11 @@ batadv_dat_select_candidates(struct batadv_priv *bat_priv, __be32 ip_dst) * @ip: the DHT key * @packet_subtype: unicast4addr packet subtype to use * - * In this function the skb is copied by means of pskb_copy() and is sent as - * unicast packet to each of the selected candidates + * This function copies the skb with pskb_copy() and is sent as unicast packet + * to each of the selected candidates. * - * Returns true if the packet is sent to at least one candidate, false otherwise + * Returns true if the packet is sent to at least one candidate, false + * otherwise. */ static bool batadv_dat_send_data(struct batadv_priv *bat_priv, struct sk_buff *skb, __be32 ip, @@ -727,7 +726,7 @@ out: * @skb: packet to analyse * @hdr_size: size of the possible header before the ARP packet in the skb * - * Returns the ARP type if the skb contains a valid ARP packet, 0 otherwise + * Returns the ARP type if the skb contains a valid ARP packet, 0 otherwise. */ static uint16_t batadv_arp_get_type(struct batadv_priv *bat_priv, struct sk_buff *skb, int hdr_size) @@ -754,9 +753,7 @@ static uint16_t batadv_arp_get_type(struct batadv_priv *bat_priv, arphdr = (struct arphdr *)(skb->data + hdr_size + ETH_HLEN); - /* Check whether the ARP packet carries a valid - * IP information - */ + /* check whether the ARP packet carries a valid IP information */ if (arphdr->ar_hrd != htons(ARPHRD_ETHER)) goto out; @@ -784,7 +781,7 @@ static uint16_t batadv_arp_get_type(struct batadv_priv *bat_priv, if (is_zero_ether_addr(hw_src) || is_multicast_ether_addr(hw_src)) goto out; - /* we don't care about the destination MAC address in ARP requests */ + /* don't care about the destination MAC address in ARP requests */ if (arphdr->ar_op != htons(ARPOP_REQUEST)) { hw_dst = batadv_arp_hw_dst(skb, hdr_size); if (is_zero_ether_addr(hw_dst) || @@ -804,8 +801,8 @@ out: * @skb: packet to check * * Returns true if the message has been sent to the dht candidates, false - * otherwise. In case of true the message has to be enqueued to permit the - * fallback + * otherwise. In case of a positive return value the message has to be enqueued + * to permit the fallback. */ bool batadv_dat_snoop_outgoing_arp_request(struct batadv_priv *bat_priv, struct sk_buff *skb) @@ -854,7 +851,7 @@ bool batadv_dat_snoop_outgoing_arp_request(struct batadv_priv *bat_priv, batadv_dbg(BATADV_DBG_DAT, bat_priv, "ARP request replied locally\n"); ret = true; } else { - /* Send the request on the DHT */ + /* Send the request to the DHT */ ret = batadv_dat_send_data(bat_priv, skb, ip_dst, BATADV_P_DAT_DHT_GET); } @@ -871,7 +868,7 @@ out: * @skb: packet to check * @hdr_size: size of the encapsulation header * - * Returns true if the request has been answered, false otherwise + * Returns true if the request has been answered, false otherwise. */ bool batadv_dat_snoop_incoming_arp_request(struct batadv_priv *bat_priv, struct sk_buff *skb, int hdr_size) @@ -911,10 +908,9 @@ bool batadv_dat_snoop_incoming_arp_request(struct batadv_priv *bat_priv, if (!skb_new) goto out; - /* to preserve backwards compatibility, here the node has to answer - * using the same packet type it received for the request. This is due - * to that if a node is not using the 4addr packet format it may not - * support it. + /* To preserve backwards compatibility, the node has choose the outgoing + * format based on the incoming request packet type. The assumption is + * that a node not using the 4addr packet format doesn't support it. */ if (hdr_size == sizeof(struct batadv_unicast_4addr_packet)) err = batadv_unicast_4addr_send_skb(bat_priv, skb_new, @@ -964,7 +960,7 @@ void batadv_dat_snoop_outgoing_arp_reply(struct batadv_priv *bat_priv, batadv_dat_entry_add(bat_priv, ip_dst, hw_dst); /* Send the ARP reply to the candidates for both the IP addresses that - * the node got within the ARP reply + * the node obtained from the ARP reply */ batadv_dat_send_data(bat_priv, skb, ip_src, BATADV_P_DAT_DHT_PUT); batadv_dat_send_data(bat_priv, skb, ip_dst, BATADV_P_DAT_DHT_PUT); @@ -974,7 +970,7 @@ void batadv_dat_snoop_outgoing_arp_reply(struct batadv_priv *bat_priv, * DAT storage only * @bat_priv: the bat priv with all the soft interface information * @skb: packet to check - * @hdr_size: siaze of the encapsulation header + * @hdr_size: size of the encapsulation header */ bool batadv_dat_snoop_incoming_arp_reply(struct batadv_priv *bat_priv, struct sk_buff *skb, int hdr_size) @@ -1018,11 +1014,11 @@ out: /** * batadv_dat_drop_broadcast_packet - check if an ARP request has to be dropped - * (because the node has already got the reply via DAT) or not + * (because the node has already obtained the reply via DAT) or not * @bat_priv: the bat priv with all the soft interface information * @forw_packet: the broadcast packet * - * Returns true if the node can drop the packet, false otherwise + * Returns true if the node can drop the packet, false otherwise. */ bool batadv_dat_drop_broadcast_packet(struct batadv_priv *bat_priv, struct batadv_forw_packet *forw_packet) -- 1.7.10.4

1 1

[B.A.T.M.A.N.] [PATCHv2] batman-adv: send each broadcast only once on non-wireless interfaces
by Matthias Schiffer 16 Mar '13

16 Mar '13

While it makes sense to send each broadcast thrice on 802.11 (WLAN) interfaces as broadcasts are often unreliable on there, there is no reason to do so on other interface types. The increased the overhead can be harmful on low-bandwidth links like VPN connections over slow internet lines, therefore it is better to reduce the number of broadcast packets sent on non-wireless links to one. Signed-off-by: Matthias Schiffer <mschiffer(a)universe-factory.net> --- hard-interface.c | 11 +++++++++++ main.h | 5 +++++ send.c | 5 ++++- types.h | 1 + 4 files changed, 21 insertions(+), 1 deletion(-) diff --git a/hard-interface.c b/hard-interface.c index fd99e42..3f3ff9f 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -515,6 +515,17 @@ batadv_hardif_add_interface(struct net_device *net_dev) INIT_WORK(&hard_iface->cleanup_work, batadv_hardif_remove_interface_finish); + hard_iface->num_bcasts = BATADV_NUM_BCASTS_DEFAULT; + +#if IS_ENABLED(CONFIG_WIRELESS_EXT) || IS_ENABLED(CONFIG_CFG80211) + if (net_dev->ieee80211_ptr) + hard_iface->num_bcasts = BATADV_NUM_BCASTS_WIRELESS; +#if IS_ENABLED(CONFIG_WIRELESS_EXT) + else if (net_dev->wireless_handlers) + hard_iface->num_bcasts = BATADV_NUM_BCASTS_WIRELESS; +#endif +#endif + /* extra reference for return */ atomic_set(&hard_iface->refcount, 2); diff --git a/main.h b/main.h index e6eaf43..2c751c6 100644 --- a/main.h +++ b/main.h @@ -76,6 +76,11 @@ #define BATADV_LOG_BUF_LEN 8192 /* has to be a power of 2 */ +/* number of packets to send for broadcasts on different interface types */ +#define BATADV_NUM_BCASTS_DEFAULT 1 +#define BATADV_NUM_BCASTS_WIRELESS 3 +#define BATADV_NUM_BCASTS_MAX 3 + /* msecs after which an ARP_REQUEST is sent in broadcast as fallback */ #define ARP_REQ_DELAY 250 /* numbers of originator to contact for any PUT/GET DHT operation */ diff --git a/send.c b/send.c index 0a0bb45..e21138f 100644 --- a/send.c +++ b/send.c @@ -260,6 +260,9 @@ static void batadv_send_outstanding_bcast_packet(struct work_struct *work) if (hard_iface->soft_iface != soft_iface) continue; + if (forw_packet->num_packets >= hard_iface->num_bcasts) + continue; + /* send a copy of the saved skb */ skb1 = skb_clone(forw_packet->skb, GFP_ATOMIC); if (skb1) @@ -271,7 +274,7 @@ static void batadv_send_outstanding_bcast_packet(struct work_struct *work) forw_packet->num_packets++; /* if we still have some more bcasts to send */ - if (forw_packet->num_packets < 3) { + if (forw_packet->num_packets < BATADV_NUM_BCASTS_MAX) { _batadv_add_bcast_packet_to_list(bat_priv, forw_packet, msecs_to_jiffies(5)); return; diff --git a/types.h b/types.h index aba8364..0c5009f 100644 --- a/types.h +++ b/types.h @@ -76,6 +76,7 @@ struct batadv_hard_iface { char if_status; struct net_device *net_dev; atomic_t frag_seqno; + uint8_t num_bcasts; struct kobject *hardif_obj; atomic_t refcount; struct packet_type batman_adv_ptype; -- 1.8.1.5

3 8

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N