The following commit has been merged in the next branch: commit 17638375106f7c00c27e640ebf58dab1e14ea78e Author: Antonio Quartulli ordex@autistici.org Date: Wed Jul 20 14:47:33 2011 +0200

batman-adv: Distributed ARP Table - increase default soft_iface ARP table timeout

The default timeout value for ARP entries belonging to any soft_iface ARP table has been incremented by a factor 4. This is necessary because the DHT will store several network entries in the soft_iface ARP table.

Signed-off-by: Antonio Quartulli ordex@autistici.org

diff --git a/distributed-arp-table.c b/distributed-arp-table.c index 5e07602..a22bcda 100644 --- a/distributed-arp-table.c +++ b/distributed-arp-table.c @@ -23,6 +23,7 @@ #include <linux/if_arp.h> /* needed to use arp_tbl */ #include <net/arp.h> +#include <linux/inetdevice.h>

#include "main.h" #include "distributed-arp-table.h" @@ -559,3 +560,21 @@ bool dat_drop_broadcast_packet(struct bat_priv *bat_priv, } return false; } + +void arp_change_timeout(struct net_device *soft_iface, const char *name) +{ + struct in_device *in_dev = in_dev_get(soft_iface); + if (!in_dev) { + pr_err("Unable to set ARP parameters for the batman interface " + "'%s'\n", name); + return; + } + + /* Introduce a delay in the ARP state-machine transactions. Entries + * will be kept in the ARP table for the default time multiplied by 4 */ + in_dev->arp_parms->base_reachable_time *= ARP_TIMEOUT_FACTOR; + in_dev->arp_parms->gc_staletime *= ARP_TIMEOUT_FACTOR; + in_dev->arp_parms->reachable_time *= ARP_TIMEOUT_FACTOR; + + in_dev_put(in_dev); +} diff --git a/distributed-arp-table.h b/distributed-arp-table.h index 21c5d5e..235b2a4 100644 --- a/distributed-arp-table.h +++ b/distributed-arp-table.h @@ -47,6 +47,7 @@ bool dat_snoop_incoming_arp_reply(struct bat_priv *bat_priv, struct sk_buff *skb, int hdr_size); bool dat_drop_broadcast_packet(struct bat_priv *bat_priv, struct forw_packet *forw_packet); +void arp_change_timeout(struct net_device *soft_iface, const char *name);

/* hash function to choose an entry in a hash table of given size */ /* hash algorithm from http://en.wikipedia.org/wiki/Hash_table */ diff --git a/main.h b/main.h index c7a75d2..218be63 100644 --- a/main.h +++ b/main.h @@ -71,6 +71,9 @@ #define ARP_REQ_DELAY 250 /* numbers of originator to contact for any PUT/GET DHT operation */ #define DHT_CANDIDATES_NUM 3 +/* Factor which default ARP timeout values of the soft_iface table are + * multiplied by */ +#define ARP_TIMEOUT_FACTOR 4

#define LOG_BUF_LEN 8192 /* has to be a power of 2 */

diff --git a/soft-interface.c b/soft-interface.c index 0a78feb..8b68e01 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -381,6 +381,8 @@ struct net_device *softif_create(const char *name) goto free_soft_iface; }

+ arp_change_timeout(soft_iface, name); + bat_priv = netdev_priv(soft_iface);

atomic_set(&bat_priv->aggregated_ogms, 1);